date:20210922

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - icon-themes/colibre icon-themes/colibre_svg

2021-09-22 Thread Rizal Muttaqin (via logerrit)

 icon-themes/colibre/cmd/32/executereport.png |binary
 icon-themes/colibre/cmd/32/sbaexecutesql.png |binary
 icon-themes/colibre/cmd/32/sbanativesql.png  |binary
 icon-themes/colibre/cmd/lc_executereport.png |binary
 icon-themes/colibre/cmd/lc_sbaexecutesql.png |binary
 icon-themes/colibre/cmd/lc_sbanativesql.png  |binary
 icon-themes/colibre/cmd/sc_executereport.png |binary
 icon-themes/colibre/cmd/sc_sbaexecutesql.png |binary
 icon-themes/colibre/cmd/sc_sbanativesql.png  |binary
 icon-themes/colibre_svg/cmd/32/executereport.svg |2 +-
 icon-themes/colibre_svg/cmd/32/sbaexecutesql.svg |2 +-
 icon-themes/colibre_svg/cmd/32/sbanativesql.svg  |2 +-
 icon-themes/colibre_svg/cmd/lc_executereport.svg |2 +-
 icon-themes/colibre_svg/cmd/lc_sbaexecutesql.svg |2 +-
 icon-themes/colibre_svg/cmd/lc_sbanativesql.svg  |2 +-
 icon-themes/colibre_svg/cmd/sc_executereport.svg |3 ++-
 icon-themes/colibre_svg/cmd/sc_sbaexecutesql.svg |2 +-
 icon-themes/colibre_svg/cmd/sc_sbanativesql.svg  |7 ---
 18 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 03a215cfb95fea956b90d8068f4504e9671defe3
Author: Rizal Muttaqin 
AuthorDate: Thu Sep 23 11:33:23 2021 +0700
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Sep 23 08:55:03 2021 +0200

tdf#144631 Colibre: sync up query/sql/report execution icons

Change-Id: I52cfa4aa52f0bc03accb1030d463893ee871cdab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122504
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 
(cherry picked from commit 0b810cc0f04241e644c82ba8bdad6a075b964118)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122435
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/icon-themes/colibre/cmd/32/executereport.png 
b/icon-themes/colibre/cmd/32/executereport.png
index 53d70d529ac0..e23f494cead9 100644
Binary files a/icon-themes/colibre/cmd/32/executereport.png and 
b/icon-themes/colibre/cmd/32/executereport.png differ
diff --git a/icon-themes/colibre/cmd/32/sbaexecutesql.png 
b/icon-themes/colibre/cmd/32/sbaexecutesql.png
index 6217c3651e29..1039ac6caddc 100644
Binary files a/icon-themes/colibre/cmd/32/sbaexecutesql.png and 
b/icon-themes/colibre/cmd/32/sbaexecutesql.png differ
diff --git a/icon-themes/colibre/cmd/32/sbanativesql.png 
b/icon-themes/colibre/cmd/32/sbanativesql.png
index dff8e9399bbe..4f794d5b38c5 100644
Binary files a/icon-themes/colibre/cmd/32/sbanativesql.png and 
b/icon-themes/colibre/cmd/32/sbanativesql.png differ
diff --git a/icon-themes/colibre/cmd/lc_executereport.png 
b/icon-themes/colibre/cmd/lc_executereport.png
index 9b3fbb57288f..c3e10e77d025 100644
Binary files a/icon-themes/colibre/cmd/lc_executereport.png and 
b/icon-themes/colibre/cmd/lc_executereport.png differ
diff --git a/icon-themes/colibre/cmd/lc_sbaexecutesql.png 
b/icon-themes/colibre/cmd/lc_sbaexecutesql.png
index a71eb9784e56..0f6c62c3ede0 100644
Binary files a/icon-themes/colibre/cmd/lc_sbaexecutesql.png and 
b/icon-themes/colibre/cmd/lc_sbaexecutesql.png differ
diff --git a/icon-themes/colibre/cmd/lc_sbanativesql.png 
b/icon-themes/colibre/cmd/lc_sbanativesql.png
index f7e32b0584dd..56df87b72581 100644
Binary files a/icon-themes/colibre/cmd/lc_sbanativesql.png and 
b/icon-themes/colibre/cmd/lc_sbanativesql.png differ
diff --git a/icon-themes/colibre/cmd/sc_executereport.png 
b/icon-themes/colibre/cmd/sc_executereport.png
index 76a664c3bdc0..548a827e0ed3 100644
Binary files a/icon-themes/colibre/cmd/sc_executereport.png and 
b/icon-themes/colibre/cmd/sc_executereport.png differ
diff --git a/icon-themes/colibre/cmd/sc_sbaexecutesql.png 
b/icon-themes/colibre/cmd/sc_sbaexecutesql.png
index 469c5a720cdb..37866388ea9e 100644
Binary files a/icon-themes/colibre/cmd/sc_sbaexecutesql.png and 
b/icon-themes/colibre/cmd/sc_sbaexecutesql.png differ
diff --git a/icon-themes/colibre/cmd/sc_sbanativesql.png 
b/icon-themes/colibre/cmd/sc_sbanativesql.png
index 634987be26cb..9127a87ee8fd 100644
Binary files a/icon-themes/colibre/cmd/sc_sbanativesql.png and 
b/icon-themes/colibre/cmd/sc_sbanativesql.png differ
diff --git a/icon-themes/colibre_svg/cmd/32/executereport.svg 
b/icon-themes/colibre_svg/cmd/32/executereport.svg
index 315e7dff4851..460adcad1da1 100644
--- a/icon-themes/colibre_svg/cmd/32/executereport.svg
+++ b/icon-themes/colibre_svg/cmd/32/executereport.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/32/sbaexecutesql.svg 
b/icon-themes/colibre_svg/cmd/32/sbaexecutesql.svg
index 909912d17e46..f2f0cf08fc59 100644
--- a/icon-themes/colibre_svg/cmd/32/sbaexecutesql.svg
+++ b/icon-themes/colibre_svg/cmd/32/sbaexecutesql.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline a

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 connectivity/source/drivers/mysql_jdbc/YDriver.cxx |   14 +++--
 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |   15 
+-
 connectivity/source/drivers/postgresql/pq_xcolumns.cxx |9 --
 3 files changed, 26 insertions(+), 12 deletions(-)

New commits:
commit bbcb3e68c75d9eb7da36788def8845a3e3e727f8
Author: Stephan Bergmann 
AuthorDate: Thu Sep 23 07:30:35 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 23 08:51:55 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: connectivity

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

diff --git a/connectivity/source/drivers/mysql_jdbc/YDriver.cxx 
b/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
index ad8ce525feac..7ee501d42e81 100644
--- a/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
@@ -17,8 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
+
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -93,11 +98,14 @@ enum class T_DRIVERTYPE
 Native
 };
 
-bool isOdbcUrl(const OUString& _sUrl) { return 
_sUrl.startsWith("sdbc:mysql:odbc:"); }
+bool isOdbcUrl(std::u16string_view _sUrl) { return o3tl::starts_with(_sUrl, 
u"sdbc:mysql:odbc:"); }
 
-bool isNativeUrl(const OUString& _sUrl) { return 
_sUrl.startsWith("sdbc:mysql:mysqlc:"); }
+bool isNativeUrl(std::u16string_view _sUrl)
+{
+return o3tl::starts_with(_sUrl, u"sdbc:mysql:mysqlc:");
+}
 
-T_DRIVERTYPE lcl_getDriverType(const OUString& _sUrl)
+T_DRIVERTYPE lcl_getDriverType(std::u16string_view _sUrl)
 {
 T_DRIVERTYPE eRet = T_DRIVERTYPE::Jdbc;
 if (isOdbcUrl(_sUrl))
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 8f2021608830..b6b7b44482bd 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -74,6 +74,7 @@
 #include "pq_statics.hxx"
 #include "pq_tools.hxx"
 
+#include 
 #include 
 #include 
 #include 
@@ -1184,34 +1185,34 @@ css::uno::Reference< XResultSet > 
DatabaseMetaData::getTables(
 namespace
 {
 // sort no schema first, then "public", then normal schemas, then internal 
schemas
-int compare_schema(const OUString &nsA, const OUString &nsB)
+int compare_schema(const OUString &nsA, std::u16string_view nsB)
 {
 if (nsA.isEmpty())
 {
-return nsB.isEmpty() ? 0 : -1;
+return nsB.empty() ? 0 : -1;
 }
-else if (nsB.isEmpty())
+else if (nsB.empty())
 {
 assert(!nsA.isEmpty());
 return 1;
 }
 else if(nsA == "public")
 {
-return (nsB == "public") ? 0 : -1;
+return (nsB == u"public") ? 0 : -1;
 }
-else if(nsB == "public")
+else if(nsB == u"public")
 {
 assert(nsA != "public");
 return 1;
 }
 else if(nsA.startsWith("pg_"))
 {
-if(nsB.startsWith("pg_"))
+if(o3tl::starts_with(nsB, u"pg_"))
 return nsA.compareTo(nsB);
 else
 return 1;
 }
-else if(nsB.startsWith("pg_"))
+else if(o3tl::starts_with(nsB, u"pg_"))
 {
 return -1;
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx 
b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index 34d9ef38f36e..82d595628db3 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -34,6 +34,11 @@
  *
  /
 
+#include 
+
+#include 
+
+#include 
 #include 
 #include 
 #include 
@@ -81,9 +86,9 @@ static Any isCurrency( const OUString & typeName )
 // typeName.equalsIgnoreAsciiCase("bigserial");
 // }
 
-static Any isAutoIncrement( const OUString & defaultValue )
+static Any isAutoIncrement( std::u16string_view defaultValue )
 {
-bool ret = defaultValue.startsWith( "nextval(" );
+bool ret = o3tl::starts_with( defaultValue, u"nextval(" );
 // printf( "%s %d\n",
 // OUStringToOString(defaultValue, 
RTL_TEXTENCODING_ASCII_US).getStr(),
 // ret );

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 cui/source/dialogs/hlinettp.cxx |   10 +-
 cui/source/inc/hlinettp.hxx |6 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 7c2c5400cb1726112165482cc6074a88351edfae
Author: Stephan Bergmann 
AuthorDate: Thu Sep 23 07:29:55 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 23 08:51:16 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: cui

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

diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index afa7b3e4e602..19153270a600 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 
@@ -24,7 +25,6 @@
 #include 
 
 constexpr OUStringLiteral sAnonymous = u"anonymous";
-char const sFTPScheme[]= INET_FTP_SCHEME;
 
 /*
 |*
@@ -92,7 +92,7 @@ void SvxHyperlinkInternetTp::FillDlgFields(const OUString& 
rStrURL)
 OUString aStrScheme(GetSchemeFromURL(rStrURL));
 
 // set additional controls for FTP: Username / Password
-if (aStrScheme.startsWith(sFTPScheme))
+if (aStrScheme.startsWith(INET_FTP_SCHEME))
 {
 if ( aURL.GetUser().toAsciiLowerCase().startsWith( sAnonymous ) )
 setAnonymousFTPUser();
@@ -238,10 +238,10 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, 
ModifiedLoginHdl_Impl, weld::Entry&, voi
 }
 }
 
-void SvxHyperlinkInternetTp::SetScheme(const OUString& rScheme)
+void SvxHyperlinkInternetTp::SetScheme(std::u16string_view rScheme)
 {
 //if rScheme is empty or unknown the default behaviour is like it where 
HTTP
-bool bFTP = rScheme.startsWith(sFTPScheme);
+bool bFTP = o3tl::starts_with(rScheme, u"" INET_FTP_SCHEME);
 bool bInternet = !bFTP;
 
 //update protocol button selection:
@@ -260,7 +260,7 @@ void SvxHyperlinkInternetTp::SetScheme(const OUString& 
rScheme)
 m_xCbAnonymous->set_visible( bFTP );
 
 //update 'link target in document'-window and opening-button
-if (rScheme.startsWith(INET_HTTP_SCHEME) || rScheme.isEmpty())
+if (o3tl::starts_with(rScheme, u"" INET_HTTP_SCHEME) || rScheme.empty())
 {
 if ( m_bMarkWndOpen )
 ShowMarkWnd ();
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index e8eb96e6883d..c2340fdde2f7 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -18,6 +18,10 @@
  */
 #pragma once
 
+#include 
+
+#include 
+
 #include "cuihyperdlg.hxx"
 #include "hltpbase.hxx"
 
@@ -54,7 +58,7 @@ private:
 DECL_LINK( TimeoutHdl_Impl, Timer *, void); ///< Handler for 
timer -timeout
 
 
-voidSetScheme(const OUString& rScheme);
+voidSetScheme(std::u16string_view rScheme);
 voidRemoveImproperProtocol(std::u16string_view rProperScheme);
 OUString  GetSchemeFromButtons() const;
 INetProtocol GetSmartProtocolFromButtons() const;

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 dbaccess/source/core/misc/dsntypes.cxx |5 +++--
 dbaccess/source/inc/dsntypes.hxx   |2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 2e088bf71767849e99070d576fb300c244bd6475
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 23:28:10 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 23 08:50:50 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: dbaccess

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

diff --git a/dbaccess/source/core/misc/dsntypes.cxx 
b/dbaccess/source/core/misc/dsntypes.cxx
index aca8aacb560b..2758b0a6ed6a 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -278,9 +279,9 @@ Sequence 
ODsnTypeCollection::getDefaultDBSettings( std::u16string
 return aProperties.getPropertyValues();
 }
 
-bool ODsnTypeCollection::isEmbeddedDatabase( const OUString& _sURL )
+bool ODsnTypeCollection::isEmbeddedDatabase( std::u16string_view _sURL )
 {
-return _sURL.startsWith( "sdbc:embedded:" );
+return o3tl::starts_with( _sURL, u"sdbc:embedded:" );
 }
 
 OUString ODsnTypeCollection::getEmbeddedDatabase()
diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx
index b7642c66f20c..871db0a1fe27 100644
--- a/dbaccess/source/inc/dsntypes.hxx
+++ b/dbaccess/source/inc/dsntypes.hxx
@@ -158,7 +158,7 @@ public:
 bool isConnectionUrlRequired(std::u16string_view _sURL) const;
 
 /// checks if the given data source type embeds its data into the database 
document
-static bool isEmbeddedDatabase( const OUString& _sURL );
+static bool isEmbeddedDatabase( std::u16string_view _sURL );
 
 static OUString getEmbeddedDatabase();

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 desktop/source/migration/migration_impl.hxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 09fc31370252a09dd8affda0b0c743133e023244
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 23:26:34 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 23 08:49:35 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: desktop

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

diff --git a/desktop/source/migration/migration_impl.hxx 
b/desktop/source/migration/migration_impl.hxx
index a3e21a4a1f24..cf2d201d22e6 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -19,9 +19,11 @@
 #pragma once
 
 #include 
+#include 
 #include 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -64,9 +66,9 @@ typedef std::vector< migration_step > migrations_v;
 typedef std::unique_ptr< migrations_v > migrations_vr;
 typedef std::vector< supported_migration > migrations_available;
 
-inline bool areBothOpenFrom(std::u16string_view cmd1, OUString const & cmd2)
+inline bool areBothOpenFrom(std::u16string_view cmd1, std::u16string_view cmd2)
 {
-return cmd1 == u".uno:Open" && cmd2.startsWith(".uno:OpenFrom");
+return cmd1 == u".uno:Open" && o3tl::starts_with(cmd2, u".uno:OpenFrom");
 }
 
 /**

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/qa writerfilter/source

2021-09-22 Thread Vasily Melenchuk (via logerrit)

 sw/qa/extras/globalfilter/data/char_background_editing.docx |binary
 sw/qa/extras/globalfilter/data/fieldmark_QUOTE_nest.docx|binary
 sw/qa/extras/layout/layout.cxx  |2 
 sw/qa/extras/ooxmlexport/data/tdf123642.docx|binary
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx  |   21 +++
 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx   |2 
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx   |6 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx   |   75 +++-
 8 files changed, 100 insertions(+), 6 deletions(-)

New commits:
commit d1df1b71cffa91c791b2b8c26ef1df241d301742
Author: Vasily Melenchuk 
AuthorDate: Thu Sep 9 11:41:33 2021 +0300
Commit: Thorsten Behrens 
CommitDate: Thu Sep 23 08:43:18 2021 +0200

tdf#123642: keep last bookmark at the document end

In some cases DomainMapper_Impl::RemoveLastParagraph() can also remove
last bookmark from real last paragraph. This does never happens
when we use xParagraph->dispose(), but pretty always during older
way with xCursor->setString(OUString()).

Unfortunately without deep refactoring of redlines, bookmarks, etc.
I see no other way to avoid this removal except given hack which is
trying to store last bookmark and if it did disappear restore it.

Some existing unittests were adjusted: corresponding original DOCX
files did contain final bookmarks not taken into account by the code.
In some cases test code is modified, in some just removed final
bookmark in DOCX: such multi-format tests as in ooxmlfieldexport.cxx
will be more identical to RTF & DOC variants.

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

Change-Id: Ie9948b58cda705a0b85fa8e5e08b72fbb7d682b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121409
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122016
Tested-by: Samuel Mehrbrodt 

diff --git a/sw/qa/extras/globalfilter/data/char_background_editing.docx 
b/sw/qa/extras/globalfilter/data/char_background_editing.docx
index 3e3302d00c71..5e92fe8bbd49 100644
Binary files a/sw/qa/extras/globalfilter/data/char_background_editing.docx and 
b/sw/qa/extras/globalfilter/data/char_background_editing.docx differ
diff --git a/sw/qa/extras/globalfilter/data/fieldmark_QUOTE_nest.docx 
b/sw/qa/extras/globalfilter/data/fieldmark_QUOTE_nest.docx
index ba886edfa777..9fbec01e0ab6 100644
Binary files a/sw/qa/extras/globalfilter/data/fieldmark_QUOTE_nest.docx and 
b/sw/qa/extras/globalfilter/data/fieldmark_QUOTE_nest.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index b54f2bcf03c0..72fc20dded00 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -1167,7 +1167,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf116486)
 {
 SwDoc* pDoc = createDoc("tdf116486.docx");
 CPPUNIT_ASSERT(pDoc);
-OUString aTop = parseDump("/root/page/body/txt/Special", "nHeight");
+OUString aTop = parseDump("/root/page/body/txt/Special[1]", "nHeight");
 CPPUNIT_ASSERT_EQUAL(OUString("4006"), aTop);
 }
 
diff --git a/sw/qa/extras/ooxmlexport/data/tdf123642.docx 
b/sw/qa/extras/ooxmlexport/data/tdf123642.docx
new file mode 100644
index ..9817093e02f8
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf123642.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index a20a93c93637..0b175bd83cd3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -11,6 +11,7 @@
 
 #include 
 #include 
+#include 
 
 char const DATA_DIRECTORY[] = "/sw/qa/extras/ooxmlexport/data/";
 
@@ -107,6 +108,26 @@ DECLARE_OOXMLEXPORT_TEST(testTdf135973, "tdf135973.odt")
 }
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf123642_BookmarkAtDocEnd, "tdf123642.docx")
+{
+// get bookmark interface
+uno::Reference xBookmarksSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY);
+uno::Reference xBookmarksByName = 
xBookmarksSupplier->getBookmarks();
+
+// check: we have 1 bookmark (previously there were 0)
+CPPUNIT_ASSERT_EQUAL(static_cast(1), 
xBookmarksByIdx->getCount());
+CPPUNIT_ASSERT(xBookmarksByName->hasByName("Bookmark1"));
+
+// and it is really in exprted DOCX (let's ensure)
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+   return; // initial import, no futher checks
+
+CPPUNIT_ASSERT_EQUAL(OUString("Bookmark1"), getXPath(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:bookmarkStart[1]", "name"));
+}
+
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sc/source sc/uiconfig solenv/sanitizers

2021-09-22 Thread Samuel Mehrbrodt (via logerrit)

 sc/source/ui/dbgui/filtdlg.cxx   |  240 ---
 sc/source/ui/inc/filtdlg.hxx |   11 +
 sc/uiconfig/scalc/ui/standardfilterdialog.ui |  205 +--
 solenv/sanitizers/ui/modules/scalc.suppr |5 
 4 files changed, 393 insertions(+), 68 deletions(-)

New commits:
commit 94a51d9497f630ce42d59c812077e25753daedaf
Author: Samuel Mehrbrodt 
AuthorDate: Thu Sep 9 09:33:49 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Sep 23 08:41:04 2021 +0200

tdf#143103 Support Color Filter in "Standard Filter" dialog

Change-Id: Ie8ffc928315b742d5b445d5fdda62cb9c2aabc0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122089
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit d9dd003f63a781e63bfbe380ea737e080c21881f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122347
Reviewed-by: Thorsten Behrens 
Tested-by: Samuel Mehrbrodt 

diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 8882d9139c89..8fbe257d2206 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -34,9 +34,13 @@
 #include 
 
 #include 
+#include 
 #include 
+#include 
+#include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -55,6 +59,8 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* 
pCW, weld::Window* pPa
 , aStrEmpty(ScResId(SCSTR_FILTER_EMPTY))
 , aStrNotEmpty(ScResId(SCSTR_FILTER_NOTEMPTY))
 , aStrColumn(ScResId(SCSTR_COLUMN))
+, aStrTextColor(ScResId(SCSTR_FILTER_TEXT_COLOR))
+, aStrBackgroundColor(ScResId(SCSTR_FILTER_BACKGROUND_COLOR))
 , nWhichQuery(rArgSet.GetPool()->GetWhich(SID_QUERY))
 , theQueryData(static_cast(rArgSet.Get(nWhichQuery)).GetQueryData())
 , pViewData(nullptr)
@@ -65,18 +71,22 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* 
pCW, weld::Window* pPa
 , m_xLbField1(m_xBuilder->weld_combo_box("field1"))
 , m_xLbCond1(m_xBuilder->weld_combo_box("cond1"))
 , m_xEdVal1(m_xBuilder->weld_combo_box("val1"))
+, m_xLbColor1(m_xBuilder->weld_combo_box("color1"))
 , m_xLbConnect2(m_xBuilder->weld_combo_box("connect2"))
 , m_xLbField2(m_xBuilder->weld_combo_box("field2"))
 , m_xLbCond2(m_xBuilder->weld_combo_box("cond2"))
 , m_xEdVal2(m_xBuilder->weld_combo_box("val2"))
+, m_xLbColor2(m_xBuilder->weld_combo_box("color2"))
 , m_xLbConnect3(m_xBuilder->weld_combo_box("connect3"))
 , m_xLbField3(m_xBuilder->weld_combo_box("field3"))
 , m_xLbCond3(m_xBuilder->weld_combo_box("cond3"))
 , m_xEdVal3(m_xBuilder->weld_combo_box("val3"))
+, m_xLbColor3(m_xBuilder->weld_combo_box("color3"))
 , m_xLbConnect4(m_xBuilder->weld_combo_box("connect4"))
 , m_xLbField4(m_xBuilder->weld_combo_box("field4"))
 , m_xLbCond4(m_xBuilder->weld_combo_box("cond4"))
 , m_xEdVal4(m_xBuilder->weld_combo_box("val4"))
+, m_xLbColor4(m_xBuilder->weld_combo_box("color4"))
 , m_xContents(m_xBuilder->weld_widget("grid"))
 , m_xScrollBar(m_xBuilder->weld_scrolled_window("scrollbar"))
 , m_xExpander(m_xBuilder->weld_expander("more"))
@@ -116,6 +126,33 @@ ScFilterDlg::~ScFilterDlg()
 pTimer.reset();
 }
 
+namespace {
+VirtualDevice* lcl_getColorImage(const Color &rColor)
+{
+const StyleSettings& rStyleSettings = 
Application::GetSettings().GetStyleSettings();
+Size aImageSize(rStyleSettings.GetListBoxPreviewDefaultPixelSize());
+
+VclPtrInstance xDevice;
+xDevice->SetOutputSize(aImageSize);
+const tools::Rectangle aRect(Point(0, 0), aImageSize);
+if (rColor == COL_NONE_COLOR)
+{
+const Color aW(COL_WHITE);
+const Color aG(0xef, 0xef, 0xef);
+xDevice->DrawCheckered(aRect.TopLeft(), aRect.GetSize(), 8, aW, aG);
+xDevice->SetFillColor();
+}
+else
+{
+xDevice->SetFillColor(rColor);
+}
+
+xDevice->DrawRect(aRect);
+
+return xDevice.get();
+}
+}
+
 void ScFilterDlg::Init( const SfxItemSet& rArgSet )
 {
 const ScQueryItem& rQueryItem = static_cast(
@@ -150,6 +187,11 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
 m_xLbCond3->connect_changed( LINK( this, ScFilterDlg, LbSelectHdl ) );
 m_xLbCond4->connect_changed( LINK( this, ScFilterDlg, LbSelectHdl ) );
 
+m_xLbColor1->connect_changed( LINK( this, ScFilterDlg, LbSelectHdl ) );
+m_xLbColor2->connect_changed( LINK( this, ScFilterDlg, LbSelectHdl ) );
+m_xLbColor3->connect_changed( LINK( this, ScFilterDlg, LbSelectHdl ) );
+m_xLbColor4->connect_changed( LINK( this, ScFilterDlg, LbSelectHdl ) );
+
 pViewData   = rQueryItem.GetViewData();
 pDoc= pViewData ? pViewData->GetDocument() : nullptr;
 nSrcTab = pViewData ? pViewData->GetTabNo() : static_cast(0);
@@ -175,6 +217,11 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
 maConnLbArr.push_back(m_xLbConnect2.get());
 maConnLbArr.push_back(m_xLbConnect3.get());
 maConn

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 2 commits - include/tools sc/uiconfig tools/source

2021-09-22 Thread Samuel Mehrbrodt (via logerrit)

 include/tools/color.hxx  |   21 +
 sc/uiconfig/scalc/ui/standardfilterdialog.ui |  477 ---
 tools/source/generic/color.cxx   |   39 ++
 3 files changed, 344 insertions(+), 193 deletions(-)

New commits:
commit f3a14171997ce33ba5f872799ec188b402a5b36f
Author: Samuel Mehrbrodt 
AuthorDate: Mon Sep 20 10:40:45 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Sep 23 08:40:45 2021 +0200

Save with glade 3.38.2

Change-Id: Ie9f8b54d64b66f51d145a697af78882cc769ac8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122346
Reviewed-by: Thorsten Behrens 
Tested-by: Samuel Mehrbrodt 

diff --git a/sc/uiconfig/scalc/ui/standardfilterdialog.ui 
b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
index a71da96fbb22..d47f384d471d 100644
--- a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
@@ -1,38 +1,35 @@
 
-
+
 
   
   
-False
-6
+False
+6
 Standard Filter
 False
-0
-0
-dialog
-
-  
-
+0
+0
+dialog
 
   
-False
+False
 True
 True
 vertical
 12
 
   
-False
-end
+False
+end
 
   
 gtk-ok
 True
-True
-True
-True
-True
-True
+True
+True
+True
+True
+True
   
   
 False
@@ -44,10 +41,10 @@
   
 gtk-cancel
 True
-True
-True
-True
-True
+True
+True
+True
+True
   
   
 False
@@ -59,10 +56,10 @@
   
 gtk-help
 True
-True
-True
-True
-True
+True
+True
+True
+True
   
   
 False
@@ -75,58 +72,60 @@
   
 False
 True
-end
+end
 0
   
 
 
   
 True
-False
+False
 True
 True
-0
-none
+0
+none
 
   
 True
-False
+False
 True
 True
-6
-12
+6
+12
 
   
 True
-True
+True
 True
 True
-never
-always
-in
+never
+always
+in
 
   
 True
-False
+False
 True
 True
 
+  
   
 True
-False
+False
 
+  
   
 True
-False
+False
 True
 True
-3
-6
-12
+3
+6
+12
 
   
 True
-False
+False
 
   AND
   OR
@@ -141,14 +140,14 @@
 
   
   
-0
-1
+0
+1
   
 
 
   
 True
-False
+False
 
   AND

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

2021-09-22 Thread Jim Raykowski (via logerrit)

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

New commits:
commit e43eeac1a99ea0d70192dfd7cecf3e8f52f3e53c
Author: Jim Raykowski 
AuthorDate: Wed Sep 22 17:24:42 2021 -0800
Commit: Jim Raykowski 
CommitDate: Thu Sep 23 08:35:50 2021 +0200

tdf#95378 Writer Navigator: Track indexes

Resolves indexes tracking part of the enhancement request. Makes
corresponding table of content entry, listed under Indexes category in
Navigator content tree, highlight when current cursor position in the
document is on table of content type section.

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

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index ff17d753e13e..9fb2367e0d39 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3557,6 +3557,14 @@ void SwContentTree::UpdateTracking()
 }
 return;
 }
+// indexes
+if (const SwTOXBase* pTOX = m_pActiveShell->GetCurTOX(); pTOX &&
+!(m_bIsRoot && m_nRootType != ContentTypeId::INDEX))
+{
+lcl_SelectByContentTypeAndName(this, *m_xTreeView, 
SwResId(STR_CONTENT_TYPE_INDEX),
+   pTOX->GetTOXName());
+return;
+}
 // section
 if (const SwSection* pSection = m_pActiveShell->GetCurrSection(); pSection 
&&
 !(m_bIsRoot && m_nRootType != ContentTypeId::REGION))

[Libreoffice-commits] core.git: download.lst external/pdfium solenv/flatpak-manifest.in vcl/source

2021-09-22 Thread Miklos Vajna (via logerrit)

 download.lst   |4 
 external/pdfium/Library_pdfium.mk  |   11 +
 external/pdfium/build.patch.1  |  168 +
 external/pdfium/cg-instead-of-carbon.patch.1   |2 
 external/pdfium/inc/pch/precompiled_pdfium.hxx |   16 +-
 solenv/flatpak-manifest.in |6 
 vcl/source/pdf/PDFiumLibrary.cxx   |4 
 7 files changed, 89 insertions(+), 122 deletions(-)

New commits:
commit 8cecaa622700cecb5b5776bd3e5360ac6cc3dd63
Author: Miklos Vajna 
AuthorDate: Wed Sep 22 20:09:04 2021 +0200
Commit: Miklos Vajna 
CommitDate: Thu Sep 23 08:11:55 2021 +0200

external: update pdfium to 4643

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

diff --git a/download.lst b/download.lst
index da331797a1f4..f816e785f176 100644
--- a/download.lst
+++ b/download.lst
@@ -208,8 +208,8 @@ export ORCUS_SHA256SUM := 
c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f9
 export ORCUS_TARBALL := liborcus-0.16.1.tar.bz2
 export PAGEMAKER_SHA256SUM := 
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
 export PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
-export PDFIUM_SHA256SUM := 
b0c5725e1cdcef7f52f068fd33adf9e8d833a271c28ba5b6a5a576ef8f2bbbf4
-export PDFIUM_TARBALL := pdfium-4568.tar.bz2
+export PDFIUM_SHA256SUM := 
eb98a77eaaab9e9e8de541cfd18b9438dd3c538bd5ef163820353179727f5dc9
+export PDFIUM_TARBALL := pdfium-4643.tar.bz2
 export PIXMAN_SHA256SUM := 
6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc
 export PIXMAN_TARBALL := pixman-0.40.0.tar.gz
 export LIBPNG_SHA256SUM := 
505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
diff --git a/external/pdfium/Library_pdfium.mk 
b/external/pdfium/Library_pdfium.mk
index 1cec5c19573d..8b55628fd30f 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -58,7 +58,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_actionhandler \
 UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_annotiterator \
 UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_customaccess \
-UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_fieldaction \
 UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_filewriteadapter \
 UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_helpers \
 UnpackedTarball/pdfium/fpdfsdk/fpdf_annot \
@@ -104,7 +103,8 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_textfield \
 UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_button \
 UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_textobject \
-UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_privatedata \
+UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_fieldaction \
+UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_perwindowdata \
 ))
 
 # fpdfapi
@@ -288,6 +288,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_pagerendercontext \
 UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_transferfuncdib \
 UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_transferfunc \
+UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_basedcs \
 ))
 
 # fpdfdoc
@@ -363,7 +364,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext \
 UnpackedTarball/pdfium/core/fxcodec/basic/basicmodule \
 UnpackedTarball/pdfium/core/fxcodec/flate/flatemodule \
-UnpackedTarball/pdfium/core/fxcodec/icc/iccmodule \
+UnpackedTarball/pdfium/core/fxcodec/icc/icc_transform \
 UnpackedTarball/pdfium/core/fxcodec/jbig2/jbig2_decoder \
 UnpackedTarball/pdfium/core/fxcodec/jpeg/jpeg_common \
 ))
@@ -615,12 +616,14 @@ $(eval $(call gb_Library_add_generated_cobjects,pdfium,\
 UnpackedTarball/pdfium/third_party/freetype/src/src/truetype/truetype \
 UnpackedTarball/pdfium/third_party/freetype/src/src/type1/type1 \
 UnpackedTarball/pdfium/third_party/freetype/src/src/base/ftdebug \
+UnpackedTarball/pdfium/third_party/freetype/src/src/base/ftfstype \
 ))
 endif
 
 ifneq ($(OS),WNT)
 $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/core/fxcrt/cfx_fileaccess_posix \
+UnpackedTarball/pdfium/core/fxcrt/fx_folder_posix \
 ))
 endif
 
@@ -636,8 +639,10 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/core/fxge/win32/cps_printer_driver \
 UnpackedTarball/pdfium/core/fxge/win32/ctext_only_printer_driver \
 UnpackedTarball/pdfium/core/fxge/win32/cwin32_platform \
+UnpackedTarball/pdfium/core/fxge/win32/cfx_psfonttracker \
 UnpackedTarball/pdfium/core/fxge/cfx_windowsrenderdevice \
 UnpackedTarball/pdfium/core/fxcrt/cfx_fileaccess_windows \
+

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

2021-09-22 Thread Samuel Mehrbrodt (via logerrit)

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

New commits:
commit e752ce56b51c832dbea1e7f20e3b6671d99df990
Author: Samuel Mehrbrodt 
AuthorDate: Tue Sep 21 16:28:30 2021 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Sep 23 07:53:38 2021 +0200

Fix color filter popup position

popup was wrongly placed when dropdown was not in the first column

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

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 250b1152f114..16ce773a287b 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -956,7 +956,8 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode 
eMode)
 }
 i++;
 }
-Point pos(mpAutoFilterPopup->GetSizePixel().getWidth(), 150);
+Point pos(mpAutoFilterPopup->GetPosPixel());
+pos.Move(150, 0);
 sal_uInt16 nSelected = pColorMenu->Execute(this, pos);
 pColorMenu.disposeAndClear();
 rControl.terminateAllPopupMenus();

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg

2021-09-22 Thread Rizal Muttaqin (via logerrit)

 icon-themes/colibre/cmd/32/executereport.png |binary
 icon-themes/colibre/cmd/32/sbaexecutesql.png |binary
 icon-themes/colibre/cmd/32/sbanativesql.png  |binary
 icon-themes/colibre/cmd/lc_executereport.png |binary
 icon-themes/colibre/cmd/lc_sbaexecutesql.png |binary
 icon-themes/colibre/cmd/lc_sbanativesql.png  |binary
 icon-themes/colibre/cmd/sc_executereport.png |binary
 icon-themes/colibre/cmd/sc_sbaexecutesql.png |binary
 icon-themes/colibre/cmd/sc_sbanativesql.png  |binary
 icon-themes/colibre_svg/cmd/32/executereport.svg |2 +-
 icon-themes/colibre_svg/cmd/32/sbaexecutesql.svg |2 +-
 icon-themes/colibre_svg/cmd/32/sbanativesql.svg  |2 +-
 icon-themes/colibre_svg/cmd/lc_executereport.svg |2 +-
 icon-themes/colibre_svg/cmd/lc_sbaexecutesql.svg |2 +-
 icon-themes/colibre_svg/cmd/lc_sbanativesql.svg  |2 +-
 icon-themes/colibre_svg/cmd/sc_executereport.svg |3 ++-
 icon-themes/colibre_svg/cmd/sc_sbaexecutesql.svg |2 +-
 icon-themes/colibre_svg/cmd/sc_sbanativesql.svg  |7 ---
 18 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 0b810cc0f04241e644c82ba8bdad6a075b964118
Author: Rizal Muttaqin 
AuthorDate: Thu Sep 23 11:33:23 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Thu Sep 23 07:43:45 2021 +0200

tdf#144631 Colibre: sync up query/sql/report execution icons

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

diff --git a/icon-themes/colibre/cmd/32/executereport.png 
b/icon-themes/colibre/cmd/32/executereport.png
index 53d70d529ac0..e23f494cead9 100644
Binary files a/icon-themes/colibre/cmd/32/executereport.png and 
b/icon-themes/colibre/cmd/32/executereport.png differ
diff --git a/icon-themes/colibre/cmd/32/sbaexecutesql.png 
b/icon-themes/colibre/cmd/32/sbaexecutesql.png
index 6217c3651e29..1039ac6caddc 100644
Binary files a/icon-themes/colibre/cmd/32/sbaexecutesql.png and 
b/icon-themes/colibre/cmd/32/sbaexecutesql.png differ
diff --git a/icon-themes/colibre/cmd/32/sbanativesql.png 
b/icon-themes/colibre/cmd/32/sbanativesql.png
index dff8e9399bbe..4f794d5b38c5 100644
Binary files a/icon-themes/colibre/cmd/32/sbanativesql.png and 
b/icon-themes/colibre/cmd/32/sbanativesql.png differ
diff --git a/icon-themes/colibre/cmd/lc_executereport.png 
b/icon-themes/colibre/cmd/lc_executereport.png
index 9b3fbb57288f..c3e10e77d025 100644
Binary files a/icon-themes/colibre/cmd/lc_executereport.png and 
b/icon-themes/colibre/cmd/lc_executereport.png differ
diff --git a/icon-themes/colibre/cmd/lc_sbaexecutesql.png 
b/icon-themes/colibre/cmd/lc_sbaexecutesql.png
index a71eb9784e56..0f6c62c3ede0 100644
Binary files a/icon-themes/colibre/cmd/lc_sbaexecutesql.png and 
b/icon-themes/colibre/cmd/lc_sbaexecutesql.png differ
diff --git a/icon-themes/colibre/cmd/lc_sbanativesql.png 
b/icon-themes/colibre/cmd/lc_sbanativesql.png
index f7e32b0584dd..56df87b72581 100644
Binary files a/icon-themes/colibre/cmd/lc_sbanativesql.png and 
b/icon-themes/colibre/cmd/lc_sbanativesql.png differ
diff --git a/icon-themes/colibre/cmd/sc_executereport.png 
b/icon-themes/colibre/cmd/sc_executereport.png
index 76a664c3bdc0..548a827e0ed3 100644
Binary files a/icon-themes/colibre/cmd/sc_executereport.png and 
b/icon-themes/colibre/cmd/sc_executereport.png differ
diff --git a/icon-themes/colibre/cmd/sc_sbaexecutesql.png 
b/icon-themes/colibre/cmd/sc_sbaexecutesql.png
index 469c5a720cdb..37866388ea9e 100644
Binary files a/icon-themes/colibre/cmd/sc_sbaexecutesql.png and 
b/icon-themes/colibre/cmd/sc_sbaexecutesql.png differ
diff --git a/icon-themes/colibre/cmd/sc_sbanativesql.png 
b/icon-themes/colibre/cmd/sc_sbanativesql.png
index 634987be26cb..9127a87ee8fd 100644
Binary files a/icon-themes/colibre/cmd/sc_sbanativesql.png and 
b/icon-themes/colibre/cmd/sc_sbanativesql.png differ
diff --git a/icon-themes/colibre_svg/cmd/32/executereport.svg 
b/icon-themes/colibre_svg/cmd/32/executereport.svg
index 315e7dff4851..460adcad1da1 100644
--- a/icon-themes/colibre_svg/cmd/32/executereport.svg
+++ b/icon-themes/colibre_svg/cmd/32/executereport.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/32/sbaexecutesql.svg 
b/icon-themes/colibre_svg/cmd/32/sbaexecutesql.svg
index 909912d17e46..f2f0cf08fc59 100644
--- a/icon-themes/colibre_svg/cmd/32/sbaexecutesql.svg
+++ b/icon-themes/colibre_svg/cmd/32/sbaexecutesql.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/32/sbanativesql.svg 
b/icon-themes/colibre_svg/cmd/32/sbanativesql.svg
index 9db5056f61d2..3f922c6170f2 100644
--- a/icon-themes/coli

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 idlc/inc/idlc.hxx   |2 +-
 idlc/source/astscope.cxx|6 --
 idlc/source/idlccompile.cxx |5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 4706eb93350b2613b1fe6b98afa1243415c40577
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 22:19:43 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 23 07:27:14 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: idlc

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

diff --git a/idlc/inc/idlc.hxx b/idlc/inc/idlc.hxx
index 8995ead72de4..1be11b1457da 100644
--- a/idlc/inc/idlc.hxx
+++ b/idlc/inc/idlc.hxx
@@ -147,7 +147,7 @@ void removeIfExists(std::string_view pathname);
 bool copyFile(const OString* source, const OString& target);
 // a null source means stdin
 
-bool isFileUrl(const OString& fileName);
+bool isFileUrl(std::string_view fileName);
 OString convertToAbsoluteSystemPath(const OString& fileName);
 OString convertToFileUrl(const OString& fileName);
 
diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx
index d4c0f954367c..ca6214129c87 100644
--- a/idlc/source/astscope.cxx
+++ b/idlc/source/astscope.cxx
@@ -20,17 +20,19 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 
 
-static bool isGlobal(const OString& scopedName)
+static bool isGlobal(std::string_view scopedName)
 {
-return scopedName.isEmpty() || scopedName.startsWith(":");
+return scopedName.empty() || o3tl::starts_with(scopedName, ":");
 }
 
 AstScope::AstScope(NodeType nodeType)
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index 1902d63e0cad..6db9a615d316 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -52,9 +53,9 @@ extern int yydebug;
 
 static char tmpFilePattern[512];
 
-bool isFileUrl(const OString& fileName)
+bool isFileUrl(std::string_view fileName)
 {
-return fileName.startsWith("file://");
+return o3tl::starts_with(fileName, "file://");
 }
 
 OString convertToAbsoluteSystemPath(const OString& fileName)

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 extensions/source/update/check/download.cxx |9 +
 extensions/source/update/check/download.hxx |6 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 310d43b9a27efc36f2c9e6737a0b5ac3f211bda0
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 23:25:49 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 23 07:26:38 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: extensions

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

diff --git a/extensions/source/update/check/download.cxx 
b/extensions/source/update/check/download.cxx
index 1f98b7717be2..905d16e99a7f 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -23,6 +23,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -168,7 +169,7 @@ progress_callback( void *clientp, double dltotal, double 
dlnow, SAL_UNUSED_PARAM
 
 
 void
-Download::getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& 
rPort) const
+Download::getProxyForURL(std::u16string_view rURL, OString& rHost, sal_Int32& 
rPort) const
 {
 uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
 css::configuration::theDefaultProvider::get( m_xContext ) );
@@ -191,17 +192,17 @@ Download::getProxyForURL(const OUString& rURL, OString& 
rHost, sal_Int32& rPort)
 sal_Int32 nProxyType = aValue.get< sal_Int32 >();
 if( 0 != nProxyType ) // type 0 means "direct connection to the internet
 {
-if( rURL.startsWith("http:") )
+if( o3tl::starts_with(rURL, u"http:") )
 {
 rHost = getStringValue(xNameAccess, "ooInetHTTPProxyName");
 rPort = getInt32Value(xNameAccess, "ooInetHTTPProxyPort");
 }
-else if( rURL.startsWith("https:") )
+else if( o3tl::starts_with(rURL, u"https:") )
 {
 rHost = getStringValue(xNameAccess, "ooInetHTTPSProxyName");
 rPort = getInt32Value(xNameAccess, "ooInetHTTPSProxyPort");
 }
-else if( rURL.startsWith("ftp:") )
+else if( o3tl::starts_with(rURL, u"ftp:") )
 {
 rHost = getStringValue(xNameAccess, "ooInetFTPProxyName");
 rPort = getInt32Value(xNameAccess, "ooInetFTPProxyPort");
diff --git a/extensions/source/update/check/download.hxx 
b/extensions/source/update/check/download.hxx
index 2440ce4cec85..12a11ddde091 100644
--- a/extensions/source/update/check/download.hxx
+++ b/extensions/source/update/check/download.hxx
@@ -19,6 +19,10 @@
 
 #pragma once
 
+#include 
+
+#include 
+
 #include 
 
 #include 
@@ -65,7 +69,7 @@ public:
 
 protected:
 // Determines the appropriate proxy settings for the given URL. Returns 
true if a proxy should be used
-void getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& 
rPort) const;
+void getProxyForURL(std::u16string_view rURL, OString& rHost, sal_Int32& 
rPort) const;
 
 private:
 osl::Condition m_aCondition;

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 l10ntools/source/localize.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 047a983314b560e0f64280ae2ac7d696d90d539b
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 22:06:37 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 23 07:26:09 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: l10ntools

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

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 38e9c21f3cac..cede7837bdd3 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -49,17 +50,17 @@ using namespace std;
 namespace {
 
 bool matchList(
-const OUString& rUrl, const std::u16string_view* pList, size_t nLength)
+std::u16string_view rUrl, const std::u16string_view* pList, size_t nLength)
 {
 for (size_t i = 0; i != nLength; ++i) {
-if (rUrl.endsWith(pList[i])) {
+if (o3tl::ends_with(rUrl, pList[i])) {
 return true;
 }
 }
 return false;
 }
 
-bool passesNegativeList(const OUString& rUrl) {
+bool passesNegativeList(std::u16string_view rUrl) {
 static const std::u16string_view list[] = {
 u"/desktop/test/deployment/passive/help/en/help.tree",
 u"/desktop/test/deployment/passive/help/en/main.xhp",
@@ -77,7 +78,7 @@ bool passesNegativeList(const OUString& rUrl) {
 return !matchList(rUrl, list, SAL_N_ELEMENTS(list));
 }
 
-bool passesPositiveList(const OUString& rUrl) {
+bool passesPositiveList(std::u16string_view rUrl) {
 static const std::u16string_view list[] = {
 u"/description.xml"
 };

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 framework/inc/protocols.h   |   43 
 framework/source/layoutmanager/toolbarlayoutmanager.cxx |5 +
 framework/source/layoutmanager/toolbarlayoutmanager.hxx |3 -
 3 files changed, 29 insertions(+), 22 deletions(-)

New commits:
commit cb3058aa4e3155d97d47d1444b808da7297b5794
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 23:25:16 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 23 07:25:40 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: framework

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

diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h
index f9dfffd85a3d..30d87cc59336 100644
--- a/framework/inc/protocols.h
+++ b/framework/inc/protocols.h
@@ -21,6 +21,11 @@
 
 #pragma once
 
+#include 
+
+#include 
+
+#include 
 #include 
 
 namespace framework{
@@ -34,23 +39,23 @@ namespace framework{
 // indicates a loadable content in general!
 #define SPECIALPROTOCOL_PRIVATE   "private:"
 // indicates loading of components using a model directly
-#define SPECIALPROTOCOL_PRIVATE_OBJECT"private:object"
+#define SPECIALPROTOCOL_PRIVATE_OBJECTu"private:object"
 // indicates loading of components using a stream only
-#define SPECIALPROTOCOL_PRIVATE_STREAM"private:stream"
+#define SPECIALPROTOCOL_PRIVATE_STREAMu"private:stream"
 // indicates creation of empty documents
-#define SPECIALPROTOCOL_PRIVATE_FACTORY   "private:factory"
+#define SPECIALPROTOCOL_PRIVATE_FACTORY   u"private:factory"
 // internal protocol of the sfx project for generic dispatch functionality
-#define SPECIALPROTOCOL_SLOT  "slot:"
+#define SPECIALPROTOCOL_SLOT  u"slot:"
 // external representation of the slot protocol using names instead of id's
-#define SPECIALPROTOCOL_UNO   ".uno:"
+#define SPECIALPROTOCOL_UNO   u".uno:"
 // special sfx protocol to execute macros
-#define SPECIALPROTOCOL_MACRO "macro:"
+#define SPECIALPROTOCOL_MACRO u"macro:"
 // generic way to start uno services during dispatch
-#define SPECIALPROTOCOL_SERVICE   "service:"
+#define SPECIALPROTOCOL_SERVICE   u"service:"
 // for sending mails
-#define SPECIALPROTOCOL_MAILTO"mailto:";
+#define SPECIALPROTOCOL_MAILTOu"mailto:";
 // for sending news
-#define SPECIALPROTOCOL_NEWS  "news:";
+#define SPECIALPROTOCOL_NEWS  u"news:";
 
 /** well known protocols */
 enum class EProtocol
@@ -75,37 +80,37 @@ class ProtocolCheck
 It should be used instead of specifyProtocol() if only this question
 is interesting to perform the code. We must not check for all possible 
protocols here...
  */
-static bool isProtocol( const OUString& sURL, EProtocol eRequired )
+static bool isProtocol( std::u16string_view sURL, EProtocol eRequired )
 {
 bool bRet = false;
 switch(eRequired)
 {
 case EProtocol::PrivateObject:
-bRet = sURL.startsWith(SPECIALPROTOCOL_PRIVATE_OBJECT);
+bRet = o3tl::starts_with(sURL, SPECIALPROTOCOL_PRIVATE_OBJECT);
 break;
 case EProtocol::PrivateStream:
-bRet = sURL.startsWith(SPECIALPROTOCOL_PRIVATE_STREAM);
+bRet = o3tl::starts_with(sURL, SPECIALPROTOCOL_PRIVATE_STREAM);
 break;
 case EProtocol::PrivateFactory:
-bRet = sURL.startsWith(SPECIALPROTOCOL_PRIVATE_FACTORY);
+bRet = o3tl::starts_with(sURL, 
SPECIALPROTOCOL_PRIVATE_FACTORY);
 break;
 case EProtocol::Slot:
-bRet = sURL.startsWith(SPECIALPROTOCOL_SLOT);
+bRet = o3tl::starts_with(sURL, SPECIALPROTOCOL_SLOT);
 break;
 case EProtocol::Uno:
-bRet = sURL.startsWith(SPECIALPROTOCOL_UNO);
+bRet = o3tl::starts_with(sURL, SPECIALPROTOCOL_UNO);
 break;
 case EProtocol::Macro:
-bRet = sURL.startsWith(SPECIALPROTOCOL_MACRO);
+bRet = o3tl::starts_with(sURL, SPECIALPROTOCOL_MACRO);
 break;
 case EProtocol::Service:
-bRet = sURL.startsWith(SPECIALPROTOCOL_SERVICE);
+bRet = o3tl::starts_with(sURL, SPECIALPROTOCOL_SERVICE);
 break;
 case EProtocol::MailTo:
-bRet = sURL.startsWith(SPECIALPROTOCOL_MAILTO);
+bRet = o3tl::starts_with(sURL, SPECIALPROTOCOL_MAILTO);
 break;
 case EProtocol::News:
-bRet = sURL.startsWith(SPECIALPROTOCOL_NEWS);
+bRet = o3tl::starts_with(sURL, SPECIALPROTOCOL_NEWS);
 break;
 default:
 bRet = false;
diff --

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

2021-09-22 Thread Andrea Gelmini (via logerrit)

 desktop/qa/desktop_lib/test_desktop_lib.cxx |2 +-
 sw/source/uibase/utlui/content.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 84e61754bfe2f07de412c24513774900702a48a2
Author: Andrea Gelmini 
AuthorDate: Wed Sep 22 22:10:23 2021 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Sep 23 05:29:21 2021 +0200

Fix typos

Change-Id: I01c46b864e296d4094f0a1579fdc64066eacc386
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122496
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 680e48228d10..d827124a4e52 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -3299,7 +3299,7 @@ void DesktopLOKTest::testMultiViewTableSelection()
 Scheduler::ProcessEventsToIdle();
 // View1 should not get any table selection messages.
 CPPUNIT_ASSERT_EQUAL(0, aView1.m_nTableSelectionCount);
-// View2 will first get table selection of Table1, then emty selection, 
and finally on 7th down arrow keypress,
+// View2 will first get table selection of Table1, then empty selection, 
and finally on 7th down arrow keypress,
 // it will get table-selection of Table2. So in total it should get 3 
table selections.
 CPPUNIT_ASSERT_EQUAL(3, aView2.m_nTableSelectionCount);
 CPPUNIT_ASSERT(!aView2.m_bEmptyTableSelection);
diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index fb8667ead94a..ff17d753e13e 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3406,7 +3406,7 @@ void SwContentTree::UpdateTracking()
 m_pActiveShell->GetContentAtPos(m_pActiveShell->GetCursorDocPos(), 
aContentAtPos) &&
 !(m_bIsRoot && m_nRootType != ContentTypeId::URLFIELD))
 {
-// Because hyperlink item names do not need to be unique, finding the 
corrosponding item
+// Because hyperlink item names do not need to be unique, finding the 
corresponding item
 // in the tree by name may result in incorrect selection. Find the 
item in the tree by
 // comparing the SwTextINetFormat pointer at the document cursor 
position to that stored
 // in the item SwURLFieldContent.

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/unx

2021-09-22 Thread Caolán McNamara (via logerrit)

 vcl/unx/gtk3/gtkinst.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit e163000fdb525b93d639aa9886365745439b2132
Author: Caolán McNamara 
AuthorDate: Wed Sep 22 16:26:00 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Sep 23 05:26:03 2021 +0200

Resolves: tdf#142704 %PRODUCTNAME shown in gtk3 extended tips

Change-Id: I61d8b83ce326816c498f54e3cfc053270d82c1a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122433
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 7034386c35f3..53ab57ae32dd 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -21395,6 +21395,18 @@ private:
 gtk_widget_hide(pWidget);
 }
 
+#if !GTK_CHECK_VERSION(4, 0, 0)
+// tdf#142704 %PRODUCTNAME shown in extended tips
+AtkObject* pAtkObject = gtk_widget_get_accessible(pWidget);
+const char* pDesc = pAtkObject ? 
atk_object_get_description(pAtkObject) : nullptr;
+if (pDesc && pDesc[0])
+{
+OUString aDesc(pDesc, strlen(pDesc), RTL_TEXTENCODING_UTF8);
+aDesc = (*m_pStringReplace)(aDesc);
+atk_object_set_description(pAtkObject, OUStringToOString(aDesc, 
RTL_TEXTENCODING_UTF8).getStr());
+}
+#endif
+
 // expand placeholder and collect potentially missing mnemonics
 if (GTK_IS_BUTTON(pWidget))
 {

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

2021-09-22 Thread Noel Grandin (via logerrit)

 desktop/inc/lib/init.hxx|   23 ++---
 desktop/source/lib/init.cxx |  192 +---
 2 files changed, 123 insertions(+), 92 deletions(-)

New commits:
commit 475d6528a5ae1781c5b09cbcd3fd305c4180c168
Author: Noel Grandin 
AuthorDate: Wed Aug 4 13:01:22 2021 +0200
Commit: Luboš Luňák 
CommitDate: Thu Sep 23 00:09:00 2021 +0200

speed up scanning the LOK queue

we frequently scan the queue to caolesce events.
Most of the time we are scanning based on the event type.
So split the queue data into a compact queue that only contains the
type, and another queue for the rest of the data.
That makes the scanning __much__ more cache-friendly.

Change-Id: I92d0b95611cd139cac8532f9297eaabda71d5fe9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119996
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Noel Grandin 
(cherry picked from commit acf9cf33d53e4bf598ddbdab102bfbd6bb14f8a3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121558
Tested-by: Jenkins
(cherry picked from commit 3b3e4ee97af23f210fa39f1af3ddf1de63291371)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122434
Reviewed-by: Luboš Luňák 

diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index 3d95d4f602b4..ed35ebc2fa13 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -92,9 +92,8 @@ namespace desktop {
 
 struct CallbackData
 {
-CallbackData(int type, const std::string& payload)
-: Type(type)
-, PayloadString(payload)
+CallbackData(const std::string& payload)
+: PayloadString(payload)
 {
 }
 
@@ -117,7 +116,6 @@ namespace desktop {
 /// Returns true iff there is cached data.
 bool isCached() const { return PayloadObject.which() != 0; }
 
-int Type;
 std::string PayloadString;
 
 private:
@@ -125,14 +123,19 @@ namespace desktop {
 boost::variant PayloadObject;
 };
 
-typedef std::vector queue_type;
+typedef std::vector queue_type1;
+typedef std::vector queue_type2;
 
 private:
-bool removeAll(const std::function& rTestFunc);
-bool processInvalidateTilesEvent(CallbackData& aCallbackData);
-bool processWindowEvent(CallbackData& aCallbackData);
-
-queue_type m_queue;
+bool removeAll(const std::function& 
rTestFunc);
+bool processInvalidateTilesEvent(int type, CallbackData& 
aCallbackData);
+bool processWindowEvent(int type, CallbackData& aCallbackData);
+queue_type2::reverse_iterator toQueue2(queue_type1::reverse_iterator);
+
+/** we frequently want to scan the queue, and mostly when we do so, we 
only care about the element type
+so we split the queue in 2 to make the scanning cache friendly. */
+queue_type1 m_queue1;
+queue_type2 m_queue2;
 std::map m_states;
 std::unordered_map> 
m_viewStates;
 LibreOfficeKitDocument* m_pDocument;
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c95de6ed4082..86c468df402f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1438,13 +1438,19 @@ void CallbackFlushHandler::callback(const int type, 
const char* payload, void* d
 }
 }
 
+CallbackFlushHandler::queue_type2::reverse_iterator 
CallbackFlushHandler::toQueue2(CallbackFlushHandler::queue_type1::reverse_iterator
 pos)
+{
+int delta = std::distance(m_queue1.rbegin(), pos);
+return m_queue2.rbegin() + delta;
+}
+
 void CallbackFlushHandler::queue(const int type, const char* data)
 {
 comphelper::ProfileZone aZone("CallbackFlushHandler::queue");
 
-CallbackData aCallbackData(type, (data ? data : "(nil)"));
+CallbackData aCallbackData(data ? data : "(nil)");
 const std::string& payload = aCallbackData.PayloadString;
-SAL_INFO("lok", "Queue: [" << type << "]: [" << payload << "] on " << 
m_queue.size() << " entries.");
+SAL_INFO("lok", "Queue: [" << type << "]: [" << payload << "] on " << 
m_queue1.size() << " entries.");
 
 bool bIsChartActive = false;
 if (type == LOK_CALLBACK_GRAPHIC_SELECTION)
@@ -1523,10 +1529,10 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 case LOK_CALLBACK_CALC_FUNCTION_LIST:
 case LOK_CALLBACK_INVALIDATE_SHEET_GEOMETRY:
 {
-const auto& pos = std::find_if(m_queue.rbegin(), m_queue.rend(),
-[type] (const queue_type::value_type& elem) { return 
(elem.Type == type); });
-
-if (pos != m_queue.rend() && pos->PayloadString == payload)
+const auto& pos = std::find_if(m_queue1.rbegin(), m_queue1.rend(),
+[type] (int elemType) { return (elemType == type); });
+auto pos2 = toQueue2(pos);
+if (pos != m_queue1.rend()

[Libreoffice-commits] core.git: 2 commits - include/vcl sw/CppunitTest_sw_uwriter.mk sw/inc sw/qa sw/source

2021-09-22 Thread Luboš Luňák (via logerrit)

 include/vcl/region.hxx |6 +-
 sw/CppunitTest_sw_uwriter.mk   |1 
 sw/inc/swregion.hxx|3 -
 sw/qa/core/test_region.cxx |  108 +
 sw/source/core/bastyp/swregion.cxx |   32 +++---
 sw/source/core/view/viewsh.cxx |4 -
 6 files changed, 127 insertions(+), 27 deletions(-)

New commits:
commit 362d2271721dd19de7a7f6f2271a349272ce51d8
Author: Luboš Luňák 
AuthorDate: Wed Sep 22 16:41:45 2021 +0200
Commit: Luboš Luňák 
CommitDate: Thu Sep 23 00:08:41 2021 +0200

add some unittests for SwRegionRects

And fix two small bugs in SwRegionRects::Compress().

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

diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk
index ef9951ca1f80..7626039ca23e 100644
--- a/sw/CppunitTest_sw_uwriter.mk
+++ b/sw/CppunitTest_sw_uwriter.mk
@@ -20,6 +20,7 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,sw_uwriter, \
 sw/qa/core/test_ToxLinkProcessor \
 sw/qa/core/test_ToxTextGenerator \
 sw/qa/core/test_ToxMiscTest \
+sw/qa/core/test_region \
 ))
 
 $(eval $(call gb_CppunitTest_use_library_objects,sw_uwriter,sw))
diff --git a/sw/inc/swregion.hxx b/sw/inc/swregion.hxx
index 1aa190712a8f..338a30649c7a 100644
--- a/sw/inc/swregion.hxx
+++ b/sw/inc/swregion.hxx
@@ -55,8 +55,9 @@ public:
 // Ensures all rectangles are within the origin area.
 void LimitToOrigin();
 
+enum CompressType { CompressExact, CompressFuzzy };
 // Combine adjacent rectangles.
-void Compress();
+void Compress( CompressType type );
 
 const SwRect &GetOrigin() const { return m_aOrigin; }
 void ChangeOrigin( const SwRect &rRect ) { m_aOrigin = rRect; }
diff --git a/sw/qa/core/test_region.cxx b/sw/qa/core/test_region.cxx
new file mode 100644
index ..15fa398c7e4a
--- /dev/null
+++ b/sw/qa/core/test_region.cxx
@@ -0,0 +1,108 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+class RegionUnittest : public CppUnit::TestFixture
+{
+public:
+void testCompress();
+void testInvert();
+
+CPPUNIT_TEST_SUITE(RegionUnittest);
+CPPUNIT_TEST(testCompress);
+CPPUNIT_TEST(testInvert);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void RegionUnittest::testCompress()
+{
+SwRegionRects region;
+
+// All inside each other, check it'll compress them to the largest one.
+region = SwRegionRects();
+region += SwRect(Point(10, 10), Size(10, 10));
+region += SwRect(Point(10, 10), Size(20, 20));
+region += SwRect(Point(10, 10), Size(100, 100));
+region += SwRect(Point(10, 10), Size(50, 50));
+region.Compress(SwRegionRects::CompressExact);
+CPPUNIT_ASSERT_EQUAL(size_t(1), region.size());
+CPPUNIT_ASSERT_EQUAL(SwRect(Point(10, 10), Size(100, 100)), region[0]);
+
+// Check merging of adjacent rectangles. This will merge first two groups
+// and then those two merged rects only in the next iteration.
+region = SwRegionRects();
+region += SwRect(Point(10, 10), Size(1, 1));
+region += SwRect(Point(10010, 10), Size(1, 1));
+region += SwRect(Point(10, 10010), Size(1, 1));
+region += SwRect(Point(10010, 10010), Size(1, 1));
+region.Compress(SwRegionRects::CompressExact);
+CPPUNIT_ASSERT_EQUAL(size_t(1), region.size());
+CPPUNIT_ASSERT_EQUAL(SwRect(Point(10, 10), Size(2, 2)), region[0]);
+
+// Check fuzzy compress, two almost aligned rects will be compressed to 
one.
+region = SwRegionRects();
+region += SwRect(Point(10, 10), Size(100, 100));
+region += SwRect(Point(110, 10), Size(100, 90));
+region.Compress(SwRegionRects::CompressExact);
+CPPUNIT_ASSERT_EQUAL(size_t(2), region.size());
+region.Compress(SwRegionRects::CompressFuzzy);
+CPPUNIT_ASSERT_EQUAL(size_t(1), region.size());
+CPPUNIT_ASSERT_EQUAL(SwRect(Point(10, 10), Size(200, 100)), region[0]);
+
+// Check it doesn't crash because of empty size.
+region = SwRegionRects();
+region += SwRect(Point(0, 0), Size(0, 0));
+region += SwRect(Point(10, 10), Size(0, 0));
+region += SwRect(Point(100, 100), Size(0, 0));
+region.Compress(SwRegionRects::CompressExact);
+region.Compress(SwRegionRects::CompressFuzzy);
+}
+
+void RegionUnittest::testInvert()
+{
+// Check that punching holes and inverting has the same result as adding 
up rects.
+const SwRect fullRect(Point(100, 100), Size(1000, 1000));
+const SwRect rects[]
+

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

2021-09-22 Thread Jim Raykowski (via logerrit)

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

New commits:
commit 8644a3114d412e8de6cc6712c2f2bcad436906c9
Author: Jim Raykowski 
AuthorDate: Tue Sep 21 18:24:38 2021 -0800
Commit: Jim Raykowski 
CommitDate: Wed Sep 22 23:25:35 2021 +0200

tdf#95378 Writer Navigator: Track references

Resolves reference tracking part of the enhancement request.
Makes the Navigator content tree highlight the corresponding
reference item of the reference field at the current cursor
position in the document if there is one.

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

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 4a0eea209990..fb8667ead94a 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3391,6 +3391,16 @@ void SwContentTree::UpdateTracking()
 return;
 }
 
+// references
+if (SwContentAtPos aContentAtPos(IsAttrAtPos::RefMark);
+m_pActiveShell->GetContentAtPos(m_pActiveShell->GetCursorDocPos(), 
aContentAtPos) &&
+!(m_bIsRoot && m_nRootType != ContentTypeId::REFERENCE))
+{
+const SwFormatRefMark& rRefMark = 
aContentAtPos.pFndTextAttr->GetRefMark();
+lcl_SelectByContentTypeAndName(this, *m_xTreeView, 
SwResId(STR_CONTENT_TYPE_REFERENCE),
+   rRefMark.GetRefName());
+return;
+}
 // hyperlinks
 if (SwContentAtPos aContentAtPos(IsAttrAtPos::InetAttr);
 m_pActiveShell->GetContentAtPos(m_pActiveShell->GetCursorDocPos(), 
aContentAtPos) &&

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 sc/inc/dputil.hxx  |6 +-
 sc/source/core/data/dputil.cxx |5 +++--
 sc/source/core/tool/stylehelper.cxx|9 +++--
 sc/source/ui/dataprovider/dataprovider.cxx |5 +++--
 sc/source/ui/inc/dataprovider.hxx  |3 ++-
 sc/source/ui/vba/vbaworkbooks.cxx  |   11 ++-
 sc/source/ui/vba/vbaworkbooks.hxx  |6 +-
 7 files changed, 31 insertions(+), 14 deletions(-)

New commits:
commit 3b6dd54994ab1e624729cb007a8e3dc2b5f3b891
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 21:15:20 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 23:23:35 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: sc

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

diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx
index 70fa54e1aa3c..5081c758ab77 100644
--- a/sc/inc/dputil.hxx
+++ b/sc/inc/dputil.hxx
@@ -9,6 +9,10 @@
 
 #pragma once
 
+#include 
+
+#include 
+
 #include 
 #include "scdllapi.h"
 #include "global.hxx"
@@ -20,7 +24,7 @@ enum class ScGeneralFunction;
 class ScDPUtil
 {
 public:
-static bool isDuplicateDimension(const OUString& rName);
+static bool isDuplicateDimension(std::u16string_view rName);
 
 SC_DLLPUBLIC static OUString getSourceDimensionName(std::u16string_view 
rName);
 
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index b589d4e80156..0f5083f810df 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -57,9 +58,9 @@ OUString getSpecialDateName(double fValue, bool bFirst, 
SvNumberFormatter* pForm
 
 }
 
-bool ScDPUtil::isDuplicateDimension(const OUString& rName)
+bool ScDPUtil::isDuplicateDimension(std::u16string_view rName)
 {
-return rName.endsWith("*");
+return o3tl::ends_with(rName, u"*");
 }
 
 OUString ScDPUtil::getSourceDimensionName(std::u16string_view rName)
diff --git a/sc/source/core/tool/stylehelper.cxx 
b/sc/source/core/tool/stylehelper.cxx
index 076e968265ff..7caab7580dec 100644
--- a/sc/source/core/tool/stylehelper.cxx
+++ b/sc/source/core/tool/stylehelper.cxx
@@ -17,7 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
+
 #include 
+#include 
 #include 
 
 #include 
@@ -120,9 +125,9 @@ static const ScDisplayNameMap* lcl_GetStyleNameMap( 
SfxStyleFamily nType )
 
 constexpr OUStringLiteral SC_SUFFIX_USER = u" (user)";
 
-static bool lcl_EndsWithUser( const OUString& rString )
+static bool lcl_EndsWithUser( std::u16string_view rString )
 {
-return rString.endsWith(SC_SUFFIX_USER);
+return o3tl::ends_with(rString, SC_SUFFIX_USER);
 }
 
 OUString ScStyleNameConversion::DisplayToProgrammaticName( const OUString& 
rDispName, SfxStyleFamily nType )
diff --git a/sc/source/ui/dataprovider/dataprovider.cxx 
b/sc/source/ui/dataprovider/dataprovider.cxx
index ff0ee8626fef..72f674a7b99d 100644
--- a/sc/source/ui/dataprovider/dataprovider.cxx
+++ b/sc/source/ui/dataprovider/dataprovider.cxx
@@ -11,6 +11,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -266,9 +267,9 @@ ScDBData* ScDBDataManager::getDBData()
 return pDBData;
 }
 
-bool DataProviderFactory::isInternalDataProvider(const OUString& rProvider)
+bool DataProviderFactory::isInternalDataProvider(std::u16string_view rProvider)
 {
-return rProvider.startsWith("org.libreoffice.calc");
+return o3tl::starts_with(rProvider, u"org.libreoffice.calc");
 }
 
 std::shared_ptr DataProviderFactory::getDataProvider(ScDocument* 
pDoc,
diff --git a/sc/source/ui/inc/dataprovider.hxx 
b/sc/source/ui/inc/dataprovider.hxx
index 87022fc34a7e..9f7b2b2e3a50 100644
--- a/sc/source/ui/inc/dataprovider.hxx
+++ b/sc/source/ui/inc/dataprovider.hxx
@@ -10,6 +10,7 @@
 #pragma once
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -134,7 +135,7 @@ class DataProviderFactory
 {
 private:
 
-static bool isInternalDataProvider(const OUString& rProvider);
+static bool isInternalDataProvider(std::u16string_view rProvider);
 
 public:
 
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx 
b/sc/source/ui/vba/vbaworkbooks.cxx
index 0b8316824033..facfc89fe23c 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -30,6 +30,7 @@
 #include "vbaworkbooks.hxx"
 #include 
 
+#include 
 #include 
 #include 
 
@@ -164,13 +165,13 @@ ScVbaWorkbooks::isTextFile( std::u16string_view sType )
 }
 
 bool
-ScVbaWorkbooks::isSpreadSheetFile( const OUString& sType )
+ScVbaWorkbooks::isSpreadSheetFile( std::u16string_view sType )
 {
 // include calc_QPro etc. ? ( not for the moment anyway )
-return sType.startsWith( "calc_MS" )
-  || sType.startsWith( "MS Excel" )
-  || sType.startsWith( "calc8" )
-  || sTyp

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 include/oox/export/shapes.hxx  |3 ++-
 oox/source/drawingml/textfield.cxx |   19 ---
 oox/source/export/shapes.cxx   |   33 +
 3 files changed, 31 insertions(+), 24 deletions(-)

New commits:
commit fcdfdc21b197bb9af1a75348ce912c5d1d47dfba
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 21:16:12 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 23:23:14 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: oox

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

diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index 0f4e264fb1b6..646d462e827b 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -67,7 +68,7 @@ namespace oox {
 OOX_DLLPUBLIC css::uno::Reference GetOLEObjectStream(
 css::uno::Reference const& xContext,
 css::uno::Reference const& xObj,
-OUString const& i_rProgID,
+std::u16string_view i_rProgID,
 OUString & o_rMediaType,
 OUString & o_rRelationType,
 OUString & o_rSuffix,
diff --git a/oox/source/drawingml/textfield.cxx 
b/oox/source/drawingml/textfield.cxx
index 0d33da71266d..405a874d8e57 100644
--- a/oox/source/drawingml/textfield.cxx
+++ b/oox/source/drawingml/textfield.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
+
 #include 
 
 #include 
@@ -26,6 +30,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -56,11 +61,11 @@ namespace {
  * @param sType the OpenXML field type.
  */
 void lclCreateTextFields( std::vector< Reference< XTextField > > & aFields,
-const Reference< 
XModel > & xModel, const OUString & sType )
+const Reference< 
XModel > & xModel, std::u16string_view sType )
 {
 Reference< XInterface > xIface;
 Reference< XMultiServiceFactory > xFactory( xModel, UNO_QUERY_THROW );
-if( sType.startsWith("datetime"))
+if( o3tl::starts_with(sType, u"datetime"))
 {
 OString s = OUStringToOString( sType, RTL_TEXTENCODING_UTF8);
 OString p( s.pData->buffer + 8 );
@@ -100,22 +105,22 @@ void lclCreateTextFields( std::vector< Reference< 
XTextField > > & aFields,
 TOOLS_WARN_EXCEPTION("oox", "");
 }
 }
-else if ( sType == "slidenum" )
+else if ( sType == u"slidenum" )
 {
 xIface = xFactory->createInstance( 
"com.sun.star.text.TextField.PageNumber" );
 aFields.emplace_back( xIface, UNO_QUERY );
 }
-else if ( sType == "slidecount" )
+else if ( sType == u"slidecount" )
 {
 xIface = xFactory->createInstance( 
"com.sun.star.text.TextField.PageCount" );
 aFields.emplace_back( xIface, UNO_QUERY );
 }
-else if ( sType == "slidename" )
+else if ( sType == u"slidename" )
 {
 xIface = xFactory->createInstance( 
"com.sun.star.text.TextField.PageName" );
 aFields.emplace_back( xIface, uno::UNO_QUERY );
 }
-else if ( sType.startsWith("file") )
+else if ( o3tl::starts_with(sType, u"file") )
 {
 OString s = OUStringToOString( sType, RTL_TEXTENCODING_UTF8);
 OString p( s.pData->buffer + 4 );
@@ -139,7 +144,7 @@ void lclCreateTextFields( std::vector< Reference< 
XTextField > > & aFields,
 xProps->setPropertyValue("FileFormat", makeAny(0));
 }
 }
-else if( sType == "author" )
+else if( sType == u"author" )
 {
 xIface = xFactory->createInstance( 
"com.sun.star.text.TextField.Author" );
 aFields.emplace_back( xIface, UNO_QUERY );
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 5fc037029456..bc120abe1627 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -95,88 +96,88 @@ using ::sax_fastparser::FSHelperPtr;
 
 namespace oox {
 
-static void lcl_ConvertProgID(OUString const& rProgID,
+static void lcl_ConvertProgID(std::u16string_view rProgID,
 OUString & o_rMediaType, OUString & o_rRelationType, OUString & 
o_rFileExtension)
 {
-if (rProgID == "Excel.Sheet.12")
+if (rProgID == u"Excel.Sheet.12")
 {
 o_rMediaType = 
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
 o_rRelationType = oox::getRelationship(Relationship::PACKAGE);
 o_rFileExtension = "xlsx";
 }
-else if (rProgID.startsWith("Excel.SheetBinaryMacroEnabled.12") )
+else if (o3tl::starts_with(rProgID, u"Excel.SheetBinaryMacroEnabled.12") )
 {
 o_rMediaType = "application/vnd.ms-excel.sheet.binary.macroEnable

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 lotuswordpro/inc/lwptools.hxx   |3 ++-
 lotuswordpro/source/filter/lwptools.cxx |5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit f8b6d1a2f48ce259ba2e75d41777293dfe23ab11
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 21:24:51 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 23:22:54 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: lotuswordpro

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

diff --git a/lotuswordpro/inc/lwptools.hxx b/lotuswordpro/inc/lwptools.hxx
index 3ac63055b740..753a9bacdd06 100644
--- a/lotuswordpro/inc/lwptools.hxx
+++ b/lotuswordpro/inc/lwptools.hxx
@@ -69,6 +69,7 @@
 #include "xfilter/xftimestyle.hxx"
 #include 
 #include 
+#include 
 
 // 01/19/2005
 const sal_uInt32 UNITS_PER_INCH = 65536L * 72L;
@@ -97,7 +98,7 @@ public:
 inline static bool IsOddNumber(sal_uInt16 nNumber);
 inline static bool IsEvenNumber(sal_uInt16 nNumber);
 
-static bool isFileUrl(const OString& fileName);
+static bool isFileUrl(std::string_view fileName);
 static OUString convertToFileUrl(const OString& fileName);
 static OUStringDateTimeToOUString(const LtTm& dt);
 
diff --git a/lotuswordpro/source/filter/lwptools.cxx 
b/lotuswordpro/source/filter/lwptools.cxx
index 254d7fc7f6eb..9af6d1b4ffb3 100644
--- a/lotuswordpro/source/filter/lwptools.cxx
+++ b/lotuswordpro/source/filter/lwptools.cxx
@@ -60,6 +60,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -195,9 +196,9 @@ bool LwpTools::IsUnicodePacked(LwpObjectStream* pObjStrm, 
sal_uInt16 len)
 return false;
 }
 
-bool LwpTools::isFileUrl(const OString &fileName)
+bool LwpTools::isFileUrl(std::string_view fileName)
 {
-return fileName.startsWith("file://");
+return o3tl::starts_with(fileName, "file://");
 }
 
 OUString LwpTools::convertToFileUrl(const OString &fileName)

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 editeng/source/uno/unofield.cxx |   35 ---
 include/editeng/unofield.hxx|3 ++-
 2 files changed, 22 insertions(+), 16 deletions(-)

New commits:
commit 59646d3fa4fab037ccedc7ebe765de11d5016f3f
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 20:28:09 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 23:22:26 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: editeng

Change-Id: Ic275bbd167e69060f6442ceed6c4dd88733d5e1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122486
Tested-by: Stephan Bergmann 
Reviewed-by: Stephan Bergmann 

diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 0e1dab6db253..765a40349075 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -17,8 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
+
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -893,57 +898,57 @@ sal_Bool SAL_CALL SvxUnoTextField::supportsService( const 
OUString& ServiceName
 return cppu::supportsService( this, ServiceName );
 }
 
-uno::Reference< uno::XInterface > SvxUnoTextCreateTextField( const OUString& 
ServiceSpecifier )
+uno::Reference< uno::XInterface > SvxUnoTextCreateTextField( 
std::u16string_view ServiceSpecifier )
 {
 uno::Reference< uno::XInterface > xRet;
 
 // #i93308# up to OOo 3.2 we used this wrong namespace name with the 
capital T & F. This is
 // fixed since OOo 3.2 but for compatibility we will still provide support 
for the wrong notation.
 
-OUString aFieldType;
-if( (ServiceSpecifier.startsWith( "com.sun.star.text.textfield.", 
&aFieldType )) ||
-(ServiceSpecifier.startsWith( "com.sun.star.text.TextField.", 
&aFieldType )) )
+std::u16string_view aFieldType;
+if( (o3tl::starts_with( ServiceSpecifier, u"com.sun.star.text.textfield.", 
&aFieldType )) ||
+(o3tl::starts_with( ServiceSpecifier, u"com.sun.star.text.TextField.", 
&aFieldType )) )
 {
 sal_Int32 nId = text::textfield::Type::UNSPECIFIED;
 
-if ( aFieldType == "DateTime" )
+if ( aFieldType == u"DateTime" )
 {
 nId = text::textfield::Type::DATE;
 }
-else if ( aFieldType == "URL" )
+else if ( aFieldType == u"URL" )
 {
 nId = text::textfield::Type::URL;
 }
-else if ( aFieldType == "PageNumber" )
+else if ( aFieldType == u"PageNumber" )
 {
 nId = text::textfield::Type::PAGE;
 }
-else if ( aFieldType == "PageCount" )
+else if ( aFieldType == u"PageCount" )
 {
 nId = text::textfield::Type::PAGES;
 }
-else if ( aFieldType == "SheetName" )
+else if ( aFieldType == u"SheetName" )
 {
 nId = text::textfield::Type::TABLE;
 }
-else if ( aFieldType == "FileName" )
+else if ( aFieldType == u"FileName" )
 {
 nId = text::textfield::Type::EXTENDED_FILE;
 }
-else if (aFieldType == "docinfo.Title" ||
- aFieldType == "DocInfo.Title" )
+else if (aFieldType == u"docinfo.Title" ||
+ aFieldType == u"DocInfo.Title" )
 {
 nId = text::textfield::Type::DOCINFO_TITLE;
 }
-else if ( aFieldType == "Author" )
+else if ( aFieldType == u"Author" )
 {
 nId = text::textfield::Type::AUTHOR;
 }
-else if ( aFieldType == "Measure" )
+else if ( aFieldType == u"Measure" )
 {
 nId = text::textfield::Type::MEASURE;
 }
-else if (aFieldType == "DocInfo.Custom")
+else if (aFieldType == u"DocInfo.Custom")
 {
 nId = text::textfield::Type::DOCINFO_CUSTOM;
 }
diff --git a/include/editeng/unofield.hxx b/include/editeng/unofield.hxx
index 3c0d1650f6cc..fe68cd95c060 100644
--- a/include/editeng/unofield.hxx
+++ b/include/editeng/unofield.hxx
@@ -29,6 +29,7 @@
 
 #include 
 #include 
+#include 
 
 namespace com::sun::star::beans { class XPropertySetInfo; }
 
@@ -39,7 +40,7 @@ class SvxFieldData;
 /// @throws css::uno::Exception
 /// @throws css::uno::RuntimeException
 css::uno::Reference< css::uno::XInterface > EDITENG_DLLPUBLIC 
SvxUnoTextCreateTextField(
-const OUString& ServiceSpecifier );
+std::u16string_view ServiceSpecifier );
 
 class EDITENG_DLLPUBLIC SvxUnoTextField final : public cppu::BaseMutex,
 public ::cppu::OComponentHelper,

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

2021-09-22 Thread Xisco Fauli (via logerrit)

 sc/qa/uitest/autofilter/colorfilter.py |   37 +
 sc/qa/uitest/data/autofilter/tdf142579_cond_format.ods |binary
 2 files changed, 37 insertions(+)

New commits:
commit 2dd6c7e5d59126e28bf478439c25f9f4cbc3422c
Author: Xisco Fauli 
AuthorDate: Wed Sep 22 17:04:28 2021 +0200
Commit: Xisco Fauli 
CommitDate: Wed Sep 22 23:20:58 2021 +0200

tdf#142579: sc: Add UItest for cond. format background colors

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

diff --git a/sc/qa/uitest/autofilter/colorfilter.py 
b/sc/qa/uitest/autofilter/colorfilter.py
index 65a4ca5a483c..0e4fe939c4d6 100644
--- a/sc/qa/uitest/autofilter/colorfilter.py
+++ b/sc/qa/uitest/autofilter/colorfilter.py
@@ -100,4 +100,41 @@ class ColorFilterTest(UITestCase):
 self.assertTrue(is_row_hidden(doc, 6))
 self.assertFalse(is_row_hidden(doc, 7))
 
+def test_tdf142579_conditional_format(self):
+with 
self.ui_test.load_file(get_url_for_data_file("tdf142579_cond_format.ods")) as 
doc:
+
+xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window")
+xGridWin.executeAction("SELECT", mkPropertyValues({"RANGE": 
"A1:A9"}))
+
+for i in range(8):
+self.assertFalse(is_row_hidden(doc, i))
+
+with 
self.ui_test.execute_modeless_dialog_through_command(".uno:DataFilterStandardFilter")
 as xDialog:
+xField1 = xDialog.getChild("field1")
+xCond1 = xDialog.getChild("cond1")
+
+self.assertEqual("Another", 
get_state_as_dict(xField1)['DisplayText'])
+
+props = {"TEXT": "Background color"}
+actionProps = mkPropertyValues(props)
+xCond1.executeAction("SELECT", actionProps)
+self.assertEqual("Background color", 
get_state_as_dict(xCond1)['DisplayText'])
+
+xColor1 = xDialog.getChild("color1")
+
+# tdf#142579: Without the fix in place, this test would have 
failed with
+# AssertionError: '2' != '1'
+self.assertEqual('2', get_state_as_dict(xColor1)["EntryCount"])
+
+select_pos(xColor1, "0")
+
+self.assertFalse(is_row_hidden(doc, 0))
+self.assertFalse(is_row_hidden(doc, 1))
+self.assertTrue(is_row_hidden(doc, 2))
+self.assertFalse(is_row_hidden(doc, 3))
+self.assertTrue(is_row_hidden(doc, 4))
+self.assertTrue(is_row_hidden(doc, 5))
+self.assertFalse(is_row_hidden(doc, 6))
+self.assertFalse(is_row_hidden(doc, 7))
+
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/data/autofilter/tdf142579_cond_format.ods 
b/sc/qa/uitest/data/autofilter/tdf142579_cond_format.ods
new file mode 100644
index ..04b5f3f30066
Binary files /dev/null and 
b/sc/qa/uitest/data/autofilter/tdf142579_cond_format.ods differ

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 sd/source/core/stlsheet.cxx |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 0a4c883a7e0dd3ba66d8cc86c6f77bd3578a0a92
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 20:02:06 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 22:19:07 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: sd

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

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 533a9846557f..d0ea45f4c640 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -627,14 +628,14 @@ OUString GetApiNameForHelpId(sal_uLong nId)
 return OUString();
 }
 
-sal_uInt32 GetHelpIdForApiName(const OUString& sName)
+sal_uInt32 GetHelpIdForApiName(std::u16string_view sName)
 {
-OUString sRest;
-if (sName.startsWith("outline", &sRest))
+std::u16string_view sRest;
+if (o3tl::starts_with(sName, u"outline", &sRest))
 {
-if (sRest.getLength() == 1)
+if (sRest.length() == 1)
 {
-sal_Unicode ch = sRest.toChar();
+sal_Unicode ch = sRest.front();
 if ('1' <= ch && ch <= '9')
 return HID_PSEUDOSHEET_OUTLINE1 + ch - '1';
 }

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 include/svx/unomod.hxx   |6 
 svx/source/customshapes/EnhancedCustomShape2d.cxx|  243 +++
 svx/source/form/datanavi.cxx |5 
 svx/source/inc/datanavi.hxx  |2 
 svx/source/svdraw/presetooxhandleadjustmentrelations.cxx |   15 
 svx/source/svdraw/presetooxhandleadjustmentrelations.hxx |7 
 svx/source/unodraw/unomod.cxx|2 
 7 files changed, 149 insertions(+), 131 deletions(-)

New commits:
commit 51c9d41ca97955dd986cd5fec1aed6fbc6ec1374
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 19:04:28 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 22:06:04 2021 +0200

xtend loplugin:stringviewparam to starts/endsWith: svx

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

diff --git a/include/svx/unomod.hxx b/include/svx/unomod.hxx
index dcdbfa8358d5..d786824ebbab 100644
--- a/include/svx/unomod.hxx
+++ b/include/svx/unomod.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_SVX_UNOMOD_HXX
 #define INCLUDED_SVX_UNOMOD_HXX
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -49,7 +53,7 @@ public:
 
 /// @throws css::uno::Exception
 /// @throws css::uno::RuntimeException
-static css::uno::Reference< css::uno::XInterface > createTextField( const 
OUString& aServiceSpecifier );
+static css::uno::Reference< css::uno::XInterface > createTextField( 
std::u16string_view aServiceSpecifier );
 
 /** fills the given EventObject from the given SdrHint.
 @returns
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 154f2df08c9e..aa67d543c1a0 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -19,6 +19,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -58,6 +59,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 using namespace ::com::sun::star;
@@ -1188,7 +1190,7 @@ bool EnhancedCustomShape2d::GetHandlePosition( const 
sal_uInt32 nIndex, Point& r
 return bRetValue;
 }
 
-static double lcl_getXAdjustmentValue(const OUString& rShapeType, const 
sal_uInt32 nHandleIndex,
+static double lcl_getXAdjustmentValue(std::u16string_view rShapeType, const 
sal_uInt32 nHandleIndex,
   const double fX, const double fW, const 
double fH)
 {
 // degenerated shapes are not worth to calculate special case for each 
shape type
@@ -1196,106 +1198,107 @@ static double lcl_getXAdjustmentValue(const OUString& 
rShapeType, const sal_uInt
 return 5;
 
 // pattern (w - x) / ss * 10 or (r - x) / ss * 10
-if ((rShapeType == "ooxml-bentArrow" && nHandleIndex == 2) || (rShapeType 
== "ooxml-chevron")
-|| (rShapeType == "ooxml-curvedRightArrow") || (rShapeType == 
"ooxml-foldedCorner")
-|| (rShapeType == "ooxml-homePlate") || (rShapeType == 
"ooxml-notchedRightArrow")
-|| (rShapeType == "ooxml-nonIsoscelesTrapezoid" && nHandleIndex == 1)
-|| (rShapeType == "ooxml-rightArrow")
-|| (rShapeType == "ooxml-rightArrowCallout" && nHandleIndex == 2)
-|| (rShapeType == "ooxml-round1Rect")
-|| (rShapeType == "ooxml-round2DiagRect" && nHandleIndex == 1)
-|| (rShapeType == "ooxml-round2SameRect" && nHandleIndex == 0)
-|| (rShapeType == "ooxml-snip1Rect")
-|| (rShapeType == "ooxml-snip2DiagRect" && nHandleIndex == 1)
-|| (rShapeType == "ooxml-snip2SameRect" && nHandleIndex == 0)
-|| (rShapeType == "ooxml-snipRoundRect" && nHandleIndex == 1)
-|| (rShapeType == "ooxml-swooshArrow") || (rShapeType == 
"ooxml-stripedRightArrow"))
+if ((rShapeType == u"ooxml-bentArrow" && nHandleIndex == 2) || (rShapeType 
== u"ooxml-chevron")
+|| (rShapeType == u"ooxml-curvedRightArrow") || (rShapeType == 
u"ooxml-foldedCorner")
+|| (rShapeType == u"ooxml-homePlate") || (rShapeType == 
u"ooxml-notchedRightArrow")
+|| (rShapeType == u"ooxml-nonIsoscelesTrapezoid" && nHandleIndex == 1)
+|| (rShapeType == u"ooxml-rightArrow")
+|| (rShapeType == u"ooxml-rightArrowCallout" && nHandleIndex == 2)
+|| (rShapeType == u"ooxml-round1Rect")
+|| (rShapeType == u"ooxml-round2DiagRect" && nHandleIndex == 1)
+|| (rShapeType == u"ooxml-round2SameRect" && nHandleIndex == 0)
+|| (rShapeType == u"ooxml-snip1Rect")
+|| (rShapeType == u"ooxml-snip2DiagRect" && nHandleIndex == 1)
+|| (rShapeType == u"ooxml-snip2SameRect" && nHandleIndex == 0)
+|| (rShapeType == u"ooxml-snipRoundRect" && nHandleIndex == 1)
+|| (rShapeType == u"ooxml-swooshArrow") || (rShapeType == 
u"ooxml-stripedRightArrow"))
 return (fW - fX) / std::min(fW, fH) * 10.

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 scaddins/source/pricing/pricing.cxx |   26 ++
 1 file changed, 14 insertions(+), 12 deletions(-)

New commits:
commit 3ead1e624514466811d451325d02acd50862c80a
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 20:02:29 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 21:24:21 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: scaddins

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

diff --git a/scaddins/source/pricing/pricing.cxx 
b/scaddins/source/pricing/pricing.cxx
index 83cacff87fc8..3961603bc04b 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -32,8 +32,10 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace sca::pricing;
@@ -309,10 +311,10 @@ uno::Sequence< sheet::LocalizedName > SAL_CALL 
ScaPricingAddIn::getCompatibility
 // auxiliary input handling functions
 namespace {
 
-bool getinput_putcall(bs::types::PutCall& pc, const OUString& str) {
-if(str.startsWith("c")) {
+bool getinput_putcall(bs::types::PutCall& pc, std::u16string_view str) {
+if(o3tl::starts_with(str, u"c")) {
 pc=bs::types::Call;
-} else if(str.startsWith("p")) {
+} else if(o3tl::starts_with(str, u"p")) {
 pc=bs::types::Put;
 } else {
 return false;
@@ -343,10 +345,10 @@ bool getinput_strike(double& strike, const uno::Any& 
anyval) {
 return true;
 }
 
-bool getinput_inout(bs::types::BarrierKIO& kio, const OUString& str) {
-if(str.startsWith("i")) {
+bool getinput_inout(bs::types::BarrierKIO& kio, std::u16string_view str) {
+if(o3tl::starts_with(str, u"i")) {
 kio=bs::types::KnockIn;
-} else if(str.startsWith("o")) {
+} else if(o3tl::starts_with(str, u"o")) {
 kio=bs::types::KnockOut;
 } else {
 return false;
@@ -354,10 +356,10 @@ bool getinput_inout(bs::types::BarrierKIO& kio, const 
OUString& str) {
 return true;
 }
 
-bool getinput_barrier(bs::types::BarrierActive& cont, const OUString& str) {
-if(str.startsWith("c")) {
+bool getinput_barrier(bs::types::BarrierActive& cont, std::u16string_view str) 
{
+if(o3tl::starts_with(str, u"c")) {
 cont=bs::types::Continuous;
-} else if(str.startsWith("e")) {
+} else if(o3tl::starts_with(str, u"e")) {
 cont=bs::types::Maturity;
 } else {
 return false;
@@ -365,10 +367,10 @@ bool getinput_barrier(bs::types::BarrierActive& cont, 
const OUString& str) {
 return true;
 }
 
-bool getinput_fordom(bs::types::ForDom& fd, const OUString& str) {
-if(str.startsWith("f")) {
+bool getinput_fordom(bs::types::ForDom& fd, std::u16string_view str) {
+if(o3tl::starts_with(str, u"f")) {
 fd=bs::types::Foreign;
-} else if(str.startsWith("d")) {
+} else if(o3tl::starts_with(str, u"d")) {
 fd=bs::types::Domestic;
 } else {
 return false;

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 include/sfx2/classificationhelper.hxx |   26 +-
 include/sfx2/sfxhelp.hxx  |6 +-
 sfx2/source/appl/sfxhelp.cxx  |   13 -
 sfx2/source/doc/graphhelp.cxx |   13 +++--
 sfx2/source/doc/graphhelp.hxx |3 ++-
 sfx2/source/view/classificationhelper.cxx |7 ---
 6 files changed, 43 insertions(+), 25 deletions(-)

New commits:
commit ea29e9936a3e628f95ca4ae1d5816adfce87318f
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 20:01:38 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 21:14:15 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: sfx2

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

diff --git a/include/sfx2/classificationhelper.hxx 
b/include/sfx2/classificationhelper.hxx
index ca9ffc386b5d..5a4fa6b1eeab 100644
--- a/include/sfx2/classificationhelper.hxx
+++ b/include/sfx2/classificationhelper.hxx
@@ -11,8 +11,10 @@
 #define INCLUDED_SFX2_CLASSIFICATIONHELPER_HXX
 
 #include 
+#include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -100,7 +102,7 @@ public:
 std::vector const& GetIntellectualPropertyPartNumbers() const;
 
 /// Does a best-effort conversion of rType to SfxClassificationPolicyType.
-static SfxClassificationPolicyType stringToPolicyType(const OUString& 
rType);
+static SfxClassificationPolicyType stringToPolicyType(std::u16string_view 
rType);
 /// Returns the string representation of a SfxClassificationPolicyType 
element.
 static const OUString& policyTypeToString(SfxClassificationPolicyType 
eType);
 
@@ -154,16 +156,19 @@ public:
 return makeTextKey() + ":n" + OUString::number(m_nTextNumber++);
 }
 
-bool isMarkingTextKey(OUString const& aKey) const { return 
aKey.startsWith(makeTextKey()); }
+bool isMarkingTextKey(std::u16string_view aKey) const
+{
+return o3tl::starts_with(aKey, makeTextKey());
+}
 
 OUString makeCategoryNameKey() const
 {
 return getPolicyKey() + "BusinessAuthorizationCategory:Name";
 }
 
-bool isCategoryNameKey(OUString const& aKey) const
+bool isCategoryNameKey(std::u16string_view aKey) const
 {
-return aKey.startsWith(makeCategoryNameKey());
+return o3tl::starts_with(aKey, makeCategoryNameKey());
 }
 
 OUString makeCategoryIdentifierKey() const
@@ -171,9 +176,9 @@ public:
 return getPolicyKey() + "BusinessAuthorizationCategory:Identifier";
 }
 
-bool isCategoryIdentifierKey(OUString const& aKey) const
+bool isCategoryIdentifierKey(std::u16string_view aKey) const
 {
-return aKey.startsWith(makeCategoryIdentifierKey());
+return o3tl::starts_with(aKey, makeCategoryIdentifierKey());
 }
 
 OUString makeMarkingKey() const { return getPolicyKey() + 
"Custom:Marking"; }
@@ -183,7 +188,10 @@ public:
 return makeMarkingKey() + ":n" + OUString::number(m_nMarkingNumber++);
 }
 
-bool isMarkingKey(OUString const& aKey) const { return 
aKey.startsWith(makeMarkingKey()); }
+bool isMarkingKey(std::u16string_view aKey) const
+{
+return o3tl::starts_with(aKey, makeMarkingKey());
+}
 
 OUString makeIntellectualPropertyPartKey() const
 {
@@ -195,9 +203,9 @@ public:
 return makeIntellectualPropertyPartKey() + ":n" + 
OUString::number(m_nIPPartNumber++);
 }
 
-bool isIntellectualPropertyPartKey(OUString const& aKey) const
+bool isIntellectualPropertyPartKey(std::u16string_view aKey) const
 {
-return aKey.startsWith(makeIntellectualPropertyPartKey());
+return o3tl::starts_with(aKey, makeIntellectualPropertyPartKey());
 }
 
 OUString makeFullTextualRepresentationKey() const
diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx
index b0f3ff00657f..a8f725d067a6 100644
--- a/include/sfx2/sfxhelp.hxx
+++ b/include/sfx2/sfxhelp.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_SFX2_SFXHELP_HXX
 #define INCLUDED_SFX2_SFXHELP_HXX
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -34,7 +38,7 @@ private:
 SAL_DLLPRIVATE static bool Start_Impl(const OUString& rURL, weld::Widget* 
pWidget, const OUString& rKeyword);
 SAL_DLLPRIVATE virtual void SearchKeyword( const OUString& rKeyWord ) 
override;
 SAL_DLLPRIVATE virtual bool Start(const OUString& rURL, weld::Widget* 
pWidget = nullptr) override;
-SAL_DLLPRIVATE static OUString GetHelpModuleName_Impl(const OUString 
&rHelpId);
+SAL_DLLPRIVATE static OUString GetHelpModuleName_Impl(std::u16string_view 
rHelpId);
 SAL_DLLPRIVATE static OUString CreateHelpURL_Impl( const OUString& 
aCommandURL, const OUString& rModuleName );
 
 SAL_DLLPRIVATE static bool Start_Impl( const OUString& rURL, const 
vcl::Window* pWindow );
diff --git a/sfx2/source/appl/sfxhelp.cxx b

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 svgio/inc/svgnode.hxx  |3 +-
 svgio/source/svgreader/svgnode.cxx |   41 ++---
 2 files changed, 23 insertions(+), 21 deletions(-)

New commits:
commit 8f2f2a8d131eef60164c0586fb73b69fd950f15d
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 20:01:06 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 21:13:42 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: svgio

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

diff --git a/svgio/inc/svgnode.hxx b/svgio/inc/svgnode.hxx
index 93c303fa2df7..63c6b2318406 100644
--- a/svgio/inc/svgnode.hxx
+++ b/svgio/inc/svgnode.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -72,7 +73,7 @@ namespace svgio::svgreader
 // helper to convert a string associated with a token of type 
SVGTokenDisplay
 // to the enum Display. Empty strings return the default 
'Display_inline' with
 // which members should be initialized
-Display getDisplayFromContent(const OUString& aContent);
+Display getDisplayFromContent(std::u16string_view aContent);
 
   class Visitor;
 
diff --git a/svgio/source/svgreader/svgnode.cxx 
b/svgio/source/svgreader/svgnode.cxx
index c01539ba389a..3bc3fb76baca 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 
@@ -333,79 +334,79 @@ namespace svgio::svgreader
 }
 }
 
-Display getDisplayFromContent(const OUString& aContent)
+Display getDisplayFromContent(std::u16string_view aContent)
 {
-if(!aContent.isEmpty())
+if(!aContent.empty())
 {
-if(aContent.startsWith("inline"))
+if(o3tl::starts_with(aContent, u"inline"))
 {
 return Display::Inline;
 }
-else if(aContent.startsWith("none"))
+else if(o3tl::starts_with(aContent, u"none"))
 {
 return Display::None;
 }
-else if(aContent.startsWith("inherit"))
+else if(o3tl::starts_with(aContent, u"inherit"))
 {
 return Display::Inherit;
 }
-else if(aContent.startsWith("block"))
+else if(o3tl::starts_with(aContent, u"block"))
 {
 return Display::Block;
 }
-else if(aContent.startsWith("list-item"))
+else if(o3tl::starts_with(aContent, u"list-item"))
 {
 return Display::ListItem;
 }
-else if(aContent.startsWith("run-in"))
+else if(o3tl::starts_with(aContent, u"run-in"))
 {
 return Display::RunIn;
 }
-else if(aContent.startsWith("compact"))
+else if(o3tl::starts_with(aContent, u"compact"))
 {
 return Display::Compact;
 }
-else if(aContent.startsWith("marker"))
+else if(o3tl::starts_with(aContent, u"marker"))
 {
 return Display::Marker;
 }
-else if(aContent.startsWith("table"))
+else if(o3tl::starts_with(aContent, u"table"))
 {
 return Display::Table;
 }
-else if(aContent.startsWith("inline-table"))
+else if(o3tl::starts_with(aContent, u"inline-table"))
 {
 return Display::InlineTable;
 }
-else if(aContent.startsWith("table-row-group"))
+else if(o3tl::starts_with(aContent, u"table-row-group"))
 {
 return Display::TableRowGroup;
 }
-else if(aContent.startsWith("table-header-group"))
+else if(o3tl::starts_with(aContent, u"table-header-group"))
 {
 return Display::TableHeaderGroup;
 }
-else if(aContent.startsWith("table-footer-group"))
+else if(o3tl::starts_with(aContent, u"table-footer-group"))
 {
 return Display::TableFooterGroup;
 }
-else if(aContent.startsWith("table-row"))
+else if(o3tl::starts_with(aContent, u"table-row"))
 {
 return Display::TableRow;
 }
-else if(aContent.startsWith("table-column-group"))
+else if(o3tl::starts_with(aContent, u"table-col

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 include/svtools/imageresourceaccess.hxx |3 ++-
 svtools/source/misc/imageresourceaccess.cxx |   11 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 49cee95eb4efddefde9caab33d0a639e83f05202
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 19:05:10 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 20:44:36 2021 +0200

xtend loplugin:stringviewparam to starts/endsWith: svtools

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

diff --git a/include/svtools/imageresourceaccess.hxx 
b/include/svtools/imageresourceaccess.hxx
index ccb5b6b69bce..ca76c0909f17 100644
--- a/include/svtools/imageresourceaccess.hxx
+++ b/include/svtools/imageresourceaccess.hxx
@@ -22,6 +22,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -41,7 +42,7 @@ namespace svt::GraphicAccess
 */
 
 /** determines whether the given URL denotes an image within a resource */
-UNLESS_MERGELIBS(SVT_DLLPUBLIC) bool isSupportedURL(OUString const & rURL);
+UNLESS_MERGELIBS(SVT_DLLPUBLIC) bool isSupportedURL(std::u16string_view rURL);
 
 /** for a given URL of an image within a resource, this method retrieves an
 SvStream for this image.
diff --git a/svtools/source/misc/imageresourceaccess.cxx 
b/svtools/source/misc/imageresourceaccess.cxx
index 24db4ae50ac3..fc12981a3460 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -106,12 +107,12 @@ sal_Int64 SAL_CALL StreamSupplier::getLength()
 return m_xSeekable->getLength();
 }
 
-bool isSupportedURL(OUString const & rURL)
+bool isSupportedURL(std::u16string_view rURL)
 {
-return rURL.startsWith("private:resource/")
-|| rURL.startsWith("private:graphicrepository/")
-|| rURL.startsWith("private:standardimage/")
-|| rURL.startsWith("vnd.sun.star.extension://");
+return o3tl::starts_with(rURL, u"private:resource/")
+|| o3tl::starts_with(rURL, u"private:graphicrepository/")
+|| o3tl::starts_with(rURL, u"private:standardimage/")
+|| o3tl::starts_with(rURL, u"vnd.sun.star.extension://");
 }
 
 std::unique_ptr 
getImageStream(uno::Reference const & rxContext, 
OUString const & rImageResourceURL)

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 compilerplugins/clang/test/consttobool.cxx |2 +-
 compilerplugins/clang/test/cppunitassertequals.cxx |2 +-
 compilerplugins/clang/test/redundantcast.cxx   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 27f3618a66e59d6b45e22f0eb46457172a52
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 16:05:17 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 20:24:14 2021 +0200

Adapt to Clang 14 trunk change in diagnostics



"Print nullptr_t namespace qualified within std::"

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

diff --git a/compilerplugins/clang/test/consttobool.cxx 
b/compilerplugins/clang/test/consttobool.cxx
index 3d880cb4d5d1..4fe41a8140f2 100644
--- a/compilerplugins/clang/test/consttobool.cxx
+++ b/compilerplugins/clang/test/consttobool.cxx
@@ -28,7 +28,7 @@ constexpr int c2 = 2;
 struct S
 {
 S()
-// expected-error-re@+1 {{implicit conversion of constant {{nullptr|0}} of 
type 'nullptr_t' to 'bool'; use 'false' instead [loplugin:consttobool]}}
+// expected-error-re@+1 {{implicit conversion of constant {{nullptr|0}} of 
type '{{(std::)?}}nullptr_t' to 'bool'; use 'false' instead 
[loplugin:consttobool]}}
 : b(nullptr)
 {
 }
diff --git a/compilerplugins/clang/test/cppunitassertequals.cxx 
b/compilerplugins/clang/test/cppunitassertequals.cxx
index 9fe35cfc6919..48bea83f6088 100644
--- a/compilerplugins/clang/test/cppunitassertequals.cxx
+++ b/compilerplugins/clang/test/cppunitassertequals.cxx
@@ -55,7 +55,7 @@ void test(
 // very meaningful, so let it use CPPUNIT_ASSERT (but stick to 
CPPUNIT_ASSERT_EQUAL for
 // consistency in the unlikely case that P is of type std::nullptr_t):
 CPPUNIT_ASSERT(p == nullptr);
-CPPUNIT_ASSERT(n == nullptr); // expected-error {{rather call 
CPPUNIT_ASSERT_EQUAL when comparing 'std::nullptr_t' (aka 'nullptr_t') and 
'nullptr_t' (or rewrite as an explicit operator == call when the operator 
itself is the topic) [loplugin:cppunitassertequals]}}
+CPPUNIT_ASSERT(n == nullptr); // expected-error-re {{rather call 
CPPUNIT_ASSERT_EQUAL when comparing 'std::nullptr_t'{{( \(aka 'nullptr_t'\))?}} 
and '{{(std::)?}}nullptr_t' (or rewrite as an explicit operator == call when 
the operator itself is the topic) [loplugin:cppunitassertequals]}}
 
 // There might even be good reasons(?) not to warn inside explicit casts:
 CPPUNIT_ASSERT(bool(b1 && b2));
diff --git a/compilerplugins/clang/test/redundantcast.cxx 
b/compilerplugins/clang/test/redundantcast.cxx
index 2a3721bb0c2e..319365d3676b 100644
--- a/compilerplugins/clang/test/redundantcast.cxx
+++ b/compilerplugins/clang/test/redundantcast.cxx
@@ -42,7 +42,7 @@ void testConstCast() {
 
 void * vp = nullptr;
 (void) const_cast(static_cast(vp)); // 
expected-error {{redundant static_cast/const_cast combination from 'void *' via 
'const char *' to 'char *' [loplugin:redundantcast]}}
-(void) const_cast(static_cast(nullptr)); // 
expected-error {{redundant static_cast/const_cast combination from 'nullptr_t' 
via 'const char *' to 'char *' [loplugin:redundantcast]}}
+(void) const_cast(static_cast(nullptr)); // 
expected-error-re {{redundant static_cast/const_cast combination from 
'{{(std::)?}}nullptr_t' via 'const char *' to 'char *' 
[loplugin:redundantcast]}}
 (void) const_cast(static_cast(D{})); // expected-error 
{{redundant static_cast/const_cast combination from 'D' via 'const S &' to 'S 
&' [loplugin:redundantcast]}}
 
 S const s{};

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

2021-09-22 Thread Caolán McNamara (via logerrit)

 vcl/unx/gtk3/gtkinst.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit c9b19f69e658f1114f1b8fc0ae62b6edd6d33e3f
Author: Caolán McNamara 
AuthorDate: Wed Sep 22 16:26:00 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 22 20:20:09 2021 +0200

Resolves: tdf#142704 %PRODUCTNAME shown in gtk3 extended tips

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 2131dbabb24a..babd59e3403f 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -21788,6 +21788,18 @@ private:
 gtk_widget_hide(pWidget);
 }
 
+#if !GTK_CHECK_VERSION(4, 0, 0)
+// tdf#142704 %PRODUCTNAME shown in extended tips
+AtkObject* pAtkObject = gtk_widget_get_accessible(pWidget);
+const char* pDesc = pAtkObject ? 
atk_object_get_description(pAtkObject) : nullptr;
+if (pDesc && pDesc[0])
+{
+OUString aDesc(pDesc, strlen(pDesc), RTL_TEXTENCODING_UTF8);
+aDesc = (*m_pStringReplace)(aDesc);
+atk_object_set_description(pAtkObject, OUStringToOString(aDesc, 
RTL_TEXTENCODING_UTF8).getStr());
+}
+#endif
+
 // expand placeholder and collect potentially missing mnemonics
 if (GTK_IS_BUTTON(pWidget))
 {

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 ucb/source/ucp/hierarchy/hierarchydatasource.cxx |9 +
 ucb/source/ucp/hierarchy/hierarchydatasource.hxx |3 ++-
 ucb/source/ucp/tdoc/tdoc_content.cxx |   11 ++-
 ucb/source/ucp/tdoc/tdoc_content.hxx |   10 +++---
 ucb/source/ucp/tdoc/tdoc_provider.cxx|4 ++--
 ucb/source/ucp/tdoc/tdoc_provider.hxx|8 ++--
 ucb/source/ucp/webdav-neon/DAVProperties.cxx |   16 
 ucb/source/ucp/webdav-neon/DAVProperties.hxx |6 +-
 8 files changed, 41 insertions(+), 26 deletions(-)

New commits:
commit 7885c1cb80568930270e55b3ae450eccc66aca94
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 17:17:16 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 20:00:17 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: ucb

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

diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx 
b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index a74524e70f35..8e77576134bb 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -39,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -443,18 +444,18 @@ HierarchyDataSource::getConfigProvider()
 
 
 bool HierarchyDataSource::createConfigPath(
-const OUString & rInPath, OUString & rOutPath )
+std::u16string_view rInPath, OUString & rOutPath )
 {
-if ( !rInPath.isEmpty() )
+if ( !rInPath.empty() )
 {
-if ( rInPath.startsWith( "/" ) )
+if ( o3tl::starts_with( rInPath, u"/" ) )
 {
 OSL_FAIL( "HierarchyDataSource::createConfigPath - "
 "Leading slash in node path!" );
 return false;
 }
 
-if ( rInPath.endsWith( "/" ) )
+if ( o3tl::ends_with( rInPath, u"/" ) )
 {
 OSL_FAIL( "HierarchyDataSource::createConfigPath - "
 "Trailing slash in node path!" );
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx 
b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
index 9806f98f8036..24b3a18491d6 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace comphelper { class OInterfaceContainerHelper2; }
 
@@ -75,7 +76,7 @@ private:
 
 css::uno::Reference< css::lang::XMultiServiceFactory > getConfigProvider();
 
-static bool createConfigPath( const OUString & rInPath, OUString & 
rOutPath );
+static bool createConfigPath( std::u16string_view rInPath, OUString & 
rOutPath );
 };
 
 } // namespace hierarchy_ucp
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx 
b/ucb/source/ucp/tdoc/tdoc_content.cxx
index dcb800ee91c8..5a1335e1efc9 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -28,6 +28,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -1709,7 +1710,7 @@ void Content::notifyDocumentClosed()
 
 
 uno::Reference< ucb::XContent >
-Content::queryChildContent( const OUString & rRelativeChildUri )
+Content::queryChildContent( std::u16string_view rRelativeChildUri )
 {
 osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1717,10 +1718,10 @@ Content::queryChildContent( const OUString & 
rRelativeChildUri )
 OUStringBuffer aBuf( aMyId );
 if ( !aMyId.endsWith("/") )
 aBuf.append( "/" );
-if ( !rRelativeChildUri.startsWith("/") )
+if ( !o3tl::starts_with(rRelativeChildUri, u"/") )
 aBuf.append( rRelativeChildUri );
 else
-aBuf.append( rRelativeChildUri.subView(1) );
+aBuf.append( rRelativeChildUri.substr(1) );
 
 uno::Reference< ucb::XContentIdentifier > xChildId
 = new ::ucbhelper::ContentIdentifier( aBuf.makeStringAndClear() );
@@ -1741,7 +1742,7 @@ Content::queryChildContent( const OUString & 
rRelativeChildUri )
 }
 
 
-void Content::notifyChildRemoved( const OUString & rRelativeChildUri )
+void Content::notifyChildRemoved( std::u16string_view rRelativeChildUri )
 {
 osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1765,7 +1766,7 @@ void Content::notifyChildRemoved( const OUString & 
rRelativeChildUri )
 }
 
 
-void Content::notifyChildInserted( const OUString & rRelativeChildUri )
+void Content::notifyChildInserted( std::u16string_view rRelativeChildUri )
 {
 osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx 
b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 56117b1b0853..9a920c1bb376 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -19,6 +19,10 @@
 
 #pragma once
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 sw/inc/iodetect.hxx  |6 ++-
 sw/source/core/tox/tox.cxx   |6 ++-
 sw/source/core/unocore/unostyle.cxx  |8 ++--
 sw/source/filter/ww8/docxattributeoutput.cxx |   51 ++-
 sw/source/filter/ww8/docxattributeoutput.hxx |4 +-
 sw/source/filter/ww8/rtfexport.cxx   |   11 -
 sw/source/filter/ww8/ww8par5.cxx |6 ++-
 sw/source/ui/envelp/envfmt.cxx   |7 ++-
 sw/source/ui/envelp/envfmt.hxx   |6 ++-
 sw/source/uibase/inc/unotools.hxx|6 ++-
 sw/source/uibase/utlui/unotools.cxx  |   14 +--
 11 files changed, 78 insertions(+), 47 deletions(-)

New commits:
commit d1e14030e81ff2bbe4bcb3706a9f21672a368074
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 17:18:06 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 19:59:56 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: sw

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

diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index 1d5713aaccab..9069b01ffda0 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -21,6 +21,8 @@
 #define INCLUDED_SW_INC_IODETECT_HXX
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -59,9 +61,9 @@ struct SwIoDetect
 {
 }
 
-bool IsFilter( const OUString& rNm ) const
+bool IsFilter( std::u16string_view rNm ) const
 {
-return rNm.startsWith(sName);
+return o3tl::starts_with(rNm, sName);
 }
 };
 
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index f24cfdaab814..65462bf44f80 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -35,9 +35,11 @@
 
 #include 
 #include 
+#include 
 #include 
 
 #include 
+#include 
 
 
 using namespace std;
@@ -756,7 +758,7 @@ OUString SwFormToken::GetString() const
 
@return the type of the token
 */
-static FormTokenType lcl_GetTokenType(const OUString & sToken,
+static FormTokenType lcl_GetTokenType(std::u16string_view sToken,
   sal_Int32 & rTokenLen)
 {
 static struct
@@ -779,7 +781,7 @@ static FormTokenType lcl_GetTokenType(const OUString & 
sToken,
 
 for(const auto & i : aTokenArr)
 {
-if( sToken.startsWith( i.sTokenStart ) )
+if( o3tl::starts_with( sToken, i.sTokenStart ) )
 {
 rTokenLen = i.nTokenLength;
 return i.eTokenType;
diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index 0a93658920a1..48510356b54c 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -20,6 +20,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -115,6 +116,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace css;
@@ -2468,12 +2470,12 @@ beans::PropertyState SwXStyle::getPropertyState(const 
OUString& rPropertyName)
 
 // allow to retarget the SfxItemSet working on, default correctly. Only
 // use pSourceSet below this point (except in header/footer processing)
-static const SfxItemSet* lcl_GetItemsetForProperty(const SfxItemSet& rSet, 
SfxStyleFamily eFamily, const OUString& rPropertyName)
+static const SfxItemSet* lcl_GetItemsetForProperty(const SfxItemSet& rSet, 
SfxStyleFamily eFamily, std::u16string_view rPropertyName)
 {
 if(eFamily != SfxStyleFamily::Page)
 return &rSet;
-const bool isFooter = rPropertyName.startsWith("Footer");
-if(!isFooter && !rPropertyName.startsWith("Header") && rPropertyName != 
UNO_NAME_FIRST_IS_SHARED)
+const bool isFooter = o3tl::starts_with(rPropertyName, u"Footer");
+if(!isFooter && !o3tl::starts_with(rPropertyName, u"Header") && 
rPropertyName != u"" UNO_NAME_FIRST_IS_SHARED)
 return &rSet;
 const SvxSetItem* pSetItem;
 if(!lcl_GetHeaderFooterItem(rSet, rPropertyName, isFooter, pSetItem))
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index f764fe980c0c..a78211445782 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -138,6 +138,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -152,6 +153,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 
@@ -1787,33 +1789,34 @@ void 
DocxAttributeOutput::DoWriteBookmarksEnd(std::vector& rEnds)
 // - "permission-for-user::"
 // - "permission-for-group::"
 //
-void DocxAttributeOutput::DoWritePermissionTagStart(const OUString & 
permission)
+void DocxAttributeOutput::DoWritePermissionTagStart(std::u16string_view 
permission)
 {
-OUString permissionIdAndName;
+std::u16string_view permissionIdAndName;
 
-if (permission.startsWith("permission-for-group:", &permissionIdAndName))
+

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 unodevtools/inc/options.hxx|4 +++-
 unodevtools/source/unodevtools/options.cxx |7 ---
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 743e6aa211ccd631c811fb57e2050a5b4e8ffbba
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 17:16:30 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 19:59:35 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: unodevtools

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

diff --git a/unodevtools/inc/options.hxx b/unodevtools/inc/options.hxx
index d9b557d06a28..5094a11ef5e1 100644
--- a/unodevtools/inc/options.hxx
+++ b/unodevtools/inc/options.hxx
@@ -21,6 +21,8 @@
 
 #include 
 
+#include 
+
 #include 
 
 namespace unodevtools {
@@ -32,7 +34,7 @@ bool readOption( OUString * pValue, const char * pOpt,
 
 
 bool readOption( const char * pOpt,
- sal_uInt32 * pnIndex, const OUString & aArg);
+ sal_uInt32 * pnIndex, std::u16string_view aArg);
 
 } // end of namespace unodevtools
 
diff --git a/unodevtools/source/unodevtools/options.cxx 
b/unodevtools/source/unodevtools/options.cxx
index eb34e723c38a..8cd2b652f8b0 100644
--- a/unodevtools/source/unodevtools/options.cxx
+++ b/unodevtools/source/unodevtools/options.cxx
@@ -20,6 +20,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -66,12 +67,12 @@ bool readOption( OUString * pValue, const char * pOpt,
 
 
 bool readOption( const char * pOpt,
- sal_uInt32 * pnIndex, const OUString & aArg)
+ sal_uInt32 * pnIndex, std::u16string_view aArg)
 {
 OUString aOpt = OUString::createFromAscii(pOpt);
 
-if((aArg.startsWith("-") && aOpt.equalsIgnoreAsciiCase(aArg.subView(1))) ||
-   (aArg.startsWith("--") && aOpt.equalsIgnoreAsciiCase(aArg.subView(2))) )
+if((o3tl::starts_with(aArg, u"-") && 
aOpt.equalsIgnoreAsciiCase(aArg.substr(1))) ||
+   (o3tl::starts_with(aArg, u"--") && 
aOpt.equalsIgnoreAsciiCase(aArg.substr(2))) )
 {
 ++(*pnIndex);
 SAL_INFO("unodevtools", "identified option --" << pOpt);

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 xmlsecurity/source/helper/ooxmlsecexporter.cxx |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 924e0774a8201651a762394d51a964a4f8a0c566
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 17:13:59 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 19:58:55 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: xmlsecurity

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

diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx 
b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
index 324657a96ee0..a202cda19cef 100644
--- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
@@ -20,6 +20,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -55,7 +56,7 @@ public:
 }
 
 /// Should we intentionally not sign this stream?
-static bool isOOXMLDenylist(const OUString& rStreamName);
+static bool isOOXMLDenylist(std::u16string_view rStreamName);
 /// Should we intentionally not sign this relation type?
 static bool isOOXMLRelationDenylist(const OUString& rRelationName);
 
@@ -85,16 +86,17 @@ public:
 void writeSignatureLineImages();
 };
 
-bool OOXMLSecExporter::Impl::isOOXMLDenylist(const OUString& rStreamName)
+bool OOXMLSecExporter::Impl::isOOXMLDenylist(std::u16string_view rStreamName)
 {
 static const std::initializer_list vDenylist
 = { u"/%5BContent_Types%5D.xml", u"/docProps/app.xml", 
u"/docProps/core.xml",
 // Don't attempt to sign other signatures for now.
 u"/_xmlsignatures" };
 // Just check the prefix, as we don't care about the content type part of 
the stream name.
-return std::any_of(
-vDenylist.begin(), vDenylist.end(),
-[&](const std::u16string_view& rLiteral) { return 
rStreamName.startsWith(rLiteral); });
+return std::any_of(vDenylist.begin(), vDenylist.end(),
+   [&](const std::u16string_view& rLiteral) {
+   return o3tl::starts_with(rStreamName, rLiteral);
+   });
 }
 
 bool OOXMLSecExporter::Impl::isOOXMLRelationDenylist(const OUString& 
rRelationName)

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

2021-09-22 Thread László Németh (via logerrit)

 sw/qa/extras/uiwriter/uiwriter2.cxx |   45 
 sw/source/core/doc/tblrwcl.cxx  |   23 --
 2 files changed, 65 insertions(+), 3 deletions(-)

New commits:
commit dbc82c02eb24ec1c97c6ee32069771d8deb394f9
Author: László Németh 
AuthorDate: Wed Sep 22 16:26:18 2021 +0200
Commit: László Németh 
CommitDate: Wed Sep 22 19:56:47 2021 +0200

tdf#143358 sw: track insertion of empty table rows

Insertion of empty table rows wasn't tracked, and
inserting also text in the new rows and rejecting
everything didn't reject the row insertion.

Follow-up to commit 99059a1ececa3621c2fe46fabdd79eed9d626c42
"tdf#143359 sw: track deletion of empty table rows".

Note: as a workaround for tracking of the empty rows,
i.e. rows without text content, add a redline with
invisible text CH_TXT_TRACKED_DUMMY_CHAR in the first
cell of the empty row.

See also commit a483a44ca00f43a64ae51d62b8fbb4129a413f6d
"tdf#143215 DOCX import: fix tracked empty row insertion/deletion",
commit b50d386dfa70f7c1d4eb1a49091ec9dd782b767b
"tdf#142701 track changes: fix layout regression of image deletion"
and commit 05366b8e6683363688de8708a3d88cf144c7a2bf
"tdf#60382 sw offapi: add change tracking of table/row deletion".

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

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 50c9f008eb34..1a9cbdc7d84f 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -4611,6 +4611,51 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, 
testRedlineTableRowDeletionWithReject)
 assertXPath(pXmlDoc, "//page[1]//body/tab", 0);
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testRedlineTableRowInsertionWithReject)
+{
+// load a 1-row table, and insert a row with enabled change tracking
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf118311.fodt");
+
+// turn on red-lining and show changes
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | 
RedlineFlags::ShowDelete
+  | 
RedlineFlags::ShowInsert);
+CPPUNIT_ASSERT_MESSAGE("redlining should be on",
+   pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE(
+"redlines should be visible",
+
IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+
+// check table and its single row
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "//page[1]//body/tab");
+assertXPath(pXmlDoc, "//page[1]//body/tab/row", 1);
+
+// insert rows before and after with enabled change tracking
+// (HasTextChangesOnly property of the row will be false, and
+// add dummy characters CH_TXT_TRACKED_DUMMY_CHAR)
+dispatchCommand(mxComponent, ".uno:InsertRowsBefore", {});
+dispatchCommand(mxComponent, ".uno:InsertRowsAfter", {});
+
+SwEditShell* const pEditShell(pDoc->GetEditShell());
+// This was 0 (not tracked row insertion)
+CPPUNIT_ASSERT_EQUAL(static_cast(2), 
pEditShell->GetRedlineCount());
+
+discardDumpedLayout();
+pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "//page[1]//body/tab");
+assertXPath(pXmlDoc, "//page[1]//body/tab/row", 3);
+
+// reject redlines
+pEditShell->RejectRedline(0);
+pEditShell->RejectRedline(0);
+
+discardDumpedLayout();
+pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "//page[1]//body/tab");
+// This was 3 (not rejected row insertion)
+assertXPath(pXmlDoc, "//page[1]//body/tab/row", 1);
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf128603)
 {
 // Load the bugdoc, which has 3 textboxes.
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index f529742e429c..2273ec51c12f 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -244,7 +244,7 @@ struct CpyPara
 
 }
 
-static void lcl_CopyRow(FndLine_ & rFndLine, CpyPara *const pCpyPara);
+static SwTableLine* lcl_CopyRow(FndLine_ & rFndLine, CpyPara *const pCpyPara);
 
 static void lcl_CopyCol( FndBox_ & rFndBox, CpyPara *const pCpyPara)
 {
@@ -379,7 +379,7 @@ static void lcl_CopyCol( FndBox_ & rFndBox, CpyPara *const 
pCpyPara)
 }
 }
 
-static void lcl_CopyRow(FndLine_& rFndLine, CpyPara *const pCpyPara)
+static SwTableLine* lcl_CopyRow(FndLine_& rFndLine, CpyPara *const pCpyPara)
 {
 SwTableLine* pNewLine = new SwTableLine(
 
static_cast(rFndLine.GetLine()->GetFrameFormat()),
@@ -402,6 +402,8 @@ static void lcl_CopyRow(FndLine_& rFndLine, CpyPara *const 
pCpyPara)
 }
 
 pCpyPara->nDelBorderFlag &= 0xf8;
+
+return pNewLine;
 }
 
 static void lcl_InsCol( FndLine_* pFndLn, CpyPara

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 include/vcl/GraphicObject.hxx |3 ++-
 vcl/inc/unx/gtk/gtkdata.hxx   |3 ++-
 vcl/source/graphic/GraphicObject.cxx  |5 +++--
 vcl/source/graphic/UnoGraphicProvider.cxx |   28 +++-
 vcl/source/window/layout.cxx  |9 +++--
 vcl/source/window/toolbox.cxx |   12 +++-
 vcl/unx/gtk3/gtkdata.cxx  |5 +++--
 7 files changed, 39 insertions(+), 26 deletions(-)

New commits:
commit c638bcc78cfa3974b7461096b6ac521dfc5e927c
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 17:15:04 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 18:55:18 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: vcl

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

diff --git a/include/vcl/GraphicObject.hxx b/include/vcl/GraphicObject.hxx
index 27b50455864a..980f686f6ba9 100644
--- a/include/vcl/GraphicObject.hxx
+++ b/include/vcl/GraphicObject.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -268,7 +269,7 @@ public:
 
 voidStopAnimation( const OutputDevice* pOut = nullptr, 
tools::Long nExtraData = 0 );
 
-static bool isGraphicObjectUniqueIdURL(OUString const & rURL);
+static bool isGraphicObjectUniqueIdURL(std::u16string_view rURL);
 
 // create CropScaling information
 // fWidth, fHeight: object size
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 5ca53c368104..185a000e0398 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -39,6 +39,7 @@
 #include 
 #include 
 
+#include 
 #include 
 
 namespace com::sun::star::accessibility { class XAccessibleEventListener; }
@@ -195,7 +196,7 @@ inline GdkGLContext* surface_create_gl_context(GdkSurface* 
pSurface)
 typedef GtkClipboard GdkClipboard;
 #endif
 
-int getButtonPriority(const OString &rType);
+int getButtonPriority(std::string_view rType);
 
 class GtkSalTimer final : public SalTimer
 {
diff --git a/vcl/source/graphic/GraphicObject.cxx 
b/vcl/source/graphic/GraphicObject.cxx
index d6c0963b6c61..96f69b3c37df 100644
--- a/vcl/source/graphic/GraphicObject.cxx
+++ b/vcl/source/graphic/GraphicObject.cxx
@@ -21,6 +21,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -884,9 +885,9 @@ Graphic GraphicObject::GetTransformedGraphic( const 
GraphicAttr* pAttr ) const
 return aGraphic;
 }
 
-bool GraphicObject::isGraphicObjectUniqueIdURL(OUString const & rURL)
+bool GraphicObject::isGraphicObjectUniqueIdURL(std::u16string_view rURL)
 {
-return rURL.startsWith("vnd.sun.star.GraphicObject:");
+return o3tl::starts_with(rURL, u"vnd.sun.star.GraphicObject:");
 }
 
 // calculate scalings between real image size and logic object size. This
diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx 
b/vcl/source/graphic/UnoGraphicProvider.cxx
index c4c77e43064b..058f72830041 100644
--- a/vcl/source/graphic/UnoGraphicProvider.cxx
+++ b/vcl/source/graphic/UnoGraphicProvider.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 #include 
@@ -45,6 +46,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -81,9 +83,9 @@ protected:
 private:
 
 static css::uno::Reference< css::graphic::XGraphic > implLoadMemory( const 
OUString& rResourceURL );
-static css::uno::Reference< css::graphic::XGraphic > 
implLoadRepositoryImage( const OUString& rResourceURL );
+static css::uno::Reference< css::graphic::XGraphic > 
implLoadRepositoryImage( std::u16string_view rResourceURL );
 static css::uno::Reference< css::graphic::XGraphic > implLoadBitmap( const 
css::uno::Reference< css::awt::XBitmap >& rBitmap );
-static css::uno::Reference< css::graphic::XGraphic > 
implLoadStandardImage( const OUString& rResourceURL );
+static css::uno::Reference< css::graphic::XGraphic > 
implLoadStandardImage( std::u16string_view rResourceURL );
 };
 
 GraphicProvider::GraphicProvider()
@@ -142,15 +144,15 @@ uno::Reference< ::graphic::XGraphic > 
GraphicProvider::implLoadMemory( const OUS
 }
 
 
-uno::Reference< ::graphic::XGraphic > 
GraphicProvider::implLoadRepositoryImage( const OUString& rResourceURL )
+uno::Reference< ::graphic::XGraphic > 
GraphicProvider::implLoadRepositoryImage( std::u16string_view rResourceURL )
 {
 uno::Reference< ::graphic::XGraphic >   xRet;
 
-OUString sPathName;
-if( rResourceURL.startsWith("private:graphicrepository/", &sPathName) )
+std::u16string_view sPathName;
+if( o3tl::starts_with(rResourceURL, u"private:graphicrepository/", 
&sPathName) )
 {
 BitmapEx aBitmap;
-if ( vcl::ImageRepository::loadImage( sPathName, aBitmap ) )
+if ( vcl::ImageRepository::loadImage( OUString(sPathName), aBitmap ) )
 {

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

2021-09-22 Thread Stephan Bergmann (via logerrit)

 unotools/source/config/dynamicmenuoptions.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 8d65f68f98950efe7cb117d7ad228bab79ad0ddb
Author: Stephan Bergmann 
AuthorDate: Wed Sep 22 17:15:46 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 22 18:54:52 2021 +0200

Extend loplugin:stringviewparam to starts/endsWith: unotools

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

diff --git a/unotools/source/config/dynamicmenuoptions.cxx 
b/unotools/source/config/dynamicmenuoptions.cxx
index 14ce7bb87aa5..38138797f149 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -19,6 +19,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -30,6 +31,7 @@
 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -51,7 +53,7 @@ constexpr OUStringLiteral SETNODE_WIZARDMENU = u"Wizard";
 
 #define PROPERTYCOUNT   4
 
-constexpr OUStringLiteral PATHPREFIX_SETUP = u"m";
+constexpr std::u16string_view PATHPREFIX_SETUP = u"m";
 
 namespace
 {
@@ -300,10 +302,10 @@ static void lcl_SortAndExpandPropertyNames( const 
Sequence< OUString >& lSource
 };
 struct SelectByPrefix
 {
-bool operator() ( const OUString& s ) const
+bool operator() ( std::u16string_view s ) const
 {
 // Prefer setup written entries by check first letter of given 
string. It must be a "s".
-return s.startsWith( PATHPREFIX_SETUP );
+return o3tl::starts_with( s, PATHPREFIX_SETUP );
 }
 };

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - drawinglayer/source include/drawinglayer svx/CppunitTest_svx_unit.mk svx/qa svx/source

2021-09-22 Thread Miklos Vajna (via logerrit)

 drawinglayer/source/primitive2d/shadowprimitive2d.cxx   |   71 ---
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |   10 +
 drawinglayer/source/tools/primitive2dxmldump.cxx|   33 +
 include/drawinglayer/primitive2d/baseprimitive2d.hxx|7 +
 include/drawinglayer/primitive2d/shadowprimitive2d.hxx  |8 +
 svx/CppunitTest_svx_unit.mk |1 
 svx/qa/unit/data/table-shadow-blur.pptx |binary
 svx/qa/unit/table.cxx   |  100 
 svx/source/table/viewcontactoftableobj.cxx  |   13 +-
 9 files changed, 221 insertions(+), 22 deletions(-)

New commits:
commit 288eab2fbb859689d84082810afb15b2a229f12d
Author: Miklos Vajna 
AuthorDate: Mon Sep 20 11:26:53 2021 +0200
Commit: Mike Kaganski 
CommitDate: Wed Sep 22 17:27:39 2021 +0200

tdf#144091 svx: fix unwanted blur of shadow from table cell fill

Initial render support for shadows of table shapes were added in commit
a75bf43a8d6c5dec6dcc86908c142ceec541aa8c (tdf#129961 svx: add rendering
for table shadow as direct format, 2020-12-02).

That already noticed a trick with the shadow of table shapes: the shadow
is generate from the cell fill and the border, but not from the text.

An additional trick is that when blur is enabled for the table shape's
shadow, then only the border should be blurred, not the cell fill.

In the bug document's case, the effective cell background was gray, with
a semi-transparent red shadow. We used to render cc with blur and
cc without blur, now we correctly render cca3a3, matching
PowerPoint.

(cherry picked from commit 37a52d30bbfcf1d073779b50139c4dafa507be4b)

Conflicts:
drawinglayer/source/primitive2d/shadowprimitive2d.cxx
drawinglayer/source/tools/primitive2dxmldump.cxx

include/drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx

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

diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx 
b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
index f0efd64c7bdc..516cc0c0bd4a 100644
--- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
@@ -30,6 +30,27 @@ using namespace com::sun::star;
 
 namespace drawinglayer::primitive2d
 {
+namespace
+{
+void get2DDecompositionOfChildren(const ShadowPrimitive2D& rPrimitive,
+  Primitive2DDecompositionVisitor& rVisitor,
+  const Primitive2DContainer& rChildren)
+{
+if (rChildren.empty())
+return;
+
+// create a modifiedColorPrimitive containing the shadow color and the 
content
+const basegfx::BColorModifierSharedPtr aBColorModifier
+= 
std::make_shared(rPrimitive.getShadowColor());
+const Primitive2DReference xRefA(new ModifiedColorPrimitive2D(rChildren, 
aBColorModifier));
+Primitive2DContainer aSequenceB{ xRefA };
+
+// build transformed primitiveVector with shadow offset and add to target
+rVisitor.append(
+new TransformPrimitive2D(rPrimitive.getShadowTransform(), 
std::move(aSequenceB)));
+}
+}
+
 ShadowPrimitive2D::ShadowPrimitive2D(
 const basegfx::B2DHomMatrix& rShadowTransform,
 const basegfx::BColor& rShadowColor,
@@ -66,21 +87,41 @@ namespace drawinglayer::primitive2d
 
 void 
ShadowPrimitive2D::get2DDecomposition(Primitive2DDecompositionVisitor& 
rVisitor, const geometry::ViewInformation2D& /*rViewInformation*/) const
 {
-if(getChildren().empty())
-return;
-
-// create a modifiedColorPrimitive containing the shadow color and 
the content
-const basegfx::BColorModifierSharedPtr aBColorModifier =
-std::make_shared(
-getShadowColor());
-const Primitive2DReference xRefA(
-new ModifiedColorPrimitive2D(
-getChildren(),
-aBColorModifier));
-const Primitive2DContainer aSequenceB { xRefA };
-
-// build transformed primitiveVector with shadow offset and add to 
target
-rVisitor.append(new TransformPrimitive2D(getShadowTransform(), 
aSequenceB));
+get2DDecompositionOfChildren(*this, rVisitor, getChildren());
+}
+
+void ShadowPrimitive2D::get2DDecompositionWithoutBlur(
+Primitive2DDecompositionVisitor& rVisitor,
+const geometry::ViewInformation2D& /*rViewInformation*/) const
+{
+Primitive2DContainer aChildren;
+// Only decompose children which are not blurred (they opted in 
for this).
+std::copy_if(getChildren().begin(), getChildre

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

2021-09-22 Thread Michael Stahl (via logerrit)

 compilerplugins/clang/unnecessaryoverride.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 805cc60039fcce2ba356430cb90811a6e300a540
Author: Michael Stahl 
AuthorDate: Wed Sep 22 15:33:53 2021 +0200
Commit: Michael Stahl 
CommitDate: Wed Sep 22 17:15:42 2021 +0200

fix crash in compilerplugins/clang/unnecessaryoverride.cxx:328

Somehow the compountStmt doesn't have anything in the body?

Happens in CurlSession.cxx but not sure where.

Change-Id: I69bd2e694e22c891f34242b8bee28012e793f0c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122457
Reviewed-by: Noel Grandin 
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/compilerplugins/clang/unnecessaryoverride.cxx 
b/compilerplugins/clang/unnecessaryoverride.cxx
index 7ce2627cc8fb..6523170105a2 100644
--- a/compilerplugins/clang/unnecessaryoverride.cxx
+++ b/compilerplugins/clang/unnecessaryoverride.cxx
@@ -325,6 +325,9 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const 
CXXMethodDecl* methodDecl)
 }
 */
 auto bodyIt = compoundStmt->body_begin();
+if (bodyIt == compoundStmt->body_end()) {
+return true;
+}
 auto declStmt = dyn_cast(*bodyIt);
 if (!declStmt || !declStmt->isSingleDecl())
 return true;

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

2021-09-22 Thread Tor Lillqvist (via logerrit)

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

New commits:
commit c4739b1bd63585bd3b071196d4e6804762e81ff4
Author: Tor Lillqvist 
AuthorDate: Wed Sep 22 10:34:47 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 22 17:15:26 2021 +0200

Bump current iOS SDK version and drop the oldest ones

Grudgingly accept 14.0 as that is what the machine that builds for iOS
in Gerrit has.

Change-Id: I1eaebcbbe3f05b0e33efa4ca3fe79ced3d855114
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122420
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122430
Tested-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 9a5c637d8e8e..31bf6e85efac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3410,8 +3410,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=14.5
-older_sdk_vers="14.4 14.3 14.2 14.1 14.0 13.7"
+current_sdk_ver=15.0
+older_sdk_vers="14.5 14.0"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=12.2

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

2021-09-22 Thread Miklos Vajna (via logerrit)

 svx/source/svdraw/svdedxv.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 4cf51357b75c254e7962dd86140c69474fff129f
Author: Miklos Vajna 
AuthorDate: Wed Sep 22 15:56:06 2021 +0200
Commit: Miklos Vajna 
CommitDate: Wed Sep 22 16:47:47 2021 +0200

svx: improve SdrObjEditView::DisposeUndoManager()

Addresses the comment at

,
i.e. there can be the case when the undo manager is not an
sw::UndoManager (or any other high level undo manager), but it's an
EditUndoManager, and in that case we should not clear away the owning
pointer to avoid a memory leak.

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

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index d71c48027232..3a66fff6b2e2 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2737,7 +2737,11 @@ void SdrObjEditView::DisposeUndoManager()
 {
 if (pTextEditOutliner)
 {
-pTextEditOutliner->SetUndoManager(nullptr);
+if (typeid(pTextEditOutliner->GetUndoManager()) != 
typeid(EditUndoManager))
+{
+// Non-owning pointer, clear it.
+pTextEditOutliner->SetUndoManager(nullptr);
+}
 }
 
 mpOldTextEditUndoManager = nullptr;

Re: ESC meeting minutes: 2021-09-16

2021-09-22 Thread Miklos Vajna

Hi,

On Thu, Sep 16, 2021 at 04:32:44PM +0200, Miklos Vajna  
wrote:
> * ESC meeting on Saturday? (Xisco)
>   + not much interested (Stephan)
>   + do we expect extra attendees? (Miklos)
>  + probably who wants to attend an online call can do it anytime, the 
> conference one will not be in-person, either
>   + plan to cancel it if we don’t see benefit
>   + agree (Xisco)
> => skip it that week (all)

I'm still sending what would be the agenda for this week, so people
interested in most pressing bugs and other stats see it.

Regards,

Miklos



* Present:
+

* Completed Action Items:
+ None

* Pending Action Items:
+ None

* Release Engineering update (Cloph)
+ 7.2 status
+ 7.1 status
+ Remotes: Android, iOS
+ Android viewer

* Documentation (Olivier)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
257(257) (topicUI) bugs open, 149(149) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month3 months   12 months
 added  3(-2)10(-3) 35(-7)  85(-8)
 commented 28(-4)   198(-52)   718(-44)   3361(-154)
   removed  1(0)  3(-1) 10(1)   37(0)
  resolved  6(2) 29(-3)102(2)  496(-8)
+ top 10 contributors:
  Heiko Tietze made 162 changes in 1 month, and 2332 changes in 1 year
  Telesto made 36 changes in 1 month, and 672 changes in 1 year
  Foote, V Stuart made 25 changes in 1 month, and 600 changes in 1 year
  Roman Kuznetsov made 20 changes in 1 month, and 229 changes in 1 year
  Nabet, Julien made 18 changes in 1 month, and 54 changes in 1 year
  Timur made 13 changes in 1 month, and 120 changes in 1 year
  Kaganski, Mike made 9 changes in 1 month, and 183 changes in 1 year
  Henschel, Regina made 8 changes in 1 month, and 87 changes in 1 year
  Ross Johnson made 8 changes in 1 month, and 8 changes in 1 year
  Xisco Fauli made 8 changes in 1 month, and 184 changes in 1 year

* Crash Testing (Caolan)
+ 7(+0) import failure, 3(-1) export failures
+ ??? coverity issues
+ Google / ossfuzz: ?? fuzzers active now

* Crash Reporting (Xisco)
+ 7.2.0.2122(+7)
+ 7.2.0.370(+3)
+ 7.2.0.414347(+4432)
+ 7.2.1.2561(+0)

* Mentoring/EasyHack update (Hossein)
  committer...   1 week 1 month  3 months12 months
  open  79(13) 125(8)   181(14)  195(16)
   reviews 320(-62)   1360(-122)   3790(-28)7226(198)
merged 246(-24)   1273(-62)3811(-73)8617(243)
 abandoned   6(-7)  49(-8)  186(-16) 459(5)
   own commits 198(39)1039(19) 2993(36)12647(-75)
review commits  61(5)  351(-5) 1028(4)  4317(-14)
contributor...   1 week 1 month  3 months 12 months
  open  23(-15) 75(-12) 120(-6)   133(-4)
   reviews 712(-26)   3060(-142)   8728(-174)   19070(552)
merged  27(-1) 134(-11) 360(-17)  762(27)
 abandoned  19(17)  36(12)  111(18)   276(19)
   own commits  19(-4) 129(-18) 398(-20) 1971(8)
review commits   0(0)0(0) 0(0)  0(0)
+ easyHack statistics:
   needsDevEval 8(8)   needsUXEval 1(1)   cleanup_comments 277(277)
   total 331(331)   assigned 26(26)   open 278(278)
+ top 10 contributors:
  Johnny_M made 74 patches in 1 month, and 748 patches in 1 year
  Ross Johnson made 11 patches in 1 month, and 11 patches in 1 year
  Baran Aytas made 5 patches in 1 month, and 5 patches in 1 year
  Akshit Kushwaha made 4 patches in 1 month, and 23 patches in 1 year
  Dante DM made 3 patches in 1 month, and 126 patches in 1 year
  Attila Bakos made 3 patches in 1 month, and 36 patches in 1 year
  Ming Hua made 3 patches in 1 month, and 22 patches in 1 year
  4k5h1t made 3 patches in 1 month, and 3 patches in 1 year
  Nagy Tibor made 2 patches in 1 month, and 39 patches in 1 year
  Steve Fanning made 2 patches in 1 month, and 58 patches in 1 year
+ top 10 reviewers:
  Michael Stahl made 146 review comments in 1 month, and 580 in 1 year
  Kaganski, Mike made 126 review comments in 1 month, and 460 in 1 year
  Olivier Hallot made 124 review comments in 1 month, and 698 in 1 year
  Xisco Fauli made 110 review comments in 1 month, and 508 in 1 year
  Adolfo Jayme Barrientos made 98 review comments in 1 month, and 502 
in 1 year
  Vajna, Miklos made 64 review comments in 1 month, and 396 in 1 year
  Grandin, Noel made 60 review comments in 1 month, and 448 in 1 year
  Németh, László made 58 review comments in 1 month, and 340 in 1 year

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

2021-09-22 Thread Luboš Luňák (via logerrit)

 solenv/gbuild/platform/com_MSC_class.mk |   36 ++--
 1 file changed, 21 insertions(+), 15 deletions(-)

New commits:
commit 6507eddc2d760c8807633268558c47e8cb06
Author: Luboš Luňák 
AuthorDate: Wed Sep 22 12:28:37 2021 +
Commit: Luboš Luňák 
CommitDate: Wed Sep 22 15:33:07 2021 +0200

avoid some more D9025 warnings

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

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 3ea82e6c4936..ca6c60064897 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -47,10 +47,16 @@ endef
 
 # Avoid annoying warning D9025 about overriding command-line arguments.
 gb_Helper_remove_overridden_flags = \
+$(filter-out -W4 -w -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2 -Od -O2 
-Zc:inline -Zc:inline- \
+-Zc:dllexportInlines -Zc:dllexportInlines- -EHs -EHa -DNOMINMAX 
-UNOMINMAX -D_X86_=1 -U_X86_ \
+-D_AMD64_=1 -U_AMD64_,$(1)) \
 $(lastword $(filter -W4 -w,$(1))) \
-$(filter-out -W4 -w -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2 -Od -O2 
-Zc:inline -Zc:inline- -Zc:dllexportInlines -Zc:dllexportInlines-,$(1)) \
 $(lastword $(filter -Od -O2,$(1))) \
 $(lastword $(filter -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2,$(1))) \
+$(lastword $(filter -EHs -EHa,$(1))) \
+$(lastword $(filter -DNOMINMAX -UNOMINMAX,$(1))) \
+$(lastword $(filter -D_X86_=1 -U_X86_,$(1))) \
+$(lastword $(filter -D_AMD64_=1 -U_AMD64_,$(1))) \
 $(lastword $(filter -Zc:inline -Zc:inline-,$(1))) \
 $(lastword $(filter -Zc:dllexportInlines -Zc:dllexportInlines-,$(1)))
 
@@ -60,22 +66,22 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
unset INCLUDE && \
$(call gb_CObject__compiler,$(2),$(3),$(7)) \
-   $(DEFS) \
-   $(gb_LTOFLAGS) \
$(call gb_Helper_remove_overridden_flags, \
-   $(2) $(if 
$(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \
-   $(if $(EXTERNAL_CODE), \
-   $(if $(filter -clr,$(2)),,$(if 
$(COM_IS_CLANG),-Wno-undef)), \
-   $(gb_DEFS_INTERNAL)) \
-   $(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
-   $(if $(filter -clr,$(2)),,$(if $(5),$(gb_COMPILER_PLUGINS))) \
-   $(if $(COMPILER_TEST),-fsyntax-only -ferror-limit=0 -Xclang 
-verify) \
-   -Fd$(PDBFILE) \
-   $(PCHFLAGS) \
-   $(if $(COMPILER_TEST),,$(gb_COMPILERDEPFLAGS)) \
+   $(DEFS) \
+   $(gb_LTOFLAGS) \
+   $(2) $(if 
$(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS)) \
+   $(if $(EXTERNAL_CODE), \
+   $(if $(filter -clr,$(2)),,$(if 
$(COM_IS_CLANG),-Wno-undef)), \
+   $(gb_DEFS_INTERNAL)) \
+   $(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if 
$(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR))
 \
+   $(if $(filter -clr,$(2)),,$(if 
$(5),$(gb_COMPILER_PLUGINS))) \
+   $(if $(COMPILER_TEST),-fsyntax-only -ferror-limit=0 
-Xclang -verify) \
+   $(PCHFLAGS) \
+   $(if $(COMPILER_TEST),,$(gb_COMPILERDEPFLAGS)) \
+   $(if $(filter YES,$(LIBRARY_X64)), -U_X86_ -D_AMD64_,) \
+   $(if $(filter YES,$(PE_X86)), -D_X86_ -U_AMD64_,)) \
$(INCLUDE) \
-   $(if $(filter YES,$(LIBRARY_X64)), -U_X86_ -D_AMD64_,) \
-   $(if $(filter YES,$(PE_X86)), -D_X86_ -U_AMD64_,) \
+   -Fd$(PDBFILE) \
-c $(3) \
-Fo$(1)) $(if $(filter $(true),$(6)),/link /DEBUG:FASTLINK) \
$(if $(COMPILER_TEST),,$(call gb_create_deps,$(4),$(1),$(3)))

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

2021-09-22 Thread Noel Grandin (via logerrit)

 vcl/inc/graphic/Manager.hxx|4 ++--
 vcl/source/graphic/Manager.cxx |   23 ++-
 2 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 9df17d12a0e069d0a0db262368abc153b92169a0
Author: Noel Grandin 
AuthorDate: Wed Sep 22 12:29:15 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 22 14:57:36 2021 +0200

fix deadlock in vcl::GraphicManager

after
commit 300753bf1d4db7eff42d707f427180f0d1d1dffb
no need to use recursive_mutex in graphic::Manager

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

diff --git a/vcl/inc/graphic/Manager.hxx b/vcl/inc/graphic/Manager.hxx
index 60dc62ab184c..6324ff89a899 100644
--- a/vcl/inc/graphic/Manager.hxx
+++ b/vcl/inc/graphic/Manager.hxx
@@ -43,11 +43,12 @@ private:
 Manager();
 
 void registerGraphic(const std::shared_ptr& rImpGraphic);
-void loopGraphicsAndSwapOut();
+void loopGraphicsAndSwapOut(std::unique_lock& rGuard);
 
 DECL_LINK(SwapOutTimerHandler, Timer*, void);
 
 static sal_Int64 getGraphicSizeBytes(const ImpGraphic* pImpGraphic);
+void reduceGraphicMemory(std::unique_lock& rGuard);
 
 public:
 static Manager& get();
@@ -55,7 +56,6 @@ public:
 void swappedIn(const ImpGraphic* pImpGraphic, sal_Int64 nSizeBytes);
 void swappedOut(const ImpGraphic* pImpGraphic, sal_Int64 nSizeBytes);
 
-void reduceGraphicMemory();
 void changeExisting(const ImpGraphic* pImpGraphic, sal_Int64 nOldSize);
 void unregisterGraphic(ImpGraphic* pImpGraphic);
 
diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx
index 92293dc99db6..e637e16e1442 100644
--- a/vcl/source/graphic/Manager.cxx
+++ b/vcl/source/graphic/Manager.cxx
@@ -76,7 +76,7 @@ Manager::Manager()
 }
 }
 
-void Manager::loopGraphicsAndSwapOut()
+void Manager::loopGraphicsAndSwapOut(std::unique_lock& rGuard)
 {
 // make a copy of m_pImpGraphicList because if we swap out a svg, the svg
 // filter may create more temp Graphics which are auto-added to
@@ -102,28 +102,33 @@ void Manager::loopGraphicsAndSwapOut()
 auto aSeconds = 
std::chrono::duration_cast(aDeltaTime);
 
 if (aSeconds > mnAllowedIdleTime)
+{
+// unlock because svgio can call back into us
+rGuard.unlock();
 pEachImpGraphic->swapOut();
+rGuard.lock();
+}
 }
 }
 }
 }
 
-void Manager::reduceGraphicMemory()
+void Manager::reduceGraphicMemory(std::unique_lock& rGuard)
 {
+// maMutex is locked in callers
+
 if (!mbSwapEnabled)
 return;
 
 if (mnUsedSize < mnMemoryLimit)
 return;
 
-std::scoped_lock aGuard(maMutex);
-
 // avoid recursive reduceGraphicMemory on reexport of tdf118346-1.odg to 
odg
 if (mbReducingGraphicMemory)
 return;
 mbReducingGraphicMemory = true;
 
-loopGraphicsAndSwapOut();
+loopGraphicsAndSwapOut(rGuard);
 
 sal_Int64 calculatedSize = 0;
 for (ImpGraphic* pEachImpGraphic : m_pImpGraphicList)
@@ -151,20 +156,20 @@ sal_Int64 Manager::getGraphicSizeBytes(const ImpGraphic* 
pImpGraphic)
 
 IMPL_LINK(Manager, SwapOutTimerHandler, Timer*, pTimer, void)
 {
-std::scoped_lock aGuard(maMutex);
+std::unique_lock aGuard(maMutex);
 
 pTimer->Stop();
-reduceGraphicMemory();
+reduceGraphicMemory(aGuard);
 pTimer->Start();
 }
 
 void Manager::registerGraphic(const std::shared_ptr& pImpGraphic)
 {
-std::scoped_lock aGuard(maMutex);
+std::unique_lock aGuard(maMutex);
 
 // make some space first
 if (mnUsedSize > mnMemoryLimit)
-reduceGraphicMemory();
+reduceGraphicMemory(aGuard);
 
 // Insert and update the used size (bytes)
 mnUsedSize += getGraphicSizeBytes(pImpGraphic.get());

[Libreoffice-commits] core.git: helpcontent2

2021-09-22 Thread Rafael Lima (via logerrit)

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

New commits:
commit b25beb5c331ce1eb8cc6a4ba845d480e606f9345
Author: Rafael Lima 
AuthorDate: Wed Sep 22 14:41:19 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Sep 22 14:41:19 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 1d9db89cb1d9e2beb64672b55f200e24da405670
  - tdf#144559 Fix information about document encryption

Change-Id: Ibadf9946d144fc9573d6cbfa2f4abdc8d56721ba
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/122283
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 38c34032f737..1d9db89cb1d9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 38c34032f737213ec166b80793fb1230e657975d
+Subproject commit 1d9db89cb1d9e2beb64672b55f200e24da405670

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

2021-09-22 Thread Rafael Lima (via logerrit)

 source/text/shared/guide/protection.xhp  |   82 ++-
 source/text/swriter/guide/protection.xhp |2 
 2 files changed, 40 insertions(+), 44 deletions(-)

New commits:
commit 1d9db89cb1d9e2beb64672b55f200e24da405670
Author: Rafael Lima 
AuthorDate: Mon Sep 20 20:58:28 2021 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Sep 22 14:41:18 2021 +0200

tdf#144559 Fix information about document encryption

Change-Id: Ibadf9946d144fc9573d6cbfa2f4abdc8d56721ba
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/122283
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/guide/protection.xhp 
b/source/text/shared/guide/protection.xhp
index 42c7deee5..991172cfe 100644
--- a/source/text/shared/guide/protection.xhp
+++ b/source/text/shared/guide/protection.xhp
@@ -19,31 +19,30 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-
 
-  
- Protecting Content in 
%PRODUCTNAME
- /text/shared/guide/protection.xhp
-  
-   
-   
-protecting; contents
-  protected contents
-  contents protection
-  encryption of contents
-  passwords for protecting contents
-  security;protecting contents
-  form controls; protecting
-  draw objects;protecting
-  OLE objects;protecting
-  graphics;protecting
-  frames;protecting
-mw moved 4 index entries to 
swriter/guide/protection.xhp
-Protecting Content in %PRODUCTNAME
-
-  The 
following is an overview of the different ways of protecting contents in %PRODUCTNAME from being modified, deleted or 
viewed.
-  Protecting All Documents When Saving
-  All 
documents that are saved in OpenDocument format can be saved with a 
password. Documents that are saved with a password cannot be opened without the 
password. The content is secured so that it cannot be read with an external 
editor. This applies to content, graphics and OLE objects.
+  
+Protecting Content in %PRODUCTNAME
+/text/shared/guide/protection.xhp
+  
+
+
+  protecting; contents
+protected contents
+contents protection
+encryption of contents
+passwords for protecting contents
+security;protecting contents
+form controls; protecting
+draw objects;protecting
+OLE objects;protecting
+graphics;protecting
+frames;protecting
+  
+  Protecting Contents in %PRODUCTNAME
+
+  The 
following is an overview of the different ways of protecting contents in %PRODUCTNAME from being modified, deleted or 
viewed.
+  Protecting Documents With Passwords When Saving
+  All 
documents that are saved in OpenDocument format can be saved with a 
password. Documents that are saved with a password cannot be opened without the 
password. The content is secured so that it cannot be read with an external 
editor. This applies to content, graphics and OLE objects.
   
  
 
@@ -62,10 +61,9 @@
 
  
   
-
-  Information entered in File - Properties is not 
encrypted. This includes the name of the author, creation date, word and 
character counts.
-  Protecting Revision Marking
-  With 
every change made in %PRODUCTNAME Calc and 
%PRODUCTNAME Writer, the review function 
records who made the change. This function can be turned on with protection, so 
that it can only be turned off when the correct password is entered. Until 
then, all changes will continue to be recorded. Acceptance or rejection of 
changes is not possible.
+  It is possible to use OpenPGP to define 
private and public keys to be used to encrypt %PRODUCTNAME documents. Read 
 to learn more on how 
to set up OpenPGP encryption keys.
+  Protecting Revision Marking
+  With every 
change made in %PRODUCTNAME Calc and %PRODUCTNAME Writer, the review function records who 
made the change. This function can be turned on with protection, so that it can 
only be turned off when the correct password is entered. Until then, all 
changes will continue to be recorded. Acceptance or rejection of changes is not 
possible.
   
  
 
@@ -84,9 +82,8 @@
 
  
   
-MW moved contents of "Protecting Cell Ranges in Calc" to the Calc 
guides cell_protect.xhp and cell_unprotect.xhp.MW moved 
Writer specific contents to the new writer guide protection.xhp
-Protecting Frames, Graphics, and OLE Objects
-  You can 
protect the content, position and size of inserted graphics. The same applies 
to frames (in Writer) and OLE objects.
+  Protecting Frames, Graphics, and OLE Objects
+  You can 
protect the content, position and size of inserted graphics. The same applies 
to frames (in Writer) and OLE objects.
   
  
 
@@ -105,9 +102,8 @@
 
  
   
-
-  Protecting Drawing Objects and Form Objects
-  The draw 
objects that you insert into your documents with the Drawing 
toolbar can be protected from being accidentally mo

[Libreoffice-commits] core.git: dbaccess/CppunitTest_dbaccess_dialog_save.mk dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk dbaccess/CppunitTest_dbaccess_hsqlbinary_import.mk dbaccess/CppunitTest_

2021-09-22 Thread Caolán McNamara (via logerrit)

 dbaccess/CppunitTest_dbaccess_RowSetClones.mk  |3 ++-
 dbaccess/CppunitTest_dbaccess_dialog_save.mk   |3 ++-
 dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk |3 ++-
 dbaccess/CppunitTest_dbaccess_hsqlbinary_import.mk |3 ++-
 dbaccess/CppunitTest_dbaccess_hsqlschema_import.mk |3 ++-
 dbaccess/CppunitTest_dbaccess_macros_test.mk   |3 ++-
 dbaccess/CppunitTest_dbaccess_nolib_save.mk|3 ++-
 dbaccess/CppunitTest_dbaccess_tdf119625.mk |3 ++-
 dbaccess/CppunitTest_dbaccess_tdf126268.mk |3 ++-
 9 files changed, 18 insertions(+), 9 deletions(-)

New commits:
commit 1901cc1169660c50fc651c68861bdb022d931da4
Author: Caolán McNamara 
AuthorDate: Wed Sep 22 12:13:13 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 22 14:38:27 2021 +0200

don't link to vbahelper for --disable-scripting case

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

diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk 
b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
index ac11256d6bfd..1b67411fb4bd 100644
--- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
+++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
@@ -49,7 +49,8 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_RowSetClones, \
 ucbhelper \
unotest \
 utl \
-vbahelper \
+$(call gb_Helper_optional,SCRIPTING, \
+vbahelper) \
 vcl \
 xo \
 ))
diff --git a/dbaccess/CppunitTest_dbaccess_dialog_save.mk 
b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
index 408366ecb445..81adbc733a20 100644
--- a/dbaccess/CppunitTest_dbaccess_dialog_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
@@ -49,7 +49,8 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_dialog_save, \
 ucbhelper \
unotest \
 utl \
-vbahelper \
+$(call gb_Helper_optional,SCRIPTING, \
+vbahelper) \
 vcl \
 xo \
 ))
diff --git a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk 
b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
index 6d1e47df4a30..3a4b44479635 100644
--- a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
@@ -49,7 +49,8 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_empty_stdlib_save, \
 ucbhelper \
unotest \
 utl \
-vbahelper \
+$(call gb_Helper_optional,SCRIPTING, \
+vbahelper) \
 vcl \
 xo \
 ))
diff --git a/dbaccess/CppunitTest_dbaccess_hsqlbinary_import.mk 
b/dbaccess/CppunitTest_dbaccess_hsqlbinary_import.mk
index ee10da23df90..23ec9e1e4e1e 100644
--- a/dbaccess/CppunitTest_dbaccess_hsqlbinary_import.mk
+++ b/dbaccess/CppunitTest_dbaccess_hsqlbinary_import.mk
@@ -48,7 +48,8 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_hsql_binary_import, \
 ucbhelper \
unotest \
 utl \
-vbahelper \
+$(call gb_Helper_optional,SCRIPTING, \
+vbahelper) \
 vcl \
 xo \
 ))
diff --git a/dbaccess/CppunitTest_dbaccess_hsqlschema_import.mk 
b/dbaccess/CppunitTest_dbaccess_hsqlschema_import.mk
index 8c8d06698b38..7e131c81052f 100644
--- a/dbaccess/CppunitTest_dbaccess_hsqlschema_import.mk
+++ b/dbaccess/CppunitTest_dbaccess_hsqlschema_import.mk
@@ -46,7 +46,8 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_hsql_schema_import, \
ucbhelper \
unotest \
utl \
-   vbahelper \
+   $(call gb_Helper_optional,SCRIPTING, \
+   vbahelper) \
vcl \
xo \
 ))
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk 
b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 8d8672e882fe..248a5520c66c 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -49,7 +49,8 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_macros_test, \
 ucbhelper \
unotest \
 utl \
-vbahelper \
+$(call gb_Helper_optional,SCRIPTING, \
+vbahelper) \
 vcl \
 xo \
 ))
diff --git a/dbaccess/CppunitTest_dbaccess_nolib_save.mk 
b/dbaccess/CppunitTest_dbaccess_nolib_save.mk
index 1490c024aeb2..088dc92c4310 100644
--- a/dbaccess/CppunitTest_dbaccess_nolib_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_nolib_save.mk
@@ -49,7 +49,8 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_nolib_save, \
 ucbhelper \
unotest \
 utl \
-vbahelper \
+$(call gb_Helper_optional,SCRIPTING, \
+vbahelper) \
 vcl \
 xo \
 ))
diff --git a/dbaccess/CppunitTest_dbaccess_tdf119625.mk 
b/dbaccess/CppunitTest_dbaccess_tdf119625.mk
index b58aa973df52..b96ea797f27f 100644
--- a/dbaccess/CppunitTest_dbaccess_tdf119625.mk
+++ b/dbaccess/CppunitTest_dbaccess_tdf119625.mk
@@ -48,7 +48,8 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_tdf119625, \
 ucbhelper \
unotest \
 utl \
-vbahelper \
+$(call g

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

2021-09-22 Thread Tor Lillqvist (via logerrit)

 solenv/gbuild/platform/iOS.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a542f9f4f7d1cc4a499f260209c70f086322c26c
Author: Tor Lillqvist 
AuthorDate: Wed Sep 22 12:53:20 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 22 14:09:00 2021 +0200

Apparently we need to define gb_Library_PLAINEXT_FOR_BUILD for iOS

Helps a build for iOS proceed a bit further.

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

diff --git a/solenv/gbuild/platform/iOS.mk b/solenv/gbuild/platform/iOS.mk
index 0188d1cc94c2..95c5461409eb 100644
--- a/solenv/gbuild/platform/iOS.mk
+++ b/solenv/gbuild/platform/iOS.mk
@@ -142,6 +142,7 @@ gb_Library_DEFS :=
 gb_Library_SYSPRE := lib
 gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
 gb_Library_PLAINEXT := .a
+gb_Library_PLAINEXT_FOR_BUILD := .dylib
 gb_Library_DLLEXT := .a
 gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)

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

2021-09-22 Thread Tor Lillqvist (via logerrit)

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

New commits:
commit ed62bb177d72e6e83d0ae2091677d507492691e5
Author: Tor Lillqvist 
AuthorDate: Wed Sep 22 10:34:47 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 22 13:29:31 2021 +0200

Bump current iOS SDK version and drop the oldest ones

Grudgingly accept 14.0 as that is what the machine that builds for iOS
in Gerrit has.

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

diff --git a/configure.ac b/configure.ac
index cb40e781cff9..3545e71ed85e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3153,8 +3153,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=14.5
-older_sdk_vers="14.4 14.3 14.2 14.1 14.0 13.7 13.6 13.5 13.4 13.2 13.1 
13.0 12.4 12.2"
+current_sdk_ver=15.0
+older_sdk_vers="14.5 14.0"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=12.2

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

2021-09-22 Thread Caolán McNamara (via logerrit)

 filter/source/msfilter/svdfppt.cxx |   24 ++--
 1 file changed, 22 insertions(+), 2 deletions(-)

New commits:
commit 454d5f846a8c5b7e87aad6000555b3066c3b4bbf
Author: Caolán McNamara 
AuthorDate: Wed Sep 22 10:50:15 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 22 13:28:34 2021 +0200

ofz: MemorySanitizer: use-of-uninitialized-value

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

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 454cac8a0959..93b3f6bd4b33 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -3948,13 +3948,13 @@ void PPTParaSheet::Read( SdrPowerPointImport const &
 , sal_uInt32 nLevel, bool bFirst )
 {
 // paragraph attributes
-sal_uInt16  nVal16;
 sal_uInt32 nPMask(0);
 rIn.ReadUInt32(nPMask);
 
 sal_uInt16 nMask16 = static_cast(nPMask) & 0xf;
 if ( nMask16 )
 {
+sal_uInt16 nVal16(0);
 rIn.ReadUInt16( nVal16 );
 maParaLevel[ nLevel ].mnBuFlags &=~ nMask16;
 nVal16 &= nMask16;
@@ -3966,6 +3966,7 @@ void PPTParaSheet::Read( SdrPowerPointImport const &
 rIn.ReadUInt16( maParaLevel[ nLevel ].mnBulletFont );
 if ( nPMask & 0x0040 )
 {
+sal_uInt16 nVal16(0);
 rIn.ReadUInt16( nVal16 );
 maParaLevel[ nLevel ].mnBulletHeight = nVal16;
 }
@@ -3978,7 +3979,9 @@ void PPTParaSheet::Read( SdrPowerPointImport const &
 if ( bFirst )
 {
 if ( nPMask & 0xF00 )
-{   // AbsJust!
+{
+// AbsJust!
+sal_uInt16 nVal16(0);
 rIn.ReadUInt16( nVal16 );
 maParaLevel[ nLevel ].mnAdjust = nVal16 & 3;
 }
@@ -3996,6 +3999,7 @@ void PPTParaSheet::Read( SdrPowerPointImport const &
 rIn.ReadUInt16( maParaLevel[ nLevel ].mnDefaultTab );
 if ( nPMask & 0x20 )
 {
+sal_uInt16 nVal16;
 sal_uInt32 nVal32;
 // number of tabulators
 rIn.ReadUInt16( nVal16 );
@@ -4005,7 +4009,10 @@ void PPTParaSheet::Read( SdrPowerPointImport const &
 rIn.ReadUInt32( nVal32 );  // reading the tabulators
 }
 if ( nPMask & 0x4 )
+{
+sal_uInt16 nVal16;
 rIn.ReadUInt16( nVal16 );
+}
 if ( nPMask & 0x8 )
 rIn.ReadUInt16( maParaLevel[ nLevel ].mnAsianLineBreak );
 if ( nPMask & 0x10 )
@@ -4015,6 +4022,7 @@ void PPTParaSheet::Read( SdrPowerPointImport const &
 {
 if ( nPMask & 0x800 )
 {
+sal_uInt16 nVal16(0);
 rIn.ReadUInt16( nVal16 );
 maParaLevel[ nLevel ].mnAdjust = nVal16 & 3;
 }
@@ -4025,18 +4033,28 @@ void PPTParaSheet::Read( SdrPowerPointImport const &
 if ( nPMask & 0x4000 )
 rIn.ReadUInt16( maParaLevel[ nLevel ].mnLowerDist );
 if ( nPMask & 0x8000 )
+{
+sal_uInt16 nVal16;
 rIn.ReadUInt16( nVal16 );
+}
 if ( nPMask & 0x100 )
 rIn.ReadUInt16( maParaLevel[ nLevel ].mnTextOfs );
 if ( nPMask & 0x200 )
+{
+sal_uInt16 nVal16;
 rIn.ReadUInt16( nVal16 );
+}
 if ( nPMask & 0x400 )
 rIn.ReadUInt16( maParaLevel[ nLevel ].mnBulletOfs );
 if ( nPMask & 0x1 )
+{
+sal_uInt16 nVal16;
 rIn.ReadUInt16( nVal16 );
+}
 if ( nPMask & 0xe )
 {
 sal_uInt16 nFlagsToModifyMask = static_cast( ( nPMask 
>> 17 ) & 7 );
+sal_uInt16 nVal16(0);
 rIn.ReadUInt16( nVal16 );
 // bits that are not involved to zero
 nVal16 &= nFlagsToModifyMask;
@@ -4047,6 +4065,7 @@ void PPTParaSheet::Read( SdrPowerPointImport const &
 }
 if ( nPMask & 0x10 )
 {
+sal_uInt16 nVal16;
 sal_uInt32 nVal32;
 // number of tabulators
 rIn.ReadUInt16( nVal16 );
@@ -4070,6 +4089,7 @@ void PPTParaSheet::Read( SdrPowerPointImport const &
 OSL_FAIL( "PPTParaSheet::Read - unknown attribute, send me 
this document (SJ)" );
 }
 #endif
+sal_uInt16 nVal16;
 rIn.ReadUInt16( nVal16 );
 }
 nPMask >>= 1;

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

2021-09-22 Thread Caolán McNamara (via logerrit)

 extensions/source/update/check/updatecheck.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6a20b266a6e2cfc46f4fd03a4955199ed16b5bce
Author: Caolán McNamara 
AuthorDate: Wed Sep 22 10:59:55 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 22 13:27:08 2021 +0200

lock older -> lock order

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

diff --git a/extensions/source/update/check/updatecheck.cxx 
b/extensions/source/update/check/updatecheck.cxx
index 99aa5f624889..b9b64a4dfb9c 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -814,7 +814,7 @@ UpdateCheck::initialize(const uno::Sequence< 
beans::NamedValue >& rValues,
 bool downloadPaused = aModel.isDownloadPaused();
 
 enableDownload(true, downloadPaused);
-// coverity[lock_order : FALSE] - incorrect report of lock 
older error with std::recursive_mutex
+// coverity[lock_order : FALSE] - incorrect report of lock 
order error with std::recursive_mutex
 setUIState(downloadPaused ? UPDATESTATE_DOWNLOAD_PAUSED : 
UPDATESTATE_DOWNLOADING);
 }

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

2021-09-22 Thread Caolán McNamara (via logerrit)

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

New commits:
commit d993bb6e77d9e94abeb487a24084d34b6605f730
Author: Caolán McNamara 
AuthorDate: Wed Sep 22 10:39:25 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 22 13:26:10 2021 +0200

ofz: MemorySanitizer: use-of-uninitialized-value

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

diff --git a/vcl/source/filter/ipict/ipict.cxx 
b/vcl/source/filter/ipict/ipict.cxx
index 6f4eaf632ed3..f14f97c014ed 100644
--- a/vcl/source/filter/ipict/ipict.cxx
+++ b/vcl/source/filter/ipict/ipict.cxx
@@ -821,7 +821,7 @@ sal_uInt64 PictReader::ReadPixMapEtc( BitmapEx &rBitmap, 
bool bBaseAddr, bool bC
 // conditionally read region (or skip it):
 if ( bMaskRgn )
 {
-sal_uInt16 nSize;
+sal_uInt16 nSize(0);
 pPict->ReadUInt16( nSize );
 pPict->SeekRel( nSize - 2 );
 nDataSize += nSize;

[Libreoffice-commits] core.git: connectivity/Library_dbase.mk connectivity/Library_dbtools.mk

2021-09-22 Thread Caolán McNamara (via logerrit)

 connectivity/Library_dbase.mk   |2 --
 connectivity/Library_dbtools.mk |2 --
 2 files changed, 4 deletions(-)

New commits:
commit 4e4fffb037a99bd801f26e39eabd4d3d43771638
Author: Caolán McNamara 
AuthorDate: Wed Sep 22 10:21:09 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 22 13:24:56 2021 +0200

drop comments about disabling optimization

which are 10 years old

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

diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
index ff1d703e520a..1779b49cf21d 100644
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -58,6 +58,4 @@ $(eval $(call gb_Library_add_exception_objects,dbase,\
connectivity/source/drivers/dbase/DTable \
 ))
 
-#connectivity/source/drivers/dbase/DTable disable optimization?
-
 # vim: set noet sw=4 ts=4:
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 6869cd0bbc6b..1b9f444a9ab1 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_libraries,dbtools,\
 ))
 endif
 
-#connectivity/source/commontools/RowFunctionParser.cxx disable optimization?
-
 $(eval $(call gb_Library_add_exception_objects,dbtools,\
 ))

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

2021-09-22 Thread Julien Nabet (via logerrit)

 vcl/skia/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 876b58e7030b2a24eca5464bb172bdd0b45c8546
Author: Julien Nabet 
AuthorDate: Tue Sep 21 21:17:33 2021 +0200
Commit: Julien Nabet 
CommitDate: Wed Sep 22 13:04:19 2021 +0200

Fix Skia/Raster description

See https://bugs.documentfoundation.org/show_bug.cgi?id=144598#c16

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

diff --git a/vcl/skia/README b/vcl/skia/README
index 8381dd8dca89..f2903d97fdd7 100644
--- a/vcl/skia/README
+++ b/vcl/skia/README
@@ -13,7 +13,7 @@ Skia drawing methods:
 =
 
 Skia supports several methods to draw:
-- Raster - CPU-based drawing (here primarily used for debugging)
+- Raster - CPU-based drawing (here primarily used for fallback when Vulkan 
isn't available or for debugging)
 - Vulkan - Vulkan-based GPU drawing, this is the default
 - Metal - MACOSX GPU drawing, this is the Mac default

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

2021-09-22 Thread Noel Grandin (via logerrit)

 desktop/qa/desktop_lib/test_desktop_lib.cxx |2 
 sw/source/core/crsr/crsrsh.cxx  |   69 +---
 2 files changed, 34 insertions(+), 37 deletions(-)

New commits:
commit 2bb1290736ab7fe26e5670c732615c175b76ba3e
Author: Noel Grandin 
AuthorDate: Tue Aug 3 14:42:13 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Sep 22 12:54:35 2021 +0200

use tools::Json for cursor messages

and tweak the JsonWriter to produce output more like the boost propertytree,
to make the cypress tests happier.

Change-Id: Ia2062508ae9f14a5f89306042c33884ff300f478
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119936
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Noel Grandin 
(cherry picked from commit d46c7bd597e51453ac420db97fd898ed2f3b26bf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120433
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122127
Reviewed-by: Luboš Luňák 

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 4f0014f6e0ad..f63e8dd5ddca 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2014,7 +2014,7 @@ public:
 break;
 case LOK_CALLBACK_TABLE_SELECTED:
 {
-m_bEmptyTableSelection = (std::string(pPayload).compare("{\n}\n") 
== 0);
+m_bEmptyTableSelection = (std::string(pPayload).compare("{ }") == 
0);
 ++m_nTableSelectionCount;
 }
 break;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index bb2323240c20..ef4e669b5f36 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -73,8 +73,8 @@
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
 
 using namespace com::sun::star;
 using namespace util;
@@ -2054,69 +2054,66 @@ void SwCursorShell::sendLOKCursorUpdates()
 SwFrame* pCurrentFrame = GetCurrFrame();
 SelectionType eType = pShell->GetSelectionType();
 
-boost::property_tree::ptree aRootTree;
+tools::JsonWriter aJsonWriter;
 
 if (pCurrentFrame && (eType & SelectionType::Table) && 
pCurrentFrame->IsInTab())
 {
 const SwRect& rPageRect = pShell->GetAnyCurRect(CurRectType::Page, 
nullptr);
 
-boost::property_tree::ptree aTableColumns;
 {
+auto columnsNode = aJsonWriter.startNode("columns");
 SwTabCols aTabCols;
 pShell->GetTabCols(aTabCols);
 
 const int nColumnOffset = aTabCols.GetLeftMin() + rPageRect.Left();
 
-aTableColumns.put("left", aTabCols.GetLeft());
-aTableColumns.put("right", aTabCols.GetRight());
-aTableColumns.put("tableOffset", nColumnOffset);
+aJsonWriter.put("left", aTabCols.GetLeft());
+aJsonWriter.put("right", aTabCols.GetRight());
+aJsonWriter.put("tableOffset", 
static_cast(nColumnOffset));
 
-boost::property_tree::ptree aEntries;
-for (size_t i = 0; i < aTabCols.Count(); ++i)
 {
-auto const & rEntry = aTabCols.GetEntry(i);
-boost::property_tree::ptree aTableColumnEntry;
-aTableColumnEntry.put("position", rEntry.nPos);
-aTableColumnEntry.put("min", rEntry.nMin);
-aTableColumnEntry.put("max", rEntry.nMax);
-aTableColumnEntry.put("hidden", rEntry.bHidden);
-aEntries.push_back(std::make_pair("", aTableColumnEntry));
+auto entriesNode = aJsonWriter.startArray("entries");
+for (size_t i = 0; i < aTabCols.Count(); ++i)
+{
+auto entryNode = aJsonWriter.startStruct();
+auto const & rEntry = aTabCols.GetEntry(i);
+aJsonWriter.put("position", rEntry.nPos);
+aJsonWriter.put("min", rEntry.nMin);
+aJsonWriter.put("max", rEntry.nMax);
+aJsonWriter.put("hidden", rEntry.bHidden);
+}
 }
-aTableColumns.push_back(std::make_pair("entries", aEntries));
 }
 
-boost::property_tree::ptree aTableRows;
 {
+auto rowsNode = aJsonWriter.startNode("rows");
 SwTabCols aTabRows;
 pShell->GetTabRows(aTabRows);
 
 const int nRowOffset = aTabRows.GetLeftMin() + rPageRect.Top();
 
-aTableRows.put("left", aTabRows.GetLeft());
-aTableRows.put("right", aTabRows.GetRight());
-aTableRows.put("tableOffset", nRowOffset);
+aJsonWriter.put("left", aTabRows.GetLeft());
+aJsonWriter.put("right", aTabRows.GetRight());
+aJsonWriter.put("tableOffset", static_cast(nRowOffset));
 
-boost::property_tree::ptree aEntries;
-for (size_t i = 0; i < aTabRows.Count(); ++i)

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

2021-09-22 Thread Mike Kaganski (via logerrit)

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

New commits:
commit 657ec7ff6863ebc79dcea228898b619d43543a6c
Author: Mike Kaganski 
AuthorDate: Fri Aug 27 10:18:05 2021 +0300
Commit: Mike Kaganski 
CommitDate: Wed Sep 22 12:37:49 2021 +0200

tdf#137737: treat foot/endnote anchor as a "normal" (control) character

The anchor uses Unicode codepoint U+0001 (START OF HEADING) internally.
It was removed from start and end of the search string (but not from
the middle) previously, and only when the character appeared inside the
search range; before 0cd3b7926cafc01d06b589124215e9cb7c148f19, such
anchors outside of the range were ignored in TextSearch::searchForward.
The said change made search consider the data outside of the range for
context (e.g., look-ahead/behind assertions), and then the asymmetry of
removal when the range includes or excludes the character started to
affect the "replace after find" case, when initial find searches the
entire paragraph, and removes the anchor character, then finds '"$' and
selects the quote before the anchor; then replace uses the selection as
the range, does not remove the anchor, and it prevents the match.

This change excludes the anchor from the set of removed characters. Now
the foot/endnote anchors always stay in the string, and make the "find"
consistent with the following "replace" by preventing the match when
there's no [\p{Control}] (or [:control:]) in the regex explicitly for
the anchor. This allows for more flexibility in search, and makes it
more consistent in making this visible element participate in search.

The other elements that are still removed:
  RES_TXTATR_FLYCNT,
  RES_TXTATR_FIELD,
  RES_TXTATR_REFMARK,
  RES_TXTATR_TOXMARK,
  RES_TXTATR_META,
  RES_TXTATR_METAFIELD
need separate consideration. Some of them may be also excluded in
follow-up commits; the other need more correct removal (both when they
are inside and outside of the range; also in the middle) to create
consistent results when searching/replacing.

This change also makes sure that ReplaceBackReferences uses the same
special preprocessing that DoSearch uses.

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

diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index ccb3a650c86f..79405979143b 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -275,7 +275,6 @@ lcl_CleanStr(const SwTextNode& rNd,
 switch (pNextHint->Which())
 {
 case RES_TXTATR_FLYCNT:
-case RES_TXTATR_FTN:
 case RES_TXTATR_FIELD:
 case RES_TXTATR_REFMARK:
 case RES_TXTATR_TOXMARK:
@@ -1153,9 +1152,6 @@ std::optional ReplaceBackReferences(const 
i18nutil::SearchOptions2& rS
 }
 else
 {
-OUString const aStr(pLayout
-? pFrame->GetText()
-: pTextNode->GetTextNode()->GetText());
 AmbiguousIndex nStart;
 AmbiguousIndex nEnd;
 if (pLayout)
@@ -1168,6 +1164,9 @@ std::optional ReplaceBackReferences(const 
i18nutil::SearchOptions2& rS
 nStart.SetModelIndex(pPam->Start()->nContent.GetIndex());
 nEnd.SetModelIndex(pPam->End()->nContent.GetIndex());
 }
+std::vector aFltArr;
+OUString const aStr = lcl_CleanStr(*pTextNode->GetTextNode(), 
pFrame, pLayout,
+   nStart, nEnd, aFltArr, 
false, false);
 if (aSText.SearchForward(aStr, &nStart.GetAnyIndex(), 
&nEnd.GetAnyIndex(), &aResult))
 {
 aSText.ReplaceBackReferences( aReplaceStr, aStr, aResult );

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

2021-09-22 Thread Noel Grandin (via logerrit)

 drawinglayer/source/primitive2d/BufferedDecompositionPrimitive2D.cxx  |2 +-
 include/drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx |4 
++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 58418e9a85a007f550d9deb02729fc0c96cc1efd
Author: Noel Grandin 
AuthorDate: Wed Sep 22 09:43:33 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 22 12:30:15 2021 +0200

reduce copying in BufferedDecompositionPrimitive2D

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

diff --git 
a/drawinglayer/source/primitive2d/BufferedDecompositionPrimitive2D.cxx 
b/drawinglayer/source/primitive2d/BufferedDecompositionPrimitive2D.cxx
index 301d501e6e32..6846a3bcdd26 100644
--- a/drawinglayer/source/primitive2d/BufferedDecompositionPrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/BufferedDecompositionPrimitive2D.cxx
@@ -40,7 +40,7 @@ void BufferedDecompositionPrimitive2D::get2DDecomposition(
 Primitive2DContainer aNewSequence;
 create2DDecomposition(aNewSequence, rViewInformation);
 
const_cast(this)->setBuffered2DDecomposition(
-aNewSequence);
+std::move(aNewSequence));
 }
 
 rVisitor.append(getBuffered2DDecomposition());
diff --git 
a/include/drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx 
b/include/drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx
index 66bb9f29af24..c09635c6d60d 100644
--- a/include/drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx
+++ b/include/drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx
@@ -79,9 +79,9 @@ protected:
 {
 return maBuffered2DDecomposition;
 }
-void setBuffered2DDecomposition(const Primitive2DContainer& rNew)
+void setBuffered2DDecomposition(Primitive2DContainer&& rNew)
 {
-maBuffered2DDecomposition = rNew;
+maBuffered2DDecomposition = std::move(rNew);
 }
 
 /** method which is to be used to implement the local decomposition of a 
2D primitive. */

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

2021-09-22 Thread Attila Bakos (NISZ) (via logerrit)

 sd/qa/uitest/impress_tests/data/tdf127900.fodp |  778 +
 sd/qa/uitest/impress_tests/tdf127900.py|   46 +
 sd/source/ui/view/drawview.cxx |3 
 3 files changed, 826 insertions(+), 1 deletion(-)

New commits:
commit dbfb7940e4e6b0a1f136a6d109d0e6926617208f
Author: Attila Bakos (NISZ) 
AuthorDate: Tue Aug 24 16:48:07 2021 +0200
Commit: Xisco Fauli 
CommitDate: Wed Sep 22 10:45:49 2021 +0200

tdf#127900 sd: fix regression at applying master properties

Language settings of frames in slide master weren't applied
on the slides based on that master.

Regression since LO 6.3 by "tdf#126067 Fix slide scope
feature." (commit 40bb9ac690d979ef544d5aa759bd734a176912a0).

Co-developed-by: Dániel Arató (NISZ)

Change-Id: I559adbe00870ed8a3d2947fef8dae435a387e34a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120993
Tested-by: László Németh 
Reviewed-by: László Németh 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122397
Tested-by: Jenkins

diff --git a/sd/qa/uitest/impress_tests/data/tdf127900.fodp 
b/sd/qa/uitest/impress_tests/data/tdf127900.fodp
new file mode 100644
index ..adedafc2757a
--- /dev/null
+++ b/sd/qa/uitest/impress_tests/data/tdf127900.fodp
@@ -0,0 +1,778 @@
+
+
+http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/200
 4/writer" xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns
 :css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.presentation">
+ 
2021-08-30T08:55:10.39400LibreOffice/7.1.1.2$Windows_X86_64
 
LibreOffice_project/fe0b08f4af1bacafe4c7ecc87ce55bb4261646762021-08-30T08:56:29.11600PT7S1
+ 
+  
+   0
+   0
+   14099
+   
+   
+
+ view1
+ false
+ false
+ true
+ true
+ true
+ true
+ false
+ false
+ true
+ 1500
+ false
+ Hw==
+ Hw==
+ 
+ false
+ true
+ false
+ 0
+ 1
+ false
+ true
+ true
+ 4
+ 0
+ -974
+ -423
+ 28894
+ 17739
+ 2000
+ 2000
+ 500
+ 500
+ 2000
+ 4
+ 2000
+ 4
+ false
+ 1500
+ true
+ false
+
+   
+  
+  
+   true
+   $(inst)/share/palette%3B$(user)/config/standard.sob
+   0
+   $(inst)/share/palette%3B$(user)/config/standard.soc
+   $(inst)/share/palette%3B$(user)/config/standard.sod
+   1250
+   true
+   true
+   false
+   true
+   false
+   $(inst)/share/palette%3B$(user)/config/standard.sog
+   true
+   $(inst)/share/palette%3B$(user)/config/standard.soh
+   false
+   false
+   true
+   true
+   false
+   true
+   false
+   false
+   true
+   false
+   false
+   false
+   false
+   false
+   $(inst)/share/palette%3B$(user)/config/standard.soe
+   false
+   4
+   false
+   0
+   low-resolution
+   Microsoft Print to PDF
+   false
+   GRb+/01pY3Jvc29mdCBQcmludCB0byBQREY

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

2021-09-22 Thread Julien Nabet (via logerrit)

 sc/uiconfig/scalc/ui/standardfilterdialog.ui |8 
 1 file changed, 8 insertions(+)

New commits:
commit 41ccb5c63c94e54b07707eca62bed761c87b0d10
Author: Julien Nabet 
AuthorDate: Tue Sep 21 22:31:36 2021 +0200
Commit: Caolán McNamara 
CommitDate: Wed Sep 22 10:08:33 2021 +0200

tdf#144618: fix Standard Filter Dialog with gtk3

See bts here:
- https://bugs.documentfoundation.org/attachment.cgi?id=175150
- https://bugs.documentfoundation.org/attachment.cgi?id=175151

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

diff --git a/sc/uiconfig/scalc/ui/standardfilterdialog.ui 
b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
index e36a8780d6a1..df8bc2771065 100644
--- a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
@@ -656,6 +656,8 @@
 False
 True
 liststore2
+0
+1
 
   
   
@@ -722,6 +724,8 @@
 False
 False
 liststore1
+0
+1
 
   
   
@@ -788,6 +792,8 @@
 False
 True
 liststore3
+0
+1
 
   
   
@@ -854,6 +860,8 @@
 False
 True
 liststore4
+0
+1

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

2021-09-22 Thread Tor Lillqvist (via logerrit)

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

New commits:
commit 355072f973e57c6e6ebdbcc906aefe260237694c
Author: Tor Lillqvist 
AuthorDate: Wed Sep 22 10:36:23 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 22 10:01:29 2021 +0200

Bump minimum iOS version to 13.7

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

diff --git a/configure.ac b/configure.ac
index 01c13baacdce..32267249702b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3531,10 +3531,10 @@ if test $_os = iOS; then
 older_sdk_vers="14.5"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
-versionmin=-mios-simulator-version-min=12.2
+versionmin=-mios-simulator-version-min=13.7
 else
 platform=iPhoneOS
-versionmin=-miphoneos-version-min=12.2
+versionmin=-miphoneos-version-min=13.7
 fi
 xcode_developer=`xcode-select -print-path`

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

2021-09-22 Thread Tor Lillqvist (via logerrit)

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

New commits:
commit 1e194b878545e3a016ec7adaf9ebfc2aa86eb48e
Author: Tor Lillqvist 
AuthorDate: Wed Sep 22 10:34:47 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 22 10:00:16 2021 +0200

Bump current iOS SDK version and drop older ones

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

diff --git a/configure.ac b/configure.ac
index 643d2f95281d..01c13baacdce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3527,8 +3527,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=14.5
-older_sdk_vers="14.4 14.3 14.2 14.1 14.0 13.7"
+current_sdk_ver=15.0
+older_sdk_vers="14.5"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=12.2

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

2021-09-22 Thread Caolán McNamara (via logerrit)

 sc/source/ui/docshell/docsh.cxx |   42 
 sc/source/ui/inc/docsh.hxx  |4 +++
 vcl/workben/fftester.cxx|   10 +
 3 files changed, 56 insertions(+)

New commits:
commit 7f5af8272d8b10bf56b82cbe9d898e8ed0a347ca
Author: Caolán McNamara 
AuthorDate: Tue Sep 21 20:51:51 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 22 09:57:41 2021 +0200

add a TestImportDBF

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

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index d6bb0d9f5f6f..baf0903ca855 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -121,6 +121,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -3404,4 +3405,45 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool 
TestImportSLK(SvStream &rStream)
 return aImpEx.ImportStream(rStream, OUString(), 
SotClipboardFormatId::SYLK);
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportDBF(SvStream &rStream)
+{
+ScDLL::Init();
+
+utl::TempFile aTempInput;
+aTempInput.EnableKillingFile();
+
+// need a real file for this filter
+SvStream* pInputStream = aTempInput.GetStream(StreamMode::WRITE);
+sal_uInt8 aBuffer[8192];
+while (auto nRead = rStream.ReadBytes(aBuffer, SAL_N_ELEMENTS(aBuffer)))
+pInputStream->WriteBytes(aBuffer, nRead);
+aTempInput.CloseStream();
+
+SfxMedium aMedium(aTempInput.GetURL(), StreamMode::STD_READWRITE);
+
+ScDocShellRef xDocShell = new ScDocShell(SfxModelFlags::EMBEDDED_OBJECT |
+ 
SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS |
+ 
SfxModelFlags::DISABLE_DOCUMENT_RECOVERY);
+
+xDocShell->DoInitNew();
+
+ScDocument& rDoc = xDocShell->GetDocument();
+
+ScDocOptions aDocOpt = rDoc.GetDocOptions();
+aDocOpt.SetLookUpColRowNames(false);
+rDoc.SetDocOptions(aDocOpt);
+rDoc.MakeTable(0);
+rDoc.EnableExecuteLink(false);
+rDoc.SetInsertingFromOtherDoc(true);
+
+ScDocRowHeightUpdater::TabRanges aRecalcRanges(0, rDoc.MaxRow());
+std::map aColWidthParam;
+ErrCode eError = xDocShell->DBaseImport(aMedium.GetPhysicalName(), 
RTL_TEXTENCODING_IBM_850, aColWidthParam, aRecalcRanges.maRanges);
+
+xDocShell->DoClose();
+xDocShell.clear();
+
+return eError == ERRCODE_NONE;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 8c353d0087c7..635db201ac97 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -70,6 +70,8 @@ typedef std::unordered_map< sal_uLong, sal_uLong > 
ScChangeActionMergeMap;
 
 enum class LOKCommentNotificationType { Add, Modify, Remove };
 
+extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportDBF(SvStream &rStream);
+
 // Extra flags for Repaint
 #define SC_PF_LINES 1
 #define SC_PF_TESTMERGE 2
@@ -133,6 +135,8 @@ class SC_DLLPUBLIC ScDocShell final: public SfxObjectShell, 
public SfxListener
 SAL_DLLPRIVATE bool  SaveXML( SfxMedium* pMedium, const 
css::uno::Reference< css::embed::XStorage >& );
 SAL_DLLPRIVATE SCTAB GetSaveTab();
 
+friend bool TestImportDBF(SvStream &rStream);
+
 SAL_DLLPRIVATE ErrCode   DBaseImport( const OUString& rFullFileName, 
rtl_TextEncoding eCharSet,
  std::map& 
aColWidthParam, ScFlatBoolRowSegments& rRowHeightsRecalc );
 SAL_DLLPRIVATE ErrCode   DBaseExport(
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index 4359452f39ac..f700b0660f0f 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -444,6 +444,16 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 SvFileStream aFileStream(out, StreamMode::READ);
 ret = static_cast((*pfnImport)(aFileStream));
 }
+else if (strcmp(argv[2], "dbf") == 0)
+{
+static FFilterCall pfnImport(nullptr);
+if (!pfnImport)
+{
+pfnImport = load(u"libsclo.so", "TestImportDBF");
+}
+SvFileStream aFileStream(out, StreamMode::READ);
+ret = static_cast((*pfnImport)(aFileStream));
+}
 else if (strcmp(argv[2], "dif") == 0)
 {
 static FFilterCall pfnImport(nullptr);

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

2021-09-22 Thread Dennis Francis (via logerrit)

 desktop/qa/data/table-selection.odt |binary
 desktop/qa/desktop_lib/test_desktop_lib.cxx |  121 
 2 files changed, 121 insertions(+)

New commits:
commit ba0851926a9def7577dcf7b29919de0632ac31a9
Author: Dennis Francis 
AuthorDate: Mon Jun 28 13:32:48 2021 +0530
Commit: Dennis Francis 
CommitDate: Wed Sep 22 09:12:53 2021 +0200

lok-desktop: unit tests for LOK_CALLBACK_TABLE_SELECTED

Conflicts:
desktop/qa/desktop_lib/test_desktop_lib.cxx

Change-Id: I4e07ffc6f8eebbbee284d19cd9c77df13dddff3a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118945
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 
(cherry picked from commit 56795f50abad3de960f23e85b2ccfa1ba0181370)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122415
Tested-by: Jenkins

diff --git a/desktop/qa/data/table-selection.odt 
b/desktop/qa/data/table-selection.odt
new file mode 100644
index ..c19f8c79fc3a
Binary files /dev/null and b/desktop/qa/data/table-selection.odt differ
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index c593eca12562..680e48228d10 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -209,6 +209,8 @@ public:
 void testJumpCursor();
 void testRenderSearchResult_WriterNode();
 void testRenderSearchResult_CommonNode();
+void testNoDuplicateTableSelection();
+void testMultiViewTableSelection();
 void testABI();
 
 CPPUNIT_TEST_SUITE(DesktopLOKTest);
@@ -274,6 +276,8 @@ public:
 CPPUNIT_TEST(testJumpCursor);
 CPPUNIT_TEST(testRenderSearchResult_WriterNode);
 CPPUNIT_TEST(testRenderSearchResult_CommonNode);
+CPPUNIT_TEST(testNoDuplicateTableSelection);
+CPPUNIT_TEST(testMultiViewTableSelection);
 CPPUNIT_TEST(testABI);
 CPPUNIT_TEST_SUITE_END();
 
@@ -1953,6 +1957,8 @@ class ViewCallback
 int mnView;
 public:
 OString m_aCellFormula;
+int m_nTableSelectionCount;
+bool m_bEmptyTableSelection;
 bool m_bTilesInvalidated;
 bool m_bZeroCursor;
 tools::Rectangle m_aOwnCursor;
@@ -1962,6 +1968,8 @@ public:
 
 ViewCallback(LibLODocument_Impl* pDocument)
 : mpDocument(pDocument),
+  m_nTableSelectionCount(0),
+  m_bEmptyTableSelection(false),
   m_bTilesInvalidated(false),
   m_bZeroCursor(false)
 {
@@ -2029,6 +2037,12 @@ public:
 m_aCellFormula = aPayload;
 }
 break;
+case LOK_CALLBACK_TABLE_SELECTED:
+{
+m_bEmptyTableSelection = (std::string(pPayload).compare("{ }") == 
0);
+++m_nTableSelectionCount;
+}
+break;
 }
 }
 };
@@ -3199,6 +3213,113 @@ void DesktopLOKTest::testRenderSearchResult_CommonNode()
 std::free(pBuffer);
 }
 
+static void lcl_repeatKeyStroke(LibLODocument_Impl *pDocument, int nCharCode, 
int nKeyCode, size_t nCount)
+{
+for (size_t nCtr = 0; nCtr < nCount; ++nCtr)
+{
+pDocument->m_pDocumentClass->postKeyEvent(pDocument, 
LOK_KEYEVENT_KEYINPUT, nCharCode, nKeyCode);
+pDocument->m_pDocumentClass->postKeyEvent(pDocument, 
LOK_KEYEVENT_KEYUP, nCharCode, nKeyCode);
+}
+}
+
+void DesktopLOKTest::testNoDuplicateTableSelection()
+{
+comphelper::LibreOfficeKit::setActive();
+LibLODocument_Impl* pDocument = loadDoc("table-selection.odt");
+
+// Create view 1.
+pDocument->m_pDocumentClass->initializeForRendering(pDocument, "{}");
+ViewCallback aView1(pDocument);
+
+lcl_repeatKeyStroke(pDocument, 0, KEY_DOWN, 1);
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(1, aView1.m_nTableSelectionCount);
+CPPUNIT_ASSERT(aView1.m_bEmptyTableSelection);
+
+aView1.m_nTableSelectionCount = 0;
+// Go to Table1.
+lcl_repeatKeyStroke(pDocument, 0, KEY_DOWN, 1);
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(1, aView1.m_nTableSelectionCount);
+CPPUNIT_ASSERT(!aView1.m_bEmptyTableSelection);
+
+aView1.m_nTableSelectionCount = 0;
+// Move to the last row in Table1.
+lcl_repeatKeyStroke(pDocument, 0, KEY_DOWN, 2);
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(0, aView1.m_nTableSelectionCount);
+
+// Go outside Table1.
+lcl_repeatKeyStroke(pDocument, 0, KEY_DOWN, 1);
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(1, aView1.m_nTableSelectionCount);
+CPPUNIT_ASSERT(aView1.m_bEmptyTableSelection);
+}
+
+void DesktopLOKTest::testMultiViewTableSelection()
+{
+comphelper::LibreOfficeKit::setActive();
+LibLODocument_Impl* pDocument = loadDoc("table-selection.odt");
+
+// Create view 1.
+pDocument->m_pDocumentClass->initializeForRendering(pDocument, "{}");
+ViewCallback aView1(pDocument);
+int nView1 = pDocument->m_pDocumentClass->getView(pDocument);
+
+// Create view 2.
+pDocument->m_pDocumen

Re: Where have markers to be drawn in custom-shapes?

2021-09-22 Thread Miklos Vajna

Hi Regina,

On Tue, Sep 21, 2021 at 02:59:37PM +0200, Regina Henschel 
 wrote:
> In regard to "compatibility": MS Office behaves already different on
> ODF-files than LibreOffice, whereby I think, that MS Office is neither a
> role model as it has inconsistencies too.

Sure, checking what LO and MSO already does and deciding that behavior
is not wanted is fair enough. Baking something into ODF without even
considering the status quo is less wise, I would say. :-)

Regards,

Miklos

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

2021-09-22 Thread Noel Grandin (via logerrit)

 sw/source/filter/ascii/parasc.cxx |   46 ++---
 sw/source/filter/html/htmlatr.cxx |   82 +++---
 sw/source/filter/html/wrthtml.hxx |3 -
 sw/source/filter/xml/xmlfmt.cxx   |   34 +++
 4 files changed, 83 insertions(+), 82 deletions(-)

New commits:
commit 8dda0309871b371e056c0c0f308203e2a8a0306f
Author: Noel Grandin 
AuthorDate: Tue Sep 21 20:33:22 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 22 09:07:44 2021 +0200

no need to allocate these SfxItemSet on the heap

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

diff --git a/sw/source/filter/ascii/parasc.cxx 
b/sw/source/filter/ascii/parasc.cxx
index 23bc58230f62..e57a03557637 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -56,7 +56,7 @@ class SwASCIIParser
 std::unique_ptr m_pArr;
 const SwAsciiOptions& m_rOpt;
 SwAsciiOptions m_usedAsciiOptions;
-std::unique_ptr m_pItemSet;
+std::optional m_oItemSet;
 tools::Long m_nFileSize;
 SvtScriptType m_nScript;
 bool m_bNewDoc;
@@ -115,7 +115,7 @@ SwASCIIParser::SwASCIIParser(SwDoc& rD, const SwPaM& 
rCursor, SvStream& rIn, boo
 m_pPam.reset(new SwPaM(*rCursor.GetPoint()));
 m_pArr.reset(new char[ASC_BUFFLEN + 2]);
 
-m_pItemSet = std::make_unique(
+m_oItemSet.emplace(
 m_rDoc.GetAttrPool(),
 svl::Items);
@@ -124,11 +124,11 @@ SwASCIIParser::SwASCIIParser(SwDoc& rD, const SwPaM& 
rCursor, SvStream& rIn, boo
 if (m_rOpt.GetLanguage())
 {
 SvxLanguageItem aLang(m_rOpt.GetLanguage(), RES_CHRATR_LANGUAGE);
-m_pItemSet->Put(aLang);
+m_oItemSet->Put(aLang);
 aLang.SetWhich(RES_CHRATR_CJK_LANGUAGE);
-m_pItemSet->Put(aLang);
+m_oItemSet->Put(aLang);
 aLang.SetWhich(RES_CHRATR_CTL_LANGUAGE);
-m_pItemSet->Put(aLang);
+m_oItemSet->Put(aLang);
 }
 if (m_rOpt.GetFontName().isEmpty())
 return;
@@ -138,11 +138,11 @@ SwASCIIParser::SwASCIIParser(SwDoc& rD, const SwPaM& 
rCursor, SvStream& rIn, boo
 aTextFont = 
m_rDoc.getIDocumentDeviceAccess().getPrinter(false)->GetFontMetric(aTextFont);
 SvxFontItem aFont( aTextFont.GetFamilyType(), aTextFont.GetFamilyName(),
OUString(), aTextFont.GetPitch(), 
aTextFont.GetCharSet(), RES_CHRATR_FONT );
-m_pItemSet->Put(aFont);
+m_oItemSet->Put(aFont);
 aFont.SetWhich(RES_CHRATR_CJK_FONT);
-m_pItemSet->Put(aFont);
+m_oItemSet->Put(aFont);
 aFont.SetWhich(RES_CHRATR_CTL_FONT);
-m_pItemSet->Put(aFont);
+m_oItemSet->Put(aFont);
 }
 
 // Calling the parser
@@ -179,25 +179,25 @@ ErrCode SwASCIIParser::CallParser()
 
 ErrCode nError = ReadChars();
 
-if (m_pItemSet)
+if (m_oItemSet)
 {
 // set only the attribute, for scanned scripts.
 if (!(SvtScriptType::LATIN & m_nScript))
 {
-m_pItemSet->ClearItem(RES_CHRATR_FONT);
-m_pItemSet->ClearItem(RES_CHRATR_LANGUAGE);
+m_oItemSet->ClearItem(RES_CHRATR_FONT);
+m_oItemSet->ClearItem(RES_CHRATR_LANGUAGE);
 }
 if (!(SvtScriptType::ASIAN & m_nScript))
 {
-m_pItemSet->ClearItem(RES_CHRATR_CJK_FONT);
-m_pItemSet->ClearItem(RES_CHRATR_CJK_LANGUAGE);
+m_oItemSet->ClearItem(RES_CHRATR_CJK_FONT);
+m_oItemSet->ClearItem(RES_CHRATR_CJK_LANGUAGE);
 }
 if (!(SvtScriptType::COMPLEX & m_nScript))
 {
-m_pItemSet->ClearItem(RES_CHRATR_CTL_FONT);
-m_pItemSet->ClearItem(RES_CHRATR_CTL_LANGUAGE);
+m_oItemSet->ClearItem(RES_CHRATR_CTL_FONT);
+m_oItemSet->ClearItem(RES_CHRATR_CTL_LANGUAGE);
 }
-if (m_pItemSet->Count())
+if (m_oItemSet->Count())
 {
 if (m_bNewDoc)
 {
@@ -224,16 +224,16 @@ ErrCode SwASCIIParser::CallParser()
 {
 const SfxPoolItem *pItem;
 if (SfxItemState::SET
-== m_pItemSet->GetItemState(*pWhichIds, false, 
&pItem))
+== m_oItemSet->GetItemState(*pWhichIds, false, 
&pItem))
 {
 pColl->SetFormatAttr( *pItem );
-m_pItemSet->ClearItem(*pWhichIds);
+m_oItemSet->ClearItem(*pWhichIds);
 }
 ++pWhichIds;
 }
 }
-if (m_pItemSet->Count())
-m_rDoc.SetDefault(*m_pItemSet);
+if (m_oItemSet->Count())
+m_rDoc.SetDefault(*m_oItemSet);
 }
 else if( pInsPam )
 {
@@ -245,10 +245,10 @@ ErrCode SwASCIIParser::Ca

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

2021-09-22 Thread Adolfo Jayme Barrientos (via logerrit)

 include/sfx2/strings.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 743057da7a20d9eebad939f2baecb1e225920b56
Author: Adolfo Jayme Barrientos 
AuthorDate: Wed Sep 22 02:01:36 2021 -0500
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Sep 22 02:01:36 2021 -0500

Improve UX writing on Start Center

Good UX writing shouldn’t try too much to explain an UI,
and directional language like “from the left side” doesn’t
make sense for users of RTL languages or screen readers.

Change-Id: Ibc5b6982d4686248de09ec1b2ad2a94b9b012f67

diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index d5ac65484663..4b95c8505d87 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -181,7 +181,7 @@
 #define STR_FILTER_CONSULT_SERVICE  
NC_("STR_FILTER_CONSULT_SERVICE", "The selected filter $(FILTER) is not 
included in your edition.\nYou can find information about orders on our 
homepage.")
 
 #define STR_WELCOME_LINE1   NC_("STR_WELCOME_LINE1", 
"Welcome to %PRODUCTNAME.")
-#define STR_WELCOME_LINE2   NC_("STR_WELCOME_LINE2", "Drop 
a document here or pick an app from the left side to create one.")
+#define STR_WELCOME_LINE2   NC_("STR_WELCOME_LINE2", "Drop 
a document here or open an app to create one.")
 
 // Translators: Target types in Auto-redaction dialog
 #define STR_REDACTION_TARGET_TYPE_TEXT  
NC_("STR_REDACTION_TARGET_TYPE_TEXT", "Text")

70 matches

Mail list logo