[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit a90fdbb53c7a16ce87fa4176ef6301fe06758292
Author: Christian Lohmaier 
AuthorDate: Sat Jul 2 19:30:06 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Sat Jul 2 19:30:06 2022 +0200

Update git submodules

* Update translations from branch 'distro/collabora/co-22.05'
  to f9bd9ed1749294bfb0113bbf05645e788918e9b7
  - update translations for 7.3.5 rc1

and force-fix errors using pocheck

Change-Id: I6b8f0f326c1ef1f3804409057e3081bf2b2caaa0

diff --git a/translations b/translations
index 178d01d84358..f9bd9ed17492 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 178d01d84358992a53f6e2d5aed3462ad89fd23a
+Subproject commit f9bd9ed1749294bfb0113bbf05645e788918e9b7

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

[Chris Sherlock (via logerrit)]

 store/source/lockbyte.hxx |5 +
 store/source/object.hxx   |5 +
 store/source/storbase.hxx |5 +
 store/source/stortree.hxx |5 +
 4 files changed, 4 insertions(+), 16 deletions(-)

New commits:
commit c28455b899fa7e9d88f843cd59663aa522a28a33
Author: Chris Sherlock 
AuthorDate: Sun Jan 9 06:29:09 2022 +1100
Commit: Julien Nabet 
CommitDate: Sun Jul 3 09:13:11 2022 +0200

tdf#143148 store: Use pragma once instead of include guards

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

diff --git a/store/source/lockbyte.hxx b/store/source/lockbyte.hxx
index 04634328a922..41c6145f1674 100644
--- a/store/source/lockbyte.hxx
+++ b/store/source/lockbyte.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_STORE_SOURCE_LOCKBYTE_HXX
-#define INCLUDED_STORE_SOURCE_LOCKBYTE_HXX
+#pragma once
 
 #include 
 
@@ -152,6 +151,4 @@ storeError MemoryLockBytes_createInstance (
 
 } // namespace store
 
-#endif // INCLUDED_STORE_SOURCE_LOCKBYTE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/object.hxx b/store/source/object.hxx
index b450d7446ff4..c68f9b8f8a11 100644
--- a/store/source/object.hxx
+++ b/store/source/object.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_STORE_SOURCE_OBJECT_HXX
-#define INCLUDED_STORE_SOURCE_OBJECT_HXX
+#pragma once
 
 #include 
 #include 
@@ -52,6 +51,4 @@ store_handle_type* SAL_CALL query(OStoreObject* pHandle, 
store_handle_type*);
 
 } // namespace store
 
-#endif // INCLUDED_STORE_SOURCE_OBJECT_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index 20f6f3245638..4963ee2ddcfb 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_STORE_SOURCE_STORBASE_HXX
-#define INCLUDED_STORE_SOURCE_STORBASE_HXX
+#pragma once
 
 #include 
 #include 
@@ -605,6 +604,4 @@ inline sal_uInt32 OStorePageObject::location() const
 
 } // namespace store
 
-#endif // INCLUDED_STORE_SOURCE_STORBASE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx
index 9eeb8dfcae4e..609d1d1ba8d3 100644
--- a/store/source/stortree.hxx
+++ b/store/source/stortree.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_STORE_SOURCE_STORTREE_HXX
-#define INCLUDED_STORE_SOURCE_STORTREE_HXX
+#pragma once
 
 #include 
 
@@ -246,6 +245,4 @@ private:
 
 } // namespace store
 
-#endif // INCLUDED_STORE_SOURCE_STORTREE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

Week 3 - update

[Hannah Meeks]

Hi,

This week I:

- resolved previous issued & pushed my changes for getValue2 and mutex
commits

- wrote macro tests on word to test for the .Find object

- tests didn’t work on writer, new find objects were being created and
destroyed each time .Find was called losing the properties.

^^ (filed a bug report for this) -
https://bugs.documentfoundation.org/show_bug.cgi?id=149775

- tried anchoring the find object to the selection which also was
continually created and destroyed

- made this a global like in word, now some tests work

- https://gerrit.libreoffice.org/c/core/+/136630

- set up a better editor - gedit to vscode

- started looking at XParagraphFormat and writing macro tests for this
exploring some methods and starting to try and add them to LibreOffice


Next week I want to set up more automated tests for writer vba and make
sure they pass

Hannah

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

[Martin Srebotnjak (via logerrit)]

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

New commits:
commit 941f6ff09f0bd4c501dfc69efc96ec462371a454
Author: Martin Srebotnjak 
AuthorDate: Sun Jul 3 12:38:37 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 3 12:38:37 2022 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-4'
  to 781f4d2dc9caf63bd695f770792174b6f74d2fe5
  - Updated Slovenian translation

Change-Id: I7167421ef0e14942ad3ed5288286af5937aa3b16

diff --git a/translations b/translations
index 984bc1116845..781f4d2dc9ca 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 984bc1116845bd13606b8d0956120f10a6e19eaa
+Subproject commit 781f4d2dc9caf63bd695f770792174b6f74d2fe5

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sfx2/source

[Christian Lohmaier (via logerrit)]

 sfx2/source/appl/sfxhelp.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 0db0e229fd2696ce9410576bdd2ba2e98cf4673d
Author: Christian Lohmaier 
AuthorDate: Thu Jun 30 22:23:30 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jul 3 11:18:28 2022 +0200

tdf#149603 macOS: fix workaround to use web help if Safari is the default 
browser

Safari won't access the local helpfiles from LO's app folder unless you
enable Safari's webdeveloper menu. The workaround broke since
f31f0038f5fd9254584a06665066faf9715d1cd8 switched from window to widget
references and hence using a different codepath, skipping the workaround
added in 44893662d510c4173e55ba27af02d0258a697a5d

Change-Id: I0c59066fe1cef1514c6595e0439d31d3e60e02f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136685
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 184a45c4176d96bf799a8f8a0fba290a8c851948)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136705
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 4aa13c6f2c64..d11c99b30b12 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -1281,6 +1281,22 @@ bool SfxHelp::Start_Impl(const OUString& rURL, 
weld::Widget* pWidget, const OUSt
 impl_showOnlineHelp(aHelpURL, pWidget);
 return true;
 }
+#ifdef MACOSX
+if (@available(macOS 10.14, *)) {
+// Workaround: Safari sandboxing prevents it from accessing files in 
the LibreOffice.app folder
+// force online-help instead if Safari is default browser.
+CFURLRef pBrowser = LSCopyDefaultApplicationURLForURL(
+CFURLCreateWithString(
+kCFAllocatorDefault,
+
static_cast(@"https://www.libreoffice.org";),
+nullptr),
+kLSRolesAll, nullptr);
+if([static_cast(CFURLGetString(pBrowser)) 
isEqualToString:@"file:///Applications/Safari.app/"]) {
+impl_showOnlineHelp(aHelpURL, pWidget);
+return true;
+}
+}
+#endif
 
 // If the HTML or no help is installed, but aHelpURL nevertheless 
references valid help content,
 // that implies that help content belongs to an extension (and thus would 
not be available

[Libreoffice-commits] translations.git: Branch 'libreoffice-7-4' - source/sl

[Martin Srebotnjak (via logerrit)]

 source/sl/cui/messages.po   |4 
 source/sl/helpcontent2/source/text/sbasic/guide.po  |4 
 source/sl/helpcontent2/source/text/sbasic/shared.po |4 
 source/sl/helpcontent2/source/text/sbasic/shared/03.po  | 8188 ++--
 source/sl/helpcontent2/source/text/scalc/01.po  |4 
 source/sl/helpcontent2/source/text/scalc/guide.po   |4 
 source/sl/helpcontent2/source/text/shared.po|   10 
 source/sl/helpcontent2/source/text/shared/00.po |4 
 source/sl/helpcontent2/source/text/shared/01.po |4 
 source/sl/helpcontent2/source/text/shared/guide.po  |4 
 source/sl/helpcontent2/source/text/simpress/04.po   |   24 
 source/sl/helpcontent2/source/text/swriter.po   |   22 
 source/sl/helpcontent2/source/text/swriter/00.po|   34 
 source/sl/helpcontent2/source/text/swriter/01.po|   32 
 source/sl/helpcontent2/source/text/swriter/04.po|4 
 source/sl/helpcontent2/source/text/swriter/librelogo.po |4 
 source/sl/sc/messages.po|   14 
 17 files changed, 5482 insertions(+), 2882 deletions(-)

New commits:
commit 781f4d2dc9caf63bd695f770792174b6f74d2fe5
Author: Martin Srebotnjak 
AuthorDate: Sun Jul 3 12:38:29 2022 +0200
Commit: Andras Timar 
CommitDate: Sun Jul 3 12:38:29 2022 +0200

Updated Slovenian translation

Change-Id: I7167421ef0e14942ad3ed5288286af5937aa3b16

diff --git a/source/sl/cui/messages.po b/source/sl/cui/messages.po
index c847bb4b069..46b067e5c55 100644
--- a/source/sl/cui/messages.po
+++ b/source/sl/cui/messages.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 7.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2022-06-30 10:48+0200\n"
+"POT-Creation-Date: 2022-07-02 17:26+0200\n"
 "PO-Revision-Date: 2022-06-30 15:57+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/helpcontent2/source/text/sbasic/guide.po 
b/source/sl/helpcontent2/source/text/sbasic/guide.po
index b7a386b0209..bee4205bda8 100644
--- a/source/sl/helpcontent2/source/text/sbasic/guide.po
+++ b/source/sl/helpcontent2/source/text/sbasic/guide.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 7.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2022-06-30 10:49+0200\n"
+"POT-Creation-Date: 2022-07-02 17:26+0200\n"
 "PO-Revision-Date: 2022-06-30 15:23+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/helpcontent2/source/text/sbasic/shared.po 
b/source/sl/helpcontent2/source/text/sbasic/shared.po
index b3424083fb6..d049fcead73 100644
--- a/source/sl/helpcontent2/source/text/sbasic/shared.po
+++ b/source/sl/helpcontent2/source/text/sbasic/shared.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 7.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2022-06-30 10:49+0200\n"
+"POT-Creation-Date: 2022-07-02 17:26+0200\n"
 "PO-Revision-Date: 2022-06-30 15:24+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/helpcontent2/source/text/sbasic/shared/03.po 
b/source/sl/helpcontent2/source/text/sbasic/shared/03.po
index 0ac0710ad71..57f87ed8aa4 100644
--- a/source/sl/helpcontent2/source/text/sbasic/shared/03.po
+++ b/source/sl/helpcontent2/source/text/sbasic/shared/03.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 7.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2022-06-30 10:49+0200\n"
-"PO-Revision-Date: 2022-06-30 15:25+0200\n"
+"POT-Creation-Date: 2022-07-02 17:26+0200\n

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

[Julien Nabet (via logerrit)]

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

New commits:
commit d2dfc0c4286057f5d8dda178817de3503c3a7d29
Author: Julien Nabet 
AuthorDate: Sun Jul 3 21:15:23 2022 +0200
Commit: Julien Nabet 
CommitDate: Sun Jul 3 22:26:15 2022 +0200

tdf#149822: Clone Formatting does not apply glow effects

and since we're here, let's add too the soft edge radius.

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

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 309f42fc7816..163b7bd31232 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2656,7 +2656,8 @@ static const WhichRangesContainer& 
GetFormatRangeImpl(bool bTextOnly)
SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, 
SDRATTR_MISC_FIRST,
SDRATTR_MISC_LAST, // table cell formats
SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST, SDRATTR_TABLE_FIRST, 
SDRATTR_TABLE_LAST,
-   EE_PARA_START, EE_PARA_END, EE_CHAR_START, EE_CHAR_END>);
+   SDRATTR_GLOW_FIRST, SDRATTR_GLOW_LAST, 
SDRATTR_SOFTEDGE_FIRST,
+   SDRATTR_SOFTEDGE_LAST, EE_PARA_START, EE_PARA_END, 
EE_CHAR_START, EE_CHAR_END>);
 
 static const WhichRangesContainer gTextOnly(
 svl::Items

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 19dce74e1500fba57fa4dc37aebe6f73d09bf4e8
Author: Olivier Hallot 
AuthorDate: Sun Jul 3 17:07:29 2022 -0300
Commit: Gerrit Code Review 
CommitDate: Sun Jul 3 22:07:29 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 95301198e1518884a318bf24a1adbd8fa883a412
  - tdf#139469 Fontwork dialog for text to curve alignment

Help part, align with widget tooltips

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

diff --git a/helpcontent2 b/helpcontent2
index 8fc940edb19b..95301198e151 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8fc940edb19bef35a99ff891ba41357b3d367905
+Subproject commit 95301198e1518884a318bf24a1adbd8fa883a412

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sd/qa sd/source svx/sdi

[Miklos Vajna (via logerrit)]

 sd/qa/unit/uiimpress.cxx   |   16 +++-
 sd/source/ui/view/drviews2.cxx |   10 ++
 svx/sdi/svx.sdi|2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit cdb9706daccf3135e4789ecd93b57c9e32047315
Author: Miklos Vajna 
AuthorDate: Wed May 25 20:06:36 2022 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 4 08:07:15 2022 +0200

sd theme: add UI (sidebar) for shape fill color effects

Which was perhaps the last missing piece of the "sd theme: shape fill
color" story.

(cherry picked from commit 645413a14a91a72bc06acf0fb4703ff7b9fffec9)

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

diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx
index fd4756388463..283753f339c8 100644
--- a/sd/qa/unit/uiimpress.cxx
+++ b/sd/qa/unit/uiimpress.cxx
@@ -925,10 +925,12 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testFillColorTheme)
  uno::UNO_QUERY);
 xController->select(uno::makeAny(xShape));
 
-// When setting the fill color of that shape, with theme metadata:
+// When setting the fill color of that shape, with theme metadata & 
effects:
 uno::Sequence aColorArgs = {
 comphelper::makePropertyValue("FillColor", 
static_cast(0xed7d31)), // orange
 comphelper::makePropertyValue("ColorThemeIndex", 
static_cast(4)), // accent 1
+comphelper::makePropertyValue("ColorLumMod", 
static_cast(4000)),
+comphelper::makePropertyValue("ColorLumOff", 
static_cast(6000)),
 };
 dispatchCommand(mxComponent, ".uno:FillColor", aColorArgs);
 Scheduler::ProcessEventsToIdle();
@@ -941,6 +943,18 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testFillColorTheme)
 // - Actual  : -1
 // i.e. the theme index was lost during the dispatch of the command.
 CPPUNIT_ASSERT_EQUAL(static_cast(4), nFillColorTheme);
+
+// Then also verify the effects:
+sal_Int16 nFillColorLumMod = 1;
+xShape->getPropertyValue("FillColorLumMod") >>= nFillColorLumMod;
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 4000
+// - Actual  : 1
+// i.e. the theme index was set, but not the effects.
+CPPUNIT_ASSERT_EQUAL(static_cast(4000), nFillColorLumMod);
+sal_Int16 nFillColorLumOff = 0;
+xShape->getPropertyValue("FillColorLumOff") >>= nFillColorLumOff;
+CPPUNIT_ASSERT_EQUAL(static_cast(6000), nFillColorLumOff);
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index b7f0638adb15..9918368dda65 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -604,6 +604,16 @@ public:
 auto pIntItem = static_cast(pItem);
 aColorItem.GetThemeColor().SetThemeIndex(pIntItem->GetValue());
 }
+if (pArgs->GetItemState(SID_ATTR_COLOR_LUM_MOD, false, &pItem) == 
SfxItemState::SET)
+{
+auto pIntItem = static_cast(pItem);
+aColorItem.GetThemeColor().SetLumMod(pIntItem->GetValue());
+}
+if (pArgs->GetItemState(SID_ATTR_COLOR_LUM_OFF, false, &pItem) == 
SfxItemState::SET)
+{
+auto pIntItem = static_cast(pItem);
+aColorItem.GetThemeColor().SetLumOff(pIntItem->GetValue());
+}
 pArgs->Put(aColorItem);
 }
 }
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 4a258d860439..f415e2522bd0 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -2746,7 +2746,7 @@ XFillBitmapItem FillPageBitmap SID_ATTR_PAGE_BITMAP
 ]
 
 XFillColorItem FillColor SID_ATTR_FILL_COLOR
-(SfxStringItem Color SID_ATTR_COLOR_STR, XFillColorItem FillColor 
SID_ATTR_FILL_COLOR, SfxInt16Item ColorThemeIndex SID_ATTR_COLOR_THEME_INDEX)
+(SfxStringItem Color SID_ATTR_COLOR_STR, XFillColorItem FillColor 
SID_ATTR_FILL_COLOR, SfxInt16Item ColorThemeIndex SID_ATTR_COLOR_THEME_INDEX, 
SfxInt16Item ColorLumMod SID_ATTR_COLOR_LUM_MOD, SfxInt16Item ColorLumOff 
SID_ATTR_COLOR_LUM_OFF)
 [
 AutoUpdate = TRUE,
 FastCall = FALSE,

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

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

 sw/qa/extras/layout/data/tdf149709.fodt |   41 +++
 sw/qa/extras/layout/layout2.cxx |   57 
 sw/source/core/txtnode/ndtxt.cxx|6 +++
 3 files changed, 104 insertions(+)

New commits:
commit eea2c6b59812950fd7b9a67532ac1a584da6aa46
Author: László Németh 
AuthorDate: Fri Jul 1 11:49:45 2022 +0200
Commit: Xisco Fauli 
CommitDate: Mon Jul 4 10:57:14 2022 +0200

tdf#149709 sw_redlinenum: fix list levels

Levels of ORIGTEXT SwNodeNum weren't updated,
resulting bad numbering of multilevel lists during
editing and file import.

Follow-up to commit d0e49c07203c9ae33c5dfa1855b2b8909c3e16dc
"tdf#115524 sw_redlinenum: show original numbering of insertions".

Change-Id: I478971643a10b2007f37a4f0074067896d546228
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136734
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 21acc6f261ace78b470dc982dd8283bb06a975ae)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136713
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/layout/data/tdf149709.fodt 
b/sw/qa/extras/layout/data/tdf149709.fodt
new file mode 100644
index ..0a33515d1ca9
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf149709.fodt
@@ -0,0 +1,41 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle: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:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d: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:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
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:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
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:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
+ 
+  
+   
+  
+ 
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+  
+ 
+ 
+  
+   
+
+ Item
+ 
+  
+   Item
+  
+  
+   Item
+  
+ 
+
+
+ Item
+
+   
+  
+ 
+
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index 08160784a4d0..9a366b00a15d 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -395,6 +395,63 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, 
testTdf149710_RedlineNumberingEditing)
 assertXPathContent(pXmlDoc, "/metafile/push/push/push/textarray[5]/text", 
"3.");
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf149709_RedlineNumberingLevel)
+{
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf149709.fodt");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+// Show Changes
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+SwRootFrame* pLayout(pWrtShell->GetLayout());
+CPPUNIT_ASSERT(!pLayout->IsHideRedlines());
+
+// insert a new list item at start of the second list item "a)"
+dispatchCommand(mxComponent, ".uno:TrackChanges", {});
+pWrtShell->Down(false, 1);
+pWrtShell->SplitNode(false);
+
+// Dump the rendering of the first page as an XML file.
+SwDocShell* pShell = pDoc->GetDocShell();
+std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+
+xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+
+// Show the correct and the original line numbering instead of counting
+// the deleted list items in Show Changes mode, as part of the list
+assertXPathContent(pXmlDoc, "/metafile/push/push/push/textarray[1]/text", 
"1.");
+assertXPathContent(pXmlDoc, "/metafile/push/push/push/te

GSoC status report - Week 6

[Paris Oplopoios]

Squashed the previous PngSuite related commits into one and finished
previously unfinished work (added all cases) (patch
)

Next:
Hopefully start integrating PngImageWriter. Otherwise probably going to
create more tests.

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

[Julien Nabet (via logerrit)]

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

New commits:
commit 7b49b3ebc17378566942e7b263e0e5f2b400dbd1
Author: Julien Nabet 
AuthorDate: Sun Jul 3 17:30:02 2022 +0200
Commit: Noel Grandin 
CommitDate: Sun Jul 3 20:53:13 2022 +0200

tdf#130252: Impress: Clone formatting not cloning highlight color

See https://bugs.documentfoundation.org/show_bug.cgi?id=130252#c5 for full 
analysis

Change-Id: Ie87663c716a6ed31f753e0db5519436f6947aad4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136785
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index a92651abd785..309f42fc7816 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2715,7 +2715,7 @@ static SfxItemSet CreatePaintSet(const 
WhichRangesContainer& pRanges, SfxItemPoo
 if (bNoParagraphFormats && (nWhich == EE_PARA_START))
 continue;
 
-for (; nWhich < nLastWhich; nWhich++)
+for (; nWhich <= nLastWhich; nWhich++)
 {
 const SfxPoolItem* pSourceItem = rSourceSet.GetItem(nWhich);
 const SfxPoolItem* pTargetItem = rTargetSet.GetItem(nWhich);

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

[Olivier Hallot (via logerrit)]

 source/text/shared/01/0528.xhp |  101 +
 1 file changed, 48 insertions(+), 53 deletions(-)

New commits:
commit 95301198e1518884a318bf24a1adbd8fa883a412
Author: Olivier Hallot 
AuthorDate: Mon Jun 27 22:28:30 2022 -0300
Commit: Olivier Hallot 
CommitDate: Sun Jul 3 22:07:27 2022 +0200

tdf#139469 Fontwork dialog for text to curve alignment

Help part, align with widget tooltips

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

diff --git a/source/text/shared/01/0528.xhp 
b/source/text/shared/01/0528.xhp
index 2bbae57ad..1e17776e1 100644
--- a/source/text/shared/01/0528.xhp
+++ b/source/text/shared/01/0528.xhp
@@ -33,33 +33,35 @@
 
 Fontwork Dialog (for putting 
text along a curve)
 Simple tool for putting text along a curve without any 
fancy effects.UFI: see "Fontwork_ui" spec 
doc.
+
 This Fontwork dialog is meant for making 
text follow a curve. Draw a curve, double-click it and type text into it. With 
the curve selected, you can now activate the Fontwork command. Access the dialog by choosing 
Format - Text Box and Shape - 
FontworkFirst call Tools - 
Customize to add a menu command or a toolbar button to open the 
dialog. The Fontwork command is found in the Format category of 
the Customize dialog.
 
 Alignment icons
 You can make 
text follow any shape. Most of the custom shapes available in the Drawing 
toolbar need to be converted to a different type before you can use them with 
Fontwork. In Impress or Draw, right-click the shape and select Convert - 
To Curve/Polygon/Contour. If you wish, you can now copy and paste the 
converted shape into Writer for use with Fontwork. Shapes in the Legacy 
Circles and Ovals and Legacy Rectangles toolbars do not 
need to be converted. The Arc included in the basic shapes is also 
a legacy shape.
+
 
+Baseline Off
 Removes baseline 
formatting.
 
 
 
 
-Icon
-   
+Icon 
Off
 
 
-Off
+Baseline 
Off
 
 
 
 
 
+Rotate
 Uses the top or the bottom edge of the 
selected object as the text baseline.
 
 
 
 
-Icon
-   
+Icon
 
 
 Rotate
@@ -68,13 +70,13 @@
 
 
 
+Upright
 Uses the top or the bottom edge of the 
selected object as the text baseline and preserves the original vertical 
alignment of the individual characters.
 
 
 
 
-Icon
-   
+Icon Upright
 
 
 Upright
@@ -83,28 +85,27 @@
 
 
 
+Slant Horizontal
 Horizontally slants the characters in the 
text object.
 
 
 
 
-Icon
-   
+Icon Slant 
Horizontal
 
 
 Slant 
Horizontal
 
 
 
-
 
+Slant Vertical
 Vertically slants the characters in the text 
object.
 
 
 
 
-Icon
-   
+Icon Slant 
Vertical
 
 
 Slant 
Vertical
@@ -113,13 +114,13 @@
 
 
 
+Orientation
 Reverses the text flow direction, and 
flips the text horizontally or vertically. To use this command, you must first 
apply a different baseline to the text.
 
 
 
 
-Icon
-   
+Icon Orientation
 
 
 Orientation
@@ -128,13 +129,13 @@
 
 
 
+Align Left
 Aligns the text to the left end of the text 
baseline.
 
 
 
 
-Icon
-   
+Icon Align 
Left
 
 
 Align 
Left
@@ -143,28 +144,28 @@
 
 
 
+Align Center
 Centers the text on the text 
baseline.
 
 
 
 
-Icon
-   
+Icon Align 
Center
 
 
-Center
+Align 
Center
 
 
 
 
 
+Align Right
 Aligns the text to the right end of the text 
baseline.
 
 
 
 
-Icon
-   
+Icon Align 
Right
 
 
 Align 
Right
@@ -173,13 +174,13 @@
 
 
 
+AutoSize Text
 Resizes the text to fit the length of the 
text baseline.
 
 
 
 
-Icon
-   
+Icon AutoSize 
Text
 
 
 AutoSize 
Text
@@ -188,28 +189,27 @@
 
 
 
+Distance
 Enter the amount of space that you want 
to leave between the text baseline and the base of the individual 
characters.
 
 
 
 
-Icon
-   
+Icon 
Distance
 
 
 Distance
 
 
 
-
+Indent
 
 Enter the amount of space to leave between 
the beginning of the text baseline, and the beginning of the 
text.
 
 
 
 
-Icon
-   
+Icon 
Indent
 
 
 Indent
@@ -218,43 +218,41 @@
 
 
 
+Contour
 Shows or hides the text baseline, or the 
edges of the selected object.
 
 
 
 
-Icon
-   
+Icon 
Contour
 
 
 Contour
 
 
 
-
 
+Text Contour
 Shows or hides the borders of the 
individual characters in the text.
 
 
 
 
-Icon
-   
+Icon Text 
Contour
 
 
 Text 
Contour
 
 
 
-
 
+No Text Shadow
 Removes the shadow effects that you 
applied to the text.
 
 
 
 
-Icon
-   
+Icon No Text 
Shadow
 
 
 No 
Shadow
@@ -263,63 +261,60 @@
 
 
 
+Add Text Shadow
 Adds a shadow to the text in the selected 
object. Click this button, and then enter the dimensions of the shadow in the 
Distance X and the Distance Y 
boxes.
 
 
 
 
-Icon
-   
+Icon Add Text 
Shadow
 
 
-Vertical
+Add Text 
Shadow
 
 
 
-
+Text Shadow Slant
 
 Adds a slant shadow to the text in the 
selected object. Click this button, and then enter the dimensions of the shadow 
in the Distance X and the Distance Y 
boxes.
 
 
 

[Libreoffice-commits] core.git: chart2/Module_chart2.mk

[Xisco Fauli (via logerrit)]

 chart2/Module_chart2.mk |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 268f0f3f0d70902acaeb3f99e0d206ad66ffd67c
Author: Xisco Fauli 
AuthorDate: Mon Jul 4 11:42:22 2022 +0200
Commit: Xisco Fauli 
CommitDate: Mon Jul 4 12:41:23 2022 +0200

run CppunitTest_chart2_xshape without ENABLE_CHART_TESTS

This was added in d8ae59e097b3fca29f071d1a792cdb98ad8139cf
"add concept for chart xshape tests" and it's only run
when using --enable-chart-tests
OTOH, SdImportTest::testDocumentLayout in sd/qa/unit/import-tests.cxx
also uses doXMLDiff to compare shapes and it's run without any
special flag.
Let's remove the ENABLE_CHART_TESTS check to see if jenkins or any
tinderbox fails. If it does, we can always revert this commit.
If it works fine, I'll remove the --enable-chart-tests machinery
in a follow-up commit in some days

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

diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 94cba43344fa..fc2f0f95151f 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -38,13 +38,11 @@ $(eval $(call gb_Module_add_slowcheck_targets,chart2,\
 CppunitTest_chart2_geometry \
 ))
 
-ifeq ($(ENABLE_CHART_TESTS),TRUE)
 ifeq ($(WITH_FONTS), TRUE)
 $(eval $(call gb_Module_add_slowcheck_targets,chart2,\
 CppunitTest_chart2_xshape \
 ))
 endif
-endif
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,chart2,\
 JunitTest_chart2_unoapi \

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

[Olivier Hallot (via logerrit)]

 svx/uiconfig/ui/dockingfontwork.ui |   30 ++
 1 file changed, 22 insertions(+), 8 deletions(-)

New commits:
commit 45623966c670bfd039817a0178a7a92a8b599978
Author: Olivier Hallot 
AuthorDate: Mon Jun 27 22:24:35 2022 -0300
Commit: Olivier Hallot 
CommitDate: Sun Jul 3 21:49:57 2022 +0200

tdf#139469 Fontwork dialog for text to curve alignment

Improve terms used in the dockingfontwork.ui dialog
The dialog has no widget labels, only tooltips and extended tips.

Help part follows.

Change-Id: I010b545bccac5a14e11265c05151e7934c6089ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136519
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/svx/uiconfig/ui/dockingfontwork.ui 
b/svx/uiconfig/ui/dockingfontwork.ui
index 0088ebfbfcff..ecfd6a543b15 100644
--- a/svx/uiconfig/ui/dockingfontwork.ui
+++ b/svx/uiconfig/ui/dockingfontwork.ui
@@ -44,7 +44,8 @@
 
   
 True
-Off
+True
+Baseline Off
 True
 svx/res/fw01.png
 True
@@ -72,6 +73,7 @@
 
   
 True
+True
 Rotate
 True
 svx/res/fw02.png
@@ -90,6 +92,7 @@
 
   
 True
+True
 Upright
 True
 svx/res/fw03.png
@@ -108,6 +111,7 @@
 
   
 True
+True
 Slant Horizontal
 True
 svx/res/fw04.png
@@ -126,6 +130,7 @@
 
   
 True
+True
 Slant Vertical
 True
 svx/res/fw05.png
@@ -155,6 +160,7 @@
 
   
 True
+True
 Orientation
 True
 svx/res/fw06.png
@@ -182,6 +188,7 @@
 
   
 True
+True
 Align Left
 True
 svx/res/fw07.png
@@ -200,7 +207,8 @@
 
   
 True
-Center
+True
+Align Center
 True
 svx/res/fw08.png
 autosize
@@ -218,6 +226,7 @@
 
   
 True
+True
 Align Right
 True
 svx/res/fw09.png
@@ -236,6 +245,7 @@
 
   
 True
+True
 AutoSize Text
 True
 svx/res/fw010.png
@@ -354,6 +364,7 @@
 
   
 True
+True
 Contour
 True
 svx/res/fw011.png
@@ -371,6 +382,7 @@
 
   
 True
+True
 Text Contour
 True
 svx/res/fw012.png
@@ -398,7 +410,8 @@
 
   
 True
-No Shadow
+True
+No Text Shadow
 True
 svx/res/fw013.png
 True
@@ -416,7 +429,8 @@
 
   
 True
-Vertical
+True
+Add Text Shadow
 True
 svx/res/fw014.png
 noshadow
@@ -434,7 +448,8 @@
 
   
 True
-Slant
+True
+Slant Text Shadow
 True
 svx/res/fw015.png
 noshadow
@@ -485,7 +500,7 @@
 2
 
   
-Enter the 
horizontal distance between the text characters and the edge of the 
shadow.
+Enter the 
horizontal distance between the text characters and the edge of the shadow or 
the angle of the shadow slant from vertical.
   
 
   
@@ -530,7 +545,7 @@
 2
 
   
-Enter the 
vertical distance between the text characters and the edge of the 
shadow.
+Enter the 
vertical distance between the text characters and the edge of the shadow, or 
the size of the shadow in percent values of the character size.
   
 
   
@@ -554,7 +569,6 @@
 True
 0
 True
-
 
   
 

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

[Miklos Vajna (via logerrit)]

 sw/sdi/_grfsh.sdi|1 
 sw/source/core/crsr/contentcontrolbutton.cxx |   39 +++
 2 files changed, 23 insertions(+), 17 deletions(-)

New commits:
commit c45b788517c9db9f8f3c0294ef3f8fdaae890815
Author: Miklos Vajna 
AuthorDate: Fri Jul 1 11:40:10 2022 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 4 08:06:40 2022 +0200

sw content controls: fix picture placeholders

This went wrong in commit c321498f915f4e8b3f4853232860ce040ab48e46 (sw
content controls: reject typing inside checkbox or picture content
controls, 2022-06-10), now a freshly inserted picture content control is
not replaced with an image on click.

The problem is that we want to forbid typing into a picture content
control (it should only host a single as-char image), but changing the
picture's bitmap is meant to be still possible.

Fix the problem by allowing SID_CHANGE_PICTURE even if the cursor is
protected: this allows changing the picture again, and a real read-only
document still doesn't show the "change" menu item in its context menu.

If we later find some other corner-case where this command should be
still disabled, we can extend SwGrfShell::GetAttrState(), similar to how
e.g. inserting images in input fields is disabled there.

(cherry picked from commit c769c369c87a46ec877b7eefee27988044a2798f)

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

diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 8291745966bb..5475017d448e 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -63,7 +63,6 @@ interface BaseTextGraphic
 [
 ExecMethod = Execute ;
 StateMethod = GetAttrState ;
-DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 
 SID_EXTERNAL_EDIT
commit 40a9a7e15c6131f903ea5ea9ed2fa44323098485
Author: Miklos Vajna 
AuthorDate: Fri Jul 1 09:02:27 2022 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 4 08:06:19 2022 +0200

sw content controls, dropdown: use DecorationView for the button's arrow

Instead of drawing manually, which was the way form field dropdowns did
it. Also enable anti-aliasing.

(cherry picked from commit 48010539f695bc269034f12cf72aa0665cca10de)

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

diff --git a/sw/source/core/crsr/contentcontrolbutton.cxx 
b/sw/source/core/crsr/contentcontrolbutton.cxx
index 00deb260981c..34cbd38e663a 100644
--- a/sw/source/core/crsr/contentcontrolbutton.cxx
+++ b/sw/source/core/crsr/contentcontrolbutton.cxx
@@ -11,8 +11,10 @@
 
 #include 
 #include 
+#include 
 
 #include 
+#include 
 
 SwContentControlButton::SwContentControlButton(
 SwEditWin* pEditWin, const std::shared_ptr& 
pContentControl)
@@ -107,7 +109,7 @@ void SwContentControlButton::Paint(vcl::RenderContext& 
rRenderContext, const too
 
 // Draw the button next to the frame
 Point aButtonPos(aFrameRect.TopLeft());
-aButtonPos.AdjustX(aFrameRect.GetSize().getWidth() - 1);
+aButtonPos.AdjustX(aFrameRect.GetSize().getWidth() - nPadding * 2);
 Size aButtonSize(aFrameRect.GetSize());
 aButtonSize.setWidth(GetSizePixel().getWidth() - aFrameRect.getWidth() - 
nPadding);
 const tools::Rectangle aButtonRect(tools::Rectangle(aButtonPos, 
aButtonSize));
@@ -118,21 +120,26 @@ void SwContentControlButton::Paint(vcl::RenderContext& 
rRenderContext, const too
 rRenderContext.DrawRect(aButtonRect);
 
 // the arrowhead
-rRenderContext.SetLineColor(aLineColor);
-rRenderContext.SetFillColor(aLineColor);
-
-Point aCenter(aButtonPos.X() + (aButtonSize.Width() / 2),
-  aButtonPos.Y() + (aButtonSize.Height() / 2));
-tools::Long nMinWidth = 4;
-tools::Long nMinHeight = 2;
-Size aArrowSize(std::max(aButtonSize.Width() / 4, nMinWidth),
-std::max(aButtonSize.Height() / 10, nMinHeight));
-
-tools::Polygon aPoly(3);
-aPoly.SetPoint(Point(aCenter.X() - aArrowSize.Width(), aCenter.Y() - 
aArrowSize.Height()), 0);
-aPoly.SetPoint(Point(aCenter.X() + aArrowSize.Width(), aCenter.Y() - 
aArrowSize.Height()), 1);
-aPoly.SetPoint(Point(aCenter.X(), aCenter.Y() + aArrowSize.Height()), 2);
-rRenderContext.DrawPolygon(aPoly);
+DecorationView aDecoView(&rRenderContext);
+tools::Rectangle aSymbolRect(aButtonRect);
+// 20% distance to the left and right button border
+const tools::Long nBorderDistanceLeftAndRight = aSymbolRect.GetWidth() / 4;
+aSymbolRect.AdjustLeft(nBorderDistanceLeftAndRight);
+aSymbolRect.AdjustRight(-nBorderDistanceLeftAndRight);
+// 20% distance to the top and bottom button border
+const t

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - svx/source

[Julien Nabet (via logerrit)]

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

New commits:
commit 519d358b5c227610e21f41b28b9400296d66991f
Author: Julien Nabet 
AuthorDate: Sun Jul 3 21:15:23 2022 +0200
Commit: Xisco Fauli 
CommitDate: Mon Jul 4 12:56:30 2022 +0200

tdf#149822: Clone Formatting does not apply glow effects

and since we're here, let's add too the soft edge radius.

Change-Id: I84f84c0f57b0cf59f6e681ada7682b152eb209f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136787
Reviewed-by: Julien Nabet 
(cherry picked from commit 83cef8d1098ddb869018d0c5ba39fd9b18aafa4c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136759
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 309f42fc7816..163b7bd31232 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2656,7 +2656,8 @@ static const WhichRangesContainer& 
GetFormatRangeImpl(bool bTextOnly)
SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, 
SDRATTR_MISC_FIRST,
SDRATTR_MISC_LAST, // table cell formats
SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST, SDRATTR_TABLE_FIRST, 
SDRATTR_TABLE_LAST,
-   EE_PARA_START, EE_PARA_END, EE_CHAR_START, EE_CHAR_END>);
+   SDRATTR_GLOW_FIRST, SDRATTR_GLOW_LAST, 
SDRATTR_SOFTEDGE_FIRST,
+   SDRATTR_SOFTEDGE_LAST, EE_PARA_START, EE_PARA_END, 
EE_CHAR_START, EE_CHAR_END>);
 
 static const WhichRangesContainer gTextOnly(
 svl::Items

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - chart2/source

[Kurt Nordback (via logerrit)]

 chart2/source/view/charttypes/VSeriesPlotter.cxx |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 31e982283e1abd0233c06f6f224c34298efabe97
Author: Kurt Nordback 
AuthorDate: Sat May 28 15:29:31 2022 -0600
Commit: Xisco Fauli 
CommitDate: Mon Jul 4 10:58:22 2022 +0200

tdf#56580 Fix negative error bars on log chart

This is a bug in the rendering of negative error bars on log charts,
when the error bar size is greater than the chart value. This is
numerically invalid, since it leads to taking the logarithm of a
non-positive value.
- Add a test for this condition, and turn off the negative error bar
  when the condition is met.

Change-Id: If84823c27d68976d3515581b1f913d78d683f446
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135106
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit ec31df481568f6a654e5f6c1d597dc8b963b99e6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136708
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx 
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 640abfebb1ab..fd3a1fe1f9fa 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1044,7 +1044,21 @@ void VSeriesPlotter::createErrorBar(
 fLocalX-=fLength;
 aNegative = m_pPosHelper->transformLogicToScene( fLocalX, 
fLocalY, fZ, true );
 }
-bCreateNegativeBorder = m_pPosHelper->isLogicVisible( fLocalX, 
fLocalY, fZ);
+if (std::isfinite(aNegative.PositionX) &&
+std::isfinite(aNegative.PositionY) &&
+std::isfinite(aNegative.PositionZ)) {
+bCreateNegativeBorder = m_pPosHelper->isLogicVisible( 
fLocalX, fLocalY, fZ);
+} else {
+// If error bars result in a numerical problem (e.g., an
+// error bar on a logarithmic chart that results in a point
+// <= 0) then just turn off the error bar.
+//
+// TODO: This perhaps should display a warning, so the user
+// knows why a bar is not appearing.
+// TODO: This test could also be added to the positive 
case,
+// though a numerical overflow there is less likely.
+bShowNegative = false;
+}
 }
 else
 bShowNegative = false;

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - svx/source

[Julien Nabet (via logerrit)]

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

New commits:
commit 3788d8be31764a3f44dc662f2d6e040a2a24510e
Author: Julien Nabet 
AuthorDate: Sun Jul 3 17:30:02 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jul 4 01:49:30 2022 +0200

tdf#130252: Impress: Clone formatting not cloning highlight color

See https://bugs.documentfoundation.org/show_bug.cgi?id=130252#c5 for full 
analysis

Change-Id: Ie87663c716a6ed31f753e0db5519436f6947aad4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136785
Reviewed-by: Julien Nabet 
(cherry picked from commit 7b49b3ebc17378566942e7b263e0e5f2b400dbd1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136758
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index f046fb185057..cac845ae46ae 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2711,7 +2711,7 @@ static SfxItemSet CreatePaintSet(const 
WhichRangesContainer& pRanges, SfxItemPoo
 if (bNoParagraphFormats && (nWhich == EE_PARA_START))
 continue;
 
-for (; nWhich < nLastWhich; nWhich++)
+for (; nWhich <= nLastWhich; nWhich++)
 {
 const SfxPoolItem* pSourceItem = rSourceSet.GetItem(nWhich);
 const SfxPoolItem* pTargetItem = rTargetSet.GetItem(nWhich);

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - svx/source

[Julien Nabet (via logerrit)]

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

New commits:
commit c957471bc57a89ec71f1a91838646e664a7dc6f1
Author: Julien Nabet 
AuthorDate: Sun Jul 3 17:30:02 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jul 4 01:48:59 2022 +0200

tdf#130252: Impress: Clone formatting not cloning highlight color

See https://bugs.documentfoundation.org/show_bug.cgi?id=130252#c5 for full 
analysis

Change-Id: Ie87663c716a6ed31f753e0db5519436f6947aad4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136785
Reviewed-by: Julien Nabet 
(cherry picked from commit 7b49b3ebc17378566942e7b263e0e5f2b400dbd1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136757
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index a92651abd785..309f42fc7816 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2715,7 +2715,7 @@ static SfxItemSet CreatePaintSet(const 
WhichRangesContainer& pRanges, SfxItemPoo
 if (bNoParagraphFormats && (nWhich == EE_PARA_START))
 continue;
 
-for (; nWhich < nLastWhich; nWhich++)
+for (; nWhich <= nLastWhich; nWhich++)
 {
 const SfxPoolItem* pSourceItem = rSourceSet.GetItem(nWhich);
 const SfxPoolItem* pTargetItem = rTargetSet.GetItem(nWhich);

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

[Szymon Kłos (via logerrit)]

 vcl/inc/jsdialog/jsdialogbuilder.hxx |8 
 vcl/jsdialog/enabled.cxx |6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 044b6d343ecdd31670bbd824a8758ee1071327cf
Author: Szymon Kłos 
AuthorDate: Mon Jun 20 20:10:30 2022 +0200
Commit: Szymon Kłos 
CommitDate: Mon Jul 4 08:27:24 2022 +0200

jsdialog: send grab_focus action

- disable jsdialogs for navigator panel for now because it breaks
  tests but is not used in online yet

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

diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 5e7437b2725a..6a7a9632a27c 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -417,6 +417,14 @@ public:
 sendUpdate();
 }
 
+virtual void grab_focus() override
+{
+BaseInstanceClass::grab_focus();
+std::unique_ptr pMap = 
std::make_unique();
+(*pMap)[ACTION_TYPE] = "grab_focus";
+sendAction(std::move(pMap));
+}
+
 virtual void sendClose() override
 {
 if (m_pSender)
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index a37d77602766..380fb2d3e9d2 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -121,19 +121,19 @@ bool isBuilderEnabledForSidebar(std::u16string_view 
rUIFile)
 || rUIFile == u"modules/simpress/ui/masterpagepanelrecent.ui"
 || rUIFile == u"modules/simpress/ui/slidetransitionspanel.ui"
 || rUIFile == u"modules/simpress/ui/tabledesignpanel.ui"
-|| rUIFile == u"modules/simpress/ui/navigatorpanel.ui"
+//|| rUIFile == u"modules/simpress/ui/navigatorpanel.ui"
 || rUIFile == u"modules/simpress/ui/sidebarslidebackground.ui"
 || rUIFile == u"modules/scalc/ui/sidebaralignment.ui"
 || rUIFile == u"modules/scalc/ui/sidebarcellappearance.ui"
 || rUIFile == u"modules/scalc/ui/sidebarnumberformat.ui"
-|| rUIFile == u"modules/scalc/ui/navigatorpanel.ui"
+//|| rUIFile == u"modules/scalc/ui/navigatorpanel.ui"
 || rUIFile == u"modules/scalc/ui/functionpanel.ui"
 || rUIFile == u"modules/swriter/ui/pagestylespanel.ui"
 || rUIFile == u"modules/swriter/ui/pageformatpanel.ui"
 || rUIFile == u"modules/swriter/ui/pageheaderpanel.ui"
 || rUIFile == u"modules/swriter/ui/pagefooterpanel.ui"
 || rUIFile == u"modules/swriter/ui/sidebarwrap.ui"
-|| rUIFile == u"modules/swriter/ui/navigatorpanel.ui"
+//|| rUIFile == u"modules/swriter/ui/navigatorpanel.ui"
 || rUIFile == u"modules/swriter/ui/managechangessidebar.ui"
 || rUIFile == u"svx/ui/inspectortextpanel.ui"
 || rUIFile == u"modules/swriter/ui/sidebarstylepresets.ui"

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - include/oox sd/CppunitTest_sd_filter_eppt.mk sd/qa sd/source

[Miklos Vajna (via logerrit)]

 include/oox/drawingml/clrscheme.hxx  |   10 +++---
 sd/CppunitTest_sd_filter_eppt.mk |1 
 sd/qa/filter/eppt/eppt.cxx   |   51 ++-
 sd/source/filter/eppt/pptx-epptooxml.cxx |   26 +++
 4 files changed, 69 insertions(+), 19 deletions(-)

New commits:
commit 3776c15fdf63262721126539bdaa6fd5d4474b1c
Author: Miklos Vajna 
AuthorDate: Tue May 24 20:11:47 2022 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 4 08:06:52 2022 +0200

tdf#149205 sd theme: fix PPTX export loosing dk1 and lt1 colors

Document theme of Impress documents were exported to PPTX only
partially: dk1 and lt1 was hardcoded to the SYS_COLOR_SCHEMES define,
while the rest was written from master-slide-specific svx::Theme.

The benefit of this is that our theme is just a set of colors
( markup in OOXML), while dk1 and lt1 is more dynamic by
default in PowerPoint ( in OOXML). The downside is that this
way a custom dk1 and lt1 color was lost on export.

Fix the problem by switching to  markup even for dk1 and lt1:
not using the  markup doesn't seem to be a problem in
practice, or at least much less problematic than rendering with bad
colors.

If there is a need, dedicated  markup support can be still
added later by extending svx::ColorSet::maColors to not only store a
list of colors, but also some additional properties of those colors.

(cherry picked from commit 4a54a24c207f3040390e2fefec41cbbf0edd5eca)

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

diff --git a/include/oox/drawingml/clrscheme.hxx 
b/include/oox/drawingml/clrscheme.hxx
index 01711fe8bfbd..a4f0b653441a 100644
--- a/include/oox/drawingml/clrscheme.hxx
+++ b/include/oox/drawingml/clrscheme.hxx
@@ -34,9 +34,9 @@
 namespace oox::drawingml {
 
 enum PredefinedClrSchemeId {
-//dk1,
-//lt1,
-dk2 = 0,
+dk1 = 0,
+lt1,
+dk2,
 lt2,
 accent1,
 accent2,
@@ -51,8 +51,8 @@ enum PredefinedClrSchemeId {
 
 static std::map PredefinedClrNames =
 {
-//{ dk1,  "dk1" },
-//{ lt1, "lt1" },
+{ dk1,  "dk1" },
+{ lt1, "lt1" },
 { dk2, "dk2" },
 { lt2, "lt2" },
 { accent1, "accent1" },
diff --git a/sd/CppunitTest_sd_filter_eppt.mk b/sd/CppunitTest_sd_filter_eppt.mk
index 1a58e113643e..72b7b4d4dbb7 100644
--- a/sd/CppunitTest_sd_filter_eppt.mk
+++ b/sd/CppunitTest_sd_filter_eppt.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,sd_filter_eppt))
 
 $(eval $(call gb_CppunitTest_use_externals,sd_filter_eppt,\
boost_headers \
+   libxml2 \
 ))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sd_filter_eppt, \
diff --git a/sd/qa/filter/eppt/eppt.cxx b/sd/qa/filter/eppt/eppt.cxx
index d27713da20b0..1e8e2c7e1491 100644
--- a/sd/qa/filter/eppt/eppt.cxx
+++ b/sd/qa/filter/eppt/eppt.cxx
@@ -9,20 +9,25 @@
 
 #include 
 #include 
+#include 
 
+#include 
 #include 
+#include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
 namespace
 {
 /// Covers sd/source/filter/eppt/ fixes.
-class Test : public test::BootstrapFixture, public unotest::MacrosTest
+class Test : public test::BootstrapFixture, public unotest::MacrosTest, public 
XmlTestTools
 {
 private:
 uno::Reference mxComponent;
@@ -30,6 +35,7 @@ private:
 public:
 void setUp() override;
 void tearDown() override;
+void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) override;
 uno::Reference& getComponent() { return mxComponent; }
 };
 
@@ -48,6 +54,11 @@ void Test::tearDown()
 test::BootstrapFixture::tearDown();
 }
 
+void Test::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx)
+{
+XmlTestTools::registerOOXMLNamespaces(pXmlXpathCtx);
+}
+
 constexpr OUStringLiteral DATA_DIRECTORY = u"/sd/qa/filter/eppt/data/";
 
 CPPUNIT_TEST_FIXTURE(Test, testOOXMLCustomShapeBitmapFill)
@@ -76,6 +87,44 @@ CPPUNIT_TEST_FIXTURE(Test, testOOXMLCustomShapeBitmapFill)
 CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.GraphicObjectShape"),
  xShape->getShapeType());
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testThemeExport)
+{
+// Given a document with a master slide and a theme, lt1 is set to 
0x02:
+uno::Reference xComponent = 
loadFromDesktop("private:factory/simpress");
+uno::Reference xDrawPagesSupplier(xComponent, 
uno::UNO_QUERY);
+uno::Reference xDrawPage(
+xDrawPagesSupplier->getDrawPages()->getByIndex(0), uno::UNO_QUERY);
+uno::Reference 
xMasterPage(xDrawPage->getMasterPage(), uno::UNO_QUERY);
+comphelper::SequenceAsHashMap aMap;
+aMap["Name"] <<= OUString("mytheme");
+aMap["ColorSchemeName"] <<= OUString("mycolorscheme");
+uno::Sequence aColorScheme
+= { 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0x

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

[Chris Sherlock (via logerrit)]

 include/registry/reader.hxx |5 +
 include/registry/refltype.hxx   |5 +
 include/registry/regdllapi.h|5 +
 include/registry/regtype.h  |5 +
 include/registry/typereg_reader.hxx |5 +
 include/registry/types.hxx  |5 +
 include/registry/version.h  |5 +
 registry/source/reflcnst.hxx|6 +-
 registry/source/regimpl.hxx |5 +
 registry/source/regkey.hxx  |5 +
 10 files changed, 10 insertions(+), 41 deletions(-)

New commits:
commit 6952be913510c63716940648a06163c19622187e
Author: Chris Sherlock 
AuthorDate: Sun Jan 9 06:34:39 2022 +1100
Commit: Stephan Bergmann 
CommitDate: Mon Jul 4 10:07:17 2022 +0200

tdf#143148 registry: Use pragma once instead of include guards

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

diff --git a/include/registry/reader.hxx b/include/registry/reader.hxx
index b804ba3ed559..27b3cb50e8d7 100644
--- a/include/registry/reader.hxx
+++ b/include/registry/reader.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_REGISTRY_READER_HXX
-#define INCLUDED_REGISTRY_READER_HXX
+#pragma once
 
 #include 
 #include 
@@ -601,6 +600,4 @@ private:
 
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/registry/refltype.hxx b/include/registry/refltype.hxx
index 5278e37c01b5..14fc81fe88a7 100644
--- a/include/registry/refltype.hxx
+++ b/include/registry/refltype.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_REGISTRY_REFLTYPE_HXX
-#define INCLUDED_REGISTRY_REFLTYPE_HXX
+#pragma once
 
 #include 
 #include 
@@ -47,6 +46,4 @@ public:
 /// specifies the calling convention for type reader/writer api
 #define TYPEREG_CALLTYPE SAL_CALL
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/registry/regdllapi.h b/include/registry/regdllapi.h
index 603eea11dba8..4a324e93cb04 100644
--- a/include/registry/regdllapi.h
+++ b/include/registry/regdllapi.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_REGISTRY_REGDLLAPI_H
-#define INCLUDED_REGISTRY_REGDLLAPI_H
+#pragma once
 
 #include 
 
@@ -28,6 +27,4 @@
 #define REG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
 #endif
 
-#endif // INCLUDED_REGISTRY_REGDLLAPI_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/registry/regtype.h b/include/registry/regtype.h
index 89fdcc940aaf..8b72931d3847 100644
--- a/include/registry/regtype.h
+++ b/include/registry/regtype.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_REGISTRY_REGTYPE_H
-#define INCLUDED_REGISTRY_REGTYPE_H
+#pragma once
 
 #include 
 #include 
@@ -136,6 +135,4 @@ enum class SAL_DLLPUBLIC_RTTI RegError
 /// specify the calling convention for the registry API
 #define REGISTRY_CALLTYPE SAL_CALL
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/registry/typereg_reader.hxx 
b/include/registry/typereg_reader.hxx
index a0af800f0527..88d683c7dd34 100644
--- a/include/registry/typereg_reader.hxx
+++ b/include/registry/typereg_reader.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_REGISTRY_READER_H
-#define INCLUDED_REGISTRY_READER_H
+#pragma once
 
 #include 
 #include 
@@ -560,6 +559,4 @@ REG_DLLPUBLIC RTReferenceType 
typereg_reader_getReferenceSort(
 REG_DLLPUBLIC void typereg_reader_getReferenceTypeName(
 void * handle, rtl_uString ** result, sal_uInt16 index);
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/registry/types.hxx b/include/registry/types.hxx
index a9763f5ea6bb..820e342a7323 100644
--- a/include/registry/types.hxx
+++ b/include/registry/types.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_REGISTRY_TYPES_H
-#define INCLUDED_REGISTRY_TYPES_H
+#pragma once
 
 #include 
 #include 
@@ -334,6 +333,4 @@ enum class RTReferenceType
 TYPE_PARAMETER
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/registry/version.h b/include/registry/version.h
index b7c066d4177f..59988d7cdcdb 100644
--- a/include/registry/version.h
+++ b/include/registry/version.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_REGISTRY_VERSION_H
-#define INCLUDED_REGISTRY_VERSION_H
+#pragma once
 
 #include 
 
@@ -64,6 +63,4 @@ enum typereg_Version {
 }
 #endif
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/source/reflcnst.hxx b/registry/source/reflcnst.hxx
index 529d02f9d68a..2c93

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - slideshow/source

[dldld (via logerrit)]

 slideshow/source/engine/opengl/TransitionerImpl.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit fc560f587dfef044046d894875d0921b1c21ee91
Author: dldld 
AuthorDate: Thu May 26 22:50:27 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jul 4 00:14:13 2022 +0200

tdf#91456 OpenGL context rendered without slide on it

When an OpenGL transition is initialized the screen might show
for a short time a black screen, because the slide was not directly
drawn onto the context and therefore a short black flash was visible
on the beginning of the silde transition.

This issue did on my side only occur, when the slide was changed
by going to a specific slide, moving to the next slide was fine, like
shown in the recorded video in the bug tracker. It seems that all
events which are going over the EventMultiplexer are not having
this flickering issue, as the moments when the drawing is
happening are different.

Change-Id: If57d9518e74d3a2ede166fd7e55ef5b290274109
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135031
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 398ceced15ee4fdd24b1f8db5e09096c3afa4804)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136534
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx 
b/slideshow/source/engine/opengl/TransitionerImpl.cxx
index f3cc33abf3f6..faef77988442 100644
--- a/slideshow/source/engine/opengl/TransitionerImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx
@@ -444,6 +444,12 @@ bool OGLTransitionerImpl::setTransition( const 
std::shared_ptr

[Libreoffice-commits] core.git: .git-blame-ignore-revs

[Chris Sherlock (via logerrit)]

 .git-blame-ignore-revs |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 591b9daf8cf89dc4e7a01cec9bf9623747094a3d
Author: Chris Sherlock 
AuthorDate: Sun Jul 3 02:47:32 2022 +1000
Commit: Stephan Bergmann 
CommitDate: Mon Jul 4 09:09:50 2022 +0200

tdf#123936 Add formatting commit to .git-blame-ignore-revs

We need to ignore commit e02a7a55c23d:

"registry: remove unnecessary comments"

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

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 7298b0ab85b6..3da2ece0c59f 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -128,4 +128,5 @@ dd6e0ab30a120512e39f0d9b2e422243deae7b5f
 4391c275df68b409a9bf7295934350bffd1abc00
 80139bf7977d2e78e3c619956813893f5933f929
 e05af8af958c9caa4bb7a4f6d8600ddf0a22c54b
-b53fa6344d033f8b8f03b9274dbdd811251c2c1a
\ No newline at end of file
+b53fa6344d033f8b8f03b9274dbdd811251c2c1a
+e02a7a55c23d23dd7afa2627a7e10c70e1cba001

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

[Miklos Vajna (via logerrit)]

 basegfx/source/tools/stringconversiontools.cxx |   15 +--
 sw/source/uibase/uno/unotxdoc.cxx  |2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

New commits:
commit 4002a399af823055b6ba59db18ded1caba4969c9
Author: Miklos Vajna 
AuthorDate: Mon Jul 4 13:05:08 2022 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 4 16:28:53 2022 +0200

sw content control, picture, lok: fix change of placeholder after insert

Commit c769c369c87a46ec877b7eefee27988044a2798f (sw content controls:
fix picture placeholders, 2022-07-01) fixed picture placeholders on the
desktop, but left the LOK case still broken.

This is a problem since picture placeholders are protected (which is
wanted), and these only allow SID_CHANGE_PICTURE, not
SID_INSERT_GRAPHIC.

Fix the problem by adapting
SwXTextDocument::executeContentControlEvent() to dispatch
SID_CHANGE_PICTURE (and not SID_INSERT_GRAPHIC), but do keep the slot ID
of the argument as SID_INSERT_GRAPHIC, since SwView::InsertGraphicDlg()
looks for a non-interactive URL as SID_INSERT_GRAPHIC even if we're
changing an image, not inserting a new one.

This means that LOK clients can't use SID_INSERT_GRAPHIC to change
picture placeholders, they have to go via
SwXTextDocument::executeContentControlEvent(), which is what
gtktiledviewer does already.

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

diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index b3f6e2e7487f..b59795d3c2a4 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3423,7 +3423,7 @@ void SwXTextDocument::executeContentControlEvent(const 
StringMap& rArguments)
 
 // The current placeholder is selected, so this will replace, not 
insert.
 SfxStringItem aItem(SID_INSERT_GRAPHIC, it->second);
-pView->GetViewFrame()->GetDispatcher()->ExecuteList(SID_INSERT_GRAPHIC,
+pView->GetViewFrame()->GetDispatcher()->ExecuteList(SID_CHANGE_PICTURE,
 
SfxCallMode::SYNCHRON, { &aItem });
 }
 else if (it->second == "date")
commit 895643431e6aea672158bae3772a36f26cd05cde
Author: Noel Grandin 
AuthorDate: Fri Jul 1 14:04:00 2022 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 4 16:28:41 2022 +0200

tdf#137544 no need to create a OUStringBuffer here

we can just pass a view here

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

diff --git a/basegfx/source/tools/stringconversiontools.cxx 
b/basegfx/source/tools/stringconversiontools.cxx
index 3a671ae539f0..79b6d604662e 100644
--- a/basegfx/source/tools/stringconversiontools.cxx
+++ b/basegfx/source/tools/stringconversiontools.cxx
@@ -50,19 +50,17 @@ namespace basegfx::internal
 {
 const sal_Int64 nStrSize = rStr.size();
 sal_Unicode aChar = io_rPos < nStrSize ? rStr[io_rPos] : 0;
-OUStringBuffer sNumberString;
+const sal_Int32 nStartPos = io_rPos;
 
 // sign
 if(aChar == '+' || aChar == '-')
 {
-sNumberString.append(rStr[io_rPos]);
 aChar = rStr[++io_rPos];
 }
 
 // numbers before point
 while('0' <= aChar && '9' >= aChar)
 {
-sNumberString.append(rStr[io_rPos]);
 io_rPos++;
 aChar = io_rPos < nStrSize ? rStr[io_rPos] : 0;
 }
@@ -70,7 +68,6 @@ namespace basegfx::internal
 // point
 if(aChar == '.')
 {
-sNumberString.append(rStr[io_rPos]);
 io_rPos++;
 aChar = io_rPos < nStrSize ? rStr[io_rPos] : 0;
 }
@@ -78,7 +75,6 @@ namespace basegfx::internal
 // numbers after point
 while ('0' <= aChar && '9' >= aChar)
 {
-sNumberString.append(rStr[io_rPos]);
 io_rPos++;
 aChar = io_rPos < nStrSize ? rStr[io_rPos] : 0;
 }
@@ -86,14 +82,12 @@ namespace basegfx::internal
 // 'e'
 if(aChar == 'e' || aChar == 'E')
 {
-sNumberString.append(rStr[io_rPos]);
 io_rPos++;
 aChar = io_rPos < nStrSize ? rStr[io_rPos] : 0;
 
 // sign for 'e'
 if(aChar == '+' || aChar == '-')
 {
-sNumberString.append(rStr[io_rPos]);
 io_rPos++;
 aChar = io_rPos < nStrSize ? rStr[io_rPos] : 0;
 }
@@ -101,16 +95,17 @@ namespace basegfx::internal
  

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |   48 
 1 file changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 2c67f40e2c2968845e423db72f41dc24f8b7a467
Author: Christian Lohmaier 
AuthorDate: Tue Jun 21 13:45:00 2022 +0200
Commit: Xisco Fauli 
CommitDate: Mon Jul 4 10:59:21 2022 +0200

allow pretty names in --enable-macosx-code/package-signing

also reorder the logic to avoid duplicating the matches for default
value and manually provided one.

Change-Id: I4466cbeaf5abd7168f21e22cd910f63568c14e24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136224
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 2f5b54ba51157a2346e10dfb82e3d434d6030aaa)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136552
Reviewed-by: Xisco Fauli 

diff --git a/configure.ac b/configure.ac
index 6134678b9c54..8e13abca6f65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3565,16 +3565,22 @@ if test $_os = Darwin; then
 
 AC_MSG_CHECKING([whether to do code signing])
 
-if test "$enable_macosx_code_signing" = yes; then
-# By default use the first suitable certificate (?).
-
-# 
http://stackoverflow.com/questions/13196291/difference-between-mac-developer-and-3rd-party-mac-developer-application
-# says that the "Mac Developer" certificate is useful just for 
self-testing. For distribution
-# outside the Mac App Store, use the "Developer ID Application" one, 
and for distribution in
-# the App Store, the "3rd Party Mac Developer" one. I think it works 
best to the
-# "Developer ID Application" one.
+if test -z "$enable_macosx_code_signing" -o "$enable_macosx_code_signing" 
== "no" ; then
+AC_MSG_RESULT([no])
+else
+if test "$enable_macosx_code_signing" = yes; then
+# By default use the first suitable certificate (?).
 
-identity=`security find-identity -p codesigning -v 2>/dev/null | grep 
'Developer ID Application:' | $AWK '{print $2}' |head -1`
+# 
http://stackoverflow.com/questions/13196291/difference-between-mac-developer-and-3rd-party-mac-developer-application
+# says that the "Mac Developer" certificate is useful just for 
self-testing. For distribution
+# outside the Mac App Store, use the "Developer ID Application" 
one, and for distribution in
+# the App Store, the "3rd Party Mac Developer" one. I think it 
works best to the
+# "Developer ID Application" one.
+identity="Developer ID Application:"
+else
+identity=$enable_macosx_code_signing
+fi
+identity=`security find-identity -p codesigning -v 2>/dev/null | $AWK 
"/$identity/{print \\$2; exit}"`
 if test -n "$identity"; then
 MACOSX_CODESIGNING_IDENTITY=$identity
 pretty_name=`security find-identity -p codesigning -v | grep 
"$MACOSX_CODESIGNING_IDENTITY" | sed -e 's/^[[^"]]*"//' -e 's/"//'`
@@ -3582,12 +3588,6 @@ if test $_os = Darwin; then
 else
 AC_MSG_ERROR([cannot determine identity to use])
 fi
-elif test -n "$enable_macosx_code_signing" -a 
"$enable_macosx_code_signing" != no ; then
-MACOSX_CODESIGNING_IDENTITY=$enable_macosx_code_signing
-pretty_name=`security find-identity -p codesigning -v | grep 
"$MACOSX_CODESIGNING_IDENTITY" | sed -e 's/^[[^"]]*"//' -e 's/"//'`
-AC_MSG_RESULT([yes, using the identity $MACOSX_CODESIGNING_IDENTITY 
for $pretty_name])
-else
-AC_MSG_RESULT([no])
 fi
 
 AC_MSG_CHECKING([whether to create a Mac App Store package])
@@ -3596,11 +3596,15 @@ if test $_os = Darwin; then
 AC_MSG_RESULT([no])
 elif test -z "$MACOSX_CODESIGNING_IDENTITY"; then
 AC_MSG_ERROR([You forgot --enable-macosx-code-signing])
-elif test "$enable_macosx_package_signing" = yes; then
-# By default use the first suitable certificate.
-# It should be a "3rd Party Mac Developer Installer" one
-
-identity=`security find-identity -v 2>/dev/null | grep '3rd Party Mac 
Developer Installer:' | awk '{print $2}' |head -1`
+else
+if test "$enable_macosx_package_signing" = yes; then
+# By default use the first suitable certificate.
+# It should be a "3rd Party Mac Developer Installer" one
+identity="3rd Party Mac Developer Installer:"
+else
+identity=$enable_macosx_package_signing
+fi
+identity=`security find-identity -v 2>/dev/null | $AWK "/$identity/ 
{print \\$2; exit}"`
 if test -n "$identity"; then
 MACOSX_PACKAGE_SIGNING_IDENTITY=$identity
 pretty_name=`security find-identity -v | grep 
"$MACOSX_PACKAGE_SIGNING_IDENTITY" | sed -e 's/^[[^"]]*"//' -e 's/"//'`
@@ -3608,10 +3612,6 @@ if test $_os = Darwin; then
 else
 AC_MSG_ERROR([Could not find any suitable '3rd Party Ma

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

[Miklos Vajna (via logerrit)]

 sw/source/filter/ww8/ww8toolbar.cxx |   92 ++--
 sw/source/filter/ww8/ww8toolbar.hxx |   32 ++--
 2 files changed, 62 insertions(+), 62 deletions(-)

New commits:
commit 3b7920043fcb42f68efae99fe290d1b759522443
Author: Miklos Vajna 
AuthorDate: Mon Jul 4 08:04:17 2022 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 4 08:46:54 2022 +0200

sw: prefix members of ww8toolbar

PlfAcd, PlfKme, PlfMcd and SwCTB

See tdf#94879 for motivation.

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

diff --git a/sw/source/filter/ww8/ww8toolbar.cxx 
b/sw/source/filter/ww8/ww8toolbar.cxx
index fb31b698ecaa..a8540849d1c3 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -374,11 +374,11 @@ bool TBDelta::Read(SvStream &rS)
 return rS.good();
 }
 
-SwCTB::SwCTB() : cbTBData( 0 )
-,iWCTBl( 0 )
-,reserved( 0 )
-,unused( 0 )
-,cCtls( 0 )
+SwCTB::SwCTB() : m_cbTBData( 0 )
+,m_iWCTBl( 0 )
+,m_reserved( 0 )
+,m_unused( 0 )
+,m_cCtls( 0 )
 {
 }
 
@@ -388,35 +388,35 @@ SwCTB::~SwCTB()
 
 bool SwCTB::IsMenuToolbar() const
 {
-return tb.IsMenuToolbar();
+return m_tb.IsMenuToolbar();
 }
 
 bool SwCTB::Read( SvStream &rS)
 {
 SAL_INFO("sw.ww8","SwCTB::Read() stream pos 0x" << std::hex << rS.Tell() );
 nOffSet = rS.Tell();
-if ( !name.Read( rS ) )
+if ( !m_name.Read( rS ) )
 return false;
-rS.ReadInt32( cbTBData );
-if ( !tb.Read( rS ) )
+rS.ReadInt32( m_cbTBData );
+if ( !m_tb.Read( rS ) )
 return false;
 for ( short index = 0; index < nVisualData; ++index )
 {
 TBVisualData aVisData;
 aVisData.Read( rS );
-rVisualData.push_back( aVisData );
+m_rVisualData.push_back( aVisData );
 }
 
-rS.ReadInt32( iWCTBl ).ReadUInt16( reserved ).ReadUInt16( unused 
).ReadInt32( cCtls );
+rS.ReadInt32( m_iWCTBl ).ReadUInt16( m_reserved ).ReadUInt16( m_unused 
).ReadInt32( m_cCtls );
 
-if ( cCtls )
+if ( m_cCtls )
 {
-for ( sal_Int32 index = 0; index < cCtls; ++index )
+for ( sal_Int32 index = 0; index < m_cCtls; ++index )
 {
 SwTBC aTBC;
 if ( !aTBC.Read( rS ) )
 return false;
-rTBC.push_back( aTBC );
+m_rTBC.push_back( aTBC );
 }
 }
 return rS.good();
@@ -427,7 +427,7 @@ bool SwCTB::ImportCustomToolBar( SwCTBWrapper& rWrapper, 
CustomToolBarImportHelp
 bool bRes = false;
 try
 {
-if ( !tb.IsEnabled() )
+if ( !m_tb.IsEnabled() )
 return true;  // didn't fail, just ignoring
 // Create default setting
 uno::Reference< container::XIndexContainer > xIndexContainer( 
helper.getCfgManager()->createSettings(), uno::UNO_SET_THROW );
@@ -435,10 +435,10 @@ bool SwCTB::ImportCustomToolBar( SwCTBWrapper& rWrapper, 
CustomToolBarImportHelp
 uno::Reference< beans::XPropertySet > xProps( xIndexContainer, 
uno::UNO_QUERY_THROW );
 
 // set UI name for toolbar
-xProps->setPropertyValue( "UIName", uno::Any( name.getString() ) );
+xProps->setPropertyValue( "UIName", uno::Any( m_name.getString() ) );
 
-const OUString sToolBarName = "private:resource/toolbar/custom_" + 
name.getString();
-for ( auto& rItem : rTBC )
+const OUString sToolBarName = "private:resource/toolbar/custom_" + 
m_name.getString();
+for ( auto& rItem : m_rTBC )
 {
 // createToolBar item for control
 if ( !rItem.ImportToolBarControl( rWrapper, xIndexContainer, 
helper, IsMenuToolbar() ) )
@@ -468,7 +468,7 @@ bool SwCTB::ImportCustomToolBar( SwCTBWrapper& rWrapper, 
CustomToolBarImportHelp
 
 bool SwCTB::ImportMenuTB( SwCTBWrapper& rWrapper, const css::uno::Reference< 
css::container::XIndexContainer >& xIndexContainer, CustomToolBarImportHelper& 
rHelper )
 {
-for ( auto& rItem : rTBC )
+for ( auto& rItem : m_rTBC )
 {
 // createToolBar item for control
 if ( !rItem.ImportToolBarControl( rWrapper, xIndexContainer, rHelper, 
true ) )
@@ -746,7 +746,7 @@ bool Tcg255SubStruct::Read(SvStream &rS)
 }
 
 PlfMcd::PlfMcd()
-: iMac(0)
+: m_iMac(0)
 {
 }
 
@@ -755,21 +755,21 @@ bool PlfMcd::Read(SvStream &rS)
 SAL_INFO("sw.ww8","PffMcd::Read() stream pos 0x" << std::hex << rS.Tell() 
);
 nOffSet = rS.Tell();
 Tcg255SubStruct::Read( rS );
-rS.ReadInt32( iMac );
-if (iMac < 0)
+rS.ReadInt32( m_iMac );
+if (m_iMac < 0)
 return false;
 auto nMaxPossibleRecords = rS.remainingSize() / 24 /*sizeof MCD*/;
-if (o3tl::make_unsigned(iMac) > nMaxPossibleRecords)
+if (o3tl::make_unsigned(m_iMac) > nMaxPossibleRecords)
 {
-SAL_WARN("sw.ww8", iMac << " records claimed, but max possible is " << 
nMaxPossibleRecords);
-   

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

[Noel Grandin (via logerrit)]

 xmloff/source/core/xmlimp.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d30810b5a116816fe8a6d3341aa98e43adc56de2
Author: Noel Grandin 
AuthorDate: Mon Jul 4 14:08:53 2022 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 4 15:37:36 2022 +0200

dont instantiate TextImport unless we need it

speeds up loading XColorList and related UI elements

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

diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 3d9cb9f1edb1..873f557f8982 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -598,7 +598,8 @@ void SAL_CALL SvXMLImport::endDocument()
 //  #i9518# All the stuff that accesses the document has to be done here, 
not in the dtor,
 //  because the SvXMLImport dtor might not be called until after the 
document has been closed.
 
-GetTextImport()->MapCrossRefHeadingFieldsHorribly();
+if (mxTextImport)
+mxTextImport->MapCrossRefHeadingFieldsHorribly();
 
 if (mpImpl->mpRDFaHelper)
 {

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - include/svx sd/qa sd/source svx/sdi svx/source

[Miklos Vajna (via logerrit)]

 include/svx/ColorSets.hxx   |   19 +++
 sd/qa/unit/uiimpress.cxx|   40 
 sd/source/ui/func/fuconstr.cxx  |   39 +++
 sd/source/ui/view/drviewse.cxx  |5 +
 svx/sdi/svx.sdi |2 +-
 svx/source/styles/ColorSets.cxx |   10 ++
 6 files changed, 114 insertions(+), 1 deletion(-)

New commits:
commit fc4ab8cf4ad74fb8b84ca94800802c47d7efc2ff
Author: Miklos Vajna 
AuthorDate: Mon Jun 20 09:46:44 2022 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 4 08:09:48 2022 +0200

sd theme: consider accent1 color when inserting shape with solid fill

Once a theme is defined for the master page of the current slide,
PowerPoint inserts a shapes with their fill color & line color set based
on that theme (so this color is master-page-specific), while Impress
sets the fill & line color based on the default shape style.

The Impress behavior has the benefit of doing the usual style-based
formatting, but now a document-level style overwrites a
(master-)slide-specific theme, which is inconsistent.

Fix the problem by extending sd::FuConstruct::SetStyleSheet(): if we
construct a shape with fill, then not only apply the style sheet, but
also set the fill & line color based on the theme (if there is any).

Note that this works both in case the shape is instantly created on
click (LOK case) or when the user first draws a top-left -> bottom-right
point pair to define the position / size of the shape. At the same time
line colors don't support themes yet, so that color is just a plain value
for now.

(cherry picked from commit 486810603fb3f84847bb549004ed0394a2e22d0b)

Conflicts:
sd/qa/unit/uiimpress.cxx

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

diff --git a/include/svx/ColorSets.hxx b/include/svx/ColorSets.hxx
index ac9008cbeb32..6ad59a50c064 100644
--- a/include/svx/ColorSets.hxx
+++ b/include/svx/ColorSets.hxx
@@ -69,6 +69,23 @@ public:
 const ColorSet& getColorSet(std::u16string_view rName);
 };
 
+/// Offsets into the color list of a theme.
+enum class ThemeColorType
+{
+DK1 = 0,
+LT1 = 1,
+DK2 = 2,
+LT2 = 3,
+ACCENT1 = 4,
+ACCENT2 = 5,
+ACCENT3 = 6,
+ACCENT4 = 7,
+ACCENT5 = 8,
+ACCENT6 = 9,
+HLINK = 10,
+FOLHLINK = 11,
+};
+
 /// A named theme has a named color set.
 class SVXCORE_DLLPUBLIC Theme
 {
@@ -94,6 +111,8 @@ public:
 void UpdateSdrPage(SdrPage* pPage);
 
 std::vector GetColors() const;
+
+Color GetColor(ThemeColorType eType) const;
 };
 
 } // end of namespace svx
diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx
index 283753f339c8..9b58251ffc93 100644
--- a/sd/qa/unit/uiimpress.cxx
+++ b/sd/qa/unit/uiimpress.cxx
@@ -16,6 +16,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -44,6 +46,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -957,6 +960,43 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testFillColorTheme)
 CPPUNIT_ASSERT_EQUAL(static_cast(6000), nFillColorLumOff);
 }
 
+CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testThemeShapeInsert)
+{
+// Given a document with a theme, accent1 color is set to 0x04:
+mxComponent = loadFromDesktop("private:factory/simpress",
+  
"com.sun.star.presentation.PresentationDocument");
+uno::Reference 
xDrawPagesSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
+ uno::UNO_QUERY);
+uno::Reference xMasterPageTarget(xDrawPage, 
uno::UNO_QUERY);
+uno::Reference 
xMasterPage(xMasterPageTarget->getMasterPage(),
+uno::UNO_QUERY);
+comphelper::SequenceAsHashMap aMap;
+aMap["Name"] <<= OUString("mytheme");
+aMap["ColorSchemeName"] <<= OUString("mycolorscheme");
+uno::Sequence aColorScheme
+= { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb };
+aMap["ColorScheme"] <<= aColorScheme;
+uno::Any aTheme(aMap.getAsConstPropertyValueList());
+xMasterPage->setPropertyValue("Theme", aTheme);
+
+// When inserting a shape:
+uno::Sequence aArgs = {
+comphelper::makePropertyValue("CreateDirectly", true),
+};
+dispatchCommand(mxComponent, ".uno:BasicShapes.round-rectangle", aArgs);
+
+// Then make sure the that fill color of the last shape is the accent1 
color:
+sal_Int32 nShapeIndex = xDrawPage->getCount() - 1;
+uno::Reference 
xShape(xDrawPage->getByIndex(nShapeIndex), uno::UNO_QUERY);
+sal_Int32 nFillColor{};
+xShape->getPropertyValue("FillColor") >>= 

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter3.cxx |   27 ---
 sw/qa/extras/uiwriter/uiwriter6.cxx |   18 ++
 2 files changed, 18 insertions(+), 27 deletions(-)

New commits:
commit de59dbdc488122f70229550dba21ba76e2c61146
Author: Xisco Fauli 
AuthorDate: Mon Jul 4 13:54:05 2022 +0200
Commit: Xisco Fauli 
CommitDate: Mon Jul 4 16:12:52 2022 +0200

sw_uiwriter: simplify autocorrect test

In preparation for https://gerrit.libreoffice.org/c/core/+/136727
Also put this test with the rest of autocorrect tests

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

diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index e3127c2e3d1f..54cbcb42863a 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -1484,33 +1484,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks)
 }
 }
 
-CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf139922)
-{
-SwDoc* const pDoc = createSwDoc();
-SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
-
-pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_RETURN);
-Scheduler::ProcessEventsToIdle();
-
-SwWrtShell* const pWrtSh = pDoc->GetDocShell()->GetWrtShell();
-CPPUNIT_ASSERT(pWrtSh);
-
-pWrtSh->Insert("this _is_ a SEntence. this _is_ a SEntence.");
-
-CPPUNIT_ASSERT_EQUAL(OUString("this _is_ a SEntence. this _is_ a 
SEntence."),
- getParagraph(2)->getString());
-
-//apply autocorrect StartAutoCorrect
-dispatchCommand(mxComponent, ".uno:AutoFormatApply", {});
-Scheduler::ProcessEventsToIdle();
-
-// Without the fix in place, this test would have failed with
-// - Expected: This is a Sentence. This is a Sentence.
-// - Actual  : this is a Sentence. This is a Sentence.
-CPPUNIT_ASSERT_EQUAL(OUString("This is a Sentence. This is a Sentence."),
- getParagraph(2)->getString());
-}
-
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf125261)
 {
 createSwDoc(DATA_DIRECTORY, "tdf125261.odt");
diff --git a/sw/qa/extras/uiwriter/uiwriter6.cxx 
b/sw/qa/extras/uiwriter/uiwriter6.cxx
index b7187568cff4..e52e16abba71 100644
--- a/sw/qa/extras/uiwriter/uiwriter6.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter6.cxx
@@ -1874,6 +1874,24 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf74363)
 CPPUNIT_ASSERT_EQUAL(OUString("Testing "), getParagraph(1)->getString());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf139922)
+{
+createSwDoc();
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_RETURN);
+Scheduler::ProcessEventsToIdle();
+
+emulateTyping(*pTextDoc, u"this is a SEntence. this is a SEntence.");
+
+// Without the fix in place, this test would have failed with
+// - Expected: This is a Sentence. This is a Sentence.
+// - Actual  : this is a Sentence. This is a Sentence.
+CPPUNIT_ASSERT_EQUAL(OUString("This is a Sentence. This is a Sentence."),
+ getParagraph(2)->getString());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf143176)
 {
 // Hungarian test document with right-to-left paragraph setting

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

[Miklos Vajna (via logerrit)]

 sw/source/core/text/porfld.cxx |2 +-
 sw/source/core/text/porfld.hxx |3 +++
 sw/source/core/text/txtfld.cxx |7 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 5abd089d601fb745735ad784c1be48a30bdb0a40
Author: Miklos Vajna 
AuthorDate: Mon Jul 4 09:19:35 2022 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 4 13:05:06 2022 +0200

sw content controls, checkbox: reduce left vs right amount of shading 
mismatch

This was a visual problem with all content controls, but most visible
with short ones, like checkbox.

A content control's layout starts with a field portion (shaded),
followed by a content control portion (also shaded). The shading around
the checkbox character is not balanced, the left side has more shading.

Half of the additional shading is caused by shading for the field
portion: avoid this in case we know where will be a content control
portion after the field portion.

The result is not perfect, but the left/right mismatch for the amount of
shading around the checkbox is much better this way.

(cherry picked from commit 0203485a7f7dd85f8d3e04ce91579051aa89d26a)

Conflicts:
sw/source/core/text/porfld.hxx

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

diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 6ef492c1b9d5..413e8e4d4171 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -441,7 +441,7 @@ void SwFieldPortion::Paint( const SwTextPaintInfo &rInf ) 
const
 SwFontSave aSave( rInf, m_pFont.get() );
 
 //OSL_ENSURE(GetLen() <= TextFrameIndex(1), "SwFieldPortion::Paint: 
rest-portion pollution?");
-if( Width() && ( !m_bPlaceHolder || 
rInf.GetOpt().IsShowPlaceHolderFields() ) )
+if( Width() && ( !m_bPlaceHolder || 
rInf.GetOpt().IsShowPlaceHolderFields() ) && !m_bContentControl )
 {
 // A very liberal use of the background
 rInf.DrawViewOpt( *this, PortionType::Field );
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 519e56f8f58c..ec4757d56ea9 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -52,6 +52,7 @@ protected:
 bool m_bReplace : 1;  // Used by SwGrfNumPortion
 const bool m_bPlaceHolder : 1;
 bool m_bNoLength : 1;   // HACK for meta suffix (no CH_TXTATR)
+bool m_bContentControl = false;
 
 void SetFont( std::unique_ptr pNew ) { m_pFont = std::move(pNew); }
 bool IsNoLength() const  { return m_bNoLength; }
@@ -107,6 +108,8 @@ public:
 
 // Accessibility: pass information about this portion to the PortionHandler
 virtual void HandlePortion( SwPortionHandler& rPH ) const override;
+
+void SetContentControl(bool bContentControl) { m_bContentControl = 
bContentControl; }
 };
 
 /**
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index fc25dc4e9880..efb8d2926bc4 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -406,7 +406,12 @@ SwLinePortion *SwTextFormatter::NewExtraPortion( 
SwTextFormatInfo &rInf )
 }
 if( !pRet )
 {
-pRet = new SwFieldPortion( "" );
+auto pFieldPortion = new SwFieldPortion( "" );
+if (pHint->Which() == RES_TXTATR_CONTENTCONTROL)
+{
+pFieldPortion->SetContentControl(true);
+}
+pRet = pFieldPortion;
 rInf.SetLen(TextFrameIndex(1));
 }
 return pRet;

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

[Noel Grandin (via logerrit)]

 editeng/source/uno/unotext.cxx |3 ++-
 xmloff/source/draw/shapeimport.cxx |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit ac33020ea870fc137fd8ee80cbd6c79310b260ad
Author: Noel Grandin 
AuthorDate: Fri Jul 1 14:04:34 2022 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 4 15:12:32 2022 +0200

tdf#137544 avoid some temporary OUString

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

diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index bf085c647c0e..14a7c9f9ef04 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -1822,7 +1822,8 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( 
const uno::Reference< text
 aRange.nEndPos  = aRange.nStartPos;
 
 pRange->SetSelection( aRange );
-pRange->setString( "\x0D" );
+static constexpr OUStringLiteral CR = u"\x0D";
+pRange->setString( CR );
 
 aRange.nStartPos = 0;
 aRange.nStartPara += 1;
diff --git a/xmloff/source/draw/shapeimport.cxx 
b/xmloff/source/draw/shapeimport.cxx
index 930051b2aeec..1a21953f39ff 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -466,7 +466,8 @@ void XMLShapeImportHelper::addShape( uno::Reference< 
drawing::XShape >& rShape,
 uno::Reference xPropertySet(rShape, 
uno::UNO_QUERY);
 if (xPropertySet.is())
 {
-xPropertySet->setPropertyValue("HandlePathObjScale", 
uno::Any(true));
+static constexpr OUStringLiteral sHandlePathObjScale = 
u"HandlePathObjScale";
+xPropertySet->setPropertyValue(sHandlePathObjScale, 
uno::Any(true));
 }
 }
 }

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 6124dccb7bb20688f98f5517c2604f510dd6f4fb
Author: Olivier Hallot 
AuthorDate: Mon Jul 4 12:55:57 2022 -0300
Commit: Gerrit Code Review 
CommitDate: Mon Jul 4 17:55:57 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5a91be35bf16757602aa1600a0c154bd5560b2bf
  - tdf#149846 tdf#149759 Update CSV import Help page

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

diff --git a/helpcontent2 b/helpcontent2
index 95301198e151..5a91be35bf16 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 95301198e1518884a318bf24a1adbd8fa883a412
+Subproject commit 5a91be35bf16757602aa1600a0c154bd5560b2bf

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

[Michael Weghorn (via logerrit)]

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

New commits:
commit bf731dedfad5f498e4eebdc9fbf776c6e10eafce
Author: Michael Weghorn 
AuthorDate: Fri Jul 1 13:58:07 2022 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 4 14:18:42 2022 +0200

tdf#149804 Set default listbox bg color to white

This restores white background color for list/combo boxes
for the the "gen" VCL plugin after

commit 3c6a53b9ce64180b2a03e097c1844f7496f26815
Date:   Sat Apr 17 14:49:43 2021 +0200

improve the look of the macOS combobox

Other VCL plugins and Windows, which use the system style,
are covered in
Change-Id I31401af38b991e7e0cdc436b894ee0f491a22752,
"tdf#149804 Set newly introduced list box colors from system colors".

macOS Should be unaffected by this change of the default color,
since it explicitly sets one in `AquaSalFrame::UpdateSettings`.

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

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 82093fcf2d65..bed7e4c90a62 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -700,7 +700,7 @@ void ImplStyleData::SetStandardStyles()
 maMenuBarRolloverColor  = COL_BLUE;
 maMenuBorderColor   = COL_LIGHTGRAY;
 maMenuTextColor = COL_BLACK;
-maListBoxWindowBackgroundColor = COL_LIGHTGRAY;
+maListBoxWindowBackgroundColor = COL_WHITE;
 maListBoxWindowTextColor= COL_BLACK;
 maListBoxWindowHighlightColor = COL_BLUE;
 maListBoxWindowHighlightTextColor = COL_WHITE;

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

[Andreas Heinisch (via logerrit)]

 sw/source/ui/misc/outline.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d6a363d83011ce3f195b96816e25dd749772cc24
Author: Andreas Heinisch 
AuthorDate: Mon Jul 4 13:53:15 2022 +0200
Commit: Andreas Heinisch 
CommitDate: Mon Jul 4 15:03:55 2022 +0200

tdf#131568 - Chapter numbering dialog: sort list of character styles

Change-Id: Ibe6830a7d3fdd35c4d8e6fa2b7c0007fa318083a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136798
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch 

diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 3c1345f308ae..533028ebe09b 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -409,6 +409,7 @@ 
SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(weld::Container* pPage, weld:
 m_xPrefixED->connect_changed(LINK(this,   SwOutlineSettingsTabPage, 
DelimModify));
 m_xSuffixED->connect_changed(LINK(this,   SwOutlineSettingsTabPage, 
DelimModify));
 m_xStartEdit->connect_value_changed(LINK(this,  SwOutlineSettingsTabPage, 
StartModified));
+m_xCharFormatLB->make_sorted();
 m_xCharFormatLB->connect_changed(LINK(this,  SwOutlineSettingsTabPage, 
CharFormatHdl));
 }
 

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

[Miklos Vajna (via logerrit)]

 sw/source/core/text/porfld.cxx |2 +-
 sw/source/core/text/porfld.hxx |3 +++
 sw/source/core/text/txtfld.cxx |7 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 0203485a7f7dd85f8d3e04ce91579051aa89d26a
Author: Miklos Vajna 
AuthorDate: Mon Jul 4 09:19:35 2022 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 4 10:08:30 2022 +0200

sw content controls, checkbox: reduce left vs right amount of shading 
mismatch

This was a visual problem with all content controls, but most visible
with short ones, like checkbox.

A content control's layout starts with a field portion (shaded),
followed by a content control portion (also shaded). The shading around
the checkbox character is not balanced, the left side has more shading.

Half of the additional shading is caused by shading for the field
portion: avoid this in case we know where will be a content control
portion after the field portion.

The result is not perfect, but the left/right mismatch for the amount of
shading around the checkbox is much better this way.

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

diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 03c3750cabbf..e0e75780cdb7 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -441,7 +441,7 @@ void SwFieldPortion::Paint( const SwTextPaintInfo &rInf ) 
const
 SwFontSave aSave( rInf, m_pFont.get() );
 
 //OSL_ENSURE(GetLen() <= TextFrameIndex(1), "SwFieldPortion::Paint: 
rest-portion pollution?");
-if( Width() && ( !m_bPlaceHolder || 
rInf.GetOpt().IsShowPlaceHolderFields() ) )
+if( Width() && ( !m_bPlaceHolder || 
rInf.GetOpt().IsShowPlaceHolderFields() ) && !m_bContentControl )
 {
 // A very liberal use of the background
 rInf.DrawViewOpt( *this, PortionType::Field );
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index b4c6865dabdb..45a2027b4e74 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -52,6 +52,7 @@ protected:
 bool m_bReplace : 1;  // Used by SwGrfNumPortion
 const bool m_bPlaceHolder : 1;
 bool m_bNoLength : 1;   // HACK for meta suffix (no CH_TXTATR)
+bool m_bContentControl = false;
 
 void SetFont( std::unique_ptr pNew ) { m_pFont = std::move(pNew); }
 bool IsNoLength() const  { return m_bNoLength; }
@@ -108,6 +109,8 @@ public:
 // Accessibility: pass information about this portion to the PortionHandler
 virtual void HandlePortion( SwPortionHandler& rPH ) const override;
 
+void SetContentControl(bool bContentControl) { m_bContentControl = 
bContentControl; }
+
 void dumpAsXml(xmlTextWriterPtr pWriter, const OUString& rText,
TextFrameIndex& nOffset) const override;
 };
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index f935e8d8ab93..d9727deabeec 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -406,7 +406,12 @@ SwLinePortion *SwTextFormatter::NewExtraPortion( 
SwTextFormatInfo &rInf )
 }
 if( !pRet )
 {
-pRet = new SwFieldPortion( "" );
+auto pFieldPortion = new SwFieldPortion( "" );
+if (pHint->Which() == RES_TXTATR_CONTENTCONTROL)
+{
+pFieldPortion->SetContentControl(true);
+}
+pRet = pFieldPortion;
 rInf.SetLen(TextFrameIndex(1));
 }
 return pRet;

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 2 commits - sd/qa sd/source

[Miklos Vajna (via logerrit)]

 sd/qa/unit/uiimpress.cxx   |   15 +++
 sd/source/ui/view/drviews2.cxx |   35 +++
 2 files changed, 34 insertions(+), 16 deletions(-)

New commits:
commit 424fc806a0b96343bec8c74aef7dfc14eda2618d
Author: Miklos Vajna 
AuthorDate: Wed Jun 29 08:55:17 2022 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 4 08:10:26 2022 +0200

tdf#149748 sd theme: fix crash on selecting none from color bar

Opening Impress, going to view -> color bar to enable it and then
clicking on "none" resulted in a crash.

This went wrong in commit f5db3b12ae1cd3bfe6ee5d260aec9532cc65f2dc (sd
theme: add UI (sidebar) for shape fill color, 2022-04-06), where I
assumed that in case the slot is a SID_ATTR_FILL_COLOR, then its item
set also has a SID_ATTR_FILL_COLOR key. This is usually true, but not in
case of "no color" (i.e. transparent).

Fix the problem by just skipping theming metadata for such a color.

It seems to me that the color set of a theme is not allowed to contain
such "no color" colors, so this should be safe.

(cherry picked from commit c09eb0f74c0a110e4a4cfc4783b59883aad30475)

Conflicts:
sd/qa/unit/uiimpress.cxx

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

diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx
index 9b58251ffc93..23fabc297d86 100644
--- a/sd/qa/unit/uiimpress.cxx
+++ b/sd/qa/unit/uiimpress.cxx
@@ -960,6 +960,21 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testFillColorTheme)
 CPPUNIT_ASSERT_EQUAL(static_cast(6000), nFillColorLumOff);
 }
 
+CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testFillColorNoColor)
+{
+// Given an empty Impress document:
+mxComponent = loadFromDesktop("private:factory/simpress",
+  
"com.sun.star.presentation.PresentationDocument");
+auto pImpressDocument = 
dynamic_cast(mxComponent.get());
+sd::ViewShell* pViewShell = 
pImpressDocument->GetDocShell()->GetViewShell();
+SfxDispatcher* pDispatcher = pViewShell->GetViewFrame()->GetDispatcher();
+
+// When dispatching a fill color that only has a fill style (no color), 
then make sure we don't
+// crash:
+XFillStyleItem aXFillStyleItem(drawing::FillStyle_NONE);
+pDispatcher->ExecuteList(SID_ATTR_FILL_COLOR, SfxCallMode::RECORD, { 
&aXFillStyleItem });
+}
+
 CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testThemeShapeInsert)
 {
 // Given a document with a theme, accent1 color is set to 0x04:
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 02a3e3364c1c..5ca1f2d9c50a 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -598,24 +598,26 @@ public:
 {
 // Merge the color parameters to the color itself.
 const XFillColorItem* pColorItem = static_cast(pArgs->GetItem(SID_ATTR_FILL_COLOR));
-assert(pColorItem);
-XFillColorItem aColorItem(*pColorItem);
-if (pArgs->GetItemState(SID_ATTR_COLOR_THEME_INDEX, false, &pItem) 
== SfxItemState::SET)
+if (pColorItem)
 {
-auto pIntItem = static_cast(pItem);
-aColorItem.GetThemeColor().SetThemeIndex(pIntItem->GetValue());
-}
-if (pArgs->GetItemState(SID_ATTR_COLOR_LUM_MOD, false, &pItem) == 
SfxItemState::SET)
-{
-auto pIntItem = static_cast(pItem);
-aColorItem.GetThemeColor().SetLumMod(pIntItem->GetValue());
-}
-if (pArgs->GetItemState(SID_ATTR_COLOR_LUM_OFF, false, &pItem) == 
SfxItemState::SET)
-{
-auto pIntItem = static_cast(pItem);
-aColorItem.GetThemeColor().SetLumOff(pIntItem->GetValue());
+XFillColorItem aColorItem(*pColorItem);
+if (pArgs->GetItemState(SID_ATTR_COLOR_THEME_INDEX, false, 
&pItem) == SfxItemState::SET)
+{
+auto pIntItem = static_cast(pItem);
+
aColorItem.GetThemeColor().SetThemeIndex(pIntItem->GetValue());
+}
+if (pArgs->GetItemState(SID_ATTR_COLOR_LUM_MOD, false, &pItem) 
== SfxItemState::SET)
+{
+auto pIntItem = static_cast(pItem);
+aColorItem.GetThemeColor().SetLumMod(pIntItem->GetValue());
+}
+if (pArgs->GetItemState(SID_ATTR_COLOR_LUM_OFF, false, &pItem) 
== SfxItemState::SET)
+{
+auto pIntItem = static_cast(pItem);
+aColorItem.GetThemeColor().SetLumOff(pIntItem->GetValue());
+}
+pArgs->Put(aColorItem);
 }
-pArgs->Put(aColorItem);
 }
 }
 }
commit b16f2e3a39255dcb3e8cb064c8

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

[Attila Szűcs (via logerrit)]

 sw/qa/core/text/data/tdf43100_tdf120715_cursorOnSpacesOverMargin.docx |binary
 sw/qa/core/text/text.cxx  |   68 
++
 sw/source/core/text/guess.cxx |   10 +
 sw/source/core/text/guess.hxx |4 
 sw/source/core/text/itrcrsr.cxx   |   48 
+++
 sw/source/core/text/itrpaint.cxx  |1 
 sw/source/core/text/itrtxt.hxx|1 
 sw/source/core/text/porlin.hxx|7 -
 sw/source/core/text/portxt.cxx|   20 ++
 sw/source/core/text/portxt.hxx|1 
 10 files changed, 132 insertions(+), 28 deletions(-)

New commits:
commit 690d4eb71509649ad147cfe60f5b97e2cfaaa519
Author: Attila Szűcs 
AuthorDate: Wed Jun 15 09:16:32 2022 +0200
Commit: László Németh 
CommitDate: Mon Jul 4 15:34:57 2022 +0200

tdf#43100 tdf#104683 tdf#120715 sw: cursor on spaces over margin

Allow cursor movement on spaces over margin (or clicking it
it to position the cursor), like MSO does instead of stopping
cursor before the stripped (from the typesetting) spaces.
This way it's possible to follow the modification of these
characters, e.g. removing spaces or inserting other characters
at the cursor position.

Follow-up to commit 8741fd0e0ae9e346de2e09887f0668b831c9b48b
"tdf#43244 sw: show stripped line-end spaces on margin".

Details: extend SwHolePortion to calculate its width,
that can be used for cursor movement, even over the right
margin. Removed some code that not allowed cursor to be
positioned over the right margin. Layout calculation uses
m_nWidth variable (that was 0) to make frames. To keep the
layout unchanged, this new width calculated into m_nExtraBlankWidth 
temporarily, and this extra width is added to m_nWidth only
after the layout calculation is finished. (Ideally this 2 width
values could be stored and used separately, but that would require
a bigger refactor of the cursor calculation.)

Known regression: lost selection at Search & Replace, e.g. searching
double spaces: there was a narrow selection at end of the line
showing the position.

Other issues: when a different character inserted on the margin
resulting new line break, space formatting marks aren't updated
according to the less spaces. Removing the inserted character by
Backspace results losing of the cursor movement on the spaces.

Co-authored-by: Tibor Nagy (NISZ)

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

diff --git 
a/sw/qa/core/text/data/tdf43100_tdf120715_cursorOnSpacesOverMargin.docx 
b/sw/qa/core/text/data/tdf43100_tdf120715_cursorOnSpacesOverMargin.docx
new file mode 100644
index ..474d805d893e
Binary files /dev/null and 
b/sw/qa/core/text/data/tdf43100_tdf120715_cursorOnSpacesOverMargin.docx differ
diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx
index 2db4d6dab348..99d80f649fef 100644
--- a/sw/qa/core/text/text.cxx
+++ b/sw/qa/core/text/text.cxx
@@ -470,6 +470,74 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testRedlineDelete)
  
pDoc->getIDocumentRedlineAccess().GetRedlineTable().size());
 }
 
+CPPUNIT_TEST_FIXTURE(SwCoreTextTest, 
testTdf120715_CursorMoveWhenTypingSpaceAtCenteredLineEnd)
+{
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, 
"tdf43100_tdf120715_cursorOnSpacesOverMargin.docx");
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+// Make a paint to force the call of AddExtraBlankWidth, that calculate 
width for holePortions.
+pDoc->GetDocShell()->GetPreviewBitmap();
+
+// Move the cursor to the last character of the document.
+pWrtShell->EndOfSection();
+
+//Press space and check if the cursor move right with the additional space.
+sal_Int32 nOldCursorPos = pWrtShell->GetCharRect().Left();
+pWrtShell->Insert(" ");
+sal_Int32 nNewCursorPos = pWrtShell->GetCharRect().Left();
+CPPUNIT_ASSERT_GREATER(nOldCursorPos, nNewCursorPos);
+}
+
+CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf43100_CursorMoveToSpacesOverMargin)
+{
+// Test the cursor movement over the right margin in several different 
paragraphs.
+// These differences are based on its paragraphs
+// - alignment (left, center, right, justified),
+// - line count (1 line, 2 lines, blank line containing only spaces)
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, 
"tdf43100_tdf120715_cursorOnSpacesOverMargin.docx");
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+// Make a paint to force the call of AddExtraBlankWidth, that ca

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

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/executor.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 36c6981f81fd929ad355c35bbf69b35c77720efc
Author: Szymon Kłos 
AuthorDate: Tue Jun 28 13:11:42 2022 +0200
Commit: Gökay ŞATIR 
CommitDate: Mon Jul 4 16:10:38 2022 +0200

jsdialog: add open/close instead of toggle menu from dropdown

it will make us sure we don't reopen popup when we just toggle
so we will be in sync

Change-Id: I014e824a29d91d5972a6840246bcd4c31d24ae48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136571
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Gökay ŞATIR 

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 8d3dd2d876d1..1b13cbeafe79 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -248,6 +248,18 @@ bool ExecuteAction(const std::string& nWindowId, const 
OString& rWidget, StringM
 pToolbar->set_menu_item_active(sId, !bIsActive);
 return true;
 }
+else if (sAction == "closemenu")
+{
+OString sId = OUStringToOString(rData["data"], 
RTL_TEXTENCODING_ASCII_US);
+pToolbar->set_menu_item_active(sId, false);
+return true;
+}
+else if (sAction == "openmenu")
+{
+OString sId = OUStringToOString(rData["data"], 
RTL_TEXTENCODING_ASCII_US);
+pToolbar->set_menu_item_active(sId, true);
+return true;
+}
 }
 }
 else if (sControlType == "edit")

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

[Heiko Tietze (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +-
 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit de6f30bc459ba600193c0998b285afcfe0936c3e
Author: Heiko Tietze 
AuthorDate: Fri Jul 1 11:35:49 2022 +0200
Commit: Heiko Tietze 
CommitDate: Mon Jul 4 17:53:04 2022 +0200

Resolves tdf#133023 - Autocorrect "Automatic *bold*..." off by default

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 8dd15b7ca8c7..8f12cf4a1218 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1323,7 +1323,7 @@
   _underline_).
   Apply bold, italics, strikeout or underline
 
-true
+false
   
   
 

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

[Pedro Pinto Silva (via logerrit)]

 cui/uiconfig/ui/toolbarmodedialog.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c1743dc6f610db557de1a4fd31ce8c0f090f4c52
Author: Pedro Pinto Silva 
AuthorDate: Fri Jul 1 15:33:22 2022 +0200
Commit: Andras Timar 
CommitDate: Mon Jul 4 16:55:52 2022 +0200

Rename UI Variant from Standard Toolbar to Compact

To be more in-tune with COnline options

Signed-off-by: Pedro Pinto Silva 
Change-Id: I38c4d1639dbf7d726fb8c3d784a298cd01a97201
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136743
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/cui/uiconfig/ui/toolbarmodedialog.ui 
b/cui/uiconfig/ui/toolbarmodedialog.ui
index d401f75edf73..58b399680760 100644
--- a/cui/uiconfig/ui/toolbarmodedialog.ui
+++ b/cui/uiconfig/ui/toolbarmodedialog.ui
@@ -108,7 +108,7 @@
 3
 
   
-Standard Toolbar
+Compact
 True
 True
 False

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

[Noel Grandin (via logerrit)]

 svx/source/unodraw/unopage.cxx  |9 ++---
 svx/source/unodraw/unoshape.cxx |   18 ++
 2 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 3e8f89f80ca0405c01d9b068ca9e85328e87404b
Author: Noel Grandin 
AuthorDate: Fri Jul 1 14:04:24 2022 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 4 15:49:04 2022 +0200

tdf#137544 avoid some dynamic_cast cost

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

diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index ee91c36c9afe..96ab565f1c68 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -516,8 +516,9 @@ SdrObject* SvxDrawPage::CreateSdrObject_(const Reference< 
drawing::XShape > & xS
 if (!pNewObj)
 return nullptr;
 
-if( auto pScene = dynamic_cast(pNewObj) )
+if( nType == SdrObjKind::E3D_Scene )
 {
+auto pScene = static_cast(pNewObj);
 // initialise scene
 
 double fW = static_cast(aSize.Width);
@@ -534,8 +535,9 @@ SdrObject* SvxDrawPage::CreateSdrObject_(const Reference< 
drawing::XShape > & xS
 
 pScene->SetBoundAndSnapRectsDirty();
 }
-else if(auto pObj = dynamic_cast(pNewObj))
+else if(nType == SdrObjKind::E3D_Extrusion)
 {
+auto pObj = static_cast(pNewObj);
 basegfx::B2DPolygon aNewPolygon;
 aNewPolygon.append(basegfx::B2DPoint(0.0, 0.0));
 aNewPolygon.append(basegfx::B2DPoint(0.0, 1.0));
@@ -546,8 +548,9 @@ SdrObject* SvxDrawPage::CreateSdrObject_(const Reference< 
drawing::XShape > & xS
 // #107245# pObj->SetExtrudeCharacterMode(sal_True);
 pObj->SetMergedItem(Svx3DCharacterModeItem(true));
 }
-else if(auto pLatheObj = dynamic_cast(pNewObj))
+else if(nType == SdrObjKind::E3D_Lathe)
 {
+auto pLatheObj = static_cast(pNewObj);
 basegfx::B2DPolygon aNewPolygon;
 aNewPolygon.append(basegfx::B2DPoint(0.0, 0.0));
 aNewPolygon.append(basegfx::B2DPoint(0.0, 1.0));
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 0ef2f314d19f..e618c209d697 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -3105,15 +3105,17 @@ void SvxShape::setAllPropertiesToDefault()
 {
 ::SolarMutexGuard aGuard;
 
-if( !HasSdrObject() )
+SdrObject* pSdrObj = GetSdrObject();
+if( !pSdrObj )
 throw lang::DisposedException();
-GetSdrObject()->ClearMergedItem(); // nWhich == 0 => all
+pSdrObj->ClearMergedItem(); // nWhich == 0 => all
 
-if(dynamic_cast(GetSdrObject()) != nullptr)
+const SdrObjKind nObjId = pSdrObj->GetObjIdentifier();
+if(nObjId == SdrObjKind::Graphic) // SdrGrafObj
 {
 // defaults for graphic objects have changed:
-GetSdrObject()->SetMergedItem( XFillStyleItem( drawing::FillStyle_NONE 
) );
-GetSdrObject()->SetMergedItem( XLineStyleItem( drawing::LineStyle_NONE 
) );
+pSdrObj->SetMergedItem( XFillStyleItem( drawing::FillStyle_NONE ) );
+pSdrObj->SetMergedItem( XLineStyleItem( drawing::LineStyle_NONE ) );
 }
 
 // #i68523# special handling for Svx3DCharacterModeItem, this is not saved
@@ -3121,12 +3123,12 @@ void SvxShape::setAllPropertiesToDefault()
 // does not load lathe or extrude objects, it is possible to set the items
 // here.
 // For other solution possibilities, see task description.
-if( dynamic_cast(GetSdrObject())  != nullptr|| 
dynamic_cast(GetSdrObject()) != nullptr)
+if( nObjId == SdrObjKind::E3D_Lathe /*E3dLatheObj*/ || nObjId == 
SdrObjKind::E3D_Extrusion /*E3dExtrudeObj*/ )
 {
-GetSdrObject()->SetMergedItem(Svx3DCharacterModeItem(true));
+pSdrObj->SetMergedItem(Svx3DCharacterModeItem(true));
 }
 
-GetSdrObject()->getSdrModelFromSdrObject().SetChanged();
+pSdrObj->getSdrModelFromSdrObject().SetChanged();
 }
 
 void SvxShape::setPropertiesToDefault(

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

[Henry Castro (via logerrit)]

 include/sfx2/frame.hxx  |4 ++--
 sfx2/source/view/frame.cxx  |2 +-
 sfx2/source/view/frame2.cxx |6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d22d86e266826543e9e7ca406bedcddae04074cb
Author: Henry Castro 
AuthorDate: Fri Jul 1 12:07:23 2022 -0400
Commit: Henry Castro 
CommitDate: Mon Jul 4 14:29:02 2022 +0200

sfx2: replace pWindow m_pWindow

SfxFrame class members

Signed-off-by: Henry Castro 
Change-Id: I1fd272a113763f6330f15ee34095e9e34ce5dd34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136753
Tested-by: Jenkins

diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 7956fdd36d57..b9004bdb8b36 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -70,7 +70,7 @@ class SFX2_DLLPUBLIC SfxFrame final : public 
SvCompatWeakBase
 
 private:
 std::unique_ptr< SfxFrame_Impl > m_pImpl;
-VclPtr pWindow;
+VclPtr m_pWindow;
 
 virtual ~SfxFrame();
 
@@ -82,7 +82,7 @@ public:
 CreateBlankFrame();
 static SfxFrame*CreateHidden( SfxObjectShell const & rDoc, 
vcl::Window& rWindow, SfxInterfaceId nViewId );
 
-vcl::Window&GetWindow() const { return *pWindow;}
+vcl::Window&GetWindow() const { return *m_pWindow;}
 voidCancelTransfers();
 boolDoClose();
 
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 0abc76bc3271..ee9ed9a4bd3e 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -73,7 +73,7 @@ void SfxFrame::Construct_Impl()
 SfxFrame::~SfxFrame()
 {
 RemoveTopFrame_Impl( this );
-pWindow.disposeAndClear();
+m_pWindow.disposeAndClear();
 
 auto it = std::find( gaFramesArr_Impl.begin(), gaFramesArr_Impl.end(), 
this );
 if ( it != gaFramesArr_Impl.end() )
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 01b29366ad1b..015414e3ad3e 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -290,7 +290,7 @@ SfxFrame* SfxFrame::Create( const Reference < XFrame >& 
i_rFrame )
 
 SfxFrame::SfxFrame( vcl::Window& i_rContainerWindow )
 :SvCompatWeakBase( this )
-,pWindow( nullptr )
+,m_pWindow( nullptr )
 {
 Construct_Impl();
 
@@ -298,13 +298,13 @@ SfxFrame::SfxFrame( vcl::Window& i_rContainerWindow )
 InsertTopFrame_Impl( this );
 m_pImpl->pExternalContainerWindow = &i_rContainerWindow;
 
-pWindow = VclPtr::Create( this, i_rContainerWindow );
+m_pWindow = VclPtr::Create( this, i_rContainerWindow 
);
 
 // always show pWindow, which is the ComponentWindow of the XFrame we live 
in
 // nowadays, since SfxFrames can be created with an XFrame only, hiding or 
showing the complete XFrame
 // is not done at level of the container window, not at SFX level. Thus, 
the component window can
 // always be visible.
-pWindow->Show();
+m_pWindow->Show();
 }
 
 void SfxFrame::SetPresentationMode( bool bSet )

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - schema/libreoffice

[Miklos Vajna (via logerrit)]

 schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d1d54800db7dc92c45f55661e81617b01638a492
Author: Miklos Vajna 
AuthorDate: Fri Jul 1 13:36:05 2022 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 4 12:01:00 2022 +0200

sw content controls: link ODF proposal

(cherry picked from commit 3f379f00b17268fbb63ba072d04336acb0c7e398)

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

diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng 
b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index 959cc36e00b5..d78c60fbddd1 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
@@ -2795,7 +2795,7 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
 
   
 
-  
+  
   
 
   

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

[Miklos Vajna (via logerrit)]

 sw/source/core/text/porfld.cxx |2 +-
 sw/source/core/text/porfld.hxx |3 +++
 sw/source/core/text/txtfld.cxx |7 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 4cd05b29046cfa1a2e68bc49dd849c2651b93cd9
Author: Miklos Vajna 
AuthorDate: Mon Jul 4 09:19:35 2022 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jul 4 13:17:43 2022 +0200

sw content controls, checkbox: reduce left vs right amount of shading 
mismatch

This was a visual problem with all content controls, but most visible
with short ones, like checkbox.

A content control's layout starts with a field portion (shaded),
followed by a content control portion (also shaded). The shading around
the checkbox character is not balanced, the left side has more shading.

Half of the additional shading is caused by shading for the field
portion: avoid this in case we know where will be a content control
portion after the field portion.

The result is not perfect, but the left/right mismatch for the amount of
shading around the checkbox is much better this way.

Change-Id: I147d23c43e679113c84c21fbfc0c8ac1ca9e51b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136792
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit 0203485a7f7dd85f8d3e04ce91579051aa89d26a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136760

diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index b7f2f6f81905..2affe7edd844 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -441,7 +441,7 @@ void SwFieldPortion::Paint( const SwTextPaintInfo &rInf ) 
const
 SwFontSave aSave( rInf, m_pFont.get() );
 
 //OSL_ENSURE(GetLen() <= TextFrameIndex(1), "SwFieldPortion::Paint: 
rest-portion pollution?");
-if( Width() && ( !m_bPlaceHolder || 
rInf.GetOpt().IsShowPlaceHolderFields() ) )
+if( Width() && ( !m_bPlaceHolder || 
rInf.GetOpt().IsShowPlaceHolderFields() ) && !m_bContentControl )
 {
 // A very liberal use of the background
 rInf.DrawViewOpt( *this, PortionType::Field );
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index b4c6865dabdb..45a2027b4e74 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -52,6 +52,7 @@ protected:
 bool m_bReplace : 1;  // Used by SwGrfNumPortion
 const bool m_bPlaceHolder : 1;
 bool m_bNoLength : 1;   // HACK for meta suffix (no CH_TXTATR)
+bool m_bContentControl = false;
 
 void SetFont( std::unique_ptr pNew ) { m_pFont = std::move(pNew); }
 bool IsNoLength() const  { return m_bNoLength; }
@@ -108,6 +109,8 @@ public:
 // Accessibility: pass information about this portion to the PortionHandler
 virtual void HandlePortion( SwPortionHandler& rPH ) const override;
 
+void SetContentControl(bool bContentControl) { m_bContentControl = 
bContentControl; }
+
 void dumpAsXml(xmlTextWriterPtr pWriter, const OUString& rText,
TextFrameIndex& nOffset) const override;
 };
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index f935e8d8ab93..d9727deabeec 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -406,7 +406,12 @@ SwLinePortion *SwTextFormatter::NewExtraPortion( 
SwTextFormatInfo &rInf )
 }
 if( !pRet )
 {
-pRet = new SwFieldPortion( "" );
+auto pFieldPortion = new SwFieldPortion( "" );
+if (pHint->Which() == RES_TXTATR_CONTENTCONTROL)
+{
+pFieldPortion->SetContentControl(true);
+}
+pRet = pFieldPortion;
 rInf.SetLen(TextFrameIndex(1));
 }
 return pRet;

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

[Noel Grandin (via logerrit)]

 comphelper/source/misc/solarmutex.cxx |9 -
 include/comphelper/solarmutex.hxx |4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 1a6833a00fb7fcf04c71fcaa05dbee1f15a075d4
Author: Noel Grandin 
AuthorDate: Fri Jul 1 11:36:25 2022 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 4 15:42:15 2022 +0200

tdf#137544 reduce cost of SolarMutex checking

the  std::thread::id facilities are cheaper than the sal versions

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

diff --git a/comphelper/source/misc/solarmutex.cxx 
b/comphelper/source/misc/solarmutex.cxx
index 5d1052327154..3e45ae14582d 100644
--- a/comphelper/source/misc/solarmutex.cxx
+++ b/comphelper/source/misc/solarmutex.cxx
@@ -38,7 +38,6 @@ SolarMutex *SolarMutex::get()
 
 SolarMutex::SolarMutex()
 : m_nCount( 0 )
-, m_nThreadId( 0 )
 , m_aBeforeReleaseHandler( nullptr )
 {
 assert(!g_pSolarMutex);
@@ -54,7 +53,7 @@ void SolarMutex::doAcquire( const sal_uInt32 nLockCount )
 {
 for ( sal_uInt32 n = nLockCount; n ; --n )
 m_aMutex.acquire();
-m_nThreadId = osl::Thread::getCurrentIdentifier();
+m_nThreadId = std::this_thread::get_id();
 m_nCount += nLockCount;
 }
 
@@ -72,7 +71,7 @@ sal_uInt32 SolarMutex::doRelease( bool bUnlockAll )
 {
 if ( m_aBeforeReleaseHandler )
 m_aBeforeReleaseHandler();
-m_nThreadId = 0;
+m_nThreadId = std::thread::id();
 }
 
 for ( sal_uInt32 n = nCount ; n ; --n )
@@ -83,14 +82,14 @@ sal_uInt32 SolarMutex::doRelease( bool bUnlockAll )
 
 bool SolarMutex::IsCurrentThread() const
 {
-return m_nThreadId == osl::Thread::getCurrentIdentifier();
+return m_nThreadId == std::this_thread::get_id();
 }
 
 bool SolarMutex::tryToAcquire()
 {
 if ( m_aMutex.tryToAcquire() )
 {
-m_nThreadId = osl::Thread::getCurrentIdentifier();
+m_nThreadId = std::this_thread::get_id();
 m_nCount++;
 return true;
 }
diff --git a/include/comphelper/solarmutex.hxx 
b/include/comphelper/solarmutex.hxx
index 4094e08ee1f7..f9af16f1d3ad 100644
--- a/include/comphelper/solarmutex.hxx
+++ b/include/comphelper/solarmutex.hxx
@@ -24,8 +24,8 @@
 
 #include 
 #include 
+#include 
 
-#include 
 #include 
 #include 
 
@@ -72,7 +72,7 @@ protected:
 sal_uInt32m_nCount;
 
 private:
-std::atomic m_nThreadId;
+std::atomic m_nThreadId;
 
 SolarMutex(const SolarMutex&) = delete;
 SolarMutex& operator=(const SolarMutex&) = delete;

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - include/sfx2 sfx2/source sw/inc sw/source

[Mike Kaganski (via logerrit)]

 include/sfx2/objsh.hxx |   14 ++
 sfx2/source/doc/objstor.cxx|2 ++
 sw/inc/docsh.hxx   |   13 -
 sw/source/uibase/app/docsh.cxx |   10 --
 4 files changed, 28 insertions(+), 11 deletions(-)

New commits:
commit 9d7d48d3603c246cf00ed34fe5336d2c19cfcd47
Author: Mike Kaganski 
AuthorDate: Wed Jul 29 17:45:03 2020 +0300
Commit: Gabor Kelemen 
CommitDate: Mon Jul 4 15:09:10 2022 +0200

tdf#135244: move LockAllViews to SfxObjectShell

... so that it may be called from SfxObjectShell::SaveTo_Impl, and
handle export cases in addition to save (as) handled in tdf#41063.

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

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 4db1c5769e80..35210463240e 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -215,6 +215,13 @@ protected:
 // helper method
 void AddToRecentlyUsedList();
 
+// Parent class for actual guard objects that would do useful work
+class LockAllViewsGuard
+{
+public:
+virtual ~LockAllViewsGuard() {}
+};
+
 public:
 SFX_DECL_INTERFACE(SFX_INTERFACE_SFXDOCSH)
 
@@ -746,6 +753,13 @@ public:
 
 /** override this if you have a XmlIdRegistry. */
 virtual const sfx2::IXmlIdRegistry* GetXmlIdRegistry() const { return 
nullptr; }
+
+// Lock all unlocked views, and returns a guard object which unlocks those 
views when destructed
+virtual std::unique_ptr LockAllViews()
+{
+return std::make_unique();
+}
+
 };
 
 #define SFX_GLOBAL_CLASSID \
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 36f58416a9e9..4b58cbe14ecb 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1154,6 +1154,8 @@ bool SfxObjectShell::SaveTo_Impl
 UpdateDocInfoForSave();
 
 ModifyBlocker_Impl aMod(this);
+// tdf#41063, tdf#135244: prevent jumping to cursor at any temporary 
modification
+auto aViewGuard(LockAllViews());
 
 std::shared_ptr pFilter = rMedium.GetFilter();
 if ( !pFilter )
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 291b20455c17..ba0a823ed258 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -322,16 +322,19 @@ public:
 void CallAutomationDocumentEventSinks(const OUString& Method, 
css::uno::Sequence< css::uno::Any >& Arguments);
 void RegisterAutomationDocumentObject(css::uno::Reference< 
ooo::vba::word::XDocument > const& xDocument);
 
-class LockAllViewsGuard
+// Lock all unlocked views, and returns a guard object which unlocks those 
views when destructed
+virtual std::unique_ptr LockAllViews() override;
+
+protected:
+class LockAllViewsGuard_Impl : public LockAllViewsGuard
 {
 std::vector m_aViewWasUnLocked;
 
 public:
-explicit LockAllViewsGuard(SwViewShell* pViewShell);
-~LockAllViewsGuard();
+explicit LockAllViewsGuard_Impl(SwViewShell* pViewShell);
+~LockAllViewsGuard_Impl();
 };
-// Lock all unlocked views, and returns a guard object which unlocks those 
views when destructed
-std::unique_ptr LockAllViews();
+
 };
 
 /** Find the right DocShell and create a new one:
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 083b4ec6c648..a6a56fb33366 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -380,7 +380,7 @@ bool SwDocShell::Save()
 return !nErr.IsError();
 }
 
-SwDocShell::LockAllViewsGuard::LockAllViewsGuard(SwViewShell* pViewShell)
+SwDocShell::LockAllViewsGuard_Impl::LockAllViewsGuard_Impl(SwViewShell* 
pViewShell)
 {
 if (!pViewShell)
 return;
@@ -394,23 +394,21 @@ 
SwDocShell::LockAllViewsGuard::LockAllViewsGuard(SwViewShell* pViewShell)
 }
 }
 
-SwDocShell::LockAllViewsGuard::~LockAllViewsGuard()
+SwDocShell::LockAllViewsGuard_Impl::~LockAllViewsGuard_Impl()
 {
 for (SwViewShell* pShell : m_aViewWasUnLocked)
 pShell->LockView(false);
 }
 
-std::unique_ptr SwDocShell::LockAllViews()
+std::unique_ptr SwDocShell::LockAllViews()
 {
-return std::make_unique(GetEditShell());
+return std::make_unique(GetEditShell());
 }
 
 // Save using the Defaultformat
 bool SwDocShell::SaveAs( SfxMedium& rMedium )
 {
 SwWait aWait( *this, true );
-// tdf#41063: prevent jumping to cursor at any temporary modification
-auto aViewGuard(LockAllViews());
 //#i3370# remove quick help to prevent saving of autocorrection suggestions
 if (m_pView)
 m_pView->GetEditWin().StopQuickHelp();

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

[Olivier Hallot (via logerrit)]

 source/text/shared/00/0208.xhp  |   75 +---
 source/text/shared/00/0401.xhp  |2 
 source/text/shared/guide/csv_params.xhp |   24 +-
 3 files changed, 56 insertions(+), 45 deletions(-)

New commits:
commit 5a91be35bf16757602aa1600a0c154bd5560b2bf
Author: Olivier Hallot 
AuthorDate: Mon Jul 4 11:31:26 2022 -0300
Commit: Olivier Hallot 
CommitDate: Mon Jul 4 17:55:56 2022 +0200

tdf#149846 tdf#149759 Update CSV import Help page

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

diff --git a/source/text/shared/00/0208.xhp 
b/source/text/shared/00/0208.xhp
index 756cc6634..91dfefd91 100644
--- a/source/text/shared/00/0208.xhp
+++ b/source/text/shared/00/0208.xhp
@@ -30,104 +30,101 @@
 
 
 
-Text 
Import
+Text 
Import
 Sets the import 
options for delimited data.
 
 
 
 
-
-
-
-
-
-
 
-Import
+Import
 
 
-Character Set
+Character Set
 Specifies the character set to be 
used in the imported file.
 
 
-Language
+Language
 Determines how the number strings are imported.
 If Language 
is set to Default (for CSV import) or Automatic (for HTML import), Calc will 
use the globally set language. If Language is set to a specific language, that 
language will be used when importing numbers.
 When 
importing an HTML document, the Language selection can conflict with the global 
HTML option Use 
'English (USA)' locale for numbers. The global HTML option is effective 
only when the Automatic language option is selected. If you select a specific 
language in the HTML Import Options dialog, the global HTML option is 
ignored.
 
 
-From 
Row
+From Row
 Specifies the row where you want 
to start the import. The rows are visible in the preview window at the 
bottom of the dialog.
 
-Separator Options
+Separator Options
 Specifies 
whether your data uses separators or fixed widths as delimiters.
 
 
-Fixed 
width
+Fixed width
 Separates fixed-width data 
(equal number of characters) into columns. Click on the ruler in the 
preview window to set the width.
 
 
-Separated by
+Separated by
 Select the separator used in 
your data.
 
 
-Tab
+Tab
 Separates data delimited by tabs into 
columns.
 
 
-Semicolon
+Semicolon
 Separates data delimited by 
semicolons into columns.
 
 
-Comma
+Comma
 Separates data delimited by commas 
into columns.
 
 
-Space
+Space
 Separates data delimited by spaces 
into columns.
 
 
 
-Other
+Other
 Separates data into columns using the custom separator that you 
specify. Note: The custom separator must also be contained in your 
data.
 
 
-Merge 
delimiters
+Merge delimiters
 Combines consecutive 
delimiters and removes blank data fields.
 
 
 
-Trim 
spaces
+Trim spaces
 Removes starting and trailing spaces from data 
fields.
 
 
 
-String 
delimiter
+String delimiter
 Select a character to 
delimit text data. You can also enter a character in the text 
box.
 
-Other 
options
+Other options
 Sets some 
other import options.
 
 
-Format quoted field as text
+Format quoted field as text
 When this option is enabled, fields or cells whose values are quoted in 
their entirety (the first and last characters of the value equal the text 
delimiter) are imported as text.
 
 
-Detect special numbers
+Detect special numbers
 When this option is enabled, Calc will automatically detect all number 
formats, including special number formats such as dates, time, and scientific 
notation.
 The selected 
language influences how such special numbers are detected, since different 
languages and regions many have different conventions for such special 
numbers.
 When this 
option is disabled, Calc will detect and convert only decimal numbers. The 
rest, including numbers formatted in scientific notation, will be imported as 
text. A decimal number string can have digits 0-9, thousands separators, and a 
decimal separator. Thousands separators and decimal separators may vary with 
the selected language and region.
 
 
-Skip empty cells
-When this option is enabled, Calc preserves 
previous content of cells when pasting empty ones. Otherwise, Calc deletes 
content of previous cells.
+Skip empty cells
+Available when using Paste 
Special: when this option is enabled, Calc preserves previous 
content of cells when pasting empty ones. Otherwise, Calc deletes content of 
previous cells.
 In 
Text to Columns conversion, if cell content begins with a 
separator and this option is disabled, then first column will be 
emptied.
 
-Fields
+Evaluate formulas
+Determines whether 
formula expressions starting with a = equal sign character are to be evaluated 
as formulas or imported as textual data. If checked evaluate formulas on input. 
Otherwise formulas are input as text.
+
+Fields
 Shows how your 
data will look when it is separated into columns.
 
 
-Column 
type
+Column type
 Choose a column in the preview 
window and

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

[Noel Grandin (via logerrit)]

 svl/source/items/style.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 6b9c51aee8a42e597efe78257ab051bf108c0128
Author: Noel Grandin 
AuthorDate: Fri Jul 1 12:28:19 2022 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 4 19:24:50 2022 +0200

dodgy use of dynamic_cast on an UNO object

rather just stick to using getFromUnoTunnel

ever since
commit 5420fbd0d722754e4e01e48d661f0ee082caef56
Date:   Wed Mar 12 12:09:03 2008 +
INTEGRATION: CWS impresstables2 (1.16.30); FILE MERGED
2008/

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

diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 0179635f7493..dfa2ada7e88c 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -886,10 +886,7 @@ SfxUnoStyleSheet::SfxUnoStyleSheet( const OUString& 
_rName, const SfxStyleSheetB
 
 SfxUnoStyleSheet* SfxUnoStyleSheet::getUnoStyleSheet( const 
css::uno::Reference< css::style::XStyle >& xStyle )
 {
-SfxUnoStyleSheet* pRet = dynamic_cast< SfxUnoStyleSheet* >( xStyle.get() );
-if( !pRet )
-pRet = comphelper::getFromUnoTunnel(xStyle);
-return pRet;
+return comphelper::getFromUnoTunnel(xStyle);
 }
 
 /**

[Libreoffice-commits] core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 567529002cac50624678d6968724e447bc243f2d
Author: Christian Lohmaier 
AuthorDate: Mon Jul 4 20:00:37 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jul 4 20:00:37 2022 +0200

Update git submodules

* Update translations from branch 'master'
  to 0222d5b94ca656d54f47027c4a3ca7b53a0ca6b3
  - update translations for 7.4/master

and force-fix errors using pocheck

Change-Id: I0ae7f1a2496b0deeaabe0518f4895c89c953e0c6

diff --git a/translations b/translations
index 140d3bcbbdf2..0222d5b94ca6 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 140d3bcbbdf20e83d772d419515e49846ae7e105
+Subproject commit 0222d5b94ca656d54f47027c4a3ca7b53a0ca6b3

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 6c0185016280cfc455d6f4d08088a1ef0afc8258
Author: Christian Lohmaier 
AuthorDate: Mon Jul 4 20:21:37 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jul 4 20:21:37 2022 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-4'
  to a6cf03e88e8216fba55b6c67e672c3877e635676
  - update translations for 7.4/master

and force-fix errors using pocheck

Change-Id: I0ae7f1a2496b0deeaabe0518f4895c89c953e0c6
(cherry picked from commit 0222d5b94ca656d54f47027c4a3ca7b53a0ca6b3)

diff --git a/translations b/translations
index 781f4d2dc9ca..a6cf03e88e82 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 781f4d2dc9caf63bd695f770792174b6f74d2fe5
+Subproject commit a6cf03e88e8216fba55b6c67e672c3877e635676

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

[Noel Grandin (via logerrit)]

 basegfx/source/polygon/b2dpolypolygon.cxx  |   11 +++
 basegfx/source/polygon/b2dpolypolygontools.cxx |1 +
 include/basegfx/polygon/b2dpolypolygon.hxx |1 +
 3 files changed, 13 insertions(+)

New commits:
commit f1e15482bcf6bf65dc611e19cbd2479ef141
Author: Noel Grandin 
AuthorDate: Fri Jul 1 14:03:22 2022 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 4 21:04:30 2022 +0200

tdf#137544 reserve space in polypolygon

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

diff --git a/basegfx/source/polygon/b2dpolypolygon.cxx 
b/basegfx/source/polygon/b2dpolypolygon.cxx
index 4a81a82c4c71..a283828f661c 100644
--- a/basegfx/source/polygon/b2dpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dpolypolygon.cxx
@@ -108,6 +108,11 @@ public:
 }
 }
 
+void reserve(sal_uInt32 nCount)
+{
+maPolygons.reserve(nCount);
+}
+
 void insert(sal_uInt32 nIndex, const basegfx::B2DPolyPolygon& rPolyPolygon)
 {
 // add nCount polygons from rPolyPolygon
@@ -288,6 +293,12 @@ public:
 mpPolyPolygon->insert(std::as_const(mpPolyPolygon)->count(), 
rPolygon, nCount);
 }
 
+void B2DPolyPolygon::reserve(sal_uInt32 nCount)
+{
+if(nCount)
+mpPolyPolygon->reserve(nCount);
+}
+
 B2DPolyPolygon B2DPolyPolygon::getDefaultAdaptiveSubdivision() const
 {
 B2DPolyPolygon aRetval;
diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx 
b/basegfx/source/polygon/b2dpolypolygontools.cxx
index b49de907d45c..3f8f51c52404 100644
--- a/basegfx/source/polygon/b2dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolypolygontools.cxx
@@ -553,6 +553,7 @@ namespace basegfx::utils
 const css::drawing::PointSequenceSequence& 
rPointSequenceSequenceSource)
 {
 B2DPolyPolygon aRetval;
+aRetval.reserve(rPointSequenceSequenceSource.getLength());
 const css::drawing::PointSequence* pPointSequence = 
rPointSequenceSequenceSource.getConstArray();
 const css::drawing::PointSequence* pPointSeqEnd = pPointSequence + 
rPointSequenceSequenceSource.getLength();
 
diff --git a/include/basegfx/polygon/b2dpolypolygon.hxx 
b/include/basegfx/polygon/b2dpolypolygon.hxx
index f1420edef79a..474c0cbdb40f 100644
--- a/include/basegfx/polygon/b2dpolypolygon.hxx
+++ b/include/basegfx/polygon/b2dpolypolygon.hxx
@@ -68,6 +68,7 @@ namespace basegfx
 // insert/append single polygon
 void insert(sal_uInt32 nIndex, const B2DPolygon& rPolygon, sal_uInt32 
nCount = 1);
 void append(const B2DPolygon& rPolygon, sal_uInt32 nCount = 1);
+void reserve(sal_uInt32 nCount);
 
 /** Default adaptive subdivision access