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

[Stephan Bergmann (via logerrit)]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 26b63f4f2f71a48dc0a9be3356da88f8b5f143dc
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:11 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 19:56:49 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: drawinglayer

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

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 084cc0bef17e..193f5cdad31a 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1083,7 +1083,7 @@ void VclMetafileProcessor2D::processControlPrimitive2D(
 uno::Reference xPropertyInfo(
 xModelProperties.is() ? xModelProperties->getPropertySetInfo()
   : 
uno::Reference());
-static constexpr OUStringLiteral 
sPrintablePropertyName(u"Printable");
+static constexpr OUString 
sPrintablePropertyName(u"Printable"_ustr);
 
 if (xPropertyInfo.is() && 
xPropertyInfo->hasPropertyByName(sPrintablePropertyName))
 {
@@ -1264,7 +1264,7 @@ void 
VclMetafileProcessor2D::processTextHierarchyFieldPrimitive2D(
 {
 // support for FIELD_SEQ_BEGIN, FIELD_SEQ_END and URL. It wraps text 
primitives (but is not limited to)
 // thus do the MetafileAction embedding stuff but just handle recursively.
-static constexpr OStringLiteral aCommentStringCommon("FIELD_SEQ_BEGIN");
+static constexpr OString aCommentStringCommon("FIELD_SEQ_BEGIN"_ostr);
 OUString aURL;
 
 switch (rFieldPrimitive.getType())
@@ -1358,7 +1358,7 @@ void 
VclMetafileProcessor2D::processTextHierarchyBulletPrimitive2D(
 void VclMetafileProcessor2D::processTextHierarchyParagraphPrimitive2D(
 const primitive2d::TextHierarchyParagraphPrimitive2D& rParagraphPrimitive)
 {
-static constexpr OStringLiteral aCommentString("XTEXT_EOP");
+static constexpr OString aCommentString("XTEXT_EOP"_ostr);
 static bool bSuppressPDFExtOutDevDataSupport(false); // 
loplugin:constvars:ignore
 
 if (nullptr == mpPDFExtOutDevData || bSuppressPDFExtOutDevDataSupport)

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

[Patrick Luby (via logerrit)]

 vcl/source/gdi/impgraph.cxx   |   11 +++
 vcl/source/gdi/pdfwriter_impl.cxx |   18 ++
 2 files changed, 21 insertions(+), 8 deletions(-)

New commits:
commit 5ea44cd9fd467f1ed26f69e194d0a59d9e0e71c2
Author: Patrick Luby 
AuthorDate: Wed Oct 11 19:53:18 2023 -0400
Commit: Patrick Luby 
CommitDate: Thu Oct 19 21:44:14 2023 +0200

tdf#157680 scale down size and adjust size and scale factor for /BBox

The size of an embedded PDF files is multiplied by
PDF_INSERT_MAGIC_SCALE_FACTOR for platforms like macOS so undo that
by adjusting the size and scale factor.

For some unknown reason, when exporting the following PDF, the
estimated size of embedded PDF charts are 20x larger than expected.
This only occurs on macOS so possibly there is some special conversion
from MapUnit::MapPoint to MapUnit::MapTwip elsewhere in the code:

  https://bugs.documentfoundation.org/attachment.cgi?id=190109

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

diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 35a2145aa8e4..c4a5a1ca11b5 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -788,6 +788,17 @@ Size ImpGraphic::getPrefSize() const
 // svg not yet buffered in maBitmapEx, return size 
derived from range
 const basegfx::B2DRange& rRange = 
maVectorGraphicData->getRange();
 
+#ifdef MACOSX
+// tdf#157680 scale down estimated size of embedded PDF
+// For some unknown reason, the embedded PDF sizes
+// are 20x larger than expected. This only occurs on
+// macOS so possibly there is some special conversion
+// from MapUnit::MapPoint to MapUnit::MapTwip elsewhere
+// in the code.
+if (maVectorGraphicData->getType() == 
VectorGraphicDataType::Pdf)
+   aSize = Size(basegfx::fround(rRange.getWidth() / 
20.0f), basegfx::fround(rRange.getHeight() / 20.0f));
+else
+#endif
 aSize = Size(basegfx::fround(rRange.getWidth()), 
basegfx::fround(rRange.getHeight()));
 }
 else
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 8176f3f86378..15eeb5c4a619 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -71,6 +71,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -9058,6 +9059,7 @@ void PDFWriterImpl::writeReferenceXObject(const 
ReferenceXObjectEmit& rEmit)
 // vcl::ImportPDF() uses getDefaultPdfResolutionDpi to set the desired
 // rendering DPI so we have to take into account that here too.
 static const double fResolutionDPI = 
vcl::pdf::getDefaultPdfResolutionDpi();
+static const double fMagicScaleFactor = PDF_INSERT_MAGIC_SCALE_FACTOR;
 
 sal_Int32 nOldDPIX = GetDPIX();
 sal_Int32 nOldDPIY = GetDPIY();
@@ -9072,15 +9074,13 @@ void PDFWriterImpl::writeReferenceXObject(const 
ReferenceXObjectEmit& rEmit)
 sal_Int32 nWrappedFormObject = 0;
 if (!m_aContext.UseReferenceXObject)
 {
-#ifdef MACOSX
 // tdf#156842 increase scale for external PDF data
-// For some unknown reason, the scale is 8 times larger than for
-// non-external PDF XObjects.
+// Multiply PDF_INSERT_MAGIC_SCALE_FACTOR for platforms like macOS
+// that scale all images by this number.
 // This fix also allows the CppunitTest_vcl_pdfexport to run
 // successfully on macOS.
-fScaleX = 8.0 / aSize.Width();
-fScaleY = 8.0 / aSize.Height();
-#endif
+fScaleX = fMagicScaleFactor / aSize.Width();
+fScaleY = fMagicScaleFactor / aSize.Height();
 
 // Parse the PDF data, we need that to write the PDF dictionary of our
 // object.
@@ -9322,9 +9322,11 @@ void PDFWriterImpl::writeReferenceXObject(const 
ReferenceXObjectEmit& rEmit)
 appendDouble(fScaleY, aLine);
 aLine.append(" 0 0 ]");
 aLine.append(" /BBox [ 0 0 ");
-aLine.append(aSize.Width());
+// tdf#157680 reduce size by magic scale factor in /BBox
+aLine.append(aSize.Width() / fMagicScaleFactor);
 aLine.append(" ");
-aLine.append(aSize.Height());
+// tdf#157680 reduce size by magic scale factor in /BBox
+aLine.append(aSize.Height() / fMagicScaleFactor);
 aLine.append(" ]\n");
 
 if (m_aContext.UseReferenceXObject && rEmit.m_nEmbeddedObject > 0)

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

[Stephan Bergmann (via logerrit)]

 hwpfilter/source/hwpreader.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f290768698b24e0d4e7cbf29d6255dc083f02001
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:17 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 23:20:14 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: hwpfilter

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

diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 8ff1ba1d7541..450e582ca504 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -45,7 +45,7 @@
 #include 
 
 // xmloff/xmlkyd.hxx
-constexpr OUStringLiteral sXML_CDATA = u"CDATA";
+constexpr OUString sXML_CDATA = u"CDATA"_ustr;
 
 namespace
 {
@@ -53,7 +53,7 @@ double WTI(double x) { return x / 1800.; } // unit => inch
 double WTMM(double x) { return x / 1800. * 25.4; } // unit => mm
 int WTSM(double x) { return x / 1800. * 2540; } // unit ==> 1/100 mm
 
-constexpr OUStringLiteral sBeginOfDoc(u"[\uBB38\uC11C\uC758 \uCC98\uC74C]");
+constexpr OUString sBeginOfDoc(u"[\uBB38\uC11C\uC758 \uCC98\uC74C]"_ustr);
 // U+BB38 HANGUL SYLLABLE MUN, U+C11C HANGUL SYLLABLE SEO,
 // U+C758 HANGUL SYLLABLE YI, U+CC98 HANGUL SYLLABLE CEO,
 // U+C74C HANGUL SYLLABLE EUM: "Begin of Document"
@@ -4719,8 +4719,8 @@ namespace
 {
 
 constexpr OUStringLiteral IMPLEMENTATION_NAME = 
u"com.sun.comp.hwpimport.HwpImportFilter";
-constexpr OUStringLiteral SERVICE_NAME1 = 
u"com.sun.star.document.ImportFilter";
-constexpr OUStringLiteral SERVICE_NAME2 = 
u"com.sun.star.document.ExtendedTypeDetection";
+constexpr OUString SERVICE_NAME1 = u"com.sun.star.document.ImportFilter"_ustr;
+constexpr OUString SERVICE_NAME2 = 
u"com.sun.star.document.ExtendedTypeDetection"_ustr;
 
 class HwpImportFilter : public WeakImplHelper< XFilter, XImporter, 
XServiceInfo, XExtendedFilterDetection >
 {

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

[Stephan Bergmann (via logerrit)]

 l10ntools/source/merge.cxx|2 +-
 l10ntools/source/xmlparse.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f6f00918854bae7f03e79192e5d79f78929cb418
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:19 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 23:20:34 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: l10ntools

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

diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 8327442b0af2..2ad9d8261fb8 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -150,7 +150,7 @@ MergeDataFile::MergeDataFile(
 OString sLang;
 //Get language id from path
 {
-static constexpr OStringLiteral 
sTransSource("translations/source/");
+static constexpr OString sTransSource("translations/source/"_ostr);
 const sal_Int32 nStart =
 sPoFileName.indexOf(sTransSource)+sTransSource.getLength();
 const sal_Int32 nCount =
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index b3fa97ae00d0..51186ac5c623 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -36,7 +36,7 @@
 
 using namespace osl;
 
-constexpr OStringLiteral XML_LANG = "xml-lang";
+constexpr OString XML_LANG = "xml-lang"_ostr;
 
 
 

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

[Stephan Bergmann (via logerrit)]

 embeddedobj/source/commonembedding/persistence.cxx |   12 ++--
 embeddedobj/source/general/intercept.cxx   |   12 ++--
 embeddedobj/source/msole/ownview.cxx   |2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 93c0780392758f783592f030aa2d4e824d57bb2f
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:13 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 20:32:23 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: embeddedobj

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

diff --git a/embeddedobj/source/commonembedding/persistence.cxx 
b/embeddedobj/source/commonembedding/persistence.cxx
index 4bb8d19123a3..6859de216c24 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -178,7 +178,7 @@ static void TransferMediaType( const uno::Reference< 
embed::XStorage >& i_rSourc
 {
 const uno::Reference< beans::XPropertySet > xSourceProps( i_rSource, 
uno::UNO_QUERY_THROW );
 const uno::Reference< beans::XPropertySet > xTargetProps( i_rTarget, 
uno::UNO_QUERY_THROW );
-static constexpr OUStringLiteral sMediaTypePropName( u"MediaType" );
+static constexpr OUString sMediaTypePropName( u"MediaType"_ustr );
 xTargetProps->setPropertyValue( sMediaTypePropName, 
xSourceProps->getPropertyValue( sMediaTypePropName ) );
 }
 catch( const uno::Exception& )
@@ -784,11 +784,11 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl(
 if ( aFilterName.isEmpty() )
 throw io::IOException(); // TODO:
 
-static constexpr OUStringLiteral sFilterName = u"FilterName";
-static constexpr OUStringLiteral sHierarchicalDocumentName = 
u"HierarchicalDocumentName";
-static constexpr OUStringLiteral sDocumentBaseURL = u"DocumentBaseURL";
-static constexpr OUStringLiteral sSourceShellID = u"SourceShellID";
-static constexpr OUStringLiteral sDestinationShellID = 
u"DestinationShellID";
+static constexpr OUString sFilterName = u"FilterName"_ustr;
+static constexpr OUString sHierarchicalDocumentName = 
u"HierarchicalDocumentName"_ustr;
+static constexpr OUString sDocumentBaseURL = u"DocumentBaseURL"_ustr;
+static constexpr OUString sSourceShellID = u"SourceShellID"_ustr;
+static constexpr OUString sDestinationShellID = 
u"DestinationShellID"_ustr;
 uno::Sequence aArgs{
 comphelper::makePropertyValue(sFilterName, aFilterName),
 comphelper::makePropertyValue(sHierarchicalDocumentName, 
aHierarchName),
diff --git a/embeddedobj/source/general/intercept.cxx 
b/embeddedobj/source/general/intercept.cxx
index 58a7ed49bcc0..db16a59b9d68 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -26,12 +26,12 @@
 
 using namespace ::com::sun::star;
 
-constexpr OUStringLiteral IU0 = u".uno:Save";
-constexpr OUStringLiteral IU1 = u".uno:SaveAll";
-constexpr OUStringLiteral IU2 = u".uno:CloseDoc";
-constexpr OUStringLiteral IU3 = u".uno:CloseWin";
-constexpr OUStringLiteral IU4 = u".uno:CloseFrame";
-constexpr OUStringLiteral IU5 = u".uno:SaveAs";
+constexpr OUString IU0 = u".uno:Save"_ustr;
+constexpr OUString IU1 = u".uno:SaveAll"_ustr;
+constexpr OUString IU2 = u".uno:CloseDoc"_ustr;
+constexpr OUString IU3 = u".uno:CloseWin"_ustr;
+constexpr OUString IU4 = u".uno:CloseFrame"_ustr;
+constexpr OUString IU5 = u".uno:SaveAs"_ustr;
 const uno::Sequence< OUString > Interceptor::m_aInterceptedURL{ IU0, IU1, IU2, 
IU3, IU4, IU5 };
 
 class StatusChangeListenerContainer
diff --git a/embeddedobj/source/msole/ownview.cxx 
b/embeddedobj/source/msole/ownview.cxx
index e4684d6d29bf..5576f8633cce 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -401,7 +401,7 @@ void OwnView_Impl::CreateNative()
 aArgs, m_xContext ),
 uno::UNO_QUERY_THROW );
 
-static constexpr OUStringLiteral aSubStreamName(u"\1Ole10Native");
+static constexpr OUString aSubStreamName(u"\1Ole10Native"_ustr);
 uno::Reference< embed::XClassifiedObject > xStor( xNameAccess, 
uno::UNO_QUERY_THROW );
 uno::Sequence< sal_Int8 > aStorClassID = xStor->getClassID();
 

[Libreoffice-commits] core.git: download.lst external/lxml

[Taichi Haradaguchi (via logerrit)]

 download.lst   
 |4 -
 
external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 
|   31 ++
 external/lxml/README   
 |6 -
 external/lxml/UnpackedTarball_lxml.mk  
 |5 -
 external/lxml/Wincompatible-function-pointer-types.patch   
 |   20 --
 external/lxml/replace-setuptools-with-distutils.patch.0
 |   11 +++
 6 files changed, 49 insertions(+), 28 deletions(-)

New commits:
commit a4b4a90557f9fc1839fc0eb297f4c6a4e94c761a
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Jul 2 14:54:23 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Fri Oct 20 02:23:12 2023 +0200

lxml: upgrade to release 4.9.2

* external/lxml/Wincompatible-function-pointer-types.patch: fixed upstream.
* backport 
external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
  from .

Changelog: https://lxml.de/4.9/changes-4.9.2.html

Change-Id: I8ea947b3b1fb30b9427d066bd41a5d4693ceedbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153863
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 0a113753fbf9..ad03e50a6ad4 100644
--- a/download.lst
+++ b/download.lst
@@ -431,8 +431,8 @@ LPSOLVE_TARBALL := 
26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LXML_SHA256SUM := 
940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e
-LXML_TARBALL := lxml-4.1.1.tgz
+LXML_SHA256SUM := 
2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67
+LXML_TARBALL := lxml-4.9.2.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git 
a/external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
 
b/external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
new file mode 100644
index ..ce1ec383cc63
--- /dev/null
+++ 
b/external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
@@ -0,0 +1,31 @@
+From 9686dd9c7670d18acff6360c8444520273d5f1b2 Mon Sep 17 00:00:00 2001
+From: Jakub Wilk 
+Date: Fri, 16 Jun 2023 09:24:21 +0200
+Subject: [PATCH] Make regexp string raw to correct its escape sequence usage
+ (GH-371)
+
+Fixes:
+
+$ python3 -Wd setup.py
+setup.py:117: DeprecationWarning: invalid escape sequence \.
+...
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 709cbc68..7a3f46e5 100644
+--- a/setup.py
 b/setup.py
+@@ -114,7 +114,7 @@ extra_options['packages'] = [
+ 
+ def setup_extra_options():
+ is_interesting_package = re.compile('^(libxml|libxslt|libexslt)$').match
+-is_interesting_header = re.compile('^(zconf|zlib|.*charset)\.h$').match
++is_interesting_header = re.compile(r'^(zconf|zlib|.*charset)\.h$').match
+ 
+ def extract_files(directories, pattern='*'):
+ def get_files(root, dir_path, files):
+-- 
+2.39.2
+
diff --git a/external/lxml/README b/external/lxml/README
index ad9f0952c6b3..be90f0a862ce 100644
--- a/external/lxml/README
+++ b/external/lxml/README
@@ -1,7 +1,7 @@
-LXML XML processing python Library from [http://lxml.de/].
+LXML XML processing python Library from [https://lxml.de/].
 
 This library is used for the .ui accessibility checker bin/gla11y
 
 The archive was downloaded from:
-[http://lxml.de/files/lxml-4.1.1.tgz]
-on 2018-02-22.
+[https://lxml.de/files/lxml-4.9.2.tgz]
+on 2023-07-17.
diff --git a/external/lxml/UnpackedTarball_lxml.mk 
b/external/lxml/UnpackedTarball_lxml.mk
index 3f4180404870..8d032e70dd90 100644
--- a/external/lxml/UnpackedTarball_lxml.mk
+++ b/external/lxml/UnpackedTarball_lxml.mk
@@ -11,10 +11,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,lxml))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,lxml,$(LXML_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,lxml,0))
-
 $(eval $(call gb_UnpackedTarball_add_patches,lxml, \
-external/lxml/Wincompatible-function-pointer-types.patch \
+   
external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 
\
+   external/lxml/replace-setuptools-with-distutils.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/lxml/Wincompatible-function-pointer-types.patch 
b/external/lxml/Wincompatible-function-pointer-types.patch
deleted file mode 100644
index bb9c7a02918b..
--- a/external/lxml/Wincompatible-function-pointer-types.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 src/lxml/etree.c
-+++ src/lxml/etree.c
-@@ -6810,7 +6810,7 @@
- static void __pyx_f_4lxml_5etree__xpath_function_call(xmlXPathParserContext 
*, int); /*proto*/
- 

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

[Stephan Bergmann (via logerrit)]

 forms/source/component/Columns.cxx|4 ++--
 forms/source/component/DatabaseForm.cxx   |2 +-
 forms/source/component/FormattedField.cxx |4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6581f028f85d72f3b85c873eaecd77a37c98ac31
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:15 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 20:21:47 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: forms

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

diff --git a/forms/source/component/Columns.cxx 
b/forms/source/component/Columns.cxx
index 4aab958f934e..56be293fc549 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -83,8 +83,8 @@ const css::uno::Sequence& getColumnTypes()
 
 sal_Int32 getColumnTypeByModelName(const OUString& aModelName)
 {
-static constexpr OUStringLiteral aModelPrefix 
(u"com.sun.star.form.component.");
-static constexpr OUStringLiteral aCompatibleModelPrefix 
(u"stardiv.one.form.component.");
+static constexpr OUString aModelPrefix 
(u"com.sun.star.form.component."_ustr);
+static constexpr OUString aCompatibleModelPrefix 
(u"stardiv.one.form.component."_ustr);
 
 sal_Int32 nTypeId = -1;
 if (aModelName == FRM_COMPONENT_EDIT)
diff --git a/forms/source/component/DatabaseForm.cxx 
b/forms/source/component/DatabaseForm.cxx
index fccd2367ea17..0d6aafaaa5cf 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1953,7 +1953,7 @@ void ODatabaseForm::reset_impl(bool _bApproveByListeners)
 if ( xColProps.is() )
 xPSI = xColProps->getPropertySetInfo( );
 
-static constexpr OUStringLiteral PROPERTY_CONTROLDEFAULT = 
u"ControlDefault";
+static constexpr OUString PROPERTY_CONTROLDEFAULT = 
u"ControlDefault"_ustr;
 if ( xPSI.is() && xPSI->hasPropertyByName( 
PROPERTY_CONTROLDEFAULT ) )
 {
 Any aDefault = xColProps->getPropertyValue( 
PROPERTY_CONTROLDEFAULT );
diff --git a/forms/source/component/FormattedField.cxx 
b/forms/source/component/FormattedField.cxx
index dbabcaf9bcdd..119fcc35f6a1 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -656,7 +656,7 @@ void OFormattedModel::write(const 
Reference& _rxOutStream)
 Reference  xFormats = xSupplier->getNumberFormats();
 OUString sFormatDescription;
 LanguageTypeeFormatLanguage = LANGUAGE_DONTKNOW;
-static constexpr OUStringLiteral s_aLocaleProp = u"Locale";
+static constexpr OUString s_aLocaleProp = u"Locale"_ustr;
 Reference  xFormat = 
xFormats->getByKey(nKey);
 if (hasProperty(s_aLocaleProp, xFormat))
 {
@@ -667,7 +667,7 @@ void OFormattedModel::write(const 
Reference& _rxOutStream)
 eFormatLanguage = LanguageTag::convertToLanguageType( 
*pLocale, false);
 }
 }
-static constexpr OUStringLiteral s_aFormatStringProp = u"FormatString";
+static constexpr OUString s_aFormatStringProp = u"FormatString"_ustr;
 if (hasProperty(s_aFormatStringProp, xFormat))
 xFormat->getPropertyValue(s_aFormatStringProp) >>= 
sFormatDescription;
 _rxOutStream->writeUTF(sFormatDescription);

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

[Stephan Bergmann (via logerrit)]

 editeng/source/editeng/impedit3.cxx |2 +-
 editeng/source/items/numitem.cxx|4 ++--
 editeng/source/misc/svxacorr.cxx|   10 +-
 editeng/source/misc/unolingu.cxx|2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 30c4d857612ec3ba6c252d6da70b0195e0e1d902
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:12 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 21:08:25 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: editeng

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

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 7ed7423bbded..7402487120e1 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -88,7 +88,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::linguistic2;
 
-constexpr OUStringLiteral CH_HYPH = u"-";
+constexpr OUString CH_HYPH = u"-"_ustr;
 
 constexpr tools::Long WRONG_SHOW_MIN = 5;
 
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 97f857547029..983eff2779e2 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -140,8 +140,8 @@ OUString SvxNumberType::GetNumStr( sal_Int32 nNo, const 
css::lang::Locale& rLoca
 else
 {
 SvxNumType nActType = !bIsLegal || 
isArabicNumberingType(nNumType) ? nNumType : SVX_NUM_ARABIC;
-static constexpr OUStringLiteral sNumberingType = 
u"NumberingType";
-static constexpr OUStringLiteral sValue = u"Value";
+static constexpr OUString sNumberingType = 
u"NumberingType"_ustr;
+static constexpr OUString sValue = u"Value"_ustr;
 Sequence< PropertyValue > aProperties
 {
 comphelper::makePropertyValue(sNumberingType, 
static_cast(nActType)),
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 7959b9c2ba83..094ee2130f67 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -97,9 +97,9 @@ namespace o3tl {
 }
 const sal_Unicode cNonBreakingSpace = 0xA0; // UNICODE code for no break space
 
-constexpr OUStringLiteral pXMLImplWordStart_ExcptLstStr = 
u"WordExceptList.xml";
-constexpr OUStringLiteral pXMLImplCplStt_ExcptLstStr = 
u"SentenceExceptList.xml";
-constexpr OUStringLiteral pXMLImplAutocorr_ListStr = u"DocumentList.xml";
+constexpr OUString pXMLImplWordStart_ExcptLstStr = u"WordExceptList.xml"_ustr;
+constexpr OUString pXMLImplCplStt_ExcptLstStr = u"SentenceExceptList.xml"_ustr;
+constexpr OUString pXMLImplAutocorr_ListStr = u"DocumentList.xml"_ustr;
 
 // tdf#54409 check also typographical quotation marks in the case of skipped 
ASCII quotation marks
 // Curious, why these \u0083\u0084\u0089\u0091\u0092\u0093\u0094 are handled 
as "begin characters"?
@@ -304,8 +304,8 @@ ACFlags SvxAutoCorrect::GetDefaultFlags()
 
 constexpr sal_Unicode cEmDash = 0x2014;
 constexpr sal_Unicode cEnDash = 0x2013;
-constexpr OUStringLiteral sEmDash(u"\u2014");
-constexpr OUStringLiteral sEnDash(u"\u2013");
+constexpr OUString sEmDash(u"\u2014"_ustr);
+constexpr OUString sEnDash(u"\u2013"_ustr);
 constexpr sal_Unicode cApostrophe = 0x2019;
 constexpr sal_Unicode cLeftDoubleAngleQuote = 0xAB;
 constexpr sal_Unicode cRightDoubleAngleQuote = 0xBB;
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index b8b5676099f1..1e7b69a25f27 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -633,7 +633,7 @@ uno::Reference< XDictionary > LinguMgr::GetStandard()
 if (!xTmpDicList.is())
 return nullptr;
 
-static constexpr OUStringLiteral aDicName( u"standard.dic" );
+static constexpr OUString aDicName( u"standard.dic"_ustr );
 uno::Reference< XDictionary > xDic = xTmpDicList->getDictionaryByName( 
aDicName );
 if (!xDic.is())
 {

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

[Stephan Bergmann (via logerrit)]

 test/source/sheet/xsheetoutline.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c9a522a383bb5dea92f46b462302eb7ab521f34b
Author: Stephan Bergmann 
AuthorDate: Wed Oct 18 19:45:08 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 21:19:33 2023 +0200

Presumed loplugin:cppunitassertequals

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

diff --git a/test/source/sheet/xsheetoutline.cxx 
b/test/source/sheet/xsheetoutline.cxx
index d60820021b29..e5b99c86a369 100644
--- a/test/source/sheet/xsheetoutline.cxx
+++ b/test/source/sheet/xsheetoutline.cxx
@@ -102,14 +102,14 @@ void XSheetOutline::testShowDetail()
 aSheetOutline->showDetail(aLevelRangeAddress);
 
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Row level 2 still hidden",
-getVisibleAddress(aSheet, rowLevel2), OUString(rowLevel2));
+OUString(rowLevel2), getVisibleAddress(aSheet, rowLevel2));
 
 // Column Level 2
 aLevelRangeAddress = getAddressFromRangeString(aSheet, colLevel2);
 aSheetOutline->showDetail(aLevelRangeAddress);
 
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Column level 2 still hidden",
-getVisibleAddress(aSheet, colLevel2), OUString(colLevel2));
+OUString(colLevel2), getVisibleAddress(aSheet, colLevel2));
 
 }
 
@@ -254,8 +254,8 @@ void XSheetOutline::testClearOutline()
 aLevelRangeAddress = getAddressFromRangeString(aSheet, rowLevel1);
 aSheetOutline->hideDetail(aLevelRangeAddress);
 
-CPPUNIT_ASSERT_EQUAL_MESSAGE("testClearOutline Columns are hidden after 
clear", getVisibleAddress(aSheet, colLevel1), OUString(colLevel1));
-CPPUNIT_ASSERT_EQUAL_MESSAGE("testClearOutline Rows are hidden after 
clear", getVisibleAddress(aSheet, rowLevel1), OUString(rowLevel1));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("testClearOutline Columns are hidden after 
clear", OUString(colLevel1), getVisibleAddress(aSheet, colLevel1));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("testClearOutline Rows are hidden after 
clear", OUString(rowLevel1), getVisibleAddress(aSheet, rowLevel1));
 
 }
 

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

[Patrick Luby (via logerrit)]

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

New commits:
commit fb68f0761c3cfadf73f261d2d44de7b4e277e0af
Author: Patrick Luby 
AuthorDate: Thu Oct 19 16:32:33 2023 -0400
Commit: Patrick Luby 
CommitDate: Fri Oct 20 02:20:42 2023 +0200

tdf#157565 show tooltip if any parent window is the key window

Commit b69db38a38b09e158e8d46d8b717db85860ca874 caused tooltips
to fail to appear if their immediate parent window was not the
key window. So, look through the parent window's parent windows
and, if any of those windows are the kwy window, show the tooltip.

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

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 98c165d9659f..d20e6e3d8422 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -468,8 +468,29 @@ void AquaSalFrame::Show(bool bVisible, bool bNoActivate)
 // Also, don't display tooltips when mousing over non-key windows even if
 // the application is active as the tooltip window will pull the non-key
 // window in front of the key window.
-if (bVisible && (mnStyle & SalFrameStyleFlags::TOOLTIP) && (![NSApp 
isActive] || (mpParent && ![ mpParent->mpNSWindow isKeyWindow])))
-return;
+if (bVisible && (mnStyle & SalFrameStyleFlags::TOOLTIP))
+{
+if (![NSApp isActive])
+return;
+
+if (mpParent)
+{
+// tdf#157565 show tooltip if any parent window is the key window
+bool bKeyWindowFound = false;
+NSWindow *pParent = mpParent->mpNSWindow;
+while (pParent)
+{
+if ([pParent isKeyWindow])
+{
+bKeyWindowFound = true;
+break;
+}
+pParent = [pParent parentWindow];
+}
+if (!bKeyWindowFound)
+return;
+}
+}
 
 mbShown = bVisible;
 if(bVisible)

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

[Stephan Bergmann (via logerrit)]

 filter/source/msfilter/escherex.cxx  |6 -
 filter/source/msfilter/msdffimp.cxx  |   14 +--
 filter/source/msfilter/msocximex.cxx |2 
 filter/source/msfilter/msvbahelper.cxx   |4 -
 filter/source/pdf/pdfexport.cxx  |4 -
 filter/source/svg/svgexport.cxx  |   28 +++
 filter/source/svg/svgwriter.cxx  |   82 +++
 filter/source/textfilterdetect/filterdetect.cxx  |   16 ++--
 filter/source/xsltdialog/typedetectionexport.cxx |   28 +++
 filter/source/xsltdialog/xmlfilterjar.cxx|2 
 10 files changed, 93 insertions(+), 93 deletions(-)

New commits:
commit 24655ccaeb7d36cf024b31ad5925244ac7016351
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:14 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 20:53:37 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: filter

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

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 112d468e90db..caf07865941e 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -598,7 +598,7 @@ void EscherPropertyContainer::CreateFillProperties(
 uno::Any aAny;
 AddOpt( ESCHER_Prop_WrapText, ESCHER_WrapNone );
 AddOpt( ESCHER_Prop_AnchorText, ESCHER_AnchorMiddle );
-static constexpr OUStringLiteral aPropName( u"FillStyle" );
+static constexpr OUString aPropName( u"FillStyle"_ustr );
 
 if ( EscherPropertyValueHelper::GetPropertyValue(
 aAny, rXPropSet, aPropName ) )
@@ -2598,10 +2598,10 @@ void 
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
 
 static constexpr OUStringLiteral sViewBox( u"ViewBox"  );
 static constexpr OUStringLiteral sTextRotateAngle( u"TextRotateAngle"  
);
-static constexpr OUStringLiteral sExtrusion  ( u"Extrusion"  );
+static constexpr OUString sExtrusion  ( u"Extrusion"_ustr  );
 static constexpr OUStringLiteral sEquations  ( u"Equations"  );
 static constexpr OUStringLiteral sPath   ( u"Path"  );
-static constexpr OUStringLiteral sTextPath   ( u"TextPath"  );
+static constexpr OUString sTextPath   ( u"TextPath"_ustr  );
 static constexpr OUStringLiteral sHandles( u"Handles"  );
 static constexpr OUStringLiteral sAdjustmentValues   ( u"AdjustmentValues" 
 );
 
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 058b61e1253d..6f2f29665ee0 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -171,7 +171,7 @@ using namespace container   ;
 
 // static counter for OLE-Objects
 static sal_uInt32 nMSOleObjCntr = 0;
-constexpr OUStringLiteral MSO_OLE_Obj = u"MSO_OLE_Obj";
+constexpr OUString MSO_OLE_Obj = u"MSO_OLE_Obj"_ustr;
 
 namespace {
 /* Office File Formats - 2.2.23  */
@@ -615,7 +615,7 @@ void SvxMSDffManager::SolveSolver( const 
SvxMSDffSolverContainer& rSolver )
 {
 const SfxPoolItem& aCustomShape =  
static_cast(pO)->GetMergedItem( 
SDRATTR_CUSTOMSHAPE_GEOMETRY );
 SdrCustomShapeGeometryItem aGeometryItem( 
static_cast(aCustomShape) );
-static constexpr OUStringLiteral sPath( 
u"Path" );
+static constexpr OUString sPath( u"Path"_ustr 
);
 sal_Int16 nGluePointType = 
EnhancedCustomShapeGluePointType::SEGMENTS;
 css::uno::Any* pAny = 
aGeometryItem.GetPropertyValueByName( sPath, "GluePointType" );
 if ( pAny )
@@ -737,7 +737,7 @@ void SvxMSDffManager::SolveSolver( const 
SvxMSDffSolverContainer& rSolver )
 sal_Int32 nX = 0, nY = 0;
 if ( ( rPara.First.Value >>= nX ) 
&& ( rPara.Second.Value >>= nY ) )
 {
-static constexpr 
OUStringLiteral sGluePoints( u"GluePoints" );
+static constexpr OUString 
sGluePoints( u"GluePoints"_ustr );
 css::uno::Sequence< 
css::drawing::EnhancedCustomShapeParameterPair > aGluePoints;
 pAny = 
aGeometryItem.GetPropertyValueByName( sPath, sGluePoints );
 if ( pAny )
@@ -2833,7 +2833,7 @@ void DffPropertyReader::CheckAndCorrectExcelTextRotation( 
SvStream& rIn, SfxItem
 
 const css::uno::Any* pAny;
 

Re: LLVM exit code 139 building git master on Xubuntu 22.04

[David Gerard]

On Thu, 19 Oct 2023 at 07:26, Stephan Bergmann  wrote:
> On 10/18/23 23:08, David Gerard wrote:

> > I just tried again from a completely fresh git clone, and it's still
> > happening. Any ideas? Is there anything in the new C++20 conf that's
> > too new for llvm 14.0.0 Ubuntu version?

> Smells like a bug in that particular version of Clang.  I'd follow the
> printed instructions to report it, either directly upstream at LLVM or
> (presumably better) at Ubuntu first.


So rather than file a bug and wait, I first tried a newer version of
clang, and clang-15 worked. Hooray!

Here's what I did:

# Become root

sudo -s

# install clang-15

apt remove llvm-14 clang-14 libclang-cpp14 libclang1-14
apt autoremove
apt install clang-15 llvm-15 libclang-cpp15 libclang1-15

# put its binaries in the path - no, there doesn't seem to be a more elegant way

cd /usr/lib/llvm-15/bin
for f in *; do rm -f /usr/bin/$f; ln -s ../lib/llvm-15/bin/$f /usr/bin/$f; done

and then get out of root and ./autogen.sh


- d.

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

[Mike Kaganski (via logerrit)]

 sw/qa/extras/tiledrendering/tiledrendering.cxx |   10 +-
 sw/source/core/doc/DocumentRedlineManager.cxx  |   23 +++
 2 files changed, 24 insertions(+), 9 deletions(-)

New commits:
commit 34ac12dca3f5af50fddfb7c77e2943897980b815
Author: Mike Kaganski 
AuthorDate: Thu Oct 19 20:32:56 2023 +0300
Commit: Mike Kaganski 
CommitDate: Fri Oct 20 00:55:03 2023 +0200

Do not forget to notify in cases when modified redline's start/end don't 
move

SwRangeRedline::SetStart/SetEnd call MaybeNotifyRedlineModification,
which means that e.g. continuing typing at the end of the current
redline would continue sending notifications. But as soon as cursor
is moved (e.g. using arrow left, inside the current redline), the
next modification is completely inside the current one, and would
be simply deleted. In this case (and other similar), notifications
weren't sent.

This change tries to make sure that every such case is handled. In
case of delete-inside-insert, when positions are equal, the current
redline is deleted; MaybeNotifyRedlineModification is not called,
to not crash. I don't know if this needs additional notification.

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

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 13a882b7f82f..d66a2bc98c2d 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1652,9 +1652,9 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, 
testRedlineUpdateCallback)
 m_nRedlineTableEntryModified = 0;
 pWrtShell->DelLeft();
 
-// Assert that we get exactly one notification about the redline update.
+// Assert that we get exactly two notification about the redline update.
 // This was 0, as LOK_CALLBACK_REDLINE_TABLE_ENTRY_MODIFIED wasn't sent.
-CPPUNIT_ASSERT_EQUAL(1, m_nRedlineTableEntryModified);
+CPPUNIT_ASSERT_EQUAL(2, m_nRedlineTableEntryModified);
 
 // Turn off the change tracking mode, make some modification to left of the
 // redline so that its position changes
@@ -1663,18 +1663,18 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, 
testRedlineUpdateCallback)
 pWrtShell->Insert("This text is left of the redline");
 
 // Position of the redline has changed => Modify callback
-CPPUNIT_ASSERT_EQUAL(2, m_nRedlineTableEntryModified);
+CPPUNIT_ASSERT_EQUAL(3, m_nRedlineTableEntryModified);
 
 pWrtShell->DelLeft();
 // Deletion also emits Modify callback
-CPPUNIT_ASSERT_EQUAL(3, m_nRedlineTableEntryModified);
+CPPUNIT_ASSERT_EQUAL(4, m_nRedlineTableEntryModified);
 
 // Make changes to the right of the redline => no position change in 
redline
 pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/false, 100/*Go 
enough right */, /*bBasicCall=*/false);
 pWrtShell->Insert("This text is right of the redline");
 
 // No Modify callbacks
-CPPUNIT_ASSERT_EQUAL(3, m_nRedlineTableEntryModified);
+CPPUNIT_ASSERT_EQUAL(4, m_nRedlineTableEntryModified);
 }
 
 CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testGetViewRenderState)
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index f5ab5a9fdba3..7a9af1ee8891 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1427,6 +1427,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 !pRedl->IsMoved() )
 {
 bool bDelete = false;
+bool bMaybeNotify = false;
 
 // Merge if applicable?
 if( (( SwComparePosition::Behind == eCmpPos &&
@@ -1477,22 +1478,22 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 *pStt = *pREnd;
 if( ( *pStt == *pEnd ) &&
 ( pNewRedl->GetContentIdx() == nullptr ) )
-bDelete = true;
+bDelete = bMaybeNotify = true;
 }
 else if( SwComparePosition::OverlapBefore == eCmpPos )
 {
 *pEnd = *pRStt;
 if( ( *pStt == *pEnd ) &&
 ( pNewRedl->GetContentIdx() == nullptr ) )
-bDelete = true;
+bDelete = bMaybeNotify = true;
 }
 else if( SwComparePosition::Inside == eCmpPos )
 {
-bDelete = true;
+bDelete = bMaybeNotify = true;
 bMerged = true;
 }
  

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

[Noel Grandin (via logerrit)]

 sd/source/core/drawdoc2.cxx |6 ++
 sd/source/core/drawdoc3.cxx |   18 +-
 sd/source/core/drawdoc4.cxx |   12 
 sd/source/core/sdpage.cxx   |   11 +--
 sd/source/core/sdpage2.cxx  |   13 -
 sd/source/filter/html/htmlex.cxx|   19 ---
 sd/source/filter/xml/sdtransform.cxx|9 ++---
 sd/source/ui/app/sdxfer.cxx |5 +
 sd/source/ui/dlg/animobjs.cxx   |3 +--
 sd/source/ui/docshell/docshel3.cxx  |8 ++--
 sd/source/ui/tools/GraphicSizeCheck.cxx |   10 +++---
 sd/source/ui/uitest/uiobject.cxx|   18 +-
 sd/source/ui/unoidl/unopage.cxx |4 +---
 sd/source/ui/view/DocumentRenderer.cxx  |   16 
 sd/source/ui/view/drawview.cxx  |   16 
 sd/source/ui/view/drviews2.cxx  |   10 --
 sd/source/ui/view/outlview.cxx  |   12 
 slideshow/source/engine/box2dtools.cxx  |6 ++
 18 files changed, 69 insertions(+), 127 deletions(-)

New commits:
commit f3e010829ab9d6b0b0ef48b67661774dd19f6de0
Author: Noel Grandin 
AuthorDate: Wed Oct 18 13:59:22 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 19 08:09:38 2023 +0200

use more SdrObjList::begin/end in sd

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

diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index d591113fcca9..de82a8b95306 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -244,10 +244,8 @@ void SdDrawDocument::UpdatePageObjectsInNotes(sal_uInt16 
nStartPos)
 // number
 if (pPage && pPage->GetPageKind() == PageKind::Notes)
 {
-const size_t nObjCount = pPage->GetObjCount();
-for (size_t nObj = 0; nObj < nObjCount; ++nObj)
+for (const rtl::Reference& pObj : *pPage)
 {
-SdrObject* pObj = pPage->GetObj(nObj);
 if (pObj->GetObjIdentifier() == SdrObjKind::Page &&
 pObj->GetObjInventor() == SdrInventor::Default)
 {
@@ -257,7 +255,7 @@ void SdDrawDocument::UpdatePageObjectsInNotes(sal_uInt16 
nStartPos)
 SAL_WARN_IF(nPage <= 1, "sd", "Page object must not be a 
handout.");
 
 if (nStartPos > 0 && nPage > 1)
-
static_cast(pObj)->SetReferencedPage(GetPage(nPage - 1));
+
static_cast(pObj.get())->SetReferencedPage(GetPage(nPage - 1));
 }
 }
 }
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 357858f46222..b3c6e0595c8a 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -927,17 +927,17 @@ bool SdDrawDocument::InsertBookmarkAsPage(
 {
 for(sal_uInt32 p = nInsertPos; p < sal_uInt32(nInsertPos) + 
sal_uInt32(nBMSdPageCount); p++)
 {
-SdPage *pPg = static_cast( GetPage(p) );
-for(size_t i = 0; pPg && (i < pPg->GetObjCount()); ++i)
-{
-if(pPg->GetObj(i)->GetStyleSheet())
+if (SdPage *pPg = static_cast( GetPage(p) ))
+for (const rtl::Reference& pObj : *pPg)
 {
-OUString aStyleName = 
pPg->GetObj(i)->GetStyleSheet()->GetName();
-SfxStyleSheet *pSheet = 
lcl_findStyle(aNewGraphicStyles, Concat2View(aStyleName + aRenameStr));
-if(pSheet != nullptr)
-pPg->GetObj(i)->SetStyleSheet(pSheet, true);
+if(pObj->GetStyleSheet())
+{
+OUString aStyleName = 
pObj->GetStyleSheet()->GetName();
+SfxStyleSheet *pSheet = 
lcl_findStyle(aNewGraphicStyles, Concat2View(aStyleName + aRenameStr));
+if(pSheet != nullptr)
+pObj->SetStyleSheet(pSheet, true);
+}
 }
-}
 }
 }
 catch(...)
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 91c4dc600703..577859d957bc 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1067,10 +1067,8 @@ void SdDrawDocument::RenameLayoutTemplate(const 
OUString& rOldLayoutName, const
 {
 pPage->SetLayoutName(aPageLayoutName);
 
-for (size_t nObj = 0; nObj < pPage->GetObjCount(); ++nObj)
+for (const rtl::Reference& pObj : *pPage)
 {
-SdrObject* pObj = pPage->GetObj(nObj);
-
 if (pObj->GetObjInventor() == SdrInventor::Default)
 

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

[Skyler Grey (via logerrit)]

 sw/inc/reffld.hxx |   20 -
 sw/qa/core/fields/data/tdf86790.docx  |binary
 sw/qa/core/fields/fields.cxx  |  228 ++
 sw/qa/extras/uiwriter/uiwriter7.cxx   |   15 -
 sw/qa/extras/uiwriter/uiwriter8.cxx   |6 
 sw/source/core/fields/reffld.cxx  |   73 ++-
 sw/source/core/text/txtfld.cxx|7 
 sw/source/core/txtnode/atrfld.cxx |2 
 sw/source/core/unocore/unofield.cxx   |2 
 sw/source/filter/ww8/ww8par5.cxx  |8 
 sw/source/ui/fldui/fldref.cxx |6 
 sw/source/uibase/docvw/edtwin2.cxx|2 
 sw/source/uibase/fldui/fldmgr.cxx |   13 -
 sw/source/uibase/utlui/content.cxx|2 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 
 xmloff/source/text/txtfldi.cxx|4 
 16 files changed, 287 insertions(+), 103 deletions(-)

New commits:
commit 613249e2b208716aa71580ff0373bb201d9c2697
Author: Skyler Grey 
AuthorDate: Fri Oct 13 09:36:51 2023 +
Commit: Miklos Vajna 
CommitDate: Thu Oct 19 08:18:14 2023 +0200

Add tests for STYLEREF and fix STYLEREF bugs

- testTdf86790 tests that the "sample file with STYLEREF" document from
  tdf#86790 has the correct fields
- testStyleRefSearchUp tests that the STYLEREF searches up when there
  are bits of text both above and below it
- testStyleRefSearchDown tests that the STYLEREF searches down when
  there are bits of text below it only
- testMarginalStyleRef tests that the STYLEREF searches from the page
  top when it is placed in a footer
- testFootnotetyleRef tests that the STYLEREF searches from the
  reference mark when it is placed in a footnote

- As an artifact of changing the STYLEREF namespace from TEXT to LO_EXT
  partway through, some references to STYLEREF being in TEXT still
  remained. This caused STYLEREFs saved to ODF to vanish on import. This
  has been fixed

- Previously STYLEREF kept a pointer to the frame and text node
  containing it. Unfortunately, sometimes these could be destructed and
  the STYLEREF later asked to update which led to a crash due to
  use-after-free. STYLEREF no longer keeps a pointer to these values,
  instead preferring to not update when it is not given them

- As part of the review process for
  I25dd7a6940abee5651a784b9059fe23b32547d6c we added
  SearchForStyleAnchor, a function used only in reffld.cxx, to an
  anonymous namespace. Unfortunately we neglected to do the same for
  StyleRefElementType just above it. This has been fixed

Follow-Up-To: I25dd7a6940abee5651a784b9059fe23b32547d6c
Change-Id: I35dc36197b62fa53def4745da1d4755ece79ed22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157911
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index 28ced8dcc2cb..bf9d563ab2ac 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -99,22 +99,15 @@ private:
 /// reference to either a SwTextFootnote::m_nSeqNo or a 
SwSetExpField::mnSeqNo
 sal_uInt16 m_nSeqNo;
 
-SwTextNode* m_pTextNode; ///< a pointer to the text node which contains 
the field
-SwFrame* m_pFrame; ///< a pointer to the frame which contains the field
-/* m_pTextNode and m_pFrame are used for STYLEREF, for other subtypes 
these will often be nullptr */
-
 virtual OUStringExpandImpl(SwRootFrame const* pLayout) const override;
 virtual std::unique_ptr Copy() const override;
 
 public:
 SwGetRefField( SwGetRefFieldType*, OUString aSetRef, OUString 
aReferenceLanguage,
-sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_uLong nFormat,
-SwTextNode* pTextNode, SwFrame* pFrame );
+sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_uLong nFormat 
);
 
 virtual ~SwGetRefField() override;
 
-void ChangeExpansion(SwFrame* pFrame, const SwTextField* pField);
-
 virtual OUString GetFieldName() const override;
 
 const OUString& GetSetRefName() const { return m_sSetRefName; }
@@ -126,9 +119,9 @@ public:
and REF_STYLE.
Note: This instance may be NULL (field in Undo/Redo). This will cause
no update for these reference format types. */
-voidUpdateField( const SwTextField* pFieldTextAttr );
-voidUpdateField( const SwTextField* pFieldTextAttr, const 
SwRootFrame* const pLayout,
- OUString& rText );
+voidUpdateField( const SwTextField* pFieldTextAttr, 
SwFrame* pFrame );
+voidUpdateField( const SwTextField* pFieldTextAttr, 
SwFrame* pFrame,
+ const SwRootFrame* const pLayout, 
OUString& rText );
 
  

[Libreoffice-commits] core.git: sc/UITest_calc_tests7.mk sc/UITest_calc_tests8.mk sc/UITest_calc_tests9.mk sc/UITest_search_replace.mk sd/UITest_impress_tests.mk sw/UITest_sw_findReplace.mk sw/UITest_

[Miklos Vajna (via logerrit)]

 sc/UITest_calc_tests7.mk|2 ++
 sc/UITest_calc_tests8.mk|2 ++
 sc/UITest_calc_tests9.mk|2 ++
 sc/UITest_search_replace.mk |3 +++
 sd/UITest_impress_tests.mk  |2 ++
 sw/UITest_sw_findReplace.mk |4 
 sw/UITest_sw_sidebar.mk |4 
 sw/UITest_sw_table.mk   |4 
 sw/UITest_writer_macro_tests.mk |4 
 sw/UITest_writer_tests.mk   |4 
 sw/UITest_writer_tests5.mk  |4 
 11 files changed, 35 insertions(+)

New commits:
commit 322044e128d86b1fd4a09c42f4950bf0f1cf4535
Author: Miklos Vajna 
AuthorDate: Wed Oct 18 20:06:36 2023 +0200
Commit: Miklos Vajna 
CommitDate: Thu Oct 19 08:21:51 2023 +0200

uitest oneprocess mode: explicitly avoid this in the remaining tests

These 11 suites depended on the UITest default to not use oneprocess
mode. Explicitly avoid that mode in these suites, because they currently
fail that way. This allows changing the default in the future, so new
suites automatically benefit from the oneprocess mode (it runs faster,
somewhat similar to cppunit).

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

diff --git a/sc/UITest_calc_tests7.mk b/sc/UITest_calc_tests7.mk
index b2e19b118ac0..8a6259c10550 100644
--- a/sc/UITest_calc_tests7.mk
+++ b/sc/UITest_calc_tests7.mk
@@ -17,4 +17,6 @@ $(eval $(call gb_UITest_set_defs,calc_tests7, \
 TDOC="$(SRCDIR)/sc/qa/uitest/data" \
 ))
 
+$(eval $(call gb_UITest_avoid_oneprocess,calc_tests7))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sc/UITest_calc_tests8.mk b/sc/UITest_calc_tests8.mk
index 255dc2ec49d0..64167e45d0e7 100644
--- a/sc/UITest_calc_tests8.mk
+++ b/sc/UITest_calc_tests8.mk
@@ -17,4 +17,6 @@ $(eval $(call gb_UITest_set_defs,calc_tests8, \
 TDOC="$(SRCDIR)/sc/qa/uitest/data" \
 ))
 
+$(eval $(call gb_UITest_avoid_oneprocess,calc_tests8))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sc/UITest_calc_tests9.mk b/sc/UITest_calc_tests9.mk
index bba170fdf80f..b84b25deb0de 100644
--- a/sc/UITest_calc_tests9.mk
+++ b/sc/UITest_calc_tests9.mk
@@ -17,4 +17,6 @@ $(eval $(call gb_UITest_set_defs,calc_tests9, \
 TDOC="$(SRCDIR)/sc/qa/uitest/data" \
 ))
 
+$(eval $(call gb_UITest_avoid_oneprocess,calc_tests9))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sc/UITest_search_replace.mk b/sc/UITest_search_replace.mk
index 1400c8f27260..e737800cb4e8 100644
--- a/sc/UITest_search_replace.mk
+++ b/sc/UITest_search_replace.mk
@@ -16,4 +16,7 @@ $(eval $(call 
gb_UITest_add_modules,search_replace,$(SRCDIR)/sc/qa/uitest,\
 $(eval $(call gb_UITest_set_defs,search_replace, \
 TDOC="$(SRCDIR)/sc/qa/uitest/data/search_replace" \
 ))
+
+$(eval $(call gb_UITest_avoid_oneprocess,search_replace))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sd/UITest_impress_tests.mk b/sd/UITest_impress_tests.mk
index e1f6c47ff2c7..f2c074fe5246 100644
--- a/sd/UITest_impress_tests.mk
+++ b/sd/UITest_impress_tests.mk
@@ -15,4 +15,6 @@ $(eval $(call gb_UITest_set_defs,impress_tests, \
 TDOC="$(SRCDIR)/sd/qa/uitest/data" \
 ))
 
+$(eval $(call gb_UITest_avoid_oneprocess,impress_tests))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sw/UITest_sw_findReplace.mk b/sw/UITest_sw_findReplace.mk
index cfcf6e8218b5..72caa3cd9ed5 100644
--- a/sw/UITest_sw_findReplace.mk
+++ b/sw/UITest_sw_findReplace.mk
@@ -14,3 +14,7 @@ $(eval $(call 
gb_UITest_add_modules,sw_findReplace,$(SRCDIR)/sw/qa/uitest,\
 $(eval $(call gb_UITest_set_defs,sw_findReplace, \
 TDOC="$(SRCDIR)/sw/qa/uitest/data" \
 ))
+
+$(eval $(call gb_UITest_avoid_oneprocess,sw_findReplace))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/UITest_sw_sidebar.mk b/sw/UITest_sw_sidebar.mk
index 8a087e14fa43..3d73a4cf20ec 100644
--- a/sw/UITest_sw_sidebar.mk
+++ b/sw/UITest_sw_sidebar.mk
@@ -14,3 +14,7 @@ $(eval $(call 
gb_UITest_add_modules,sw_sidebar,$(SRCDIR)/sw/qa/uitest,\
 $(eval $(call gb_UITest_set_defs,sw_sidebar, \
 TDOC="$(SRCDIR)/sw/qa/uitest/data" \
 ))
+
+$(eval $(call gb_UITest_avoid_oneprocess,sw_findReplace))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/UITest_sw_table.mk b/sw/UITest_sw_table.mk
index ce4434ebfb0a..11d7f79a2983 100644
--- a/sw/UITest_sw_table.mk
+++ b/sw/UITest_sw_table.mk
@@ -14,3 +14,7 @@ $(eval $(call 
gb_UITest_add_modules,sw_table,$(SRCDIR)/sw/qa/uitest,\
 $(eval $(call gb_UITest_set_defs,sw_table, \
 TDOC="$(SRCDIR)/sw/qa/uitest/data" \
 ))
+
+$(eval $(call gb_UITest_avoid_oneprocess,sw_table))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/UITest_writer_macro_tests.mk b/sw/UITest_writer_macro_tests.mk
index 4fddf1627338..01f58cd10f58 100644
--- a/sw/UITest_writer_macro_tests.mk
+++ b/sw/UITest_writer_macro_tests.mk
@@ -14,3 +14,7 @@ $(eval $(call 
gb_UITest_add_modules,writer_macro_tests,$(SRCDIR)/sw/qa/uitest,\
 $(eval $(call gb_UITest_set_defs,writer_macro_tests, \
 TDOC="$(SRCDIR)/sw/qa/uitest/data" \
 ))
+

Re: LLVM exit code 139 building git master on Xubuntu 22.04

[Stephan Bergmann]

On 10/18/23 23:08, David Gerard wrote:

I just tried again from a completely fresh git clone, and it's still
happening. Any ideas? Is there anything in the new C++20 conf that's
too new for llvm 14.0.0 Ubuntu version?


Smells like a bug in that particular version of Clang.  I'd follow the 
printed instructions to report it, either directly upstream at LLVM or 
(presumably better) at Ubuntu first.

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

[Stephan Bergmann (via logerrit)]

 sd/source/ui/sidebar/LayoutMenu.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 37298c29e775c0715c779e7d2be3902290556d17
Author: Stephan Bergmann 
AuthorDate: Wed Oct 18 20:52:41 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 08:47:14 2023 +0200

Use std::u16string_view instead of OUStringLiteral

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

diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx 
b/sd/source/ui/sidebar/LayoutMenu.cxx
index fd6bc32c58bf..bf3ff1257e99 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -82,7 +82,7 @@ struct snew_slide_value_info
 
 }
 
-constexpr OUStringLiteral EMPTY = u"";
+constexpr std::u16string_view EMPTY = u"";
 
 constexpr snew_slide_value_info notes[] =
 {

[Libreoffice-commits] core.git: 2 commits - basctl/source chart2/source filter/source sc/source

[Noel Grandin (via logerrit)]

 basctl/source/accessibility/accessibledialogwindow.cxx   |9 -
 basctl/source/dlged/dlged.cxx|   11 --
 basctl/source/dlged/dlgedobj.cxx |5 
 chart2/source/view/main/DrawModelWrapper.cxx |   14 --
 filter/source/msfilter/msdffimp.cxx  |5 
 sc/source/core/data/drwlayer.cxx |   32 ++
 sc/source/filter/xml/xmlimprt.cxx|   10 -
 sc/source/ui/Accessibility/AccessibleDocument.cxx|   10 -
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx |   57 +--
 sc/source/ui/drawfunc/drawsh.cxx |5 
 sc/source/ui/unoobj/viewuno.cxx  |9 -
 sc/source/ui/view/drawview.cxx   |   12 --
 12 files changed, 73 insertions(+), 106 deletions(-)

New commits:
commit 358b480be5e3146ee8edead9aed5998f011925e2
Author: Noel Grandin 
AuthorDate: Wed Oct 18 14:42:24 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 19 09:06:06 2023 +0200

use more SdrObjList::begin/end in various

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

diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx 
b/basctl/source/accessibility/accessibledialogwindow.cxx
index 9b17f3cf4caa..d5c702616d9f 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -85,11 +85,10 @@ AccessibleDialogWindow::AccessibleDialogWindow 
(basctl::DialogWindow* pDialogWin
 return;
 
 SdrPage& rPage = m_pDialogWindow->GetPage();
-const size_t nCount = rPage.GetObjCount();
 
-for ( size_t i = 0; i < nCount; ++i )
+for (const rtl::Reference& pObj : rPage)
 {
-if (DlgEdObj* pDlgEdObj = dynamic_cast(rPage.GetObj(i)))
+if (DlgEdObj* pDlgEdObj = dynamic_cast(pObj.get()))
 {
 ChildDescriptor aDesc( pDlgEdObj );
 if ( IsChildVisible( aDesc ) )
@@ -267,8 +266,8 @@ void AccessibleDialogWindow::UpdateChildren()
 if ( m_pDialogWindow )
 {
 SdrPage& rPage = m_pDialogWindow->GetPage();
-for ( size_t i = 0, nCount = rPage.GetObjCount(); i < nCount; ++i )
-if (DlgEdObj* pDlgEdObj = dynamic_cast(rPage.GetObj(i)))
+for (const rtl::Reference& pObj : rPage)
+if (DlgEdObj* pDlgEdObj = dynamic_cast(pObj.get()))
 UpdateChild( ChildDescriptor( pDlgEdObj ) );
 }
 }
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 1917e3ff4a56..873fb3792dd7 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -516,16 +516,13 @@ void DlgEditor::Paint(vcl::RenderContext& rRenderContext, 
const tools::Rectangle
 pDlgEdForm->StartListening();
 
 // set position and size of controls
-if (const size_t nObjCount = pDlgEdPage->GetObjCount())
+for (const rtl::Reference& pObj : *pDlgEdPage)
 {
-for (size_t i = 0 ; i < nObjCount ; ++i)
+if (DlgEdObj* pDlgEdObj = 
dynamic_cast(pObj.get()))
 {
-if (DlgEdObj* pDlgEdObj = 
dynamic_cast(pDlgEdPage->GetObj(i)))
+if (!dynamic_cast(pDlgEdObj))
 {
-if (!dynamic_cast(pDlgEdObj))
-{
-pDlgEdObj->SetRectFromProps();
-}
+pDlgEdObj->SetRectFromProps();
 }
 }
 }
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 1f4421d5ca43..a3c2b396f791 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -1406,10 +1406,9 @@ void DlgEdForm::UpdateStep()
 
 if ( pSdrPage )
 {
-const size_t nObjCount = pSdrPage->GetObjCount();
-for ( size_t i = 0 ; i < nObjCount ; i++ )
+for (const rtl::Reference& pObj : *pSdrPage)
 {
-DlgEdObj* pDlgEdObj = dynamic_cast(pSdrPage->GetObj(i));
+DlgEdObj* pDlgEdObj = dynamic_cast(pObj.get());
 if (pDlgEdObj && !dynamic_cast(pDlgEdObj))
 pDlgEdObj->UpdateStep();
 }
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx 
b/chart2/source/view/main/DrawModelWrapper.cxx
index 9b4a8b28a1ef..5593c9b59943 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -293,17 +293,13 @@ SdrObject* DrawModelWrapper::getNamedSdrObject( const 
OUString& rObjectCID, SdrO
 {
 if(!pSearchList || rObjectCID.isEmpty())
 return nullptr;
-

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

[Stephan Bergmann (via logerrit)]

 basic/source/classes/sb.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 7a349aa4f338982f99675ad4eed9d7474cab1ff0
Author: Stephan Bergmann 
AuthorDate: Wed Oct 18 15:24:13 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 09:09:33 2023 +0200

Suppress some upcoming loplugin:ostr OUStringLiteral -> OUString rewrites

...which would not work, as calling constexpr SbxVariable::MakeHashCode on 
those
vars would no longer be constant expressions

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

diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 9d3a7706189c..94b1becd04a5 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1942,9 +1942,13 @@ void StarBASIC::DetachAllDocBasicItems()
 // #118116 Implementation Collection object
 
 
+// [-loplugin:ostr]
 constexpr OUStringLiteral pCountStr = u"Count";
+// [-loplugin:ostr]
 constexpr OUStringLiteral pAddStr = u"Add";
+// [-loplugin:ostr]
 constexpr OUStringLiteral pItemStr = u"Item";
+// [-loplugin:ostr]
 constexpr OUStringLiteral pRemoveStr = u"Remove";
 constexpr sal_uInt16 nCountHash = SbxVariable::MakeHashCode(pCountStr);
 constexpr sal_uInt16 nAddHash = SbxVariable::MakeHashCode(pAddStr);

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

[Miklos Vajna (via logerrit)]

 sw/CppunitTest_sw_core_layout.mk |1 
 sw/qa/core/layout/data/floattable-nomargins.docx |binary
 sw/qa/core/layout/flycnt.cxx |1 
 sw/qa/core/layout/frmtool.cxx|   40 +++
 4 files changed, 41 insertions(+), 1 deletion(-)

New commits:
commit 6195ba32f864cb9256b57c8bcbad2976798e125e
Author: Miklos Vajna 
AuthorDate: Tue Oct 17 08:28:10 2023 +0200
Commit: Caolán McNamara 
CommitDate: Thu Oct 19 09:33:55 2023 +0200

n#775899 sw: add testcase for the FloattableNomargins compat flag

This was added in commit 50a1df360c907d8419ce49f098b6bc87a37a9956
(n#775899 sw: add FloattableNomargins compat flag, 2012-08-23), without
a testcase, so it was hard to make later changes without breaking the
old behavior.

Later commit 0898871b7b9492ada947ebc7b8429c5cb56db23c (n#775899
testcase, 2012-08-27) did add a testcase for the bug, it was a different
sub-task there, so the test document had no margins, while this compat
flag is about some special handling around non-zero paragraph margins
and floating tables.

So add a new test that fails without the
DocumentSettingId::FLOATTABLE_NOMARGINS block in
SwBorderAttrs::CalcLeft() to make sure that this keeps working after I
fix tdf#157573, which is a related problem.

(cherry picked from commit 40b8b9ee5fb6de66ee455f8ffd64750e59f0587a)

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

diff --git a/sw/CppunitTest_sw_core_layout.mk b/sw/CppunitTest_sw_core_layout.mk
index 8cc670abf64d..a499f537acc2 100644
--- a/sw/CppunitTest_sw_core_layout.mk
+++ b/sw/CppunitTest_sw_core_layout.mk
@@ -15,6 +15,7 @@ $(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sw_core_layout))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_core_layout, \
 sw/qa/core/layout/flycnt \
+sw/qa/core/layout/frmtool \
 sw/qa/core/layout/ftnfrm \
 sw/qa/core/layout/layact \
 sw/qa/core/layout/layout \
diff --git a/sw/qa/core/layout/data/floattable-nomargins.docx 
b/sw/qa/core/layout/data/floattable-nomargins.docx
new file mode 100644
index ..642010e0f356
Binary files /dev/null and b/sw/qa/core/layout/data/floattable-nomargins.docx 
differ
diff --git a/sw/qa/core/layout/flycnt.cxx b/sw/qa/core/layout/flycnt.cxx
index 279ec5ba3e78..557d94eee63c 100644
--- a/sw/qa/core/layout/flycnt.cxx
+++ b/sw/qa/core/layout/flycnt.cxx
@@ -1199,7 +1199,6 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitFlyWrapOnAllPages)
 
 // Then make sure that the anchor text is also split between page 1 and 
page 2:
 SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
-pLayout->dumpAsXml();
 auto pPage1 = pLayout->Lower()->DynCastPageFrame();
 CPPUNIT_ASSERT(pPage1);
 auto pPage1Anchor = pPage1->FindLastBodyContent()->DynCastTextFrame();
diff --git a/sw/qa/core/layout/frmtool.cxx b/sw/qa/core/layout/frmtool.cxx
new file mode 100644
index ..2ee4c3a07d8c
--- /dev/null
+++ b/sw/qa/core/layout/frmtool.cxx
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+
+namespace
+{
+/// Covers sw/source/core/layout/frmtool.cxx fixes.
+class Test : public SwModelTestBase
+{
+public:
+Test()
+: SwModelTestBase("/sw/qa/core/layout/data/")
+{
+}
+};
+
+CPPUNIT_TEST_FIXTURE(Test, testFloattableNoMargins)
+{
+createSwDoc("floattable-nomargins.docx");
+
+SwDoc* pDoc = getSwDoc();
+SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+auto pPage1 = pLayout->Lower()->DynCastPageFrame();
+CPPUNIT_ASSERT(pPage1);
+CPPUNIT_ASSERT(!pPage1->GetNext());
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/SpellDialog.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 25a251d3c0c3dcf41874dfb2a13f24c423e1e388
Author: Caolán McNamara 
AuthorDate: Wed Oct 18 16:47:20 2023 +0100
Commit: Xisco Fauli 
CommitDate: Thu Oct 19 09:34:55 2023 +0200

crashreporting: svx::SentenceEditWindow_Impl::CreateSpellPortions()

cui/source/dialogs/SpellDialog.cxx:2005
aRet[ aRet.size() - 1 ].sText += aLeftOverText;

presumably aRet is empty() here

a) don't bother appending if aLeftOverText is empty()
b) don't crah if aRet is empty() and aLeftOverText is not

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

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 692c8e4512d1..1da34447f779 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -2000,7 +2000,7 @@ svx::SpellPortions 
SentenceEditWindow_Impl::CreateSpellPortions() const
 aPortion2.sText = aLeftOverText.makeStringAndClear();
 aRet.push_back( aPortion2 );
 }
-else
+else if (!aLeftOverText.isEmpty() && !aRet.empty())
 {   // we just need to append the left-over text to the last 
portion (which had no errors)
 aRet[ aRet.size() - 1 ].sText += aLeftOverText;
 }

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

[Michael Weghorn (via logerrit)]

 winaccessibility/source/UAccCOM/AccTextBase.cxx |   90 
 1 file changed, 3 insertions(+), 87 deletions(-)

New commits:
commit 2bf88c172c9c9d159344b95fb96073f4891a6c30
Author: Michael Weghorn 
AuthorDate: Wed Oct 18 13:44:42 2023 +0200
Commit: Michael Weghorn 
CommitDate: Thu Oct 19 10:11:23 2023 +0200

tdf#157696 wina11y: Switch from custom to IA2 text attributes

So far, reporting text attributes on the a11y layer on
Windows did not follow any standard/specification, but
LibreOffice's custom attribute values were mostly reported
as is (i.e. using the LibreOffice-internal attribute names
and values), and assistive tooling had to interpret those in order
to support reporting them to the user in a useful way.

For example, NVDA has custom code in the LibreOffice-specific
app module to do so. [1]

Stop using our custom attributes and switch to the
use of attributes according to the IAccessible2 text
attributes specification [2] instead, which is the applicable
specification for `IAccessibleText::get_attributes` that
is implemented here.

This implies that by reporting more IAccessible2 text attributes,
those should "automatically" work if assistive tooling handles
those, as is e.g. the case for NVDA and the the "invalid:spelling;"
attribute for spelling errors, for which bridging to IA2 has
been iplemented in

Change-Id I54e5bcbb4bef4c73068243f91a3ee69c10326460
tdf#157696 a11y: Report spelling error via IA2 "invalid:spelling" attr

(See also the other tdf#135922 commits preparing for this
change.)

A change in NVDA is still needed in addition to switch from only
handling the custom values for LO to use the existing code
path for handling IA2 text attrs instead.
Pending pull request that implents this: [3]

[1] 
https://github.com/nvaccess/nvda/blob/9878248c217156de4defe244d2df797d6b3bd0ca/source/appModules/soffice.py#L35-L137
[2] 
https://wiki.linuxfoundation.org/accessibility/iaccessible2/textattributes
[3] https://github.com/nvaccess/nvda/pull/15649

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

diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx 
b/winaccessibility/source/UAccCOM/AccTextBase.cxx
index 37eb1d6fcf70..858504395a6f 100644
--- a/winaccessibility/source/UAccCOM/AccTextBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx
@@ -26,6 +26,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -140,97 +141,12 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccTextBase::get_attributes(long offset, long
 if (offset < 0 || offset > pRXText->getCharacterCount() )
 return E_FAIL;
 
-OUStringBuffer strAttrs("Version:1;");
 
-Sequence  pValues = 
pRXText->getCharacterAttributes(offset, Sequence());
-int nCount = pValues.getLength();
-
-sal_Int16 numberingLevel = 0;
-OUString numberingPrefix;
-Any anyNumRule;
-bool bHaveNumberingPrefixAttr = false;
-bool bHaveNumberingLevel = false;
-bool bHaveNumberingRules = false;
-for(int i =0; i>= numberingLevel;
-else
-numberingLevel = -1;
-bHaveNumberingLevel = true;
-continue;
-}
-if(pValue.Name == "NumberingPrefix")
-{
-pValue.Value >>=numberingPrefix;
-bHaveNumberingPrefixAttr = true;
-continue;
-}
-if(pValue.Name == "NumberingRules")
-{
-bHaveNumberingRules = true;
-anyNumRule = pValue.Value;
-continue;
-}
-if (bHaveNumberingLevel && bHaveNumberingRules && 
bHaveNumberingPrefixAttr)
-{
-strAttrs.append(';');
-numberingPrefix = numberingPrefix.replaceAll(u"\\", u"")
-  .replaceAll(u";", u"\\;")
-  .replaceAll(u"=", u"\\=")
-  .replaceAll(u",", u"\\,")
-  .replaceAll(u":", u"\\:");
-
-
strAttrs.append(CMAccessible::get_String4Numbering(anyNumRule,numberingLevel,numberingPrefix));
-bHaveNumberingLevel = false;
-bHaveNumberingRules = false;
-}
-if( (bHaveNumberingPrefixAttr && i > 1 ) ||
-(!bHaveNumberingPrefixAttr && i > 0 ) ) //element 0 is 
NumberingPrefix, not write alone
-{
-strAttrs.append(';');
-}
-strAttrs.append(pValue.Name + ":");
-
-if (pValue.Name == "CharBackColor" ||
-pValue.Name == "CharColor" ||
-pValue.Name == "CharUnderlineColor" )
-{
-unsigned long nColor;
-pValue.Value >>= nColor;
-strAttrs.append('#');
-OUString 

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 6 commits - configure.ac cui/source sc/inc sc/source sc/uiconfig stoc/Library_javavm.mk stoc/source vcl/skia

[Andras Timar (via logerrit)]

 configure.ac|2 
 cui/source/dialogs/SpellDialog.cxx  |2 
 sc/inc/arraysumfunctor.hxx  |   17 ---
 sc/inc/kahan.hxx|   66 
 sc/source/core/tool/arraysum.hxx|   36 ---
 sc/source/core/tool/arraysumSSE2.cxx|6 --
 sc/uiconfig/scalc/ui/notebookbar_compact.ui |2 
 stoc/Library_javavm.mk  |6 ++
 stoc/source/javavm/javavm.cxx   |   15 ++
 vcl/skia/osx/gdiimpl.cxx|5 ++
 10 files changed, 79 insertions(+), 78 deletions(-)

New commits:
commit a2baff69d478479498e92ef33b9dd98700229aa5
Author: Andras Timar 
AuthorDate: Thu Oct 19 11:27:31 2023 +0200
Commit: Andras Timar 
CommitDate: Thu Oct 19 11:27:31 2023 +0200

Bump version to 23.05.5.2

Change-Id: I9c00f8a6d07d036d634261bef8ef66e385fc4945

diff --git a/configure.ac b/configure.ac
index 58b0d7f12e10..6de649762bd5 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.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[23.05.5.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
commit 4beab2956d339fb5caac1684135c3cab25d2363e
Author: Caolán McNamara 
AuthorDate: Wed Oct 18 16:47:20 2023 +0100
Commit: Andras Timar 
CommitDate: Thu Oct 19 11:27:02 2023 +0200

crashreporting: svx::SentenceEditWindow_Impl::CreateSpellPortions()

cui/source/dialogs/SpellDialog.cxx:2005
aRet[ aRet.size() - 1 ].sText += aLeftOverText;

presumably aRet is empty() here

a) don't bother appending if aLeftOverText is empty()
b) don't crah if aRet is empty() and aLeftOverText is not

Change-Id: Ie9a9585f572d8afb17183b479fb6f2cce5952aa7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158047
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 3c0db58e51a24bf08ca443af62489e761063f456)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158152

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index cf7d03972bee..0975f5ebf245 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -2001,7 +2001,7 @@ svx::SpellPortions 
SentenceEditWindow_Impl::CreateSpellPortions() const
 aPortion2.sText = aLeftOverText.makeStringAndClear();
 aRet.push_back( aPortion2 );
 }
-else
+else if (!aLeftOverText.isEmpty() && !aRet.empty())
 {   // we just need to append the left-over text to the last 
portion (which had no errors)
 aRet[ aRet.size() - 1 ].sText += aLeftOverText;
 }
commit f8e36903fe78a41f5cee952e9fd573a75eccf25f
Author: Patrick Luby 
AuthorDate: Sat Oct 14 21:13:26 2023 -0400
Commit: Andras Timar 
CommitDate: Thu Oct 19 11:27:02 2023 +0200

tdf#101376 don't detach thread if it is the main thread on macOS

On macOS, many AWT classes do their work on the main thread
deep in native methods in the java.awt.* classes. The problem
is that Oracle's and OpenJDK's JVMs don't bracket their
"perform on main thread" native calls with "attach/detach
current thread" calls to the JVM.

Change-Id: I0859dc9e20f34bd0b43bb321898507764fd530fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157985
Tested-by: Jenkins
Reviewed-by: Patrick Luby 
(cherry picked from commit a0eee8e56b91324470bb0e15c6b8009cfc411335)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157962

diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk
index e096565769f9..adcb49691ce1 100644
--- a/stoc/Library_javavm.mk
+++ b/stoc/Library_javavm.mk
@@ -31,4 +31,10 @@ $(eval $(call gb_Library_add_exception_objects,javavm,\
 stoc/source/javavm/jvmargs \
 ))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_use_system_darwin_frameworks,javavm,\
+CoreFoundation \
+))
+endif
+
 # vim:set noet sw=4 ts=4:
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 12bcc2c904b7..dc22107fbf84 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -79,6 +79,12 @@
 #define TIMEZONE "MET"
 #endif
 
+#ifdef MACOSX
+#include 
+#include 
+#include 
+#endif
+
 /* Within this implementation of the com.sun.star.java.JavaVirtualMachine
  * service and com.sun.star.java.theJavaVirtualMachine singleton, the method
  * com.sun.star.java.XJavaVM.getJavaVM relies on the following:
@@ -456,6 

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

[Andras Timar (via logerrit)]

Tag 'cp-23.05.5-2' created by Andras Timar  at 
2023-10-19 09:28 +

cp-23.05.5-2

Changes since cp-23.05.4-2-9:
---
 0 files changed
---

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

[Andras Timar (via logerrit)]

Tag 'cp-23.05.5-2' created by Andras Timar  at 
2023-10-19 09:28 +

cp-23.05.5-2

Changes since co-23.05-branch-point:
Andras Timar (1):
  On Linux dictionaries are packaged separately

---
 Module_dictionaries.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---

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

[Andras Timar (via logerrit)]

Tag 'cp-23.05.5-2' created by Andras Timar  at 
2023-10-19 09:28 +

cp-23.05.5-2

Changes since cp-23.05.4-2-6:
---
 0 files changed
---

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

[Andras Timar (via logerrit)]

Tag 'cp-23.05.5-2' created by Andras Timar  at 
2023-10-19 09:28 +

cp-23.05.5-2

Changes since cp-23.05.5-1-27:
---
 0 files changed
---

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

[Stephan Bergmann (via logerrit)]

 filter/source/t602/t602filter.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit d1d5900ca4d15caf3def78e3af8bb0d3fda98cf7
Author: Stephan Bergmann 
AuthorDate: Wed Oct 18 20:13:18 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 10:00:20 2023 +0200

Use OUString instead of OUStringLiteral

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

diff --git a/filter/source/t602/t602filter.cxx 
b/filter/source/t602/t602filter.cxx
index ae1b53f2ad95..d97bc3d5e5de 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -872,7 +872,7 @@ bool T602ImportFilterDialog::OptionsDlg()
 any <<= _val;\
 _prop->setPropertyValue(_nam, any);
 #define propString_(_prop,_nam,_val) \
-any <<= OUString(_val);\
+any <<= _val;\
 _prop->setPropertyValue(_nam, any);
 #define propStringFromResId_(_prop,_nam,_val) \
 any <<= FilterResId(_val);\
@@ -898,13 +898,13 @@ bool T602ImportFilterDialog::OptionsDlg()
 propInt_(xPSetDialog,"Height",90);
 propStringFromResId_(xPSetDialog,"Title", 
T602FILTER_STR_IMPORT_DIALOG_TITLE);
 
-static constexpr OUStringLiteral T602DLG_OK_BUTTON = u"ok_button";
-static constexpr OUStringLiteral T602DLG_CANCEL_BUTTON = u"cancel_button";
-static constexpr OUStringLiteral T602DLG_CODE_LB = u"code_lb";
-static constexpr OUStringLiteral T602DLG_AZBUKA_CB = u"azbuka_cb";
-static constexpr OUStringLiteral T602DLG_COMMENT_CB = u"comment_cb";
-static constexpr OUStringLiteral T602DLG_REFORMAT_CB = u"reformat_cb";
-static constexpr OUStringLiteral T602DLG_CODE_TXT = u"code_txt";
+static constexpr OUString T602DLG_OK_BUTTON = u"ok_button"_ustr;
+static constexpr OUString T602DLG_CANCEL_BUTTON = u"cancel_button"_ustr;
+static constexpr OUString T602DLG_CODE_LB = u"code_lb"_ustr;
+static constexpr OUString T602DLG_AZBUKA_CB = u"azbuka_cb"_ustr;
+static constexpr OUString T602DLG_COMMENT_CB = u"comment_cb"_ustr;
+static constexpr OUString T602DLG_REFORMAT_CB = u"reformat_cb"_ustr;
+static constexpr OUString T602DLG_CODE_TXT = u"code_txt"_ustr;
 
 Reference < XInterface > TextModel = 
Inst_("com.sun.star.awt.UnoControlFixedTextModel");
 Reference < XPropertySet > xPSetText( TextModel, UNO_QUERY );

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - external/libffi

[Stephan Bergmann (via logerrit)]

 external/libffi/UnpackedTarball_libffi.mk   |6 ++
 external/libffi/implicit-function-declaration.patch |   11 +++
 2 files changed, 17 insertions(+)

New commits:
commit 5b59e0be11edc3dceedfab5522081882dc3289dc
Author: Stephan Bergmann 
AuthorDate: Sun Oct 15 21:29:15 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 10:30:44 2023 +0200

-Wimplicit-function-declaration

Change-Id: Id78f5378566b35da6212bd2ff71d988956e682f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157994
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit fab52afe822d08fdb9aa06668e02967bc85ae2c1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158151

diff --git a/external/libffi/UnpackedTarball_libffi.mk 
b/external/libffi/UnpackedTarball_libffi.mk
index 5d0582329ac5..26436b33012e 100644
--- a/external/libffi/UnpackedTarball_libffi.mk
+++ b/external/libffi/UnpackedTarball_libffi.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libffi))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libffi,$(LIBFFI_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libffi,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libffi, \
+external/libffi/implicit-function-declaration.patch \
+)) \
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libffi/implicit-function-declaration.patch 
b/external/libffi/implicit-function-declaration.patch
new file mode 100644
index ..294a5eff64a3
--- /dev/null
+++ b/external/libffi/implicit-function-declaration.patch
@@ -0,0 +1,11 @@
+--- src/tramp.c
 src/tramp.c
+@@ -55,6 +55,8 @@
+ #include 
+ #endif
+ #endif
++
++int open_temp_exec_file (void);
+ 
+ /*
+  * Each architecture defines static code for a trampoline code table. The

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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 6359969e230af2569bb68e75ecfd85d43f95e20b
Author: Stephan Bergmann 
AuthorDate: Wed Oct 18 21:25:13 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 09:33:37 2023 +0200

Presumed loplugin:cppunitassertequals

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

diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 6875d63073d7..b64c67402c8d 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -762,7 +762,7 @@ void SwDocTest::testSwScanner()
 aPaM.GetPoint()->nContent.Assign(aPaM.GetPointContentNode(), 5);   
//set end of selection to fifth char of current node
 m_pDoc->getIDocumentContentOperations().DeleteAndJoin(aPaM);
//redline-aware deletion api
 //"real underlying text should be the same"
-CPPUNIT_ASSERT_EQUAL(pTextNode->GetText(), OUString(aString));
+CPPUNIT_ASSERT_EQUAL(OUString(aString), pTextNode->GetText());
 
 aDocStat.Reset();
 pTextNode->SetWordCountDirty(true);

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/SpellDialog.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1c7e820d444a8721ce9ef785ec0a5f3977424722
Author: Caolán McNamara 
AuthorDate: Wed Oct 18 16:47:20 2023 +0100
Commit: Xisco Fauli 
CommitDate: Thu Oct 19 10:27:00 2023 +0200

crashreporting: svx::SentenceEditWindow_Impl::CreateSpellPortions()

cui/source/dialogs/SpellDialog.cxx:2005
aRet[ aRet.size() - 1 ].sText += aLeftOverText;

presumably aRet is empty() here

a) don't bother appending if aLeftOverText is empty()
b) don't crah if aRet is empty() and aLeftOverText is not

Change-Id: Ie9a9585f572d8afb17183b479fb6f2cce5952aa7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158047
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 3c0db58e51a24bf08ca443af62489e761063f456)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158152

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index b662da41a52c..2da88e9b98ca 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1992,7 +1992,7 @@ svx::SpellPortions 
SentenceEditWindow_Impl::CreateSpellPortions() const
 aPortion2.sText = aLeftOverText.makeStringAndClear();
 aRet.push_back( aPortion2 );
 }
-else
+else if (!aLeftOverText.isEmpty() && !aRet.empty())
 {   // we just need to append the left-over text to the last 
portion (which had no errors)
 aRet[ aRet.size() - 1 ].sText += aLeftOverText;
 }

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

[Mike Kaganski (via logerrit)]

 sd/source/ui/sidebar/LayoutMenu.cxx |   23 +++
 1 file changed, 7 insertions(+), 16 deletions(-)

New commits:
commit 29691361002154a34c3a617e75682af4cbc19048
Author: Mike Kaganski 
AuthorDate: Thu Oct 19 09:59:15 2023 +0300
Commit: Mike Kaganski 
CommitDate: Thu Oct 19 12:31:16 2023 +0200

Use std::span instead of sentinel elements

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

diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx 
b/sd/source/ui/sidebar/LayoutMenu.cxx
index bf3ff1257e99..9022609df7d7 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -82,13 +82,10 @@ struct snew_slide_value_info
 
 }
 
-constexpr std::u16string_view EMPTY = u"";
-
 constexpr snew_slide_value_info notes[] =
 {
 {BMP_SLIDEN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB,
  AUTOLAYOUT_NOTES},
-{EMPTY, {}, WritingMode_LR_TB, AUTOLAYOUT_NONE},
 };
 
 constexpr snew_slide_value_info handout[] =
@@ -105,7 +102,6 @@ constexpr snew_slide_value_info handout[] =
  AUTOLAYOUT_HANDOUT6},
 {BMP_SLIDEH_09, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB,
  AUTOLAYOUT_HANDOUT9},
-{EMPTY, {}, WritingMode_LR_TB, AUTOLAYOUT_NONE},
 };
 
 constexpr snew_slide_value_info standard[] =
@@ -128,7 +124,6 @@ constexpr snew_slide_value_info standard[] =
 {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, 
AUTOLAYOUT_VTITLE_VCONTENT},
 {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, 
AUTOLAYOUT_TITLE_VCONTENT},
 {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART,   
WritingMode_TB_RL, AUTOLAYOUT_TITLE_2VTEXT},
-{EMPTY, {}, WritingMode_LR_TB, AUTOLAYOUT_NONE}
 };
 
 class LayoutValueSet : public ValueSet
@@ -518,7 +513,7 @@ void LayoutMenu::Fill()
 catch (RuntimeException&)
 {}
 
-const snew_slide_value_info* pInfo = nullptr;
+std::span pInfo;
 if (sCenterPaneViewName == framework::FrameworkHelper::msNotesViewURL)
 {
 pInfo = notes;
@@ -532,27 +527,23 @@ void LayoutMenu::Fill()
 {
 pInfo = standard;
 }
-else
-{
-pInfo = nullptr;
-}
 
 Clear();
-for (sal_uInt16 i=1; pInfo!=nullptr && pInfo->mpStrResId; i++, pInfo++)
+for (size_t i = 0; i < pInfo.size(); i++)
 {
-if ((WritingMode_TB_RL != pInfo->meWritingMode) || bVertical)
+if ((WritingMode_TB_RL != pInfo[i].meWritingMode) || bVertical)
 {
-Image aImg(OUString::Concat("private:graphicrepository/") + 
pInfo->msBmpResId);
+Image aImg(OUString::Concat("private:graphicrepository/") + 
pInfo[i].msBmpResId);
 
-if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode))
+if (bRightToLeft && (WritingMode_TB_RL != pInfo[i].meWritingMode))
 { // FIXME: avoid interpolating RTL layouts.
 BitmapEx aRTL = aImg.GetBitmapEx();
 aRTL.Mirror(BmpMirrorFlags::Horizontal);
 aImg = Image(aRTL);
 }
 
-mxLayoutValueSet->InsertItem(i, aImg, SdResId(pInfo->mpStrResId));
-mxLayoutValueSet->SetItemData (i, new 
AutoLayout(pInfo->maAutoLayout));
+mxLayoutValueSet->InsertItem(i + 1, aImg, 
SdResId(pInfo[i].mpStrResId));
+mxLayoutValueSet->SetItemData(i + 1, new 
AutoLayout(pInfo[i].maAutoLayout));
 }
 }
 }

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

[Stephan Bergmann (via logerrit)]

 UnoControls/source/controls/progressmonitor.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ce3569746922ec0888e436683846631e69bfb19e
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:01 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 13:00:38 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: UnoControls

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

diff --git a/UnoControls/source/controls/progressmonitor.cxx 
b/UnoControls/source/controls/progressmonitor.cxx
index a22bbd620060..7df767760323 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -39,9 +39,9 @@ using namespace ::com::sun::star::awt;
 
 using ::std::vector;
 
-constexpr OUStringLiteral FIXEDTEXT_SERVICENAME = 
u"com.sun.star.awt.UnoControlFixedText";
-constexpr OUStringLiteral FIXEDTEXT_MODELNAME = 
u"com.sun.star.awt.UnoControlFixedTextModel";
-constexpr OUStringLiteral CONTROLNAME_TEXT = u"Text";   // identifier the 
control in container
+constexpr OUString FIXEDTEXT_SERVICENAME = 
u"com.sun.star.awt.UnoControlFixedText"_ustr;
+constexpr OUString FIXEDTEXT_MODELNAME = 
u"com.sun.star.awt.UnoControlFixedTextModel"_ustr;
+constexpr OUString CONTROLNAME_TEXT = u"Text"_ustr;   // identifier the 
control in container
 constexpr OUStringLiteral CONTROLNAME_PROGRESSBAR = u"ProgressBar";
 constexpr OUStringLiteral BUTTON_SERVICENAME = 
u"com.sun.star.awt.UnoControlButton";
 constexpr OUStringLiteral CONTROLNAME_BUTTON = u"Button";

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

[Stephan Bergmann (via logerrit)]

 avmedia/source/framework/mediaitem.cxx   |2 +-
 avmedia/source/gstreamer/gstframegrabber.cxx |2 +-
 avmedia/source/gstreamer/gstplayer.cxx   |2 +-
 avmedia/source/gstreamer/gstwindow.cxx   |2 +-
 avmedia/source/gtk/gtkplayer.cxx |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c12df614adde52cc558cf3503469efffea02dd5c
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:02 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 13:07:58 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: avmedia

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

diff --git a/avmedia/source/framework/mediaitem.cxx 
b/avmedia/source/framework/mediaitem.cxx
index 4699a0454359..320a24bc9bfe 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -469,7 +469,7 @@ bool EmbedMedia(uno::Reference const& xModel,
 uno::Reference const xStorage(
 xSBD->getDocumentStorage(), uno::UNO_SET_THROW);
 
-static constexpr OUStringLiteral media(u"Media");
+static constexpr OUString media(u"Media"_ustr);
 uno::Reference const xSubStorage(
 xStorage->openStorageElement(media, embed::ElementModes::WRITE));
 
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx 
b/avmedia/source/gstreamer/gstframegrabber.cxx
index 6f41511dc128..4c4b17326860 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -32,7 +32,7 @@
 #include 
 
 constexpr OUStringLiteral AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME = 
u"com.sun.star.comp.avmedia.FrameGrabber_GStreamer";
-constexpr OUStringLiteral AVMEDIA_GST_FRAMEGRABBER_SERVICENAME = 
u"com.sun.star.media.FrameGrabber_GStreamer";
+constexpr OUString AVMEDIA_GST_FRAMEGRABBER_SERVICENAME = 
u"com.sun.star.media.FrameGrabber_GStreamer"_ustr;
 
 using namespace ::com::sun::star;
 
diff --git a/avmedia/source/gstreamer/gstplayer.cxx 
b/avmedia/source/gstreamer/gstplayer.cxx
index 259185c197ec..fd1407b3ca4f 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -51,7 +51,7 @@
 #include 
 
 constexpr OUStringLiteral AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME = 
u"com.sun.star.comp.avmedia.Player_GStreamer";
-constexpr OUStringLiteral AVMEDIA_GST_PLAYER_SERVICENAME= 
u"com.sun.star.media.Player_GStreamer";
+constexpr OUString AVMEDIA_GST_PLAYER_SERVICENAME= 
u"com.sun.star.media.Player_GStreamer"_ustr;
 #define AVVERSION "gst 1.0: "
 
 using namespace ::com::sun::star;
diff --git a/avmedia/source/gstreamer/gstwindow.cxx 
b/avmedia/source/gstreamer/gstwindow.cxx
index 5862443da6aa..5f1a9e4acf13 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -24,7 +24,7 @@
 #include "gstwindow.hxx"
 
 constexpr OUStringLiteral AVMEDIA_GST_WINDOW_IMPLEMENTATIONNAME = 
u"com.sun.star.comp.avmedia.Window_GStreamer";
-constexpr OUStringLiteral AVMEDIA_GST_WINDOW_SERVICENAME = 
u"com.sun.star.media.Window_GStreamer";
+constexpr OUString AVMEDIA_GST_WINDOW_SERVICENAME = 
u"com.sun.star.media.Window_GStreamer"_ustr;
 
 using namespace ::com::sun::star;
 
diff --git a/avmedia/source/gtk/gtkplayer.cxx b/avmedia/source/gtk/gtkplayer.cxx
index 47a57e3a4cd2..4dca3e202a24 100644
--- a/avmedia/source/gtk/gtkplayer.cxx
+++ b/avmedia/source/gtk/gtkplayer.cxx
@@ -29,7 +29,7 @@
 
 constexpr OUStringLiteral AVMEDIA_GTK_PLAYER_IMPLEMENTATIONNAME
 = u"com.sun.star.comp.avmedia.Player_Gtk";
-constexpr OUStringLiteral AVMEDIA_GTK_PLAYER_SERVICENAME = 
u"com.sun.star.media.Player_Gtk";
+constexpr OUString AVMEDIA_GTK_PLAYER_SERVICENAME = 
u"com.sun.star.media.Player_Gtk"_ustr;
 
 using namespace ::com::sun::star;
 

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

[Noel Grandin (via logerrit)]

 svx/source/sdr/contact/viewcontactofsdrpathobj.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit f5c4635c8bbd27b06a81bfa8d75f986994065310
Author: Noel Grandin 
AuthorDate: Thu Oct 19 11:50:57 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 19 15:20:57 2023 +0200

tdf#155410 small optimisation

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

diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx 
b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 42b699374e1c..d95d5fbeb75e 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -90,15 +90,13 @@ namespace sdr::contact
 if(bIsLine)
 {
 // special handling for single line mode (2 points)
-const basegfx::B2DPolygon 
aSubPolygon(aUnitPolyPolygon.getB2DPolygon(0));
-const basegfx::B2DPoint aStart(aSubPolygon.getB2DPoint(0));
-const basegfx::B2DPoint aEnd(aSubPolygon.getB2DPoint(1));
+const basegfx::B2DPolygon & 
rSubPolygon(aUnitPolyPolygon.getB2DPolygon(0));
+const basegfx::B2DPoint aStart(rSubPolygon.getB2DPoint(0));
+const basegfx::B2DPoint aEnd(rSubPolygon.getB2DPoint(1));
 const basegfx::B2DVector aLine(aEnd - aStart);
 
 // #i102548# create new unit polygon for line (horizontal)
-basegfx::B2DPolygon aNewPolygon;
-aNewPolygon.append(basegfx::B2DPoint(0.0, 0.0));
-aNewPolygon.append(basegfx::B2DPoint(1.0, 0.0));
+static const basegfx::B2DPolygon 
aNewPolygon{basegfx::B2DPoint(0.0, 0.0), basegfx::B2DPoint(1.0, 0.0)};
 aUnitPolyPolygon.setB2DPolygon(0, aNewPolygon);
 
 // #i102548# fill objectMatrix with rotation and offset (no 
shear for lines)

[Libreoffice-commits] core.git: i18npool/Library_localedata_en.mk

[Stephan Bergmann (via logerrit)]

 i18npool/Library_localedata_en.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 9d850743c2d046c92757fde3079a1d29794bf3ce
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 11:55:10 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 15:27:07 2023 +0200

Link Library_localedata_en against sal

 recently 
started to
fail with

> localedata_en_AU.o : error LNK2001: unresolved external symbol 
__imp_rtl_uString_release
> C:\cygwin\home\tdf\jenkins\dly\b_master\instdir\program\localedata_en.dll 
: fatal error LNK1120: 1 unresolved externals
> touch: failed to get attributes of 
'C:/cygwin/home/tdf/jenkins/dly/b_master/instdir/program/localedata_en.dll': No 
such file or directory
> make[1]: *** 
[C:/cygwin/home/tdf/jenkins/dly/s_master/i18npool/Library_localedata_en.mk:10: 
C:/cygwin/home/tdf/jenkins/dly/b_master/instdir/program/localedata_en.dll] 
Error 96

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

diff --git a/i18npool/Library_localedata_en.mk 
b/i18npool/Library_localedata_en.mk
index 45bf18ac89c3..4db3bc86b3cd 100644
--- a/i18npool/Library_localedata_en.mk
+++ b/i18npool/Library_localedata_en.mk
@@ -37,4 +37,8 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,localedata_en,\
CustomTarget/i18npool/localedata/localedata_en_ZW \
 ))
 
+$(eval $(call gb_Library_use_libraries,localedata_en, \
+sal \
+))
+
 # vim: set noet sw=4 ts=4:

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

[Stephan Bergmann (via logerrit)]

 basctl/source/basicide/baside2.cxx |2 +-
 basctl/source/basicide/baside3.cxx |2 +-
 basctl/source/basicide/basides1.cxx|   12 ++--
 basctl/source/basicide/basidesh.cxx|4 ++--
 basctl/source/basicide/bastypes.cxx|2 +-
 basctl/source/basicide/localizationmgr.cxx |8 
 basctl/source/dlged/dlged.cxx  |4 ++--
 basctl/source/dlged/propbrw.cxx|2 +-
 8 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 8c230395bc374a2be4e9bb341a10f9e8f8cf467e
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:03 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 15:29:04 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: basctl

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

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 60d25cf74128..b01e5c238a6c 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -95,7 +95,7 @@ short const ValidWindow = 0x1234;
 #if defined(OW) || defined(MTF)
 char const FilterMask_All[] = "*";
 #else
-constexpr OUStringLiteral FilterMask_All = u"*.*";
+constexpr OUString FilterMask_All = u"*.*"_ustr;
 #endif
 
 } // end anonymous namespace
diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index f8197a49d909..4b5d13fb6ecf 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -72,7 +72,7 @@ using namespace ::com::sun::star::ui::dialogs;
 #ifdef _WIN32
 OUStringLiteral const FilterMask_All = u"*.*";
 #else
-constexpr OUStringLiteral FilterMask_All = u"*";
+constexpr OUString FilterMask_All = u"*"_ustr;
 #endif
 
 DialogWindow::DialogWindow(DialogWindowLayout* pParent, ScriptDocument const& 
rDocument,
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 66820cd21881..9ef9f75e3f40 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1342,12 +1342,12 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool 
bUpdateTabBar, bool bRemembe
 
 void Shell::ManageToolbars()
 {
-static constexpr OUStringLiteral aMacroBarResName = 
u"private:resource/toolbar/macrobar";
-static constexpr OUStringLiteral aDialogBarResName = 
u"private:resource/toolbar/dialogbar";
-static constexpr OUStringLiteral aInsertControlsBarResName
-= u"private:resource/toolbar/insertcontrolsbar";
-static constexpr OUStringLiteral aFormControlsBarResName
-= u"private:resource/toolbar/formcontrolsbar";
+static constexpr OUString aMacroBarResName = 
u"private:resource/toolbar/macrobar"_ustr;
+static constexpr OUString aDialogBarResName = 
u"private:resource/toolbar/dialogbar"_ustr;
+static constexpr OUString aInsertControlsBarResName
+= u"private:resource/toolbar/insertcontrolsbar"_ustr;
+static constexpr OUString aFormControlsBarResName
+= u"private:resource/toolbar/formcontrolsbar"_ustr;
 
 if( !pCurWin )
 return;
diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index 73d27e2eea34..d23da94d268f 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -77,8 +77,8 @@
 
 namespace basctl
 {
-constexpr OUStringLiteral BASIC_IDE_EDITOR_WINDOW = u"BasicIDEEditorWindow";
-constexpr OUStringLiteral BASIC_IDE_CURRENT_ZOOM = u"CurrentZoom";
+constexpr OUString BASIC_IDE_EDITOR_WINDOW = u"BasicIDEEditorWindow"_ustr;
+constexpr OUString BASIC_IDE_CURRENT_ZOOM = u"CurrentZoom"_ustr;
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index bbd71ad08ce0..8c523e2bdb04 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -54,7 +54,7 @@ namespace basctl
 {
 
 // ID used for the read-only infobar
-constexpr OUStringLiteral BASIC_IDE_READONLY_INFOBAR = u"readonly";
+constexpr OUString BASIC_IDE_READONLY_INFOBAR = u"readonly"_ustr;
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
diff --git a/basctl/source/basicide/localizationmgr.cxx 
b/basctl/source/basicide/localizationmgr.cxx
index 22e44c09c6aa..68d2f63622f7 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -53,9 +53,9 @@ using namespace ::com::sun::star::resource;
 namespace
 {
 
-constexpr OUStringLiteral aDot(u".");
-constexpr OUStringLiteral aEsc(u"&");
-constexpr OUStringLiteral aSemi(u";");
+constexpr OUString aDot(u"."_ustr);
+constexpr OUString aEsc(u"&"_ustr);
+constexpr OUString aSemi(u";"_ustr);
 
 } // namespace
 
@@ -80,7 +80,7 @@ bool LocalizationMgr::isLibraryLocalized ()
 
 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - cui/uiconfig

[Regina Henschel (via logerrit)]

 cui/uiconfig/ui/connectortabpage.ui |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 5c89f10495b34fccff1509ec96593dfa4f4532c9
Author: Regina Henschel 
AuthorDate: Mon Oct 9 13:31:06 2023 +0200
Commit: Xisco Fauli 
CommitDate: Thu Oct 19 13:15:21 2023 +0200

tdf#132605 Negative skew values in connector dialog

The skew values of a standard connector can have negative values.
Those are possible in ODF, rendered in LO and produced by dragging the
handles. Only the dialog restricts the metric field to non negative
values. The patch allows negative values now.

Change-Id: I5174dccc1ed0ed8644e0f62a5d599eea4d5cdbaf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157700
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 6c32d052011132e891dab3254bf2a2ea6f31e888)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158153
Reviewed-by: Michael Stahl 

diff --git a/cui/uiconfig/ui/connectortabpage.ui 
b/cui/uiconfig/ui/connectortabpage.ui
index a2f6aadf3e03..d82e643f4629 100644
--- a/cui/uiconfig/ui/connectortabpage.ui
+++ b/cui/uiconfig/ui/connectortabpage.ui
@@ -3,16 +3,19 @@
 
   
   
+-100
 100
 1
 10
   
   
+-100
 100
 1
 10
   
   
+-100
 100
 1
 10

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

[Stephan Bergmann (via logerrit)]

 configmgr/source/configurationprovider.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 826d673ac8870001a53a50a6142d66d510a67e4a
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:06 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 13:54:29 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: configmgr

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

diff --git a/configmgr/source/configurationprovider.cxx 
b/configmgr/source/configurationprovider.cxx
index 40ffd6a9ba4a..9789e0721bd6 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -60,10 +60,10 @@ namespace configmgr::configuration_provider {
 
 namespace {
 
-constexpr OUStringLiteral accessServiceName =
-u"com.sun.star.configuration.ConfigurationAccess";
-constexpr OUStringLiteral updateAccessServiceName =
-u"com.sun.star.configuration.ConfigurationUpdateAccess";
+constexpr OUString accessServiceName =
+u"com.sun.star.configuration.ConfigurationAccess"_ustr;
+constexpr OUString updateAccessServiceName =
+u"com.sun.star.configuration.ConfigurationUpdateAccess"_ustr;
 
 void badNodePath() {
 throw css::uno::Exception(

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - officecfg/registry sc/inc sc/Library_sc.mk sc/sdi sc/source sc/uiconfig sc/UIConfig_scalc.mk static/CustomTarget_emscripten_fs_imag

[Paris Oplopoios (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |   57 ++
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu   |   14 
 sc/Library_sc.mk  |1 
 sc/UIConfig_scalc.mk  |2 
 sc/inc/document.hxx   |4 
 sc/inc/sc.hrc |3 
 sc/sdi/cellsh.sdi |9 
 sc/sdi/scalc.sdi  |   31 +
 sc/source/core/data/documen2.cxx  |5 
 sc/source/ui/app/scdll.cxx|1 
 sc/source/ui/condformat/condformateasydlg.cxx |  192 

 sc/source/ui/inc/condformateasydlg.hxx|   54 ++
 sc/source/ui/inc/reffact.hxx  |7 
 sc/source/ui/view/cellsh3.cxx |   20 
 sc/source/ui/view/reffact.cxx |1 
 sc/source/ui/view/tabvwsh.cxx |1 
 sc/source/ui/view/tabvwshc.cxx|6 
 sc/uiconfig/scalc/popupmenu/conditional.xml   |2 
 sc/uiconfig/scalc/popupmenu/conditional_easy.xml  |   17 
 sc/uiconfig/scalc/ui/conditionaleasydialog.ui |  237 
++
 static/CustomTarget_emscripten_fs_image.mk|2 
 21 files changed, 663 insertions(+), 3 deletions(-)

New commits:
commit a9f6f63d21e368fe6bcc9080fd1ba23b0e52
Author: Paris Oplopoios 
AuthorDate: Mon Sep 11 23:20:50 2023 +0300
Commit: Paris Oplopoios 
CommitDate: Thu Oct 19 14:09:51 2023 +0200

sc: Add easy to use conditional formatting menu

Add menu options that open a dialog that can add conditional formatting
in a cell range with common options.

Change-Id: Ia54baba08e4b78c4c6e37fa7bff744af8cf06037
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157718
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Paris Oplopoios 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index ccf99067b033..815151845c14 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -636,7 +636,7 @@
   1
 
   
-  
+  
 
   Conditional Formatting: Condition
 
@@ -647,6 +647,61 @@
   1
 
   
+  
+
+  Conditional Formatting: Greater Than
+
+
+  Greater than...
+
+
+  1
+
+  
+  
+
+  Conditional Formatting: Condition Less 
Than
+
+
+  Less than...
+
+
+  1
+
+  
+  
+
+  Conditional Formatting: Condition 
Equals
+
+
+  Equals...
+
+
+  1
+
+  
+  
+
+  Conditional Formatting: Between
+
+
+  Between...
+
+
+  1
+
+  
+  
+
+  Conditional Formatting: More Rules
+
+
+  More rules...
+
+
+  1
+
+  
   
 
   Conditional Formatting...
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index de6221954ab0..2dd6eb87d620 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -548,6 +548,20 @@
   distributebar
 
   
+  
+
+  .uno:ConditionalFormatConditionMenu
+
+
+  com.sun.star.sheet.SpreadsheetDocument
+
+
+  com.sun.star.comp.framework.ResourceMenuController
+
+
+  conditional_easy
+
+  
 
 
   
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 12eab51a41d5..ec97db031a38 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -396,6 +396,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/ui/condformat/condformatdlg \
 sc/source/ui/condformat/condformatdlgentry \
 sc/source/ui/condformat/condformatdlgitem \
+sc/source/ui/condformat/condformateasydlg \
 sc/source/ui/condformat/condformathelper \
 sc/source/ui/condformat/colorformat \
 sc/source/ui/dataprovider/csvdataprovider \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 0696cf11acda..126875711de9 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk

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

[Willian Pessoa (via logerrit)]

 editeng/source/items/textitem.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit fec4d0fb9992811d1217624d8eda95eac6da4220
Author: Willian Pessoa 
AuthorDate: Thu Oct 12 17:34:10 2023 -0300
Commit: Ilmari Lauhakangas 
CommitDate: Thu Oct 19 14:18:59 2023 +0200

tdf#147021 Use std::size() in editeng

Change-Id: Id6496b34a3601fb021af2894fbf7f876b444145f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157895
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index e4c1cdbe14cc..813f907fb784 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -552,7 +552,7 @@ OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos )
 RID_SVXITEMS_WEIGHT_BLACK
 };
 
-static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_WEIGHTS) - 1 == WEIGHT_BLACK, 
"must match");
+static_assert(std::size(RID_SVXITEMS_WEIGHTS) - 1 == WEIGHT_BLACK, "must 
match");
 assert(nPos <= sal_uInt16(WEIGHT_BLACK) && "enum overflow!" );
 return EditResId(RID_SVXITEMS_WEIGHTS[nPos]);
 }
@@ -1123,7 +1123,7 @@ OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 
nPos ) const
 RID_SVXITEMS_UL_BOLDDASHDOTDOT,
 RID_SVXITEMS_UL_BOLDWAVE
 };
-static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_UL) - 1 == LINESTYLE_BOLDWAVE, 
"must match");
+static_assert(std::size(RID_SVXITEMS_UL) - 1 == LINESTYLE_BOLDWAVE, "must 
match");
 assert(nPos <= sal_uInt16(LINESTYLE_BOLDWAVE) && "enum overflow!");
 return EditResId(RID_SVXITEMS_UL[nPos]);
 }
@@ -1164,7 +1164,7 @@ OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 
nPos ) const
 RID_SVXITEMS_OL_BOLDDASHDOTDOT,
 RID_SVXITEMS_OL_BOLDWAVE
 };
-static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_OL) - 1 == LINESTYLE_BOLDWAVE, 
"must match");
+static_assert(std::size(RID_SVXITEMS_OL) - 1 == LINESTYLE_BOLDWAVE, "must 
match");
 assert(nPos <= sal_uInt16(LINESTYLE_BOLDWAVE) && "enum overflow!");
 return EditResId(RID_SVXITEMS_OL[nPos]);
 }
@@ -1229,7 +1229,7 @@ OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 
nPos )
 RID_SVXITEMS_STRIKEOUT_SLASH,
 RID_SVXITEMS_STRIKEOUT_X
 };
-static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_STRIKEOUT) - 1 == STRIKEOUT_X, 
"must match");
+static_assert(std::size(RID_SVXITEMS_STRIKEOUT) - 1 == STRIKEOUT_X, "must 
match");
 assert(nPos <= sal_uInt16(STRIKEOUT_X) && "enum overflow!");
 return EditResId(RID_SVXITEMS_STRIKEOUT[nPos]);
 }
@@ -1761,7 +1761,7 @@ OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 
nPos )
 RID_SVXITEMS_CASEMAP_SMALLCAPS
 };
 
-static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_CASEMAP) == 
size_t(SvxCaseMap::End), "must match");
+static_assert(std::size(RID_SVXITEMS_CASEMAP) == size_t(SvxCaseMap::End), 
"must match");
 assert(nPos < sal_uInt16(SvxCaseMap::End) && "enum overflow!");
 return EditResId(RID_SVXITEMS_CASEMAP[nPos]);
 }
@@ -1881,7 +1881,7 @@ OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 
nPos )
 RID_SVXITEMS_ESCAPEMENT_SUB
 };
 
-static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_ESCAPEMENT) == 
size_t(SvxEscapement::End), "must match");
+static_assert(std::size(RID_SVXITEMS_ESCAPEMENT) == 
size_t(SvxEscapement::End), "must match");
 assert(nPos < sal_uInt16(SvxEscapement::End) && "enum overflow!");
 return EditResId(RID_SVXITEMS_ESCAPEMENT[nPos]);
 }
@@ -2554,13 +2554,13 @@ static TranslateId RID_SVXITEMS_RELIEF[] =
 
 OUString SvxCharReliefItem::GetValueTextByPos(sal_uInt16 nPos)
 {
-assert(nPos < SAL_N_ELEMENTS(RID_SVXITEMS_RELIEF) && "enum overflow");
+assert(nPos < std::size(RID_SVXITEMS_RELIEF) && "enum overflow");
 return EditResId(RID_SVXITEMS_RELIEF[nPos]);
 }
 
 sal_uInt16 SvxCharReliefItem::GetValueCount() const
 {
-return SAL_N_ELEMENTS(RID_SVXITEMS_RELIEF) - 1;
+return std::size(RID_SVXITEMS_RELIEF) - 1;
 }
 
 bool SvxCharReliefItem::GetPresentation

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

[Stephan Bergmann (via logerrit)]

 connectivity/source/commontools/conncleanup.cxx  |2 
 connectivity/source/commontools/dbtools.cxx  |   32 +++
 connectivity/source/commontools/dbtools2.cxx |2 
 connectivity/source/commontools/formattedcolumnvalue.cxx |2 
 connectivity/source/commontools/statementcomposer.cxx|4 -
 connectivity/source/cpool/ZConnectionPool.cxx|2 
 connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx |2 
 connectivity/source/drivers/file/FDatabaseMetaData.cxx   |4 -
 connectivity/source/drivers/firebird/Connection.cxx  |4 -
 connectivity/source/drivers/firebird/Driver.cxx  |   18 
 connectivity/source/drivers/hsqldb/HDriver.cxx   |6 +-
 connectivity/source/drivers/mysql_jdbc/YDriver.cxx   |2 
 connectivity/source/parse/sqliterator.cxx|2 
 connectivity/source/parse/sqlnode.cxx|2 
 14 files changed, 42 insertions(+), 42 deletions(-)

New commits:
commit 4f66ce572be5bbec9fe8feef8f0937d0ca06e964
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:07 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 14:25:14 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: connectivity

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

diff --git a/connectivity/source/commontools/conncleanup.cxx 
b/connectivity/source/commontools/conncleanup.cxx
index 5504c4e14253..7b703f093c80 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -35,7 +35,7 @@ namespace dbtools
 using namespace css::sdbc;
 using namespace css::lang;
 
-constexpr OUStringLiteral ACTIVE_CONNECTION_PROPERTY_NAME = 
u"ActiveConnection";
+constexpr OUString ACTIVE_CONNECTION_PROPERTY_NAME = 
u"ActiveConnection"_ustr;
 
 OAutoConnectionDisposer::OAutoConnectionDisposer(const Reference< XRowSet 
>& _rxRowSet, const Reference< XConnection >& _rxConnection)
 :m_xRowSet( _rxRowSet )
diff --git a/connectivity/source/commontools/dbtools.cxx 
b/connectivity/source/commontools/dbtools.cxx
index 1e66826e80b6..885e28c751f5 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -389,7 +389,7 @@ static SharedConnection lcl_connectRowSet(const Reference< 
XRowSet>& _rxRowSet,
 
 // build a connection with its current settings (4. data source name, 
or 5. URL)
 
-static constexpr OUStringLiteral sUserProp( u"User" );
+static constexpr OUString sUserProp( u"User"_ustr );
 OUString sDataSourceName;
 xRowSetProps->getPropertyValue("DataSourceName") >>= sDataSourceName;
 OUString sURL;
@@ -913,7 +913,7 @@ Reference< XNumberFormatsSupplier> getNumberFormats(
 // ask the parent of the connection (should be a DatabaseAccess)
 Reference< XNumberFormatsSupplier> xReturn;
 Reference< XChild> xConnAsChild(_rxConn, UNO_QUERY);
-static constexpr OUStringLiteral sPropFormatsSupplier( 
u"NumberFormatsSupplier" );
+static constexpr OUString sPropFormatsSupplier( 
u"NumberFormatsSupplier"_ustr );
 if (xConnAsChild.is())
 {
 Reference< XPropertySet> xConnParentProps(xConnAsChild->getParent(), 
UNO_QUERY);
@@ -945,20 +945,20 @@ try
 const Sequence< Property> aOldProperties = xOldInfo->getProperties();
 const Sequence< Property> aNewProperties = xNewInfo->getProperties();
 
-static constexpr OUStringLiteral sPropFormatsSupplier(u"FormatsSupplier");
-static constexpr OUStringLiteral sPropCurrencySymbol(u"CurrencySymbol");
-static constexpr OUStringLiteral sPropDecimals(u"Decimals");
-static constexpr OUStringLiteral sPropEffectiveMin(u"EffectiveMin");
-static constexpr OUStringLiteral sPropEffectiveMax(u"EffectiveMax");
-static constexpr OUStringLiteral 
sPropEffectiveDefault(u"EffectiveDefault");
-static constexpr OUStringLiteral sPropDefaultText(u"DefaultText");
-static constexpr OUStringLiteral sPropDefaultDate(u"DefaultDate");
-static constexpr OUStringLiteral sPropDefaultTime(u"DefaultTime");
-static constexpr OUStringLiteral sPropValueMin(u"ValueMin");
-static constexpr OUStringLiteral sPropValueMax(u"ValueMax");
-static constexpr OUStringLiteral sPropDecimalAccuracy(u"DecimalAccuracy");
-static constexpr OUStringLiteral sPropClassId(u"ClassId");
-static constexpr OUStringLiteral sFormattedServiceName( 
u"com.sun.star.form.component.FormattedField" );
+static constexpr OUString sPropFormatsSupplier(u"FormatsSupplier"_ustr);
+static constexpr OUString sPropCurrencySymbol(u"CurrencySymbol"_ustr);
+static constexpr OUString sPropDecimals(u"Decimals"_ustr);
+static constexpr OUString sPropEffectiveMin(u"EffectiveMin"_ustr);
+static constexpr 

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

[khushishikhu (via logerrit)]

 unoxml/source/xpath/xpathapi.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit baf677e2f1130205df6e4a5cf0a94f4d9dc228a5
Author: khushishikhu 
AuthorDate: Mon Oct 16 00:59:32 2023 +0530
Commit: Hossein 
CommitDate: Thu Oct 19 13:13:38 2023 +0200

tdf#42982: Improve UNO API error reporting

Change-Id: I16bd4bb935d02ff03422cb48d21a63e3d994d0b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157993
Tested-by: Jenkins
Reviewed-by: Hossein 

diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx
index 17b28027534c..a60083983882 100644
--- a/unoxml/source/xpath/xpathapi.cxx
+++ b/unoxml/source/xpath/xpathapi.cxx
@@ -110,7 +110,7 @@ namespace XPath
 nsmap_t & rNamespaces, Reference< XNode > const& xNamespaceNode)
 {
 DOM::CNode *const 
pCNode(dynamic_cast(xNamespaceNode.get()));
-if (!pCNode) { throw RuntimeException(); }
+if (!pCNode) { throw RuntimeException("Could not use the namespace 
node in order to collect namespace declarations."); }
 
 ::osl::MutexGuard const g(pCNode->GetOwnerDocument().GetMutex());
 
@@ -274,7 +274,7 @@ namespace XPath
 Reference< XNode > const& xContextNode,
 const OUString& expr)
 {
-if (!xContextNode.is()) { throw RuntimeException(); }
+if (!xContextNode.is()) { throw RuntimeException("xContextNode does 
not exist!"); }
 
 nsmap_t nsmap;
 extensions_t extensions;
@@ -288,15 +288,15 @@ namespace XPath
 // get the node and document
 ::rtl::Reference const pCDoc(
 
dynamic_cast(xContextNode->getOwnerDocument().get()));
-if (!pCDoc.is()) { throw RuntimeException(); }
+if (!pCDoc.is()) { throw RuntimeException("Interface pointer for the 
owner document of the xContextNode does not exist."); }
 
 DOM::CNode *const pCNode = 
dynamic_cast(xContextNode.get());
-if (!pCNode) { throw RuntimeException(); }
+if (!pCNode) { throw RuntimeException("xContextNode interface pointer 
does not exist."); }
 
 ::osl::MutexGuard const g(pCDoc->GetMutex()); // lock the document!
 
 xmlNodePtr const pNode = pCNode->GetNodePtr();
-if (!pNode) { throw RuntimeException(); }
+if (!pNode) { throw RuntimeException("Node pointer for xContextNode 
does not exist."); }
 xmlDocPtr pDoc = pNode->doc;
 
 /* NB: workaround for #i87252#:
@@ -376,7 +376,7 @@ namespace XPath
 Reference< XXPathExtension> const& xExtension)
 {
 if (!xExtension.is()) {
-throw RuntimeException();
+throw RuntimeException("Extension instance xExtension to be used 
by XPath does not exist.");
 }
 std::scoped_lock const g(m_Mutex);
 m_extensions.push_back( xExtension );

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

[Stephan Bergmann (via logerrit)]

 comphelper/source/container/embeddedobjectcontainer.cxx   |2 -
 comphelper/source/misc/backupfilehelper.cxx   |8 ++--
 comphelper/source/misc/numberedcollection.cxx |2 -
 comphelper/source/officeinstdir/officeinstallationdirectories.cxx |4 +-
 comphelper/source/xml/ofopxmlhelper.cxx   |   20 
+-
 5 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 7cd27b446193e5973ef73d207d0c6dfe5f0ddea9
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:06 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 13:22:15 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: comphelper

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

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx 
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 094597fe6d06..9a971b41b3f6 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -913,7 +913,7 @@ bool EmbeddedObjectContainer::RemoveEmbeddedObject( const 
uno::Reference < embed
 // the media type will be provided with object 
insertion
 OUString aOrigStorMediaType;
 uno::Reference< beans::XPropertySet > xStorProps( 
pImpl->mxStorage, uno::UNO_QUERY_THROW );
-static constexpr OUStringLiteral 
s_sMediaType(u"MediaType");
+static constexpr OUString s_sMediaType(u"MediaType"_ustr);
 xStorProps->getPropertyValue( s_sMediaType ) >>= 
aOrigStorMediaType;
 
 SAL_WARN_IF( aOrigStorMediaType.isEmpty(), 
"comphelper.container", "No valuable media type in the storage!" );
diff --git a/comphelper/source/misc/backupfilehelper.cxx 
b/comphelper/source/misc/backupfilehelper.cxx
index 9cd61f6f4c14..87e1035aa015 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -354,7 +354,7 @@ namespace
 
 typedef std::vector< ExtensionInfoEntry > ExtensionInfoEntryVector;
 
-constexpr OUStringLiteral gaRegPath { 
u"/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml"
 };
+constexpr OUString gaRegPath { 
u"/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml"_ustr
 };
 
 class ExtensionInfo
 {
@@ -661,8 +661,8 @@ namespace
 const ExtensionInfoEntryVector& rToBeEnabled,
 const ExtensionInfoEntryVector& rToBeDisabled)
 {
-static constexpr OUStringLiteral 
aRegPathFront(u"/uno_packages/cache/registry/com.sun.star.comp.deployment.");
-static constexpr OUStringLiteral 
aRegPathBack(u".PackageRegistryBackend/backenddb.xml");
+static constexpr OUString 
aRegPathFront(u"/uno_packages/cache/registry/com.sun.star.comp.deployment."_ustr);
+static constexpr OUString 
aRegPathBack(u".PackageRegistryBackend/backenddb.xml"_ustr);
 // first appearance to check
 {
 const OUString 
aUnoPackagReg(OUString::Concat(rUserConfigWorkURL) + aRegPathFront + "bundle" + 
aRegPathBack);
@@ -1467,7 +1467,7 @@ namespace comphelper
 // points to registrymodifications.xcu
 OUString conf("${CONFIGURATION_LAYERS}");
 rtl::Bootstrap::expandMacros(conf);
-static constexpr OUStringLiteral aTokenUser(u"user:");
+static constexpr OUString aTokenUser(u"user:"_ustr);
 sal_Int32 nStart(conf.indexOf(aTokenUser));
 
 if (-1 != nStart)
diff --git a/comphelper/source/misc/numberedcollection.cxx 
b/comphelper/source/misc/numberedcollection.cxx
index 80d33776c420..9dec18e66a06 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.cxx
@@ -24,7 +24,7 @@
 
 namespace comphelper{
 
-constexpr OUStringLiteral ERRMSG_INVALID_COMPONENT_PARAM = u"NULL as component 
reference not allowed.";
+constexpr OUString ERRMSG_INVALID_COMPONENT_PARAM = u"NULL as component 
reference not allowed."_ustr;
 
 
 NumberedCollection::NumberedCollection()
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx 
b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 582bdc125f78..010655964dcc 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -75,8 +75,8 @@ static bool makeCanonicalFileURL( OUString & rURL )
 
 namespace comphelper {
 
-constexpr OUStringLiteral g_aOfficeBrandDirMacro(u"$(brandbaseurl)");
-constexpr OUStringLiteral g_aUserDirMacro(u"$(userdataurl)");
+constexpr OUString 

Re: Inquiry Regarding LibreOffice

[Christian Lohmaier]

Hi,

On Wed, Oct 18, 2023 at 10:37 AM 増野智仁  wrote:
> [export Excel to pdf from commandline]
> In this context, I have a question: If we install the font specified by the 
> Excel file as the system font on the server, is it possible to create the 
> converted PDF with the same font as specified in the Excel file? 
> Additionally, what happens if different fonts are specified for individual 
> cells in the Excel document?

LibreOffice dropped support for Type 1/Postscript fonts (see
https://wiki.documentfoundation.org/ReleaseNotes/5.3#General ), so the
answer is a "it depends". If the fonts are truetype or CFF/Type2 or
opentype they should work.

But of course there can always be font-specific bugs or weird custom
encodings that might break stuff/result in different output compared
to Excel, but that would need to be looked into on a case by case
basis.

HTH (hope that helps),
ciao
Christian

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

[Xisco Fauli (via logerrit)]

 sc/source/ui/app/inputhdl.cxx |   37 ++---
 1 file changed, 18 insertions(+), 19 deletions(-)

New commits:
commit fee44aa4d5080af29ff0e663118ea1e629d53605
Author: Xisco Fauli 
AuthorDate: Thu Oct 19 10:48:58 2023 +0200
Commit: Xisco Fauli 
CommitDate: Thu Oct 19 14:01:24 2023 +0200

sc: return earlier if there is no pActiveViewSh

See https://gerrit.libreoffice.org/c/core/+/158123

Change-Id: Id9a27ca657377ba0a81009cdd2d27ce6aa4e2aa0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158140
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index de6a7f47a8bc..6cedb9617ec5 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3073,6 +3073,9 @@ void ScInputHandler::EnterHandler( ScEnterMode 
nBlockMode, bool bBeforeSavingInL
 && pActiveViewSh != SfxViewShell::Current())
 return;
 
+if (!pActiveViewSh)
+return;
+
 // Macro calls for validity can cause a lot of problems, so inhibit
 // nested calls of EnterHandler().
 if (bInEnterHandler) return;
@@ -3080,8 +3083,7 @@ void ScInputHandler::EnterHandler( ScEnterMode 
nBlockMode, bool bBeforeSavingInL
 bInOwnChange = true; // disable ModifyHdl (reset below)
 mbPartialPrefix = false;
 
-if (pActiveViewSh)
-ImplCreateEditEngine();
+ImplCreateEditEngine();
 
 bool bMatrix = ( nBlockMode == ScEnterMode::MATRIX );
 
@@ -3103,7 +3105,7 @@ void ScInputHandler::EnterHandler( ScEnterMode 
nBlockMode, bool bBeforeSavingInL
 lcl_SelectionToEnd(pTableView);
 }
 
-vcl::Window* pFrameWin = pActiveViewSh ? pActiveViewSh->GetFrameWin() 
: nullptr;
+vcl::Window* pFrameWin = pActiveViewSh->GetFrameWin();
 
 if (pTopView)
 pTopView->CompleteAutoCorrect(); // CompleteAutoCorrect for both 
Views
@@ -3115,7 +3117,7 @@ void ScInputHandler::EnterHandler( ScEnterMode 
nBlockMode, bool bBeforeSavingInL
 lcl_RemoveTabs(aPreAutoCorrectString);
 
 // Test if valid (always with simple string)
-if (bModified && nValidation && pActiveViewSh)
+if (bModified && nValidation)
 {
 ScDocument& rDoc = pActiveViewSh->GetViewData().GetDocument();
 const ScValidationData* pData = rDoc.GetValidationEntry( nValidation );
@@ -3165,7 +3167,7 @@ void ScInputHandler::EnterHandler( ScEnterMode 
nBlockMode, bool bBeforeSavingInL
 }
 
 // Check for input into DataPilot table
-if ( bModified && pActiveViewSh && !bForget )
+if ( bModified && !bForget )
 {
 ScDocument& rDoc = pActiveViewSh->GetViewData().GetDocument();
 ScDPObject* pDPObj = rDoc.GetDPAtCursor( aCursorPos.Col(), 
aCursorPos.Row(), aCursorPos.Tab() );
@@ -3187,21 +3189,18 @@ void ScInputHandler::EnterHandler( ScEnterMode 
nBlockMode, bool bBeforeSavingInL
 {
 //  #i3820# If the spell checker flags numerical input as error,
 //  it still has to be treated as number, not EditEngine object.
-if ( pActiveViewSh )
+ScDocument& rDoc = pActiveViewSh->GetViewData().GetDocument();
+// #i67990# don't use pLastPattern in EnterHandler
+const ScPatternAttr* pPattern = rDoc.GetPattern( aCursorPos.Col(), 
aCursorPos.Row(), aCursorPos.Tab() );
+if (pPattern)
 {
-ScDocument& rDoc = pActiveViewSh->GetViewData().GetDocument();
-// #i67990# don't use pLastPattern in EnterHandler
-const ScPatternAttr* pPattern = rDoc.GetPattern( aCursorPos.Col(), 
aCursorPos.Row(), aCursorPos.Tab() );
-if (pPattern)
+SvNumberFormatter* pFormatter = rDoc.GetFormatTable();
+// without conditional format, as in ScColumn::SetString
+sal_uInt32 nFormat = pPattern->GetNumberFormat( pFormatter );
+double nVal;
+if ( pFormatter->IsNumberFormat( aString, nFormat, nVal ) )
 {
-SvNumberFormatter* pFormatter = rDoc.GetFormatTable();
-// without conditional format, as in ScColumn::SetString
-sal_uInt32 nFormat = pPattern->GetNumberFormat( pFormatter );
-double nVal;
-if ( pFormatter->IsNumberFormat( aString, nFormat, nVal ) )
-{
-bSpellErrors = false;   // ignore the spelling errors
-}
+bSpellErrors = false;   // ignore the spelling errors
 }
 }
 }
@@ -3235,7 +3234,7 @@ void ScInputHandler::EnterHandler( ScEnterMode 
nBlockMode, bool bBeforeSavingInL
 const SfxPoolItem* pItem = nullptr;
 
 // Find common (cell) attributes before RemoveAdjust
-if ( pActiveViewSh && bUniformAttribs )
+if ( bUniformAttribs )
 {
 std::optional pCommonAttrs;
 for (sal_uInt16 nId = EE_CHAR_START; nId <= 

Re: Any ideas why lock files do not work in Chrome OS’ Linux VM?

[Christian Lohmaier]

On Sat, Oct 14, 2023 at 4:11 PM Paul Menzel
 wrote:
>
> Wanting to run LibreOffice on a Google Chromebook with Chrome OS
> 117.0.5938.157, one can enable the Linux development environment, a VM
> running Debian 11 (bullseye/oldstable), and install LibreOffice 7.0.4
> into it:
>
>  $ sudo apt update
>  $ sudo apt install libreoffice # 1:7.0.4-4+deb11u7
>
> The German tutorial *LibreOffice unter Google Chrome OS auf einem
> Chromebook nutzen* [1] says to disable create of lock files by editing
> `/usr/lib/libreoffice/program/soffice` and commenting out the lines below:

That tutorial is from 2021, so might no longer be necessary

>  SAL_ENABLE_FILE_LOCKING=1 export
>  SAL_ENABLE_FILE_LOCKING
>
> Then, under expert settings `useLocking` and `UseDocumentOOoLockfile`
> need to be set to `false`.
>
> Does somebody know, why this is needed?

probably it is not that it cannot create lock files in general, but
rather that creating additional files in whatever share the documents
are opened from prevents that - you should still be able to open the
document nevertheless in the case though, you might just have to pick
in a dialog whether to open the file read only or for writing, right?

> Could LibreOffice be improved to
> enable/disable file locking at runtime depending on the environment?

We'd need more details first as to what exactly is missing. Not being
able to create a lockfile should not prevent LO from opening files to
begin with. Does it work on an external thumb drive for example / what
kind of storage are you trying to open the documents from, etc...

> [1]:
> https://linux-in-der-schule.de/2021/05/03/libreoffice-unter-google-chrome-os-auf-einem-chromebook-nutzen/

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

[Stephan Bergmann (via logerrit)]

 chart2/qa/extras/chart2geometry.cxx  |   
28 +-
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx  |
2 
 chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx  |
2 
 chart2/source/controller/dialogs/DialogModel.cxx |
2 
 chart2/source/controller/dialogs/tp_DataSource.cxx   |
8 +-
 chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx |
4 -
 chart2/source/controller/sidebar/ChartColorWrapper.cxx   |
2 
 chart2/source/model/filter/XMLFilter.cxx |
6 +-
 chart2/source/model/main/CartesianCoordinateSystem.cxx   |
2 
 chart2/source/model/main/ChartModel.cxx  |
8 +-
 chart2/source/model/main/PolarCoordinateSystem.cxx   |
4 -
 chart2/source/model/template/PieChartTypeTemplate.cxx|
2 
 chart2/source/tools/CachedDataSequence.cxx   |
2 
 chart2/source/tools/ConfigColorScheme.cxx|
2 
 chart2/source/tools/ErrorBar.cxx |
2 
 chart2/source/tools/InternalDataProvider.cxx |   
10 +--
 chart2/source/tools/ObjectIdentifier.cxx |
8 +-
 chart2/source/tools/ReferenceSizeProvider.cxx|
2 
 chart2/source/tools/RegressionCurveHelper.cxx|
2 
 chart2/source/tools/Scaling.cxx  |
8 +-
 chart2/source/tools/StatisticsHelper.cxx |
2 
 chart2/source/tools/UncachedDataSequence.cxx |
4 -
 chart2/source/view/axes/DateScaling.cxx  |
6 +-
 chart2/source/view/axes/VCartesianAxis.cxx   |
2 
 chart2/source/view/main/ChartView.cxx|
8 +-
 chart2/source/view/main/VLegend.cxx  |
2 
 26 files changed, 65 insertions(+), 65 deletions(-)

New commits:
commit 27aea4de846810fcca5afe3788b0d0615d85bb30
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:05 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 14:05:52 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: chart2

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

diff --git a/chart2/qa/extras/chart2geometry.cxx 
b/chart2/qa/extras/chart2geometry.cxx
index fdd4e6daa11d..c4374e65c678 100644
--- a/chart2/qa/extras/chart2geometry.cxx
+++ b/chart2/qa/extras/chart2geometry.cxx
@@ -80,10 +80,10 @@ void Chart2GeometryTest::testTdf135184RoundLineCap()
 xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml");
 CPPUNIT_ASSERT(pXmlDoc);
 
-static constexpr OStringLiteral 
sStyleStart("/office:document-content/office:automatic-styles");
-static constexpr OStringLiteral 
sCap("/style:graphic-properties[@svg:stroke-linecap='round']");
-static constexpr OStringLiteral sChartStart(
-"/office:document-content/office:body/office:chart/chart:chart");
+static constexpr OString 
sStyleStart("/office:document-content/office:automatic-styles"_ostr);
+static constexpr OString 
sCap("/style:graphic-properties[@svg:stroke-linecap='round']"_ostr);
+static constexpr OString sChartStart(
+"/office:document-content/office:body/office:chart/chart:chart"_ostr);
 OString sPredicate;
 // chart area
 const OUString sOUAreaStyleName = getXPathContent(pXmlDoc, sChartStart + 
"/@chart:style-name");
@@ -109,10 +109,10 @@ void Chart2GeometryTest::testTdf135184RoundLineCap2()
 xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml");
 CPPUNIT_ASSERT(pXmlDoc);
 
-static constexpr OStringLiteral 
sStyleStart("/office:document-content/office:automatic-styles");
-static constexpr OStringLiteral 
sCap("/style:graphic-properties[@svg:stroke-linecap='round']");
-static constexpr OStringLiteral sChartStart(
-"/office:document-content/office:body/office:chart/chart:chart");
+static constexpr OString 
sStyleStart("/office:document-content/office:automatic-styles"_ostr);
+static constexpr OString 
sCap("/style:graphic-properties[@svg:stroke-linecap='round']"_ostr);
+static constexpr OString sChartStart(
+"/office:document-content/office:body/office:chart/chart:chart"_ostr);
 OString sPredicate;
 // legend
 const OString sLegend(sChartStart + "/chart:legend");
@@ -140,11 +140,11 @@ void Chart2GeometryTest::testTdf135184RoundLineCap3()
 xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
 CPPUNIT_ASSERT(pXmlDoc);
 
- 

Minutes from the UX/design meeting 2023-Oct-19

[Heiko Tietze]

Present: Cor, Eyal, Heiko
Comments: Stephane, RGB, Eyal, Jan, Robert

Tickets/Topics

 * As we now have a Comment style, remove/redirect "Format all comments..."
   + https://bugs.documentfoundation.org/show_bug.cgi?id=157522
   + direct formatting might still be needed, eg. to increase the font size
 for all comments (Stephane)
 + rename to "Direct format all comments" and perhaps hide it from
   the menu but keep it; add Edit Style to the menu (Heiko)
   + turn "Format all comments" into "Edit default paragraph style for
 comments" (RGB)
   + rather open the Paragraph Style dialog for the current Comment PS (Eyal)
   + remove the command, and offer "Select All" (Cor, Eyal)
   => comment

 * Improve password security UX
   + https://bugs.documentfoundation.org/show_bug.cgi?id=157518
   + implement strength meter based on existing code, do not use rules,
 consider further improvements (Jan)
 + https://keepass.info/help/kb/pw_quality_est.html
   + have an "unmask password" icon (Jan)
   + have a policy to provide companies a way to not allow simple
 passwords (Cor, Gabor)
   + show strength meter with tooltips what do to (Eyal, Heiko)
   + perhaps split the bug (Eyal)
   => comment

 * Method to clear search text drop down list in Base form
   + https://bugs.documentfoundation.org/show_bug.cgi?id=157039
   + remember search during the session (Heiko)
   + store it in the database (Robert)
   => fix depending on effort

 * Writer: repeat first column of a table on subsequent pages
   + https://bugs.documentfoundation.org/show_bug.cgi?id=157301
   + table don't flow left/right to the next page (Cor)
   + OP is not a CTL user but wants to split a wide table
 across multiple pages
   + theoretically it might be possible "If a table does not fit
 on a single page, a set of adjacent table columns can be
 automatically repeated on every page..."
   + Calc provide means to achieve this via Print Range > Row/Columns
 to repeat (Cor)
   + don't worth the effort, unless the OP can explain why implementing
 this in Writer in necessary (Eyal)
   => WF


OpenPGP_signature.asc
Description: OpenPGP digital signature

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

[Stephan Bergmann (via logerrit)]

 basic/source/basmgr/basicmanagerrepository.cxx |2 +-
 basic/source/basmgr/basmgr.cxx |   12 ++--
 basic/source/classes/sb.cxx|4 ++--
 basic/source/classes/sbunoobj.cxx  |   12 ++--
 basic/source/runtime/runtime.cxx   |2 +-
 basic/source/sbx/sbxform.cxx   |   18 +-
 basic/source/sbx/sbxscan.cxx   |2 +-
 basic/source/uno/dlgcont.cxx   |4 ++--
 8 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 625705f10e765b6fa246c016acc9546cb0247301
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:04 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 15:17:53 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: basic

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

diff --git a/basic/source/basmgr/basicmanagerrepository.cxx 
b/basic/source/basmgr/basicmanagerrepository.cxx
index 7a2ed5efd20a..bf0c6ee53a46 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -382,7 +382,7 @@ namespace basic
 try
 {
 // ensure there's a standard library in the basic container
-static constexpr OUStringLiteral aStdLibName( u"Standard" );
+static constexpr OUString aStdLibName( u"Standard"_ustr );
 if ( !_rxBasicLibraries->hasByName( aStdLibName ) )
 {
 _rxBasicLibraries->createLibrary( aStdLibName );
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 6e2ce76d37ae..c619bbf1fb6a 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -88,12 +88,12 @@ typedef WeakImplHelper< script::XStarBasicAccess > 
StarBasicAccessHelper;
 // Version 2
 //  + bool  bReference
 
-constexpr OUStringLiteral szStdLibName = u"Standard";
-constexpr OUStringLiteral szBasicStorage = u"StarBASIC";
-constexpr OUStringLiteral szOldManagerStream = u"BasicManager";
-constexpr OUStringLiteral szManagerStream = u"BasicManager2";
-constexpr OUStringLiteral szImbedded = u"LIBIMBEDDED";
-constexpr OStringLiteral szCryptingKey = "CryptedBasic";
+constexpr OUString szStdLibName = u"Standard"_ustr;
+constexpr OUString szBasicStorage = u"StarBASIC"_ustr;
+constexpr OUString szOldManagerStream = u"BasicManager"_ustr;
+constexpr OUString szManagerStream = u"BasicManager2"_ustr;
+constexpr OUString szImbedded = u"LIBIMBEDDED"_ustr;
+constexpr OString szCryptingKey = "CryptedBasic"_ostr;
 
 
 const StreamMode eStreamReadMode = StreamMode::READ | StreamMode::NOCREATE | 
StreamMode::SHARE_DENYALL;
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 94b1becd04a5..eeef54222647 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -55,7 +55,7 @@
 
 using namespace ::com::sun::star::script;
 
-constexpr OUStringLiteral SB_RTLNAME = u"@SBRTL";
+constexpr OUString SB_RTLNAME = u"@SBRTL"_ustr;
 //  i#i68894#
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -1306,7 +1306,7 @@ SbxVariable* StarBASIC::Find( const OUString& rName, 
SbxClassType t )
 }
 }
 }
-static constexpr OUStringLiteral aMainStr(u"Main");
+static constexpr OUString aMainStr(u"Main"_ustr);
 if( !pRes && pNamed && ( t == SbxClassType::Method || t == 
SbxClassType::DontCare ) &&
 !pNamed->GetName().equalsIgnoreAsciiCase( aMainStr ) )
 {
diff --git a/basic/source/classes/sbunoobj.cxx 
b/basic/source/classes/sbunoobj.cxx
index b9db47dcd306..bf740aaafc0d 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -100,9 +100,9 @@ using namespace cppu;
 
 
 // Identifiers for creating the strings for dbg_Properties
-constexpr OUStringLiteral ID_DBG_SUPPORTEDINTERFACES = 
u"Dbg_SupportedInterfaces";
-constexpr OUStringLiteral ID_DBG_PROPERTIES = u"Dbg_Properties";
-constexpr OUStringLiteral ID_DBG_METHODS = u"Dbg_Methods";
+constexpr OUString ID_DBG_SUPPORTEDINTERFACES = 
u"Dbg_SupportedInterfaces"_ustr;
+constexpr OUString ID_DBG_PROPERTIES = u"Dbg_Properties"_ustr;
+constexpr OUString ID_DBG_METHODS = u"Dbg_Methods"_ustr;
 
 char const aSeqLevelStr[] = "[]";
 
@@ -2743,15 +2743,15 @@ void SbUnoObject::implCreateDbgProperties()
 Property aProp;
 
 // Id == -1: display the implemented interfaces corresponding the 
ClassProvider
-auto xVarRef = tools::make_ref( 
OUString(ID_DBG_SUPPORTEDINTERFACES), SbxSTRING, SbxSTRING, aProp, -1, false, 
false );
+auto xVarRef = tools::make_ref( ID_DBG_SUPPORTEDINTERFACES, 
SbxSTRING, SbxSTRING, aProp, -1, false, false );
 QuickInsert( xVarRef.get() );
 
 // Id == -2: output the properties
-xVarRef = tools::make_ref( OUString(ID_DBG_PROPERTIES), 

[Libreoffice-commits] core.git: basegfx/test

[Stephan Bergmann (via logerrit)]

 basegfx/test/SvgPathImportExport.cxx |   32 
 basegfx/test/boxclipper.cxx  |2 +-
 basegfx/test/clipstate.cxx   |2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit f680e7998cf963edf8e788723af004cee794d7ae
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:03 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 13:37:47 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: basegfx

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

diff --git a/basegfx/test/SvgPathImportExport.cxx 
b/basegfx/test/SvgPathImportExport.cxx
index 955c47b239f2..b51da1b0dcfb 100644
--- a/basegfx/test/SvgPathImportExport.cxx
+++ b/basegfx/test/SvgPathImportExport.cxx
@@ -116,14 +116,14 @@ public:
 CPPUNIT_ASSERT_MESSAGE("importing simple rectangle from SVG-D",
utils::importFromSvgD( aPoly, aPath0, false, 
nullptr ));
 aExport = utils::exportToSvgD( aPoly, true, true, false );
-static constexpr OUStringLiteral sExportString = u"m10 10h-20v-20h20z";
+static constexpr OUString sExportString = u"m10 10h-20v-20h20z"_ustr;
 CPPUNIT_ASSERT_EQUAL_MESSAGE("exporting rectangle to SVG-D",
-   OUString(sExportString), aExport );
+   sExportString, aExport );
 CPPUNIT_ASSERT_MESSAGE("importing simple rectangle from SVG-D 
(round-trip",
utils::importFromSvgD( aPoly, aExport, false, 
nullptr ));
 aExport = utils::exportToSvgD( aPoly, true, true, false );
 CPPUNIT_ASSERT_EQUAL_MESSAGE("exporting rectangle to SVG-D 
(round-trip)",
-   OUString(sExportString), aExport);
+   sExportString, aExport);
 
 CPPUNIT_ASSERT_MESSAGE("importing simple bezier polygon from SVG-D",
utils::importFromSvgD( aPoly, aPath1, false, 
nullptr ));
@@ -143,11 +143,11 @@ public:
 
 // so for correct unit test i add the new exported string here as 
sExportStringSimpleBezier
 // and compare to it.
-static constexpr OUStringLiteral sExportStringSimpleBezier =
+static constexpr OUString sExportStringSimpleBezier =
 u"m11430 0c-8890 3810 5715 6985 5715 6985"
 "l-17145-1905c0 0 22860-10160 16510 6350"
-"s-3810-11430-3810-11430z";
-CPPUNIT_ASSERT_EQUAL_MESSAGE("exporting bezier polygon to SVG-D", 
OUString(sExportStringSimpleBezier), aExport);
+"s-3810-11430-3810-11430z"_ustr;
+CPPUNIT_ASSERT_EQUAL_MESSAGE("exporting bezier polygon to SVG-D", 
sExportStringSimpleBezier, aExport);
 
 // Adaptations for B2DPolygon bezier change (see #i77162#):
 
@@ -164,7 +164,7 @@ public:
 
 // same here, the corrected export with the corrected B2DPolygon is 
simply more efficient,
 // so i needed to change the compare string. Also adding the re-import 
comparison below.
-static constexpr OUStringLiteral sExportString1 =
+static constexpr OUString sExportString1 =
 u"m1917 1114c-89-189-233-284-430-284-167 0-306 91-419 273s-170 
370-17"
 "0 564c0 145 33 259 98 342 65 84 150 126 257 126q115.5 0 
231-57s147-97 210-176 99-143 109-190c38-199 76-398 114"
 "-598zm840 1646c-133 73-312 139-537 197-225 57-440 86-644 
87-483-1-866-132-1150-392-284-261-426-619-426-1076 0-"
@@ -173,21 +173,21 @@ public:
 "5c0-277 90-527 271-751 181-223 394-335 640-335 196 0 353 83 470 
250 13-68 26-136 41-204q144 0 288 0c-74 376-14"
 "8 752-224 1128-21 101-31 183-31 245 0 39 9 70 26 93 17 24 39 36 
67 36 145 0 279-80 400-240s182-365 182-615c0-2"
 "88-107-533-322-734s-487-301-816-301c-395 0-715 124-960 373s-368 
569-368 958q0 577.5 357 900c237 216 557 324 95"
-"8 325 189-1 389-27 600-77 211-52 378-110 503-174q40.5 105 81 
210z";
+"8 325 189-1 389-27 600-77 211-52 378-110 503-174q40.5 105 81 
210z"_ustr;
 CPPUNIT_ASSERT_MESSAGE("re-importing '@' from SVG-D", 
utils::importFromSvgD( aReImport, aExport, false, nullptr));
 CPPUNIT_ASSERT_EQUAL_MESSAGE("re-imported '@' needs to be identical", 
aPoly, aReImport);
 
-CPPUNIT_ASSERT_EQUAL_MESSAGE("exporting '@' to SVG-D", 
OUString(sExportString1), aExport);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("exporting '@' to SVG-D", sExportString1, 
aExport);
 CPPUNIT_ASSERT_MESSAGE("importing '@' from SVG-D (round-trip",
utils::importFromSvgD( aPoly, aExport, false, 
nullptr ));
 aExport = utils::exportToSvgD( aPoly, true, true, false );
 CPPUNIT_ASSERT_EQUAL_MESSAGE("exporting '@' to SVG-D (round-trip)",
-   

[Libreoffice-commits] core.git: cui/source cui/uiconfig include/unotools officecfg/registry sfx2/source sw/source unotools/source xmloff/source

[Balazs Varga (via logerrit)]

 cui/source/options/optinet2.cxx|4 
 cui/source/options/securityoptions.cxx |   39 +
 cui/source/options/securityoptions.hxx |   20 
 cui/uiconfig/ui/securityoptionsdialog.ui   |  406 -
 include/unotools/securityoptions.hxx   |4 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   36 +
 sfx2/source/doc/objcont.cxx|3 
 sfx2/source/doc/objserv.cxx|   10 
 sfx2/source/doc/objstor.cxx|3 
 sw/source/filter/ww8/docxattributeoutput.cxx   |   12 
 sw/source/filter/ww8/docxtableexport.cxx   |6 
 unotools/source/config/securityoptions.cxx |   36 +
 xmloff/source/draw/sdxmlexp.cxx|3 
 xmloff/source/text/XMLRedlineExport.cxx|6 
 xmloff/source/text/txtflde.cxx |3 
 15 files changed, 435 insertions(+), 156 deletions(-)

New commits:
commit 9f9e195dbabe07244622924bf609ab4676f16993
Author: Balazs Varga 
AuthorDate: Wed Oct 18 11:05:50 2023 +0200
Commit: Balazs Varga 
CommitDate: Thu Oct 19 14:15:52 2023 +0200

tdf#157484 UI: Add UI controls for personal information to be kept

or removed upon save.

With the new options button we can keep the security infos upon save
such as (even if we set the remove personal infos):

- RedLine Info
- Document User Info
- Author and date of notes
- Document version infos

Also on the infobar, if we have a warning, clicking on the infobar button
the security option dialog will open where we can set/modify these options.

follow-up of: 1f440348eb0892fd2c9597806d87b5fe9d60d49a
(tdf#157482 UI: Turn Security Warnings popup windows into infobars)

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

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 22cd480eb6a2..8ca6a5488a78 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -897,6 +897,10 @@ bool SvxSecurityTabPage::FillItemSet( SfxItemSet* )
 CheckAndSave( SvtSecurityOptions::EOption::DocWarnPrint, 
m_xSecOptDlg->IsPrintDocsChecked(), bModified );
 CheckAndSave( SvtSecurityOptions::EOption::DocWarnCreatePdf, 
m_xSecOptDlg->IsCreatePdfChecked(), bModified );
 CheckAndSave( SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo, 
m_xSecOptDlg->IsRemovePersInfoChecked(), bModified );
+CheckAndSave( SvtSecurityOptions::EOption::DocWarnKeepRedlineInfo, 
m_xSecOptDlg->IsRemoveRedlineInfoChecked(), bModified );
+CheckAndSave( SvtSecurityOptions::EOption::DocWarnKeepDocUserInfo, 
m_xSecOptDlg->IsRemoveDocUserInfoChecked(), bModified );
+CheckAndSave( 
SvtSecurityOptions::EOption::DocWarnKeepNoteAuthorDateInfo, 
m_xSecOptDlg->IsRemoveNoteAuthorInfoChecked(), bModified );
+CheckAndSave( SvtSecurityOptions::EOption::DocWarnKeepDocVersionInfo, 
m_xSecOptDlg->IsRemoveDocVersionInfoChecked(), bModified );
 CheckAndSave( SvtSecurityOptions::EOption::DocWarnRecommendPassword, 
m_xSecOptDlg->IsRecommPasswdChecked(), bModified );
 CheckAndSave( SvtSecurityOptions::EOption::CtrlClickHyperlink, 
m_xSecOptDlg->IsCtrlHyperlinkChecked(), bModified );
 CheckAndSave( SvtSecurityOptions::EOption::BlockUntrustedRefererLinks, 
m_xSecOptDlg->IsBlockUntrustedRefererLinksChecked(), bModified );
diff --git a/cui/source/options/securityoptions.cxx 
b/cui/source/options/securityoptions.cxx
index 4b00176ab490..d583f626183e 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -54,6 +54,25 @@ SecurityOptionsDialog::SecurityOptionsDialog(weld::Window* 
pParent)
 , m_xCtrlHyperlinkImg(m_xBuilder->weld_widget("lockctrlclick"))
 , 
m_xBlockUntrustedRefererLinksCB(m_xBuilder->weld_check_button("blockuntrusted"))
 , 
m_xBlockUntrustedRefererLinksImg(m_xBuilder->weld_widget("lockblockuntrusted"))
+, m_xRedlineinfoCB(m_xBuilder->weld_check_button("redlineinfo"))
+, m_xRedlineinfoImg(m_xBuilder->weld_widget("lockredlineinfo"))
+, m_xDocPropertiesCB(m_xBuilder->weld_check_button("docproperties"))
+, m_xDocPropertiesImg(m_xBuilder->weld_widget("lockdocproperties"))
+, m_xNoteAuthorCB(m_xBuilder->weld_check_button("noteauthor"))
+, m_xNoteAuthorImg(m_xBuilder->weld_widget("locknoteauthor"))
+, m_xDocumentVersionCB(m_xBuilder->weld_check_button("documentversion"))
+, m_xDocumentVersionImg(m_xBuilder->weld_widget("lockdocumentversion"))
+{
+m_xRemovePersInfoCB->connect_toggled(LINK(this, SecurityOptionsDialog, 
ShowPersonalInfosToggle));
+init();

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

[Balazs Varga (via logerrit)]

 sc/source/filter/xml/xmlexprt.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 87e1a77a9aadb883386816dc4ebc3dad64c81892
Author: Balazs Varga 
AuthorDate: Wed Oct 18 13:52:16 2023 +0200
Commit: Balazs Varga 
CommitDate: Thu Oct 19 14:16:09 2023 +0200

tdf#156336 - sc ods: fix can't remove Calc comment metadata

Remove Calc comment metadata (author, date) during ods export
if the Remove personal information option is enable.

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

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 2ac992a20930..9acae7b1ec0d 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3714,16 +3714,22 @@ void ScXMLExport::exportAnnotationMeta( const 
uno::Reference < drawing::XShape >
 if (xCurrentShape.get()!=xShape.get())
 return;
 
+bool bRemovePersonalInfo = SvtSecurityOptions::IsOptionSet(
+SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo) && 
!SvtSecurityOptions::IsOptionSet(
+SvtSecurityOptions::EOption::DocWarnKeepNoteAuthorDateInfo);
+
 const OUString& sAuthor(pNote->GetAuthor());
 if (!sAuthor.isEmpty())
 {
 SvXMLElementExport aCreatorElem( *this, XML_NAMESPACE_DC,
 XML_CREATOR, true,
 false );
-Characters(sAuthor);
+Characters( bRemovePersonalInfo
+? "Author" + OUString::number(SvXMLExport::GetInfoID(sAuthor))
+: sAuthor );
 }
 
-const OUString& aDate(pNote->GetDate());
+const OUString& aDate(bRemovePersonalInfo ? OUString("1970-01-01") : 
pNote->GetDate()); // Epoch time
 if (pDoc)
 {
 SvNumberFormatter* pNumForm = pDoc->GetFormatTable();

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

[Stephan Bergmann (via logerrit)]

 cppuhelper/source/component_context.cxx |2 +-
 cppuhelper/source/macro_expander.cxx|4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 15b86648f031bb2b44b23a1826ad4ac2a00884b3
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:08 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 14:41:21 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: cppuhelper

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

diff --git a/cppuhelper/source/component_context.cxx 
b/cppuhelper/source/component_context.cxx
index 21604a6bcd1b..da070bdf027c 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -47,7 +47,7 @@
 #include 
 #include 
 
-constexpr OUStringLiteral SMGR_SINGLETON = 
u"/singletons/com.sun.star.lang.theServiceManager";
+constexpr OUString SMGR_SINGLETON = 
u"/singletons/com.sun.star.lang.theServiceManager"_ustr;
 constexpr OUStringLiteral TDMGR_SINGLETON = 
u"/singletons/com.sun.star.reflection.theTypeDescriptionManager";
 constexpr OUStringLiteral AC_SINGLETON = 
u"/singletons/com.sun.star.security.theAccessController";
 
diff --git a/cppuhelper/source/macro_expander.cxx 
b/cppuhelper/source/macro_expander.cxx
index 0cf2fe99d268..ce227a7e76f4 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -34,8 +34,8 @@
 #include "macro_expander.hxx"
 #include "paths.hxx"
 
-constexpr OUStringLiteral SERVICE_NAME_A = u"com.sun.star.lang.MacroExpander";
-constexpr OUStringLiteral SERVICE_NAME_B = 
u"com.sun.star.lang.BootstrapMacroExpander";
+constexpr OUString SERVICE_NAME_A = u"com.sun.star.lang.MacroExpander"_ustr;
+constexpr OUString SERVICE_NAME_B = 
u"com.sun.star.lang.BootstrapMacroExpander"_ustr;
 constexpr OUStringLiteral IMPL_NAME = 
u"com.sun.star.lang.comp.cppuhelper.BootstrapMacroExpander";
 
 using namespace ::osl;

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

[Noel Grandin (via logerrit)]

 xmloff/source/draw/shapeimport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d8b7558d8a462649fa3b2df2748e92377917e3fd
Author: Noel Grandin 
AuthorDate: Thu Oct 19 12:07:26 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 19 16:03:34 2023 +0200

SAL_WARN->SAL_INFO in XMLShapeImportHelper::CreateGroupChildContext

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

diff --git a/xmloff/source/draw/shapeimport.cxx 
b/xmloff/source/draw/shapeimport.cxx
index 5b0e6d101787..5186c8be2b47 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -341,7 +341,7 @@ SvXMLShapeContext* 
XMLShapeImportHelper::CreateGroupChildContext(
 return new SdXMLShapeLinkContext( rImport, xAttrList, rShapes );
 // add other shapes here...
 default:
-XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement);
+XMLOFF_INFO_UNKNOWN_ELEMENT("xmloff", nElement);
 return new SvXMLShapeContext( rImport, bTemporaryShape );
 }
 

[Libreoffice-commits] core.git: include/rtl

[Stephan Bergmann (via logerrit)]

 include/rtl/string.hxx  |   13 -
 include/rtl/ustring.hxx |7 ++-
 2 files changed, 6 insertions(+), 14 deletions(-)

New commits:
commit e6ca379bcbe7d9fb426cf8944f24e345e8856d3f
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 13:21:20 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 17:16:29 2023 +0200

Clean up some C++20 TODOs

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

diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 62bf0530e819..55b83d675d8d 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -36,6 +36,7 @@
 #include 
 
 #if defined LIBO_INTERNAL_ONLY
+#include 
 #include 
 #include 
 #endif
@@ -98,10 +99,7 @@ public:
 OStringLiteral(char const ()[N]) {
 assertLayout();
 assert(literal[N - 1] == '\0');
-//TODO: Use C++20 constexpr std::copy_n (P0202R3):
-for (std::size_t i = 0; i != N; ++i) {
-more.buffer[i] = literal[i];
-}
+std::copy_n(literal, N, more.buffer);
 }
 
 #if !(defined _MSC_VER && _MSC_VER >= 1930 && _MSC_VER <= 1938 && defined 
_MANAGED)
@@ -113,10 +111,7 @@ public:
 OStringLiteral(char8_t const ()[N]) {
 assertLayout();
 assert(literal[N - 1] == '\0');
-//TODO: Use C++20 constexpr std::copy_n (P0202R3):
-for (std::size_t i = 0; i != N; ++i) {
-more.buffer[i] = literal[i];
-}
+std::copy_n(literal, N, more.buffer);
 }
 #endif
 
@@ -141,7 +136,7 @@ private:
 
 oslInterlockedCount refCount = 0x4000; // SAL_STRING_STATIC_FLAG 
(sal/rtl/strimp.hxx)
 sal_Int32 length = N - 1;
-char buffer[N] = {}; //TODO: drop initialization for C++20 (P1331R2)
+char buffer[N];
 };
 
 public:
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index cd23f121e2ac..cad8cc10ac48 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -96,10 +96,7 @@ public:
 OUStringLiteral(char16_t const ()[N]) {
 assertLayout();
 assert(literal[N - 1] == '\0');
-//TODO: Use C++20 constexpr std::copy_n (P0202R3):
-for (std::size_t i = 0; i != N; ++i) {
-more.buffer[i] = literal[i];
-}
+std::copy_n(literal, N, more.buffer);
 }
 
 constexpr sal_Int32 getLength() const { return more.length; }
@@ -123,7 +120,7 @@ private:
 
 oslInterlockedCount refCount = 0x4000; // SAL_STRING_STATIC_FLAG 
(sal/rtl/strimp.hxx)
 sal_Int32 length = N - 1;
-sal_Unicode buffer[N] = {}; //TODO: drop initialization for C++20 
(P1331R2)
+sal_Unicode buffer[N];
 };
 
 public:

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

[Miklos Vajna (via logerrit)]

 sw/source/core/layout/frmtool.cxx |   35 -
 sw/source/core/text/itrform2.cxx  |   45 ++
 2 files changed, 32 insertions(+), 48 deletions(-)

New commits:
commit b967e0978276b58cbdc8db7fb215aa0fa07241c3
Author: Miklos Vajna 
AuthorDate: Wed Oct 18 08:52:44 2023 +0200
Commit: Xisco Fauli 
CommitDate: Thu Oct 19 16:42:26 2023 +0200

tdf#157573 sw floattable: fix incorrect lack of left margin after table

Regression from d477fa8ac1b0d3ee81427217bbb5950278ab16db (sw floattable:
unconditionally map  to SwFormatFlySplit, 2023-03-17), the
paragraph after the anchor of the floating table in the document lost
its left paragraph margin at a layout level.

Turns out the problem was there earlier, but it was hidden for this
specific document, because we used to map DOCX floating tables to Writer
inline tables in some cases before. The real problem was introduced
earlier, in my 50a1df360c907d8419ce49f098b6bc87a37a9956 (n#775899 sw:
add FloattableNomargins compat flag, 2012-08-23), even a TODO was added
to point out this will be problematic. The old bugdoc wants to get rid
of margins, because the floating table is already shifting text towards
the right, the new bugdoc wants to keep the original margin as the
paragraph after the anchor is not wrapping.

Fix the problem by reverting the older fix and re-fix the old document
differently. Don't do changes to the paragraph margin: that's not a good
idea. If there is enough anchor text, it'll lead to a visibly bad
paragraph margin anyway. Instead of reducing the paragraph margin,
reduce the width of the fly portion in the paragraphs that intersect
with the floating table. That's reasonly straightforward to do, because
SwTextFormatter::CalcFlyWidth() already has a case when we know we're
intersecting with a floating table and we also know that the floating
table is aligned to the left. In this case we can simply reduce the fly
portion width with the paragraph margin. This keeps the old bugdoc fixed
and fixes the new bugdoc.

It also means that DocumentSettingId::FLOATTABLE_NOMARGINS is now
effectively unused, but that's not yet removed in this change.

Change-Id: Ibaccc4807fd8c11bd45955b76e96cd4a5e55976f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158103
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158176

diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index 7f27932434c6..853f363f38e8 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2367,25 +2367,6 @@ tools::Long SwBorderAttrs::CalcRight( const SwFrame* 
pCaller ) const
 return nRight;
 }
 
-/// Tries to detect if this paragraph has a floating table attached.
-static bool lcl_hasTabFrame(const SwTextFrame* pTextFrame)
-{
-if (pTextFrame->GetDrawObjs())
-{
-const SwSortedObjs* pSortedObjs = pTextFrame->GetDrawObjs();
-if (pSortedObjs->size() > 0)
-{
-SwAnchoredObject* pObject = (*pSortedObjs)[0];
-if (auto pFly = pObject->DynCastFlyFrame())
-{
-if (pFly->Lower() && pFly->Lower()->IsTabFrame())
-return true;
-}
-}
-}
-return false;
-}
-
 tools::Long SwBorderAttrs::CalcLeft( const SwFrame *pCaller ) const
 {
 tools::Long nLeft=0;
@@ -2405,23 +2386,9 @@ tools::Long SwBorderAttrs::CalcLeft( const SwFrame 
*pCaller ) const
 nLeft += m_pRightMargin->GetRight();
 else
 {
-bool bIgnoreMargin = false;
 if (pCaller->IsTextFrame())
 {
-const SwTextFrame* pTextFrame = static_cast(pCaller);
-if 
(pTextFrame->GetDoc().GetDocumentSettingManager().get(DocumentSettingId::FLOATTABLE_NOMARGINS))
-{
-// If this is explicitly requested, ignore the margins next to 
the floating table.
-if (lcl_hasTabFrame(pTextFrame))
-bIgnoreMargin = true;
-// TODO here we only handle the first two paragraphs, would be 
nice to generalize this.
-else if (pTextFrame->FindPrev() && 
pTextFrame->FindPrev()->IsTextFrame() && lcl_hasTabFrame(static_cast(pTextFrame->FindPrev(
-bIgnoreMargin = true;
-}
-if (!bIgnoreMargin)
-{
-nLeft += m_pTextLeftMargin->GetLeft(*m_pFirstLineIndent);
-}
+nLeft += m_pTextLeftMargin->GetLeft(*m_pFirstLineIndent);
 }
 else
 nLeft += m_xLR->GetLeft();
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index c44b831d2a63..51c2d7a9423f 100644
--- a/sw/source/core/text/itrform2.cxx
+++ 

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

[Noel Grandin (via logerrit)]

 vcl/source/filter/png/PngImageReader.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 3a1cf7a24cfbf65adbbe692ac6f8c1b55c7807fe
Author: Noel Grandin 
AuthorDate: Thu Oct 19 12:07:12 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 19 16:19:24 2023 +0200

use png_set_keep_unknown_chunks

so we don't see unnecessary warnings about the exIf chunks we use

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

diff --git a/vcl/source/filter/png/PngImageReader.cxx 
b/vcl/source/filter/png/PngImageReader.cxx
index a949f856646e..860bd807a685 100644
--- a/vcl/source/filter/png/PngImageReader.cxx
+++ b/vcl/source/filter/png/PngImageReader.cxx
@@ -329,6 +329,8 @@ bool reader(SvStream& rStream, Graphic& rGraphic,
 
 APNGInfo aAPNGInfo;
 png_set_read_user_chunk_fn(pPng, , _unknown_chunk);
+// don't complain about vpAg and exIf chunks
+png_set_keep_unknown_chunks(pPng, 2, nullptr, 0);
 
 png_infop pInfo = png_create_info_struct(pPng);
 if (!pInfo)

ESC meeting minutes: 2023-10-19

[Miklos Vajna]

* Present:
+ Hossein, Olivier, Cloph, Heiko, Ilmari, Michael W, Stephan, Caolan, 
Stephane, Xisco, Eike, Michael S, Miklos

* Completed Action Items:

* Pending Action Items:
+ Set up a daily tinderbox for the python-based windows installer (Cloph)

* Release Engineering update (Cloph)
+ 7.6 status: 7.6.3 rc1 in 2 weeks (+2 weeks: next rc)
+ 7.5 status: 7.5.8 rc2 in 1 week
+ 24.2: end of Nov, in week 47, first alpha
  + feature freeze in early Dec
  + see https://wiki.documentfoundation.org/ReleasePlan/24.2 for details
  + might be some small shifts of 1-2 weeks in either direction

* Documentation (Olivier)
+ Helpcontents
   + Continuing update of UI and UNO help pages (ohallot)
   + Fixes by translators (S. Horacek, buovjaga)

+ Guides
   + Updates in Getting Started Guide (Rob Thornton, ohallot)
   + Updates in Calc Guide (S. Fanning)
   + Updates in Impress/Draw guides (P. Schofield)
   + Progress in guide sanitiy-check scripts (B. Antonio)

+ Bugzilla Documentation statistics
272(272) bugs open
+ Updates:
BZ changes   1 week   1 month   3 months   12 months
   created 4(-1)20(-1) 66(-8) 292(-2)
 commented 9(0) 43(-3)212(-25)   1080(-2)
  resolved 2(2)  5(-1) 29(-3) 157(-2)
+ top 10 contributors:
  Ilmari Lauhakangas made 15 changes in 1 month, and 125 changes in 1 
year
  Stéphane Guillou made 14 changes in 1 month, and 352 changes in 1 year
  Olivier Hallot made 9 changes in 1 month, and 429 changes in 1 year
  Kaganski, Mike made 8 changes in 1 month, and 78 changes in 1 year
  aswath t made 7 changes in 1 month, and 7 changes in 1 year
  Xisco Fauli made 4 changes in 1 month, and 14 changes in 1 year
  Rathke, Eike made 2 changes in 1 month, and 10 changes in 1 year
  Elisabeth Dapper made 1 changes in 1 month, and 1 changes in 1 year
  MISY Nyias made 1 changes in 1 month, and 1 changes in 1 year
  wrigh made 1 changes in 1 month, and 1 changes in 1 year

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
254(254) (topicUI) bugs open, 56(56) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month3 months   12 months
 added  1(-18)17(-9) 19(-13) 42(-14)
 commented 41(-21)   141(-68)   400(-74)   2169(-93)
   removed  1(0)   2(1)   3(1)   20(0)
  resolved 11(8)  30(4)  86(2)  324(5)
+ top 10 contributors:
  Heiko Tietze made 110 changes in 1 month, and 1364 changes in 1 year
  Stéphane Guillou made 87 changes in 1 month, and 532 changes in 1 year
  Ilmari Lauhakangas made 27 changes in 1 month, and 229 changes in 1 
year
  Justin Luth made 22 changes in 1 month, and 114 changes in 1 year
  Eyal Rozenberg made 18 changes in 1 month, and 247 changes in 1 year
  Kelemen, Gabor made 18 changes in 1 month, and 24 changes in 1 year
  Bogdan B made 15 changes in 1 month, and 111 changes in 1 year
  Balazs Varga made 14 changes in 1 month, and 14 changes in 1 year
  Roman Kuznetsov made 6 changes in 1 month, and 123 changes in 1 year
  Dieter made 5 changes in 1 month, and 233 changes in 1 year
+ [Bug 157605] Table rows are split into several lines when copying the 
table
   from Writer to a plain text program
+ [Bug 157788] Saving the "Show navigation panel" setting for a device
+ [Bug 157747] Calc select all rows and columns corner should hint at its 
function
+ [Bug 157716] Rename "Language settings" to "Language and Locale"
+ [Bug 148023] Numbering list tooltips doesn't show correct content for
   non-Latin locale
+ [Bug 157681] Add an opportunity to hide any file (but not to delete it) in
   master document like a slide in a presentation
+ [Bug 157420] Allow setting a default Date and Time subtype (fixed vs 
non-fixed)
   and format so they can be inserted with shortcuts
 -> + [Bug 157649] Dialog button accelerators should work without Alt key on 
Windows
+ [Bug 157627] Paste number format only

* Crash Testing (Caolan)
+ 6(-6) import failure, 0(+0) export failures

new run underway that includes mstahl's latest fix

+ 1 coverity issues

parse issue, some trickiness with std::pair and new _ustr (maybe)

+ 1 ossfuzz issue

one timeout


* Crash Reporting (Xisco)
+ 7.5.6.22328 (+245)
+ 7.5.7.11190 (+371)
+ 7.6.0.312800 (+673)
+ 7.6.1.26140 (+394)
+ 7.6.2.14348 (+1292)


Regressions / new in 7.6 branch

- 
https://crashreport.libreoffice.org/stats/signature/SwNodeIndex::SwNodeIndex(SwNode%20*)


- 

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

[Michael Stahl (via logerrit)]

 sw/source/core/text/EnhancedPDFExportHelper.cxx|3 
 sw/source/core/text/frmpaint.cxx   |4 
 sw/source/core/text/itrpaint.cxx   |   21 +-
 vcl/qa/cppunit/pdfexport/data/LO_Lbl_Lbody_bug_report.fodt |  125 +
 vcl/qa/cppunit/pdfexport/pdfexport.cxx |   83 
 5 files changed, 227 insertions(+), 9 deletions(-)

New commits:
commit 7cb283cf0e92cba4bd53b1cd69816ac7037937e4
Author: Michael Stahl 
AuthorDate: Wed Oct 18 19:15:22 2023 +0200
Commit: Michael Stahl 
CommitDate: Thu Oct 19 17:15:48 2023 +0200

tdf#157703 sw: PDF/UA export: fix headings with labels

The problem is that the new Lbl/LBody elements are produced even for
outline nodes, but those aren't represented as lists at all, but as
headings H1..H10.

Plausible representation of the heading label could be in a Lbl element
inside H1, or simply as plain text; i can't find any recommendation
either way.

Let's try Lbl inside H1, neither veraPDF nor PAC3 complain about it.

(regression from commit 9b38beadf9eaf027b201cdf0ecb2bce5611014dd)

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

diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx 
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index b71b699b8e36..50e62aeff964 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -1305,7 +1305,8 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
 const SwTextNode *const 
pTextNd(rTextFrame.GetTextNodeForParaProps());
 
 // lazy open LBody after Lbl
-if 
(rTextFrame.GetPara()->HasNumberingPortion(SwParaPortion::OnlyNumbering))
+if (!pTextNd->IsOutline()
+&& 
rTextFrame.GetPara()->HasNumberingPortion(SwParaPortion::OnlyNumbering))
 {
 sal_Int32 const nId = BeginTagImpl(nullptr, 
vcl::PDFWriter::LIBody, aListBodyString);
 SwNodeNum const*const 
pNodeNum(pTextNd->GetNum(rTextFrame.getRootFrame()));
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 43f5922999d4..57458a021817 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -692,7 +692,9 @@ void SwTextFrame::PaintSwFrame(vcl::RenderContext& 
rRenderContext, SwRect const&
 // Paragraph tag - if there is a list label, opening should be delayed.
 ::std::optional oTaggedParagraph;
 
-if (isPDFTaggingEnabled && 
!GetPara()->HasNumberingPortion(SwParaPortion::FootnoteToo))
+if (isPDFTaggingEnabled
+&& (GetTextNodeForParaProps()->IsOutline()
+|| !GetPara()->HasNumberingPortion(SwParaPortion::FootnoteToo)))
 {   // no Lbl needed => open paragraph tag now
 Frame_Info aFrameInfo(*this, false);
 oTaggedParagraph.emplace(nullptr, , nullptr, 
rRenderContext);
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 620838d10171..6d07ef7dc468 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -153,7 +153,8 @@ void SwTextPainter::DrawTextLine( const SwRect , 
SwSaveClip ,
 bool bSkippedNumPortions(false);
 SwLinePortion *pPor = bEndPor ? m_pCurr->GetFirstPortion() : 
CalcPaintOfst(rPaint, bSkippedNumPortions);
 
-if (bSkippedNumPortions) // ugly but hard to check earlier in PaintSwFrame:
+if (bSkippedNumPortions // ugly but hard to check earlier in PaintSwFrame:
+&& !GetInfo().GetTextFrame()->GetTextNodeForParaProps()->IsOutline())
 {   // there is a num portion but it is outside of the frame area and not 
painted
 assert(!roTaggedLabel);
 assert(!roTaggedParagraph);
@@ -436,9 +437,12 @@ void SwTextPainter::DrawTextLine( const SwRect , 
SwSaveClip ,
 {
 assert(roTaggedLabel);
 roTaggedLabel.reset(); // close Lbl
-assert(!roTaggedParagraph);
-Frame_Info aFrameInfo(*m_pFrame, false); // open LBody
-roTaggedParagraph.emplace(nullptr, , nullptr, *pOut);
+if 
(!GetInfo().GetTextFrame()->GetTextNodeForParaProps()->IsOutline())
+{
+assert(!roTaggedParagraph);
+Frame_Info aFrameInfo(*m_pFrame, false); // open LBody
+roTaggedParagraph.emplace(nullptr, , nullptr, 
*pOut);
+}
 }
 
 // reset underline font
@@ -461,7 +465,7 @@ void SwTextPainter::DrawTextLine( const SwRect , 
SwSaveClip ,
  pNext && pNext->IsHolePortion() ) ?
pNext :
nullptr;
-if (!pPor && isPDFTaggingEnabled && !roTaggedParagraph)
+if (!pPor && isPDFTaggingEnabled && (roTaggedLabel || 

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

[Julien Nabet (via logerrit)]

 dbaccess/source/core/dataaccess/datasource.cxx |1 +
 dbaccess/source/ui/app/AppController.cxx   |8 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 7f3ab74eb62ec83d6fc4432979654944f27de7b4
Author: Julien Nabet 
AuthorDate: Thu Oct 19 11:13:59 2023 +0200
Commit: Julien Nabet 
CommitDate: Thu Oct 19 18:20:12 2023 +0200

Related tdf#144256: missing removePropertyChangeListener calls in 
AppController

Compare and use same order as in 
dbaccess/source/core/dataaccess/datasource.cxx

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

diff --git a/dbaccess/source/core/dataaccess/datasource.cxx 
b/dbaccess/source/core/dataaccess/datasource.cxx
index 55c161b854d1..eaa580a3a66d 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -735,6 +735,7 @@ Reference< XPropertySetInfo >  
ODatabaseSource::getPropertySetInfo()
 return new ::cppu::OPropertyArrayHelper
 {
 {
+// a change here means a change should also been done in 
OApplicationController::disposing()
 { PROPERTY_INFO, PROPERTY_ID_INFO, cppu::UnoType>::get(), css::beans::PropertyAttribute::BOUND },
 { PROPERTY_ISPASSWORDREQUIRED, PROPERTY_ID_ISPASSWORDREQUIRED, 
cppu::UnoType::get(), css::beans::PropertyAttribute::BOUND },
 { PROPERTY_ISREADONLY, PROPERTY_ID_ISREADONLY, 
cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY },
diff --git a/dbaccess/source/ui/app/AppController.cxx 
b/dbaccess/source/ui/app/AppController.cxx
index f9b818db663f..61c0940e98a1 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -327,14 +327,20 @@ void SAL_CALL OApplicationController::disposing()
 
 if ( m_xDataSource.is() )
 {
+// Should correspond to ODatabaseSource::createArrayHelper in 
dbaccess/source/core/dataaccess/datasource.cxx
 m_xDataSource->removePropertyChangeListener(OUString(), this);
 m_xDataSource->removePropertyChangeListener(PROPERTY_INFO, this);
-m_xDataSource->removePropertyChangeListener(PROPERTY_URL, this);
 
m_xDataSource->removePropertyChangeListener(PROPERTY_ISPASSWORDREQUIRED, this);
+m_xDataSource->removePropertyChangeListener(PROPERTY_ISREADONLY, 
this);
 
m_xDataSource->removePropertyChangeListener(PROPERTY_LAYOUTINFORMATION, this);
+m_xDataSource->removePropertyChangeListener(PROPERTY_NAME, this);
+
m_xDataSource->removePropertyChangeListener(PROPERTY_NUMBERFORMATSSUPPLIER, 
this);
+m_xDataSource->removePropertyChangeListener(PROPERTY_PASSWORD, 
this);
+m_xDataSource->removePropertyChangeListener(PROPERTY_SETTINGS, 
this);
 
m_xDataSource->removePropertyChangeListener(PROPERTY_SUPPRESSVERSIONCL, this);
 m_xDataSource->removePropertyChangeListener(PROPERTY_TABLEFILTER, 
this);
 
m_xDataSource->removePropertyChangeListener(PROPERTY_TABLETYPEFILTER, this);
+m_xDataSource->removePropertyChangeListener(PROPERTY_URL, this);
 m_xDataSource->removePropertyChangeListener(PROPERTY_USER, this);
 m_xDataSource = nullptr;
 }

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

[Patrick Luby (via logerrit)]

 vcl/source/gdi/impgraph.cxx   |   11 +++
 vcl/source/gdi/pdfwriter_impl.cxx |   18 ++
 2 files changed, 21 insertions(+), 8 deletions(-)

New commits:
commit ebb3dc3162730dad34595d390cd731b5cfaeb1ea
Author: Patrick Luby 
AuthorDate: Wed Oct 11 19:53:18 2023 -0400
Commit: Patrick Luby 
CommitDate: Thu Oct 19 18:25:47 2023 +0200

tdf#157680 scale down size and adjust size and scale factor for /BBox

The size of an embedded PDF files is multiplied by
PDF_INSERT_MAGIC_SCALE_FACTOR for platforms like macOS so undo that
by adjusting the size and scale factor.

For some unknown reason, when exporting the following PDF, the
estimated size of embedded PDF charts are 20x larger than expected.
This only occurs on macOS so possibly there is some special conversion
from MapUnit::MapPoint to MapUnit::MapTwip elsewhere in the code:

  https://bugs.documentfoundation.org/attachment.cgi?id=190109

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

diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index ca63d8645063..36b9b7ffef1b 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -793,6 +793,17 @@ Size ImpGraphic::getPrefSize() const
 // svg not yet buffered in maBitmapEx, return size 
derived from range
 const basegfx::B2DRange& rRange = 
maVectorGraphicData->getRange();
 
+#ifdef MACOSX
+// tdf#157680 scale down estimated size of embedded PDF
+// For some unknown reason, the embedded PDF sizes
+// are 20x larger than expected. This only occurs on
+// macOS so possibly there is some special conversion
+// from MapUnit::MapPoint to MapUnit::MapTwip elsewhere
+// in the code.
+if (maVectorGraphicData->getType() == 
VectorGraphicDataType::Pdf)
+   aSize = Size(basegfx::fround(rRange.getWidth() / 
20.0f), basegfx::fround(rRange.getHeight() / 20.0f));
+else
+#endif
 aSize = Size(basegfx::fround(rRange.getWidth()), 
basegfx::fround(rRange.getHeight()));
 }
 else
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 28935f59a5a5..9f2f75be6d93 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -68,6 +68,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -8970,6 +8971,7 @@ void PDFWriterImpl::writeReferenceXObject(const 
ReferenceXObjectEmit& rEmit)
 // vcl::ImportPDF() uses getDefaultPdfResolutionDpi to set the desired
 // rendering DPI so we have to take into account that here too.
 static const double fResolutionDPI = 
vcl::pdf::getDefaultPdfResolutionDpi();
+static const double fMagicScaleFactor = PDF_INSERT_MAGIC_SCALE_FACTOR;
 
 sal_Int32 nOldDPIX = GetDPIX();
 sal_Int32 nOldDPIY = GetDPIY();
@@ -8984,15 +8986,13 @@ void PDFWriterImpl::writeReferenceXObject(const 
ReferenceXObjectEmit& rEmit)
 sal_Int32 nWrappedFormObject = 0;
 if (!m_aContext.UseReferenceXObject)
 {
-#ifdef MACOSX
 // tdf#156842 increase scale for external PDF data
-// For some unknown reason, the scale is 8 times larger than for
-// non-external PDF XObjects.
+// Multiply PDF_INSERT_MAGIC_SCALE_FACTOR for platforms like macOS
+// that scale all images by this number.
 // This fix also allows the CppunitTest_vcl_pdfexport to run
 // successfully on macOS.
-fScaleX = 8.0 / aSize.Width();
-fScaleY = 8.0 / aSize.Height();
-#endif
+fScaleX = fMagicScaleFactor / aSize.Width();
+fScaleY = fMagicScaleFactor / aSize.Height();
 
 // Parse the PDF data, we need that to write the PDF dictionary of our
 // object.
@@ -9234,9 +9234,11 @@ void PDFWriterImpl::writeReferenceXObject(const 
ReferenceXObjectEmit& rEmit)
 appendDouble(fScaleY, aLine);
 aLine.append(" 0 0 ]");
 aLine.append(" /BBox [ 0 0 ");
-aLine.append(aSize.Width());
+// tdf#157680 reduce size by magic scale factor in /BBox
+aLine.append(aSize.Width() / fMagicScaleFactor);
 aLine.append(" ");
-aLine.append(aSize.Height());
+// tdf#157680 reduce size by magic scale factor in /BBox
+aLine.append(aSize.Height() / fMagicScaleFactor);
 aLine.append(" ]\n");
 
 if (m_aContext.UseReferenceXObject && rEmit.m_nEmbeddedObject > 0)

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

[Patrick Luby (via logerrit)]

 vcl/source/gdi/impgraph.cxx   |   11 +++
 vcl/source/gdi/pdfwriter_impl.cxx |   18 ++
 2 files changed, 21 insertions(+), 8 deletions(-)

New commits:
commit 5d347c3d72a1d05f998f93f1e1ffea0b55457217
Author: Patrick Luby 
AuthorDate: Wed Oct 11 19:53:18 2023 -0400
Commit: Patrick Luby 
CommitDate: Thu Oct 19 18:25:14 2023 +0200

tdf#157680 scale down size and adjust size and scale factor for /BBox

The size of an embedded PDF files is multiplied by
PDF_INSERT_MAGIC_SCALE_FACTOR for platforms like macOS so undo that
by adjusting the size and scale factor.

For some unknown reason, when exporting the following PDF, the
estimated size of embedded PDF charts are 20x larger than expected.
This only occurs on macOS so possibly there is some special conversion
from MapUnit::MapPoint to MapUnit::MapTwip elsewhere in the code:

  https://bugs.documentfoundation.org/attachment.cgi?id=190109

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

diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index f3f877d3b939..780e2c26fd15 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -788,6 +788,17 @@ Size ImpGraphic::getPrefSize() const
 // svg not yet buffered in maBitmapEx, return size 
derived from range
 const basegfx::B2DRange& rRange = 
maVectorGraphicData->getRange();
 
+#ifdef MACOSX
+// tdf#157680 scale down estimated size of embedded PDF
+// For some unknown reason, the embedded PDF sizes
+// are 20x larger than expected. This only occurs on
+// macOS so possibly there is some special conversion
+// from MapUnit::MapPoint to MapUnit::MapTwip elsewhere
+// in the code.
+if (maVectorGraphicData->getType() == 
VectorGraphicDataType::Pdf)
+   aSize = Size(basegfx::fround(rRange.getWidth() / 
20.0f), basegfx::fround(rRange.getHeight() / 20.0f));
+else
+#endif
 aSize = Size(basegfx::fround(rRange.getWidth()), 
basegfx::fround(rRange.getHeight()));
 }
 else
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 2d5fe724a4ac..506fde66b6c7 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -71,6 +71,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -9111,6 +9112,7 @@ void PDFWriterImpl::writeReferenceXObject(const 
ReferenceXObjectEmit& rEmit)
 // vcl::ImportPDF() uses getDefaultPdfResolutionDpi to set the desired
 // rendering DPI so we have to take into account that here too.
 static const double fResolutionDPI = 
vcl::pdf::getDefaultPdfResolutionDpi();
+static const double fMagicScaleFactor = PDF_INSERT_MAGIC_SCALE_FACTOR;
 
 sal_Int32 nOldDPIX = GetDPIX();
 sal_Int32 nOldDPIY = GetDPIY();
@@ -9125,15 +9127,13 @@ void PDFWriterImpl::writeReferenceXObject(const 
ReferenceXObjectEmit& rEmit)
 sal_Int32 nWrappedFormObject = 0;
 if (!m_aContext.UseReferenceXObject)
 {
-#ifdef MACOSX
 // tdf#156842 increase scale for external PDF data
-// For some unknown reason, the scale is 8 times larger than for
-// non-external PDF XObjects.
+// Multiply PDF_INSERT_MAGIC_SCALE_FACTOR for platforms like macOS
+// that scale all images by this number.
 // This fix also allows the CppunitTest_vcl_pdfexport to run
 // successfully on macOS.
-fScaleX = 8.0 / aSize.Width();
-fScaleY = 8.0 / aSize.Height();
-#endif
+fScaleX = fMagicScaleFactor / aSize.Width();
+fScaleY = fMagicScaleFactor / aSize.Height();
 
 // Parse the PDF data, we need that to write the PDF dictionary of our
 // object.
@@ -9375,9 +9375,11 @@ void PDFWriterImpl::writeReferenceXObject(const 
ReferenceXObjectEmit& rEmit)
 appendDouble(fScaleY, aLine);
 aLine.append(" 0 0 ]");
 aLine.append(" /BBox [ 0 0 ");
-aLine.append(aSize.Width());
+// tdf#157680 reduce size by magic scale factor in /BBox
+aLine.append(aSize.Width() / fMagicScaleFactor);
 aLine.append(" ");
-aLine.append(aSize.Height());
+// tdf#157680 reduce size by magic scale factor in /BBox
+aLine.append(aSize.Height() / fMagicScaleFactor);
 aLine.append(" ]\n");
 
 if (m_aContext.UseReferenceXObject && rEmit.m_nEmbeddedObject > 0)

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests8/navigator.py |3 -
 sw/UITest_sw_navigator.mk |2 
 sw/qa/uitest/navigator/tdf134960.py   |5 --
 sw/qa/uitest/navigator/tdf137274.py   |   35 +++
 sw/qa/uitest/navigator/tdf144672.py   |   30 ++--
 sw/qa/uitest/navigator/tdf148198.py   |3 -
 sw/qa/uitest/navigator/tdf154521.py   |   79 --
 7 files changed, 76 insertions(+), 81 deletions(-)

New commits:
commit 0a0c5a5b0521bea6cb695731d448e62c41ed4c57
Author: Xisco Fauli 
AuthorDate: Thu Oct 19 15:46:45 2023 +0200
Commit: Xisco Fauli 
CommitDate: Thu Oct 19 18:31:27 2023 +0200

UITest_sw_navigator: avoid oneprocess

This is just a test to see whether this is reason why
UITest_sw_navigator is failing some much recently.
if it's not the case, I'll revert this patch later on

This patch reverts
- 1775b0c25ab13dab94c5ce930d45347a25198af4 "disable unreliable navigator 
UITest"
- f2ba17fecb60d936599efb975d96a3ea06c2a43f "disable more flakey
  navigator UITest"
- 2e49ec0eaa59b5b513ea756861ecac5482b930b2 "disable more flakey
  navigator UITest"
- d09785691373009a72cef14fd67610404c8d6022 "disable more flakey
  navigator test"
- 6347dcbd3ab2e0a7cb2f7de3bcb5d007e8befc09 "disable more unreliable 
navigator UITest"

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

diff --git a/sc/qa/uitest/calc_tests8/navigator.py 
b/sc/qa/uitest/calc_tests8/navigator.py
index ec8fa2ae9a2e..f917e6e84b30 100644
--- a/sc/qa/uitest/calc_tests8/navigator.py
+++ b/sc/qa/uitest/calc_tests8/navigator.py
@@ -142,8 +142,7 @@ class navigator(UITestCase):
 xColumn.executeAction("TYPE", mkPropertyValues({"TEXT":"B"}))
 xColumn.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"RETURN"}))
 xToolkit.processEventsToIdle()
-# disable flakey UITest
-#self.assertEqual(get_state_as_dict(xColumn)['Value'], '2')
+self.assertEqual(get_state_as_dict(xColumn)['Value'], '2')
 
 xRow.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
 xRow.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
diff --git a/sw/UITest_sw_navigator.mk b/sw/UITest_sw_navigator.mk
index 270ca6a9844a..901807349812 100644
--- a/sw/UITest_sw_navigator.mk
+++ b/sw/UITest_sw_navigator.mk
@@ -15,6 +15,6 @@ $(eval $(call gb_UITest_set_defs,sw_navigator, \
 TDOC="$(SRCDIR)/sw/qa/uitest/data" \
 ))
 
-$(eval $(call gb_UITest_use_oneprocess,sw_navigator))
+$(eval $(call gb_UITest_avoid_oneprocess,sw_navigator))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/qa/uitest/navigator/tdf134960.py 
b/sw/qa/uitest/navigator/tdf134960.py
index 031852d15fb4..8388b63e40f9 100644
--- a/sw/qa/uitest/navigator/tdf134960.py
+++ b/sw/qa/uitest/navigator/tdf134960.py
@@ -34,9 +34,8 @@ class tdf134960_hyperlinks(UITestCase):
 xHyperlinks.executeAction("EXPAND", tuple())
 
 expectedHyperlinksOrder = [1, 2, 8, 9, 7, 10, 11, 3, 12, 4, 5, 6]
-# disable flakey test
-#for i in range(12):
-#self.assertEqual('Hyperlink ' + str(expectedHyperlinksOrder[i]), 
get_state_as_dict(xHyperlinks.getChild(str(i)))['Text'])
+for i in range(12):
+self.assertEqual('Hyperlink ' + str(expectedHyperlinksOrder[i]), 
get_state_as_dict(xHyperlinks.getChild(str(i)))['Text'])
 
 xHyperlinks.executeAction("COLLAPSE", tuple())
 
diff --git a/sw/qa/uitest/navigator/tdf137274.py 
b/sw/qa/uitest/navigator/tdf137274.py
index f984d78b032a..5273ddcb2f91 100644
--- a/sw/qa/uitest/navigator/tdf137274.py
+++ b/sw/qa/uitest/navigator/tdf137274.py
@@ -59,24 +59,23 @@ class tdf137274(UITestCase):
 # wait until the second comment is available
 self.ui_test.wait_until_child_is_available('Comment2')
 
-# disable flakey test
-## xComments needs reassigned after content tree change
-#while True:
-#xComments = self.get_item(xContentTree, 'Comments')
-#if '1' in xComments.getChildren():
-#break
-#time.sleep(self.ui_test.get_default_sleep())
-#self.assertEqual('Comments', get_state_as_dict(xComments)['Text'])
-#
-#xComments.executeAction("EXPAND", tuple())
-#
-## Without the fix in place, this test would have failed with 
AssertionError: 2 != 0
-#self.assertEqual(2, len(xComments.getChildren()))
-#self.assertEqual('C1', 
get_state_as_dict(xComments.getChild('0'))['Text'])
-#
-#xComments.executeAction("COLLAPSE", tuple())
-#
-#self.xUITest.executeCommand(".uno:Sidebar")
+# xComments needs reassigned after content tree change
+while True:
+xComments = self.get_item(xContentTree, 'Comments')
+if 

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

[Miklos Vajna (via logerrit)]

 sw/qa/core/text/data/floattable-anchor-left-margin.docx |binary
 sw/qa/core/text/itrform2.cxx|   23 
 2 files changed, 23 insertions(+)

New commits:
commit 65f508b44ecbc20c8bd5172d1656639f686730ff
Author: Miklos Vajna 
AuthorDate: Thu Oct 19 13:44:24 2023 +0200
Commit: Miklos Vajna 
CommitDate: Thu Oct 19 18:36:52 2023 +0200

tdf#157573 sw floattable: add missing testcase

Fails with commit 626fe9ab5ebebc4ef36e35f4aa597c03a3564d22 (tdf#157573
sw floattable: fix incorrect lack of left margin after table,
2023-10-18) reverted.

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

diff --git a/sw/qa/core/text/data/floattable-anchor-left-margin.docx 
b/sw/qa/core/text/data/floattable-anchor-left-margin.docx
new file mode 100644
index ..aa55a0ce3001
Binary files /dev/null and 
b/sw/qa/core/text/data/floattable-anchor-left-margin.docx differ
diff --git a/sw/qa/core/text/itrform2.cxx b/sw/qa/core/text/itrform2.cxx
index 0705069b3038..02cd813ae549 100644
--- a/sw/qa/core/text/itrform2.cxx
+++ b/sw/qa/core/text/itrform2.cxx
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace
 {
@@ -143,6 +144,28 @@ CPPUNIT_TEST_FIXTURE(Test, 
testContentControlHeaderPDFExport)
 // i.e. not all of header, heading and body text was there on page 2, 
content was lost.
 CPPUNIT_ASSERT_EQUAL(3, nTextCount);
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testSplitFlyAnchorLeftMargin)
+{
+// Given a document with a floating table, anchor para is followed by an 
other para with a left
+// margin:
+createSwDoc("floattable-anchor-left-margin.docx");
+
+// When laying out that document:
+calcLayout();
+
+// Then make sure that the left margin of this last paragraph is not lost:
+SwDoc* pDoc = getSwDoc();
+SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+auto pPage = dynamic_cast(pLayout->Lower());
+CPPUNIT_ASSERT(pPage);
+SwContentFrame* pLastPara = pPage->FindLastBodyContent();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 6480
+// - Actual  : 0
+// i.e. the left margin was lost.
+CPPUNIT_ASSERT_EQUAL(static_cast(6480), 
pLastPara->getFramePrintArea().Left());
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

[Adam Seskunas (via logerrit)]

 svtools/source/control/ctrlbox.cxx  |4 ++--
 svtools/source/control/valueset.cxx |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1e6c1b672b1b93376f3c816e870d956b84e089e7
Author: Adam Seskunas 
AuthorDate: Wed Sep 20 13:54:44 2023 -0700
Commit: Hossein 
CommitDate: Fri Oct 20 03:37:45 2023 +0200

tdf#114441 Convert use of sal_uLong to better integer types

In ctrlbox.cxx, nCount and i were changed to sal_uInt32 because
aFontSizeNames.Count() returns sal_uInt32.

In valueset.cxx, nFirstItem and nLastItem are only used in a comparison
with a value of size_t. They were both changed to size_t because
nLastItem contains the product of tools::Long mnVisLines and
sal_uInt16 mnCols where tools::Long can be 64 bit in some cases.

Change-Id: Ib3f10cdf6ae81e96f28f13a0bb32699f26c8a0cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157109
Tested-by: Jenkins
Reviewed-by: Hossein 

diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index 22bfde7febe5..3d4ce47b0814 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1186,8 +1186,8 @@ void FontSizeBox::Fill( const FontList* pList )
 if ( pAry == FontList::GetStdSizeAry() )
 {
 // for scalable fonts all font size names
-sal_uLong nCount = aFontSizeNames.Count();
-for( sal_uLong i = 0; i < nCount; i++ )
+sal_uInt32 nCount = aFontSizeNames.Count();
+for( sal_uInt32 i = 0; i < nCount; i++ )
 {
 OUString aSizeName = aFontSizeNames.GetIndexName( i );
 int nSize = aFontSizeNames.GetIndexSize( i );
diff --git a/svtools/source/control/valueset.cxx 
b/svtools/source/control/valueset.cxx
index 89ce7f8cdb23..87696d1a7886 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1076,8 +1076,8 @@ void ValueSet::Format(vcl::RenderContext const & 
rRenderContext)
 }
 
 // draw items
-sal_uLong nFirstItem = static_cast(mnFirstLine) * mnCols;
-sal_uLong nLastItem = nFirstItem + (mnVisLines * mnCols);
+size_t nFirstItem = static_cast(mnFirstLine) * mnCols;
+size_t nLastItem = nFirstItem + (mnVisLines * mnCols);
 
 maItemListRect.SetLeft( x );
 maItemListRect.SetTop( y );

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

[Michael Weghorn (via logerrit)]

 winaccessibility/source/UAccCOM/MAccessible.cxx |  196 
 winaccessibility/source/UAccCOM/MAccessible.h   |5 
 2 files changed, 201 deletions(-)

New commits:
commit fc06de1b23df9c80445c99def36beab6efa755cb
Author: Michael Weghorn 
AuthorDate: Thu Oct 19 16:42:58 2023 +0100
Commit: Michael Weghorn 
CommitDate: Fri Oct 20 05:47:47 2023 +0200

wina11y: Drop now unused CMAccessible::get_String4Numbering etc.

`CMAccessible::get_String4Numbering` is unused since

commit 2bf88c172c9c9d159344b95fb96073f4891a6c30
Author: Michael Weghorn 
Date:   Wed Oct 18 13:44:42 2023 +0200

tdf#157696 wina11y: Switch from custom to IA2 text attributes

, so drop it.
This means that `CMAccessible::get_StringFromAny` is then
also unused, so drop it as well.

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

diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx 
b/winaccessibility/source/UAccCOM/MAccessible.cxx
index eff02d6ade31..e8f29c8192d2 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -2439,202 +2439,6 @@ IAccessible* 
CMAccessible::get_IAccessibleFromXAccessible(XAccessible* pXAcc)
 return nullptr;
 }
 
-OUString CMAccessible::get_StringFromAny(Any const & pAny)
-{
-switch(pAny.getValueTypeClass())
-{
-case TypeClass_CHAR:
-{
-sal_Int8 val;
-pAny >>= val;
-return OUString::number(val);
-}
-case TypeClass_BOOLEAN:
-{
-bool val;
-pAny >>= val;
-return OUString::number(int(val));
-}
-case TypeClass_BYTE:
-{
-sal_Int8 val;
-pAny >>= val;
-return OUString::number(val);
-}
-case TypeClass_SHORT:
-{
-sal_Int16 val;
-pAny >>= val;
-return OUString::number(val);
-}
-case TypeClass_UNSIGNED_SHORT:
-{
-sal_uInt16 val;
-pAny >>= val;
-return OUString::number(val);
-}
-case TypeClass_LONG:
-{
-sal_Int32 val;
-pAny >>= val;
-return OUString::number(val);
-}
-case TypeClass_UNSIGNED_LONG:
-{
-sal_uInt32 val;
-pAny >>= val;
-return OUString::number(val);
-}
-case TypeClass_FLOAT:
-{
-float val;
-pAny >>= val;
-return OUString::number(val);
-}
-case TypeClass_DOUBLE:
-{
-double val;
-pAny >>= val;
-return OUString::number(val);
-}
-case TypeClass_STRING:
-{
-OUString val;
-pAny >>= val;
-return val;
-}
-case TypeClass_SEQUENCE:
-{
-if(pAny.getValueType() == cppu::UnoType>::get())
-{
-Sequence < OUString > val;
-pAny >>= val;
-
-OUStringBuffer pString;
-
-for (const OUString& rElem : val)
-pString.append(rElem);
-
-return pString.makeStringAndClear();
-}
-else if (pAny.getValueType() == cppu::UnoType>::get())
-{
-Sequence < css::style::TabStop > val;
-pAny >>= val;
-
-OUStringBuffer buf;
-for (const css::style::TabStop& rSingleVal : val)
-{
-buf.append(
-"Position=" + OUString::number(rSingleVal.Position) + 
",TabAlign="
-+ OUString::number(sal_Int32(rSingleVal.Alignment)) + 
",DecimalChar=");
-if (rSingleVal.DecimalChar==';' || rSingleVal.DecimalChar 
== ':' || rSingleVal.DecimalChar == ',' ||
-rSingleVal.DecimalChar == '=' || 
rSingleVal.DecimalChar == '\\')
-buf.append('\\');
-buf.append(OUStringChar(rSingleVal.DecimalChar) + 
",FillChar=");
-if (rSingleVal.FillChar==';' || rSingleVal.FillChar == ':' 
|| rSingleVal.FillChar == ',' ||
-rSingleVal.FillChar == '=' || rSingleVal.FillChar == 
'\\')
-buf.append('\\');
-buf.append(OUStringChar(rSingleVal.FillChar) + ",");
-}
-return buf.makeStringAndClear();
-}
-break;
-}
-case TypeClass_ENUM:
-{
-if (pAny.getValueType() == 
cppu::UnoType::get())
-{
-css::awt::FontSlant val;
-pAny >>= val;
-return OUString::number(sal_Int32(val));
-}
-break;
-}
-case 

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

[Olivier Hallot (via logerrit)]

 source/text/scalc/main0102.xhp |   15 +++
 source/text/shared/01/0218.xhp |6 +-
 source/text/shared/01/0220.xhp |1 +
 source/text/swriter/main0102.xhp   |   15 ++-
 4 files changed, 11 insertions(+), 26 deletions(-)

New commits:
commit f7585dc09a544ff865dcf39f55cb81d77e9d73ba
Author: Olivier Hallot 
AuthorDate: Thu Oct 19 19:37:11 2023 -0300
Commit: Olivier Hallot 
CommitDate: Fri Oct 20 02:33:07 2023 +0200

tdf#155876 UI cmds Calc (05)

+ refactoring
+ Edit menu - Final

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

diff --git a/source/text/scalc/main0102.xhp b/source/text/scalc/main0102.xhp
index 74c251bae1..8cedebec4f 100644
--- a/source/text/scalc/main0102.xhp
+++ b/source/text/scalc/main0102.xhp
@@ -26,11 +26,9 @@
 
 
 
-
-
-
 
 
+
 Edit
 This menu contains commands for editing the contents of the current 
document.
 
@@ -47,15 +45,8 @@
 
 
 
-
-
-
-Links
-
-
-Object
-
+
+
 
 
-
 
diff --git a/source/text/shared/01/0218.xhp 
b/source/text/shared/01/0218.xhp
index ff4eb64cd0..244c236248 100644
--- a/source/text/shared/01/0218.xhp
+++ b/source/text/shared/01/0218.xhp
@@ -37,8 +37,12 @@
 
 
 
-Edit External Links
+
+  Links to External 
FilesExternal 
Links
+
   You can change or break each link to external 
files in the current document. You can also update the content of the current 
file to the most recently saved version of linked external file. This command 
does not apply to hyperlinks, and is not available if the current document does 
not contain links to other files.
+
+
 This command can be 
used with external file links to sections (place cursor outside of the section), master 
documents,sheets linked with 
Sheet - Insert Sheet from File or Sheet - 
External Links, Function WEBSERVICE, 
images and OLE objects (when inserted with a link to an external 
file).
 
 
diff --git a/source/text/shared/01/0220.xhp 
b/source/text/shared/01/0220.xhp
index 1a24952c6d..4dda4b7e31 100644
--- a/source/text/shared/01/0220.xhp
+++ b/source/text/shared/01/0220.xhp
@@ -34,6 +34,7 @@
   
 
 
+
 Save Copy as
 Opens the Save as dialog to save a copy of the 
object in a file. The file extension suggested depends on the type of the OLE 
object.
 
diff --git a/source/text/swriter/main0102.xhp b/source/text/swriter/main0102.xhp
index 0dbec975d6..379b9f24fa 100644
--- a/source/text/swriter/main0102.xhp
+++ b/source/text/swriter/main0102.xhp
@@ -26,9 +26,8 @@
 
 
 
-
 
-
+
 Edit
 This menu contains commands for editing the contents of the current 
document.
 
@@ -43,30 +42,20 @@
 
 
 
-
 
 
-
 
-
 
 
-
 
 
 
 Fields
 
-
-External Links
-
-
+
 
-
 
-
 
-
 
 
 

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 26a08eb18eb18963652b063ce8bfb3e36b7529f4
Author: Olivier Hallot 
AuthorDate: Thu Oct 19 21:33:07 2023 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Oct 20 02:33:07 2023 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to f7585dc09a544ff865dcf39f55cb81d77e9d73ba
  - tdf#155876 UI cmds Calc (05)

+ refactoring
+ Edit menu - Final

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

diff --git a/helpcontent2 b/helpcontent2
index 7d08444f187d..f7585dc09a54 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7d08444f187ddea8a983565fc2c7fb8b2a38176c
+Subproject commit f7585dc09a544ff865dcf39f55cb81d77e9d73ba

[Libreoffice-commits] core.git: 2 commits - framework/source sal/osl sal/qa

[Stephan Bergmann (via logerrit)]

 framework/source/accelerators/acceleratorconfiguration.cxx  |8 -
 framework/source/accelerators/storageholder.cxx |2 
 framework/source/dispatch/closedispatcher.cxx   |4 
 framework/source/dispatch/servicehandler.cxx|2 
 framework/source/dispatch/systemexec.cxx|2 
 framework/source/fwe/classes/addonsoptions.cxx  |   10 +-
 framework/source/fwe/helper/propertysetcontainer.cxx|2 
 framework/source/fwe/xml/menudocumenthandler.cxx|   46 
+-
 framework/source/fwe/xml/statusbardocumenthandler.cxx   |   36 +++
 framework/source/fwe/xml/toolboxdocumenthandler.cxx |   10 +-
 framework/source/fwi/classes/protocolhandlercache.cxx   |2 
 framework/source/fwi/uielement/constitemcontainer.cxx   |2 
 framework/source/fwi/uielement/itemcontainer.cxx|4 
 framework/source/fwi/uielement/rootitemcontainer.cxx|6 -
 framework/source/helper/statusindicatorfactory.cxx  |2 
 framework/source/helper/uiconfigelementwrapperbase.cxx  |   16 +--
 framework/source/helper/uielementwrapperbase.cxx|6 -
 framework/source/jobs/jobexecutor.cxx   |4 
 framework/source/layoutmanager/layoutmanager.cxx|2 
 framework/source/loadenv/loadenv.cxx|4 
 framework/source/recording/dispatchrecorder.cxx |2 
 framework/source/services/autorecovery.cxx  |   24 ++---
 framework/source/services/pathsettings.cxx  |   10 +-
 framework/source/uiconfiguration/imagemanagerimpl.cxx   |4 
 framework/source/uielement/fontsizemenucontroller.cxx   |2 
 framework/source/uielement/langselectionstatusbarcontroller.cxx |2 
 framework/source/uielement/macrosmenucontroller.cxx |2 
 framework/source/uielement/menubarmanager.cxx   |2 
 framework/source/uielement/newmenucontroller.cxx|4 
 framework/source/uielement/recentfilesmenucontroller.cxx|8 -
 framework/source/uielement/toolbarsmenucontroller.cxx   |8 -
 framework/source/uielement/uicommanddescription.cxx |   16 +--
 framework/source/xml/imagesdocumenthandler.cxx  |   10 +-
 sal/osl/unx/pipe.cxx|4 
 sal/qa/osl/pipe/osl_Pipe.cxx|8 -
 sal/qa/rtl/digest/rtl_digest.cxx|2 
 sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx |   16 +--
 sal/qa/rtl/process/rtl_Process.cxx  |4 
 sal/qa/rtl/textenc/rtl_textcvt.cxx  |2 
 39 files changed, 150 insertions(+), 150 deletions(-)

New commits:
commit 35948cad8d41c0e70debb442b8f6182b28f0a65a
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:23 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Oct 20 07:06:31 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: sal

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

diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx
index 9aaa83bcb79e..43f577ba8f44 100644
--- a/sal/osl/unx/pipe.cxx
+++ b/sal/osl/unx/pipe.cxx
@@ -37,8 +37,8 @@
 #include 
 #include 
 
-constexpr OStringLiteral PIPEDEFAULTPATH = "/tmp";
-constexpr OStringLiteral PIPEALTERNATEPATH = "/var/tmp";
+constexpr OString PIPEDEFAULTPATH = "/tmp"_ostr;
+constexpr OString PIPEALTERNATEPATH = "/var/tmp"_ostr;
 
 static oslPipe osl_psz_createPipe(const char *pszPipeName, oslPipeOptions 
Options, oslSecurity Security);
 
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 39c9e99864f6..62463f8868dc 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -82,11 +82,11 @@ static void printPipeError( ::osl::Pipe const & aPipe )
 
 // pipe name and transfer contents
 
-constexpr OUStringLiteral aTestPipeName(u"testpipe2");
-constexpr OUStringLiteral aTestPipe1(u"testpipe1");
+constexpr OUString aTestPipeName(u"testpipe2"_ustr);
+constexpr OUString aTestPipe1(u"testpipe1"_ustr);
 
-constexpr OStringLiteral m_pTestString1("Sun Microsystems");
-constexpr OStringLiteral m_pTestString2("test pipe PASS/OK");
+constexpr OString m_pTestString1("Sun Microsystems"_ostr);
+constexpr OString m_pTestString2("test pipe PASS/OK"_ostr);
 
 // test code start here
 
diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx
index f62e951a7295..e259eead6a69 100644
--- a/sal/qa/rtl/digest/rtl_digest.cxx
+++ b/sal/qa/rtl/digest/rtl_digest.cxx
@@ -36,7 +36,7 @@ using namespace rtl;
 namespace
 {
 
-constexpr 

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

[Stephan Bergmann (via logerrit)]

 i18npool/qa/cppunit/test_breakiterator.cxx|   64 +-
 i18npool/qa/cppunit/test_characterclassification.cxx  |4 
 i18npool/source/breakiterator/breakiteratorImpl.cxx   |2 
 i18npool/source/collator/chaptercollator.cxx  |4 
 i18npool/source/collator/collator_unicode.cxx |4 
 i18npool/source/indexentry/indexentrysupplier.cxx |2 
 i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx |4 
 i18npool/source/nativenumber/nativenumbersupplier.cxx |2 
 i18npool/source/ordinalsuffix/ordinalsuffix.cxx   |2 
 9 files changed, 44 insertions(+), 44 deletions(-)

New commits:
commit 3bbed358b617eb407184edac9a11aed62e36a2d7
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:18 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Oct 20 07:06:43 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: i18npool

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

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx 
b/i18npool/qa/cppunit/test_breakiterator.cxx
index 9edadaaf4755..4463f46270e1 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -92,7 +92,7 @@ void TestBreakIterator::testLineBreaking()
 
 //See https://bugs.libreoffice.org/show_bug.cgi?id=49849
 {
-static constexpr OUStringLiteral aWord = 
u"\u05DE\u05D9\u05DC\u05D9\u05DD";
+static constexpr OUString aWord = 
u"\u05DE\u05D9\u05DC\u05D9\u05DD"_ustr;
 OUString aTest(aWord + " " + aWord);
 
 aLocale.Language = "he";
@@ -148,8 +148,8 @@ void TestBreakIterator::testLineBreaking()
 
 //See https://bugs.documentfoundation.org/show_bug.cgi?id=96197
 {
-static constexpr OUStringLiteral aTest = u"\uc560\uad6D\uac00\uc758 
\uac00"
-   "\uc0ac\ub294";
+static constexpr OUString aTest = u"\uc560\uad6D\uac00\uc758 \uac00"
+   "\uc0ac\ub294"_ustr;
 
 aLocale.Language = "ko";
 aLocale.Country = "KR";
@@ -226,7 +226,7 @@ void TestBreakIterator::testWordBoundaries()
 
 //See https://bz.apache.org/ooo/show_bug.cgi?id=14904
 {
-static constexpr OUStringLiteral aTest =
+static constexpr OUString aTest =
 u"Working \u201CWords"
 " starting wit"
 "h quotes\u201D Work"
@@ -234,7 +234,7 @@ void TestBreakIterator::testWordBoundaries()
 "?Spanish? doe"
 "sn\u2019t work. No"
 "t even \u00BFreal? "
-"Spanish";
+"Spanish"_ustr;
 
 aBounds = m_xBreak->getWordBoundary(aTest, 4, aLocale, 
i18n::WordType::DICTIONARY_WORD, false);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos);
@@ -462,8 +462,8 @@ void TestBreakIterator::testWordBoundaries()
 break;
 }
 
-static constexpr OUStringLiteral aTest =
-u"I\u200Bwant\u200Bto\u200Bgo";
+static constexpr OUString aTest =
+u"I\u200Bwant\u200Bto\u200Bgo"_ustr;
 
 sal_Int32 nPos = 0;
 sal_Int32 aExpected[] = {1, 6, 9, 12};
@@ -498,11 +498,11 @@ void TestBreakIterator::testWordBoundaries()
 break;
 }
 
-static constexpr OUStringLiteral aTest =
+static constexpr OUString aTest =
 u"\u1F0C\u03BD\u03B4\u03C1\u03B1 \u1F00"
 "\u03C1\u03BD\u1F7B\u03BC\u03B5\u03BD\u03BF"
 "\u03C2 \u1F00\u03BB\u03BB \u1F24"
-"\u03C3\u03B8\u03B9\u03BF\u03BD";
+"\u03C3\u03B8\u03B9\u03BF\u03BD"_ustr;
 
 sal_Int32 nPos = 0;
 sal_Int32 aExpected[] = {5, 15, 19, 26};
@@ -569,8 +569,8 @@ void TestBreakIterator::testWordBoundaries()
 aLocale.Language = "en";
 aLocale.Country = "US";
 
-static constexpr OUStringLiteral aTest =
-u"ru\uFB00le \uFB01sh";
+static constexpr OUString aTest =
+u"ru\uFB00le \uFB01sh"_ustr;
 
 aBounds = m_xBreak->getWordBoundary(aTest, 1, aLocale, 
i18n::WordType::DICTIONARY_WORD, false);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos);
@@ -586,8 +586,8 @@ void TestBreakIterator::testWordBoundaries()
 aLocale.Language = "en";
 aLocale.Country = "US";
 
-static constexpr OUStringLiteral aTest =
-u"a\u2013b\u2014c";
+static constexpr OUString aTest =
+u"a\u2013b\u2014c"_ustr;
 
 aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, 
i18n::WordType::DICTIONARY_WORD, true);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos);
@@ -614,7 +614,7 @@ void TestBreakIterator::testGraphemeIteration()
 aLocale.Country = "IN";
 
 {
-static constexpr OUStringLiteral 

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

[Stephan Bergmann (via logerrit)]

 package/source/manifest/ManifestExport.cxx |8 
 package/source/manifest/ManifestImport.cxx |6 +++---
 package/source/xstor/owriteablestream.cxx  |8 
 package/source/zippackage/ZipPackage.cxx   |   16 
 package/source/zippackage/ZipPackageStream.cxx |   10 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 6e4d3c3476fb60116fc7100a30a30ae15f60ce62
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:21 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Oct 20 07:06:58 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: package

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

diff --git a/package/source/manifest/ManifestExport.cxx 
b/package/source/manifest/ManifestExport.cxx
index 79948c9ff068..feeb63353698 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -49,9 +49,9 @@ ManifestExport::ManifestExport( uno::Reference< 
xml::sax::XDocumentHandler > con
 static constexpr OUStringLiteral sPgpKeyIDProperty( u"KeyId" );
 static constexpr OUStringLiteral sPgpKeyPacketProperty( 
u"KeyPacket" );
 static constexpr OUStringLiteral sCipherValueProperty ( 
u"CipherValue" );
-static constexpr OUStringLiteral sFullPathProperty ( u"FullPath" );
-static constexpr OUStringLiteral sVersionProperty  ( u"Version" );
-static constexpr OUStringLiteral sMediaTypeProperty( u"MediaType" );
+static constexpr OUString sFullPathProperty ( u"FullPath"_ustr );
+static constexpr OUString sVersionProperty  ( u"Version"_ustr );
+static constexpr OUString sMediaTypeProperty( u"MediaType"_ustr );
 static constexpr OUStringLiteral sIterationCountProperty   ( 
u"IterationCount" );
 static constexpr OUStringLiteral sDerivedKeySizeProperty  ( 
u"DerivedKeySize" );
 static constexpr OUStringLiteral sSaltProperty ( u"Salt" );
@@ -62,7 +62,7 @@ ManifestExport::ManifestExport( uno::Reference< 
xml::sax::XDocumentHandler > con
 static constexpr OUStringLiteral sStartKeyAlgProperty  ( 
u"StartKeyAlgorithm" );
 static constexpr OUStringLiteral sDigestAlgProperty( 
u"DigestAlgorithm" );
 
-static constexpr OUStringLiteral sWhiteSpace   ( u" " );
+static constexpr OUString sWhiteSpace   ( u" "_ustr );
 
 const OUString sSHA256_URL_ODF12 ( SHA256_URL_ODF12 );
 const OUString  sSHA1_Name   ( SHA1_NAME );
diff --git a/package/source/manifest/ManifestImport.cxx 
b/package/source/manifest/ManifestImport.cxx
index d2b3177e34cf..2c55bcf87fe9 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -41,9 +41,9 @@ constexpr OUStringLiteral gsSaltProperty ( 
u"Salt" );
 constexpr OUStringLiteral gsInitialisationVectorProperty ( 
u"InitialisationVector" );
 constexpr OUStringLiteral gsSizeProperty ( u"Size" );
 constexpr OUStringLiteral gsDigestProperty   ( u"Digest" );
-constexpr OUStringLiteral gsEncryptionAlgProperty( 
u"EncryptionAlgorithm" );
-constexpr OUStringLiteral gsStartKeyAlgProperty  ( 
u"StartKeyAlgorithm" );
-constexpr OUStringLiteral gsDigestAlgProperty( u"DigestAlgorithm" 
);
+constexpr OUString gsEncryptionAlgProperty( 
u"EncryptionAlgorithm"_ustr );
+constexpr OUString gsStartKeyAlgProperty  ( u"StartKeyAlgorithm"_ustr 
);
+constexpr OUString gsDigestAlgProperty( u"DigestAlgorithm"_ustr );
 
 ManifestImport::ManifestImport( std::vector < Sequence < PropertyValue > > & 
rNewManVector )
 : bIgnoreEncryptData( false )
diff --git a/package/source/xstor/owriteablestream.cxx 
b/package/source/xstor/owriteablestream.cxx
index 1ed64c60e204..bd58f579a326 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -974,8 +974,8 @@ uno::Sequence< beans::PropertyValue > 
OWriteStream_Impl::ReadPackageStreamProper
 // The "Compressed" property must be set after "MediaType" property,
 // since the setting of the last one can change the value of the first one
 static constexpr OUStringLiteral sMediaType = u"MediaType";
-static constexpr OUStringLiteral sCompressed = u"Compressed";
-static constexpr OUStringLiteral sSize = u"Size";
+static constexpr OUString sCompressed = u"Compressed"_ustr;
+static constexpr OUString sSize = u"Size"_ustr;
 static constexpr OUStringLiteral sEncrypted = u"Encrypted";
 if ( m_nStorageType == embed::StorageFormats::OFOPXML || m_nStorageType == 
embed::StorageFormats::PACKAGE )
 {
@@ -2770,8 +2770,8 @@ void SAL_CALL OWriteStream::setPropertyValue( const 
OUString& aPropertyName, con
 }
 
 

[Libreoffice-commits] core.git: 2 commits - linguistic/source oox/qa oox/source

[Stephan Bergmann (via logerrit)]

 linguistic/source/convdicxml.cxx   |4 ++--
 linguistic/source/dicimp.cxx   |2 +-
 linguistic/source/hhconvdic.cxx|2 +-
 linguistic/source/lngsvcmgr.cxx|8 
 oox/qa/unit/export.cxx |2 +-
 oox/qa/unit/mcgr.cxx   |8 
 oox/source/core/filterbase.cxx |6 +++---
 oox/source/core/xmlfilterbase.cxx  |4 ++--
 oox/source/crypto/Standard2007Engine.cxx   |2 +-
 oox/source/drawingml/customshapeproperties.cxx |2 +-
 oox/source/drawingml/fontworkhelpers.cxx   |6 +++---
 oox/source/drawingml/hyperlinkcontext.cxx  |4 ++--
 oox/source/drawingml/shape.cxx |2 +-
 oox/source/export/vmlexport.cxx|2 +-
 oox/source/helper/modelobjecthelper.cxx|4 ++--
 oox/source/ole/oleobjecthelper.cxx |2 +-
 oox/source/ppt/pptshape.cxx|2 +-
 oox/source/ppt/presentationfragmenthandler.cxx |4 ++--
 oox/source/ppt/slidepersist.cxx|2 +-
 oox/source/vml/vmlinputstream.cxx  |2 +-
 oox/source/vml/vmlshape.cxx|2 +-
 oox/source/vml/vmlshapecontext.cxx |2 +-
 22 files changed, 37 insertions(+), 37 deletions(-)

New commits:
commit dd6f6147d431577ce7e1c5596481366a9faa7afb
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:20 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Oct 20 07:58:58 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: linguistic

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

diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index c8a09997fd7e..370629925a45 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -43,8 +43,8 @@ using namespace linguistic;
 
 
 constexpr OUStringLiteral XML_NAMESPACE_TCD_STRING = 
u"http://openoffice.org/2003/text-conversion-dictionary;;
-constexpr OUStringLiteral CONV_TYPE_HANGUL_HANJA = u"Hangul / Hanja";
-constexpr OUStringLiteral CONV_TYPE_SCHINESE_TCHINESE = u"Chinese simplified / 
Chinese traditional";
+constexpr OUString CONV_TYPE_HANGUL_HANJA = u"Hangul / Hanja"_ustr;
+constexpr OUString CONV_TYPE_SCHINESE_TCHINESE = u"Chinese simplified / 
Chinese traditional"_ustr;
 
 
 static OUString ConversionTypeToText( sal_Int16 nConversionType )
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index ec49682b0cf9..b3099b3097e5 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -73,7 +73,7 @@ constexpr OUStringLiteral SPELLML_SUPPORT = u"";
 // The following fake file name extension will be
 // added to the text of the title: field for correct
 // text stripping and dictionary saving.
-constexpr OUStringLiteral EXTENSION_FOR_TITLE_TEXT = u".";
+constexpr OUString EXTENSION_FOR_TITLE_TEXT = u"."_ustr;
 
 const char* const pVerStr2= "WBSWG2";
 const char* const pVerStr5= "WBSWG5";
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index f2574d630e49..e7712ee66be4 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -39,7 +39,7 @@ using namespace linguistic;
 using namespace i18n;
 
 
-constexpr OUStringLiteral SN_HH_CONV_DICTIONARY = 
u"com.sun.star.linguistic2.HangulHanjaConversionDictionary";
+constexpr OUString SN_HH_CONV_DICTIONARY = 
u"com.sun.star.linguistic2.HangulHanjaConversionDictionary"_ustr;
 
 
 
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 017d4b5e8c30..850d4d813bfd 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -710,10 +710,10 @@ void LngSvcMgr::UpdateAll()
 
 void LngSvcMgr::Notify( const uno::Sequence< OUString >  )
 {
-static constexpr OUStringLiteral aSpellCheckerList( 
u"ServiceManager/SpellCheckerList" );
-static constexpr OUStringLiteral aGrammarCheckerList( 
u"ServiceManager/GrammarCheckerList" );
-static constexpr OUStringLiteral aHyphenatorList( 
u"ServiceManager/HyphenatorList" );
-static constexpr OUStringLiteral aThesaurusList( 
u"ServiceManager/ThesaurusList" );
+static constexpr OUString aSpellCheckerList( 
u"ServiceManager/SpellCheckerList"_ustr );
+static constexpr OUString aGrammarCheckerList( 
u"ServiceManager/GrammarCheckerList"_ustr );
+static constexpr OUString aHyphenatorList( 
u"ServiceManager/HyphenatorList"_ustr );
+static constexpr OUString aThesaurusList( 
u"ServiceManager/ThesaurusList"_ustr );
 
 const uno::Sequence< OUString > aSpellCheckerListEntries( GetNodeNames( 
aSpellCheckerList ) );
 const uno::Sequence< OUString > aGrammarCheckerListEntries( GetNodeNames( 
aGrammarCheckerList ) );
commit 

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

[Stephan Bergmann (via logerrit)]

 jvmfwk/source/elements.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cbe3899ed9b0fb226bf84c19e6f312e587ce2c03
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:19 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Oct 20 07:58:27 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: jvmfwk

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

diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index ebbf8abf0fd2..57b500c56d56 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -177,8 +177,8 @@ NodeJava::NodeJava(Layer layer):
 
 void NodeJava::load()
 {
-static constexpr OStringLiteral sExcMsg("[Java framework] Error in 
function NodeJava::load"
- "(elements.cxx).");
+static constexpr OString sExcMsg("[Java framework] Error in function 
NodeJava::load"
+ "(elements.cxx)."_ostr);
 if (SHARED == m_layer)
 {
 //we do not support yet to write into the shared installation

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

[Stephan Bergmann (via logerrit)]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |6 +++---
 desktop/source/app/app.cxx  |2 +-
 desktop/source/app/check_ext_deps.cxx   |2 +-
 desktop/source/app/cmdlinehelp.cxx  |4 ++--
 desktop/source/app/crashreport.cxx  |4 ++--
 desktop/source/deployment/gui/dp_gui_dialog2.cxx|2 +-
 desktop/source/deployment/gui/dp_gui_theextmgr.cxx  |2 +-
 desktop/source/deployment/manager/dp_properties.cxx |2 +-
 desktop/source/deployment/misc/dp_dependencies.cxx  |8 
 desktop/source/deployment/registry/help/dp_help.cxx |2 +-
 desktop/source/lib/init.cxx |8 
 desktop/source/migration/migration.cxx  |8 
 desktop/source/migration/services/jvmfwk.cxx|2 +-
 13 files changed, 26 insertions(+), 26 deletions(-)

New commits:
commit 326a8d5dd2d01a2037f17a6fd921494937c134d4
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:11 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 18:49:36 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: desktop

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

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index dcb5c7192782..dd89ebf1eed0 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -3044,7 +3044,7 @@ void DesktopLOKTest::testComplexSelection()
 {
 // Start with a blank text file and add contents.
 LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
-static constexpr OStringLiteral aText("hello world");
+static constexpr OString aText("hello world"_ostr);
 
 // Certainly not complex.
 CPPUNIT_ASSERT_EQUAL(static_cast(LOK_SELTYPE_NONE), 
pDocument->pClass->getSelectionType(pDocument));
@@ -3072,7 +3072,7 @@ void DesktopLOKTest::testComplexSelection()
 // Export as plain text, we should get only the text part "hello".
 char* pText = pDocument->pClass->getTextSelection(pDocument, 
"text/plain;charset=utf-8", nullptr);
 CPPUNIT_ASSERT(pText != nullptr);
-CPPUNIT_ASSERT_EQUAL(OString(aText), OString(pText));
+CPPUNIT_ASSERT_EQUAL(aText, OString(pText));
 free(pText);
 
 // Export as rtf, we should also get the image.
@@ -3128,7 +3128,7 @@ void DesktopLOKTest::testCalcSaveAs()
 
 void DesktopLOKTest::testSpellcheckerMultiView()
 {
-static constexpr OUStringLiteral aLangISO(u"en-US");
+static constexpr OUString aLangISO(u"en-US"_ustr);
 SvtSysLocaleOptions aSysLocaleOptions;
 aSysLocaleOptions.SetLocaleConfigString(aLangISO);
 aSysLocaleOptions.SetUILocaleConfigString(aLangISO);
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index cb3beaf0ae26..cd1d1de0d6ea 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -581,7 +581,7 @@ bool Desktop::QueryExit()
 {
 }
 
-static constexpr OUStringLiteral SUSPEND_QUICKSTARTVETO = 
u"SuspendQuickstartVeto";
+static constexpr OUString SUSPEND_QUICKSTARTVETO = 
u"SuspendQuickstartVeto"_ustr;
 
 Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( 
::comphelper::getProcessComponentContext() );
 Reference< XPropertySet > xPropertySet(xDesktop, UNO_QUERY_THROW);
diff --git a/desktop/source/app/check_ext_deps.cxx 
b/desktop/source/app/check_ext_deps.cxx
index 8b53d564feb1..4a69a8cf79cc 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -208,7 +208,7 @@ void SilentCommandEnv::pop()
 } // end namespace
 
 
-constexpr OUStringLiteral aAccessSrvc = 
u"com.sun.star.configuration.ConfigurationUpdateAccess";
+constexpr OUString aAccessSrvc = 
u"com.sun.star.configuration.ConfigurationUpdateAccess"_ustr;
 
 static sal_Int16 impl_showExtensionDialog( uno::Reference< 
uno::XComponentContext > const  )
 {
diff --git a/desktop/source/app/cmdlinehelp.cxx 
b/desktop/source/app/cmdlinehelp.cxx
index 58b8b3abb566..9c9fd940f233 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -35,9 +35,9 @@
 
 namespace desktop
 {
-constexpr OUStringLiteral aCmdLineHelp_version =
+constexpr OUString aCmdLineHelp_version =
 u"%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION %BUILDID\n"
-"\n";
+"\n"_ustr;
 constexpr OUStringLiteral aCmdLineHelp =
 u"Usage: %CMDNAME [argument...]\n"
 "   argument - switches, switch parameters and document URIs 
(filenames).   \n\n"
diff --git a/desktop/source/app/crashreport.cxx 
b/desktop/source/app/crashreport.cxx
index 680492b3b80a..186a59b02101 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -135,8 +135,8 @@ void 

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

[Stephan Bergmann (via logerrit)]

 dbaccess/qa/extras/dialog-save.cxx |2 +-
 dbaccess/qa/extras/empty-stdlib-save.cxx   |2 +-
 dbaccess/qa/extras/nolib-save.cxx  |2 +-
 dbaccess/qa/unit/embeddeddb_performancetest.cxx|4 ++--
 dbaccess/source/core/api/FilteredContainer.cxx |8 
 dbaccess/source/core/api/KeySet.cxx|2 +-
 dbaccess/source/core/api/SingleSelectQueryComposer.cxx |   10 +-
 dbaccess/source/core/dataaccess/databasedocument.cxx   |2 +-
 dbaccess/source/core/dataaccess/datasource.cxx |2 +-
 dbaccess/source/core/misc/DatabaseDataProvider.cxx |2 +-
 dbaccess/source/core/recovery/dbdocrecovery.cxx|4 ++--
 dbaccess/source/core/recovery/storagetextstream.cxx|2 +-
 dbaccess/source/core/recovery/subcomponentrecovery.cxx |6 +++---
 dbaccess/source/filter/hsqldb/hsqlimport.cxx   |2 +-
 dbaccess/source/filter/hsqldb/parseschema.cxx  |6 +++---
 dbaccess/source/filter/xml/xmlExport.cxx   |2 +-
 dbaccess/source/ui/app/AppControllerGen.cxx|2 +-
 dbaccess/source/ui/dlg/dbadmin.cxx |2 +-
 dbaccess/source/ui/dlg/dbfindex.cxx|2 +-
 dbaccess/source/ui/dlg/queryfilter.cxx |4 ++--
 dbaccess/source/ui/dlg/tablespage.cxx  |2 +-
 dbaccess/source/ui/misc/indexcollection.cxx|2 +-
 dbaccess/source/ui/querydesign/querycontroller.cxx |4 ++--
 23 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 7eda35a36c8837c620722e5c26c90324ae9b48e9
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:10 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 18:49:53 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: dbaccess

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

diff --git a/dbaccess/qa/extras/dialog-save.cxx 
b/dbaccess/qa/extras/dialog-save.cxx
index 4b07eebff459..04c12b1c5e8b 100644
--- a/dbaccess/qa/extras/dialog-save.cxx
+++ b/dbaccess/qa/extras/dialog-save.cxx
@@ -56,7 +56,7 @@ void DialogSaveTest::test()
 uno::Reference< script::XStorageBasedLibraryContainer > 
xStorDlgLib(xDocScr->getDialogLibraries());
 CPPUNIT_ASSERT(xStorDlgLib.is());
 uno::Reference< script::XLibraryContainer > xDlgLib(xStorDlgLib, 
UNO_QUERY_THROW);
-static constexpr OUStringLiteral sStandard(u"Standard");
+static constexpr OUString sStandard(u"Standard"_ustr);
 xBasLib->loadLibrary(sStandard);
 CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard));
 // the whole point of this test is to test the "save" operation
diff --git a/dbaccess/qa/extras/empty-stdlib-save.cxx 
b/dbaccess/qa/extras/empty-stdlib-save.cxx
index 41074d909c89..5c3b5d028d8c 100644
--- a/dbaccess/qa/extras/empty-stdlib-save.cxx
+++ b/dbaccess/qa/extras/empty-stdlib-save.cxx
@@ -54,7 +54,7 @@ void DialogSaveTest::test()
 uno::Reference< script::XStorageBasedLibraryContainer > 
xStorDlgLib(xDocScr->getDialogLibraries());
 CPPUNIT_ASSERT(xStorDlgLib.is());
 uno::Reference< script::XLibraryContainer > xDlgLib(xStorDlgLib, 
UNO_QUERY_THROW);
-static constexpr OUStringLiteral sStandard(u"Standard");
+static constexpr OUString sStandard(u"Standard"_ustr);
 xBasLib->loadLibrary(sStandard);
 xDlgLib->loadLibrary(sStandard);
 CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard));
diff --git a/dbaccess/qa/extras/nolib-save.cxx 
b/dbaccess/qa/extras/nolib-save.cxx
index 054ad9a369ca..614c4f03794a 100644
--- a/dbaccess/qa/extras/nolib-save.cxx
+++ b/dbaccess/qa/extras/nolib-save.cxx
@@ -54,7 +54,7 @@ void DialogSaveTest::test()
 uno::Reference< script::XStorageBasedLibraryContainer > 
xStorDlgLib(xDocScr->getDialogLibraries());
 CPPUNIT_ASSERT(xStorDlgLib.is());
 uno::Reference< script::XLibraryContainer > xDlgLib(xStorDlgLib, 
UNO_QUERY_THROW);
-static constexpr OUStringLiteral sStandard(u"Standard");
+static constexpr OUString sStandard(u"Standard"_ustr);
 xBasLib->loadLibrary(sStandard);
 xDlgLib->loadLibrary(sStandard);
 CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard));
diff --git a/dbaccess/qa/unit/embeddeddb_performancetest.cxx 
b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
index 921fc9977d98..184ef0831ad1 100644
--- a/dbaccess/qa/unit/embeddeddb_performancetest.cxx
+++ b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
@@ -82,7 +82,7 @@ class EmbeddedDBPerformanceTest
 : public DBTestBase
 {
 private:
-static constexpr OUStringLiteral our_sEnableTestEnvVar = u"DBA_PERFTEST";
+static constexpr OUString our_sEnableTestEnvVar = u"DBA_PERFTEST"_ustr;
 
 
 // We store the results and print 

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

[Stephan Bergmann (via logerrit)]

 cui/source/customize/acccfg.cxx|4 ++--
 cui/source/customize/cfgutil.cxx   |6 +++---
 cui/source/customize/macropg.cxx   |2 +-
 cui/source/dialogs/colorpicker.cxx |2 +-
 cui/source/dialogs/cuigaldlg.cxx   |2 +-
 cui/source/dialogs/hlinettp.cxx|2 +-
 cui/source/dialogs/hlmarkwn.cxx|6 +++---
 cui/source/dialogs/showcols.cxx|2 +-
 cui/source/options/optasian.cxx|4 ++--
 cui/source/options/optgdlg.cxx |   14 +++---
 cui/source/options/optinet2.cxx|   16 
 cui/source/options/optlanguagetool.cxx |2 +-
 cui/source/options/optlingu.cxx|8 
 cui/source/options/optpath.cxx |4 ++--
 cui/source/options/treeopt.cxx |2 +-
 cui/source/tabpages/chardlg.cxx|2 +-
 16 files changed, 39 insertions(+), 39 deletions(-)

New commits:
commit fa869ef61c790b6407ef6eae3eefc094d13c1361
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:09 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 19:31:54 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: cui

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

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 54b7eb73c81a..027ac72968e8 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -69,9 +69,9 @@
 
 using namespace css;
 
-constexpr OUStringLiteral FOLDERNAME_UICONFIG = u"Configurations2";
+constexpr OUString FOLDERNAME_UICONFIG = u"Configurations2"_ustr;
 
-constexpr OUStringLiteral MEDIATYPE_PROPNAME = u"MediaType";
+constexpr OUString MEDIATYPE_PROPNAME = u"MediaType"_ustr;
 
 const sal_uInt16 KEYCODE_ARRAY[] = { KEY_F1,
  KEY_F2,
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 3039486a2f30..3a2cdbc1b05e 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -79,9 +79,9 @@ const char CMDURL_STYLEPROT_ONLY[] = ".uno:StyleApply?";
 const char CMDURL_SPART_ONLY[] = "Style:string=";
 const char CMDURL_FPART_ONLY[] = "FamilyName:string=";
 
-constexpr OUStringLiteral STYLEPROP_UINAME = u"DisplayName";
-constexpr OUStringLiteral MACRO_SELECTOR_CONFIGNAME = u"MacroSelectorDialog";
-constexpr OUStringLiteral LAST_RUN_MACRO_INFO = u"LastRunMacro";
+constexpr OUString STYLEPROP_UINAME = u"DisplayName"_ustr;
+constexpr OUString MACRO_SELECTOR_CONFIGNAME = u"MacroSelectorDialog"_ustr;
+constexpr OUString LAST_RUN_MACRO_INFO = u"LastRunMacro"_ustr;
 
 OUString SfxStylesInfo_Impl::generateCommand(
 std::u16string_view sFamily, std::u16string_view sStyle)
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 6a22ee2c3d99..b1a1094733ea 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -38,7 +38,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-constexpr OUStringLiteral aVndSunStarUNO = u"vnd.sun.star.UNO:";
+constexpr OUString aVndSunStarUNO = u"vnd.sun.star.UNO:"_ustr;
 
 SvxMacroTabPage_Impl::SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet )
 : bReadOnly(false)
diff --git a/cui/source/dialogs/colorpicker.cxx 
b/cui/source/dialogs/colorpicker.cxx
index 24dda1936a2a..87f50b534c26 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1266,7 +1266,7 @@ com_sun_star_cui_ColorPicker_get_implementation(
 }
 
 
-constexpr OUStringLiteral gsColorKey( u"Color" );
+constexpr OUString gsColorKey( u"Color"_ustr );
 constexpr OUStringLiteral gsModeKey( u"Mode" );
 
 ColorPicker::ColorPicker()
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 530ef109c216..9a1a2e26a4ed 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -707,7 +707,7 @@ void TPGalleryThemeProperties::FillFilterList()
 
 #if HAVE_FEATURE_AVMEDIA
 // media filters
-static constexpr OUStringLiteral aWildcard = u"*.";
+static constexpr OUString aWildcard = u"*."_ustr;
 ::avmedia::FilterNameVector aFilters= 
::avmedia::MediaWindow::getMediaFilters();
 
 for(const std::pair & aFilter : aFilters)
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index a01673550851..8ffdb2053f5b 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -24,7 +24,7 @@
 #include 
 #include 
 
-constexpr OUStringLiteral sAnonymous = u"anonymous";
+constexpr OUString sAnonymous = u"anonymous"_ustr;
 
 /*
 |*
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 96b61a7e2806..7eb2ced02489 100644
--- 

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

[Stephan Bergmann (via logerrit)]

 cpputools/source/unoexe/unoexe.cxx |2 +-
 extensions/source/abpilot/fieldmappingimpl.cxx |6 +++---
 extensions/source/bibliography/bibconfig.cxx   |2 +-
 extensions/source/bibliography/datman.cxx  |2 +-
 extensions/source/dbpilots/gridwizard.cxx  |4 ++--
 extensions/source/dbpilots/optiongrouplayouter.cxx |2 +-
 extensions/source/logging/csvformatter.cxx |2 +-
 extensions/source/update/check/updatecheck.cxx |2 +-
 extensions/source/update/check/updatehdl.cxx   |   20 ++--
 extensions/source/update/ui/updatecheckui.cxx  |   12 ++--
 10 files changed, 27 insertions(+), 27 deletions(-)

New commits:
commit 3afe381c840f3c3687800410066d6738191c7480
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:08 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 19:31:34 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: cpputools

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

diff --git a/cpputools/source/unoexe/unoexe.cxx 
b/cpputools/source/unoexe/unoexe.cxx
index 9f2e233cdd7b..c6e5f0966c6c 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -90,7 +90,7 @@ const char arUsingText[] =
 static bool readOption( OUString * pValue, const char * pOpt,
 sal_uInt32 * pnIndex, const OUString & aArg)
 {
-static constexpr OUStringLiteral dash(u"-");
+static constexpr OUString dash(u"-"_ustr);
 if(!aArg.startsWith(dash))
 return false;
 
commit 566de3328e60b2608b8f611698b6d26fc33b05f1
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:14 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 19:31:21 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: extensions

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

diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx 
b/extensions/source/abpilot/fieldmappingimpl.cxx
index 35314045e918..b8e8ac56686c 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -49,7 +49,7 @@ namespace abp
 
 
 const char16_t sDriverSettingsNodeName[] = 
u"/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver";
-constexpr OUStringLiteral sAddressBookNodeName = 
u"/org.openoffice.Office.DataAccess/AddressBook";
+constexpr OUString sAddressBookNodeName = 
u"/org.openoffice.Office.DataAccess/AddressBook"_ustr;
 
 namespace fieldmapping
 {
@@ -218,8 +218,8 @@ namespace abp
 const OUString* pExistentFields = aExistentFields.getConstArray();
 const OUString* pExistentFieldsEnd = pExistentFields + 
aExistentFields.getLength();
 
-static constexpr OUStringLiteral sProgrammaticNodeName( 
u"ProgrammaticFieldName" );
-static constexpr OUStringLiteral sAssignedNodeName( 
u"AssignedFieldName" );
+static constexpr OUString sProgrammaticNodeName( 
u"ProgrammaticFieldName"_ustr );
+static constexpr OUString sAssignedNodeName( 
u"AssignedFieldName"_ustr );
 
 for ( ; pExistentFields != pExistentFieldsEnd; ++pExistentFields )
 {
diff --git a/extensions/source/bibliography/bibconfig.cxx 
b/extensions/source/bibliography/bibconfig.cxx
index 14203ae6c346..358adf8c58c3 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdb;
 
 
-constexpr OUStringLiteral cDataSourceHistory = u"DataSourceHistory";
+constexpr OUString cDataSourceHistory = u"DataSourceHistory"_ustr;
 
 Sequence const & BibConfig::GetPropertyNames()
 {
diff --git a/extensions/source/bibliography/datman.cxx 
b/extensions/source/bibliography/datman.cxx
index 4f20e997cc24..a15a3e889c18 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star::lang;
 
 // PropertyNames
 constexpr OUStringLiteral FM_PROP_LABEL = u"Label";
-constexpr OUStringLiteral FM_PROP_CONTROLSOURCE = u"DataField";
+constexpr OUString FM_PROP_CONTROLSOURCE = u"DataField"_ustr;
 constexpr OUStringLiteral FM_PROP_NAME = u"Name";
 
 static Reference< XConnection > getConnection(const OUString& _rURL)
diff --git a/extensions/source/dbpilots/gridwizard.cxx 
b/extensions/source/dbpilots/gridwizard.cxx
index c084eda7b364..99507008870d 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -93,8 +93,8 @@ namespace dbp
 if (!xColumnFactory.is() || 

[Libreoffice-bugs] [Bug 157827] No plain text paste after copying an Impress/Draw table (missing text/plain target)

[bugzilla-daemon]

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

jcs...@libreoffice.org changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1

--- Comment #2 from jcs...@libreoffice.org ---
Confirmed with:

-
Version: 24.2.0.0.alpha0+ (X86_64) / LibreOffice Community
Build ID: 7d08767b890e723cd502b1c61d250924f695eb98
CPU threads: 16; OS: Windows 10.0 Build 22621; UI render: Skia/Vulkan; VCL: win
Locale: es-ES (es_ES); UI: es-ES
Calc: CL threaded

-
Version: 7.6.2.1 (X86_64) / LibreOffice Community
Build ID: 56f7684011345957bbf33a7ee678afaf4d2ba333
CPU threads: 16; OS: Windows 10.0 Build 22621; UI render: Skia/Vulkan; VCL: win
Locale: es-ES (es_ES); UI: en-US
Calc: CL threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 144626] Borders of Writer tables are not correctly aligned

[bugzilla-daemon]

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

raal  changed:

   What|Removed |Added

 CC||r...@post.cz

--- Comment #15 from raal  ---
Created attachment 190304
  --> https://bugs.documentfoundation.org/attachment.cgi?id=190304=edit
printscreen of bug in bibisect

Bibisected with repository/OS bibisect-43max/Linux.
After this commit thick line appears on the top:

a3ada5c2e0f610e97f9494118f3823de2abb6a31 is the first bad commit
commit a3ada5c2e0f610e97f9494118f3823de2abb6a31
Author: Matthew Francis 
Date:   Thu May 28 18:29:06 2015 +0800

source-hash-111fe03e36dd7e819e8fa9bdf38a16f5284b6063

Bibisect: This commit covers the following source commit(s) which failed to
build
f979a12741d0e5f47b26aa407593ab7c21979f6dKendy
6a3fb868b2b8af21f7b6140424b6f8377599a786Kohei
ec1a3157c1851dcb481f402ec25aa38fa9e7c51c
82599357ae6066b002ca2bd2b7060b26e51ba00f
b3b57c7a3a43a056217c72716d18bdeced029b66
ae22838d2ff4d388e97c30317a6a9f83e652a06a
30f97564f86ff2fff3e682a14191db0d841df0cf
41bee5b83102760a6da7eaca3b770e4c4e310d4d
01104522ef890bb535994311e627ba1bbfff023c
4b2b4133c2bd750a4b71230433dba0e41ced0abe

After this commit is line thinner
 8565c48d7e72be078a7344dafe680452a68cd82f is the first bad commit
commit 8565c48d7e72be078a7344dafe680452a68cd82f
Author: Matthew Francis 
Date:   Thu May 28 18:29:09 2015 +0800

source-hash-15974abe63f0d4fc88099634d5cd2ddb9760ec23

commit 15974abe63f0d4fc88099634d5cd2ddb9760ec23
Author: Kohei Yoshida 
AuthorDate: Mon Jan 20 18:37:08 2014 -0500
Commit: Kohei Yoshida 
CommitDate: Mon Jan 20 18:39:54 2014 -0500

fdo#73487: Center thick border lines around cell grid.

This reduces the amount of gap at line joins. Plus it generally looks
better
this way.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 103164] [META] Footnote and Endnote bugs and enhancements

[bugzilla-daemon]

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

Stéphane Guillou (stragu)  changed:

   What|Removed |Added

 Depends on||151474


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=151474
[Bug 151474] Allow formatting footnotes in columns or separated by spaces
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 151474] Allow formatting footnotes in columns or separated by spaces

[bugzilla-daemon]

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

Stéphane Guillou (stragu)  changed:

   What|Removed |Added

 Blocks||103164
Version|unspecified |Inherited From OOo
 Status|UNCONFIRMED |NEW
 CC||stephane.guillou@libreoffic
   ||e.org
   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=14
   ||6348,
   ||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=10
   ||8546
 Ever confirmed|0   |1
   Keywords||needsUXEval

--- Comment #10 from Stéphane Guillou (stragu) 
 ---
Adding some related reports in "see also".

Request makes sens to me too -> New.

Design/UX, opinion?


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=103164
[Bug 103164] [META] Footnote and Endnote bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145073] Editing an email address corrupts the cell data

[bugzilla-daemon]

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

Stéphane Guillou (stragu)  changed:

   What|Removed |Added

 CC||stephane.guillou@libreoffic
   ||e.org

--- Comment #3 from Stéphane Guillou (stragu) 
 ---
Not a duplicate of bug 72266.
I reproduce as described the mismatch between the inputbar and the cell in 7.2:

Version: 7.2.0.4 / LibreOffice Community
Build ID: 9a9c6381e3f7a62afc1329bd359cc48accb6435b
CPU threads: 8; OS: Linux 5.15; UI render: default; VCL: gtk3
Locale: en-AU (en_AU.UTF-8); UI: en-US
Calc: threaded

As well as a recent trunk build:

Version: 24.2.0.0.alpha0+ (X86_64) / LibreOffice Community
Build ID: b83f069101f1e6d8aaac09a805f02bbc4c619e7a
CPU threads: 8; OS: Linux 5.15; UI render: default; VCL: gtk3
Locale: en-AU (en_AU.UTF-8); UI: en-US
Calc: threaded

Both with gtk3 and gen VCL plugins.

This is actually the same as bug 103447, marking as duplicate.

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

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 103447] Cell containing hyperlink (URL or email), is not synchronized properly between cell and input line (mismatch in display, edit and selection)

[bugzilla-daemon]

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

Stéphane Guillou (stragu)  changed:

   What|Removed |Added

 CC||rootki...@yahoo.it

--- Comment #14 from Stéphane Guillou (stragu) 
 ---
*** Bug 145073 has been marked as a duplicate of this bug. ***

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 157831] New: Slow loading pages

[bugzilla-daemon]

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

Bug ID: 157831
   Summary: Slow loading pages
   Product: LibreOffice
   Version: 7.6.0.3 release
  Hardware: All
OS: Windows (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: steved...@yahoo.com

Description:
Suddenly now some odt and ods files require approximately 50 seconds to open. 
Problem repeats with some files, but not others.  I'm using Windows 10 Home
version 22H2 and newly installed LibreOffice 7.6.2.1.  Same problem occurs with
LO 7.6.0.3.

Actual Results:
Merely click on the file to open.

Expected Results:
Wait approximately 50 seconds for file to open.  (Then save file as docx or
xlsx to prevent problem in the future.)


Reproducible: Sometimes


User Profile Reset: Yes

Additional Info:
File should have opened instantly as normal.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 144626] Borders of Writer tables are not correctly aligned

[bugzilla-daemon]

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

raal  changed:

   What|Removed |Added

  Regression By||Kohei Yoshida
   Keywords|bibisectRequest |bisected

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 103447] Cell containing hyperlink (URL or email), is not synchronized properly between cell and input line (mismatch in display, edit and selection)

[bugzilla-daemon]

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

Stéphane Guillou (stragu)  changed:

   What|Removed |Added

 CC||mikekagan...@hotmail.com

--- Comment #13 from Stéphane Guillou (stragu) 
 ---
*** Bug 146020 has been marked as a duplicate of this bug. ***

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 108660] [META] Formula bar (input line) bugs and enhancements

[bugzilla-daemon]

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

Stéphane Guillou (stragu)  changed:

   What|Removed |Added

 Depends on|146020  |


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=146020
[Bug 146020] URL field in Formula Bar behaves erratically when entered first
time
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 146020] URL field in Formula Bar behaves erratically when entered first time

[bugzilla-daemon]

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

Stéphane Guillou (stragu)  changed:

   What|Removed |Added

 CC||stephane.guillou@libreoffic
   ||e.org
 Status|NEW |RESOLVED
   Keywords|bibisectRequest |bibisectNotNeeded
 Resolution|--- |DUPLICATE
 Blocks|108660  |

--- Comment #4 from Stéphane Guillou (stragu) 
 ---
Thanks for the description Mike, the issue appears less unpredictable now.
Marking as duplicate of earlier bug 103447.

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


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=108660
[Bug 108660] [META] Formula bar (input line) bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 146348] FILEOPEN: DOCX: Incorrect footnote with columns

[bugzilla-daemon]

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

Stéphane Guillou (stragu)  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=15
   ||1474

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 108546] Sections in Footnotes cannot be formatted into multiple columns

[bugzilla-daemon]

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

Stéphane Guillou (stragu)  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=15
   ||1474

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 144799] FILEOPEN DOCX Text of textbox inside chart grows

[bugzilla-daemon]

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

--- Comment #4 from greg.diehl@gmail.com ---
Bug is present in latest development build

Version: 24.2.0.0.alpha0+ (AARCH64) / LibreOffice Community
Build ID: b83f069101f1e6d8aaac09a805f02bbc4c619e7a
CPU threads: 10; OS: macOS 14.0; UI render: default; VCL: osx
Locale: en-US (en_US.UTF-8); UI: en-US
Calc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 103447] Cell containing hyperlink (URL or email), is not synchronized properly between cell and input line (mismatch in display, edit and selection)

[bugzilla-daemon]

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

Stéphane Guillou (stragu)  changed:

   What|Removed |Added

Summary|Issues when working with|Cell containing hyperlink
   |URLs in Calc|(URL or email), is not
   ||synchronized properly
   ||between cell and input line
   ||(mismatch in display, edit
   ||and selection)

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 144829] EDITING Promote level on an ordered/unordered list is not recorded as tracked change

[bugzilla-daemon]

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

--- Comment #6 from greg.diehl@gmail.com ---
Reproduced with latest development build

Version: 24.2.0.0.alpha0+ (AARCH64) / LibreOffice Community
Build ID: b83f069101f1e6d8aaac09a805f02bbc4c619e7a
CPU threads: 10; OS: macOS 14.0; UI render: default; VCL: osx
Locale: en-US (en_US.UTF-8); UI: en-US
Calc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 144831] EDITING Demote level on an ordered/unordered list is not recorded as tracked change

[bugzilla-daemon]

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

--- Comment #5 from greg.diehl@gmail.com ---
Reproduced with latest development build

Version: 24.2.0.0.alpha0+ (AARCH64) / LibreOffice Community
Build ID: b83f069101f1e6d8aaac09a805f02bbc4c619e7a
CPU threads: 10; OS: macOS 14.0; UI render: default; VCL: osx
Locale: en-US (en_US.UTF-8); UI: en-US
Calc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 144830] EDITING No list operation on an ordered/unordered list is not recorded as tracked change

[bugzilla-daemon]

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

--- Comment #5 from greg.diehl@gmail.com ---
Reproduced with latest development build

Version: 24.2.0.0.alpha0+ (AARCH64) / LibreOffice Community
Build ID: b83f069101f1e6d8aaac09a805f02bbc4c619e7a
CPU threads: 10; OS: macOS 14.0; UI render: default; VCL: osx
Locale: en-US (en_US.UTF-8); UI: en-US
Calc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 150453] [EDITING] Select all in formula bar only selects partially for URLs

[bugzilla-daemon]

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

Stéphane Guillou (stragu)  changed:

   What|Removed |Added

Version|4.1.0.4 release |3.5.0 release

--- Comment #12 from Stéphane Guillou (stragu) 
 ---
Repro in:

LibreOffice 3.5.0rc3 
Build ID: 7e68ba2-a744ebf-1f241b7-c506db1-7d53735

No repro in libreoffice-3.4.6rc2. Back then, clicking in formula bar would
always format its contents as a hyperlink, and Ctrl + A would work as expected.
Likely the same cause as bug 103447.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 85184] [META] Color picker toolbar, dialog and sidebar drop-down widget bugs and enhancements

[bugzilla-daemon]

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

Bug 157565 Summary: The Font Color chooser does not show color names any more 
since 7.6
https://bugs.documentfoundation.org/show_bug.cgi?id=157565

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 114019] [META] Tooltip bugs and enhancements

[bugzilla-daemon]

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

Bug 157565 Summary: The Font Color chooser does not show color names any more 
since 7.6
https://bugs.documentfoundation.org/show_bug.cgi?id=157565

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.