[Libreoffice-commits] core.git: include/vcl vcl/source

[Miklos Vajna (via logerrit)]

 include/vcl/filter/PDFiumLibrary.hxx   |   15 +++
 vcl/source/graphic/VectorGraphicSearch.cxx |   19 +--
 vcl/source/pdf/PDFiumLibrary.cxx   |   11 +++
 3 files changed, 35 insertions(+), 10 deletions(-)

New commits:
commit 4f3987e0b1a995431478769c898b5ef151745254
Author: Miklos Vajna 
AuthorDate: Thu Jan 28 21:04:35 2021 +0100
Commit: Miklos Vajna 
CommitDate: Fri Jan 29 08:56:23 2021 +0100

pdfium: add wrapper for FPDFText_FindClose()

So we can call it in the dtor, so we can't forget calling it.

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

diff --git a/include/vcl/filter/PDFiumLibrary.hxx 
b/include/vcl/filter/PDFiumLibrary.hxx
index 0fbcf4fe2199..418feede99b6 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -149,6 +149,21 @@ public:
 virtual bool getDrawMode(PDFFillMode& eFillMode, bool& bStroke) = 0;
 };
 
+class VCL_DLLPUBLIC PDFiumSearchHandle final
+{
+private:
+FPDF_SCHHANDLE mpSearchHandle;
+
+PDFiumSearchHandle(const PDFiumSearchHandle&) = delete;
+PDFiumSearchHandle& operator=(const PDFiumSearchHandle&) = delete;
+
+public:
+PDFiumSearchHandle(FPDF_SCHHANDLE pSearchHandle);
+~PDFiumSearchHandle();
+
+FPDF_SCHHANDLE getPointer() { return mpSearchHandle; }
+};
+
 class VCL_DLLPUBLIC PDFiumTextPage final
 {
 private:
diff --git a/vcl/source/graphic/VectorGraphicSearch.cxx 
b/vcl/source/graphic/VectorGraphicSearch.cxx
index 083dc6cf2741..3ac33db37cc3 100644
--- a/vcl/source/graphic/VectorGraphicSearch.cxx
+++ b/vcl/source/graphic/VectorGraphicSearch.cxx
@@ -30,7 +30,7 @@ private:
 std::unique_ptr& mpPdfDocument;
 std::unique_ptr mpPage;
 std::unique_ptr mpTextPage;
-FPDF_SCHHANDLE mpSearchHandle;
+std::unique_ptr mpSearchHandle;
 
 public:
 sal_Int32 mnPageIndex;
@@ -40,7 +40,6 @@ public:
 
 SearchContext(std::unique_ptr& pPdfDocument, 
sal_Int32 nPageIndex)
 : mpPdfDocument(pPdfDocument)
-, mpSearchHandle(nullptr)
 , mnPageIndex(nPageIndex)
 , mnCurrentIndex(-1)
 {
@@ -49,7 +48,7 @@ public:
 ~SearchContext()
 {
 if (mpSearchHandle)
-FPDFText_FindClose(mpSearchHandle);
+mpSearchHandle.reset();
 if (mpTextPage)
 mpTextPage.reset();
 if (mpPage)
@@ -77,7 +76,7 @@ public:
 return true;
 
 if (mpSearchHandle)
-FPDFText_FindClose(mpSearchHandle);
+mpSearchHandle.reset();
 
 if (mpTextPage)
 mpTextPage.reset();
@@ -114,15 +113,15 @@ public:
 if (maOptions.mbMatchWholeWord)
 nSearchFlags |= FPDF_MATCHWHOLEWORD;
 
-mpSearchHandle
-= FPDFText_FindStart(mpTextPage->getPointer(), pString, 
nSearchFlags, nStartIndex);
+mpSearchHandle = std::make_unique(
+FPDFText_FindStart(mpTextPage->getPointer(), pString, 
nSearchFlags, nStartIndex));
 
 return mpSearchHandle != nullptr;
 }
 
 bool next()
 {
-if (mpSearchHandle && FPDFText_FindNext(mpSearchHandle))
+if (mpSearchHandle && FPDFText_FindNext(mpSearchHandle->getPointer()))
 {
 mnCurrentIndex = index();
 return true;
@@ -132,7 +131,7 @@ public:
 
 bool previous()
 {
-if (mpSearchHandle && FPDFText_FindPrev(mpSearchHandle))
+if (mpSearchHandle && FPDFText_FindPrev(mpSearchHandle->getPointer()))
 {
 mnCurrentIndex = index();
 return true;
@@ -143,14 +142,14 @@ public:
 int index()
 {
 if (mpSearchHandle)
-return FPDFText_GetSchResultIndex(mpSearchHandle);
+return FPDFText_GetSchResultIndex(mpSearchHandle->getPointer());
 return -1;
 }
 
 int size()
 {
 if (mpSearchHandle)
-return FPDFText_GetSchCount(mpSearchHandle);
+return FPDFText_GetSchCount(mpSearchHandle->getPointer());
 return -1;
 }
 
diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx
index 886549031596..fce8d4d539bd 100644
--- a/vcl/source/pdf/PDFiumLibrary.cxx
+++ b/vcl/source/pdf/PDFiumLibrary.cxx
@@ -1100,6 +1100,17 @@ unsigned int PDFiumTextPage::getUnicode(int index)
 return FPDFText_GetUnicode(mpTextPage, index);
 }
 
+PDFiumSearchHandle::PDFiumSearchHandle(FPDF_SCHHANDLE pSearchHandle)
+: mpSearchHandle(pSearchHandle)
+{
+}
+
+PDFiumSearchHandle::~PDFiumSearchHandle()
+{
+if (mpSearchHandle)
+FPDFText_FindClose(mpSearchHandle);
+}
+
 } // end vcl::pdf
 
 #endif // HAVE_FEATURE_PDFIUM
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/karasa_jaga icon-themes/karasa_jaga_svg

[Rizal Muttaqin (via logerrit)]

 dev/null|binary
 icon-themes/karasa_jaga/links.txt   | 4250 ++--
 icon-themes/karasa_jaga_svg/sfx2/res/actiontemplates020.svg |1 
 icon-themes/karasa_jaga_svg/sfx2/res/actionview010.svg  |1 
 4 files changed, 2126 insertions(+), 2126 deletions(-)

New commits:
commit 977f66ccd6161da8ec37d4eac0f85515e0cf1df0
Author: Rizal Muttaqin 
AuthorDate: Fri Jan 29 09:57:45 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Fri Jan 29 08:41:03 2021 +0100

KJ: tdf#139988: make Export and Import icon in Template Manager show up

Change-Id: Ibfbea62c1890d72d5b7b4611d9c09d49e67a85ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110116
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/karasa_jaga/links.txt 
b/icon-themes/karasa_jaga/links.txt
index fcfe3ec6038a..aea37d5694bc 100644
--- a/icon-themes/karasa_jaga/links.txt
+++ b/icon-themes/karasa_jaga/links.txt
@@ -1,2124 +1,2126 @@
-avmedia/res/av02048.png cmd/sc_open.png
-avmedia/res/av02049.png cmd/sc_datastreamsplay.png
-avmedia/res/av02050.png cmd/sc_mediapause.png
-avmedia/res/av02051.png cmd/sc_datastreamsstop.png
-avmedia/res/av02052.png cmd/sc_mediarepeat.png
-avmedia/res/av02053.png cmd/sc_ok.png
-avmedia/res/av02054.png cmd/sc_mediamute.png
-avmedia/res/avl02048.png cmd/lc_open.png
-avmedia/res/avl02049.png cmd/lc_datastreamsplay.png
-avmedia/res/avl02050.png cmd/lc_mediapause.png
-avmedia/res/avl02051.png cmd/lc_datastreamsstop.png
-avmedia/res/avl02052.png cmd/lc_mediarepeat.png
-avmedia/res/avl02053.png cmd/lc_ok.png
-avmedia/res/avl02054.png cmd/lc_mediamute.png
-chart2/res/dataeditor_icon01.png cmd/sc_insertrowsafter.png
-chart2/res/dataeditor_icon02.png cmd/sc_insertcolumnsafter.png
-chart2/res/dataeditor_icon03.png cmd/sc_deleterows.png
-chart2/res/dataeditor_icon04.png cmd/sc_deletecolumns.png
-chart2/res/typecolumn_16.png cmd/sc_insertobjectchartfromfile.png
-chart2/res/typecolumnline_16.png cmd/sc_statisticsmenu.png
-chart2/res/typepie_16.png cmd/sc_drawchart.png
-cmd/32/acceptchanges.png cmd/32/accepttrackedchanges.png
-cmd/32/accepttracedchange.png cmd/32/accepttrackedchange.png
-cmd/32/adddatefield.png cmd/32/datefield.png
-cmd/32/addtextbox.png cmd/32/insertfixedtext.png
-cmd/32/adjust.png cmd/32/zoomoptimal.png
-cmd/32/advancedmode.png cmd/32/toggleobjectrotatemode.png
-cmd/32/alignframemenu.png cmd/32/objectalign.png
-cmd/32/alignvcenter.png cmd/32/alignverticalcenter.png
-cmd/32/anchormenu.png cmd/32/toggleanchortype.png
-cmd/32/ar/bulletliststyle.png cmd/32/ar/defaultbullet.png
-cmd/32/ar/linenumberdialog.png cmd/32/ar/linenumberingdialog.png
-cmd/32/ar/numberliststyle.png cmd/32/ar/defaultnumbering.png
-cmd/32/arrangeframemenu.png cmd/32/bringtofront.png
-cmd/32/arrangemenu.png cmd/32/bringtofront.png
-cmd/32/arrowshapes.png cmd/32/arrowshapes.left-right-arrow.png
-cmd/32/arrowstoolbox.png cmd/32/linearrowend.png
-cmd/32/authoritiesentrydialog.png cmd/32/insertauthorfield.png
-cmd/32/autofilter.png cmd/32/datafilterautofilter.png
-cmd/32/autoformatmenu.png cmd/32/autocorrectdlg.png
-cmd/32/availabletoolbars.png cmd/32/showtoolbar.png
-cmd/32/backgroundcolor.png cmd/32/formatarea.png
-cmd/32/backgroundpatterncontroller.png cmd/32/formatarea.png
-cmd/32/badcellstyle.png cmd/32/badcellstyles.png
-cmd/32/basicshapes.png cmd/32/basicshapes.diamond.png
-cmd/32/bg/autoformatmenu.png cmd/32/bg/autocorrectdlg.png
-cmd/32/bg/spelldialog.png cmd/32/bg/spelling.png
-cmd/32/bg/spellingandgrammardialog.png cmd/32/bg/spelling.png
-cmd/32/bg/underline.png cmd/32/ca/underline.png
-cmd/32/bg/underlinedouble.png cmd/32/hu/underlinedouble.png
-cmd/32/bg/underlinesimple.png cmd/32/hu/underline.png
-cmd/32/bg/underlinesingle.png cmd/32/hu/underline.png
-cmd/32/break.png cmd/32/polygon_unfilled.png
-cmd/32/browsebackward.png cmd/32/navigateback.png
-cmd/32/browseforward.png cmd/32/navigateforward.png
-cmd/32/bulletliststyle.png cmd/32/defaultbullet.png
-cmd/32/ca/underlinesimple.png cmd/32/ca/underline.png
-cmd/32/ca/underlinesingle.png cmd/32/ca/underline.png
-cmd/32/calloutshapes.png cmd/32/calloutshapes.round-rectangular-callout.png
-cmd/32/cellcontentsmenu.png cmd/32/calculate.png
-cmd/32/cellprotection.png cmd/32/protect.png
-cmd/32/cellvertbottom.png cmd/32/alignbottom.png
-cmd/32/cellvertcenter.png cmd/32/alignverticalcenter.png
-cmd/32/cellverttop.png cmd/32/aligntop.png
-cmd/32/centerpara.png cmd/32/alignhorizontalcenter.png
-cmd/32/changesmenu.png cmd/32/accepttrackedchange.png
-cmd/32/charactermenu.png cmd/32/fontdialog.png
-cmd/32/charbackcolor.png cmd/32/backcolor.png
-cmd/32/charmapcontrol.png cmd/32/insertsymbol.png
-cmd/32/charttitlemenu.png cmd/32/toggletitle.png
-cmd/32/checkboxformfield.png cmd/32/checkbox.png
-cmd/32/circle.png cmd/32/basicshapes.circle.png
-cmd/32/circlepie.png cmd/32/basicshapes.circle-pie.png
-cmd/32/closedocs.png cmd/32/closedoc.png
-cmd/32/columnoperations.png cmd/32/entir

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - configure.ac external/firebird external/nss

[Christian Lohmaier (via logerrit)]

 configure.ac  |4 ++--
 external/firebird/ExternalProject_firebird.mk |1 +
 external/nss/ExternalProject_nss.mk   |2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit f490652153498b6184c6589263212b3b3326900b
Author: Christian Lohmaier 
AuthorDate: Thu Jan 28 21:15:02 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Jan 29 05:17:42 2021 +0100

mac: allow cross compiling with host/build x86_64-apple-macos

apple silicon supports to cross compile without special build-tools/full
cross-compiling setup, so just always pass the build/host for firebird.
firebird and nss don't recognize the -macos specifier, so substitute it
by -darwin to make those happy…

Change-Id: I953317fc87da2a20dc91acd88c8528796c3b2a69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110093
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 5a0991c9cd60b6ab10fe0665511e7749a0c0ecc2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110065
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/configure.ac b/configure.ac
index 07d56b0785a6..42158d2613b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8360,7 +8360,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
 JAVAINC="$JAVAINC -I$JAVA_HOME/include"
 ;;
 
-darwin*)
+darwin*|macos*)
 if test -d "$JAVA_HOME/include/darwin"; then
 JAVAINC="-I$JAVA_HOME/include  -I$JAVA_HOME/include/darwin"
 else
@@ -11178,7 +11178,7 @@ elif $GNUCP --version 2>/dev/null | grep "GNU 
fileutils" >/dev/null 2>/dev/null;
 AC_MSG_RESULT([yes])
 else
 case "$build_os" in
-darwin*|netbsd*|openbsd*|freebsd*|dragonfly*|aix*)
+darwin*|macos*|netbsd*|openbsd*|freebsd*|dragonfly*|aix*)
 x_GNUCP=[\#]
 GNUCP=''
 AC_MSG_RESULT([no gnucp found - using the system's cp command])
diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 8f8a8230227f..3e6455edb9b8 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -75,6 +75,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--enable-shared --disable-static \
) \
$(if $(filter MACOSX,$(OS)), \
+   --build=$(subst macos,darwin,$(BUILD_PLATFORM)) 
--host=$(subst macos,darwin,$(HOST_PLATFORM)) \
$(if $(filter 1, \
$(shell expr 
'$(MAC_OS_X_VERSION_MIN_REQUIRED)' \
'<' 101200)), \
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index b97ae11a515a..a9c4fcadfc95 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -63,7 +63,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): \
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
$(if $(filter MACOSX-X86_64-arm64,$(OS)-$(CPUNAME)-$(shell 
uname -m)), \
CPU_ARCH=x86_64 \
-   NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
+   NSPR_CONFIGURE_OPTS="--build=$(subst 
macos,darwin,$(BUILD_PLATFORM)) --host=$(subst macos,darwin,$(HOST_PLATFORM))") 
\
NSDISTMODE=copy \
$(MAKE) \
AR="$(AR)" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Regina Henschel (via logerrit)]

 sc/qa/unit/scshapetest.cxx |  422 -
 1 file changed, 114 insertions(+), 308 deletions(-)

New commits:
commit 66013201749df7d5ac5ddaf377a7b3732518a93b
Author: Regina Henschel 
AuthorDate: Wed Jan 27 23:31:56 2021 +0100
Commit: Regina Henschel 
CommitDate: Fri Jan 29 00:36:12 2021 +0100

Factor out common parts in scshapetest.cxx

Change-Id: Ifb63fa5162ea2fe0d1083c6a4361e9595af23317
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110038
Tested-by: Jenkins
Reviewed-by: Regina Henschel 

diff --git a/sc/qa/unit/scshapetest.cxx b/sc/qa/unit/scshapetest.cxx
index bc5df4d4854c..1c54c0e5ac5c 100644
--- a/sc/qa/unit/scshapetest.cxx
+++ b/sc/qa/unit/scshapetest.cxx
@@ -148,29 +148,61 @@ static void 
lcl_AssertPointEqualWithTolerance(std::string_view sInfo, const Poin
 CPPUNIT_ASSERT_MESSAGE(sMsg.getStr(), std::abs(rExpected.Y() - 
rActual.Y()) <= nTolerance);
 }
 
-void ScShapeTest::testTdf139583_Rotate180deg()
+static ScDocShell*
+lcl_getScDocShellWithAssert(css::uno::Reference& 
xComponent)
 {
-// Load an empty document.
-OUString aFileURL;
-createFileURL(u"ManualColWidthRowHeight.ods", aFileURL);
-uno::Reference xComponent = 
loadFromDesktop(aFileURL);
-CPPUNIT_ASSERT(xComponent.is());
-
-// Get ScDocShell
 SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
 CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
 ScDocShell* pDocSh = dynamic_cast(pFoundShell);
 CPPUNIT_ASSERT(pDocSh);
+return pDocSh;
+}
 
-// Get SdrPage
-ScDocument& rDoc = pDocSh->GetDocument();
+static ScTabViewShell* lcl_getScTabViewShellWithAssert(ScDocShell* pDocSh)
+{
+ScTabViewShell* pTabViewShell = pDocSh->GetBestViewShell(false);
+CPPUNIT_ASSERT_MESSAGE("No ScTabViewShell", pTabViewShell);
+return pTabViewShell;
+}
+
+static SdrPage* lcl_getSdrPageWithAssert(ScDocument& rDoc)
+{
 ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
 CPPUNIT_ASSERT_MESSAGE("No ScDrawLayer", pDrawLayer);
 SdrPage* pPage = pDrawLayer->GetPage(0);
 CPPUNIT_ASSERT_MESSAGE("No draw page", pPage);
+return pPage;
+}
+
+static SdrObject* lcl_getSdrObjectWithAssert(ScDocument& rDoc, sal_uInt16 
nObjNumber)
+{
+ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
+CPPUNIT_ASSERT_MESSAGE("No ScDrawLayer", pDrawLayer);
+const SdrPage* pPage = pDrawLayer->GetPage(0);
+CPPUNIT_ASSERT_MESSAGE("No draw page", pPage);
+SdrObject* pObj = pPage->GetObj(nObjNumber);
+OString sMsg = "no Object " + OString::number(nObjNumber);
+CPPUNIT_ASSERT_MESSAGE(sMsg.getStr(), pObj);
+return pObj;
+}
+
+void ScShapeTest::testTdf139583_Rotate180deg()
+{
+// Load an empty document.
+OUString aFileURL;
+createFileURL(u"ManualColWidthRowHeight.ods", aFileURL);
+uno::Reference xComponent = 
loadFromDesktop(aFileURL);
+CPPUNIT_ASSERT(xComponent.is());
+
+// Get document and draw page
+ScDocShell* pDocSh = lcl_getScDocShellWithAssert(xComponent);
+ScDocument& rDoc = pDocSh->GetDocument();
+SdrPage* pPage = lcl_getSdrPageWithAssert(rDoc);
 
 // Insert Shape
 const tools::Rectangle aRect(Point(3000, 4000), Size(5000, 2000));
+ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
+CPPUNIT_ASSERT_MESSAGE("No ScDrawLayer", pDrawLayer);
 SdrRectObj* pObj = new SdrRectObj(*pDrawLayer, aRect);
 CPPUNIT_ASSERT_MESSAGE("Could not create rectangle", pObj);
 pPage->InsertObject(pObj);
@@ -184,20 +216,10 @@ void ScShapeTest::testTdf139583_Rotate180deg()
 saveAndReload(xComponent, "calc8");
 CPPUNIT_ASSERT(xComponent);
 
-// Get ScDocShell
-pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent);
-CPPUNIT_ASSERT_MESSAGE("Reload: Failed to access document shell", 
pFoundShell);
-pDocSh = dynamic_cast(pFoundShell);
-CPPUNIT_ASSERT(pDocSh);
-
 // Get document and object
+pDocSh = lcl_getScDocShellWithAssert(xComponent);
 ScDocument& rDoc2 = pDocSh->GetDocument();
-pDrawLayer = rDoc2.GetDrawLayer();
-CPPUNIT_ASSERT_MESSAGE("Reload: No ScDrawLayer", pDrawLayer);
-pPage = pDrawLayer->GetPage(0);
-CPPUNIT_ASSERT_MESSAGE("Reload: No draw page", pPage);
-pObj = dynamic_cast(pPage->GetObj(0));
-CPPUNIT_ASSERT_MESSAGE("Reload: Shape no longer exists", pObj);
+pObj = static_cast(lcl_getSdrObjectWithAssert(rDoc2, 0));
 
 //  Without the fix in place, the shape would have nearly zero size.
 lcl_AssertRectEqualWithTolerance("Show: Object geometry should not 
change", aRect,
@@ -213,20 +235,10 @@ void ScShapeTest::testTdf137033_FlipHori_Resize()
 uno::Reference xComponent = 
loadFromDesktop(aFileURL);
 CPPUNIT_ASSERT(xComponent.is());
 
-// Get document
-SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
-CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
-ScDocShell* pDocSh = 

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests8/tdf126248.py |   99 ++
 1 file changed, 99 insertions(+)

New commits:
commit 7d48001ccf35417cb20ca7ea8bb772082583c79c
Author: Xisco Fauli 
AuthorDate: Thu Jan 28 16:54:45 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Jan 28 23:31:07 2021 +0100

tdf#126248: sc: Add UItest

Change-Id: Ibbe7aa2229c2a522725bc600a1ba94844910cc84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110087
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests8/tdf126248.py 
b/sc/qa/uitest/calc_tests8/tdf126248.py
new file mode 100644
index ..0731c839a5d9
--- /dev/null
+++ b/sc/qa/uitest/calc_tests8/tdf126248.py
@@ -0,0 +1,99 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.calc import enter_text_to_cell
+from uitest.uihelper.common import select_pos
+
+class tdf126248(UITestCase):
+
+def changeLocalSetting(self, language):
+self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+
+xPages = xDialog.getChild("pages")
+xLanguageEntry = xPages.getChild('2')
+xLanguageEntry.executeAction("EXPAND", tuple())
+xxLanguageEntryGeneralEntry = xLanguageEntry.getChild('0')
+xxLanguageEntryGeneralEntry.executeAction("SELECT", tuple())
+
+# Check asian support is enabled
+asianlanguage = xDialog.getChild("asiansupport")
+self.assertEqual("true", get_state_as_dict(asianlanguage)['Selected'])
+
+localeSetting = xDialog.getChild("localesetting")
+localeSetting.executeAction("SELECT", mkPropertyValues({"TEXT": 
language}))
+
+self.assertEqual(language, 
get_state_as_dict(localeSetting)['SelectEntryText'])
+
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+
+def test_tdf126248(self):
+
+self.ui_test.create_doc_in_start_center("calc")
+
+self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog")
+xCellsDlg = self.xUITest.getTopFocusWindow()
+select_pos(xCellsDlg, "2")
+
+# Get current font names from the Format Cell dialog
+westFontName = 
get_state_as_dict(xCellsDlg.getChild("westfontnamelb-cjk"))['Text']
+eastFontName = 
get_state_as_dict(xCellsDlg.getChild("eastfontnamelb"))['Text']
+
+okBtn = xCellsDlg.getChild("ok")
+self.ui_test.close_dialog_through_button(okBtn)
+
+self.changeLocalSetting("Chinese (traditional)")
+
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+
+enter_text_to_cell(gridwin, "A1", "Test")
+
+self.xUITest.executeCommand(".uno:Sidebar")
+gridwin.executeAction("SIDEBAR", mkPropertyValues({"PANEL": 
"TextPropertyPanel"}))
+
+xCalcDoc = self.xUITest.getTopFocusWindow()
+
+fontName = xCalcDoc.getChild("fontnamecombobox")
+self.ui_test.wait_until_property_is_updated(fontName, "Text", 
westFontName)
+
+# Without the fix in place, this test would have failed here
+self.assertEqual(westFontName, get_state_as_dict(fontName)['Text'])
+
+enter_text_to_cell(gridwin, "B1", "測試")
+
+self.ui_test.wait_until_property_is_updated(fontName, "Text", 
eastFontName)
+self.assertEqual(eastFontName, get_state_as_dict(fontName)['Text'])
+
+self.changeLocalSetting("Default - English (USA)")
+
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+
+fontName = xCalcDoc.getChild("fontnamecombobox")
+
+enter_text_to_cell(gridwin, "C1", "Test")
+
+self.ui_test.wait_until_property_is_updated(fontName, "Text", 
westFontName)
+self.assertEqual(westFontName, get_state_as_dict(fontName)['Text'])
+
+enter_text_to_cell(gridwin, "D1", "測試")
+
+self.ui_test.wait_until_property_is_updated(fontName, "Text", 
eastFontName)
+self.assertEqual(eastFontName, get_state_as_dict(fontName)['Text'])
+
+self.xUITest.executeCommand(".uno:Sidebar")
+
+self.ui_test.close_doc()
+
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac external/firebird external/nss

[Christian Lohmaier (via logerrit)]

 configure.ac  |4 ++--
 external/firebird/ExternalProject_firebird.mk |1 +
 external/nss/ExternalProject_nss.mk   |2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 5a0991c9cd60b6ab10fe0665511e7749a0c0ecc2
Author: Christian Lohmaier 
AuthorDate: Thu Jan 28 21:15:02 2021 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Jan 28 23:11:59 2021 +0100

mac: allow cross compiling with host/build x86_64-apple-macos

apple silicon supports to cross compile without special build-tools/full
cross-compiling setup, so just always pass the build/host for firebird.
firebird and nss don't recognize the -macos specifier, so substitute it
by -darwin to make those happy…

Change-Id: I953317fc87da2a20dc91acd88c8528796c3b2a69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110093
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/configure.ac b/configure.ac
index aad842d03768..75f5543703f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8332,7 +8332,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
 JAVAINC="$JAVAINC -I$JAVA_HOME/include"
 ;;
 
-darwin*)
+darwin*|macos*)
 if test -d "$JAVA_HOME/include/darwin"; then
 JAVAINC="-I$JAVA_HOME/include  -I$JAVA_HOME/include/darwin"
 else
@@ -11123,7 +11123,7 @@ elif $GNUCP --version 2>/dev/null | grep "GNU 
fileutils" >/dev/null 2>/dev/null;
 AC_MSG_RESULT([yes])
 else
 case "$build_os" in
-darwin*|netbsd*|openbsd*|freebsd*|dragonfly*|aix*)
+darwin*|macos*|netbsd*|openbsd*|freebsd*|dragonfly*|aix*)
 x_GNUCP=[\#]
 GNUCP=''
 AC_MSG_RESULT([no gnucp found - using the system's cp command])
diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 0a1706031746..2a491d965699 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -76,6 +76,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--enable-shared --disable-static \
) \
$(if $(filter MACOSX,$(OS)), \
+   --build=$(subst macos,darwin,$(BUILD_PLATFORM)) 
--host=$(subst macos,darwin,$(HOST_PLATFORM)) \
$(if $(filter 1, \
$(shell expr 
'$(MAC_OS_X_VERSION_MIN_REQUIRED)' \
'<' 101200)), \
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index ef2ae95d7a5f..fb68da65adff 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -63,7 +63,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): \
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
$(if $(filter MACOSX-X86_64-arm64,$(OS)-$(CPUNAME)-$(shell 
uname -m)), \
CPU_ARCH=x86_64 \
-   NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
+   NSPR_CONFIGURE_OPTS="--build=$(subst 
macos,darwin,$(BUILD_PLATFORM)) --host=$(subst macos,darwin,$(HOST_PLATFORM))") 
\
NSDISTMODE=copy \
$(MAKE) \
AR="$(AR)" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Christian Lohmaier (via logerrit)]

 external/nss/ExternalProject_nss.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit b8a968d83dec047bed47c1d7a6fac1b14dc7651b
Author: Christian Lohmaier 
AuthorDate: Thu Jan 28 15:17:51 2021 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Jan 28 23:11:13 2021 +0100

nss: makefile bitrot: no need for android spcial case anymore

check for AARCH64 is done for all OS now, so get rid of the superfluous
statement.

The all-OS line was initially ARM64 for apple silicon, then AARCH64 was
added in addtion since that is what ~all other tools use as label - and
finally use withing LO was also unified to use AARCH64 and ARM64 was
removed…

Change-Id: Ief7e5d8bd399c839ff2910fa91ca5bbbff4bcf31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110080
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 759ef461e3f8..ef2ae95d7a5f 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -51,7 +51,6 @@ $(call gb_ExternalProject_get_state_target,nss,build): \
$(call gb_Trace_StartRange,nss,EXTERNAL)
$(call gb_ExternalProject_run,build,\
$(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter 
X86_64,$(CPUNAME)),USE_64=1)) \
-   $(if $(filter ANDROID,$(OS)),$(if $(filter 
AARCH64,$(CPUNAME)),USE_64=1)) \
$(if $(filter AARCH64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \
$(if $(filter MACOSX,$(OS)),\
MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[no subject]

[Dante Doménech]

Hello.

I'm working in the syntax highlight on starmathover here:
https://gerrit.libreoffice.org/c/core/+/109639

Need help with accessibility, but do not understand what I have to do. The
content of the label is important, not decorative. Have no idea about GTK,
deduced syntax from context, so constructive comments are welcomed.

Have already checked this, but do not understand yet.
https://wiki.documentfoundation.org/Development/Accessibility

Suppression file:
/home/uv/Downloads/libreoffice/solenv/sanitizers/ui/modules/smath.suppr
False positive file:
/home/uv/Downloads/libreoffice/solenv/sanitizers/ui/modules/smath.false
*starmath/uiconfig/smath/ui/smathsettings.ui:350 WARNING: 'GtkLabel'
'label6' does not specify what it labels within 'GtkFrame' 'contents1' *
1 new warning (36 suppressed by
/home/uv/Downloads/libreoffice/solenv/sanitizers/ui/modules/smath.suppr,
please fix them)
Explanations are available on
https://wiki.documentfoundation.org/Development/Accessibility
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-qa] ESC meeting agenda - Adding topic: Broken release process when fresh become still and when still become EOL'ed

[Jan-Marek Glogowski]

Am 28.01.21 um 19:56 schrieb Timur Gadzo:
I'm reading about rolling release idea, and I find it awful. It just 
popped up, not sure why. Yes, it's more simple to publish, but it would 
ruin LO usability.


ESC meeting minutes: 2020-12-10

https://lists.freedesktop.org/archives/libreoffice/2020-December/086428.html

I personally don't think it'll solve the problem. Feels a bit like gnupg 
or OpenSSL...



LO is regression plagued product.


Yup. But honestly with the available resources, I don't see this 
changing in any time-frame, I can imagine. One IMHO main problem is, 
that we mainly have regression unit tests. So every change is almost 
guaranteed to break stuff. At least for me it feels like this. 
Everything is a lot of guesswork for me, even in areas, where people 
claim I'm the actual expert.


I remember patches, which had almost 100 iterations and still had a 
regression, literally a day after the commit.


Some of my stuff you might remember from QA too, like:
* The Scheduler rework, so we could get rid of crazy stuff, like the 1ms 
sleep, so Idles wouldn't starve each other or process stuff in the wrong 
sequence
* The "simplification" of the SalLayout to implement some little bit 
more understandable font handling, which broke the generic font cache, 
broke Windows font handling, slowing down documents in all aspects
* The unification of SolarMutex, which previously was simply ignoring 
underflows and "hope nothing breaks", which I stopped with std::abort() 
on underflow and still - now and then - get bisects on a crash to this 
change years later
* The whole "multi-threaded" GUI processing including now crazy stuff to 
redirect GUI stuff from non-GUI threads, like ignoring the mutex in the 
main thread to process GUI, while the original threads holds it.
* Or the stuff I broke while reworking the mail merge to work with 
complex documents and be usable with more the 100 document, not slowing 
down to a crawl with 200 (the sensible limit was at some point ~10k 
letter complexity docs)

* ... etc, etc, etc...

You may ask: do we have unit tests at least for some of the essential 
low level stuff I touched? Barely any and nothing I would consider 
remotely sufficient.


And this is just the major stuff I worked on an broke stuff for multiple 
releases.


And still currently there is 
https://gerrit.libreoffice.org/c/core/+/109829, which passed before XMas 
and now always aborts, with very broken logs indicating some (new?) 
Scheduler problem, I'm unable to reproduce locally, driving me nuts. And 
not taking into account the 12141 open bug reports against LibreOffice 
(according to the weekly bug summary of today).


So I can very much relate to your impression. But unless you have some 
large new resources available for the project, we'll have to bear with it.


ATB

Jan-Marek

P.S. and on top of it you have a lot of https://xkcd.com/1172/, simply 
because LO is around for a long time, used by many people and actually 
gets a lot more done, then I can imagine. I'm just remembering those 
blog post, where people replied how they use Draw for CAD...
P.P.S. x.y.6 is the most stable, but sometimes people actually want to 
use new features a bit earlier. Or they pay for commercial support.
P.P.P.S. And then there is also the very broken WASM port, which neither 
helps my sanity...

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

Re: Need help with starmath UI

[Dante Doménech]

Ignore it. Solved

El mié, 27 ene 2021 a las 21:04, Dante Doménech ()
escribió:

> Hello.
> I'm working on a starmath syntax highlighter over here:
> https://gerrit.libreoffice.org/c/core/+/109639 (it builds)
>
> Need help about how to link the stuff on UI files with the c++ code.
> Already edited: starmath/source/dialog.cxx, but not enought.
>
> The current behaviour:
> smzoom (m_xSmZoom): internals not implemented yet. For some reason it's in
> sync with zoom (m_xZoom).
>
> El mié, 27 ene 2021 a las 20:33, Dante Doménech ()
> escribió:
>
>> Hello.
>> I'm working on a starmath syntax highlighter over here:
>> https://gerrit.libreoffice.org/c/core/+/109639 (it builds)
>>
>> Need help about how to link the stuff on UI files with the c++ code.
>> Already edited: starmath/source/dialog.cxx, but not enought.
>>
>> The current behaviour:
>> syntaxhightlight (m_xSyntaxHightlight): does not change the preference
>> and it's value is false even if selected. When apply changes reselects
>> itself.
>> smzoom (m_xSmZoom): internals not implemented yet. For some reason it's
>> in sync wit zoom (m_xZoom).
>>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: bin/check-missing-unittests.py

[Xisco Fauli (via logerrit)]

 bin/check-missing-unittests.py |   53 ++---
 1 file changed, 39 insertions(+), 14 deletions(-)

New commits:
commit b7175495249958c430e16c0bad358eee0032b65a
Author: Xisco Fauli 
AuthorDate: Thu Jan 28 12:16:49 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Jan 28 20:56:21 2021 +0100

check-missing-unittests: improve script

* Use findall since there might be more than 1 bugId in the summary
* put everything from 'source/core/' in others

Change-Id: I7d8d6e28f06a97415378c3d235b617ebc7441fbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110072
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/bin/check-missing-unittests.py b/bin/check-missing-unittests.py
index 154d01d5aa25..3ce385f82f0d 100755
--- a/bin/check-missing-unittests.py
+++ b/bin/check-missing-unittests.py
@@ -22,12 +22,19 @@ def main(ignoredBugs):
 'xhtml': {},
 'html': {},
 },
-'undo': {
-'writer': {}
+'writer': {
+'undo': {},
+'autoformat': {},
+'autocorrect': {},
+'others': {},
 },
-'import': {
-'calc': {},
-'drawingml': {}
+'calc': {
+'import': {},
+'others': {},
+},
+'impress': {
+'drawingml': {},
+'others': {},
 },
 
 }
@@ -51,10 +58,13 @@ def main(ignoredBugs):
 
 summary = commitInfo[0].strip('"').lower()
 
-#Check summary has a bug id
-reBugId = re.search(r'(?<=tdf#|fdo#)\d{5,6}\b', summary)
-if reBugId:
-bugId = reBugId.group()
+# Check for bugIds in the summary. Ignore those with a '-' after the 
digits.
+# Those are used for file names ( e.g. tdf129410-1.ods )
+bugIds = re.findall("\\b(?:bug|fdo|tdf|lo)[#:]?(\\d+)(?!-)\\b", 
summary)
+if bugIds is None or len(bugIds) == 0:
+continue
+
+for bugId in bugIds:
 
 isIgnored = False
 for i in ignoredBugs:
@@ -95,15 +105,30 @@ def main(ignoredBugs):
 results['export']['html'][bugId] = infoList
 
 elif 'sw/source/core/undo/' in changedFiles:
-results['undo']['writer'][bugId] = infoList
+results['writer']['undo'][bugId] = infoList
 
-elif 'sc/source/core/tool/interpr' in changedFiles:
-results['import']['calc'][bugId] = infoList
+elif 'sw/source/core/edit/autofmt' in changedFiles:
+results['writer']['autoformat'][bugId] = infoList
+
+elif 'sw/source/core/edit/acorrect' in changedFiles:
+results['writer']['autocorrect'][bugId] = infoList
 
 elif 'drawingml' in changedFiles:
-results['import']['drawingml'][bugId] = infoList
+results['impress']['drawingml'][bugId] = infoList
+
+elif 'sc/source/core/tool/interpr' in changedFiles:
+results['calc']['import'][bugId] = infoList
+
+# Keep the following if statements at the end
+
+elif 'sc/source/core/data/' in changedFiles:
+results['calc']['others'][bugId] = infoList
+
+elif 'sw/source/core/' in changedFiles:
+results['writer']['others'][bugId] = infoList
 
-# Add others here
+elif 'sd/source/core/' in changedFiles:
+results['impress']['others'][bugId] = infoList
 
 print()
 print('{{TopMenu}}')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/uibase/index/toxmgr.cxx |   17 -
 1 file changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 960e88835e0b2f7ff5fc57393b74017198c314e3
Author: Michael Stahl 
AuthorDate: Wed Jan 27 15:41:40 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Jan 28 20:06:52 2021 +0100

sw: fix SwTOXMgr::UpdateOrInsertTOX() for user-defined

The main problem is that when editing an existing user-defined index,
the "Create From" changes aren't applied, because it does
pCurTOX->SetCreate() and not pNewTOX->SetCreate().

But that wasn't obvious as the function is obviosly very confused about
its 3 different TOX variables.

pTOX is just used at the end, so just move it there.

pCurTOX can be const.

Then there is an odd condition on pSh->HasSelection() which ends up
doing DelRight() but fortunately it's dead code since commit
e9da29679bce3b544add9233a4aca2b19b78da1a #i97572# cleared the selection
already.

The pNewTOX = pCurTOX there seems pointless because pNewTOX is already a
copy of *pCurTOX.

Change-Id: I1e9c8178e314a188a50272410fbe566e4a566742
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110021
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/uibase/index/toxmgr.cxx 
b/sw/source/uibase/index/toxmgr.cxx
index 4e7e65f9c4d0..fe4885830ffa 100644
--- a/sw/source/uibase/index/toxmgr.cxx
+++ b/sw/source/uibase/index/toxmgr.cxx
@@ -269,13 +269,9 @@ bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& 
rDesc,
 {
 SwWait aWait( *pSh->GetView().GetDocShell(), true );
 bool bRet = true;
-const SwTOXBase* pCurTOX = ppBase && *ppBase ? *ppBase : pSh->GetCurTOX();
-SwTOXBase* pTOX = const_cast(pCurTOX);
+const SwTOXBase *const pCurTOX = ppBase && *ppBase ? *ppBase : 
pSh->GetCurTOX();
 
-SwTOXBase * pNewTOX = nullptr;
-
-if (pTOX)
-pNewTOX = new SwTOXBase(*pTOX);
+SwTOXBase * pNewTOX = pCurTOX ? new SwTOXBase(*pCurTOX) : nullptr;
 
 TOXTypes eCurTOXType = rDesc.GetTOXType();
 if(pCurTOX && !ppBase && pSh->HasSelection())
@@ -330,7 +326,7 @@ bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& 
rDesc,
 }
 else
 {
-const_cast( pCurTOX 
)->SetCreate(rDesc.GetContentOptions());
+pNewTOX->SetCreate(rDesc.GetContentOptions());
 }
 pNewTOX->SetLevelFromChapter(rDesc.IsLevelFromChapter());
 }
@@ -385,12 +381,6 @@ bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& 
rDesc,
 TOX_AUTHORITIES == eCurTOXType ? SwTOXElement::Mark : 
SwTOXElement::NONE,
 pType->GetTypeName());
 }
-else
-{
-if((!ppBase || !(*ppBase)) && pSh->HasSelection())
-pSh->DelRight();
-pNewTOX = const_cast(pCurTOX);
-}
 pNewTOX->SetFromObjectNames(rDesc.IsCreateFromObjectNames());
 pNewTOX->SetOLEOptions(rDesc.GetOLEOptions());
 }
@@ -437,6 +427,7 @@ bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& 
rDesc,
 pDoc->GetIDocumentUndoRedo().StartUndo(SwUndoId::TOXCHANGE, 
nullptr);
 }
 
+SwTOXBase *const pTOX = const_cast(pCurTOX);
 pDoc->ChangeTOX(*pTOX, *pNewTOX);
 
 pTOX->DisableKeepExpression();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] ESC meeting agenda - Adding topic: Broken release process when fresh become still and when still become EOL'ed

[Timur Gadzo]

On Thursday, January 28, 2021, Florian Effenberger <
flo...@documentfoundation.org> wrote:
>
> William Gathoye (LibreOffice) wrote on 27.01.21 at 18:22:
>
>> Right now: 6.4 is EOL'ed[4] but it is still advertised on the website
while the update service is redirecting users of 6.4 to the 7.0 version.
>
> I think it is intentional that we always do have two parallel versions
available for download, but it's something that might change as we are
looking into the rolling release system, which makes this differentiation
obsolete.
>

Hi

Still has a purpose, many users (me also) are using Still.last. So we need
6.4 to be on the webpage, until we get 7.0.last.
This proposal not only missed the point and failed to consider diverse
needs of others, but it's over zealous in a detrimental way.

I'm reading about rolling release idea, and I find it awful. It just popped
up, not sure why. Yes, it's more simple to publish, but it would ruin LO
usability.

LO is regression plagued product.
Some serious regressions may take months to be resolved, if ever. So with
Still we still have a half-decent suite (other half are all those
unresolved regressions).

To me, who's in QA and following thousands of bugs, this looks like making
new problems, because the most important ones (regressions and 10 years old
bugs) are harder to deal with.

If it's working, don't change that, rather fix what's not working.

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

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/tiledrendering/tiledrendering.cxx |   57 +
 sw/source/core/txtnode/ndtxt.cxx   |   50 +
 2 files changed, 98 insertions(+), 9 deletions(-)

New commits:
commit 6de46444027d03b617d02b66434f626c5723501f
Author: Miklos Vajna 
AuthorDate: Thu Jan 28 17:28:54 2021 +0100
Commit: Miklos Vajna 
CommitDate: Thu Jan 28 18:41:17 2021 +0100

sw: don't repaint all text frames on text node delete for bullet numberings

The intention of the InvalidateNumRule() call is probably to make sure
that generated number portions in e.g. Arabic numbering are up to date.
But this is not necessary for bullets and causes not needed
invalidations.

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

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 28edd8c5fb55..eb453e9bbec8 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -60,6 +60,7 @@
 #include 
 #include 
 #include 
+#include 
 
 constexpr OUStringLiteral DATA_DIRECTORY = 
u"/sw/qa/extras/tiledrendering/data/";
 
@@ -148,6 +149,7 @@ public:
 void testTablePaintInvalidate();
 void testSpellOnlineRenderParameter();
 void testExtTextInputReadOnly();
+void testBulletDeleteInvalidation();
 
 CPPUNIT_TEST_SUITE(SwTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -222,13 +224,17 @@ public:
 CPPUNIT_TEST(testTablePaintInvalidate);
 CPPUNIT_TEST(testSpellOnlineRenderParameter);
 CPPUNIT_TEST(testExtTextInputReadOnly);
+CPPUNIT_TEST(testBulletDeleteInvalidation);
 CPPUNIT_TEST_SUITE_END();
 
 private:
 SwXTextDocument* createDoc(const char* pName = nullptr);
 static void callback(int nType, const char* pPayload, void* pData);
 void callbackImpl(int nType, const char* pPayload);
+// First invalidation.
 tools::Rectangle m_aInvalidation;
+/// Union of all invalidations.
+tools::Rectangle m_aInvalidations;
 Size m_aDocumentSize;
 OString m_aTextSelection;
 bool m_bFound;
@@ -309,17 +315,20 @@ void SwTiledRenderingTest::callbackImpl(int nType, const 
char* pPayload)
 {
 case LOK_CALLBACK_INVALIDATE_TILES:
 {
+tools::Rectangle aInvalidation;
+uno::Sequence aSeq = 
comphelper::string::convertCommaSeparated(OUString::createFromAscii(pPayload));
+if (OString("EMPTY") == pPayload)
+return;
+CPPUNIT_ASSERT(aSeq.getLength() == 4 || aSeq.getLength() == 5);
+aInvalidation.setX(aSeq[0].toInt32());
+aInvalidation.setY(aSeq[1].toInt32());
+aInvalidation.setWidth(aSeq[2].toInt32());
+aInvalidation.setHeight(aSeq[3].toInt32());
 if (m_aInvalidation.IsEmpty())
 {
-uno::Sequence aSeq = 
comphelper::string::convertCommaSeparated(OUString::createFromAscii(pPayload));
-if (OString("EMPTY") == pPayload)
-return;
-CPPUNIT_ASSERT(aSeq.getLength() == 4 || aSeq.getLength() == 5);
-m_aInvalidation.setX(aSeq[0].toInt32());
-m_aInvalidation.setY(aSeq[1].toInt32());
-m_aInvalidation.setWidth(aSeq[2].toInt32());
-m_aInvalidation.setHeight(aSeq[3].toInt32());
+m_aInvalidation = aInvalidation;
 }
+m_aInvalidations.Union(aInvalidation);
 ++m_nInvalidations;
 }
 break;
@@ -2929,6 +2938,38 @@ void SwTiledRenderingTest::testExtTextInputReadOnly()
 CPPUNIT_ASSERT_EQUAL(OUString("x"), getParagraph(2)->getString());
 }
 
+void SwTiledRenderingTest::testBulletDeleteInvalidation()
+{
+// Given a document with 3 paragraphs: first 2 is bulleted, the last is 
not.
+SwXTextDocument* pXTextDocument = createDoc();
+SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
+pWrtShell->SplitNode();
+pWrtShell->Up(/*bSelect=*/false);
+pWrtShell->StartAllAction();
+pWrtShell->BulletOn();
+pWrtShell->EndAllAction();
+pWrtShell->Insert2("a");
+pWrtShell->SplitNode();
+pWrtShell->Insert2("b");
+pWrtShell->Down(/*bSelect=*/false);
+pWrtShell->GetLayout()->PaintSwFrame(*pWrtShell->GetOut(),
+ 
pWrtShell->GetLayout()->getFrameArea());
+Scheduler::ProcessEventsToIdle();
+
pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&SwTiledRenderingTest::callback,
 this);
+m_aInvalidations = tools::Rectangle();
+
+// When pressing backspace in the last paragraph.
+pWrtShell->DelLeft();
+
+// Then the first paragraph should not be invalidated.
+SwRootFrame* pRoot = pWrtShell->GetLayout();
+SwFrame* pPage = pRoot->GetLower();
+SwFrame* pBody = pPage->GetLower();
+SwFrame* pFirstText = pBody->GetLower();
+to

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

[Caolán McNamara (via logerrit)]

 lotuswordpro/source/filter/lwpfribptr.cxx |   35 +++---
 lotuswordpro/source/filter/lwpfribptr.hxx |4 +--
 2 files changed, 20 insertions(+), 19 deletions(-)

New commits:
commit 4e84a42add9c8ac27feb5e49a96e00ffcc8f0bc8
Author: Caolán McNamara 
AuthorDate: Thu Jan 28 14:54:13 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 28 18:14:54 2021 +0100

ofz#30005 crash in LwpFribPtr::XFConvert

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

diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx 
b/lotuswordpro/source/filter/lwpfribptr.cxx
index dc00504a9be6..01089461d576 100644
--- a/lotuswordpro/source/filter/lwpfribptr.cxx
+++ b/lotuswordpro/source/filter/lwpfribptr.cxx
@@ -84,7 +84,8 @@
 #include 
 
 LwpFribPtr::LwpFribPtr()
-: m_pFribs(nullptr),m_pXFPara(nullptr),m_pPara(nullptr)
+: m_pFribs(nullptr)
+, m_pPara(nullptr)
 {
 }
 
@@ -173,7 +174,7 @@ void LwpFribPtr::XFConvert()
 case FRIB_TAG_TEXT:
 {
 LwpFribText* textFrib= static_cast(pFrib);
-textFrib->XFConvert(m_pXFPara,m_pPara->GetStory());
+textFrib->XFConvert(m_pXFPara.get(),m_pPara->GetStory());
 }
 break;
 case FRIB_TAG_TAB:
@@ -245,7 +246,7 @@ void LwpFribPtr::XFConvert()
 case FRIB_TAG_UNICODE3: //fall through
 {
 LwpFribUnicode* unicodeFrib= static_cast(pFrib);
-unicodeFrib->XFConvert(m_pXFPara,m_pPara->GetStory());
+unicodeFrib->XFConvert(m_pXFPara.get(), m_pPara->GetStory());
 }
 break;
 case FRIB_TAG_HARDSPACE:
@@ -254,13 +255,13 @@ void LwpFribPtr::XFConvert()
 LwpStory *pStory = m_pPara->GetStory();
 LwpHyperlinkMgr* pHyperlink = pStory ? pStory->GetHyperlinkMgr() : 
nullptr;
 if (pHyperlink && pHyperlink->GetHyperlinkFlag())
-pFrib->ConvertHyperLink(m_pXFPara,pHyperlink,sHardSpace);
+pFrib->ConvertHyperLink(m_pXFPara.get(), 
pHyperlink,sHardSpace);
 else
-pFrib->ConvertChars(m_pXFPara,sHardSpace);
+pFrib->ConvertChars(m_pXFPara.get(), sHardSpace);
 }
 break;
 case FRIB_TAG_SOFTHYPHEN:
-pFrib->ConvertChars(m_pXFPara,u"\x00ad");
+pFrib->ConvertChars(m_pXFPara.get(), u"\x00ad");
 break;
 case FRIB_TAG_FRAME:
 {
@@ -271,64 +272,64 @@ void LwpFribPtr::XFConvert()
 LwpFoundry* pFoundry = m_pPara->GetFoundry();
 LwpDropcapMgr* pMgr = pFoundry ? pFoundry->GetDropcapMgr() : 
nullptr;
 if (pMgr)
-pMgr->SetXFPara(m_pXFPara);
+pMgr->SetXFPara(m_pXFPara.get());
 }
-frameFrib->XFConvert(m_pXFPara);
+frameFrib->XFConvert(m_pXFPara.get());
 break;
 }
 case FRIB_TAG_CHBLOCK:
 {
 LwpFribCHBlock* chbFrib = static_cast(pFrib);
-chbFrib->XFConvert(m_pXFPara,m_pPara->GetStory());
+chbFrib->XFConvert(m_pXFPara.get(),m_pPara->GetStory());
 }
 break;
 case FRIB_TAG_TABLE:
 {
 LwpFribTable* tableFrib = static_cast(pFrib);
 //tableFrib->XFConvert(m_pPara->GetXFContainer());
-tableFrib->XFConvert(m_pXFPara);
+tableFrib->XFConvert(m_pXFPara.get());
 }
 break;
 case FRIB_TAG_BOOKMARK:
 {
 LwpFribBookMark* bookmarkFrib = 
static_cast(pFrib);
-bookmarkFrib->XFConvert(m_pXFPara);
+bookmarkFrib->XFConvert(m_pXFPara.get());
 }
 break;
 case FRIB_TAG_FOOTNOTE:
 {
 LwpFribFootnote* pFootnoteFrib = 
static_cast(pFrib);
-pFootnoteFrib->XFConvert(m_pXFPara);
+pFootnoteFrib->XFConvert(m_pXFPara.get());
 break;
 }
 case FRIB_TAG_FIELD:
 {
 LwpFribField* fieldFrib = static_cast(pFrib);
-fieldFrib->XFConvert(m_pXFPara);
+fieldFrib->XFConvert(m_pXFPara.get());
 break;
 }
 case FRIB_TAG_NOTE:
 {
 LwpFribNote* pNoteFrib = static_cast(pFrib);
-pNoteFrib->XFConvert(m_pXFPara);
+pNoteFrib->XFConvert(m_pXFPara.get());
 break;
 }
 case FRIB_TAG_PAGENUMBER:
 {
 LwpFribPageNumber* pagenumFrib = 
static_cast(pFrib);
-pagenumFrib->XFConvert(m_pXFPara);
+pagenumFrib->XFConvert(m_pXFPara.get());
 break;
 }
 case FRIB_TAG_DOCVAR:
 {
 LwpFribDocVar* docFrib = static_cast(pFrib);
-docFrib->XFConvert(m_pXFPara);
+docFrib->XFConvert(m_pXFPara.get());
 break;
 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - solenv/bin

[Maxim Monastirsky (via logerrit)]

 solenv/bin/uiimagelist.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9fb11584425d692136c3c83d4e02a78432738f6b
Author: Maxim Monastirsky 
AuthorDate: Thu Jan 28 11:06:35 2021 +0200
Commit: Caolán McNamara 
CommitDate: Thu Jan 28 17:55:27 2021 +0100

tdf#139781 Handle also "icon-name" property name

Change-Id: Iaf2c8521588bdf58daa3166b1efa27979eca2e1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110048
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 
(cherry picked from commit ed28902e2d2b8929617c92226be985e322147569)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110062
Reviewed-by: Caolán McNamara 

diff --git a/solenv/bin/uiimagelist.xsl b/solenv/bin/uiimagelist.xsl
index 3d14f8d31dc4..659d3b943ae1 100644
--- a/solenv/bin/uiimagelist.xsl
+++ b/solenv/bin/uiimagelist.xsl
@@ -17,7 +17,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source comphelper/source connectivity/source desktop/source editeng/source forms/source framework/source i18npool/source oox/source opencl/source registry/source

[Noel (via logerrit)]

 basic/source/comp/codegen.cxx |2 -
 basic/source/runtime/runtime.cxx  |2 -
 comphelper/source/misc/string.cxx |2 -
 connectivity/source/commontools/dbtools2.cxx  |4 +-
 connectivity/source/drivers/firebird/Clob.cxx |4 +-
 connectivity/source/drivers/firebird/PreparedStatement.cxx|4 +-
 desktop/source/deployment/misc/dp_misc.cxx|2 -
 desktop/source/deployment/misc/dp_ucb.cxx |   12 

 editeng/source/editeng/editdoc.cxx|2 -
 editeng/source/misc/svxacorr.cxx  |4 +-
 forms/source/component/Filter.cxx |2 -
 framework/source/uielement/toolbarsmenucontroller.cxx |6 +---
 i18npool/source/characterclassification/cclass_unicode_parser.cxx |   12 

 i18npool/source/nativenumber/nativenumbersupplier.cxx |4 +-
 oox/source/dump/dumperbase.cxx|6 ++--
 opencl/source/openclconfig.cxx|4 +-
 registry/source/keyimpl.cxx   |2 -
 sal/osl/unx/file_url.cxx  |2 -
 sax/source/tools/converter.cxx|2 -
 sc/source/core/tool/address.cxx   |2 -
 sc/source/filter/excel/xehelper.cxx   |2 -
 sc/source/ui/app/inputhdl.cxx |4 +-
 sdext/source/pdfimport/tree/style.cxx |2 -
 sdext/source/presenter/PresenterController.cxx|4 +-
 stoc/source/uriproc/ExternalUriReferenceTranslator.cxx|4 +-
 stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx |8 ++---
 svl/source/misc/urihelper.cxx |4 +-
 svl/source/numbers/zformat.cxx|   10 
+++
 sw/source/core/access/accportions.cxx |2 -
 sw/source/core/bastyp/calc.cxx|4 +-
 sw/source/core/crsr/pam.cxx   |2 -
 sw/source/core/fields/cellfml.cxx |4 +-
 sw/source/core/text/redlnitr.cxx  |4 +-
 sw/source/filter/xml/xmltexte.cxx |2 -
 toolkit/source/awt/animatedimagespeer.cxx |8 ++---
 ucb/source/ucp/tdoc/tdoc_content.cxx  |2 -
 unotools/source/config/configpaths.cxx|4 +-
 vbahelper/source/vbahelper/vbacommandbarhelper.cxx|4 +-
 vcl/source/control/field.cxx  |   14 
+-
 vcl/source/control/field2.cxx |2 -
 vcl/source/control/longcurr.cxx   |2 -
 vcl/source/edit/texteng.cxx   |4 +-
 vcl/source/window/menu.cxx|7 +
 xmloff/source/core/xmluconv.cxx   |2 -
 xmloff/source/draw/propimp0.cxx   |2 -
 xmloff/source/meta/xmlmetai.cxx   |3 --
 xmloff/source/style/fonthdl.cxx   |2 -
 xmloff/source/style/xmlexppr.cxx  |2 -
 48 files changed, 92 insertions(+), 102 deletions(-)

New commits:
commit 943060836339f9640c612e9724f20e79db616e6e
Author: Noel 
AuthorDate: Thu Jan 28 12:38:01 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Jan 28 17:32:18 2021 +0100

simplify code, use more subView()

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

diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index 87daa849f74f..f821c15aece6 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -218,7 +218,7 @@ void SbiCodeGen::Save()
 {
 aIfaceProcName.append(aPropPrefix);
 }
-
aIfaceProcName.append(std::u16string_view(aPureProcName).substr(rIfaceName.getLength()
 + 1) );
+
aIfaceProcName.append(aPureProcName.subView(rIfaceName.getLength() + 1) );
 aIfaceName = rIfaceName;
 nPassCount = 2;
 break;
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 87cef46cffbe..bacd02a2c0e2 100644

[Libreoffice-commits] core.git: embedserv/source sfx2/source vcl/win

[Jan-Marek Glogowski (via logerrit)]

 embedserv/source/embed/tracker.cxx   |   12 +++-
 sfx2/source/appl/shutdowniconw32.cxx |9 -
 vcl/win/dtrans/MtaOleClipb.cxx   |   23 ---
 vcl/win/dtrans/target.cxx|   10 +-
 4 files changed, 44 insertions(+), 10 deletions(-)

New commits:
commit d249bd5a3dfe13052ce9aa91bad94ec7d60604d4
Author: Jan-Marek Glogowski 
AuthorDate: Thu Jan 28 08:43:12 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Jan 28 17:08:47 2021 +0100

WIN handle GetMessageW return values

GetMessageW returns a BOOL with three defined return values; a
bit unexpected (-1 = error, 0 = WM_QUIT, * = dispatch message).
So this tries to handle the non-dispatch results in some way.

It's not clear for me, if there is some sensible way to "recover"
from an error, but from all I've read it doesn't look like it.
"Recover" means in this case, that the last call failed but next
call may still succeed without changing the parameters.

Change-Id: Ib1f366c7ce8b48158d1935938b49d8da991b30e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110043
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/embedserv/source/embed/tracker.cxx 
b/embedserv/source/embed/tracker.cxx
index 00260481c0a8..dbe114660f61 100644
--- a/embedserv/source/embed/tracker.cxx
+++ b/embedserv/source/embed/tracker.cxx
@@ -22,11 +22,18 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
 #include 
 
+// windowserrorstring.hxx includes postwin.h, which #undef OPAQUE, so "#redef" 
it
+#include 
+#ifdef OPAQUE
+#error OPAQUE should not be defined!?
+#endif
+#define OPAQUE 2
 
 static HCURSOR afxCursors[10] = { nullptr, };
 static HBRUSH afxHalftoneBrush = nullptr;
@@ -398,7 +405,10 @@ BOOL Tracker::TrackHandle(int nHandle,HWND hWnd,POINT 
point,HWND hWndClipTo)
 for (;;)
 {
 MSG msg;
-GetMessageW(&msg, nullptr, 0, 0);
+BOOL bRet = GetMessageW(&msg, nullptr, 0, 0);
+SAL_WARN_IF(-1 == bRet, "embedserv", "GetMessageW failed: " << 
WindowsErrorString(GetLastError()));
+if (-1 == bRet || 0 == bRet)
+break;
 
 if (GetCapture() != hWnd)
 break;
diff --git a/sfx2/source/appl/shutdowniconw32.cxx 
b/sfx2/source/appl/shutdowniconw32.cxx
index 0f1aa36301d7..298d84bf7d89 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -458,9 +459,15 @@ static DWORD WINAPI SystrayThread( LPVOID /*lpParam*/ )
 );
 
 MSG msg;
+BOOL bRet;
 
-while ( GetMessageW( &msg, nullptr, 0, 0 ) )
+while ((bRet = GetMessageW(&msg, nullptr, 0, 0)) != 0)
 {
+if (-1 == bRet)
+{
+SAL_WARN("sfx.appl", "GetMessageW failed: " << 
WindowsErrorString(GetLastError()));
+return 1;
+}
 TranslateMessage( &msg );
 DispatchMessageW( &msg );
 }
diff --git a/vcl/win/dtrans/MtaOleClipb.cxx b/vcl/win/dtrans/MtaOleClipb.cxx
index 6fc789e27d9d..f6e471925516 100644
--- a/vcl/win/dtrans/MtaOleClipb.cxx
+++ b/vcl/win/dtrans/MtaOleClipb.cxx
@@ -45,6 +45,8 @@
 
 #include 
 
+#include 
+
 //  namespace directives
 
 using osl::MutexGuard;
@@ -642,22 +644,29 @@ unsigned int CMtaOleClipboard::run( )
 
 createMtaOleReqWnd( );
 
-unsigned int nRet;
+unsigned int nRet = ~0U; // = error
 
 if ( IsWindow( m_hwndMtaOleReqWnd ) )
 {
 if ( nullptr != m_hEvtThrdReady )
 SetEvent( m_hEvtThrdReady );
 
+nRet = 0;
+
 // pumping messages
 MSG msg;
-while( GetMessageW( &msg, nullptr, 0, 0 ) )
-DispatchMessageW( &msg );
-
-nRet = 0;
+BOOL bRet;
+while ((bRet = GetMessageW(&msg, nullptr, 0, 0)) != 0)
+{
+if (-1 == bRet)
+{
+SAL_WARN("vcl.win.dtrans", "GetMessageW failed: " << 
WindowsErrorString(GetLastError()));
+nRet = ~0U;
+break;
+}
+DispatchMessageW(&msg);
+}
 }
-else
-nRet = ~0U;
 
 OleUninitialize( );
 
diff --git a/vcl/win/dtrans/target.cxx b/vcl/win/dtrans/target.cxx
index adddabab7038..45a8515bd414 100644
--- a/vcl/win/dtrans/target.cxx
+++ b/vcl/win/dtrans/target.cxx
@@ -30,6 +30,8 @@
 #include "targetdragcontext.hxx"
 #include 
 #include 
+#include 
+#include 
 
 #include "DOTransferable.hxx"
 
@@ -206,8 +208,14 @@ DWORD WINAPI DndTargetOleSTAFunc(LPVOID pParams)
 DWORD threadId= GetCurrentThreadId();
 // We force the creation of a thread message queue. This is necessary
 // for a later call to AttachThreadInput
-while( GetMessageW(&msg, nullptr, 0, 0) )
+BOOL bRet;
+while ((bRet = GetMessageW(&msg, nullptr, 0, 0)) != 0)
 {
+if (-1 == bRet)
+{
+SAL_WARN("vcl.win.dtra

Re: ESC meeting agenda - Adding topic: Broken release process when fresh become still and when still become EOL'ed

[Florian Effenberger]

Hi William,

Cloph and Xisco can give more technical details, so just some quick 
thoughts from my side before the ESC call:


William Gathoye (LibreOffice) wrote on 27.01.21 at 18:22:

Right now: 6.4 is EOL'ed[4] but it is still advertised on the website 
while the update service is redirecting users of 6.4 to the 7.0 version. 


I think it is intentional that we always do have two parallel versions 
available for download, but it's something that might change as we are 
looking into the rolling release system, which makes this 
differentiation obsolete.


2. Write and ensure a check list for the release process is **enforced** 
to ensure these use case are properly handled and the TDF update service 
is advertising the right version with 2 days max delay.


The goal is to have the update trigger live within one week. Two days 
sounds rather short - having some days gives us the option to see if 
there are any major problems, and is e.g. also what many Android vendors 
do with their staggered rollout.


What's the rationale for two days, why that urgency? Also, thinking of 
the release days on Wednesdays or Thursdays, it might be smart to not 
put forward such updates during the weekends, when reaction times in 
case of issues are slower than during the week.


Unless we e.g. have a very severe security issue, a week sounds just 
fine to me. Ultimately, this is something Cloph and Xisco should decide 
together with the ESC.


Florian

--
Florian Effenberger, Executive Director (Geschäftsführer)
Tel: +49 30 5557992-50 | Mail: flo...@documentfoundation.org
The Document Foundation, Kurfürstendamm 188, 10707 Berlin, DE
Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: https://www.documentfoundation.org/imprint
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - filter/qa sfx2/source

[Mike Kaganski (via logerrit)]

 filter/qa/unit/textfilterdetect.cxx |   20 
 sfx2/source/doc/objstor.cxx |6 --
 2 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit e7cf5e1187c378b680fecefd0d3176de09c55bba
Author: Mike Kaganski 
AuthorDate: Wed Jan 27 16:05:54 2021 +0100
Commit: Miklos Vajna 
CommitDate: Thu Jan 28 16:40:56 2021 +0100

tdf#123476 filter: Also handle empty ODF

This builds on top of commit ada07f303e7cd1e39c73abe0741aefe7d9d73a57,
to allow 0-byte ODT, ODS etc.

Possible TODO would be somehow use default template for such empty files,
getting the template name using SfxObjectFactory::GetStandardTemplate.
That would enable using 0-byte ODF files as means to "create new document
at this location from default template" workflow.

Change-Id: I36e07b80f60c42aecdcc6a7357e5bdd18f62e4f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109989
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 2854362f429e476d4a1ab4759c6a1f1c04150280)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110061
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/filter/qa/unit/data/empty.odp b/filter/qa/unit/data/empty.odp
new file mode 100644
index ..e69de29bb2d1
diff --git a/filter/qa/unit/data/empty.odt b/filter/qa/unit/data/empty.odt
new file mode 100644
index ..e69de29bb2d1
diff --git a/filter/qa/unit/textfilterdetect.cxx 
b/filter/qa/unit/textfilterdetect.cxx
index 4e81a333ab71..74d967490ffe 100644
--- a/filter/qa/unit/textfilterdetect.cxx
+++ b/filter/qa/unit/textfilterdetect.cxx
@@ -96,6 +96,26 @@ CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testEmptyFile)
 // Without the accompanying fix in place, this test would have failed, as 
it was opened in
 // Writer instead.
 
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.presentation.PresentationDocument"));
+
+getComponent()->dispose();
+
+// Now also test ODT
+aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "empty.odt";
+getComponent() = loadFromDesktop(aURL);
+xServiceInfo.set(getComponent(), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xServiceInfo.is());
+// Make sure it opens in Writer.
+
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.TextDocument"));
+getComponent()->dispose();
+
+// ... and ODP
+aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "empty.odp";
+getComponent() = loadFromDesktop(aURL);
+xServiceInfo.set(getComponent(), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xServiceInfo.is());
+// Without the accompanying fix in place, this test would have failed, as 
it was opened in
+// Writer instead.
+
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.presentation.PresentationDocument"));
 }
 }
 
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 441ae44c1373..2141a590b212 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -446,7 +446,7 @@ bool SfxObjectShell::InitNew( const uno::Reference< 
embed::XStorage >& xStorage
 
 bool SfxObjectShell::Load( SfxMedium& rMedium )
 {
-return GeneralInit_Impl( rMedium.GetStorage(), true );
+return GeneralInit_Impl(rMedium.GetStorage(), 
!tools::isEmptyFileUrl(rMedium.GetName()));
 }
 
 void SfxObjectShell::DoInitUnitTest()
@@ -686,7 +686,9 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed )
 bWarnMediaTypeFallback = false;
 }
 
-if ( bWarnMediaTypeFallback || 
!xStorage->getElementNames().hasElements() )
+if (bWarnMediaTypeFallback
+|| (!tools::isEmptyFileUrl(pMedium->GetName())
+&& !xStorage->getElementNames().hasElements()))
 SetError(ERRCODE_IO_BROKENPACKAGE);
 }
 catch( uno::Exception& )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

ESC meeting minutes: 2021-01-28

[Miklos Vajna]

* Present:
+ Caolan, Cloph, Stephan, Heiko, Michael W, Olivier, Sophie, Miklos, 
Thorsten, Gabriel, Xisco, Michael S, Taruen, William

* Completed Action Items:

* Pending Action Items:
+ get GSoC 2021 application kicked off until 29th January (Thorsten)
  + actually application window opens tomorrow
+ data of mentoring update / qa stats look outdated, investigate (Xisco)

* Release Engineering update (Cloph)
+ 7.1 status: 7.1.0 rc3, meant to be the final one
  + tag has been created yesterday, builds are in progress
+ 7.0 status
  + 7.0.5 far away (week 7)
+ Remotes: Android, iOS
+ Android viewer

* Documentation (Olivier)
+Helpconetnt2
  + Updates and fixes (fitojb, ohallot, S. Chaiklin, A. Gelmini, johnny_M)
  + New Help pages for ScriptForge (R. Lima),
+ Guides
  + Work in progress
+ url for blog post:
https://blog.documentfoundation.org/blog/2021/01/28/introducing-the-scriptforge-basic-libraries/


* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
242(242) (topicUI) bugs open, 254(254) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week 1 month   3 months   12 months
 added  12(-13)32(-7) 62(-7)164(-7)
 commented 130(-16)   417(69)   1048(30)   4131(25)
   removed   1(1)   3(3)   8(2)  52(3)
  resolved  13(-5) 54(11)158(5) 510(5)
+ top 10 contributors:
  Heiko Tietze made 269 changes in 1 month, and 2495 changes in 1 year
  Telesto made 218 changes in 1 month, and 952 changes in 1 year
  Foote, V Stuart made 102 changes in 1 month, and 707 changes in 1 year
  Seth Chaiklin made 73 changes in 1 month, and 212 changes in 1 year
  Ilmari Lauhakangas made 42 changes in 1 month, and 316 changes in 1 
year
  Dieter Praas made 31 changes in 1 month, and 489 changes in 1 year
  Kaganski, Mike made 27 changes in 1 month, and 173 changes in 1 year
  Roman Kuznetsov made 23 changes in 1 month, and 263 changes in 1 year
  Jim Raykowski made 16 changes in 1 month, and 34 changes in 1 year
  Budea, Áron made 11 changes in 1 month, and 35 changes in 1 year

+ New tickets with needsUXEval Jan/21-28

  + [Bug 139956] FORMATTING : Grid lines are not visible on a different
 background colour
  + [Bug 139944] Navigator not adjusted to "Master slide mode". So shows
 objects from normal mode
  + [Bug 139568] Show how much new data you have written since a save (next
 to save icon)
  + [Bug 139924] Tools > Autocorrect > Apply with "Replace bullets with"
 only works with Default Style - contra help page - which
 is wrong?
  + [Bug 139884] [UI] Need a menu entry + keyboard shortcut + icon in
 toolbar to set "Default character style"
  + [Bug 135895] Improve documentation about numbered lists without a list
 style (see comment 15)
  + [Bug 134724] UI - Find in Calc fails when a formula refers to a cell in
 another sheet's pivot table
  + [Bug 139841] UI: cursor doesn't adjust size based on font size before
 typing
  + [Bug 139838] The behavior of the border picker is sometimes off
  + [Bug 139837] The area to select the inner border is to small (or the
 dialog)
  + [Bug 139811] Sidebar Draw Properties deck -> Page -> Background
 'Gradient' control needs additional height, the Insert
 Image dialog button is being clipped

   -> + Tools - AutoCorrect - Apply converts non-empty "Default Paragraph Style"
paragraphs to "Text Body" PS --even when no [M] options are selected
+ https://bugs.documentfoundation.org/show_bug.cgi?id=90507
+ needsDevAdvice / why was formatting/[M] introduced in first place?

* Crash Testing (Caolan)
+ 12(-2) import failure, 0(-1) export failures
+ 0 coverity issues
+ 16 ossfuzz: ?? fuzzers active now

* Crash Reporting (Xisco)
   + https://crashreport.libreoffice.org/stats/version/6.4.7.2
 + (+157) 1713 1556 1425 476 1349 1232 1411 1286 944 803 568 343 0
   + https://crashreport.libreoffice.org/stats/version/7.0.3.1
 + (-661) 5583 6244 6046 2302 7544 6347 6410 6208 4932 3472 1732 0
   + https://crashreport.libreoffice.org/stats/version/7.0.4.2
 + (+1702) 5595 3893 2033 1027 0
  Crash without steps since 6.4.6.2: 
https://crashreport.libreoffice.org/stats/signature/SwContentNode::GetAttr(SfxItemSet%20&)
  + no reproducer yet
https://crashreport.libreoffice.org/stats/crash_details/6e5b63e5-ddfd-43df-893a-a258a3d12a3e
  + is a sample instance of this pattern
* Mentoring/easyhack update
  committer...   1 week  1 month 3 months12 months
  open

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

[Tamás Zolnai (via logerrit)]

 sd/source/ui/sidebar/SlideBackground.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2be52f741e283b5f172ae536f0e99ce0f38df9e1
Author: Tamás Zolnai 
AuthorDate: Thu Jan 28 12:20:29 2021 +0100
Commit: Tamás Zolnai 
CommitDate: Thu Jan 28 16:08:05 2021 +0100

tdf#139965: Broken master slide list after switching mode.

Let's update the master slide combobox by context change.
populateMasterSlideDropdown() will fill the list when we
switch to normal view. The same method is called when the
sidebar created in normal view.
mpMasterSlide->Clear() will clean the list when we switch
to master view. The same happens, when the sidebar is created
in a master view context (the list is empty).

Change-Id: I322619e409a5352ddcd59a249dd0c874054c1e4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110075
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index 197d43abf4b8..0ba486884b25 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -291,6 +291,7 @@ void SlideBackground::HandleContextChange(
 mpCloseMaster->Show();
 mpEditMaster->Hide();
 mpMasterSlide->Disable();
+mpMasterSlide->Clear();
 mpDspMasterBackground->Disable();
 mpDspMasterObjects->Disable();
 mpFillStyle->Hide();
@@ -307,6 +308,7 @@ void SlideBackground::HandleContextChange(
 mpCloseMaster->Hide();
 mpEditMaster->Hide();
 mpMasterSlide->Disable();
+mpMasterSlide->Clear();
 mpDspMasterBackground->Disable();
 mpDspMasterObjects->Disable();
 mpFillStyle->Hide();
@@ -318,6 +320,7 @@ void SlideBackground::HandleContextChange(
 mpCloseMaster->Hide();
 mpEditMaster->Show();
 mpMasterSlide->Enable();
+populateMasterSlideDropdown();
 mpDspMasterBackground->Enable();
 mpDspMasterObjects->Enable();
 mpFillStyle->Show();
___
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/uitest/macro_tests/tdf64690.py |   79 +++
 1 file changed, 79 insertions(+)

New commits:
commit 33656a6c7500d0f799b0e4ed97bda0a9e58a7010
Author: Xisco Fauli 
AuthorDate: Thu Jan 28 10:00:51 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Jan 28 16:07:06 2021 +0100

tdf#64690: sw: Add UItest

Change-Id: I5fb9c630cb4c7e51add571c1fe24b1e5f14cffba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110045
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/uitest/macro_tests/tdf64690.py 
b/sw/qa/uitest/macro_tests/tdf64690.py
new file mode 100644
index ..7039e48df83a
--- /dev/null
+++ b/sw/qa/uitest/macro_tests/tdf64690.py
@@ -0,0 +1,79 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+class tdf64690(UITestCase):
+
+def test_tdf64690(self):
+
+self.ui_test.create_doc_in_start_center("writer")
+
+self.ui_test.execute_dialog_through_command(".uno:MacroDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+
+xEditBtn = xDialog.getChild("edit")
+xEditBtn.executeAction("CLICK", tuple())
+
+xMacroWin = self.xUITest.getTopFocusWindow()
+xEditWin = xMacroWin.getChild('EditorWindow')
+
+self.xUITest.executeCommand(".uno:SelectAll")
+xEditWin.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+
+self.assertEqual("\n", get_state_as_dict(xEditWin)['Text'])
+
+xEditWin.executeAction("TYPE", mkPropertyValues({"TEXT":"'abc"}))
+xEditWin.executeAction("TYPE", mkPropertyValues({"KEYCODE":"RETURN"}))
+xEditWin.executeAction("TYPE", mkPropertyValues({"TEXT":"'def"}))
+
+self.assertEqual("'abc\n'def\n", get_state_as_dict(xEditWin)['Text'])
+
+self.xUITest.executeCommand(".uno:SelectAll")
+
+
self.ui_test.execute_modeless_dialog_through_command(".uno:SearchDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+
+searchterm = xDialog.getChild("searchterm")
+searchterm.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"CTRL+A"}))
+searchterm.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+searchterm.executeAction("TYPE", mkPropertyValues({"TEXT":"."}))
+
+replaceterm = xDialog.getChild("replaceterm")
+replaceterm.executeAction("TYPE", mkPropertyValues({"TEXT":"ABC"}))
+
+regexp = xDialog.getChild("regexp")
+if get_state_as_dict(regexp)['Selected'] == 'false':
+regexp.executeAction("CLICK", tuple())
+self.assertEqual("true", get_state_as_dict(regexp)['Selected'])
+
+selection = xDialog.getChild("selection")
+if get_state_as_dict(selection)['Selected'] == 'false':
+selection.executeAction("CLICK", tuple())
+self.assertEqual("true", get_state_as_dict(selection)['Selected'])
+
+def handle_confirmation_dlg(dialog):
+xOKBtn = dialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+replaceall = xDialog.getChild("replaceall")
+
+# Without the fix in place, this test would have hung here
+self.ui_test.execute_blocking_action(replaceall.executeAction, 
args=('CLICK', ()),
+dialog_handler=handle_confirmation_dlg)
+
+xcloseBtn = xDialog.getChild("close")
+self.ui_test.close_dialog_through_button(xcloseBtn)
+
+self.assertEqual("ABCABCABCABC\nABCABCABCABC\n", 
get_state_as_dict(xEditWin)['Text'])
+
+self.ui_test.close_doc()
+
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gülşah Köse (via logerrit)]

 oox/inc/drawingml/graphicproperties.hxx|4 +++-
 oox/source/drawingml/fillproperties.cxx|   29 -
 oox/source/drawingml/shape.cxx |9 +++--
 sd/qa/unit/data/pptx/mirrored-graphic.pptx |binary
 sd/qa/unit/import-tests.cxx|   16 
 5 files changed, 54 insertions(+), 4 deletions(-)

New commits:
commit 62ee7fdce30d8e1deb6df80b73577ef6164a5a90
Author: Gülşah Köse 
AuthorDate: Thu Jan 28 09:37:58 2021 +0300
Commit: Gülşah Köse 
CommitDate: Thu Jan 28 15:46:14 2021 +0100

tdf#134210 Apply mirror property to custom cropped graphic.

Change-Id: I5bf2ba8fa432af8b6a560cc60c18bef799834fd0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110039
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 

diff --git a/oox/inc/drawingml/graphicproperties.hxx 
b/oox/inc/drawingml/graphicproperties.hxx
index 85b47dbff593..48d1acf61931 100644
--- a/oox/inc/drawingml/graphicproperties.hxx
+++ b/oox/inc/drawingml/graphicproperties.hxx
@@ -43,7 +43,9 @@ struct GraphicProperties
 /** Writes the properties to the passed property map. */
 voidpushToPropMap(
 PropertyMap& rPropMap,
-const GraphicHelper& rGraphicHelper) const;
+const GraphicHelper& rGraphicHelper,
+bool bFlipH = false,
+bool bFlipV = false) const;
 };
 
 } // namespace oox::drawingml
diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index c8946c15f9a8..6d537097a206 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -112,6 +112,28 @@ Reference< XGraphic > 
lclCropGraphic(uno::Reference const & x
 return aReturnGraphic.GetXGraphic();
 }
 
+Reference< XGraphic > lclMirrorGraphic(uno::Reference const 
& xGraphic, bool bFlipH, bool bFlipV)
+{
+::Graphic aGraphic(xGraphic);
+::Graphic aReturnGraphic;
+
+assert (aGraphic.GetType() == GraphicType::Bitmap);
+
+BitmapEx aBitmapEx(aGraphic.GetBitmapEx());
+BmpMirrorFlags nMirrorFlags = BmpMirrorFlags::NONE;
+
+if(bFlipH)
+nMirrorFlags |= BmpMirrorFlags::Horizontal;
+if(bFlipV)
+nMirrorFlags |= BmpMirrorFlags::Vertical;
+
+aBitmapEx.Mirror(nMirrorFlags);
+
+aReturnGraphic = ::Graphic(aBitmapEx);
+aReturnGraphic.setOriginURL(aGraphic.getOriginURL());
+
+return aReturnGraphic.GetXGraphic();
+}
 
 Reference< XGraphic > lclCheckAndApplyChangeColorTransform(const 
BlipFillProperties &aBlipProps, uno::Reference const & 
xGraphic,
const 
GraphicHelper& rGraphicHelper, const ::Color nPhClr)
@@ -761,7 +783,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 rPropMap.setProperty( ShapeProperty::FillStyle, eFillStyle );
 }
 
-void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const 
GraphicHelper& rGraphicHelper) const
+void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const 
GraphicHelper& rGraphicHelper, bool bFlipH, bool bFlipV) const
 {
 sal_Int16 nBrightness = getLimitedValue< sal_Int16, sal_Int32 >( 
maBlipProps.moBrightness.get( 0 ) / PER_PERCENT, -100, 100 );
 sal_Int16 nContrast = getLimitedValue< sal_Int16, sal_Int32 >( 
maBlipProps.moContrast.get( 0 ) / PER_PERCENT, -100, 100 );
@@ -811,6 +833,11 @@ void GraphicProperties::pushToPropMap( PropertyMap& 
rPropMap, const GraphicHelpe
 xGraphic = lclRotateGraphic(xGraphic, Degree10(nAngle/10) );
 }
 
+// We have not core feature that flips graphic in the shape.
+// Here we are applying flip property to bitmap directly.
+if(bFlipH || bFlipV)
+xGraphic = lclMirrorGraphic(xGraphic, bFlipH, bFlipV );
+
 rPropMap.setProperty(PROP_FillBitmap, xGraphic);
 }
 else
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 37633abb8b87..38c5ddfa689f 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1049,8 +1049,13 @@ Reference< XShape > const & Shape::createAndInsert(
 aShapeProps.assignUsed( maDefaultShapeProperties );
 if(mnRotation != 0 && bIsCustomShape)
 aShapeProps.setProperty( PROP_RotateAngle, sal_Int32( 
NormAngle36000( Degree100(mnRotation / -600) ) ));
-if ( bIsEmbMedia || aServiceName == 
"com.sun.star.drawing.GraphicObjectShape" || aServiceName == 
"com.sun.star.drawing.OLE2Shape" || bIsCustomShape )
-mpGraphicPropertiesPtr->pushToPropMap( aShapeProps, rGraphicHelper 
);
+if( bIsEmbMedia ||
+bIsCustomShape ||
+aServiceName == "com.sun.star.drawing.GraphicObjectShape" ||
+aServiceName == "com.sun.star.drawing.OLE2Shape")
+{
+mpGraphicPropertiesPtr->pushToPropMap( aS

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

[Michael Meeks (via logerrit)]

 sfx2/source/view/lokhelper.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4fab953fe24943152cfdbbc88b0d904be73c8514
Author: Michael Meeks 
AuthorDate: Sun Jan 24 04:10:41 2021 +
Commit: Michael Meeks 
CommitDate: Thu Jan 28 15:38:13 2021 +0100

lok: avoid a set of invalidations per view on re-size.

Unfortunate to have N^2 invalidations in the number of views on
resize - particularly for calc, when you re-size/wrap-text on a
row during editing.

Change-Id: I93f75c4543ad072684e5575a2cbe0e8abcab0d80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109913
Reviewed-by: Jan Holesovsky 
Tested-by: Jenkins CollaboraOffice 

diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 4928dd3102e9..3c1ecd207159 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -530,7 +530,10 @@ void 
SfxLokHelper::notifyDocumentSizeChangedAllViews(vcl::ITiledRenderable* pDoc
 // Should we then do this for all views of all open documents
 // or not?
 if (pCurrentViewShell == nullptr || pViewShell->GetDocId() == 
pCurrentViewShell-> GetDocId())
+{
 SfxLokHelper::notifyDocumentSizeChanged(pViewShell, "", pDoc, 
bInvalidateAll);
+bInvalidateAll = false; // we direct invalidations to all views 
anyway.
+}
 pViewShell = SfxViewShell::GetNext(*pViewShell);
 }
 }
___
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.4' - framework/source

[Michael Meeks (via logerrit)]

 framework/source/layoutmanager/helpers.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit ba18bb5729a01d3325ebf554263af6cf7a475c28
Author: Michael Meeks 
AuthorDate: Fri Jan 22 21:10:49 2021 +
Commit: Michael Meeks 
CommitDate: Thu Jan 28 15:33:46 2021 +0100

lok: avoid expensive fetching of a property.

--doc_setView
   SfxLokHelper::setView
   SfxViewFrame::MakeActive_Impl
   SfxApplication::SetViewFrame_Impl
   |
--SfxDispatcher::Update_Impl
  |
   --SfxWorkWindow::UpdateObjectBars_Impl
 SfxWorkWindow::UpdateObjectBars_Impl2
 |
  --framework::LayoutManager::requestElement
framework::LayoutManager::createElement
|
--11.97%--framework::implts_isPreviewModel

We re-calculate the calc print-area on every setView via this
code-path; pointlessly expensive.

Change-Id: I36dbdc60a789fac4e2a82825b145725a4a4d6439
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109836
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 
Reviewed-by: Michael Meeks 

diff --git a/framework/source/layoutmanager/helpers.cxx 
b/framework/source/layoutmanager/helpers.cxx
index bb858b33b5e7..c39c22788c70 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -262,6 +263,11 @@ uno::Reference< frame::XModel > impl_getModelFromFrame( 
const uno::Reference< fr
 
 bool implts_isPreviewModel( const uno::Reference< frame::XModel >& xModel )
 {
+// the cost in calc of calling getArgs for this property
+// includes measuring the entire sheet - which is extremely slow.
+if (comphelper::LibreOfficeKit::isActive())
+return false;
+
 if ( xModel.is() )
 {
 utl::MediaDescriptor aDesc( xModel->getArgs() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - officecfg/registry sfx2/source sfx2/uiconfig

[Heiko Tietze (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/Common.xcu   |3 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |5 
 sfx2/source/dialog/backingwindow.cxx   |   95 +++--
 sfx2/source/dialog/backingwindow.hxx   |5 
 sfx2/uiconfig/ui/startcenter.ui|9 -
 5 files changed, 98 insertions(+), 19 deletions(-)

New commits:
commit af8ec08e70767c6e8b5a4ba19b4ebab56f59cc8d
Author: Heiko Tietze 
AuthorDate: Tue Jan 19 14:37:19 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jan 28 15:32:59 2021 +0100

Make brand image clickable

and link to LibreOffice volunteer page

Change-Id: Ie422983d0e23faa16c2e2364b25798b938712a43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109637
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 35713de9d0b4981a019edd25591285d0bc6107db)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109972
Reviewed-by: Caolán McNamara 

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 08b39475df5c..816d22bc993c 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -368,6 +368,9 @@
 
   https://hub.libreoffice.org/InstallJava/
 
+
+  https://hub.libreoffice.org/volunteersupport/
+
   
   
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index ac14fc3e5d7d..99b4104f6499 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2120,6 +2120,11 @@
   Specifies the URL used with the UNO command SendFeedback 
(SID_SEND_FEEDBACK).
 
   
+  
+
+  Specifies the URL opened per click on the brand image at the 
start center.
+
+  
   
 
   Specifies the URL used with the UNO command QuestionAnswers 
(SID_Q_AND_A).
diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 39183c2a748c..01d8923978c8 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -21,6 +21,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -36,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -61,6 +64,73 @@ using namespace ::com::sun::star::document;
 
 const char SERVICENAME_CFGREADACCESS[] = 
"com.sun.star.configuration.ConfigurationAccess";
 
+class BrandImage final : public weld::CustomWidgetController
+{
+private:
+BitmapEx maBrandImage;
+bool mbIsDark = false;
+
+public:
+virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override
+{
+weld::CustomWidgetController::SetDrawingArea(pDrawingArea);
+SetPointer(PointerStyle::RefHand);
+}
+
+virtual void Resize() override
+{
+auto nWidth = GetOutputSizePixel().Width();
+if (maBrandImage.GetSizePixel().Width() != nWidth)
+LoadImageForWidth(nWidth);
+weld::CustomWidgetController::Resize();
+}
+
+void LoadImageForWidth(int nWidth)
+{
+mbIsDark = 
Application::GetSettings().GetStyleSettings().GetDialogColor().IsDark();
+SfxApplication::loadBrandSvg(mbIsDark ? "shell/logo-sc_inverted" : 
"shell/logo-sc",
+maBrandImage, nWidth);
+}
+
+void ConfigureForWidth(int nWidth)
+{
+if (maBrandImage.GetSizePixel().Width() == nWidth)
+return;
+LoadImageForWidth(nWidth);
+const Size aBmpSize(maBrandImage.GetSizePixel());
+set_size_request(aBmpSize.Width(), aBmpSize.Height());
+}
+
+virtual void StyleUpdated() override
+{
+const bool bIsDark = 
Application::GetSettings().GetStyleSettings().GetDialogColor().IsDark();
+if (bIsDark != mbIsDark)
+LoadImageForWidth(GetOutputSizePixel().Width());
+weld::CustomWidgetController::StyleUpdated();
+}
+
+virtual bool MouseButtonUp(const MouseEvent& rMEvt) override
+{
+if (rMEvt.IsLeft())
+{
+OUString sURL = 
officecfg::Office::Common::Menus::VolunteerURL::get();
+localizeWebserviceURI(sURL);
+
+Reference const 
xSystemShellExecute(
+css::system::SystemShellExecute::create(
+::comphelper::getProcessComponentContext()));
+xSystemShellExecute->execute(sURL, OUString(),
+ 
css::system::SystemShellExecuteFlags::URIS_ONLY);
+}
+return true;
+}
+
+virtual void Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle&) override
+{
+rRenderContext.DrawBitmapEx(Point(0, 0), maB

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/vcl vcl/qa vcl/source

[Caolán McNamara (via logerrit)]

 include/vcl/button.hxx|2 +-
 vcl/qa/cppunit/lifecycle.cxx  |4 ++--
 vcl/source/window/builder.cxx |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d730be5a23db82bd4e43b6d0709b38942e4d636b
Author: Caolán McNamara 
AuthorDate: Wed Jan 20 14:22:52 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 28 15:32:21 2021 +0100

drop RadioButton arg defaults

the nBits arg in builder.cxx was in the wrong place

Change-Id: Id4d0dd6919444cb39cf0d9e593f46d324f343a31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109718
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 02371c996e95..69a3d5aa420f 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -301,7 +301,7 @@ public:
 
  true is fairly straightforward, false leads to trick situations and is 
the legacy case
 */
-explicitRadioButton(vcl::Window* pParent, bool bUsesExplicitGroup 
= true, WinBits nWinStyle = 0);
+explicitRadioButton(vcl::Window* pParent, bool bUsesExplicitGroup, 
WinBits nWinStyle);
 virtual ~RadioButton() override;
 virtual voiddispose() override;
 
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index a4a3f5d9e3d2..dd606aeed4f7 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -127,7 +127,7 @@ void LifecycleTest::testWidgets(vcl::Window *pParent)
 (void)aPtr; // silence unused variable warning
 }
 {
-ScopedVclPtrInstance< RadioButton > aPtr( pParent );
+ScopedVclPtrInstance< RadioButton > aPtr( pParent, true, 0 );
 (void)aPtr; // silence unused variable warning
 }
 }
@@ -302,7 +302,7 @@ void LifecycleTest::testLeakage()
 aObjects.push_back(LeakTestObject::Create(xParent));
 aObjects.push_back(LeakTestObject::Create(xParent));
 aObjects.push_back(LeakTestObject::Create(xParent));
-aObjects.push_back(LeakTestObject::Create(xParent));
+aObjects.push_back(LeakTestObject::Create(xParent, true, 0));
 
 { // something that looks like a dialog
 
aObjects.push_back(LeakTestObject::Create(xParent,WB_CLIPCHILDREN|WB_MOVEABLE|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEABLE));
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 14d6cdeed6ce..641952c35e2d 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2001,7 +2001,7 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 OUString sWrap = BuilderUtils::extractCustomProperty(rMap);
 if (!sWrap.isEmpty())
 nBits |= WB_WORDBREAK;
-VclPtr xButton = VclPtr::Create(pParent, 
nBits);
+VclPtr xButton = VclPtr::Create(pParent, 
true, nBits);
 xButton->SetImageAlign(ImageAlign::Left); //default to left
 xWindow = xButton;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/win/app/salinst.cxx |   79 +---
 1 file changed, 42 insertions(+), 37 deletions(-)

New commits:
commit dbac52a2b56337c2086a18bf6cf3ebe6ac0c785e
Author: Jan-Marek Glogowski 
AuthorDate: Thu Jan 28 06:11:33 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Jan 28 15:20:55 2021 +0100

WIN refactor ImplSalYield

While looking for some reason for multiple ABORTED Jenkins runs,
presumely due to unprocessed Idles, I found the ImplSalYield code
way too hard to follow, so this restructures the PeekMessage loop
and adds some better comments to make that easier.

We now bail out a bit earlier in m_nNoYieldLock mode and also
account for eventual tick wraps in single message mode, which
isn't needed, as we already just process one message, but it
removes additional conditions and further simplifies the code.
We also now explicitly report GetMessageW non-message return
codes.

Change-Id: Ibd745d5540dd9998570ece9aeb0d37886b627eb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110042
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 00069d82499b..08519b0f8f8d 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -408,45 +409,39 @@ static LRESULT ImplSalDispatchMessage( const MSG* pMsg )
 return lResult;
 }
 
-bool ImplSalYield( bool bWait, bool bHandleAllCurrentEvents )
+// probably can't be static, because of SalTimer friend? (static gives C4211)
+bool ImplSalYield(const bool bWait, const bool bHandleAllCurrentEvents)
 {
+// used to abort further message processing on tick count wraps
 static sal_uInt32 nLastTicks = 0;
-MSG aMsg;
-bool bWasMsg = false, bOneEvent = false, bWasTimeoutMsg = false;
-ImplSVData *const pSVData = ImplGetSVData();
-WinSalTimer* pTimer = static_cast( 
pSVData->maSchedCtx.mpSalTimer );
-const bool bNoYieldLock = (GetSalData()->mpInstance->m_nNoYieldLock > 0);
 
-assert( !bNoYieldLock );
-if ( bNoYieldLock )
+// we should never yield in m_nNoYieldLock mode!
+const bool bNoYieldLock = (GetSalData()->mpInstance->m_nNoYieldLock > 0);
+assert(!bNoYieldLock);
+if (bNoYieldLock)
 return false;
 
-sal_uInt32 nCurTicks = 0;
-if ( bHandleAllCurrentEvents )
-nCurTicks = GetTickCount();
+MSG aMsg;
+bool bWasMsg = false, bWasTimeoutMsg = false;
+WinSalTimer* pTimer = 
static_cast(ImplGetSVData()->maSchedCtx.mpSalTimer);
+
+sal_uInt32 nCurTicks = GetTickCount();
 
-bool bHadNewerEvent = false;
 do
 {
-bOneEvent = PeekMessageW( &aMsg, nullptr, 0, 0, PM_REMOVE );
-if ( bOneEvent )
-{
-bWasMsg = true;
-TranslateMessage( &aMsg );
-LRESULT nRet = ImplSalDispatchMessage( &aMsg );
-
-if ( !bWasTimeoutMsg )
-bWasTimeoutMsg = (SAL_MSG_TIMER_CALLBACK == aMsg.message)
-&& static_cast( nRet );
-
-if ( bHandleAllCurrentEvents
-&& !bHadNewerEvent && aMsg.time > nCurTicks
-&& (nLastTicks <= nCurTicks || aMsg.time < nLastTicks) )
-bHadNewerEvent = true;
-bOneEvent = !bHadNewerEvent;
-}
+if (!PeekMessageW(&aMsg, nullptr, 0, 0, PM_REMOVE))
+break;
 
-if ( !(bHandleAllCurrentEvents && bOneEvent) )
+bWasMsg = true;
+TranslateMessage(&aMsg);
+LRESULT nRet = ImplSalDispatchMessage(&aMsg);
+
+bWasTimeoutMsg |= (SAL_MSG_TIMER_CALLBACK == aMsg.message) && 
static_cast(nRet);
+
+if (!bHandleAllCurrentEvents)
+break;
+
+if ((aMsg.time > nCurTicks) && (nLastTicks <= nCurTicks || aMsg.time < 
nLastTicks))
 break;
 }
 while( true );
@@ -461,20 +456,30 @@ bool ImplSalYield( bool bWait, bool 
bHandleAllCurrentEvents )
 bWasMsg = true;
 }
 
-if ( bHandleAllCurrentEvents )
-nLastTicks = nCurTicks;
+nLastTicks = nCurTicks;
 
 if ( bWait && !bWasMsg )
 {
-if ( GetMessageW( &aMsg, nullptr, 0, 0 ) )
+switch (GetMessageW(&aMsg, nullptr, 0, 0))
 {
-bWasMsg = true;
-TranslateMessage( &aMsg );
-ImplSalDispatchMessage( &aMsg );
+case -1:
+SAL_WARN("vcl.schedule", "GetMessageW failed: " << 
WindowsErrorString(GetLastError()));
+// should we std::abort() / SalAbort here?
+break;
+case 0:
+SAL_INFO("vcl.schedule", "GetMessageW received WM_QUIT while 
waiting");
+break;
+default:
+bWasMsg = true;
+TranslateMessage(&aMsg);
+ImplSalDispatchMessage(&aMsg);
+break;
 }

[Libreoffice-commits] core.git: include/sal vcl/win

[Jan-Marek Glogowski (via logerrit)]

 include/sal/log-areas.dox |2 +-
 vcl/win/dtrans/DOTransferable.cxx |8 
 vcl/win/dtrans/MtaOleClipb.cxx|6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit f974f3941ce593005a99d75f3ef0307000313235
Author: Jan-Marek Glogowski 
AuthorDate: Thu Jan 28 10:34:48 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Jan 28 15:12:44 2021 +0100

WIN move dtrans log to vcl.win.dtrans

Missing from commit 9613165239ade3f0b4d3d06e238430aabc9fcff3
("WIN move dtrans code into vcl/win/dtrans").

Change-Id: I257017ae617f72c3ce48828ee34e9246af08fd8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110073
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 0d286366d598..647f5c1902ec 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -506,6 +506,7 @@ certain functionality.
 @li @c vcl.virdev
 @li @c vcl.watchdog
 @li @c vcl.window
+@li @c vcl.win.dtrans
 @li @c vcl.wmf
 
 @section winaccessibility
@@ -607,7 +608,6 @@ certain functionality.
 @li @c configmgr.dconf
 @li @c cppcanvas
 @li @c cppcanvas.emf
-@li @c dtrans
 @li @c helpcompiler
 @li @c idl
 @li @c javaunohelper
diff --git a/vcl/win/dtrans/DOTransferable.cxx 
b/vcl/win/dtrans/DOTransferable.cxx
index 409c671e3de4..0c61dd77 100644
--- a/vcl/win/dtrans/DOTransferable.cxx
+++ b/vcl/win/dtrans/DOTransferable.cxx
@@ -92,7 +92,7 @@ void clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM 
stgmedium, CDOTransferable::
 HRESULT hr = pStream->Stat(&aStat, STATFLAG_NONAME);
 if (FAILED(hr))
 {
-SAL_WARN("dtrans", "clipDataToByteStream: Stat() failed");
+SAL_WARN("vcl.win.dtrans", "clipDataToByteStream: Stat() failed");
 return;
 }
 
@@ -103,18 +103,18 @@ void clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM 
stgmedium, CDOTransferable::
 hr = pStream->Seek(li, STREAM_SEEK_SET, nullptr);
 if (FAILED(hr))
 {
-SAL_WARN("dtrans", "clipDataToByteStream: Seek() failed");
+SAL_WARN("vcl.win.dtrans", "clipDataToByteStream: Seek() failed");
 }
 
 ULONG nRead = 0;
 hr = pStream->Read(aByteSequence.getArray(), nMemSize, &nRead);
 if (FAILED(hr))
 {
-SAL_WARN("dtrans", "clipDataToByteStream: Read() failed");
+SAL_WARN("vcl.win.dtrans", "clipDataToByteStream: Read() failed");
 }
 if (nRead < nMemSize)
 {
-SAL_WARN("dtrans", "clipDataToByteStream: Read() was partial");
+SAL_WARN("vcl.win.dtrans", "clipDataToByteStream: Read() was 
partial");
 }
 
 return;
diff --git a/vcl/win/dtrans/MtaOleClipb.cxx b/vcl/win/dtrans/MtaOleClipb.cxx
index d894ae7b5a48..6fc789e27d9d 100644
--- a/vcl/win/dtrans/MtaOleClipb.cxx
+++ b/vcl/win/dtrans/MtaOleClipb.cxx
@@ -239,7 +239,7 @@ CMtaOleClipboard::CMtaOleClipboard( ) :
 m_ClipboardChangedEventCount( 0 )
 {
 OSL_ASSERT( nullptr != m_hEvtThrdReady );
-SAL_WARN_IF(!m_hEvtWndDisposed, "dtrans", "CreateEventW failed: 
m_hEvtWndDisposed is nullptr");
+SAL_WARN_IF(!m_hEvtWndDisposed, "vcl.win.dtrans", "CreateEventW failed: 
m_hEvtWndDisposed is nullptr");
 
 s_theMtaOleClipboardInst = this;
 
@@ -520,7 +520,7 @@ LRESULT CMtaOleClipboard::sendMessage( UINT msg, WPARAM 
wParam, LPARAM lParam )
 bool CMtaOleClipboard::postMessage( UINT msg, WPARAM wParam, LPARAM lParam )
 {
 bool const ret = PostMessageW(m_hwndMtaOleReqWnd, msg, wParam, lParam);
-SAL_WARN_IF(!ret, "dtrans", "ERROR: PostMessage() failed!");
+SAL_WARN_IF(!ret, "vcl.win.dtrans", "ERROR: PostMessage() failed!");
 return ret;
 }
 
@@ -576,7 +576,7 @@ LRESULT CALLBACK CMtaOleClipboard::mtaOleReqWndProc( HWND 
hWnd, UINT uMsg, WPARA
 case MSG_REGCLIPVIEWER:
 {
 MsgCtx* pMsgCtx = reinterpret_cast(lParam);
-SAL_WARN_IF(!pMsgCtx, "dtrans", "pMsgCtx is nullptr");
+SAL_WARN_IF(!pMsgCtx, "vcl.win.dtrans", "pMsgCtx is nullptr");
 
 pImpl->onRegisterClipViewer(
 
reinterpret_cast(wParam));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Minutes from the UX/design meeting 2020-Jan-28

[Heiko Tietze]

Present: Heiko
Comments: Sascha, Stuart, Regina, Andreas

Tickets/Topic

 * Don't retain image position when cut/pasting exclusively the image
   + https://bugs.documentfoundation.org/show_bug.cgi?id=139522
   + NAB (Heiko)
   + option already implemented but would need another paste special
 command without changing the image type, no opinion (Sascha)
   => NAB

 * On Writer's standard TB and Insert menu: replace current "Text Box"
   a draw shape (.uno:DrawText) with the interactive frame with column
   (.uno:InsertFrameInteract) control
   + https://bugs.documentfoundation.org/show_bug.cgi?id=139606
   + quite some effort (Stuart), good idea (Regina)
   + sdraw objects shouldn't replace main features of swriter (Sascha)
   + the frame has several advantages and should be preferred (Sascha)
   => do it

 * F2 for inserting textbox (shape) kind odd choice
   + https://bugs.documentfoundation.org/show_bug.cgi?id=139632
   + could use Ctrl+T, similar to Ctrl+K for hyperlinks (Sascha)
   + we could use F2 for manage templates, Shift+F2 in Calc (Sascha)
   + text box is not a frequently used feature and removal
 is much harder (Heiko)
   => resolve this bug as NAB, comment on the other

 * Should "Bullets and Numbering" in Writer become "Bullets and Lists",
   with consistent use of "List Style" in Writer UI?
   + https://bugs.documentfoundation.org/show_bug.cgi?id=139667
   + Bullets are also sort of list, see 
https://en.wikipedia.org/wiki/Wikipedia:Manual_of_Style/Lists#Bulleted_lists or 
https://www.w3schools.com/HTML/html_lists_unordered.asp (Sascha)

   + maybe "Apply Lists..." for the menu entry (includes transform and
 create cases) and "Unsorted List" and "Sorted List" for toolbar
 entries (Numb. List also include Letters) (Sascha)
   => ticket has been taken by Seth and patch is submitted

 * UI: Underline split button in regular toolbar
   + https://bugs.documentfoundation.org/show_bug.cgi?id=139701
   + adds functionality (Sascha)
   + +1 (Andreas)
   => do it



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

[Libreoffice-commits] core.git: Branch 'private/timar/fontconfigcrash' - vcl/unx

[Andras Timar (via logerrit)]

 vcl/unx/generic/fontmanager/fontconfig.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 6e16b24eb6b96d720112c1c94be435fcf07056ec
Author: Andras Timar 
AuthorDate: Thu Jan 28 14:15:10 2021 +0100
Commit: Andras Timar 
CommitDate: Thu Jan 28 14:15:10 2021 +0100

debug 13

Change-Id: I3df34d8a7c8b6d81e3ee19adbd865a88e4789bfd

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx 
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 8f51f3a8a06a..3a99196b347b 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -91,15 +91,10 @@ FontCfgWrapper::FontCfgWrapper()
 {
 std::cerr << "next: FcInit()" << std::endl;
 setenv("FC_DEBUG", "1024", 1);
-//std::cerr << "FONTCONFIG_PATH: " << getenv("FONTCONFIG_PATH") << 
std::endl;
-//setenv("FONTCONFIG_PATH", "/etc/fonts", 1);
-//std::cerr << "FONTCONFIG_PATH: " << getenv("FONTCONFIG_PATH") << 
std::endl;
-//std::cout << "Standard output is working" << std::endl;
 std::ifstream conf("/etc/fonts/fonts.conf");
 if(!conf)
 {
 std::cerr << "/etc/fonts/fonts.conf is not readable from LO core" << 
std::endl;
-std::system("ls -lR /");
 }
 else
 std::cerr << "/etc/fonts/fonts.conf is readable from LO core" << 
std::endl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 filter/qa/unit/textfilterdetect.cxx |   20 
 sfx2/source/doc/objstor.cxx |6 --
 2 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit 2854362f429e476d4a1ab4759c6a1f1c04150280
Author: Mike Kaganski 
AuthorDate: Wed Jan 27 16:05:54 2021 +0100
Commit: Mike Kaganski 
CommitDate: Thu Jan 28 14:09:30 2021 +0100

tdf#123476 filter: Also handle empty ODF

This builds on top of commit ada07f303e7cd1e39c73abe0741aefe7d9d73a57,
to allow 0-byte ODT, ODS etc.

Possible TODO would be somehow use default template for such empty files,
getting the template name using SfxObjectFactory::GetStandardTemplate.
That would enable using 0-byte ODF files as means to "create new document
at this location from default template" workflow.

Change-Id: I36e07b80f60c42aecdcc6a7357e5bdd18f62e4f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109989
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/filter/qa/unit/data/empty.odp b/filter/qa/unit/data/empty.odp
new file mode 100644
index ..e69de29bb2d1
diff --git a/filter/qa/unit/data/empty.odt b/filter/qa/unit/data/empty.odt
new file mode 100644
index ..e69de29bb2d1
diff --git a/filter/qa/unit/textfilterdetect.cxx 
b/filter/qa/unit/textfilterdetect.cxx
index d66839402d9b..396ac8019e51 100644
--- a/filter/qa/unit/textfilterdetect.cxx
+++ b/filter/qa/unit/textfilterdetect.cxx
@@ -91,6 +91,26 @@ CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testEmptyFile)
 // Without the accompanying fix in place, this test would have failed, as 
it was opened in
 // Writer instead.
 
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.presentation.PresentationDocument"));
+
+getComponent()->dispose();
+
+// Now also test ODT
+aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "empty.odt";
+getComponent() = loadFromDesktop(aURL);
+xServiceInfo.set(getComponent(), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xServiceInfo.is());
+// Make sure it opens in Writer.
+
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.TextDocument"));
+getComponent()->dispose();
+
+// ... and ODP
+aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "empty.odp";
+getComponent() = loadFromDesktop(aURL);
+xServiceInfo.set(getComponent(), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xServiceInfo.is());
+// Without the accompanying fix in place, this test would have failed, as 
it was opened in
+// Writer instead.
+
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.presentation.PresentationDocument"));
 }
 }
 
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 9bc9c17e4628..e6aaa4658977 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -424,7 +424,7 @@ bool SfxObjectShell::InitNew( const uno::Reference< 
embed::XStorage >& xStorage
 
 bool SfxObjectShell::Load( SfxMedium& rMedium )
 {
-return GeneralInit_Impl( rMedium.GetStorage(), true );
+return GeneralInit_Impl(rMedium.GetStorage(), 
!tools::isEmptyFileUrl(rMedium.GetName()));
 }
 
 void SfxObjectShell::DoInitUnitTest()
@@ -660,7 +660,9 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed )
 bWarnMediaTypeFallback = false;
 }
 
-if ( bWarnMediaTypeFallback || 
!xStorage->getElementNames().hasElements() )
+if (bWarnMediaTypeFallback
+|| (!tools::isEmptyFileUrl(pMedium->GetName())
+&& !xStorage->getElementNames().hasElements()))
 SetError(ERRCODE_IO_BROKENPACKAGE);
 }
 catch( uno::Exception& )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/timar/fontconfigcrash' - vcl/unx

[Andras Timar (via logerrit)]

 vcl/unx/generic/fontmanager/fontconfig.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e6602647932b37eb288dfcce5652a242294d7e11
Author: Andras Timar 
AuthorDate: Thu Jan 28 14:02:22 2021 +0100
Commit: Andras Timar 
CommitDate: Thu Jan 28 14:02:22 2021 +0100

debug 12

Change-Id: Id6839f711efadf50a2b441b4dc7a9633ae679ead

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx 
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 1df890d0208c..8f51f3a8a06a 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -92,9 +92,9 @@ FontCfgWrapper::FontCfgWrapper()
 std::cerr << "next: FcInit()" << std::endl;
 setenv("FC_DEBUG", "1024", 1);
 //std::cerr << "FONTCONFIG_PATH: " << getenv("FONTCONFIG_PATH") << 
std::endl;
-setenv("FONTCONFIG_PATH", "/etc/fonts", 1);
-std::cerr << "FONTCONFIG_PATH: " << getenv("FONTCONFIG_PATH") << std::endl;
-std::cout << "Standard output is working" << std::endl;
+//setenv("FONTCONFIG_PATH", "/etc/fonts", 1);
+//std::cerr << "FONTCONFIG_PATH: " << getenv("FONTCONFIG_PATH") << 
std::endl;
+//std::cout << "Standard output is working" << std::endl;
 std::ifstream conf("/etc/fonts/fonts.conf");
 if(!conf)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 include/svtools sfx2/source svtools/inc

[Samuel Mehrbrodt (via logerrit)]

 include/sfx2/docmacromode.hxx|7 +--
 include/svtools/sfxecode.hxx |1 +
 sfx2/source/doc/docmacromode.cxx |   23 +++
 sfx2/source/doc/objmisc.cxx  |5 +++--
 svtools/inc/errtxt.hrc   |1 +
 5 files changed, 29 insertions(+), 8 deletions(-)

New commits:
commit 1dc71daf7fa7204a98c75dac680af664ab9c8edb
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jan 18 15:24:48 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Jan 28 12:45:30 2021 +0100

Improve macro checks

Change-Id: Ie40801df8866b52c1458e020ffa9cba120720af7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109552
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx
index 9533518bee9d..aa120240688e 100644
--- a/include/sfx2/docmacromode.hxx
+++ b/include/sfx2/docmacromode.hxx
@@ -220,7 +220,8 @@ namespace sfx2
  if and only if macro execution in this document is 
allowed.
 */
 booladjustMacroMode(
-const css::uno::Reference< css::task::XInteractionHandler 
>& _rxInteraction
+const css::uno::Reference< css::task::XInteractionHandler 
>& _rxInteraction,
+bool bHasValidContentSignature = false
 );
 
 /** determines whether macro execution is disallowed
@@ -286,11 +287,13 @@ namespace sfx2
 */
 bool
 checkMacrosOnLoading(
-const css::uno::Reference< css::task::XInteractionHandler 
>& _rxInteraction
+const css::uno::Reference< css::task::XInteractionHandler 
>& _rxInteraction,
+bool bHasValidContentSignature = false
 );
 
 private:
 std::shared_ptr< DocumentMacroMode_Data >   m_xData;
+bool m_bNeedsContentSigned;
 };
 
 
diff --git a/include/svtools/sfxecode.hxx b/include/svtools/sfxecode.hxx
index a57c6b9e966f..fe6f26dc3623 100644
--- a/include/svtools/sfxecode.hxx
+++ b/include/svtools/sfxecode.hxx
@@ -36,6 +36,7 @@ class ErrCode;
 #define ERRCODE_SFX_CANTCREATEBACKUPErrCode(ErrCodeArea::Sfx, 
ErrCodeClass::Create, 50)
 #define ERRCODE_SFX_MACROS_SUPPORT_DISABLED ErrCode(WarningFlag::Yes, 
ErrCodeArea::Sfx, ErrCodeClass::NONE, 51)
 #define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED ErrCode(WarningFlag::Yes, 
ErrCodeArea::Sfx, ErrCodeClass::NONE, 52)
+#define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_CONTENT_UNSIGNED 
ErrCode(WarningFlag::Yes, ErrCodeArea::Sfx, ErrCodeClass::NONE, 53)
 #define ERRCODE_SFX_SHARED_NOPASSWORDCHANGE ErrCode(WarningFlag::Yes, 
ErrCodeArea::Sfx, ErrCodeClass::NONE, 54)
 #define ERRCODE_SFX_INCOMPLETE_ENCRYPTION   ErrCode(WarningFlag::Yes, 
ErrCodeArea::Sfx, ErrCodeClass::NONE, 55)
 #define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_MAC \
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index bbb3b629de2b..c49f7cec00c6 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -111,6 +111,10 @@ namespace sfx2
 #endif
 }
 
+void lcl_showMacrosDisabledUnsignedContentError( const Reference< 
XInteractionHandler >& rxHandler, bool& rbAlreadyShown )
+{
+lcl_showGeneralSfxErrorOnce( rxHandler, 
ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_CONTENT_UNSIGNED, rbAlreadyShown );
+}
 
 bool lcl_showMacroWarning( const Reference< XInteractionHandler >& 
rxHandler,
 const OUString& rDocumentLocation )
@@ -123,7 +127,8 @@ namespace sfx2
 
 //= DocumentMacroMode
 DocumentMacroMode::DocumentMacroMode( IMacroDocumentAccess& 
rDocumentAccess )
-:m_xData( std::make_shared( rDocumentAccess ) )
+:m_xData( std::make_shared( rDocumentAccess ) 
),
+m_bNeedsContentSigned(false)
 {
 }
 
@@ -139,7 +144,7 @@ namespace sfx2
 return false;
 }
 
-bool DocumentMacroMode::adjustMacroMode( const Reference< 
XInteractionHandler >& rxInteraction )
+bool DocumentMacroMode::adjustMacroMode( const Reference< 
XInteractionHandler >& rxInteraction, bool bHasValidContentSignature )
 {
 sal_uInt16 nMacroExecutionMode = 
m_xData->m_rDocumentAccess.getCurrentMacroExecMode();
 
@@ -237,6 +242,14 @@ namespace sfx2
 lcl_showDocumentMacrosDisabledError(rxInteraction, 
m_xData->m_bDocMacroDisabledMessageShown);
 return disallowMacroExecution();
 }
+else if ( 
m_xData->m_rDocumentAccess.macroCallsSeenWhileLoading() &&
+  bHasTrustedMacroSignature &&
+  !bHasValidContentSignature)
+{
+// When macros are signed, and the document has events 
which call macros, the document content needs to be signed too.
+lcl_showMacrosDisabledUnsignedContentError(rxInteraction, 
m_xData->m_bDocMacroDisabledMessageShown);
+

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

[Xisco Fauli (via logerrit)]

 sw/qa/uitest/macro_tests/tdf124413.py |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 905371194e890a9a565f655df171bddf6b2510e5
Author: Xisco Fauli 
AuthorDate: Thu Jan 28 10:07:24 2021 +0100
Commit: Xisco Fauli 
CommitDate: Thu Jan 28 12:44:37 2021 +0100

uitest: sw: close document at the end

Change-Id: Ic07b3eac1b4e3ada5a54d2ce1fa4d284d886
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110047
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/uitest/macro_tests/tdf124413.py 
b/sw/qa/uitest/macro_tests/tdf124413.py
index a8ab676b77d3..d0aaccd03929 100644
--- a/sw/qa/uitest/macro_tests/tdf124413.py
+++ b/sw/qa/uitest/macro_tests/tdf124413.py
@@ -40,4 +40,6 @@ class tdf124413(UITestCase):
 
 self.assertEqual(get_state_as_dict(xEditWin)['Text'], resultText)
 
+self.ui_test.close_doc()
+
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - sw/source

[Samuel Mehrbrodt (via logerrit)]

 sw/source/uibase/shells/basesh.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ad808ac375c200857026acbbabf862264e695887
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jan 18 15:51:47 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Jan 28 12:44:39 2021 +0100

"Update all" should do a full reformatting

Change-Id: I05b06e4b345c2125f4fd5272fc6a3354396a29ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109554
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 4ecabed3ac5aff26bee6d195136ca819cbeb995c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109603
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/uibase/shells/basesh.cxx 
b/sw/source/uibase/shells/basesh.cxx
index 629424523126..545e9c78a89d 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -748,7 +748,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
 rDis.Execute( FN_UPDATE_FIELDS );
 rDis.Execute( FN_UPDATE_TOX );
 rDis.Execute( FN_UPDATE_CHARTS );
-rSh.CalcLayout();
+rSh.Reformat();
 }
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - sw/source

[Samuel Mehrbrodt (via logerrit)]

 sw/source/uibase/uno/unotxdoc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit af1918a987be3578affa85b06cd2220c59108a27
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jan 18 12:07:16 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Jan 28 12:44:19 2021 +0100

XTextDocument::refresh should do a full reformatting

Change-Id: Ia92e10e43cb8254b6dd35db03462b87d0fe93f45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109538
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit cbbfed893616f804cb6557185ddda26c0cef2ed6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109531
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index e3d80b664deb..e5ce030ddaac 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -2232,7 +2232,7 @@ void SwXTextDocument::refresh()
 SwViewShell *pViewShell = pDocShell->GetWrtShell();
 NotifyRefreshListeners();
 if(pViewShell)
-pViewShell->CalcLayout();
+pViewShell->Reformat();
 }
 
 void SAL_CALL SwXTextDocument::addRefreshListener(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - officecfg/registry sw/source

[Samuel Mehrbrodt (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +-
 sw/source/uibase/uiview/view2.cxx   |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4697b9f7a4bab4357837d1212fbc57ba6e7c50b9
Author: Samuel Mehrbrodt 
AuthorDate: Tue Jan 12 13:22:37 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Jan 28 12:44:05 2021 +0100

Make uno:RefreshView redo the whole document layout

This is useful when encountering layout problems, to refresh
the doc layout from an extension.

Change-Id: Ie2472f061ebea203a9d876782b3bb953477de7c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109169
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 51ef3a3af573287b03262e96bf8298bdbe06c44d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109506
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index a41666bef3a6..1e3c642bea13 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2528,7 +2528,7 @@
   
   
 
-  Restore View
+  Refresh document layout
 
   
   
diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index be7a42416eae..ca91ba80828e 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -567,6 +567,7 @@ void SwView::Execute(SfxRequest &rReq)
 break;
 case FN_REFRESH_VIEW:
 GetEditWin().Invalidate();
+m_pWrtShell->Reformat();
 break;
 case FN_PAGEUP:
 case FN_PAGEUP_SEL:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl vcl/source

[Noel Grandin (via logerrit)]

 include/vcl/settings.hxx|3 +--
 vcl/source/app/settings.cxx |2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit d564cad9a69af56445a9a257e23c0dc684371780
Author: Noel Grandin 
AuthorDate: Thu Jan 28 11:40:03 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Jan 28 12:23:04 2021 +0100

MouseFollowFlags::DDList is dead

has been since initial import

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

diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index b62f1b2d0522..1e18e005cb70 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -64,11 +64,10 @@ namespace o3tl
 enum class MouseFollowFlags
 {
 Menu   = 0x0001,
-DDList = 0x0002,
 };
 namespace o3tl
 {
-template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 enum class MouseMiddleButtonAction
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 556e1f7e69cf..bfce93a9736b 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -65,7 +65,7 @@ struct ImplMouseData
 tools::LongmnStartDragHeight   = 2;
 sal_uLong   mnButtonRepeat  = 90;
 sal_uLong   mnMenuDelay = 150;
-MouseFollowFlagsmnFollow= 
MouseFollowFlags::Menu | MouseFollowFlags::DDList;
+MouseFollowFlagsmnFollow= 
MouseFollowFlags::Menu;
 MouseMiddleButtonAction mnMiddleButtonAction= 
MouseMiddleButtonAction::AutoScroll;
 MouseWheelBehaviour mnWheelBehavior = 
MouseWheelBehaviour::ALWAYS;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl vcl/source

[Noel Grandin (via logerrit)]

 include/vcl/settings.hxx  |3 +--
 vcl/source/window/winproc.cxx |6 --
 2 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 28a8a14f1782520cf1699b5610b23917daa5ee9a
Author: Noel Grandin 
AuthorDate: Thu Jan 28 12:12:45 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Jan 28 12:17:21 2021 +0100

MouseSettingsOptions::AutoFocus is dead

ever since initial import

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

diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index f09e50608e76..b62f1b2d0522 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -53,13 +53,12 @@ namespace vcl {
 enum class MouseSettingsOptions
 {
 NONE   = 0x00,
-AutoFocus  = 0x01,
 AutoCenterPos  = 0x02,
 AutoDefBtnPos  = 0x04,
 };
 namespace o3tl
 {
-template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 enum class MouseFollowFlags
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index d6f1b1e18bc2..72aba0a4362d 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -666,12 +666,6 @@ bool ImplHandleMouseEvent( const VclPtr& 
xWindow, MouseNotifyEvent
 }
 else
 {
-// Auto-ToTop
-if (!pSVData->mpWinData->mpCaptureWin
-&& (pChild->GetSettings().GetMouseSettings().GetOptions()
-& MouseSettingsOptions::AutoFocus))
-pChild->ToTop( ToTopFlags::NoGrabFocus );
-
 if( pChild->IsDisposed() )
 bCallHelpRequest = false;
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

[Maxim Monastirsky (via logerrit)]

 solenv/bin/uiimagelist.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ed28902e2d2b8929617c92226be985e322147569
Author: Maxim Monastirsky 
AuthorDate: Thu Jan 28 11:06:35 2021 +0200
Commit: Maxim Monastirsky 
CommitDate: Thu Jan 28 12:04:34 2021 +0100

tdf#139781 Handle also "icon-name" property name

Change-Id: Iaf2c8521588bdf58daa3166b1efa27979eca2e1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110048
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/solenv/bin/uiimagelist.xsl b/solenv/bin/uiimagelist.xsl
index 3d14f8d31dc4..659d3b943ae1 100644
--- a/solenv/bin/uiimagelist.xsl
+++ b/solenv/bin/uiimagelist.xsl
@@ -17,7 +17,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: accessibility/inc accessibility/source desktop/source editeng/source include/vcl lotuswordpro/source sc/source sd/source starmath/source svtools/source svx/source sw/so

[Caolán McNamara (via logerrit)]

 accessibility/inc/helper/listboxhelper.hxx   |2 
 accessibility/source/standard/vclxaccessiblelistitem.cxx |2 
 desktop/source/lib/init.cxx  |4 -
 editeng/source/editeng/editdbg.cxx   |4 -
 include/vcl/outdev.hxx   |2 
 lotuswordpro/source/filter/lwpdrawobj.cxx|4 -
 sc/source/ui/app/inputwin.cxx|4 -
 sc/source/ui/cctrl/tbzoomsliderctrl.cxx  |2 
 sd/source/ui/dlg/headerfooterdlg.cxx |2 
 starmath/source/rect.cxx |2 
 svtools/source/brwbox/brwbox1.cxx|2 
 svtools/source/brwbox/brwbox2.cxx|2 
 svtools/source/hatchwindow/ipwin.cxx |2 
 svx/source/dialog/connctrl.cxx   |2 
 svx/source/dialog/svxbmpnumvalueset.cxx  |4 -
 svx/source/stbctrls/zoomsliderctrl.cxx   |2 
 svx/source/unodraw/UnoGraphicExporter.cxx|2 
 sw/source/uibase/docvw/AnnotationWin2.cxx|2 
 vcl/source/control/combobox.cxx  |2 
 vcl/source/control/listbox.cxx   |2 
 vcl/source/gdi/pdfwriter_impl.cxx|   32 +++
 vcl/source/window/menu.cxx   |2 
 vcl/unx/generic/print/common_gfx.cxx |   16 +++
 23 files changed, 50 insertions(+), 50 deletions(-)

New commits:
commit ddf8a2f91bb14be1b1cca2d2ea0ebd7fda5dd0fe
Author: Caolán McNamara 
AuthorDate: Wed Jan 27 15:03:17 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 28 11:55:30 2021 +0100

TopLeft().Y() -> Top() etc.

TopLeft().X() -> Left()
BottomLeft().X() -> Left()
TopRight().X() -> Right()
BottomRight().X() -> Right()

TopLeft().Y() -> Top()
TopRight().Y() -> Top()
BottomLeft().Y() -> Bottom()
BottomRight().Y() -> Bottom()

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

diff --git a/accessibility/inc/helper/listboxhelper.hxx 
b/accessibility/inc/helper/listboxhelper.hxx
index b5e09034d01c..dfadf37aa015 100644
--- a/accessibility/inc/helper/listboxhelper.hxx
+++ b/accessibility/inc/helper/listboxhelper.hxx
@@ -51,7 +51,7 @@ public:
 {
 tools::Rectangle aTemp = 
m_aComboListBox.GetWindowExtentsRelative(nullptr);
 tools::Rectangle aRet = m_aComboListBox.GetDropDownPosSizePixel();
-aRet.Move(aTemp.TopLeft().X(),aTemp.TopLeft().Y());
+aRet.Move(aTemp.Left(), aTemp.Top());
 return aRet;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx 
b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 7f807c5e7240..872f75b40581 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -295,7 +295,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( 
const awt::Point& _aPoi
 if (pListBoxHelper)
 {
 tools::Rectangle 
aRect(pListBoxHelper->GetBoundingRectangle(static_cast(m_nIndexInParent)));
-aRect.Move(-aRect.TopLeft().X(),-aRect.TopLeft().Y());
+aRect.Move(-aRect.Left(), -aRect.Top());
 bInside = aRect.IsInside( VCLPoint( _aPoint ) );
 }
 return bInside;
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index fbbf450b6530..0931ffda08ac 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -5303,8 +5303,8 @@ unsigned char* 
doc_renderFontOrientation(SAL_UNUSED_PARAMETER LibreOfficeKitDocu
 if (aRect.IsEmpty())
 break;
 
-int nFontWidth = aRect.BottomRight().X() + 1;
-int nFontHeight = aRect.BottomRight().Y() + 1;
+int nFontWidth = aRect.Right() + 1;
+int nFontHeight = aRect.Bottom() + 1;
 
 if (nFontWidth <= 0 || nFontHeight <= 0)
 break;
diff --git a/editeng/source/editeng/editdbg.cxx 
b/editeng/source/editeng/editdbg.cxx
index 3598036e2240..639e936a9558 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -465,10 +465,10 @@ void EditEngine::DumpData(const EditEngine* pEE, bool 
bInfoBox)
 fprintf( fp, "\nView %zu: Focus=%i", nView, 
pV->GetWindow()->HasFocus() );
 tools::Rectangle aR( pV->GetOutputArea() );
 fprintf( fp, "\n  OutputArea: nX=%" SAL_PRIdINT64 ", nY=%" 
SAL_PRIdINT64 ", dX=%" SAL_PRIdINT64 ", dY=%" SAL_PRIdINT64 ", MapMode = %i",
-sal_Int64(aR.TopLeft().X()), sal_Int64(aR.TopLeft().Y()), 
sal_Int64(aR.GetSize().Width()), sal_Int64(aR.GetSize().Height()) , int( 
pV->GetWindow()->GetMapMode().GetMapUnit() ) );
+

[Libreoffice-commits] core.git: Branch 'private/timar/fontconfigcrash' - vcl/unx

[Andras Timar (via logerrit)]

 vcl/unx/generic/fontmanager/fontconfig.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7919a66c282648fae6ff510cf7250637340a0488
Author: Andras Timar 
AuthorDate: Thu Jan 28 11:28:22 2021 +0100
Commit: Andras Timar 
CommitDate: Thu Jan 28 11:28:22 2021 +0100

debug 11

Change-Id: Id4df67c1c78f9e7e7eb8668b2e1e132220bcccef

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx 
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index d91962f29412..1df890d0208c 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -99,7 +99,7 @@ FontCfgWrapper::FontCfgWrapper()
 if(!conf)
 {
 std::cerr << "/etc/fonts/fonts.conf is not readable from LO core" << 
std::endl;
-std::system("ls -lR /etc");
+std::system("ls -lR /");
 }
 else
 std::cerr << "/etc/fonts/fonts.conf is readable from LO core" << 
std::endl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/timar/fontconfigcrash' - vcl/unx

[Andras Timar (via logerrit)]

 vcl/unx/generic/fontmanager/fontconfig.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e83c6e20ec76d269a4d6a23d09e4101b24f1eb78
Author: Andras Timar 
AuthorDate: Thu Jan 28 11:12:33 2021 +0100
Commit: Andras Timar 
CommitDate: Thu Jan 28 11:12:33 2021 +0100

debug 10

Change-Id: I9bc29ad79d9c4f35421574a25d386dc7ee412fca

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx 
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index b2dc3b95035c..d91962f29412 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -97,7 +97,10 @@ FontCfgWrapper::FontCfgWrapper()
 std::cout << "Standard output is working" << std::endl;
 std::ifstream conf("/etc/fonts/fonts.conf");
 if(!conf)
+{
 std::cerr << "/etc/fonts/fonts.conf is not readable from LO core" << 
std::endl;
+std::system("ls -lR /etc");
+}
 else
 std::cerr << "/etc/fonts/fonts.conf is readable from LO core" << 
std::endl;
 FcInit();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/crsr/pam.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 041ecabb7bf6ad15c2cdcf228cb9dc82b2d16837
Author: Michael Stahl 
AuthorDate: Wed Jan 27 13:21:35 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jan 28 11:12:00 2021 +0100

sw_fieldmarkhide: adjust SwPaM::HasReadonlySel() to the fact that...

... there is, in fact, an else branch. D'oh.

(regression from f8da730bd66d5d6d3e49935573b3223c06baffbe)

Change-Id: I378b0a78a4ccc9a0e7fa9a6bf2e1ecb456133bed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110012
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit e65376ecd6e4356686927a5daeb845faf1fc4a42)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109985
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 684b6e5eae72..fe3f41a9a76c 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -730,9 +730,11 @@ bool SwPaM::HasReadonlySel( bool bFormView ) const
 const bool bAtStartA = (pA != nullptr) && (pA->GetMarkStart() == 
*GetPoint());
 const bool bAtStartB = (pB != nullptr) && (pB->GetMarkStart() == 
*GetMark());
 
-if (!bRet &&
-// allow editing all fields in generic mode
-
!officecfg::Office::Common::Filter::Microsoft::Import::ForceImportWWFieldsAsGenericFields::get(comphelper::getProcessComponentContext()))
+if 
(officecfg::Office::Common::Filter::Microsoft::Import::ForceImportWWFieldsAsGenericFields::get(comphelper::getProcessComponentContext()))
+{
+; // allow editing all fields in generic mode
+}
+else if (!bRet)
 {
 bool bUnhandledMark = pA && pA->GetFieldname( ) == ODF_UNHANDLED;
 // Unhandled fieldmarks case shouldn't be edited manually to avoid 
breaking anything
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source compilerplugins/clang cui/source extensions/source framework/source i18nutil/source include/rtl l10ntools/source linguistic/source lotuswordpro/source oox

[Noel (via logerrit)]

 chart2/source/tools/ObjectIdentifier.cxx   |2 
 compilerplugins/clang/stringview.cxx   |   83 +++-
 compilerplugins/clang/test/stringview.cxx  |   12 +
 cui/source/dialogs/FontFeaturesDialog.cxx  |4 
 extensions/source/propctrlr/browserline.cxx|2 
 framework/source/accelerators/acceleratorconfiguration.cxx |2 
 i18nutil/source/utility/unicode.cxx|2 
 include/rtl/strbuf.hxx |   28 
 include/rtl/ustrbuf.hxx|   87 +
 l10ntools/source/helper.cxx|2 
 l10ntools/source/localize.cxx  |4 
 l10ntools/source/po.cxx|4 
 linguistic/source/hyphdsp.cxx  |2 
 lotuswordpro/source/filter/lwptools.cxx|4 
 oox/source/dump/dumperbase.cxx |2 
 sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx|8 -
 sc/source/core/tool/address.cxx|2 
 sc/source/core/tool/compiler.cxx   |2 
 sc/source/core/tool/rangeutl.cxx   |2 
 sc/source/filter/dif/difimp.cxx|8 -
 svl/source/numbers/zformat.cxx |4 
 svl/source/numbers/zforscan.cxx|2 
 sw/source/core/text/txtfrm.cxx |   10 -
 sw/source/core/txtnode/ndtxt.cxx   |2 
 sw/source/filter/ascii/ascatr.cxx  |4 
 tools/source/inet/inetmime.cxx |6 
 ucb/source/ucp/file/bc.cxx |2 
 ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx |6 
 vcl/source/control/edit.cxx|2 
 vcl/source/control/longcurr.cxx|2 
 vcl/source/treelist/treelistbox.cxx|2 
 xmloff/source/meta/xmlmetai.cxx|2 
 xmloff/source/style/xmlnumfi.cxx   |4 
 33 files changed, 257 insertions(+), 53 deletions(-)

New commits:
commit 1da69081732c8a429840edaaf10cfb789ea68df8
Author: Noel 
AuthorDate: Thu Jan 28 11:01:28 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Jan 28 11:11:28 2021 +0100

add string_view variants of methods to O[U]StringBuffer

and update the stringview loplugin to detect cases where we can
use these new methods.

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

diff --git a/chart2/source/tools/ObjectIdentifier.cxx 
b/chart2/source/tools/ObjectIdentifier.cxx
index b5faa312d46b..29f2b83efbec 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -170,7 +170,7 @@ OUString lcl_getIndexStringAfterString( const OUString& 
rString, const OUString&
 sal_Int32 nNextColon = rString.indexOf( ':', nIndexStart );
 if( nNextColon != -1 )
 nIndexEnd = nNextColon;
-aRet = rString.copy(nIndexStart,nIndexEnd-nIndexStart);
+aRet = rString.subView(nIndexStart,nIndexEnd-nIndexStart);
 }
 
 return aRet.makeStringAndClear();
diff --git a/compilerplugins/clang/stringview.cxx 
b/compilerplugins/clang/stringview.cxx
index abfc87f78fd6..5df91dcad054 100644
--- a/compilerplugins/clang/stringview.cxx
+++ b/compilerplugins/clang/stringview.cxx
@@ -51,8 +51,11 @@ public:
 bool VisitFunctionDecl(FunctionDecl const*);
 bool VisitCXXOperatorCallExpr(CXXOperatorCallExpr const*);
 bool VisitImplicitCastExpr(ImplicitCastExpr const*);
+bool VisitCXXMemberCallExpr(CXXMemberCallExpr const*);
+bool VisitCXXConstructExpr(CXXConstructExpr const*);
 
 private:
+void handleSubExprThatCouldBeView(Expr const* expr);
 void handleCXXConstructExpr(CXXConstructExpr const* expr);
 void handleCXXMemberCallExpr(CXXMemberCallExpr const* expr);
 };
@@ -88,6 +91,20 @@ bool 
StringView::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* cxxOperator
 check(cxxOperatorCallExpr->getArg(1));
 else if (op == OO_Subscript)
 check(cxxOperatorCallExpr->getArg(0));
+else if (op == OO_Equal)
+{
+if (loplugin::TypeCheck(cxxOperatorCallExpr->getType())
+.Class("OUStringBuffer")
+.Namespace("rtl")
+.GlobalNamespace()
+|| loplugin::TypeCheck(cxxOperatorCallExpr->getType())
+   .Class("OStringBuffer")
+   .Namespace("rtl")
+   .GlobalNamespace())
+{
+check(cxxOperatorCallExpr->getArg(1));
+}
+}
 return true;
 }
 
@@ -

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - connectivity/source

[Lionel Elie Mamane (via logerrit)]

 connectivity/source/drivers/postgresql/pq_baseresultset.cxx   |2 +-
 connectivity/source/drivers/postgresql/pq_connection.cxx  |9 
+
 connectivity/source/drivers/postgresql/pq_preparedstatement.cxx   |3 +--
 connectivity/source/drivers/postgresql/pq_tools.hxx   |8 

 connectivity/source/drivers/postgresql/pq_updateableresultset.cxx |2 +-
 5 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit 13091c7cf527a04cc373042370c4d4bbda839ba9
Author: Lionel Elie Mamane 
AuthorDate: Tue Nov 17 02:14:15 2020 +0100
Commit: Michael Stahl 
CommitDate: Thu Jan 28 10:55:41 2021 +0100

pgsql-sdbc: use libpq's custom free()...

... for stuff allocated by libpq

Their documentation says this is important on Microsoft Windows:

 It is particularly important that this function, rather than free(),
 be used on Microsoft Windows. This is because allocating memory in a
 DLL and releasing it in the application works only if
 multithreaded/single-threaded, release/debug, and static/dynamic
 flags are the same for the DLL and the application.

Also use const unique_ptr since we don't need the value to survive the
scope in any way.

Change-Id: If4637ea0cd1c05125d63e2f3d37dbeaf716973f9
(cherry picked from commit 177792660697f85763b39f455d7ebff0f83084fd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107907
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx 
b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index 8fc7140e4817..9ff5e01e098a 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -456,7 +456,7 @@ Sequence< sal_Int8 > BaseResultSet::getBytes( sal_Int32 
columnIndex )
 char * res = reinterpret_cast(PQunescapeBytea( 
reinterpret_cast(val.getStr()), &length));
 ret = Sequence< sal_Int8 > ( reinterpret_cast(res), length 
);
 if( res )
-free( res );
+PQfreemem( res );
 }
 return ret;
 }
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx 
b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 66c30c893aed..9a51f0cd2833 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -42,6 +42,7 @@
 
 #include "pq_connection.hxx"
 #include "pq_statement.hxx"
+#include "pq_tools.hxx"
 #include "pq_preparedstatement.hxx"
 #include "pq_databasemetadata.hxx"
 #include "pq_xtables.hxx"
@@ -216,7 +217,7 @@ Reference< XPreparedStatement > 
Connection::prepareStatement( const OUString& sq
 MutexGuard guard( m_xMutex->GetMutex() );
 checkClosed();
 
-OString byteSql = OUStringToOString( sql, ConnectionSettings::encoding );
+OString byteSql = rtl::OUStringToOString( sql, 
ConnectionSettings::encoding );
 PreparedStatement *stmt = new PreparedStatement( m_xMutex, this, 
&m_settings, byteSql );
 Reference< XPreparedStatement > ret = stmt;
 
@@ -414,7 +415,7 @@ static void properties2arrays( const Sequence< 
PropertyValue > & args,
 {
 OUString value;
 tc->convertTo( prop.Value, cppu::UnoType::get() ) 
>>= value;
-char *v = strdup(OUStringToOString(value, enc).getStr());
+char *v = strdup(rtl::OUStringToOString(value, enc).getStr());
 values.push_back ( v );
 }
 else
@@ -460,7 +461,7 @@ void Connection::initialize( const Sequence< Any >& 
aArguments )
 nColon = url.indexOf( ':' , 1+ nColon );
 if( nColon != -1 )
 {
- o = OUStringToOString( url.getStr()+nColon+1, 
ConnectionSettings::encoding );
+ o = rtl::OUStringToOString( url.getStr()+nColon+1, 
ConnectionSettings::encoding );
 }
 }
 {
@@ -477,7 +478,7 @@ void Connection::initialize( const Sequence< Any >& 
aArguments )
 if ( err != nullptr)
 {
 errorMessage = OUString( err, strlen(err), 
ConnectionSettings::encoding );
-free(err);
+PQfreemem(err);
 }
 else
 errorMessage = "#no error message#";
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx 
b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index 2e352320353f..069cdfa13e35 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -479,8 +479,7 @@ void PreparedStatement::setBytes(
 checkClosed();
 checkColumnIndex( parameterIndex );
 size_t len;
-struct Free { void operator ()(void * p) const { free(p); } };
-std::unique_ptr escapedString(
+const std::unique_ptr> 
escapedString(

[Libreoffice-commits] core.git: vcl/inc vcl/osx vcl/quartz

[Stephan Bergmann (via logerrit)]

 vcl/inc/quartz/salgdi.h |1 
 vcl/osx/salgdiutils.cxx |   50 
 vcl/osx/salmacos.cxx|2 -
 vcl/quartz/salgdi.cxx   |8 +++
 4 files changed, 36 insertions(+), 25 deletions(-)

New commits:
commit b3737c638671ab39c5e6aaeaf5426d102392cc0a
Author: Stephan Bergmann 
AuthorDate: Thu Jan 28 09:39:48 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Jan 28 10:43:09 2021 +0100

Revert "tdf#138122 Detect window scaling for multi display configurations 
on macOS"

This reverts commit f318b856ed055f1952276355f811153f6b29c93e.
It appears this reliably causes CppunitTest_vcl_backend_test to fail on 
macOS on
at least tb69, see e.g.  and
,

  [_RUN_] BackendTest::testDrawBlendExtended
  
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/vcl/qa/cppunit/BackendTest.cxx:688:BackendTest::testDrawBlendExtended
  equality assertion failed
  - Expected: c[80ff]
  - Actual  : c[]

  BackendTest::testDrawBlendExtended finished in: 1ms
  [_RUN_] BackendTest::testDrawAlphaBitmapMirrored
  
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/vcl/qa/cppunit/BackendTest.cxx:749:BackendTest::testDrawAlphaBitmapMirrored
  equality assertion failed
  - Expected: c[ffff]
  - Actual  : c[00ff]

  BackendTest::testDrawAlphaBitmapMirrored finished in: 1ms
  [_RUN_] BackendTest::testTdf124848
  
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/vcl/qa/cppunit/BackendTest.cxx:808:BackendTest::testTdf124848
  equality assertion failed
  - Expected: c[00ff]
  - Actual  : c[]

And it also causes my local macOS 11.1 ARM64 build to consistently fail that
way, both the original patch set 1 (with the older parent) and the submitted
patch set 2 (with a newer parent).

Change-Id: I2c36fada271e8bc300b6caa19370d8e8bb1e7599
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110055
Reviewed-by: Tor Lillqvist 
Tested-by: Jenkins

diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 4897d96c6089..69b735787bdc 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -174,6 +174,7 @@ class AquaSalGraphics : public SalGraphics
 #ifdef MACOSX
 /// is this a window graphics
 boolmbWindow;
+boolmbWindowScaling;
 
 #else // IOS
 
diff --git a/vcl/osx/salgdiutils.cxx b/vcl/osx/salgdiutils.cxx
index f3ddd946f699..01626d348999 100644
--- a/vcl/osx/salgdiutils.cxx
+++ b/vcl/osx/salgdiutils.cxx
@@ -35,35 +35,37 @@
 #include 
 #include 
 
-// TODO: Scale will be set to 2.0f as default after implementation of full 
scaled display support . This will allow moving of
-// windows between non retina and retina displays without blurry text and 
graphics. Static variables have to be removed thereafter.
+float AquaSalGraphics::GetWindowScaling()
+{
+float fScale = 1.0f;
 
-// Currently scaled display support is not implemented for bitmaps. This will 
cause a slight performance degradation on displays
-// with single precision. To preserve performance for now, window scaling is 
only activated if at least one display with double
-// precision is present. Moving windows between displays is then possible 
without blurry text and graphics too. Adapting window
-// scaling when displays are added while application is running is not 
supported.
+#ifdef MACOSX
 
-static bool  bWindowScaling = false;
-static float fWindowScale = 1.0f;
+// Window scaling independent from main display may be forced by setting 
VCL_MACOS_FORCE_WINDOW_SCALING environment variable
+// whose setting is stored in mbWindowScaling. After implementation of 
full support of scaled displays window scaling will be
+// set to 2.0f for macOS as default. This will allow moving of windows 
between non retina and retina displays without blurry
+// text and graphics.
 
-float AquaSalGraphics::GetWindowScaling()
-{
-if (!bWindowScaling)
+// TODO: After implementation of full support of scaled displays code has 
to be modified to set a scaling of 2.0f as default.
+
+if (mbWindowScaling)
 {
-NSArray *aScreens = [NSScreen screens];
-if (aScreens != nullptr)
-{
-int nScreens = [aScreens count];
-for (int i = 0; i < nScreens; i++)
-{
-float fScale = [[aScreens objectAtIndex:i] backingScaleFactor];
-if (fScale > fWindowScale)
-  fWindowScale = fScale;
-}
-bWindowScaling = true;
-}
+fScale = 2.0f;

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

[Maxim Monastirsky (via logerrit)]

 vcl/source/window/brdwin.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 46984619f8b7fa30678b5c7ccd40a0d727a57ce5
Author: Maxim Monastirsky 
AuthorDate: Wed Jan 27 16:49:54 2021 +0200
Commit: Maxim Monastirsky 
CommitDate: Thu Jan 28 10:40:39 2021 +0100

tdf#122714 Avoid tracking mode for a toolbar's title menu button

Regression of commit c3e552ac25be001a623469c549ee8d0719b98133
("wayland: Make popup menus not show off-screen"). Apparently
executing the menu async used to give the tracking mode a chance
to be turned off.

Avoid the problem by not activating that mode in the first place.
And because the Tracking method will no longer be executed, we
also need to reset the "pressed" state here instead.

Change-Id: Iab63f1eaada1f4945507d6bdd05dc6171e6afbab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110029
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 78258d758776..2604aa043114 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -805,6 +805,11 @@ bool ImplStdBorderWindowView::MouseButtonDown( const 
MouseEvent& rMEvt )
 SystemWindow* pClientWindow = 
static_cast(pBorderWindow->ImplGetClientWindow());
 pClientWindow->TitleButtonClick( TitleButton::Menu );
 }
+
+maFrameData.mnMenuState &= ~DrawButtonFlags::Pressed;
+pBorderWindow->InvalidateBorder();
+
+bTracking = false;
 }
 else if ( maFrameData.mnHitTest & BorderWindowHitTest::Hide )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - instsetoo_native/util setup_native/scripts solenv/bin

[Christian Lohmaier (via logerrit)]

 instsetoo_native/util/openoffice.lst.in   |3 
 setup_native/scripts/downloadscript.sh|  104 --
 solenv/bin/modules/installer.pm   |6 -
 solenv/bin/modules/installer/download.pm  |   86 -
 solenv/bin/modules/installer/simplepackage.pm |   12 ---
 5 files changed, 5 insertions(+), 206 deletions(-)

New commits:
commit a3eb01f1675d473580c3b1fa87072852f97b6daa
Author: Christian Lohmaier 
AuthorDate: Tue Jan 26 19:07:21 2021 +0100
Commit: Michael Stahl 
CommitDate: Thu Jan 28 10:40:12 2021 +0100

packaging: remove resolve_variables_in_downloadname

OOODOWNLOADNAME was set in the global section of openoffice.lst, so the
code always did set the target path with set_download_filename. Thus
remove the superfluous sub and then also the no longer used
OOODOWNLOADNAME variables
In the same vein: the "script that extracts a tarball that is appended
to it" method is no longer in use since many years, delete that as well.

Change-Id: I43481a3ec09e064ef77138e1cbfc1dba6854f2d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110017
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 443f65e9aff72442348e8e0c7162762c7a68ee05)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109990
Reviewed-by: Michael Stahl 

diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index 343cbfec2096..dc6d2d97861e 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -31,7 +31,6 @@ Globals
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
 WINDOWSPATCHLEVEL 8
-OOODOWNLOADNAME 1
 64BITPRODUCT @WINDOWS_X64@
 WINDOWSSDKVERSION @WINDOWS_SDK_VERSION@
 CRASHDUMPENABLE @DEFAULT_CRASHDUMP_VALUE@
@@ -65,7 +64,6 @@ LibreOffice
 ROOTMODULEGID gid_Module_Root
 GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 SPELLCHECKERFILE spellchecker_selection.txt
-OOODOWNLOADNAME 1
 CHANGETARGETDIR 1
 PATCHCODEFILE ooo_patchcodes.txt
 STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
@@ -114,7 +112,6 @@ LibreOfficeDev
 ROOTMODULEGID gid_Module_Root
 GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 SPELLCHECKERFILE spellchecker_selection.txt
-OOODOWNLOADNAME 1
 CHANGETARGETDIR 1
 PATCHCODEFILE ooodev_patchcodes.txt
 CODEFILENAME codes_ooodev.txt
diff --git a/setup_native/scripts/downloadscript.sh 
b/setup_native/scripts/downloadscript.sh
deleted file mode 100644
index 7246ebcda27c..
--- a/setup_native/scripts/downloadscript.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-#
-# 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/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-linenum=LINENUMBERPLACEHOLDER
-
-UNPACKDIR=/var/tmp/unpack_PRODUCTNAMEPLACEHOLDER
-diskSpaceRequired=DISCSPACEPLACEHOLDER
-checksum=CHECKSUMPLACEHOLDER
-
-EXTRACTONLY="no"
-if [ "$1" = "-x" ]
-then
-EXTRACTONLY=yes
-fi
-
-# Determining current platform
-
-platform=`uname -s`
-
-case $platform in
-SunOS)
-  tail_prog="tail"
-  ;;
-Linux)
-  tail_prog="tail -n"
-  ;;
-*)
-  tail_prog="tail"
-  ;;
-esac
-
-# Asking for the unpack directory
-
-echo
-echo "Select the directory in which to save the unpacked files. [$UNPACKDIR] "
-read reply leftover
-if [ "x$reply" != "x" ]
-then
-  UNPACKDIR="$reply"
-fi
-
-if [ -d $UNPACKDIR ]; then
-printf "Directory $UNPACKDIR already exists.\n"
-printf "Please select a new directory name.\n"
-exit 1
-fi
-
-# Unpacking
-
-mkdir -m 700 $UNPACKDIR
-
-diskSpace=`df -k $UNPACKDIR | $tail_prog -1 | awk '{if ( $4 ~ /%/) { print $3 
} else { print $4 } }'`
-if [ $diskSpace -lt $diskSpaceRequired ]; then
-printf "The selected drive does not have enough disk space available.\n"
-printf "PRODUCTNAMEPLACEHOLDER requires at least %s kByte.\n" 
$diskSpaceRequired
-exit 1
-fi
-
-trap 'rm -rf $UNPACKDIR; exit 1' HUP INT QUIT TERM
-
-if [ -x /usr/bin/sum ] ; then
-echo "F

[Libreoffice-commits] core.git: include/vcl vcl/source

[Noel Grandin (via logerrit)]

 include/vcl/settings.hxx |4 -
 include/vcl/textview.hxx |1 
 vcl/source/edit/textview.cxx |  106 ---
 vcl/source/edit/vclmedit.cxx |4 -
 4 files changed, 12 insertions(+), 103 deletions(-)

New commits:
commit 85e2aa4191497db91a11fb340d143f80e6ac8baa
Author: Noel Grandin 
AuthorDate: Thu Jan 28 10:31:37 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Jan 28 10:36:48 2021 +0100

remove unused SelectionOptions values

Focus is dead since
commit 6a22fc81e219667566b9cc3ed5e9de1898c1fe6b
Date:   Thu Apr 23 20:49:05 2020 +0200
loplugin:unusedmethods

Invert seems to have dead since initial import

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

diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 427447c8d1b2..f09e50608e76 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -181,13 +181,11 @@ namespace o3tl
 enum class SelectionOptions
 {
 NONE   = 0x,
-Focus  = 0x0001,
-Invert = 0x0002,
 ShowFirst  = 0x0004,
 };
 namespace o3tl
 {
-template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 enum class DisplayOptions
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index d913dfd99c0a..105fd352089c 100644
--- a/include/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
@@ -98,7 +98,6 @@ class VCL_DLLPUBLIC TextView final : public 
vcl::unohelper::DragAndDropClient
 voidImpPaint(vcl::RenderContext& rRenderContext, const 
Point& rStartPos, tools::Rectangle const* pPaintArea, TextSelection const* 
pSelection);
 voidImpPaint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect);
 voidImpShowCursor( bool bGotoCursor, bool bForceVisCursor, 
bool bEndKey );
-voidImpHighlight( const TextSelection& rSel );
 voidImpSetSelection( const TextSelection& rSelection );
 Point   ImpGetOutputStartPos( const Point& rStartDocPos ) 
const;
 
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index f7095a0d590c..73a68de7ca42 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -139,7 +139,6 @@ struct ImpTextView
 boolmbReadOnly  : 1;
 boolmbPaintSelection: 1;
 boolmbAutoIndent: 1;
-boolmbHighlightSelection: 1;
 boolmbCursorEnabled : 1;
 boolmbClickedInSelection: 1;
 boolmbCursorAtEndOfLine;
@@ -157,7 +156,6 @@ TextView::TextView( ExtTextEngine* pEng, vcl::Window* 
pWindow ) :
 mpImpl->mbAutoScroll = true;
 mpImpl->mbInsertMode = true;
 mpImpl->mbReadOnly = false;
-mpImpl->mbHighlightSelection = false;
 mpImpl->mbAutoIndent = false;
 mpImpl->mbCursorEnabled = true;
 mpImpl->mbClickedInSelection = false;
@@ -175,9 +173,6 @@ TextView::TextView( ExtTextEngine* pEng, vcl::Window* 
pWindow ) :
 pWindow->SetCursor( mpImpl->mpCursor.get() );
 pWindow->SetInputContext( InputContext( pEng->GetFont(), 
InputContextFlags::Text|InputContextFlags::ExtText ) );
 
-if ( pWindow->GetSettings().GetStyleSettings().GetSelectionOptions() & 
SelectionOptions::Invert )
-mpImpl->mbHighlightSelection = true;
-
 pWindow->SetLineColor();
 
 if ( pWindow->GetDragGestureRecognizer().is() )
@@ -291,85 +286,11 @@ void TextView::ImpPaint(vcl::RenderContext& 
rRenderContext, const tools::Rectang
 return;
 
 TextSelection *pDrawSelection = nullptr;
-if (!mpImpl->mbHighlightSelection && mpImpl->maSelection.HasRange())
+if (mpImpl->maSelection.HasRange())
 pDrawSelection = &mpImpl->maSelection;
 
 Point aStartPos = ImpGetOutputStartPos(mpImpl->maStartDocPos);
 ImpPaint(rRenderContext, aStartPos, &rRect, pDrawSelection);
-if (mpImpl->mbHighlightSelection)
-ImpHighlight(mpImpl->maSelection);
-}
-
-void TextView::ImpHighlight( const TextSelection& rSel )
-{
-TextSelection aSel( rSel );
-aSel.Justify();
-if ( !(aSel.HasRange() && !mpImpl->mpTextEngine->IsInUndo() && 
mpImpl->mpTextEngine->GetUpdateMode()) )
-return;
-
-mpImpl->mpCursor->Hide();
-
-SAL_WARN_IF( mpImpl->mpTextEngine->mpIdleFormatter->IsActive(), "vcl", 
"ImpHighlight: Not formatted!" );
-
-tools::Rectangle aVisArea( mpImpl->maStartDocPos, 
mpImpl->mpWindow->GetOutputSizePixel() );
-tools::Long nY = 0;
-const sal_uInt32 nStartPara = aSel.GetStart().GetPara();
-const sal_uInt32 nEndPara = aSel.GetEnd().GetPara();
-for ( sal_uInt32 nPara = 0; nPara <= nEndPara; ++nPara )
-{
-const tools::Long nParaHeight = mpIm

[Libreoffice-commits] core.git: Branch 'private/timar/fontconfigcrash' - vcl/unx

[Andras Timar (via logerrit)]

Rebased ref, commits from common ancestor:
commit 4eaff82e8d55b81c33c13c711f84262620e141ea
Author: Andras Timar 
AuthorDate: Thu Jan 28 10:06:00 2021 +0100
Commit: Andras Timar 
CommitDate: Thu Jan 28 10:25:25 2021 +0100

debug 9

Change-Id: I7258f5ac3177df16a2546fe84fa3e3df67a3cb57

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx 
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 253078259198..b2dc3b95035c 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -94,6 +95,11 @@ FontCfgWrapper::FontCfgWrapper()
 setenv("FONTCONFIG_PATH", "/etc/fonts", 1);
 std::cerr << "FONTCONFIG_PATH: " << getenv("FONTCONFIG_PATH") << std::endl;
 std::cout << "Standard output is working" << std::endl;
+std::ifstream conf("/etc/fonts/fonts.conf");
+if(!conf)
+std::cerr << "/etc/fonts/fonts.conf is not readable from LO core" << 
std::endl;
+else
+std::cerr << "/etc/fonts/fonts.conf is readable from LO core" << 
std::endl;
 FcInit();
 std::cerr << "FcInit() OK" << std::endl;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/timar/fontconfigcrash' - vcl/unx

[Andras Timar (via logerrit)]

 vcl/unx/generic/fontmanager/fontconfig.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 7d9777fa23aadd0dd4efbbf6352c143cc58eda6d
Author: Andras Timar 
AuthorDate: Thu Jan 28 10:06:00 2021 +0100
Commit: Andras Timar 
CommitDate: Thu Jan 28 10:06:00 2021 +0100

debug 8

Change-Id: I7258f5ac3177df16a2546fe84fa3e3df67a3cb57

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx 
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 253078259198..c90b2aa645ad 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -94,6 +95,11 @@ FontCfgWrapper::FontCfgWrapper()
 setenv("FONTCONFIG_PATH", "/etc/fonts", 1);
 std::cerr << "FONTCONFIG_PATH: " << getenv("FONTCONFIG_PATH") << std::endl;
 std::cout << "Standard output is working" << std::endl;
+ifstream conf("/etc/fonts/fonts.conf");
+if(!conf)
+std::cerr << "/etc/fonts/fonts.conf is not readable from LO core" << 
std::endl;
+else
+std::cerr << "/etc/fonts/fonts.conf is readable from LO core" << 
std::endl;
 FcInit();
 std::cerr << "FcInit() OK" << std::endl;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: ESC meeting agenda - Adding topic: Broken release process when fresh become still and when still become EOL'ed

[Michael Weghorn]

On 27/01/2021 18.22, William Gathoye (LibreOffice) wrote:
I would like the ESC take action on a pending topic that is annoying a 
bunch of users and that I have been constantly reporting for **3 years 
now**[0]: desynchronization between the website and the TDF update service.


[...]
I'll be there at the ESC meeting to support this tomorrow if you want. 
ESC meetings being quick and not to bother anyone with limited time, if 
you need further details, we can have a dedicated video chat if you want.


Unless anybody else suggests a different way to handle this, it IMHO 
certainly makes sense if you attend the ESC meeting today.

(I've added that item to the agenda for now.)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna (via logerrit)]

 vcl/source/graphic/VectorGraphicSearch.cxx |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 8f0b4aacf13c8d096a87a61b5f573a77e08c96c6
Author: Miklos Vajna 
AuthorDate: Wed Jan 27 20:38:39 2021 +0100
Commit: Miklos Vajna 
CommitDate: Thu Jan 28 09:02:34 2021 +0100

pdfium: use PDFiumTextPage in SearchContext

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

diff --git a/vcl/source/graphic/VectorGraphicSearch.cxx 
b/vcl/source/graphic/VectorGraphicSearch.cxx
index b835962e25ef..083dc6cf2741 100644
--- a/vcl/source/graphic/VectorGraphicSearch.cxx
+++ b/vcl/source/graphic/VectorGraphicSearch.cxx
@@ -29,7 +29,7 @@ class SearchContext
 private:
 std::unique_ptr& mpPdfDocument;
 std::unique_ptr mpPage;
-FPDF_TEXTPAGE mpTextPage;
+std::unique_ptr mpTextPage;
 FPDF_SCHHANDLE mpSearchHandle;
 
 public:
@@ -40,7 +40,6 @@ public:
 
 SearchContext(std::unique_ptr& pPdfDocument, 
sal_Int32 nPageIndex)
 : mpPdfDocument(pPdfDocument)
-, mpTextPage(nullptr)
 , mpSearchHandle(nullptr)
 , mnPageIndex(nPageIndex)
 , mnCurrentIndex(-1)
@@ -52,7 +51,7 @@ public:
 if (mpSearchHandle)
 FPDFText_FindClose(mpSearchHandle);
 if (mpTextPage)
-FPDFText_ClosePage(mpTextPage);
+mpTextPage.reset();
 if (mpPage)
 mpPage.reset();
 }
@@ -81,7 +80,7 @@ public:
 FPDFText_FindClose(mpSearchHandle);
 
 if (mpTextPage)
-FPDFText_ClosePage(mpTextPage);
+mpTextPage.reset();
 
 if (mpPage)
 mpPage.reset();
@@ -93,7 +92,7 @@ public:
 if (!mpPage)
 return false;
 
-mpTextPage = FPDFText_LoadPage(mpPage->getPointer());
+mpTextPage = mpPage->getTextPage();
 if (!mpTextPage)
 return false;
 
@@ -115,7 +114,8 @@ public:
 if (maOptions.mbMatchWholeWord)
 nSearchFlags |= FPDF_MATCHWHOLEWORD;
 
-mpSearchHandle = FPDFText_FindStart(mpTextPage, pString, nSearchFlags, 
nStartIndex);
+mpSearchHandle
+= FPDFText_FindStart(mpTextPage->getPointer(), pString, 
nSearchFlags, nStartIndex);
 
 return mpSearchHandle != nullptr;
 }
@@ -178,7 +178,8 @@ public:
 double bottom = 0.0;
 double top = 0.0;
 
-if (FPDFText_GetCharBox(mpTextPage, nIndex + nCount, &left, 
&right, &bottom, &top))
+if (FPDFText_GetCharBox(mpTextPage->getPointer(), nIndex + nCount, 
&left, &right,
+&bottom, &top))
 {
 left = convertPointToMm100(left);
 right = convertPointToMm100(right);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits