[Libreoffice-commits] core.git: include/tools tools/CppunitTest_tools_test.mk tools/qa

[Tomaž Vajngerl (via logerrit)]

 include/tools/simdsupport.hxx |   21 ++---
 tools/CppunitTest_tools_test.mk   |   12 ++
 tools/qa/cppunit/test_cpu_runtime_detection_AVX2.cxx  |   75 ++
 tools/qa/cppunit/test_cpu_runtime_detection_SSE2.cxx  |   58 +
 tools/qa/cppunit/test_cpu_runtime_detection_SSSE3.cxx |   58 +
 5 files changed, 214 insertions(+), 10 deletions(-)

New commits:
commit 7ee6fa6487f01271c4374e4c260466b5041afe72
Author: Tomaž Vajngerl 
AuthorDate: Sat Jun 20 16:59:59 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed Jun 24 08:47:30 2020 +0200

Add test as an example how to add CPU intrinsics support

Also makes sure that if the CPU dataction or compiler detection
doesn't work correctly, the test could potentially crash.

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

diff --git a/include/tools/simdsupport.hxx b/include/tools/simdsupport.hxx
index 4ef7a698089e..5d10d53d48ad 100644
--- a/include/tools/simdsupport.hxx
+++ b/include/tools/simdsupport.hxx
@@ -14,6 +14,8 @@
 // code using intrinsics or not. So we have to (re)set them again
 // every time this file has been included.
 
+// In other words... DO NOT ADD "#pragma once" here
+
 #undef LO_SSE2_AVAILABLE
 #undef LO_SSSE3_AVAILABLE
 #undef LO_AVX_AVAILABLE
@@ -24,49 +26,48 @@
 // SSE2 is required for X64
 #if (defined(_M_X64) || defined(_M_IX86_FP) && _M_IX86_FP >= 2)
 #define LO_SSE2_AVAILABLE
+#include 
 #endif // end SSE2
 
 // compiled with /arch:AVX
 #if defined(__AVX__)
 #ifndef LO_SSE2_AVAILABLE
 #define LO_SSE2_AVAILABLE
+#include 
 #endif
 #define LO_SSSE3_AVAILABLE
 #define LO_AVX_AVAILABLE
-#endif // defined(__AVX__)
+#include 
+#endif // end defined(__AVX__)
 
 // compiled with /arch:AVX2
 #if defined(__AVX2__)
 #define LO_AVX2_AVAILABLE
+#include 
 #endif // defined(__AVX2__)
 
 #else // compiler Clang and GCC
 
 #if defined(__SSE2__) || defined(__x86_64__) // SSE2 is required for X64
 #define LO_SSE2_AVAILABLE
+#include 
 #endif // defined(__SSE2__)
 
 #if defined(__SSSE3__)
 #define LO_SSSE3_AVAILABLE
+#include 
 #endif // defined(__SSSE3__)
 
 #if defined(__AVX__)
 #define LO_AVX_AVAILABLE
+#include 
 #endif // defined(__AVX__)
 
 #if defined(__AVX2__)
 #define LO_AVX2_AVAILABLE
+#include 
 #endif // defined(__AVX2__)
 
 #endif // end compiler Clang and GCC
 
-// If we detect any SIMD intrinsics, include the headers automatically
-#if defined(LO_SSE2_AVAILABLE)
-#include 
-#elif defined(LO_SSSE3_AVAILABLE)
-#include 
-#elif defined(LO_AVX_AVAILABLE) || defined(LO_AVX2_AVAILABLE)
-#include 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk
index 46a6cf5242cd..aa5ac4606d02 100644
--- a/tools/CppunitTest_tools_test.mk
+++ b/tools/CppunitTest_tools_test.mk
@@ -34,6 +34,18 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,tools_test, \
 tools/qa/cppunit/test_cpuid \
 ))
 
+$(eval $(call gb_CppunitTest_add_exception_objects,tools_test,\
+tools/qa/cppunit/test_cpu_runtime_detection_AVX2, 
$(CXXFLAGS_INTRINSICS_AVX2) \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,tools_test,\
+tools/qa/cppunit/test_cpu_runtime_detection_SSE2, 
$(CXXFLAGS_INTRINSICS_SSE2) \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,tools_test,\
+tools/qa/cppunit/test_cpu_runtime_detection_SSSE3, 
$(CXXFLAGS_INTRINSICS_SSSE3) \
+))
+
 $(eval $(call gb_CppunitTest_use_sdk_api,tools_test))
 
 $(eval $(call gb_CppunitTest_use_libraries,tools_test, \
diff --git a/tools/qa/cppunit/test_cpu_runtime_detection_AVX2.cxx 
b/tools/qa/cppunit/test_cpu_runtime_detection_AVX2.cxx
new file mode 100644
index ..0c98f2fc8c98
--- /dev/null
+++ b/tools/qa/cppunit/test_cpu_runtime_detection_AVX2.cxx
@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#ifdef LO_AVX2_AVAILABLE
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+namespace
+{
+class CpuRuntimeDetection_AVX2 : public CppUnit::TestFixture
+{
+public:
+void checkAVX2();
+void testCpuRuntimeDetection();
+
+CPPUNIT_TEST_SUITE(CpuRuntimeDetection_AVX2);
+CPPUNIT_TEST(testCpuRuntimeDetection);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void CpuRuntimeDetection_AVX2::testCpuRuntimeDetection()
+{
+// can only run if this function if CPU supports AVX2
+if (cpuid::isCpuInstructionSetSupported(cpuid::InstructionSetFlags::AVX2))
+checkAVX2();
+}
+
+void CpuRuntimeDetection_AVX2::checkAVX2()
+{
+__m256i a = _mm256_set

[Libreoffice-commits] core.git: basctl/source basegfx/source canvas/source chart2/source comphelper/source connectivity/source cui/source dbaccess/source drawinglayer/source extensions/source framewor

[Noel Grandin (via logerrit)]

 basctl/source/basicide/scriptdocument.cxx|4 --
 basegfx/source/tools/keystoplerp.cxx |3 -
 canvas/source/opengl/ogl_spritedevicehelper.cxx  |8 +---
 canvas/source/tools/spriteredrawmanager.cxx  |5 --
 chart2/source/tools/DataSeriesHelper.cxx |3 -
 chart2/source/tools/DataSourceHelper.cxx |6 +--
 chart2/source/tools/DiagramHelper.cxx|6 +--
 chart2/source/tools/ImplOPropertySet.cxx |3 -
 chart2/source/tools/InternalDataProvider.cxx |4 --
 comphelper/source/property/opropertybag.cxx  |   12 +-
 connectivity/source/commontools/dbtools.cxx  |7 
 connectivity/source/parse/sqliterator.cxx|3 -
 cui/source/customize/macropg.cxx |8 
 dbaccess/source/filter/xml/xmlExport.cxx |2 -
 dbaccess/source/ui/app/AppControllerDnD.cxx  |   12 ++
 dbaccess/source/ui/relationdesign/RelationController.cxx |2 -
 drawinglayer/source/primitive2d/Primitive2DContainer.cxx |   10 +
 extensions/source/propctrlr/eventhandler.cxx |2 -
 framework/source/services/autorecovery.cxx   |4 --
 linguistic/source/convdiclist.cxx|2 -
 oox/source/export/chartexport.cxx|6 +--
 package/source/zipapi/ZipFile.cxx|2 -
 reportdesign/source/filter/xml/xmlExport.cxx |2 -
 sc/source/core/data/table3.cxx   |2 -
 sc/source/ui/vba/vbachartobjects.cxx |2 -
 sccomp/source/solver/ParticelSwarmOptimization.hxx   |   17 +
 sd/source/core/CustomAnimationEffect.cxx |3 -
 sd/source/core/EffectMigration.cxx   |2 -
 sd/source/ui/animations/CustomAnimationPane.cxx  |4 +-
 sd/source/ui/framework/configuration/ResourceId.cxx  |2 -
 sd/source/ui/view/ToolBarManager.cxx |5 +-
 sdext/source/presenter/PresenterTimer.cxx|7 +---
 sfx2/source/control/charmapcontrol.cxx   |8 ++--
 slideshow/source/engine/slide/layermanager.cxx   |3 -
 svl/source/passwordcontainer/syscreds.cxx|4 --
 svtools/source/dialogs/addresstemplate.cxx   |6 +--
 svx/source/form/fmshimp.cxx  |7 
 svx/source/form/formcontroller.cxx   |4 --
 svx/source/form/formcontrolling.cxx  |3 -
 sw/source/core/access/textmarkuphelper.cxx   |7 +---
 sw/source/filter/basflt/shellio.cxx  |4 +-
 sw/source/filter/ww8/wrtww8.cxx  |3 -
 toolkit/source/helper/formpdfexport.cxx  |3 -
 unotools/source/config/dynamicmenuoptions.cxx|3 -
 vbahelper/source/msforms/vbalistcontrolhelper.cxx|2 -
 vcl/source/gdi/textlayout.cxx|4 --
 writerfilter/source/ooxml/OOXMLPropertySet.cxx   |4 --
 xmloff/source/chart/SchXMLExport.cxx |   26 ++-
 xmloff/source/chart/SchXMLSeriesHelper.cxx   |3 -
 xmloff/source/chart/SchXMLTableContext.cxx   |6 +--
 xmloff/source/forms/elementimport.cxx|   14 +---
 xmloff/source/style/xmlexppr.cxx |3 -
 52 files changed, 85 insertions(+), 192 deletions(-)

New commits:
commit a2fc883173d7053cefe543620982051ae40c4b03
Author: Noel Grandin 
AuthorDate: Tue Jun 23 15:02:35 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Jun 24 08:43:55 2020 +0200

use more std::container::insert instead of std::copy

which is both more compact code, and more efficient, since the insert
method can do smarter resizing

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

diff --git a/basctl/source/basicide/scriptdocument.cxx 
b/basctl/source/basicide/scriptdocument.cxx
index cedadda510cf..d557bd5f31f4 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -1228,9 +1228,7 @@ namespace basctl
 OUString aBaseName = _eType == E_SCRIPTS ? OUString("Module") : 
OUString("Dialog");
 
 Sequence< OUString > aUsedNames( getObjectNames( _eType, _rLibName ) );
-std::set< OUString > aUsedNamesCheck;
-std::copy( aUsedNames.begin(), aUsedNames.end(),
-std::insert_iterator< std::set< OUString > >( aUsedNamesCheck, 
aUsedNamesCheck.begin() ) );
+std::set< OUString > aUsedNamesCheck( aUsedNames.begin(), 
aUsedNames.end() );
 
 bool bValid = false;
 sal_Int32 i = 1;
diff --git a/ba

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

[Noel Grandin (via logerrit)]

 sc/source/core/data/table2.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 240758a972eb99dd4d26fa6040ff0b6614036621
Author: Noel Grandin 
AuthorDate: Tue Jun 23 16:46:22 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Jun 24 08:44:19 2020 +0200

tdf#133326 Crash after redo

regression from
commit 7282014e362a1529a36c88eb308df8ed359c2cfa
tdf#50916 Makes numbers of columns dynamic.

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

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 8c52bd5a1a74..9779964d10e0 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1347,10 +1347,11 @@ void ScTable::UndoToTable(
 
 for ( SCCOL i = 0; i < aCol.size(); i++)
 {
+auto& rDestCol = pDestTab->CreateColumnIfNotExists(i);
 if ( i >= nCol1 && i <= nCol2 )
-aCol[i].UndoToColumn(rCxt, nRow1, nRow2, nFlags, bMarked, 
pDestTab->aCol[i]);
+aCol[i].UndoToColumn(rCxt, nRow1, nRow2, nFlags, bMarked, 
rDestCol);
 else
-aCol[i].CopyToColumn(rCxt, 0, pDocument->MaxRow(), 
InsertDeleteFlags::FORMULA, false, pDestTab->aCol[i]);
+aCol[i].CopyToColumn(rCxt, 0, pDocument->MaxRow(), 
InsertDeleteFlags::FORMULA, false, rDestCol);
 }
 
 if (nFlags & InsertDeleteFlags::ATTRIB)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Vasily Melenchuk (via logerrit)]

 sw/source/core/text/txtfld.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 0453702ea9cf48fc5764bb7d2d6685e0234e09cb
Author: Vasily Melenchuk 
AuthorDate: Tue Jun 23 08:45:54 2020 +0300
Commit: Vasily Melenchuk 
CommitDate: Wed Jun 24 08:10:05 2020 +0200

tdf#83309: sw: do not create bullet with no char

On some machines (depending on fonts installed) creation
of SwBulletPortion with bullet = \0 leads to drawing
a bullet as a empty rectangle.

Change-Id: I2826944f2278e8c9a6c740b11b69d2e4e5108158
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96711
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 5ed96c798679a1613b058a11b30cce4ba0ffd920)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96886
Reviewed-by: Vasily Melenchuk 

diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 463e7668f4e7..e81ec0e36232 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -650,11 +650,14 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( 
SwTextFormatInfo &rInf ) con
 lcl_setRedlineAttr( rInf, *pTextNd, pNumFnt );
 
 // --> OD 2008-01-23 #newlistelevelattrs#
-pRet = new SwBulletPortion( rNumFormat.GetBulletChar(),
-pTextNd->GetLabelFollowedBy(),
-std::move(pNumFnt),
-bLeft, bCenter, nMinDist,
-
bLabelAlignmentPosAndSpaceModeActive );
+if (rNumFormat.GetBulletChar())
+{
+pRet = new SwBulletPortion(rNumFormat.GetBulletChar(),
+pTextNd->GetLabelFollowedBy(),
+std::move(pNumFnt),
+bLeft, bCenter, nMinDist,
+bLabelAlignmentPosAndSpaceModeActive);
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - instsetoo_native/inc_openoffice

[Roman Kuznetsov (via logerrit)]

 instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 448d920711a24e6819a3cc4b012e70dba347b13f
Author: Roman Kuznetsov 
AuthorDate: Tue Jun 9 16:25:00 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jun 24 07:37:43 2020 +0200

increase a radiobutton text area in Windows installer dialog

Change-Id: I3e2a2dbb7913bc0e35f0eb676f39afba53e1d0d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95970
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit eaf30f98597f12c53d734935d62a84501cb201b4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96887
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt
index c0425876b93f..680c97605409 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt
@@ -10,5 +10,5 @@ AgreeToLicense1   No  0   15  295 
15  OOO_RADIOBUTTON_6
 AgreeToLicense 2   Yes 0   0   295 15  
OOO_RADIOBUTTON_7   
 ApplicationUsers   1   AllUsers1   7   290 14  
OOO_RADIOBUTTON_8   
 ApplicationUsers   2   OnlyCurrentUser 1   23  290 14  
OOO_RADIOBUTTON_9   
-MsiUIRMOption  1   UseRM   0   0   295 16  
OOO_RADIOBUTTON_10  
-MsiUIRMOption  2   DontUseRM   0   20  295 16  
OOO_RADIOBUTTON_11  
+MsiUIRMOption  1   UseRM   0   0   420 16  
OOO_RADIOBUTTON_10  
+MsiUIRMOption  2   DontUseRM   0   20  420 16  
OOO_RADIOBUTTON_11  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 vcl/source/gdi/bitmapex.cxx |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 48106f66e4132dcc7a11a5ad18a535768b342dd4
Author: Luboš Luňák 
AuthorDate: Mon Jun 22 16:13:34 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jun 24 07:37:02 2020 +0200

do not assume SalBitmap is zero-initialized (tdf#134152)

This code apparently expected that bitmaps are initialized with
the first color in the palette, but that's not guaranteed to be
the case (fails at least with Skia and X11 'gen' bitmaps).

Change-Id: Ie4f7412e0a6c4c1110fc5fbb8ab5bed3c96f652f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96864
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 7f75271f91862f333707aae065f40af4d96a89a9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96873
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index cf46607f14a1..80c6879af00c 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -1035,9 +1035,9 @@ BitmapEx BitmapEx::ModifyBitmapEx(const 
basegfx::BColorModifierStack& rBColorMod
 // clear bitmap with dest color
 if(aChangedBitmap.GetBitCount() <= 8)
 {
-// do NOT use erase; for e.g. 8bit Bitmaps, the nearest 
color to the given
-// erase color is determined and used -> this may be 
different from what is
-// wanted here. Better create a new bitmap with the needed 
color explicitly
+// For e.g. 8bit Bitmaps, the nearest color to the given 
erase color is
+// determined and used -> this may be different from what 
is wanted here.
+// Better create a new bitmap with the needed color 
explicitly.
 Bitmap::ScopedReadAccess xReadAccess(aChangedBitmap);
 OSL_ENSURE(xReadAccess, "Got no Bitmap ReadAccess ?!?");
 
@@ -1051,10 +1051,7 @@ BitmapEx BitmapEx::ModifyBitmapEx(const 
basegfx::BColorModifierStack& rBColorMod
 &aNewPalette);
 }
 }
-else
-{
-aChangedBitmap.Erase(Color(pReplace->getBColor()));
-}
+aChangedBitmap.Erase(Color(pReplace->getBColor()));
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Weghorn (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8771e576a3a9d601f688265f1ad505cd8ceafb07
Author: Michael Weghorn 
AuthorDate: Fri Mar 6 11:07:40 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Wed Jun 24 00:08:10 2020 +0200

Update fontconfig to 2.13.91

This new version speeds up cache initialization.

For the Android Viewer case, this significantly decreases the
time between the user selecting the first document
after app installation and the point in time it actually shows up
(e.g. from about 2 minutes to about 10 seconds on my Samsung
Galaxy S4).

Note: fontconfig 2.13.92 had issues and did not work properly
when quickly testing with Android Viewer, showed e.g. this line in
'adb logcat' output and crashed when opening a document with Asian
characters

stderr  : Fontconfig error: Cannot load config file from 
/data/user/0//etc/fonts/fonts.conf

So, go with version 2.13.91 for now.

This should probably also allow dropping the current workarounds
related to slow fontconfig cache initialization for the online-based
Android app, but unfortunately my builds of that app never
succeeded in properly loading/rendering any document, so I won't
touch that one for now...

tarball available for download at

https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.91.tar.gz

Change-Id: I22c8d6de58ac9425931f884aab75841ccea0494a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90095
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit adbc858dd476651ac79300aaae25cf82e848cb69)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96874
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/download.lst b/download.lst
index 5e0610acd713..25cfc22e15a6 100644
--- a/download.lst
+++ b/download.lst
@@ -46,8 +46,8 @@ export EXPAT_SHA256SUM := 
9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e4
 export EXPAT_TARBALL := expat-2.2.8.tar.bz2
 export FIREBIRD_SHA256SUM := 
6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2
-export FONTCONFIG_SHA256SUM := 
cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
-export FONTCONFIG_TARBALL := fontconfig-2.12.6.tar.bz2
+export FONTCONFIG_SHA256SUM := 
19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5
+export FONTCONFIG_TARBALL := fontconfig-2.13.91.tar.gz
 export FONT_CALADEA_SHA256SUM := 
c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09
 export FONT_CALADEA_TARBALL := 
368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
 export FONT_CARLITO_SHA256SUM := 
4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 external/postgresql/postgresql.exit.patch.0 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 010713e65ccade7b682c219707c8db3d864145c1
Author: Tor Lillqvist 
AuthorDate: Tue Jun 23 23:29:50 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jun 23 23:29:36 2020 +0200

Brown paper bag fix for e69f547bce7de376a0af464c5f7af5e7d2c8784a

No idea why Jenkins didn't notice.

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

diff --git a/external/postgresql/postgresql.exit.patch.0 
b/external/postgresql/postgresql.exit.patch.0
index fe9bdcca8569..0d167925f4a4 100644
--- a/external/postgresql/postgresql.exit.patch.0
+++ b/external/postgresql/postgresql.exit.patch.0
@@ -14,6 +14,6 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
 +#include 
- typedef long int ac_int64;
+ typedef long long int ac_int64;
  
  /*
___
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.0-29' - 21 commits - download.lst external/curl external/expat external/icu external/libabw external/libvisio external/libxml2 external/li

[László Németh (via logerrit)]

 download.lst   
|   32 
 external/curl/zlib.patch.0 
|   10 
 external/expat/ExternalProject_expat.mk
|2 
 external/expat/StaticLibrary_expat.mk  
|1 
 external/expat/StaticLibrary_expat_x64.mk  
|1 
 external/expat/UnpackedTarball_expat.mk
|1 
 external/expat/expat-winapi.patch  
|   18 
 external/icu/ExternalProject_icu.mk
|5 
 external/icu/UnpackedTarball_icu.mk
|1 
 external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2  
|   37 
 external/libabw/UnpackedTarball_libabw.mk  
|4 
 external/libabw/libabw-msvc.patch.1
|   46 
 external/libvisio/0001-fix-debug-build.patch.1 
|   40 
 external/libvisio/UnpackedTarball_libvisio.mk  
|1 
 external/libvisio/ubsan.patch  
|4 
 external/libxml2/libxml2-android.patch 
|2 
 external/libxml2/libxml2-config.patch.1
|   46 
 external/libxslt/UnpackedTarball_libxslt.mk
|2 
 external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1  
|  120 --
 external/libxslt/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch.1  
|   69 +
 external/libxslt/libxslt-config.patch.1
|   18 
 external/libxslt/libxslt-internal-symbols.patch.1  
|8 
 external/nss/UnpackedTarball_nss.mk
|2 
 external/nss/clang-cl.patch.0  
|   16 
 external/nss/nss-chromium-nss-static.patch 
|  487 --
 external/nss/nss-more-static.patch 
|   39 
 external/nss/nss.aix.patch 
|2 
 external/nss/nss.patch 
|   27 
 external/nss/nss.vs2015.pdb.patch  
|4 
 external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1
|   27 
 
external/poppler/0001-Revert-Make-the-mul-tables-be-calculated-at-compile-.patch.1
 |  169 +++
 external/poppler/StaticLibrary_poppler.mk  
|1 
 external/poppler/UnpackedTarball_poppler.mk
|4 
 external/poppler/poppler-config.patch.1
|   19 
 forms/source/xforms/submission.cxx 
|3 
 forms/source/xforms/submission/submission.hxx  
|6 
 sc/source/ui/docshell/docsh.cxx
|   13 
 sc/source/ui/docshell/docsh4.cxx   
|   61 -
 sc/source/ui/docshell/externalrefmgr.cxx   
|9 
 sc/source/ui/inc/docsh.hxx 
|2 
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx  
|   25 
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx  
|   14 
 shell/source/win32/SysShExec.cxx   
|5 
 solenv/flatpak-manifest.in 
|   12 
 sw/inc/anchoredobject.hxx  
|1 
 sw/qa/extras/ooxmlexport/data/tdf116194.docx   
|binary
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx 
|9 
 sw/source/core/inc/layouter.hxx
|4 
 sw/source/core/layout/anchoredobject.cxx   
|9 
 sw/source/core/layout/fly.cxx  
|2 
 sw/source/core/layout/layouter.cxx 
|   15 
 sw/source/core/layout/objstmpconsiderwrapinfl.cxx  
|   27 
 sw/source/core/layout/objstmpconsiderwrapinfl.hxx  
|1 
 sw/source/core/layout/ssfrm.cxx

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

[Caolán McNamara (via logerrit)]

 sw/source/ui/index/cnttab.cxx   |2 +-
 sw/source/uibase/inc/unotools.hxx   |5 +++--
 sw/source/uibase/utlui/unotools.cxx |2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 77e4943cc6cf206a45901e5c87fabf0f783c8262
Author: Caolán McNamara 
AuthorDate: Tue Jun 23 20:04:21 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jun 23 22:25:34 2020 +0200

tdf#134243 only do the toc-terms localization when showing toc preview

and not when previewing another document, which sidesteps the
infinite loop in this example

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

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index f428406b27b4..dc24e2c3d9e7 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -432,7 +432,7 @@ IMPL_LINK_NOARG(SwMultiTOXTabDialog, ShowPreviewHdl, 
weld::ToggleButton&, void)
 else
 {
 Link aLink(LINK(this, 
SwMultiTOXTabDialog, CreateExample_Hdl));
-m_xExampleFrame.reset(new 
SwOneExampleFrame(EX_SHOW_ONLINE_LAYOUT, &aLink, &sTemplate));
+m_xExampleFrame.reset(new 
SwOneExampleFrame(EX_SHOW_ONLINE_LAYOUT | EX_LOCALIZE_TOC_STRINGS, &aLink, 
&sTemplate));
 m_xExampleFrameWin.reset(new weld::CustomWeld(*m_xBuilder, 
"example", *m_xExampleFrame));
 }
 m_xShowExampleCB->set_visible(m_xExampleFrame != nullptr);
diff --git a/sw/source/uibase/inc/unotools.hxx 
b/sw/source/uibase/inc/unotools.hxx
index 1c6c3708d433..4e72a5309920 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -26,12 +26,13 @@
 #include 
 #include 
 
-#define EX_SHOW_ONLINE_LAYOUT   0x001
-
+#define EX_SHOW_ONLINE_LAYOUT   0x01
 // hard zoom value
 #define EX_SHOW_BUSINESS_CARDS  0x02
 //don't modify page size
 #define EX_SHOW_DEFAULT_PAGE0x04
+//replace sample toc strings in the template to localized versions
+#define EX_LOCALIZE_TOC_STRINGS 0x08
 
 class SwView;
 
diff --git a/sw/source/uibase/utlui/unotools.cxx 
b/sw/source/uibase/utlui/unotools.cxx
index dd4470b0667f..fbad314f1309 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -294,7 +294,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer, 
void )
 auto pCursor = 
comphelper::getUnoTunnelImplementation(m_xCursor);
 
 SwDoc *pDoc = pCursor ? pCursor->GetDoc() : nullptr;
-if (pDoc)
+if (pDoc && (m_nStyleFlags & EX_LOCALIZE_TOC_STRINGS))
 {
 SwEditShell* pSh = pDoc->GetEditShell();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/ui/index/cnttab.cxx   |2 +-
 sw/source/uibase/inc/unotools.hxx   |5 +++--
 sw/source/uibase/utlui/unotools.cxx |2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 851daf6ab20c046509725cf26ff72473fb61a761
Author: Caolán McNamara 
AuthorDate: Tue Jun 23 20:04:21 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jun 23 22:25:15 2020 +0200

tdf#134243 only do the toc-terms localization when showing toc preview

and not when previewing another document, which sidesteps the
infinite loop in this example

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

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 3fc5120696ed..1531ad09e987 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -432,7 +432,7 @@ IMPL_LINK_NOARG(SwMultiTOXTabDialog, ShowPreviewHdl, 
weld::ToggleButton&, void)
 else
 {
 Link aLink(LINK(this, 
SwMultiTOXTabDialog, CreateExample_Hdl));
-m_xExampleFrame.reset(new 
SwOneExampleFrame(EX_SHOW_ONLINE_LAYOUT, &aLink, &sTemplate));
+m_xExampleFrame.reset(new 
SwOneExampleFrame(EX_SHOW_ONLINE_LAYOUT | EX_LOCALIZE_TOC_STRINGS, &aLink, 
&sTemplate));
 m_xExampleFrameWin.reset(new weld::CustomWeld(*m_xBuilder, 
"example", *m_xExampleFrame));
 }
 m_xShowExampleCB->set_visible(m_xExampleFrame != nullptr);
diff --git a/sw/source/uibase/inc/unotools.hxx 
b/sw/source/uibase/inc/unotools.hxx
index 1c6c3708d433..4e72a5309920 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -26,12 +26,13 @@
 #include 
 #include 
 
-#define EX_SHOW_ONLINE_LAYOUT   0x001
-
+#define EX_SHOW_ONLINE_LAYOUT   0x01
 // hard zoom value
 #define EX_SHOW_BUSINESS_CARDS  0x02
 //don't modify page size
 #define EX_SHOW_DEFAULT_PAGE0x04
+//replace sample toc strings in the template to localized versions
+#define EX_LOCALIZE_TOC_STRINGS 0x08
 
 class SwView;
 
diff --git a/sw/source/uibase/utlui/unotools.cxx 
b/sw/source/uibase/utlui/unotools.cxx
index dd4470b0667f..fbad314f1309 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -294,7 +294,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer, 
void )
 auto pCursor = 
comphelper::getUnoTunnelImplementation(m_xCursor);
 
 SwDoc *pDoc = pCursor ? pCursor->GetDoc() : nullptr;
-if (pDoc)
+if (pDoc && (m_nStyleFlags & EX_LOCALIZE_TOC_STRINGS))
 {
 SwEditShell* pSh = pDoc->GetEditShell();
 
___
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' - download.lst

[Michael Weghorn (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f2ef50062bb02d02d14728692f0ac3a763296255
Author: Michael Weghorn 
AuthorDate: Fri Mar 6 11:07:40 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Jun 23 22:19:18 2020 +0200

Update fontconfig to 2.13.91

This new version speeds up cache initialization.

For the Android Viewer case, this significantly decreases the
time between the user selecting the first document
after app installation and the point in time it actually shows up
(e.g. from about 2 minutes to about 10 seconds on my Samsung
Galaxy S4).

Note: fontconfig 2.13.92 had issues and did not work properly
when quickly testing with Android Viewer, showed e.g. this line in
'adb logcat' output and crashed when opening a document with Asian
characters

stderr  : Fontconfig error: Cannot load config file from 
/data/user/0//etc/fonts/fonts.conf

So, go with version 2.13.91 for now.

This should probably also allow dropping the current workarounds
related to slow fontconfig cache initialization for the online-based
Android app, but unfortunately my builds of that app never
succeeded in properly loading/rendering any document, so I won't
touch that one for now...

tarball available for download at

https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.91.tar.gz

Change-Id: I22c8d6de58ac9425931f884aab75841ccea0494a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90095
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit adbc858dd476651ac79300aaae25cf82e848cb69)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96875
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/download.lst b/download.lst
index a88c2d6024d9..c4a311085a0d 100644
--- a/download.lst
+++ b/download.lst
@@ -46,8 +46,8 @@ export EXPAT_SHA256SUM := 
9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e4
 export EXPAT_TARBALL := expat-2.2.8.tar.bz2
 export FIREBIRD_SHA256SUM := 
6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2
-export FONTCONFIG_SHA256SUM := 
cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
-export FONTCONFIG_TARBALL := fontconfig-2.12.6.tar.bz2
+export FONTCONFIG_SHA256SUM := 
19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5
+export FONTCONFIG_TARBALL := fontconfig-2.13.91.tar.gz
 export FONT_CALADEA_SHA256SUM := 
c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09
 export FONT_CALADEA_TARBALL := 
368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
 export FONT_CARLITO_SHA256SUM := 
4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/uiconfig

[Caolán McNamara (via logerrit)]

 cui/uiconfig/ui/menuassignpage.ui |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0662813e4d68f0495beee595a9d3ffd84cd2c1b8
Author: Caolán McNamara 
AuthorDate: Tue Jun 23 10:17:47 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jun 23 20:17:54 2020 +0200

spurious receives-default

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

diff --git a/cui/uiconfig/ui/menuassignpage.ui 
b/cui/uiconfig/ui/menuassignpage.ui
index cfa87f1cf95e..87ccc2c7fef9 100644
--- a/cui/uiconfig/ui/menuassignpage.ui
+++ b/cui/uiconfig/ui/menuassignpage.ui
@@ -321,7 +321,6 @@
 -1
 True
 True
-True
 True
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-5' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 4c853820015849eb45ff21fe388eee6ec2565962
Author: Christian Lohmaier 
AuthorDate: Tue Jun 23 19:59:09 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Jun 23 19:59:09 2020 +0200

Update git submodules

* Update translations from branch 'libreoffice-6-4-5'
  to edb34f9bc15a185f1b12851d979e99966f278a6f
  - update translations for 6.4.5 rc2

and force-fix errors using pocheck

Change-Id: I84a6ae3404d583b5bf9a99887843dd82d0e40dac
(cherry picked from commit a8c4610fdf3a63a81495db0cb406edd48ee9020a)

diff --git a/translations b/translations
index 8077243508cd..edb34f9bc15a 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 8077243508cdefe470f9264e843a1264f0b12e2a
+Subproject commit edb34f9bc15a185f1b12851d979e99966f278a6f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit ccab75364afefdde9a00cef87385aad67d2abaa9
Author: Christian Lohmaier 
AuthorDate: Tue Jun 23 19:57:35 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Jun 23 19:57:35 2020 +0200

Update git submodules

* Update translations from branch 'libreoffice-6-4'
  to a8c4610fdf3a63a81495db0cb406edd48ee9020a
  - update translations for 6.4.5 rc2

and force-fix errors using pocheck

Change-Id: I84a6ae3404d583b5bf9a99887843dd82d0e40dac

diff --git a/translations b/translations
index c5cb3837549e..a8c4610fdf3a 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit c5cb3837549e8a2cfaeaf2afd3ad1a13f801d7cb
+Subproject commit a8c4610fdf3a63a81495db0cb406edd48ee9020a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf116194.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx   |9 +++
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   37 ++-
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |3 -
 writerfilter/source/dmapper/TableData.hxx|   11 +++-
 writerfilter/source/dmapper/TableManager.cxx |   20 
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx|4 +
 writerfilter/source/ooxml/model.xml  |5 +-
 8 files changed, 74 insertions(+), 15 deletions(-)

New commits:
commit 489453ad71a710fb5896003f815d78db9c09c598
Author: László Németh 
AuthorDate: Mon Dec 2 19:02:43 2019 +0100
Commit: Andras Timar 
CommitDate: Tue Jun 23 19:46:13 2020 +0200

tdf#116194 DOCX import: fix missing tables with w:gridBefore

Regression from the commit cf33af732ed0d3d553bb74636e3b14c55d44c153
"handle w:gridBefore by faking cells (fdo#38414)"

This patch replaces the previous fix with a better solution,
fixing tdf#38414 on the proposed DomainMapper level. (Note:
to reject the old fix completely, its follow-up commit w:gridAfter
will be handled in a similar way.)

Now the related regressions, tdf#111679, tdf#120512 and the complex
forms of tdf#116194, tdf120256 and tdf#122608 are fixed, too.

Reviewed-on: https://gerrit.libreoffice.org/84263
Reviewed-by: László Németh 
Tested-by: László Németh 
(cherry picked from commit da1f71edfc72928b07a569b98e2766a8a7de9d2a)
Reviewed-on: https://gerrit.libreoffice.org/84711
Tested-by: Jenkins

Change-Id: Id25f5fb4d9021c87ee8c82782b2038e6fb255673
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96951
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf116194.docx 
b/sw/qa/extras/ooxmlexport/data/tdf116194.docx
new file mode 100644
index ..feec3ee9870f
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf116194.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 79375ec5f0ac..a3a9ccf63778 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -571,6 +571,15 @@ DECLARE_OOXMLEXPORT_TEST(testGridBefore, "gridbefore.docx")
 CPPUNIT_ASSERT( leftA3.toInt32() > leftB2.toInt32());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf116194, "tdf116194.docx")
+{
+// The problem was that the importer lost consecutive tables with 
w:gridBefore
+xmlDocPtr pXmlDoc = parseExport();
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc, "/w:document/w:body/w:tbl", 2);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testMsoBrightnessContrast, 
"msobrightnesscontrast.docx")
 {
 uno::Reference textDocument(mxComponent, 
uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 4eaa51823c24..407d3c36c17c 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -47,7 +47,7 @@ DomainMapperTableManager::DomainMapperTableManager() :
 m_nRow(0),
 m_nCell(),
 m_nGridSpan(1),
-m_nGridBefore(0),
+m_aGridBefore(),
 m_nGridAfter(0),
 m_nHeaderRepeat(0),
 m_nTableWidth(0),
@@ -347,7 +347,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
 }
 break;
 case NS_ooxml::LN_CT_TrPrBase_gridBefore:
-m_nGridBefore = nIntValue;
+m_aGridBefore.back( ) = nIntValue;
 break;
 case NS_ooxml::LN_CT_TrPrBase_gridAfter:
 m_nGridAfter = nIntValue;
@@ -387,6 +387,11 @@ std::shared_ptr< vector > const & 
DomainMapperTableManager::getCurren
 return m_aTableGrid.back( );
 }
 
+sal_uInt32 DomainMapperTableManager::getCurrentGridBefore( )
+{
+return m_aGridBefore.back( );
+}
+
 bool DomainMapperTableManager::hasCurrentSpans() const
 {
 return !m_aGridSpans.empty();
@@ -449,6 +454,7 @@ void DomainMapperTableManager::startLevel( )
 m_aTmpPosition.push_back( pTmpPosition );
 m_aTmpTableProperties.push_back( pTmpProperties );
 m_nCell.push_back( 0 );
+m_aGridBefore.push_back( 0 );
 m_nTableWidth = 0;
 m_nLayoutType = 0;
 
@@ -478,6 +484,7 @@ void DomainMapperTableManager::endLevel( )
 m_aCellWidths.back()->push_back(*oCurrentWidth);
 
 m_nCell.pop_back( );
+m_aGridBefore.pop_back( );
 m_nTableWidth = 0;
 m_nLayoutType = 0;
 
@@ -533,6 +540,7 @@ void DomainMapperTableManager::endOfRowAction()
 IntVectorPtr pTmpGridSpans = m_aGridSpans.back();
 IntVectorPtr pTmpCellWidths = m_aCellWidths.back();
 sal_uInt32 nTmpCell = m_nCell.back();
+sal_uInt32 nTmpGridBefore = m_aGridBefore.back();
 
 

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

[Noel Grandin (via logerrit)]

 vcl/source/window/window.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 32d3af216800555009c0f372615a446da54dc6e9
Author: Noel Grandin 
AuthorDate: Tue Jun 23 15:15:21 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 23 18:41:26 2020 +0200

fix commit "remove JSON node erasing"

this
commit 84881e32317765e7752d57fceac8d979dd801b8c
Author: Noel Grandin 
Date:   Fri Jun 19 16:17:25 2020 +0200
remove JSON node erasing
left some intermediate state behind

Change-Id: I3d14b3f14c56e2e866903ac7985aa1a5c09ce471
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96947
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 767beda066d9..c3baf5e6547c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -85,8 +85,6 @@ using namespace ::com::sun::star::datatransfer::dnd;
 
 namespace vcl {
 
-static bool g_isLOKMobilePhone = false;
-
 Window::Window( WindowType nType )
 : OutputDevice(OUTDEV_WINDOW)
 , mpWindowImpl(new WindowImpl( nType ))
@@ -3387,7 +3385,7 @@ boost::property_tree::ptree Window::DumpAsPropertyTree()
 // This is for the code in sc/source/ui/sidebar/AlignmentPropertyPanel.cxx.
 // Also see commit f27c6320e8496d690b5d341d3718430709263a1c
 // "lok: remove complex rotation / alignment settings"
-if (g_isLOKMobilePhone && get_id() == "textorientbox") {
+if (get_id() == "textorientbox") {
 return boost::property_tree::ptree();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 sc/source/core/data/table2.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8cad16207cb6d6df098d2a2f307df4fbc7519035
Author: Noel Grandin 
AuthorDate: Tue Jun 23 16:28:04 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 23 18:40:46 2020 +0200

tdf#133629 calc, crash on format borders on multiple sheets

regression from
commit 7282014e362a1529a36c88eb308df8ed359c2cfa
tdf#50916 Makes numbers of columns dynamic.

Change-Id: Ie862ec4a29d495c71aa3a21a1941f801fa3a789e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96957
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 75a4061ef784..8c52bd5a1a74 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2635,6 +2635,7 @@ void ScTable::ApplyBlockFrame(const SvxBoxItem& 
rLineOuter, const SvxBoxInfoItem
 {
 PutInOrder(nStartCol, nEndCol);
 PutInOrder(nStartRow, nEndRow);
+nEndCol = ClampToAllocatedColumns(nEndCol);
 for (SCCOL i=nStartCol; i<=nEndCol; i++)
 aCol[i].ApplyBlockFrame(rLineOuter, pLineInner,
 nStartRow, nEndRow, (i==nStartCol), 
nEndCol-i);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 7bfd24b8ee660661eb2635a3b5dc7c7516d9
Author: Olivier Hallot 
AuthorDate: Tue Jun 23 12:50:09 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Jun 23 17:50:09 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 1e9d89d3f606914d53a5d2d35a5ddb35223964c1
  - tdf#124010 Missing bookmark for adv database settings

Change-Id: Ibab5140c0095dbdc46fae02268b5c51e251be0b8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96783
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 3512ddac6810ba61d89e843c3b010d1354720deb)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96872
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 001120ca435b..1e9d89d3f606 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 001120ca435b5e3738644405e77651ae1159ded8
+Subproject commit 1e9d89d3f606914d53a5d2d35a5ddb35223964c1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-7-0' - source/text

[Olivier Hallot (via logerrit)]

 source/text/shared/explorer/database/dabaadvpropdat.xhp |   39 +++-
 1 file changed, 19 insertions(+), 20 deletions(-)

New commits:
commit 1e9d89d3f606914d53a5d2d35a5ddb35223964c1
Author: Olivier Hallot 
AuthorDate: Sat Jun 20 19:04:12 2020 -0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jun 23 17:50:09 2020 +0200

tdf#124010 Missing bookmark for adv database settings

Change-Id: Ibab5140c0095dbdc46fae02268b5c51e251be0b8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96783
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 3512ddac6810ba61d89e843c3b010d1354720deb)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96872
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/explorer/database/dabaadvpropdat.xhp 
b/source/text/shared/explorer/database/dabaadvpropdat.xhp
index b1e0f3664..399a8693d 100644
--- a/source/text/shared/explorer/database/dabaadvpropdat.xhp
+++ b/source/text/shared/explorer/database/dabaadvpropdat.xhp
@@ -18,8 +18,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-
-
 
   
  Special Settings
@@ -27,8 +25,10 @@
   


+ 
+ 
   
- Special 
Settings
+ Special 
Settings
  Specifies the way you can work with data in a 
database.
   
   
@@ -36,60 +36,59 @@
  
   
   The 
availability of the following controls depends on the type of 
database:
-  Use SQL92 naming constraintsUFI: found this for dBase and 
for text file folder
+  Use SQL92 naming constraintsUFI: found 
this for dBase and for text file folder
   Only allows characters that conform to the SQL92 naming convention in a 
name in a data source. All other characters are rejected. Each name must begin 
with a lowercase letter, an uppercase letter, or an underscore ( _ ). The 
remaining characters can be ASCII letters, numbers, and 
underscores.
   
-  Use keyword AS before table alias names
+  Use keyword AS before table alias names
   Some databases use the keyword "AS" between a name and its alias, while 
other databases use a whitespace. Enable this option to insert AS before the 
alias.http://dba.openoffice.org/specifications/Data_Source_Property_Dialog.sxw
 
-
   
-End 
text lines with CR + LFUFI: found for dBase and text file 
folder
+End text lines with CR + LFUFI: found for dBase 
and text file folder
   Select to use the CR + LF code pair to end every text line (preferred 
for DOS and Windows operating systems).
 
-Append 
the table alias name in SELECT statements
+Append the table alias name in SELECT statements
   Appends the alias to the table name in SELECT 
statements.
 
-Use 
Outer Join syntax '{OJ }'
+Use Outer Join syntax '{OJ }'
   Use escape sequences for outer joins. The syntax for this escape 
sequence is {oj outer-join}copied from 
shared\explorer\database\02010100.xhp
   Example:
   select 
Article.* from {oj item LEFT OUTER JOIN orders ON 
item.no=orders.ANR}
 
-Ignore 
the privileges from the database driver
+Ignore the privileges from the database driver
   Ignores access privileges that are provided by the database 
driver.
 
-Replace 
named parameters with ?
+Replace named parameters with ?
   Replaces named parameters in a data source with a question mark 
(?).
 
-Display 
version columns (when available)
+Display version columns (when available)
   Some 
databases assign version numbers to fields to track changes to records. The 
version number of a field is incremented by one each time the contents of the 
field are changed. Displays the internal version 
number of the record in the database table.copied from 
shared\explorer\database\1109.xhp
 
-Use the 
catalog name in SELECT statements
+Use the catalog name in SELECT statements
   Uses the current data source of the catalog. This option is useful when 
the ODBC data source is a database server. Do not select this option if the 
ODBC data source is a dBASE driver.copie from 
shared\explorer\database\1102.xhp
 
-Use the 
schema name in SELECT statements
+Use the schema name in SELECT statements
   Allows you to use the schema name in SELECT 
statements.UFI: ???
 
-Create 
index with ASC or DESC statement
+Create index with ASC or DESC statement
   Creates an index with ASC or DESC statements.UFI: 
???
 
-Comparison of Boolean values
+Comparison of Boolean values
   Select the type of Boolean comparison that you want to 
use.UFI: ???
 
-Form 
data input checks for required fieldsi82291
+Form data input checks for required 
fieldsi82291
   When you enter a new record or update an existing record in a form, and 
you leave a field empty which is bound to a database column which requires 
input, then you will see a message complaining about the empty 
field.
   If this 
contr

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

[Tor Lillqvist (via logerrit)]

 external/postgresql/UnpackedTarball_postgresql.mk |1 +
 external/postgresql/postgresql.exit.patch.0   |   19 +++
 2 files changed, 20 insertions(+)

New commits:
commit e69f547bce7de376a0af464c5f7af5e7d2c8784a
Author: Tor Lillqvist 
AuthorDate: Tue Jun 23 01:59:05 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jun 23 17:26:35 2020 +0200

Fix -Werror,-Wimplicit-function-declaration in posrgresql configury

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

diff --git a/external/postgresql/UnpackedTarball_postgresql.mk 
b/external/postgresql/UnpackedTarball_postgresql.mk
index a7e57ab93301..a53bbbffdb9b 100644
--- a/external/postgresql/UnpackedTarball_postgresql.mk
+++ b/external/postgresql/UnpackedTarball_postgresql.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,postgresql, \
external/postgresql/postgresql-libs-leak.patch \
external/postgresql/postgresql-9.2.1-libreoffice.patch \
external/postgresql/windows.patch.0 \
+   external/postgresql/postgresql.exit.patch.0 \
 ))
 
 ifeq ($(SYSTEM_ZLIB),)
diff --git a/external/postgresql/postgresql.exit.patch.0 
b/external/postgresql/postgresql.exit.patch.0
new file mode 100644
index ..fe9bdcca8569
--- /dev/null
+++ b/external/postgresql/postgresql.exit.patch.0
@@ -0,0 +1,19 @@
+# error: implicitly declaring library function 'exit' with type 'void (int) 
__attribute__((noreturn))' [-Werror,-Wimplicit-function-declaration]
+--- configure
 configure
+@@ -24565,6 +24565,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include 
+ typedef long int ac_int64;
+ 
+ /*
+@@ -24702,6 +24702,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include 
+ typedef long int ac_int64;
+ 
+ /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 external/nss/UnpackedTarball_nss.mk |1 +
 external/nss/nss.getopt.patch.0 |   25 +
 2 files changed, 26 insertions(+)

New commits:
commit 70848c7e5ab2035aa7727fa97492e4535fd6937e
Author: Tor Lillqvist 
AuthorDate: Tue Jun 23 01:19:23 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jun 23 17:26:18 2020 +0200

Add getopt declarations

Avoids: implicit declaration of function 'getopt' is invalid in C99
[-Werror,-Wimplicit-function-declaration].

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

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 8801c7cdad63..54119b9c2d9b 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss.bzmozilla1238154.patch \
 external/nss/macos-dlopen.patch.0 \
 external/nss/nss.nspr-parallel-win-debug_build.patch \
+   external/nss/nss.getopt.patch.0 \
 $(if $(filter iOS,$(OS)), \
 external/nss/nss-ios.patch) \
 $(if $(filter ANDROID,$(OS)), \
diff --git a/external/nss/nss.getopt.patch.0 b/external/nss/nss.getopt.patch.0
new file mode 100644
index ..aeabb33f9b97
--- /dev/null
+++ b/external/nss/nss.getopt.patch.0
@@ -0,0 +1,25 @@
+# pr/tests/sel_spd.c:427:20: error: implicit declaration of function 'getopt' 
is invalid in C99 [-Werror,-Wimplicit-function-declaration]
+--- nspr/pr/tests/sel_spd.c
 nspr/pr/tests/sel_spd.c
+@@ -15,6 +15,9 @@
+ #include 
+ #include 
+ #include 
++
++extern char *optarg;
++int getopt(int argc, char *const argv[], const char *optstring);
+ 
+ #ifdef DEBUG
+ #define PORT_INC_DO +100
+--- nspr/pr/tests/testfile.c
 nspr/pr/tests/testfile.c
+@@ -23,6 +23,9 @@
+ #include 
+ #include 
+ #endif /* XP_OS2 */
++
++extern char *optarg;
++int getopt(int argc, char *const argv[], const char *optstring);
+ 
+ static int _debug_on = 0;
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-5.4' - sw/CppunitTest_sw_uibase_shells.mk sw/Module_sw.mk sw/qa sw/source

[Miklos Vajna (via logerrit)]

 sw/CppunitTest_sw_uibase_shells.mk   |   73 ++
 sw/Module_sw.mk  |1 
 sw/qa/uibase/shells/data/ole-save-preview-update.odt |binary
 sw/qa/uibase/shells/shells.cxx   |   95 +++
 sw/source/uibase/shells/basesh.cxx   |4 
 5 files changed, 173 insertions(+)

New commits:
commit 50383c547f440ee28680d5e10c074884648747dc
Author: Miklos Vajna 
AuthorDate: Tue Jun 23 10:31:05 2020 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 23 17:03:31 2020 +0200

sw: fix missing OLE preview on updating links

Regression from commit 74844277cc2194c9e43f5bd7a6f78a9603da32f3 (disable
generation of ole previews in ODF format until after load, 2016-09-13),
if the document has charts without previews, it's loaded, fields are
updated and saved, we no longer generate those previews.

Given that Tools -> Update -> Update all is always an explicit user
action, restore the permission to update OLE previews / links before
performing the actual update.

With this, comphelper::EmbeddedObjectContainer::StoreAsChildren() will
generate those missing previews inside the getUserAllowsLinkUpdate()
conditional block.

(cherry picked from commit 2aad85f84235f362604b5fd385bb77de839d2014)

Conflicts:
sw/qa/uibase/shells/shells.cxx

Change-Id: Ib54e06a2e2f2e1c65951fdec302e59e63c71d008

diff --git a/sw/CppunitTest_sw_uibase_shells.mk 
b/sw/CppunitTest_sw_uibase_shells.mk
new file mode 100644
index ..1e79b0a17387
--- /dev/null
+++ b/sw/CppunitTest_sw_uibase_shells.mk
@@ -0,0 +1,73 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_uibase_shells))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_uibase_shells))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_uibase_shells, \
+sw/qa/uibase/shells/shells \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_uibase_shells, \
+comphelper \
+cppu \
+cppuhelper \
+editeng \
+sal \
+sfx \
+svl \
+svx \
+svxcore \
+sw \
+test \
+unotest \
+utl \
+vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_uibase_shells,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_uibase_shells,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
+-I$(SRCDIR)/sw/qa/extras/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_uibase_shells,\
+   udkapi \
+   offapi \
+   oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_uibase_shells))
+$(eval $(call gb_CppunitTest_use_vcl,sw_uibase_shells))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_uibase_shells,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_uibase_shells,\
+officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_uibase_shells))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_uibase_shells, \
+modules/swriter \
+))
+
+$(eval $(call gb_CppunitTest_use_more_fonts,sw_uibase_shells))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 6560faab37ae..6a017917725d 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_mailmerge \
 CppunitTest_sw_globalfilter \
 CppunitTest_sw_unowriter \
+CppunitTest_sw_uibase_shells \
 ))
 
 ifneq ($(ENABLE_HEADLESS),TRUE)
diff --git a/sw/qa/uibase/shells/data/ole-save-preview-update.odt 
b/sw/qa/uibase/shells/data/ole-save-preview-update.odt
new file mode 100644
index ..353ce7fa050c
Binary files /dev/null and 
b/sw/qa/uibase/shells/data/ole-save-preview-update.odt differ
diff --git a/sw/qa/uibase/shells/shells.cxx b/sw/qa/uibase/shells/shells.cxx
new file mode 100644
index ..c0f1b18a3298
--- /dev/null
+++ b/sw/qa/uibase/shells/shells.cxx
@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include

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

[Regina Henschel (via logerrit)]

 oox/source/drawingml/lineproperties.cxx |   24 -
 oox/source/export/drawingml.cxx |   49 
 sd/qa/unit/data/pptx/tdf134053_dashdot.pptx |binary
 sd/qa/unit/uiimpress.cxx|   34 +++
 4 files changed, 91 insertions(+), 16 deletions(-)

New commits:
commit 1cbdc101c72309a97e9ee09c77f4fd36fbd71314
Author: Regina Henschel 
AuthorDate: Sat Jun 20 15:08:12 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jun 23 16:58:18 2020 +0200

tdf#134053 tweak dash and space length for ooxml

OOXML does not specify how line caps are applied to dashes. MS Office
keeps dash and space length for preset dash styles and for round
custom dash styles and add them for square line caps on custom dash
styles. ODF specifies, that the linecaps are added to the dashes and
the spaces are reduced, so that the dash-space pair keeps its length.

This patch changes the dash and space length on import and export so,
that they look nearly the same in LibreOffice as in MS Office.

For custom dash styles with square line cap the first dash is longer
as in MS Office. I have no solution for that. But I consider it as
minor problem, because MS Office has not even an UI for that case. It
should not hinder the improvement for the usual cases.

Change-Id: I3e3e4b7c9d71e440ed301d2be423100440cb688b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96769
Tested-by: Jenkins
Reviewed-by: Regina Henschel 
(cherry picked from commit 3f3b50015e4fd9efc3459612a70409fca49cf390)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96796
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/oox/source/drawingml/lineproperties.cxx 
b/oox/source/drawingml/lineproperties.cxx
index 3183d5ce4c24..451da4c6aa26 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -443,6 +443,11 @@ void LineProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 sal_Int32 nLineWidth = getLineWidth(); // includes conversion from EMUs to 
1/100mm
 rPropMap.setProperty( ShapeProperty::LineWidth, nLineWidth );
 
+// line cap type
+LineCap eLineCap = moLineCap.has() ? lclGetLineCap( moLineCap.get() ) : 
LineCap_BUTT;
+if( moLineCap.has() )
+rPropMap.setProperty( ShapeProperty::LineCap, eLineCap );
+
 // create line dash from preset dash token or dash stop vector (not for 
invisible line)
 if( (eLineStyle != drawing::LineStyle_NONE) && (moPresetDash.differsFrom( 
XML_solid ) || !maCustomDash.empty()) )
 {
@@ -456,12 +461,25 @@ void LineProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 lclConvertCustomDash(aLineDash, maCustomDash);
 lclRecoverStandardDashStyles(aLineDash, nLineWidth);
 }
+
+// In MS Office (2020) for preset dash style line caps round and 
square are included in dash length.
+// For custom dash style round line cap is included, square line cap 
is added. In ODF line caps are
+// always added to dash length. Tweak the length accordingly.
+if (eLineCap == LineCap_ROUND || (eLineCap == LineCap_SQUARE && 
maCustomDash.empty()))
+{
+// Cannot use -100 because that results in 0 length in some cases 
and
+// LibreOffice interprets 0 length as 100%.
+if (aLineDash.DotLen >= 100 || aLineDash.DashLen >= 100)
+aLineDash.Distance += 99;
+if (aLineDash.DotLen >= 100)
+aLineDash.DotLen -= 99;
+if (aLineDash.DashLen >= 100)
+aLineDash.DashLen -= 99;
+}
+
 if( rPropMap.setProperty( ShapeProperty::LineDash, aLineDash ) )
 eLineStyle = drawing::LineStyle_DASH;
 }
-// line cap type
-if( moLineCap.has() )
-rPropMap.setProperty( ShapeProperty::LineCap, lclGetLineCap( 
moLineCap.get() ) );
 
 // set final line style property
 rPropMap.setProperty( ShapeProperty::LineStyle, eLineStyle );
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index f14129d0a2e8..607db7a33ae7 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -733,10 +733,11 @@ void DrawingML::WriteLineArrow( const Reference< 
XPropertySet >& rXPropSet, bool
 void DrawingML::WriteOutline( const Reference& rXPropSet, 
Reference< frame::XModel > const & xModel )
 {
 drawing::LineStyle aLineStyle( drawing::LineStyle_NONE );
-
 if (GetProperty(rXPropSet, "LineStyle"))
 mAny >>= aLineStyle;
 
+const LineCap aLineCap = GetProperty(rXPropSet, "LineCap") ? 
mAny.get() : LineCap_BUTT;
+
 sal_uInt32 nLineWidth = 0;
 sal_uInt32 nEmuLineWidth = 0;
 ::Color nColor;
@@ -747,6 +748,7 @@ void DrawingML::WriteOutline( const 
Reference& rXPropSet, Referenc
 bool bDashSet = false;
 bool bNoFill = false;
 
+
 // get InteropGrabBag 

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

[Stephan Bergmann (via logerrit)]

 binaryurp/source/bridge.cxx |   21 +++--
 1 file changed, 19 insertions(+), 2 deletions(-)

New commits:
commit ba86099d3c4804cc7e0958c9a89fbdee29456ecf
Author: Stephan Bergmann 
AuthorDate: Tue Jun 23 14:53:02 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jun 23 16:39:58 2020 +0200

HACK to decouple URP release calls from all other threads

Abandoned  "Don't call out to UNO 
with
SolarMutex locked" documents a deadlock where a synchronous
documentEventOccurred call made with SolarMutex locked evokes an 
asynchronous
release call back (serviced on a different physical thread, but which 
blocks the
original thread) that then wants to acquire the SolarMutex.  While we 
usually
appear to get away with wrapping those UNO calls in SolarMutexReleaser 
(though
knowing all too well that that is nothing but a bad hack that may well cause
crashes and deadlocks at least in theory), the place in
SfxBaseModel::postEvent_Impl was obviously too sensitive for that hack:  It 
did
cause enough different crashes (e.g., hitting

  assert(pSchedulerData == pMostUrgent);

in Scheduler::ProcessTaskScheduling, vcl/source/app/scheduler.cxx) and 
deadlocks
(e.g., different threads now taking the SolarMutex and JobExecutor's mutex 
in
framework/source/jobs/jobexecutor.cxx in different orders) to make me 
search for
a different "fix", so I came up with this hack instead.

Change-Id: Icd26926279cb86ce529edb4544a3ec0bc9a8b108
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96946
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 99e6cafd6f9f..2534dfa1a873 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -976,9 +976,26 @@ void Bridge::sendProtPropRequest(
 void Bridge::makeReleaseCall(
 OUString const & oid, css::uno::TypeDescription const & type)
 {
-AttachThread att(getThreadPool());
+//HACK to decouple the processing of release calls from all other threads. 
 Normally, sending
+// the release request should use the current thread's TID (via 
AttachThread), so that that
+// asynchronous request would be processed by a physical thread that is 
paired with the physical
+// thread processing the normal synchronous call stack (see 
ThreadIdHashMap in
+// cppu/source/threadpool/threadpool.hxx).  However, that can lead to 
deadlock when a thread
+// illegally makes a synchronous UNO call with the SolarMutex locked (e.g.,
+// SfxBaseModel::postEvent_Impl in sfx2/source/doc/sfxbasemodel.cxx doing 
documentEventOccurred
+// and notifyEvent calls), and while that call is on the stack the remote 
side sends back some
+// release request on the same logical UNO thread for an object that wants 
to acquire the
+// SolarMutex in its destructor (e.g., SwXTextDocument in 
sw/inc/unotxdoc.hxx holding its
+// m_pImpl via an sw::UnoImplPtr).  While the correct approach would be to 
not make UNO calls
+// with the SolarMutex (or any other mutex) locked, fixing that would 
probably be a heroic
+// effort.  So for now live with this hack, hoping that it does not 
introduce any new issues of
+// its own:
+static auto const tid = [] {
+static sal_Int8 const id[] = {'r', 'e', 'l', 'e', 'a', 's', 'e', 
'h', 'a', 'c', 'k'};
+return rtl::ByteSequence(id, SAL_N_ELEMENTS(id));
+}();
 sendRequest(
-att.getTid(), oid, type,
+tid, oid, type,
 css::uno::TypeDescription("com.sun.star.uno.XInterface::release"),
 std::vector< BinaryAny >());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/undo/undel.cxx |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit b3b25dfd6cb963c496a4f7b8d0746f1dfb1801f4
Author: Michael Stahl 
AuthorDate: Thu Jun 18 14:19:12 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jun 23 16:34:42 2020 +0200

tdf#134021 sw_redlinehide: fix crash if document contains only table

This sets the m_bTableDelLastNd flag in SwUndoDelete, so a SwTextNode is
created so that there's something in the document, and there are 2
problems with Undo:

1. ~SwIndexReg assert because there's a shell cursor on the text node;
   could fix this with some PaMCorrAbs() but let's just call
   DelFullPara() which takes care of that.
   (this likely isn't possible in the !m_bTableDelLastNd case)

2. no frames are created in MakeFrames() because there's no node in the
   document with layout frames, so delete it at the end.
   (regression from 723728cd358693b8f4bc9d913541aa4479f2bd48)

Change-Id: I6d8535ae1a2e607d665660f149b344e817bc8ab0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96604
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 5d836621326c68decaae09f1911d2d036a251b43)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96632
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 139bf8208a7f59b742afac0eefb60e2e73316145)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96808
Reviewed-by: Xisco Fauli 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index c9dc7fdae063..b66c5ba2e5fc 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -851,6 +851,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & 
rContext)
 SwPosition aPos( aIdx );
 if( !m_bDelFullPara )
 {
+assert(!m_bTableDelLastNd || pInsNd->IsTextNode());
 if( pInsNd->IsTableNode() )
 {
 pInsNd = rDoc.GetNodes().MakeTextNode( aIdx,
@@ -1037,8 +1038,11 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & 
rContext)
 }
 }
 // delete the temporarily added Node
-if( pInsNd )
+if (pInsNd && !m_bTableDelLastNd)
+{
+assert(&aIdx.GetNode() == pInsNd);
 rDoc.GetNodes().Delete( aIdx );
+}
 if( m_pRedlSaveData )
 SetSaveData(rDoc, *m_pRedlSaveData);
 
@@ -,6 +1115,15 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & 
rContext)
 lcl_MakeAutoFrames(*rDoc.GetSpzFrameFormats(), pMovedNode->GetIndex());
 }
 
+// tdf#134021 only after MakeFrames(), because it may be the only node
+// that has layout frames
+if (pInsNd && m_bTableDelLastNd)
+{
+assert(&aIdx.GetNode() == pInsNd);
+SwPaM tmp(aIdx, aIdx);
+rDoc.getIDocumentContentOperations().DelFullPara(tmp);
+}
+
 AddUndoRedoPaM(rContext, true);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 include/svx/svdpage.hxx   |3 +--
 svx/source/svdraw/svdpage.cxx |   29 +
 2 files changed, 10 insertions(+), 22 deletions(-)

New commits:
commit 4c7a3286fd05b1939acb45b2333c1ee927b0d4db
Author: Noel Grandin 
AuthorDate: Tue Jun 23 14:01:00 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 23 16:28:43 2020 +0200

inline typedef WeakSdrObjectContainerType

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

diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 7d55b0fab697..d2fd71482476 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -226,10 +226,9 @@ public:
 virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
 private:
-class WeakSdrObjectContainerType;
 /// This list, if it exists, defines the navigation order. If it does
 /// not exist then maList defines the navigation order.
-std::unique_ptr mxNavigationOrder;
+std::unique_ptr>> 
mxNavigationOrder;
 
 /// This flag is  when the mpNavigation list has been changed but
 /// the indices of the referenced SdrObjects still have their old values.
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 734becaf3c7d..489e20653fad 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -55,14 +55,6 @@
 
 using namespace ::com::sun::star;
 
-class SdrObjList::WeakSdrObjectContainerType
-: public ::std::vector>
-{
-public:
-explicit WeakSdrObjectContainerType (const sal_Int32 nInitialSize)
-: ::std::vector>(nInitialSize) {};
-};
-
 static const sal_Int32 InitialObjectContainerCapacity (64);
 
 

@@ -841,11 +833,8 @@ void SdrObjList::SetObjectNavigationPosition (
 // maList.
 if (mxNavigationOrder == nullptr)
 {
-mxNavigationOrder.reset(new WeakSdrObjectContainerType(maList.size()));
-::std::copy(
-maList.begin(),
-maList.end(),
-mxNavigationOrder->begin());
+mxNavigationOrder.reset(new 
std::vector>(maList.begin(),
+maList.end()));
 }
 OSL_ASSERT(mxNavigationOrder != nullptr);
 OSL_ASSERT( mxNavigationOrder->size() == maList.size());
@@ -853,10 +842,10 @@ void SdrObjList::SetObjectNavigationPosition (
 tools::WeakReference aReference (&rObject);
 
 // Look up the object whose navigation position is to be changed.
-WeakSdrObjectContainerType::iterator iObject (::std::find(
+auto iObject = ::std::find(
 mxNavigationOrder->begin(),
 mxNavigationOrder->end(),
-aReference));
+aReference);
 if (iObject == mxNavigationOrder->end())
 {
 // The given object is not a member of the navigation order.
@@ -950,7 +939,7 @@ void SdrObjList::SetNavigationOrder (const 
uno::Reference>(nCount));
 
 for (sal_Int32 nIndex=0; nIndex aReference (maList[nObjectPosition]);
-WeakSdrObjectContainerType::iterator iObject (::std::find(
+auto iObject = ::std::find(
 mxNavigationOrder->begin(),
 mxNavigationOrder->end(),
-aReference));
+aReference);
 if (iObject != mxNavigationOrder->end())
 mxNavigationOrder->erase(iObject);
 
@@ -1044,10 +1033,10 @@ void SdrObjList::RemoveObjectFromContainer (
 if (HasObjectNavigationOrder())
 {
 tools::WeakReference aReference (maList[nObjectPosition]);
-WeakSdrObjectContainerType::iterator iObject (::std::find(
+auto iObject = ::std::find(
 mxNavigationOrder->begin(),
 mxNavigationOrder->end(),
-aReference));
+aReference);
 if (iObject != mxNavigationOrder->end())
 mxNavigationOrder->erase(iObject);
 mbIsNavigationOrderDirty = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szabolcs Toth (via logerrit)]

 
sw/qa/extras/ooxmlexport/data/tdf132976_testRelativeAnchorWidthFromLeftMargin.docx
 |binary
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx  
|   14 ++
 sw/source/core/layout/anchoreddrawobject.cxx   
|   13 ++---
 writerfilter/source/dmapper/GraphicImport.cxx  
|   10 +++
 4 files changed, 33 insertions(+), 4 deletions(-)

New commits:
commit 7380905abc0833d9e4c4fe731d76174db8a8724c
Author: Szabolcs Toth 
AuthorDate: Thu Jun 4 15:43:42 2020 +0200
Commit: László Németh 
CommitDate: Tue Jun 23 16:20:13 2020 +0200

tdf#132976 DOCX import: fix shape width relative to left margin

using UNO API RelativeWidthRelation and the associated
lo-ext attribute for OpenDocument export.

See commit 43d7f4e3640c5e370fd1204739c2b0c7eb5f40e4
(offapi: document the 4 new properties which are no longer read-only).

Co-authored-by: Balázs Regényi

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

diff --git 
a/sw/qa/extras/ooxmlexport/data/tdf132976_testRelativeAnchorWidthFromLeftMargin.docx
 
b/sw/qa/extras/ooxmlexport/data/tdf132976_testRelativeAnchorWidthFromLeftMargin.docx
new file mode 100644
index ..2f1c5560c17a
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf132976_testRelativeAnchorWidthFromLeftMargin.docx
 differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 336e99b26507..4c6428321792 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -1155,6 +1155,20 @@ DECLARE_OOXMLEXPORT_TEST(testShapeLineWidth, 
"tdf92526_ShapeLineWidth.odt")
 "/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln", "w", "0");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorWidthFromLeftMargin, 
"tdf132976_testRelativeAnchorWidthFromLeftMargin.docx")
+{
+// TODO: Fix export.
+if (mbExported)
+return;
+
+// tdf#132976 The size of the width of this shape should come from the 
size of the left margin.
+// It was set to the size of the width of the entire page before.
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+const sal_Int32 nAnchoredWidth
+= getXPath(pXmlDoc, "//SwAnchoredDrawObject/bounds", 
"width").toInt32();
+CPPUNIT_ASSERT_EQUAL(static_cast(1133), nAnchoredWidth);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx 
b/sw/source/core/layout/anchoreddrawobject.cxx
index 5f60d769a44a..4789ae807239 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -632,13 +632,18 @@ SwRect SwAnchoredDrawObject::GetObjBoundRect() const
 long nTargetWidth = aCurrObjRect.GetWidth( );
 if ( GetDrawObj( )->GetRelativeWidth( ) )
 {
-tools::Rectangle aPageRect;
+long nWidth = 0;
 if (GetDrawObj()->GetRelativeWidthRelation() == 
text::RelOrientation::FRAME)
 // Exclude margins.
-aPageRect = GetPageFrame()->getFramePrintArea().SVRect();
+nWidth = 
GetPageFrame()->getFramePrintArea().SVRect().GetWidth();
+// Here we handle the relative size of the width of some shape.
+// The size of the shape's width is going to be relative to the 
size of the left margin.
+// E.g.: (left margin = 8 && relative size = 150%) -> width of 
some shape = 12.
+else if (GetDrawObj()->GetRelativeWidthRelation() == 
text::RelOrientation::PAGE_LEFT)
+nWidth = GetPageFrame()->GetLeftMargin();
 else
-aPageRect = GetPageFrame( )->GetBoundRect( 
GetPageFrame()->getRootFrame()->GetCurrShell()->GetOut() ).SVRect();
-nTargetWidth = aPageRect.GetWidth( ) * (*GetDrawObj( 
)->GetRelativeWidth());
+nWidth = GetPageFrame( )->GetBoundRect( 
GetPageFrame()->getRootFrame()->GetCurrShell()->GetOut() ).SVRect().GetWidth();
+nTargetWidth = nWidth * (*GetDrawObj( )->GetRelativeWidth());
 }
 
 long nTargetHeight = aCurrObjRect.GetHeight( );
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 5155e2f61211..700fb6ca34a8 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -945,6 +945,16 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
 
xPropertySet->setPropertyValue("RelativeWidthRelation", 
uno::makeAny(text::RelOrientation::FRAME));
 }
 break;
+case NS_ooxml::LN_ST_SizeRelFromH_leftMargin:
+  

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - helpcontent2

[Adolfo Jayme Barrientos (via logerrit)]

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

New commits:
commit 19bcccaccb11678c798c08cde07e944a0edddae2
Author: Adolfo Jayme Barrientos 
AuthorDate: Tue Jun 23 09:11:29 2020 -0500
Commit: Gerrit Code Review 
CommitDate: Tue Jun 23 16:11:29 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 001120ca435b5e3738644405e77651ae1159ded8
  - Update CSS box colors to match new Colibre

Change-Id: I5ed9fdcad79fc34032e6c8d1536aaaf12d32e177
(cherry picked from commit 47b0c69b0a1cefe027366d6e01f4f14470edaa2f)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96952
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 96bbdcf58f52..001120ca435b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 96bbdcf58f52d054eca60eb651638ffb131e6da7
+Subproject commit 001120ca435b5e3738644405e77651ae1159ded8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-7-0' - help3xsl/default.css

[Adolfo Jayme Barrientos (via logerrit)]

 help3xsl/default.css |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 001120ca435b5e3738644405e77651ae1159ded8
Author: Adolfo Jayme Barrientos 
AuthorDate: Tue Jun 23 08:59:52 2020 -0500
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jun 23 16:11:29 2020 +0200

Update CSS box colors to match new Colibre

Change-Id: I5ed9fdcad79fc34032e6c8d1536aaaf12d32e177
(cherry picked from commit 47b0c69b0a1cefe027366d6e01f4f14470edaa2f)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96952
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 69a2b0705..8030eb599 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -158,16 +158,16 @@ pre,
 margin-top: 15px;
 }
 .note {
-border-left: 4px solid #61897C;
-background-color: #D9E7E2;
+border-left: 3px solid #309048;
+background-color: #d9f1dd;
 }
 .tip {
-border-left: 4px solid #4866AD;
-background-color: #CDD5E8;
+border-left: 3px solid #0063b1;
+background-color: #cde5f7;
 }
 .warning {
-border-left: 4px solid #D5B177;
-background-color: #F9EEDC;
+border-left: 3px solid #ed8733;
+background-color: #f6f1d2;
 }
 .noteicon, .notetext {
 padding:0.3em;
@@ -253,7 +253,7 @@ h6 {
 }
 .howtoget {
 background: #EBE7E9;
-border-left: 4px solid #4E4B55;
+border-left: 3px solid #4E4B55;
 border-radius: 0 4px 4px 0;
 box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2);
 padding: 0.3em;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-5' - sw/qa sw/source writerfilter/source

[Vasily Melenchuk (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf120394.docx |binary
 sw/qa/extras/ooxmlexport/data/tdf132754.docx |binary
 sw/qa/extras/ooxmlexport/data/tdf83309.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx   |   55 ++
 sw/qa/extras/rtfimport/rtfimport.cxx |5 -
 sw/source/core/doc/number.cxx|7 +
 sw/source/core/text/txttab.cxx   |   10 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |2 
 sw/source/filter/ww8/wrtw8num.cxx|   32 
 writerfilter/source/dmapper/NumberingManager.cxx |   90 ---
 writerfilter/source/dmapper/NumberingManager.hxx |9 +-
 11 files changed, 131 insertions(+), 79 deletions(-)

New commits:
commit 3c09eb16f4e0dea47839adbef66584a6e7bbca63
Author: Vasily Melenchuk 
AuthorDate: Fri May 15 18:36:08 2020 +0300
Commit: Miklos Vajna 
CommitDate: Tue Jun 23 16:10:01 2020 +0200

fix tdf#83309 tdf#120394 tdf#132754: squashed fix backport

SW DOCX import: list import fixes

These changes are already in 6.4, 7.0 branch and
are resolving set of bugs and regressions related
to DOCX lists support.

This is a combination of 4 commits.

tdf#120394: docx import: support for w:styleLink

Previous implementation for w:numStyleLink was referring
just ordinal styles, but there can be another abstract
list marked with w:styleLink which should be used in
given context.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94332
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95892

tdf#132754: DOCX import: changed default list start nubmer

Default value for list numbering startAt is zero. If it is not
proveded numbering starts from this value.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93899
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit f8211e84a5239de25fe6dc45a4bb6b6f8673a1ee)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96048

tdf#120394: DOCX list import: simplify zero width space hack

Since introducion of list format string hack with creation
of zero-width-space can be much more simple. It was being
used to indicate existing, but empty list label suffix to
avoid stripping down numbering.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94383
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95346

tdf#83309: docx import: allow for lists tabstop at zero position

Zero position is valid value for tabstop, but previously it was
treated as "no tab stop defined". Right now writer distinguishes
tab stop at zero postion and no tab stop.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95132
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit d2e428d1abb9f2907c0b87d55830e8742f8209b9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95561
(cherry picked from commit a380a06c1872091e8fa8c810e95a8e1d5dfe1820)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96178
Change-Id: I9717058e450282dfd3ee84b839f8ec9868787196
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96391
Tested-by: Thorsten Behrens 
Reviewed-by: Michael Stahl 
Reviewed-by: Vasily Melenchuk 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf120394.docx 
b/sw/qa/extras/ooxmlexport/data/tdf120394.docx
new file mode 100644
index ..39bd5886c0fe
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf120394.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf132754.docx 
b/sw/qa/extras/ooxmlexport/data/tdf132754.docx
new file mode 100644
index ..baec54f5e0d7
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf132754.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf83309.docx 
b/sw/qa/extras/ooxmlexport/data/tdf83309.docx
new file mode 100644
index ..8dfddb6ed201
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf83309.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index f410c889375d..c9d8ed8b24aa 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -237,6 +237,20 @@ DECLARE_OOXMLIMPORT_TEST(testTdf125038c, "tdf125038c.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("email: t...@test.test"), aActual);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf83309, "tdf83309.docx")
+{
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+OUString sNodeType;
+
+// First paragraph does not have tab before
+sNodeType = parseDump("/root/page/body/txt[1]/Text[1]", "nType");
+CPPUNIT_ASSERT_EQUAL(OUString("PortionType::Text"), sNodeType);
+
+// Second paragraph sta

[Libreoffice-commits] core.git: dbaccess/source xmlsecurity/CppunitTest_xmlsecurity_signing.mk xmlsecurity/qa

[Samuel Mehrbrodt (via logerrit)]

 dbaccess/source/core/dataaccess/ModelImpl.cxx  |   11 -
 xmlsecurity/CppunitTest_xmlsecurity_signing.mk |1 
 xmlsecurity/qa/unit/signing/data/odb_signed_macros.odb |binary
 xmlsecurity/qa/unit/signing/signing2.cxx   |  124 +
 4 files changed, 132 insertions(+), 4 deletions(-)

New commits:
commit 29cb36cbee9c3ff5e73bc7a6d6a2f365c5c62da7
Author: Samuel Mehrbrodt 
AuthorDate: Thu May 7 12:03:48 2020 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue Jun 23 16:06:55 2020 +0200

tdf#97694 Add test for macro signature preservation in Base

Change-Id: I35fb8d499eed66f9a5e208a4778a1f0f12637079
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93630
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx 
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 2fae3b051ba6..e54712ff9ae5 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -848,14 +848,17 @@ bool 
ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference<
 aTempFile.EnableKillingFile();
 OUString sTmpFileUrl = aTempFile.GetURL();
 SignatureState aSignatureState = getScriptingSignatureState();
-if (aSignatureState == SignatureState::OK
-|| aSignatureState == SignatureState::NOTVALIDATED
-|| aSignatureState == SignatureState::INVALID)
+OUString sLocation = getDocFileLocation();
+bool bIsEmbedded = sLocation.startsWith("vnd.sun.star.pkg:") && 
sLocation.endsWith("/EmbeddedDatabase");
+if (!bIsEmbedded && !sLocation.isEmpty()
+&& (aSignatureState == SignatureState::OK || aSignatureState == 
SignatureState::NOTVALIDATED
+|| aSignatureState == SignatureState::INVALID
+|| aSignatureState == SignatureState::UNKNOWN))
 {
 bTryToPreserveScriptSignature = true;
 // We need to first save the file (which removes the macro signature), 
then add the macro signature again.
 // For that, we need a temporary copy of the original file.
-osl::File::RC rc = osl::File::copy(getDocFileLocation(), sTmpFileUrl);
+osl::File::RC rc = osl::File::copy(sLocation, sTmpFileUrl);
 if (rc != osl::FileBase::E_None)
 throw uno::RuntimeException("Could not create temp file");
 }
diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk 
b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
index 11a00d0482b4..584bcf1c4ab6 100644
--- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
+++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,xmlsecurity_signing))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,xmlsecurity_signing, \
xmlsecurity/qa/unit/signing/signing \
+   xmlsecurity/qa/unit/signing/signing2 \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_signing, \
diff --git a/xmlsecurity/qa/unit/signing/data/odb_signed_macros.odb 
b/xmlsecurity/qa/unit/signing/data/odb_signed_macros.odb
new file mode 100644
index ..3e90f4514599
Binary files /dev/null and 
b/xmlsecurity/qa/unit/signing/data/odb_signed_macros.odb differ
diff --git a/xmlsecurity/qa/unit/signing/signing2.cxx 
b/xmlsecurity/qa/unit/signing/signing2.cxx
new file mode 100644
index ..90a8f3b1e6ef
--- /dev/null
+++ b/xmlsecurity/qa/unit/signing/signing2.cxx
@@ -0,0 +1,124 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace css;
+
+namespace
+{
+char const DATA_DIRECTORY[] = "/xmlsecurity/qa/unit/signing/data/";
+}
+
+/// Testsuite for the document signing feature.
+class SigningTest2 : public test::BootstrapFixture, public 
unotest::MacrosTest, public XmlTestTools
+{
+protected:
+uno::Reference mxComponent;
+uno::Reference mxSEInitializer;
+uno::Reference mxSecurityContext;
+
+public:
+SigningTest2();
+virtual void setUp() override;
+virtual void tearDown() override;
+void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) override;
+};
+
+SigningTest2::SigningTest2() {}
+
+void SigningTest2::setUp()
+{
+test::BootstrapFixture::setUp();
+
+// Initialize crypto after setting up the environment variables.
+mxDesktop.set(frame::Desktop::create(mxComponentContext));
+}
+
+void SigningTest2::tearDown()
+{
+if (mxComponent.is())
+mxComponent->dispose();
+
+test::BootstrapFixture::tearDown();
+}
+
+/// Test if a macro signature from a ODF

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

[Vasily Melenchuk (via logerrit)]

 sw/source/core/text/txtfld.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 5ed96c798679a1613b058a11b30cce4ba0ffd920
Author: Vasily Melenchuk 
AuthorDate: Tue Jun 23 08:45:54 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Tue Jun 23 16:05:24 2020 +0200

tdf#83309: sw: do not create bullet with no char

On some machines (depending on fonts installed) creation
of SwBulletPortion with bullet = \0 leads to drawing
a bullet as a empty rectangle.

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

diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index ed52fbca1707..6e0e6f33decb 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -649,11 +649,14 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( 
SwTextFormatInfo &rInf ) con
 lcl_setRedlineAttr( rInf, *pTextNd, pNumFnt );
 
 // --> OD 2008-01-23 #newlistelevelattrs#
-pRet = new SwBulletPortion( rNumFormat.GetBulletChar(),
-pTextNd->GetLabelFollowedBy(),
-std::move(pNumFnt),
-bLeft, bCenter, nMinDist,
-
bLabelAlignmentPosAndSpaceModeActive );
+if (rNumFormat.GetBulletChar())
+{
+pRet = new SwBulletPortion(rNumFormat.GetBulletChar(),
+pTextNd->GetLabelFollowedBy(),
+std::move(pNumFnt),
+bLeft, bCenter, nMinDist,
+bLabelAlignmentPosAndSpaceModeActive);
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Adolfo Jayme Barrientos (via logerrit)]

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

New commits:
commit 234096e1d16771e1a62a2ec6c71196316716ef61
Author: Adolfo Jayme Barrientos 
AuthorDate: Tue Jun 23 09:00:39 2020 -0500
Commit: Gerrit Code Review 
CommitDate: Tue Jun 23 16:00:39 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 47b0c69b0a1cefe027366d6e01f4f14470edaa2f
  - Update CSS box colors to match new Colibre

Change-Id: I5ed9fdcad79fc34032e6c8d1536aaaf12d32e177

diff --git a/helpcontent2 b/helpcontent2
index f9e41ddb473f..47b0c69b0a1c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f9e41ddb473fdb17dab310d17e68e2d0470a8518
+Subproject commit 47b0c69b0a1cefe027366d6e01f4f14470edaa2f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/default.css

[Adolfo Jayme Barrientos (via logerrit)]

 help3xsl/default.css |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 47b0c69b0a1cefe027366d6e01f4f14470edaa2f
Author: Adolfo Jayme Barrientos 
AuthorDate: Tue Jun 23 08:59:52 2020 -0500
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jun 23 08:59:52 2020 -0500

Update CSS box colors to match new Colibre

Change-Id: I5ed9fdcad79fc34032e6c8d1536aaaf12d32e177

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 2d1b2cc4a..6ce1e1d06 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -158,16 +158,16 @@ pre,
 margin-top: 15px;
 }
 .note {
-border-left: 4px solid #61897C;
-background-color: #D9E7E2;
+border-left: 3px solid #309048;
+background-color: #d9f1dd;
 }
 .tip {
-border-left: 4px solid #4866AD;
-background-color: #CDD5E8;
+border-left: 3px solid #0063b1;
+background-color: #cde5f7;
 }
 .warning {
-border-left: 4px solid #D5B177;
-background-color: #F9EEDC;
+border-left: 3px solid #ed8733;
+background-color: #f6f1d2;
 }
 .noteicon, .notetext {
 padding:0.3em;
@@ -253,7 +253,7 @@ h6 {
 }
 .howtoget {
 background: #EBE7E9;
-border-left: 4px solid #4E4B55;
+border-left: 3px solid #4E4B55;
 border-radius: 0 4px 4px 0;
 box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2);
 padding: 0.3em;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - download.lst external/mariadb-connector-c RepositoryExternal.mk solenv/clang-format solenv/flatpak-manifest.in

[Michael Stahl (via logerrit)]

 RepositoryExternal.mk   |7 
 download.lst|4 
 external/mariadb-connector-c/README |   18 
 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk   |  113 
+
 external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk |   26 -
 external/mariadb-connector-c/clang-cl.patch.0   |4 
 external/mariadb-connector-c/configs/linux_my_config.h  |  212 
+
 external/mariadb-connector-c/configs/mac_my_config.h|  217 
+-
 external/mariadb-connector-c/configs/mariadb_version.h  |   38 +
 external/mariadb-connector-c/configs/mysql_version.h|   28 -
 external/mariadb-connector-c/configs/wnt_ma_config.h|  154 
+++
 external/mariadb-connector-c/mariadb-CONC-104.patch.1   |   49 --
 external/mariadb-connector-c/mariadb-inline.patch.1 |   23 -
 external/mariadb-connector-c/mariadb-msvc.patch.1   |   13 
 external/mariadb-connector-c/mariadb-swap.patch |   24 -
 solenv/clang-format/blacklist   |3 
 solenv/flatpak-manifest.in  |6 
 17 files changed, 339 insertions(+), 600 deletions(-)

New commits:
commit 329c83c57989948d16b4e4d646607b93ee407a9e
Author: Michael Stahl 
AuthorDate: Tue Jun 16 15:09:50 2020 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 23 15:55:40 2020 +0200

mariadb: upgrade to release 3.1.8

Fixes CVE-2018-3081 CVE-2020-2574 CVE-2020-2752 CVE-2020-2922 CVE-2020-13249

Remove obsolete patches:
* mariadb-msvc.patch.1
* mariadb-swap.patch
* mariadb-inline.patch.1
* mariadb-CONC-104.patch.1

Don't build anything from plugins/ in the hope that it's not needed.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96466
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit fe041bbc343ee08c6e901f63985d55a90da71c8b)

mariadb: forgot to adapt flatpak-manifest.in

mariadb: the "pvio_socket" plugin turns out to be important
... otherwise can't connect to a TCP socket.
(regression from fe041bbc343ee08c6e901f63985d55a90da71c8b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96536
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 82a1650683df7d5c1769dfd68a26a4d071f1a546)

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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9f172d6af448..f6003fc22aba 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -262,6 +262,13 @@ $(call gb_LinkTarget_add_libs,$(1),\
-liconv \
 )
 endif
+$(call gb_LinkTarget_use_system_win32_libs,$(1),\
+   ws2_32 \
+   advapi32 \
+   kernel32 \
+   shlwapi \
+   crypt32 \
+)
 
 endef
 define gb_ExternalProject__use_mariadb-connector-c
diff --git a/download.lst b/download.lst
index 479820f95a5e..c1b8858bc443 100644
--- a/download.lst
+++ b/download.lst
@@ -168,8 +168,8 @@ export LPSOLVE_SHA256SUM := 
171816288f14215c69e730f7a4f1c325739873e21f946ff83884
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export LXML_SHA256SUM := 
940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e
 export LXML_TARBALL := lxml-4.1.1.tgz
-export MARIADB_CONNECTOR_C_SHA256SUM := 
fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60
-export MARIADB_CONNECTOR_C_TARBALL := 
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
+export MARIADB_CONNECTOR_C_SHA256SUM := 
431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b
+export MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.1.8-src.tar.gz
 export MDDS_SHA256SUM := 
144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d
 export MDDS_TARBALL := mdds-1.5.0.tar.bz2
 export MDNSRESPONDER_SHA256SUM := 
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0
diff --git a/external/mariadb-connector-c/README 
b/external/mariadb-connector-c/README
index 03a1138b47f8..25209f97f4d2 100644
--- a/external/mariadb-connector-c/README
+++ b/external/mariadb-connector-c/README
@@ -1,16 +1,8 @@
-Update to new upstream bzr snapshot:
+MariaDB Connector/C
 
-Don't use 'bzr diff', it will not put renames in the diff in a way
-that patch understands.
+https://mariadb.com/kb/en/mariadb-connector-c-release-notes/
+https://downloads.mariadb.com/Connectors/c/
 
-bzr -Ossl.cert_reqs=none branch lp:mariadb-native-client
-mv mariadb-native-client mariadb-native-client.trunk
-cp -R mariadb-native-client.trunk mariadb-native-client.release
-cd mariadb-native-client.release
-bzr revert -r mariadb-na

[Libreoffice-commits] online.git: ios/Mobile

[Tor Lillqvist (via logerrit)]

 ios/Mobile/Info.plist.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9c517608be297e938caebeb122c2e31c56bae7cc
Author: Tor Lillqvist 
AuthorDate: Tue Jun 23 16:46:10 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jun 23 16:46:13 2020 +0300

Bump the internal iOS app version to 4.2.6

Build 4.2.5 (57) was released (as 4.2.4).

Change-Id: I76a49b7851c2d8fa68f623c08ae211d2ac549d26

diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in
index 2b716ded1..54d68f36c 100644
--- a/ios/Mobile/Info.plist.in
+++ b/ios/Mobile/Info.plist.in
@@ -214,7 +214,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
-   4.2.4
+   4.2.6
CFBundleVersion
@IOSAPP_BUNDLE_VERSION@
LSRequiresIPhoneOS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/loleaflet.css|5 -
 loleaflet/src/control/Control.LokDialog.js |2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 862486f6d231178ce44a0f3902b2feb76866b5f9
Author: Pedro Pinto Silva 
AuthorDate: Fri Jun 19 16:32:05 2020 +0200
Commit: Pedro Silva 
CommitDate: Tue Jun 23 15:01:29 2020 +0200

Sidebar-panel has fixed width that is bigger than its contents, better fix

- Revert display:table from #sidebar-panel
- Set document-container position to right:0px when in presence of text or 
presentation documents that has (missing) the sidebar closed 
(sidebar-dock-wrapper display:none)

Change-Id: Id4416e9dfa0540dd774b83b41428f021f99f4f38
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96741
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Pedro Silva 

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 0773c624d..41e9459fc 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -7,6 +7,10 @@
right: 0px;
left: 0px;
 }
+#document-container.sidebar-closed {
+   right: 0px !important;
+}
+
 
 #document-container.tablet {
top: 36px;
@@ -152,7 +156,6 @@ body {
 }
 
 #sidebar-panel {
-   display: table;
padding: 0px;
margin: 0px;
position: relative;
diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index dfddbdfc2..1b70b1cc0 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1060,6 +1060,7 @@ L.Control.LokDialog = L.Control.extend({
this._sendPaintWindowRect(id);
} else {
this._createSidebar(id, strId, width, height);
+   $('#document-container').removeClass('sidebar-closed');
}
},
 
@@ -1365,6 +1366,7 @@ L.Control.LokDialog = L.Control.extend({
this._map.fire('editorgotfocus');
this._map.focus();
}
+   $('#document-container').addClass('sidebar-closed');
},
 
_onCalcInputBarClose: function(dialogId) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: net/FakeSocket.cpp

[Tor Lillqvist (via logerrit)]

 net/FakeSocket.cpp |  139 ++---
 1 file changed, 81 insertions(+), 58 deletions(-)

New commits:
commit 9d8f6f7f8b6b3c37805b9e5d1b8d6e694578ad59
Author: Tor Lillqvist 
AuthorDate: Tue Jun 23 15:29:43 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jun 23 15:01:06 2020 +0200

Introduce more selective FakeSocket logging

Set a FAKESOCKET_LOG_LEVEL environment variable to "2" for more
verbose logging. This is how it used to be, and is indeed very
verbose, as each poll, read, and write operation is logged.

(Normally the FakeSocket logging does not get displayed, though, as it
is passed to LOG_INF() and the default LOOL_LOGLEVEL is "warning". To
see it, either set FAKESOCKET_LOG_ALWAYS_STDERR or set LOOL_LOGLEVEL
appropriately.)

With the default log level 1 only creation, connection, and closing of
FakeSockets is logged, and the state of all active ones is displayed
after each established connetion and when a FakeSocket has been
closed. This is usually enough to get a basic trace of how the
plumbing works.

Change-Id: Id87bd32ce06105af561aa6a75cf365b41c079713
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96943
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/net/FakeSocket.cpp b/net/FakeSocket.cpp
index 13b73922c..e8fd6bbca 100644
--- a/net/FakeSocket.cpp
+++ b/net/FakeSocket.cpp
@@ -22,8 +22,6 @@
 #include 
 #include 
 
-#include "FakeSocket.hpp"
-
 // A "fake socket" is represented by a number, a smallish integer, just like a 
real socket.
 //
 // There is one FakeSocketPair for each two sequential fake socket numbers. 
When you create one, you
@@ -71,6 +69,10 @@ static void (*loggingCallback)(const std::string&) = nullptr;
 static std::mutex theMutex;
 static std::condition_variable theCV;
 
+static int fakeSocketLogLevel = 0;
+
+static void fakeSocketDumpStateImpl();
+
 // Avoid problems with order of initialisation of static globals.
 static std::vector& getFds()
 {
@@ -92,9 +94,9 @@ static std::string flush()
 
 #ifdef __ANDROID__
 // kill the verbose logging on Android
-#define FAKESOCKET_LOG(arg)
+#define FAKESOCKET_LOG(level, arg)
 #else
-#define FAKESOCKET_LOG(arg) loggingBuffer << arg
+#define FAKESOCKET_LOG(level, arg) do { if (level <= fakeSocketLogLevel) { 
loggingBuffer << arg; } } while (false)
 #endif
 
 void fakeSocketSetLoggingCallback(void (*callback)(const std::string&))
@@ -104,6 +106,19 @@ void fakeSocketSetLoggingCallback(void (*callback)(const 
std::string&))
 
 static int fakeSocketAllocate()
 {
+if (fakeSocketLogLevel == 0)
+{
+char *logLevel = std::getenv("FAKESOCKET_LOG_LEVEL");
+if (logLevel == nullptr)
+fakeSocketLogLevel = 1;
+else
+{
+fakeSocketLogLevel = std::strtol(logLevel, nullptr, 10);
+if (fakeSocketLogLevel != 1 && fakeSocketLogLevel != 2)
+fakeSocketLogLevel = 1;
+}
+}
+
 std::vector& fds = getFds();
 
 std::lock_guard lock(theMutex);
@@ -126,7 +141,7 @@ int fakeSocketSocket()
 {
 const int result = fakeSocketAllocate();
 
-FAKESOCKET_LOG("FakeSocket Create #" << result << flush());
+FAKESOCKET_LOG(1, "FakeSocket Create #" << result << flush());
 
 return result;
 }
@@ -146,7 +161,7 @@ int fakeSocketPipe2(int pipefd[2])
 pair.fd[1] = pair.fd[0] + 1;
 pipefd[1] = pair.fd[1];
 
-FAKESOCKET_LOG("FakeSocket Pipe created (#" << pipefd[0] << ",#" << 
pipefd[1] << ')' << flush());
+FAKESOCKET_LOG(1, "FakeSocket Pipe created (#" << pipefd[0] << ",#" << 
pipefd[1] << ')' << flush());
 
 return 0;
 }
@@ -249,14 +264,14 @@ static bool checkForPoll(std::vector& 
fds, struct pollfd *pollfd
 
 int fakeSocketPoll(struct pollfd *pollfds, int nfds, int timeout)
 {
-FAKESOCKET_LOG("FakeSocket Poll ");
+FAKESOCKET_LOG(2, "FakeSocket Poll ");
 for (int i = 0; i < nfds; i++)
 {
 if (i > 0)
-FAKESOCKET_LOG(',');
-FAKESOCKET_LOG('#' << pollfds[i].fd << ':' << 
pollBits(pollfds[i].events));
+FAKESOCKET_LOG(2, ',');
+FAKESOCKET_LOG(2, '#' << pollfds[i].fd << ':' << 
pollBits(pollfds[i].events));
 }
-FAKESOCKET_LOG(", timeout:" << timeout << flush());
+FAKESOCKET_LOG(2, ", timeout:" << timeout << flush());
 
 std::vector& fds = getFds();
 std::unique_lock lock(theMutex);
@@ -269,7 +284,7 @@ int fakeSocketPoll(struct pollfd *pollfds, int nfds, int 
timeout)
 while (!checkForPoll(fds, pollfds, nfds))
 if (theCV.wait_until(lock, end) == std::cv_status::timeout)
 {
-FAKESOCKET_LOG("FakeSocket Poll timeout: 0" << flush());
+FAKESOCKET_LOG(2, "FakeSocket Poll timeout: 0" << flush());
 return 0;
 }
 }
@@ -290,14 +305,14 @@ int fakeSocketPoll(struct pollfd *pollfds, int nfds, int 
timeout)
 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - officecfg/registry sw/qa writerfilter/source

[Serge Krot (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |   12 ++
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |   26 -
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx |   29 --
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx  |   35 ++-
 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx  |   33 +--
 writerfilter/source/dmapper/SdtHelper.cxx  |   60 +
 6 files changed, 155 insertions(+), 40 deletions(-)

New commits:
commit f7606f0c7d9fc5961adec6a84ccedf0f4dbcdad9
Author: Serge Krot 
AuthorDate: Tue Jun 16 17:11:12 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Jun 23 14:23:01 2020 +0200

tdf#134043 DOCX import: DropDown text field instead of ComboBox form control

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 8b76534d540d..6beb18105b08 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -5899,6 +5899,18 @@
 true
   
 
+
+  
+Contains settings for importing DOCX.
+  
+  
+
+  Specifies whether ComboBox form control should be imported 
as DropDown text field.
+  Import ComboBox as DropDown
+
+true
+  
+
   
 
 
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 5ff581743ccd..133c2add7822 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -264,12 +264,26 @@ DECLARE_OOXMLEXPORT_TEST(testDropdownInCell, 
"dropdown-in-cell.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
 
 // Second problem: dropdown shape wasn't anchored inside the B1 cell.
-uno::Reference xShape(getShape(1), uno::UNO_QUERY);
-uno::Reference xAnchor = xShape->getAnchor();
-uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
-uno::Reference xCell(xTable->getCellByName("B1"), 
uno::UNO_QUERY);
-uno::Reference xTextRangeCompare(xCell, 
uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(sal_Int16(0), 
xTextRangeCompare->compareRegionStarts(xAnchor, xCell));
+if (getShapes() > 0)
+{
+uno::Reference xShape(getShape(1), uno::UNO_QUERY);
+uno::Reference xAnchor = xShape->getAnchor();
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("B1"), 
uno::UNO_QUERY);
+uno::Reference xTextRangeCompare(xCell, 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0), 
xTextRangeCompare->compareRegionStarts(xAnchor, xCell));
+}
+else
+{
+// ComboBox was imported as DropDown text field
+uno::Reference 
xTextFieldsSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+uno::Reference 
xFields(xFieldsAccess->createEnumeration());
+CPPUNIT_ASSERT(xFields->hasMoreElements());
+uno::Any aField = xFields->nextElement();
+uno::Reference xServiceInfo(aField, 
uno::UNO_QUERY);
+
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.textfield.DropDown"));
+}
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTableAlignment, "table-alignment.docx")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 272daae72c78..430749768862 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -560,7 +560,7 @@ DECLARE_OOXMLEXPORT_TEST(testParaAdjustDistribute, 
"para-adjust-distribute.docx"
 DECLARE_OOXMLEXPORT_TEST(testInputListExport, "tdf122186_input_list.odt")
 {
 CPPUNIT_ASSERT_EQUAL(1, getPages());
-if (!mbExported) // importing the ODT, an input field
+if (!mbExported || getShapes() == 0) // importing the ODT, an input field
 {
 uno::Reference 
xTextFieldsSupplier(mxComponent, uno::UNO_QUERY);
 uno::Reference 
xFieldsAccess(xTextFieldsSupplier->getTextFields());
@@ -1032,11 +1032,28 @@ DECLARE_OOXMLEXPORT_TEST(tdf127085, "tdf127085.docx")
 DECLARE_OOXMLEXPORT_TEST(tdf119809, "tdf119809.docx")
 {
 // Combobox without an item list lost during import
-uno::Reference xControlShape(getShape(1), 
uno::UNO_QUERY);
-uno::Reference 
xPropertySet(xControlShape->getControl(), uno::UNO_QUERY);
-uno::Reference xServiceInfo(xPropertySet, 
uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(true, 
bool(xServiceInfo->supportsService("com.sun.star.form.component.ComboBox")));
-C

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

[Miklos Vajna (via logerrit)]

 sw/inc/undobj.hxx  |7 +++-
 sw/source/core/inc/UndoDelete.hxx  |2 +
 sw/source/core/inc/UndoManager.hxx |1 
 sw/source/core/inc/rolbck.hxx  |6 +++
 sw/source/core/layout/atrfrm.cxx   |7 +++-
 sw/source/core/undo/docundo.cxx|   14 +
 sw/source/core/undo/rolbck.cxx |   56 +
 sw/source/core/undo/undel.cxx  |   12 +++
 sw/source/core/undo/undobj.cxx |   15 +
 sw/source/core/undo/undobj1.cxx|   24 +++
 sw/source/core/undo/unins.cxx  |3 -
 sw/source/core/undo/untblk.cxx |   35 +++
 12 files changed, 177 insertions(+), 5 deletions(-)

New commits:
commit 10129e2dfc582915d999e24deed34f7303a6f02e
Author: Miklos Vajna 
AuthorDate: Tue Jun 23 12:12:19 2020 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 23 14:10:21 2020 +0200

sw doc model xml dump: improve undo-redo coverage:

- show the undo manager's node array
- show SwUndoDelete
- show SwUndoSaveContent
- show SwHistory
- show SwHistoryHint
- show SwHistoryTextFlyCnt
- show SwUndoFlyBase
- show SwHistorySetFormat
- show SwUndoInserts

When an action + undo pair goes wrong, it's easier to see the state of
the undo stack after the action this way, then decide if the undo stack
is already bad, or the problem is with the undo implementation.

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

diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index bd6748d656a0..60d219bc0109 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -42,6 +42,7 @@ class SwRedlineData;
 class SwRedlineSaveDatas;
 enum class RedlineFlags;
 enum class RndStdIds;
+typedef struct _xmlTextWriter* xmlTextWriterPtr;
 
 namespace sw {
 class UndoRedoContext;
@@ -191,7 +192,8 @@ protected:
 
 public:
 SwUndoSaveContent();
-~SwUndoSaveContent() COVERITY_NOEXCEPT_FALSE;
+virtual ~SwUndoSaveContent() COVERITY_NOEXCEPT_FALSE;
+virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 // Save a complete section in nodes-array.
@@ -274,6 +276,8 @@ public:
 static bool IsCreateUndoForNewFly(SwFormatAnchor const& rAnchor,
 sal_uLong const nStartNode, sal_uLong const nEndNode);
 std::vector * GetFlysAnchoredAt() { return 
m_pFrameFormats.get(); }
+
+void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 class SwUndoInsDoc final : public SwUndoInserts
@@ -307,6 +311,7 @@ protected:
 
 public:
 virtual ~SwUndoFlyBase() override;
+void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 
 };
 
diff --git a/sw/source/core/inc/UndoDelete.hxx 
b/sw/source/core/inc/UndoDelete.hxx
index ce38a4d99e03..6e38201f3443 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -27,6 +27,7 @@
 
 class SwRedlineSaveDatas;
 class SwTextNode;
+typedef struct _xmlTextWriter* xmlTextWriterPtr;
 
 namespace sfx2 {
 class MetadatableUndo;
@@ -101,6 +102,7 @@ public:
 bool IsDelFullPara() const { return m_bDelFullPara; }
 
 void DisableMakeFrames() { m_bDisableMakeFrames = true; };
+void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDODELETE_HXX
diff --git a/sw/source/core/inc/UndoManager.hxx 
b/sw/source/core/inc/UndoManager.hxx
index fda9c734a7e6..4113d54d8f52 100644
--- a/sw/source/core/inc/UndoManager.hxx
+++ b/sw/source/core/inc/UndoManager.hxx
@@ -86,6 +86,7 @@ public:
bool bTryMerg = false) override;
 virtual bool Undo() override;
 virtual bool Redo() override;
+void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
 SwUndo * RemoveLastUndo();
 SwUndo * GetLastUndo();
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 1882a68d1d0e..96a8eb58b7d9 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -54,6 +54,7 @@ class SwFormatChain;
 class SwNode;
 class SwCharFormat;
 enum class SwFieldIds : sal_uInt16;
+typedef struct _xmlTextWriter* xmlTextWriterPtr;
 
 enum HISTORY_HINT {
 HSTRY_SETFMTHNT,
@@ -85,6 +86,7 @@ public:
 virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) = 0;
 HISTORY_HINT Which() const { return m_eWhichId; }
 virtual OUString GetDescription() const;
+virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 class SwHistorySetFormat : public SwHistoryHint
@@ -98,6 +100,7 @@ public:
 virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override;
 virtual OUString GetDescription() const override;
 
+void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 class SwHistoryResetFormat : public SwHistoryHint
@@ -234,6 +237,7 @@ public:
 virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override;
 SwUndoDelLayFormat* GetUD

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

[Noel Grandin (via logerrit)]

 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx |   44 
 sc/source/ui/sidebar/AlignmentPropertyPanel.hxx |2 -
 vcl/source/window/window.cxx|9 
 3 files changed, 9 insertions(+), 46 deletions(-)

New commits:
commit 84881e32317765e7752d57fceac8d979dd801b8c
Author: Noel Grandin 
AuthorDate: Fri Jun 19 16:17:25 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 23 13:41:01 2020 +0200

remove JSON node erasing

as a step towards using tools::JsonWriter for DumpAsPropertyTree

Since this method is only used by the LOK stuff, we can just
remove the node down at the generation site in vcl::Window

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

diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx 
b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 4d7183d5f31f..6a6bee924459 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -140,50 +140,6 @@ void AlignmentPropertyPanel::Initialize()
 mxRefEdgeStd->connect_toggled(aLink2);
 }
 
-namespace {
-
-void eraseNode(boost::property_tree::ptree& pTree, const std::string& aValue)
-{
-boost::optional pId;
-boost::optional pSubTree = 
pTree.get_child_optional("children");
-
-if (pSubTree)
-{
-boost::property_tree::ptree::iterator itFound = pSubTree.get().end();
-for (boost::property_tree::ptree::iterator it = 
pSubTree.get().begin(); it != pSubTree.get().end(); ++it)
-{
-pId = it->second.get_child_optional("id");
-if (pId && pId.get().get_value("") == aValue)
-{
-itFound = it;
-break;
-}
-
-eraseNode(it->second, aValue);
-}
-
-if (itFound != pSubTree.get().end())
-{
-pSubTree.get().erase(itFound);
-}
-}
-}
-
-}
-
-boost::property_tree::ptree AlignmentPropertyPanel::DumpAsPropertyTree()
-{
-boost::property_tree::ptree aTree = PanelLayout::DumpAsPropertyTree();
-
-const SfxViewShell* pViewShell = SfxViewShell::Current();
-if (pViewShell && pViewShell->isLOKMobilePhone())
-{
-eraseNode(aTree, "textorientbox");
-}
-
-return aTree;
-}
-
 IMPL_LINK(AlignmentPropertyPanel, ReferenceEdgeHdl, weld::ToggleButton&, 
rToggle, void)
 {
 if (mbSettingToggles)
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx 
b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
index bcd3e1ebadba..3a1b8eb8201b 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
@@ -55,8 +55,6 @@ public:
 
 SfxBindings* GetBindings() { return mpBindings;}
 
-virtual boost::property_tree::ptree DumpAsPropertyTree() override;
-
 // constructor/destructor
 AlignmentPropertyPanel(
 vcl::Window* pParent,
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index c0429c9b76be..767beda066d9 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -85,6 +85,8 @@ using namespace ::com::sun::star::datatransfer::dnd;
 
 namespace vcl {
 
+static bool g_isLOKMobilePhone = false;
+
 Window::Window( WindowType nType )
 : OutputDevice(OUTDEV_WINDOW)
 , mpWindowImpl(new WindowImpl( nType ))
@@ -3382,6 +3384,13 @@ const char* windowTypeName(WindowType nWindowType)
 
 boost::property_tree::ptree Window::DumpAsPropertyTree()
 {
+// This is for the code in sc/source/ui/sidebar/AlignmentPropertyPanel.cxx.
+// Also see commit f27c6320e8496d690b5d341d3718430709263a1c
+// "lok: remove complex rotation / alignment settings"
+if (g_isLOKMobilePhone && get_id() == "textorientbox") {
+return boost::property_tree::ptree();
+}
+
 boost::property_tree::ptree aTree;
 aTree.put("id", get_id());  // TODO could be missing - sort out
 aTree.put("type", windowTypeName(GetType()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-7-0' - source/text

[Olivier Hallot (via logerrit)]

 source/text/scalc/guide/csv_files.xhp |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 96bbdcf58f52d054eca60eb651638ffb131e6da7
Author: Olivier Hallot 
AuthorDate: Mon Jun 22 08:35:41 2020 -0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jun 23 13:38:06 2020 +0200

Fix label contents for Text CSV import

Change-Id: Ifdfc8ad238b6ef070ca2fa46af7bd50be77c17d0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96844
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit d2fe8fae9d249659c389e374a253072ae92506ae)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96870
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/scalc/guide/csv_files.xhp 
b/source/text/scalc/guide/csv_files.xhp
index bb87760fc..d0cbd01f0 100644
--- a/source/text/scalc/guide/csv_files.xhp
+++ b/source/text/scalc/guide/csv_files.xhp
@@ -1,6 +1,6 @@
 
 
-   
+
 
- 
+
 
 
  Importing and Exporting CSV Files 
@@ -39,11 +39,11 @@
 opening;text csv files
 saving;as text csv
 MW deleted "importing;text data bases" and copied 4 index 
entries from scalc/guide/csv_formula.xhpmw added "saving;" 
and "opening;"
-Opening and Saving Text CSV Files
-
+Opening and Saving Text CSV Files
+
 Comma Separated 
Values (CSV) is a text file format that you can use to exchange data from a 
database or a spreadsheet between applications. Each line in a Text CSV file 
represents a record in the database, or a row in a spreadsheet. Each field in a 
database record or cell in a spreadsheet row is usually separated by a comma. 
However, you can use other characters to delimit a field, such as a tabulator 
character.
 If the field or 
cell contains a comma, the field or cell must be enclosed by 
single quotes (') or double quotes (").
-To Open 
a Text CSV File in Calc
+To Open a Text CSV File in Calc
 
 
 Choose File - Open.
@@ -51,7 +51,7 @@
 
 Locate the CSV 
file that you want to open.
 If the file has 
a *.csv extension, select the file.
-If the CSV file 
has another extension, select the file, and then select "Text CSV" in the File type box
+If the CSV file 
has another extension, select the file, and then select "Text CSV" in the 
Filter box
 
 
 Click Open.
@@ -61,18 +61,18 @@
 Specify the 
options to divide the text in the file into columns.
 You can preview 
the layout of the imported data at the bottom of the Text 
Import dialog. 
 Right-click a 
column in the preview to set the format or to hide the column.
-Check the text 
delimiter box that matches the character used as text delimiter in the file. In 
case of an unlisted delimiter, type the character into the input 
box.
+Check the text delimiter box that 
matches the character used as text delimiter in the file. In case of an 
unlisted delimiter, type the character into the input box.
 
 
 Click OK.
 
 
-To Save 
a Sheet as a Text CSV File
-When you export a 
spreadsheet to CSV format, only the data on the current sheet is saved. All 
other information, including formulas and formatting, is lost.
+To Save a Sheet as a Text CSV File
+When you export a spreadsheet to CSV format, only the 
data on the current sheet is saved. All other information, including formulas 
and formatting, is lost.
 
 
 Open the Calc 
sheet that you want to save as a Text CSV file.
-Only the current 
sheet can be exported.
+Only the current sheet can be 
exported.
 
 
 Choose File - Save as.
@@ -81,7 +81,7 @@
 In the File name box, enter a name for the file.
 
 
-In the File type box, select "Text CSV".
+In the 
Filter box, select "Text CSV".
 
 
 (Optional) Set 
the field options for the Text CSV file.
@@ -101,4 +101,4 @@
 Import text 
files
 
 
-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 8c0468bf021ccde54f802dc56a52af3d6e814fda
Author: Olivier Hallot 
AuthorDate: Tue Jun 23 08:38:06 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Jun 23 13:38:06 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 96bbdcf58f52d054eca60eb651638ffb131e6da7
  - Fix label contents for Text CSV import

Change-Id: Ifdfc8ad238b6ef070ca2fa46af7bd50be77c17d0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96844
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit d2fe8fae9d249659c389e374a253072ae92506ae)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96870
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index a77bc035d212..96bbdcf58f52 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a77bc035d212a463792a0eca5f4c0a264c0064b7
+Subproject commit 96bbdcf58f52d054eca60eb651638ffb131e6da7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit e297b6b43e260803fea8181c063b004c2d419422
Author: Olivier Hallot 
AuthorDate: Tue Jun 23 08:36:53 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Jun 23 13:36:53 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to a77bc035d212a463792a0eca5f4c0a264c0064b7
  - Fix backgound color page after translator review

Special thanks to Mihkel Tonnov.

Change-Id: If0ef8d7aa9ca076937330f86f1cfaf8f5ec40f32
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96849
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 835cdccb3d81e1b12a36610f7c54223fc5fc3d22)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96809
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index a70efb219e76..a77bc035d212 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a70efb219e762f5ccf5a1d36826859d9c726fbc9
+Subproject commit a77bc035d212a463792a0eca5f4c0a264c0064b7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-7-0' - source/text

[Olivier Hallot (via logerrit)]

 source/text/swriter/guide/background.xhp |   26 ++
 1 file changed, 10 insertions(+), 16 deletions(-)

New commits:
commit a77bc035d212a463792a0eca5f4c0a264c0064b7
Author: Olivier Hallot 
AuthorDate: Mon Jun 22 09:31:35 2020 -0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jun 23 13:36:53 2020 +0200

Fix backgound color page after translator review

Special thanks to Mihkel Tonnov.

Change-Id: If0ef8d7aa9ca076937330f86f1cfaf8f5ec40f32
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96849
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 835cdccb3d81e1b12a36610f7c54223fc5fc3d22)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96809
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/swriter/guide/background.xhp 
b/source/text/swriter/guide/background.xhp
index 4b7d0fcc0..aab0d2a3f 100644
--- a/source/text/swriter/guide/background.xhp
+++ b/source/text/swriter/guide/background.xhp
@@ -35,10 +35,10 @@
 cells; backgrounds
 backgrounds;selecting
 MW transferred 4 index entries from 
shared/guide/background.xhp and added 3 new entries
-Defining Background Colors or Background Graphics
-MW built this file from splitting 
shared/guide/background.xhp
+Defining Background Colors or Background Graphics
+MW built this file from splitting 
shared/guide/background.xhp
 You can define 
a background color or use a graphic as a background for various objects in 
$[officename] Writer.
-  To Apply a Background To Text Characters
+  To Apply a Background To Text Characters
   
  
 Select the characters.
@@ -50,7 +50,7 @@
 Click the Background tab, select the background 
color.
  
   
-  To Apply a Background To a Paragraph
+  To Apply a Background To a Paragraph
   
  
 Place the cursor in the paragraph or select several 
paragraphs.
@@ -62,8 +62,8 @@
 On 
the Background tab page, select the background color or a 
background graphic.
  
   
-  To 
select an object in the background, hold down the CommandCtrl
 key and click the object. Alternatively, use the Navigator to select the 
object.
-  To Apply a Background To All or Part of a Table
+  To select an object in the background, 
hold down the CommandCtrl
 key and click the object. Alternatively, use the Navigator to select the 
object.
+  To Apply a Background To All or Part of a 
Table
   
  
 Place the cursor in the table in your text document.
@@ -78,15 +78,9 @@
 In 
the For box, choose whether the color or graphic should apply to 
the current cell, the current row or the whole table. If you select several 
cells or rows before opening the dialog, the change applies to the 
selection.
  
   
-  You may also 
use an icon to apply a background to table parts.
-  
- 
-To apply 
a background color to cells, select the cells and click the color on the 
Background Color toolbar.
- 
- 
-To apply 
a background color to a text paragraph within a cell, place the cursor into the 
text paragraph, then click the color on the Background 
Color toolbar.
- 
-  
+  You may also use an icon to apply a background to 
table parts.
+  To apply a background color to cells, select the 
cells and use the Table Cell Background Color button dropdown on 
the Table toolbar.
+  To apply a background color to a text paragraph 
within a cell, place the cursor into the text paragraph and then use the 
Background Color dropdown button on the Formatting 
toolbar.
   
 
 
@@ -98,4 +92,4 @@
  Page Backgrounds as Page 
Styles
   

-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 wsd/DocumentBroker.cpp |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit a541dc5bcbb089f8ffbf977e8c62d39065dc2d24
Author: Tor Lillqvist 
AuthorDate: Tue Jun 23 13:44:28 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jun 23 13:26:37 2020 +0200

No need for this 'if (false)'

Change-Id: I552ee8873d398b428aa2c54d7d762c13144b8b75
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96931
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index c242da586..da71968f6 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -432,10 +432,8 @@ void DocumentBroker::pollThread()
 lastClipboardHashUpdateTime = now;
 }
 
-if (false)
-;
 // Remove idle documents after 1 hour.
-else if (isLoaded() && getIdleTimeSecs() >= IdleDocTimeoutSecs)
+if (isLoaded() && getIdleTimeSecs() >= IdleDocTimeoutSecs)
 {
 // Stop if there is nothing to save.
 LOG_INF("Autosaving idle DocumentBroker for docKey [" << 
getDocKey() << "] to kill.");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 sc/source/core/data/column4.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 97965876459d8cfda0b653551708eb14de36e632
Author: Noel Grandin 
AuthorDate: Tue Jun 23 12:09:45 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 23 13:18:35 2020 +0200

tdf#133699 Slow sorting of a column

reserve inside a loop is a pessimization, since it breaks the
logarithmic resizing of the std::vector data area.

Also use the std::vector::insert method, instead of std::copy, since
the insert method will perform less resizing operations.

On my machine, this takes the sort operation from 25s to less than 1s.

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

diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 3ca9a2892357..06f4684a5acd 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -1221,8 +1221,7 @@ public:
 void operator() ( size_t /*nRow*/, SvtBroadcaster* p )
 {
 SvtBroadcaster::ListenersType& rLis = p->GetAllListeners();
-mrListeners.reserve(mrListeners.size() + rLis.size());
-std::copy(rLis.begin(), rLis.end(), std::back_inserter(mrListeners));
+mrListeners.insert(mrListeners.end(), rLis.begin(), rLis.end());
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - wsd/ProofKey.cpp

[Damian (via logerrit)]

 wsd/ProofKey.cpp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit efba60720248fcd53c55ecb56a14f18481ab5203
Author: Damian 
AuthorDate: Mon Jun 22 21:06:34 2020 +0300
Commit: Mike Kaganski 
CommitDate: Tue Jun 23 13:01:57 2020 +0200

tdf#134041: reset engine before next digest computation

Change-Id: I68ef078f6f885bebaf29b37d5fd704a9c70c826a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96899
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Mike Kaganski 
(cherry picked from commit f160ccf80d46fda857a7cd4d87c036f61ef9df74)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96876
Reviewed-by: Michael Meeks 

diff --git a/wsd/ProofKey.cpp b/wsd/ProofKey.cpp
index f3bff7599..3bfaf1423 100644
--- a/wsd/ProofKey.cpp
+++ b/wsd/ProofKey.cpp
@@ -243,6 +243,7 @@ std::string Proof::SignProof(const std::vector& proof) const
 {
 assert(m_pKey);
 static Poco::Crypto::RSADigestEngine digestEngine(*m_pKey, "SHA256");
+digestEngine.reset();
 digestEngine.update(proof.data(), proof.size());
 return BytesToBase64(digestEngine.signature());
 }
___
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 include/vcl solenv/clang-format toolkit/source vcl/inc vcl/qa vcl/source vcl/workben

[Caolán McNamara (via logerrit)]

 accessibility/inc/pch/precompiled_acc.hxx |7 +--
 accessibility/source/helper/acc_factory.cxx   |2 +-
 accessibility/source/standard/vclxaccessiblebox.cxx   |2 +-
 accessibility/source/standard/vclxaccessiblelist.cxx  |2 +-
 accessibility/source/standard/vclxaccessiblelistitem.cxx  |2 +-
 accessibility/source/standard/vclxaccessibletextfield.cxx |2 +-
 include/vcl/toolkit/combobox.hxx  |2 +-
 include/vcl/toolkit/lstbox.hxx|4 
 solenv/clang-format/blacklist |2 +-
 toolkit/source/awt/vclxtoolkit.cxx|2 +-
 toolkit/source/awt/vclxwindows.cxx|2 +-
 vcl/inc/pch/precompiled_vcl.hxx   |2 +-
 vcl/inc/salvtables.hxx|2 +-
 vcl/qa/cppunit/dndtest.cxx|2 +-
 vcl/source/control/combobox.cxx   |2 +-
 vcl/source/control/imp_listbox.cxx|2 +-
 vcl/source/control/listbox.cxx|2 +-
 vcl/source/control/tabctrl.cxx|2 +-
 vcl/source/uitest/uiobject.cxx|2 +-
 vcl/source/window/builder.cxx |2 +-
 vcl/workben/svpclient.cxx |2 +-
 21 files changed, 28 insertions(+), 21 deletions(-)

New commits:
commit 501c8d64b5831ccbf943db9342f337ed89ff0652
Author: Caolán McNamara 
AuthorDate: Fri Jun 19 17:40:35 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jun 23 12:50:52 2020 +0200

move ListBox to toolkit-only headers

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

diff --git a/accessibility/inc/pch/precompiled_acc.hxx 
b/accessibility/inc/pch/precompiled_acc.hxx
index 839b881744c0..108cdf397c28 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-04-25 20:54:48 using:
+ Generated on 2020-06-19 17:39:54 using:
  ./bin/update_pch accessibility acc --cutoff=4 --exclude:system 
--include:module --include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -49,6 +49,7 @@
 #include 
 #include 
 #include 
+#include 
 #endif // PCH_LEVEL >= 1
 #if PCH_LEVEL >= 2
 #include 
@@ -113,7 +114,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -133,6 +133,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -167,6 +168,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -306,6 +308,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/accessibility/source/helper/acc_factory.cxx 
b/accessibility/source/helper/acc_factory.cxx
index 3ede3d7157df..a4648485c2dc 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -53,7 +53,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx 
b/accessibility/source/standard/vclxaccessiblebox.cxx
index fd382ff5b06b..d8edd7e206bf 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -29,7 +29,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 using namespace ::com::sun::star;
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx 
b/accessibility/source/standard/vclxaccessiblelist.cxx
index e405b30fb4c3..b64b10bb8cb9 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -31,7 +31,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 using namespace ::com::sun::star;
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx 
b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 9615c43eff54..7f807c5e7240 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -30,7 +30,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx 
b/accessibility/source/standard/vclxaccessibletextfield.cxx
index b0527d049bb2..c94e46e3d5ed 100644
--- a/accessibility/source/standard/vclxaccessibletextfield.cxx
+++ b/accessibility/source/standard/vclxaccessibletextfield.cxx
@@ -18,7 +18

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

[Caolán McNamara (via logerrit)]

 vcl/inc/jsdialog/jsdialogbuilder.hxx |2 +-
 vcl/inc/pch/precompiled_vcl.hxx  |5 +++--
 vcl/source/app/salvtables.cxx|2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit e2341bb8a43b9d6443a90e745b699f662550c64c
Author: Caolán McNamara 
AuthorDate: Sat Jun 20 16:03:52 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jun 23 12:50:33 2020 +0200

salvtables.hxx not needed outside vcl

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

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 5c7f5879af27..f5d0d098cb68 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -15,7 +15,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index c115104f821c..fca4ccecb24b 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-05-07 20:21:38 using:
+ Generated on 2020-06-22 16:35:24 using:
  ./bin/update_pch vcl vcl --cutoff=6 --exclude:system --include:module 
--include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #endif // PCH_LEVEL >= 1
@@ -261,7 +262,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/include/vcl/salvtables.hxx b/vcl/inc/salvtables.hxx
similarity index 100%
rename from include/vcl/salvtables.hxx
rename to vcl/inc/salvtables.hxx
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index ff441c6a5b18..0f4ba0ecc2b0 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -71,7 +71,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 desktop/source/lib/init.cxx  |6 ++
 include/vcl/jsdialog/builder.hxx |   21 +
 vcl/inc/jsdialog/jsdialogbuilder.hxx |   26 +-
 vcl/jsdialog/jsdialogbuilder.cxx |   12 +++-
 vcl/source/window/builder.cxx|2 +-
 5 files changed, 44 insertions(+), 23 deletions(-)

New commits:
commit 5bbd8aecad3d2cc97c075490ef27aecc9180ef99
Author: Caolán McNamara 
AuthorDate: Sat Jun 20 16:01:07 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jun 23 12:50:00 2020 +0200

most of jsdialogbuilder is not used outside vcl

so split it into the bit that is needed and just include that.

add missing license headers

Change-Id: I875f91176e6881e830fee6a58368d0b28ce9a0f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96774
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 717e9d6a9d49..4623812f1853 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -148,9 +148,7 @@
 #include 
 #include 
 #include 
-#define VCL_INTERNALS 1
-#include 
-#undef VCL_INTERNALS
+#include 
 
 // Needed for getUndoManager()
 #include 
@@ -3617,7 +3615,7 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 try
 {
 OString sControlId = OUStringToOString(aMap["id"], 
RTL_TEXTENCODING_ASCII_US);
-weld::Widget* pWidget = 
JSInstanceBuilder::FindWeldWidgetsMap(nWindowId, sControlId);
+weld::Widget* pWidget = jsdialog::FindWeldWidgetsMap(nWindowId, 
sControlId);
 
 bIsWeldedDialog = pWidget != nullptr;
 bool bContinueWithLOKWindow = false;
diff --git a/include/vcl/jsdialog/builder.hxx b/include/vcl/jsdialog/builder.hxx
new file mode 100644
index ..ac4c8925cb87
--- /dev/null
+++ b/include/vcl/jsdialog/builder.hxx
@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#pragma once
+
+#include 
+#include 
+#include 
+
+namespace jsdialog
+{
+VCL_DLLPUBLIC weld::Widget* FindWeldWidgetsMap(vcl::LOKWindowId nWindowId, 
const OString& rWidget);
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/include/vcl/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
similarity index 89%
rename from include/vcl/jsdialog/jsdialogbuilder.hxx
rename to vcl/inc/jsdialog/jsdialogbuilder.hxx
index 62f6d11a2d7a..5c7f5879af27 100644
--- a/include/vcl/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -7,9 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_VCL_INC_JSDIALOG_JSDIALOG_HXX
-#define INCLUDED_VCL_INC_JSDIALOG_JSDIALOG_HXX
+#pragma once
 
+#include 
 #include 
 #include 
 #include 
@@ -46,13 +46,16 @@ public:
 void notifyDialogState();
 };
 
-class VCL_DLLPUBLIC JSInstanceBuilder : public SalInstanceBuilder
+class JSInstanceBuilder : public SalInstanceBuilder
 {
 vcl::LOKWindowId m_nWindowId;
 /// used in case of tab pages where dialog is not a direct top level
 VclPtr m_aParentDialog;
 bool m_bHasTopLevelDialog;
 
+friend VCL_DLLPUBLIC weld::Widget* 
jsdialog::FindWeldWidgetsMap(vcl::LOKWindowId nWindowId,
+const 
OString& rWidget);
+
 static std::map& GetLOKWeldWidgetsMap();
 static void InsertWindowToMap(int nWindowId);
 void RememberWidget(const OString& id, weld::Widget* pWidget);
@@ -81,11 +84,10 @@ public:
 VclMessageType 
eMessageType,
 VclButtonsType eButtonType,
 const OUString& 
rPrimaryMessage);
-static weld::Widget* FindWeldWidgetsMap(vcl::LOKWindowId nWindowId, const 
OString& rWidget);
 };
 
 template 
-class VCL_DLLPUBLIC JSWidget : public BaseInstanceClass, public JSDialogSender
+class JSWidget : public BaseInstanceClass, public JSDialogSender
 {
 public:
 JSWidget(VclPtr aOwnedToplevel, VclClass* pObject, 
SalInstanceBuilder* pBuilder,
@@ -114,7 +116,7 @@ public:
 }
 };
 
-class VCL_DLLPUBLIC JSLabel : public JSWidget
+class JSLabel : public JSWidget
 {
 public:
 JSLabel(VclPtr aOwnedToplevel, FixedText* pLabel, 
SalInstanceBuilder* pBuilder,
@@ -122,14 +124,14 @@ public:
 virtual void set_label(const OUString& rText) override;
 };
 
-class VCL_DLLPUBLIC JSButton : public JSWidget
+class JSButton : public JSWidget
 {
 public:
 JSButton(VclPtr aOwnedToplevel, 

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

[Szymon Kłos (via logerrit)]

 desktop/source/lib/init.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit 9d5e36c216d01a2cc0b2aefa801bb96ddb6eb199
Author: Szymon Kłos 
AuthorDate: Tue Mar 10 16:46:37 2020 +0100
Commit: Szymon Kłos 
CommitDate: Tue Jun 23 12:47:42 2020 +0200

jsdialog: use welding for button click event

Change-Id: I0320dfb5cdc4f936eddff003bda7d16bdd1c4667
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94342
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96913
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d97fa9cf243c..717e9d6a9d49 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3668,6 +3668,19 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 bContinueWithLOKWindow = true;
 }
 }
+else if (sControlType == "pushbutton")
+{
+auto pButton = dynamic_cast(pWidget);
+if (pButton)
+{
+if (sAction == "click")
+{
+pButton->clicked();
+}
+else
+bContinueWithLOKWindow = true;
+}
+}
 else
 {
 bContinueWithLOKWindow = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Damian (via logerrit)]

 wsd/ProofKey.cpp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f160ccf80d46fda857a7cd4d87c036f61ef9df74
Author: Damian 
AuthorDate: Mon Jun 22 21:06:34 2020 +0300
Commit: Mike Kaganski 
CommitDate: Tue Jun 23 12:32:19 2020 +0200

tdf#134041: reset engine before next digest computation

Change-Id: I68ef078f6f885bebaf29b37d5fd704a9c70c826a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96899
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Mike Kaganski 

diff --git a/wsd/ProofKey.cpp b/wsd/ProofKey.cpp
index f3bff7599..3bfaf1423 100644
--- a/wsd/ProofKey.cpp
+++ b/wsd/ProofKey.cpp
@@ -243,6 +243,7 @@ std::string Proof::SignProof(const std::vector& proof) const
 {
 assert(m_pKey);
 static Poco::Crypto::RSADigestEngine digestEngine(*m_pKey, "SHA256");
+digestEngine.reset();
 digestEngine.update(proof.data(), proof.size());
 return BytesToBase64(digestEngine.signature());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[László Németh (via logerrit)]

 sw/qa/extras/layout/data/tdf130218.fodt |   86 
 sw/qa/extras/layout/layout.cxx  |   16 +
 sw/source/core/text/itrcrsr.cxx |   10 +++
 3 files changed, 112 insertions(+)

New commits:
commit 2eecf2b007a44c4e2ce2877af2c841875a70c282
Author: László Németh 
AuthorDate: Mon Jun 22 15:59:05 2020 +0200
Commit: László Németh 
CommitDate: Tue Jun 23 12:19:42 2020 +0200

tdf#130218 sw: show hanging indent in narrow cells

Instead of hiding it, show hanging first paragraph
line in narrow table cells, like MSO does.

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

diff --git a/sw/qa/extras/layout/data/tdf130218.fodt 
b/sw/qa/extras/layout/data/tdf130218.fodt
new file mode 100644
index ..d9031871bfd5
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf130218.fodt
@@ -0,0 +1,86 @@
+
+
+http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.
 0" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://op
 enoffice.org/2005/report" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
+ 
2018-08-13T16:49:19.8844595662018-08-13T16:56:24.066877759PT7M6S2LibreOfficeDev/6.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/628fbb66869ea82a1f38132ff2ba39e9666083eb
+ 
+  
+   
+
+ 
+
+   
+
+  
+ 
+ 
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+   
+   
+
+   
+   
+  
+  
+   
+   
+
+   
+   
+  
+ 
+ 
+  
+   
+   
+
+
+
+ 
+  Text
+ 
+ 
+  First 
column should have visible 
content
+ 
+
+
+ 
+  Text
+ 
+ 
+  With hanging indent, too.
+ 
+
+   
+   
+  
+ 
+
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index eb772aa54611..139252721b52 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3513,6 +3513,22 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf113014)
 assertXPathContent(pXmlDoc, 
"/metafile/push[1]/push[1]/push[1]/textarray[5]/text", "3.");
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf130218)
+{
+SwDoc* pDoc = createDoc("tdf130218.fodt");
+SwDocShell* pShell = pDoc->GetDocShell();
+
+// Dump the rendering of the first page as an XML file.
+std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+
+xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+
+// This failed, if hanging first line was hidden
+assertXPathContent(pXmlDoc, 
"/metafile/push[1]/push[1]/push[1]/textarray[1]/text", "Text");
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf127235)
 {
 SwDoc* pDoc = createDoc("tdf127235.odt");
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index acf24d67c597..

Damian Walkowski license statement

[Damian Walkowski Primesoft Polska]

Hello,

All of my past & future contributions to LibreOffice may be licensed 
under the MPLv2/LGPLv3+ dual license.


Regards,

--
Primesoft Polska Sp. z o.o.

Damian Walkowski
PHP Developer

damian.walkow...@primesoft.pl 
www.primesoft.pl 

Primesoft Polska Sp. z o.o.
ul. Piątkowska 161, 60-650 Poznań tel/fax 61/833-17-72
NIP 7831592998 Regon 634610845 KRS 221565 Kapitał zakł. 5pln
PKO BP S.A. PL 50 1440 1130   0336 0806

*Technologia OCR w Primesoft Polska*

OCR to inteligentna technologia intensywnie rozwijana i wykorzystywana w 
produktach firmy Primesoft. W systemie V-Desk umożliwia automatyczne 
wprowadzanie informacji z dokumentów papierowych
co usprawnia realizację potrzeb biznesu. Technologię OCR wdrażamy 
również w rozwiązaniach mobilnych.
Zachęcamy do zapoznania się z możliwościami poprzez darmową aplikację 
PanParagon dostępną w sklepach: App Store 
 i 
Google Play 

PanParagon oprócz prezentacji technologii jest w pełni funkcjonalnym i 
przydatnym narzędziem zapewniającym bezpieczne i proste przechowywanie 
paragonów sklepowych.


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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/comphelper include/svx include/vcl sc/source sd/IwyuFilter_sd.yaml sd/source svx/source sw/source toolkit/source vcl/inc vcl/

[Caolán McNamara (via logerrit)]

 include/comphelper/accflowenum.hxx|   34 ---
 include/svx/srchdlg.hxx   |5 
 include/vcl/salvtables.hxx|7 
 include/vcl/weld.hxx  |5 
 include/vcl/window.hxx|4 
 sc/source/ui/Accessibility/AccessibleDocument.cxx |  155 --
 sc/source/ui/inc/AccessibleDocument.hxx   |7 
 sc/source/ui/view/tabvwshe.cxx|   40 ---
 sd/IwyuFilter_sd.yaml |1 
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |9 
 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |  151 -
 sd/source/ui/inc/AccessibleDocumentViewBase.hxx   |7 
 sd/source/ui/inc/AccessibleDrawDocumentView.hxx   |6 
 sd/source/ui/view/Outliner.cxx|   11 
 svx/source/dialog/srchdlg.cxx |   57 -
 sw/source/core/access/accdoc.cxx  |  121 --
 sw/source/core/access/accdoc.hxx  |8 
 sw/source/uibase/uiview/viewsrch.cxx  |   38 ---
 toolkit/source/awt/vclxaccessiblecomponent.cxx|3 
 vcl/inc/window.h  |1 
 vcl/source/app/salvtables.cxx |   10 
 vcl/source/window/window2.cxx |   15 -
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   29 --
 23 files changed, 6 insertions(+), 718 deletions(-)

New commits:
commit bfab61b8004cacf0b853b76ebfb3d46638cac0d7
Author: Caolán McNamara 
AuthorDate: Wed May 27 17:11:34 2020 +0100
Commit: Andras Timar 
CommitDate: Tue Jun 23 12:11:48 2020 +0200

Resolves: tdf#133411 drop CONTENT_FLOWS_TO from dialog to search results

in the document, looks like only the calc one actually works, and when
it works on large quantities of results calc grinds to a complete halt

This was introduced with:

commit b41332475783c31136673fb44cf4c411bb0148f8
Date:   Mon Dec 2 15:54:29 2013 +

Integrate branch of IAccessible2

and has been a problem on and off with calc's potentially ~infinite grid

There is the on-by-default search results dialog in calc (which has a limit 
on
how many it shows) which provides an alternative route to iterate through 
the
results

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95006
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 0b94169d820482434dc98a37c3c1633ca46fd0dc)

Change-Id: I2685e480d2d15220be0bddbc83baad3992e7d5d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95014
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96919
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/include/comphelper/accflowenum.hxx 
b/include/comphelper/accflowenum.hxx
deleted file mode 100644
index fc6b7ea2d8ec..
--- a/include/comphelper/accflowenum.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * 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 .
- */
-
-#ifndef INCLUDED_COMPHELPER_ACCFLOWENUM_HXX
-#define INCLUDED_COMPHELPER_ACCFLOWENUM_HXX
-
-#include 
-
-enum AccessibilityFlowTo : sal_Int32
-{
-FORSPELLCHECKFLOWTO = 1,
-FORFINDREPLACEFLOWTO_ITEM = 2,
-FORFINDREPLACEFLOWTO_RANGE = 3
-};
-
-#endif // INCLUDED_COMPHELPER_ACCFLOWENUM_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 9a0bf9ea381d..34419ef28a5a 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -126,16 +126,11 @@ public:
 
 TransliterationFlagsGetTransliterationFlags() const;
 
-void SetDocWin(vcl::Window* pDocWin, SvxSearchCmd eCommand);
-void SetSrchFlag( bool bSuccess ) { mbSuccess = bSuccess; }
-bool GetSrchFlag() const { return mbSuccess; }
 voidSe

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit b50fc5606335191960b18af066fae97146bc7f94
Author: Olivier Hallot 
AuthorDate: Tue Jun 23 06:52:44 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Jun 23 11:52:44 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to f9e41ddb473fdb17dab310d17e68e2d0470a8518
  - Add Pattern fill Help page, fix Bitmap page

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

diff --git a/helpcontent2 b/helpcontent2
index 540b892df6e0..f9e41ddb473f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 540b892df6e000c75dd0a9dacc50a06ea48a3182
+Subproject commit f9e41ddb473fdb17dab310d17e68e2d0470a8518
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 AllLangHelp_shared.mk  |1 
 source/text/shared/01/05210100.xhp |8 +---
 source/text/shared/01/05210500.xhp |   73 ++---
 source/text/shared/01/05210800.xhp |   60 ++
 4 files changed, 123 insertions(+), 19 deletions(-)

New commits:
commit f9e41ddb473fdb17dab310d17e68e2d0470a8518
Author: Olivier Hallot 
AuthorDate: Mon Jun 22 21:54:13 2020 -0300
Commit: Olivier Hallot 
CommitDate: Tue Jun 23 11:52:44 2020 +0200

Add Pattern fill Help page, fix Bitmap page

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

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 5611b5dab..34fbafb3d 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -228,6 +228,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/01/05210500 \
 helpcontent2/source/text/shared/01/05210600 \
 helpcontent2/source/text/shared/01/05210700 \
+helpcontent2/source/text/shared/01/05210800 \
 helpcontent2/source/text/shared/01/0522 \
 helpcontent2/source/text/shared/01/0523 \
 helpcontent2/source/text/shared/01/05230100 \
diff --git a/source/text/shared/01/05210100.xhp 
b/source/text/shared/01/05210100.xhp
index 16322c641..a1184fefe 100644
--- a/source/text/shared/01/05210100.xhp
+++ b/source/text/shared/01/05210100.xhp
@@ -64,14 +64,10 @@
 Fills the object with a gradient selected 
on this page.
 
 
-Bitmap
-Fills the object with a bitmap pattern 
selected on this page. To add a bitmap to the list, open this dialog, 
click the Bitmaps tab, and then click Add / 
Import.
+
 
-TODO: write a page about the Pattern tab
 
-Pattern
-Fills the object with a simple two color 
pattern selected on this page.
-
+
 
 Hatch
 Fills the object with a hatching pattern 
selected on this page.
diff --git a/source/text/shared/01/05210500.xhp 
b/source/text/shared/01/05210500.xhp
index 4bb1e6fc2..112da20f8 100644
--- a/source/text/shared/01/05210500.xhp
+++ b/source/text/shared/01/05210500.xhp
@@ -28,28 +28,75 @@
 
 
 
-bitmaps; patterns
-areas; bitmap patterns
-pixel patterns
-pixel editor
-pattern editor
+
+bitmaps; areas
+areas; bitmap
 
 
 
-Bitmap
-Select a bitmap that you want to use 
as a fill pattern, or create your own pixel pattern. You can also import 
bitmaps, and save or load bitmap lists.
+Bitmap
+Select a bitmap that you want to use 
as a fill image, or add your own bitmap pattern.
 
 
 
 
-Pattern 
Editor
-Use this 
editor to create a simple, two-color, 8x8 pixel bitmap pattern.
-Grid
-To enable this 
editor, select the Blank bitmap in the bitmap list.
+Bitmap
+Lists the 
available bitmaps. You can also import bitmaps.
+To rename a bitmap, 
select the bitmap, right-click and choose Rename. To 
delete a bitmap, select the bitmap, right-click and choose 
Delete.
 
-Import
+Add/Import
 Locate the bitmap that you want to 
import, and then click Open. The bitmap is added to the end of the 
list of available bitmaps.
-
+
+Imported bitmaps are saved in your user 
profile and can be used in other documents.
+
+Options
+
+Style
+
+
+Tiled: Fill the area with the bitmap as 
tiles.
+
+
+Stretched: Stretch the image to fit the object 
area.
+
+
+Custom 
position/size: Set a custom size and position of the bitmap in the 
object area.
+
+
+
+
+
+Size
+Size of the tiles and 
the custom size.
+
+
+Width: Set the width of the tile or custom 
size.
+
+
+Height: Set the height of the tile or custom 
size.
+
+
+Scale: Mark to turn the height and width settings 
relative to original size.
+
+
+
+Position
+Select the anchoring 
position of the bitmap image inside the object area.
+
+
+Tiling Position
+
+
+X-Offset: Set the horizontal bitmap offset value 
with respect to the anchoring position.
+
+
+Y-Offset: Set the vertical bitmap offset value 
with respect to the anchoring position.
+
+
+
+
+Tiling Offset
+Select the tiles offset 
in rows or columns. Use the spin button to specify the offset value.
 
 
 
diff --git a/source/text/shared/01/05210800.xhp 
b/source/text/shared/01/05210800.xhp
new file mode 100644
index 0..efff55af5
--- /dev/null
+++ b/source/text/shared/01/05210800.xhp
@@ -0,0 +1,60 @@
+
+
+
+
+
+  
+Pattern
+/text/shared/01/05210800.xhp
+  
+
+
+
+
+pattern;area
+pattern;background
+background;pattern
+background;area
+
+
+
+Pattern
+Fills the object with a simple two color 
pattern selected on this page.
+
+Pattern
+Lists the 
available patterns. You can also modify or create your own pattern.
+
+To rename a pattern, select the pattern, 
right-click and choose Rename. To delete a pattern, select 
the pattern, right-click and choose Delete.
+Add
+Adds a custom  pattern to the current list. 
Specify the pr

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

[Miklos Vajna (via logerrit)]

 sw/qa/uibase/shells/data/ole-save-preview-update.odt |binary
 sw/qa/uibase/shells/shells.cxx   |   33 +--
 sw/source/uibase/shells/basesh.cxx   |4 ++
 3 files changed, 34 insertions(+), 3 deletions(-)

New commits:
commit 2aad85f84235f362604b5fd385bb77de839d2014
Author: Miklos Vajna 
AuthorDate: Tue Jun 23 10:31:05 2020 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 23 11:33:27 2020 +0200

sw: fix missing OLE preview on updating links

Regression from commit 74844277cc2194c9e43f5bd7a6f78a9603da32f3 (disable
generation of ole previews in ODF format until after load, 2016-09-13),
if the document has charts without previews, it's loaded, fields are
updated and saved, we no longer generate those previews.

Given that Tools -> Update -> Update all is always an explicit user
action, restore the permission to update OLE previews / links before
performing the actual update.

With this, comphelper::EmbeddedObjectContainer::StoreAsChildren() will
generate those missing previews inside the getUserAllowsLinkUpdate()
conditional block.

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

diff --git a/sw/qa/uibase/shells/data/ole-save-preview-update.odt 
b/sw/qa/uibase/shells/data/ole-save-preview-update.odt
new file mode 100644
index ..353ce7fa050c
Binary files /dev/null and 
b/sw/qa/uibase/shells/data/ole-save-preview-update.odt differ
diff --git a/sw/qa/uibase/shells/shells.cxx b/sw/qa/uibase/shells/shells.cxx
index c1012d6af1d1..fbdf35758156 100644
--- a/sw/qa/uibase/shells/shells.cxx
+++ b/sw/qa/uibase/shells/shells.cxx
@@ -26,16 +26,21 @@
 #include 
 #include 
 
+static char const DATA_DIRECTORY[] = "/sw/qa/uibase/shells/data/";
+
 /// Covers sw/source/uibase/shells/ fixes.
 class SwUibaseShellsTest : public SwModelTestBase
 {
 public:
-SwDoc* createDoc();
+SwDoc* createDoc(const char* pName = nullptr);
 };
 
-SwDoc* SwUibaseShellsTest::createDoc()
+SwDoc* SwUibaseShellsTest::createDoc(const char* pName)
 {
-loadURL("private:factory/swriter", nullptr);
+if (!pName)
+loadURL("private:factory/swriter", nullptr);
+else
+load(DATA_DIRECTORY, pName);
 
 SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
 CPPUNIT_ASSERT(pTextDoc);
@@ -112,6 +117,28 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, 
testShapeTextAlignment)
 #endif
 }
 
+CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testOleSavePreviewUpdate)
+{
+// Load a document with 2 charts in it. The second is down enough that you 
have to scroll to
+// trigger its rendering. Previews are missing for both.
+createDoc("ole-save-preview-update.odt");
+
+// Explicitly update OLE previews, etc.
+dispatchCommand(mxComponent, ".uno:UpdateAll", {});
+
+// Save the document and see if we get the previews.
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+xStorable->storeToURL(maTempFile.GetURL(), {});
+uno::Reference xNameAccess
+= 
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
+  maTempFile.GetURL());
+
+// Without the accompanying fix in place, this test would have failed, 
because the object
+// replacements were not generated, even after UpdateAll.
+CPPUNIT_ASSERT(xNameAccess->hasByName("ObjectReplacements/Object 1"));
+CPPUNIT_ASSERT(xNameAccess->hasByName("ObjectReplacements/Object 2"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/basesh.cxx 
b/sw/source/uibase/shells/basesh.cxx
index 64fd150e1700..c01c31da877c 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -716,6 +716,10 @@ void SwBaseShell::Execute(SfxRequest &rReq)
 
 case FN_UPDATE_ALL:
 {
+comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer
+= GetObjectShell()->getEmbeddedObjectContainer();
+rEmbeddedObjectContainer.setUserAllowsLinkUpdate(true);
+
 SwView&  rTempView = GetView();
 rSh.EnterStdMode();
 if( !rSh.GetLinkManager().GetLinks().empty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source include/vcl solenv/clang-format sw/source toolkit/inc toolkit/source vcl/Executable_svpclient.mk vcl/inc vcl/source vcl/workben

[Caolán McNamara (via logerrit)]

 desktop/source/lib/init.cxx|2 
 include/vcl/fixed.hxx  |   39 -
 include/vcl/salvtables.hxx |2 
 include/vcl/toolkit/fixed.hxx  |   63 +
 include/vcl/toolkit/group.hxx  |5 --
 solenv/clang-format/blacklist  |1 
 sw/source/uibase/docvw/HeaderFooterWin.cxx |1 
 toolkit/inc/helper/msgbox.hxx  |2 
 toolkit/source/awt/vclxtoolkit.cxx |2 
 vcl/Executable_svpclient.mk|4 +
 vcl/inc/hyperlabel.hxx |2 
 vcl/inc/messagedialog.hxx  |2 
 vcl/inc/pch/precompiled_vcl.hxx|2 
 vcl/source/app/salvtables.cxx  |2 
 vcl/source/control/button.cxx  |2 
 vcl/source/control/fixed.cxx   |2 
 vcl/source/window/accessibility.cxx|2 
 vcl/source/window/builder.cxx  |2 
 vcl/source/window/dlgctrl.cxx  |2 
 vcl/source/window/tabdlg.cxx   |2 
 vcl/source/window/window.cxx   |2 
 vcl/source/window/window2.cxx  |2 
 vcl/workben/icontest.cxx   |2 
 vcl/workben/svpclient.cxx  |2 
 24 files changed, 89 insertions(+), 60 deletions(-)

New commits:
commit 797ffc29450f46dd6683886e7436453ce9fb4d72
Author: Caolán McNamara 
AuthorDate: Mon Jun 22 09:25:13 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jun 23 11:30:47 2020 +0200

FixedBitmap can be in a toolkit only header

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0918b86982d6..d97fa9cf243c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -148,7 +148,9 @@
 #include 
 #include 
 #include 
+#define VCL_INTERNALS 1
 #include 
+#undef VCL_INTERNALS
 
 // Needed for getUndoManager()
 #include 
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index 9c4005559210..fdfda987b900 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -21,12 +21,9 @@
 #define INCLUDED_VCL_FIXED_HXX
 
 #include 
-#include 
 #include 
-#include 
 #include 
 
-
 class VCL_DLLPUBLIC FixedText : public Control
 {
 private:
@@ -75,16 +72,6 @@ public:
 vcl::Window*get_mnemonic_widget() const { return m_pMnemonicWindow; }
 };
 
-class SelectableFixedText final : public Edit
-{
-public:
-explicit SelectableFixedText( vcl::Window* pParent, WinBits nStyle );
-
-virtual voidLoseFocus() override;
-virtual voidApplySettings(vcl::RenderContext&) override;
-};
-
-
 class VCL_DLLPUBLIC FixedLine : public Control
 {
 private:
@@ -115,32 +102,6 @@ public:
 virtual SizeGetOptimalSize() const override;
 };
 
-class VCL_DLLPUBLIC FixedBitmap final : public Control
-{
-private:
-BitmapExmaBitmap;
-
-using Control::ImplInitSettings;
-using Window::ImplInit;
-SAL_DLLPRIVATE voidImplInit( vcl::Window* pParent, WinBits nStyle );
-SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle );
-SAL_DLLPRIVATE voidImplDraw( OutputDevice* pDev, const Point& rPos, 
const Size& rSize );
-
-public:
-explicitFixedBitmap( vcl::Window* pParent, WinBits nStyle = 0 );
-
-virtual voidApplySettings(vcl::RenderContext&) override;
-
-virtual voidPaint( vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect ) override;
-virtual voidDraw( OutputDevice* pDev, const Point& rPos, DrawFlags 
nFlags ) override;
-virtual voidResize() override;
-virtual voidStateChanged( StateChangedType nType ) override;
-virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
-
-voidSetBitmap( const BitmapEx& rBitmap );
-};
-
-
 class VCL_DLLPUBLIC FixedImage : public Control
 {
 private:
diff --git a/include/vcl/salvtables.hxx b/include/vcl/salvtables.hxx
index 7912520059e5..57cb006b7a38 100644
--- a/include/vcl/salvtables.hxx
+++ b/include/vcl/salvtables.hxx
@@ -16,7 +16,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/include/vcl/toolkit/fixed.hxx b/include/vcl/toolkit/fixed.hxx
new file mode 100644
index ..5e495101d71f
--- /dev/null
+++ b/include/vcl/toolkit/fixed.hxx
@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-5' - pyuno/source

[Caolán McNamara (via logerrit)]

 pyuno/source/loader/pyuno_loader.cxx |   14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit f463cbd6ea2fd8ab80b812425eb05ae83fa6a426
Author: Caolán McNamara 
AuthorDate: Fri Jun 19 11:32:00 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Jun 23 11:22:19 2020 +0200

tdf#121384 don't leave a bare trailing : in PYTHONPATH

and don't insert any empty path entries if that situation
was to arise

Change-Id: I8d8183485f457c3e4385181fee07390c4bfef603
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96707
Reviewed-by: Tomáš Chvátal 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Jenkins
(cherry picked from commit b72705d5391b849fc70a0a4cac33523c0ea5d054)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96803
Tested-by: Stephan Bergmann 
Reviewed-by: Stephan Bergmann 

diff --git a/pyuno/source/loader/pyuno_loader.cxx 
b/pyuno/source/loader/pyuno_loader.cxx
index ffdb81143961..e35148f8ddbc 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -145,6 +145,7 @@ static void setPythonHome ( const OUString & pythonHome )
 static void prependPythonPath( const OUString & pythonPathBootstrap )
 {
 OUStringBuffer bufPYTHONPATH( 256 );
+bool bAppendSep = false;
 sal_Int32 nIndex = 0;
 while( true )
 {
@@ -160,15 +161,24 @@ static void prependPythonPath( const OUString & 
pythonPathBootstrap )
 }
 OUString systemPath;
 osl_getSystemPathFromFileURL( fileUrl.pData, &(systemPath.pData) );
-bufPYTHONPATH.append( systemPath );
-bufPYTHONPATH.append( static_cast(SAL_PATHSEPARATOR) );
+if (!systemPath.isEmpty())
+{
+if (bAppendSep)
+
bufPYTHONPATH.append(static_cast(SAL_PATHSEPARATOR));
+bufPYTHONPATH.append(systemPath);
+bAppendSep = true;
+}
 if( nNew == -1 )
 break;
 nIndex = nNew + 1;
 }
 const char * oldEnv = getenv( "PYTHONPATH");
 if( oldEnv )
+{
+if (bAppendSep)
+bufPYTHONPATH.append( static_cast(SAL_PATHSEPARATOR) 
);
 bufPYTHONPATH.append( OUString(oldEnv, strlen(oldEnv), 
osl_getThreadTextEncoding()) );
+}
 
 OUString envVar("PYTHONPATH");
 OUString envValue(bufPYTHONPATH.makeStringAndClear());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/CppunitTest_sw_core_unocore.mk sw/Module_sw.mk sw/qa sw/source

[Miklos Vajna (via logerrit)]

 sw/CppunitTest_sw_core_unocore.mk |   77 
 sw/Module_sw.mk   |1 
 sw/qa/core/unocore/data/tdf119081.odt |binary
 sw/qa/core/unocore/unocore.cxx|   91 ++
 sw/source/core/unocore/unotext.cxx|3 -
 5 files changed, 170 insertions(+), 2 deletions(-)

New commits:
commit ab6a5c9eb8eee1d3efcb8f46e16e172ea8f4b1d4
Author: Miklos Vajna 
AuthorDate: Mon Jun 22 21:04:47 2020 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 23 10:49:17 2020 +0200

tdf#119081 sw: fix RTF paste into outer table cell

Regression from commit ed654c4aa7f9f10fcb16127349009bc0c38b12e8 (Revert
"fdo#43869 use the old rtf importer for paste", 2012-11-30), the direct
problem is that SwXText::insertTextPortion() is now used by
writerfilter, so in case it's not as good as the internal API used by
the old RTF filter, we have a problem.

This function calls SwXCell::CreateCursor(), which calls
SwXCell::createTextCursor(), which uses Move() to go to the first
content node in the cell, but that means we end up at the inner cell's
XText for an outer cell.

So later when we want to go to the end of the outer cell, we can't, as
that would be a different XText and we throw an exception.

Fix the problem by instead using createTextCursorByRange(), which
immediately positions the cursor at the insert position, so the XText
will be correct.

FWIW, the ODF import at SwXMLImport::setTextInsertMode() also uses
createTextCursorByRange() to handle this situation.

(cherry picked from commit e0d0274c2b806f5148b413926ec2e58c75ce04a1)

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

diff --git a/sw/CppunitTest_sw_core_unocore.mk 
b/sw/CppunitTest_sw_core_unocore.mk
new file mode 100644
index ..6ff38dfc1890
--- /dev/null
+++ b/sw/CppunitTest_sw_core_unocore.mk
@@ -0,0 +1,77 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_core_unocore))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_unocore))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_unocore, \
+sw/qa/core/unocore/unocore \
+))
+
+# note: this links msword only for the reason to have an order dependency,
+# because "make sw.check" will not see the dependency through services.rdb
+$(eval $(call gb_CppunitTest_use_libraries,sw_core_unocore, \
+comphelper \
+cppu \
+cppuhelper \
+editeng \
+msword \
+sal \
+sfx \
+svl \
+svt \
+svxcore \
+sw \
+test \
+unotest \
+vcl \
+tl \
+tk \
+utl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_core_unocore,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_core_unocore,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
+-I$(SRCDIR)/sw/qa/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_core_unocore,\
+   udkapi \
+   offapi \
+   oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_core_unocore))
+$(eval $(call gb_CppunitTest_use_vcl,sw_core_unocore))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_core_unocore,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_core_unocore))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_unocore, \
+modules/swriter \
+))
+
+$(call gb_CppunitTest_get_target,sw_core_unocore): \
+$(call gb_Library_get_target,textconv_dict)
+
+$(eval $(call gb_CppunitTest_use_more_fonts,sw_core_unocore))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 4fd7a13dae8a..9ffbfa4f4106 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -115,6 +115,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_core_frmedt \
 CppunitTest_sw_core_txtnode \
 CppunitTest_sw_core_objectpositioning \
+CppunitTest_sw_core_unocore \
 ))
 
 ifneq ($(DISABLE_GUI),TRUE)
diff --git a/sw/qa/core/unocore/data/tdf119081.odt 
b/sw/qa/core/unocore/data/tdf119081.odt
new file mode 100644
index ..a9b479dd59df
Binary files /dev/null and b/sw/qa/core/unocore/data/tdf119081.odt differ
diff --git a/sw/qa/core/unocore/unocore.cxx b/sw/qa/core/unocore/unocore.cxx
new file mode 100644
index ..d8d72ecf369f
--- /dev/null
+++ b/

[Libreoffice-commits] core.git: extras/source include/sfx2 sfx2/inc sfx2/source sfx2/uiconfig solenv/bin

[Caolán McNamara (via logerrit)]

 extras/source/glade/libreoffice-catalog.xml.in |3 
 include/sfx2/emojipopup.hxx|1 
 sfx2/inc/emojicontrol.hxx  |   37 +--
 sfx2/inc/emojiview.hxx |   14 -
 sfx2/source/control/emojicontrol.cxx   |  161 ++
 sfx2/source/control/emojipopup.cxx |   14 +
 sfx2/source/control/emojiview.cxx  |   50 ++--
 sfx2/source/control/thumbnailview.cxx  |8 
 sfx2/uiconfig/ui/emojicontrol.ui   |  270 +
 solenv/bin/native-code.py  |1 
 10 files changed, 238 insertions(+), 321 deletions(-)

New commits:
commit 6c0a6e2e91069da9db13c27a058721b88e8eaba9
Author: Caolán McNamara 
AuthorDate: Mon Jun 22 15:17:04 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jun 23 10:21:26 2020 +0200

weld emoji dropdown

sharing a single widget between multiple notebook pages isn't
going to work with native notebooks, so replace with a row
of toggle buttons

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

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index f20ba840153b..170c0a8967a6 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -28,9 +28,6 @@
 
-
 
diff --git a/include/sfx2/emojipopup.hxx b/include/sfx2/emojipopup.hxx
index 20d1e493c250..04f6fe720247 100644
--- a/include/sfx2/emojipopup.hxx
+++ b/include/sfx2/emojipopup.hxx
@@ -30,6 +30,7 @@ public:
 virtual ~EmojiPopup() override;
 
 virtual VclPtr createVclPopupWindow( vcl::Window* pParent ) 
override;
+virtual std::unique_ptr weldPopupWindow() override;
 
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
diff --git a/sfx2/inc/emojicontrol.hxx b/sfx2/inc/emojicontrol.hxx
index 33d0e021bbe1..98a28985fe42 100644
--- a/sfx2/inc/emojicontrol.hxx
+++ b/sfx2/inc/emojicontrol.hxx
@@ -7,15 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SFX2_INC_EMOJICONTROL_HXX
-#define INCLUDED_SFX2_INC_EMOJICONTROL_HXX
+#pragma once
 
 #include 
 #include 
-#include 
 #include 
-
-#define TAB_FONT_SIZE 15
+#include 
 
 namespace com::sun::star::frame { class XFrame; }
 
@@ -24,28 +21,34 @@ class EmojiView;
 class ThumbnailViewItem;
 enum class FILTER_CATEGORY;
 
-class SfxEmojiControl final : public svtools::ToolbarPopup
+class SfxEmojiControl final : public WeldToolbarPopup
+
 {
 public:
-explicit SfxEmojiControl(EmojiPopup* pControl, vcl::Window* pParent);
-
+explicit SfxEmojiControl(EmojiPopup* pControl, weld::Widget* pParent);
 virtual ~SfxEmojiControl() override;
 
-virtual void dispose() override;
+virtual void GrabFocus() override;
 
 private:
-void ConvertLabelToUnicode(sal_uInt16 nPageId);
+static void ConvertLabelToUnicode(weld::ToggleButton& rBtn);
 
-/// Return filter according to the currently selected tab page.
-FILTER_CATEGORY getCurrentFilter() const;
+FILTER_CATEGORY getFilter(const weld::Button& rBtn) const;
 
-DECL_LINK(ActivatePageHdl, TabControl*, void);
+DECL_LINK(ActivatePageHdl, weld::Button&, void);
 DECL_STATIC_LINK(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, void);
 
-VclPtr   mpTabControl;
-VclPtrmpEmojiView;
+std::unique_ptr mxPeopleBtn;
+std::unique_ptr mxNatureBtn;
+std::unique_ptr mxFoodBtn;
+std::unique_ptr mxActivityBtn;
+std::unique_ptr mxTravelBtn;
+std::unique_ptr mxObjectsBtn;
+std::unique_ptr mxSymbolsBtn;
+std::unique_ptr mxFlagsBtn;
+std::unique_ptr mxUnicode9Btn;
+std::unique_ptr mxEmojiView;
+std::unique_ptr mxEmojiWeld;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/emojiview.hxx b/sfx2/inc/emojiview.hxx
index 4ee37ac6f581..68cdb962128e 100644
--- a/sfx2/inc/emojiview.hxx
+++ b/sfx2/inc/emojiview.hxx
@@ -49,26 +49,26 @@ private:
 };
 
 
-class EmojiView final : public ThumbnailView
+class EmojiView final : public SfxThumbnailView
 {
 public:
-EmojiView ( vcl::Window* pParent);
+EmojiView(std::unique_ptr xWindow);
 
-virtual ~EmojiView () override;
+virtual ~EmojiView() override;
 
 // Fill view with emojis
-void Populate ();
+void Populate();
 
 void setInsertEmojiHdl (const Link &rLink);
 
 void AppendItem(const OUString &rTitle, const OUString &rCategory, const 
OUString &rName );
 
 private:
-virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
+virtual bool MouseButtonDown( const MouseEvent& rMEvt ) override;
 
-virtual void KeyInput( const KeyEvent& rKEvt ) override;
+virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
 
-virtual void ApplySett

[Libreoffice-commits] core.git: extras/source include/svx solenv/bin svx/inc svx/source svx/uiconfig

[Caolán McNamara (via logerrit)]

 extras/source/glade/libreoffice-catalog.xml.in |4 
 include/svx/xmlexchg.hxx   |2 
 solenv/bin/native-code.py  |1 
 svx/inc/bitmaps.hlst   |5 
 svx/source/form/datanavi.cxx   | 1381 +++--
 svx/source/inc/datalistener.hxx|2 
 svx/source/inc/datanavi.hxx|  160 +-
 svx/uiconfig/ui/datanavigator.ui   |  227 ++--
 svx/uiconfig/ui/xformspage.ui  |   89 +
 9 files changed, 905 insertions(+), 966 deletions(-)

New commits:
commit 3c5e074a8fe5e0a18d326d37bc54a5ec0f077e4e
Author: Caolán McNamara 
AuthorDate: Fri Jun 19 12:37:05 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jun 23 10:21:08 2020 +0200

weld DataNavigator

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

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 9316bb275289..f20ba840153b 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -35,10 +35,6 @@
 generic-name="Template Icon View" parent="GtkIconView"
 icon-name="widget-gtk-iconview"/>
 
-
-
 
diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx
index 63ebd758140d..b29dec181513 100644
--- a/include/svx/xmlexchg.hxx
+++ b/include/svx/xmlexchg.hxx
@@ -61,7 +61,7 @@ namespace svx
 
 //= OXFormsTransferable
 
-class SVXCORE_DLLPUBLIC OXFormsTransferable final : public 
TransferableHelper {
+class SVXCORE_DLLPUBLIC OXFormsTransferable final : public 
TransferDataContainer {
 
 // TransferableHelper overridables
 virtual voidAddSupportedFormats() override;
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 661d64894c37..dbd9cf720376 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -522,7 +522,6 @@ constructor_map = {
 
 custom_widgets = [
 'ContextVBox',
-'DataTreeListBox',
 'DropdownBox',
 'EmojiView',
 'ManagedMenuButton',
diff --git a/svx/inc/bitmaps.hlst b/svx/inc/bitmaps.hlst
index fdb60807e47d..4b5f02162c97 100644
--- a/svx/inc/bitmaps.hlst
+++ b/svx/inc/bitmaps.hlst
@@ -78,11 +78,6 @@
 #define RID_SVXBMP_LAMP_ON  "svx/res/lighton.png"
 #define RID_SVXBMP_LAMP_OFF "svx/res/light.png"
 
-#define RID_SVXBMP_ADD  "res/tb01.png"
-#define RID_SVXBMP_ADD_ELEMENT  "res/tb02.png"
-#define RID_SVXBMP_ADD_ATTRIBUTE"res/tb03.png"
-#define RID_SVXBMP_EDIT "res/tb04.png"
-#define RID_SVXBMP_REMOVE   "res/tb05.png"
 #define RID_SVXBMP_ELEMENT  "res/da03.png"
 #define RID_SVXBMP_ATTRIBUTE"res/da04.png"
 #define RID_SVXBMP_TEXT "res/da05.png"
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 59ae4d1f26bf..ab8ff5c35007 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -34,16 +34,14 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
-#include 
+#include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -119,288 +117,192 @@ namespace svxform
 m_xPropSet( _rxSet ) {}
 };
 
-DataTreeListBox::DataTreeListBox(vcl::Window* pParent, WinBits nBits)
-: SvTreeListBox(pParent, nBits)
-, m_pXFormsPage(nullptr)
-, m_eGroup(DGTUnknown)
-, m_nAddId(0)
-, m_nAddElementId(0)
-, m_nAddAttributeId(0)
-, m_nEditId(0)
-, m_nRemoveId(0)
-{
-EnableContextMenuHandling();
-
-if ( DGTInstance == m_eGroup )
-SetDragDropMode( DragDropMode::CTRL_MOVE |DragDropMode::CTRL_COPY 
| DragDropMode::APP_COPY );
-}
-
-DataTreeListBox::~DataTreeListBox()
-{
-disposeOnce();
-}
-
-void DataTreeListBox::dispose()
+DataTreeDropTarget::DataTreeDropTarget(weld::TreeView& rWidget)
+: DropTargetHelper(rWidget.get_drop_target())
 {
-DeleteAndClear();
-m_xMenu.clear();
-m_xBuilder.reset();
-m_pXFormsPage.clear();
-SvTreeListBox::dispose();
 }
 
-sal_Int8 DataTreeListBox::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
+sal_Int8 DataTreeDropTarget::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
 {
 return DND_ACTION_NONE;
 }
 
-sal_Int8 DataTreeListBox::ExecuteDrop( const ExecuteDropEvent& /*rEvt*/ )
+sal_Int8 DataTreeDropTarget::ExecuteDrop( const ExecuteDropEvent& /*rEvt*/ 
)
 {
 return DND_ACTION_NONE;
 }
 
-   

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

[Szymon Kłos (via logerrit)]

 desktop/source/lib/init.cxx |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 5aea21c0f92be5ac2fc1bd510723c1de3f01f058
Author: Szymon Kłos 
AuthorDate: Tue Jun 16 12:06:56 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Jun 23 10:17:38 2020 +0200

jsdialog: try call welded action even if window doesn't exist

Change-Id: I8ae96d2e61899c89b5ddb8ff362d8a066ded3960
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96922
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2d043e276a7c..771bc2e72b02 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3580,12 +3580,7 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 if (!pWindow && nWindowId >= 10 /* why unsigned? */)
 pWindow = getSidebarWindow();
 
-if (!pWindow)
-{
-SetLastExceptionMsg("Document doesn't support dialog rendering, or 
window not found.");
-return;
-}
-else if (aMap.find("id") != aMap.end())
+if (aMap.find("id") != aMap.end())
 {
 static const OUString sClickAction("CLICK");
 static const OUString sSelectAction("SELECT");
@@ -3700,6 +3695,12 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 }
 }
 
+if (!pWindow)
+{
+SetLastExceptionMsg("Document doesn't support dialog 
rendering, or window not found.");
+return;
+}
+
 if (!bIsWeldedDialog || bContinueWithLOKWindow)
 {
 WindowUIObject aUIObject(pWindow);
___
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' - sw/source

[Szymon Kłos (via logerrit)]

 sw/source/uibase/app/docstyle.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 7463f150bf8a31b5febe3f91dc082124d53df504
Author: Szymon Kłos 
AuthorDate: Tue Jun 16 11:42:13 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Jun 23 10:11:58 2020 +0200

Getting styles info shouldnt set document modification state

Getter function modified document's 'is modified' state
and broadcasted it due to internal styles creation/delete

That caused spam of SwCursorShell::UpdateCursor calls
when styles preview widget was used in the notebookbar.

Change-Id: I22ee4e820adf79f6e816cb35161cb21f26abb2b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96921
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/sw/source/uibase/app/docstyle.cxx 
b/sw/source/uibase/app/docstyle.cxx
index 4326445cd8ec..def145366ad8 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -1290,7 +1290,14 @@ std::unique_ptr 
SwDocStyleSheet::GetItemSetForPreview()
 // time, return one "flattened" item set that contains all items from
 // all parents.
 std::unique_ptr pRet;
+
+bool bModifiedEnabled = rDoc.getIDocumentState().IsEnableSetModified();
+rDoc.getIDocumentState().SetEnableSetModified(false);
+
 FillStyleSheet(FillPreview, &pRet);
+
+rDoc.getIDocumentState().SetEnableSetModified(bModifiedEnabled);
+
 assert(pRet);
 return pRet;
 }
___
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' - sfx2/source

[Szymon Kłos (via logerrit)]

 sfx2/source/notebookbar/PriorityHBox.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0ab5bfd495cf7ea1cab99321ff031ae390247825
Author: Szymon Kłos 
AuthorDate: Tue Jun 16 10:37:02 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Jun 23 10:11:40 2020 +0200

notebookbar: don't hide elements for online

Change-Id: Icbef09e9e012d88372b164d2f69f80b06161772b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96920
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/sfx2/source/notebookbar/PriorityHBox.cxx 
b/sfx2/source/notebookbar/PriorityHBox.cxx
index cb4a1be51d8c..70ef4c596eb4 100644
--- a/sfx2/source/notebookbar/PriorityHBox.cxx
+++ b/sfx2/source/notebookbar/PriorityHBox.cxx
@@ -23,6 +23,7 @@
 #include 
 #include "DropdownBox.hxx"
 #include "PriorityHBox.hxx"
+#include 
 
 namespace
 {
@@ -115,7 +116,7 @@ void PriorityHBox::Resize()
 if (!m_bInitialized && SfxViewFrame::Current())
 Initialize();
 
-if (!m_bInitialized)
+if (!m_bInitialized || comphelper::LibreOfficeKit::isActive())
 {
 return VclHBox::Resize();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 92859fafdaffe5dbd7e5e27e7c02725c4e64a3e6
Author: Tor Lillqvist 
AuthorDate: Tue Jun 23 09:22:41 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jun 23 09:51:23 2020 +0200

Accept iOS SDK 14.0

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

diff --git a/configure.ac b/configure.ac
index e9528f9fdda9..1b43e189bcb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3068,8 +3068,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=13.5
-older_sdk_vers="13.4 13.2 13.1 13.0 12.4 12.2"
+current_sdk_ver=14.0
+older_sdk_vers="13.5 13.4 13.2 13.1 13.0 12.4 12.2"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=12.2
___
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' - 2 commits - include/sfx2 include/vcl sfx2/Library_sfx.mk sfx2/source vcl/source

[Szymon Kłos (via logerrit)]

 include/sfx2/notebookbar/SfxNotebookBar.hxx  |4 
 include/sfx2/notebookbar/WeldedTabbedNotebookbar.hxx |   35 
 include/vcl/notebookbar.hxx  |   10 ++
 sfx2/Library_sfx.mk  |1 
 sfx2/source/notebookbar/SfxNotebookBar.cxx   |   30 ---
 sfx2/source/notebookbar/WeldedTabbedNotebookbar.cxx  |   25 ++
 vcl/source/control/notebookbar.cxx   |   79 ++-
 vcl/source/window/builder.cxx|5 +
 8 files changed, 159 insertions(+), 30 deletions(-)

New commits:
commit 86578b072fac17b952e81fd82bac1d8f8a7e2476
Author: Szymon Kłos 
AuthorDate: Tue Jun 16 08:40:13 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Jun 23 09:29:55 2020 +0200

notebookbar: use JSInstanceBuilder for styles preview in online

Change-Id: I826ca92aec5e324b935dfc7c52fc95c6ce5c5e05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96915
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 1997f64a3f5f..eaca96c6e57c 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -167,6 +167,11 @@ weld::Builder* Application::CreateBuilder(weld::Widget* 
pParent, const OUString
 
 weld::Builder* Application::CreateInterimBuilder(vcl::Window* pParent, const 
OUString &rUIFile)
 {
+if (comphelper::LibreOfficeKit::isActive() && rUIFile == 
"svx/ui/stylespreview.ui")
+{
+return new JSInstanceBuilder(pParent, 
VclBuilderContainer::getUIRootDir(), rUIFile, 
css::uno::Reference());
+}
+
 return ImplGetSVData()->mpDefInst->CreateInterimBuilder(pParent, 
VclBuilderContainer::getUIRootDir(), rUIFile);
 }
 
commit a69efab5583c289ed5d775b1e90a0b357637eb58
Author: Szymon Kłos 
AuthorDate: Fri Jun 5 06:42:45 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Jun 23 09:29:46 2020 +0200

notebookbar: build using weld::Builder

and provide welded implementation for writer tabbed

Change-Id: Id6c71234cb1f40fd3889555785fcdbe84b801edd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96917
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx 
b/include/sfx2/notebookbar/SfxNotebookBar.hxx
index 1a3babd53d9e..4fbda295cace 100644
--- a/include/sfx2/notebookbar/SfxNotebookBar.hxx
+++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx
@@ -19,6 +19,7 @@ namespace com::sun::star::uno { template  class 
Reference; }
 class SfxBindings;
 class SfxViewFrame;
 class SystemWindow;
+class WeldedTabbedNotebookbar;
 
 namespace sfx2 {
 
@@ -59,6 +60,9 @@ public:
 private:
 static bool m_bLock;
 static bool m_bHide;
+static std::unique_ptr 
m_pNotebookBarWeldedWrapper;
+
+DECL_STATIC_LINK(SfxNotebookBar, VclDisposeHdl, const void*, void);
 };
 
 } // namespace sfx2
diff --git a/include/sfx2/notebookbar/WeldedTabbedNotebookbar.hxx 
b/include/sfx2/notebookbar/WeldedTabbedNotebookbar.hxx
new file mode 100644
index ..d709fc64fcf1
--- /dev/null
+++ b/include/sfx2/notebookbar/WeldedTabbedNotebookbar.hxx
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SFX2_NOTEBOOKBAR_WRITERTABBEDNOTEBOOKBAR_HXX
+#define INCLUDED_SFX2_NOTEBOOKBAR_WRITERTABBEDNOTEBOOKBAR_HXX
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+/** Tabbed implementation of NotebookBar for Writer
+*/
+class SFX2_DLLPUBLIC WeldedTabbedNotebookbar
+{
+std::unique_ptr m_xBuilder;
+
+std::unique_ptr m_xContainer;
+std::unique_ptr m_xNotebook;
+
+public:
+WeldedTabbedNotebookbar(VclPtr& pContainerWindow, const 
OUString& rUIFilePath,
+const css::uno::Reference& 
rFrame);
+};
+
+#endif // INCLUDED_SFX2_NOTEBOOKBAR_SFXNOTEBOOKBAR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx
index 457a64b9a206..3b4fa740e779 100644
--- a/include/vcl/notebookbar.hxx
+++ b/include/vcl/notebookbar.hxx
@@ -47,6 +47,11 @@ public:
 void ControlListenerForCurrentController(bool bListen);
 void StopListeningAllControllers();
 
+bool IsWelded() { return m_bIsWelded; }
+VclPtr& GetMainContainer() { return m_xVclContentArea; }
+OUString GetUIFilePath() { return m_sUIXMLDescription; }
+void SetDisposeCallback(const Link rDisposeCallback);
+
 private:
 VclPtr m_pSystemWindow;
 css::uno::Reference m_pEventListener;
@@ -54,6 +59,11 @@ private:
 std::vector m_pContextContainers;
 css::uno::Reference mxFrame;
 
+VclPtr m_xV

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

[Szymon Kłos (via logerrit)]

 sw/uiconfig/swriter/ui/notebookbar.ui |  179 +-
 1 file changed, 8 insertions(+), 171 deletions(-)

New commits:
commit 80b36ded609d77bc697644ce632be6c5fd4ec322
Author: Szymon Kłos 
AuthorDate: Tue Jun 16 08:41:20 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Jun 23 09:09:22 2020 +0200

notebookbar: insert styles preview widget

Change-Id: I9a9baed9bc6b769a83295f05fd17133b12965398
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96916
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui 
b/sw/uiconfig/swriter/ui/notebookbar.ui
index 335a1b7fb5df..152d8d6aa074 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -4150,32 +4150,6 @@
 0
   
 
-
-  
-True
-True
-center
-icons
-False
-
-  
-True
-False
-.uno:StyleApply?Style:string=Standard&FamilyName:string=ParagraphStyles
-cmd/sc_defaultcharstyle.png
-  
-  
-False
-True
-  
-
-  
-  
-False
-True
-1
-  
-
   
   
 False
@@ -4206,166 +4180,29 @@
 center
 vertical
 
-  
+  
 True
-False
-center
-
-  
-True
-True
-icons
-False
-
-  
-True
-False
-center
-True
-.uno:StyleApply
-  
-  
-True
-True
-  
-
-  
-  
-True
-True
-1
-  
-
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-False
-center
-True
+True
+icons
+False
 
-  
+  
 True
 False
-5
-5
-vertical
-  
-  
-False
-True
-5
-3
-  
-
-
-  
-True
-True
 center
-center
-True
-True
-icon

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

[Szymon Kłos (via logerrit)]

 include/vcl/jsdialog/jsdialogbuilder.hxx |   17 ++--
 vcl/jsdialog/jsdialogbuilder.cxx |   43 +++
 2 files changed, 46 insertions(+), 14 deletions(-)

New commits:
commit 526c4bd5dbe0225a1ff14ff1e7fe32151ab7d29d
Author: Szymon Kłos 
AuthorDate: Tue Mar 31 15:42:28 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Jun 23 09:09:00 2020 +0200

jsdialog: use Idle timer to send updates

Change-Id: Ib4f18bab1279c622b576dca53169b40c4a2526bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94482
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96847
Tested-by: Jenkins

diff --git a/include/vcl/jsdialog/jsdialogbuilder.hxx 
b/include/vcl/jsdialog/jsdialogbuilder.hxx
index 161d770d613a..62f6d11a2d7a 100644
--- a/include/vcl/jsdialog/jsdialogbuilder.hxx
+++ b/include/vcl/jsdialog/jsdialogbuilder.hxx
@@ -22,13 +22,24 @@
 class ComboBox;
 typedef std::map WidgetMap;
 
-class JSDialogSender
+class JSDialogNotifyIdle : public Idle
 {
-VclPtr m_aOwnedToplevel;
+VclPtr m_aWindow;
+std::string m_LastNotificationMessage;
+
+public:
+JSDialogNotifyIdle(VclPtr aWindow);
+
+void Invoke() override;
+};
+
+class VCL_DLLPUBLIC JSDialogSender
+{
+std::unique_ptr mpIdleNotify;
 
 public:
 JSDialogSender(VclPtr aOwnedToplevel)
-: m_aOwnedToplevel(aOwnedToplevel)
+: mpIdleNotify(new JSDialogNotifyIdle(aOwnedToplevel))
 {
 }
 
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 2ab05b40dd21..d7f35b7d6039 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -17,23 +17,44 @@
 #include 
 #include 
 
-void JSDialogSender::notifyDialogState()
+JSDialogNotifyIdle::JSDialogNotifyIdle(VclPtr aWindow)
+: Idle("JSDialog notify")
+, m_aWindow(aWindow)
+, m_LastNotificationMessage()
 {
-if (!m_aOwnedToplevel)
-return;
+SetPriority(TaskPriority::POST_PAINT);
+}
 
-const vcl::ILibreOfficeKitNotifier* pNotifier = 
m_aOwnedToplevel->GetLOKNotifier();
-if (pNotifier)
+void JSDialogNotifyIdle::Invoke()
+{
+try
 {
-std::stringstream aStream;
-boost::property_tree::ptree aTree = 
m_aOwnedToplevel->DumpAsPropertyTree();
-aTree.put("id", m_aOwnedToplevel->GetLOKWindowId());
-boost::property_tree::write_json(aStream, aTree);
-const std::string message = aStream.str();
-pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, 
message.c_str());
+if (!m_aWindow)
+return;
+
+const vcl::ILibreOfficeKitNotifier* pNotifier = 
m_aWindow->GetLOKNotifier();
+if (pNotifier)
+{
+std::stringstream aStream;
+boost::property_tree::ptree aTree = 
m_aWindow->DumpAsPropertyTree();
+aTree.put("id", m_aWindow->GetLOKWindowId());
+boost::property_tree::write_json(aStream, aTree);
+const std::string message = aStream.str();
+if (message != m_LastNotificationMessage)
+{
+m_LastNotificationMessage = message;
+pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, 
message.c_str());
+}
+}
+}
+catch (boost::property_tree::json_parser::json_parser_error& rError)
+{
+SAL_WARN("vcl", rError.message());
 }
 }
 
+void JSDialogSender::notifyDialogState() { mpIdleNotify->Start(); }
+
 JSInstanceBuilder::JSInstanceBuilder(weld::Widget* pParent, const OUString& 
rUIRoot,
  const OUString& rUIFile)
 : SalInstanceBuilder(dynamic_cast(pParent)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sw/CppunitTest_sw_core_unocore.mk |   77 
 sw/Module_sw.mk   |1 
 sw/qa/core/unocore/data/tdf119081.odt |binary
 sw/qa/core/unocore/unocore.cxx|   91 ++
 sw/source/core/unocore/unotext.cxx|3 -
 5 files changed, 170 insertions(+), 2 deletions(-)

New commits:
commit e0d0274c2b806f5148b413926ec2e58c75ce04a1
Author: Miklos Vajna 
AuthorDate: Mon Jun 22 21:04:47 2020 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 23 09:02:21 2020 +0200

tdf#119081 sw: fix RTF paste into outer table cell

Regression from commit ed654c4aa7f9f10fcb16127349009bc0c38b12e8 (Revert
"fdo#43869 use the old rtf importer for paste", 2012-11-30), the direct
problem is that SwXText::insertTextPortion() is now used by
writerfilter, so in case it's not as good as the internal API used by
the old RTF filter, we have a problem.

This function calls SwXCell::CreateCursor(), which calls
SwXCell::createTextCursor(), which uses Move() to go to the first
content node in the cell, but that means we end up at the inner cell's
XText for an outer cell.

So later when we want to go to the end of the outer cell, we can't, as
that would be a different XText and we throw an exception.

Fix the problem by instead using createTextCursorByRange(), which
immediately positions the cursor at the insert position, so the XText
will be correct.

FWIW, the ODF import at SwXMLImport::setTextInsertMode() also uses
createTextCursorByRange() to handle this situation.

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

diff --git a/sw/CppunitTest_sw_core_unocore.mk 
b/sw/CppunitTest_sw_core_unocore.mk
new file mode 100644
index ..6ff38dfc1890
--- /dev/null
+++ b/sw/CppunitTest_sw_core_unocore.mk
@@ -0,0 +1,77 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_core_unocore))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_unocore))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_unocore, \
+sw/qa/core/unocore/unocore \
+))
+
+# note: this links msword only for the reason to have an order dependency,
+# because "make sw.check" will not see the dependency through services.rdb
+$(eval $(call gb_CppunitTest_use_libraries,sw_core_unocore, \
+comphelper \
+cppu \
+cppuhelper \
+editeng \
+msword \
+sal \
+sfx \
+svl \
+svt \
+svxcore \
+sw \
+test \
+unotest \
+vcl \
+tl \
+tk \
+utl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_core_unocore,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_core_unocore,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
+-I$(SRCDIR)/sw/qa/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_core_unocore,\
+   udkapi \
+   offapi \
+   oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_core_unocore))
+$(eval $(call gb_CppunitTest_use_vcl,sw_core_unocore))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_core_unocore,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_core_unocore))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_unocore, \
+modules/swriter \
+))
+
+$(call gb_CppunitTest_get_target,sw_core_unocore): \
+$(call gb_Library_get_target,textconv_dict)
+
+$(eval $(call gb_CppunitTest_use_more_fonts,sw_core_unocore))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 4fd7a13dae8a..9ffbfa4f4106 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -115,6 +115,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_core_frmedt \
 CppunitTest_sw_core_txtnode \
 CppunitTest_sw_core_objectpositioning \
+CppunitTest_sw_core_unocore \
 ))
 
 ifneq ($(DISABLE_GUI),TRUE)
diff --git a/sw/qa/core/unocore/data/tdf119081.odt 
b/sw/qa/core/unocore/data/tdf119081.odt
new file mode 100644
index ..a9b479dd59df
Binary files /dev/null and b/sw/qa/core/unocore/data/tdf119081.odt differ
diff --git a/sw/qa/core/unocore/unocore.cxx b/sw/qa/core/unocore/unocore.cxx
new file mode 100644
index ..d8d72ecf369f
--- /dev/null
+++ b/sw/qa/core/unocore/unocore.cxx
@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: