[Libreoffice-commits] core.git: fpicker/source

[Caolán McNamara (via logerrit)]

 fpicker/source/office/iodlg.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 23ddc3811d4d1890e4024f4e0f6bb5129a694fdc
Author: Caolán McNamara 
AuthorDate: Thu Apr 30 17:45:26 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 30 20:12:36 2020 +0200

Resolves: tdf#130505 give default focus to the file name field

Change-Id: I2c78fa95e626029a4cfc7f8e2faf03d4a5d2dee8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93228
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 89564fca2efd..8a51fc97b518 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -466,6 +466,8 @@ SvtFileDialog::SvtFileDialog(weld::Window* pParent, 
PickerFlags nStyle)
 
 m_xDialog->connect_size_allocate(LINK(this, SvtFileDialog, SizeAllocHdl));
 SizeAllocHdl(Size());
+
+m_xImpl->m_xEdFileName->grab_focus();
 }
 
 SvtFileDialog::~SvtFileDialog()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/data3/tdf124397.docx |binary
 sw/qa/extras/uiwriter/uiwriter3.cxx|   21 +
 2 files changed, 21 insertions(+)

New commits:
commit d49df68ec4807f31df4fb3cdaa0448405ef40a29
Author: Xisco Fauli 
AuthorDate: Thu Apr 30 17:55:06 2020 +0200
Commit: Xisco Faulí 
CommitDate: Thu Apr 30 18:39:24 2020 +0200

tdf#124397: sw: Add unittest

Change-Id: Idd98980625e246dea432346f3d7c12c942132aa0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93223
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sw/qa/extras/uiwriter/data3/tdf124397.docx 
b/sw/qa/extras/uiwriter/data3/tdf124397.docx
new file mode 100644
index ..65e2d25bcc62
Binary files /dev/null and b/sw/qa/extras/uiwriter/data3/tdf124397.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index ebecddedbb16..362a0161751d 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -223,6 +223,27 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf126340)
 CPPUNIT_ASSERT_EQUAL(OUString("foo"), getParagraph(1)->getString());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf124397)
+{
+load(DATA_DIRECTORY, "tdf124397.docx");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+uno::Reference xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xIndexAccess(xTextFramesSupplier->getTextFrames(),
+ uno::UNO_QUERY);
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+dispatchCommand(mxComponent, ".uno:Delete", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
+// Without the fix in place, it would crash here
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf107975)
 {
 // This test also covers tdf#117185 tdf#110442
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - svx/source

[Tomaž Vajngerl (via logerrit)]

 svx/source/svdraw/svdpdf.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit f552aa0622adabfe608aa0f7403fa5040ed6abd4
Author: Tomaž Vajngerl 
AuthorDate: Thu Apr 30 19:07:44 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Apr 30 19:07:44 2020 +0200

SdrPdfImport: fix garbled text at breaking the PDF graphic

The text size of OUString expects no. of characters, but we give
the number of bytes as that is what we get from PDFium. Best to
just not give the text size at all and let OUString determine
that as the text shouldbe terminated correctly.

Change-Id: Icc5cd6e851a9d2920faa9ca2eb6d827465483e72

diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index 806e82ebf5ac..296d2b53f31b 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -798,16 +798,19 @@ void ImpSdrPdfImport::ImportText(FPDF_PAGEOBJECT 
pPageObject, FPDF_TEXTPAGE pTex
 const tools::Rectangle aRect = PointsToLogic(aTextRect.getMinX(), 
aTextRect.getMaxX(),
  aTextRect.getMinY(), 
aTextRect.getMaxY());
 
-const int nChars = FPDFTextObj_GetText(pPageObject, pTextPage, nullptr, 0);
-std::unique_ptr pText(new sal_Unicode[nChars]);
+const int nBytes = FPDFTextObj_GetText(pPageObject, pTextPage, nullptr, 0);
+std::unique_ptr pText(new sal_Unicode[nBytes]);
 
-const int nActualChars = FPDFTextObj_GetText(pPageObject, pTextPage, 
pText.get(), nChars);
-if (nActualChars <= 0)
+const int nActualBytes = FPDFTextObj_GetText(pPageObject, pTextPage, 
pText.get(), nBytes);
+if (nActualBytes <= 0)
 {
 return;
 }
 
-OUString sText(pText.get(), nActualChars);
+// Let's rely on null-terminaton for the length of the string. We
+// just know the number of bytes the string takes, but in OUString
+// needs the number of charaters.
+OUString sText(pText.get());
 
 const double dFontSize = FPDFTextObj_GetFontSize(pPageObject);
 double dFontSizeH = fabs(sqrt2(matrix.a, matrix.c) * dFontSize);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source

[Heiko Tietze (via logerrit)]

 cui/inc/strings.hrc  |3 ---
 cui/source/dialogs/about.cxx |   34 --
 2 files changed, 8 insertions(+), 29 deletions(-)

New commits:
commit 35f5520fc83a2c69a5d5eef283a37b1553c8ed65
Author: Heiko Tietze 
AuthorDate: Thu Apr 30 16:32:59 2020 +0200
Commit: Heiko Tietze 
CommitDate: Thu Apr 30 20:45:59 2020 +0200

Drop obsolete variable strings

Change-Id: I0cd96b3466f94681567663625aa662717630e92f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93220
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 1049f7e7ff4f..df99edb217b2 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -381,14 +381,11 @@
 
 #define RID_SVXSTR_CANNOTCONVERTURL_ERR 
NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a 
filesystem path.")
 
-#define RID_SVXSTR_ABOUT_VERSION
NC_("aboutdialog|textbuffer1", 
"%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")
 #define RID_SVXSTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2020 LibreOffice contributors.")
 #define RID_SVXSTR_ABOUT_CREDITS_URLNC_("aboutdialog|link", 
"https://www.libreoffice.org/about-us/credits/;)
-#define RID_SVXSTR_ABOUT_BUILDIDNC_("aboutdialog|buildid", 
"$BUILDID")
 #define RID_SVXSTR_ABOUT_VENDOR NC_("aboutdialog|vendor", 
"This release was supplied by %OOOVENDOR.")
 #define RID_SVXSTR_ABOUT_BASED_ON   
NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
 #define RID_SVXSTR_ABOUT_DERIVEDNC_("aboutdialog|derived", 
"%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
-#define RID_SVXSTR_ABOUT_LOCALE NC_("aboutdialog|locale", 
"$LOCALE")
 #define RID_SVXSTR_ABOUT_UILOCALE   
NC_("aboutdialog|uilocale", "UI-Language: $LOCALE")
 
 #define RID_SVXSTR_EDIT_PATHS   
NC_("optpathspage|editpaths", "Edit Paths: %1")
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 845ad5496a37..c07a8c964586 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -142,7 +142,7 @@ bool AboutDialog::IsStringValidGitHash(const OUString 
) {
 }
 
 OUString AboutDialog::GetVersionString() {
-  OUString sVersion = CuiResId(RID_SVXSTR_ABOUT_VERSION);
+  OUString sVersion = 
CuiResId("%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX");
 
 #ifdef _WIN64
   sVersion += " (x64)";
@@ -163,18 +163,7 @@ OUString AboutDialog::GetBuildString() {
   }
   OSL_ENSURE(!sBuildId.isEmpty(), "No BUILDID in bootstrap file");
 
-  OUString sBuildStr;
-
-  if (!sBuildId.trim().isEmpty()) {
-sBuildStr = CuiResId(RID_SVXSTR_ABOUT_BUILDID);
-if (sBuildStr.indexOf("$BUILDID") == -1) {
-  SAL_WARN("cui.dialogs", "translated Build Id string in translations "
-  "doesn't contain $BUILDID placeholder");
-  sBuildStr += " $BUILDID";
-}
-sBuildStr = sBuildStr.replaceAll("$BUILDID", sBuildId);
-  }
-  return sBuildStr;
+  return sBuildId;
 }
 
 OUString AboutDialog::GetEnvString() { return Application::GetHWOSConfInfo(1); 
}
@@ -182,29 +171,22 @@ OUString AboutDialog::GetUIString() { return 
Application::GetHWOSConfInfo(2); }
 
 OUString AboutDialog::GetLocaleString() {
 
-  OUString aLocaleStr;
+  OUString sLocaleStr;
 
   rtl_Locale *pLocale;
   osl_getProcessLocale();
   if (pLocale && pLocale->Language) {
 if (pLocale->Country && rtl_uString_getLength(pLocale->Country) > 0)
-  aLocaleStr = OUString::unacquired(>Language) + "_" +
+  sLocaleStr = OUString::unacquired(>Language) + "_" +
OUString::unacquired(>Country);
 else
-  aLocaleStr = OUString(pLocale->Language);
+  sLocaleStr = OUString(pLocale->Language);
 if (pLocale->Variant && rtl_uString_getLength(pLocale->Variant) > 0)
-  aLocaleStr += OUString(pLocale->Variant);
+  sLocaleStr += OUString(pLocale->Variant);
   }
 
-  aLocaleStr = Application::GetSettings().GetLanguageTag().getBcp47() + " (" +
-   aLocaleStr + ")";
-  OUString sLocaleStr(CuiResId(RID_SVXSTR_ABOUT_LOCALE));
-  if (sLocaleStr.indexOf("$LOCALE") == -1) {
-SAL_WARN("cui.dialogs", "translated locale string in translations doesn't "
-"contain $LOCALE placeholder");
-sLocaleStr += " $LOCALE";
-  }
-  sLocaleStr = sLocaleStr.replaceAll("$LOCALE", aLocaleStr);
+  sLocaleStr = Application::GetSettings().GetLanguageTag().getBcp47() + " (" +
+   sLocaleStr + ")";
 
   OUString aUILocaleStr =
   Application::GetSettings().GetUILanguageTag().getBcp47();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/desktop/writer/shape_operations_spec.js 
 |2 +-
 cypress_test/integration_tests/mobile/calc/focus_spec.js   
 |3 ++-
 
cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js 
|4 ++--
 cypress_test/integration_tests/mobile/writer/focus_spec.js 
 |2 +-
 cypress_test/integration_tests/mobile/writer/shape_properties_spec.js  
 |9 ++---
 cypress_test/integration_tests/mobile/writer/table_properties_spec.js  
 |8 +---
 6 files changed, 17 insertions(+), 11 deletions(-)

New commits:
commit 39b00d3b84961c3e783e7d2cd7d5e99a1d084045
Author: Tamás Zolnai 
AuthorDate: Thu Apr 30 18:02:58 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Apr 30 18:55:41 2020 +0200

cypress: disable various regressed test cases.

Change-Id: I316021a57e9bd3288138c1ac2e85af73d8efcf46
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93224
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git 
a/cypress_test/integration_tests/desktop/writer/shape_operations_spec.js 
b/cypress_test/integration_tests/desktop/writer/shape_operations_spec.js
index b205249aa..abbfe64b3 100644
--- a/cypress_test/integration_tests/desktop/writer/shape_operations_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/shape_operations_spec.js
@@ -8,7 +8,7 @@ describe('Shape operations', function() {
helper.afterAll('shape_operations.odt', 'writer');
});
 
-   it('Insert a simple shape.', function() {
+   it.skip('Insert a simple shape.', function() {
helper.loadTestDoc('shape_operations.odt');
 
// Scroll on the up toolbar
diff --git a/cypress_test/integration_tests/mobile/calc/focus_spec.js 
b/cypress_test/integration_tests/mobile/calc/focus_spec.js
index 3e2b3c8b0..6a5ed60e9 100644
--- a/cypress_test/integration_tests/mobile/calc/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/focus_spec.js
@@ -76,7 +76,8 @@ describe('Calc focus tests', function() {
.should('be.eq', 'clipboard');
});
 
-   it('Formula-bar focus', function() {
+   // Regression here: 'BAZINGA' text is typed at an incorrect position.
+   it.skip('Formula-bar focus', function() {
// Click on edit button
mobileHelper.enableEditingMobile();
 
diff --git 
a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
 
b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
index bbecf7264..030e91686 100644
--- 
a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
+++ 
b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
@@ -210,9 +210,9 @@ describe('Apply paragraph properties.', function() {
it('Change para spacing via combobox.', function() {
// Check para spacing current value
cy.get('#aboveparaspacing .spinfield')
-   .should('have.attr', 'value', '0.0');
+   .should('have.attr', 'value', '0');
cy.get('#belowparaspacing .spinfield')
-   .should('have.attr', 'value', '0.0');
+   .should('have.attr', 'value', '0');
 
// Change spacing
cy.get('#aboveparaspacing .spinfieldcontrols .plus')
diff --git a/cypress_test/integration_tests/mobile/writer/focus_spec.js 
b/cypress_test/integration_tests/mobile/writer/focus_spec.js
index 602723e0b..e09c3c85e 100644
--- a/cypress_test/integration_tests/mobile/writer/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/focus_spec.js
@@ -90,7 +90,7 @@ describe('Focus tests', function() {
.click();
 
cy.get('#aboveparaspacing .spinfield')
-   .should('have.attr', 'value', '0.0')
+   .should('have.attr', 'value', '0')
.click();
 
// The spinfield should have the focus now.
diff --git 
a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js 
b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
index 91f2bc5df..feb8582f3 100644
--- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
@@ -81,7 +81,8 @@ describe('Change shape properties via mobile wizard.', 
function() {
.should('have.attr', 'fill', 'rgb(114,159,207)');
});
 
-   it('Change shape width.', function() {
+   // Regression here: we can't enter value directly into the spinfield
+   it.skip('Change shape width.', function() {
// TODO: Entering a value inside the spinbutton has no effect 
on the shape.
if (Cypress.env('LO_CORE_VERSION') === 'master')
 

[Libreoffice-commits] online.git: loleaflet/js

[Michael Meeks (via logerrit)]

 loleaflet/js/global.js |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit e9abaaf71b23809fe96c5475030363d623b753a3
Author: Michael Meeks 
AuthorDate: Thu Apr 30 16:29:26 2020 +0100
Commit: Michael Meeks 
CommitDate: Thu Apr 30 19:01:46 2020 +0200

Proxy: tolerate missing CSS files during CSS re-write.

Change-Id: I3d5af4950962391466192fdb391915d02f8813ed
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93221
Tested-by: Michael Meeks 
Reviewed-by: Michael Meeks 

diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index 07ae23ad9..c5546f7c2 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -402,7 +402,13 @@
relBases.pop(); // bin last - css name.
var replaceBase = 'url("' + relBases.join('/') 
+ '/images/';
 
-   var rules = sheets[i].cssRules || 
sheets[i].rules;
+   var rules;
+   try {
+   rules = sheets[i].cssRules || 
sheets[i].rules;
+   } catch (err) {
+   console.log('Missing CSS from ' + 
sheets[i].href);
+   continue;
+   }
for (var r = 0; r < rules.length; ++r) {
if (!rules[r] || !rules[r].style)
continue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/Makefile.am

[Tamás Zolnai (via logerrit)]

 cypress_test/Makefile.am |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4008c7120d2bf619357f12b23a245df30f3c2d58
Author: Tamás Zolnai 
AuthorDate: Thu Apr 30 17:42:38 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Apr 30 18:26:34 2020 +0200

cypress: don't run mobile and desktop tests in parallel.

With the recent mobile detection related changes having
mobile and dekstop tests running in parallel make the build
fail.

A related commit:
255d24ba8fc8669b4197887e69bd4406af4cba14

Change-Id: I69929b5dbd37298e27409d247a651c79f6dbe33f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93222
Tested-by: Tamás Zolnai 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index f206b2803..3e8e5908d 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -59,7 +59,7 @@ $(PID_FILE): @JAILS_PATH@ $(NODE_BINS)
$(if $(HEADLESS_BUILD),$(call start_Xvfb),)
$(call start_loolwsd)
 
-$(MOBILE_TEST_FILES_DONE): $(PID_FILE)
+$(MOBILE_TEST_FILES_DONE): $(PID_FILE) $(DESKTOP_TEST_FILES_DONE)
$(if $(PARALLEL_BUILD),\
$(call run_mobile_tests,$(subst 
$(MOBILE_TRACK_FOLDER)/,,$(basename $@)),$(basename $@).log),\
$(call run_mobile_tests))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx svx/CppunitTest_svx_gallery_test.mk svx/Module_svx.mk svx/qa

[Aditya (via logerrit)]

 include/svx/gallery1.hxx |2 
 svx/CppunitTest_svx_gallery_test.mk  |   49 +
 svx/Module_svx.mk|1 
 svx/qa/unit/gallery/test_gallery.cxx |  175 +++
 4 files changed, 226 insertions(+), 1 deletion(-)

New commits:
commit 3e8a93f5077e7ec5fbc47acdcdeaafaa15c5a7a9
Author: Aditya 
AuthorDate: Wed Apr 22 14:33:49 2020 +0530
Commit: Tomaž Vajngerl 
CommitDate: Thu Apr 30 19:03:51 2020 +0200

svx:unit tests for gallery

Tests for creation of renaming, deletion of gallery theme

Change-Id: I2bfb602342f5d6b4ed45ff2f2fb9df7601e0e6b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92679
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index ca639cddf4ea..dc2631beb70e 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -121,7 +121,7 @@ public:
 SAL_DLLPRIVATE OUString GetThemeName( sal_uInt32 nThemeId ) const;
 
 boolCreateTheme( const OUString& rThemeName );
-SAL_DLLPRIVATE void RenameTheme( const OUString& rOldName, const 
OUString& rNewName );
+voidRenameTheme( const OUString& rOldName, const 
OUString& rNewName );
 boolRemoveTheme( const OUString& rThemeName );
 
 GalleryTheme*   AcquireTheme( const OUString& rThemeName, 
SfxListener& rListener );
diff --git a/svx/CppunitTest_svx_gallery_test.mk 
b/svx/CppunitTest_svx_gallery_test.mk
new file mode 100644
index ..e13b75694627
--- /dev/null
+++ b/svx/CppunitTest_svx_gallery_test.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitScreenShot,svx_gallery_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,svx_gallery_test, \
+svx/qa/unit/gallery/test_gallery \
+))
+
+$(eval $(call gb_CppunitTest_set_include,svx_gallery_test,\
+-I$(SRCDIR)/svx/source/inc \
+-I$(SRCDIR)/svx/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,svx_gallery_test, \
+   sal \
+   utl \
+   svxcore \
+   comphelper \
+))
+
+$(eval $(call gb_CppunitTest_use_vcl,svx_gallery_test))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,svx_gallery_test))
+
+$(eval $(call gb_CppunitTest_use_configuration,svx_gallery_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,svx_gallery_test,services))
+
+$(eval $(call gb_CppunitTest_use_ure,svx_gallery_test))
+
+
+
+
+
+
+
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 1d83bdc29d68..2040a906891f 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_l10n_targets,svx,\
 
 $(eval $(call gb_Module_add_check_targets,svx,\
CppunitTest_svx_unit \
+   CppunitTest_svx_gallery_test \
 ))
 
 # screenshots
diff --git a/svx/qa/unit/gallery/test_gallery.cxx 
b/svx/qa/unit/gallery/test_gallery.cxx
new file mode 100644
index ..c7ced2d58ee1
--- /dev/null
+++ b/svx/qa/unit/gallery/test_gallery.cxx
@@ -0,0 +1,175 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+class GalleryObjTest : public CppUnit::TestFixture
+{
+public:
+void TestCreateTheme();
+void TestDeleteTheme();
+void TestSetThemeName();
+void TestThemeURLCase();
+
+CPPUNIT_TEST_SUITE(GalleryObjTest);
+
+CPPUNIT_TEST(TestCreateTheme);
+CPPUNIT_TEST(TestDeleteTheme);
+CPPUNIT_TEST(TestSetThemeName);
+CPPUNIT_TEST(TestThemeURLCase);
+
+CPPUNIT_TEST_SUITE_END();
+};
+
+// Create and Dereference a theme, check that file exists
+void GalleryObjTest::TestCreateTheme()
+{
+// Create theme
+std::unique_ptr pTempDir;
+pTempDir.reset(new utl::TempFile(nullptr, true));
+CPPUNIT_ASSERT_MESSAGE("Could not create valid temporary directory", 
pTempDir->IsValid());
+pTempDir->EnableKillingFile();
+const OUString aGalleryURL = pTempDir->GetURL();
+
+// Check if directory exists
+CPPUNIT_ASSERT_MESSAGE("Could not create temporary directory",
+   

[Libreoffice-commits] core.git: extras/CustomTarget_tplpresnt.mk extras/source

[andreas kainz (via logerrit)]

 dev/null   
 |binary
 extras/CustomTarget_tplpresnt.mk   
 |2 
 extras/source/templates/presnt/Sunset/META-INF/manifest.xml
 |2 
 
extras/source/templates/presnt/Sunset/Pictures/100041668D2E4F6045D45030E4D3EC44.svg
 |  394 --
 extras/source/templates/presnt/Sunset/Thumbnails/thumbnail.png 
 |binary
 extras/source/templates/presnt/Sunset/content.xml  
 |   27 
 extras/source/templates/presnt/Sunset/styles.xml   
 |  272 --
 7 files changed, 190 insertions(+), 507 deletions(-)

New commits:
commit ed1c11e9213ad11cfe38440294b95a3cf08d0db0
Author: andreas kainz 
AuthorDate: Thu Apr 30 21:32:33 2020 +0200
Commit: andreas_kainz 
CommitDate: Thu Apr 30 23:31:18 2020 +0200

tdf#132138 Update Sunset impress theme

Change-Id: I5fd2ab88cced118867c270dc191ac3e2b0fde72a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93229
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk
index ea9a49be55d8..cbdbd5510547 100644
--- a/extras/CustomTarget_tplpresnt.mk
+++ b/extras/CustomTarget_tplpresnt.mk
@@ -158,8 +158,6 @@ extras_PRESENTATIONS_XMLFILES := \
Sunset/content.xml \
Sunset/META-INF/manifest.xml \
Sunset/meta.xml \
-   Sunset/Pictures/120103AF02126EB1F3F571D17DD0.png \
-   Sunset/Pictures/100041668D2E4F6045D45030E4D3EC44.svg \
Sunset/styles.xml \
Sunset/Thumbnails/thumbnail.png \
Vintage/content.xml \
diff --git a/extras/source/templates/presnt/Sunset/META-INF/manifest.xml 
b/extras/source/templates/presnt/Sunset/META-INF/manifest.xml
index 4ca277b95b12..c3e1aec9147d 100644
--- a/extras/source/templates/presnt/Sunset/META-INF/manifest.xml
+++ b/extras/source/templates/presnt/Sunset/META-INF/manifest.xml
@@ -4,7 +4,5 @@
   
   
   
-  
-  
   
 
diff --git 
a/extras/source/templates/presnt/Sunset/Pictures/120103AF02126EB1F3F571D17DD0.png
 
b/extras/source/templates/presnt/Sunset/Pictures/120103AF02126EB1F3F571D17DD0.png
deleted file mode 100644
index dc1e832b7a27..
Binary files 
a/extras/source/templates/presnt/Sunset/Pictures/120103AF02126EB1F3F571D17DD0.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/Sunset/Pictures/100041668D2E4F6045D45030E4D3EC44.svg
 
b/extras/source/templates/presnt/Sunset/Pictures/100041668D2E4F6045D45030E4D3EC44.svg
deleted file mode 100644
index 6697e09d043c..
--- 
a/extras/source/templates/presnt/Sunset/Pictures/100041668D2E4F6045D45030E4D3EC44.svg
+++ /dev/null
@@ -1,394 +0,0 @@
-
-
-
-http://purl.org/dc/elements/1.1/;
-   xmlns:cc="http://creativecommons.org/ns#;
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#;
-   xmlns:svg="http://www.w3.org/2000/svg;
-   xmlns="http://www.w3.org/2000/svg;
-   xmlns:xlink="http://www.w3.org/1999/xlink;
-   version="1.1"
-   width="1366"
-   height="768"
-   id="svg2"
-   style="enable-background:new">
-  
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-
-
-  
-
-
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-
-  
-  
-
-  
-image/svg+xml
-http://purl.org/dc/dcmitype/StillImage; />
-
-  
-
-  
-  
-  
-
-
-
-
-
-
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
-  
-
-
-  
-  
-  
-  
-  
-
-  
-
diff --git a/extras/source/templates/presnt/Sunset/Thumbnails/thumbnail.png 
b/extras/source/templates/presnt/Sunset/Thumbnails/thumbnail.png
index ef540cc0fc0f..4a35a928dbfe 100644
Binary files a/extras/source/templates/presnt/Sunset/Thumbnails/thumbnail.png 
and b/extras/source/templates/presnt/Sunset/Thumbnails/thumbnail.png differ
diff --git a/extras/source/templates/presnt/Sunset/content.xml 
b/extras/source/templates/presnt/Sunset/content.xml
index 0793fea711e7..6d731cc108d7 100644
--- a/extras/source/templates/presnt/Sunset/content.xml
+++ b/extras/source/templates/presnt/Sunset/content.xml
@@ -1,12 +1,12 @@
 
-http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 

[Libreoffice-commits] online.git: loleaflet/src

[Dennis Francis (via logerrit)]

 loleaflet/src/control/Control.LokDialog.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1a4322a940073c2a4f461f971a3f04ced65007b1
Author: Dennis Francis 
AuthorDate: Fri May 1 02:23:30 2020 +0530
Commit: Dennis Francis 
CommitDate: Fri May 1 04:30:23 2020 +0200

loleaflet: mobile: center the dialog horizontally

Before this the dialogs (in mobile) like 'autofilter/validation list' were
not centered horizontally and looked awkward. However as for vertical
positioning, it is correctly glued to the top of the map as said in
the comments.

Change-Id: I2f31075742ac8f40b3fd4d4016dbfef635b5f805
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93238
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index bcdf1f4fa..dd0a78113 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1238,7 +1238,7 @@ L.Control.LokDialog = L.Control.extend({
// on mobile, force the positioning to the top, so that it is 
not
// covered by the virtual keyboard
if (window.mode.isMobile()) {
-   $(dialogContainer).dialog('option', 'position', { my: 
'left top', at: 'let top', of: '#document-container' });
+   $(dialogContainer).dialog('option', 'position', { my: 
'center top', at: 'center top', of: '#document-container' });
transformation.origin = 'center top';
transformation.translate.y = 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |   14 --
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 2e0f1402028d60344247605223e8a63fed70e7d4
Author: Dennis Francis 
AuthorDate: Thu Apr 30 17:28:39 2020 +0530
Commit: Dennis Francis 
CommitDate: Fri May 1 04:16:09 2020 +0200

fix validation dropdown icon size

There is no need to have a 'maxHeight' for the icon as we don't mirror
the core's button anymore. The height of the icon follows the cell height,
and lets make the width follow it too, so that the icon is nicely
scaled with zoom (the icon used has a 1:1 aspect ratio).

Change-Id: I175ad98f6a1306fabd003eee7fda9652f5835995
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93211
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index adf022776..2918f8bf0 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -3038,18 +3038,12 @@ L.TileLayer = L.GridLayer.extend({
this._map.removeLayer(this._dropDownButton);
},
 
-   _getDropDownMarker: function (height) {
-   if (height) {
-   var maxHeight = 27; // it matches the max height of the 
same control in core
-   var topMargin = 0;
-   if (height > maxHeight) {
-   topMargin = height - maxHeight;
-   height = maxHeight;
-   }
+   _getDropDownMarker: function (dropDownSize) {
+   if (dropDownSize) {
var icon =  L.divIcon({
className: 'spreadsheet-drop-down-marker',
-   iconSize: [undefined, height],
-   iconAnchor: [0, -topMargin]
+   iconSize: [dropDownSize, dropDownSize],
+   iconAnchor: [0, 0]
});
this._dropDownButton.setIcon(icon);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |3 +++
 loleaflet/src/map/handler/Map.TouchGesture.js |9 +
 2 files changed, 12 insertions(+)

New commits:
commit 485e849459f998a6aea0e5978562a9b05f458c85
Author: Dennis Francis 
AuthorDate: Thu Apr 30 18:07:06 2020 +0530
Commit: Dennis Francis 
CommitDate: Fri May 1 04:22:31 2020 +0200

The validity dropdown button should react to taps too

Change-Id: I5c689106a2d995c37f28d652e8b0e39c0644ec8b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93212
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 2918f8bf0..9836590ba 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -338,6 +338,9 @@ L.TileLayer = L.GridLayer.extend({
this._cellResizeMarkerEnd.on('dragstart drag dragend', 
this._onCellResizeMarkerDrag, this);
this._cellAutofillMarker.on('dragstart drag dragend', 
this._onCellResizeMarkerDrag, this);
this._dropDownButton.on('click', this._onDropDownButtonClick, 
this);
+   // The 'tap' events are not broadcasted by L.Map.TouchGesture, 
A specialized 'dropdownmarkertapped' event is
+   // generated just for the validity-dropdown-icon.
+   map.on('dropdownmarkertapped', this._onDropDownButtonClick, 
this);
 
map.setPermission(this.options.permission);
 
diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index 6120a8d1a..cff7eeffe 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -311,6 +311,15 @@ L.Map.TouchGesture = L.Handler.extend({
 
this._map.fire('closepopups');
this._map.fire('closemobilewizard');
+
+   // The validity dropdown marker icon (exists only in calc) 
needs to be notified of tap events if it is the target.
+   var dropDownMarkers = 
document.getElementsByClassName('leaflet-marker-icon 
spreadsheet-drop-down-marker');
+   if (dropDownMarkers.length == 1 && dropDownMarkers[0] && 
e.target && e.target == dropDownMarkers[0]) {
+   this._map.fire('dropdownmarkertapped');
+   // don't send the mouse-event to core
+   return;
+   }
+
this._map.fire('editorgotfocus');
 
var docLayer = this._map._docLayer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sc/source

[Dennis Francis (via logerrit)]

 sc/source/ui/view/gridwin.cxx |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 86019fc76473cde457ecf1634bcff9df60ad7cbf
Author: Dennis Francis 
AuthorDate: Fri May 1 05:39:53 2020 +0530
Commit: Dennis Francis 
CommitDate: Fri May 1 06:44:23 2020 +0200

lokit: fix autofilter window position...

when client zoom is not 100%. The fix and the reasoning
is same as that in

lokit: fix validation dropdown's wrong position
3405f7f1b19738cad57b58259105ec87c1108466

Change-Id: I04837721d82b1e178cf5aa1130bbdaf77d13edae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93240
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 97a73632ee22..c0fd0034c55c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -641,10 +641,11 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW 
nRow)
 {
 SCTAB nTab = pViewData->GetTabNo();
 ScDocument* pDoc = pViewData->GetDocument();
+bool bLOKActive = comphelper::LibreOfficeKit::isActive();
 
 mpAutoFilterPopup.disposeAndClear();
 mpAutoFilterPopup.reset(VclPtr::Create(this, pDoc));
-if (comphelper::LibreOfficeKit::isActive())
+if (bLOKActive)
 mpAutoFilterPopup->SetLOKNotifier(SfxViewShell::Current());
 mpAutoFilterPopup->setOKAction(new AutoFilterAction(this, 
AutoFilterMode::Normal));
 mpAutoFilterPopup->setPopupEndAction(
@@ -656,6 +657,18 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW 
nRow)
 long nSizeX  = 0;
 long nSizeY  = 0;
 pViewData->GetMergeSizePixel(nCol, nRow, nSizeX, nSizeY);
+if (bLOKActive)
+{
+// Reverse the zoom factor from aPos and nSize[X|Y]
+// before letting the autofilter window convert the to twips
+// with no zoom information.
+double fZoomX(pViewData->GetZoomX());
+double fZoomY(pViewData->GetZoomY());
+aPos.setX(aPos.getX() / fZoomX);
+aPos.setY(aPos.getY() / fZoomY);
+nSizeX = nSizeX / fZoomX;
+nSizeY = nSizeY / fZoomY;
+}
 tools::Rectangle aCellRect(OutputToScreenPixel(aPos), Size(nSizeX, 
nSizeY));
 
 ScDBData* pDBData = pDoc->GetDBAtCursor(nCol, nRow, nTab, 
ScDBDataPortion::AREA);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 903488a7821872234c5f6b8cce5325ca97ef829a
Author: Dennis Francis 
AuthorDate: Thu Apr 30 11:46:16 2020 +0530
Commit: Dennis Francis 
CommitDate: Fri May 1 04:13:09 2020 +0200

Lets make 'dropdown marker' icon active

Before this, the dropdown marker icon was just trying to mirror the
exact shape and position of the validity list button in core.
It is a lot easier just to have the js icon according to our
styling and in its click handler, sent '.uno:DataSelect' command to
core. It saves us the trouble of mirroring the core's button which
apparently is not zoom adjusted. With non-default dpiscale, it takes
more effort to mirror it exactly.

Change-Id: Ibe15293e9052dfacf01be94ed4950d1842e46c4b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93210
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 7662b71a2..adf022776 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -156,7 +156,7 @@ L.TileLayer = L.GridLayer.extend({
className: 'spreadsheet-drop-down-marker',
iconSize: null
}),
-   interactive: false
+   interactive: true
});
 
this._cellResizeMarkerStart = L.marker(new L.LatLng(0, 0), {
@@ -337,6 +337,7 @@ L.TileLayer = L.GridLayer.extend({
this._cellResizeMarkerStart.on('dragstart drag dragend', 
this._onCellResizeMarkerDrag, this);
this._cellResizeMarkerEnd.on('dragstart drag dragend', 
this._onCellResizeMarkerDrag, this);
this._cellAutofillMarker.on('dragstart drag dragend', 
this._onCellResizeMarkerDrag, this);
+   this._dropDownButton.on('click', this._onDropDownButtonClick, 
this);
 
map.setPermission(this.options.permission);
 
@@ -2830,6 +2831,12 @@ L.TileLayer = L.GridLayer.extend({
}
},
 
+   _onDropDownButtonClick: function () {
+   if (this._validatedCellXY && this._cellCursorXY && 
this._validatedCellXY.equals(this._cellCursorXY)) {
+   this._map.sendUnoCommand('.uno:DataSelect');
+   }
+   },
+
// Update group layer selection handler.
_onUpdateGraphicSelection: function () {
if (this._graphicSelection && 
!this._isEmptyRectangle(this._graphicSelection)) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Dennis Francis (via logerrit)]

 sc/source/ui/view/gridwin.cxx |   23 +++
 1 file changed, 3 insertions(+), 20 deletions(-)

New commits:
commit a202f29155aa60e479774a0972a88e232394a85e
Author: Dennis Francis 
AuthorDate: Fri May 1 04:23:09 2020 +0530
Commit: Dennis Francis 
CommitDate: Fri May 1 07:28:27 2020 +0200

Revert "lokit: scale the validation dropdown with client zoom"

The scaling of the float window containg the listbox is unfortunately
far from ideal at certain zoom levels and entry sizes. There are issues
like too much extra spaces around the entries and around scrollbar if
present. These issues need more work to fix. Until then lets revert
this.

Another issue is that we don't really want to zoom adjust any popups in
mobile or android as this does not match the design of jsdialogs.

This reverts the commit :
7787bac16cbe63698f56a9a70d9b1b217f3ea860 (master)
a87e78df635d4a8e745bfffcf33d022d2a498afa (cp62)

Change-Id: Ic31040b491e25b5113dfc8e70d3f73de204862e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93239
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 
(cherry picked from commit 84200fc5e1b807629de2d975acaa3ffb81640d1f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93137
Tested-by: Jenkins

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 59a4d6b60d35..26c2d6eb7b7f 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1073,7 +1073,6 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, 
SCROW nRow )
 pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY );
 Point aPos = pViewData->GetScrPos( nCol, nRow, eWhich );
 bool bLOKActive = comphelper::LibreOfficeKit::isActive();
-double fListWindowZoom = 1.0;
 
 if (bLOKActive)
 {
@@ -1086,17 +1085,8 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, 
SCROW nRow )
 double fZoomY(pViewData->GetZoomY());
 aPos.setX(aPos.getX() / fZoomX);
 aPos.setY(aPos.getY() / fZoomY);
-// Reverse the zooms from sizes too
-// nSizeX : because we need to rescale with another (trimmed) zoom 
level below.
 nSizeX = nSizeX / fZoomX;
-// nSizeY : because this is used by vcl::FloatingWindow later to 
compute its vertical position
-// since we pass the flag FloatWinPopupFlags::Down setup the popup.
 nSizeY = nSizeY / fZoomY;
-// Limit zoom scale for Listwindow in the dropdown.
-fListWindowZoom = std::max(std::min(fZoomY, 2.0), 0.5);
-// nSizeX is only used in setting the width of dropdown, so rescale 
with
-// the trimmed zoom.
-nSizeX = nSizeX * fListWindowZoom;
 }
 
 if ( bLayoutRTL )
@@ -1114,8 +1104,6 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, 
SCROW nRow )
 }
 mpFilterFloat->SetPopupModeEndHdl(LINK( this, ScGridWindow, 
PopupModeEndHdl));
 mpFilterBox.reset(VclPtr::Create(mpFilterFloat.get(), 
this, nCol, nRow, ScFilterBoxMode::DataSelect));
-if (bLOKActive)
-mpFilterBox->SetZoom(Fraction(fListWindowZoom));
 // Fix for bug fdo#44925
 if (AllSettings::GetLayoutRTL() != bLayoutRTL)
 mpFilterBox->EnableMirroring();
@@ -1150,17 +1138,12 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, 
SCROW nRow )
 //! Check first if the entries fit (width)
 
 // minimum width in pixel
-const long nMinLOKWinWidth = static_cast(1.3 * STD_COL_WIDTH * 
pViewData->GetPPTX());
+const long nMinLOKWinWidth = static_cast(1.3 * STD_COL_WIDTH / 
TWIPS_PER_PIXEL);
 if (bLOKActive && nSizeX < nMinLOKWinWidth)
 nSizeX = nMinLOKWinWidth;
 
-if (bLOKActive)
-{
-if (aStrings.size() < SC_FILTERLISTBOX_LINES)
-nHeight = nHeight * (aStrings.size() + 1) / 
SC_FILTERLISTBOX_LINES;
-
-nHeight = nHeight * fListWindowZoom;
-}
+if (bLOKActive && aStrings.size() < SC_FILTERLISTBOX_LINES)
+nHeight = nHeight * (aStrings.size() + 1) / SC_FILTERLISTBOX_LINES;
 
 Size aParentSize = GetParent()->GetOutputSizePixel();
 Size aSize( nSizeX, nHeight );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sc/source

[Dennis Francis (via logerrit)]

 sc/source/ui/view/gridwin.cxx |   23 +++
 1 file changed, 3 insertions(+), 20 deletions(-)

New commits:
commit 84200fc5e1b807629de2d975acaa3ffb81640d1f
Author: Dennis Francis 
AuthorDate: Fri May 1 04:23:09 2020 +0530
Commit: Dennis Francis 
CommitDate: Fri May 1 06:38:13 2020 +0200

Revert "lokit: scale the validation dropdown with client zoom"

The scaling of the float window containg the listbox is unfortunately
far from ideal at certain zoom levels and entry sizes. There are issues
like too much extra spaces around the entries and around scrollbar if
present. These issues need more work to fix. Until then lets revert
this.

Another issue is that we don't really want to zoom adjust any popups in
mobile or android as this does not match the design of jsdialogs.

This reverts the commit :
7787bac16cbe63698f56a9a70d9b1b217f3ea860 (master)
a87e78df635d4a8e745bfffcf33d022d2a498afa (cp62)

Change-Id: Ic31040b491e25b5113dfc8e70d3f73de204862e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93239
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 14d96448f283..97a73632ee22 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1062,7 +1062,6 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, 
SCROW nRow )
 pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY );
 Point aPos = pViewData->GetScrPos( nCol, nRow, eWhich );
 bool bLOKActive = comphelper::LibreOfficeKit::isActive();
-double fListWindowZoom = 1.0;
 
 if (bLOKActive)
 {
@@ -1075,17 +1074,8 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, 
SCROW nRow )
 double fZoomY(pViewData->GetZoomY());
 aPos.setX(aPos.getX() / fZoomX);
 aPos.setY(aPos.getY() / fZoomY);
-// Reverse the zooms from sizes too
-// nSizeX : because we need to rescale with another (trimmed) zoom 
level below.
 nSizeX = nSizeX / fZoomX;
-// nSizeY : because this is used by vcl::FloatingWindow later to 
compute its vertical position
-// since we pass the flag FloatWinPopupFlags::Down setup the popup.
 nSizeY = nSizeY / fZoomY;
-// Limit zoom scale for Listwindow in the dropdown.
-fListWindowZoom = std::max(std::min(fZoomY, 2.0), 0.5);
-// nSizeX is only used in setting the width of dropdown, so rescale 
with
-// the trimmed zoom.
-nSizeX = nSizeX * fListWindowZoom;
 }
 
 if ( bLayoutRTL )
@@ -1103,8 +1093,6 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, 
SCROW nRow )
 }
 mpFilterFloat->SetPopupModeEndHdl(LINK( this, ScGridWindow, 
PopupModeEndHdl));
 mpFilterBox.reset(VclPtr::Create(mpFilterFloat.get(), 
this, nCol, nRow, ScFilterBoxMode::DataSelect));
-if (bLOKActive)
-mpFilterBox->SetZoom(Fraction(fListWindowZoom));
 // Fix for bug fdo#44925
 if (AllSettings::GetLayoutRTL() != bLayoutRTL)
 mpFilterBox->EnableMirroring();
@@ -1139,17 +1127,12 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, 
SCROW nRow )
 //! Check first if the entries fit (width)
 
 // minimum width in pixel
-const long nMinLOKWinWidth = static_cast(1.3 * STD_COL_WIDTH * 
pViewData->GetPPTX());
+const long nMinLOKWinWidth = static_cast(1.3 * STD_COL_WIDTH / 
TWIPS_PER_PIXEL);
 if (bLOKActive && nSizeX < nMinLOKWinWidth)
 nSizeX = nMinLOKWinWidth;
 
-if (bLOKActive)
-{
-if (aStrings.size() < SC_FILTERLISTBOX_LINES)
-nHeight = nHeight * (aStrings.size() + 1) / 
SC_FILTERLISTBOX_LINES;
-
-nHeight = nHeight * fListWindowZoom;
-}
+if (bLOKActive && aStrings.size() < SC_FILTERLISTBOX_LINES)
+nHeight = nHeight * (aStrings.size() + 1) / SC_FILTERLISTBOX_LINES;
 
 Size aParentSize = GetParent()->GetOutputSizePixel();
 Size aSize( nSizeX, nHeight );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Jim Raykowski (via logerrit)]

 sw/source/uibase/utlui/content.cxx |   29 +
 1 file changed, 29 insertions(+)

New commits:
commit a7e0375e40dd98b3bdc544967b5652a4dc0965fc
Author: Jim Raykowski 
AuthorDate: Fri Mar 27 17:12:20 2020 -0800
Commit: Jim Raykowski 
CommitDate: Fri May 1 07:14:11 2020 +0200

tdf#63967 Navigator section tooltip word and character count

Change-Id: I13ef9d71b080d5cac15e402e9198cf3c182eb78e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91268
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index db829431569f..207a0d63f610 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -86,6 +86,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 #define CTYPE_CNT   0
 #define CTYPE_CTT   1
 
@@ -3289,6 +3292,32 @@ IMPL_LINK(SwContentTree, QueryTooltipHdl, const 
weld::TreeIter&, rEntry, OUStrin
 
assert(dynamic_cast(static_cast(pUserData)));
 sEntry = static_cast(pUserData)->GetLink();
 break;
+case ContentTypeId::REGION:
+{
+
assert(dynamic_cast(static_cast(pUserData)));
+sEntry = static_cast(pUserData)->GetName();
+const SwSectionFormats& rFormats = 
GetWrtShell()->GetDoc()->GetSections();
+for (SwSectionFormats::size_type n = rFormats.size(); n;)
+{
+const SwNodeIndex* pIdx = nullptr;
+const SwSectionFormat* pFormat = rFormats[--n];
+const SwSection* pSect;
+if (nullptr != (pSect = pFormat->GetSection()) &&
+pSect->GetSectionName() == sEntry &&
+nullptr != (pIdx = 
pFormat->GetContent().GetContentIdx()) &&
+pIdx->GetNode().GetNodes().IsDocNodes())
+{
+SwDocStat aDocStat;
+SwPaM aPaM(*pIdx, *pIdx->GetNode().EndOfSectionNode());
+SwDoc::CountWords(aPaM, aDocStat);
+sEntry = SwResId(STR_REGION_DEFNAME) + ": " + sEntry + 
"\n" +
+ SwResId(FLD_STAT_WORD) + ": " + 
OUString::number(aDocStat.nWord) + "\n" +
+ SwResId(FLD_STAT_CHAR) + ": " + 
OUString::number(aDocStat.nChar);
+break;
+}
+}
+}
+break;
 default: break;
 }
 if(static_cast(pUserData)->IsInvisible())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

[Jan Holesovsky (via logerrit)]

 wsd/LOOLWSD.cpp |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 4669934a263b40512988626b8f251264cb6f6d69
Author: Jan Holesovsky 
AuthorDate: Thu Apr 30 10:34:23 2020 +0200
Commit: Jan Holesovsky 
CommitDate: Thu Apr 30 15:00:58 2020 +0200

Allow overriding the lo-template-path with a command line switch.

This was completely removed in commit
db176ee45baae93ab4411c23d32ae1d0f608352b from good reasons - it is
really bad to have that in the config file, the Online and Core versions
are tightly coupled.

Having said that, the possibility to override still has its use cases,
so let's introduce a command line switch for those who need it & know
what they are doing.

Change-Id: I76875f7c7a174fbc16985299eb968a41814b7962
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93196
Reviewed-by: Andras Timar 
Tested-by: Jan Holesovsky 

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 6ef3f2c84..f4812ff30 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -715,7 +715,7 @@ bool LOOLWSD::DummyLOK = false;
 std::string LOOLWSD::FuzzFileName;
 #endif
 std::string LOOLWSD::SysTemplate;
-std::string LOOLWSD::LoTemplate;
+std::string LOOLWSD::LoTemplate = LO_PATH;
 std::string LOOLWSD::ChildRoot;
 std::string LOOLWSD::ServerName;
 std::string LOOLWSD::FileServerRoot;
@@ -1145,7 +1145,6 @@ void LOOLWSD::initialize(Application& self)
 #endif
 
 SysTemplate = getPathFromConfig("sys_template_path");
-LoTemplate = LO_PATH;
 ChildRoot = getPathFromConfig("child_root_path");
 ServerName = config().getString("server_name");
 
@@ -1441,6 +1440,11 @@ void LOOLWSD::defineOptions(OptionSet& optionSet)
 .repeatable(false)
 .argument("path"));
 
+optionSet.addOption(Option("lo-template-path", "", "Override the LOK core 
installation directory path.")
+.required(false)
+.repeatable(false)
+.argument("path"));
+
 #if ENABLE_DEBUG
 optionSet.addOption(Option("unitlib", "", "Unit testing library path.")
 .required(false)
@@ -1499,6 +1503,8 @@ void LOOLWSD::handleOption(const std::string& optionName,
 ConfigFile = value;
 else if (optionName == "config-dir")
 ConfigDir = value;
+else if (optionName == "lo-template-path")
+LoTemplate = value;
 #if ENABLE_DEBUG
 else if (optionName == "unitlib")
 UnitTestLibrary = value;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/skia

[Luboš Luňák (via logerrit)]

 vcl/skia/gdiimpl.cxx |   53 +--
 1 file changed, 35 insertions(+), 18 deletions(-)

New commits:
commit fa4fe362cd15f89996cf877f31efbac7363f64af
Author: Luboš Luňák 
AuthorDate: Wed Apr 29 16:12:11 2020 +0200
Commit: Luboš Luňák 
CommitDate: Thu Apr 30 15:56:16 2020 +0200

implement basegfx::B2DLineJoin::NONE for Skia drawPolyLine()

Change-Id: I186622aec3e944b89536bdcd44ff0be6b1d9cd8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93213
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 2ffd68dee132..efecb95b7920 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -778,12 +778,6 @@ bool SkiaSalGraphicsImpl::drawPolyLine(const 
basegfx::B2DHomMatrix& rObjectToDev
 const basegfx::B2DVector aLineWidth(rLineWidth.equalZero() ? 
basegfx::B2DVector(1.0, 1.0)
: 
rObjectToDevice * rLineWidth);
 
-// Skia does not support B2DLineJoin::NONE; return false to use
-// the fallback (own geometry preparation),
-// linejoin-mode and thus the above only applies to "fat" lines.
-if ((basegfx::B2DLineJoin::NONE == eLineJoin) && (aLineWidth.getX() > 1.3))
-return false;
-
 // MM01 need to do line dashing as fallback stuff here now
 const double fDotDashLength(
 nullptr != pStroke ? std::accumulate(pStroke->begin(), pStroke->end(), 
0.0) : 0.0);
@@ -857,21 +851,44 @@ bool SkiaSalGraphicsImpl::drawPolyLine(const 
basegfx::B2DHomMatrix& rObjectToDev
 aPaint.setStrokeWidth(aLineWidth.getX());
 aPaint.setAntiAlias(mParent.getAntiAliasB2DDraw());
 
-SkPath aPath;
-
-// MM01 checked/verified for Skia (on Win)
-for (sal_uInt32 a(0); a < aPolyPolygonLine.count(); a++)
+if (eLineJoin != basegfx::B2DLineJoin::NONE)
+{
+SkPath aPath;
+aPath.setFillType(SkPathFillType::kEvenOdd);
+for (sal_uInt32 a(0); a < aPolyPolygonLine.count(); a++)
+addPolygonToPath(aPolyPolygonLine.getB2DPolygon(a), aPath);
+// Apply the same adjustment as toSkX()/toSkY() do. Do it here even in 
the non-GPU
+// case as it seems to produce better results.
+aPath.offset(0.5, 0.5, nullptr);
+getDrawCanvas()->drawPath(aPath, aPaint);
+addXorRegion(aPath.getBounds());
+}
+else // Skia does not support basegfx::B2DLineJoin::NONE, draw each line 
separately
 {
-const basegfx::B2DPolygon aPolyLine(aPolyPolygonLine.getB2DPolygon(a));
-addPolygonToPath(aPolyLine, aPath);
+for (sal_uInt32 i = 0; i < aPolyPolygonLine.count(); ++i)
+{
+const basegfx::B2DPolygon& rPolygon = 
aPolyPolygonLine.getB2DPolygon(i);
+sal_uInt32 nPoints = rPolygon.count();
+bool bClosed = rPolygon.isClosed();
+for (sal_uInt32 j = 0; j < (bClosed ? nPoints : nPoints - 1); ++j)
+{
+sal_uInt32 index1 = (j + 0) % nPoints;
+sal_uInt32 index2 = (j + 1) % nPoints;
+SkPath aPath;
+aPath.moveTo(rPolygon.getB2DPoint(index1).getX(),
+ rPolygon.getB2DPoint(index1).getY());
+aPath.lineTo(rPolygon.getB2DPoint(index2).getX(),
+ rPolygon.getB2DPoint(index2).getY());
+
+// Apply the same adjustment as toSkX()/toSkY() do. Do it here 
even in the non-GPU
+// case as it seems to produce better results.
+aPath.offset(0.5, 0.5, nullptr);
+getDrawCanvas()->drawPath(aPath, aPaint);
+addXorRegion(aPath.getBounds());
+}
+}
 }
 
-aPath.setFillType(SkPathFillType::kEvenOdd);
-// Apply the same adjustment as toSkX()/toSkY() do. Do it here even in the 
non-GPU
-// case as it seems to produce better results.
-aPath.offset(0.5, 0.5, nullptr);
-getDrawCanvas()->drawPath(aPath, aPaint);
-addXorRegion(aPath.getBounds());
 postDraw();
 
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: distro-configs/LibreOfficeiOS.conf

[Caolán McNamara (via logerrit)]

 distro-configs/LibreOfficeiOS.conf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d46cf84466a0ec47b44e7723d0f8c3e62cd08d42
Author: Caolán McNamara 
AuthorDate: Thu Apr 30 13:13:21 2020 +0100
Commit: Tor Lillqvist 
CommitDate: Thu Apr 30 16:10:19 2020 +0200

tango theme was removed

Change-Id: I351c92a6a2519c2c8b7b1c6868194c1bee81aa12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93215
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/distro-configs/LibreOfficeiOS.conf 
b/distro-configs/LibreOfficeiOS.conf
index 9a15ad6b083f..12f48f3073b7 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -7,7 +7,7 @@
 --without-java
 --without-junit
 
---with-theme=colibre tango
+--with-theme=colibre
 
 --with-build-platform-configure-options=--with-system-jpeg=no
 --with-macosx-version-min-required=10.11
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[LibreOfficiant (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 57f1c59be6b1027757266fe5cd02f9f8e0bae275
Author: LibreOfficiant 
AuthorDate: Thu Apr 30 18:07:54 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Apr 30 18:07:54 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 21fd17892ae4827f66d16a67a9c30c1854c5079d
  - tdf#131416 Basic syntax diagrams

- Add UNO objects in Dim, ReDim statements
- Include std fragments in Dim, Redim, Type statements
- "@" omission in Dim, ReDim Statements
- Replace bugged example in Let statement

Change-Id: I500e1dcaa605978981e3b96cb277664fe5916282
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/93131
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 5999ae5b939b..21fd17892ae4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5999ae5b939b73fbb194547a7bd134859a3c8a43
+Subproject commit 21fd17892ae4827f66d16a67a9c30c1854c5079d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd.xml.in test/UnitWOPITemplate.cpp test/WopiTestServer.hpp wsd/Storage.cpp wsd/Storage.hpp

[Michael Meeks (via logerrit)]

 loolwsd.xml.in|3 ++-
 test/UnitWOPITemplate.cpp |1 -
 test/WopiTestServer.hpp   |   10 --
 wsd/Storage.cpp   |   33 ++---
 wsd/Storage.hpp   |3 +++
 5 files changed, 39 insertions(+), 11 deletions(-)

New commits:
commit f9f392ab5cdcde96e6eace26c90a7482952735f1
Author: Michael Meeks 
AuthorDate: Wed Apr 29 20:24:33 2020 +0100
Commit: Michael Meeks 
CommitDate: Thu Apr 30 14:53:25 2020 +0200

Storage: add as_scheme to allow auto-determination of whether to use SSL.

This is the new default - do as we're told by the client.
The old setting is left to allow users to force SSL if they are
concerned that they may receive unhelpful URLs.

Change-Id: Idea83aacea6826a8f37264e34d49c7550efe6d27
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93179
Tested-by: Michael Meeks 
Reviewed-by: Michael Meeks 

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 02518139b..4b40aa46f 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -140,7 +140,8 @@
 localhost
 
 
-
+   true
+
 
 
 
diff --git a/test/UnitWOPITemplate.cpp b/test/UnitWOPITemplate.cpp
index 2145bfc2b..2ebb1a28c 100644
--- a/test/UnitWOPITemplate.cpp
+++ b/test/UnitWOPITemplate.cpp
@@ -15,7 +15,6 @@
 #include 
 #include 
 #include 
-#include 
 
 class UnitWOPITemplate : public WopiTestServer
 {
diff --git a/test/WopiTestServer.hpp b/test/WopiTestServer.hpp
index f8a3375ed..40bacc45d 100644
--- a/test/WopiTestServer.hpp
+++ b/test/WopiTestServer.hpp
@@ -6,7 +6,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-
 #include "config.h"
 
 #include "helpers.hpp"
@@ -14,7 +13,6 @@
 #include "Unit.hpp"
 #include "UnitHTTP.hpp"
 
-
 #include 
 #include 
 #include 
@@ -22,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class WopiTestServer : public UnitWSD
 {
@@ -98,6 +97,13 @@ public:
 {
 }
 
+void configure(Poco::Util::LayeredConfiguration& config) override
+{
+UnitWSD::configure(config);
+// we're still internally confused as to https vs. http in places.
+config.setBool("storage.ssl.as_scheme", false);
+}
+
 protected:
 /// Here we act as a WOPI server, so that we have a server that responds to
 /// the wopi requests without additional expensive setup.
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index ad4249f4c..f010894c4 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -55,7 +55,8 @@ using std::size_t;
 
 bool StorageBase::FilesystemEnabled;
 bool StorageBase::WopiEnabled;
-bool StorageBase::SSLEnabled;
+bool StorageBase::SSLAsScheme = true;
+bool StorageBase::SSLEnabled = false;
 Util::RegexListMatcher StorageBase::WopiHosts;
 
 #if !MOBILEAPP
@@ -126,6 +127,10 @@ void StorageBase::initialize()
 // Init client
 Poco::Net::Context::Params sslClientParams;
 
+// false default for upgrade to preserve legacy configuration
+// in-config-file defaults are true.
+SSLAsScheme = LOOLWSD::getConfigValue("storage.ssl.as_scheme", 
false);
+
 // Fallback to ssl.enable if not set - for back compatibility & simplicity.
 SSLEnabled = LOOLWSD::getConfigValue(
 "storage.ssl.enable", LOOLWSD::getConfigValue("ssl.enable", 
true));
@@ -398,15 +403,29 @@ LocalStorage::saveLocalFileToStorage(const Authorization& 
/*auth*/, const std::s
 #if !MOBILEAPP
 
 Poco::Net::HTTPClientSession* StorageBase::getHTTPClientSession(const 
Poco::URI& uri)
- {
+{
+bool useSSL = false;
+if (SSLAsScheme)
+{
+// the WOPI URI itself should control whether we use SSL or not
+// for whether we verify vs. certificates, cf. above
+useSSL = uri.getScheme() != "http";
+}
+else
+{
+// We decoupled the Wopi communication from client communication 
because
+// the Wopi communication must have an independent policy.
+// So, we will use here only Storage settings.
+useSSL = SSLEnabled || LOOLWSD::isSSLTermination();
+}
 // We decoupled the Wopi communication from client communication because
 // the Wopi communication must have an independent policy.
 // So, we will use here only Storage settings.
-return (SSLEnabled || LOOLWSD::isSSLTermination())
- ? new Poco::Net::HTTPSClientSession(uri.getHost(), uri.getPort(),
- 
Poco::Net::SSLManager::instance().defaultClientContext())
- : new Poco::Net::HTTPClientSession(uri.getHost(), uri.getPort());
- }
+return useSSL
+? new Poco::Net::HTTPSClientSession(uri.getHost(), uri.getPort(),
+
Poco::Net::SSLManager::instance().defaultClientContext())
+: new Poco::Net::HTTPClientSession(uri.getHost(), uri.getPort());
+}
 
 namespace
 {
diff --git 

[Libreoffice-commits] core.git: extras/CustomTarget_tplpresnt.mk extras/source

[andreas kainz (via logerrit)]

 dev/null  |binary
 extras/CustomTarget_tplpresnt.mk  |3 
 extras/source/templates/presnt/Portfolio/META-INF/manifest.xml|3 
 extras/source/templates/presnt/Portfolio/Thumbnails/thumbnail.png |binary
 extras/source/templates/presnt/Portfolio/content.xml  |   34 -
 extras/source/templates/presnt/Portfolio/styles.xml   |  242 
++
 6 files changed, 172 insertions(+), 110 deletions(-)

New commits:
commit 1498fc92527785eb47eb1bb30d957150dc513dfb
Author: andreas kainz 
AuthorDate: Thu Apr 30 16:24:29 2020 +0200
Commit: andreas_kainz 
CommitDate: Thu Apr 30 18:06:33 2020 +0200

tdf#132138 Update Portfolio impress template

Change-Id: I3bdb7954fe93019da62512c6832b587cc39959e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93219
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk
index 9b64daecef27..ea9a49be55d8 100644
--- a/extras/CustomTarget_tplpresnt.mk
+++ b/extras/CustomTarget_tplpresnt.mk
@@ -148,9 +148,6 @@ extras_PRESENTATIONS_XMLFILES := \
Portfolio/content.xml \
Portfolio/META-INF/manifest.xml \
Portfolio/meta.xml \
-   Portfolio/Pictures/12010CEB09B00D8BDC51D4D18334.png \
-   Portfolio/Pictures/12010CEB09B0698EB1ACA470D143.png \
-   Portfolio/Pictures/12010CEB09B0C3D535B3CBDAE49B.png \
Portfolio/styles.xml \
Portfolio/Thumbnails/thumbnail.png \
Progress/content.xml \
diff --git a/extras/source/templates/presnt/Portfolio/META-INF/manifest.xml 
b/extras/source/templates/presnt/Portfolio/META-INF/manifest.xml
index 28d0fd6590bd..c3e1aec9147d 100644
--- a/extras/source/templates/presnt/Portfolio/META-INF/manifest.xml
+++ b/extras/source/templates/presnt/Portfolio/META-INF/manifest.xml
@@ -4,8 +4,5 @@
   
   
   
-  
-  
-  
   
 
diff --git 
a/extras/source/templates/presnt/Portfolio/Pictures/12010CEB09B00D8BDC51D4D18334.png
 
b/extras/source/templates/presnt/Portfolio/Pictures/12010CEB09B00D8BDC51D4D18334.png
deleted file mode 100644
index c69e8fa58b79..
Binary files 
a/extras/source/templates/presnt/Portfolio/Pictures/12010CEB09B00D8BDC51D4D18334.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/Portfolio/Pictures/12010CEB09B0698EB1ACA470D143.png
 
b/extras/source/templates/presnt/Portfolio/Pictures/12010CEB09B0698EB1ACA470D143.png
deleted file mode 100644
index 02cc10b69f7d..
Binary files 
a/extras/source/templates/presnt/Portfolio/Pictures/12010CEB09B0698EB1ACA470D143.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/Portfolio/Pictures/12010CEB09B0C3D535B3CBDAE49B.png
 
b/extras/source/templates/presnt/Portfolio/Pictures/12010CEB09B0C3D535B3CBDAE49B.png
deleted file mode 100644
index 062765b72b0f..
Binary files 
a/extras/source/templates/presnt/Portfolio/Pictures/12010CEB09B0C3D535B3CBDAE49B.png
 and /dev/null differ
diff --git a/extras/source/templates/presnt/Portfolio/Thumbnails/thumbnail.png 
b/extras/source/templates/presnt/Portfolio/Thumbnails/thumbnail.png
index 5da9293a1379..c993516e6f2c 100644
Binary files 
a/extras/source/templates/presnt/Portfolio/Thumbnails/thumbnail.png and 
b/extras/source/templates/presnt/Portfolio/Thumbnails/thumbnail.png differ
diff --git a/extras/source/templates/presnt/Portfolio/content.xml 
b/extras/source/templates/presnt/Portfolio/content.xml
index eb39e190707c..14ffa409fc72 100644
--- a/extras/source/templates/presnt/Portfolio/content.xml
+++ b/extras/source/templates/presnt/Portfolio/content.xml
@@ -1,16 +1,19 @@
 
-http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" x
 mlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 

[Libreoffice-commits] help.git: source/media source/text

[LibreOfficiant (via logerrit)]

 source/media/helpimg/sbasic/Dim_statement.svg   |   32 --
 source/media/helpimg/sbasic/ReDim_statement.svg |   54 
 source/media/helpimg/sbasic/Type_statement.svg  |   34 +++
 source/text/sbasic/shared/03090413.xhp  |2 
 source/text/sbasic/shared/03103700.xhp  |   26 +++
 5 files changed, 82 insertions(+), 66 deletions(-)

New commits:
commit 21fd17892ae4827f66d16a67a9c30c1854c5079d
Author: LibreOfficiant 
AuthorDate: Wed Apr 29 12:13:50 2020 +0200
Commit: Olivier Hallot 
CommitDate: Thu Apr 30 18:07:54 2020 +0200

tdf#131416 Basic syntax diagrams

- Add UNO objects in Dim, ReDim statements
- Include std fragments in Dim, Redim, Type statements
- "@" omission in Dim, ReDim Statements
- Replace bugged example in Let statement

Change-Id: I500e1dcaa605978981e3b96cb277664fe5916282
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/93131
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/media/helpimg/sbasic/Dim_statement.svg 
b/source/media/helpimg/sbasic/Dim_statement.svg
index f2d06e0b2..31ac71596 100644
--- a/source/media/helpimg/sbasic/Dim_statement.svg
+++ b/source/media/helpimg/sbasic/Dim_statement.svg
@@ -1,4 +1,4 @@
-http://www.w3.org/2000/svg;>
+http://www.w3.org/2000/svg;>
 
 /* Private
 Public
 Static
-
-
+
+
 variable
-
-
+
+
 
 
 array
-
+
 As
-type-name
-
-type-car
-
-[Libreoffice-commits] core.git: 2 commits - extras/source


2020-04-30

Thread
andreas kainz (via logerrit)

 extras/source/templates/presnt/Pencil/Thumbnails/thumbnail.png |binary
 extras/source/templates/presnt/Pencil/content.xml  |   25 
 extras/source/templates/presnt/Pencil/styles.xml   |  327 +
 extras/source/templates/presnt/Piano/Thumbnails/thumbnail.png  |binary
 extras/source/templates/presnt/Piano/content.xml   |   28 
 extras/source/templates/presnt/Piano/styles.xml|  362 
+-
 6 files changed, 436 insertions(+), 306 deletions(-)

New commits:
commit 155648d602e84e7626b55c71e9b76140303e7432
Author: andreas kainz 
AuthorDate: Thu Apr 30 16:22:11 2020 +0200
Commit: andreas_kainz 
CommitDate: Thu Apr 30 18:06:18 2020 +0200

tdf#132138 Update piano impress template

Change-Id: I77795dbc87d8835d5609dd12ed33ad029dd309a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93218
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/extras/source/templates/presnt/Piano/Thumbnails/thumbnail.png 
b/extras/source/templates/presnt/Piano/Thumbnails/thumbnail.png
index 4bb2fa0b6204..4d35bef892d7 100644
Binary files a/extras/source/templates/presnt/Piano/Thumbnails/thumbnail.png 
and b/extras/source/templates/presnt/Piano/Thumbnails/thumbnail.png differ
diff --git a/extras/source/templates/presnt/Piano/content.xml 
b/extras/source/templates/presnt/Piano/content.xml
index f7384641ab9d..5b84e2793643 100644
--- a/extras/source/templates/presnt/Piano/content.xml
+++ b/extras/source/templates/presnt/Piano/content.xml
@@ -1,5 +1,5 @@
 
-http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" x
 mlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:loext="urn:org:documentfoundation:
 names:experimental:office:xmlns:loext:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:css3t="http://www.w3.org/TR/css3-text/; office:version="1.2">
+http://openoffice.org/2004/office; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; x
 mlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 




ESC meeting minutes: 2020-04-30


2020-04-30

Thread
Miklos Vajna

* Present:
+ Cloph, Ilmari, Caolan, Stephan, Michael W, Olivier, Miklos, Eike, Xisco, 
Michael S, Heiko, Gabriel, Kendy, Michael M

* Completed Action Items:
+ None

* Pending Action Items:
+ None

* Release Engineering update (Cloph)
+ 7.0 status: alpha next week, feature freeze is last week of May
+ 6.4 status: 6.4.4 rc1 is tagged yesterday
+ 6.3 status: last release is out
+ Remotes
+ Android viewer
  + Android tinderbox has problems, need HW help -> still broken
  + maybe it’ll be moved to TDF infra
+ Online

* Documentation (Olivier)
+ New Help
  + updated icon replacement table (ohallot)
  + Added module brand color to module’s help page (ohallot)
+ Helpcontent2
  + Updates and fixes (ohallot, LibreOfficiant, fitoshido, A. Gelmini)
+ Guides
  + work in progress.

+ Google Season of Doc
  +  How about API documentation?
 + opportunity for external tech writer to address $subject
 + need to format as project
 + scenario: basic or python macro author, too much details, no overview
   + somebody who comes from the VBA world
 + then the project would not be about the specific UNOIDL interfaces 
(Stephan)
   + rather how to use it from basic/python, it’s a question how to 
scope such a project
   + it’s not clear if somebody external can author such documentation
 + typical scenario: inspect UNO objects, then go to interface 
documentation (Olivier)
   + want to help from-VBA migration
 + DevGuide addresses part of that (Stephan)
   + if you want some higher level documentation, not individual 
interfaces
   + interface vs object is not that separate for basic/python 
(compared to Java/C++)
 + autodoc was a bit easier (Olivier)
   + think doxygen makes this harder now
 + agrees with Stephan (Michael S)
   + would it be possible to put comments from IDL into RDB and access 
them via reflection?
   + or have some mechanism, so you can go from an interface name and 
open online documentation (Stephan)
   + do you have any other idea in mind? (Xisco)
 + have to think about it (Olivier)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
245(245) (topicUI) bugs open, 269(269) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month   3 months   12 months
 added  18(9) 30(10) 88(11)172(10)
 commented 136(61)   425(70)   1069(58)   3329(119)
   removed   1(1)  2(0)  36(1)  44(1)
  resolved   8(0) 48(4) 121(3) 314(6)
+ top 10 contributors:
  Heiko Tietze made 276 changes in 1 month, and 1831 changes in 1 year
  Kainz, Andreas made 141 changes in 1 month, and 432 changes in 1 year
  Dieter Praas made 78 changes in 1 month, and 526 changes in 1 year
  Ilmari Lauhakangas made 47 changes in 1 month, and 103 changes in 1 
year
  Foote, V Stuart made 46 changes in 1 month, and 551 changes in 1 year
  Telesto made 35 changes in 1 month, and 64 changes in 1 year
  Timur made 27 changes in 1 month, and 202 changes in 1 year
  Rizal Muttaqin made 17 changes in 1 month, and 63 changes in 1 year
  Thomas Lendo made 16 changes in 1 month, and 256 changes in 1 year
  NISZ LibreOffice Team made 15 changes in 1 month, and 34 changes in 1 
year

+ New tickets with needsUXEval Apr/23-30

  ->  * UX: Ignore all option in spell check is an unexpected full session
setting
+ https://bugs.documentfoundation.org/show_bug.cgi?id=132505
+ dev input is much appreciated
  * When in text edit mode, ignore the hit area of other text boxes that
overlap with the box being edited
+ https://bugs.documentfoundation.org/show_bug.cgi?id=126874
  * Unable to control table formatting in Writer
+ https://bugs.documentfoundation.org/show_bug.cgi?id=132313
  * IMPRESS: drag and drop of an image into a text field results in display
of file name instead of image
+ https://bugs.documentfoundation.org/show_bug.cgi?id=126860
  * Colibre: Too large size for Impress' Display Views icons
+ https://bugs.documentfoundation.org/show_bug.cgi?id=132399
  * When protecting image content, you cannot add a caption
+ https://bugs.documentfoundation.org/show_bug.cgi?id=132315
  * Track changes submenu is missing
+ https://bugs.documentfoundation.org/show_bug.cgi?id=132168
  * Adopt new application icons for LibreOffice 7.0
+ https://bugs.documentfoundation.org/show_bug.cgi?id=132398
  * Font feature dialog: Reimplement some checkboxes as tri-state
+ https://bugs.documentfoundation.org/show_bug.cgi?id=127423
  * On new installation, why not ask user for his name as it would be 



[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 118 commits - bin/distro-install-file-lists bridges/source chart2/qa chart2/source comphelper/source compilerplugins/clang configure


2020-04-30

Thread
Tomaž Vajngerl (via logerrit)

Rebased ref, commits from common ancestor:
commit 82ec858f9d4997568142e5455d96b4493d7f1a14
Author: Tomaž Vajngerl 
AuthorDate: Thu Apr 30 07:54:46 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Apr 30 08:51:55 2020 +0200

test import and export of multi-page PDF with PDFium filter

The test checks that the exported PDFs contain embedded PDF for
different pages.

Change-Id: I4e5cd108d8597851d86aa774efbde0d4f2b9d2ac

diff --git a/vcl/qa/cppunit/pdfexport/data/SimpleMultiPagePDF.pdf 
b/vcl/qa/cppunit/pdfexport/data/SimpleMultiPagePDF.pdf
new file mode 100644
index ..af665fcba8a0
Binary files /dev/null and 
b/vcl/qa/cppunit/pdfexport/data/SimpleMultiPagePDF.pdf differ
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 313dbdd278b4..c228cc7945a6 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -146,6 +147,8 @@ public:
 void testLargePage();
 void testVersion15();
 void testDefaultVersion();
+void testMultiPagePDF();
+
 
 CPPUNIT_TEST_SUITE(PdfExportTest);
 CPPUNIT_TEST(testTdf106059);
@@ -189,6 +192,7 @@ public:
 CPPUNIT_TEST(testLargePage);
 CPPUNIT_TEST(testVersion15);
 CPPUNIT_TEST(testDefaultVersion);
+CPPUNIT_TEST(testMultiPagePDF);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -2154,6 +2158,136 @@ void PdfExportTest::testVersion15()
 CPPUNIT_ASSERT_EQUAL(15, nFileVersion);
 }
 
+// Check round-trip of importing and exporting the PDF with PDFium filter,
+// which imports the PDF document as multiple PDFs as graphic object.
+// Each page in the document has one PDF graphic object which content is
+// the correcponding page in the PDF. When such a document is exported,
+// the PDF graphic gets embedded into the exported PDF document (as a
+// Form XObject).
+void PdfExportTest::testMultiPagePDF()
+{
+// We need to enable PDFium import (and make sure to disable after the 
test)
+bool bResetEnvVar = false;
+if (getenv("LO_IMPORT_USE_PDFIUM") == nullptr)
+{
+bResetEnvVar = true;
+setenv("LO_IMPORT_USE_PDFIUM", "1", false);
+}
+comphelper::ScopeGuard aPDFiumEnvVarGuard([&]() {
+if (bResetEnvVar)
+unsetenv("LO_IMPORT_USE_PDFIUM");
+});
+
+// Load the PDF and save as PDF
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"SimpleMultiPagePDF.pdf";
+mxComponent = loadFromDesktop(aURL);
+CPPUNIT_ASSERT(mxComponent.is());
+
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
+xStorable->storeToURL(maTempFile.GetURL(), 
aMediaDescriptor.getAsConstPropertyValueList());
+
+// Parse the export result.
+vcl::filter::PDFDocument aDocument;
+SvFileStream aStream(maTempFile.GetURL(), StreamMode::READ);
+CPPUNIT_ASSERT(aDocument.Read(aStream));
+
+std::vector aPages = aDocument.GetPages();
+CPPUNIT_ASSERT_EQUAL(static_cast(3), aPages.size());
+
+vcl::filter::PDFObjectElement* pResources = 
aPages[0]->LookupObject("Resources");
+CPPUNIT_ASSERT(pResources);
+
+auto pXObjects = 
dynamic_cast(pResources->Lookup("XObject"));
+CPPUNIT_ASSERT(pXObjects);
+
+CPPUNIT_ASSERT_EQUAL(static_cast(3), 
pXObjects->GetItems().size()); // 3 PDFs as Form XObjects
+
+std::vector rIDs;
+for (auto const & rPair : pXObjects->GetItems()) {
+rIDs.push_back(rPair.first);
+}
+
+// Let's check the embedded PDF pages - just make sure the size differs,
+// which should indicate we don't have 3 times the same page.
+
+{   // embedded PDF page 1
+vcl::filter::PDFObjectElement* pXObject1 = 
pXObjects->LookupObject(rIDs[0]);
+CPPUNIT_ASSERT(pXObject1);
+CPPUNIT_ASSERT_EQUAL(OString("Im19"), rIDs[0]);
+
+auto pSubtype1 = 
dynamic_cast(pXObject1->Lookup("Subtype"));
+CPPUNIT_ASSERT(pSubtype1);
+CPPUNIT_ASSERT_EQUAL(OString("Form"), pSubtype1->GetValue());
+
+auto pXObjectResources = 
dynamic_cast(pXObject1->Lookup("Resources"));
+CPPUNIT_ASSERT(pXObjectResources);
+auto pXObjectForms = 
dynamic_cast(pXObjectResources->LookupElement("XObject"));
+CPPUNIT_ASSERT(pXObjectForms);
+vcl::filter::PDFObjectElement* pForm = 
pXObjectForms->LookupObject(pXObjectForms->GetItems().begin()->first);
+CPPUNIT_ASSERT(pForm);
+
+vcl::filter::PDFStreamElement* pStream = pForm->GetStream();
+CPPUNIT_ASSERT(pStream);
+SvMemoryStream& rObjectStream = pStream->GetMemory();
+rObjectStream.Seek(STREAM_SEEK_TO_BEGIN);
+
+// Just check that the size of the page stream is what is expected.
+CPPUNIT_ASSERT_EQUAL(sal_uInt64(230), rObjectStream.remainingSize());
+}
+
+{   // embedded 



[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 2 commits - drawinglayer/source solenv/clang-format vcl/qa


2020-04-30

Thread
Tomaž Vajngerl (via logerrit)

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 1557 
 solenv/clang-format/blacklist   |1 
 vcl/qa/cppunit/pdfexport/data/SimpleMultiPagePDF.pdf|binary
 vcl/qa/cppunit/pdfexport/pdfexport.cxx  |  134 +
 4 files changed, 945 insertions(+), 747 deletions(-)

New commits:
commit f6fb4a0b2127b12ebb904659259de216c6a9b2d2
Author: Tomaž Vajngerl 
AuthorDate: Thu Apr 30 07:54:46 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Apr 30 08:50:29 2020 +0200

test import and export of multi-page PDF with PDFium filter

The test checks that the exported PDFs contain embedded PDF for
different pages.

Change-Id: I4e5cd108d8597851d86aa774efbde0d4f2b9d2ac

diff --git a/vcl/qa/cppunit/pdfexport/data/SimpleMultiPagePDF.pdf 
b/vcl/qa/cppunit/pdfexport/data/SimpleMultiPagePDF.pdf
new file mode 100644
index ..af665fcba8a0
Binary files /dev/null and 
b/vcl/qa/cppunit/pdfexport/data/SimpleMultiPagePDF.pdf differ
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 313dbdd278b4..c228cc7945a6 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -146,6 +147,8 @@ public:
 void testLargePage();
 void testVersion15();
 void testDefaultVersion();
+void testMultiPagePDF();
+
 
 CPPUNIT_TEST_SUITE(PdfExportTest);
 CPPUNIT_TEST(testTdf106059);
@@ -189,6 +192,7 @@ public:
 CPPUNIT_TEST(testLargePage);
 CPPUNIT_TEST(testVersion15);
 CPPUNIT_TEST(testDefaultVersion);
+CPPUNIT_TEST(testMultiPagePDF);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -2154,6 +2158,136 @@ void PdfExportTest::testVersion15()
 CPPUNIT_ASSERT_EQUAL(15, nFileVersion);
 }
 
+// Check round-trip of importing and exporting the PDF with PDFium filter,
+// which imports the PDF document as multiple PDFs as graphic object.
+// Each page in the document has one PDF graphic object which content is
+// the correcponding page in the PDF. When such a document is exported,
+// the PDF graphic gets embedded into the exported PDF document (as a
+// Form XObject).
+void PdfExportTest::testMultiPagePDF()
+{
+// We need to enable PDFium import (and make sure to disable after the 
test)
+bool bResetEnvVar = false;
+if (getenv("LO_IMPORT_USE_PDFIUM") == nullptr)
+{
+bResetEnvVar = true;
+setenv("LO_IMPORT_USE_PDFIUM", "1", false);
+}
+comphelper::ScopeGuard aPDFiumEnvVarGuard([&]() {
+if (bResetEnvVar)
+unsetenv("LO_IMPORT_USE_PDFIUM");
+});
+
+// Load the PDF and save as PDF
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"SimpleMultiPagePDF.pdf";
+mxComponent = loadFromDesktop(aURL);
+CPPUNIT_ASSERT(mxComponent.is());
+
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
+xStorable->storeToURL(maTempFile.GetURL(), 
aMediaDescriptor.getAsConstPropertyValueList());
+
+// Parse the export result.
+vcl::filter::PDFDocument aDocument;
+SvFileStream aStream(maTempFile.GetURL(), StreamMode::READ);
+CPPUNIT_ASSERT(aDocument.Read(aStream));
+
+std::vector aPages = aDocument.GetPages();
+CPPUNIT_ASSERT_EQUAL(static_cast(3), aPages.size());
+
+vcl::filter::PDFObjectElement* pResources = 
aPages[0]->LookupObject("Resources");
+CPPUNIT_ASSERT(pResources);
+
+auto pXObjects = 
dynamic_cast(pResources->Lookup("XObject"));
+CPPUNIT_ASSERT(pXObjects);
+
+CPPUNIT_ASSERT_EQUAL(static_cast(3), 
pXObjects->GetItems().size()); // 3 PDFs as Form XObjects
+
+std::vector rIDs;
+for (auto const & rPair : pXObjects->GetItems()) {
+rIDs.push_back(rPair.first);
+}
+
+// Let's check the embedded PDF pages - just make sure the size differs,
+// which should indicate we don't have 3 times the same page.
+
+{   // embedded PDF page 1
+vcl::filter::PDFObjectElement* pXObject1 = 
pXObjects->LookupObject(rIDs[0]);
+CPPUNIT_ASSERT(pXObject1);
+CPPUNIT_ASSERT_EQUAL(OString("Im19"), rIDs[0]);
+
+auto pSubtype1 = 
dynamic_cast(pXObject1->Lookup("Subtype"));
+CPPUNIT_ASSERT(pSubtype1);
+CPPUNIT_ASSERT_EQUAL(OString("Form"), pSubtype1->GetValue());
+
+auto pXObjectResources = 
dynamic_cast(pXObject1->Lookup("Resources"));
+CPPUNIT_ASSERT(pXObjectResources);
+auto pXObjectForms = 
dynamic_cast(pXObjectResources->LookupElement("XObject"));
+CPPUNIT_ASSERT(pXObjectForms);
+vcl::filter::PDFObjectElement* pForm = 
pXObjectForms->LookupObject(pXObjectForms->GetItems().begin()->first);
+CPPUNIT_ASSERT(pForm);
+
+vcl::filter::PDFStreamElement* pStream = pForm->GetStream();
+CPPUNIT_ASSERT(pStream);




[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 3 commits - include/vcl vcl/CppunitTest_vcl_type_serializer_test.mk vcl/inc vcl/qa vcl/source


2020-04-30

Thread
Tomaž Vajngerl (via logerrit)

 include/vcl/filter/pdfdocument.hxx  |   29 -
 vcl/CppunitTest_vcl_type_serializer_test.mk |   11 -
 vcl/inc/TypeSerializer.hxx  |4 
 vcl/qa/cppunit/TypeSerializerTest.cxx   |  161 +++-
 vcl/source/gdi/TypeSerializer.cxx   |  117 
 5 files changed, 285 insertions(+), 37 deletions(-)

New commits:
commit d028229068c89f44c74a645fe8f0c3400c05706f
Author: Tomaž Vajngerl 
AuthorDate: Thu Apr 30 10:48:44 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Apr 30 10:48:44 2020 +0200

vcl: add Graphic serialization (writing) to TypeSerializer + tests

Change-Id: I3c4845550e776c4c2c891d94db71bacea27c9a37

diff --git a/vcl/inc/TypeSerializer.hxx b/vcl/inc/TypeSerializer.hxx
index befd4edd7660..136af57a399a 100644
--- a/vcl/inc/TypeSerializer.hxx
+++ b/vcl/inc/TypeSerializer.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class VCL_DLLPUBLIC TypeSerializer : public tools::GenericTypeSerializer
 {
@@ -35,6 +36,9 @@ public:
 
 void readGfxLink(GfxLink& rGfxLink);
 void writeGfxLink(const GfxLink& rGfxLink);
+
+void readGraphic(Graphic& rGraphic);
+void writeGraphic(const Graphic& rGraphic);
 };
 
 #endif
diff --git a/vcl/qa/cppunit/TypeSerializerTest.cxx 
b/vcl/qa/cppunit/TypeSerializerTest.cxx
index e5d3a259f803..0c737a4c4f03 100644
--- a/vcl/qa/cppunit/TypeSerializerTest.cxx
+++ b/vcl/qa/cppunit/TypeSerializerTest.cxx
@@ -130,6 +130,43 @@ void TypeSerializerTest::testGraphic()
 
CPPUNIT_ASSERT_EQUAL(std::string("c2bed2099ce617f1cc035701de5186f0d43e3064"),
  toHexString(aHash));
 }
+
+// Test TypeSerializer - Native Format 5
+{
+SvMemoryStream aMemoryStream;
+aMemoryStream.SetVersion(SOFFICE_FILEFORMAT_50);
+aMemoryStream.SetCompressMode(SvStreamCompressFlags::NATIVE);
+{
+TypeSerializer aSerializer(aMemoryStream);
+aSerializer.writeGraphic(aGraphic);
+}
+aMemoryStream.Seek(STREAM_SEEK_TO_BEGIN);
+
+CPPUNIT_ASSERT_EQUAL(sal_uInt64(290), aMemoryStream.remainingSize());
+std::vector aHash = calculateHash(aMemoryStream);
+
CPPUNIT_ASSERT_EQUAL(std::string("ee55ab6faa73b61b68bc3d5628d95f0d3c528e2a"),
+ toHexString(aHash));
+
+aMemoryStream.Seek(STREAM_SEEK_TO_BEGIN);
+sal_uInt32 nType;
+aMemoryStream.ReadUInt32(nType);
+CPPUNIT_ASSERT_EQUAL(COMPAT_FORMAT('N', 'A', 'T', '5'), nType);
+}
+
+// Test TypeSerializer - Normal
+{
+SvMemoryStream aMemoryStream;
+{
+TypeSerializer aSerializer(aMemoryStream);
+aSerializer.writeGraphic(aGraphic);
+}
+aMemoryStream.Seek(STREAM_SEEK_TO_BEGIN);
+
+CPPUNIT_ASSERT_EQUAL(sal_uInt64(233), aMemoryStream.remainingSize());
+std::vector aHash = calculateHash(aMemoryStream);
+
CPPUNIT_ASSERT_EQUAL(std::string("c2bed2099ce617f1cc035701de5186f0d43e3064"),
+ toHexString(aHash));
+}
 }
 
 void TypeSerializerTest::testGraphic_Bitmap_NoGfxLink()
@@ -155,6 +192,26 @@ void TypeSerializerTest::testGraphic_Bitmap_NoGfxLink()
 aMemoryStream.ReadUInt16(nType);
 CPPUNIT_ASSERT_EQUAL(sal_uInt16(0x4D42), nType); // Magic written with 
WriteDIBBitmapEx
 }
+
+// Test TypeSerializer
+{
+SvMemoryStream aMemoryStream;
+{
+TypeSerializer aSerializer(aMemoryStream);
+aSerializer.writeGraphic(aGraphic);
+}
+aMemoryStream.Seek(STREAM_SEEK_TO_BEGIN);
+
+CPPUNIT_ASSERT_EQUAL(sal_uInt64(383), aMemoryStream.remainingSize());
+std::vector aHash = calculateHash(aMemoryStream);
+
CPPUNIT_ASSERT_EQUAL(std::string("da831418499146d51bf245fadf60b9111faa76c2"),
+ toHexString(aHash));
+
+aMemoryStream.Seek(STREAM_SEEK_TO_BEGIN);
+sal_uInt16 nType;
+aMemoryStream.ReadUInt16(nType);
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(0x4D42), nType); // Magic written with 
WriteDIBBitmapEx
+}
 }
 
 } // namespace
diff --git a/vcl/source/gdi/TypeSerializer.cxx 
b/vcl/source/gdi/TypeSerializer.cxx
index ad2f1400da85..8266c6ac9813 100644
--- a/vcl/source/gdi/TypeSerializer.cxx
+++ b/vcl/source/gdi/TypeSerializer.cxx
@@ -20,6 +20,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 TypeSerializer::TypeSerializer(SvStream& rStream)
 : GenericTypeSerializer(rStream)
@@ -148,4 +150,119 @@ void TypeSerializer::writeGfxLink(const GfxLink& rGfxLink)
 }
 }
 
+namespace
+{
+constexpr sal_uInt32 constSvgMagic((sal_uInt32('s') << 24) | (sal_uInt32('v') 
<< 16)
+   | (sal_uInt32('g') << 8) | sal_uInt32('0'));
+constexpr sal_uInt32 constWmfMagic((sal_uInt32('w') << 24) | (sal_uInt32('m') 
<< 16)
+   | (sal_uInt32('f') << 8) | sal_uInt32('0'));
+constexpr 



Re: Building skia with clang(-cl)


2020-04-30

Thread
Miklos Vajna

Hi Thorsten,

On Thu, Apr 23, 2020 at 04:42:17PM +0200, Thorsten Behrens 
 wrote:
> No objections, but I'd much prefer to have release and normal builds
> use the same compiler then. If it's easy to add in VS2019, let's make
> it a prerequisite & fail hard otherwise.

Now  implements this
idea. Next step is to have build bot owners actually install clang-cl,
so the change can go in without causing problems, I guess.

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice





[Libreoffice-commits] core.git: sd/source slideshow/source vcl/unx


2020-04-30

Thread
Andrea Gelmini (via logerrit)

 sd/source/core/sdpage2.cxx|2 +-
 sd/source/ui/func/fumorph.cxx |2 +-
 slideshow/source/engine/slideshowimpl.cxx |2 +-
 vcl/unx/generic/window/salframe.cxx   |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 97e85db82e56c3d1cba6fb10842ffb85cd804a8d
Author: Andrea Gelmini 
AuthorDate: Thu Apr 30 10:36:27 2020 +0200
Commit: Julien Nabet 
CommitDate: Thu Apr 30 11:54:15 2020 +0200

Fix typos

Change-Id: I380b85646a62c4eafa40fdb5257060fac040feb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93195
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index d5e23641ae1a..b477b03e1930 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -222,7 +222,7 @@ void SdPage::SetPresentationLayout(const OUString& 
rLayoutName,
 else if (pObj->GetObjInventor() == SdrInventor::Default &&
  pObj->GetObjIdentifier() == OBJ_TITLETEXT)
 {
-// We do net get PresObjKind via GetPresObjKind() since there are
+// We do not get PresObjKind via GetPresObjKind() since there are
 // only PresObjListe considered. But we want to consider all "Title
 // objects" here (paste from clipboard etc.)
 SfxStyleSheet* pSheet = 
GetStyleSheetForPresObj(PresObjKind::Title);
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index de8dd06787f2..812d2d68b484 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -85,7 +85,7 @@ void FuMorph::DoExecute( SfxRequest& )
 SdrObject*  
pCloneObj1(pObj1->CloneSdrObject(pObj1->getSdrModelFromSdrObject()));
 SdrObject*  
pCloneObj2(pObj2->CloneSdrObject(pObj2->getSdrModelFromSdrObject()));
 
-// delete text at clone, otherwise we do net get a correct PathObj
+// delete text at clone, otherwise we do not get a correct PathObj
 pCloneObj1->SetOutlinerParaObject(nullptr);
 pCloneObj2->SetOutlinerParaObject(nullptr);
 
diff --git a/slideshow/source/engine/slideshowimpl.cxx 
b/slideshow/source/engine/slideshowimpl.cxx
index a0c652450bcb..214084710fad 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -1398,7 +1398,7 @@ void SlideShowImpl::registerUserPaintPolygons( const 
uno::Reference< lang::XMult
 }
 
 // ODF defaults from ctor of SdrLayer are not automatically set on the here
-// created XLayer. Need to be done explicitely here.
+// created XLayer. Need to be done explicitly here.
 aPropLayer <<= true;
 xDrawnInSlideshow->setPropertyValue("IsVisible", aPropLayer);
 xDrawnInSlideshow->setPropertyValue("IsPrintable", aPropLayer);
diff --git a/vcl/unx/generic/window/salframe.cxx 
b/vcl/unx/generic/window/salframe.cxx
index 94efbcd72f53..a246a975a3d5 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -1934,7 +1934,7 @@ void X11SalFrame::SetPosSize( const tools::Rectangle 
 )
 if( values.width != static_cast(maGeometry.nWidth) || values.height 
!= static_cast(maGeometry.nHeight) )
 bSized = true;
 
-// do net set WMNormalHints for ..
+// do not set WMNormalHints for...
 if(
 // child windows
 ! IsChildWindow()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits





[Libreoffice-commits] core.git: sw/source


2020-04-30

Thread
Andrea Gelmini (via logerrit)

 sw/source/filter/ww8/ww8par.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8aedb081e731da66191fe13b65e94a1009c815dc
Author: Andrea Gelmini 
AuthorDate: Thu Apr 30 10:43:03 2020 +0200
Commit: Julien Nabet 
CommitDate: Thu Apr 30 11:53:03 2020 +0200

Update name pReffedStck to xReffedStck

In commit 2a72602824bf8aec44319e7fb9fe6dd3cebc72b3 it was updated

Change-Id: I2dbc799f379805b94055e229606d032dc802d6fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90875
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 0149c3a13f76..87156c52800d 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1117,7 +1117,7 @@ private:
 This stack is for fields whose true conversion cannot be determined until
 the end of the document, it is the same stack for headers/footers/main
 text/textboxes/tables etc... They are things that reference other things
-e.g. NoteRef and Ref, they are processed after pReffedStck
+e.g. NoteRef and Ref, they are processed after m_xReffedStck
 */
 std::unique_ptr m_xReffingStck;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits





[Libreoffice-commits] core.git: sw/source


2020-04-30

Thread
Miklos Vajna (via logerrit)

 sw/source/core/doc/DocumentSettingManager.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ce5f26159361b2e40d89d82595068067bc8ef7b
Author: Miklos Vajna 
AuthorDate: Wed Apr 29 21:07:47 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu Apr 30 09:11:43 2020 +0200

sw: handle TabOverMargin when replacing compat options

This was added in commit bdfc6363d66aa079512cc8008996b633f693fed1
(n#793998 sw: add TabOverMargin compat mode, 2013-01-08), it's off by
default and on for MSO documents.

Change-Id: Ic97e711e4c8be507db71c49ffbdb63b40464c1bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93178
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index 60cbae457508..bbc2f0781387 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -622,7 +622,7 @@ void 
sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
 // No mbUnbreakableNumberings
 // No mbClippedPictures
 // No mbBackgroundParaOverDrawings
-// No mbTabOverMargin
+mbTabOverMargin = rSource.mbTabOverMargin;
 // No mbTreatSingleColumnBreakAsPageBreak
 // No mbSurroundTextWrapSmall
 // No mbPropLineSpacingShrinksFirstLine
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits





[Libreoffice-commits] core.git: include/xmloff sw/source xmloff/inc xmloff/source


2020-04-30

Thread
Noel Grandin (via logerrit)

 include/xmloff/xformsimport.hxx   |5 +
 sw/source/filter/xml/xmlimp.cxx   |2 
 xmloff/inc/DomBuilderContext.hxx  |   23 +++--
 xmloff/source/core/DomBuilderContext.cxx  |   77 +++
 xmloff/source/core/xmlimp.cxx |1 
 xmloff/source/forms/layerimport.cxx   |2 
 xmloff/source/xforms/SchemaContext.cxx|   32 +---
 xmloff/source/xforms/SchemaContext.hxx|   12 ++-
 xmloff/source/xforms/SchemaRestrictionContext.cxx |   88 ++
 xmloff/source/xforms/SchemaRestrictionContext.hxx |   12 ++-
 xmloff/source/xforms/SchemaSimpleTypeContext.cxx  |   36 ++---
 xmloff/source/xforms/SchemaSimpleTypeContext.hxx  |   12 ++-
 xmloff/source/xforms/TokenContext.cxx |   71 +
 xmloff/source/xforms/TokenContext.hxx |   42 +++---
 xmloff/source/xforms/XFormsBindContext.cxx|   54 -
 xmloff/source/xforms/XFormsBindContext.hxx|   15 ++-
 xmloff/source/xforms/XFormsInstanceContext.cxx|   44 +++
 xmloff/source/xforms/XFormsInstanceContext.hxx|   21 +++--
 xmloff/source/xforms/XFormsModelContext.cxx   |   65 +++-
 xmloff/source/xforms/XFormsModelContext.hxx   |   14 ++-
 xmloff/source/xforms/XFormsSubmissionContext.cxx  |   67 +++-
 xmloff/source/xforms/XFormsSubmissionContext.hxx  |   10 +-
 xmloff/source/xforms/xformsimport.cxx |7 +
 23 files changed, 474 insertions(+), 238 deletions(-)

New commits:
commit e4da8ae4bef37f5450dcf34d9f06b68e3b901c01
Author: Noel Grandin 
AuthorDate: Thu Apr 30 08:37:51 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 30 09:43:10 2020 +0200

Revert "Convert TokenContext to fastparser APIs"

This reverts commit b7bfe6ae08f5b214f2d03d70a40b66c894c0b659.

Reason for revert: I missed some call-sites which means this is not going 
to work properly, which also means we don't have any tests for this 
functionality :-(

Change-Id: Ie340a5e2331609258e79176c3dd12249ad46ba7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93134
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/xmloff/xformsimport.hxx b/include/xmloff/xformsimport.hxx
index 3bf554d9a7b2..5975ea993416 100644
--- a/include/xmloff/xformsimport.hxx
+++ b/include/xmloff/xformsimport.hxx
@@ -35,7 +35,10 @@ namespace com { namespace sun { namespace star {
 } } }
 
 /** create import context for xforms:model element. */
-XMLOFF_DLLPUBLIC SvXMLImportContext* createXFormsModelContext( SvXMLImport& 
rImport );
+XMLOFF_DLLPUBLIC SvXMLImportContext* createXFormsModelContext(
+SvXMLImport& rImport,
+sal_uInt16 nPrefix,
+const OUString& rLocalName );
 
 /** perform the actual binding of an XForms-binding with the suitable control
  *  @param document which contains the XForms-model(s)
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index eaded191bdcc..0ea3690eddac 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -260,7 +260,7 @@ SvXMLImportContextRef 
SwXMLDocContext_Impl::CreateChildContext(
 switch( rTokenMap.Get( nPrefix, rLocalName ) )
 {
 case XML_TOK_DOC_XFORMS:
-pContext = createXFormsModelContext(GetImport());
+pContext = createXFormsModelContext(GetImport(), nPrefix, rLocalName);
 break;
 }
 
diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx
index a3ce39574473..cf73d6e7d608 100644
--- a/xmloff/inc/DomBuilderContext.hxx
+++ b/xmloff/inc/DomBuilderContext.hxx
@@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star {
 class XDocument;
 } }
 namespace xml { namespace sax {
-class XFastAttributeList;
+class XAttributeList;
 } }
 } } }
 class SvXMLImport;
@@ -48,11 +48,14 @@ class DomBuilderContext final : public SvXMLImportContext
 public:
 
 /** default constructor: create new DOM tree */
-DomBuilderContext( SvXMLImport& rImport, sal_Int32 nElement );
+DomBuilderContext( SvXMLImport& rImport,
+   sal_uInt16 nPrefix,
+   const OUString& rLocalName );
 
 /** constructor: create DOM subtree under the given node */
 DomBuilderContext( SvXMLImport& rImport,
-   sal_Int32 nElement,
+   sal_uInt16 nPrefix,
+   const OUString& rLocalName,
css::uno::Reference const & );
 
 virtual ~DomBuilderContext() override;
@@ -67,12 +70,16 @@ public:
 
 // implement SvXMLImportContext methods:
 
-virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
-sal_Int32 nElement,
-const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
xAttrList ) override;
 
-virtual void SAL_CALL startFastElement( 



Re: Doxygen


2020-04-30

Thread
Stephan Bergmann


On 30/04/2020 03:34, Olivier Hallot wrote:

The way information is presented to the non-developer is sub-optimal.
Pre-Doxygen sdk was much easier to navigate and get information as the
ues cases below


What exactly do you mean with "pre-Doxygen sdk"?  (IIRC, Doxygen has 
been introduced to replace OOo's autodoc first for generation of the C++ 
API documentation and then for generation of the UNOIDL API documentation.)



With installed sdk in his computer at
file:///opt/libreoffice6.4/sdk/index.html


What exactly is installed there? 
 
or 
 
as currently available at ?



Let's suppose I am a candidate to macro programming and want to

Use case 1 : Search for ThisComponent -> no matches


Search how?  I find no ability to search on 
.  (Did you mean the search 
field at the top right of 
, reached from 
 via "IDL Reference"?  But 
then, "ThisComponent" is not a term related to LO's UNOIDL API, so no 
matches is a plausible outcome there.)


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice





[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - external/firebird


2020-04-30

Thread
Stephan Bergmann (via logerrit)

 external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 
|   49 ++
 external/firebird/UnpackedTarball_firebird.mk  
|4 
 2 files changed, 53 insertions(+)

New commits:
commit b45283638b2167d32c8b0a09edc227dc6e4c97ee
Author: Stephan Bergmann 
AuthorDate: Mon Oct 21 18:09:00 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Apr 30 10:28:14 2020 +0200

external/firebird: Make comparison operator member functions const

see commit message of

external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1
for details

Change-Id: I559e4b6ef2dbf3800ff5013dcde078d69296d2fb
Reviewed-on: https://gerrit.libreoffice.org/81261
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93191
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git 
a/external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1
 
b/external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1
new file mode 100644
index ..42c677f7e5ad
--- /dev/null
+++ 
b/external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1
@@ -0,0 +1,49 @@
+From 15390d75ee6ca429dbbe15ea04214df8a30fbd48 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann 
+Date: Mon, 21 Oct 2019 17:54:18 +0200
+Subject: [PATCH] Make comparison operator member functions const
+
+...which avoids overload resolution ambiguities in C++20, when a synthesized
+candidate of operator == for a reversed-argument rewrite conflicts with the
+actual operator ==, due to the asymmetric const-ness of the implicit object
+parameter and the RHS parameter.  (As observed with recent Clang 10 trunk with
+-std=c++2a when building firebird as part of LibreOffice:
+
+> workdir/UnpackedTarball/firebird/src/jrd/inf.cpp:1139:62: error: use of 
overloaded operator '!=' is ambiguous (with operand types 
'RuntimeStatistics::Iterator' and 'Jrd::RuntimeStatistics::Iterator')
+> for (RuntimeStatistics::Iterator iter = stats.begin(); iter != 
stats.end(); ++iter)
+> ^  
~~~
+> 
workdir/UnpackedTarball/firebird/src/jrd/../dsql/../jrd/RuntimeStatistics.h:283:8:
 note: candidate function
+> bool operator!=(const Iterator& other)
+>  ^
+> 
workdir/UnpackedTarball/firebird/src/jrd/../dsql/../jrd/RuntimeStatistics.h:278:8:
 note: candidate function
+> bool operator==(const Iterator& other)
+>  ^
+> 
workdir/UnpackedTarball/firebird/src/jrd/../dsql/../jrd/RuntimeStatistics.h:278:8:
 note: candidate function (with reversed parameter order)
+
+)
+---
+ src/jrd/RuntimeStatistics.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/jrd/RuntimeStatistics.h b/src/jrd/RuntimeStatistics.h
+index 74a03de2ad..fab286ad1a 100644
+--- a/src/jrd/RuntimeStatistics.h
 b/src/jrd/RuntimeStatistics.h
+@@ -290,12 +290,12 @@ public:
+   {}
+ 
+   public:
+-  bool operator==(const Iterator& other)
++  bool operator==(const Iterator& other) const
+   {
+   return (m_counts == other.m_counts);
+   }
+ 
+-  bool operator!=(const Iterator& other)
++  bool operator!=(const Iterator& other) const
+   {
+   return (m_counts != other.m_counts);
+   }
+-- 
+2.21.0
+
diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 96f29a76ead5..a2e2dcebc187 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -18,6 +18,9 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,firebird,\
extern/editline \
 ))
 
+# * 
external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 
is upstream at
+#    "Make comparison 
operator member functions
+#   const":
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 external/firebird/firebird.disable-ib-util-not-found.patch.1 \
external/firebird/firebird-Engine12.patch \
@@ -31,6 +34,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/c++17.patch \
external/firebird/ubsan.patch \
external/firebird/asan.patch \
+   
external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits





[Libreoffice-commits] core.git: compilerplugins/clang sw/qa sw/source


2020-04-30

Thread
Andrea Gelmini (via logerrit)

 compilerplugins/clang/test/cppunitassertequals.cxx |2 +-
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |2 +-
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |2 +-
 sw/source/core/doc/number.cxx  |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7685dff381f538bf011a56da4a0493228b84614a
Author: Andrea Gelmini 
AuthorDate: Tue Apr 28 17:19:13 2020 +0200
Commit: Andrea Gelmini 
CommitDate: Thu Apr 30 10:31:29 2020 +0200

Fix typos

Change-Id: I8d0e10b08393b7752d55298e0e1ba64e5fd6c422
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93083
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/compilerplugins/clang/test/cppunitassertequals.cxx 
b/compilerplugins/clang/test/cppunitassertequals.cxx
index d0825000be07..d42007c99d66 100644
--- a/compilerplugins/clang/test/cppunitassertequals.cxx
+++ b/compilerplugins/clang/test/cppunitassertequals.cxx
@@ -53,7 +53,7 @@ void test(
 CPPUNIT_ASSERT(t.operator ==(t));
 
 // `P == nullptr` for P of pointer type is awkward to write with 
CPPUNIT_ASSERT_EQUAL, and the
-// actual pointer values that would be printed if CPPUNIT_ASSERT_EQUAL 
failed would likey not be
+// actual pointer values that would be printed if CPPUNIT_ASSERT_EQUAL 
failed would likely not be
 // very meaningful, so let it use CPPUNIT_ASSERT (but stick to 
CPPUNIT_ASSERT_EQUAL for
 // consistency in the unlikely case that P is of type std::nullptr_t):
 CPPUNIT_ASSERT(p == nullptr);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 0b142d51141a..65036bbbc3bc 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -765,7 +765,7 @@ DECLARE_OOXMLEXPORT_TEST(testNumOverrideLvltext, 
"num-override-lvltext.docx")
 {
 uno::Reference xRules = getProperty< 
uno::Reference 
>(getStyles("NumberingStyles")->getByName("WWNum1"), "NumberingRules");
 // This was 1, i.e. the numbering on the second level was "1", not "1.1".
-// Check the praragraph properties, not the list ones, since they can 
differ due to overrides
+// Check the paragraph properties, not the list ones, since they can 
differ due to overrides
 uno::Reference xPara(getParagraph(1), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(static_cast(1), 
getProperty(xPara, "NumberingLevel"));
 CPPUNIT_ASSERT_EQUAL(OUString("1.1"), getProperty(xPara, 
"ListLabelString"));
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 396f2a6e1513..773b5c457a73 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1553,7 +1553,7 @@ DECLARE_OOXMLIMPORT_TEST(testTdf108995, "xml_space.docx")
 
 DECLARE_OOXMLIMPORT_TEST(testGroupShapeTextHighlight, 
"tdf131841_HighlightColorGroupedShape.docx")
 {
-// tdf#131841 Highligh color of text in grouped shapes was not imported.
+// tdf#131841 Highlight color of text in grouped shapes was not imported.
 
 // These are the possible highlight colors in MSO Word. Check that we 
import them properly.
 const std::vector xColors {
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index d26c48fe579d..cfa140a58817 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -648,7 +648,7 @@ OUString SwNumRule::MakeNumString( const 
SwNumberTree::tNumberVector & rNumVecto
 if (!sLevelFormat.isEmpty())
 {
 // In this case we are ignoring GetIncludeUpperLevels: we put 
all
-// level nubers requested by level format
+// level numbers requested by level format
 for (SwNumberTree::tNumberVector::size_type i=0; i <= nLevel; 
++i)
 {
 OUString sReplacement;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits





Minutes from the UX/design meeting 2020-Apr-29


2020-04-30

Thread
Heiko Tietze

Present: Olivier, Cor, Heiko
Comments: by many

Tickets/Topic

 * Writer does not allow a user-set default view/zoom
   + https://bugs.documentfoundation.org/show_bug.cgi?id=132274
   + option to override document zoom level
   => do it

 * Inserted file not displayed correctly (Numbering missing)
   + https://bugs.documentfoundation.org/show_bug.cgi?id=132289
   + list style must not be ignored when pasting/inserting styled text
   + paste "1. Lorem" into a paragraph like "That didnt bode well" makes
 the paragraph a list, ie. "1. That didnt bode Lorem\n 2. well." 
 -> makes no sense
   + so just follow the recent decision and keep the source style when pasting
 at an empty paragraph, otherwise keep target's style
   + usually operation is done on an empty paragraph (Cor)
   => comment and fix the bug

 * Opentype features window is longer than screen size and it is difficult to 
reach
   ok/cancel buttons
   + https://bugs.documentfoundation.org/show_bug.cgi?id=128176
   + three columns or scrollwindow
   + prefer scrollwindow (Cor, Olivier)
   => do it

 * Extend the marker line if tracked changes spans over the next paragraph
   + https://bugs.documentfoundation.org/show_bug.cgi?id=104346
   + no objection, enhancement not a bug, low priority
   + line is interrupted by paragraph spacing
   => do it

 * Add ability to keep vector image and compress replacement image in image
   compression dialog
   + https://bugs.documentfoundation.org/show_bug.cgi?id=127854
   + reason for https://vmiklos.hu/blog/lo-insert-pdf-image.html
 + "Similarly to the SVG feature, the original vector image is stored in 
the 
   document, but when saving to ODF, a replacement PNG file is also 
generated to be
   backwards compatible with older ODF readers."
   + reading Miklos blog from comment #9, it looks as if
 + inserted PDF is represented with PNG,
   but choosing Save from Context menu allows to save as PDF again...
 + so would it be possible to do the same with inserted SVGs ?
 + could ask Miklos I think (Cor)
   + introduce a compatibility flag to switch conversion to raster graphic off?
   + any workflow with back and forth conversion of PNG<->SVG sounds weird 
(Heiko)
   => involve Miklos

 * Definition List (or Definition Index or Glossary) at the end of the page - 
EDITING
   + https://bugs.documentfoundation.org/show_bug.cgi?id=118455
   + would be nice to have it more comfortable though but quite a lot of effort 
 and unclear if possible with the ODF
   + less comfortable options are using endnotes or 1st key of index entry
   + would be definitely a nice feature (Cor, Olivier)
   + would ODF specs have the room for this to be implemented?
 + ask Regina :) (Cor)
   + if we realize it it has to be done based on the current ODF specs (Heiko)
   => look at the competitor's way and take compatibility as prime
 + or ask for a good design from someone if we know ODF allows it to be 
implemented

 * Adopt new application icons for LibreOffice 7.0
   + https://bugs.documentfoundation.org/show_bug.cgi?id=132398
   + seeking for opinions, see c8 (Heiko)
   + wouldn't change the app icons (Olivier)
   + let's gather the ideas first (Cor)
   => comments and input is always welcome



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice





[Libreoffice-commits] core.git: sw/qa sw/source


2020-04-30

Thread
László Németh (via logerrit)

 sw/qa/extras/tiledrendering/data/tdf114799.docx |binary
 sw/qa/extras/tiledrendering/tiledrendering.cxx  |   27 
 sw/source/core/text/txtfld.cxx  |   14 ++--
 3 files changed, 34 insertions(+), 7 deletions(-)

New commits:
commit 315d56582f8a56d8f2d3ea6cda63ea4832249608
Author: László Németh 
AuthorDate: Tue Apr 28 16:48:09 2020 +0200
Commit: László Németh 
CommitDate: Thu Apr 30 09:41:45 2020 +0200

tdf#114799 DOCX import: fix missing numbering highlight

opening a DOCX with shadowing (w:shd) instead of highlight
(w:highlight), for example, a DOCX saved in LibreOffice.

This reverts also commit aa02ed306f7c633bbffede16e44e8e736977ace4
(tdf#106991: Highlighting remains after select no fill).

Change-Id: I0935694e3c309b5a450cd424fd398a88d13f8b22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93082
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/tiledrendering/data/tdf114799.docx 
b/sw/qa/extras/tiledrendering/data/tdf114799.docx
new file mode 100644
index ..730ef91dcef9
Binary files /dev/null and b/sw/qa/extras/tiledrendering/data/tdf114799.docx 
differ
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 441c06271d52..355ae56cc29f 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -121,6 +121,7 @@ public:
 void testVisCursorInvalidation();
 void testDeselectCustomShape();
 void testSemiTransparent();
+void testHighlightNumbering();
 void testClipText();
 void testAnchorTypes();
 void testLanguageStatus();
@@ -186,6 +187,7 @@ public:
 CPPUNIT_TEST(testVisCursorInvalidation);
 CPPUNIT_TEST(testDeselectCustomShape);
 CPPUNIT_TEST(testSemiTransparent);
+CPPUNIT_TEST(testHighlightNumbering);
 CPPUNIT_TEST(testClipText);
 CPPUNIT_TEST(testAnchorTypes);
 CPPUNIT_TEST(testLanguageStatus);
@@ -2386,6 +2388,31 @@ void SwTiledRenderingTest::testSemiTransparent()
 CPPUNIT_ASSERT_GREATEREQUAL(190, static_cast(aColor.B));
 }
 
+void SwTiledRenderingTest::testHighlightNumbering()
+{
+// Load a document where the top left tile contains a semi-transparent 
rectangle shape.
+SwXTextDocument* pXTextDocument = createDoc("tdf114799.docx");
+
+// Render a larger area, and then get the color of the bottom right corner 
of our tile.
+size_t nCanvasWidth = 1024;
+size_t nCanvasHeight = 512;
+size_t nTileSize = 256;
+std::vector aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
+ScopedVclPtrInstance pDevice(DeviceFormat::DEFAULT);
+pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
+pDevice->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth, 
nCanvasHeight),
+Fraction(1.0), Point(), 
aPixmap.data());
+pXTextDocument->paintTile(*pDevice, nCanvasWidth, nCanvasHeight, 
/*nTilePosX=*/0,
+  /*nTilePosY=*/0, /*nTileWidth=*/15360, 
/*nTileHeight=*/7680);
+pDevice->EnableMapMode(false);
+Bitmap aBitmap = pDevice->GetBitmap(Point(0, 0), Size(nTileSize, 
nTileSize));
+Bitmap::ScopedReadAccess pAccess(aBitmap);
+
+// Yellow highlighting over numbering
+Color aColor(pAccess->GetPixel(103, 148));
+CPPUNIT_ASSERT_EQUAL(COL_YELLOW, aColor);
+}
+
 void SwTiledRenderingTest::testClipText()
 {
 // Load a document where the top left tile contains table text with
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index a1c27cbb3597..5442f3f87922 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -466,17 +466,17 @@ static void 
checkApplyParagraphMarkFormatToNumbering(SwFont* pNumFnt, SwTextForm
 const SfxPoolItem* pItem = aIter.GetCurItem();
 do
 {
-if (SwTextNode::IsIgnoredCharFormatForNumbering(pItem->Which()))
-pCleanedSet->ClearItem(pItem->Which());
-else if (pFormat && pFormat->HasItem(pItem->Which()))
-pCleanedSet->ClearItem(pItem->Which());
+if (pItem->Which() != RES_CHRATR_BACKGROUND)
+{
+if 
(SwTextNode::IsIgnoredCharFormatForNumbering(pItem->Which()))
+pCleanedSet->ClearItem(pItem->Which());
+else if (pFormat && pFormat->HasItem(pItem->Which()))
+pCleanedSet->ClearItem(pItem->Which());
+}
 
 pItem = aIter.NextItem();
 } while (pItem);
-// Highlightcolor also needed to be untouched, but we can't have that 
just by clearing the item
-Color nSaveHighlight = pNumFnt->GetHighlightColor();
 pNumFnt->SetDiffFnt(pCleanedSet.get(), pIDSA);
-pNumFnt->SetHighlightColor(nSaveHighlight);
 }
 }
 
___
Libreoffice-commits mailing 



[Libreoffice-commits] core.git: xmloff/source


2020-04-30

Thread
Noel Grandin (via logerrit)

 xmloff/source/forms/elementimport.cxx |   80 +++---
 xmloff/source/forms/elementimport.hxx |  121 +-
 2 files changed, 89 insertions(+), 112 deletions(-)

New commits:
commit 7e4463db510fe7faa15e4f5ad3394aa0abf52b66
Author: Noel Grandin 
AuthorDate: Thu Apr 30 09:53:49 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 30 10:32:42 2020 +0200

expand out OContainerImport template

to make the logic easier to follow, and to make it possible to convert
this to fast-parser APIs

Change-Id: I48921c3cd84b45f56ff943060f2d9c8e4882d051
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93193
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/xmloff/source/forms/elementimport.cxx 
b/xmloff/source/forms/elementimport.cxx
index 25824d8e08c6..8693cc355bf1 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1836,20 +1836,62 @@ namespace xmloff
 OGridImport::OGridImport(OFormLayerXMLImport_Impl& _rImport, 
IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& 
_rName,
 const Reference< XNameContainer >& _rxParentContainer,
 OControlElement::ElementType _eType)
-:OGridImport_Base(_rImport, _rEventManager, _nPrefix, _rName, 
_rxParentContainer, "column")
+:OControlImport(_rImport, _rEventManager, _nPrefix, _rName, 
_rxParentContainer)
 {
 setElementType(_eType);
 }
 
-SvXMLImportContext* OGridImport::implCreateControlWrapper(sal_uInt16 
_nPrefix, const OUString& _rLocalName)
+SvXMLImportContextRef OGridImport::CreateChildContext(
+sal_uInt16 _nPrefix, const OUString& _rLocalName,
+const css::uno::Reference< css::xml::sax::XAttributeList >& 
_rxAttrList)
+{
+// maybe it's a sub control
+if (_rLocalName == "column")
+{
+if (m_xMeAsContainer.is())
+return new OColumnWrapperImport(m_rFormImport, *this, 
_nPrefix, _rLocalName, m_xMeAsContainer);
+else
+{
+OSL_FAIL("OGridImport::CreateChildContext: don't have an 
element!");
+return nullptr;
+}
+}
+
+return OControlImport::CreateChildContext(_nPrefix, _rLocalName, 
_rxAttrList);
+}
+
+void OGridImport::EndElement()
+{
+OControlImport::EndElement();
+
+// now that we have all children, attach the events
+css::uno::Reference< css::container::XIndexAccess > 
xIndexContainer(m_xMeAsContainer, css::uno::UNO_QUERY);
+if (xIndexContainer.is())
+ODefaultEventAttacherManager::setEvents(xIndexContainer);
+}
+
+css::uno::Reference< css::beans::XPropertySet > 
OGridImport::createElement()
 {
-return new OColumnWrapperImport(m_rFormImport, *this, _nPrefix, 
_rLocalName, m_xMeAsContainer);
+// let the base class create the object
+css::uno::Reference< css::beans::XPropertySet > xReturn = 
OControlImport::createElement();
+if (!xReturn.is())
+return xReturn;
+
+// ensure that the object is a XNameContainer (we strongly need this 
for inserting child elements)
+m_xMeAsContainer.set(xReturn, css::uno::UNO_QUERY);
+if (!m_xMeAsContainer.is())
+{
+OSL_FAIL("OContainerImport::createElement: invalid element (no 
XNameContainer) created!");
+xReturn.clear();
+}
+
+return xReturn;
 }
 
 //= OFormImport
 OFormImport::OFormImport(OFormLayerXMLImport_Impl& _rImport, 
IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& 
_rName,
 const Reference< XNameContainer >& _rxParentContainer)
-:OFormImport_Base(_rImport, _rEventManager, _nPrefix, _rName, 
_rxParentContainer, "control")
+:OElementImport(_rImport, _rEventManager, _nPrefix, _rName, 
_rxParentContainer)
 {
 enableTrackAttributes();
 }
@@ -1875,7 +1917,7 @@ namespace xmloff
 void OFormImport::StartElement(const Reference< XAttributeList >& 
_rxAttrList)
 {
 m_rFormImport.enterEventContext();
-OFormImport_Base::StartElement(_rxAttrList);
+OElementImport::StartElement(_rxAttrList);
 
 // handle the target-frame attribute
 
simulateDefaultedAttribute(OAttributeMetaData::getCommonControlAttributeName(CCAFlags::TargetFrame),
 PROPERTY_TARGETFRAME, "_blank");
@@ -1883,14 +1925,32 @@ namespace xmloff
 
 void OFormImport::EndElement()
 {
-OFormImport_Base::EndElement();
+OElementImport::EndElement();
+
+// now that we have all children, attach the events
+css::uno::Reference< css::container::XIndexAccess > 
xIndexContainer(m_xMeAsContainer, css::uno::UNO_QUERY);
+if (xIndexContainer.is())
+ODefaultEventAttacherManager::setEvents(xIndexContainer);
+
 m_rFormImport.leaveEventContext();
 }
 
-   



[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - svx/source


2020-04-30

Thread
Tomaž Vajngerl (via logerrit)

 svx/source/svdraw/svdpdf.cxx |   28 +++-
 1 file changed, 15 insertions(+), 13 deletions(-)

New commits:
commit fca270c2eba79c376d08f4adf1239a8e91d645e8
Author: Tomaž Vajngerl 
AuthorDate: Thu Apr 30 13:18:21 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Apr 30 13:18:21 2020 +0200

SdrPdfImport: rename some variables to non-abbreviated names

Change-Id: I1cb004a8e426f8ea26bb930d4897db3763433b31

diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index c6a11c16d73f..806e82ebf5ac 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -85,6 +85,7 @@ namespace
 /// Here we effectively render at 96 DPI (to match
 /// the image rendered in vcl::ImportPDF in pdfread.cxx).
 double lcl_PointToPixel(double fPoint) { return fPoint * 96. / 72.; }
+
 /// Convert from pixels to logic (twips).
 long lcl_ToLogic(double value)
 {
@@ -883,21 +884,22 @@ void ImpSdrPdfImport::ImportText(const Point& rPos, const 
Size& rSize, const OUS
 // calc text box size, add 5% to make it fit safely
 
 FontMetric aFontMetric(mpVD->GetFontMetric());
-vcl::Font aFnt(mpVD->GetFont());
-FontAlign eAlg(aFnt.GetAlignment());
+vcl::Font aFont(mpVD->GetFont());
+FontAlign eAlignment(aFont.GetAlignment());
 
 // sal_Int32 nTextWidth = static_cast(mpVD->GetTextWidth(rStr) 
* mfScaleX);
 sal_Int32 nTextHeight = static_cast(mpVD->GetTextHeight() * 
mfScaleY);
 
-Point aPos(FRound(rPos.X() * mfScaleX + maOfs.X()), FRound(rPos.Y() * 
mfScaleY + maOfs.Y()));
+Point aPosition(FRound(rPos.X() * mfScaleX + maOfs.X()),
+FRound(rPos.Y() * mfScaleY + maOfs.Y()));
 Size aSize(FRound(rSize.Width() * mfScaleX), FRound(rSize.Height() * 
mfScaleY));
 
-if (eAlg == ALIGN_BASELINE)
-aPos.AdjustY(-FRound(aFontMetric.GetAscent() * mfScaleY));
-else if (eAlg == ALIGN_BOTTOM)
-aPos.AdjustY(-nTextHeight);
+if (eAlignment == ALIGN_BASELINE)
+aPosition.AdjustY(-FRound(aFontMetric.GetAscent() * mfScaleY));
+else if (eAlignment == ALIGN_BOTTOM)
+aPosition.AdjustY(-nTextHeight);
 
-tools::Rectangle aTextRect(aPos, aSize);
+tools::Rectangle aTextRect(aPosition, aSize);
 SdrRectObj* pText = new SdrRectObj(*mpModel, OBJ_TEXT, aTextRect);
 
 pText->SetMergedItem(makeSdrTextUpperDistItem(0));
@@ -905,7 +907,7 @@ void ImpSdrPdfImport::ImportText(const Point& rPos, const 
Size& rSize, const OUS
 pText->SetMergedItem(makeSdrTextRightDistItem(0));
 pText->SetMergedItem(makeSdrTextLeftDistItem(0));
 
-if (aFnt.GetAverageFontWidth())
+if (aFont.GetAverageFontWidth())
 {
 pText->ClearMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH);
 pText->SetMergedItem(makeSdrTextAutoGrowHeightItem(false));
@@ -922,21 +924,21 @@ void ImpSdrPdfImport::ImportText(const Point& rPos, const 
Size& rSize, const OUS
 SetAttributes(pText, true);
 pText->SetSnapRect(aTextRect);
 
-if (!aFnt.IsTransparent())
+if (!aFont.IsTransparent())
 {
 SfxItemSet aAttr(*mpFillAttr->GetPool(), svl::Items{});
 aAttr.Put(XFillStyleItem(drawing::FillStyle_SOLID));
-aAttr.Put(XFillColorItem(OUString(), aFnt.GetFillColor()));
+aAttr.Put(XFillColorItem(OUString(), aFont.GetFillColor()));
 pText->SetMergedItemSet(aAttr);
 }
-sal_uInt32 nAngle = aFnt.GetOrientation();
+sal_uInt32 nAngle = aFont.GetOrientation();
 if (nAngle)
 {
 nAngle *= 10;
 double a = nAngle * F_PI18000;
 double nSin = sin(a);
 double nCos = cos(a);
-pText->NbcRotate(aPos, nAngle, nSin, nCos);
+pText->NbcRotate(aPosition, nAngle, nSin, nCos);
 }
 InsertObj(pText, false);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits





[Libreoffice-commits] core.git: sw/CppunitTest_sw_htmlexport.mk sw/qa sw/source


2020-04-30

Thread
Miklos Vajna (via logerrit)

 sw/CppunitTest_sw_htmlexport.mk   |1 
 sw/qa/extras/htmlexport/data/pdf-ole.odt  |binary
 sw/qa/extras/htmlexport/htmlexport.cxx|  138 ++
 sw/source/filter/html/htmlreqifreader.cxx |   96 
 4 files changed, 233 insertions(+), 2 deletions(-)

New commits:
commit 1392fd6a7eaf9f507639096984c2a0108f254795
Author: Miklos Vajna 
AuthorDate: Thu Apr 30 12:40:24 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu Apr 30 13:20:15 2020 +0200

sw reqif-xhtml export, embedded objects: handle Ole10Native stream

Normally the embedded object has some OLE2 native data, and we insert
our OLE1 header before that. But in case the OLE2 data already has an
Ole10Native stream, then don't create an OLE1-in-OLE2-in-OLE1 output:
it's pointless and some consumers have trouble parsing that.

Change-Id: Ifc8b37494f97da89ce66a147e08a49eaa2f7ae1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93200
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
index 957152c7fd8b..c85c5b8212cd 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_htmlexport, \
 cppu \
cppuhelper \
i18nlangtag \
+   msfilter \
 sal \
 sfx \
 sw \
diff --git a/sw/qa/extras/htmlexport/data/pdf-ole.odt 
b/sw/qa/extras/htmlexport/data/pdf-ole.odt
new file mode 100644
index ..184449a4f829
Binary files /dev/null and b/sw/qa/extras/htmlexport/data/pdf-ole.odt differ
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 4967975f1caa..54334aade9f5 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -28,6 +28,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 
 class HtmlExportTest : public SwModelTestBase, public HtmlTestTools
 {
@@ -883,6 +887,140 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, 
testReqifParagraphAlignment)
 assertXPathNoAttribute(pDoc, "//reqif-xhtml:p", "align");
 }
 
+namespace
+{
+/// Test RTF parser that just extracts a single OLE2 object from a file.
+class TestReqIfRtfReader : public SvRTFParser
+{
+public:
+TestReqIfRtfReader(SvStream& rStream);
+void NextToken(int nToken) override;
+bool WriteObjectData(SvStream& rOLE);
+
+private:
+bool m_bInObjData = false;
+OStringBuffer m_aHex;
+};
+
+TestReqIfRtfReader::TestReqIfRtfReader(SvStream& rStream)
+: SvRTFParser(rStream)
+{
+}
+
+void TestReqIfRtfReader::NextToken(int nToken)
+{
+switch (nToken)
+{
+case '}':
+m_bInObjData = false;
+break;
+case RTF_TEXTTOKEN:
+if (m_bInObjData)
+m_aHex.append(OUStringToOString(aToken, 
RTL_TEXTENCODING_ASCII_US));
+break;
+case RTF_OBJDATA:
+m_bInObjData = true;
+break;
+}
+}
+
+bool TestReqIfRtfReader::WriteObjectData(SvStream& rOLE)
+{
+OString aObjdata = m_aHex.makeStringAndClear();
+
+SvMemoryStream aStream;
+int b = 0;
+int count = 2;
+
+// Feed the destination text to a stream.
+for (int i = 0; i < aObjdata.getLength(); ++i)
+{
+char ch = aObjdata[i];
+if (ch != 0x0d && ch != 0x0a)
+{
+b = b << 4;
+sal_Int8 parsed = msfilter::rtfutil::AsHex(ch);
+if (parsed == -1)
+return false;
+b += parsed;
+count--;
+if (!count)
+{
+aStream.WriteChar(b);
+count = 2;
+b = 0;
+}
+}
+}
+
+aStream.Seek(0);
+rOLE.WriteStream(aStream);
+return true;
+}
+}
+
+CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifOle1PDF)
+{
+// Save to reqif-xhtml.
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"pdf-ole.odt";
+mxComponent = loadFromDesktop(aURL, "com.sun.star.text.TextDocument", {});
+
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+uno::Sequence aStoreProperties = {
+comphelper::makePropertyValue("FilterName", OUString("HTML 
(StarWriter)")),
+comphelper::makePropertyValue("FilterOptions", 
OUString("xhtmlns=reqif-xhtml")),
+};
+xStorable->storeToURL(maTempFile.GetURL(), aStoreProperties);
+
+// Get the .ole path.
+SvMemoryStream aStream;
+HtmlExportTest::wrapFragment(maTempFile, aStream);
+xmlDocPtr pDoc = parseXmlStream();
+CPPUNIT_ASSERT(pDoc);
+OUString aOlePath = getXPath(
+pDoc, 
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p/reqif-xhtml:object", "data");
+OUString aOleSuffix(".ole");
+CPPUNIT_ASSERT(aOlePath.endsWith(aOleSuffix));
+INetURLObject aUrl(maTempFile.GetURL());
+aUrl.setBase(aOlePath.copy(0, aOlePath.getLength() - 



[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - include/tools sw/source tools/source


2020-04-30

Thread
Miklos Vajna (via logerrit)

 include/tools/debug.hxx|6 +++---
 sw/source/uibase/sidebar/WrapPropertyPanel.cxx |8 
 tools/source/debug/debug.cxx   |4 
 3 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit af0678cc00aff2e2d375bc34dc77b27e9a27cf6a
Author: Miklos Vajna 
AuthorDate: Wed Dec 18 10:46:43 2019 +0100
Commit: Miklos Vajna 
CommitDate: Thu Apr 30 12:05:59 2020 +0200

tools: define DbgTestSolarMutex() unconditionally

See the discussion at , and
this came up on IRC today again.

The above change broke the invariant that you can mix product and debug
(but not dbgutil) builds. Restore this, without mandating dbgutil for
the solar mutex assert code, which is useful for plain debug builds as
well.

(cherry picked from commit fc761cb2cc343c0c0f3ca8a908a547603a029e36)

Conflicts:
tools/source/debug/debug.cxx

Change-Id: I1f8bdb114b129fc4f39f186ba917e35e346a16b5

diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx
index b66a9b2866ef..c72da4d06887 100644
--- a/include/tools/debug.hxx
+++ b/include/tools/debug.hxx
@@ -34,14 +34,14 @@
 standard assert.
 */
 
-#ifndef NDEBUG
-// we want the solar mutex checking to be enabled in the assert-enabled builds 
that the QA people use
-
 typedef void (*DbgTestSolarMutexProc)();
 
 TOOLS_DLLPUBLIC void DbgSetTestSolarMutex( DbgTestSolarMutexProc pParam );
 TOOLS_DLLPUBLIC void DbgTestSolarMutex();
 
+#ifndef NDEBUG
+// we want the solar mutex checking to be enabled in the assert-enabled builds 
that the QA people use
+
 #define DBG_TESTSOLARMUTEX()   \
 do \
 {  \
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index de4a14015044..fb2b0513c938 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -61,8 +61,6 @@
 #include 
 #endif
 
-#ifndef NDEBUG
-
 struct DebugData
 {
 DbgTestSolarMutexProc   pDbgTestSolarMutex;
@@ -93,8 +91,6 @@ void DbgTestSolarMutex()
 aDebugData.pDbgTestSolarMutex();
 }
 
-#endif
-
 static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any 
& caught)
 {
 auto toOString = [](OUString const & s) {
commit fdb48192a1234482631f243a4b9ea77af52364ef
Author: Miklos Vajna 
AuthorDate: Wed Dec 18 22:34:06 2019 +0100
Commit: Miklos Vajna 
CommitDate: Thu Apr 30 12:03:38 2020 +0200

sw lok: disable Edit Contour button in image sidebar

This can be enabled when the underlying dialog is OK under LOK.

Change-Id: Id74d20de55e77842d707e345b2193ca9113594e8
Reviewed-on: https://gerrit.libreoffice.org/85435
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit 803c3a7824883ccf7d0841aabff591c014d20195)

diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx 
b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index e596d8d8dc72..b9d01096a1f7 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 
 const char UNO_WRAPOFF[] = ".uno:WrapOff";
 const char UNO_WRAPLEFT[] = ".uno:WrapLeft";
@@ -148,6 +149,13 @@ void WrapPropertyPanel::Initialize()
 
 Link EditContourLink = LINK(this, WrapPropertyPanel, 
EditContourHdl);
 mpEditContour->SetClickHdl(EditContourLink);
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+// Disable Edit Contour button for LOK purposes.
+mpEditContour->Hide();
+}
+
 Link EnableContourLink = LINK(this,WrapPropertyPanel, 
EnableContourHdl);
 mpEnableContour->SetClickHdl(EnableContourLink);
 mpSpacingLB->SetSelectHdl(LINK(this, WrapPropertyPanel, SpacingLBHdl));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits





[Libreoffice-commits] core.git: extras/CustomTarget_tplpresnt.mk extras/source


2020-04-30

Thread
andreas kainz (via logerrit)

 dev/null   |binary
 extras/CustomTarget_tplpresnt.mk   |4 
 extras/source/templates/presnt/Forestbird/META-INF/manifest.xml|4 
 extras/source/templates/presnt/Forestbird/Thumbnails/thumbnail.png |binary
 extras/source/templates/presnt/Forestbird/content.xml  |   48 
 extras/source/templates/presnt/Forestbird/styles.xml   | 3510 
+-
 6 files changed, 3224 insertions(+), 342 deletions(-)

New commits:
commit 0d934971f920774c9783bd204fb4bc32d1adcb9a
Author: andreas kainz 
AuthorDate: Wed Apr 29 12:52:32 2020 +0200
Commit: andreas_kainz 
CommitDate: Thu Apr 30 13:48:40 2020 +0200

tdf#132138 Update Forestbird impress template

Change-Id: I86828af416941544b54ec4e9e65089184fb7e6fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93124
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk
index e4d5434d6bdc..ed99dcd5bb46 100644
--- a/extras/CustomTarget_tplpresnt.mk
+++ b/extras/CustomTarget_tplpresnt.mk
@@ -89,10 +89,6 @@ extras_PRESENTATIONS_XMLFILES := \
Forestbird/content.xml \
Forestbird/META-INF/manifest.xml \
Forestbird/meta.xml \
-   Forestbird/Pictures/13FB02FE917E6CB003A83232.png \
-   Forestbird/Pictures/13FD02FE4C4CDF0F4A7ED9F9.png \
-   Forestbird/Pictures/13FD02FE92464623A3FB3F6D.png \
-   Forestbird/Pictures/120103FC02FE87524FDDC56B0E9E.png \
Forestbird/styles.xml \
Forestbird/Thumbnails/thumbnail.png \
Impress/content.xml \
diff --git a/extras/source/templates/presnt/Forestbird/META-INF/manifest.xml 
b/extras/source/templates/presnt/Forestbird/META-INF/manifest.xml
index 6a0f4c3c6ca2..c3e1aec9147d 100644
--- a/extras/source/templates/presnt/Forestbird/META-INF/manifest.xml
+++ b/extras/source/templates/presnt/Forestbird/META-INF/manifest.xml
@@ -4,9 +4,5 @@
   
   
   
-  
-  
-  
-  
   
 
diff --git 
a/extras/source/templates/presnt/Forestbird/Pictures/13FB02FE917E6CB003A83232.png
 
b/extras/source/templates/presnt/Forestbird/Pictures/13FB02FE917E6CB003A83232.png
deleted file mode 100644
index 57c5275421e7..
Binary files 
a/extras/source/templates/presnt/Forestbird/Pictures/13FB02FE917E6CB003A83232.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/Forestbird/Pictures/13FD02FE4C4CDF0F4A7ED9F9.png
 
b/extras/source/templates/presnt/Forestbird/Pictures/13FD02FE4C4CDF0F4A7ED9F9.png
deleted file mode 100644
index d078803c4f35..
Binary files 
a/extras/source/templates/presnt/Forestbird/Pictures/13FD02FE4C4CDF0F4A7ED9F9.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/Forestbird/Pictures/13FD02FE92464623A3FB3F6D.png
 
b/extras/source/templates/presnt/Forestbird/Pictures/13FD02FE92464623A3FB3F6D.png
deleted file mode 100644
index 2513d670b976..
Binary files 
a/extras/source/templates/presnt/Forestbird/Pictures/13FD02FE92464623A3FB3F6D.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/Forestbird/Pictures/120103FC02FE87524FDDC56B0E9E.png
 
b/extras/source/templates/presnt/Forestbird/Pictures/120103FC02FE87524FDDC56B0E9E.png
deleted file mode 100644
index 7096691223bb..
Binary files 
a/extras/source/templates/presnt/Forestbird/Pictures/120103FC02FE87524FDDC56B0E9E.png
 and /dev/null differ
diff --git a/extras/source/templates/presnt/Forestbird/Thumbnails/thumbnail.png 
b/extras/source/templates/presnt/Forestbird/Thumbnails/thumbnail.png
index 318ca94ebdee..6d4c5a7d9ad5 100644
Binary files 
a/extras/source/templates/presnt/Forestbird/Thumbnails/thumbnail.png and 
b/extras/source/templates/presnt/Forestbird/Thumbnails/thumbnail.png differ
diff --git a/extras/source/templates/presnt/Forestbird/content.xml 
b/extras/source/templates/presnt/Forestbird/content.xml
index c82bf4d1dedc..61b7efa90af7 100644
--- a/extras/source/templates/presnt/Forestbird/content.xml
+++ b/extras/source/templates/presnt/Forestbird/content.xml
@@ -1,5 +1,5 @@
 
-http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" x
 



[Libreoffice-commits] core.git: extras/CustomTarget_tplpresnt.mk extras/source


2020-04-30

Thread
andreas kainz (via logerrit)

 dev/null   |binary
 extras/CustomTarget_tplpresnt.mk   |4 
 extras/source/templates/presnt/Vivid/META-INF/manifest.xml |4 
 extras/source/templates/presnt/Vivid/content.xml   |   70 -
 extras/source/templates/presnt/Vivid/styles.xml|  537 -
 5 files changed, 381 insertions(+), 234 deletions(-)

New commits:
commit 777f53503121e21ea6a584d0578b3e3eee2ed3fa
Author: andreas kainz 
AuthorDate: Wed Apr 29 13:15:57 2020 +0200
Commit: andreas_kainz 
CommitDate: Thu Apr 30 13:48:58 2020 +0200

tdf#132138 Update Vivid impress template

Change-Id: Id35a95abe8fd38a4ac284de384c01a7e3a528c81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93146
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk
index ed99dcd5bb46..917763f59146 100644
--- a/extras/CustomTarget_tplpresnt.mk
+++ b/extras/CustomTarget_tplpresnt.mk
@@ -184,10 +184,6 @@ extras_PRESENTATIONS_XMLFILES := \
Vivid/content.xml \
Vivid/META-INF/manifest.xml \
Vivid/meta.xml \
-   Vivid/Pictures/102000204B249CA79A42C6D7.png \
-   Vivid/Pictures/14F90322783ADE15FCCE3CBA.png \
-   Vivid/Pictures/14F90322B6E66A5FF68F74A7.png \
-   Vivid/Pictures/1555035C66CD1AA3E88406D5.png \
Vivid/styles.xml \
Vivid/Thumbnails/thumbnail.png \
 
diff --git a/extras/source/templates/presnt/Vivid/META-INF/manifest.xml 
b/extras/source/templates/presnt/Vivid/META-INF/manifest.xml
index e547f53abe9e..c3e1aec9147d 100644
--- a/extras/source/templates/presnt/Vivid/META-INF/manifest.xml
+++ b/extras/source/templates/presnt/Vivid/META-INF/manifest.xml
@@ -4,9 +4,5 @@
   
   
   
-  
-  
-  
-  
   
 
diff --git 
a/extras/source/templates/presnt/Vivid/Pictures/102000204B249CA79A42C6D7.png
 
b/extras/source/templates/presnt/Vivid/Pictures/102000204B249CA79A42C6D7.png
deleted file mode 100644
index 45b401dc6037..
Binary files 
a/extras/source/templates/presnt/Vivid/Pictures/102000204B249CA79A42C6D7.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/Vivid/Pictures/14F90322783ADE15FCCE3CBA.png
 
b/extras/source/templates/presnt/Vivid/Pictures/14F90322783ADE15FCCE3CBA.png
deleted file mode 100644
index dc4b005c6540..
Binary files 
a/extras/source/templates/presnt/Vivid/Pictures/14F90322783ADE15FCCE3CBA.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/Vivid/Pictures/14F90322B6E66A5FF68F74A7.png
 
b/extras/source/templates/presnt/Vivid/Pictures/14F90322B6E66A5FF68F74A7.png
deleted file mode 100644
index 68d81d8e7df6..
Binary files 
a/extras/source/templates/presnt/Vivid/Pictures/14F90322B6E66A5FF68F74A7.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/Vivid/Pictures/1555035C66CD1AA3E88406D5.png
 
b/extras/source/templates/presnt/Vivid/Pictures/1555035C66CD1AA3E88406D5.png
deleted file mode 100644
index 80d1d0b55893..
Binary files 
a/extras/source/templates/presnt/Vivid/Pictures/1555035C66CD1AA3E88406D5.png
 and /dev/null differ
diff --git a/extras/source/templates/presnt/Vivid/content.xml 
b/extras/source/templates/presnt/Vivid/content.xml
index 262fb7b8e3be..8d0758e2d560 100644
--- a/extras/source/templates/presnt/Vivid/content.xml
+++ b/extras/source/templates/presnt/Vivid/content.xml
@@ -1,5 +1,5 @@
 
-http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" x
 mlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 




[Libreoffice-commits] core.git: extras/CustomTarget_tplpresnt.mk extras/source


2020-04-30

Thread
andreas kainz (via logerrit)

 dev/null   |binary
 extras/CustomTarget_tplpresnt.mk   |2 
 extras/source/templates/presnt/Lights/META-INF/manifest.xml|2 
 extras/source/templates/presnt/Lights/Thumbnails/thumbnail.png |binary
 extras/source/templates/presnt/Lights/content.xml  |   45 
 extras/source/templates/presnt/Lights/styles.xml   |  715 
+++---
 6 files changed, 555 insertions(+), 209 deletions(-)

New commits:
commit dfaa749f048150945eb144694ef2b6de829f4423
Author: andreas kainz 
AuthorDate: Wed Apr 29 14:48:24 2020 +0200
Commit: andreas_kainz 
CommitDate: Thu Apr 30 13:50:47 2020 +0200

tdf#132138 Lights impress template

Change-Id: Iac9ce595ecf98f1957ff829a2090f5a712ead144
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93156
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk
index 327270628485..9b64daecef27 100644
--- a/extras/CustomTarget_tplpresnt.mk
+++ b/extras/CustomTarget_tplpresnt.mk
@@ -104,8 +104,6 @@ extras_PRESENTATIONS_XMLFILES := \
Lights/content.xml \
Lights/META-INF/manifest.xml \
Lights/meta.xml \
-   Lights/Pictures/14210319935403CE7B0BE43B.jpg \
-   Lights/Pictures/142300634B59AC09AB41D853.jpg \
Lights/styles.xml \
Lights/Thumbnails/thumbnail.png \
LushGreen/content.xml \
diff --git a/extras/source/templates/presnt/Lights/META-INF/manifest.xml 
b/extras/source/templates/presnt/Lights/META-INF/manifest.xml
index 8b0b35fea86c..c3e1aec9147d 100644
--- a/extras/source/templates/presnt/Lights/META-INF/manifest.xml
+++ b/extras/source/templates/presnt/Lights/META-INF/manifest.xml
@@ -4,7 +4,5 @@
   
   
   
-  
-  
   
 
diff --git 
a/extras/source/templates/presnt/Lights/Pictures/14210319935403CE7B0BE43B.jpg
 
b/extras/source/templates/presnt/Lights/Pictures/14210319935403CE7B0BE43B.jpg
deleted file mode 100644
index 0a4098e8e5a0..
Binary files 
a/extras/source/templates/presnt/Lights/Pictures/14210319935403CE7B0BE43B.jpg
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/Lights/Pictures/142300634B59AC09AB41D853.jpg
 
b/extras/source/templates/presnt/Lights/Pictures/142300634B59AC09AB41D853.jpg
deleted file mode 100644
index 2c2b346062dc..
Binary files 
a/extras/source/templates/presnt/Lights/Pictures/142300634B59AC09AB41D853.jpg
 and /dev/null differ
diff --git a/extras/source/templates/presnt/Lights/Thumbnails/thumbnail.png 
b/extras/source/templates/presnt/Lights/Thumbnails/thumbnail.png
index c6866a45147e..d879ab66548b 100644
Binary files a/extras/source/templates/presnt/Lights/Thumbnails/thumbnail.png 
and b/extras/source/templates/presnt/Lights/Thumbnails/thumbnail.png differ
diff --git a/extras/source/templates/presnt/Lights/content.xml 
b/extras/source/templates/presnt/Lights/content.xml
index 57632545ca9f..fe744f9529d8 100644
--- a/extras/source/templates/presnt/Lights/content.xml
+++ b/extras/source/templates/presnt/Lights/content.xml
@@ -1,5 +1,5 @@
 
-http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" x
 mlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:loext="urn:org:documentfoundation:
 names:experimental:office:xmlns:loext:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 




[Libreoffice-commits] core.git: extras/source


2020-04-30

Thread
andreas kainz (via logerrit)

 extras/source/templates/presnt/Progress/Thumbnails/thumbnail.png |binary
 extras/source/templates/presnt/Progress/content.xml  |  106 -
 extras/source/templates/presnt/Progress/styles.xml   |  571 
+-
 3 files changed, 356 insertions(+), 321 deletions(-)

New commits:
commit 9c67355fe438c2c8ebc61b170e102dc9dbfd7448
Author: andreas kainz 
AuthorDate: Wed Apr 29 14:55:01 2020 +0200
Commit: andreas_kainz 
CommitDate: Thu Apr 30 13:51:06 2020 +0200

tdf#132138 Update Progress impress template

Change-Id: I23f18f9a9cd18b0104541050900a3a84bb545e4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93157
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/extras/source/templates/presnt/Progress/Thumbnails/thumbnail.png 
b/extras/source/templates/presnt/Progress/Thumbnails/thumbnail.png
index 67708b51b2d6..9b256a660a97 100644
Binary files a/extras/source/templates/presnt/Progress/Thumbnails/thumbnail.png 
and b/extras/source/templates/presnt/Progress/Thumbnails/thumbnail.png differ
diff --git a/extras/source/templates/presnt/Progress/content.xml 
b/extras/source/templates/presnt/Progress/content.xml
index d807c26a8936..d6b309fcdb04 100644
--- a/extras/source/templates/presnt/Progress/content.xml
+++ b/extras/source/templates/presnt/Progress/content.xml
@@ -1,5 +1,5 @@
 
-http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" x
 mlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:loext="urn:org:documentfoundation:
 names:experimental:office:xmlns:loext:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:css3t="http://www.w3.org/TR/css3-text/; office:version="1.2">
+http://openoffice.org/2004/office; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; x
 mlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xhtml="http://www.w3.org/1999/xhtml; 




[Libreoffice-commits] core.git: extras/CustomTarget_tplpresnt.mk extras/source


2020-04-30

Thread
andreas kainz (via logerrit)

 dev/null  |binary
 extras/CustomTarget_tplpresnt.mk  |4 
 extras/source/templates/presnt/LushGreen/META-INF/manifest.xml|4 
 extras/source/templates/presnt/LushGreen/Thumbnails/thumbnail.png |binary
 extras/source/templates/presnt/LushGreen/content.xml  |   41 
 extras/source/templates/presnt/LushGreen/styles.xml   |  654 
++
 6 files changed, 433 insertions(+), 270 deletions(-)

New commits:
commit 23d2f9c571baf4165c9aa3b81f32073f70045ead
Author: andreas kainz 
AuthorDate: Wed Apr 29 14:15:28 2020 +0200
Commit: andreas_kainz 
CommitDate: Thu Apr 30 13:49:33 2020 +0200

tdf#132138 Update Lush Green impress template

Change-Id: I52e3480ded1892fb29c1b4a0537235d1af52370b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93153
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk
index 917763f59146..327270628485 100644
--- a/extras/CustomTarget_tplpresnt.mk
+++ b/extras/CustomTarget_tplpresnt.mk
@@ -111,10 +111,6 @@ extras_PRESENTATIONS_XMLFILES := \
LushGreen/content.xml \
LushGreen/META-INF/manifest.xml \
LushGreen/meta.xml \
-   LushGreen/Pictures/1201064004AD17A4D9F0A443E0A2.png \
-   LushGreen/Pictures/1201064004AD5A95F4B7B86B2ED1.png \
-   LushGreen/Pictures/1201064004AD88FC52DBCACCDD82.png \
-   LushGreen/Pictures/1201064004ADF67714D670705C1E.png \
LushGreen/styles.xml \
LushGreen/Thumbnails/thumbnail.png \
Metropolis/content.xml \
diff --git a/extras/source/templates/presnt/LushGreen/META-INF/manifest.xml 
b/extras/source/templates/presnt/LushGreen/META-INF/manifest.xml
index 7b5a057cb022..c3e1aec9147d 100644
--- a/extras/source/templates/presnt/LushGreen/META-INF/manifest.xml
+++ b/extras/source/templates/presnt/LushGreen/META-INF/manifest.xml
@@ -4,9 +4,5 @@
   
   
   
-  
-  
-  
-  
   
 
diff --git 
a/extras/source/templates/presnt/LushGreen/Pictures/1201064004AD17A4D9F0A443E0A2.png
 
b/extras/source/templates/presnt/LushGreen/Pictures/1201064004AD17A4D9F0A443E0A2.png
deleted file mode 100644
index 41405c76b23a..
Binary files 
a/extras/source/templates/presnt/LushGreen/Pictures/1201064004AD17A4D9F0A443E0A2.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/LushGreen/Pictures/1201064004AD5A95F4B7B86B2ED1.png
 
b/extras/source/templates/presnt/LushGreen/Pictures/1201064004AD5A95F4B7B86B2ED1.png
deleted file mode 100644
index f9b3db2c6b9d..
Binary files 
a/extras/source/templates/presnt/LushGreen/Pictures/1201064004AD5A95F4B7B86B2ED1.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/LushGreen/Pictures/1201064004AD88FC52DBCACCDD82.png
 
b/extras/source/templates/presnt/LushGreen/Pictures/1201064004AD88FC52DBCACCDD82.png
deleted file mode 100644
index c944e1412f5b..
Binary files 
a/extras/source/templates/presnt/LushGreen/Pictures/1201064004AD88FC52DBCACCDD82.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/LushGreen/Pictures/1201064004ADF67714D670705C1E.png
 
b/extras/source/templates/presnt/LushGreen/Pictures/1201064004ADF67714D670705C1E.png
deleted file mode 100644
index f47278d6d4a5..
Binary files 
a/extras/source/templates/presnt/LushGreen/Pictures/1201064004ADF67714D670705C1E.png
 and /dev/null differ
diff --git a/extras/source/templates/presnt/LushGreen/Thumbnails/thumbnail.png 
b/extras/source/templates/presnt/LushGreen/Thumbnails/thumbnail.png
index 417ed9e92f7b..df2f638beb84 100644
Binary files 
a/extras/source/templates/presnt/LushGreen/Thumbnails/thumbnail.png and 
b/extras/source/templates/presnt/LushGreen/Thumbnails/thumbnail.png differ
diff --git a/extras/source/templates/presnt/LushGreen/content.xml 
b/extras/source/templates/presnt/LushGreen/content.xml
index 2e339f492b0d..7b89816c2079 100644
--- a/extras/source/templates/presnt/LushGreen/content.xml
+++ b/extras/source/templates/presnt/LushGreen/content.xml
@@ -1,28 +1,31 @@
 
-http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" x
 mlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 




[Libreoffice-commits] core.git: sc/qa sc/source


2020-04-30

Thread
Noel Grandin (via logerrit)

 sc/qa/unit/helper/xpath.cxx  |6 
 sc/qa/unit/helper/xpath.hxx  |2 
 sc/qa/unit/subsequent_export-test.cxx|2 
 sc/source/core/data/dpfilteredcache.cxx  |3 
 sc/source/core/data/dpobject.cxx |2 
 sc/source/core/opencl/formulagroupcl.cxx |  502 +++
 sc/source/core/tool/interpr4.cxx |2 
 sc/source/filter/excel/xeescher.cxx  |2 
 sc/source/filter/excel/xichart.cxx   |6 
 sc/source/filter/inc/xeescher.hxx|2 
 sc/source/filter/xml/xmlbodyi.cxx|2 
 sc/source/filter/xml/xmlnexpi.cxx|4 
 sc/source/filter/xml/xmlnexpi.hxx|2 
 sc/source/filter/xml/xmltabi.cxx |2 
 sc/source/ui/attrdlg/scdlgfact.cxx   |   40 +-
 sc/source/ui/attrdlg/scdlgfact.hxx   |   10 
 sc/source/ui/cctrl/checklistmenu.cxx |1 
 sc/source/ui/docshell/docfuncutil.cxx|4 
 sc/source/ui/docshell/docsh4.cxx |2 
 sc/source/ui/docshell/tablink.cxx|4 
 sc/source/ui/inc/docfuncutil.hxx |2 
 sc/source/ui/inc/tabvwsh.hxx |2 
 sc/source/ui/miscdlgs/retypepassdlg.cxx  |1 
 sc/source/ui/view/tabvwsha.cxx   |6 
 sc/source/ui/view/tabvwshc.cxx   |   78 ++--
 25 files changed, 344 insertions(+), 345 deletions(-)

New commits:
commit 5efd34eabcbd374f0f06cac12b7b25f955db7965
Author: Noel Grandin 
AuthorDate: Thu Apr 30 11:29:34 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 30 12:21:50 2020 +0200

loplugin:makeshared in sc

Change-Id: I512d05ea24c519c25f03a35842e362bf23f05693
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93198
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/qa/unit/helper/xpath.cxx b/sc/qa/unit/helper/xpath.cxx
index 49a3dda04cc8..99095798939d 100644
--- a/sc/qa/unit/helper/xpath.cxx
+++ b/sc/qa/unit/helper/xpath.cxx
@@ -26,19 +26,19 @@ xmlDocPtr XPathHelper::parseExport2(ScBootstrapFixture & 
rFixture, ScDocShell& r
 return parseExport(pTempFile, xSFactory, rFile);
 }
 
-std::shared_ptr 
XPathHelper::parseExportStream(std::shared_ptr const & 
pTempFile, uno::Reference const & xSFactory, const 
OUString& rFile)
+std::unique_ptr 
XPathHelper::parseExportStream(std::shared_ptr const & 
pTempFile, uno::Reference const & xSFactory, const 
OUString& rFile)
 {
 // Read the XML stream we're interested in.
 uno::Reference xNameAccess = 
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(xSFactory),
 pTempFile->GetURL());
 uno::Reference 
xInputStream(xNameAccess->getByName(rFile), uno::UNO_QUERY);
 CPPUNIT_ASSERT(xInputStream.is());
-std::shared_ptr 
pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
+std::unique_ptr 
pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
 return pStream;
 }
 
 xmlDocPtr XPathHelper::parseExport(std::shared_ptr const & 
pTempFile, uno::Reference const & xSFactory, const 
OUString& rFile)
 {
-std::shared_ptr pStream = parseExportStream(pTempFile, 
xSFactory, rFile);
+std::unique_ptr pStream = parseExportStream(pTempFile, 
xSFactory, rFile);
 return XmlTestTools::parseXmlStream(pStream.get());
 }
 
diff --git a/sc/qa/unit/helper/xpath.hxx b/sc/qa/unit/helper/xpath.hxx
index 16d0fec07f25..d46e2e85da80 100644
--- a/sc/qa/unit/helper/xpath.hxx
+++ b/sc/qa/unit/helper/xpath.hxx
@@ -46,7 +46,7 @@ namespace XPathHelper
 /**
  * Tries to parse the specified file in the temp file zip container as a 
binary file.
  */
-SCQAHELPER_DLLPUBLIC std::shared_ptr 
parseExportStream(std::shared_ptr const & pTempFile,
+SCQAHELPER_DLLPUBLIC std::unique_ptr 
parseExportStream(std::shared_ptr const & pTempFile,
 uno::Reference const & xSFactory, 
const OUString& rFile);
 
 /**
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 9ebe6e00ba39..9493ede62556 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -3136,7 +3136,7 @@ void ScExportTest::testCustomXml()
 assertXPath(pRelsDoc, "/r:Relationships/r:Relationship", 1);
 assertXPath(pRelsDoc, "/r:Relationships/r:Relationship[@Id='rId1']", 
"Target", "itemProps1.xml");
 
-std::shared_ptr pStream = 
XPathHelper::parseExportStream(pXPathFile, m_xSFactory, "ddp/ddpfile.xen");
+std::unique_ptr pStream = 
XPathHelper::parseExportStream(pXPathFile, m_xSFactory, "ddp/ddpfile.xen");
 CPPUNIT_ASSERT(pStream);
 
 xShell->DoClose();
diff --git a/sc/source/core/data/dpfilteredcache.cxx 
b/sc/source/core/data/dpfilteredcache.cxx
index a95144ee5f9a..16e11c183b83 100644
--- a/sc/source/core/data/dpfilteredcache.cxx
+++ b/sc/source/core/data/dpfilteredcache.cxx
@@ -71,8 +71,7 @@ size_t ScDPFilteredCache::GroupFilter::getMatchItemCount() 
const
 }
 
 ScDPFilteredCache::Criterion::Criterion() :
-mnFieldIndex(-1),
-



[Libreoffice-commits] core.git: icon-themes/colibre instsetoo_native/inc_common setup_native/source


2020-04-30

Thread
Heiko Tietze (via logerrit)

 icon-themes/colibre/brand/flat_logo.svg | 1187 
--
 icon-themes/colibre/brand/intro-highres.png |binary
 icon-themes/colibre/brand/intro.png |binary
 icon-themes/colibre/brand/shell/logo.svg|  116 
 icon-themes/colibre/brand/shell/logo_inverted.svg   |  114 
 icon-themes/colibre/brand_dev/intro-highres.png |binary
 icon-themes/colibre/brand_dev/intro.png |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp  |binary
 setup_native/source/packinfo/osxdndinstall.png  |binary
 10 files changed, 31 insertions(+), 1386 deletions(-)

New commits:
commit 492675180203b3409074923d7993429237611f99
Author: Heiko Tietze 
AuthorDate: Thu Apr 30 11:38:23 2020 +0200
Commit: Heiko Tietze 
CommitDate: Thu Apr 30 12:27:00 2020 +0200

Resolves tdf#130778 - Branding for 7.0

Remaining installer images added
TDF tagline removed
White background on all splash screens

Change-Id: Iafde896fd3ed58957ec16ba43565c56e85db925c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93199
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/icon-themes/colibre/brand/flat_logo.svg 
b/icon-themes/colibre/brand/flat_logo.svg
deleted file mode 100644
index dc9279be615f..
--- a/icon-themes/colibre/brand/flat_logo.svg
+++ /dev/null
@@ -1,1187 +0,0 @@
-
-http://xml.openoffice.org/svg/export;
-   xmlns:dc="http://purl.org/dc/elements/1.1/;
-   xmlns:cc="http://creativecommons.org/ns#;
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#;
-   xmlns:svg="http://www.w3.org/2000/svg;
-   xmlns="http://www.w3.org/2000/svg;
-   xmlns:xlink="http://www.w3.org/1999/xlink;
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd;
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape;
-   version="1.2"
-   width="171.45mm"
-   height="28.22mm"
-   viewBox="0 0 17145 2822"
-   preserveAspectRatio="xMidYMid"
-   fill-rule="evenodd"
-   stroke-width="28.222"
-   stroke-linejoin="round"
-   xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   sodipodi:docname="flat_logo.svg">image/svg+xmlhttp://purl.org/dc/dcmitype/StillImage; 
/>https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits





[Libreoffice-commits] core.git: sw/inc sw/qa sw/source


2020-04-30

Thread
Noel Grandin (via logerrit)

 sw/inc/format.hxx   |2 -
 sw/qa/inc/swmodeltestbase.hxx   |6 +--
 sw/source/core/attr/format.cxx  |6 +--
 sw/source/core/docnode/ndtbl1.cxx   |2 -
 sw/source/core/inc/unoparaframeenum.hxx |4 +-
 sw/source/core/unocore/unoframe.cxx |2 -
 sw/source/core/unocore/unoobj2.cxx  |4 +-
 sw/source/filter/basflt/fltini.cxx  |2 -
 sw/source/filter/basflt/fltshell.cxx|4 +-
 sw/source/filter/inc/fltshell.hxx   |2 -
 sw/source/filter/ww8/docxexport.cxx |4 +-
 sw/source/filter/ww8/rtfexport.cxx  |2 -
 sw/source/filter/ww8/wrtww8.cxx |9 ++---
 sw/source/filter/ww8/wrtww8.hxx |2 -
 sw/source/filter/ww8/ww8par.cxx |6 +--
 sw/source/filter/ww8/ww8par5.cxx|2 -
 sw/source/filter/ww8/ww8par6.cxx|2 -
 sw/source/ui/dialog/swdlgfact.cxx   |   50 ++--
 sw/source/ui/dialog/swdlgfact.hxx   |   22 ++--
 sw/source/uibase/inc/swrenamexnameddlg.hxx  |4 +-
 sw/source/uibase/shells/frmsh.cxx   |6 +--
 sw/source/uibase/shells/tabsh.cxx   |4 +-
 sw/source/uibase/shells/textsh.cxx  |2 -
 sw/source/uibase/uiview/formatclipboard.cxx |9 ++---
 sw/source/uibase/uiview/viewtab.cxx |2 -
 25 files changed, 78 insertions(+), 82 deletions(-)

New commits:
commit e00c87caa399d37426d839f5264a747c115d0b12
Author: Noel Grandin 
AuthorDate: Thu Apr 30 12:22:14 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 30 13:14:32 2020 +0200

loplugin:makeshared in sw

Change-Id: I58d91e75ef96beaab7ec34df519ae3a376dce976
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93201
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 8a8c984ec58f..b0025beb7958 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -96,7 +96,7 @@ public:
 }
 SfxItemState GetItemState( sal_uInt16 nWhich, bool bSrchInParent = true,
 const SfxPoolItem **ppItem = nullptr ) 
const;
-SfxItemState GetBackgroundState(std::shared_ptr& rItem) 
const;
+SfxItemState GetBackgroundState(std::unique_ptr& rItem) 
const;
 virtual bool SetFormatAttr( const SfxPoolItem& rAttr );
 virtual bool SetFormatAttr( const SfxItemSet& rSet );
 virtual bool ResetFormatAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx
index dcc7b6a146c1..60b652c59b77 100644
--- a/sw/qa/inc/swmodeltestbase.hxx
+++ b/sw/qa/inc/swmodeltestbase.hxx
@@ -937,19 +937,19 @@ protected:
 return parseXmlStream(maTempFile.GetStream(StreamMode::READ));
 }
 
-std::shared_ptr parseExportStream(const OUString& url, const 
OUString& rStreamName)
+std::unique_ptr parseExportStream(const OUString& url, const 
OUString& rStreamName)
 {
 // Read the stream we're interested in.
 uno::Reference xNameAccess = 
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
 url);
 uno::Reference 
xInputStream(xNameAccess->getByName(rStreamName), uno::UNO_QUERY);
 CPPUNIT_ASSERT(xInputStream.is());
-std::shared_ptr 
pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
+std::unique_ptr 
pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
 return pStream;
 }
 
 xmlDocPtr parseExportInternal(const OUString& url, const OUString& 
rStreamName)
 {
-std::shared_ptr pStream(parseExportStream(url, rStreamName));
+std::unique_ptr pStream(parseExportStream(url, rStreamName));
 
 xmlDocPtr pXmlDoc = parseXmlStream(pStream.get());
 pXmlDoc->name = reinterpret_cast(xmlStrdup(reinterpret_cast(OUStringToOString(url, 
RTL_TEXTENCODING_UTF8).getStr(;
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index c856abb50b34..30f72d7fc3ac 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -380,7 +380,7 @@ const SfxPoolItem& SwFormat::GetFormatAttr( sal_uInt16 
nWhich, bool bInParents )
 {
 // FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST 
.. XATTR_FILL_LAST]
 SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use 
[XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes or makeBackgroundBrushItem 
(simple fallback is in place and used)");
-static std::shared_ptr aSvxBrushItem; 
//(std::make_shared(RES_BACKGROUND));
+static std::unique_ptr aSvxBrushItem; 
//(std::make_shared(RES_BACKGROUND));
 
 // fill the local static SvxBrushItem from the current ItemSet so that
 // the fill attributes [XATTR_FILL_FIRST .. XATTR_FILL_LAST] are used
@@ -407,7 +407,7 @@ SfxItemState SwFormat::GetItemState( sal_uInt16 



[Libreoffice-bugs] [Bug 132561] New: Export of jpeg or png from Draw shows white/light-grey shadow


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=132561

Bug ID: 132561
   Summary: Export of jpeg or png from Draw shows white/light-grey
shadow
   Product: LibreOffice
   Version: unspecified
  Hardware: x86-64 (AMD64)
OS: Windows (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Draw
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: doll.ge...@gmail.com

Description:
I have a draw document. It contains some imported jpegs and text fields with
shadow. All items are grouped to one object. When I export this object to jpeg
or to png the resulting file shows a light grey placeholder instead of the
shadow in the original object. Export as gif (for testing) shows the shadow as
expected. I use the latest version 6.3.6.2  (x64) on Windows 10 Pro.

Steps to Reproduce:
1. Open new Draw Document
2. Import dark jpeg
3. Create a text field within this jpeg
4. Write some text, add shadow
5. Group both items
6. Export this group as selection and jpeg

Actual Results:
I see get an jpeg with light grey placeholders where a shadow is expected

Expected Results:
jpeg with proper dark shadow


Reproducible: Always


User Profile Reset: Yes


OpenGL enabled: Yes

Additional Info:
I have already uninstalled LibreOffice, deleted all folders in programs and
appdata, restarted the pc and made a blank new installation with no change in
the result.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 129206] Macro is not always run & produce pdf file


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=129206

Buovjaga  changed:

   What|Removed |Added

 CC||ilmari.lauhakangas@libreoff
   ||ice.org
 Ever confirmed|0   |1
 Status|UNCONFIRMED |NEEDINFO

--- Comment #4 from Buovjaga  ---
I ran the macro (after changing the paths to the input/output files), but I get
this error:
BASIC runtime error.
An exception occurred 
Type: com.sun.star.util.CloseVetoException
Message: Controller disagree 

Pointing to line 304:
oDoc.close(False)

Watermark dialog is left open.

Please advise.

Arch Linux 64-bit
Version: 7.0.0.0.alpha0+
Build ID: 623d6cf06ccba392c1993a3b0ad271d508205e73
CPU threads: 8; OS: Linux 5.6; UI render: default; VCL: kf5; 
Locale: fi-FI (fi_FI.UTF-8); UI-Language: en-US
Calc: threaded
Built on 29 April 2020

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 34355] Option to show track changes in margin is missing


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=34355

lyricsmin  changed:

   What|Removed |Added

URL||https://www.lyricsmin.com/

--- Comment #144 from lyricsmin  ---
Brilliantly composed article, if just all bloggers offered a similar substance
as you, the web would be an obviously better placehttps

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 129826] Storing language based user defined format codes of cells does not work for color code based entries.


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=129826

Buovjaga  changed:

   What|Removed |Added

 Ever confirmed|0   |1
Version|6.2.8.2 release |Inherited From OOo
 Status|UNCONFIRMED |NEW
 CC||ilmari.lauhakangas@libreoff
   ||ice.org
 OS|Mac OS X (All)  |All
 Blocks||107575

--- Comment #6 from Buovjaga  ---
Repro, already in 3.3.0 (Win 10)

[FARBE22]"+"#.##0,00 [$€-407];[ROT]-#.##0,00 [$€-407]

Arch Linux 64-bit
Version: 7.0.0.0.alpha0+
Build ID: 623d6cf06ccba392c1993a3b0ad271d508205e73
CPU threads: 8; OS: Linux 5.6; UI render: default; VCL: kf5; 
Locale: fi-FI (fi_FI.UTF-8); UI-Language: en-US
Calc: threaded
Built on 29 April 2020


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=107575
[Bug 107575] [META] Number format bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 107575] [META] Number format bugs and enhancements


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=107575

Buovjaga  changed:

   What|Removed |Added

 Depends on||129826


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=129826
[Bug 129826] Storing language based user defined format codes of cells does not
work for color code based entries.
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-ux-advise] [Bug 132398] Adopt new application icons for LibreOffice 7.0


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=132398

--- Comment #17 from Kenneth Hanson  ---
I really like the current icons, and I would prefer to see someone create
filled versions in the style of the current white icons, than to adopt a new
set of filled icons or replace the white icons.

More generally, I dislike the current trend of constantly changing application
icons in the name of fashion. Whatever is fashionable now will soon become
outdated and need to be replaced again. I think it's better to maintain a
consistent, recognizable style.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Libreoffice-ux-advise mailing list
Libreoffice-ux-advise@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise





[Libreoffice-bugs] [Bug 87740] [META] Anchor and text wrapping bugs and enhancements


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=87740

Telesto  changed:

   What|Removed |Added

 Depends on||132263


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=132263
[Bug 132263] Image moves around a lot when changing anchor
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 132276] Undo doesn't work properly for moving an image/frame


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=132276

Telesto  changed:

   What|Removed |Added

 Blocks||87740


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=87740
[Bug 87740] [META] Anchor and text wrapping bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 87740] [META] Anchor and text wrapping bugs and enhancements


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=87740

Telesto  changed:

   What|Removed |Added

 Depends on||132535


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=132535
[Bug 132535] Changing anchor to character and moving the image is
slow/unresponsive
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 132398] Adopt new application icons for LibreOffice 7.0


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=132398

--- Comment #17 from Kenneth Hanson  ---
I really like the current icons, and I would prefer to see someone create
filled versions in the style of the current white icons, than to adopt a new
set of filled icons or replace the white icons.

More generally, I dislike the current trend of constantly changing application
icons in the name of fashion. Whatever is fashionable now will soon become
outdated and need to be replaced again. I think it's better to maintain a
consistent, recognizable style.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 129897] Menus positioned incorrectly on joined multi-monitor displays of different dimensions


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=129897

Buovjaga  changed:

   What|Removed |Added

 Whiteboard| QA:needsComment|
 CC||ilmari.lauhakangas@libreoff
   ||ice.org

--- Comment #2 from Buovjaga  ---
Is there a difference, if you log into a Wayland session?

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 87740] [META] Anchor and text wrapping bugs and enhancements


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=87740

Telesto  changed:

   What|Removed |Added

 Depends on||132259


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=132259
[Bug 132259] Text distribution with 'anchor to character' questionable
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 87740] [META] Anchor and text wrapping bugs and enhancements


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=87740

Telesto  changed:

   What|Removed |Added

 Depends on||132231


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=132231
[Bug 132231] Undo creates multiple empty paragraphs
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 132231] Undo creates multiple empty paragraphs


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=132231

Telesto  changed:

   What|Removed |Added

 Blocks||87740


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=87740
[Bug 87740] [META] Anchor and text wrapping bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 132259] Text distribution with 'anchor to character' questionable


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=132259

Telesto  changed:

   What|Removed |Added

 Blocks||87740


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=87740
[Bug 87740] [META] Anchor and text wrapping bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 87740] [META] Anchor and text wrapping bugs and enhancements


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=87740

Telesto  changed:

   What|Removed |Added

 Depends on||132225


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=132225
[Bug 132225] Page flow isn't updated after paste image and Undo (with image
anchored as character)
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 132533] Wrong position after undo of Anchor as character


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=132533

Telesto  changed:

   What|Removed |Added

 Blocks||105948


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=105948
[Bug 105948] [META] Undo/Redo bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 132225] Page flow isn't updated after paste image and Undo (with image anchored as character)


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=132225

Telesto  changed:

   What|Removed |Added

 Blocks||87740


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=87740
[Bug 87740] [META] Anchor and text wrapping bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 131956] Crash on file reload after file recovery


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=131956

Telesto  changed:

   What|Removed |Added

Crash report or||[mergedlo.dll]
crash signature||

--- Comment #5 from Telesto  ---
Not with
Versie: 6.1.6.3
Build ID: 5896ab1714085361c45cf540f76f60673dd96a72
CPU-threads: 4; Besturingssysteem: Windows 6.3; UI-render: GL; 
Locale: nl-NL (nl_NL); Calc: CL

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 132361] Missing keyt in certificate window.


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=132361

--- Comment #18 from Julien Nabet  ---
Created attachment 160140
  --> https://bugs.documentfoundation.org/attachment.cgi?id=160140=edit
Screenshot after having clicked "Sign Document..."

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 129092] The font Times New Roman:dlig does not create ligatures


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=129092

--- Comment #13 from Buovjaga  ---
(In reply to mkassler from comment #4)
> Created attachment 156839 [details]
> Page showing Writer's failure to create ligatures

No problem here

Version: 7.0.0.0.alpha0+ (x64)Build ID:
5063669a17538ea353e34ab0990363399d34f4f4CPU threads: 4; OS: Windows 10.0 Build
18362; UI render: default; VCL: win; Locale: fi-FI (fi_FI); UI-Language:
en-USCalc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 132552] layout changed after reopen


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=132552

Bart  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEEDINFO
 CC||bart...@tushmail.com
 Ever confirmed|0   |1

--- Comment #4 from Bart  ---
Hi Ulf,

I'd like to reproduce the result that you had and that works best if I use the
LibreOffice version that you also have, or if I use a version close to yours.

If you start LibreOffice and click
   Help -> About LibreOffice
then what version do you get?

It's best if you can copy the text there and paste it here.

Also, if you let me know which parts you removed in document "LE 5_0
Arbeitsauftrage.odt", then I can better recreate the steps that you took and
try to get to the same result. 

PS: 
- I'm not a developer. I submitted a few bugs/reports myself and I'm trying to
confirm the bugs that other people reported here.
- Filename "LE 5_0 Arbeitsauftrage.odt" probably had a few characters more when
you saved it. Because I work with Windows and Linux on one system, and because
they have different rules for the characters allowed in filenames, I often
remove special characters and characters with accents in filenames just before
saving a file. ;-)

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 129702] [UI] Smart tags wrongly listed in AutoCorrect options dialog


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=129702

Buovjaga  changed:

   What|Removed |Added

 CC||ilmari.lauhakangas@libreoff
   ||ice.org

--- Comment #3 from Buovjaga  ---
Created attachment 160142
  --> https://bugs.documentfoundation.org/attachment.cgi?id=160142=edit
Screenshot of Smart Tags tab

Here is how it looks like for me. Is it OK?

Arch Linux 64-bit
Version: 7.0.0.0.alpha0+
Build ID: 623d6cf06ccba392c1993a3b0ad271d508205e73
CPU threads: 8; OS: Linux 5.6; UI render: default; VCL: kf5; 
Locale: fi-FI (fi_FI.UTF-8); UI-Language: en-US
Calc: threaded
Built on 29 April 2020

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 129262] Exporting a large document as EPUB hangs the system


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=129262

Buovjaga  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEEDINFO
 Ever confirmed|0   |1
 CC||ilmari.lauhakangas@libreoff
   ||ice.org

--- Comment #6 from Buovjaga  ---
(In reply to Alberto Salvia Novella from comment #5)
> Created attachment 156912 [details]
> Book.odt
> 
> In order to satisfy the bug tracker upload file size limit, I have cut the
> document into the first 50 pages.

Please confirm: does it hang for you with this? By hanging, what do you mean?
It never completes? It completes, but the resource consumption is outrageous?

I had no problem exporting the file to EPUB and it only took a few seconds.

Arch Linux 64-bit
Version: 7.0.0.0.alpha0+
Build ID: 623d6cf06ccba392c1993a3b0ad271d508205e73
CPU threads: 8; OS: Linux 5.6; UI render: default; VCL: kf5; 
Locale: fi-FI (fi_FI.UTF-8); UI-Language: en-US
Calc: threaded
Built on 29 April 2020

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 132552] layout changed after reopen


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=132552

--- Comment #5 from Ulf Zibis  ---
Created attachment 160146
  --> https://bugs.documentfoundation.org/attachment.cgi?id=160146=edit
screen shot of edit

(In reply to Bart from comment #4)
Hi Bart,

> then what version do you get?
> It's best if you can copy the text there and paste it here.
Version: 6.0.7.3
Build-ID: 1:6.0.7-0ubuntu0.18.04.10
CPU-Threads: 2; BS: Linux 4.15; UI-Render: Standard; VCL: gtk3; 
Gebietsschema: de-DE (de_DE.UTF-8); Calc: group

> Also, if you let me know which parts you removed in document "LE 5_0 
> Arbeitsauftrage.odt",
> then I can better recreate the steps that you took and try to get to the same 
> result.
- Open the attached DOCX file. It has 7 pages (paper size DIN A4).
- Delete the content of the 1st page (except page header) as shown in attached
screen shot. Now 6 pages should remain, and feel free to print it, but not
necessary.
- Save the document as ODT.
- Open the ODT again ... it now has 8 instead 6 pages. On the 1st page you see
the first error ... the first 5 lines are outside of the frame, where they
should be.

> - I'm not a developer. I submitted a few bugs/reports myself and I'm trying 
> to confirm the bugs that other people reported here.
Much thanks for your effort!

> - Filename "LE 5_0 Arbeitsauftrage.odt" probably had a few characters more 
> when you saved it.
No, but instead 'a' it was 'ä'. I guess, there is a bug in bugzilla, which
corrupted it.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 129571] UI: Chart: request to split 3 strings


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=129571

Buovjaga  changed:

   What|Removed |Added

 CC||ilmari.lauhakangas@libreoff
   ||ice.org
 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1
 Whiteboard| QA:needsComment|

--- Comment #1 from Buovjaga  ---
Right -> NEW

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 128325] Default cell style colors added to "Document colors" palette of existing spreadsheet


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=128325

V Stuart Foote  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

--- Comment #7 from V Stuart Foote  ---
>From UX perspective, the colors present in templates/styles should never be
treated as 'in-use' in the document so as to show up in the 'Document colors'
palette.

Colors can show up as 'Recent' to the user profile, but unless they have been
selected and applied to an object in the document no colors should show as used
in the 'Document colors'.  And pulling colors out of unused templates/styles is
wrong.

But this has been known for a while and is a dupe of bug 107381 resulting from
work on bug 90937

*** This bug has been marked as a duplicate of bug 107381 ***

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 126873] Rotated text boxes have abnormally large hit area / hot zone


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=126873

Buovjaga  changed:

   What|Removed |Added

Version|6.4.0.0.alpha1+ |Inherited From OOo
 Status|UNCONFIRMED |NEW
Summary|Enhancement: Making |Rotated text boxes have
   |grabbing of rotated |abnormally large hit area /
   |textboxes easier|hot zone
   Severity|enhancement |minor
   Priority|medium  |low
 Ever confirmed|0   |1

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 107380] [META] Document colors palette issues


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=107380
Bug 107380 depends on bug 128325, which changed state.

Bug 128325 Summary: Default cell style colors added to "Document colors" 
palette of existing spreadsheet
https://bugs.documentfoundation.org/show_bug.cgi?id=128325

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 107381] Default cell style colors shouldnt be included as document colors


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=107381

--- Comment #7 from V Stuart Foote  ---
*** Bug 128325 has been marked as a duplicate of this bug. ***

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 132412] Fontwork lost after & save and reload (related to to character anchor on different page)


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=132412

Telesto  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

--- Comment #2 from Telesto  ---


*** This bug has been marked as a duplicate of bug 132411 ***

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 107634] [META] Fontwork / WordArt bugs and enhancements


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=107634
Bug 107634 depends on bug 132412, which changed state.

Bug 132412 Summary: Fontwork lost after & save and reload (related to to 
character anchor on different page)
https://bugs.documentfoundation.org/show_bug.cgi?id=132412

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 132411] Fontwork becomes invisible object with anchor to character


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=132411

--- Comment #7 from Telesto  ---
*** Bug 132412 has been marked as a duplicate of this bug. ***

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 87740] [META] Anchor and text wrapping bugs and enhancements


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=87740
Bug 87740 depends on bug 132412, which changed state.

Bug 132412 Summary: Fontwork lost after & save and reload (related to to 
character anchor on different page)
https://bugs.documentfoundation.org/show_bug.cgi?id=132412

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 130092] Images and dotted square are not in sync causing images to place all wrong or not stay where put.


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=130092

Buovjaga  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEEDINFO
 Ever confirmed|0   |1
 CC||ilmari.lauhakangas@libreoff
   ||ice.org

--- Comment #5 from Buovjaga  ---
Xisco was asking for a sample .ods document, but you attached a screenshot.
Back to needinfo.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 127609] Settings in View - Toolbar not persistent on restart


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=127609

Buovjaga  changed:

   What|Removed |Added

   Severity|normal  |minor
Summary|Toolbar settings not|Settings in View - Toolbar
   |persistent on LibreOffice   |not persistent on restart
   |restart |
 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1
 CC||ilmari.lauhakangas@libreoff
   ||ice.org
   Keywords||bibisectRequest, regression

--- Comment #5 from Buovjaga  ---
Reproduced.

Arch Linux 64-bit
Version: 6.4.3.2
Build ID: 6.4.3-1
CPU threads: 8; OS: Linux 5.6; UI render: default; VCL: kf5; 
Locale: fi-FI (fi_FI.UTF-8); UI-Language: en-US
Calc: threaded

Arch Linux 64-bit
Version: 7.0.0.0.alpha0+
Build ID: 623d6cf06ccba392c1993a3b0ad271d508205e73
CPU threads: 8; OS: Linux 5.6; UI render: default; VCL: kf5; 
Locale: fi-FI (fi_FI.UTF-8); UI-Language: en-US
Calc: threaded
Built on 29 April 2020

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 129262] Exporting as EPUB should show progress bar


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=129262

Buovjaga  changed:

   What|Removed |Added

   Keywords|perf|
 Status|UNCONFIRMED |NEW
Summary|Exporting a large document  |Exporting as EPUB should
   |as EPUB hangs the system|show progress bar
 Ever confirmed|0   |1

--- Comment #9 from Buovjaga  ---
Right, let's adjust the summary.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 34355] Option to show track changes in margin is missing


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=34355

Aron Budea  changed:

   What|Removed |Added

URL|https://www.lyricsmin.com/  |
 CC|roxtarajay...@gmail.com |

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 131956] Crash on file reload after file recovery


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=131956

Telesto  changed:

   What|Removed |Added

Version|7.0.0.0.alpha0+ Master  |6.3.0.1 rc
   Keywords|possibleRegression  |regression

--- Comment #4 from Telesto  ---
1. Open https://bugs.documentfoundation.org/attachment.cgi?id=156698
(tdf#129524)
2. Set design-mode of the form to "yes".
3. Mark the listfield and set Anchor > To Character. -> Crash
4. Recover the file
5. File reload -> Crash

Not with
Version: 5.4.0.2
Build ID: 2b906d450a44f2bbe506dcd22c51b3fa11dc65fd
CPU threads: 4; OS: Windows 6.2; UI render: default; 
Locale: nl-NL (nl_NL); Calc: CL

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 132361] Missing keyt in certificate window.


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=132361

Julien Nabet  changed:

   What|Removed |Added

 CC||xiscofa...@libreoffice.org

--- Comment #20 from Julien Nabet  ---
Xisco: any thoughts here? Personally, I'd put NOTOURBUG. Indeed if Raspbian
only proposes LO 5.2.7, what can we do?

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 132361] Missing keyt in certificate window.


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=132361

--- Comment #19 from Julien Nabet  ---
Created attachment 160141
  --> https://bugs.documentfoundation.org/attachment.cgi?id=160141=edit
gpgkey

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 124397] FILEOPEN DOCX Deleting text frame from DOCX crashes LibreOffice Writer


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=124397

Commit Notification  changed:

   What|Removed |Added

 Whiteboard||target:7.0.0

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 129540] Wrong y-error bars for range cells in calc


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=129540

Buovjaga  changed:

   What|Removed |Added

 CC||ilmari.lauhakangas@libreoff
   ||ice.org
 Ever confirmed|0   |1
 Status|UNCONFIRMED |NEEDINFO

--- Comment #3 from Buovjaga  ---
(In reply to heiko from comment #1)
> Created attachment 156720 [details]
> Calc file with data sets

Can you give steps on what we need to do, if we want to create the chart from
scratch based on the data in this file?

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 126873] Enhancement: Making grabbing of rotated textboxes easier


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=126873

Buovjaga  changed:

   What|Removed |Added

 CC||ilmari.lauhakangas@libreoff
   ||ice.org

--- Comment #11 from Buovjaga  ---
Created attachment 160147
  --> https://bugs.documentfoundation.org/attachment.cgi?id=160147=edit
Test file

I confirm the weird hit areas as illustrated in attachment 156058

Arch Linux 64-bit
Version: 7.0.0.0.alpha0+
Build ID: 623d6cf06ccba392c1993a3b0ad271d508205e73
CPU threads: 8; OS: Linux 5.6; UI render: default; VCL: kf5; 
Locale: fi-FI (fi_FI.UTF-8); UI-Language: en-US
Calc: threaded
Built on 29 April 2020

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 132110] Wizard service broken


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=132110

--- Comment #23 from prrv...@gmail.com ---
(In reply to Julien Nabet from comment #20)

> Still waiting for "last steps you tried where it failed" indicated in my 
> previous comment.

I just had time to redo tests under 6.4.3.2. here is what it stands out:

- When launching the Wizard by XWizard.execute() all pages are created
(XWizardController.createPage() is called for all pages of the path)!!!
Normally the pages are created as you navigate the wizard and if possible
(XWizardPage.canAdvance() and XWizardController.canAdvance() are true)

- If we manage to load the page, it appears as if it was disabled (all controls
are grayed out ...) and it is not possible to activate it (XWizard.enablePage()
has no effect)

- In addition, the size of the pages is no longer taken into account, the
Wizard being displayed with a fixed size.

Voila, I hope this will allow us to move forward...
I will have to reinstall 6.3.x if I want to be able to continue...

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 129269] Endless auto-save: Data lost (lack of available inodes in /tmp ?)


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=129269

--- Comment #4 from Alberto Salvia Novella  ---
My drive died three months later...

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 122126] Text appears askew along former row border of merged cells, zoom dependent and Intel HD Graphics


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=122126

Buovjaga  changed:

   What|Removed |Added

 CC||ilmari.lauhakangas@libreoff
   ||ice.org
 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1

--- Comment #15 from Buovjaga  ---
Confirmed immediately upon opening attachment 147575. "This is just a check"
was displayed as cut & shifted. I have Intel Corporation HD Graphics 530

Arch Linux 64-bit
Version: 6.4.3.2
Build ID: 6.4.3-1
CPU threads: 8; OS: Linux 5.6; UI render: default; VCL: kf5; 
Locale: fi-FI (fi_FI.UTF-8); UI-Language: en-US
Calc: threaded

Arch Linux 64-bit
Version: 7.0.0.0.alpha0+
Build ID: 623d6cf06ccba392c1993a3b0ad271d508205e73
CPU threads: 8; OS: Linux 5.6; UI render: default; VCL: kf5; 
Locale: fi-FI (fi_FI.UTF-8); UI-Language: en-US
Calc: threaded
Built on 29 April 2020

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 130505] LibreOffice dialogs for save and open have default focus in the location field instead of file name field


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=130505

Caolán McNamara  changed:

   What|Removed |Added

 Status|NEW |ASSIGNED
   Severity|major   |normal
   Assignee|libreoffice-b...@lists.free |caol...@redhat.com
   |desktop.org |

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs





[Libreoffice-bugs] [Bug 129262] Exporting a large document as EPUB hangs the system


2020-04-30

Thread
bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=129262

--- Comment #7 from Buovjaga  ---
I also tried with the bigger version I created per bug 129265, but it didn't
hang then either.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs




    
  1   2   3   4   5   6    >