subject:"\[Libreoffice\-commits\] core.git\:"

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-5' - sw/qa

2023-12-07 Thread Mike Kaganski (via logerrit)

 sw/qa/extras/uiwriter/uiwriter7.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ada5990e4fbc4ccf844af6ff9453e815f942c54a
Author: Mike Kaganski 
AuthorDate: Thu Dec 7 12:22:56 2023 +0300
Commit: Mike Kaganski 
CommitDate: Thu Dec 7 12:22:56 2023 +0300

Fix build

Change-Id: I8bed8e0d267004a0a8b7b2c5e178b2a6ae6a3f05

diff --git a/sw/qa/extras/uiwriter/uiwriter7.cxx 
b/sw/qa/extras/uiwriter/uiwriter7.cxx
index d78021bd9e72..92b6732f2778 100644
--- a/sw/qa/extras/uiwriter/uiwriter7.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter7.cxx
@@ -2825,7 +2825,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf149089)
 
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf62032ApplyStyle)
 {
-SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf62032_apply_style.odt");
+createSwDoc("tdf62032_apply_style.odt");
+SwDoc* pDoc = getSwDoc();
 SwWrtShell* pWrtSh = pDoc->GetDocShell()->GetWrtShell();
 
 pWrtSh->Down(/*bSelect=*/false);

[Libreoffice-commits] core.git: accessibility/inc basctl/inc canvas/qa canvas/source chart2/inc comphelper/inc cppcanvas/inc cppcanvas/qa cui/inc dbaccess/inc desktop/inc desktop/source drawinglayer/i

2023-12-07 Thread Noel Grandin (via logerrit)

 accessibility/inc/pch/precompiled_acc.hxx |1 
 basctl/inc/pch/precompiled_basctl.hxx |1 
 canvas/qa/cppunit/canvastest.cxx  |4 
 canvas/source/directx/dx_vcltools.cxx |8 
 canvas/source/vcl/canvashelper.cxx|2 
 chart2/inc/pch/precompiled_chartcontroller.hxx|1 
 comphelper/inc/pch/precompiled_comphelper.hxx |1 
 cppcanvas/inc/pch/precompiled_cppcanvas.hxx   |1 
 cppcanvas/qa/extras/emfplus/emfplus.cxx   |2 
 cui/inc/pch/precompiled_cui.hxx   |1 
 dbaccess/inc/pch/precompiled_dba.hxx  |1 
 desktop/inc/pch/precompiled_sofficeapp.hxx|1 
 desktop/source/lib/init.cxx   |4 
 drawinglayer/inc/texture/texture3d.hxx|5 
 drawinglayer/qa/unit/vclmetafileprocessor2d.cxx   |2 
 drawinglayer/qa/unit/vclpixelprocessor2d.cxx  |2 
 drawinglayer/source/processor2d/cairopixelprocessor2d.cxx |6 
 drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx   |8 
 drawinglayer/source/texture/texture3d.cxx |4 
 editeng/inc/pch/precompiled_editeng.hxx   |1 
 emfio/source/reader/wmfreader.cxx |2 
 filter/source/msfilter/msdffimp.cxx   |2 
 filter/source/msfilter/svdfppt.cxx|2 
 forms/source/component/imgprod.cxx|   11 -
 framework/inc/pch/precompiled_fwk.hxx |1 
 include/vcl/BitmapInfoAccess.hxx  |   52 +
 include/vcl/BitmapReadAccess.hxx  |   51 +
 include/vcl/BitmapWriteAccess.hxx |   54 +-
 include/vcl/alpha.hxx |9 -
 include/vcl/bitmap.hxx|   11 -
 include/vcl/scopedbitmapaccess.hxx|  123 --
 reportdesign/inc/pch/precompiled_rpt.hxx  |1 
 reportdesign/inc/pch/precompiled_rptui.hxx|1 
 sc/inc/pch/precompiled_sc.hxx |1 
 sc/source/filter/excel/xeescher.cxx   |2 
 sd/inc/pch/precompiled_sdui.hxx   |1 
 sd/qa/unit/PNGExportTests.cxx |   30 +--
 sd/qa/unit/import-tests2.cxx  |2 
 sd/qa/unit/tiledrendering/tiledrendering.cxx  |2 
 sd/source/ui/dlg/vectdlg.cxx  |2 
 slideshow/inc/pch/precompiled_slideshow.hxx   |1 
 solenv/clang-format/excludelist   |1 
 svtools/inc/pch/precompiled_svt.hxx   |1 
 svx/inc/pch/precompiled_svxcore.hxx   |1 
 svx/qa/unit/customshapes.cxx  |8 
 svx/source/svdraw/svdetc.cxx  |2 
 sw/inc/pch/precompiled_msword.hxx |1 
 sw/inc/pch/precompiled_swui.hxx   |1 
 sw/inc/pch/precompiled_vbaswobj.hxx   |1 
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx |2 
 sw/qa/extras/tiledrendering/tiledrendering.cxx|   16 -
 vbahelper/inc/pch/precompiled_msforms.hxx |1 
 vcl/backendtest/outputdevice/bitmap.cxx   |6 
 vcl/backendtest/outputdevice/common.cxx   |2 
 vcl/inc/canvasbitmap.hxx  |   13 -
 vcl/inc/pch/precompiled_vcl.hxx   |2 
 vcl/qa/cppunit/BackendTest.cxx|6 
 vcl/qa/cppunit/BitmapExTest.cxx   |   28 +--
 vcl/qa/cppunit/BitmapFilterTest.cxx   |4 
 vcl/qa/cppunit/BitmapProcessorTest.cxx|   10 -
 vcl/qa/cppunit/BitmapScaleTest.cxx|4 
 vcl/qa/cppunit/BitmapTest.cxx |   18 +-
 vcl/qa/cppunit/GraphicTest.cxx|2 
 vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx  |2 
 vcl/qa/cppunit/canvasbitmaptest.cxx   |   20 --
 vcl/qa/cppunit/cjktext.cxx|4 
 vcl/qa/cppunit/drawmode.cxx   |6 
 vcl/qa/cppunit/gen/gen.cxx|4 
 vcl/qa/cppunit/gradient.cxx   |2 
 vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx|   10 -
 vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx|   12 -
 vcl/qa/cppunit/jpeg/JpegReaderTest.cxx|4 
 vcl/qa/cppunit/jpeg/JpegWriterTest.cxx|4 
 vcl/qa/cppunit/outdev.cxx

[Libreoffice-commits] core.git: 2 commits - include/sfx2 package/source sfx2/source

2023-12-07 Thread Michael Stahl (via logerrit)

 include/sfx2/docfile.hxx |6 -
 package/source/zippackage/ZipPackage.cxx |8 +
 sfx2/source/appl/appopen.cxx |   18 ++-
 sfx2/source/doc/docfile.cxx  |  172 ++--
 sfx2/source/doc/objmisc.cxx  |2 
 sfx2/source/doc/objserv.cxx  |9 +
 sfx2/source/doc/objstor.cxx  |  186 ---
 7 files changed, 337 insertions(+), 64 deletions(-)

New commits:
commit 7101c620857cb885076b85cd1447e50d30cab528
Author: Michael Stahl 
AuthorDate: Wed Dec 6 20:19:15 2023 +0100
Commit: Michael Stahl 
CommitDate: Thu Dec 7 09:28:50 2023 +0100

sfx2: simplify SetCommonStorageEncryptionData() calls

Some of these look redundant, as SfxMedium::GetStorage() already does
this earlier.

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

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index c801fb52bc41..411c980b6e09 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1869,6 +1869,11 @@ uno::Reference < embed::XStorage > 
SfxMedium::GetStorage( bool bCreateTempFile )
 }
 }
 
+if (GetErrorCode()) // decryption failed?
+{
+pImpl->xStorage.clear();
+}
+
 // TODO/LATER: Get versionlist on demand
 if ( pImpl->xStorage.is() )
 {
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 9ae2c8faad63..598b85aa07e8 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1012,26 +1012,17 @@ bool SfxObjectShell::DoSave()
 }
 }
 
-uno::Sequence< beans::NamedValue > aEncryptionData;
 if ( IsPackageStorageFormat_Impl( *GetMedium() ) )
 {
-if ( GetEncryptionData_Impl( ()->GetItemSet(), 
aEncryptionData ) )
+GetMedium()->GetStorage(); // sets encryption properties if 
necessary
+if (GetMedium()->GetErrorCode())
 {
-try
-{
-//TODO/MBA: GetOutputStorage?! Special mode, because it's 
"Save"?!
-
::comphelper::OStorageHelper::SetCommonStorageEncryptionData( 
GetMedium()->GetStorage(), aEncryptionData );
-bOk = true;
-}
-catch( uno::Exception& )
-{
-SetError(ERRCODE_IO_GENERAL);
-}
-
-DBG_ASSERT( bOk, "The root storage must allow to set common 
password!\n" );
+SetError(ERRCODE_IO_GENERAL);
 }
 else
+{
 bOk = true;
+}
 #if HAVE_FEATURE_SCRIPTING
 if ( HasBasic() )
 {
@@ -1471,12 +1462,12 @@ bool SfxObjectShell::SaveTo_Impl
 bCopyTo =   GetCreateMode() == SfxObjectCreateMode::EMBEDDED ||
 (pSaveToItem && pSaveToItem->GetValue());
 
-bool bOk = false;
+bool bOk = true;
 // TODO/LATER: get rid of bOk
 if (bOwnTarget && pFilter && !(pFilter->GetFilterFlags() & 
SfxFilterFlags::STARONEFILTER))
 {
 uno::Reference< embed::XStorage > xMedStorage = rMedium.GetStorage();
-if ( !xMedStorage.is() )
+if (!xMedStorage.is() || rMedium.GetErrorCode())
 {
 // no saving without storage
 pImpl->bForbidReload = bOldStat;
@@ -1484,31 +1475,7 @@ bool SfxObjectShell::SaveTo_Impl
 }
 
 // transfer password from the parameters to the storage
-bool bPasswdProvided = false;
-if (aEncryptionData.getLength() != 0)
-{
-bPasswdProvided = true;
-if (xODFDecryptedInnerPackageStream.is())
-{
-bOk = true;
-}
-else
-{
-// TODO: GetStorage() already did that?
-try {
-
::comphelper::OStorageHelper::SetCommonStorageEncryptionData( xMedStorage, 
aEncryptionData );
-bOk = true;
-}
-catch( uno::Exception& )
-{
-SAL_WARN( "sfx.doc", "Setting of common encryption key 
failed!" );
-SetError(ERRCODE_IO_GENERAL);
-}
-}
-}
-else
-bOk = true;
-
+bool const bPasswdProvided(aEncryptionData.getLength() != 0);
 pFilter = rMedium.GetFilter();
 
 const SfxStringItem *pVersionItem = !rMedium.IsInCheckIn()? 
SfxItemSet::GetItem(pSet, SID_DOCINFO_COMMENTS, false): nullptr;
@@ -1777,22 +1744,10 @@ bool SfxObjectShell::SaveTo_Impl
 // now create the outer storage
 uno::Reference const 
xOuterStorage(rMedium.GetOutputStorage());
 assert(xOuterStorage.is());
+assert(!rMedium.GetErrorCode());
 // the outer

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

2023-12-07 Thread Michael Stahl (via logerrit)

 package/source/xstor/owriteablestream.cxx   |2 +-
 package/source/zippackage/ZipPackageStream.cxx  |3 +++
 sfx2/source/doc/docfile.cxx |   15 +++
 xmloff/source/core/xmlexp.cxx   |1 +
 xmlsecurity/source/xmlsec/nss/ciphercontext.cxx |8 
 5 files changed, 16 insertions(+), 13 deletions(-)

New commits:
commit f6536f4db61b73cf7fd4a44bb5ba61eff61f8f91
Author: Michael Stahl 
AuthorDate: Wed Dec 6 13:54:39 2023 +0100
Commit: Michael Stahl 
CommitDate: Thu Dec 7 09:28:08 2023 +0100

some cosmetic improvements, better warnings

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

diff --git a/package/source/xstor/owriteablestream.cxx 
b/package/source/xstor/owriteablestream.cxx
index 59e5e94316a3..68bf5d1688a0 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -1113,7 +1113,7 @@ uno::Reference< io::XStream > 
OWriteStream_Impl::GetStream( sal_Int32 nStreamMod
 }
 catch ( const uno::Exception& ex )
 {
-TOOLS_WARN_EXCEPTION( "package.xstor", "Can't write encryption 
related properties");
+TOOLS_WARN_EXCEPTION("package.xstor", "GetStream: decrypting 
stream failed");
 SetEncryptionKeyProperty_Impl( xPropertySet, uno::Sequence< 
beans::NamedValue >() );
 throw io::IOException(ex.Message); // TODO:
 }
diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 02282a03c4e5..d3c80cec2dce 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -947,6 +947,9 @@ uno::Reference< io::XInputStream > SAL_CALL 
ZipPackageStream::getDataStream()
 }
 catch( const packages::WrongPasswordException& )
 {
+// note: due to SHA1 check this fallback is only done for
+// * ODF 1.2 files written by OOo < 3.4beta / LO < 3.5
+// * ODF 1.1/OOoXML files written by any version
 if ( m_rZipPackage.GetStartKeyGenID() == 
xml::crypto::DigestID::SHA1 )
 {
 SAL_WARN("package", "ZipPackageStream::getDataStream(): SHA1 
mismatch, trying fallbacks...");
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 42fe7d72b8c5..f4dd7b62e10f 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2954,13 +2954,11 @@ void SfxMedium::Download( const Link& aLink 
)
 }
 
 
-void SfxMedium::Init_Impl()
-/*  [Description]
-Includes a valid:: sun:: com:: star:: util:: URL (If a file name was
-previously in there) in the logical name and if available sets the
-physical name as the file name.
+/**
+Sets m_aLogicName to a valid URL and if available sets
+the physical name m_aName to the file name.
  */
-
+void SfxMedium::Init_Impl()
 {
 Reference< XOutputStream > rOutStream;
 
@@ -4124,7 +4122,7 @@ bool SfxMedium::SignDocumentContentUsingCertificate(
 }
 catch ( const uno::Exception& )
 {
-SAL_WARN( "sfx.doc", "Couldn't use signing functionality!" );
+TOOLS_WARN_EXCEPTION("sfx.doc", "Couldn't use signing functionality!");
 }
 
 CloseAndRelease();
@@ -4134,6 +4132,7 @@ bool SfxMedium::SignDocumentContentUsingCertificate(
 return bChanges;
 }
 
+// note: this is the only function creating scripting signature
 bool SfxMedium::SignContents_Impl(weld::Window* pDialogParent,
   bool bSignScriptingContent,
   bool bHasValidDocumentSignature,
@@ -4294,7 +4293,7 @@ bool SfxMedium::SignContents_Impl(weld::Window* 
pDialogParent,
 }
 catch ( const uno::Exception& )
 {
-SAL_WARN( "sfx.doc", "Couldn't use signing functionality!" );
+TOOLS_WARN_EXCEPTION("sfx.doc", "Couldn't use signing functionality!");
 }
 
 CloseAndRelease();
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 7c6be149fac3..9900fa4d86fe 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1185,6 +1185,7 @@ lcl_AddGrddl(SvXMLExport const & rExport, const 
SvXMLExportFlags /*nExportMode*/
 #endif
 }
 
+// note: the point of this is presumably to mitigate SHA/1k info leak of plain 
text
 void SvXMLExport::addChaffWhenEncryptedStorage()
 {
 uno::Reference< embed::XEncryptionProtectedSource2 > 
xEncr(mpImpl->mxTargetStorage, uno::UNO_QUERY);
diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx 
b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
index ff3441249435..9577c6d9c025 100644
--- a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
+++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
@@ -160,7 +160,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL

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

2023-12-07 Thread Stephan Bergmann (via logerrit)

 configure.ac |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 0f32809a86630d9e8bbf46fef23e189896c8a497
Author: Stephan Bergmann 
AuthorDate: Wed Dec 6 21:49:38 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 7 09:05:18 2023 +0100

Adapt consteval failure check to recent GCC 14 trunk

...which happens to accept the original check from
af34108d90bbbce90cf00c4b23961787599c7fa5 "Use C++20 consteval for the
Color(sal_uInt32) ctor" now, but would still fail to compile the actual 
code at

> In file included from xmloff/source/chart/ColorPropertySet.hxx:23,
>  from xmloff/source/chart/ColorPropertySet.cxx:20:
> include/tools/color.hxx: In constructor 
‘xmloff::chart::ColorPropertySet::ColorPropertySet(Color)’:
> xmloff/source/chart/ColorPropertySet.cxx:81:9:   in ‘constexpr’ expansion 
of 
‘((xmloff::chart::ColorPropertySet*)this)->xmloff::chart::ColorPropertySet::m_nDefaultColor.Color::Color(10079487)’
> include/tools/color.hxx:82:11: error: modification of 
‘*(xmloff::chart::ColorPropertySet*)this’ is not a constant expression
>82 | : mValue(nColor)
>   |   ^~

(see the comment at 
"wrong "error: ‘this’ is not a constant expression" with consteval 
constructor")

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

diff --git a/configure.ac b/configure.ac
index e41223ff7ec1..1f3398fd5a0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14656,7 +14656,10 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([
 };
 S const s;
 
-struct S1 { consteval S1(int) {} };
+struct S1 {
+ int a;
+ consteval S1(int n): a(n) {}
+};
 struct S2 {
 S1 x;
 S2(): x(0) {}

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

2023-12-06 Thread Stephan Bergmann (via logerrit)

 bin/update/path.py |9 +
 1 file changed, 9 insertions(+)

New commits:
commit d4370db8ceb74950d3ef381d4a0c1aca033f0294
Author: Stephan Bergmann 
AuthorDate: Wed Dec 6 16:29:12 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 7 08:57:10 2023 +0100

mkdir_p still needed by make create-partial-info

157298bb808a943616991927f9370a86c1f2ca48 "android and bin/update: make 
pythonic"
had removed it, so that `make create-partial-info` would now fail at least 
with

> Traceback (most recent call last):
>   File "bin/update/create_partial_update.py", line 10, in 
> from path import UpdaterPath, mkdir_p, convert_to_unix, 
convert_to_native
> ImportError: cannot import name 'mkdir_p' from 'path' (bin/update/path.py)

(and no idea if that make target would still do anything useful, beyond this
initial hurdle)

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

diff --git a/bin/update/path.py b/bin/update/path.py
index 0420fa3784a0..d91e9e7fba55 100644
--- a/bin/update/path.py
+++ b/bin/update/path.py
@@ -8,9 +8,18 @@
 #
 
 import os
+import errno
 import subprocess
 from sys import platform
 
+def mkdir_p(path):
+try:
+os.makedirs(path)
+except OSError as exc:  # Python >2.5
+if exc.errno == errno.EEXIST and os.path.isdir(path):
+pass
+else:
+raise
 
 def convert_to_unix(path):
 if platform == "cygwin":

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

2023-12-06 Thread Balazs Varga (via logerrit)

 sc/source/ui/inc/tpview.hxx   |   12 +
 sc/source/ui/optdlg/tpview.cxx|   91 ++
 sc/uiconfig/scalc/ui/scgeneralpage.ui |  283 +++---
 3 files changed, 325 insertions(+), 61 deletions(-)

New commits:
commit 4022666087f317f9c5f9c966307bcbe85ee5e1b6
Author: Balazs Varga 
AuthorDate: Wed Dec 6 23:29:47 2023 +0100
Commit: Balazs Varga 
CommitDate: Thu Dec 7 08:34:24 2023 +0100

tdf#158464 - UI: Part 47 - Unify lockdown behavior of Options dialog

for Calc - General Page.

Change-Id: I2ff8edd0fb10a3f388459d842c79b157bc3861f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160407
Tested-by: Jenkins
Reviewed-by: Balazs Varga 

diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 72f3b7668732..6854f77c5eb0 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -81,22 +81,34 @@ class ScTpLayoutOptions : public SfxTabPage
 ScDocument *pDoc;
 
 std::unique_ptr m_xUnitLB;
+std::unique_ptr m_xUnitImg;
 std::unique_ptr m_xTabMF;
+std::unique_ptr m_xTabImg;
 
 std::unique_ptr m_xAlwaysRB;
 std::unique_ptr m_xRequestRB;
 std::unique_ptr m_xNeverRB;
+std::unique_ptr m_xUpdateLinksImg;
 
 std::unique_ptr m_xAlignCB;
+std::unique_ptr m_xAlignImg;
 std::unique_ptr m_xAlignLB;
 std::unique_ptr m_xEditModeCB;
+std::unique_ptr m_xEditModeImg;
 std::unique_ptr m_xFormatCB;
+std::unique_ptr m_xFormatImg;
 std::unique_ptr m_xExpRefCB;
+std::unique_ptr m_xExpRefImg;
 std::unique_ptr m_xSortRefUpdateCB;
+std::unique_ptr m_xSortRefUpdateImg;
 std::unique_ptr m_xMarkHdrCB;
+std::unique_ptr m_xMarkHdrImg;
 std::unique_ptr m_xReplWarnCB;
+std::unique_ptr m_xReplWarnImg;
 std::unique_ptr m_xLegacyCellSelectionCB;
+std::unique_ptr m_xLegacyCellSelectionImg;
 std::unique_ptr m_xEnterPasteModeCB;
+std::unique_ptr m_xEnterPasteModeImg;
 
 DECL_LINK(MetricHdl, weld::ComboBox&, void );
 DECL_LINK( AlignHdl, weld::Toggleable&, void );
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 4b8595899f04..8640e187c5f7 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -32,6 +32,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 ScTpContentOptions::ScTpContentOptions(weld::Container* pPage, 
weld::DialogController* pController, const SfxItemSet&  rArgSet)
 : SfxTabPage(pPage, pController, "modules/scalc/ui/tpviewpage.ui", 
"TpViewPage", )
@@ -318,20 +321,32 @@ ScTpLayoutOptions::ScTpLayoutOptions(weld::Container* 
pPage, weld::DialogControl
 : SfxTabPage(pPage, pController, "modules/scalc/ui/scgeneralpage.ui", 
"ScGeneralPage", )
 , pDoc(nullptr)
 , m_xUnitLB(m_xBuilder->weld_combo_box("unitlb"))
+, m_xUnitImg(m_xBuilder->weld_widget("lockunitlb"))
 , m_xTabMF(m_xBuilder->weld_metric_spin_button("tabmf", FieldUnit::CM))
+, m_xTabImg(m_xBuilder->weld_widget("locktabmf"))
 , m_xAlwaysRB(m_xBuilder->weld_radio_button("alwaysrb"))
 , m_xRequestRB(m_xBuilder->weld_radio_button("requestrb"))
 , m_xNeverRB(m_xBuilder->weld_radio_button("neverrb"))
+, m_xUpdateLinksImg(m_xBuilder->weld_widget("lockupdatelinks"))
 , m_xAlignCB(m_xBuilder->weld_check_button("aligncb"))
+, m_xAlignImg(m_xBuilder->weld_widget("lockaligncb"))
 , m_xAlignLB(m_xBuilder->weld_combo_box("alignlb"))
 , m_xEditModeCB(m_xBuilder->weld_check_button("editmodecb"))
+, m_xEditModeImg(m_xBuilder->weld_widget("lockeditmodecb"))
 , m_xFormatCB(m_xBuilder->weld_check_button("formatcb"))
+, m_xFormatImg(m_xBuilder->weld_widget("lockformatcb"))
 , m_xExpRefCB(m_xBuilder->weld_check_button("exprefcb"))
+, m_xExpRefImg(m_xBuilder->weld_widget("lockexprefcb"))
 , m_xSortRefUpdateCB(m_xBuilder->weld_check_button("sortrefupdatecb"))
+, m_xSortRefUpdateImg(m_xBuilder->weld_widget("locksortrefupdatecb"))
 , m_xMarkHdrCB(m_xBuilder->weld_check_button("markhdrcb"))
+, m_xMarkHdrImg(m_xBuilder->weld_widget("lockmarkhdrcb"))
 , m_xReplWarnCB(m_xBuilder->weld_check_button("replwarncb"))
+, m_xReplWarnImg(m_xBuilder->weld_widget("lockreplwarncb"))
 , 
m_xLegacyCellSelectionCB(m_xBuilder->weld_check_button("legacy_cell_selection_cb"))
+, m_xLegacyCellSelectionImg(m_xBuilder->weld_widget("locklegacy_cell"))
 , m_xEnterPasteModeCB(m_xBuilder->weld_check_button("enter_paste_mode_cb"))
+, m_xEnterPasteModeImg(m_xBuilder->weld_widget("lockenter_paste"))
 {
 SetExchangeSupport();
 
@@ -530,11 +545,33 @@ voidScTpLayoutOptions::Reset( const SfxItemSet* 
rCoreSet )
 }
 ::SetFieldUnit(*m_xTabMF, eFieldUnit);
 }
-m_xUnitLB->save_value();
+
+bool bReadOnly = false;
+MeasurementSystem eSys = 
ScGlobal::getLocaleData().getMeasurementSystemEnum();
+if (eSys == MeasurementSystem::Metric)
+{
+bReadOnly =

[Libreoffice-commits] core.git: configmgr/source cui/source cui/uiconfig offapi/com vcl/source vcl/unx

2023-12-06 Thread Samuel Mehrbrodt (via logerrit)

 configmgr/source/access.cxx  |   22 ++
 configmgr/source/access.hxx  |3 
 configmgr/source/childaccess.cxx |4 
 configmgr/source/dconf.cxx   |4 
 configmgr/source/localizedvaluenode.cxx  |5 
 configmgr/source/localizedvaluenode.hxx  |8 
 configmgr/source/propertynode.cxx|9 -
 configmgr/source/propertynode.hxx|8 
 configmgr/source/valueparser.cxx |5 
 configmgr/source/xcuparser.cxx   |4 
 cui/source/options/optaboutconfig.cxx|  154 +++
 cui/source/options/optaboutconfig.hxx|6 
 cui/uiconfig/ui/aboutconfigdialog.ui |   18 ++
 offapi/com/sun/star/configuration/XDocumentation.idl |   16 +
 vcl/source/app/salvtables.cxx|   15 +
 vcl/unx/gtk3/gtkinst.cxx |   18 +-
 16 files changed, 216 insertions(+), 83 deletions(-)

New commits:
commit 030b72df0af04752157378e07703db0e035ff9c2
Author: Samuel Mehrbrodt 
AuthorDate: Mon Nov 27 11:01:09 2023 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Dec 7 08:03:36 2023 +0100

tdf#157432 Expert config: Allow filtering by changed values

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

diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 371ebdc95b06..3075bc0a32f6 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -478,6 +478,28 @@ css::uno::Type Access::getTypeByHierarchicalName(OUString 
const & aName)
 }
 }
 
+sal_Bool Access::getModifiedByHierarchicalName(OUString const & aName)
+{
+assert(thisIs(IS_ANY));
+osl::MutexGuard g(*lock_);
+checkLocalizedPropertyAccess();
+rtl::Reference< ChildAccess > child(getSubChild(aName));
+if (!child.is()) {
+throw css::container::NoSuchElementException(
+aName, getXWeak());
+}
+auto const & p = child->getNode();
+switch (p->kind()) {
+case Node::KIND_PROPERTY:
+return static_cast(p.get())->isModified();
+case Node::KIND_LOCALIZED_VALUE:
+return static_cast(p.get())->isModified();
+default:
+throw css::util::InvalidStateException(
+aName, getXWeak());
+}
+}
+
 sal_Bool Access::hasByHierarchicalName(OUString const & aName)
 {
 assert(thisIs(IS_ANY));
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index a94d20a6bce6..bd93b4222177 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -168,6 +168,9 @@ public:
 virtual css::uno::Type SAL_CALL getTypeByHierarchicalName(
 OUString const & aName) override;
 
+virtual sal_Bool SAL_CALL getModifiedByHierarchicalName(
+OUString const & aName) override;
+
 virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) 
override;
 
 virtual void SAL_CALL replaceByHierarchicalName(
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index e0a9f9ac6cee..abf3795f1d55 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -279,11 +279,11 @@ void ChildAccess::commitChanges(bool valid, Modifications 
* globalModifications)
 switch (node_->kind()) {
 case Node::KIND_PROPERTY:
 static_cast< PropertyNode * >(node_.get())->setValue(
-Data::NO_LAYER, *changedValue_);
+Data::NO_LAYER, *changedValue_, true);
 break;
 case Node::KIND_LOCALIZED_VALUE:
 static_cast< LocalizedValueNode * >(node_.get())->setValue(
-Data::NO_LAYER, *changedValue_);
+Data::NO_LAYER, *changedValue_, true);
 break;
 default:
 assert(false); // this cannot happen
diff --git a/configmgr/source/dconf.cxx b/configmgr/source/dconf.cxx
index 8548daa46b3c..c12f4a2814fd 100644
--- a/configmgr/source/dconf.cxx
+++ b/configmgr/source/dconf.cxx
@@ -973,7 +973,7 @@ void readDir(
 case ReadValue::Error:
 continue;
 case ReadValue::Value:
-prop->setValue(layer, value);
+prop->setValue(layer, value, false);
 finalize(client, path, member, layer);
 break;
 case ReadValue::Remove:
@@ -1005,7 +1005,7 @@ void readDir(
 continue;
 }
 static_cast(member.get())->setValue(
-layer, value);
+layer, value, false);
 finalize(client, path, member, layer);
 break;
 }
diff

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

2023-12-06 Thread Stephan Bergmann (via logerrit)

 emfio/qa/cppunit/emf/EmfImportTest.cxx |   36 +
 1 file changed, 19 insertions(+), 17 deletions(-)

New commits:
commit 7575e8afcadc1b907f803ebfd1e38ef168597eec
Author: Stephan Bergmann 
AuthorDate: Wed Dec 6 13:42:39 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 7 07:15:25 2023 +0100

loplugin:ostr (macOS)

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

diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx 
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index 8a74745b6e12..c164b7ac6122 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -1405,37 +1405,39 @@ CPPUNIT_TEST_FIXTURE(Test, 
testExtTextOutOpaqueAndClipWMF)
 
 // These values come from the fix for tdf#88163
 assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor", 5);
-assertXPath(pDocument, aXPathPrefix + 
"mask/polypolygoncolor[1]/polypolygon", "path",
+assertXPath(pDocument, aXPathPrefix + 
"mask/polypolygoncolor[1]/polypolygon", "path"_ostr,
 "m7257 1836h320v3628h-320z");
-assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor[1]", "color", 
"#ff");
+assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor[1]", 
"color"_ostr, "#ff");
 
-assertXPath(pDocument, aXPathPrefix + 
"mask/polypolygoncolor[2]/polypolygon", "path",
+assertXPath(pDocument, aXPathPrefix + 
"mask/polypolygoncolor[2]/polypolygon", "path"_ostr,
 "m7257 5976h320v321h-320z");
-assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor[2]", "color", 
"#00ff00");
+assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor[2]", 
"color"_ostr, "#00ff00");
 
-assertXPath(pDocument, aXPathPrefix + 
"mask/polypolygoncolor[3]/polypolygon", "path",
+assertXPath(pDocument, aXPathPrefix + 
"mask/polypolygoncolor[3]/polypolygon", "path"_ostr,
 "m10203 5976h320v321h-320z");
-assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor[3]", "color", 
"#8080ff");
+assertXPath(pDocument, aXPathPrefix + "mask/polypolygoncolor[3]", 
"color"_ostr, "#8080ff");
 
 assertXPath(pDocument, aXPathPrefix + "mask/group", 5);
-assertXPath(pDocument, aXPathPrefix + "mask/group[1]/polypolygoncolor", 
"color", "#00ff00");
-assertXPath(pDocument, aXPathPrefix + "mask/group[1]/textsimpleportion", 
"text", "ABCD");
-assertXPath(pDocument, aXPathPrefix + "mask/group[1]/textsimpleportion", 
"fontcolor",
+assertXPath(pDocument, aXPathPrefix + "mask/group[1]/polypolygoncolor", 
"color"_ostr,
+"#00ff00");
+assertXPath(pDocument, aXPathPrefix + "mask/group[1]/textsimpleportion", 
"text"_ostr, "ABCD");
+assertXPath(pDocument, aXPathPrefix + "mask/group[1]/textsimpleportion", 
"fontcolor"_ostr,
 "#00");
 
-assertXPath(pDocument, aXPathPrefix + "mask/group[2]/polypolygoncolor", 
"color", "#8080ff");
-assertXPath(pDocument, aXPathPrefix + "mask/group[2]/textsimpleportion", 
"text", "");
-assertXPath(pDocument, aXPathPrefix + "mask/group[2]/textsimpleportion", 
"fontcolor",
+assertXPath(pDocument, aXPathPrefix + "mask/group[2]/polypolygoncolor", 
"color"_ostr,
+"#8080ff");
+assertXPath(pDocument, aXPathPrefix + "mask/group[2]/textsimpleportion", 
"text"_ostr, "");
+assertXPath(pDocument, aXPathPrefix + "mask/group[2]/textsimpleportion", 
"fontcolor"_ostr,
 "#00");
 
-assertXPath(pDocument, aXPathPrefix + 
"mask/group[3]/mask/group/polypolygoncolor", "color",
+assertXPath(pDocument, aXPathPrefix + 
"mask/group[3]/mask/group/polypolygoncolor", "color"_ostr,
 "#ff8000");
 assertXPath(pDocument, aXPathPrefix + 
"mask/group[3]/mask/group/polypolygoncolor/polypolygon",
-"path", "m1067 1067h1296v473h-1296z");
-assertXPath(pDocument, aXPathPrefix + 
"mask/group[3]/mask/group/textsimpleportion", "text",
+"path"_ostr, "m1067 1067h1296v473h-1296z");
+assertXPath(pDocument, aXPathPrefix + 
"mask/group[3]/mask/group/textsimpleportion", "text"_ostr,
 "");
-assertXPath(pDocument, aXPathPrefix + 
"mask/group[3]/mask/group/textsimpleportion", "fontcolor",
-"#00");
+assertXPath(pDocument, aXPathPrefix + 
"mask/group[3]/mask/group/textsimpleportion",
+"fontcolor"_ostr, "#00");
 #endif
 }

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

2023-12-06 Thread Michael Weghorn (via logerrit)

 sw/source/core/access/accpara.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 185cd83bf58d8c834a9690cdd6a25736787abbf7
Author: Michael Weghorn 
AuthorDate: Tue Dec 5 14:44:45 2023 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 7 07:10:35 2023 +0100

sw a11y: Only report "level", no more "heading-level" obj attr

Stop reporting the custom "heading-level" object attribute in
addition to the "level" attribute.
As described in the Core Accessibility API Mappings spec, the
latter is specified in ARIA and maps to an attribute of
the same name for all of AT-SPI2, IAccessible2 and UIA [1].

Get rid of the non-documented "heading-level" as part of the
goal to align more closely to platform APIs/specifications.

NVDA's LibreOffice-specific app module currently relies on the
custom "heading-level" object attribute [2], but I've reported
an issue and submitted a pull request for this: [3] [4]

While neither the "level" nor the "heading-level" attribute are
currently mentioned in the the IAccessible2 object attribute
specification [5], the IAccessible2 doc for
`IAccessible2::groupPosition` [6] explicitly mentions
the "level" attribute for headings:

> This method is meant to describe the nature of an object's containment
> structure. It's exposed by trees, tree grids, nested lists, nested
> menus, but not headings, which uses the level object attribute.

[1] https://www.w3.org/TR/core-aam-1.2/#ariaLevelHeading
[2] 
https://github.com/nvaccess/nvda/blob/9cf925195e0fc5ffc67dcfcc9e4d4a7d46ffb430/source/appModules/soffice.py#L225
[3] https://github.com/nvaccess/nvda/issues/15881
[4] https://github.com/nvaccess/nvda/pull/15882
[5] 
https://wiki.linuxfoundation.org/accessibility/iaccessible2/objectattributes
[6] 
https://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/interface_i_accessible2.html#a94d4d84e000ef2fa3f2abf1148779941

Change-Id: I8e8994cc7565f9b0f40ca8bedff951512f56b59b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160347
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/sw/source/core/access/accpara.cxx 
b/sw/source/core/access/accpara.cxx
index 6f487ab46c53..f0bd0f0653d1 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -3519,9 +3519,10 @@ uno::Any SAL_CALL 
SwAccessibleParagraph::getExtendedAttributes()
 OUString strHeading;
 if (m_nHeadingLevel >= 0)
 {
-strHeading = "heading-level:" + OUString::number(m_nHeadingLevel);
-// tdf#84102: expose the same attribute with the name "level"
-strHeading += ";level:" + OUString::number(m_nHeadingLevel) + ";";
+// report heading level using the "level" object attribute as 
specified in ARIA,
+// maps to attributes of the same name for AT-SPI, IAccessible2, UIA
+// https://www.w3.org/TR/core-aam-1.2/#ariaLevelHeading
+strHeading = "level:" + OUString::number(m_nHeadingLevel) + ";";
 }
 
 return uno::Any(strHeading);

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

2023-12-06 Thread Michael Weghorn (via logerrit)

 sw/source/core/access/accpara.cxx |   22 +-
 1 file changed, 9 insertions(+), 13 deletions(-)

New commits:
commit 90d49b980d7fed1d55ab83f3ed88d27ab2cfbb12
Author: Michael Weghorn 
AuthorDate: Tue Dec 5 12:55:37 2023 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 7 07:09:49 2023 +0100

sw a11y: Only report heading level attr for heading

Only report the "heading-level" and "level" object
attributes for a Writer paragraph when this paragraph
has a heading level that can be reported as the value
of the object attribute.
No longer report the attribute without any value set otherwise,
since the attribute doesn't provide any value then,
but is rather confusing/misleading.

Change-Id: I282345b00a32a74de229058ff368f3b169bf1c03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160346
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/sw/source/core/access/accpara.cxx 
b/sw/source/core/access/accpara.cxx
index 62db53567a3e..6f487ab46c53 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -3516,19 +3516,15 @@ uno::Any SAL_CALL 
SwAccessibleParagraph::getExtendedAttributes()
 {
 SolarMutexGuard g;
 
-uno::Any Ret;
-OUString strHeading("heading-level:");
-if( m_nHeadingLevel >= 0 )
-strHeading += OUString::number(m_nHeadingLevel);
-// tdf#84102: expose the same attribute with the name "level"
-strHeading += ";level:";
-if( m_nHeadingLevel >= 0 )
-strHeading += OUString::number(m_nHeadingLevel);
-strHeading += ";";
-
-Ret <<= strHeading;
-
-return Ret;
+OUString strHeading;
+if (m_nHeadingLevel >= 0)
+{
+strHeading = "heading-level:" + OUString::number(m_nHeadingLevel);
+// tdf#84102: expose the same attribute with the name "level"
+strHeading += ";level:" + OUString::number(m_nHeadingLevel) + ";";
+}
+
+return uno::Any(strHeading);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

[Libreoffice-commits] core.git: Branch 'feature/windowsupdater' - onlineupdate/inc onlineupdate/source onlineupdate/StaticLibrary_updatehelper.mk

2023-12-06 Thread Thorsten Behrens (via logerrit)

 onlineupdate/StaticLibrary_updatehelper.mk |8 
 1 file changed, 8 insertions(+)

New commits:
commit a5e825cc69f9c29d450607d9033682ec3a68b57e
Author: Thorsten Behrens 
AuthorDate: Thu Dec 7 02:18:49 2023 +
Commit: Thorsten Behrens 
CommitDate: Thu Dec 7 03:20:26 2023 +0100

More fixup Windows buiuld

Change-Id: Ic5ffedbf57fa0f686b9ede193f61e47e7efe90ac

diff --git a/onlineupdate/StaticLibrary_updatehelper.mk 
b/onlineupdate/StaticLibrary_updatehelper.mk
index cbb0130759e9..cce26a8dcbac 100644
--- a/onlineupdate/StaticLibrary_updatehelper.mk
+++ b/onlineupdate/StaticLibrary_updatehelper.mk
@@ -19,8 +19,11 @@ $(eval $(call gb_StaticLibrary_set_include,updatehelper,\
 
 $(eval $(call gb_StaticLibrary_add_defs,updatehelper,\
-DNSS3 \
+   -DUNICODE  \
-DVERIFY_MAR_SIGNATURE \
-DXP_WIN=1 \
+   -DNTDDI_VERSION=NTDDI_WIN8 \
+   -DMOZ_MAINTENANCE_SERVICE \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,updatehelper,\
@@ -28,6 +31,11 @@ $(eval $(call 
gb_StaticLibrary_add_exception_objects,updatehelper,\
onlineupdate/source/update/common/readstrings \
onlineupdate/source/update/common/uachelper \
onlineupdate/source/update/common/updatehelper \
+   onlineupdate/source/update/common/updatecommon \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,updatehelper,\
+   onlineupdate/source/update/common/updateutils_win \
 ))
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab: */
diff --git a/onlineupdate/source/service/nsAutoRef.h 
b/onlineupdate/inc/nsAutoRef.h
similarity index 100%
rename from onlineupdate/source/service/nsAutoRef.h
rename to onlineupdate/inc/nsAutoRef.h
diff --git a/onlineupdate/source/service/nsCharTraits.h 
b/onlineupdate/inc/nsCharTraits.h
similarity index 100%
rename from onlineupdate/source/service/nsCharTraits.h
rename to onlineupdate/inc/nsCharTraits.h
diff --git a/onlineupdate/source/service/nsUTF8Utils.h 
b/onlineupdate/inc/nsUTF8Utils.h
similarity index 100%
rename from onlineupdate/source/service/nsUTF8Utils.h
rename to onlineupdate/inc/nsUTF8Utils.h
diff --git a/onlineupdate/source/service/nsWindowsHelpers.h 
b/onlineupdate/inc/nsWindowsHelpers.h
similarity index 100%
rename from onlineupdate/source/service/nsWindowsHelpers.h
rename to onlineupdate/inc/nsWindowsHelpers.h

[Libreoffice-commits] core.git: Branch 'feature/windowsupdater' - 2 commits - include/onlineupdate onlineupdate/Executable_update_service.mk onlineupdate/Module_onlineupdate.mk onlineupdate/source onl

2023-12-06 Thread Thorsten Behrens (via logerrit)

 include/onlineupdate/mozilla/ArrayUtils.h   |  188 +
 include/onlineupdate/mozilla/Casting.h  |  229 +
 include/onlineupdate/mozilla/DebugOnly.h|  102 
 include/onlineupdate/mozilla/DynamicallyLinkedFunctionPtr.h |  137 
 include/onlineupdate/mozilla/EndianUtils.h  |  611 
 include/onlineupdate/mozilla/HashFunctions.h|  417 +++
 include/onlineupdate/mozilla/MathAlgorithms.h   |  492 +++
 include/onlineupdate/mozilla/MemoryReporting.h  |   30 
 include/onlineupdate/mozilla/ReentrancyGuard.h  |   50 
 include/onlineupdate/mozilla/Result.h   |  873 ++
 include/onlineupdate/mozilla/ResultVariant.h|   61 
 include/onlineupdate/mozilla/Span.h |  973 +++
 include/onlineupdate/mozilla/Variant.h  |  928 ++
 include/onlineupdate/mozilla/Vector.h   | 1653 
 include/onlineupdate/mozilla/WinHeaderOnlyUtils.h   |  826 +
 include/onlineupdate/mozilla/WrappingOperations.h   |  262 +
 onlineupdate/Executable_update_service.mk   |8 
 onlineupdate/Module_onlineupdate.mk |3 
 onlineupdate/StaticLibrary_libmarverify.mk  |5 
 onlineupdate/source/service/nsAutoRef.h |  489 +++
 onlineupdate/source/service/nsCharTraits.h  |  486 +++
 onlineupdate/source/service/nsUTF8Utils.h   |  247 +
 onlineupdate/source/service/nsWindowsHelpers.h  |  339 ++
 onlineupdate/source/service/nsWindowsRestart.cpp|  197 +
 24 files changed, 9602 insertions(+), 4 deletions(-)

New commits:
commit 67b8ad26b868c6de69b0aa2d1f11ccf66cb1a2dd
Author: Thorsten Behrens 
AuthorDate: Thu Dec 7 01:02:40 2023 +
Commit: Thorsten Behrens 
CommitDate: Thu Dec 7 02:06:41 2023 +0100

Missing headers

Change-Id: I1a68e8f84df2c216c3507704d06131c4bfd20747

diff --git a/include/onlineupdate/mozilla/ArrayUtils.h 
b/include/onlineupdate/mozilla/ArrayUtils.h
new file mode 100644
index ..0d55bb1f6546
--- /dev/null
+++ b/include/onlineupdate/mozilla/ArrayUtils.h
@@ -0,0 +1,188 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* 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/. */
+
+/*
+ * Implements various helper functions related to arrays.
+ */
+
+#ifndef mozilla_ArrayUtils_h
+#define mozilla_ArrayUtils_h
+
+#include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
+
+#include 
+#include 
+
+#ifdef __cplusplus
+#  include 
+#  include 
+
+#  include "mozilla/Alignment.h"
+
+namespace mozilla {
+
+template 
+class Array;
+template 
+class EnumeratedArray;
+
+/*
+ * Safely subtract two pointers when it is known that aEnd >= aBegin, yielding 
a
+ * size_t result.
+ *
+ * Ordinary pointer subtraction yields a ptrdiff_t result, which, being signed,
+ * has insufficient range to express the distance between pointers at opposite
+ * ends of the address space. Furthermore, most compilers use ptrdiff_t to
+ * represent the intermediate byte address distance, before dividing by
+ * sizeof(T); if that intermediate result overflows, they'll produce results
+ * with the wrong sign even when the correct scaled distance would fit in a
+ * ptrdiff_t.
+ */
+template 
+MOZ_ALWAYS_INLINE size_t PointerRangeSize(T* aBegin, T* aEnd) {
+  MOZ_ASSERT(aEnd >= aBegin);
+  return (size_t(aEnd) - size_t(aBegin)) / sizeof(T);
+}
+
+/*
+ * Compute the length of an array with constant length.  (Use of this method
+ * with a non-array pointer will not compile.)
+ *
+ * Beware of the implicit trailing '\0' when using this with string constants.
+ */
+template 
+constexpr size_t ArrayLength(T ()[N]) {
+  return N;
+}
+
+template 
+constexpr size_t ArrayLength(const Array& aArr) {
+  return N;
+}
+
+template 
+constexpr size_t ArrayLength(const EnumeratedArray& aArr) {
+  return size_t(N);
+}
+
+/*
+ * Compute the address one past the last element of a constant-length array.
+ *
+ * Beware of the implicit trailing '\0' when using this with string constants.
+ */
+template 
+constexpr T* ArrayEnd(T ()[N]) {
+  return aArr + ArrayLength(aArr);
+}
+
+template 
+constexpr T* ArrayEnd(Array& aArr) {
+  return [0] + ArrayLength(aArr);
+}
+
+template 
+constexpr const T* ArrayEnd(const Array& aArr) {
+  return [0] + ArrayLength(aArr);
+}
+
+/**
+ * std::equal has subpar ergonomics.
+ */
+
+template 
+bool ArrayEqual(const T ()[N], const U ()[N]) {
+  return std::equal(a, a + N, b);
+}
+
+template 
+bool ArrayEqual(const T* const a, const U* const b, const size_t n) {
+  return std::equal(a, a + n, b);
+}
+
+namespace detail {
+
+template

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

2023-12-06 Thread Patrick Luby (via logerrit)

 vcl/osx/salframe.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 0ddd9f7e055a0c1ecb120de3e40c3fdb8373e9dc
Author: Patrick Luby 
AuthorDate: Wed Dec 6 11:11:38 2023 -0500
Commit: Patrick Luby 
CommitDate: Wed Dec 6 23:52:49 2023 +0100

Related: tdf#155266 skip redisplay of the view when forcing flush

It appears that calling -[NSView display] overwhelms some Intel Macs
so only flush the graphics and skip immediate redisplay of the view.

Change-Id: I7a94a1ada35526c5eda1b793f872e206b4c833ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160399
Tested-by: Jenkins
Reviewed-by: Patrick Luby 

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 2240de319860..b02dbc59585e 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1035,7 +1035,11 @@ void AquaSalFrame::Flush()
 {
 mbForceFlush = false;
 mpGraphics->Flush();
-[mpNSView display];
+// Related: tdf#155266 skip redisplay of the view when forcing flush
+// It appears that calling -[NSView display] overwhelms some Intel Macs
+// so only flush the graphics and skip immediate redisplay of the view.
+if( ImplGetSVData()->maAppData.mnDispatchLevel <= 0 )
+[mpNSView display];
 }
 }
 
@@ -1057,7 +1061,11 @@ void AquaSalFrame::Flush( const tools::Rectangle& rRect )
 {
 mbForceFlush = false;
 mpGraphics->Flush( rRect );
-[mpNSView display];
+// Related: tdf#155266 skip redisplay of the view when forcing flush
+// It appears that calling -[NSView display] overwhelms some Intel Macs
+// so only flush the graphics and skip immediate redisplay of the view.
+if( ImplGetSVData()->maAppData.mnDispatchLevel <= 0 )
+[mpNSView display];
 }
 }

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/qa sw/source

2023-12-06 Thread Miklos Vajna (via logerrit)

 sw/qa/core/layout/data/table-print-area-left.docx |binary
 sw/qa/core/layout/tabfrm.cxx  |   16 
 sw/source/core/layout/tabfrm.cxx  |7 +--
 3 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 5e0534ca76d3e666e7516ec7a9b05afdbfe4b056
Author: Miklos Vajna 
AuthorDate: Wed May 10 23:28:03 2023 +0100
Commit: Caolán McNamara 
CommitDate: Wed Dec 6 20:47:51 2023 +0100

tdf#154775 sw layout: fix unexpected large table print area left margin

The bugdoc had 2 pages, but the second page's content was mostly a
table. This table was rendered outside the page frame, so it was
practically invisible.

This started after commit fd7749fddc5a767461dfced55369af48e5a6d561 (sw:
fix handling of table vs fly overlaps in the AddVerticalFlyOffsets case,
2020-02-14), and that behavior is still wanted to have correct table
borders, but that change introduced an inconsistent case: we started to
always accept an invalid frame area definition of the fly, but we only
shifted the content down in the text::HoriOrientation::NONE case.

Fix the problem by limiting the "accept invalid frame area definition"
based on the horizontal orientation, so we either both ignore the
validity flag & shift down or do none of this. This keeps the original
bug fixed, but addresses the new "no visible table" problem.

Note that this only fixes the regression part; once the image from the
header is removed and undo is invoked, a similar problem still happens.
But that is a pre-existing, separate problem.

(cherry picked from commit 1b5bc2ae2f19a190bf588a5a26c4d125c3960991)

Conflicts:
sw/CppunitTest_sw_core_layout.mk
sw/qa/core/layout/tabfrm.cxx
sw/source/core/layout/tabfrm.cxx

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

diff --git a/sw/qa/core/layout/data/table-print-area-left.docx 
b/sw/qa/core/layout/data/table-print-area-left.docx
new file mode 100644
index ..e326bed82f39
Binary files /dev/null and b/sw/qa/core/layout/data/table-print-area-left.docx 
differ
diff --git a/sw/qa/core/layout/tabfrm.cxx b/sw/qa/core/layout/tabfrm.cxx
index 7642c3d29ea6..84f7ba48c572 100644
--- a/sw/qa/core/layout/tabfrm.cxx
+++ b/sw/qa/core/layout/tabfrm.cxx
@@ -30,6 +30,22 @@ public:
 }
 };
 
+CPPUNIT_TEST_FIXTURE(Test, testTablePrintAreaLeft)
+{
+// Given a document with a header containing an image, and also with an 
overlapping table:
+createSwDoc("table-print-area-left.docx");
+
+// When laying out that document & parsing the left margin of the table:
+SwTwips nTablePrintLeft = parseDump("//tab/infos/prtBounds", 
"left").toInt32();
+
+// Then make sure it has ~no left margin:
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 5
+// - Actual  : 10646
+// i.e. the table was shifted outside the page, was invisible.
+CPPUNIT_ASSERT_EQUAL(static_cast(5), nTablePrintLeft);
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testTableMissingJoin)
 {
 // Given a document with a table on page 2:
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index d7f3d303289c..87ab7c05c26f 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -3071,10 +3071,14 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
 //   at the page frame, the table is on, but it's anchor 
character
 //   text frame has already changed its page.
 const SwTextFrame* pAnchorCharFrame = 
pFly->FindAnchorCharFrame();
+const SwFormatHoriOrient& rHori= 
pFly->GetFormat()->GetHoriOrient();
+// Only consider invalid Writer fly frames if they'll be 
shifted down.
+bool bIgnoreFlyValidity
+= bAddVerticalFlyOffsets && rHori.GetHoriOrient() == 
text::HoriOrientation::NONE;
 bool bConsiderFly =
 // #i46807# - do not consider invalid
 // Writer fly frames.
-(pFly->isFrameAreaDefinitionValid() || 
bAddVerticalFlyOffsets) &&
+(pFly->isFrameAreaDefinitionValid() || bIgnoreFlyValidity) 
&&
 // fly anchored at character or at paragraph
 pFly->IsFlyAtContentFrame() &&
 // fly overlaps with corresponding table rectangle
@@ -3127,7 +3131,6 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
 else if (!bWrapThrough && nSurround == 
text::WrapTextMode_THROUGH)
 nSurround = text::WrapTextMode_PARALLEL;
 
-const SwFormatHoriOrient = 
pFly->GetFormat()->GetHoriOrient();

[Libreoffice-commits] core.git: 2 commits - tsan-suppress.txt unotools/source

2023-12-06 Thread Noel Grandin (via logerrit)

 tsan-suppress.txt |3 +++
 unotools/source/config/cmdoptions.cxx |2 ++
 2 files changed, 5 insertions(+)

New commits:
commit c574def363c96aa38e8db4e8a03fa9ebcc41da7b
Author: Noel Grandin 
AuthorDate: Wed Dec 6 14:24:20 2023 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 6 20:27:49 2023 +0100

update tsan suppressions

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

diff --git a/tsan-suppress.txt b/tsan-suppress.txt
index 2c431f4da22d..e72f33ba5d13 100644
--- a/tsan-suppress.txt
+++ b/tsan-suppress.txt
@@ -17,6 +17,9 @@ deadlock:AffineBridge::v_callInto_v
 # Ignore stuff in external DBUS library.
 # Some kind of dbus lock issue when we call it from psp::CUPSManager.
 deadlock:_dbus_lock
+race:g_dbus_connection_signal_unsubscribe
+race:g_path_get_basename
+race:g_date_time_format_iso8601
 
 # inside an assert so I don't care.
 race:cppu::OWeakConnectionPoint::acquire
commit de9667d419bae2c03adf9a9c08b20cd519137cba
Author: Noel Grandin 
AuthorDate: Wed Dec 6 15:03:55 2023 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 6 20:27:35 2023 +0100

tdf#157915 Error when running a Basic macro with instruction commitChanges

regression from
commit 1576ef8532cf2cea2da361db9c5707f1994e65e2
Author: Noel Grandin 
Date:   Thu Dec 23 18:40:44 2021 +0200
osl::Mutex->std::mutex in SvtCommandOptions

Note that this only fixes part of the issue - specifically the part that
the original reporter described.

There is a further issue, not fixed here, which only happens on
Linux/GTK, where the messagebox dialog manages to end up behind the
About dialog, and consequently cannot be closed, which freezes the
program.

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

diff --git a/unotools/source/config/cmdoptions.cxx 
b/unotools/source/config/cmdoptions.cxx
index ec4e826b8c8a..015637d644a2 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -222,7 +222,9 @@ void SvtCommandOptions_Impl::Notify( const Sequence< 
OUString >& )
 css::uno::Reference< css::frame::XFrame > xFrame(pIt->get(), 
css::uno::UNO_QUERY);
 if (xFrame.is())
 {
+aGuard.unlock(); // because we can call back into ourself
 xFrame->contextChanged();
+aGuard.lock();
 ++pIt;
 }
 else

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - 2 commits - sw/qa vcl/source xmloff/inc xmloff/source

2023-12-06 Thread Caolán McNamara (via logerrit)

 sw/qa/extras/fodfexport/data/SvgImageTest.fodt |  321 +
 sw/qa/extras/fodfexport/fodfexport.cxx |   25 +
 vcl/source/window/printdlg.cxx |1 
 xmloff/inc/xmlmultiimagehelper.hxx |1 
 xmloff/source/core/xmlmultiimagehelper.cxx |   28 +-
 xmloff/source/draw/ximpshap.cxx|   24 +
 xmloff/source/draw/ximpshap.hxx|3 
 xmloff/source/text/XMLTextFrameContext.cxx |   11 
 xmloff/source/text/XMLTextFrameContext.hxx |1 
 9 files changed, 400 insertions(+), 15 deletions(-)

New commits:
commit 25950b4440d8da4a20f311f94dd9e1884d0bebb9
Author: Caolán McNamara 
AuthorDate: Tue Dec 5 13:54:19 2023 +
Commit: Xisco Fauli 
CommitDate: Wed Dec 6 19:13:57 2023 +0100

Related: tdf#158534 set fallback help page for optional print content

Change-Id: I79d843cbf2591ab5a8625087e2ec5897b26a8056
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160371
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit e507fd525404d5ac078a47650df11e5e18a88a81)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160358
Reviewed-by: Xisco Fauli 

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index b83d516774ed..4ea3c6ca69e8 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1330,6 +1330,7 @@ void PrintDialog::setupOptionalUI()
 rOption.Value >>= sOptionsUIFile;
 mxCustomOptionsUIBuilder = 
Application::CreateBuilder(mxCustom.get(), sOptionsUIFile);
 std::unique_ptr xWindow = 
mxCustomOptionsUIBuilder->weld_container("box");
+xWindow->set_help_id("vcl/ui/printdialog/PrintDialog");
 xWindow->show();
 continue;
 }
commit d621458434cc316b4b8b145e402005d8529ef2aa
Author: Tomaž Vajngerl 
AuthorDate: Sat Dec 2 16:57:30 2023 +0900
Commit: Xisco Fauli 
CommitDate: Wed Dec 6 19:13:46 2023 +0100

tdf#123396 actually use the mimetype set in the from document

In the document we set the mime type for the images stored, but
at import we never actually used the mime types. We always did
mime type detection from the filename extension. The problem with
this is that files stored as base64 streams don't have a filename
so it is also not possible to determine the mime type from the
file name.

The consequence of this is that we can't know which image to take
if we have multiple images (fallback images) so we always take the
last one, which could be the wrong one. This happend in the test
document.

This changes the behavior so that we always first use the document
set mime type as there is no reason to not trust that. Only if the
mime type isn't provided by the document we use other mime type
detection methods.

Change-Id: I175c509ce5f11eab2c0454d4d9901ca1fe975272
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160237
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit f5cf0c10eb7050feff19190b06b4597aab2d400a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160353
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/fodfexport/data/SvgImageTest.fodt 
b/sw/qa/extras/fodfexport/data/SvgImageTest.fodt
new file mode 100644
index ..4246a7cb5e5e
--- /dev/null
+++ b/sw/qa/extras/fodfexport/data/SvgImageTest.fodt
@@ -0,0 +1,321 @@
+
+
+http://www.w3.org/TR/css3-text/; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
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:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report;

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

2023-12-06 Thread Caolán McNamara (via logerrit)

 vcl/inc/printdlg.hxx   |1 -
 vcl/source/window/printdlg.cxx |   11 ---
 2 files changed, 12 deletions(-)

New commits:
commit bde00b3d8748cc4642300f2a961fa3f2add85c73
Author: Caolán McNamara 
AuthorDate: Tue Dec 5 11:55:01 2023 +
Commit: Xisco Fauli 
CommitDate: Wed Dec 6 19:12:53 2023 +0100

Resolves: tdf#158534 two help pages from print help button

its either use the default "help" response, or have an explicit
handler for the help button.

Its more consistent to just use the default "help" response for
the print dialog as done everywhere else.

Change-Id: I0bb173e67a3bea1c10cc315cfcf212376f2710c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160340
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit a639b7432e7d35b271fbfea9021f5df56d681006)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160357
Reviewed-by: Xisco Fauli 

diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index fc4085a99b4a..bf058b079717 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -131,7 +131,6 @@ namespace vcl
 
 std::unique_ptr   mxOKButton;
 std::unique_ptr   mxCancelButton;
-std::unique_ptr   mxHelpButton;
 
 std::unique_ptr   mxBackwardBtn;
 std::unique_ptr   mxForwardBtn;
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 9fcb055633d8..b83d516774ed 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -543,7 +543,6 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, 
std::shared_ptrweld_check_button("reverseorder"))
 , mxOKButton(m_xBuilder->weld_button("ok"))
 , mxCancelButton(m_xBuilder->weld_button("cancel"))
-, mxHelpButton(m_xBuilder->weld_button("help"))
 , mxBackwardBtn(m_xBuilder->weld_button("backward"))
 , mxForwardBtn(m_xBuilder->weld_button("forward"))
 , mxFirstBtn(m_xBuilder->weld_button("btnFirst"))
@@ -676,7 +675,6 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, 
std::shared_ptrconnect_clicked(LINK(this, PrintDialog, ClickHdl));
 mxCancelButton->connect_clicked(LINK(this, PrintDialog, ClickHdl));
-mxHelpButton->connect_clicked(LINK(this, PrintDialog, ClickHdl));
 mxSetupButton->connect_clicked( LINK( this, PrintDialog, ClickHdl ) );
 mxBackwardBtn->connect_clicked(LINK(this, PrintDialog, ClickHdl));
 mxForwardBtn->connect_clicked(LINK(this, PrintDialog, ClickHdl));
@@ -1872,15 +1870,6 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, 
void)
 storeToSettings();
 m_xDialog->response( == mxOKButton.get() ? RET_OK : 
RET_CANCEL);
 }
-else if(  == mxHelpButton.get() )
-{
-// start help system
-Help* pHelp = Application::GetHelp();
-if( pHelp )
-{
-pHelp->Start("vcl/ui/printdialog/PrintDialog", mxOKButton.get());
-}
-}
 else if(  == mxForwardBtn.get() )
 {
 previewForward();

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - 2 commits - basctl/source writerfilter/source

2023-12-06 Thread Caolán McNamara (via logerrit)

 basctl/source/basicide/baside2b.cxx   |6 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   13 -
 2 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit ea7c17960ddfe93249b17612662adc4694bd02b3
Author: Caolán McNamara 
AuthorDate: Tue Dec 5 10:58:57 2023 +
Commit: Xisco Fauli 
CommitDate: Wed Dec 6 19:12:40 2023 +0100

Resolves: tdf#158441 we don't want to return early for all handled keys

a problem since:

commit c39bd1f6690ade936d62a66265b9b277061024d8
Author: Caolán McNamara 
Date:   Wed Feb 19 10:13:15 2020 +

weld CodeCompleteWindow

Change-Id: I520a591bad89515c973098f4200f01ae0ddbdc34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160337
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 6aba19406767a54bb61eaffb2903c1b2902da9a8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160356
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index f1c1a7303878..373114ae4ec0 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -562,7 +562,11 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
 
 if (pCodeCompleteWnd->IsVisible() && 
CodeCompleteOptions::IsCodeCompleteOn())
 {
-if (pCodeCompleteWnd->HandleKeyInput(rKEvt))
+pCodeCompleteWnd->HandleKeyInput(rKEvt);
+if( rKEvt.GetKeyCode().GetCode() == KEY_UP
+|| rKEvt.GetKeyCode().GetCode() == KEY_DOWN
+|| rKEvt.GetKeyCode().GetCode() == KEY_TAB
+|| rKEvt.GetKeyCode().GetCode() == KEY_POINT)
 return;
 }
 
commit c8c1c3e99212604e50fe42dd4752d75601da273e
Author: Miklos Vajna 
AuthorDate: Tue Dec 5 11:43:42 2023 +0100
Commit: Xisco Fauli 
CommitDate: Wed Dec 6 19:12:27 2023 +0100

writerfilter: fix crash in DomainMapper_Impl::PushSdt()

Crashreport signature:

Fatal signal received: SIGSEGV code: 1 for address: 0x0

program/libwriterfilterlo.so
writerfilter::dmapper::DomainMapper_Impl::PushSdt()
writerfilter/source/dmapper/DomainMapper_Impl.cxx:987
program/libwriterfilterlo.so
writerfilter::dmapper::DomainMapper::lcl_attribute(unsigned int, 
writerfilter::Value&)
include/tools/ref.hxx:56
program/libwriterfilterlo.so

writerfilter::ooxml::OOXMLProperty::resolve(writerfilter::Properties&)
include/tools/ref.hxx:56
program/libwriterfilterlo.so

writerfilter::ooxml::OOXMLPropertySet::resolve(writerfilter::Properties&)
include/tools/ref.hxx:157

Change-Id: I76416ca707a4ac40495e5c22f62fcd017bcb5e48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160336
Tested-by: Jenkins CollaboraOffice 
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 728f6ec104b1a91c8c8ea0790bc7f56471c67737)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160351
Tested-by: Jenkins
(cherry picked from commit 24135dc15a797ca91dd32c70cbc4d26a05dfd127)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160355
Reviewed-by: Xisco Fauli 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 79dee6e01cf5..9e90f132b76e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -980,8 +980,19 @@ void DomainMapper_Impl::PushSdt()
 }
 
 uno::Reference xTextAppend = 
m_aTextAppendStack.top().xTextAppend;
+if (!xTextAppend.is())
+{
+return;
+}
+
+uno::Reference xText = xTextAppend->getText();
+if (!xText.is())
+{
+return;
+}
+
 uno::Reference xCursor
-= 
xTextAppend->getText()->createTextCursorByRange(xTextAppend->getEnd());
+= xText->createTextCursorByRange(xTextAppend->getEnd());
 // Offset so the cursor is not adjusted as we import the SDT's content.
 bool bStart = !xCursor->goLeft(1, /*bExpand=*/false);
 m_xSdtStarts.push({bStart, OUString(), xCursor->getStart()});

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

2023-12-06 Thread Stephan Bergmann (via logerrit)

 bin/update/create_full_mar.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cc3fb303db41492eccf845f34581b462c6ee24ec
Author: Stephan Bergmann 
AuthorDate: Wed Dec 6 16:33:16 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Dec 6 18:42:10 2023 +0100

Fix apparent typo in make create-update-info

157298bb808a943616991927f9370a86c1f2ca48 "android and bin/update: make 
pythonic"
had introduced this apparent typo, so that `make create-update-info` would 
now
fail (and no idea if that make target would still do anything useful, beyond
this initial hurdle)

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

diff --git a/bin/update/create_full_mar.py b/bin/update/create_full_mar.py
index 39cb23f1f20e..58fd7fbef170 100755
--- a/bin/update/create_full_mar.py
+++ b/bin/update/create_full_mar.py
@@ -25,7 +25,7 @@ def main():
 update_config = args.update_config
 filename_prefix = args.filename_prefix
 workdir = args.workdir
-product_name = args.update_config
+product_name = args.product_name
 
 if len(update_config) == 0:
 print("missing update config")

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

2023-12-06 Thread Jean-Pierre Ledure (via logerrit)

 wizards/source/scriptforge/SF_Root.xba|4 ++--
 wizards/source/scriptforge/po/ScriptForge.pot |8 +++-
 wizards/source/scriptforge/po/en.po   |8 +++-
 3 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit e8ac98c6569f8c462e754a3142aeb9f433588ec8
Author: Jean-Pierre Ledure 
AuthorDate: Wed Dec 6 12:02:49 2023 +0100
Commit: Jean-Pierre Ledure 
CommitDate: Wed Dec 6 17:55:57 2023 +0100

ScriptForge (SF_Root) Fix typos

Suppression of linefeeds in excess
inside english error messages.

Change-Id: I38189e7dcf9d24055e477a5cb6cfeb42644ded39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160385
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure 

diff --git a/wizards/source/scriptforge/SF_Root.xba 
b/wizards/source/scriptforge/SF_Root.xba
index dc1bfa32a49c..69e0ee25ec42 100644
--- a/wizards/source/scriptforge/SF_Root.xba
+++ b/wizards/source/scriptforge/SF_Root.xba
@@ -1022,7 +1022,7 @@ Try:
  SF_Dialog.CreateControl
.AddText(   Context := DUPLICATECONTROL 
_
, MsgId := A control with 
the same name exists already in the dialog %3.\n\n _
-
« %1 » = %2\n _
+
« %1 » = %2 _
, Comment :=SF_Dialog 
CreateControl\n _
   
%1: An identifier\n _
   
%2: A string\n _
@@ -1059,7 +1059,7 @@ Try:
  SF_Dataset.Update/Insert/Delete/GetValue
.AddText(   Context := NOCURRENTRECORD _
, MsgId := A database 
record could not be retrieved, inserted or updated by the database 
system.\n _
-
The current record could not be determined.\n _
+
The current record could not be determined. _
, Comment :=
SF_Dataset cant read field values or store field updates _
)
  SF_Dataset._SetColumnValue
diff --git a/wizards/source/scriptforge/po/ScriptForge.pot 
b/wizards/source/scriptforge/po/ScriptForge.pot
index 814f75ec041f..5bf1aa6a008e 100644
--- a/wizards/source/scriptforge/po/ScriptForge.pot
+++ b/wizards/source/scriptforge/po/ScriptForge.pot
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI\n;
-"POT-Creation-Date: 2023-11-11 15:24:14\n"
+"POT-Creation-Date: 2023-12-04 16:36:35\n"
 "PO-Revision-Date: -MM-DD HH:MM:SS\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -965,8 +965,7 @@ msgctxt "DUPLICATECONTROL"
 msgid  ""
 "A control with the same name exists already in the dialog '%3'.\n"
 "\n"
-"« %1 » = %2\n"
-""
+"« %1 » = %2"
 msgstr ""
 
 #. SF_Database when running update SQL statement
@@ -1012,8 +1011,7 @@ msgctxt "NOCURRENTRECORD"
 msgid  ""
 "A database record could not be retrieved, inserted or updated by the "
 "database system.\n"
-"The current record could not be determined.\n"
-""
+"The current record could not be determined."
 msgstr ""
 
 #. SF_Database can't store field updates
diff --git a/wizards/source/scriptforge/po/en.po 
b/wizards/source/scriptforge/po/en.po
index 814f75ec041f..5bf1aa6a008e 100644
--- a/wizards/source/scriptforge/po/en.po
+++ b/wizards/source/scriptforge/po/en.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI\n;
-"POT-Creation-Date: 2023-11-11 15:24:14\n"
+"POT-Creation-Date: 2023-12-04 16:36:35\n"
 "PO-Revision-Date: -MM-DD HH:MM:SS\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -965,8 +965,7 @@ msgctxt "DUPLICATECONTROL"
 msgid  ""
 "A control with the same name exists already in the dialog '%3'.\n"
 "\n"
-"« %1 » = %2\n"
-""
+"« %1 » = %2"
 msgstr ""
 
 #. SF_Database when running update SQL statement
@@ -1012,8 +1011,7 @@ msgctxt "NOCURRENTRECORD"
 msgid  ""
 "A database record could not be retrieved, inserted or updated by the "
 "database system.\n"
-"The current record could not be determined.\n"
-""
+"The current record could not be determined."
 msgstr ""
 
 #. SF_Database can't store field updates

[Libreoffice-commits] core.git: sal/osl

2023-12-06 Thread Stephan Bergmann (via logerrit)

 sal/osl/unx/nlsupport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8b5bb37cc4116f74c2f533453936eb8cb84d9fc5
Author: Stephan Bergmann 
AuthorDate: Wed Dec 6 13:42:50 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Dec 6 16:38:22 2023 +0100

loplugin:ostr (macOS)

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

diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index 4cd02fe0e594..7ba961968ab7 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -827,7 +827,7 @@ void imp_getProcessLocale( rtl_Locale ** ppLocale )
 locale = getenv( "LANG" );
 
 if( locale.isEmpty() )
-locale = "C";
+locale = "C"_ostr;
 }
 
 /* return the locale */

[Libreoffice-commits] core.git: include/vcl offapi/com sd/source vcl/qt5 vcl/unx vcl/win

2023-12-06 Thread Gabor Kelemen (via logerrit)

 include/vcl/keycodes.hxx  |2 +
 offapi/com/sun/star/awt/Key.idl   |6 +
 sd/source/console/PresenterController.cxx |2 +
 sd/source/ui/slideshow/slideshowimpl.cxx  |2 +
 vcl/qt5/QtFrame.cxx   |6 +
 vcl/qt5/QtWidget.cxx  |6 +
 vcl/unx/generic/app/saldisp.cxx   |   12 +++
 vcl/unx/gtk3/gtkframe.cxx |4 +++
 vcl/win/window/salframe.cxx   |   32 --
 9 files changed, 70 insertions(+), 2 deletions(-)

New commits:
commit 9e8df5bfe804943a8662b52ff2afed936b79657d
Author: Gabor Kelemen 
AuthorDate: Sun Dec 3 11:07:23 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Dec 6 15:51:42 2023 +0100

tdf#148986 Support XF86Forward / XF86Back key events

Multimedia keys found on certain presentation clicker devices.
Not added to the Customize dialog, as that was not yet asked for.
As I have no access to a MAC, did not add support for that in vcl.

Inspiration for code taken from
commit ca74511985981444dbd72ade7244484c131e36a7

Change-Id: I417e6ba7e79c5f6e774a56ba747803a156d5f50f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160255
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/include/vcl/keycodes.hxx b/include/vcl/keycodes.hxx
index 2efe29a55fbb..8eb1a0ec8c2c 100644
--- a/include/vcl/keycodes.hxx
+++ b/include/vcl/keycodes.hxx
@@ -156,6 +156,8 @@ constexpr sal_uInt16 KEY_SEMICOLON = 
css::awt::Key::SEMICOLON;
 constexpr sal_uInt16 KEY_QUOTERIGHT = css::awt::Key::QUOTERIGHT;
 constexpr sal_uInt16 KEY_RIGHTCURLYBRACKET = css::awt::Key::RIGHTCURLYBRACKET;
 constexpr sal_uInt16 KEY_NUMBERSIGN = css::awt::Key::NUMBERSIGN;
+constexpr sal_uInt16 KEY_XF86FORWARD = css::awt::Key::XF86FORWARD;
+constexpr sal_uInt16 KEY_XF86BACK = css::awt::Key::XF86BACK;
 constexpr sal_uInt16 KEY_COLON = css::awt::Key::COLON;
 
 constexpr sal_uInt16 KEY_CAPSLOCK = css::awt::Key::CAPSLOCK;
diff --git a/offapi/com/sun/star/awt/Key.idl b/offapi/com/sun/star/awt/Key.idl
index d9f45257ce8c..b07ff78dab54 100644
--- a/offapi/com/sun/star/awt/Key.idl
+++ b/offapi/com/sun/star/awt/Key.idl
@@ -375,6 +375,12 @@ published constants Key
 /* # sign. @since LibreOffice 24.2 */
 const short NUMBERSIGN = 191;
 
+/* XF86Forward @since LibreOffice 24.2 */
+const short XF86FORWARD = 167;
+
+/* XF86Back @since LibreOffice 24.2 */
+const short XF86BACK = 166;
+
 /** The following values don't correspond to physical keys on any
 keyboard but are used in the macOS implementation of VCL. They
 correspond to some of the action messages of the NSResponder
diff --git a/sd/source/console/PresenterController.cxx 
b/sd/source/console/PresenterController.cxx
index 2a0e6d25aa47..7bb137d8c03b 100644
--- a/sd/source/console/PresenterController.cxx
+++ b/sd/source/console/PresenterController.cxx
@@ -845,6 +845,7 @@ void SAL_CALL PresenterController::keyReleased (const 
awt::KeyEvent& rEvent)
 case awt::Key::RIGHT:
 case awt::Key::SPACE:
 case awt::Key::DOWN:
+case awt::Key::XF86FORWARD:
 if (mxSlideShowController.is())
 {
 mxSlideShowController->gotoNextEffect();
@@ -864,6 +865,7 @@ void SAL_CALL PresenterController::keyReleased (const 
awt::KeyEvent& rEvent)
 case awt::Key::LEFT:
 case awt::Key::UP:
 case awt::Key::BACKSPACE:
+case awt::Key::XF86BACK:
 if (mxSlideShowController.is())
 {
 mxSlideShowController->gotoPreviousEffect();
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 7619624544b4..1e739ab97f26 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1848,6 +1848,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
 case KEY_SPACE:
 case KEY_RIGHT:
 case KEY_DOWN:
+case KEY_XF86FORWARD:
 gotoNextEffect();
 break;
 
@@ -1893,6 +1894,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
 case KEY_LEFT:
 case KEY_UP:
 case KEY_BACKSPACE:
+case KEY_XF86BACK:
 gotoPreviousEffect();
 break;
 
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index cde1a06b3dd8..24dcb5ff6f61 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -952,6 +952,12 @@ OUString QtFrame::GetKeyName(sal_uInt16 nKeyCode)
 case KEY_NUMBERSIGN:
 nRetCode = Qt::Key_NumberSign;
 break;
+case KEY_XF86FORWARD:
+nRetCode = Qt::Key_Forward;
+break;
+case KEY_XF86BACK:
+nRetCode = Qt::Key_Back;
+break;
 case KEY_COLON:
 nRetCode

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source

2023-12-06 Thread Michael Stahl (via logerrit)

 sw/source/core/layout/frmtool.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 96f7681117e12974964f60e272241bef236c0147
Author: Michael Stahl 
AuthorDate: Wed Aug 23 15:49:44 2023 +0200
Commit: Miklos Vajna 
CommitDate: Wed Dec 6 15:41:21 2023 +0100

tdf#137523 sw: layout: fix text below tables in footer differently

This fix is better than commit 027f8328eef1e149b6c99b478ed5df870291dc2d
because it turns out the last text frame had a height of 219 in 6.1.

One of the following commits would break this, so a different fix is
needed.

In SwFrameNotify::ImplDestroy(), if the frame changes its position the
next frame's position is invalidated; if the next frame is undersized
then also invalidate its size so that it will be formatted again, with
more space.

(cherry picked from commit 492ddef596c99a9c24d2778276025aafc612a7cb)

Conflicts:
sw/qa/extras/layout/layout3.cxx

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

diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index 4fc6286d32e4..7059b8472be8 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -202,7 +202,14 @@ void SwFrameNotify::ImplDestroy()
 }
 
 if ( pNxt )
+{
 pNxt->InvalidatePos();
+if (pNxt->IsTextFrame() && 
static_cast(pNxt)->IsUndersized())
+{   // tdf#137523 it could have more space at new pos
+pNxt->InvalidateSize();
+pNxt->Prepare(PrepareHint::AdjustSizeWithoutFormatting);
+}
+}
 else
 {
 // #104100# - correct condition for setting retouche

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

2023-12-06 Thread Oliver Specht (via logerrit)

 sw/source/core/text/txtfld.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5de53775531a358c6775d265a3a19699c96a8139
Author: Oliver Specht 
AuthorDate: Wed Nov 22 12:05:14 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Dec 6 15:24:57 2023 +0100

tdf#154369 don't apply default items to numbering symbols

default attributes from the CharFmt should no be applied to the
numbering symbol

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

diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 2cffd26eeef7..84f32e30971f 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -351,7 +351,8 @@ static void 
checkApplyParagraphMarkFormatToNumbering(SwFont* pNumFnt, SwTextForm
 {
 if (!SwTextNode::IsIgnoredCharFormatForNumbering(nWhich, 
/*bIsCharStyle=*/true)
 && !pCleanedSet->HasItem(nWhich)
-&& !(pFormat && pFormat->HasItem(nWhich)) )
+&& !(pFormat && pFormat->HasItem(nWhich))
+&& rStyleAttrs.GetItemState(nWhich) > SfxItemState::DEFAULT)
 {
 // Copy from parent sets only allowed items which will not 
overwrite
 // values explicitly defined in current set (pCleanedSet) or 
in pFormat

[Libreoffice-commits] core.git: 2 commits - postprocess/CustomTarget_registry.mk scp2/source vcl/win

2023-12-06 Thread Gabor Kelemen (via logerrit)

 postprocess/CustomTarget_registry.mk |3 ---
 scp2/source/python/file_python.scp   |9 -
 scp2/source/python/module_python.scp |3 +--
 vcl/win/window/salframe.cxx  |5 -
 4 files changed, 1 insertion(+), 19 deletions(-)

New commits:
commit 968166ba4ee96f7c9053c8f4c88ac82381ff7cf4
Author: Gabor Kelemen 
AuthorDate: Mon Dec 4 12:07:53 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Dec 6 15:23:44 2023 +0100

Remove pyuno.xcd from build/packaging

cleanup after commit 80798b426bf7d5fa4616db1af608640cfbcd79fe

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

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 034d7b7c36e0..1e2e473e0b4d 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -30,7 +30,6 @@ postprocess_XCDS := \
lingucomponent.xcd \
main.xcd \
math.xcd \
-   pyuno.xcd \
writer.xcd \
xsltfilter.xcd
 
@@ -338,8 +337,6 @@ postprocess_FILES_math := \
$(postprocess_MOD)/org/openoffice/Office/Embedding-math.xcu \
$(postprocess_MOD)/org/openoffice/Setup-math.xcu
 
-postprocess_DEPS_pyuno := main
-
 ifeq ($(ENABLE_REPORTBUILDER),TRUE)
 postprocess_XCDS += reportbuilder.xcd
 postprocess_DEPS_reportbuilder := main
diff --git a/scp2/source/python/file_python.scp 
b/scp2/source/python/file_python.scp
index fd008624fd66..f1982cb49380 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -50,14 +50,5 @@ End
 
 #endif // SYSTEM_PYTHON
 
-// Scripting Framework Python configuration settings
-
-File gid_File_Share_Registry_Pyuno_Xcd
-TXT_FILE_BODY;
-Styles = (PACKED);
-Dir = gid_Brand_Dir_Share_Registry;
-Name = "pyuno.xcd";
-End
-
 // DISABLE_PYUNO
 #endif
diff --git a/scp2/source/python/module_python.scp 
b/scp2/source/python/module_python.scp
index 343ad94029fb..62c1bdcd4dd6 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -46,8 +46,7 @@ Module gid_Module_Pyuno
 Files = (auto_python_ALL,
  gid_File_Pyuno_Rdb,
  gid_File_Lib_Python_So,
- gid_File_Lib_Python3_So,
- gid_File_Share_Registry_Pyuno_Xcd);
+ gid_File_Lib_Python3_So);
 Unixlinks = (gid_Unixlink_Python_Headers,
  gid_Unixlink_Python_LibreOfficePython,
  gid_Unixlink_Python_Resources,
commit 714e406fc4089f1a4b67c9a1ac55bf4162cc5a01
Author: Gabor Kelemen 
AuthorDate: Sun Dec 3 23:38:31 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Dec 6 15:23:36 2023 +0100

Drop use of Win98-era multimon.h

last mention of it was removed in 2014 by:
commit cb40b7d2f9902b5fbe89333c4107d72c156b9a15

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

diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 3228caf2f345..aaafe56ee887 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -76,11 +76,6 @@
 #include 
 #include 
 
-#define COMPILE_MULTIMON_STUBS
-#pragma warning(push)
-#pragma warning(disable:4996) // 'GetVersionExA': was declared deprecated
-#include 
-#pragma warning(pop)
 #include 
 
 #include

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

2023-12-06 Thread Miklos Vajna (via logerrit)

 desktop/qa/desktop_lib/test_desktop_lib.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 94b5b16cfa8847e50e30d724aea35764eae5c3c6
Author: Miklos Vajna 
AuthorDate: Mon Nov 27 11:21:57 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Dec 6 14:19:03 2023 +0100

CppunitTest_desktop_lib: adjust asserts so this works again

Change-Id: Id6aba3d9203e3fe4e95771a895d1de50a2030908
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159990
Tested-by: Jenkins CollaboraOffice 
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit ececb678b8362e3be8e02768ddd5e4197d87dc2a)

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 1bb185dd5b9e..f32fb09d9270 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2396,7 +2396,8 @@ void DesktopLOKTest::testInsertCertificate_PEM_ODT()
 }
 
 int nState = pDocument->m_pDocumentClass->getSignatureState(pDocument);
-CPPUNIT_ASSERT_EQUAL(int(1), nState);
+// OK or NOTVALIDATED (signature is OK, but certificate could not be 
validated)
+CPPUNIT_ASSERT(nState == 1 || nState == 4);
 }
 
 void DesktopLOKTest::testInsertCertificate_PEM_DOCX()
@@ -2454,7 +2455,8 @@ void DesktopLOKTest::testInsertCertificate_PEM_DOCX()
 }
 
 int nState = pDocument->m_pDocumentClass->getSignatureState(pDocument);
-CPPUNIT_ASSERT_EQUAL(int(5), nState);
+// PARTIAL_OK or NOTVALIDATED_PARTIAL_OK
+CPPUNIT_ASSERT(nState == 5 || nState == 6);
 }
 
 void DesktopLOKTest::testSignDocument_PEM_PDF()

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 3 commits - external/liborcus i18npool/source svx/source sw/source unotools/source

2023-12-06 Thread Thorsten Behrens (via logerrit)

 external/liborcus/include.patch.0   |   21 +
 i18npool/source/calendar/calendar_gregorian.cxx |2 +-
 svx/source/dialog/fntctrl.cxx   |2 +-
 sw/source/uibase/wrtsh/wrtsh2.cxx   |2 +-
 unotools/source/i18n/resmgr.cxx |5 +
 5 files changed, 29 insertions(+), 3 deletions(-)

New commits:
commit 95e1347cb2d4144ce97431a33b6d4ecda4d679aa
Author: Thorsten Behrens 
AuthorDate: Wed Dec 6 12:15:44 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Dec 6 12:15:44 2023 +0100

No FrameWeld yet on ViewFrame

This was only added via https://gerrit.libreoffice.org/c/core/+/113795

Change-Id: Ibe7c57c83a5c6fe0fd3b6f8e7682811e3549e0bd

diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx 
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 1cb9e1b46861..57769ab6e881 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -495,7 +495,7 @@ static void LoadURL(SwView& rView, const OUString& rURL, 
LoadUrlFlags nFilter,
 OSL_ENSURE( pDShell, "No DocShell?!");
 SfxViewFrame& rViewFrame = *rView.GetViewFrame();
 
-if (!SfxObjectShell::AllowedLinkProtocolFromDocument(rURL, pDShell, 
rViewFrame.GetFrameWeld()))
+if (!SfxObjectShell::AllowedLinkProtocolFromDocument(rURL, pDShell, 
rView.GetFrameWeld()))
 return;
 
 // We are doing tiledRendering, let the client handles the URL loading,
commit 403bf61489eaded6982fe5700b4dbf58d869aa12
Author: Thorsten Behrens 
AuthorDate: Wed Dec 6 11:44:15 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Dec 6 12:15:15 2023 +0100

Fix build for gcc13

This was part of the following commit:

  Author: Stephan Bergmann 
  Date:   Mon May 23 10:21:54 2022 +0200

Missing #include  in various external code

...which is a problem presumably since GCC 13 trunk


"libstdc++: Avoid including  for std::char_traits".  (All the 
broken
C++ code used unqualified uintptr_t etc. rather than std::uintptr_t 
etc., so I
deemed it more appropriate to include  rather than .)

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

Plus the gist of this one:

  Author: Caolán McNamara 
  Date:   Tue Nov 3 14:10:31 2020 +

presumably 'true' is sufficient in all cases

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

Change-Id: Iae063b6270dfe60cebe27833b1a22f7af1fc312c

diff --git a/external/liborcus/include.patch.0 
b/external/liborcus/include.patch.0
index 9555dd534b3e..3bed5aebf865 100644
--- a/external/liborcus/include.patch.0
+++ b/external/liborcus/include.patch.0
@@ -1,3 +1,24 @@
+--- include/orcus/base64.hpp
 include/orcus/base64.hpp
+@@ -9,6 +9,7 @@
+ #define __ORCUS_BASE64_HPP__
+ 
+ #include "env.hpp"
++#include 
+ #include 
+ #include 
+ 
+--- include/orcus/types.hpp
 include/orcus/types.hpp
+@@ -16,6 +16,7 @@
+ #pragma GCC diagnostic ignored "-Wshadow"
+ #endif
+ 
++#include 
+ #include 
+ #include 
+ #include 
+
 --- src/liborcus/orcus_xlsx.cpp
 +++ src/liborcus/orcus_xlsx.cpp
 @@ -32,6 +32,7 @@
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx 
b/i18npool/source/calendar/calendar_gregorian.cxx
index f3dc6ede1f66..1dacd8868265 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -347,7 +347,7 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays )
 "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " 
rounded to " << fR);
 int32_t nZoneOffset, nDSTOffset;
 UErrorCode status = U_ZERO_ERROR;
-body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
+body->getTimeZone().getOffset( fR, true, nZoneOffset, nDSTOffset, status );
 if ( !U_SUCCESS(status) ) throw ERROR;
 status = U_ZERO_ERROR;
 body->setTime( fR - (nZoneOffset + nDSTOffset), status );
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index d312d7ad5f49..10c84ca95222 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -1014,7 +1014,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet 
, bool bPreviewBack
  rCTLFont.SetFillColor( rColor );
 }
 else
-bTransparent = TRUE;
+bTransparent = true;
 
 rFont.SetTransparent( bTransparent );
 rCJKFont.SetTransparent( bTransparent );
commit 5badca42b45f23f35e6dcdb482a222e4ebbd7bb3
Author: Đoàn Trần Công Danh 
AuthorDate: Sun Nov 27 18:59:24 2022 +0700
Commit: Thorsten

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

2023-12-06 Thread Caolán McNamara (via logerrit)

 svx/source/svdraw/svdoedge.cxx |   19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 5ef9770158a3f9579429f64409c5897304ea9111
Author: Caolán McNamara 
AuthorDate: Tue Dec 5 12:42:57 2023 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 6 11:42:22 2023 +0100

cid#1558795 Dereference after null check

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

diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index d3f2560790db..19c498948dcd 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1511,7 +1511,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, 
tools::Long nAngle1, co
 if (eKind != SdrEdgeKind::Bezier || nPointCount <= 2)
 return aXP1;
 
-if (pInfo->m_bUseOOXMLCurve) // Routing method OOXML
+if (pInfo && pInfo->m_bUseOOXMLCurve) // Routing method OOXML
 {
 // The additional points needed are located on the segments of the 
path of the
 // corresponding bentConnector as calculated above.
commit c0b938e279fc36e6da129304b075361de39fa8bd
Author: Caolán McNamara 
AuthorDate: Tue Dec 5 12:42:20 2023 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 6 11:42:14 2023 +0100

replace bInfo with direct pInfo check

its a little less obscure

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

diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 3f1905efe85b..d3f2560790db 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -892,8 +892,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, 
tools::Long nAngle1, co
 bool bUnt2=nAngle2==27000;
 bool bHor2=bLks2 || bRts2;
 bool bVer2=bObn2 || bUnt2;
-bool bInfo=pInfo!=nullptr;
-if (bInfo) {
+if (pInfo) {
 pInfo->m_nAngle1=nAngle1;
 pInfo->m_nAngle2=nAngle2;
 pInfo->m_nObj1Lines=1;
@@ -935,7 +934,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, 
tools::Long nAngle1, co
 
nQ+=std::abs(aXP[3].X()-aXP[2].X())+std::abs(aXP[3].Y()-aXP[2].Y());
 *pnQuality=nQ;
 }
-if (bInfo) {
+if (pInfo) {
 pInfo->m_nObj1Lines=2;
 pInfo->m_nObj2Lines=2;
 if (bHor1) {
@@ -1274,7 +1273,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, 
tools::Long nAngle1, co
 XPolygon aXP2(ImpCalcObjToCenter(aPt2,nAngle2,aBewareRect2,aMeeting));
 sal_uInt16 nXP1Cnt=aXP1.GetPointCount();
 sal_uInt16 nXP2Cnt=aXP2.GetPointCount();
-if (bInfo) {
+if (pInfo) {
 pInfo->m_nObj1Lines=nXP1Cnt; if (nXP1Cnt>1) pInfo->m_nObj1Lines--;
 pInfo->m_nObj2Lines=nXP2Cnt; if (nXP2Cnt>1) pInfo->m_nObj2Lines--;
 }
@@ -1290,7 +1289,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, 
tools::Long nAngle1, co
 }
 if (bInsMeetingPoint) {
 aXP1.Insert(XPOLY_APPEND,aMeeting,PolyFlags::Normal);
-if (bInfo) {
+if (pInfo) {
 // Inserting a MeetingPoint adds 2 new lines,
 // either might become the center line.
 if (pInfo->m_nObj1Lines==pInfo->m_nObj2Lines) {
@@ -1306,7 +1305,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, 
tools::Long nAngle1, co
 }
 }
 }
-} else if (bInfo && aEP1!=aEP2 && nXP1Cnt+nXP2Cnt>=4) {
+} else if (pInfo && aEP1!=aEP2 && nXP1Cnt+nXP2Cnt>=4) {
 // By connecting both ends, another line is added, this becomes the 
center line.
 pInfo->m_nMiddleLine=nXP1Cnt-1;
 }
@@ -1318,7 +1317,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, 
tools::Long nAngle1, co
 }
 sal_uInt16 nPointCount=aXP1.GetPointCount();
 char cForm;
-if (bInfo || pnQuality!=nullptr) {
+if (pInfo || pnQuality!=nullptr) {
 if (nPointCount==2) cForm='I';
 else if (nPointCount==3) cForm='L';
 else if (nPointCount==4) { // Z or U
@@ -1342,7 +1341,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, 
tools::Long nAngle1, co
 } else cForm='4'; // else is case 3 with 5 lines
 } else cForm='?';
 // more shapes:
-if (bInfo) {
+if (pInfo) {
 if (cForm=='I' || cForm=='L' || cForm=='Z' || cForm=='U') {
 pInfo->m_nObj1Lines=1;
 pInfo->m_nObj2Lines=1;
@@ -1456,7 +1455,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, 
tools::Long nAngle1, co
 if (bOverflow || nQual==0x) nQual=0xFFFE;
 *pnQuality=nQual;
 }
-if (bInfo) { // now apply line offsets to aXP1
+if (pInfo) { // now apply line offsets to aXP1

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/qa sw/source

2023-12-06 Thread Justin Luth (via logerrit)

 sw/qa/extras/ooxmlexport/data/tdf76022_textboxWrap.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport18.cxx |   13 +
 sw/source/core/layout/tabfrm.cxx   |   23 +++--
 3 files changed, 29 insertions(+), 7 deletions(-)

New commits:
commit 62adbd2e34c68b5eb0f1b9abc4327ef869cfcfdc
Author: Justin Luth 
AuthorDate: Thu Mar 23 12:17:28 2023 -0400
Commit: Miklos Vajna 
CommitDate: Wed Dec 6 11:37:53 2023 +0100

tdf#115625 tdf#76022 sw table: CalcFlyOffset: get correct surround for 
textbox

The function thought it was dealing with a wrap-through shape,
but actually it is wrap parallel.

Attempts to syncProperty of RES_SURROUND meet with instant disaster,
and likely this emulation works better if the doubled-up shape
only has one wrap anyway.

There is a helper function for this after all,
so that highly suggests workarounds are necessary
instead of just syncing the wrap property.

There were two existing unit tests identified:
-tdf123163-1.docx (doesn't even open in MS Word 2010/2003)
-testCustomShapePresetExport.odt (on round-trip)
-no differences noticed.

(cherry picked from commit afbe948d4c47391092c8fcf4130bd7501c3d5062)

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport18.cxx

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf76022_textboxWrap.odt 
b/sw/qa/extras/ooxmlexport/data/tdf76022_textboxWrap.odt
new file mode 100644
index ..b08fe002f32b
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf76022_textboxWrap.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
index f9f71f77f2f9..4f812c643f5c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
@@ -327,6 +327,19 @@ 
DECLARE_OOXMLEXPORT_TEST(testTdf153964_topMarginAfterBreak15, "tdf153964_topMarg
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xPara, 
"ParaTopMargin"));
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testTdf76022_textboxWrap)
+{
+// Granted, this is an ODT with a bit of an anomoly - tables ignore fly 
wrapping.
+createSwDoc("tdf76022_textboxWrap.odt");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Did you make wrapping sane/interoperable?", 
1, getPages());
+
+// When saving to DOCX, the table should obey the fly wrapping
+reload("Office Open XML Text", "");
+
+// The fly takes up the whole page, so the table needs to shift down to 
the next page.
+CPPUNIT_ASSERT_EQUAL(2, getPages());
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testTdf149551_mongolianVert)
 {
 // Given a docx document with a shape with vert="mongolianVert".
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index bfe6316efd49..d7f3d303289c 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -3117,12 +3117,21 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
 
 if ( bConsiderFly )
 {
-const SwFormatSurround= 
pFly->GetFormat()->GetSurround();
+text::WrapTextMode nSurround = 
pFly->GetFormat()->GetSurround().GetSurround();
+// If the frame format is a TextBox of a draw shape,
+// then use the surround of the original shape.
+bool bWrapThrough = nSurround == 
text::WrapTextMode_THROUGH;
+SwTextBoxHelper::getShapeWrapThrough(pFly->GetFormat(), 
bWrapThrough);
+if (bWrapThrough && nSurround != 
text::WrapTextMode_THROUGH)
+nSurround = text::WrapTextMode_THROUGH;
+else if (!bWrapThrough && nSurround == 
text::WrapTextMode_THROUGH)
+nSurround = text::WrapTextMode_PARALLEL;
+
 const SwFormatHoriOrient = 
pFly->GetFormat()->GetHoriOrient();
-bool bShiftDown = css::text::WrapTextMode_NONE == 
rSur.GetSurround();
+bool bShiftDown = css::text::WrapTextMode_NONE == 
nSurround;
 if (!bShiftDown && bAddVerticalFlyOffsets)
 {
-if (rSur.GetSurround() == text::WrapTextMode_PARALLEL
+if (nSurround == text::WrapTextMode_PARALLEL
 && rHori.GetHoriOrient() == 
text::HoriOrientation::NONE)
 {
 // We know that wrapping was requested and the 
table frame overlaps with
@@ -3182,8 +3191,8 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
 bInvalidatePrtArea = true;
 }
 }
-if (

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

2023-12-06 Thread Thorsten Behrens (via logerrit)

Rebased ref, commits from common ancestor:
commit 64e3aacf59d345ed8f8ccdbdc20c4d5320831a79
Author: Thorsten Behrens 
AuthorDate: Wed Dec 6 06:33:02 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Dec 6 10:41:59 2023 +0100

Bump version to 6.4.0.22

Change-Id: Ife20720d3cd9725a5bf40e4f1433261b790231cf

diff --git a/configure.ac b/configure.ac
index 39cc33d13928..ac34e147b005 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([CIB Office],[6.4.0.21],[],[],[https://www.cib.de/office/])
+AC_INIT([CIB Office],[6.4.0.22],[],[],[https://www.cib.de/office/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit 847de5dfc3997886035a96b1755c07450ef6dfa9
Author: Caolán McNamara 
AuthorDate: Fri Nov 17 08:57:09 2023 +
Commit: Thorsten Behrens 
CommitDate: Wed Dec 6 10:41:59 2023 +0100

we can have just one LoadURL for writer

Change-Id: Ia0162ee1c275292fcf200bad4662e4c2c6b7b972
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159557
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 521ca9cf6acbae96cf95d9740859c9682212013d)

diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx
index ec88a639a4e9..87375f30c8b7 100644
--- a/sw/inc/swurl.hxx
+++ b/sw/inc/swurl.hxx
@@ -23,7 +23,6 @@
 #include 
 
 class SwViewShell;
-class SwView;
 
 enum class LoadUrlFlags {
 NONE= 0x00,
@@ -36,10 +35,6 @@ namespace o3tl {
 void LoadURL( SwViewShell& rSh, const OUString& rName,
   LoadUrlFlags nFilter, const OUString& rTargetFrameName );
 
-void LoadURL( SwView& rView, const OUString& rName,
-  LoadUrlFlags nFilter, const OUString& rTargetFrameName );
-
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/drwtxtex.cxx 
b/sw/source/uibase/shells/drwtxtex.cxx
index 820b131e60b6..0e3ba07c3973 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -545,7 +545,7 @@ void SwDrawTextShell::Execute( SfxRequest  )
 const SvxFieldData* pField = pOLV->GetFieldAtCursor();
 if (const SvxURLField* pURLField = dynamic_cast(pField))
 {
-::LoadURL(GetView(), pURLField->GetURL(), LoadUrlFlags::NONE,
+::LoadURL(GetShell(), pURLField->GetURL(), LoadUrlFlags::NONE,
   pURLField->GetTargetFrame());
 }
 }
commit df87d705a49125c5438eba1f14972134acb55960
Author: Caolán McNamara 
AuthorDate: Wed Nov 15 21:01:48 2023 +
Commit: Thorsten Behrens 
CommitDate: Wed Dec 6 10:41:59 2023 +0100

combine these hyperlink dispatchers into one call

Conflicts:
sw/source/uibase/shells/drwtxtex.cxx
sw/source/uibase/wrtsh/wrtsh2.cxx

Change-Id: Icb7822e811013de648ccf2fbb23a5f0be9e29bb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159489
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 0df175ccc6ea542bc5801f631ff72bed187042eb)

diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx
index 87375f30c8b7..ec88a639a4e9 100644
--- a/sw/inc/swurl.hxx
+++ b/sw/inc/swurl.hxx
@@ -23,6 +23,7 @@
 #include 
 
 class SwViewShell;
+class SwView;
 
 enum class LoadUrlFlags {
 NONE= 0x00,
@@ -35,6 +36,10 @@ namespace o3tl {
 void LoadURL( SwViewShell& rSh, const OUString& rName,
   LoadUrlFlags nFilter, const OUString& rTargetFrameName );
 
+void LoadURL( SwView& rView, const OUString& rName,
+  LoadUrlFlags nFilter, const OUString& rTargetFrameName );
+
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/drwtxtex.cxx 
b/sw/source/uibase/shells/drwtxtex.cxx
index 0e3ba07c3973..820b131e60b6 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -545,7 +545,7 @@ void SwDrawTextShell::Execute( SfxRequest  )
 const SvxFieldData* pField = pOLV->GetFieldAtCursor();
 if (const SvxURLField* pURLField = dynamic_cast(pField))
 {
-::LoadURL(GetShell(), pURLField->GetURL(), LoadUrlFlags::NONE,
+::LoadURL(GetView(), pURLField->GetURL(), LoadUrlFlags::NONE,
   pURLField->GetTargetFrame());
 }
 }
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx 
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 4b98417ac788..1cb9e1b46861 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -491,9 +491,9 @@ bool SwWrtShell::ClickToINetGrf( const Point& rDocPt, 
LoadUrlFlags

[Libreoffice-commits] core.git: desktop/source drawinglayer/source include/vcl slideshow/source svx/source vcl/qa vcl/source vcl/workben

2023-12-06 Thread Noel Grandin (via logerrit)

 desktop/source/lib/init.cxx  |2 
 drawinglayer/source/primitive2d/GlowSoftEgdeShadowTools.cxx  |2 
 drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx |6 
 include/vcl/alpha.hxx|   83 +--
 include/vcl/bitmap.hxx   |6 
 slideshow/source/engine/shapes/gdimtftools.cxx   |8 -
 svx/source/dialog/_contdlg.cxx   |2 
 vcl/qa/cppunit/BitmapExTest.cxx  |4 
 vcl/qa/cppunit/canvasbitmaptest.cxx  |4 
 vcl/qa/cppunit/skia/skia.cxx |   27 +--
 vcl/source/bitmap/BitmapEx.cxx   |8 -
 vcl/source/bitmap/alpha.cxx  |   63 
 vcl/source/bitmap/bitmap.cxx |8 -
 vcl/source/bitmap/bitmappaint.cxx|   14 -
 vcl/source/bitmap/dibtools.cxx   |2 
 vcl/source/filter/jpeg/JpegReader.cxx|2 
 vcl/source/filter/png/PngImageWriter.cxx |4 
 vcl/source/filter/wmf/emfwr.cxx  |6 
 vcl/source/filter/wmf/wmfwr.cxx  |4 
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx  |2 
 vcl/source/gdi/pdfwriter_impl.cxx|4 
 vcl/source/graphic/UnoGraphic.cxx|2 
 vcl/source/outdev/background.cxx |2 
 vcl/source/outdev/bitmap.cxx |4 
 vcl/source/outdev/bitmapex.cxx   |   12 -
 vcl/workben/vcldemo.cxx  |2 
 26 files changed, 168 insertions(+), 115 deletions(-)

New commits:
commit aa7d1c8f1411fe35465f265259cf1082adf05aea
Author: Noel Grandin 
AuthorDate: Fri Dec 1 13:27:52 2023 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 6 09:51:17 2023 +0100

make AlphaMask separate from Bitmap

Having it subclass Bitmap encourages confusion in passing it around, and
I need the extra type-safety for my work on merged-alpha

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 66075e3312d9..fa1c55c09e05 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4222,7 +4222,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
 Bitmap aBmp = aBmpEx.GetBitmap();
 AlphaMask aAlpha = aBmpEx.GetAlphaMask();
 Bitmap::ScopedReadAccess sraBmp(aBmp);
-Bitmap::ScopedReadAccess sraAlpha(aAlpha);
+AlphaMask::ScopedReadAccess sraAlpha(aAlpha);
 
 assert(sraBmp->Height() == nCanvasHeight);
 assert(sraBmp->Width() == nCanvasWidth);
diff --git a/drawinglayer/source/primitive2d/GlowSoftEgdeShadowTools.cxx 
b/drawinglayer/source/primitive2d/GlowSoftEgdeShadowTools.cxx
index ee4b6d4cb14f..e1dcac421344 100644
--- a/drawinglayer/source/primitive2d/GlowSoftEgdeShadowTools.cxx
+++ b/drawinglayer/source/primitive2d/GlowSoftEgdeShadowTools.cxx
@@ -40,7 +40,7 @@ AlphaMask ProcessAndBlurAlphaMask(const AlphaMask& rMask, 
double fErodeDilateRad
 
 // Only completely white pixels on the initial mask must be considered for 
transparency. Any
 // other color must be treated as black. This creates 1-bit B bitmap.
-BitmapEx mask(bConvertTo1Bit ? tmpMask.CreateMask(COL_WHITE) : tmpMask);
+BitmapEx mask(bConvertTo1Bit ? tmpMask.GetBitmap().CreateMask(COL_WHITE) : 
tmpMask.GetBitmap());
 
 // Scaling down increases performance without noticeable quality loss. 
Additionally,
 // current blur implementation can only handle blur radius between 2 and 
254.
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx 
b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index e5658f6cf0d3..6a0dd7e070ee 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -283,7 +283,7 @@ namespace drawinglayer::primitive2d
 }
 else
 {
-BitmapEx aExpandVisibilityMask(aAlphaMask, 
aAlphaMask);
+BitmapEx 
aExpandVisibilityMask(aAlphaMask.GetBitmap(), aAlphaMask);
 
maVirtualDeviceMask->DrawBitmapEx(rAnimationFrame.maPositionPixel, 
aExpandVisibilityMask);
 }
 
@@ -306,7 +306,7 @@ namespace drawinglayer::primitive2d
 }
 else
 {
-

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sc/source

2023-12-06 Thread Eike Rathke (via logerrit)

 sc/source/core/tool/refupdat.cxx |   19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

New commits:
commit c0b46a8270507dc59b731e9c996960374b0db472
Author: Eike Rathke 
AuthorDate: Tue Dec 5 20:58:49 2023 +0100
Commit: Xisco Fauli 
CommitDate: Wed Dec 6 09:27:36 2023 +0100

Resolves: tdf#158223 Revert "fix" for tdf#156174 and follow-up

... introducing a real fix.

commit 94ca402cd1fe2fd9776d08448f7216b7f638e69a
CommitDate: Tue Jul 25 15:04:01 2023 +0200

tdf#156174 sc DBData: fix regression of database ranges

just cured a symptom by removing a condition that shouldn't had been
removed, instead of getting to the real cause of an odd reference
update.

Shrinking the end of a sheet reference range and thus moving it one
before the previously referenced relative position is only possible if
the deleted sheet actually touches the referenced range, which here the
start value points to and thus checking ref>=start+delta is not
necessary and subtracting 1 even harms. This is different from deleting
columns or rows where the start value points behind the deleted area of
moving the following area.

Change-Id: If9ae5dd6f6ae5cd248ad5d999f1aa7577d4ec035
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160374
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit ec165d6fe3784f5cd78351a537abf69e88b68420)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160354
Reviewed-by: Xisco Fauli 

diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx
index e05a14d0137f..95f738c4ed84 100644
--- a/sc/source/core/tool/refupdat.cxx
+++ b/sc/source/core/tool/refupdat.cxx
@@ -25,12 +25,12 @@
 #include 
 
 template< typename R, typename S, typename U >
-static bool lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask )
+static bool lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask, bool bShrink 
= true )
 {
 bool bCut = false;
 if ( rRef >= nStart )
 rRef = sal::static_int_cast( rRef + nDelta );
-else if ( nDelta < 0 && rRef >= nStart + nDelta )
+else if ( nDelta < 0 && bShrink && rRef >= nStart + nDelta )
 rRef = nStart + nDelta; //TODO: limit ???
 if ( rRef < 0 )
 {
@@ -46,12 +46,12 @@ static bool lcl_MoveStart( R& rRef, U nStart, S nDelta, U 
nMask )
 }
 
 template< typename R, typename S, typename U >
-static bool lcl_MoveEnd( R& rRef, U nStart, S nDelta, U nMask )
+static bool lcl_MoveEnd( R& rRef, U nStart, S nDelta, U nMask, bool bShrink = 
true )
 {
 bool bCut = false;
 if ( rRef >= nStart )
 rRef = sal::static_int_cast( rRef + nDelta );
-else if ( nDelta < 0 && rRef >= nStart + nDelta )
+else if ( nDelta < 0 && bShrink && rRef >= nStart + nDelta )
 rRef = nStart + nDelta - 1; //TODO: limit ???
 if (rRef < 0)
 {
@@ -284,9 +284,14 @@ ScRefUpdateRes ScRefUpdate::Update( const ScDocument* 
pDoc, UpdateRefMode eUpdat
 SCTAB nMaxTab = pDoc->GetTableCount() - 1;
 nMaxTab = sal::static_int_cast(nMaxTab + nDz);  // 
adjust to new count
 bool bExp = (bExpand && IsExpand( theTab1, theTab2, nTab1, nDz ));
-bCut1 = lcl_MoveStart( theTab1, nTab1, nDz, nMaxTab );
-bCut2 = lcl_MoveEnd( theTab2, nTab1, nDz, nMaxTab );
-if ( bCut1 || bCut2 )
+bCut1 = lcl_MoveStart( theTab1, nTab1, nDz, nMaxTab, false 
/*bShrink*/);
+bCut2 = lcl_MoveEnd( theTab2, nTab1, nDz, nMaxTab, false 
/*bShrink*/);
+if ( theTab2 < theTab1 )
+{
+eRet = UR_INVALID;
+theTab2 = theTab1;
+}
+else if ( bCut1 || bCut2 )
 eRet = UR_UPDATED;
 if ( bExp )
 {

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

2023-12-06 Thread Laurent Balland (via logerrit)

 extras/source/templates/presnt/Beehive/styles.xml |6 +++---
 extras/source/templates/presnt/Blue_Curve/styles.xml  |6 +++---
 extras/source/templates/presnt/Blueprint_Plans/styles.xml |6 +++---
 extras/source/templates/presnt/Candy/styles.xml   |6 +++---
 extras/source/templates/presnt/DNA/styles.xml |6 +++---
 extras/source/templates/presnt/Focus/styles.xml   |6 +++---
 extras/source/templates/presnt/Forestbird/styles.xml  |6 +++---
 extras/source/templates/presnt/Freshes/styles.xml |6 +++---
 extras/source/templates/presnt/Grey_Elegant/styles.xml|6 +++---
 extras/source/templates/presnt/Growing_Liberty/styles.xml |6 +++---
 extras/source/templates/presnt/Inspiration/styles.xml |6 +++---
 extras/source/templates/presnt/Lights/styles.xml  |6 +++---
 extras/source/templates/presnt/Midnightblue/styles.xml|6 +++---
 extras/source/templates/presnt/Pencil/styles.xml  |6 +++---
 extras/source/templates/presnt/Piano/styles.xml   |6 +++---
 extras/source/templates/presnt/Portfolio/styles.xml   |6 +++---
 extras/source/templates/presnt/Progress/styles.xml|6 +++---
 extras/source/templates/presnt/Sunset/styles.xml  |6 +++---
 extras/source/templates/presnt/Vivid/styles.xml   |6 +++---
 extras/source/templates/presnt/Yellow_Idea/styles.xml |6 +++---
 20 files changed, 60 insertions(+), 60 deletions(-)

New commits:
commit 0f82e9d42822e627edd1fb3b3c87e1f8a22136a4
Author: Laurent Balland 
AuthorDate: Sun Dec 3 11:38:04 2023 +0100
Commit: Laurent Balland 
CommitDate: Wed Dec 6 09:04:23 2023 +0100

tdf#158488 Impress templates: restore style hierarchy

Some templates were defining Title/Header/Text A0 styles with A4 as
parent. Reset it to A0

Change-Id: Ide7b0e5287d38991ad5149eacb80f600467039f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160261
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Beehive/styles.xml 
b/extras/source/templates/presnt/Beehive/styles.xml
index 02d4d06cc9f4..74f40446049b 100644
--- a/extras/source/templates/presnt/Beehive/styles.xml
+++ b/extras/source/templates/presnt/Beehive/styles.xml
@@ -91,15 +91,15 @@
   
   
 
-
+
   
   
 
-
+
   
   
 
-
+
   
 
 
diff --git a/extras/source/templates/presnt/Blue_Curve/styles.xml 
b/extras/source/templates/presnt/Blue_Curve/styles.xml
index 7d6a90f4d70e..bc0420e28577 100644
--- a/extras/source/templates/presnt/Blue_Curve/styles.xml
+++ b/extras/source/templates/presnt/Blue_Curve/styles.xml
@@ -101,15 +101,15 @@
   
   
 
-
+
   
   
 
-
+
   
   
 
-
+
   
 
 
diff --git a/extras/source/templates/presnt/Blueprint_Plans/styles.xml 
b/extras/source/templates/presnt/Blueprint_Plans/styles.xml
index 745769d5a7d2..bd1b430c6cae 100644
--- a/extras/source/templates/presnt/Blueprint_Plans/styles.xml
+++ b/extras/source/templates/presnt/Blueprint_Plans/styles.xml
@@ -104,15 +104,15 @@
   
   
 
-
+
   
   
 
-
+
   
   
 
-
+
   
 
 
diff --git a/extras/source/templates/presnt/Candy/styles.xml 
b/extras/source/templates/presnt/Candy/styles.xml
index b839c8078818..da2008e0bf86 100644
--- a/extras/source/templates/presnt/Candy/styles.xml
+++ b/extras/source/templates/presnt/Candy/styles.xml
@@ -112,15 +112,15 @@
   
   
 
-
+
   
   
 
-
+
   
   
 
-
+
   
 
 
diff --git a/extras/source/templates/presnt/DNA/styles.xml 
b/extras/source/templates/presnt/DNA/styles.xml
index ab202f0232a5..ac5a9da4739d 100644
--- a/extras/source/templates/presnt/DNA/styles.xml
+++ b/extras/source/templates/presnt/DNA/styles.xml
@@ -99,15 +99,15 @@
   
   
 
-
+
   
   
 
-
+
   
   
 
-
+
   
 
 
diff --git a/extras/source/templates/presnt/Focus/styles.xml 
b/extras/source/templates/presnt/Focus/styles.xml
index ea730ad66917..4d5464c0d1ad 100644
--- a/extras/source/templates/presnt/Focus/styles.xml
+++ b/extras/source/templates/presnt/Focus/styles.xml
@@ -103,15 +103,15 @@
   
   
 
-
+
   
   
 
-
+
   
   
 
-
+
   
 
 
diff --git a/extras/source/templates/presnt/Forestbird/styles.xml 
b/extras/source/templates/presnt/Forestbird/styles.xml
index 85b989dc1305..37f2285c8d03 100644
--- a/extras/source/templates/presnt/Forestbird/styles.xml
+++ b/extras/source/templates/presnt/Forestbird/styles.xml
@@ -100,15 +100,15 @@
   
   
 
-
+
   
   
 
-
+
   
   
 
-
+
   
 
 
diff --git

[Libreoffice-commits] core.git: chart2/export_setup.mk oox/inc oox/source sd/qa sw/qa

2023-12-05 Thread Tomaž Vajngerl (via logerrit)

 chart2/export_setup.mk  |   60 
 oox/inc/drawingml/misccontexts.hxx  |4 +
 oox/source/core/xmlfilterbase.cxx   |1 
 oox/source/drawingml/misccontexts.cxx   |   37 ++
 sd/qa/unit/data/odp/SvgImageTest.odp|binary
 sd/qa/unit/export-tests.cxx |   31 
 sw/qa/extras/globalfilter/data/SvgImageTest.odt |binary
 sw/qa/extras/globalfilter/globalfilter.cxx  |   37 ++
 8 files changed, 100 insertions(+), 70 deletions(-)

New commits:
commit 1db193c6c744289139b1df2af0b8defcf974b238
Author: Tomaž Vajngerl 
AuthorDate: Mon Sep 25 09:03:54 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed Dec 6 08:23:34 2023 +0100

tdf#126084 import svg image from ooxml document that use svgBlip elem.

In an OOXML document the svg image is defined in an svgBlip, which
is an OOXML extension. This change checks for the svgBlip element
and imports that instead the normal "blip" element that is still
provided as a fallback (PNG image).

Add roundtrip SVG image test for ODF and OOXML, Impress and Writer.

testGraphicBlipXLSX test failed after this change, because some
component was missing. Changed to enable use_rdb for all chart2
export tests, so issues like this won't happen anymore.

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

diff --git a/chart2/export_setup.mk b/chart2/export_setup.mk
index b2bcf75e..723df9897c4a 100644
--- a/chart2/export_setup.mk
+++ b/chart2/export_setup.mk
@@ -71,65 +71,7 @@ $(eval $(call gb_CppunitTest_use_sdk_api,chart2_export$(1)))
 
 $(eval $(call gb_CppunitTest_use_ure,chart2_export$(1)))
 $(eval $(call gb_CppunitTest_use_vcl,chart2_export$(1)))
-
-$(eval $(call gb_CppunitTest_use_components,chart2_export$(1),\
-basic/util/sb \
-animations/source/animcore/animcore \
-chart2/source/controller/chartcontroller \
-chart2/source/chartcore \
-comphelper/util/comphelp \
-configmgr/source/configmgr \
-dbaccess/util/dba \
-embeddedobj/util/embobj \
-emfio/emfio \
-eventattacher/source/evtatt \
-filter/source/config/cache/filterconfig1 \
-filter/source/odfflatxml/odfflatxml \
-filter/source/storagefilterdetect/storagefd \
-filter/source/xmlfilteradaptor/xmlfa \
-filter/source/xmlfilterdetect/xmlfd \
-forms/util/frm \
-framework/util/fwk \
-i18npool/util/i18npool \
-linguistic/source/lng \
-oox/util/oox \
-package/source/xstor/xstor \
-package/util/package2 \
-sax/source/expatwrap/expwrap \
-sc/util/sc \
-sc/util/scd \
-sc/util/scfilt \
-sw/util/sw \
-sw/util/swd \
-sw/util/msword \
-sd/util/sd \
-sd/util/sdd \
-$(call gb_Helper_optional,SCRIPTING, \
-   sc/util/vbaobj) \
-scaddins/source/analysis/analysis \
-scaddins/source/datefunc/date \
-scripting/source/basprov/basprov \
-scripting/util/scriptframe \
-sfx2/util/sfx \
-sot/util/sot \
-svl/source/fsstor/fsstorage \
-svl/util/svl \
-   svtools/util/svt \
-svx/util/svx \
-svx/util/svxcore \
-toolkit/util/tk \
-vcl/vcl.common \
-ucb/source/core/ucb1 \
-ucb/source/ucp/file/ucpfile1 \
-ucb/source/ucp/tdoc/ucptdoc1 \
-unotools/util/utl \
-unoxml/source/rdf/unordf \
-unoxml/source/service/unoxml \
-uui/util/uui \
-writerfilter/util/writerfilter \
-xmloff/util/xo \
-xmlscript/util/xmlscript \
-))
+$(eval $(call gb_CppunitTest_use_rdb,chart2_export$(1),services))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,chart2_export$(1), \
 modules/swriter \
diff --git a/oox/inc/drawingml/misccontexts.hxx 
b/oox/inc/drawingml/misccontexts.hxx
index c79816282ae7..1b7f05444ac7 100644
--- a/oox/inc/drawingml/misccontexts.hxx
+++ b/oox/inc/drawingml/misccontexts.hxx
@@ -102,7 +102,8 @@ class BlipExtensionContext final : public 
::oox::core::ContextHandler2
 public:
 explicitBlipExtensionContext(
 ::oox::core::ContextHandler2Helper const & rParent,
-BlipFillProperties& rBlipProps );
+BlipFillProperties& rBlipProps,
+model::BlipFill* pBlipFill);
 virtual ~BlipExtensionContext() override;
 
 virtual ::oox::core::ContextHandlerRef
@@ -112,6 +113,7 @@ public:
 
 private:
 BlipFillProperties& mrBlipProps;
+model::BlipFill* mpBlipFill;
 };
 
 
diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index d197440133da..93b5816812a1 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -149,6 +149,7 @@ const Sequence< beans::Pair< OUString, sal_Int32 > >& 
NamespaceIds()

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/qa xmloff/inc xmloff/source

2023-12-05 Thread Tomaž Vajngerl (via logerrit)

 sw/qa/extras/fodfexport/data/SvgImageTest.fodt |  321 +
 sw/qa/extras/fodfexport/fodfexport.cxx |   25 +
 xmloff/inc/xmlmultiimagehelper.hxx |1 
 xmloff/source/core/xmlmultiimagehelper.cxx |   28 +-
 xmloff/source/draw/ximpshap.cxx|   24 +
 xmloff/source/draw/ximpshap.hxx|3 
 xmloff/source/text/XMLTextFrameContext.cxx |   11 
 xmloff/source/text/XMLTextFrameContext.hxx |1 
 8 files changed, 399 insertions(+), 15 deletions(-)

New commits:
commit d6ca6718a3514f383b2b4b678bbcca7188493c86
Author: Tomaž Vajngerl 
AuthorDate: Sat Dec 2 16:57:30 2023 +0900
Commit: Miklos Vajna 
CommitDate: Wed Dec 6 08:20:46 2023 +0100

tdf#123396 actually use the mimetype set in the from document

In the document we set the mime type for the images stored, but
at import we never actually used the mime types. We always did
mime type detection from the filename extension. The problem with
this is that files stored as base64 streams don't have a filename
so it is also not possible to determine the mime type from the
file name.

The consequence of this is that we can't know which image to take
if we have multiple images (fallback images) so we always take the
last one, which could be the wrong one. This happend in the test
document.

This changes the behavior so that we always first use the document
set mime type as there is no reason to not trust that. Only if the
mime type isn't provided by the document we use other mime type
detection methods.

Change-Id: I175c509ce5f11eab2c0454d4d9901ca1fe975272
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160237
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit f5cf0c10eb7050feff19190b06b4597aab2d400a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160338
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/fodfexport/data/SvgImageTest.fodt 
b/sw/qa/extras/fodfexport/data/SvgImageTest.fodt
new file mode 100644
index ..4246a7cb5e5e
--- /dev/null
+++ b/sw/qa/extras/fodfexport/data/SvgImageTest.fodt
@@ -0,0 +1,321 @@
+
+
+http://www.w3.org/TR/css3-text/; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
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:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form: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:officeooo="http://openoffice.org/2009/office; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
 meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
+ 
2023-12-01T21:40:25.0108966092023-12-02T14:20:24.763250978PT2M41S2LibreOffice/7.6.3.1$Linux_X86_64
 LibreOffice_project/60$Build-1
+ 
+  
+   0
+   0
+   58104
+   33657
+   true
+   false
+   
+
+ view2
+ 20551
+ 17866
+ 0
+ 0
+ 58103
+ 33655
+ 0
+ 1
+ false
+ 100
+ false
+ false
+ false
+ false
+ false
+ false
+
+   
+  
+  
+   true
+   false
+   true
+   false
+   true
+   false
+   false
+   0
+   true
+   false
+   true
+   false
+   false
+   false
+   false
+

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

2023-12-05 Thread Miklos Vajna (via logerrit)

 sw/qa/inc/swmodeltestbase.hxx  |8 
 sw/qa/unit/swmodeltestbase.cxx |4 
 2 files changed, 12 deletions(-)

New commits:
commit fa38d98155a857908641380c7a1a5a34fafe934e
Author: Miklos Vajna 
AuthorDate: Tue Dec 5 19:57:53 2023 +0100
Commit: Miklos Vajna 
CommitDate: Wed Dec 6 08:19:43 2023 +0100

Remove now unused SwModelTestBase::preTest()

Which was a way to place test setup code far from the test itself, so
good to get rid of it.

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

diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx
index 7eb41f2eda7c..950136e66eba 100644
--- a/sw/qa/inc/swmodeltestbase.hxx
+++ b/sw/qa/inc/swmodeltestbase.hxx
@@ -140,14 +140,6 @@ protected:
 CPPUNIT_FAIL( "verify method must be overridden" );
 }
 
-/**
- * Override this function if some special filename-specific setup is needed
- */
-virtual std::unique_ptr preTest(const char* /*filename*/)
-{
-return nullptr;
-}
-
 /// Override this function if some special file-specific setup is needed 
during export test: after load, but before save.
 virtual void postLoad(const char* /*pFilename*/)
 {
diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx
index 5029421a631a..d5248bd414fb 100644
--- a/sw/qa/unit/swmodeltestbase.cxx
+++ b/sw/qa/unit/swmodeltestbase.cxx
@@ -66,7 +66,6 @@ void SwModelTestBase::executeImportTest(const char* filename, 
const char* pPassw
 {
 maTempFile.EnableKillingFile(false);
 header();
-std::unique_ptr const pChanges(preTest(filename));
 loadURL(createFileURL(OUString::createFromAscii(filename)), pPassword);
 verify();
 finish();
@@ -77,7 +76,6 @@ void SwModelTestBase::executeLoadVerifyReloadVerify(const 
char* filename, const
 {
 maTempFile.EnableKillingFile(false);
 header();
-std::unique_ptr const pChanges(preTest(filename));
 loadURL(createFileURL(OUString::createFromAscii(filename)), pPassword);
 verify();
 postLoad(filename);
@@ -91,7 +89,6 @@ void SwModelTestBase::executeLoadReloadVerify(const char* 
filename, const char*
 {
 maTempFile.EnableKillingFile(false);
 header();
-std::unique_ptr const pChanges(preTest(filename));
 loadURL(createFileURL(OUString::createFromAscii(filename)), pPassword);
 postLoad(filename);
 saveAndReload(mpFilter, pPassword);
@@ -104,7 +101,6 @@ void SwModelTestBase::executeImportExport(const char* 
filename, const char* pPas
 {
 maTempFile.EnableKillingFile(false);
 header();
-std::unique_ptr const pChanges(preTest(filename));
 loadAndSave(filename, pPassword);
 maTempFile.EnableKillingFile(false);
 verify();

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

2023-12-05 Thread Noel Grandin (via logerrit)

 include/vcl/BitmapInfoAccess.hxx   |9 +
 include/vcl/BitmapPalette.hxx  |6 +
 vcl/source/bitmap/BitmapInfoAccess.cxx |6 +
 vcl/source/bitmap/bitmappaint.cxx  |  171 +++--
 vcl/source/bitmap/bitmappalette.cxx|   20 +++
 5 files changed, 140 insertions(+), 72 deletions(-)

New commits:
commit bb3157e38bfffd23505abc35f790043392f43d2c
Author: Noel Grandin 
AuthorDate: Tue Dec 5 10:45:33 2023 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 6 07:08:18 2023 +0100

Remove the special-casing in Bitmap::Invert (and fix)

and rather rely on the backends doing the right thing, which is
considerably faster.

Which uncovers a bug in the existing code - it is not legal
to simply invert the value when dealing with palette-based
images. Fix this by sharing some code with Bitmap::ReplaceMask.

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

diff --git a/include/vcl/BitmapInfoAccess.hxx b/include/vcl/BitmapInfoAccess.hxx
index c0ef7fb5be1e..6e255c97e7ec 100644
--- a/include/vcl/BitmapInfoAccess.hxx
+++ b/include/vcl/BitmapInfoAccess.hxx
@@ -77,6 +77,9 @@ public:
 return mpBuffer ? mpBuffer->mnBitCount : 0;
 }
 
+/// Returns the BitmapColor (i.e. palette index) that is either an exact 
match
+/// of the required color, or failing that, the entry that is the closest 
i.e. least error
+/// as measured by Color::GetColorError.
 BitmapColor GetBestMatchingColor(const BitmapColor& rBitmapColor) const
 {
 if (HasPalette())
@@ -121,7 +124,13 @@ public:
 return pBuffer->maPalette[nColor];
 }
 
+/// Returns the BitmapColor (i.e. palette index) that is either an exact 
match
+/// of the required color, or failing that, the entry that is the closest 
i.e. least error
+/// as measured by Color::GetColorError.
 sal_uInt16 GetBestPaletteIndex(const BitmapColor& rBitmapColor) const;
+/// Returns the BitmapColor (i.e. palette index) that is an exact match
+/// of the required color. Returns SAL_MAX_UINT16 if nothing found.
+sal_uInt16 GetMatchingPaletteIndex(const BitmapColor& rBitmapColor) const;
 
 const ColorMask& GetColorMask() const
 {
diff --git a/include/vcl/BitmapPalette.hxx b/include/vcl/BitmapPalette.hxx
index 4f20970e15ec..1d5f79de5adf 100644
--- a/include/vcl/BitmapPalette.hxx
+++ b/include/vcl/BitmapPalette.hxx
@@ -65,7 +65,13 @@ public:
 const BitmapColor& operator[](sal_uInt16 nIndex) const;
 BitmapColor& operator[](sal_uInt16 nIndex);
 
+/// Returns the BitmapColor (i.e. palette index) that is either an exact 
match
+/// of the required color, or failing that, the entry that is the closest 
i.e. least error
+/// as measured by Color::GetColorError.
 sal_uInt16 GetBestIndex(const BitmapColor& rCol) const;
+/// Returns the BitmapColor (i.e. palette index) that is an exact match
+/// of the required color. Returns SAL_MAX_UINT16 if nothing found.
+sal_uInt16 GetMatchingIndex(const BitmapColor& rCol) const;
 
 /// Returns true if the palette is 8-bit grey palette.
 bool IsGreyPalette8Bit() const;
diff --git a/vcl/source/bitmap/BitmapInfoAccess.cxx 
b/vcl/source/bitmap/BitmapInfoAccess.cxx
index 50607e94dde3..318317519928 100644
--- a/vcl/source/bitmap/BitmapInfoAccess.cxx
+++ b/vcl/source/bitmap/BitmapInfoAccess.cxx
@@ -77,4 +77,10 @@ sal_uInt16 BitmapInfoAccess::GetBestPaletteIndex(const 
BitmapColor& rBitmapColor
 return (HasPalette() ? pBuffer->maPalette.GetBestIndex(rBitmapColor) : 0);
 }
 
+sal_uInt16 BitmapInfoAccess::GetMatchingPaletteIndex(const BitmapColor& 
rBitmapColor) const
+{
+assert(HasPalette());
+return mpBuffer->maPalette.GetMatchingIndex(rBitmapColor);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/bitmap/bitmappaint.cxx 
b/vcl/source/bitmap/bitmappaint.cxx
index 5d405322e6ed..758f36bc1e93 100644
--- a/vcl/source/bitmap/bitmappaint.cxx
+++ b/vcl/source/bitmap/bitmappaint.cxx
@@ -31,6 +31,12 @@
 #include 
 #include 
 
+static BitmapColor UpdatePaletteForNewColor(BitmapScopedWriteAccess& pAcc,
+const sal_uInt16 nActColors,
+const sal_uInt16 nMaxColors, const 
tools::Long nHeight,
+const tools::Long nWidth,
+const BitmapColor& rWantedColor);
+
 bool Bitmap::Erase(const Color& rFillColor)
 {
 if (IsEmpty())
@@ -63,32 +69,6 @@ bool Bitmap::Invert()
 if (!mxSalBmp)
 return false;
 
-// For alpha masks, we need to actually invert the underlying data
-// or the optimisations elsewhere do not work right.
-if (typeid(*this) != typeid(AlphaMask))
-{
-// We want to avoid using ScopedReadAccess until we

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 7 commits - configure.ac embeddedobj/source include/svx reportdesign/source svx/source sw/source xmloff/source

2023-12-05 Thread Thorsten Behrens (via logerrit)

 configure.ac   |2 -
 embeddedobj/source/commonembedding/persistence.cxx |   25 -
 include/svx/unoshape.hxx   |6 ++-
 reportdesign/source/core/sdr/ReportDrawPage.cxx|2 -
 svx/source/unodraw/shapeimpl.hxx   |7 ++-
 svx/source/unodraw/unomod.cxx  |6 ++-
 svx/source/unodraw/unopage.cxx |   14 +++
 svx/source/unodraw/unoshap4.cxx|   38 +++--
 sw/source/uibase/wrtsh/wrtsh2.cxx  |8 ++--
 xmloff/source/draw/ximpshap.cxx|4 ++
 10 files changed, 67 insertions(+), 45 deletions(-)

New commits:
commit 9c4258eca006fd4524c11ab31a26d886dcad1ec7
Author: Thorsten Behrens 
AuthorDate: Wed Dec 6 06:33:02 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Dec 6 06:33:02 2023 +0100

Bump version to 6.4.0.22

Change-Id: Ife20720d3cd9725a5bf40e4f1433261b790231cf

diff --git a/configure.ac b/configure.ac
index 39cc33d13928..ac34e147b005 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([CIB Office],[6.4.0.21],[],[],[https://www.cib.de/office/])
+AC_INIT([CIB Office],[6.4.0.22],[],[],[https://www.cib.de/office/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit 2bb9d59c9bd1c7893fccfce8e9b4034a8b4165e8
Author: Caolán McNamara 
AuthorDate: Fri Nov 17 08:57:09 2023 +
Commit: Thorsten Behrens 
CommitDate: Wed Dec 6 06:22:54 2023 +0100

we can have just one LoadURL for writer

Change-Id: Ia0162ee1c275292fcf200bad4662e4c2c6b7b972
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159557
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 521ca9cf6acbae96cf95d9740859c9682212013d)

diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx
index ec88a639a4e9..87375f30c8b7 100644
--- a/sw/inc/swurl.hxx
+++ b/sw/inc/swurl.hxx
@@ -23,7 +23,6 @@
 #include 
 
 class SwViewShell;
-class SwView;
 
 enum class LoadUrlFlags {
 NONE= 0x00,
@@ -36,10 +35,6 @@ namespace o3tl {
 void LoadURL( SwViewShell& rSh, const OUString& rName,
   LoadUrlFlags nFilter, const OUString& rTargetFrameName );
 
-void LoadURL( SwView& rView, const OUString& rName,
-  LoadUrlFlags nFilter, const OUString& rTargetFrameName );
-
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/drwtxtex.cxx 
b/sw/source/uibase/shells/drwtxtex.cxx
index 820b131e60b6..0e3ba07c3973 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -545,7 +545,7 @@ void SwDrawTextShell::Execute( SfxRequest  )
 const SvxFieldData* pField = pOLV->GetFieldAtCursor();
 if (const SvxURLField* pURLField = dynamic_cast(pField))
 {
-::LoadURL(GetView(), pURLField->GetURL(), LoadUrlFlags::NONE,
+::LoadURL(GetShell(), pURLField->GetURL(), LoadUrlFlags::NONE,
   pURLField->GetTargetFrame());
 }
 }
commit 2644737c313540dcd1e33e9c5c6802c6d228afa2
Author: Caolán McNamara 
AuthorDate: Wed Nov 15 21:01:48 2023 +
Commit: Thorsten Behrens 
CommitDate: Wed Dec 6 06:21:58 2023 +0100

combine these hyperlink dispatchers into one call

Conflicts:
sw/source/uibase/shells/drwtxtex.cxx
sw/source/uibase/wrtsh/wrtsh2.cxx

Change-Id: Icb7822e811013de648ccf2fbb23a5f0be9e29bb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159489
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 0df175ccc6ea542bc5801f631ff72bed187042eb)

diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx
index 87375f30c8b7..ec88a639a4e9 100644
--- a/sw/inc/swurl.hxx
+++ b/sw/inc/swurl.hxx
@@ -23,6 +23,7 @@
 #include 
 
 class SwViewShell;
+class SwView;
 
 enum class LoadUrlFlags {
 NONE= 0x00,
@@ -35,6 +36,10 @@ namespace o3tl {
 void LoadURL( SwViewShell& rSh, const OUString& rName,
   LoadUrlFlags nFilter, const OUString& rTargetFrameName );
 
+void LoadURL( SwView& rView, const OUString& rName,
+  LoadUrlFlags nFilter, const OUString& rTargetFrameName );
+
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/drwtxtex.cxx 
b/sw/source/uibase/shells/drwtxtex.cxx
index 0e3ba07c3973..820b131e60b6 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -545,7 +545,7 @@ void SwDrawTextShell::Execute( SfxRequest  )

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

2023-12-05 Thread Laurent Balland (via logerrit)

 extras/source/templates/presnt/Beehive/styles.xml  |2 
 extras/source/templates/presnt/Blue_Curve/content.xml  |8 -
 extras/source/templates/presnt/DNA/content.xml |2 
 extras/source/templates/presnt/DNA/styles.xml  |   18 +-
 extras/source/templates/presnt/Focus/content.xml   |2 
 extras/source/templates/presnt/Focus/styles.xml|   74 
+-
 extras/source/templates/presnt/Nature_Illustration/content.xml |8 -
 extras/source/templates/presnt/Progress/content.xml|8 -
 extras/source/templates/presnt/Progress/styles.xml |   48 +++---
 extras/source/templates/presnt/Vivid/content.xml   |8 -
 extras/source/templates/presnt/Vivid/styles.xml|   38 ++---
 11 files changed, 93 insertions(+), 123 deletions(-)

New commits:
commit a9ad36ae46ff76c0d59b0d170314fdd3a9ee5d35
Author: Laurent Balland 
AuthorDate: Tue Nov 28 21:31:43 2023 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Dec 5 23:20:39 2023 +0100

Impress templates: restore font declarations

Some warnings appear when opening the template due to some missing font
declarations
Remove date declaration
Fix some minor errors detected with ODFValidator
Focus: remove DejaVu Sans2 font declaration (duplicate)

Change-Id: I48a61d7df651d8113d5f15ba0c5877f6553e5003
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160064
Tested-by: Jenkins
Reviewed-by: Laurent Balland 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/extras/source/templates/presnt/Beehive/styles.xml 
b/extras/source/templates/presnt/Beehive/styles.xml
index 43408af8019d..02d4d06cc9f4 100644
--- a/extras/source/templates/presnt/Beehive/styles.xml
+++ b/extras/source/templates/presnt/Beehive/styles.xml
@@ -441,7 +441,7 @@
 
 
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Blue_Curve/content.xml 
b/extras/source/templates/presnt/Blue_Curve/content.xml
index a5e6a3954b3d..3e2190dea407 100644
--- a/extras/source/templates/presnt/Blue_Curve/content.xml
+++ b/extras/source/templates/presnt/Blue_Curve/content.xml
@@ -14,13 +14,6 @@
 
   
 
-
-  
-  .
-  
-  .
-  
-
 
   
 
@@ -54,7 +47,6 @@
   
   
 
-  
   
 
 
diff --git a/extras/source/templates/presnt/DNA/content.xml 
b/extras/source/templates/presnt/DNA/content.xml
index b10ed4dd4a19..0644ebd1eddc 100644
--- a/extras/source/templates/presnt/DNA/content.xml
+++ b/extras/source/templates/presnt/DNA/content.xml
@@ -4,6 +4,8 @@
   
 
 
+
+
   
   
 
diff --git a/extras/source/templates/presnt/DNA/styles.xml 
b/extras/source/templates/presnt/DNA/styles.xml
index bf3366a7ca3e..ab202f0232a5 100644
--- a/extras/source/templates/presnt/DNA/styles.xml
+++ b/extras/source/templates/presnt/DNA/styles.xml
@@ -68,7 +68,7 @@
 
   
   
-  
+  
 
 
   
@@ -78,7 +78,7 @@
 
 
   
-  
+  
 
 
   
@@ -112,7 +112,7 @@
 
 
   
-  
+  
 
 
   
@@ -127,7 +127,7 @@
 
 
   
-  
+  
 
 
   
@@ -179,12 +179,12 @@
 
   
   
-  
+  
 
 
   
   
-  
+  
 
 
   
@@ -232,7 +232,7 @@
 
   
   
-  
+  
 
 
   
@@ -299,7 +299,7 @@
 
   
   
-  
+  
 
 
   
@@ -347,7 +347,7 @@
 
   
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Focus/content.xml 
b/extras/source/templates/presnt/Focus/content.xml
index fb38594989d0..1d88905e6b15 100644
--- a/extras/source/templates/presnt/Focus/content.xml
+++ b/extras/source/templates/presnt/Focus/content.xml
@@ -2,7 +2,7 @@
 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:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1
 .0" xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"

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

2023-12-05 Thread Eike Rathke (via logerrit)

 sc/source/core/tool/refupdat.cxx |   19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

New commits:
commit f35b540279b00575ff79eda1c65fb0f8caad86bf
Author: Eike Rathke 
AuthorDate: Tue Dec 5 20:58:49 2023 +0100
Commit: Eike Rathke 
CommitDate: Tue Dec 5 22:40:50 2023 +0100

Resolves: tdf#158223 Revert "fix" for tdf#156174 and follow-up

... introducing a real fix.

commit 94ca402cd1fe2fd9776d08448f7216b7f638e69a
CommitDate: Tue Jul 25 15:04:01 2023 +0200

tdf#156174 sc DBData: fix regression of database ranges

just cured a symptom by removing a condition that shouldn't had been
removed, instead of getting to the real cause of an odd reference
update.

Shrinking the end of a sheet reference range and thus moving it one
before the previously referenced relative position is only possible if
the deleted sheet actually touches the referenced range, which here the
start value points to and thus checking ref>=start+delta is not
necessary and subtracting 1 even harms. This is different from deleting
columns or rows where the start value points behind the deleted area of
moving the following area.

Change-Id: If9ae5dd6f6ae5cd248ad5d999f1aa7577d4ec035
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160374
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx
index e05a14d0137f..95f738c4ed84 100644
--- a/sc/source/core/tool/refupdat.cxx
+++ b/sc/source/core/tool/refupdat.cxx
@@ -25,12 +25,12 @@
 #include 
 
 template< typename R, typename S, typename U >
-static bool lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask )
+static bool lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask, bool bShrink 
= true )
 {
 bool bCut = false;
 if ( rRef >= nStart )
 rRef = sal::static_int_cast( rRef + nDelta );
-else if ( nDelta < 0 && rRef >= nStart + nDelta )
+else if ( nDelta < 0 && bShrink && rRef >= nStart + nDelta )
 rRef = nStart + nDelta; //TODO: limit ???
 if ( rRef < 0 )
 {
@@ -46,12 +46,12 @@ static bool lcl_MoveStart( R& rRef, U nStart, S nDelta, U 
nMask )
 }
 
 template< typename R, typename S, typename U >
-static bool lcl_MoveEnd( R& rRef, U nStart, S nDelta, U nMask )
+static bool lcl_MoveEnd( R& rRef, U nStart, S nDelta, U nMask, bool bShrink = 
true )
 {
 bool bCut = false;
 if ( rRef >= nStart )
 rRef = sal::static_int_cast( rRef + nDelta );
-else if ( nDelta < 0 && rRef >= nStart + nDelta )
+else if ( nDelta < 0 && bShrink && rRef >= nStart + nDelta )
 rRef = nStart + nDelta - 1; //TODO: limit ???
 if (rRef < 0)
 {
@@ -284,9 +284,14 @@ ScRefUpdateRes ScRefUpdate::Update( const ScDocument* 
pDoc, UpdateRefMode eUpdat
 SCTAB nMaxTab = pDoc->GetTableCount() - 1;
 nMaxTab = sal::static_int_cast(nMaxTab + nDz);  // 
adjust to new count
 bool bExp = (bExpand && IsExpand( theTab1, theTab2, nTab1, nDz ));
-bCut1 = lcl_MoveStart( theTab1, nTab1, nDz, nMaxTab );
-bCut2 = lcl_MoveEnd( theTab2, nTab1, nDz, nMaxTab );
-if ( bCut1 || bCut2 )
+bCut1 = lcl_MoveStart( theTab1, nTab1, nDz, nMaxTab, false 
/*bShrink*/);
+bCut2 = lcl_MoveEnd( theTab2, nTab1, nDz, nMaxTab, false 
/*bShrink*/);
+if ( theTab2 < theTab1 )
+{
+eRet = UR_INVALID;
+theTab2 = theTab1;
+}
+else if ( bCut1 || bCut2 )
 eRet = UR_UPDATED;
 if ( bExp )
 {

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

2023-12-05 Thread Jim Raykowski (via logerrit)

 sw/source/uibase/inc/conttree.hxx  |4 +
 sw/source/uibase/utlui/content.cxx |   91 -
 2 files changed, 93 insertions(+), 2 deletions(-)

New commits:
commit 8286c9ebe47aaf24b055f51136a8cb06f1e6429c
Author: Jim Raykowski 
AuthorDate: Mon Nov 27 22:51:28 2023 -0900
Commit: Jim Raykowski 
CommitDate: Tue Dec 5 21:52:22 2023 +0100

tdf#157729 SwNavigator: enhancement to group comments by threads

Change-Id: I64bc02e64d540a2bf602d2124deda1990dfb9f7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160011
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/uibase/inc/conttree.hxx 
b/sw/source/uibase/inc/conttree.hxx
index 9e1653fd08e3..b693a7da97a4 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -106,8 +106,10 @@ class SwContentTree final : public SfxListener
 SwWrtShell* m_pActiveShell;   // the active or a const. open view
 SwNavigationConfig* m_pConfig;
 
+// these maps store the expand state of nodes with children
 std::map< void*, bool > mOutLineNodeMap;
-std::map m_aRegionNodeExpandMap; // stores expand state 
of nodes with children
+std::map m_aRegionNodeExpandMap;
+std::map m_aPostItNodeExpandMap;
 
 sal_Int32   m_nActiveBlock;  // used to restore content types 
expand state
 sal_Int32   m_nHiddenBlock;
diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 4ca633697cdd..29ab1b964c26 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -119,6 +119,8 @@
 
 #include 
 
+#include 
+
 #define CTYPE_CNT   0
 #define CTYPE_CTT   1
 
@@ -2312,6 +2314,45 @@ bool SwContentTree::RequestingChildren(const 
weld::TreeIter& rParent)
 }
 }
 }
+else if (pCntType->GetType() == ContentTypeId::POSTIT)
+{
+std::vector> aParentCandidates;
+for(size_t i = 0; i < nCount; ++i)
+{
+const SwPostItContent* pCnt =
+static_cast(pCntType->GetMember(i));
+
+OUString sEntry = pCnt->GetName();
+OUString sId(weld::toId(pCnt));
+
+const SwPostItField* pPostItField =
+static_cast(pCnt->GetPostIt()->GetField());
+auto lambda = [, this](const 
std::unique_ptr& xEntry)
+{
+SwPostItContent* pParentCandidateCnt =
+
weld::fromId(m_xTreeView->get_id(*xEntry));
+return pPostItField->GetParentPostItId() ==
+static_cast(pParentCandidateCnt->GetPostIt()
+  
->GetField())->GetPostItId();
+};
+
+// if a parent candidate is not found use the passed root node
+auto aFind = std::find_if(aParentCandidates.rbegin(), 
aParentCandidates.rend(), lambda);
+if (aFind != aParentCandidates.rend())
+insert(aFind->get(), sEntry, sId, false, xChild.get());
+else
+insert(, sEntry, sId, false, xChild.get());
+
+m_xTreeView->set_sensitive(*xChild, !pCnt->IsInvisible());
+
+// clear parent candidates when encountering a postit that 
doesn't have a parent
+// following postits can't have a parent that is in these 
candidates
+if (pPostItField->GetParentPostItId() == 0)
+aParentCandidates.clear();
+
+
aParentCandidates.emplace_back(m_xTreeView->make_iterator(xChild.get()));
+}
+}
 else
 InsertContent(rParent);
 
@@ -2485,6 +2526,47 @@ void SwContentTree::Expand(const weld::TreeIter& rParent,
 m_aRegionNodeExpandMap[key] = true;
 }
 }
+else if (m_nRootType == ContentTypeId::POSTIT || (m_nRootType == 
ContentTypeId::UNKNOWN &&
+  eParentContentTypeId == 
ContentTypeId::POSTIT))
+{
+if (bParentIsContentType)
+{
+std::map aCurrentPostItNodeExpandMap;
+if (RequestingChildren(rParent))
+{
+std::unique_ptr 
xChild(m_xTreeView->make_iterator());
+while (m_xTreeView->iter_next(*xChild) && 
lcl_IsContent(*xChild, *m_xTreeView))
+{
+if (m_xTreeView->iter_has_child(*xChild))
+{
+
assert(dynamic_cast(weld::fromId(m_xTreeView->get_id(*xChild;
+const void* key =
+static_cast(weld::fromId(
+ 
m_xTreeView->get_id(*xChild))->GetPostIt());
+bool bExpandNode =
+

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

2023-12-05 Thread Miklos Vajna (via logerrit)

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 24135dc15a797ca91dd32c70cbc4d26a05dfd127
Author: Miklos Vajna 
AuthorDate: Tue Dec 5 11:43:42 2023 +0100
Commit: Caolán McNamara 
CommitDate: Tue Dec 5 20:29:03 2023 +0100

writerfilter: fix crash in DomainMapper_Impl::PushSdt()

Crashreport signature:

Fatal signal received: SIGSEGV code: 1 for address: 0x0

program/libwriterfilterlo.so
writerfilter::dmapper::DomainMapper_Impl::PushSdt()
writerfilter/source/dmapper/DomainMapper_Impl.cxx:987
program/libwriterfilterlo.so
writerfilter::dmapper::DomainMapper::lcl_attribute(unsigned int, 
writerfilter::Value&)
include/tools/ref.hxx:56
program/libwriterfilterlo.so

writerfilter::ooxml::OOXMLProperty::resolve(writerfilter::Properties&)
include/tools/ref.hxx:56
program/libwriterfilterlo.so

writerfilter::ooxml::OOXMLPropertySet::resolve(writerfilter::Properties&)
include/tools/ref.hxx:157

Change-Id: I76416ca707a4ac40495e5c22f62fcd017bcb5e48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160336
Tested-by: Jenkins CollaboraOffice 
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 728f6ec104b1a91c8c8ea0790bc7f56471c67737)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160351
Tested-by: Jenkins

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 183d71d5833a..e9d57ea34cef 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -977,8 +977,19 @@ void DomainMapper_Impl::PushSdt()
 }
 
 uno::Reference xTextAppend = 
m_aTextAppendStack.top().xTextAppend;
+if (!xTextAppend.is())
+{
+return;
+}
+
+uno::Reference xText = xTextAppend->getText();
+if (!xText.is())
+{
+return;
+}
+
 uno::Reference xCursor
-= 
xTextAppend->getText()->createTextCursorByRange(xTextAppend->getEnd());
+= xText->createTextCursorByRange(xTextAppend->getEnd());
 // Offset so the cursor is not adjusted as we import the SDT's content.
 bool bStart = !xCursor->goLeft(1, /*bExpand=*/false);
 m_xSdtStarts.push({bStart, OUString(), xCursor->getStart()});

[Libreoffice-commits] core.git: uitest/uitest

2023-12-05 Thread Mike Kaganski (via logerrit)

 uitest/uitest/test.py |   48 +++-
 1 file changed, 19 insertions(+), 29 deletions(-)

New commits:
commit faefc434efdc38587ddad0a65618efde81431e38
Author: Mike Kaganski 
AuthorDate: Tue Dec 5 14:29:00 2023 +0100
Commit: Mike Kaganski 
CommitDate: Tue Dec 5 19:28:28 2023 +0100

Deduplicate execute_dialog_through_*

Use Python 3.3's 'yield from', which should be OK, because the
baseline rhel8 has Python 3.6. If needed, older Python could
use replacement like this:

for dialog in self.wait_and_yield_dialog(event, xDialogParent, 
close_button):
yield dialog

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

diff --git a/uitest/uitest/test.py b/uitest/uitest/test.py
index 08c9a89ef9f5..db2bc1828be1 100644
--- a/uitest/uitest/test.py
+++ b/uitest/uitest/test.py
@@ -124,6 +124,23 @@ class UITest(object):
 finally:
 self.close_doc()
 
+def wait_and_yield_dialog(self, event, parent, close_button):
+while not event.executed:
+time.sleep(DEFAULT_SLEEP)
+dialog = self._xUITest.getTopFocusWindow()
+if parent == dialog:
+raise Exception("executing the action did not open the dialog")
+try:
+yield dialog
+except:
+if not close_button:
+if 'cancel' in dialog.getChildren():
+self.close_dialog_through_button(dialog.getChild("cancel"))
+raise
+finally:
+if close_button:
+self.close_dialog_through_button(dialog.getChild(close_button))
+
 # Calls UITest.close_dialog_through_button at exit
 @contextmanager
 def execute_dialog_through_command(self, command, printNames=False, 
close_button = "ok", eventName = "DialogExecute"):
@@ -131,23 +148,7 @@ class UITest(object):
 xDialogParent = self._xUITest.getTopFocusWindow()
 if not self._xUITest.executeDialog(command):
 raise Exception("Dialog not executed for: " + command)
-while True:
-if event.executed:
-xDialog = self._xUITest.getTopFocusWindow()
-if xDialogParent == xDialog:
-raise Exception("executing the action did not open the 
dialog")
-try:
-yield xDialog
-except:
-if not close_button:
-if 'cancel' in xDialog.getChildren():
-
self.close_dialog_through_button(xDialog.getChild("cancel"))
-raise
-finally:
-if close_button:
-
self.close_dialog_through_button(xDialog.getChild(close_button))
-return
-time.sleep(DEFAULT_SLEEP)
+yield from self.wait_and_yield_dialog(event, xDialogParent, 
close_button)
 
 @contextmanager
 def execute_modeless_dialog_through_command(self, command, 
printNames=False, close_button = "ok"):
@@ -163,18 +164,7 @@ class UITest(object):
 xDialogParent = self._xUITest.getTopFocusWindow()
 with EventListener(self._xContext, event_name) as event:
 ui_object.executeAction(action, parameters)
-while True:
-if event.executed:
-xDialog = self._xUITest.getTopFocusWindow()
-if xDialogParent == xDialog:
-raise Exception("executing the action did not open the 
dialog")
-try:
-yield xDialog
-finally:
-if close_button:
-
self.close_dialog_through_button(xDialog.getChild(close_button))
-return
-time.sleep(DEFAULT_SLEEP)
+yield from self.wait_and_yield_dialog(event, xDialogParent, 
close_button)
 
 # Calls UITest.close_doc at exit
 @contextmanager

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

2023-12-05 Thread Stephan Bergmann (via logerrit)

 desktop/source/app/app.cxx |1 +
 desktop/source/app/updater.cxx |   22 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit 8686b480ba1d79463f33fe931a454d9d92c3d739
Author: Stephan Bergmann 
AuthorDate: Tue Dec 5 14:05:36 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Dec 5 18:07:06 2023 +0100

Fix apparent copy/paste typo

...present ever since the code got introduced in
569269078576fa832143ec4f0bf03283ff358f48 "improve the update checker"

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

diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index 1af82cf85fc9..0cd95da8d4e7 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -477,7 +477,7 @@ update_info parse_response(const std::string& rResponse)
 }
 
 orcus::json::node aLanguageNode = aDocumentRoot.child("languages");
-if (aUpdateNode.type() != orcus::json::node_t::object)
+if (aLanguageNode.type() != orcus::json::node_t::object)
 {
 throw invalid_update_info();
 }
commit 7f49fa220225d2afbefac756a03586212d8ce1c6
Author: Stephan Bergmann 
AuthorDate: Tue Dec 5 12:35:08 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Dec 5 18:06:51 2023 +0100

Make --enable-online-update=mar at least compile again, on Linux

Seen it build (but no idea yet whether it actually would work) with
autogen.input including

> --enable-online-update=mar
> --with-update-config=/home/sberg/lo/update.ini

and ~/lo/update.ini containing

> [Updater]
> ServerURL=TODO
> base-url=TODO
> certificate-der=/home/sberg/lo/certificate.der
> certificate-name=TODO
> certificate-path=TODO
> channel=TODO
> upload-url=TODO

and ~/lo/certificate.der containing

> TODO

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

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index cd1d1de0d6ea..4c13a2a8e716 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -118,6 +118,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index edac2cb38350..1af82cf85fc9 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -36,7 +36,6 @@
 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -48,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace {
 
@@ -391,9 +391,9 @@ public:
 }
 };
 
-OUString toOUString(const std::string& rStr)
+OUString toOUString(const std::string_view& rStr)
 {
-return OUString::fromUtf8(rStr.c_str());
+return OUString::fromUtf8(rStr);
 }
 
 update_file parse_update_file(orcus::json::node& rNode)
@@ -422,12 +422,12 @@ update_file parse_update_file(orcus::json::node& rNode)
 }
 
 update_file aUpdateFile;
-aUpdateFile.aURL = toOUString(aURLNode.string_value().str());
+aUpdateFile.aURL = toOUString(aURLNode.string_value());
 
 if (aUpdateFile.aURL.isEmpty())
 throw invalid_update_info();
 
-aUpdateFile.aHash = toOUString(aHashNode.string_value().str());
+aUpdateFile.aHash = toOUString(aHashNode.string_value());
 aUpdateFile.nSize = static_cast(aSizeNode.numeric_value());
 return aUpdateFile;
 }
@@ -454,7 +454,7 @@ update_info parse_response(const std::string& rResponse)
 {
 update_info aUpdateInfo;
 auto aMsgNode = aDocumentRoot.child("response");
-aUpdateInfo.aMessage = toOUString(aMsgNode.string_value().str());
+aUpdateInfo.aMessage = toOUString(aMsgNode.string_value());
 return aUpdateInfo;
 }
 
@@ -483,17 +483,17 @@ update_info parse_response(const std::string& rResponse)
 }
 
 update_info aUpdateInfo;
-aUpdateInfo.aFromBuildID = toOUString(aFromNode.string_value().str());
-aUpdateInfo.aSeeAlsoURL = toOUString(aSeeAlsoNode.string_value().str());
+aUpdateInfo.aFromBuildID = toOUString(aFromNode.string_value());
+aUpdateInfo.aSeeAlsoURL = toOUString(aSeeAlsoNode.string_value());
 
 aUpdateInfo.aUpdateFile = parse_update_file(aUpdateNode);
 
-std::vector aLanguages = aLanguageNode.keys();
+std::vector aLanguages = aLanguageNode.keys();
 for (auto const& language : aLanguages)
 {
 language_file aLanguageFile;
 auto aLangEntry = aLanguageNode.child(language);
-aLanguageFile.aLangCode = toOUString(language.str());
+aLanguageFile.aLangCode = toOUString(language);
 aLanguageFile.aUpdateFile = parse_update_file(aLangEntry);
 aUpdateInfo.aLanguageFiles.push_back(aLanguageFile);
 }

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

2023-12-05 Thread Caolán McNamara (via logerrit)

 editeng/source/misc/svxacorr.cxx |4 +++-
 sd/source/filter/eppt/pptx-epptooxml.cxx |6 +-
 vcl/source/window/printdlg.cxx   |1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit e507fd525404d5ac078a47650df11e5e18a88a81
Author: Caolán McNamara 
AuthorDate: Tue Dec 5 13:54:19 2023 +
Commit: Caolán McNamara 
CommitDate: Tue Dec 5 17:19:03 2023 +0100

Related: tdf#158534 set fallback help page for optional print content

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

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 3c1f5d0d36e5..9c5f519f7cfb 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1330,6 +1330,7 @@ void PrintDialog::setupOptionalUI()
 rOption.Value >>= sOptionsUIFile;
 mxCustomOptionsUIBuilder = 
Application::CreateBuilder(mxCustom.get(), sOptionsUIFile);
 std::unique_ptr xWindow = 
mxCustomOptionsUIBuilder->weld_container("box");
+xWindow->set_help_id("vcl/ui/printdialog/PrintDialog");
 xWindow->show();
 continue;
 }
commit a28a721ef9f2daced3e08f30578e603abd119773
Author: Caolán McNamara 
AuthorDate: Tue Dec 5 12:45:43 2023 +
Commit: Caolán McNamara 
CommitDate: Tue Dec 5 17:18:57 2023 +0100

cid#1546503 Using invalid iterator

and

cid#1546284 Using invalid iterator

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

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 15cbecc32db3..2788c6694c09 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2146,7 +2146,9 @@ bool SvxAutoCorrect::FindInCplSttExceptList(LanguageType 
eLang,
 if (m_aLangTable.find(aLanguageTag) != m_aLangTable.end() || 
CreateLanguageFile(aLanguageTag, false))
 {
 //the language is available - so bring it on
-const SvStringsISortDtor* pList = 
m_aLangTable.find(aLanguageTag)->second.GetCplSttExceptList();
+const auto iter = m_aLangTable.find(aLanguageTag);
+assert(iter != m_aLangTable.end() && "CreateLanguageFile can't fail");
+const SvStringsISortDtor* pList = iter->second.GetCplSttExceptList();
 if(bAbbreviation ? lcl_FindAbbreviation(pList, sWord) : 
pList->find(sWord) != pList->end() )
 return true;
 }
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index ae8ccc063cf2..291565871ff2 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -2335,9 +2335,13 @@ void 
PowerPointExport::WritePlaceholderReferenceShapes(PowerPointShapeExport& rD
 || mXPagePropSet->getPropertyValue("IsDateTimeFixed") == 
false)))
 {
 if ((xShape = GetReferencedPlaceholderXShape(DateAndTime, ePageType)))
+{
+const auto iter = maPlaceholderShapeToIndexMap.find(xShape);
+assert(iter != maPlaceholderShapeToIndexMap.end());
 rDML.WritePlaceholderReferenceShape(DateAndTime,
-
maPlaceholderShapeToIndexMap.find(xShape)->second,
+iter->second,
 ePageType, mXPagePropSet);
+}
 }
 }

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

2023-12-05 Thread Laurent Balland (via logerrit)

 extras/source/templates/presnt/Vintage/styles.xml |   54 --
 1 file changed, 54 deletions(-)

New commits:
commit 23c300a06dbfb5399cf479d603e6f7fe1433d134
Author: Laurent Balland 
AuthorDate: Sun Dec 3 20:48:06 2023 +0100
Commit: Laurent Balland 
CommitDate: Tue Dec 5 14:49:58 2023 +0100

Vintage Impress template: remove unused styles

These old styles are used in the template and is no more in use in LO.
So they remain untranslated when changing UI language.

Change-Id: I130eb25df9b76783d498d6ab1e5191551b9a4d0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160269
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Vintage/styles.xml 
b/extras/source/templates/presnt/Vintage/styles.xml
index a870b0926dcb..5bdd81803fd7 100644
--- a/extras/source/templates/presnt/Vintage/styles.xml
+++ b/extras/source/templates/presnt/Vintage/styles.xml
@@ -63,63 +63,9 @@
   
   
 
-
-  
-
-
-  
-
 
   
 
-
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-

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

2023-12-05 Thread Caolán McNamara (via logerrit)

 basctl/source/basicide/baside2b.cxx |6 +-
 vcl/inc/printdlg.hxx|1 -
 vcl/source/window/printdlg.cxx  |   11 ---
 3 files changed, 5 insertions(+), 13 deletions(-)

New commits:
commit a639b7432e7d35b271fbfea9021f5df56d681006
Author: Caolán McNamara 
AuthorDate: Tue Dec 5 11:55:01 2023 +
Commit: Caolán McNamara 
CommitDate: Tue Dec 5 14:43:10 2023 +0100

Resolves: tdf#158534 two help pages from print help button

its either use the default "help" response, or have an explicit
handler for the help button.

Its more consistent to just use the default "help" response for
the print dialog as done everywhere else.

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

diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index fc4085a99b4a..bf058b079717 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -131,7 +131,6 @@ namespace vcl
 
 std::unique_ptr   mxOKButton;
 std::unique_ptr   mxCancelButton;
-std::unique_ptr   mxHelpButton;
 
 std::unique_ptr   mxBackwardBtn;
 std::unique_ptr   mxForwardBtn;
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index da0c481655dd..3c1f5d0d36e5 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -543,7 +543,6 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, 
std::shared_ptrweld_check_button("reverseorder"))
 , mxOKButton(m_xBuilder->weld_button("ok"))
 , mxCancelButton(m_xBuilder->weld_button("cancel"))
-, mxHelpButton(m_xBuilder->weld_button("help"))
 , mxBackwardBtn(m_xBuilder->weld_button("backward"))
 , mxForwardBtn(m_xBuilder->weld_button("forward"))
 , mxFirstBtn(m_xBuilder->weld_button("btnFirst"))
@@ -676,7 +675,6 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, 
std::shared_ptrconnect_clicked(LINK(this, PrintDialog, ClickHdl));
 mxCancelButton->connect_clicked(LINK(this, PrintDialog, ClickHdl));
-mxHelpButton->connect_clicked(LINK(this, PrintDialog, ClickHdl));
 mxSetupButton->connect_clicked( LINK( this, PrintDialog, ClickHdl ) );
 mxBackwardBtn->connect_clicked(LINK(this, PrintDialog, ClickHdl));
 mxForwardBtn->connect_clicked(LINK(this, PrintDialog, ClickHdl));
@@ -1872,15 +1870,6 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, 
void)
 storeToSettings();
 m_xDialog->response( == mxOKButton.get() ? RET_OK : 
RET_CANCEL);
 }
-else if(  == mxHelpButton.get() )
-{
-// start help system
-Help* pHelp = Application::GetHelp();
-if( pHelp )
-{
-pHelp->Start("vcl/ui/printdialog/PrintDialog", mxOKButton.get());
-}
-}
 else if(  == mxForwardBtn.get() )
 {
 previewForward();
commit 6aba19406767a54bb61eaffb2903c1b2902da9a8
Author: Caolán McNamara 
AuthorDate: Tue Dec 5 10:58:57 2023 +
Commit: Caolán McNamara 
CommitDate: Tue Dec 5 14:43:04 2023 +0100

Resolves: tdf#158441 we don't want to return early for all handled keys

a problem since:

commit c39bd1f6690ade936d62a66265b9b277061024d8
Author: Caolán McNamara 
Date:   Wed Feb 19 10:13:15 2020 +

weld CodeCompleteWindow

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

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index e62ba50683fb..d410a5e325d6 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -562,7 +562,11 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
 
 if (pCodeCompleteWnd->IsVisible() && 
CodeCompleteOptions::IsCodeCompleteOn())
 {
-if (pCodeCompleteWnd->HandleKeyInput(rKEvt))
+pCodeCompleteWnd->HandleKeyInput(rKEvt);
+if( rKEvt.GetKeyCode().GetCode() == KEY_UP
+|| rKEvt.GetKeyCode().GetCode() == KEY_DOWN
+|| rKEvt.GetKeyCode().GetCode() == KEY_TAB
+|| rKEvt.GetKeyCode().GetCode() == KEY_POINT)
 return;
 }

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

2023-12-05 Thread Chris Sherlock (via logerrit)

 vcl/qa/cppunit/complextext.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9b5964cf5931d7c09e4fd624d68595891c2afb58
Author: Chris Sherlock 
AuthorDate: Tue Nov 14 02:13:17 2023 +1100
Commit: Tomaž Vajngerl 
CommitDate: Tue Dec 5 14:23:50 2023 +0100

vcl: add unit test for cached glyphs based on tdf#103492

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

diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index d4eb3db67093..37f4fbc0766c 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -191,6 +191,8 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testCaching)
 testCachedGlyphs( "test", "Dejavu Sans" );
 // This font does not have latin characters, will need fallback.
 testCachedGlyphs( "test", "Noto Kufi Arabic" );
+// see tdf#103492
+testCachedGlyphs( u"يوسف My name is"_ustr, "Liberation Sans");
 }
 
 static void testCachedGlyphsSubstring( const OUString& aText, const OUString& 
aFontName, bool rtl )

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

2023-12-05 Thread Andrea Gelmini (via logerrit)

 sw/qa/extras/rtfexport/rtfexport6.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d9291c24a21ef02240df7b0bd06f86cac1c6f659
Author: Andrea Gelmini 
AuthorDate: Tue Dec 5 13:07:57 2023 +0100
Commit: Julien Nabet 
CommitDate: Tue Dec 5 14:14:33 2023 +0100

Fix typo

Change-Id: Id5c6ac6c1358334dba4b96fcc6dee9e40859ec32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160341
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/sw/qa/extras/rtfexport/rtfexport6.cxx 
b/sw/qa/extras/rtfexport/rtfexport6.cxx
index e65e57fd3192..275d2593d2df 100644
--- a/sw/qa/extras/rtfexport/rtfexport6.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport6.cxx
@@ -178,7 +178,7 @@ DECLARE_RTFEXPORT_TEST(testTdf108505_fieldCharFormat, 
"tdf108505_fieldCharFormat
 
 DECLARE_RTFEXPORT_TEST(testTdf108505_fieldCharFormat2, 
"tdf108505_fieldCharFormat2.rtf")
 {
-// not exported properly. Currrently xyz exports as run 6, red, italic.
+// not exported properly. Currently xyz exports as run 6, red, italic.
 if (isExported())
 return;

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

2023-12-05 Thread Andrea Gelmini (via logerrit)

 sw/qa/core/layout/tabfrm.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 192c581395e2db07829ff9ba1ed79d5492dcbbce
Author: Andrea Gelmini 
AuthorDate: Tue Dec 5 13:08:37 2023 +0100
Commit: Julien Nabet 
CommitDate: Tue Dec 5 14:14:13 2023 +0100

Fix typo

Change-Id: I5f000f53f4dfec62a6d5a332361c380dc142d2bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160342
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/sw/qa/core/layout/tabfrm.cxx b/sw/qa/core/layout/tabfrm.cxx
index 091b78cd2478..9357fc2df133 100644
--- a/sw/qa/core/layout/tabfrm.cxx
+++ b/sw/qa/core/layout/tabfrm.cxx
@@ -187,7 +187,7 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitFlyWrappedByTable)
 CPPUNIT_ASSERT_EQUAL(static_cast(1), rPageObjs.size());
 auto pFly = rPageObjs[0]->DynCastFlyFrame()->DynCastFlyAtContentFrame();
 CPPUNIT_ASSERT(pFly);
-// Get the bottom of of the floating table, ignoring margins:
+// Get the bottom of the floating table, ignoring margins:
 SwTwips nFloatingBottom = pFly->getFrameArea().Top() + 
pFly->getFramePrintArea().Height();
 SwFrame* pBody = pPage->FindBodyCont();
 auto pTab = pBody->GetLower()->GetNext()->DynCastTabFrame();

[Libreoffice-commits] core.git: Changes to 'refs/tags/co-23.05.6-2'

2023-12-05 Thread Miklos Vajna (via logerrit)

Tag 'co-23.05.6-2' created by Andras Timar  at 
2023-12-05 13:06 +

co-23.05.6-2

Changes since cp-23.05.6-2:
Miklos Vajna (1):
  writerfilter: fix crash in DomainMapper_Impl::PushSdt()

---
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)
---

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

2023-12-05 Thread Henry Castro (via logerrit)

 sc/inc/globstr.hrc |1 +
 sc/source/ui/view/viewfunc.cxx |5 +
 2 files changed, 6 insertions(+)

New commits:
commit fd11b63244f784b336690d9096cd3f820cdbb9ee
Author: Henry Castro 
AuthorDate: Mon Dec 4 10:33:01 2023 -0400
Commit: Caolán McNamara 
CommitDate: Tue Dec 5 12:59:14 2023 +0100

sc: show a message dialog if insert cells fail

Use case, go to the max row and insert a row.

Signed-off-by: Henry Castro 
Change-Id: I930d7724b9c94e10e9207ec749b7249d2fee0e39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160314
Tested-by: Jenkins CollaboraOffice 
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit eccbe3bb4ed6f0bed4e7fbacfaf50762c93f9464)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160183
Tested-by: Jenkins

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index e8e45fc01b2e..8b07dc508edd 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -566,6 +566,7 @@
 #define STR_UNDO_EDIT_SPARKLINE NC_("STR_UNDO_EDIT_SPARKLINE", 
"Edit Sparkline")
 #define STR_UNDO_THEME_CHANGE   NC_("STR_UNDO_THEME_CHANGE", 
"Theme Change")
 #define STR_UNDO_THEME_COLOR_CHANGE 
NC_("STR_UNDO_THEME_COLOR_CHANGE", "Theme Color Change")
+#define STR_ERR_INSERT_CELLSNC_("STR_ERR_INSERT_CELLS", 
"Failed to insert cells")
 
 #endif
 
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 98d2a1ebbe42..0b8b0865f0fc 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -1786,6 +1786,11 @@ bool ScViewFunc::InsertCells( InsCellCmd eCmd, bool 
bRecord, bool bPartOfPaste )
 true /* 
bGroups */, GetViewData().GetTabNo());
 }
 }
+else
+{
+ErrorMessage(STR_ERR_INSERT_CELLS);
+}
+
 OUString aStartAddress =  aRange.aStart.GetColRowString();
 OUString aEndAddress = aRange.aEnd.GetColRowString();
 collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}}, 
"INSERT_CELLS");

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - writerfilter/source

2023-12-05 Thread Miklos Vajna (via logerrit)

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 2f4938caebc5e8b5c7dcce45b9a5191794ceffcd
Author: Miklos Vajna 
AuthorDate: Tue Dec 5 11:43:42 2023 +0100
Commit: Caolán McNamara 
CommitDate: Tue Dec 5 12:58:44 2023 +0100

writerfilter: fix crash in DomainMapper_Impl::PushSdt()

Crashreport signature:

Fatal signal received: SIGSEGV code: 1 for address: 0x0

program/libwriterfilterlo.so
writerfilter::dmapper::DomainMapper_Impl::PushSdt()
writerfilter/source/dmapper/DomainMapper_Impl.cxx:987
program/libwriterfilterlo.so
writerfilter::dmapper::DomainMapper::lcl_attribute(unsigned int, 
writerfilter::Value&)
include/tools/ref.hxx:56
program/libwriterfilterlo.so

writerfilter::ooxml::OOXMLProperty::resolve(writerfilter::Properties&)
include/tools/ref.hxx:56
program/libwriterfilterlo.so

writerfilter::ooxml::OOXMLPropertySet::resolve(writerfilter::Properties&)
include/tools/ref.hxx:157

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

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f3558bfeac1e..897ff2f83eca 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -983,8 +983,19 @@ void DomainMapper_Impl::PushSdt()
 }
 
 uno::Reference xTextAppend = 
m_aTextAppendStack.top().xTextAppend;
+if (!xTextAppend.is())
+{
+return;
+}
+
+uno::Reference xText = xTextAppend->getText();
+if (!xText.is())
+{
+return;
+}
+
 uno::Reference xCursor
-= 
xTextAppend->getText()->createTextCursorByRange(xTextAppend->getEnd());
+= xText->createTextCursorByRange(xTextAppend->getEnd());
 // Offset so the cursor is not adjusted as we import the SDT's content.
 bool bStart = !xCursor->goLeft(1, /*bExpand=*/false);
 m_xSdtStarts.push({bStart, OUString(), xCursor->getStart()});

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

2023-12-05 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   44 ---
 sc/source/core/tool/viewopti.cxx |   34 +--
 2 files changed, 4 insertions(+), 74 deletions(-)

New commits:
commit 464d5f1265bd3ed2eff0c809152b8ccb53b785df
Author: Gabor Kelemen 
AuthorDate: Thu Nov 30 23:06:37 2023 +0100
Commit: Gabor Kelemen 
CommitDate: Tue Dec 5 12:41:09 2023 +0100

[API CHANGE] Drop unused XAxis/YAxis config groups

from Calc grid options. Spotted while researching for tdf#158473

last mention of ther getters was commented out in 2001 by:
commit a4e5d2cb47275e91834e41a9d51f1bf11ec409b1

Change-Id: Iffc7b5c4fb50352ad7063fc911039707a20dca4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160169
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index e1fe88dfa1d9..d54b092eca66 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -780,50 +780,6 @@
   
   true
 
-
-  
-  
-  
-Defines the horizontal distance between the single grid 
points in 1/100th millimeters.
-X axis
-  
-  
-
-  Specifies the distance that is used with locales that use 
the metric system.
-  
-
-1000
-  
-  
-
-  Specifies the distance that is used with locales that 
don't use the metric system.
-  
-
-1270
-  
-
-
-  
-  
-  
-Defines the vertical distance between the single grid points 
in 1/100th millimeters.
-Y axis
-  
-  
-
-  Specifies the distance that is used with locales that use 
the metric system.
-  
-
-1000
-  
-  
-
-  Specifies the distance that is used with locales that 
don't use the metric system.
-  
-
-1270
-  
-
   
   
 
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 41394ded9a16..39e2e6e0e762 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -46,15 +46,11 @@ void ScGridOptions::SetDefaults()
 {
 nFldDrawX = 1000;   // 1cm
 nFldDrawY = 1000;
-nFldSnapX = 1000;
-nFldSnapY = 1000;
 }
 else
 {
 nFldDrawX = 1270;   // 0,5"
 nFldDrawY = 1270;
-nFldSnapX = 1270;
-nFldSnapY = 1270;
 }
 nFldDivisionX = 1;
 nFldDivisionY = 1;
@@ -66,8 +62,6 @@ bool ScGridOptions::operator==( const ScGridOptions& rCpy ) 
const
 && nFldDivisionX== rCpy.nFldDivisionX
 && nFldDrawY== rCpy.nFldDrawY
 && nFldDivisionY== rCpy.nFldDivisionY
-&& nFldSnapX== rCpy.nFldSnapX
-&& nFldSnapY== rCpy.nFldSnapY
 && bUseGridsnap == rCpy.bUseGridsnap
 && bSynchronize == rCpy.bSynchronize
 && bGridVisible == rCpy.bGridVisible
@@ -156,8 +150,6 @@ std::unique_ptr 
ScViewOptions::CreateGridItem() const
 pItem->SetFieldDivisionX  ( aGridOpt.GetFieldDivisionX() );
 pItem->SetFieldDrawY  ( aGridOpt.GetFieldDrawY() );
 pItem->SetFieldDivisionY  ( aGridOpt.GetFieldDivisionY() );
-pItem->SetFieldSnapX  ( aGridOpt.GetFieldSnapX() );
-pItem->SetFieldSnapY  ( aGridOpt.GetFieldSnapY() );
 pItem->SetUseGridSnap   ( aGridOpt.GetUseGridSnap() );
 pItem->SetSynchronize   ( aGridOpt.GetSynchronize() );
 pItem->SetGridVisible   ( aGridOpt.GetGridVisible() );
@@ -227,12 +219,10 @@ constexpr OUStringLiteral CFGPATH_GRID = 
u"Office.Calc/Grid";
 #define SCGRIDOPT_RESOLU_Y  1
 #define SCGRIDOPT_SUBDIV_X  2
 #define SCGRIDOPT_SUBDIV_Y  3
-#define SCGRIDOPT_OPTION_X  4
-#define SCGRIDOPT_OPTION_Y  5
-#define SCGRIDOPT_SNAPTOGRID6
-#define SCGRIDOPT_SYNCHRON  7
-#define SCGRIDOPT_VISIBLE   8
-#define SCGRIDOPT_SIZETOGRID9
+#define SCGRIDOPT_SNAPTOGRID4
+#define SCGRIDOPT_SYNCHRON  5
+#define SCGRIDOPT_VISIBLE   6
+#define SCGRIDOPT_SIZETOGRID7
 
 Sequence ScViewCfg::GetLayoutPropertyNames()
 {
@@ -273,10 +263,6 @@ Sequence ScViewCfg::GetGridPropertyNames()
: OUString("Resolution/YAxis/NonMetric")),   // 
SCGRIDOPT_RESOLU_Y
  "Subdivision/XAxis",   // 
SCGRIDOPT_SUBDIV_X
  "Subdivision/YAxis",   // 
SCGRIDOPT_SUBDIV_Y
-(bIsMetric ?

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-23.05.6-2'

2023-12-05 Thread Andras Timar (via logerrit)

Tag 'cp-23.05.6-2' created by Andras Timar  at 
2023-12-05 10:37 +

cp-23.05.6-2

Changes since co-23.05.6-1-2:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - configure.ac

2023-12-05 Thread Andras Timar (via logerrit)

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 902c9a5fcaca2dce59f7ad0c55e512598507bb18
Author: Andras Timar 
AuthorDate: Tue Dec 5 11:37:34 2023 +0100
Commit: Andras Timar 
CommitDate: Tue Dec 5 11:37:34 2023 +0100

Bump version to 23.05.6.2

Change-Id: I0403bbf985a33be473d2bb705c2ae75f852dc4d6

diff --git a/configure.ac b/configure.ac
index 25eb99556fe2..bd43c4ad78f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[23.05.6.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[23.05.6.2],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

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

2023-12-05 Thread Laurent Balland (via logerrit)

 extras/source/templates/presnt/Grey_Elegant/content.xml |  310 ++--
 extras/source/templates/presnt/Grey_Elegant/meta.xml|6 
 extras/source/templates/presnt/Grey_Elegant/styles.xml  |  604 ++--
 3 files changed, 490 insertions(+), 430 deletions(-)

New commits:
commit 146663cc75d3954ae4a4e2f6f1f64d831618b56f
Author: Laurent Balland 
AuthorDate: Sat Nov 4 10:40:50 2023 +0100
Commit: Laurent Balland 
CommitDate: Tue Dec 5 11:22:42 2023 +0100

tdf#158022 Grey Elegant template: restore placeholders

- Restore preview of slide in notes (master notes and notes, same size
  and position than other templates)
- Enable header/date-time/footer/page number in master notes
- Uniformisation of font Noto Sans
- Bring to front header and outlines
- Add date/time, footer and slide number on all master pages (except
  Title)
- Improve Header and Outline positions
- Use placeholders for example texts
- Move credits on master slide "Table of content" and slide 9 to
  meta.xml
- Change name of Title master page due to tdf#158496

Change-Id: I29eec8ad61fdf35a53be15678fd09aefc2b11a60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158956
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Grey_Elegant/content.xml 
b/extras/source/templates/presnt/Grey_Elegant/content.xml
index 1f7b0d3fa9f2..4b274f28ec61 100644
--- a/extras/source/templates/presnt/Grey_Elegant/content.xml
+++ b/extras/source/templates/presnt/Grey_Elegant/content.xml
@@ -2,18 +2,8 @@
 http://openoffice.org/2009/office; 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:
 xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:xsd="ht
 tp://www.w3.org/2001/XMLSchema" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.3">
   
   
-
-
-
-
-
-
 
-
-
 
-
-
 
 
   
@@ -41,10 +31,6 @@
 
   
 
-
-  
-  
-
 
   
   
@@ -171,10 +157,6 @@
   
   
 
-
-  
-  
-
 
   
 
@@ -316,11 +298,6 @@
   
   
 
-
-  
-  
-  
-
 
   
   
@@ -362,7 +339,7 @@
 
   
   
-  
+  
 
 
   
@@ -399,14 +376,6 @@
   
   
 
-
-  
-
-
-  
-  
-  
-
 
   
   
@@ -447,9 +416,6 @@
 
   
 
-
-  
-
 
   
 
@@ -466,10 +432,7 @@
   
 
 
-  
-
-
-  
+  
 
 
   
@@ -513,63 +476,11 @@
 
   
 
-
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - editeng/source include/vcl sc/qa sc/source vcl/source

2023-12-05 Thread Marco Cecchetti (via logerrit)

 editeng/source/editeng/editview.cxx  |5 -
 include/vcl/window.hxx   |2 
 sc/qa/unit/tiledrendering/tiledrendering.cxx |  115 +++
 sc/source/ui/inc/gridwin.hxx |1 
 sc/source/ui/view/gridwin4.cxx   |   26 ++
 vcl/source/window/paint.cxx  |5 +
 6 files changed, 153 insertions(+), 1 deletion(-)

New commits:
commit 8a732d9ff15ba73835c3fa60208f954b772f5a9c
Author: Marco Cecchetti 
AuthorDate: Mon Dec 4 09:31:23 2023 +0100
Commit: Caolán McNamara 
CommitDate: Tue Dec 5 11:08:34 2023 +0100

calc: on editing invalidation of view with different zoom is wrong

This patch fixes the following invalidation issue:

There are 2 views with different zoom levels.
In a view text editing for a cell occurs.
The other view is not invalidated properly: the computed invalidation
rectangle is misplaced.

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

diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 0f53a53de045..6cb2913be3da 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -231,7 +231,10 @@ void EditView::InvalidateOtherViewWindows( const 
tools::Rectangle& rInvRect )
 for (auto& pWin : pImpEditView->aOutWindowSet)
 {
 if (pWin)
-pWin->Invalidate( bNegativeX ? lcl_negateRectX(rInvRect) : 
rInvRect );
+{
+if (!pWin->InvalidateByForeignEditView(this))
+pWin->Invalidate( bNegativeX ? lcl_negateRectX(rInvRect) : 
rInvRect );
+}
 }
 }
 }
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index d03555bd5b99..829b9f174b57 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -62,6 +62,7 @@ class VclWindowEvent;
 class AllSettings;
 class InputContext;
 class VclEventListeners;
+class EditView;
 enum class ImplPaintFlags;
 enum class VclEventId;
 enum class PointerStyle;
@@ -970,6 +971,7 @@ public:
  */
 virtual voidLogicInvalidate(const 
tools::Rectangle* pRectangle);
 
+virtual boolInvalidateByForeignEditView(EditView* 
);
 /**
  * Notification about some rectangle of the output device got invalidated. 
Used for the
  * dialogs and floating windows (e.g. context menu, popup).
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 1f18401a970c..7d89cb787c85 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -9,6 +9,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -60,6 +61,31 @@ static std::ostream& operator<<(std::ostream& os, 
ViewShellId const & id)
 os << static_cast(id); return os;
 }
 
+// for passing data to testInvalidateOnTextEditWithDifferentZoomLevels
+struct ColRowZoom
+{
+SCCOL col;
+SCROW row;
+int zoom;
+};
+
+CPPUNIT_NS_BEGIN
+namespace StringHelper
+{
+// used by CPPUNIT_TEST_PARAMETERIZED for 
testInvalidateOnTextEditWithDifferentZoomLevels
+template<>
+inline std::string toString(const ColRowZoom& item)
+{
+std::ostringstream ss;
+ss << "zoom level: " << item.zoom << ", "
+   << "col: " << item.col << ", "
+   << "row: " << item.row;
+return ss.str();
+}
+
+}
+CPPUNIT_NS_END
+
 namespace
 {
 
@@ -129,6 +155,7 @@ public:
 void testUndoReorderingRedo();
 void testUndoReorderingMulti();
 void testGetViewRenderState();
+void testInvalidateOnTextEditWithDifferentZoomLevels(const ColRowZoom& 
rData);
 
 CPPUNIT_TEST_SUITE(ScTiledRenderingTest);
 CPPUNIT_TEST(testRowColumnHeaders);
@@ -190,6 +217,14 @@ public:
 CPPUNIT_TEST(testUndoReorderingRedo);
 CPPUNIT_TEST(testUndoReorderingMulti);
 CPPUNIT_TEST(testGetViewRenderState);
+CPPUNIT_TEST_PARAMETERIZED(testInvalidateOnTextEditWithDifferentZoomLevels,
+   std::initializer_list
+   {
+   // zoom level 120%
+   {0, 999, 1}, {99, 0, 1},
+   // zoom level 40%
+   {0, 999, -5}, {99, 0, -5}
+   });
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -3286,6 +3321,86 @@ void ScTiledRenderingTest::testGetViewRenderState()
 CPPUNIT_ASSERT_EQUAL(OString(";Default"), pModelObj->getViewRenderState());
 }
 
+/*
+ * testInvalidateOnTextEditWithDifferentZoomLevels
+ * steps:
+ * set view 1 zoom to the passed zoom level
+ * in view 1 type a char at the passed cell address
+ * store invalidation rectangle
+ * exit from in place editing (press

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

2023-12-05 Thread Miklos Vajna (via logerrit)

 sw/qa/core/layout/data/floattable-wrapped-by-table.docx |binary
 sw/qa/core/layout/tabfrm.cxx|   30 
 sw/source/core/layout/tabfrm.cxx|   22 +++
 3 files changed, 51 insertions(+), 1 deletion(-)

New commits:
commit 868140fcc1311259b9d5f37b33d226511a53
Author: Miklos Vajna 
AuthorDate: Tue Dec 5 08:39:10 2023 +0100
Commit: Miklos Vajna 
CommitDate: Tue Dec 5 10:15:52 2023 +0100

tdf#60558 sw floattable: allow wrap of table on the right of a floattable

The bugdoc shows that Word wraps inline tables around floating tables if
they have enough space, but Writer didn't do this.

Table frames may wrap fly frames by adding some top, left or right
margin to the table at a layout level, this is calculated in
SwTabFrame::CalcFlyOffsets(). There we currently decide the give a top
margin to such tables, which fixes the overlap problem, but the bugdoc
is now of 2 pages instead of 1 page, since we don't wrap.

Fix the problem by improving the "shift down" case by checking if
shifting to the right would also work (has enough space). If so, do that
in case the fly frame is a split fly.

Note that this could be done for all flys as well, but that would have
to be conditional on some Word compat flag and that's not needed to fix
the bugdoc, so leave that for later.

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

diff --git a/sw/qa/core/layout/data/floattable-wrapped-by-table.docx 
b/sw/qa/core/layout/data/floattable-wrapped-by-table.docx
new file mode 100644
index ..a53f652183ea
Binary files /dev/null and 
b/sw/qa/core/layout/data/floattable-wrapped-by-table.docx differ
diff --git a/sw/qa/core/layout/tabfrm.cxx b/sw/qa/core/layout/tabfrm.cxx
index e83767992aa6..091b78cd2478 100644
--- a/sw/qa/core/layout/tabfrm.cxx
+++ b/sw/qa/core/layout/tabfrm.cxx
@@ -169,6 +169,36 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitFlyTableJoin)
 CPPUNIT_ASSERT(pFly->GetPrecede());
 CPPUNIT_ASSERT(!pFly->HasFollow());
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testSplitFlyWrappedByTable)
+{
+// Given a document with a floating table, wrapped by an inline table:
+// When laying out the document:
+createSwDoc("floattable-wrapped-by-table.docx");
+
+// Then make sure the inline table wraps around the floating table:
+SwDoc* pDoc = getSwDoc();
+SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+auto pPage = pLayout->Lower()->DynCastPageFrame();
+CPPUNIT_ASSERT(pPage);
+// Get the top of the inline table, ignoring margins:
+CPPUNIT_ASSERT(pPage->GetSortedObjs());
+SwSortedObjs& rPageObjs = *pPage->GetSortedObjs();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), rPageObjs.size());
+auto pFly = rPageObjs[0]->DynCastFlyFrame()->DynCastFlyAtContentFrame();
+CPPUNIT_ASSERT(pFly);
+// Get the bottom of of the floating table, ignoring margins:
+SwTwips nFloatingBottom = pFly->getFrameArea().Top() + 
pFly->getFramePrintArea().Height();
+SwFrame* pBody = pPage->FindBodyCont();
+auto pTab = pBody->GetLower()->GetNext()->DynCastTabFrame();
+SwTwips nInlineTop = pTab->getFrameArea().Top() + 
pTab->getFramePrintArea().Top();
+// Make sure the inline table is on the right of the floating one, not 
below it:
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected less than: 7287
+// - Actual  : 7287
+// i.e. the inline table was under the floating one, not on the right of 
it.
+CPPUNIT_ASSERT_LESS(nFloatingBottom, nInlineTop);
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 4367d86255a2..c1acc0c9e9fe 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -3179,6 +3179,7 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
 nSurround = text::WrapTextMode_PARALLEL;
 
 bool bShiftDown = css::text::WrapTextMode_NONE == nSurround;
+bool bSplitFly = pFly->IsFlySplitAllowed();
 if (!bShiftDown && bAddVerticalFlyOffsets)
 {
 if (nSurround == text::WrapTextMode_PARALLEL && 
isHoriOrientShiftDown)
@@ -3201,6 +3202,18 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
 // normally an SwFlyPortion is created instead that increases 
the height
 // of the first table row.
 bShiftDown = aTabRange.overlaps(aFlyRange);
+
+if (bSplitFly && pFly->GetAnchorFrame()->GetUpper() == 
GetUpper())
+{
+// Split fly followed by an inline table. Check if we have 
enough space to shift
+// to the right instead.
+SwTwips

[Libreoffice-commits] core.git: Branch 'feature/windowsupdater' - 2 commits - include/onlineupdate onlineupdate/Executable_mbsdiff.mk onlineupdate/Executable_updater.mk onlineupdate/Executable_update_

2023-12-05 Thread Thorsten Behrens (via logerrit)

 include/onlineupdate/mozilla/Attributes.h  |   16 
 onlineupdate/Executable_mbsdiff.mk |4 
 onlineupdate/Executable_update_service.mk  |8 ++--
 onlineupdate/Executable_updater.mk |3 +--
 onlineupdate/StaticLibrary_libmar.mk   |4 
 onlineupdate/StaticLibrary_libmarverify.mk |1 +
 onlineupdate/StaticLibrary_updatehelper.mk |1 +
 7 files changed, 17 insertions(+), 20 deletions(-)

New commits:
commit ec46d6dc31f015298a049ff1f1d3e325e4dc7885
Author: Thorsten Behrens 
AuthorDate: Tue Dec 5 08:48:53 2023 +
Commit: Thorsten Behrens 
CommitDate: Tue Dec 5 09:54:43 2023 +0100

Fix windows build some more

Change-Id: Ib90844096565d164226c72a9dedaccf6f49a74f1

diff --git a/include/onlineupdate/mozilla/Attributes.h 
b/include/onlineupdate/mozilla/Attributes.h
index 1f05ad3315b3..6b93ee1b2193 100644
--- a/include/onlineupdate/mozilla/Attributes.h
+++ b/include/onlineupdate/mozilla/Attributes.h
@@ -87,22 +87,6 @@
 #endif
 #endif
 
-/**
- * Per clang's documentation:
- *
- * If a statement is marked nomerge and contains call expressions, those call
- * expressions inside the statement will not be merged during optimization. 
This
- * attribute can be used to prevent the optimizer from obscuring the source
- * location of certain calls.
- *
- * This is useful to have clearer information on assertion failures.
- */
-#if defined(__clang__) && __has_attribute(nomerge)
-#define MOZ_NOMERGE __attribute__((nomerge))
-#else
-#define MOZ_NOMERGE
-#endif
-
 /*
  * MOZ_NEVER_INLINE is a macro which expands to tell the compiler that the
  * method decorated with it must never be inlined, even if the compiler would
diff --git a/onlineupdate/Executable_mbsdiff.mk 
b/onlineupdate/Executable_mbsdiff.mk
index fded20228f10..562ad184a0ea 100644
--- a/onlineupdate/Executable_mbsdiff.mk
+++ b/onlineupdate/Executable_mbsdiff.mk
@@ -25,6 +25,10 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_Executable_add_libs,mbsdiff,\
 ws2_32.lib \
 ))
+
+$(eval $(call gb_Executable_add_defs,mbsdiff,\
+   -DXP_WIN=1 \
+))
 endif
 
 $(eval $(call gb_Executable_add_cxxobjects,mbsdiff,\
diff --git a/onlineupdate/Executable_update_service.mk 
b/onlineupdate/Executable_update_service.mk
index 1ac72e854293..5ad5667732d9 100644
--- a/onlineupdate/Executable_update_service.mk
+++ b/onlineupdate/Executable_update_service.mk
@@ -48,6 +48,10 @@ $(eval $(call gb_Executable_add_ldflags,update_service,\
 /ENTRY:wmainCRTStartup \
 ))
 
+$(eval $(call gb_Executable_add_defs,update_service,\
+   -DXP_WIN=1 \
+))
+
 $(eval $(call gb_Executable_add_exception_objects,update_service,\
onlineupdate/source/update/common/certificatecheck \
onlineupdate/source/service/maintenanceservice \
diff --git a/onlineupdate/StaticLibrary_libmar.mk 
b/onlineupdate/StaticLibrary_libmar.mk
index ab6b485e0ccb..7273ab397ec1 100644
--- a/onlineupdate/StaticLibrary_libmar.mk
+++ b/onlineupdate/StaticLibrary_libmar.mk
@@ -22,6 +22,10 @@ $(eval $(call gb_StaticLibrary_add_cobjects,libmar,\
onlineupdate/source/libmar/src/mar_read \
 ))
 
+$(eval $(call gb_StaticLibrary_add_defs,libmar,\
+   -DXP_WIN=1 \
+))
+
 $(eval $(call gb_StaticLibrary_use_static_libraries,\
libmarverify \
 ))
diff --git a/onlineupdate/StaticLibrary_libmarverify.mk 
b/onlineupdate/StaticLibrary_libmarverify.mk
index 1a9204a867c9..c4c4c8e2104e 100644
--- a/onlineupdate/StaticLibrary_libmarverify.mk
+++ b/onlineupdate/StaticLibrary_libmarverify.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_StaticLibrary_set_include,libmarverify,\
 ifneq ($(OS),WNT)
 $(eval $(call gb_StaticLibrary_add_defs,libmarverify,\
-DMAR_NSS \
+   -DXP_WIN=1 \
 ))
 
 $(eval $(call gb_StaticLibrary_use_externals,libmarverify,\
diff --git a/onlineupdate/StaticLibrary_updatehelper.mk 
b/onlineupdate/StaticLibrary_updatehelper.mk
index 96129fdba267..cbb0130759e9 100644
--- a/onlineupdate/StaticLibrary_updatehelper.mk
+++ b/onlineupdate/StaticLibrary_updatehelper.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_StaticLibrary_set_include,updatehelper,\
 $(eval $(call gb_StaticLibrary_add_defs,updatehelper,\
-DNSS3 \
-DVERIFY_MAR_SIGNATURE \
+   -DXP_WIN=1 \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,updatehelper,\
commit d143109b49908db2142cdd8435b4cf3164bb510f
Author: Thorsten Behrens 
AuthorDate: Mon Dec 4 23:23:43 2023 +
Commit: Thorsten Behrens 
CommitDate: Tue Dec 5 09:54:37 2023 +0100

Fixup windows

Change-Id: Ic8426edfe6d5686791c14ddde31347f6139c7b3e

diff --git a/onlineupdate/Executable_update_service.mk 
b/onlineupdate/Executable_update_service.mk
index 6ff9afd1a6a8..1ac72e854293 100644
--- a/onlineupdate/Executable_update_service.mk
+++ b/onlineupdate/Executable_update_service.mk
@@ -49,9 +49,9 @@ $(eval $(call gb_Executable_add_ldflags,update_service,\
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,update_service,\
-

[Libreoffice-commits] core.git: bin/upload_symbols.py

2023-12-05 Thread Xisco Fauli (via logerrit)

 bin/upload_symbols.py |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 5b78bb218cc48207bc3943bd1eb0a34a9f7b60c3
Author: Xisco Fauli 
AuthorDate: Fri Dec 1 10:25:51 2023 +0100
Commit: Xisco Fauli 
CommitDate: Tue Dec 5 09:45:27 2023 +0100

upload_symbols: give some feedback

Change-Id: I2a1faa91ec502cfe8b62324f8fa80264bdb9d31f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160197
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/bin/upload_symbols.py b/bin/upload_symbols.py
index fc6a2d8c1c95..f0ae2dcf3ca3 100755
--- a/bin/upload_symbols.py
+++ b/bin/upload_symbols.py
@@ -48,7 +48,11 @@ def main():
 
 data['csrfmiddlewaretoken'] = csrftoken
 
-session.post(upload_url, headers=headers, files=files, data=data)
+response = session.post(upload_url, headers=headers, files=files, 
data=data)
+if response.ok:
+print("Symbols uploaded successfully")
+else:
+print(response.text)
 
 
 if __name__ == "__main__":

[Libreoffice-commits] core.git: uitest/uitest

2023-12-05 Thread Xisco Fauli (via logerrit)

 uitest/uitest/test.py |   17 +
 1 file changed, 1 insertion(+), 16 deletions(-)

New commits:
commit 6b41d3f6778b91838c98d1648eb652de48b0511d
Author: Xisco Fauli 
AuthorDate: Mon Dec 4 20:41:06 2023 +0100
Commit: Xisco Fauli 
CommitDate: Tue Dec 5 09:24:59 2023 +0100

uitest: remove crash report handler

Unneded since a4a1f2ecee2e7b1d50e0065e25090e262863e1c4
"Disallow crash reporting in UITests"

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

diff --git a/uitest/uitest/test.py b/uitest/uitest/test.py
index fcf9d3dee783..08c9a89ef9f5 100644
--- a/uitest/uitest/test.py
+++ b/uitest/uitest/test.py
@@ -176,17 +176,6 @@ class UITest(object):
 return
 time.sleep(DEFAULT_SLEEP)
 
-def _handle_crash_reporter(self):
-xCrashReportDlg = self._xUITest.getTopFocusWindow()
-state = get_state_as_dict(xCrashReportDlg)
-print(state)
-if state['ID'] != "CrashReportDialog":
-return False
-print("found a crash reporter")
-xCancelBtn = xCrashReportDlg.getChild("btn_cancel")
-self.close_dialog_through_button(xCancelBtn)
-return True
-
 # Calls UITest.close_doc at exit
 @contextmanager
 def create_doc_in_start_center(self, app):
@@ -194,11 +183,7 @@ class UITest(object):
 try:
 xBtn = xStartCenter.getChild(app + "_all")
 except RuntimeException:
-if self._handle_crash_reporter():
-xStartCenter = self._xUITest.getTopFocusWindow()
-xBtn = xStartCenter.getChild(app + "_all")
-else:
-raise
+raise
 
 with EventListener(self._xContext, "OnNew") as event:
 xBtn.executeAction("CLICK", tuple())

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

2023-12-04 Thread Justin Luth (via logerrit)

 sw/qa/extras/rtfexport/rtfexport6.cxx|2 ++
 writerfilter/source/rtftok/rtfdispatchflag.cxx   |9 +
 writerfilter/source/rtftok/rtfdispatchsymbol.cxx |4 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx   |1 -
 writerfilter/source/rtftok/rtfdocumentimpl.hxx   |3 ---
 5 files changed, 3 insertions(+), 16 deletions(-)

New commits:
commit b63a12d481cd26f960f97f74e5a4d764966db338
Author: Justin Luth 
AuthorDate: Fri Dec 1 14:30:45 2023 -0500
Commit: Miklos Vajna 
CommitDate: Tue Dec 5 08:49:33 2023 +0100

tdf#148540 Revert "tdf#109790 RTF import: keep remembering...

... paragraph style between \cell and \row"
This reverts 5.4.1 commit aaa6a5202a447fb4e86d5f016d8e79fbc34a3ed7,
and rtfexport7's tdf109790.rtf unit test still passes.
I also did a visual test, which looks good.

After \cell, we normally get more \cells, so an impending
\row is completely unexpected most of the time.
I'm not really sure why that patch was ever thought to be good.

The problem was that \pard was not removing the paragraph style
that was assigned to an earlier column. The end result seemed
innocent (no bad formatting noticed),
but that is probably based on other work
done in the meantime which allows the unit test to still pass
even after all of "its code" has been reverted.

[If this causes a regression, perhaps m_pLastCharacterContext
could be of value?]

Change-Id: Ide9b65f5e5fa39c21bac6d8ed354bb88e0bbefe5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160233
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sw/qa/extras/rtfexport/rtfexport6.cxx 
b/sw/qa/extras/rtfexport/rtfexport6.cxx
index f4ff562c37e8..e65e57fd3192 100644
--- a/sw/qa/extras/rtfexport/rtfexport6.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport6.cxx
@@ -172,6 +172,8 @@ DECLARE_RTFEXPORT_TEST(testTdf108505_fieldCharFormat, 
"tdf108505_fieldCharFormat
 CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, getProperty(xRun, 
"CharWeight"));
 CPPUNIT_ASSERT_EQUAL(awt::FontSlant_NONE, 
getProperty(xRun, "CharPosture"));
 CPPUNIT_ASSERT_EQUAL(COL_LIGHTGREEN, getProperty(xRun, 
"CharColor"));
+
+CPPUNIT_ASSERT_EQUAL(OUString("Standard"), getProperty(xPara, 
"ParaStyleName"));
 }
 
 DECLARE_RTFEXPORT_TEST(testTdf108505_fieldCharFormat2, 
"tdf108505_fieldCharFormat2.rtf")
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx 
b/writerfilter/source/rtftok/rtfdispatchflag.cxx
index 23d8f5d1f59f..72c777aab1fb 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@@ -579,8 +579,6 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 dispatchSymbol(RTFKeyword::PAR);
 // \pard is allowed between \cell and \row, but in that case it 
should not reset the fact that we're inside a table.
 // It should not reset the paragraph style, either, so remember 
the old paragraph style.
-RTFValue::Pointer_t pOldStyle
-= 
m_aStates.top().getParagraphSprms().find(NS_ooxml::LN_CT_PPrBase_pStyle);
 m_aStates.top().getParagraphSprms() = 
m_aDefaultState.getParagraphSprms();
 m_aStates.top().getParagraphAttributes() = 
m_aDefaultState.getParagraphAttributes();
 
@@ -593,19 +591,14 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword 
nKeyword)
 {
 // We are still in a table.
 m_aStates.top().getParagraphSprms().set(NS_ooxml::LN_inTbl, 
new RTFValue(1));
-if (m_bAfterCellBeforeRow && pOldStyle)
-// And we still have the same paragraph style.
-
m_aStates.top().getParagraphSprms().set(NS_ooxml::LN_CT_PPrBase_pStyle,
-pOldStyle);
 // Ideally getDefaultSPRM() would take care of this, but it 
would not when we're buffering.
 
m_aStates.top().getParagraphSprms().set(NS_ooxml::LN_CT_PPrBase_tabs,
 new RTFValue());
 }
 resetFrame();
 
-// Reset currently selected paragraph style as well, unless we are 
in the special "after \cell, before \row" state.
+// Reset currently selected paragraph style as well.
 // By default the style with index 0 is applied.
-if (!m_bAfterCellBeforeRow)
 {
 OUString const aName = getStyleName(0);
 // But only in case it's not a character style.
diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx 
b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
index d5b196790a50..61499aac04b5 100644
--- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
@@ -180,9 +180,6 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword 
nKeyword)

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

2023-12-04 Thread Justin Luth (via logerrit)

 sw/qa/extras/rtfexport/data/tdf108505_fieldCharFormat2.rtf |   37 +
 sw/qa/extras/rtfexport/rtfexport6.cxx  |   21 +++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |   28 +++--
 3 files changed, 68 insertions(+), 18 deletions(-)

New commits:
commit caecfff1adbe9715260ef9e2009333e523d61123
Author: Justin Luth 
AuthorDate: Fri Dec 1 14:16:14 2023 -0500
Commit: Miklos Vajna 
CommitDate: Tue Dec 5 08:48:38 2023 +0100

tdf#108505 writerfilter: fix field direct char settings

Instead of adding characters properties one at a time,
lets take care of everything all at once.

The results seem to be good so far.
There is even some similarity between
how MS Word has these properties on the
"in-between" pseudo end character, where
placing the cursor after the field gets these properties.
I don't see it happening in MS Word
at the pseudo start character, but it does in LO now...

Hopefully that doesn't end up doing bad things.

In the unit test, replacing the content ends up
in red, italic. However, I see the same thing in MSO
when testing with my second FORMTEXT example,
so I think everything is "working as expected".

I tried to see if I could limit doing this
for only certain types of fields or conditions.
However, pContext->GetResult() doesn't have a \fldrslt
yet at the time this is happening. Also, TextField.is()
happens less than I expected. I'm sure I could limit it
to just certain pContext->GetFieldId(),
but so far no problems are noticed for all field types.

make CppunitTest_sw_rtfexport6 \
CPPUNIT_TEST_NAME=testTdf108505_fieldCharFormat

make CppunitTest_sw_rtfexport6 \
CPPUNIT_TEST_NAME=testTdf108505_fieldCharFormat2

Change-Id: I3223437fd0d694f5e5733a9f7323f10f03d7802f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160232
Tested-by: Jenkins
Tested-by: Gabor Kelemen 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/rtfexport/data/tdf108505_fieldCharFormat2.rtf 
b/sw/qa/extras/rtfexport/data/tdf108505_fieldCharFormat2.rtf
new file mode 100644
index ..bb45e3052011
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf108505_fieldCharFormat2.rtf
@@ -0,0 +1,37 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang2057\deflangfe2057\themelang3079\themelangfe0\themelangcs0
+
+\noqfpromote {\stylesheet{\ql 
\li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
 \rtlch\fcs1 
+\af0\afs20\alang1025 \ltrch\fcs0 
\fs26\lang1031\langfe3079\cgrid\langnp1031\langfenp3079 \snext0 \sqformat 
\spriority0 Normal;}{\s17\ql \li0\ri0\widctlpar
+\tqc\tx4819\tqr\tx9071\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 
\fs26\lang1031\langfe3079\cgrid\langnp1031\langfenp3079 \sbasedon0 \snext17 
\slink18 header;}
+}
+\paperw16834\paperh11913\margl1134\margr1418\margt1418\margb567\gutter0\ltrsect
 
+\deftab708\widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0
+\showxmlerrors1\noextrasprl\prcolbl\cvmme\sprsspbf\brkfrm\swpbdr\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\lytprtmet\hyphcaps0\formshade\horzdoc\fracwidth\dghspace180\dgvspace180\dghorigin1701\dgvorigin1984\dghshow0\dgvshow0
+\jexpand\viewkind1\viewscale70\pgbrdrhead\pgbrdrfoot\nolnhtadjtbl\nojkernpunct\rsidroot3825670
 \fet0
+
+\ltrrow\trowd \irow0\irowband0\lastrow \ltrrow
+\ts11\trgaph70\trleft-70\trkeep\trftsWidth3\trwWidth8931\trftsWidthB3\trftsWidthA3\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3\tblrsid16408416\tblind0\tblindtype3
 \clvertalc\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl 
+\cltxlrtb\clftsWidth3\clwWidth1276\clshdrawnil 
\cellx1206\clvertalc\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl 
\clbrdrr\brdrs\brdrw30 \cltxlrtb\clftsWidth3\clwWidth3969\clshdrawnil 
\cellx5175\clvertalt\clbrdrt\brdrs\brdrw30 \clbrdrl\brdrs\brdrw30 
+\clbrdrb\brdrs\brdrw30 \clbrdrr\brdrs\brdrw30 
\cltxlrtb\clftsWidth3\clwWidth2126\clshdrawnil 
\cellx7301\clvertalt\clbrdrt\brdrtbl \clbrdrl\brdrs\brdrw30 \clbrdrb\brdrtbl 
\clbrdrr\brdrs\brdrw30 \cltxlrtb\clftsWidth3\clwWidth1560\clshdrawnil \cellx8861
+\pard\plain \ltrpar\s17\ql 
\li72\ri0\sb120\sa120\widctlpar\intbl\tqr\tx1561\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin72\pararsid8918882
 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 
\fs26\lang1031\langfe3079\cgrid\langnp1031\langfenp3079
+
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New 
Roman;}{\f5\fnil\fprq2\fcharset128 Linux Biolinum Keyboard O;}}
+

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source

2023-12-04 Thread Julien Nabet (via logerrit)

 sw/source/ui/frmdlg/column.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4b6a1c05b03f2108ff48018606fde070d0b019bd
Author: Julien Nabet 
AuthorDate: Thu Nov 30 17:46:08 2023 +0100
Commit: Miklos Vajna 
CommitDate: Tue Dec 5 08:41:10 2023 +0100

tdf#158450: fix crash when picking custom colour for column separator line

bt:
0x7ffeed9c4a2b in SwColumnPage::SwColumnPage(weld::Container*, 
weld::DialogController*, SfxItemSet const&)::$_0::operator()() const 
(this=0x574a8e38) at 
/home/julien/lo/libreoffice/sw/source/ui/frmdlg/column.cxx:396
396 [this]{ return GetDialogController()->getDialog(); 
}))
0  0x7ffeed9c4a2b in SwColumnPage::SwColumnPage(weld::Container*, 
weld::DialogController*, SfxItemSet const&)::$_0::operator()() const 
(this=0x574a8e38) at 
/home/julien/lo/libreoffice/sw/source/ui/frmdlg/column.cxx:396
1  0x7ffeed9c4a05 in std::__invoke_impl(std::__invoke_other, 
SwColumnPage::SwColumnPage(weld::Container*, weld::DialogController*, 
SfxItemSet const&)::$_0&) (__f=...) at 
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/invoke.h:61
2  0x7ffeed9c4985 in std::__invoke_r(SwColumnPage::SwColumnPage(weld::Container*, 
weld::DialogController*, SfxItemSet const&)::$_0&) (__fn=...) at 
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/invoke.h:114
3  0x7ffeed9c489d in std::_Function_handler::_M_invoke(std::_Any_data const&) (__functor=...) at 
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/std_function.h:290
4  0x71cb89e5 in std::function::operator()() 
const (this=0x574a8e38) at 
/usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/std_function.h:591
5  0x71c94604 in ColorWindow::OpenPickerClickHdl(weld::Button&) 
(this=0x574a8db0) at 
/home/julien/lo/libreoffice/svx/source/tbxctrls/tbcontrl.cxx:2283
6  0x71c9356d in ColorWindow::LinkStubOpenPickerClickHdl(void*, 
weld::Button&) (instance=0x574a8db0, data=...) at 
/home/julien/lo/libreoffice/svx/source/tbxctrls/tbcontrl.cxx:2279

See complete bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=191146

Regression from:
862fd2fa19b64972247bde9b171ec828a30e1676
defer getting toplevel for color picker until we need it

Change-Id: I2932281cb3b1cb510013a19f6bcf3d9f9c6cdb7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160164
Tested-by: Jenkins
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 4f8bb267489b14aa1dab360786d8f99c763f03b4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160178
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index c2a24ad18ef6..a64b6fe94eb5 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -393,7 +393,7 @@ SwColumnPage::SwColumnPage(weld::Container* pPage, 
weld::DialogController* pCont
 , m_xTextDirectionFT(m_xBuilder->weld_label("textdirectionft"))
 , m_xTextDirectionLB(new 
svx::FrameDirectionListBox(m_xBuilder->weld_combo_box("textdirectionlb")))
 , m_xLineColorDLB(new ColorListBox(m_xBuilder->weld_menu_button("colorlb"),
-[this]{ return GetDialogController()->getDialog(); }))
+[this]{ return GetFrameWeld(); }))
 , m_xLineTypeDLB(new 
SvtLineListBox(m_xBuilder->weld_menu_button("linestylelb")))
 , m_xEd1(new 
SwPercentField(m_xBuilder->weld_metric_spin_button("width1mf", FieldUnit::CM)))
 , m_xEd2(new 
SwPercentField(m_xBuilder->weld_metric_spin_button("width2mf", FieldUnit::CM)))

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

2023-12-04 Thread Miklos Vajna (via logerrit)

 sw/inc/fmtrfmrk.hxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 9c02160fc55bccc43d92c68ec5166a79d50e1528
Author: Miklos Vajna 
AuthorDate: Mon Dec 4 20:05:57 2023 +0100
Commit: Miklos Vajna 
CommitDate: Tue Dec 5 08:31:19 2023 +0100

sw: document SwFormatRefMark

Explain where this can appear, who owns it and where it can be found on
the UI.

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

diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index 8f708cf583ea..b41449fa97af 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -30,8 +30,13 @@
 class SwTextRefMark;
 class SwXReferenceMark;
 
-// ATT_REFMARK
-
+/// SfxPoolItem subclass that represents a reference mark (a position in the 
document with a name,
+/// which has a start and may or may not have an end).
+///
+/// This can be used as a character format in the hints array of a text node, 
it's owned by an
+/// SwTextRefMark.
+///
+/// It's Insert -> Cross-reference -> Cross-references -> set reference on the 
UI.
 class SAL_DLLPUBLIC_RTTI SwFormatRefMark final
 : public SfxPoolItem
 , public sw::BroadcastingModify

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

2023-12-04 Thread Justin Luth (via logerrit)

 sw/qa/extras/rtfexport/data/tdf108505_fieldCharFormat.rtf |   34 ++
 sw/qa/extras/rtfexport/rtfexport6.cxx |   14 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   11 
 3 files changed, 58 insertions(+), 1 deletion(-)

New commits:
commit 59a0be15b097dc4f2529837d128f52cc3fb497d9
Author: Justin Luth 
AuthorDate: Fri Dec 1 10:34:36 2023 -0500
Commit: Miklos Vajna 
CommitDate: Tue Dec 5 08:30:29 2023 +0100

tdf#108505 writerfilter: fix legacy dropdown fields direct bold setting

Any character property should be passed on,
but do that in a follow-up commit, so that
at least the bold case will remain intact
if the broader fix gets reverted for any reason.

make CppunitTest_sw_rtfexport6 \
CPPUNIT_TEST_NAME=testTdf108505_fieldCharFormat

Change-Id: Id77980b704db2ff118e89c29eb9d4db82e117cdc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160221
Reviewed-by: Justin Luth 
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/rtfexport/data/tdf108505_fieldCharFormat.rtf 
b/sw/qa/extras/rtfexport/data/tdf108505_fieldCharFormat.rtf
new file mode 100644
index ..b05c2deec6b6
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf108505_fieldCharFormat.rtf
@@ -0,0 +1,34 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang2057\deflangfe2057\themelang3079\themelangfe0\themelangcs0
+
+\noqfpromote {\stylesheet{\ql 
\li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
 \rtlch\fcs1 
+\af0\afs20\alang1025 \ltrch\fcs0 
\fs26\lang1031\langfe3079\cgrid\langnp1031\langfenp3079 \snext0 \sqformat 
\spriority0 Normal;}{\s17\ql \li0\ri0\widctlpar
+\tqc\tx4819\tqr\tx9071\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 
\fs26\lang1031\langfe3079\cgrid\langnp1031\langfenp3079 \sbasedon0 \snext17 
\slink18 header;}
+}
+\paperw16834\paperh11913\margl1134\margr1418\margt1418\margb567\gutter0\ltrsect
 
+\deftab708\widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0
+\showxmlerrors1\noextrasprl\prcolbl\cvmme\sprsspbf\brkfrm\swpbdr\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\lytprtmet\hyphcaps0\formshade\horzdoc\fracwidth\dghspace180\dgvspace180\dghorigin1701\dgvorigin1984\dghshow0\dgvshow0
+\jexpand\viewkind1\viewscale70\pgbrdrhead\pgbrdrfoot\nolnhtadjtbl\nojkernpunct\rsidroot3825670
 \fet0
+
+\ltrrow\trowd \irow0\irowband0\lastrow \ltrrow
+\ts11\trgaph70\trleft-70\trkeep\trftsWidth3\trwWidth8931\trftsWidthB3\trftsWidthA3\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3\tblrsid16408416\tblind0\tblindtype3
 \clvertalc\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl \clbrdrr\brdrtbl 
+\cltxlrtb\clftsWidth3\clwWidth1276\clshdrawnil 
\cellx1206\clvertalc\clbrdrt\brdrtbl \clbrdrl\brdrtbl \clbrdrb\brdrtbl 
\clbrdrr\brdrs\brdrw30 \cltxlrtb\clftsWidth3\clwWidth3969\clshdrawnil 
\cellx5175\clvertalt\clbrdrt\brdrs\brdrw30 \clbrdrl\brdrs\brdrw30 
+\clbrdrb\brdrs\brdrw30 \clbrdrr\brdrs\brdrw30 
\cltxlrtb\clftsWidth3\clwWidth2126\clshdrawnil 
\cellx7301\clvertalt\clbrdrt\brdrtbl \clbrdrl\brdrs\brdrw30 \clbrdrb\brdrtbl 
\clbrdrr\brdrs\brdrw30 \cltxlrtb\clftsWidth3\clwWidth1560\clshdrawnil \cellx8861
+\pard\plain \ltrpar\s17\ql 
\li72\ri0\sb120\sa120\widctlpar\intbl\tqr\tx1561\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin72\pararsid8918882
 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 
\fs26\lang1031\langfe3079\cgrid\langnp1031\langfenp3079
+
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New 
Roman;}{\f5\fnil\fprq2\fcharset128 Linux Biolinum Keyboard O;}}
+
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}
+
+{\rtlch\fcs1 \af0 \ltrch\fcs0 \f5\fs32\chcbpat7\insrsid16408416 
Header}{\rtlch\fcs1 \af0 \ltrch\fcs0 \fs32\insrsid16408416\charrsid8918882 
\cell }\pard\plain \ltrpar\ql 
\li0\ri0\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\pararsid5246913
 
+\rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 
\fs26\lang1031\langfe3079\cgrid\langnp1031\langfenp3079 {\rtlch\fcs1 \af0 
\ltrch\fcs0 \insrsid16408416\charrsid8918882 Normal\cell }\pard \ltrpar
+\qc 
\li0\ri0\sb120\sa120\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0
 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid5701682\charrsid5701682 {\*\bkmkstart 
Dropdown1}x}{\field\fldpriv{\*\fldinst {\ltrch\fcs0 
+\b\fs48\cf4  FORMDROPDOWN }{{\*\datafield 0abcd}

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

2023-12-04 Thread Mike Kaganski (via logerrit)

 vcl/source/treelist/transfer.cxx |   46 +--
 1 file changed, 16 insertions(+), 30 deletions(-)

New commits:
commit 2bde39767ff2aead9d4cfddc37f32103bfc52f63
Author: Mike Kaganski 
AuthorDate: Mon Dec 4 13:40:04 2023 +0300
Commit: Mike Kaganski 
CommitDate: Tue Dec 5 05:40:32 2023 +0100

Drop own mutex to prevent lock order problem

When running UITests on Windows with parallelism, I often see deadlocks
in clipboard threads, where one thread holds own mutex and tries to lock
solar mutex, and the other holds it and waits for own mutex. The problem
is in TransferableDataHelper::GetAny, where solar mutex is released
temporarily.

Avoid it by dropping own mutex, and only using solar mutex.

Change-Id: Idbfa2e1399fe94d092b4090e7aa4956be4103744
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160296
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
Reviewed-by: Mike Kaganski 

diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index 955b47b7cdf2..7e6009de77dc 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -23,7 +23,6 @@
 #include 
 #endif
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -1036,7 +1035,6 @@ namespace {
 class TransferableClipboardNotifier : public ::cppu::WeakImplHelper< 
XClipboardListener >
 {
 private:
-::osl::Mutex&   mrMutex;
 Reference< XClipboardNotifier > mxNotifier;
 TransferableDataHelper* mpListener;
 
@@ -1048,7 +1046,7 @@ protected:
 virtual void SAL_CALL disposing( const EventObject& Source ) override;
 
 public:
-TransferableClipboardNotifier( const Reference< XClipboard >& 
_rxClipboard, TransferableDataHelper& _rListener, ::osl::Mutex& _rMutex );
+TransferableClipboardNotifier( const Reference< XClipboard >& 
_rxClipboard, TransferableDataHelper& _rListener );
 
 /// determines whether we're currently listening
 bool isListening() const { return mpListener != nullptr; }
@@ -1059,9 +1057,8 @@ public:
 
 }
 
-TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< 
XClipboard >& _rxClipboard, TransferableDataHelper& _rListener, ::osl::Mutex& 
_rMutex )
-:mrMutex( _rMutex )
-,mxNotifier( _rxClipboard, UNO_QUERY )
+TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< 
XClipboard >& _rxClipboard, TransferableDataHelper& _rListener )
+:mxNotifier( _rxClipboard, UNO_QUERY )
 ,mpListener( &_rListener )
 {
 osl_atomic_increment( _refCount );
@@ -1079,11 +1076,6 @@ 
TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< X
 void SAL_CALL TransferableClipboardNotifier::changedContents( const 
clipboard::ClipboardEvent& event )
 {
 SolarMutexGuard aSolarGuard;
-// the SolarMutex here is necessary, since
-// - we cannot call mpListener without our own mutex locked
-// - Rebind respectively InitFormats (called by Rebind) will
-// try to lock the SolarMutex, too
-::osl::MutexGuard aGuard( mrMutex );
 if( mpListener )
 mpListener->Rebind( event.Contents );
 }
@@ -1098,7 +1090,7 @@ void SAL_CALL TransferableClipboardNotifier::disposing( 
const EventObject& )
 
 void TransferableClipboardNotifier::dispose()
 {
-::osl::MutexGuard aGuard( mrMutex );
+SolarMutexGuard g;
 
 Reference< XClipboardListener > xKeepMeAlive( this );
 
@@ -,7 +1103,6 @@ void TransferableClipboardNotifier::dispose()
 
 struct TransferableDataHelper_Impl
 {
-::osl::MutexmaMutex;
 rtl::Reference  mxClipboardListener;
 
 TransferableDataHelper_Impl()
@@ -1155,7 +1146,7 @@ TransferableDataHelper& 
TransferableDataHelper::operator=( const TransferableDat
 {
 if ( this !=  )
 {
-::osl::MutexGuard aGuard(mxImpl->maMutex);
+SolarMutexGuard g;
 
 const bool bWasClipboardListening = mxImpl->mxClipboardListener.is();
 
@@ -1176,7 +1167,7 @@ TransferableDataHelper& 
TransferableDataHelper::operator=( const TransferableDat
 
 TransferableDataHelper& 
TransferableDataHelper::operator=(TransferableDataHelper&& rDataHelper)
 {
-::osl::MutexGuard aGuard(mxImpl->maMutex);
+SolarMutexGuard g;
 
 const bool bWasClipboardListening = mxImpl->mxClipboardListener.is();
 
@@ -1198,7 +1189,7 @@ TransferableDataHelper::~TransferableDataHelper()
 {
 StopClipboardListening( );
 {
-::osl::MutexGuard aGuard(mxImpl->maMutex);
+SolarMutexGuard g;
 maFormats.clear();
 mxObjDesc.reset();
 }
@@ -1302,7 +1293,6 @@ void TransferableDataHelper::FillDataFlavorExVector( 
const Sequence< DataFlavor
 void TransferableDataHelper::InitFormats()
 {
 SolarMutexGuard aSolarGuard;
-::osl::MutexGuard aGuard(mxImpl->maMutex);
 
 maFormats.clear();
 mxObjDesc.reset(new TransferableObjectDescriptor);
@@ -1328,14 +1318,14 @@ void

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

2023-12-04 Thread Chris Sherlock (via logerrit)

 include/vcl/outdev.hxx |2 ++
 vcl/qa/cppunit/complextext.cxx |   37 ++---
 vcl/source/outdev/font.cxx |   32 +++-
 vcl/source/outdev/outdev.cxx   |6 --
 4 files changed, 71 insertions(+), 6 deletions(-)

New commits:
commit 042dc4a9186f526b625817dde50bb2f5a91fd2c6
Author: Chris Sherlock 
AuthorDate: Thu Nov 9 18:19:41 2023 +1100
Commit: Tomaž Vajngerl 
CommitDate: Tue Dec 5 04:39:05 2023 +0100

vcl: add unit tests for a mixture of CJK and latin characters

To influence the fallback fonts chosen, I have introduced a new
OutputDevice function ForceFallbackFont() which injects ("forces") a
font as the first one in the font fallback chain.

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

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index bea1e00d9b7f..329364559108 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -184,6 +184,7 @@ private:
 mutable VclPtrmpNextGraphics; ///< Next output 
device in list
 GDIMetaFile*mpMetaFile;
 mutable rtl::Reference mpFontInstance;
+rtl::Reference mpForcedFallbackInstance;
 mutable std::unique_ptr  
mpFontFaceCollection;
 std::vectormaOutDevStateStack;
 std::unique_ptr mpOutDevData;
@@ -1165,6 +1166,7 @@ public:
 SAL_DLLPRIVATE static void  ImplUpdateAllFontData( bool bNewFontLists );
 
 LogicalFontInstance const* GetFontInstance() const;
+bool ForceFallbackFont(vcl::Font const& rFallbackFont);
 
 protected:
 SAL_DLLPRIVATE tools::Long GetEmphasisAscent() const { return 
mnEmphasisAscent; }
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 633dc2210e07..d4eb3db67093 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -491,6 +491,40 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf153440)
 #endif
 }
 
+CPPUNIT_TEST_FIXTURE(VclComplexTextTest, 
testMixedCJKLatinScript_glyph_advancements)
+{
+#if HAVE_MORE_FONTS
+#if !defined _WIN32
+OUString aTestScript(u"根据10.1(37BA) Eng"_ustr);
+
+ScopedVclPtrInstance pOutDev;
+// note you can only run this once and it was designed for tdf#107718
+bool bAdded = addFont(pOutDev, u"tdf107718.otf", u"Source Han Sans");
+CPPUNIT_ASSERT_EQUAL(true, bAdded);
+
+vcl::Font aFont(u"Source Han Sans"_ustr, u"Regular"_ustr, Size(0, 72));
+pOutDev->SetFont( aFont );
+
+vcl::Font aFallbackFont("DejaVu Sans", "Book", Size(0, 72));
+pOutDev->ForceFallbackFont(aFallbackFont);
+
+// absolute character widths AKA text array.
+tools::Long nRefTextWidth = 704;
+std::vector aRefCharWidths = { 72, 144, 190, 236, 259, 305, 
333, 379, 425, 474, 523, 551, 567, 612, 658, 704 };
+KernArray aCharWidths;
+tools::Long nTextWidth = pOutDev->GetTextArray(aTestScript, );
+
+CPPUNIT_ASSERT_EQUAL(aRefCharWidths, aCharWidths.get_subunit_array());
+CPPUNIT_ASSERT_EQUAL(nRefTextWidth, nTextWidth);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(nTextWidth), aCharWidths.back());
+
+// text advance width and line height
+CPPUNIT_ASSERT_EQUAL(nRefTextWidth, pOutDev->GetTextWidth(aTestScript));
+CPPUNIT_ASSERT_EQUAL(tools::Long(105), pOutDev->GetTextHeight());
+#endif
+#endif
+}
+
 CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107718)
 {
 #if !defined _WIN32 // TODO: Fails on jenkins but passes locally
@@ -498,9 +532,6 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107718)
 
 ScopedVclPtrInstance pOutDev;
 
-bool bAdded = addFont(pOutDev, u"tdf107718.otf", u"Source Han Sans");
-CPPUNIT_ASSERT_EQUAL(true, bAdded);
-
 OUString aText(u"\u4E16\u1109\u1168\u11BC\u302E"_ustr);
 for (bool bVertical : { false, true })
 {
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index ea0727b294f9..0e37c7613ded 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1020,6 +1020,22 @@ std::unique_ptr 
OutputDevice::getFallbackLayout(
 return pFallback;
 }
 
+bool OutputDevice::ForceFallbackFont(vcl::Font const& rFallbackFont)
+{
+vcl::Font aOldFont = GetFont();
+SetFont(rFallbackFont);
+InitFont();
+
+mpForcedFallbackInstance = mpFontInstance;
+SetFont(aOldFont);
+InitFont();
+
+if (mpForcedFallbackInstance)
+return true;
+
+return false;
+}
+
 std::unique_ptr OutputDevice::ImplGlyphFallbackLayout( 
std::unique_ptr pSalLayout,
 vcl::text::ImplLayoutArgs& rLayoutArgs, const SalLayoutGlyphs* pGlyphs ) 
const
 {
@@ -1051,12 +1067,22 @@ std::unique_ptr 
OutputDevice::ImplGlyphFallbackLayout( std::unique_pt
 vcl::font::FontSelectPattern 
aFontSelData(mpFontInstance->GetFontSelectPattern());
 SalLayoutGlyphsImpl* pGlyphsImpl = pGlyphs ? pGlyphs->Impl(1) : nullptr;
 
+bool bHasUsedFallback = false;

[Libreoffice-commits] core.git: Changes to 'refs/tags/co-23.05.6-1'

2023-12-04 Thread Aron Budea (via logerrit)

Tag 'co-23.05.6-1' created by Andras Timar  at 
2023-12-04 22:17 +

co-23.05.6-1

Changes since cp-23.05.6-1-2:
---
 0 files changed
---

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

2023-12-04 Thread Justin Luth (via logerrit)

 sw/source/uibase/shells/txtnum.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 1a74a87b442857567d20da5dc97bbbc278745afd
Author: Justin Luth 
AuthorDate: Thu Nov 23 20:50:09 2023 -0500
Commit: Justin Luth 
CommitDate: Mon Dec 4 22:40:54 2023 +0100

related tdf#56258 sw sidebar SetOutline: do something without dropdown

The sidebar gained SetOutline in 7.6
with commit 3fd0b4053763aa91b0004c523e96e7d390c7b58e.

In the TOOLBAR, there is special code that tells the main button
to show the locale list outline choices - just like the dropdown does.
However, none of that code comes into play in the sidebar,
so add a special case to handle that situation.

It is easy to launch the dialog, focused on the outlinenum page.
Better yet would be to figure out how to launch the popup window
that the dropdown opens - so they do the same thing...

Change-Id: I3d6eeafaa8bdb45cfacc42e221820d664419e0e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159934
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Justin Luth 
Reviewed-by: Szymon Kłos 
(cherry picked from commit f384dc0476e4730d3ccb7a7f56eae8452bce133a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160180
Tested-by: Jenkins

diff --git a/sw/source/uibase/shells/txtnum.cxx 
b/sw/source/uibase/shells/txtnum.cxx
index c577cdafdfcc..e769b7f46347 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -310,6 +310,14 @@ void SwTextShell::ExecSetNumber(SfxRequest const )
 GetShell().SetCurNumRule( aNewNumRule, bCreateNewList );
 }
 }
+else if (nSlot == FN_SVX_SET_OUTLINE)
+{
+// no outline provided: launch dialog to request a specific 
outline
+SfxBindings& rBindings = 
GetView().GetViewFrame().GetBindings();
+const SfxStringItem aPage(FN_PARAM_1, "outlinenum");
+const SfxPoolItem* aItems[] = { , nullptr };
+rBindings.Execute(SID_OUTLINE_BULLET, aItems);
+}
 }
 break;

[Libreoffice-commits] core.git: codemaker/source dbaccess/source editeng/source forms/source oox/source sc/source sdext/source slideshow/source stoc/source sw/source toolkit/source

2023-12-04 Thread Julien Nabet (via logerrit)

 codemaker/source/cppumaker/cpputype.cxx |8 ++--
 dbaccess/source/core/api/KeySet.cxx |4 +++-
 editeng/source/misc/svxacorr.cxx|   10 +++---
 forms/source/xforms/propertysetbase.cxx |2 +-
 oox/source/drawingml/texteffectscontext.cxx |5 +++--
 sc/source/ui/namedlg/namedlg.cxx|   12 ++--
 sdext/source/pdfimport/tree/pdfiprocessor.cxx   |1 +
 slideshow/source/engine/box2dtools.cxx  |5 -
 stoc/source/invocation_adapterfactory/iafactory.cxx |2 +-
 sw/source/uibase/utlui/uitool.cxx   |9 ++---
 toolkit/source/controls/unocontrolmodel.cxx |4 +++-
 11 files changed, 45 insertions(+), 17 deletions(-)

New commits:
commit 67c2a4786154a5c246998f119c3349e4d725e43b
Author: Julien Nabet 
AuthorDate: Mon Dec 4 18:59:43 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 4 22:10:20 2023 +0100

cid#1545597 Using invalid iterator

and :

cid#1545537 Using invalid iterator
cid#1545508 Using invalid iterator
cid#1545494 Using invalid iterator
cid#1545478 Using invalid iterator
cid#1545427 Using invalid iterator
cid#1545420 Using invalid iterator
cid#1545400 Using invalid iterator
cid#1545300 Using invalid iterator
cid#1545258 Using invalid iterator
cid#1545257 Using invalid iterator
cid#1545200 Using invalid iterator
cid#1545183 Using invalid iterator

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

diff --git a/codemaker/source/cppumaker/cpputype.cxx 
b/codemaker/source/cppumaker/cpputype.cxx
index 301714911a3b..1995ed73c9ea 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -2279,8 +2279,10 @@ void 
PlainStructType::dumpComprehensiveGetCppuType(FileStream & out)
 for (std::vector< unoidl::PlainStructTypeEntity::Member >::const_iterator 
i(
  entity_->getDirectMembers().begin());
  i != entity_->getDirectMembers().end();) {
+const auto iter = types.find(i->type);
+assert(iter != types.end());
 out << indent() << "{ { " << getTypeClass(i->type, true)
-<< ", the_tname" << types.find(i->type)->second
+<< ", the_tname" << iter->second
 << ".pData, the_name" << n++ << ".pData }, false }";
 ++i;
 out << (i == entity_->getDirectMembers().end() ? " };" : ",") << "\n";
@@ -2851,8 +2853,10 @@ void 
PolyStructType::dumpComprehensiveGetCppuType(FileStream & out)
 sal_uInt32 k = parameters.find(i->type)->second;
 out << "the_pclass" << k << ", the_pname" << k << ".pData";
 } else {
+const auto iter = types.find(i->type);
+assert(iter != types.end());
 out << getTypeClass(i->type, true) << ", the_tname"
-<< types.find(i->type)->second << ".pData";
+<< iter->second << ".pData";
 }
 out << ", the_name" << n++ << ".pData }, "
 << (i->parameterized ? "true" : "false") << " }";
diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 7a2ec55fa5c2..cfbec6afecef 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -912,7 +912,9 @@ void OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const 
connectivity::OSQLTa
 if(m_bDeleted)
 {
 sal_Int32 nBookmark = 
::comphelper::getINT32((*_rDeleteRow)[0].getAny());
-if(m_aKeyIter == m_aKeyMap.find(nBookmark) && m_aKeyIter != 
m_aKeyMap.end())
+const auto iter = m_aKeyMap.find(nBookmark);
+assert(iter != m_aKeyMap.end());
+if(m_aKeyIter == iter && m_aKeyIter != m_aKeyMap.end())
 ++m_aKeyIter;
 m_aKeyMap.erase(nBookmark);
 m_bDeleted = true;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index c8891889b01d..15cbecc32db3 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1687,7 +1687,9 @@ SvxAutoCorrectLanguageLists& 
SvxAutoCorrect::GetLanguageList_(
 LanguageTag aLanguageTag( eLang);
 if (m_aLangTable.find(aLanguageTag) == m_aLangTable.end())
 (void)CreateLanguageFile(aLanguageTag);
-return m_aLangTable.find(aLanguageTag)->second;
+const auto iter = m_aLangTable.find(aLanguageTag);
+assert(iter != m_aLangTable.end());
+return iter->second;
 }
 
 void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang )
@@ -1912,14 +1914,16 @@ void SvxAutoCorrect::MakeCombinedChanges( 
std::vector& aNewEntr
   LanguageType eLang )
 {
 LanguageTag aLanguageTag( eLang);
-auto const iter = m_aLangTable.find(aLanguageTag);
+auto iter =

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

2023-12-04 Thread Mike Kaganski (via logerrit)

 vcl/source/app/svmain.cxx   |   18 +-
 vcl/win/dtrans/WinClipboard.cxx |   12 
 vcl/win/dtrans/WinClipboard.hxx |2 ++
 3 files changed, 23 insertions(+), 9 deletions(-)

New commits:
commit 8472365774b7471e96a025f424a6c7eb7b02db26
Author: Mike Kaganski 
AuthorDate: Mon Dec 4 15:08:26 2023 +0300
Commit: Mike Kaganski 
CommitDate: Mon Dec 4 21:49:03 2023 +0100

Avoid clipboard messages after Scheduler::ImplDeInitScheduler

When running UITests on Windows with parallelism, often there are
clipboard "content changed" messages that fail the assertion in
Scheduler::ImplDeInitScheduler. This is because the clipboard is
only uninitialized after the scheduler de-init; and even then,
the respective threads are not stopped yet.

Make sure that clipboard listeners are stopped before calling the
Scheduler::ImplDeInitScheduler in DeInitVCL.

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

diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 71dcca106a57..3aa2cecf4ec8 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -507,15 +507,6 @@ void DeInitVCL()
 // as this processes all pending events in debug builds.
 ImplGetSystemDependentDataManager().flushAll();
 
-Scheduler::ImplDeInitScheduler();
-
-pSVData->mpWinData->maMsgBoxImgList.clear();
-pSVData->maCtrlData.maCheckImgList.clear();
-pSVData->maCtrlData.maRadioImgList.clear();
-pSVData->maCtrlData.moDisclosurePlus.reset();
-pSVData->maCtrlData.moDisclosureMinus.reset();
-pSVData->mpDefaultWin.disposeAndClear();
-
 #if defined _WIN32
 // See GetSystemClipboard (vcl/source/treelist/transfer2.cxx):
 if (auto const comp = css::uno::Reference(
@@ -527,6 +518,15 @@ void DeInitVCL()
 pSVData->m_xSystemClipboard.clear();
 #endif
 
+Scheduler::ImplDeInitScheduler();
+
+pSVData->mpWinData->maMsgBoxImgList.clear();
+pSVData->maCtrlData.maCheckImgList.clear();
+pSVData->maCtrlData.maRadioImgList.clear();
+pSVData->maCtrlData.moDisclosurePlus.reset();
+pSVData->maCtrlData.moDisclosureMinus.reset();
+pSVData->mpDefaultWin.disposeAndClear();
+
 #ifndef NDEBUG
 DbgGUIDeInitSolarMutexCheck();
 #endif
diff --git a/vcl/win/dtrans/WinClipboard.cxx b/vcl/win/dtrans/WinClipboard.cxx
index f82c56784523..1a8eaea151b5 100644
--- a/vcl/win/dtrans/WinClipboard.cxx
+++ b/vcl/win/dtrans/WinClipboard.cxx
@@ -82,6 +82,18 @@ CWinClipboard::~CWinClipboard()
 unregisterClipboardViewer();
 }
 
+void CWinClipboard::disposing(std::unique_lock& mutex)
+{
+{
+osl::MutexGuard aGuard(s_aClipboardSingletonMutex);
+s_pCWinClipbImpl = nullptr;
+}
+
+unregisterClipboardViewer();
+
+WeakComponentImplHelper::disposing(mutex);
+}
+
 // XClipboard
 
 // to avoid unnecessary traffic we check first if there is a clipboard
diff --git a/vcl/win/dtrans/WinClipboard.hxx b/vcl/win/dtrans/WinClipboard.hxx
index 779c272c56c9..fbaa1b206288 100644
--- a/vcl/win/dtrans/WinClipboard.hxx
+++ b/vcl/win/dtrans/WinClipboard.hxx
@@ -105,6 +105,8 @@ public:
 virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() 
override;
 
 IDataObjectPtr getIDataObject();
+
+virtual void disposing(std::unique_lock&) override;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

2023-12-04 Thread László Németh (via logerrit)

 sw/qa/extras/ooxmlexport/data/tdf158436.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx   |6 ++
 sw/source/core/text/guess.cxx|5 -
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 7059a1858ddb044c5f3f0c8e0386d3e1d9dd2b5f
Author: László Németh 
AuthorDate: Mon Dec 4 15:33:14 2023 +0100
Commit: László Németh 
CommitDate: Mon Dec 4 21:41:04 2023 +0100

tdf#119908 tdf#158439 sw smart justify: fix freezing with NBSP

Stop shrinking during underflow, because it resulted
endless layout loop, e.g. when a very short word followed
by a no-break space.

Regression from commit 7d08767b890e723cd502b1c61d250924f695eb98
"tdf#130088 tdf#119908 smart justify: fix DOCX line count + compat opt."

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf158436.docx 
b/sw/qa/extras/ooxmlexport/data/tdf158436.docx
new file mode 100644
index ..8cdcd21b4c1a
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf158436.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index d9ef6b8a48d0..0656bb868795 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -1408,6 +1408,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf130088, "tdf130088.docx")
 CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf158436, "tdf158436.docx")
+{
+// This resulted freezing
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testHyphenationAuto)
 {
 loadAndReload("hyphenation.odt");
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 5e66b366c63f..37a2147d0987 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -82,7 +82,10 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, 
SwTextFormatInfo ,
 
 // allow shrinking, i.e. more text in justified lines, depending on the 
justification algorithm
 if ( rAdjust == SvxAdjust::Block && 
rInf.GetTextFrame()->GetDoc().getIDocumentSettingAccess().get(
-DocumentSettingId::JUSTIFY_LINES_WITH_SHRINKING))
+DocumentSettingId::JUSTIFY_LINES_WITH_SHRINKING) &&
+ // tdf#158436 avoid shrinking at underflow, e.g. no-break space
+ // after a very short word resulted endless loop
+ !rInf.IsUnderflow() )
 {
 // allow up to 2% shrinking of the line
 nLineWidth = nLineWidth / 0.98 + rInf.X() / 0.98 - rInf.X();

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

2023-12-04 Thread Aron Budea (via logerrit)

 sc/source/ui/docshell/docfunc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5b4a705f7477da2b546d0658e46e96f4e69017e4
Author: Aron Budea 
AuthorDate: Sun Dec 3 19:33:28 2023 +1030
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 21:36:55 2023 +0100

sc SetLayoutRTL: Only call PostPaint for current tab

...instead of the usual 0-, a layout change of the current
sheet should have no effect on others.

Change-Id: I5a9a2da78daf1fab06da939574c0e8a027533fcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160254
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 67cdcf1ab2d2977fa79f9ecd7935ad8f3a8b4377)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160181
Tested-by: Jenkins

diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index 7ad32d4963b9..1a8d902bea19 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -3485,7 +3485,7 @@ bool ScDocFunc::SetLayoutRTL( SCTAB nTab, bool bRTL )
 rDocShell.GetUndoManager()->AddUndoAction( 
std::make_unique( , nTab, bRTL ) );
 }
 
-rDocShell.PostPaint( 0,0,0,rDoc.MaxCol(),rDoc.MaxRow(),MAXTAB, 
PaintPartFlags::All );
+rDocShell.PostPaint( 0,0,nTab,rDoc.MaxCol(),rDoc.MaxRow(),nTab, 
PaintPartFlags::All );
 aModificator.SetDocumentModified();
 
 SfxBindings* pBindings = rDocShell.GetViewBindings();

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

2023-12-04 Thread Aron Budea (via logerrit)

 sc/source/ui/docshell/docsh3.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c822a05625da33479527e11a80fe44d3d7b504c8
Author: Aron Budea 
AuthorDate: Sun Dec 3 19:22:17 2023 +1030
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 21:28:46 2023 +0100

lok: Notify all tabs in the range

34d5abf464dfbf4bdc36f6b87e606c84a1f4d99d restricted this to the
first tab, but PostPaint(...) is sometimes called with a
0.. tab range, even if the change only affected somewhere
in between.

In addition, restrict range end to the last actual tab in the
spreadsheet.

Change-Id: I44a7bb351e17bf85b13fedfe2a9f3d76543c4372
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160253
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 4d30910523bccb3b965f254401e6341af2ee8704)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160182
Tested-by: Jenkins

diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 788aac9af86e..96546d11a5fe 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -110,12 +110,13 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 {
 ScRangeList aPaintRanges;
 std::set aTabsInvalidated;
+const SCTAB nMaxTab = m_pDocument->GetTableCount() - 1;
 for (size_t i = 0, n = rRanges.size(); i < n; ++i)
 {
 const ScRange& rRange = rRanges[i];
 SCCOL nCol1 = rRange.aStart.Col(), nCol2 = rRange.aEnd.Col();
 SCROW nRow1 = rRange.aStart.Row(), nRow2 = rRange.aEnd.Row();
-SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = rRange.aEnd.Tab();
+SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = std::min(nMaxTab, 
rRange.aEnd.Tab());
 
 if (!m_pDocument->ValidCol(nCol1)) nCol1 = m_pDocument->MaxCol();
 if (!m_pDocument->ValidRow(nRow1)) nRow1 = m_pDocument->MaxRow();
@@ -168,7 +169,8 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 }
 }
 aPaintRanges.push_back(ScRange(nCol1, nRow1, nTab1, nCol2, nRow2, 
nTab2));
-aTabsInvalidated.insert(nTab1);
+for (auto nTabNum = nTab1; nTabNum <= nTab2; ++nTabNum)
+aTabsInvalidated.insert(nTabNum);
 }
 
 Broadcast(ScPaintHint(aPaintRanges.Combine(), nPart));

[Libreoffice-commits] core.git: connectivity/source editeng/source idl/source sc/source sd/source slideshow/source vcl/source

2023-12-04 Thread Julien Nabet (via logerrit)

 connectivity/source/commontools/propertyids.cxx |1 +
 editeng/source/misc/svxacorr.cxx|6 +-
 idl/source/cmptools/hash.cxx|1 +
 sc/source/ui/namedlg/namedefdlg.cxx |8 ++--
 sd/source/ui/func/fupage.cxx|5 -
 slideshow/source/engine/box2dtools.cxx  |   24 ++--
 vcl/source/treelist/treelist.cxx|7 ---
 vcl/source/uitest/uiobject.cxx  |1 +
 8 files changed, 40 insertions(+), 13 deletions(-)

New commits:
commit 708e379994591c6e73f07bd2aba136841c9cf036
Author: Julien Nabet 
AuthorDate: Mon Dec 4 18:30:28 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 4 20:28:26 2023 +0100

cid#1545810 Using invalid iterator

and :

cid#1545802 Using invalid iterator
cid#1545745 Using invalid iterator
cid#1545717 Using invalid iterator
cid#1545675 Using invalid iterator
cid#1545668 Using invalid iterator
cid#1545639 Using invalid iterator
cid#1545634 Using invalid iterator
cid#1545629 Using invalid iterator
cid#1545620 Using invalid iterator
cid#1545608 Using invalid iterator
cid#1545607 Using invalid iterator
cid#1545601 Using invalid iterator

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

diff --git a/connectivity/source/commontools/propertyids.cxx 
b/connectivity/source/commontools/propertyids.cxx
index 90c6beeede6a..cedd0f5f0614 100644
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
@@ -95,6 +95,7 @@ namespace dbtools
 const OUString& OPropertyMap::getNameByIndex(sal_Int32 _nIndex) const
 {
 std::map::const_iterator aIter = 
m_aPropertyMap.find(_nIndex);
+assert(aIter != m_aPropertyMap.end());
 return aIter->second;
 }
 }
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 6fdcbcca1ccf..c8891889b01d 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1728,7 +1728,11 @@ bool SvxAutoCorrect::AddCplSttException( const OUString& 
rNew,
 if (iter != m_aLangTable.end())
 pLists = >second;
 else if(CreateLanguageFile(aLangTagUndetermined))
-pLists = _aLangTable.find(aLangTagUndetermined)->second;
+{
+iter = m_aLangTable.find(aLangTagUndetermined);
+assert(iter != m_aLangTable.end());
+pLists = >second;
+}
 }
 OSL_ENSURE(pLists, "No auto correction data");
 return pLists && pLists->AddToCplSttExceptList(rNew);
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index d3993881a6ba..4420023bbc32 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -48,6 +48,7 @@ bool SvStringHashTable::Test( const OString& rElement, 
sal_uInt32 * pInsertPos )
 SvStringHashEntry * SvStringHashTable::Get( sal_uInt32 nInsertPos ) const
 {
 auto it = maInt2EntryMap.find(nInsertPos);
+assert(it != maInt2EntryMap.end());
 return it->second.get();
 }
 
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx 
b/sc/source/ui/namedlg/namedefdlg.cxx
index 5be3ddc7de25..3304f4d39b08 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -125,11 +125,15 @@ bool ScNameDefDlg::IsNameValid()
 ScRangeName* pRangeName = nullptr;
 if(aScope == maGlobalNameStr)
 {
-pRangeName = maRangeMap.find(STR_GLOBAL_RANGE_NAME)->second;
+const auto iter = maRangeMap.find(STR_GLOBAL_RANGE_NAME);
+assert(iter != maRangeMap.end());
+pRangeName = iter->second;
 }
 else
 {
-pRangeName = maRangeMap.find(aScope)->second;
+const auto iter = maRangeMap.find(aScope);
+assert(iter != maRangeMap.end());
+pRangeName = iter->second;
 }
 
 ScRangeData::IsNameValidType eType;
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 9401a56b30ec..6d0a59ac3a42 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -548,7 +548,10 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
 if (SfxItemState::SET == pArgs->GetItemState(SID_ATTR_CHAR_GRABBAG, true, 
))
 {
 SfxGrabBagItem const*const pGrabBag(static_cast(pPoolItem));
-if (pGrabBag->GetGrabBag().find("BackgroundFullSize")->second >>= 
bFullSize)
+const auto pGrabBagInner = pGrabBag->GetGrabBag();
+const auto iter = pGrabBagInner.find("BackgroundFullSize");
+assert(iter != pGrabBagInner.end());
+if (iter->second >>= bFullSize)
 {
 if (pMasterPage->IsBackgroundFullSize() != bFullSize)
 {
diff --git a/slideshow/source/engine/box2dtools.cxx 
b/slideshow/source/engine/box2dtools.cxx
index

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

2023-12-04 Thread Julien Nabet (via logerrit)

 svx/source/form/fmshimp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6bc0020108e8b45954727276ba11b462feb9a4bf
Author: Julien Nabet 
AuthorDate: Mon Dec 4 18:23:32 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 4 20:28:02 2023 +0100

Put back the message in assert after 
b50da6f3a9109fc1d4468c15aa7d5c68773ec199

Change-Id: Ie469e94ff51f1ca6dbbd65020f02fe43e0c1608c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160318
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index a71f78f2296b..5dce31f180ba 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3380,7 +3380,7 @@ void FmXFormShell::CreateExternalView_Lock()
 
 // value list
 MapUString2UstringSeq::const_iterator aCurrentValueList = 
aRadioValueLists.find(rCtrlSource.first);
-assert(aCurrentValueList != aRadioValueLists.end());
+assert(aCurrentValueList != aRadioValueLists.end() && 
"FmXFormShell::CreateExternalView : inconsistent radio descriptions !");
 pListBoxDescription->Name = FM_PROP_STRINGITEMLIST;
 pListBoxDescription->Value <<= (*aCurrentValueList).second;
 ++pListBoxDescription;

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

2023-12-04 Thread Ilmari Lauhakangas (via logerrit)

 include/sfx2/thumbnailview.hxx  |1 +
 sfx2/source/control/recentdocsview.cxx  |1 +
 sfx2/source/control/templatedefaultview.cxx |1 +
 sfx2/source/control/thumbnailview.cxx   |3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 5584980493fd599054cc5bbdb9911ae2c70cd60f
Author: Ilmari Lauhakangas 
AuthorDate: Mon Nov 27 18:40:57 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Mon Dec 4 20:16:06 2023 +0100

tdf#158404 Start Center: remove ability to do multiselections

in Recent Documents and Templates views using Shift+arrow keys as
no actions can be executed for multiple selected files.

Multiselection still works as normal in Manage Templates dialog.

Change-Id: I03b9e54abb7772881139763a0c97f36637d01f85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160003
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index 655aa3ba13e5..54e8440ad363 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -309,6 +309,7 @@ protected:
 bool mbShowTooltips : 1;
 bool mbDrawMnemonics : 1;
 bool mbSelectOnFocus : 1;
+bool mbAllowMultiSelection : 1;
 Color maFillColor;  ///< Background color of the thumbnail 
view widget.
 Color maTextColor;  ///< Text color.
 Color maHighlightColor; ///< Color of the highlight (background) 
of the hovered item.
diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index 6df534788a32..f6ea1278390a 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -68,6 +68,7 @@ 
RecentDocsView::RecentDocsView(std::unique_ptr xWindow, st
 , mpLoadRecentFile(nullptr)
 , m_nExecuteHdlId(nullptr)
 {
+mbAllowMultiSelection = false;
 AbsoluteScreenPixelRectangle aScreen = 
Application::GetScreenPosSizePixel(Application::GetDisplayBuiltInScreen());
 mnItemMaxSize = std::min(aScreen.GetWidth(),aScreen.GetHeight()) > 800 ? 
256 : 192;
 
diff --git a/sfx2/source/control/templatedefaultview.cxx 
b/sfx2/source/control/templatedefaultview.cxx
index 909545e423ce..eef46f1817fd 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -25,6 +25,7 @@ 
TemplateDefaultView::TemplateDefaultView(std::unique_ptr x
  std::unique_ptr xMenu)
 : TemplateLocalView(std::move(xWindow), std::move(xMenu))
 {
+mbAllowMultiSelection = false;
 AbsoluteScreenPixelRectangle aScreen = 
Application::GetScreenPosSizePixel(Application::GetDisplayBuiltInScreen());
 tools::Long nItemMaxSize = 
std::min(aScreen.GetWidth(),aScreen.GetHeight()) > 800 ? 256 : 192;
 ThumbnailView::setItemDimensions( nItemMaxSize, nItemMaxSize, 
gnTextHeight, gnItemPadding );
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index abb9f9799e34..1ae47016935e 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -246,6 +246,7 @@ void ThumbnailView::ImplInit()
 mbHasVisibleItems = false;
 mbShowTooltips = false;
 mbDrawMnemonics = false;
+mbAllowMultiSelection = true;
 maFilterFunc = ViewFilterAll();
 
 const StyleSettings& rSettings = 
Application::GetSettings().GetStyleSettings();
@@ -681,7 +682,7 @@ bool ThumbnailView::KeyInput( const KeyEvent& rKEvt )
 
 if ( pNext )
 {
-if (aKeyCode.IsShift() && bValidRange)
+if (aKeyCode.IsShift() && bValidRange && mbAllowMultiSelection)
 {
 std::pair aRange;
 size_t nSelPos = mpStartSelRange - mFilteredItemList.begin();

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

2023-12-04 Thread Aron Budea (via logerrit)

 sc/source/ui/docshell/docfunc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 67cdcf1ab2d2977fa79f9ecd7935ad8f3a8b4377
Author: Aron Budea 
AuthorDate: Sun Dec 3 19:33:28 2023 +1030
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 20:11:49 2023 +0100

sc SetLayoutRTL: Only call PostPaint for current tab

...instead of the usual 0-, a layout change of the current
sheet should have no effect on others.

Change-Id: I5a9a2da78daf1fab06da939574c0e8a027533fcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160254
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index be844634ea25..12ff9a0f9908 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -3485,7 +3485,7 @@ bool ScDocFunc::SetLayoutRTL( SCTAB nTab, bool bRTL )
 rDocShell.GetUndoManager()->AddUndoAction( 
std::make_unique( , nTab, bRTL ) );
 }
 
-rDocShell.PostPaint( 0,0,0,rDoc.MaxCol(),rDoc.MaxRow(),MAXTAB, 
PaintPartFlags::All );
+rDocShell.PostPaint( 0,0,nTab,rDoc.MaxCol(),rDoc.MaxRow(),nTab, 
PaintPartFlags::All );
 aModificator.SetDocumentModified();
 
 SfxBindings* pBindings = rDocShell.GetViewBindings();

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

2023-12-04 Thread Aron Budea (via logerrit)

 sc/source/ui/docshell/docsh3.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 4d30910523bccb3b965f254401e6341af2ee8704
Author: Aron Budea 
AuthorDate: Sun Dec 3 19:22:17 2023 +1030
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 20:09:29 2023 +0100

lok: Notify all tabs in the range

34d5abf464dfbf4bdc36f6b87e606c84a1f4d99d restricted this to the
first tab, but PostPaint(...) is sometimes called with a
0.. tab range, even if the change only affected somewhere
in between.

In addition, restrict range end to the last actual tab in the
spreadsheet.

Change-Id: I44a7bb351e17bf85b13fedfe2a9f3d76543c4372
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160253
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 8b24cf81d727..0e2efa7f09fc 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -110,12 +110,13 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 {
 ScRangeList aPaintRanges;
 std::set aTabsInvalidated;
+const SCTAB nMaxTab = m_pDocument->GetTableCount() - 1;
 for (size_t i = 0, n = rRanges.size(); i < n; ++i)
 {
 const ScRange& rRange = rRanges[i];
 SCCOL nCol1 = rRange.aStart.Col(), nCol2 = rRange.aEnd.Col();
 SCROW nRow1 = rRange.aStart.Row(), nRow2 = rRange.aEnd.Row();
-SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = rRange.aEnd.Tab();
+SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = std::min(nMaxTab, 
rRange.aEnd.Tab());
 
 if (!m_pDocument->ValidCol(nCol1)) nCol1 = m_pDocument->MaxCol();
 if (!m_pDocument->ValidRow(nRow1)) nRow1 = m_pDocument->MaxRow();
@@ -168,7 +169,8 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 }
 }
 aPaintRanges.push_back(ScRange(nCol1, nRow1, nTab1, nCol2, nRow2, 
nTab2));
-aTabsInvalidated.insert(nTab1);
+for (auto nTabNum = nTab1; nTabNum <= nTab2; ++nTabNum)
+aTabsInvalidated.insert(nTabNum);
 }
 
 Broadcast(ScPaintHint(aPaintRanges.Combine(), nPart));

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/inc sc/source

2023-12-04 Thread Henry Castro (via logerrit)

 sc/inc/globstr.hrc |1 +
 sc/source/ui/view/viewfunc.cxx |5 +
 2 files changed, 6 insertions(+)

New commits:
commit eccbe3bb4ed6f0bed4e7fbacfaf50762c93f9464
Author: Henry Castro 
AuthorDate: Mon Dec 4 10:33:01 2023 -0400
Commit: Caolán McNamara 
CommitDate: Mon Dec 4 20:05:58 2023 +0100

sc: show a message dialog if insert cells fail

Use case, go to the max row and insert a row.

Signed-off-by: Henry Castro 
Change-Id: I930d7724b9c94e10e9207ec749b7249d2fee0e39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160314
Tested-by: Jenkins CollaboraOffice 
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index f4afbb7de320..aff27e3608dd 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -550,6 +550,7 @@
 #define STR_UNDO_EDIT_SPARKLINE NC_("STR_UNDO_EDIT_SPARKLINE", 
"Edit Sparkline")
 #define STR_UNDO_THEME_CHANGE   NC_("STR_UNDO_THEME_CHANGE", 
"Theme Change")
 #define STR_UNDO_THEME_COLOR_CHANGE 
NC_("STR_UNDO_THEME_COLOR_CHANGE", "Theme Color Change")
+#define STR_ERR_INSERT_CELLSNC_("STR_ERR_INSERT_CELLS", 
"Failed to insert cells")
 
 #endif
 
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 13eb71acef52..15076f04a958 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -1776,6 +1776,11 @@ bool ScViewFunc::InsertCells( InsCellCmd eCmd, bool 
bRecord, bool bPartOfPaste )
 true /* 
bGroups */, GetViewData().GetTabNo());
 }
 }
+else
+{
+ErrorMessage(STR_ERR_INSERT_CELLS);
+}
+
 OUString aStartAddress =  aRange.aStart.GetColRowString();
 OUString aEndAddress = aRange.aEnd.GetColRowString();
 collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}}, 
"INSERT_CELLS");

[Libreoffice-commits] core.git: cui/source editeng/source oox/source reportdesign/source sc/source soltools/mkdepend sw/source vcl/source

2023-12-04 Thread Julien Nabet (via logerrit)

 cui/source/dialogs/SpellDialog.cxx   |5 -
 editeng/source/misc/svxacorr.cxx |   10 --
 oox/source/drawingml/texteffectscontext.cxx  |5 +++--
 reportdesign/source/filter/xml/xmlExport.cxx |1 +
 sc/source/core/data/SolverSettings.cxx   |4 +++-
 sc/source/ui/namedlg/namedefdlg.cxx  |8 ++--
 soltools/mkdepend/collectdircontent.cxx  |1 +
 sw/source/core/layout/paintfrm.cxx   |2 +-
 vcl/source/cnttype/mcnttype.cxx  |4 +++-
 9 files changed, 30 insertions(+), 10 deletions(-)

New commits:
commit bc95ece0618b9886890d9c758b9d0ebc0fc41c69
Author: Julien Nabet 
AuthorDate: Mon Dec 4 18:03:27 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 4 19:21:31 2023 +0100

cid#1546021 Using invalid iterator

and :

cid#1545983 Using invalid iterator
cid#1545969 Using invalid iterator
cid#1545949 Using invalid iterator
cid#1545929 Using invalid iterator
cid#1545911 Using invalid iterator
cid#1545910 Using invalid iterator
cid#1545886 Using invalid iterator
cid#1545870 Using invalid iterator
cid#1545813 Using invalid iterator

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

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 3ad9c2b196b0..dfdad984ec41 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1247,7 +1247,10 @@ namespace
 void ExtractErrorDescription(const EECharAttrib& rEECharAttrib, 
SpellErrorDescription& rSpellErrorDescription)
 {
 css::uno::Sequence aSequence;
-static_cast(rEECharAttrib.pAttr)->GetGrabBag().find("SpellErrorDescription")->second
 >>= aSequence;
+const auto pGrabBag = static_cast(rEECharAttrib.pAttr)->GetGrabBag();
+const auto iter = pGrabBag.find("SpellErrorDescription");
+assert(iter != pGrabBag.end());
+iter->second >>= aSequence;
 rSpellErrorDescription.fromSequence(aSequence);
 }
 }
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 8a28ccf42ada..6fdcbcca1ccf 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1750,7 +1750,11 @@ bool SvxAutoCorrect::AddWordStartException( const 
OUString& rNew,
 if (iter != m_aLangTable.end())
 pLists = >second;
 else if(CreateLanguageFile(aLangTagUndetermined))
-pLists = _aLangTable.find(aLangTagUndetermined)->second;
+{
+iter = m_aLangTable.find(aLangTagUndetermined);
+assert(iter != m_aLangTable.end());
+pLists = >second;
+}
 }
 OSL_ENSURE(pLists, "No auto correction file!");
 return pLists && pLists->AddToWordStartExceptList(rNew);
@@ -2030,7 +2034,9 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
 CreateLanguageFile(aLanguageTag, false))
 {
 //the language is available - so bring it on
-SvxAutoCorrectLanguageLists& rList = 
m_aLangTable.find(aLanguageTag)->second;
+const auto iter = m_aLangTable.find(aLanguageTag);
+assert(iter != m_aLangTable.end());
+SvxAutoCorrectLanguageLists& rList = iter->second;
 pRet = lcl_SearchWordsInList( , rTxt, rStt, nEndPos );
 if( pRet )
 {
diff --git a/oox/source/drawingml/texteffectscontext.cxx 
b/oox/source/drawingml/texteffectscontext.cxx
index 0e33a4c3c13b..347971f4616b 100644
--- a/oox/source/drawingml/texteffectscontext.cxx
+++ b/oox/source/drawingml/texteffectscontext.cxx
@@ -91,8 +91,9 @@ OUString const & lclGetGrabBagName(sal_uInt32 aId)
 { OOX_TOKEN(w14, stylisticSets), "CharStylisticSetsTextEffect" },
 { OOX_TOKEN(w14, cntxtAlts), "CharCntxtAltsTextEffect" },
 };
-
-return aGrabBagNameMap.find(aId)->second;
+const auto iter = aGrabBagNameMap.find(aId);
+assert(iter != aGrabBagNameMap.end());
+return iter->second;
 }
 
 }
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx 
b/reportdesign/source/filter/xml/xmlExport.cxx
index 6e7104724704..c1b2c24232d9 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -755,6 +755,7 @@ void ORptExport::exportContainer(const Reference< 
XSection>& _xSection)
 TGrid::const_iterator aRowEnd = aFind->second.end();
 
 TGridStyleMap::const_iterator aRowFind = m_aRowStyleNames.find(_xSection);
+assert(aRowFind != m_aRowStyleNames.end());
 auto aHeightIter = aRowFind->second.cbegin();
 OSL_ENSURE(aRowFind->second.size() == aFind->second.size(),"Different 
count for rows");
 
diff --git a/sc/source/core/data/SolverSettings.cxx 
b/sc/source/core/data/SolverSettings.cxx
index ac2d2aa24aeb..60eb747f55f5 100644
--- a/sc/source/core/data/SolverSettings.cxx
+++

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

2023-12-04 Thread Andras Timar (via logerrit)

 sw/uiconfig/swriter/ui/translationdialog.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 22e1cdd3a2fc142fc5313e1dba942810c7e91f95
Author: Andras Timar 
AuthorDate: Sun Dec 3 21:43:06 2023 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 4 18:58:17 2023 +0100

Make OK/Cancel buttons translatable on Language Selection dialog

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

diff --git a/sw/uiconfig/swriter/ui/translationdialog.ui 
b/sw/uiconfig/swriter/ui/translationdialog.ui
index c520fd851921..36f0015ae627 100644
--- a/sw/uiconfig/swriter/ui/translationdialog.ui
+++ b/sw/uiconfig/swriter/ui/translationdialog.ui
@@ -22,7 +22,7 @@
 end
 
   
-_OK
+_OK
 True
 True
 True
@@ -36,7 +36,7 @@
 
 
   
-_Cancel
+_Cancel
 True
 True
 True

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

2023-12-04 Thread Laurent Balland (via logerrit)

 extras/source/templates/presnt/Freshes/content.xml |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit a56003dc89903f2b03d041807d48bb1e004a3853
Author: Laurent Balland 
AuthorDate: Sat Dec 2 09:48:36 2023 +0100
Commit: Laurent Balland 
CommitDate: Mon Dec 4 18:50:59 2023 +0100

tdf#158017 Freshes Impress template: color font

Color font was forced to black with 70% of transparency to render a grey
color. This trick fails with dark mode.
A standard grey color is restored with this commit (and 0% transparency)

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

diff --git a/extras/source/templates/presnt/Freshes/content.xml 
b/extras/source/templates/presnt/Freshes/content.xml
index d7699c7b4588..817414365b79 100644
--- a/extras/source/templates/presnt/Freshes/content.xml
+++ b/extras/source/templates/presnt/Freshes/content.xml
@@ -640,7 +640,7 @@
   
 
 
-  
+  
 
 
   
@@ -681,9 +681,6 @@
 
   
 
-
-  
-
 
   
 
@@ -1492,7 +1489,7 @@
 
   
 
-  Lorem ipsum dolor sit amet, 
consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et 
dolore magna aliqua.
+  Lorem ipsum dolor sit amet, 
consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et 
dolore magna aliqua.

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

2023-12-04 Thread Laurent Balland (via logerrit)

 extras/source/templates/presnt/Metropolis/styles.xml  |   54 --
 extras/source/templates/presnt/Nature_Illustration/styles.xml |   54 --
 2 files changed, 108 deletions(-)

New commits:
commit f1f8fd8455aee3cb07108696856c6026d453f372
Author: Laurent Balland 
AuthorDate: Sun Dec 3 14:30:10 2023 +0100
Commit: Laurent Balland 
CommitDate: Mon Dec 4 18:50:13 2023 +0100

Nature Illustration template: remove unused styles

These old styles are used in the template and is no more in use in LO.
So they remain untranslated when changing UI language.

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

diff --git a/extras/source/templates/presnt/Nature_Illustration/styles.xml 
b/extras/source/templates/presnt/Nature_Illustration/styles.xml
index 200ec815019b..8c384e2ce424 100644
--- a/extras/source/templates/presnt/Nature_Illustration/styles.xml
+++ b/extras/source/templates/presnt/Nature_Illustration/styles.xml
@@ -65,63 +65,9 @@
   
   
 
-
-  
-
-
-  
-
 
   
 
-
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-
 
   
   
commit d103f4afddd6360c3e09fde3cbe7c3f720ac7f65
Author: Laurent Balland 
AuthorDate: Sun Dec 3 14:19:42 2023 +0100
Commit: Laurent Balland 
CommitDate: Mon Dec 4 18:50:00 2023 +0100

Metropolis Impress template: remove unused styles

These old styles are used in the template and is no more in use in LO.
So they remain untranslated when changing UI language.

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

diff --git a/extras/source/templates/presnt/Metropolis/styles.xml 
b/extras/source/templates/presnt/Metropolis/styles.xml
index cada57042c56..6a7a14efca6c 100644
--- a/extras/source/templates/presnt/Metropolis/styles.xml
+++ b/extras/source/templates/presnt/Metropolis/styles.xml
@@ -62,63 +62,9 @@
   
   
 
-
-  
-
-
-  
-
 
   
 
-
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-

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

2023-12-04 Thread Mike Kaganski (via logerrit)

 qadevOOo/qa/registrymodifications.xcu |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a4a1f2ecee2e7b1d50e0065e25090e262863e1c4
Author: Mike Kaganski 
AuthorDate: Mon Dec 4 16:59:54 2023 +0300
Commit: Mike Kaganski 
CommitDate: Mon Dec 4 18:36:43 2023 +0100

Disallow crash reporting in UITests

Otherwise, after one crash, the next UITest starts with the crash report
dialog, and hangs, creating the noise in results. Seen when running
UITests on Windows with parallelism.

Crash reporting is unaffected by '--norestore', and handled separately
in Desktop::OpenClients (desktop/source/app/app.cxx).

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

diff --git a/qadevOOo/qa/registrymodifications.xcu 
b/qadevOOo/qa/registrymodifications.xcu
index 3ac099ff7f1e..0a4fccf18c88 100644
--- a/qadevOOo/qa/registrymodifications.xcu
+++ b/qadevOOo/qa/registrymodifications.xcu
@@ -3,6 +3,7 @@
  when building with non-en system locales -->
 http://openoffice.org/2001/registry; 
xmlns:xs="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
 true
+false
 false
 false
 en-US

[Libreoffice-commits] core.git: dbaccess/source editeng/source slideshow/source svx/source sw/source vcl/unx

2023-12-04 Thread Julien Nabet (via logerrit)

 dbaccess/source/core/api/OptimisticSet.cxx   |4 +++-
 editeng/source/misc/svxacorr.cxx |4 +++-
 slideshow/source/engine/box2dtools.cxx   |8 ++--
 svx/source/form/fmshimp.cxx  |3 +--
 sw/source/filter/ww8/docxattributeoutput.cxx |4 +++-
 vcl/unx/generic/fontmanager/fontmanager.cxx  |1 +
 6 files changed, 17 insertions(+), 7 deletions(-)

New commits:
commit b50da6f3a9109fc1d4468c15aa7d5c68773ec199
Author: Julien Nabet 
AuthorDate: Mon Dec 4 11:31:36 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 4 18:00:43 2023 +0100

cid#1546275 Using invalid iterator

and :

cid#1546219 Using invalid iterator
cid#1546088 Using invalid iterator
cid#1546070 Using invalid iterator
cid#1546061 Using invalid iterator
cid#1546055 Using invalid iterator
cid#1546049 Using invalid iterator

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

diff --git a/dbaccess/source/core/api/OptimisticSet.cxx 
b/dbaccess/source/core/api/OptimisticSet.cxx
index d1d70955f674..2a89974794ad 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -353,7 +353,9 @@ void OptimisticSet::executeDelete(const ORowSetRow& 
_rDeleteRow,const OUString&
 if(m_bDeleted)
 {
 sal_Int32 nBookmark = 
::comphelper::getINT32((*_rDeleteRow)[0].getAny());
-if(m_aKeyIter == m_aKeyMap.find(nBookmark) && m_aKeyIter != 
m_aKeyMap.end())
+const auto iter = m_aKeyMap.find(nBookmark);
+assert(iter != m_aKeyMap.end());
+if(m_aKeyIter == iter && m_aKeyIter != m_aKeyMap.end())
 ++m_aKeyIter;
 m_aKeyMap.erase(nBookmark);
 m_bDeleted = true;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 61bc805993ce..8a28ccf42ada 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2077,7 +2077,9 @@ bool SvxAutoCorrect::FindInWordStartExceptList( 
LanguageType eLang,
 CreateLanguageFile(aLanguageTag, false))
 {
 //the language is available - so bring it on
-auto& rList = m_aLangTable.find(aLanguageTag)->second;
+const auto iter = m_aLangTable.find(aLanguageTag);
+assert(iter != m_aLangTable.end());
+auto& rList = iter->second;
 if(rList.GetWordStartExceptList()->find(sWord) != 
rList.GetWordStartExceptList()->end() )
 return true;
 }
diff --git a/slideshow/source/engine/box2dtools.cxx 
b/slideshow/source/engine/box2dtools.cxx
index 97e172a4eb4e..161bbe8c37f4 100644
--- a/slideshow/source/engine/box2dtools.cxx
+++ b/slideshow/source/engine/box2dtools.cxx
@@ -323,7 +323,9 @@ void box2DWorld::setShapeAngleByAngularVelocity(
 assert(mpBox2DWorld);
 if (fPassedTime > 0) // this only makes sense if there was an advance in 
time
 {
-Box2DBodySharedPtr pBox2DBody = mpXShapeToBodyMap.find(xShape)->second;
+const auto iter = mpXShapeToBodyMap.find(xShape);
+assert(iter != mpXShapeToBodyMap.end());
+Box2DBodySharedPtr pBox2DBody = iter->second;
 pBox2DBody->setAngleByAngularVelocity(fAngle, fPassedTime);
 }
 }
@@ -561,7 +563,9 @@ void box2DWorld::queueShapeAnimationEndUpdate(
 
 void box2DWorld::alertPhysicsAnimationEnd(const 
slideshow::internal::ShapeSharedPtr& pShape)
 {
-Box2DBodySharedPtr pBox2DBody = 
mpXShapeToBodyMap.find(pShape->getXShape())->second;
+const auto iter = mpXShapeToBodyMap.find(pShape->getXShape());
+assert(iter != mpXShapeToBodyMap.end());
+Box2DBodySharedPtr pBox2DBody = iter->second;
 // since the animation ended make the body static
 makeBodyStatic(pBox2DBody);
 pBox2DBody->setRestitution(fDefaultStaticBodyBounciness);
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index dd71f6999ade..a71f78f2296b 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3380,8 +3380,7 @@ void FmXFormShell::CreateExternalView_Lock()
 
 // value list
 MapUString2UstringSeq::const_iterator aCurrentValueList = 
aRadioValueLists.find(rCtrlSource.first);
-DBG_ASSERT(aCurrentValueList != aRadioValueLists.end(),
-"FmXFormShell::CreateExternalView : inconsistent radio 
descriptions !");
+assert(aCurrentValueList != aRadioValueLists.end());
 pListBoxDescription->Name = FM_PROP_STRINGITEMLIST;
 pListBoxDescription->Value <<= (*aCurrentValueList).second;
 ++pListBoxDescription;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 8949ffe58a77..d84549d43066 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -315,7

[Libreoffice-commits] core.git: Changes to 'feature/windowsupdater'

2023-12-04 Thread Thorsten Behrens (via logerrit)

New branch 'feature/windowsupdater' available with the following commits:
commit 93609732210532ab6bcdabf8fa12fa3dc6f06478
Author: Thorsten Behrens 
Date:   Mon Dec 4 13:56:55 2023 +0100

Remove hard limit to c89 for clang

Not sure this is still true? "Windows MSVC only supports C90 so force gnu89"

Change-Id: Id628131b4fa6b61e19da6d862d773ab36f201729

commit 3ccce9c631e22faa57cc4e24200f54c040589410
Author: Thorsten Behrens 
Date:   Mon Dec 4 13:56:12 2023 +0100

More buildfixes, also define XP_

commit a52a079d419c57a86f0ab2cced6e2b06d95f954b
Author: Thorsten Behrens 
Date:   Mon Dec 4 13:05:41 2023 +0100

Add more missing includes

commit 1e4fc549a4d0741b2d34a8b8bd9498a63d475506
Author: Thorsten Behrens 
Date:   Mon Dec 4 13:03:21 2023 +0100

Widen include path

Change-Id: I3e371acb4adaf92999c830c5f94ca321df89b7d5

commit 07e11e5f5d3dbb075aeb3ed579bc1c7b8a35c6a6
Author: Thorsten Behrens 
Date:   Mon Dec 4 09:20:32 2023 +0100

Add missing files, rename cpp->cxx, tweak makefiles

commit a5799d7b7dfb937c17b1fcab77b0eaa36f5c32bf
Author: Thorsten Behrens 
Date:   Mon Dec 4 04:29:25 2023 +0100

Fixup after clang-format

commit 0e79a73d1b3c76b766e3200396b123f10b71609c
Author: Thorsten Behrens 
Date:   Mon Dec 4 04:26:57 2023 +0100

Commit w/p clang-format

commit 35b02a6818882b0d310b1098b636467d8cae45bc
Author: Thorsten Behrens 
Date:   Mon Dec 4 03:44:23 2023 +0100

clang-format all of onlineupdate

In preparation of updating from upstream

Change-Id: I8f2ce1079f000ed79af594ea1a89f85fc994de3b

commit b0c47d7d873e40456079e2c99340a92da37239a4
Author: Thorsten Behrens 
Date:   Mon Dec 4 03:38:44 2023 +0100

Format updater code with clang-format

(instead of bespoke astyle rule)

Change-Id: I623b453c7662383ba35d98ecae03b61c5a98b29b

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

2023-12-04 Thread Samuel Mehrbrodt (via logerrit)

 cui/source/options/optaboutconfig.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 1597968f5cd2534fb6e0be40fafecc305a004f4e
Author: Samuel Mehrbrodt 
AuthorDate: Mon Dec 4 16:00:21 2023 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Dec 4 17:43:34 2023 +0100

tdf#155676 Properly support editing string lists

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

diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index b5d218ecadad..ea63035471ca 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -866,7 +866,12 @@ IMPL_LINK_NOARG(CuiAboutConfigTabPage, StandardHdl_Impl, 
weld::Button&, void)
 else if (sPropertyType == "string-list")
 {
 SvxListDialog aListDialog(m_xDialog.get());
-aListDialog.SetEntries(commaStringToSequence(sDialogValue));
+Reference xConfigAccess
+= getConfigAccess(pUserData->sPropertyPath, false);
+Any aNode = xConfigAccess->getByName(sPropertyName);
+uno::Sequence aList = 
aNode.get>();
+aListDialog.SetEntries(
+
comphelper::sequenceToContainer>(aList));
 aListDialog.SetMode(ListMode::String);
 if (aListDialog.run() == RET_OK)
 {

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

2023-12-04 Thread Mike Kaganski (via logerrit)

 vcl/source/app/scheduler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 274e078a6e94e477b594839355cc709829d921dd
Author: Mike Kaganski 
AuthorDate: Mon Dec 4 14:45:57 2023 +0300
Commit: Mike Kaganski 
CommitDate: Mon Dec 4 17:26:37 2023 +0100

Relax assertion a bit

When running UITests on Windows with parallelism, I often see this
assertion failing. I don't know why; but every time I attach the
debugger to the failed process, I see mpSchedulerStack's mpTask
and mpNext are both nullptr. The only place where this can happen
is Task::~Task, which seems to suggest that this situation is
basically the same as no mpSchedulerStack.

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

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index 098242fe6c70..e6893055f633 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -130,7 +130,7 @@ void Scheduler::ImplDeInitScheduler()
 #endif
 rSchedCtx.mbActive = false;
 
-assert( nullptr == rSchedCtx.mpSchedulerStack );
+assert( nullptr == rSchedCtx.mpSchedulerStack || 
(!rSchedCtx.mpSchedulerStack->mpTask && !rSchedCtx.mpSchedulerStack->mpNext) );
 
 if (rSchedCtx.mpSalTimer) rSchedCtx.mpSalTimer->Stop();
 delete rSchedCtx.mpSalTimer;

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

2023-12-04 Thread Julien Nabet (via logerrit)

 cui/inc/personas.hrc   |   30 ++
 cui/source/options/personalization.cxx |9 +++--
 2 files changed, 37 insertions(+), 2 deletions(-)

New commits:
commit a6dc2a42263816461600307b5f8271a5c5d8d031
Author: Julien Nabet 
AuthorDate: Sat Dec 2 11:36:06 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 4 17:20:07 2023 +0100

tdf#157402: translate personas

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

diff --git a/cui/inc/personas.hrc b/cui/inc/personas.hrc
new file mode 100644
index ..6b101717dcaa
--- /dev/null
+++ b/cui/inc/personas.hrc
@@ -0,0 +1,30 @@
+/* -*- 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 
+
+#define NC_(Context, String) TranslateId(Context, u8##String)
+
+// it must be synchronized with 
extras/source/gallery/personas/personas_list.txt
+std::pair RID_PERSONAS_COLOR[] =
+{
+{ NC_("RID_CUI_PERSONAS_COLOR", "White") , 0 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Gray") , 1 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Dark") , 2 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Pink") , 3 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Sand") , 4 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Green") , 5 },
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 6311fd491141..657344d60c75 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -11,6 +11,8 @@
 
 #include "personalization.hxx"
 
+#include 
+
 #include 
 #include 
 #include 
@@ -21,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -144,6 +147,7 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 bool foundOne = false;
 
 OStringBuffer aLine;
+int nLineNumberFilePersona = 0;
 while (aStream.IsOpen() && !aStream.eof() && nIndex < MAX_DEFAULT_PERSONAS)
 {
 OUString aPersonaSetting, aPreviewFile, aName;
@@ -151,8 +155,8 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 
 aStream.ReadLine(aLine);
 aPersonaSetting = OStringToOUString(aLine, RTL_TEXTENCODING_UTF8);
-aName = aPersonaSetting.getToken(1, ';', nParseIndex);
-aPreviewFile = aPersonaSetting.getToken(0, ';', nParseIndex);
+aName = CuiResId(RID_PERSONAS_COLOR[nLineNumberFilePersona].first);
+aPreviewFile = aPersonaSetting.getToken(2, ';', nParseIndex);
 
 if (aPreviewFile.isEmpty())
 break;
@@ -175,6 +179,7 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 m_vDefaultPersonaImages[nIndex]->set_tooltip_text(aName);
 m_vDefaultPersonaImages[nIndex++]->show();
 foundOne = true;
+++nLineNumberFilePersona;
 }
 
 m_xDefaultPersona->set_sensitive(foundOne);

[Libreoffice-commits] core.git: translations

2023-12-04 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit 4b9823343777ca94bd1fa730e83f2729e55e80b6
Author: Christian Lohmaier 
AuthorDate: Mon Dec 4 17:08:58 2023 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Dec 4 17:08:58 2023 +0100

Update git submodules

* Update translations from branch 'master'
  to 5c0f8a2035b7a98ba0bce9e86e660db1e40e81c4
  - update translations for master

and force-fix errors using pocheck

Change-Id: I77488fda05cc237c8148a5307a2dd85937a42638

diff --git a/translations b/translations
index 9ad74762e8f1..5c0f8a2035b7 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 9ad74762e8f15a51057ea53d95818c92f0adf341
+Subproject commit 5c0f8a2035b7a98ba0bce9e86e660db1e40e81c4

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-23.05.6-1'

2023-12-04 Thread Andras Timar (via logerrit)

Tag 'cp-23.05.6-1' created by Andras Timar  at 
2023-12-04 15:32 +

cp-23.05.6-1

Changes since cp-23.05.5-3-135:
---
 0 files changed
---

[Libreoffice-commits] core.git: translations

2023-12-04 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit 78356d0db4a957a356a7e49e575b2fa8d3b9f902
Author: Christian Lohmaier 
AuthorDate: Mon Dec 4 16:31:14 2023 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Dec 4 16:31:14 2023 +0100

Update git submodules

* Update translations from branch 'master'
  to 9ad74762e8f15a51057ea53d95818c92f0adf341
  - update translations for master

and force-fix errors using pocheck

Change-Id: If3a600f16773aad9242bc3231788d8bfaf8227d1

diff --git a/translations b/translations
index 994b9356742b..9ad74762e8f1 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 994b9356742bd38a188a376d41fca1bd9d0fa396
+Subproject commit 9ad74762e8f15a51057ea53d95818c92f0adf341

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - configure.ac

2023-12-04 Thread Andras Timar (via logerrit)

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4262992e6180874dbf2519e5c34384e9b2f0d5d6
Author: Andras Timar 
AuthorDate: Mon Dec 4 16:31:21 2023 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 4 16:31:21 2023 +0100

Bump version to 23.05.6.1

Change-Id: Ife459f0e0646f73b0c8f87ce9ab308f0ede968fb

diff --git a/configure.ac b/configure.ac
index 60838676555c..25eb99556fe2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[23.05.5.4],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[23.05.6.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

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

2023-12-04 Thread Andras Timar (via logerrit)

 sw/uiconfig/swriter/ui/translationdialog.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1f6bfc85032b10a52a9abe9fd104e92e5671ea81
Author: Andras Timar 
AuthorDate: Sun Dec 3 21:43:06 2023 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 4 16:28:56 2023 +0100

Make OK/Cancel buttons translatable on Language Selection dialog

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

diff --git a/sw/uiconfig/swriter/ui/translationdialog.ui 
b/sw/uiconfig/swriter/ui/translationdialog.ui
index a6aff92ab00c..26d4f33bfa56 100644
--- a/sw/uiconfig/swriter/ui/translationdialog.ui
+++ b/sw/uiconfig/swriter/ui/translationdialog.ui
@@ -25,7 +25,7 @@
 end
 
   
-_Cancel
+_Cancel
 True
 True
 True
@@ -39,7 +39,7 @@
 
 
   
-_OK
+_OK
 True
 True
 True

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source

2023-12-04 Thread Justin Luth (via logerrit)

 sw/source/uibase/shells/txtnum.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit f384dc0476e4730d3ccb7a7f56eae8452bce133a
Author: Justin Luth 
AuthorDate: Thu Nov 23 20:50:09 2023 -0500
Commit: Andras Timar 
CommitDate: Mon Dec 4 16:27:58 2023 +0100

related tdf#56258 sw sidebar SetOutline: do something without dropdown

The sidebar gained SetOutline in 7.6
with commit 3fd0b4053763aa91b0004c523e96e7d390c7b58e.

In the TOOLBAR, there is special code that tells the main button
to show the locale list outline choices - just like the dropdown does.
However, none of that code comes into play in the sidebar,
so add a special case to handle that situation.

It is easy to launch the dialog, focused on the outlinenum page.
Better yet would be to figure out how to launch the popup window
that the dropdown opens - so they do the same thing...

Change-Id: I3d6eeafaa8bdb45cfacc42e221820d664419e0e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159934
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Justin Luth 
Reviewed-by: Szymon Kłos 

diff --git a/sw/source/uibase/shells/txtnum.cxx 
b/sw/source/uibase/shells/txtnum.cxx
index 34a95d13ee8e..ae353ed0aa55 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -310,6 +310,14 @@ void SwTextShell::ExecSetNumber(SfxRequest const )
 GetShell().SetCurNumRule( aNewNumRule, bCreateNewList );
 }
 }
+else if (nSlot == FN_SVX_SET_OUTLINE)
+{
+// no outline provided: launch dialog to request a specific 
outline
+SfxBindings& rBindings = 
GetView().GetViewFrame()->GetBindings();
+const SfxStringItem aPage(FN_PARAM_1, "outlinenum");
+const SfxPoolItem* aItems[] = { , nullptr };
+rBindings.Execute(SID_OUTLINE_BULLET, aItems);
+}
 }
 break;

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

2023-12-04 Thread Sahil Gautam (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |1 
 sc/source/ui/inc/tpview.hxx  |1 
 sc/source/ui/optdlg/tpview.cxx   |   12 +++
 sc/uiconfig/scalc/ui/tpviewpage.ui   |   25 +--
 4 files changed, 36 insertions(+), 3 deletions(-)

New commits:
commit a4d11d07fbace142cba82c30ecb09ff99b9bbb6f
Author: Sahil Gautam 
AuthorDate: Mon Nov 13 00:22:11 2023 +0530
Commit: Mike Kaganski 
CommitDate: Mon Dec 4 16:22:54 2023 +0100

tdf#33201 Checkbox Implementation for Col/row Highlight

Change-Id: I32aca7128a3f01be9fd5a7150243f8fd4e82f626
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159001
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Mike Kaganski 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index aa58fc81a9a7..e1fe88dfa1d9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -122,6 +122,7 @@
   false
 
 
+  
   
 Indicates whether the column/row highlight has been enabled 
or not.
 Column/row highlighting
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 65aed43031d8..72f3b7668732 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -37,6 +37,7 @@ class ScTpContentOptions : public SfxTabPage
 std::unique_ptr m_xAnnotCB;
 std::unique_ptr m_xFormulaMarkCB;
 std::unique_ptr m_xValueCB;
+std::unique_ptr m_xColRowHighCB;
 std::unique_ptr m_xAnchorCB;
 std::unique_ptr m_xRangeFindCB;
 
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index a31bc5d417fc..4b8595899f04 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -19,6 +19,7 @@
 
 #undef SC_DLLIMPLEMENTATION
 
+#include 
 #include 
 #include 
 #include 
@@ -42,6 +43,7 @@ ScTpContentOptions::ScTpContentOptions(weld::Container* 
pPage, weld::DialogContr
 , m_xAnnotCB(m_xBuilder->weld_check_button("annot"))
 , m_xFormulaMarkCB(m_xBuilder->weld_check_button("formulamark"))
 , m_xValueCB(m_xBuilder->weld_check_button("value"))
+, m_xColRowHighCB(m_xBuilder->weld_check_button("colrowhigh"))
 , m_xAnchorCB(m_xBuilder->weld_check_button("anchor"))
 , m_xRangeFindCB(m_xBuilder->weld_check_button("rangefind"))
 , m_xObjGrfLB(m_xBuilder->weld_combo_box("objgrf"))
@@ -71,6 +73,7 @@ ScTpContentOptions::ScTpContentOptions(weld::Container* 
pPage, weld::DialogContr
 m_xAnnotCB->set_accessible_description(ScResId(STR_A11Y_DESC_ANNOT));
 m_xFormulaMarkCB->connect_toggled(aCBHdl);
 m_xValueCB->connect_toggled(aCBHdl);
+m_xColRowHighCB->connect_toggled(aCBHdl);
 m_xAnchorCB->connect_toggled(aCBHdl);
 
 m_xVScrollCB->connect_toggled(aCBHdl);
@@ -156,6 +159,13 @@ boolScTpContentOptions::FillItemSet( SfxItemSet* 
rCoreSet )
 rCoreSet->Put(SfxBoolItem(SID_SC_OPT_SYNCZOOM, 
m_xSyncZoomCB->get_active()));
 bRet = true;
 }
+if (m_xColRowHighCB->get_state_changed_from_saved())
+{
+auto pChange(comphelper::ConfigurationChanges::create());
+
officecfg::Office::Calc::Content::Display::ColumnRowHighlighting::set(m_xColRowHighCB->get_active(),
 pChange);
+pChange->commit();
+bRet = true;
+}
 
 return bRet;
 }
@@ -171,6 +181,7 @@ voidScTpContentOptions::Reset( const SfxItemSet* 
rCoreSet )
 m_xAnnotCB   ->set_active(m_xLocalOptions->GetOption(VOPT_NOTES));
 
m_xFormulaMarkCB->set_active(m_xLocalOptions->GetOption(VOPT_FORMULAS_MARKS));
 m_xValueCB   ->set_active(m_xLocalOptions->GetOption(VOPT_SYNTAX));
+
m_xColRowHighCB->set_active(officecfg::Office::Calc::Content::Display::ColumnRowHighlighting::get());
 m_xAnchorCB  ->set_active(m_xLocalOptions->GetOption(VOPT_ANCHOR));
 
 m_xObjGrfLB  ->set_active( 
static_cast(m_xLocalOptions->GetObjMode(VOBJ_TYPE_OLE)) );
@@ -206,6 +217,7 @@ voidScTpContentOptions::Reset( const SfxItemSet* 
rCoreSet )
 m_xAnnotCB->save_state();
 m_xFormulaMarkCB->save_state();
 m_xValueCB->save_state();
+m_xColRowHighCB->save_state();
 m_xAnchorCB->save_state();
 m_xObjGrfLB->save_value();
 m_xDiagramLB->save_value();
diff --git a/sc/uiconfig/scalc/ui/tpviewpage.ui 
b/sc/uiconfig/scalc/ui/tpviewpage.ui
index b96283d18b69..df87f8e27b3a 100644
--- a/sc/uiconfig/scalc/ui/tpviewpage.ui
+++ b/sc/uiconfig/scalc/ui/tpviewpage.ui
@@ -20,7 +20,7 @@
 0
 none
 
-  
+  
   
 True
 False
@@ -127,7 +127,7 @@
   
   
 0
-5
+6
   
 
 
@@ -146,7

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 204957 matches

Mail list logo