[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - basctl/source basic/source fpicker/source framework/source include/vcl sc/source sfx2/source svx/source sw/source vbahelper/source vc

[Noel Grandin (via logerrit)]

 basctl/source/basicide/baside2.cxx|2 +-
 basic/source/classes/sbxmod.cxx   |2 +-
 basic/source/runtime/methods1.cxx |2 +-
 fpicker/source/win32/asyncrequests.cxx|2 +-
 framework/source/loadenv/loadenv.cxx  |2 +-
 include/vcl/svapp.hxx |4 
 sc/source/filter/oox/workbookfragment.cxx |2 +-
 sfx2/source/doc/docfile.cxx   |2 +-
 sfx2/source/doc/printhelper.cxx   |4 ++--
 svx/source/dialog/docrecovery.cxx |2 +-
 sw/source/uibase/dbui/dbmgr.cxx   |2 +-
 vbahelper/source/vbahelper/vbahelper.cxx  |2 +-
 vcl/source/app/svapp.cxx  |5 +
 vcl/source/control/prgsbar.cxx|2 +-
 vcl/source/window/dialog.cxx  |2 +-
 vcl/source/window/menufloatingwindow.cxx  |2 +-
 vcl/source/window/syswin.cxx  |2 +-
 17 files changed, 25 insertions(+), 16 deletions(-)

New commits:
commit cda7357a82b3be7b60cc314cecbc59922beda629
Author: Noel Grandin 
AuthorDate: Sat Mar 13 09:36:46 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Mar 16 07:52:46 2021 +0100

check for quit when calling Yield in loop

so we don't get stuck threads when the main application
quits

Change-Id: Id36e99267ceb4154873b6ef8ef494622fff6c19a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112409
Tested-by: Jenkins
Reviewed-by: Michael Meeks 
(cherry picked from commit c880d3e30405342a5ae6239cc77f69ed3ca6cc15)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112491
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Noel Grandin 

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 4a9fc67c94d0..a49def4b0fe5 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -676,7 +676,7 @@ BasicDebugFlags ModulWindow::BasicBreakHdl()
 
 InvalidateDebuggerSlots();
 
-while( m_aStatus.bIsRunning )
+while( m_aStatus.bIsRunning && !Application::IsQuit())
 Application::Yield();
 
 m_aStatus.bIsInReschedule = false;
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 0596e5ba87d9..c4e42b67b85c 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1122,7 +1122,7 @@ void SbModule::Run( SbMethod* pMeth )
 if( bDelInst )
 {
 // Compare here with 1 instead of 0, because before nCallLvl--
-while (pSbData->pInst->nCallLvl != 1)
+while (pSbData->pInst->nCallLvl != 1 && !Application::IsQuit())
 Application::Yield();
 }
 
diff --git a/basic/source/runtime/methods1.cxx 
b/basic/source/runtime/methods1.cxx
index 19f0acaa8c0a..f0f1e3ded591 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -582,7 +582,7 @@ void Wait_Impl( bool bDurationBased, SbxArray& rPar )
 Timer aTimer;
 aTimer.SetTimeout( nWait );
 aTimer.Start();
-while ( aTimer.IsActive() )
+while ( aTimer.IsActive() && !Application::IsQuit())
 {
 Application::Yield();
 }
diff --git a/fpicker/source/win32/asyncrequests.cxx 
b/fpicker/source/win32/asyncrequests.cxx
index 86b71cf51540..bfecc42125a3 100644
--- a/fpicker/source/win32/asyncrequests.cxx
+++ b/fpicker/source/win32/asyncrequests.cxx
@@ -50,7 +50,7 @@ void Request::wait( ::sal_Int32 nMilliSeconds )
 void Request::waitProcessMessages()
 {
 SolarMutexGuard aGuard;
-while ( !m_aJoiner.check() )
+while ( !m_aJoiner.check() && !Application::IsQuit())
 Application::Yield();
 }
 
diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index 3d04e17a23c2..dea965f01409 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -413,7 +413,7 @@ bool LoadEnv::waitWhileLoading(sal_uInt32 nTimeout)
 // in an intelligent manner :-)
 
 sal_Int32 nTime = nTimeout;
-while(true)
+while(!Application::IsQuit())
 {
 // SAFE -> --
 {
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index a0a5b53144c2..e81cff4e4096 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -462,6 +462,10 @@ public:
 */
 static void Quit();
 
+/** Has Quit() been called?
+*/
+static bool IsQuit();
+
 /** Attempt to process current pending event(s)
 
  It doesn't sleep if no events are available for processing.
diff --git a/sc/source/filter/oox/workbookfragment.cxx 
b/sc/source/filter/oox/workbookfragment.cxx
index 4146a60eb310..d9f20cbedb77 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -329,7 +329,7 @@ void importSheetFragments( WorkbookFragment& 
rWorkbookHandler, SheetFragmentVect
 }
 
 // coverity[loop_top] - t

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

[Tomaž Vajngerl (via logerrit)]

 sfx2/source/devtools/DevToolsStrings.hrc|   35 +++
 sfx2/source/devtools/ObjectInspectorTreeHandler.cxx |  226 +++-
 2 files changed, 211 insertions(+), 50 deletions(-)

New commits:
commit b63e845c25f5e78e845cc9947b0b1f9958a646ca
Author: Tomaž Vajngerl 
AuthorDate: Mon Mar 15 23:41:33 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Mar 16 07:33:52 2021 +0100

devtools: more string for transaltion, improve display of values

The change improves the display of values by shortening the string
value when showing it in the tree view. Also improve representation
of the object and sequence.

In addition add strings in object inspector for translation.

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

diff --git a/sfx2/source/devtools/DevToolsStrings.hrc 
b/sfx2/source/devtools/DevToolsStrings.hrc
index b64433efe0bb..669d9a78a5f8 100644
--- a/sfx2/source/devtools/DevToolsStrings.hrc
+++ b/sfx2/source/devtools/DevToolsStrings.hrc
@@ -34,4 +34,39 @@
 #define STR_GRAPHIC_OBJECTS_ENTRY NC_("STR_GRAPHIC_OBJECTS_ENTRY", "Graphic 
Objects")
 #define STR_EMBEDDED_OBJECTS_ENTRY NC_("STR_EMBEDDED_OBJECTS_ENTRY", "Embedded 
Objects")
 
+#define STR_ANY_VALUE_TRUE NC_("STR_ANY_VALUE_TRUE", "True")
+#define STR_ANY_VALUE_FALSE NC_("STR_ANY_VALUE_FALSE", "False")
+#define STR_ANY_VALUE_NULL NC_("STR_ANY_VALUE_NULL", "Null")
+#define STR_CLASS_UNKNOWN NC_("STR_CLASS_UNKNOWN", "Unknown")
+
+#define STR_METHOD_TYPE_OBJECT NC_("STR_METHOD_TYPE_OBJECT", "object")
+#define STR_METHOD_TYPE_STRUCT NC_("STR_METHOD_TYPE_STRUCT", "struct")
+#define STR_METHOD_TYPE_ENUM NC_("STR_METHOD_TYPE_ENUM", "enum")
+#define STR_METHOD_TYPE_SEQUENCE NC_("STR_METHOD_TYPE_SEQUENCE", "sequence")
+
+#define STR_PROPERTY_TYPE_IS_NAMED_CONTAINER 
NC_("STR_PROPERTY_TYPE_IS_NAMED_CONTAINER", "name container")
+#define STR_PROPERTY_TYPE_IS_INDEX_CONTAINER 
NC_("STR_PROPERTY_TYPE_IS_INDEX_CONTAINER", "index container")
+#define STR_PROPERTY_TYPE_IS_ENUMERATION 
NC_("STR_PROPERTY_TYPE_IS_ENUMERATION", "enumeration")
+
+#define STR_PARMETER_MODE_IN NC_("STR_PARMETER_MODE_IN", "[in]")
+#define STR_PARMETER_MODE_OUT NC_("STR_PARMETER_MODE_OUT", "[out]")
+#define STR_PARMETER_MODE_IN_AND_OUT NC_("STR_PARMETER_MODE_IN_AND_OUT", 
"[in&out]")
+
+#define STR_PROPERTY_ATTRIBUTE_IS_ATTRIBUTE 
NC_("STR_PROPERTY_ATTRIBUTE_IS_ATTRIBUTE", "attribute")
+#define STR_PROPERTY_ATTRIBUTE_GET NC_("STR_PROPERTY_ATTRIBUTE_GET", "get")
+#define STR_PROPERTY_ATTRIBUTE_SET NC_("STR_PROPERTY_ATTRIBUTE_SET", "set")
+#define STR_PROPERTY_ATTRIBUTE_MAYBEVOID 
NC_("STR_PROPERTY_ATTRIBUTE_MAYBEVOID", "may be void")
+#define STR_PROPERTY_ATTRIBUTE_READONLY NC_("STR_PROPERTY_ATTRIBUTE_READONLY", 
"read-only")
+#define STR_PROPERTY_ATTRIBUTE_WRITEONLY 
NC_("STR_PROPERTY_ATTRIBUTE_WRITEONLY", "write-only")
+#define STR_PROPERTY_ATTRIBUTE_REMOVABLE 
NC_("STR_PROPERTY_ATTRIBUTE_REMOVABLE", "removeable")
+#define STR_PROPERTY_ATTRIBUTE_BOUND NC_("STR_PROPERTY_ATTRIBUTE_BOUND", 
"bound")
+#define STR_PROPERTY_ATTRIBUTE_CONSTRAINED 
NC_("STR_PROPERTY_ATTRIBUTE_CONSTRAINED", "constrained")
+#define STR_PROPERTY_ATTRIBUTE_TRANSIENT 
NC_("STR_PROPERTY_ATTRIBUTE_TRANSIENT", "transient")
+#define STR_PROPERTY_ATTRIBUTE_MAYBEAMBIGUOUS 
NC_("STR_PROPERTY_ATTRIBUTE_MAYBEAMBIGUOUS", "may be ambiguous")
+#define STR_PROPERTY_ATTRIBUTE_MAYBEDEFAULT 
NC_("STR_PROPERTY_ATTRIBUTE_MAYBEDEFAULT", "may be default")
+
+#define STR_PROPERTY_VALUE_SEQUENCE NC_("STR_PROPERTY_VALUE_SEQUENCE", 
"")
+#define STR_PROPERTY_VALUE_OBJECT NC_("STR_PROPERTY_VALUE_OBJECT", 
"")
+#define STR_PROPERTY_VALUE_STRUCT NC_("STR_PROPERTY_VALUE_STRUCT", "")
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx 
b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
index a912e51fe704..4d6e00e2dc7e 100644
--- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
+++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
@@ -11,6 +11,8 @@
 #include 
 
 #include 
+#include 
+#include "DevToolsStrings.hrc"
 
 #include 
 #include 
@@ -27,6 +29,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -70,38 +73,33 @@ OUString enumValueToEnumName(uno::Any const& aValue,
 return aNames[nValuesIndex];
 }
 
-/** converts any value to a string */
-OUString AnyToString(const uno::Any& aValue, const 
uno::Reference& xContext)
+OUString getInterfaceImplementationClass(uno::Reference 
const& xInterface)
+{
+auto xServiceInfo = uno::Reference(xInterface, 
uno::UNO_QUERY);
+if (xServiceInfo.is())
+return xServiceInfo->getImplementationName();
+return OUString();
+}
+
+/** converts basic any value to a string */
+OUString convertBasicValueToString(const uno::Any& aValue,
+   const 
uno::Reference& xContext)
 {
 OUStrin

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

[Tomaž Vajngerl (via logerrit)]

 sc/uiconfig/scalc/menubar/menubar.xml|3 ++-
 sd/uiconfig/sdraw/menubar/menubar.xml|2 +-
 sd/uiconfig/simpress/menubar/menubar.xml |2 +-
 sw/uiconfig/sglobal/menubar/menubar.xml  |3 ++-
 sw/uiconfig/swriter/menubar/menubar.xml  |5 +++--
 5 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 1279f0bad577e44fb0a321b17a44759dc3e32c53
Author: Tomaž Vajngerl 
AuthorDate: Mon Mar 15 19:10:59 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Mar 16 06:49:49 2021 +0100

devtools: move "Development Tools" menu from "Help" to "Tools"

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

diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index e89e2b9836c9..e8ed1b24c34c 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -745,6 +745,8 @@
   
 
   
+  
+  
   
   
   
@@ -758,7 +760,6 @@
   
   
 
-  
   
   
   
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml 
b/sd/uiconfig/sdraw/menubar/menubar.xml
index d29f81fff0ff..082e9e277929 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -624,6 +624,7 @@
 
   
   
+  
   
   
   
@@ -638,7 +639,6 @@
   
   
 
-  
   
   
   
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml 
b/sd/uiconfig/simpress/menubar/menubar.xml
index 5d3ddfb34bf9..a6efad8be128 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -654,6 +654,7 @@
   
 
   
+  
   
   
   
@@ -669,7 +670,6 @@
   
   
 
-  
   
   
   
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index c02882f83b79..9c8f61f03d28 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -767,6 +767,8 @@
   
 
   
+  
+  
   
   
   
@@ -781,7 +783,6 @@
   
   
 
-  
   
   
   
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index 8f4cd3617f7d..afc744f1b415 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -787,6 +787,8 @@
   
 
   
+  
+  
   
   
   
@@ -801,7 +803,6 @@
   
   
 
-  
   
   
   
@@ -819,4 +820,4 @@
   
 
   
-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/unotest sc/qa sw/qa unotest/source xmloff/qa

[Miklos Vajna (via logerrit)]

 include/unotest/macros_test.hxx  |5 
 sc/qa/unit/tiledrendering/tiledrendering.cxx |   22 
 sw/qa/core/crsr/crsr.cxx |   19 ---
 sw/qa/extras/layout/layout.cxx   |  107 
 sw/qa/extras/uiwriter/uiwriter.cxx   |  140 ---
 sw/qa/extras/uiwriter/uiwriter2.cxx  |  131 ++---
 unotest/source/cpp/macros_test.cxx   |   20 +++
 xmloff/qa/unit/text.cxx  |   19 ---
 8 files changed, 195 insertions(+), 268 deletions(-)

New commits:
commit 8ff147f200e6514bbc7e7d7b5ca91694b9234bfc
Author: Miklos Vajna 
AuthorDate: Fri Jan 17 14:32:49 2020 +0100
Commit: Pranam Lashkari 
CommitDate: Tue Mar 16 05:46:15 2021 +0100

Clean up duplicated command dispatch test functionality

Used in both Writer and Calc at few different places, so host it in
unotest/.

Change-Id: I013e6df471deb8693cf4ae62f0958b12e16fda7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86972
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112395
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Pranam Lashkari 

diff --git a/include/unotest/macros_test.hxx b/include/unotest/macros_test.hxx
index aa098d6a2178..b62526faf9f5 100644
--- a/include/unotest/macros_test.hxx
+++ b/include/unotest/macros_test.hxx
@@ -36,6 +36,11 @@ public:
 css::uno::Reference< css::lang::XComponent > loadFromDesktop(const 
OUString& rURL, const OUString& rDocService = OUString(),
 const css::uno::Sequence& rExtra_args = 
css::uno::Sequence() );
 
+static void
+dispatchCommand(const css::uno::Reference& 
xComponent,
+const OUString& rCommand,
+const css::uno::Sequence& 
rPropertyValues);
+
 protected:
 css::uno::Reference< css::frame::XDesktop2> mxDesktop;
 void setUpNssGpg(const test::Directories& rDirectories, const OUString& 
rTestName);
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 158754d51ffc..cfcefe7ccd71 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -594,20 +594,6 @@ void ScTiledRenderingTest::testSpellOnlineRenderParameter()
 CPPUNIT_ASSERT_EQUAL(!bSet, pDoc->GetDocOptions().IsAutoSpell());
 }
 
-void lcl_dispatchCommand(const uno::Reference& xComponent, 
const OUString& rCommand, const uno::Sequence& rArguments)
-{
-uno::Reference xController = 
uno::Reference(xComponent, 
uno::UNO_QUERY_THROW)->getCurrentController();
-CPPUNIT_ASSERT(xController.is());
-uno::Reference xFrame(xController->getFrame(), 
uno::UNO_QUERY);
-CPPUNIT_ASSERT(xFrame.is());
-
-uno::Reference xContext = 
::comphelper::getProcessComponentContext();
-uno::Reference 
xDispatchHelper(frame::DispatchHelper::create(xContext));
-CPPUNIT_ASSERT(xDispatchHelper.is());
-
-xDispatchHelper->executeDispatch(xFrame, rCommand, OUString(), 0, 
rArguments);
-}
-
 void ScTiledRenderingTest::testTextViewSelection()
 {
 comphelper::LibreOfficeKit::setActive();
@@ -621,7 +607,7 @@ void ScTiledRenderingTest::testTextViewSelection()
 
 // Create a selection on two cells in the second view, that's a text 
selection in LOK terms.
 aView1.m_bTextViewSelectionInvalidated = false;
-lcl_dispatchCommand(mxComponent, ".uno:GoRightSel", {});
+dispatchCommand(mxComponent, ".uno:GoRightSel", {});
 Scheduler::ProcessEventsToIdle();
 // Make sure the first view got its notification.
 CPPUNIT_ASSERT(aView1.m_bTextViewSelectionInvalidated);
@@ -640,7 +626,7 @@ void ScTiledRenderingTest::testDocumentSizeChanged()
 {
 comphelper::makePropertyValue("ToPoint", OUString("$A$30")),
 };
-lcl_dispatchCommand(mxComponent, ".uno:GoToCell", aPropertyValues);
+dispatchCommand(mxComponent, ".uno:GoToCell", aPropertyValues);
 Scheduler::ProcessEventsToIdle();
 // Assert that the size in the payload is not 0.
 CPPUNIT_ASSERT(m_aDocumentSize.getWidth() > 0);
@@ -1687,7 +1673,7 @@ void ScTiledRenderingTest::testSpellOnlineParameter()
 {
 comphelper::makePropertyValue("Enable", uno::makeAny(!bSet)),
 };
-lcl_dispatchCommand(mxComponent, ".uno:SpellOnline", params);
+dispatchCommand(mxComponent, ".uno:SpellOnline", params);
 CPPUNIT_ASSERT_EQUAL(!bSet, pDoc->GetDocOptions().IsAutoSpell());
 
 // set the same state as now and we don't expect any change (no-toggle)
@@ -1695,7 +1681,7 @@ void ScTiledRenderingTest::testSpellOnlineParameter()
 {
 comphelper::makePropertyValue("Enable", uno::makeAny(!bSet)),
 };
-lcl_dispatchCommand(mxComponent, ".uno:SpellOnline", params);
+dispatchCommand(mxComponent, ".uno:SpellOnline", params);
 CPPUNIT_ASSERT_EQUAL(!bSet, pDoc->GetDocOptions().IsAutoSpell());
 }
 
diff --git a/sw/qa/core/crsr/crsr.cxx b/s

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

[Tomaž Vajngerl (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 
 sfx2/source/devtools/ObjectInspectorTreeHandler.cxx  |   49 
+-
 2 files changed, 28 insertions(+), 23 deletions(-)

New commits:
commit 14589413c8d10bfe9186994b55d436331a97a43e
Author: Tomaž Vajngerl 
AuthorDate: Mon Mar 15 19:14:17 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Mar 16 03:42:19 2021 +0100

devtools: rename menu "Development Tool" to "Development Tools"

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

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index fe562574ef86..7711f6f3da36 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6536,7 +6536,7 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   
   
 
-  Development Tool
+  Development Tools
 
 
   1
commit 42503d3e3004242b96d41c0722078fef6c69188a
Author: Tomaž Vajngerl 
AuthorDate: Mon Mar 15 16:22:40 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Mar 16 03:41:58 2021 +0100

devtools: extract conv. from enum value to name into a function

This conversion is not that trivial, as it needs to access some
reflection UNO classes, so extract it to its own function.

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

diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx 
b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
index d5a9c9b990cf..a912e51fe704 100644
--- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
+++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
@@ -49,6 +49,27 @@ namespace
 constexpr OUStringLiteral constTypeDescriptionManagerSingletonName
 = u"/singletons/com.sun.star.reflection.theTypeDescriptionManager";
 
+OUString enumValueToEnumName(uno::Any const& aValue,
+ uno::Reference const& 
xContext)
+{
+sal_Int32 nIntValue = 0;
+if (!cppu::enum2int(nIntValue, aValue))
+return OUString();
+
+uno::Reference xManager;
+
xManager.set(xContext->getValueByName(constTypeDescriptionManagerSingletonName),
+ uno::UNO_QUERY);
+
+uno::Reference xTypeDescription;
+
xTypeDescription.set(xManager->getByHierarchicalName(aValue.getValueType().getTypeName()),
+ uno::UNO_QUERY);
+
+uno::Sequence aValues = xTypeDescription->getEnumValues();
+sal_Int32 nValuesIndex = std::find(aValues.begin(), aValues.end(), 
nIntValue) - aValues.begin();
+uno::Sequence aNames = xTypeDescription->getEnumNames();
+return aNames[nValuesIndex];
+}
+
 /** converts any value to a string */
 OUString AnyToString(const uno::Any& aValue, const 
uno::Reference& xContext)
 {
@@ -56,7 +77,7 @@ OUString AnyToString(const uno::Any& aValue, const 
uno::Reference xInterface(aValue, uno::UNO_QUERY);
 if (!xInterface.is())
-aRetStr = "NULL";
+aRetStr = u"NULL";
 else
-aRetStr = "";
+aRetStr = u"";
 break;
 }
 case uno::TypeClass_STRUCT:
 {
-aRetStr = "";
+aRetStr = u"";
 break;
 }
 case uno::TypeClass_BOOLEAN:
@@ -91,7 +112,7 @@ OUString AnyToString(const uno::Any& aValue, const 
uno::Reference() + "\"";
+aRetStr = u"\"" + aValue.get() + u"\"";
 break;
 }
 case uno::TypeClass_FLOAT:
@@ -156,23 +177,7 @@ OUString AnyToString(const uno::Any& aValue, const 
uno::Reference xManager;
-
xManager.set(xContext->getValueByName(constTypeDescriptionManagerSingletonName),
- uno::UNO_QUERY);
-
-uno::Reference 
xTypeDescription;
-
xTypeDescription.set(xManager->getByHierarchicalName(aValType.getTypeName()),
- uno::UNO_QUERY);
-
-uno::Sequence aValues = 
xTypeDescription->getEnumValues();
-sal_Int32 nValuesIndex
-= std::find(aValues.begin(), aValues.end(), nIntValue) - 
aValues.begin();
-uno::Sequence aNames = 
xTypeDescription->getEnumNames();
-aRetStr = aNames[nValuesIndex];
-}
+aRetStr = enumValueToEnumName(aValue, xContext);
 break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libr

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

[Tomaž Vajngerl (via logerrit)]

 include/sfx2/devtools/DevelopmentToolDockingWindow.hxx |4 
 include/sfx2/devtools/ObjectInspectorTreeHandler.hxx   |5 
 include/sfx2/devtools/ObjectInspectorWidgets.hxx   |6 
 sfx2/source/devtools/ObjectInspectorTreeHandler.cxx|   24 
 sfx2/uiconfig/ui/developmenttool.ui|  657 -
 5 files changed, 383 insertions(+), 313 deletions(-)

New commits:
commit 2b9cf977810193b642761328ec15ec78ce245016
Author: Tomaž Vajngerl 
AuthorDate: Mon Mar 15 16:16:05 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Mar 16 03:41:39 2021 +0100

devtools: add a text view to show the value of selected property

Sometimes the property value in textual form can take a lot of
space, which can't be shown completely in the tree view. To solve
this problem, this change adds a text view at the bottom of the
tree view, that shows the complete value of currently selected
property.

The text view can be expanded if necessary, but to not require
constant changing of the pane, the position of the text view is
always reset to 90% of the total height.

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

diff --git a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx 
b/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
index 656e46fedada..1c4826f975f6 100644
--- a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
+++ b/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
@@ -62,9 +62,9 @@ public:
 
 virtual ~DevelopmentToolDockingWindow() override;
 
-virtual void dispose() override;
+void dispose() override;
 
-virtual void ToggleFloatingMode() override;
+void ToggleFloatingMode() override;
 
 // Inspect the input object in the object inspector
 void introspect(css::uno::Reference const& 
xInterface);
diff --git a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx 
b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
index 2cfb572eb3a2..4fd340887855 100644
--- a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
+++ b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
@@ -42,6 +42,9 @@ private:
 // just the current context
 css::uno::Reference mxContext;
 
+// should the paned size be reset to default on resize
+bool mbPanedResetSize;
+
 static void clearObjectInspectorChildren(std::unique_ptr& 
pTreeView,
  weld::TreeIter const& rParent);
 static void handleExpanding(std::unique_ptr& pTreeView,
@@ -85,6 +88,8 @@ public:
 DECL_LINK(NotebookEnterPage, const OString&, void);
 DECL_LINK(NotebookLeavePage, const OString&, bool);
 
+DECL_LINK(PanedSizeChange, const Size&, void);
+
 void introspect(css::uno::Reference const& 
xInterface);
 
 void dispose();
diff --git a/include/sfx2/devtools/ObjectInspectorWidgets.hxx 
b/include/sfx2/devtools/ObjectInspectorWidgets.hxx
index 6d7bf8cf9e9f..6481d786a222 100644
--- a/include/sfx2/devtools/ObjectInspectorWidgets.hxx
+++ b/include/sfx2/devtools/ObjectInspectorWidgets.hxx
@@ -22,6 +22,8 @@ struct ObjectInspectorWidgets
 , mpMethodsTreeView(rxBuilder->weld_tree_view("methods_treeview_id"))
 , mpToolbar(rxBuilder->weld_toolbar("object_inspector_toolbar"))
 , mpNotebook(rxBuilder->weld_notebook("object_inspector_notebookbar"))
+, mpTextView(rxBuilder->weld_text_view("object_inspector_text_view"))
+, mpPaned(rxBuilder->weld_paned("object_inspector_paned"))
 {
 }
 
@@ -35,6 +37,8 @@ struct ObjectInspectorWidgets
 mpMethodsTreeView.reset();
 mpToolbar.reset();
 mpNotebook.reset();
+mpTextView.reset();
+mpPaned.reset();
 }
 
 std::unique_ptr mpClassNameLabel;
@@ -44,6 +48,8 @@ struct ObjectInspectorWidgets
 std::unique_ptr mpMethodsTreeView;
 std::unique_ptr mpToolbar;
 std::unique_ptr mpNotebook;
+std::unique_ptr mpTextView;
+std::unique_ptr mpPaned;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx 
b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
index b7f1391ff17f..d5a9c9b990cf 100644
--- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
+++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
@@ -780,6 +780,7 @@ ObjectInspectorTreeHandler::ObjectInspectorTreeHandler(
 std::unique_ptr& pObjectInspectorWidgets)
 : mpObjectInspectorWidgets(pObjectInspectorWidgets)
 , mxContext(comphelper::getProcessComponentContext())
+, mbPanedResetSize(true)
 {
 mpObjectInspectorWidgets->mpInterfacesTreeView->connect_expanding(
 LINK(this, ObjectInspectorTreeHandler, ExpandingHandlerInterfaces));
@@ -812,10 +813,15 @@ ObjectInspectorTreeHandler::ObjectInspectorTreeHandler(
 mpObjectInspectorWidgets->mpToolbar->set_item_sens

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

[Tomaž Vajngerl (via logerrit)]

 include/sfx2/devtools/DevelopmentToolDockingWindow.hxx |9 
 include/sfx2/devtools/ObjectInspectorTreeHandler.hxx   |   18 -
 include/sfx2/devtools/ObjectInspectorWidgets.hxx   |   49 +
 sfx2/source/devtools/DevelopmentToolDockingWindow.cxx  |   19 --
 sfx2/source/devtools/ObjectInspectorTreeHandler.cxx|  155 -
 5 files changed, 132 insertions(+), 118 deletions(-)

New commits:
commit 173697822d6a598461f79da2e2f77f24723d40ab
Author: Tomaž Vajngerl 
AuthorDate: Mon Mar 15 14:56:57 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Mar 16 03:41:15 2021 +0100

devtools: put ObjectInspector widgets into it's own class

This is needed so they can be shared between ObjectInspectorHandler
and DevelopmentToolDockingWindow, otherwise we have to add each
widget as a parameter to the constructor and for each make a
referenced member. This worked for a while but with more a nd
ore widgets it is becoming ugly.

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

diff --git a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx 
b/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
index 1d05948cd51f..656e46fedada 100644
--- a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
+++ b/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
@@ -15,6 +15,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -34,15 +35,9 @@
 class SFX2_DLLPUBLIC DevelopmentToolDockingWindow final : public 
SfxDockingWindow
 {
 private:
-std::unique_ptr mpClassNameLabel;
-std::unique_ptr mpInterfacesTreeView;
-std::unique_ptr mpServicesTreeView;
-std::unique_ptr mpPropertiesTreeView;
-std::unique_ptr mpMethodsTreeView;
+std::unique_ptr mpObjectInspectorWidgets;
 std::unique_ptr mpDocumentModelTreeView;
 std::unique_ptr mpSelectionToggle;
-std::unique_ptr mpObjectInspectorToolbar;
-std::unique_ptr mpObjectInspectorNotebook;
 
 // Reference to the root object for the current document
 css::uno::Reference mxRoot;
diff --git a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx 
b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
index 1d7000371eba..2cfb572eb3a2 100644
--- a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
+++ b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
@@ -19,6 +19,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 
@@ -31,13 +33,7 @@
 class ObjectInspectorTreeHandler
 {
 private:
-std::unique_ptr& mpInterfacesTreeView;
-std::unique_ptr& mpServicesTreeView;
-std::unique_ptr& mpPropertiesTreeView;
-std::unique_ptr& mpMethodsTreeView;
-std::unique_ptr& mpClassNameLabel;
-std::unique_ptr& mpObjectInspectorToolbar;
-std::unique_ptr& mpObjectInspectorNotebook;
+std::unique_ptr& mpObjectInspectorWidgets;
 
 // object stack to remember previously inspected objects so it is
 // possible to return back to them
@@ -67,13 +63,7 @@ private:
 void updateBackButtonState();
 
 public:
-ObjectInspectorTreeHandler(std::unique_ptr& 
pInterfacesTreeView,
-   std::unique_ptr& 
pServicesTreeView,
-   std::unique_ptr& 
pPropertiesTreeView,
-   std::unique_ptr& 
pMethodsTreeView,
-   std::unique_ptr& pClassNameLabel,
-   std::unique_ptr& 
pObjectInspectorToolbar,
-   std::unique_ptr& 
pObjectInspectorNotebook);
+ObjectInspectorTreeHandler(std::unique_ptr& 
pObjectInspectorWidgets);
 
 // callbacks when a node in the tree view is expanded
 DECL_LINK(ExpandingHandlerInterfaces, const weld::TreeIter&, bool);
diff --git a/include/sfx2/devtools/ObjectInspectorWidgets.hxx 
b/include/sfx2/devtools/ObjectInspectorWidgets.hxx
new file mode 100644
index ..6d7bf8cf9e9f
--- /dev/null
+++ b/include/sfx2/devtools/ObjectInspectorWidgets.hxx
@@ -0,0 +1,49 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#pragma once
+
+#include 
+
+struct ObjectInspectorWidgets
+{
+ObjectInspectorWidgets(std::unique_ptr& rxBuilder)
+: mpClassNameLabel(rxBuilder->weld_label("class_name_value_id"))
+, 
mpInterfacesTreeView(rxBuilder->weld_tree_view("interfaces_treeview_id"))
+, mpServicesTreeView(rxBuilder->weld_tree_view("services_treeview_id"))
+, 
mpPropertiesTreeView(rxBuilder->weld_tree_view("properties_treeview_id"))
+, mpMethodsTreeView(rxBuilder->weld_tree_view("methods_treeview_id"))
+, mpToo

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

[Tomaž Vajngerl (via logerrit)]

 sfx2/source/devtools/DevToolsStrings.hrc  |   37 +++
 sfx2/source/devtools/DocumentModelTreeHandler.cxx |   74 ++
 2 files changed, 85 insertions(+), 26 deletions(-)

New commits:
commit 5b84eae0c10aa33bb8ef3a9a0d1336bcc9e9163c
Author: Tomaž Vajngerl 
AuthorDate: Mon Mar 15 12:02:15 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue Mar 16 03:40:53 2021 +0100

devtools: add strings for translation in DocumentModelTreeHandler

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

diff --git a/sfx2/source/devtools/DevToolsStrings.hrc 
b/sfx2/source/devtools/DevToolsStrings.hrc
new file mode 100644
index ..b64433efe0bb
--- /dev/null
+++ b/sfx2/source/devtools/DevToolsStrings.hrc
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#pragma once
+#define NC_(Context, String) reinterpret_cast(Context "\004" 
u8##String)
+
+#define STR_TEXT_PORTION NC_("STR_TEXT_PORTION", "Text Portion %1")
+#define STR_PARAGRAPH NC_("STR_PARAGRAPH", "Paragraph %1")
+#define STR_SHAPE NC_("STR_SHAPE", "Shape %1")
+#define STR_PAGE NC_("STR_PAGE", "Page %1")
+#define STR_SLIDE NC_("STR_SLIDE", "Slide %1")
+#define STR_MASTER_SLIDE NC_("STR_MASTER_SLIDE", "Master Slide %1")
+#define STR_SHEETS NC_("STR_SHEETS", "Sheets %1")
+
+#define STR_SHAPES_ENTRY NC_("STR_SHAPES_NODE", "Shapes")
+#define STR_CHARTS_ENTRY NC_("STR_CHARTS_ENTRY", "Charts")
+#define STR_PIVOT_TABLES_ENTRY NC_("STR_PIVOT_TABLES_ENTRY", "Pivot Tables")
+#define STR_DOCUMENT_ENTRY NC_("STR_DOCUMENT_ENTRY", "Document")
+#define STR_SHEETS_ENTRY NC_("STR_SHEETS_ENTRY", "Sheets")
+#define STR_STYLES_ENTRY NC_("STR_STYLES_ENTRY", "Styles")
+#define STR_SLIDES_ENTRY NC_("STR_SLIDES_ENTRY", "Slides")
+#define STR_MASTER_SLIDES_ENTRY NC_("STR_MASTER_SLIDES_ENTRY", "Master Slides")
+#define STR_PAGES_ENTRY NC_("STR_PAGES_ENTRY", "Pages")
+#define STR_PARAGRAPHS_ENTRY NC_("STR_PARAGRAPHS_ENTRY", "Paragraphs")
+#define STR_TABLES_ENTRY NC_("STR_TABLES_ENTRY", "Tables")
+#define STR_FRAMES_ENTRY NC_("STR_FRAMES_ENTRY", "Frames")
+#define STR_GRAPHIC_OBJECTS_ENTRY NC_("STR_GRAPHIC_OBJECTS_ENTRY", "Graphic 
Objects")
+#define STR_EMBEDDED_OBJECTS_ENTRY NC_("STR_EMBEDDED_OBJECTS_ENTRY", "Embedded 
Objects")
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/devtools/DocumentModelTreeHandler.cxx 
b/sfx2/source/devtools/DocumentModelTreeHandler.cxx
index 8494f93fa289..6216feb34ec1 100644
--- a/sfx2/source/devtools/DocumentModelTreeHandler.cxx
+++ b/sfx2/source/devtools/DocumentModelTreeHandler.cxx
@@ -12,6 +12,9 @@
 
 #include 
 
+#include 
+#include "DevToolsStrings.hrc"
+
 #include 
 #include 
 #include 
@@ -150,7 +153,8 @@ public:
 
uno::UNO_QUERY);
 OUString aString = lclGetNamed(xTextPortion);
 if (aString.isEmpty())
-aString = "Text Portion " + OUString::number(i + 1);
+aString
+= SfxResId(STR_TEXT_PORTION).replaceFirst("%1", 
OUString::number(i + 1));
 
 auto pEntry = 
std::make_unique(xTextPortion);
 lclAppendToParentEntry(pDocumentModelTree, rParent, aString, 
pEntry.release());
@@ -194,7 +198,9 @@ public:
 
uno::UNO_QUERY);
 OUString aString = lclGetNamed(xParagraph);
 if (aString.isEmpty())
-aString = "Paragraph " + OUString::number(i + 1);
+{
+aString = SfxResId(STR_PARAGRAPH).replaceFirst("%1", 
OUString::number(i + 1));
+}
 
 auto pEntry = std::make_unique(xParagraph);
 lclAppendToParentEntry(pDocumentModelTree, rParent, aString, 
pEntry.release(),
@@ -233,7 +239,8 @@ public:
uno::UNO_QUERY);
 OUString aShapeName = lclGetNamed(xShape);
 if (aShapeName.isEmpty())
-aShapeName = "Shape " + OUString::number(nIndexShapes + 1);
+aShapeName
+= SfxResId(STR_SHAPE).replaceFirst("%1", 
OUString::number(nIndexShapes + 1));
 
 auto pEntry = std::make_unique(xShape);
 lclAppendToParentEntry(pDocumentModelTree, rParent, aShapeName, 
pEntry.release());
@@ -419,7 +426,7 @@ public:
 
 OUString aPageString = lclGetNamed(xPage);
 if (aPageString.isEmpty())
-aPageString = "Page "

Need help for unit test

[Regina Henschel]

Hi all,

and again I need help for making a unit test.

My idea for unit test for https://gerrit.libreoffice.org/c/core/+/112474 
is to load a document with a custom shape in 3D mode. It has extrusion 
direction "Extrusion Backwards", which means, that no side faces are 
visible.
Then I want let a DrawViewShell execute a request with 
SID_EXTRUSION_DIRECTION. That should show a side face and I can examine 
whether the BoundRect has the correct height. But I struggle:


In svx/qa/unit/customshape.cxx I can write
CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf141021ExtrusionNorth)
{
OUString aURL = m_directories.getURLFromSrc(sDataDirectory) + 
"tdf141021_ExtrusionNorth.odp";
mxComponent = loadFromDesktop(aURL, 
"com.sun.star.comp.presentation.PresentationDocument");

uno::Reference xShape(getShape(0));

SdrObjCustomShape& rSdrShape( 
static_cast(*GetSdrObjectFromXShape(xShape)));

tools::Rectangle aBoundRect(rSdrShape.GetCurrentBoundRect());
CPPUNIT_ASSERT_EQUAL(tools::Long(5895), aBoundRect.GetHeight());
}

I get a non-empty BoundRect, but I cannot get a DrawViewShell to execute 
the request.


In sd/qa/unit/misc-tests.cxx I can write
void SdMiscTest::testTdf141021ExtrusionNorth()
{
sd::DrawDocShellRef xDocSh = 
Load(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf141021_ExtrusionNorth.odp"), 
ODP);
sd::DrawViewShell* pViewShell = 
static_cast(xDocSh->GetViewShell());


SdPage* pPage = pViewShell->GetActualPage();
SdrObjCustomShape* pObject = 
static_cast(pPage->GetObj(0));

tools::Rectangle aBoundRect(pObject->GetCurrentBoundRect());
CPPUNIT_ASSERT_EQUAL(tools::Long(5895), aBoundRect.GetHeight());
}

Here I have a DrawViewShell, but the BoundRect is empty.

Any idea?

Kind regards
Regina

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

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit 291f9275ff270b5b330df755bdb298944f09afb6
Author: Seth Chaiklin 
AuthorDate: Tue Mar 16 02:36:25 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Mar 16 02:36:25 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 7eb8bd84951159cf677149d0f7c87a8b3e07b764
  - clarify how to make global shortcuts

Change-Id: Iec8aee5b380aff28674e9500e727b5861e03bd9b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112524
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index 2ba8732a7966..7eb8bd849511 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2ba8732a796649458637ac2163c156a3d916a260
+Subproject commit 7eb8bd84951159cf677149d0f7c87a8b3e07b764
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 source/text/shared/01/06140200.xhp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7eb8bd84951159cf677149d0f7c87a8b3e07b764
Author: Seth Chaiklin 
AuthorDate: Tue Mar 16 02:24:44 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Tue Mar 16 02:36:25 2021 +0100

clarify how to make global shortcuts

Change-Id: Iec8aee5b380aff28674e9500e727b5861e03bd9b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112524
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/source/text/shared/01/06140200.xhp 
b/source/text/shared/01/06140200.xhp
index a26cce810..b0224ab51 100644
--- a/source/text/shared/01/06140200.xhp
+++ b/source/text/shared/01/06140200.xhp
@@ -39,9 +39,10 @@
 
 
 
-You can assign 
or edit shortcut keys for the current application or for all $[officename] 
applications.
+You can assign 
or edit shortcut keys for the current application or for all $[officename] 
applications. To assign a key for all applications, choose the %PRODUCTNAME 
radio button in the top right corner.
 To assign or modify a 
shortcut key: select a command in the Function list, select the 
key combination to be assigned in the Shortcut Keys list, then 
click Modify.
 If the selected 
function already has a shortcut key, it is displayed in the Keys 
list. It is possible to assign the same function to more than one 
key.
+A shortcut key assigned 
to a particular application overrides the shortcut key setting made in 
%PRODUCTNAME for all applications.
 
 Avoid assigning shortcut keys that are currently used 
by your operating system.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit 169b392a4c53e7aeab766b1f03d87dc91e4c7acf
Author: Seth Chaiklin 
AuthorDate: Tue Mar 16 01:30:51 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Mar 16 01:30:51 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 2ba8732a796649458637ac2163c156a3d916a260
  - repair embed with renamed id

Change-Id: I3fd958f23434b0f6b655086fcc9b39702298e866
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112523
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index 5a491d5ee63f..2ba8732a7966 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5a491d5ee63f9cb309384f65d7a652342ce05fd1
+Subproject commit 2ba8732a796649458637ac2163c156a3d916a260
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 source/text/swriter/02/0604.xhp |   15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 2ba8732a796649458637ac2163c156a3d916a260
Author: Seth Chaiklin 
AuthorDate: Tue Mar 16 01:23:37 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Tue Mar 16 01:30:51 2021 +0100

repair embed with renamed id

Change-Id: I3fd958f23434b0f6b655086fcc9b39702298e866
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112523
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/source/text/swriter/02/0604.xhp 
b/source/text/swriter/02/0604.xhp
index e451628b3..6b2f5ac8d 100644
--- a/source/text/swriter/02/0604.xhp
+++ b/source/text/swriter/02/0604.xhp
@@ -28,34 +28,29 @@
 
 
 
-
   
 
 No List
   Removes numbering or bullets and 
list indenting for the current paragraph or selected 
paragraphs.
   
-  
+  
   
-
-
-
 
  
   Icon No List
  
  
-  No List 
icon
+  No 
List
  
 
-
   
   
- 
+
   To preserve indenting, but remove bullet or 
number, place cursor at the beginning of the paragraph and press 
Backspace.
-  
+
   
  
   
-
+
  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit b24d32f18938c5118235c63572c373eb9f9155ae
Author: Seth Chaiklin 
AuthorDate: Tue Mar 16 00:35:33 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Mar 16 00:35:33 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5a491d5ee63f9cb309384f65d7a652342ce05fd1
  - Related tdf#140478 update "List" for Tools-Options-Writer-Basic Fonts

  ( shared/optionen/0104.xhp ) "Writer Options"
* update to ,

  ( shared/optionen/01040300.xhp ) "Basic Fonts"
* description for "List" option has not changed since its
  initial commit in 2004. Seems to be inaccurate, but no
  changes made, beyond correcting command sequence
  for Bullets and Numbering, because maybe this option
  will be removed (tdf#140478).
* Updated to  in those paragraphs were menu
  sequence was changed.
* update to 

Change-Id: I5b04f8bdc9547d76cec17e75c8b8328517e066be
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/111043
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index bbcbc7ca09d2..5a491d5ee63f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit bbcbc7ca09d2301e8fbcbaed37588959ba4e6b68
+Subproject commit 5a491d5ee63f9cb309384f65d7a652342ce05fd1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 source/text/shared/optionen/0104.xhp |   11 ---
 source/text/shared/optionen/01040300.xhp |   17 -
 2 files changed, 12 insertions(+), 16 deletions(-)

New commits:
commit 5a491d5ee63f9cb309384f65d7a652342ce05fd1
Author: Seth Chaiklin 
AuthorDate: Wed Feb 17 15:57:03 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Tue Mar 16 00:35:33 2021 +0100

Related tdf#140478 update "List" for Tools-Options-Writer-Basic Fonts

  ( shared/optionen/0104.xhp ) "Writer Options"
* update to ,

  ( shared/optionen/01040300.xhp ) "Basic Fonts"
* description for "List" option has not changed since its
  initial commit in 2004. Seems to be inaccurate, but no
  changes made, beyond correcting command sequence
  for Bullets and Numbering, because maybe this option
  will be removed (tdf#140478).
* Updated to  in those paragraphs were menu
  sequence was changed.
* update to 

Change-Id: I5b04f8bdc9547d76cec17e75c8b8328517e066be
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/111043
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/shared/optionen/0104.xhp 
b/source/text/shared/optionen/0104.xhp
index 0b9afada4..9cf83e19e 100644
--- a/source/text/shared/optionen/0104.xhp
+++ b/source/text/shared/optionen/0104.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-   
 
 
 
@@ -31,7 +28,7 @@
 
 
 
-%PRODUCTNAME Writer Options
+%PRODUCTNAME Writer Options
 These settings 
determine the way text documents that are created in $[officename] are handled. 
It is also possible to define settings for the current text document.
  The global settings are automatically saved.
 
@@ -41,12 +38,12 @@
 
 
 
-Basic 
Fonts (Western)
+Basic 
Fonts (Western)
 Specifies the 
settings for the basic fonts.
-Basic Fonts 
(Asian)
+Basic Fonts 
(Asian)
 Specifies the 
settings for the basic Asian fonts if Asian language support has been activated 
under %PRODUCTNAME - 
PreferencesTools - 
Options - Language Settings - 
Languages.
 
-Basic Fonts 
(CTL)
+Basic Fonts 
(CTL)
 Specifies the 
settings for basic fonts for complex text layout languages if their support has 
been activated under %PRODUCTNAME - 
PreferencesTools - 
Options - Language Settings - 
Languages.
 
 
diff --git a/source/text/shared/optionen/01040300.xhp 
b/source/text/shared/optionen/01040300.xhp
index 5cbf35c60..14ab7c3b5 100644
--- a/source/text/shared/optionen/01040300.xhp
+++ b/source/text/shared/optionen/01040300.xhp
@@ -18,7 +18,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-
 
 
 Basic Fonts
@@ -50,29 +49,29 @@
 
 Basic fonts
 
-Default
+Default
 Specifies the font to be 
used for the Default Paragraph Style. The 
Default Paragraph Style font is used for nearly all Paragraph 
Styles, unless the Paragraph Style explicitly defines another font.
 
 
 
 
 
-Size
+Size
 Specifies the size of the font.
 
-Heading
+Heading
 Specifies the font to be used 
for headings.
 
-List
+List
 Specifies the fonts for lists 
and numbering and all derived styles.
-When you 
choose Format - Numbering/Bullets
+When you 
choose Format - Bullets and Numbering
 
-Format - Numbering/Bullets to 
format a paragraph with numbers or bullets in a text document, the program 
assigns these Paragraph Styles automatically.
+Format - Bullets and 
Numbering to format a paragraph with 
numbers or bullets in a text document, the program assigns these Paragraph 
Styles automatically.
 
-Caption
+Caption
 Specifies the font used for 
the captions of images and tables.
 
-Index
+Index
 Specifies the font used for 
indexes, alphabetical indexes, and tables of contents.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sc/qa/unit/data/xlsx/tdf113271.xlsx   |binary
 sc/qa/unit/subsequent_export-test.cxx |   25 +
 2 files changed, 25 insertions(+)

New commits:
commit 034fa64b2becaf1b1eefa0a24d52808f30ce7c12
Author: Xisco Fauli 
AuthorDate: Mon Mar 15 20:38:19 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 15 21:47:05 2021 +0100

tdf#113271: sc_subsequent_export: Add unittest

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

diff --git a/sc/qa/unit/data/xlsx/tdf113271.xlsx 
b/sc/qa/unit/data/xlsx/tdf113271.xlsx
new file mode 100644
index ..49a161458959
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf113271.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index b0f390206129..204889815292 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -90,6 +90,7 @@ public:
 
 void test();
 void testTdf139167();
+void testTdf113271();
 void testTdf139394();
 void testExtCondFormatXLSX();
 void testTdf90104();
@@ -289,6 +290,7 @@ public:
 CPPUNIT_TEST_SUITE(ScExportTest);
 CPPUNIT_TEST(test);
 CPPUNIT_TEST(testTdf139167);
+CPPUNIT_TEST(testTdf113271);
 CPPUNIT_TEST(testTdf139394);
 CPPUNIT_TEST(testExtCondFormatXLSX);
 CPPUNIT_TEST(testTdf90104);
@@ -553,6 +555,29 @@ void ScExportTest::testTdf139167()
 xDocSh->DoClose();
 }
 
+void ScExportTest::testTdf113271()
+{
+ScDocShellRef xShell = loadDoc(u"tdf113271.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xShell.is());
+
+ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+
+std::shared_ptr pXPathFile = 
ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX);
+xmlDocUniquePtr pDoc = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/styles.xml");
+CPPUNIT_ASSERT(pDoc);
+
+assertXPath(pDoc, "/x:styleSheet/x:fonts", "count", "6");
+
+// Without the fix in place, this test would have failed with
+// - Expected: FF00
+// - Actual  : 
+assertXPath(pDoc, "/x:styleSheet/x:fonts/x:font[1]/x:color", "rgb", 
"FF00");
+assertXPath(pDoc, "/x:styleSheet/x:fonts/x:font[1]/x:name", "val", 
"Calibri");
+
+xDocSh->DoClose();
+}
+
 void ScExportTest::testTdf139394()
 {
 ScDocShellRef xShell = loadDoc(u"tdf139394.", FORMAT_XLSX);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 external/skia/source/skia_opts_internal.hxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 304352d9df17ec5e9963c1b0d41c7f7cb951012e
Author: Luboš Luňák 
AuthorDate: Sun Mar 14 13:45:11 2021 +0100
Commit: Luboš Luňák 
CommitDate: Mon Mar 15 21:40:22 2021 +0100

less complicated Skia SSSE3 loop

I copy&pasted this from other code, but in this case it's simpler and
less confusing to not overrun the output buffer.

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

diff --git a/external/skia/source/skia_opts_internal.hxx 
b/external/skia/source/skia_opts_internal.hxx
index 1f46ee72eb4a..0ca6a04351d2 100644
--- a/external/skia/source/skia_opts_internal.hxx
+++ b/external/skia/source/skia_opts_internal.hxx
@@ -52,15 +52,13 @@ inline void RGB1_to_R(uint8_t dst[], const uint32_t* src, 
int count) {
 const uint8_t X = 0xFF; // Used a placeholder.  The value of X is 
irrelevant.
 __m128i pack = _mm_setr_epi8(0,4,8,12, X,X,X,X,X,X,X,X,X,X,X,X);
 
-// Storing 4 pixels should store 4 bytes, but here it stores 16, so test count 
>= 16
-// in order to not overrun the output buffer.
-while (count >= 16) {
+while (count >= 4) {
 __m128i rgba = _mm_loadu_si128((const __m128i*) src);
 
 __m128i rgb = _mm_shuffle_epi8(rgba, pack);
 
 // Store 4 pixels.
-_mm_storeu_si128((__m128i*) dst, rgb);
+*((uint32_t*)dst) = _mm_cvtsi128_si32(rgb);
 
 src += 4;
 dst += 4;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Unit Tests failing when built with clang 12

[Luke Benes]

The  recently added Unit Test test_tdf131000
https://cgit.freedesktop.org/libreoffice/core/commit/?id=df33714f0eca
fails with clang 12 but not with gcc 10 or clang 11. I bisected this regression 
to this change in clang:

https://github.com/llvm/llvm-project/commit/69cd776e1ee79e72ccbdad30749eac04579715ee
[CodeGen] Apply 'nonnull' and 'dereferenceable(N)' to 'this' pointer


Does this look like undefined behavior on our end or a bug in clang? The build 
log is below:

-Luke


[UIT] calc_tests9
False
test_tdf131000 (forms.Forms) ...

Fatal exception: Signal 11
Stack:
/core/instdir/program/libuno_sal.so.3(+0x37ac1)[0xb7f5fac1]
/core/instdir/program/libuno_sal.so.3(+0x379b3)[0xb7f5f9b3]
linux-gate.so.1(__kernel_rt_sigreturn+0x0)[0xb7f8c560]
/core/instdir/program/libfwklo.so(+0x17e32a)[0xb6b3a32a]
/core/instdir/program/libfwklo.so(+0x182e5a)[0xb6b3ee5a]
/core/instdir/program/libsvxlo.so(+0x280df4)[0xb604ddf4]
/core/instdir/program/libsvxlo.so(+0x281082)[0xb604e082]
/core/instdir/program/libsvxlo.so(+0x28120f)[0xb604e20f]
/core/instdir/program/libsfxlo.so(+0x1738b4)[0xb64208b4]
/core/instdir/program/libsfxlo.so(+0x17385b)[0xb642085b]
/core/instdir/program/libsfxlo.so(+0x1525bb)[0xb63ff5bb]
/core/instdir/program/libsfxlo.so(+0x152161)[0xb63ff161]
/core/instdir/program/libsfxlo.so(_ZN11SfxBindings6UpdateEt+0x10e)[0xb63ff8fa]
/core/instdir/program/libsfxlo.so(+0x1582e2)[0xb64052e2]
/core/instdir/program/libsfxlo.so(_ZN13SfxDispatcher8Execute_ER8SfxShellRK7SfxSlotR10SfxRequest11SfxCallMode+0x8c)[0xb64067c0]
/core/instdir/program/libsfxlo.so(+0x154227)[0xb6401227]
/core/instdir/program/libsfxlo.so(+0x197f7e)[0xb6444f7e]
/core/instdir/program/libsfxlo.so(+0x196baf)[0xb6443baf]
/core/instdir/program/libsfxlo.so(+0x198644)[0xb6445644]
/core/instdir/program/libcomphelper.so(_ZN10comphelper15dispatchCommandERKN3rtl8OUStringERKN3com3sun4star3uno9ReferenceINS6_5frame6XFrameEEERKNS7_8SequenceINS6_5beans13PropertyValueEEERKNS8_INS9_23XDispatchResultListenerEEE+0x2e3)[0xb71307b7]
/core/instdir/program/libcomphelper.so(_ZN10comphelper15dispatchCommandERKN3rtl8OUStringERKN3com3sun4star3uno8SequenceINS6_5beans13PropertyValueEEERKNS7_9ReferenceINS6_5frame23XDispatchResultListenerEEE+0xb0)[0xb71309f0]
/core/instdir/program/libvcllo.so(+0x656b7e)[0xb494db7e]
/core/instdir/program/libvcllo.so(+0x6596e3)[0xb49506e3]
/core/instdir/program/libvcllo.so(+0x659c56)[0xb4950c56]
/core/instdir/program/libgcc3_uno.so(+0x7e35)[0xb7e38e35]
/core/instdir/program/libgcc3_uno.so(+0x77c8)[0xb7e387c8]
/core/instdir/program/libgcc3_uno.so(+0x7419)[0xb7e38419]
/core/instdir/program/libbinaryurplo.so(+0x11de7)[0xae00fde7]
/core/instdir/program/libbinaryurplo.so(+0x115f8)[0xae00f5f8]
/core/instdir/program/libbinaryurplo.so(+0x163c8)[0xae0143c8]
/core/instdir/program/libuno_cppu.so.3(+0x564b)[0xb706964b]
/core/instdir/program/libuno_cppu.so.3(+0x6913)[0xb706a913]
/core/instdir/program/libuno_cppu.so.3(+0x6a49)[0xb706aa49]
/core/instdir/program/libuno_cppu.so.3(+0x6e7e)[0xb706ae7e]
/core/instdir/program/libuno_sal.so.3(+0x3a686)[0xb7f62686]
/lib/libpthread.so.0(+0x7e77)[0xb78bce77]
/lib/libc.so.6(clone+0x66)[0xb7d3c4d6]
OfficeConnection: connecting to: 
uno:pipe,name=pytest1bf07fa8-791f-11eb-8141-2c56dc06c1e5;urp;StarOffice.ComponentContext
NoConnectException: sleeping...
NoConnectException: sleeping...
['OnLoad']
OnLoadFinished
['OnLoad']
OnTitleChanged
['OnLoad']
OnFocus
['OnLoad']
OnViewCreated
['ModelessDialogVisible']
DialogExecute
Execution time for forms.Forms.test_tdf131000: 2.707
Binary URP bridge already disposed /core/binaryurp/source/bridge.cxx:1045
ERROR
ERROR
test_cancelButton (pivotTable.pivotTable) ... OfficeConnection: connecting to: 
uno:pipe,name=pytest1ec37366-791f-11eb-8141-2c56dc06c1e5;urp;StarOffice.ComponentContext
NoConnectException: sleeping...
['OnLoad']
OnLoadFinished
['OnLoad']
OnTitleChanged
['OnLoad']
OnFocus
['OnLoad']
OnViewCreated
['DialogExecute']
ModelessDialogVisible
['OnLoad', 'DialogExecute', 'ModelessDialogExecute', 'ModelessDialogVisible']
DialogClosed
['OnLoad', 'DialogExecute', 'ModelessDialogExecute', 'ModelessDialogVisible']
DialogClosed
['OnLoad', 'DialogExecute', 'ModelessDialogExecute', 'ModelessDialogVisible']
DialogClosed
['OnLoad', 'DialogExecute', 'ModelessDialogExecute', 'ModelessDialogVisible']
DialogClosed
['OnLoad', 'DialogExecute', 'ModelessDialogExecute', 'ModelessDialogVisible']
DialogClosed
['OnLoad', 'DialogExecute', 'ModelessDialogExecute', 'ModelessDialogVisible']
DialogClosed
['OnLoad', 'DialogExecute', 'ModelessDialogExecute', 'ModelessDialogVisible']
DialogClosed
Execution time for pivotTable.pivotTable.test_cancelButton: 2.904
tearDown: calling terminate()...
...done
ok
test_tdf121949_copy_block_with_single_cell_not_included (tdf121949.tdf121949) 
... OfficeConnection: connecting to: 
uno:pipe,name=pytest212b6d0c-791f-11eb-8141-2c56dc06c1e5;urp;StarOffice.ComponentContext
NoConnectException: sleeping...
['OnNew']
OnCreate
['OnNew']
OnStorageChanged
['OnNew']
OnTitleChanged
['OnNew']
On

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

[Andreas Heinisch (via logerrit)]

 basic/qa/basic_coverage/test_string_replace.vb |6 ++
 basic/source/runtime/methods.cxx   |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 4e8b26cd67451c73aff284bb800627ed6db05443
Author: Andreas Heinisch 
AuthorDate: Mon Mar 15 13:41:58 2021 +0100
Commit: Caolán McNamara 
CommitDate: Mon Mar 15 20:46:37 2021 +0100

tdf#141045 - fixed copy paste error in the replace function

Change-Id: Id68670fed89e4cc700c5eea395139914bebdb657
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112509
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch 
(cherry picked from commit ac0b6fb3842201e438950ea99a55ad334f8521ab)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112512
Reviewed-by: Xisco Fauli 
(cherry picked from commit fde29198bd8e345c9a61a9f4d4671a3022a84cf9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112521
Reviewed-by: Caolán McNamara 

diff --git a/basic/qa/basic_coverage/test_string_replace.vb 
b/basic/qa/basic_coverage/test_string_replace.vb
index 99eafdba6b14..e2e9ce35962b 100644
--- a/basic/qa/basic_coverage/test_string_replace.vb
+++ b/basic/qa/basic_coverage/test_string_replace.vb
@@ -23,6 +23,12 @@ Function verify_stringReplace() As String
 retStr = Replace("АБВабв", "б", "*")
 TestLog_ASSERT retStr, "А*Ва*в", "case-insensitive non-ASCII: " & retStr
 
+' tdf#141045 - different length of search and replace string. It is 
important
+' that the search string starts with the original string in order to test 
the error.
+' Without the fix in place, the string index calculations result in a 
crash.
+retStr = Replace("a", "abc", "ab")
+TestLog_ASSERT retStr, "a", "different length of search and replace 
string: " & retStr
+
 result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & 
"Tests failed: " & failCount & Chr$(10)
 verify_stringReplace = result
 End Function
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 671cbe0a316d..d8fd7299d9eb 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1285,7 +1285,7 @@ void SbRtl_Replace(StarBASIC *, SbxArray & rPar, bool)
 const css::lang::Locale& rLocale = 
Application::GetSettings().GetUILanguageTag().getLocale();
 css::uno::Reference < i18n::XCharacterClassification > xCharClass = 
vcl::unohelper::CreateCharacterClassification();
 aSrcStr = xCharClass->toUpper(aSrcStr, 0, aSrcStr.getLength(), 
rLocale);
-aFindStr = xCharClass->toUpper(aFindStr, 0, aSrcStr.getLength(), 
rLocale);
+aFindStr = xCharClass->toUpper(aFindStr, 0, aFindStr.getLength(), 
rLocale);
 }
 
 // Note: the result starts from lStartPos, removing everything to the 
left. See i#94895.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

 sc/qa/unit/subsequent_export-test.cxx |5 -
 svl/source/numbers/zformat.cxx|   30 +++---
 2 files changed, 31 insertions(+), 4 deletions(-)

New commits:
commit c98891a4ba67a73d7a683ffb24845512705a4bbf
Author: Eike Rathke 
AuthorDate: Mon Mar 15 15:57:18 2021 +0100
Commit: Eike Rathke 
CommitDate: Mon Mar 15 20:25:47 2021 +0100

xls load: suppress secondary [~gengou] calendar modifier in format code

ja-JP Gengou calendar is an implicit secondary calendar switched
to and from by format codes.

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

diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 0d14b1046793..b0f390206129 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -4725,7 +4725,10 @@ void ScExportTest::testExtendedLCIDXLSX()
 SvNumberFormatter* pNumFormatter = rDoc.GetFormatTable();
 sal_uInt32 nNumberFormat;
 const OUString aLang[5] = { "[$-41E]", "[$-411]", "[$-40D]", "[$-401]", 
"[$-500]" };
-const OUString aCalendar[5] = { "[~buddhist]DD-MM-", 
"[~gengou]DD-MM-EE", "[~jewish]DD-MM-", "[~hijri]DD-MM-", 
"[~dangi]/MM/DD" };
+const OUString aCalendar[5] = { "[~buddhist]DD-MM-", "DD-MM-EE", 
"[~jewish]DD-MM-", "[~hijri]DD-MM-", "[~dangi]/MM/DD" };
+// Note: ja-JP Gengou calendar is an implicit secondary (non-gregorian)
+// calendar, the explicit [~gengou] calendar modifier does not need to be
+// present, the E and EE keywords are used instead of YY and .
 for ( sal_Int16 nCol = 1; nCol <= 2; nCol++ )
 {
 for ( sal_Int16 nRow = 1; nRow <= 4; nRow++ )
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 8787f0977984..f74b178a0419 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -442,8 +442,10 @@ OUString SvNumberformat::ImpObtainCalendarAndNumerals( 
OUStringBuffer& rString,
 switch ( aTmpLocale.mnCalendarType & 0x7F )
 {
 case 0x03 : // Gengou calendar
-sCalendar = "[~gengou]";
-// Only Japanese language support Gengou calendar
+// Only Japanese language support Gengou calendar.
+// It is an implicit "other" calendar where E, EE, R and RR
+// automatically switch to and YY and  switch to Gregorian. Do
+// not add the "[~gengou]" modifier.
 if ( nLocaleLang != LANGUAGE_JAPANESE )
 {
 nLang = maLocale.meLanguage = LANGUAGE_JAPANESE;
@@ -5252,6 +5254,7 @@ OUString SvNumberformat::GetMappedFormatstring( const 
NfKeywordTable& rKeywords,
 sal_Int32 nPosHaveLCID = -1;
 sal_Int32 nPosInsertLCID = aStr.getLength();
 sal_uInt32 nCalendarID = 0x000; // Excel ID of calendar used in 
sub-format see tdf#36038
+constexpr sal_uInt32 kCalGengou = 0x003;
 if ( nCnt )
 {
 auto& rTypeArray = NumFor[n].Info().nTypeArray;
@@ -5265,6 +5268,27 @@ OUString SvNumberformat::GetMappedFormatstring( const 
NfKeywordTable& rKeywords,
 {
 aStr.append( rLocWrp.getLongDateDayOfWeekSep() );
 }
+switch (rTypeArray[j])
+{
+case NF_KEY_EC:
+case NF_KEY_EEC:
+case NF_KEY_R:
+case NF_KEY_RR:
+// Implicit secondary (non-gregorian) calendar.
+// Currently only for ja-JP.
+/* TODO: same for all locales in
+ * LocaleDataWrapper::doesSecondaryCalendarUseEC() 
?
+ * Should split the locales off that then. */
+if (!nCalendarID)
+{
+const LanguageType nLang = 
MsLangId::getRealLanguage( nOriginalLang);
+if (nLang == LANGUAGE_JAPANESE)
+nCalendarID = kCalGengou;
+}
+break;
+default:
+;   // nothing
+}
 }
 else
 {
@@ -5313,7 +5337,7 @@ OUString SvNumberformat::GetMappedFormatstring( const 
NfKeywordTable& rKeywords,
 break;
 if ( rStrArray[j+1] == "gengou" )
 {
-nCalendarID = 0x003;
+nCalendarID = kCalGengou;
 }
 else if ( rStrArray[j+1] == "hijri" )
 {
_

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

[Andreas Heinisch (via logerrit)]

 basic/qa/basic_coverage/test_string_replace.vb |6 ++
 basic/source/runtime/methods.cxx   |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit fde29198bd8e345c9a61a9f4d4671a3022a84cf9
Author: Andreas Heinisch 
AuthorDate: Mon Mar 15 13:41:58 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 15 20:07:12 2021 +0100

tdf#141045 - fixed copy paste error in the replace function

Change-Id: Id68670fed89e4cc700c5eea395139914bebdb657
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112509
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch 
(cherry picked from commit ac0b6fb3842201e438950ea99a55ad334f8521ab)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112512
Reviewed-by: Xisco Fauli 

diff --git a/basic/qa/basic_coverage/test_string_replace.vb 
b/basic/qa/basic_coverage/test_string_replace.vb
index 99eafdba6b14..e2e9ce35962b 100644
--- a/basic/qa/basic_coverage/test_string_replace.vb
+++ b/basic/qa/basic_coverage/test_string_replace.vb
@@ -23,6 +23,12 @@ Function verify_stringReplace() As String
 retStr = Replace("АБВабв", "б", "*")
 TestLog_ASSERT retStr, "А*Ва*в", "case-insensitive non-ASCII: " & retStr
 
+' tdf#141045 - different length of search and replace string. It is 
important
+' that the search string starts with the original string in order to test 
the error.
+' Without the fix in place, the string index calculations result in a 
crash.
+retStr = Replace("a", "abc", "ab")
+TestLog_ASSERT retStr, "a", "different length of search and replace 
string: " & retStr
+
 result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & 
"Tests failed: " & failCount & Chr$(10)
 verify_stringReplace = result
 End Function
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 1fbcdd9680e2..1a598490d68a 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1286,7 +1286,7 @@ void SbRtl_Replace(StarBASIC *, SbxArray & rPar, bool)
 const css::lang::Locale& rLocale = 
Application::GetSettings().GetUILanguageTag().getLocale();
 css::uno::Reference < i18n::XCharacterClassification > xCharClass = 
vcl::unohelper::CreateCharacterClassification();
 aSrcStr = xCharClass->toUpper(aSrcStr, 0, aSrcStr.getLength(), 
rLocale);
-aFindStr = xCharClass->toUpper(aFindStr, 0, aSrcStr.getLength(), 
rLocale);
+aFindStr = xCharClass->toUpper(aFindStr, 0, aFindStr.getLength(), 
rLocale);
 }
 
 // Note: the result starts from lStartPos, removing everything to the 
left. See i#94895.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sc/qa/unit/uicalc/uicalc.cxx   |   77 +++--
 sc/source/ui/inc/viewfunc.hxx  |2 -
 sc/source/ui/view/viewfun3.cxx |4 +-
 3 files changed, 24 insertions(+), 59 deletions(-)

New commits:
commit 8a7b46c0372eb2445c0bd35c1ebe4a7c96115e5c
Author: Xisco Fauli 
AuthorDate: Mon Mar 15 16:19:53 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 15 20:06:22 2021 +0100

sc_uicalc: use UNO commands for copy, cut or paste everywhere

It's fine to use them since
043c67e0f7358753a2007b7c2bb6cc68aeea7ecb
< dummy clipboard for unit tests >

While at it, remove a couple of obsolete FIXME comments

Partially revert 9fd193168fe092bf15edbc81b8b1a15ca6d7c032
< tdf#118207: tdf#118189: sc: Move UItest to CppUnitTest >
since CutToClip is no longer used

Change-Id: I73959fbc810dc5e82b76862338814e720dc97d89
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112533
Tested-by: Jenkins

diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index c6e421569395..6d161ab81c23 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -179,14 +179,11 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf100582)
 
 goToCell("C10");
 
-ScDocument aClipDoc(SCDOCMODE_CLIP);
-ScDocShell::GetViewData()->GetView()->CopyToClip(&aClipDoc, false, false, 
false, false);
-Scheduler::ProcessEventsToIdle();
+dispatchCommand(mxComponent, ".uno:Copy", {});
 
 goToCell("C10:H14");
 
-
ScDocShell::GetViewData()->GetView()->PasteFromClip(InsertDeleteFlags::ALL, 
&aClipDoc);
-Scheduler::ProcessEventsToIdle();
+dispatchCommand(mxComponent, ".uno:Paste", {});
 
 pModelObj = saveAndReload(mxComponent, "MS Excel 97");
 pDoc = pModelObj->GetDocument();
@@ -264,15 +261,11 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf92963)
 
 goToCell("A3:C4");
 
-ScDocument aClipDoc(SCDOCMODE_CLIP);
-ScDocShell::GetViewData()->GetView()->CopyToClip(&aClipDoc, false, false, 
false, false);
-Scheduler::ProcessEventsToIdle();
+dispatchCommand(mxComponent, ".uno:Copy", {});
 
 goToCell("A1:C1");
 
-// Without the fix in place, this test would have crashed here
-
ScDocShell::GetViewData()->GetView()->PasteFromClip(InsertDeleteFlags::ALL, 
&aClipDoc);
-Scheduler::ProcessEventsToIdle();
+dispatchCommand(mxComponent, ".uno:Paste", {});
 
 CPPUNIT_ASSERT_EQUAL(size_t(2), pList->size());
 
@@ -385,14 +378,11 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf120660)
 
 goToCell("A8:E8");
 
-ScDocument aClipDoc(SCDOCMODE_CLIP);
-ScDocShell::GetViewData()->GetView()->CopyToClip(&aClipDoc, false, false, 
false, false);
-Scheduler::ProcessEventsToIdle();
+dispatchCommand(mxComponent, ".uno:Copy", {});
 
 goToCell("A4:E4");
 
-
ScDocShell::GetViewData()->GetView()->PasteFromClip(InsertDeleteFlags::ALL, 
&aClipDoc);
-Scheduler::ProcessEventsToIdle();
+dispatchCommand(mxComponent, ".uno:Paste", {});
 
 CPPUNIT_ASSERT_EQUAL(1200.0, pDoc->GetValue(ScAddress(4, 3, 0)));
 CPPUNIT_ASSERT_EQUAL(-100.0, pDoc->GetValue(ScAddress(4, 7, 0)));
@@ -404,13 +394,11 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf120660)
 
 goToCell("A8:D8");
 
-ScDocShell::GetViewData()->GetView()->CopyToClip(&aClipDoc, false, false, 
false, false);
-Scheduler::ProcessEventsToIdle();
+dispatchCommand(mxComponent, ".uno:Copy", {});
 
 goToCell("A4:D4");
 
-
ScDocShell::GetViewData()->GetView()->PasteFromClip(InsertDeleteFlags::ALL, 
&aClipDoc);
-Scheduler::ProcessEventsToIdle();
+dispatchCommand(mxComponent, ".uno:Paste", {});
 
 CPPUNIT_ASSERT_EQUAL(1200.0, pDoc->GetValue(ScAddress(4, 3, 0)));
 
@@ -455,7 +443,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf117706)
 dispatchCommand(mxComponent, ".uno:SelectRow", {});
 Scheduler::ProcessEventsToIdle();
 
-// FIXME: The rows are not copied/pasted if using CopyToClip/PasteToClip
 dispatchCommand(mxComponent, ".uno:Copy", {});
 
 mxComponent->dispose();
@@ -598,16 +585,11 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf108654)
 
 dispatchCommand(mxComponent, ".uno:SelectAll", {});
 
-// .uno:Copy without touching shared clipboard
-ScDocument aClipDoc(SCDOCMODE_CLIP);
-ScDocShell::GetViewData()->GetView()->CopyToClip(&aClipDoc, false, false, 
false, false);
-Scheduler::ProcessEventsToIdle();
+dispatchCommand(mxComponent, ".uno:Copy", {});
 
 insertNewSheet(*pDoc);
 
-// .uno:Paste without touching shared clipboard
-
ScDocShell::GetViewData()->GetView()->PasteFromClip(InsertDeleteFlags::ALL, 
&aClipDoc);
-Scheduler::ProcessEventsToIdle();
+dispatchCommand(mxComponent, ".uno:Paste", {});
 
 OUString aFormula;
 pDoc->GetFormula(3, 126, 1, aFormula);
@@ -634,10 +616,7 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf133326)
 
 dispatchCommand(mxComponent, ".uno:SelectAll", {});
 
-// .u

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

[Andrea Gelmini (via logerrit)]

 include/sfx2/objsh.hxx   |2 +-
 sfx2/source/doc/objstor.cxx  |2 +-
 sfx2/source/doc/sfxbasemodel.cxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 058d4f77bd74690cd66504b681cbede6af82de6b
Author: Andrea Gelmini 
AuthorDate: Wed Feb 17 18:18:06 2021 +0100
Commit: Noel Grandin 
CommitDate: Mon Mar 15 18:48:10 2021 +0100

Fix typo in code

It passed make check on Linux

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

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 40715f29e6ac..5d95f29bf3ea 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -316,7 +316,7 @@ public:
 virtual boolSave();
 virtual boolSaveAs( SfxMedium &rMedium  );
 virtual boolSaveCompleted( const css::uno::Reference< 
css::embed::XStorage >& xStorage );
-boolSwitchPersistance(
+boolSwitchPersistence(
 const css::uno::Reference< 
css::embed::XStorage >& xStorage );
 virtual voidUpdateLinks();
 virtual boolLoadExternal( SfxMedium& rMedium );
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index bc5e80224d84..653ea8877a94 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -3423,7 +3423,7 @@ static bool StoragesOfUnknownMediaTypeAreCopied_Impl( 
const uno::Reference< embe
 return true;
 }
 
-bool SfxObjectShell::SwitchPersistance( const uno::Reference< embed::XStorage 
>& xStorage )
+bool SfxObjectShell::SwitchPersistence( const uno::Reference< embed::XStorage 
>& xStorage )
 {
 bool bResult = false;
 // check for wrong creation of object container
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index dd0d7b54caf6..5971b7729413 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3798,7 +3798,7 @@ void SAL_CALL SfxBaseModel::switchToStorage( const 
Reference< embed::XStorage >&
 // the persistence should be switched only if the storage is different
 if ( xStorage != m_pData->m_pObjectShell->GetStorage() )
 {
-if ( !m_pData->m_pObjectShell->SwitchPersistance( xStorage ) )
+if ( !m_pData->m_pObjectShell->SwitchPersistence( xStorage ) )
 {
 ErrCode nError = m_pData->m_pObjectShell->GetErrorCode();
 nError = nError ? nError : ERRCODE_IO_GENERAL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 compilerplugins/clang/methodcycles.partition.results |2 -
 include/sfx2/sidebar/Deck.hxx|2 -
 sfx2/source/sidebar/Deck.cxx |   31 ---
 3 files changed, 35 deletions(-)

New commits:
commit 843f41917ec256ecc9122e13ea8f6da901cb50fb
Author: Caolán McNamara 
AuthorDate: Mon Mar 15 15:56:32 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 15 17:56:08 2021 +0100

drop PrintWindowSubTree that is only callable by itself

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

diff --git a/compilerplugins/clang/methodcycles.partition.results 
b/compilerplugins/clang/methodcycles.partition.results
index e2d808845e1b..049fe2555a32 100644
--- a/compilerplugins/clang/methodcycles.partition.results
+++ b/compilerplugins/clang/methodcycles.partition.results
@@ -10,5 +10,3 @@ sax/source/tools/fastserializer.hxx:184
 SvTreeListEntry * SvTabListBox::InsertEntryToColumn(const rtl::OUString 
&,unsigned long,unsigned short,void *)
 include/vcl/svtabbx.hxx:86
 
-void sfx2::sidebar::Deck::PrintWindowSubTree(vcl::Window *,int)
-include/sfx2/sidebar/Deck.hxx:69
diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx
index 69ac7f20de95..5122d7a63470 100644
--- a/include/sfx2/sidebar/Deck.hxx
+++ b/include/sfx2/sidebar/Deck.hxx
@@ -70,8 +70,6 @@ public:
 
 virtual void DumpAsPropertyTree(tools::JsonWriter&) override;
 
-static void PrintWindowSubTree(vcl::Window* pRoot, int nIndentation);
-
 sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; }
 
 class ScrollContainerWindow final : public vcl::Window
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 0a3a925aa89c..0beb6376c8f0 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -366,37 +366,6 @@ void Deck::ShowPanel(const Panel& rPanel)
 -nNewThumbPos));
 }
 
-static OUString GetWindowClassification(const vcl::Window* pWindow)
-{
-const OUString& rsName (pWindow->GetText());
-if (!rsName.isEmpty())
-{
-return rsName;
-}
-else
-{
-return "window";
-}
-}
-
-void Deck::PrintWindowSubTree(vcl::Window* pRoot, int nIndentation)
-{
-static const char* const sIndentation = "  
";
-const Point aLocation (pRoot->GetPosPixel());
-const Size aSize (pRoot->GetSizePixel());
-SAL_INFO(
-"sfx.sidebar",
-sIndentation + strlen(sIndentation) - nIndentation * 4 << pRoot << " "
-<< GetWindowClassification(pRoot) << " "
-<< (pRoot->IsVisible() ? "visible" : "hidden") << " +"
-<< aLocation.X() << "+" << aLocation.Y() << " x" << aSize.Width()
-<< "x" << aSize.Height());
-
-const sal_uInt16 nChildCount(pRoot->GetChildCount());
-for (sal_uInt16 nIndex = 0; nIndex < nChildCount; ++nIndex)
-PrintWindowSubTree(pRoot->GetChild(nIndex), nIndentation + 1);
-}
-
 IMPL_LINK_NOARG(Deck, HandleVerticalScrollBarChange, ScrollBar*, void)
 {
 const sal_Int32 nYOffset (-mpVerticalScrollBar->GetThumbPos());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

 svl/source/numbers/zformat.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 3e73d3475711b790cc80b9a286c5d454f3929384
Author: Eike Rathke 
AuthorDate: Mon Mar 15 15:49:55 2021 +0100
Commit: Eike Rathke 
CommitDate: Mon Mar 15 17:45:00 2021 +0100

xls save: fix writing inline calendar modifiers as format code, don't

E.g. ja-JP
  GGGE [~gregorian]
saved as OOXML ended up as
  [$-411]ggge\ gregorian
which when reloaded became
  GGGE GREGoRian
displaying
  令和3 R033Ro03ian2021
(whatever Xcl might have done with that).

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

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index b0dcad070dd2..8787f0977984 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -5309,6 +5309,8 @@ OUString SvNumberformat::GetMappedFormatstring( const 
NfKeywordTable& rKeywords,
 }
 break;
 case NF_SYMBOLTYPE_CALDEL :
+if (j + 1 >= nCnt)
+break;
 if ( rStrArray[j+1] == "gengou" )
 {
 nCalendarID = 0x003;
@@ -5325,9 +5327,10 @@ OUString SvNumberformat::GetMappedFormatstring( const 
NfKeywordTable& rKeywords,
 {
 nCalendarID = 0x008;
 }
-// other calendars (see tdf#36038) not corresponding 
between LibO and XL
-if ( nCalendarID > 0 )
-j = j+2;
+// Other calendars (see tdf#36038) not corresponding 
between LibO and XL.
+// However, skip any calendar modifier and don't write
+// as format code (if not as literal string).
+j += 2;
 break;
 case NF_SYMBOLTYPE_CURREXT :
 nPosHaveLCID = aStr.getLength();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 starmath/inc/nodetype.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7246c1b4971e780be8d027de5171f42cc0749c16
Author: Andrea Gelmini 
AuthorDate: Mon Mar 15 13:33:46 2021 +0100
Commit: Julien Nabet 
CommitDate: Mon Mar 15 17:11:02 2021 +0100

Fix typos

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

diff --git a/starmath/inc/nodetype.hxx b/starmath/inc/nodetype.hxx
index f59e02895d4f..f0bf28cece67 100644
--- a/starmath/inc/nodetype.hxx
+++ b/starmath/inc/nodetype.hxx
@@ -44,12 +44,12 @@ enum class SmNodeType : int_fast16_t
 Math, // operator value
 Blank, // ~
 Error, // Syntax error
-Line, // a line of math untill newline
+Line, // a line of math until newline
 Expression, // { content in here }
 PolyLine, // ^
 Root, // root node
 RootSymbol, // 3 of cubic root
-Rectangle, //just structual
+Rectangle, //just structural
 VerticalBrace, // vertical {}
 MathIdent // identities and variables
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sc/qa/unit/uicalc/data/tdf136113.xlsx |binary
 sc/qa/unit/uicalc/uicalc.cxx  |   28 
 2 files changed, 28 insertions(+)

New commits:
commit 12d719d9dfe72f376ae0997977f44310031a45d2
Author: Xisco Fauli 
AuthorDate: Mon Mar 15 11:47:49 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 15 16:46:00 2021 +0100

tdf#136113: sc_uicalc: Add unittest

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

diff --git a/sc/qa/unit/uicalc/data/tdf136113.xlsx 
b/sc/qa/unit/uicalc/data/tdf136113.xlsx
new file mode 100644
index ..a811e91b9330
Binary files /dev/null and b/sc/qa/unit/uicalc/data/tdf136113.xlsx differ
diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index d0d3c03181ef..c6e421569395 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -1070,6 +1070,34 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf138428)
 CPPUNIT_ASSERT_MESSAGE("There should be a note on B1", 
pDoc->HasNote(ScAddress(1, 0, 0)));
 }
 
+CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf136113)
+{
+ScModelObj* pModelObj = createDoc("tdf136113.xlsx");
+ScDocument* pDoc = pModelObj->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
+SdrPage* pPage = pDrawLayer->GetPage(0);
+SdrObject* pObj = pPage->GetObj(0);
+
+CPPUNIT_ASSERT_EQUAL(tools::Long(18159), pObj->GetSnapRect().Left());
+CPPUNIT_ASSERT_EQUAL(tools::Long(1709), pObj->GetSnapRect().Top());
+
+lcl_SelectObjectByName(u"Arrow");
+
+// Move the shape up
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::UP);
+pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::UP);
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(tools::Long(18159), pObj->GetSnapRect().Left());
+CPPUNIT_ASSERT_EQUAL(tools::Long(1609), pObj->GetSnapRect().Top());
+
+// Without the fix in place, this test would have failed here
+ScDocShell* pDocSh = ScDocShell::GetViewData()->GetDocShell();
+CPPUNIT_ASSERT(pDocSh->IsModified());
+}
+
 CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf130614)
 {
 ScModelObj* pModelObj = createDoc("tdf130614.ods");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/scriptforge/python/scriptforge.py |  130 ---
 1 file changed, 116 insertions(+), 14 deletions(-)

New commits:
commit 2e5055ed463ef987105b32eda5e0454b0a9dc7f3
Author: Jean-Pierre Ledure 
AuthorDate: Mon Mar 15 11:05:55 2021 +0100
Commit: Jean-Pierre Ledure 
CommitDate: Mon Mar 15 15:51:09 2021 +0100

ScriptForge - (scriptforge.py) Dictionary class

The new SF_Dictionary class subclasses the dict native Python class
and implements 2 methods:
- ConvertToPropertyValues()
- ImportFromPropertyValues()

Usage:
 dico = dict(A = 1, B = 2, C = 3)
 myDict = CreateScriptService('Dictionary', dico)  # Initialize myDict with 
the content of dico
 myDict['D'] = 4
 print(myDict)   # {'A': 1, 'B': 2, 'C': 3, 'D': 4}
 propval = myDict.ConvertToPropertyValues()
or, alternatively:
 dico = dict(A = 1, B = 2, C = 3)
 myDict = CreateScriptService('Dictionary')  # Initialize myDict as an 
empty dict object
 myDict.update(dico) # Load the values of dico into myDict
 myDict['D'] = 4
 print(myDict)   # {'A': 1, 'B': 2, 'C': 3, 'D': 4}
 propval = myDict.ConvertToPropertyValues()

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

diff --git a/wizards/source/scriptforge/python/scriptforge.py 
b/wizards/source/scriptforge/python/scriptforge.py
index 538736468567..9baabf42b0bf 100644
--- a/wizards/source/scriptforge/python/scriptforge.py
+++ b/wizards/source/scriptforge/python/scriptforge.py
@@ -325,7 +325,7 @@ class SFServices(object):
 - class module: 1 for usual modules, 2 for class modules
 - name (form, control, ... name) - may be blank
 
-The role of the Service() superclass is mainly to propose a 
generic properties management
+The role of the SFServices() superclass is mainly to propose a 
generic properties management
 Properties are got and set following next strategy:
 1. Property names are controlled strictly ('Value' or 'value', 
not 'VALUE')
 2. Getting a property value for the first time is always done 
via a Basic call
@@ -387,7 +387,7 @@ class SFServices(object):
 self.classmodule = classmodule  # Module (1), Class instance (2)
 self.name = name  # '' when no name
 self.internal = False  # True to exceptionally allow assigning a new 
value to a read-only property
-self.localProperties = ()  # the properties reserved for internal use 
(often empty)
+self.localProperties = []  # the properties reserved for internal use 
(often empty)
 self.SIMPLEEXEC = ScriptForge.InvokeSimpleScript  # Shortcuts to 
script provider interfaces
 self.EXEC = ScriptForge.InvokeBasicService
 
@@ -405,7 +405,7 @@ class SFServices(object):
 'forceGetProperty'):
 pass
 elif name in self.serviceproperties:
-if self.forceGetProperty is False and 
self.serviceproperties[name] is False: # False = read-only
+if self.forceGetProperty is False and 
self.serviceproperties[name] is False:  # False = read-only
 if name in self.__dict__:
 return self.__dict__[name]
 else:
@@ -430,7 +430,7 @@ class SFServices(object):
 elif name[0:2] == '__' or name in self.internal_attributes or name 
in self.localProperties:
 pass
 elif name in self.serviceproperties or name in 
self.propertysynonyms:
-if name in self.propertysynonyms: # Reset real name if 
argument provided in lower or camel case
+if name in self.propertysynonyms:  # Reset real name if 
argument provided in lower or camel case
 name = self.propertysynonyms[name]
 if self.internal:  # internal = True forces property local 
setting even if property is read-only
 pass
@@ -635,18 +635,120 @@ class SFScriptForge:
 xray = Xray
 
 # #
-# SF_String CLASS
+# SF_Dictionary CLASS
 # #
-class SF_String(SFServices, metaclass = _Singleton):
+class SF_Dictionary(SFServices, dict):
 """
-A collection of methods focused on string manipulation, user input 
validation,
-regular expressions, encodings, parsing and hashing algorithms.
-Many of them are less efficient than their Python equivalents.
+The service adds to a Python dict instance the interfaces for 
conversion to and from
+a list of UNO PropertyValues
+
+Usage:
+dico = dict(A = 1, B = 

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

[Seth Chaiklin (via logerrit)]

 sw/uiconfig/sglobal/menubar/menubar.xml  |2 +-
 sw/uiconfig/sglobal/toolbar/numobjectbar.xml |2 +-
 sw/uiconfig/sweb/menubar/menubar.xml |2 +-
 sw/uiconfig/sweb/toolbar/numobjectbar.xml|2 +-
 sw/uiconfig/swform/menubar/menubar.xml   |2 +-
 sw/uiconfig/swform/toolbar/numobjectbar.xml  |2 +-
 sw/uiconfig/swreport/menubar/menubar.xml |2 +-
 sw/uiconfig/swriter/menubar/menubar.xml  |2 +-
 sw/uiconfig/swriter/toolbar/numobjectbar.xml |2 +-
 sw/uiconfig/swxform/menubar/menubar.xml  |2 +-
 sw/uiconfig/swxform/toolbar/numobjectbar.xml |2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit d0e4e4f4994424085ebd33b8d4333fdef454cc52
Author: Seth Chaiklin 
AuthorDate: Sat Mar 13 20:59:32 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Mon Mar 15 15:40:29 2021 +0100

tdf#139667 tdf#126689 "Add to Previous List" in menus and toolbars

Change-Id: I85334320f6fde2b12b981ad7fdeee570e89fd74f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112420
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index 7f1bfe99a7bd..c02882f83b79 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -430,10 +430,10 @@
   
   
   
+  
   
   
   
-  
 
   
   
diff --git a/sw/uiconfig/sglobal/toolbar/numobjectbar.xml 
b/sw/uiconfig/sglobal/toolbar/numobjectbar.xml
index 9fcd5ed70c74..16f566b7ed5a 100644
--- a/sw/uiconfig/sglobal/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/numobjectbar.xml
@@ -30,10 +30,10 @@
  
  
  
+ 
  
  
  
- 
  
  
  
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml 
b/sw/uiconfig/sweb/menubar/menubar.xml
index eed675d241d4..46c1a22f32fc 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -301,10 +301,10 @@
   
   
   
+  
   
   
   
-  
 
   
   
diff --git a/sw/uiconfig/sweb/toolbar/numobjectbar.xml 
b/sw/uiconfig/sweb/toolbar/numobjectbar.xml
index 9fcd5ed70c74..16f566b7ed5a 100644
--- a/sw/uiconfig/sweb/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/numobjectbar.xml
@@ -30,10 +30,10 @@
  
  
  
+ 
  
  
  
- 
  
  
  
diff --git a/sw/uiconfig/swform/menubar/menubar.xml 
b/sw/uiconfig/swform/menubar/menubar.xml
index c2aee67dafad..0e64a2315124 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -380,10 +380,10 @@
   
   
   
+  
   
   
   
-  
 
   
   
diff --git a/sw/uiconfig/swform/toolbar/numobjectbar.xml 
b/sw/uiconfig/swform/toolbar/numobjectbar.xml
index 9fcd5ed70c74..16f566b7ed5a 100644
--- a/sw/uiconfig/swform/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/numobjectbar.xml
@@ -30,10 +30,10 @@
  
  
  
+ 
  
  
  
- 
  
  
  
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml 
b/sw/uiconfig/swreport/menubar/menubar.xml
index 0862618e0b5f..c2562ee5d521 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -366,10 +366,10 @@
   
   
   
+  
   
   
   
-  
 
   
   
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index b57802250a23..8f4cd3617f7d 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -446,10 +446,10 @@
   
   
   
+  
   
   
   
-  
 
   
   
diff --git a/sw/uiconfig/swriter/toolbar/numobjectbar.xml 
b/sw/uiconfig/swriter/toolbar/numobjectbar.xml
index 9fcd5ed70c74..16f566b7ed5a 100644
--- a/sw/uiconfig/swriter/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/numobjectbar.xml
@@ -30,10 +30,10 @@
  
  
  
+ 
  
  
  
- 
  
  
  
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml 
b/sw/uiconfig/swxform/menubar/menubar.xml
index 315e9a389e7e..7fb669089632 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -427,10 +427,10 @@
   
   
   
+  
   
   
   
-  
 
   
   
diff --git a/sw/uiconfig/swxform/toolbar/numobjectbar.xml 
b/sw/uiconfig/swxform/toolbar/numobjectbar.xml
index 9fcd5ed70c74..16f566b7ed5a 100644
--- a/sw/uiconfig/swxform/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/numobjectbar.xml
@@ -30,10 +30,10 @@
  
  
  
+ 
  
  
  
- 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/list

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

[Julien Nabet (via logerrit)]

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

New commits:
commit 70c33addf14d7ee9db874c0d653fbd8f035ac96e
Author: Julien Nabet 
AuthorDate: Sun Feb 28 22:23:30 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 15 15:37:02 2021 +0100

tdf#127217: Fix buttons in forms not working in Adobe Reader

Regression from 76b5dca9dc0ff60f8f62cbecdee68f8f3b287ceb:
author  Thorsten Behrens   2019-04-09 02:19:14 
+0200
committer   Katarina Behrens   2019-07-03 
14:48:45 +0200
commit  76b5dca9dc0ff60f8f62cbecdee68f8f3b287ceb (patch)
treee778dad33073a228eb61ab62ce5f38e2a26d07ca
parent  1e8a9c19a6f7b82c9e0c481aee0c04c0780f4433 (diff)
tdf#113448 don't export any font for radio buttons

Don't let only color value in m_aDAString since it'll go here:
if( !rWidget.m_aDAString.isEmpty() )
{
if( !rWidget.m_aDRDict.isEmpty() )
{
aLine.append( "/DR<<" );
aLine.append( rWidget.m_aDRDict );
aLine.append( ">>\n" );
}
else
{
aLine.append( "/DR<>>>\n" );
}
aLine.append( "/DA" );
appendLiteralStringEncrypt( rWidget.m_aDAString, 
rWidget.m_nObject, aLine );
aLine.append( "\n" );
if( rWidget.m_nTextStyle & DrawTextFlags::Center )
aLine.append( "/Q 1\n" );
else if( rWidget.m_nTextStyle & DrawTextFlags::Right )
aLine.append( "/Q 2\n" );
}

But if we shouldn't have /DR at all since we don't want fonts for 
radiobutton, it also means
we don't want /DA too.
Indeed at the end of 12.7.3.3 
https://www.adobe.com/content/dam/acom/en/devnet/pdf/pdfs/PDF32000_2008.pdf:
The default appearance string (DA) contains any graphics state or text 
state operators needed to establish the
graphics state parameters, such as text size and colour, for displaying the 
field’s variable text. Only operators
that are allowed within text objects shall occur in this string (see Figure 
9). At a minimum, the string shall
include a Tf (text font) operator along with its two operands, font and 
size. The specified font value shall match
a resource name in the Font entry of the default resource dictionary 
(referenced from the DR entry of the
interactive form dictionary; see Table 218).

Change-Id: Ib350495d7fc5a7a4fba88d710614a0f67a0b1553
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111724
(cherry picked from commit a0d63ee5df921e5f1ac915ada783fdef0dbbb057)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112306
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 375a4fcba0d7..3836d348ab2c 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3920,9 +3920,6 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( 
PDFWidget& rBox, const P
 
 pop();
 
-OStringBuffer aDA( 256 );
-appendNonStrokingColor( replaceColor( rWidget.TextColor, 
rSettings.GetRadioCheckTextColor() ), aDA );
-rBox.m_aDAString = aDA.makeStringAndClear();
 //to encrypt this (el)
 rBox.m_aMKDict = "/CA";
 //after this assignment, to m_aMKDic cannot be added anything
@@ -3935,6 +3932,7 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( 
PDFWidget& rBox, const P
 SvMemoryStream* pCheckStream = new SvMemoryStream( 256, 256 );
 
 beginRedirect( pCheckStream, aCheckRect );
+OStringBuffer aDA( 256 );
 aDA.append( "/Tx BMC\nq BT\n" );
 appendNonStrokingColor( replaceColor( rWidget.TextColor, 
rSettings.GetRadioCheckTextColor() ), aDA );
 aDA.append( ' ' );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

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

New commits:
commit fc337124c9bb7498fc84a1c60250d7c043e8c7a6
Author: Julien Nabet 
AuthorDate: Sun Feb 28 22:23:30 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 15 15:34:54 2021 +0100

tdf#127217: Fix buttons in forms not working in Adobe Reader

Regression from 76b5dca9dc0ff60f8f62cbecdee68f8f3b287ceb:
author  Thorsten Behrens   2019-04-09 02:19:14 
+0200
committer   Katarina Behrens   2019-07-03 
14:48:45 +0200
commit  76b5dca9dc0ff60f8f62cbecdee68f8f3b287ceb (patch)
treee778dad33073a228eb61ab62ce5f38e2a26d07ca
parent  1e8a9c19a6f7b82c9e0c481aee0c04c0780f4433 (diff)
tdf#113448 don't export any font for radio buttons

Don't let only color value in m_aDAString since it'll go here:
if( !rWidget.m_aDAString.isEmpty() )
{
if( !rWidget.m_aDRDict.isEmpty() )
{
aLine.append( "/DR<<" );
aLine.append( rWidget.m_aDRDict );
aLine.append( ">>\n" );
}
else
{
aLine.append( "/DR<>>>\n" );
}
aLine.append( "/DA" );
appendLiteralStringEncrypt( rWidget.m_aDAString, 
rWidget.m_nObject, aLine );
aLine.append( "\n" );
if( rWidget.m_nTextStyle & DrawTextFlags::Center )
aLine.append( "/Q 1\n" );
else if( rWidget.m_nTextStyle & DrawTextFlags::Right )
aLine.append( "/Q 2\n" );
}

But if we shouldn't have /DR at all since we don't want fonts for 
radiobutton, it also means
we don't want /DA too.
Indeed at the end of 12.7.3.3 
https://www.adobe.com/content/dam/acom/en/devnet/pdf/pdfs/PDF32000_2008.pdf:
The default appearance string (DA) contains any graphics state or text 
state operators needed to establish the
graphics state parameters, such as text size and colour, for displaying the 
field’s variable text. Only operators
that are allowed within text objects shall occur in this string (see Figure 
9). At a minimum, the string shall
include a Tf (text font) operator along with its two operands, font and 
size. The specified font value shall match
a resource name in the Font entry of the default resource dictionary 
(referenced from the DR entry of the
interactive form dictionary; see Table 218).

Change-Id: Ib350495d7fc5a7a4fba88d710614a0f67a0b1553
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111724
(cherry picked from commit a0d63ee5df921e5f1ac915ada783fdef0dbbb057)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112305
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index eeeb4305a181..6c6fc7c8923b 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -4023,9 +4023,6 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( 
PDFWidget& rBox, const P
 
 pop();
 
-OStringBuffer aDA( 256 );
-appendNonStrokingColor( replaceColor( rWidget.TextColor, 
rSettings.GetRadioCheckTextColor() ), aDA );
-rBox.m_aDAString = aDA.makeStringAndClear();
 //to encrypt this (el)
 rBox.m_aMKDict = "/CA";
 //after this assignment, to m_aMKDic cannot be added anything
@@ -4038,6 +4035,7 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( 
PDFWidget& rBox, const P
 SvMemoryStream* pCheckStream = new SvMemoryStream( 256, 256 );
 
 beginRedirect( pCheckStream, aCheckRect );
+OStringBuffer aDA( 256 );
 aDA.append( "/Tx BMC\nq BT\n" );
 appendNonStrokingColor( replaceColor( rWidget.TextColor, 
rSettings.GetRadioCheckTextColor() ), aDA );
 aDA.append( ' ' );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit 23974f5f00cd5d5e7a52cb3e257ec74bbfa12607
Author: Seth Chaiklin 
AuthorDate: Mon Mar 15 15:34:32 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 15 15:34:32 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to bbcbc7ca09d2301e8fbcbaed37588959ba4e6b68
  - tdf#135783 improvements about applying page styles

  + add explanation about how to use Status bar to apply page style
and a link to the page about how to turn on the Status bar.
  + write new section about how override a "next style" in page style
and a link to another page with additional information.
  + add bookmark about overriding page styles.
  + add a note about what to do when a user wants to apply a page style
to a page that is formatted with the page style's "next style".
  * updated to  section.

Change-Id: I4d5f8537d1e4e9f8cceef840e6b2ce221207c79f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112292
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index 145718f04baf..bbcbc7ca09d2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 145718f04baf9d9febad94a6ce9d884b5c0e8ced
+Subproject commit bbcbc7ca09d2301e8fbcbaed37588959ba4e6b68
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 source/text/swriter/guide/pagestyles.xhp |   33 ---
 1 file changed, 30 insertions(+), 3 deletions(-)

New commits:
commit bbcbc7ca09d2301e8fbcbaed37588959ba4e6b68
Author: Seth Chaiklin 
AuthorDate: Thu Mar 11 01:06:18 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Mon Mar 15 15:34:32 2021 +0100

tdf#135783 improvements about applying page styles

  + add explanation about how to use Status bar to apply page style
and a link to the page about how to turn on the Status bar.
  + write new section about how override a "next style" in page style
and a link to another page with additional information.
  + add bookmark about overriding page styles.
  + add a note about what to do when a user wants to apply a page style
to a page that is formatted with the page style's "next style".
  * updated to  section.

Change-Id: I4d5f8537d1e4e9f8cceef840e6b2ce221207c79f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112292
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/swriter/guide/pagestyles.xhp 
b/source/text/swriter/guide/pagestyles.xhp
index 52befb21a..3a88ce807 100644
--- a/source/text/swriter/guide/pagestyles.xhp
+++ b/source/text/swriter/guide/pagestyles.xhp
@@ -31,8 +31,8 @@
   page styles;creating and applying
   defining;page styles
   styles;for pages
+  overriding next style;for pages
 
-MW deleted "applying;" and added "styles;"
 
 Creating and Applying Page Styles
 $[officename] 
uses page styles to specify the layout of a page, including the page 
orientation, background, margins, headers, footers, and text columns. To change 
the layout of an individual page in a document, you must create and apply a 
custom page style to the page.
@@ -78,12 +78,38 @@
 Click in 
the page that you want to apply the page style to.
   
   
-Choose 
View - Styles, and then click the Page 
Style icon.
+Do one of the 
following:
   
+
+  
   
+Choose 
View - Styles, and then click the Page 
Style icon.
 Double-click a name in the list.
   
+  
+Right-click the page 
style displayed in the Status Bar. Select another page style.
+  
+  
+
+To Manually Override the “Next style” of a Page 
Style
+
+
+  
+Place cursor between 
the page with the page style and the page with the style specified in 
Next style.
+  
+  
+  Right click and 
choose Edit Page Break.
+  
+  
+Select the 
With page style checkbox.
+  
+  
+Enter the page style 
to be applied.
+  
 
+See Manually 
Defined Range of a Page style.
+
+ A special situation arises when a Next 
style is different than the page style itself, and you want to apply 
that page style to two consecutive pages. For example, if you have applied 
First Page style to a page, and want to apply First Page style 
again to the immediately following page, then you must manually override First 
Page style, because it is configured to be followed by Default Page 
Style.
 
 To Apply a Page Style to a New Page
 
@@ -104,7 +130,7 @@
 Click 
OK.
   
 
-
+
 
 
 
@@ -113,5 +139,6 @@
 
 
 
+
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests9/tdf124318.py |   35 ++
 sc/qa/uitest/data/tdf124318.xls   |binary
 2 files changed, 35 insertions(+)

New commits:
commit 6e5081011d7727536a5ff8eb604907cdb041d2b1
Author: Xisco Fauli 
AuthorDate: Mon Mar 15 12:33:31 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 15 15:18:52 2021 +0100

tdf#124318: sc: Add UItest

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

diff --git a/sc/qa/uitest/calc_tests9/tdf124318.py 
b/sc/qa/uitest/calc_tests9/tdf124318.py
new file mode 100644
index ..69a8a8a181ef
--- /dev/null
+++ b/sc/qa/uitest/calc_tests9/tdf124318.py
@@ -0,0 +1,35 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+class tdf124318(UITestCase):
+
+def test_tdf124318(self):
+
+calc_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf124318.xls"))
+
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B4"}))
+
+self.ui_test.execute_dialog_through_action(gridwin, "TYPE", 
mkPropertyValues({"KEYCODE": "CTRL+k"}))
+xDialog = self.xUITest.getTopFocusWindow()
+
+# Without the fix in place, this test would have failed with
+# AssertionError: 'mobile/identification/authentification' !=
+# 'mobile/identification/authentification%00塹\uf481ᴻ䡿ⲯ嶂藄挧%00%00ꮥ%00'
+self.assertEqual("mobile/identification/authentification",
+
get_state_as_dict(xDialog.getChild("target"))['Text'].split(".fr/")[1])
+self.assertEqual("mobile/identification/authentification",
+
get_state_as_dict(xDialog.getChild("indication"))['Text'].split(".fr/")[1])
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/data/tdf124318.xls b/sc/qa/uitest/data/tdf124318.xls
new file mode 100644
index ..9dc7c12d7921
Binary files /dev/null and b/sc/qa/uitest/data/tdf124318.xls differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andreas Heinisch (via logerrit)]

 basic/qa/basic_coverage/test_string_replace.vb |6 ++
 basic/source/runtime/methods.cxx   |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit ac0b6fb3842201e438950ea99a55ad334f8521ab
Author: Andreas Heinisch 
AuthorDate: Mon Mar 15 13:41:58 2021 +0100
Commit: Andreas Heinisch 
CommitDate: Mon Mar 15 15:16:57 2021 +0100

tdf#141045 - fixed copy paste error in the replace function

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

diff --git a/basic/qa/basic_coverage/test_string_replace.vb 
b/basic/qa/basic_coverage/test_string_replace.vb
index 99eafdba6b14..e2e9ce35962b 100644
--- a/basic/qa/basic_coverage/test_string_replace.vb
+++ b/basic/qa/basic_coverage/test_string_replace.vb
@@ -23,6 +23,12 @@ Function verify_stringReplace() As String
 retStr = Replace("АБВабв", "б", "*")
 TestLog_ASSERT retStr, "А*Ва*в", "case-insensitive non-ASCII: " & retStr
 
+' tdf#141045 - different length of search and replace string. It is 
important
+' that the search string starts with the original string in order to test 
the error.
+' Without the fix in place, the string index calculations result in a 
crash.
+retStr = Replace("a", "abc", "ab")
+TestLog_ASSERT retStr, "a", "different length of search and replace 
string: " & retStr
+
 result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & 
"Tests failed: " & failCount & Chr$(10)
 verify_stringReplace = result
 End Function
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 2e2311078a67..0276a41c1b17 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1289,7 +1289,7 @@ void SbRtl_Replace(StarBASIC *, SbxArray & rPar, bool)
 const css::lang::Locale& rLocale = 
Application::GetSettings().GetUILanguageTag().getLocale();
 css::uno::Reference < i18n::XCharacterClassification > xCharClass = 
vcl::unohelper::CreateCharacterClassification();
 aSrcStr = xCharClass->toUpper(aSrcStr, 0, aSrcStr.getLength(), 
rLocale);
-aFindStr = xCharClass->toUpper(aFindStr, 0, aSrcStr.getLength(), 
rLocale);
+aFindStr = xCharClass->toUpper(aFindStr, 0, aFindStr.getLength(), 
rLocale);
 }
 
 // Note: the result starts from lStartPos, removing everything to the 
left. See i#94895.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |2 +-
 include/svl/sigstruct.hxx  |2 +-
 xmlsecurity/source/helper/xmlsignaturehelper.cxx   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5a086e43ef9959b2c934b7747e0453636a336af0
Author: Andrea Gelmini 
AuthorDate: Mon Mar 15 11:18:58 2021 +0100
Commit: Andras Timar 
CommitDate: Mon Mar 15 15:15:44 2021 +0100

Fix typos

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

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index f55c7ee97009..033f3200c846 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1687,7 +1687,7 @@
 
 
 
-
 
 
diff --git a/include/svl/sigstruct.hxx b/include/svl/sigstruct.hxx
index 77be7c48cae9..20cb0ebd2d0a 100644
--- a/include/svl/sigstruct.hxx
+++ b/include/svl/sigstruct.hxx
@@ -98,7 +98,7 @@ struct SignatureInformation
 OUString X509Subject;
 };
 typedef std::vector X509Data;
-// note: at parse time, it's unkown which one is the signing certificate;
+// note: at parse time, it's unknown which one is the signing certificate;
 // ImplVerifySignatures() figures it out and puts it at the back
 std::vector X509Datas;
 
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx 
b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 18ed40ce6ac5..c77491558380 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -642,7 +642,7 @@ static auto CheckX509Data(
 if (xmlsecurity::EqualDistinguishedNames(
 certs[chain[i]]->getSubjectName(), 
certs[j]->getIssuerName()))
 {
-if (chain.size() != i + 1) // already found issuee?
+if (chain.size() != i + 1) // already found issue?
 {
 SAL_WARN("xmlsecurity.comp", "X509Data do not form a 
chain: certificate issued 2 others: " << certs[chain[i]]->getSubjectName());
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Andrea Gelmini (via logerrit)]

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

New commits:
commit 69d79d41c8f1f509e0a5a4e013a8caef01401ece
Author: Andrea Gelmini 
AuthorDate: Mon Mar 15 15:14:45 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 15 15:14:45 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 145718f04baf9d9febad94a6ce9d884b5c0e8ced
  - Fix typo

Change-Id: I10d04a332b92267e79621cd26ccadab2bf43fb48
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112507
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/helpcontent2 b/helpcontent2
index 1e37bc66a03b..145718f04baf 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1e37bc66a03bbc4b096147addcebfbe41030557c
+Subproject commit 145718f04baf9d9febad94a6ce9d884b5c0e8ced
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 source/text/simpress/main_slide.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 145718f04baf9d9febad94a6ce9d884b5c0e8ced
Author: Andrea Gelmini 
AuthorDate: Mon Mar 15 13:33:32 2021 +0100
Commit: Andras Timar 
CommitDate: Mon Mar 15 15:14:45 2021 +0100

Fix typo

Change-Id: I10d04a332b92267e79621cd26ccadab2bf43fb48
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112507
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/source/text/simpress/main_slide.xhp 
b/source/text/simpress/main_slide.xhp
index 2b96dec24..1a81be6ed 100644
--- a/source/text/simpress/main_slide.xhp
+++ b/source/text/simpress/main_slide.xhp
@@ -42,7 +42,7 @@
   Delete Slide
   Deletes the selected 
slide(s).
   Save Background Image
-  If the slide has a 
background image, this option alows the user to save the corresponding 
background image file.
+  If the slide has a 
background image, this option allows the user to save the corresponding 
background image file.
   Set Background Image
   Opens a File Picker 
to choose an image file to be set as the background of the current 
slide.
   Slide Properties
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Weghorn (via logerrit)]

 android/source/build.gradle |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 96af7614c205cbb43379d8b37fd02de7080175a0
Author: Michael Weghorn 
AuthorDate: Mon Mar 15 11:30:36 2021 +0100
Commit: Michael Weghorn 
CommitDate: Mon Mar 15 14:01:31 2021 +0100

tdf#141044 android: Update included .ui files

... according to changes in

commit 51379fb3d46e5891bdaea0122bd62b0753663da3
Date:   Thu Dec 3 15:54:45 2020 +

weld writer's FrameControl MenuButtons

and

commit a39a3f1ad1e5e39b09ce474c0f4c0f9f4e174bbe
Date:   Tue Feb 9 12:07:27 2021 +

weld impress annotation window

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

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 32de09f84749..ee297e1b44c6 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -186,14 +186,10 @@ task copyAssets(type: Copy) {
 include '*.data'
 }
 }
-// documents with manual page break trigger attempt to read the ui file 
'pagebreakmenu.ui'
-// would trigger a css::container::NoSuchElementException with 
osl_File_E_NOENT
-// if not present and since it is not caught would crash the app;
-// 'annotationmenu.ui' required to handle documents containing comments,
-// 'headerfootermenu.ui' when clicking inside header/footer of document
+// include required .ui files
 into('config') {
 from "${liboInstdir}/share/config"
-include '**/pagebreakmenu.ui', '**/annotationmenu.ui', 
'**/headerfootermenu.ui'
+include '**/annotation.ui', '**/hfmenubutton.ui', '**/pbmenubutton.ui'
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 sal/rtl/strtmpl.hxx |   48 
 1 file changed, 20 insertions(+), 28 deletions(-)

New commits:
commit 760a902a3314b7fde8751b0df67c024b8d5935f3
Author: Mike Kaganski 
AuthorDate: Mon Mar 15 11:55:08 2021 +0100
Commit: Mike Kaganski 
CommitDate: Mon Mar 15 13:55:04 2021 +0100

Deduplicate trim implementations

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

diff --git a/sal/rtl/strtmpl.hxx b/sal/rtl/strtmpl.hxx
index b63d9ff35415..f69aad1ee990 100644
--- a/sal/rtl/strtmpl.hxx
+++ b/sal/rtl/strtmpl.hxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -738,7 +739,7 @@ template  sal_Int32 trim( 
IMPL_RTL_STRCODE* pStr )
 /* --- */
 
 template 
-sal_Int32 trim_WithLength( IMPL_RTL_STRCODE* pStr, sal_Int32 nLen )
+std::basic_string_view trimView( IMPL_RTL_STRCODE* pStr, 
sal_Int32 nLen )
 {
 assert(nLen >= 0);
 sal_Int32 nPreSpaces= 0;
@@ -754,18 +755,22 @@ sal_Int32 trim_WithLength( IMPL_RTL_STRCODE* pStr, 
sal_Int32 nLen )
 nIndex--;
 }
 
-if ( nPostSpaces )
-{
-nLen -= nPostSpaces;
-*(pStr+nLen) = 0;
-}
+return { pStr + nPreSpaces, static_cast(nLen - nPostSpaces - 
nPreSpaces) };
+}
+
+/* --- */
+
+template 
+sal_Int32 trim_WithLength( IMPL_RTL_STRCODE* pStr, sal_Int32 nLen )
+{
+const auto view = trimView(pStr, nLen);
 
-if ( nPreSpaces )
+if (static_cast(view.size()) != nLen)
 {
-nLen -= nPreSpaces;
-memmove(pStr, pStr + nPreSpaces, nLen * sizeof(IMPL_RTL_STRCODE));
-pStr += nLen;
-*pStr = 0;
+nLen = static_cast(view.size());
+if (view.data() != pStr)
+memmove(pStr, view.data(), nLen * sizeof(IMPL_RTL_STRCODE));
+*(pStr+nLen) = 0;
 }
 
 return nLen;
@@ -1825,32 +1830,19 @@ void newTrim( 
IMPL_RTL_STRINGDATA** ppThis,
 assert(ppThis);
 assert(pStr);
 IMPL_RTL_STRINGDATA*pOrg= *ppThis;
-const auto* pCharStr= pStr->buffer;
-sal_Int32   nPreSpaces  = 0;
-sal_Int32   nPostSpaces = 0;
-sal_Int32   nLen= pStr->length;
-sal_Int32   nIndex  = nLen-1;
-
-while ( (nPreSpaces < nLen) && rtl_ImplIsWhitespace( 
USTRCODE(*(pCharStr+nPreSpaces)) ) )
-nPreSpaces++;
-
-while ( (nIndex > nPreSpaces) && rtl_ImplIsWhitespace( 
USTRCODE(*(pCharStr+nIndex)) ) )
-{
-nPostSpaces++;
-nIndex--;
-}
+const auto view = trimView(pStr->buffer, pStr->length);
 
-if ( !nPreSpaces && !nPostSpaces )
+if (static_cast(view.size()) == pStr->length)
 {
 *ppThis = pStr;
 acquire( pStr );
 }
 else
 {
-nLen -= nPostSpaces+nPreSpaces;
+sal_Int32 nLen = static_cast(view.size());
 *ppThis = Alloc( nLen );
 assert(*ppThis);
-Copy( (*ppThis)->buffer, pStr->buffer+nPreSpaces, nLen );
+Copy( (*ppThis)->buffer, view.data(), nLen );
 }
 
 RTL_LOG_STRING_NEW( *ppThis );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

About ZipIOException

[Quan Nguyen]

Hi,

I am writing a unit test for the bug 49819 
(https://bugs.documentfoundation.org/show_bug.cgi?id=49819) and 
encounter a weird issue. I have restored the code to the state before 
the bug fix but still can't reproduce the bug. Even weirder, I tried and 
succeeded to reproduce the bug once, but it suddenly disappear after a 
rebuild.


After using gdb to trace back the issue, I noticed that I the function 
void ZipFile::readLOC( ZipEntry &rEntry ) in 
/package/source/zipapi/ZipFile.cxx/ does throw an exception (throw 
ZipIOException("The stream seems to be broken!" );) when rEntry.nTime != 
nTime. But somehow the exception is caught in 
/writerfilter/source/dmapper/DomainMapper.cxx:253/ ( catch( const 
uno::Exception& ) {} ) and does nothing.


Is this the correct behavior when the Zip file is broken? Also, how 
could I restore the previous state to reproduce the bug?


Thank you.

Best regards,

Quan Nguyen.


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

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

[Noel Grandin (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport16.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit fcc022ca9c8e93f045f7bed7bf9b672f55e741b5
Author: Noel Grandin 
AuthorDate: Mon Mar 15 12:17:26 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Mar 15 13:25:20 2021 +0100

mark some more tests failing on non-default dpi

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

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index 319695655fcb..6338931f9ec3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -159,6 +159,8 @@ 
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf140572_docDefault_superscript, "tdf14
 
 DECLARE_OOXMLEXPORT_TEST(testTdf136841, "tdf136841.docx")
 {
+if (!IsDefaultDPI())
+return;
 uno::Reference image = getShape(1);
 uno::Reference imageProperties(image, uno::UNO_QUERY);
 uno::Reference graphic;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

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

New commits:
commit 4927e8277d0a9740c0d52015bbcb8571081b721c
Author: Michael Stahl 
AuthorDate: Sun Mar 14 11:45:10 2021 +0100
Commit: Michael Stahl 
CommitDate: Mon Mar 15 13:15:03 2021 +0100

configure: fix detection of CLANGDIR

... for values of CXX like "sccache clang++" - take the first word that
contains "clang".

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

diff --git a/configure.ac b/configure.ac
index fece7f768759..fe84f7b4e922 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7802,7 +7802,7 @@ if test "$COM_IS_CLANG" = "TRUE"; then
 dnl The prefix where Clang resides, override to where Clang resides if
 dnl using a source build:
 if test -z "$CLANGDIR"; then
-CLANGDIR=$(dirname $(dirname $($CXX -print-prog-name=$(basename 
$(printf '%s\n' $CXX | head -n 1)
+CLANGDIR=$(dirname $(dirname $($CXX -print-prog-name=$(basename 
$(printf '%s\n' $CXX | grep clang | head -n 1)
 fi
 # Assume Clang is self-built, but allow overriding 
COMPILER_PLUGINS_CXX to the compiler Clang was built with.
 if test -z "$COMPILER_PLUGINS_CXX"; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt (via logerrit)]

 sc/source/ui/inc/gridwin.hxx   |2 +-
 sc/source/ui/view/gridwin.cxx  |2 +-
 sc/source/ui/view/gridwin3.cxx |7 ++-
 sd/source/ui/view/drviews4.cxx |4 ++--
 svx/source/form/fmview.cxx |   28 
 5 files changed, 38 insertions(+), 5 deletions(-)

New commits:
commit 67ad205404211a2ae17c430a17ede6e9d04d0b7e
Author: Samuel Mehrbrodt 
AuthorDate: Wed Mar 3 07:47:43 2021 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Mar 15 12:47:34 2021 +0100

tdf#139804 Focus form controls inside document with Alt-

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

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index b4f08368d530..9ce8a8365bf0 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -260,7 +260,7 @@ class SAL_DLLPUBLIC_RTTI ScGridWindow : public vcl::Window, 
public DropTargetHel
 boolDrawMouseButtonDown(const MouseEvent& rMEvt);
 boolDrawMouseButtonUp(const MouseEvent& rMEvt);
 boolDrawMouseMove(const MouseEvent& rMEvt);
-boolDrawKeyInput(const KeyEvent& rKEvt);
+boolDrawKeyInput(const KeyEvent& rKEvt, vcl::Window* pWin);
 boolDrawCommand(const CommandEvent& rCEvt);
 boolDrawHasMarkedObj();
 voidDrawEndAction();
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 1497988b7f16..585d46ff6cf0 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3250,7 +3250,7 @@ void ScGridWindow::KeyInput(const KeyEvent& rKEvt)
 if (mrViewData.GetDocShell()->GetProgress())
 return;
 
-if (DrawKeyInput(rKEvt))
+if (DrawKeyInput(rKEvt, this))
 {
 const vcl::KeyCode& rLclKeyCode = rKEvt.GetKeyCode();
 if (rLclKeyCode.GetCode() == KEY_DOWN
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index e78a97cd5e3f..948f388ca866 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -167,10 +167,15 @@ bool ScGridWindow::DrawCommand(const CommandEvent& rCEvt)
 return false;
 }
 
-bool ScGridWindow::DrawKeyInput(const KeyEvent& rKEvt)
+bool ScGridWindow::DrawKeyInput(const KeyEvent& rKEvt, vcl::Window* pWin)
 {
 ScDrawView* pDrView = mrViewData.GetScDrawView();
 FuPoor* pDraw = mrViewData.GetView()->GetDrawFuncPtr();
+
+
+if (pDrView && pDrView->KeyInput(rKEvt, pWin))
+return true;
+
 if (pDrView && pDraw && !mrViewData.IsRefMode())
 {
 pDraw->SetWindow( this );
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 62e23e5b8e7e..39f428bb8658 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -148,9 +148,9 @@ void DrawViewShell::DeleteActualLayer()
 
 bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
 {
-bool bRet = false;
+bool bRet = GetView()->KeyInput(rKEvt, pWin);
 
-if ( !IsInputLocked() || ( rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE ) )
+if (!bRet && (!IsInputLocked() || (rKEvt.GetKeyCode().GetCode() == 
KEY_ESCAPE)))
 {
 if(KEY_RETURN == rKEvt.GetKeyCode().GetCode()
 && rKEvt.GetKeyCode().IsMod1()
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 756fa8d2b21e..feb1e43f2f8e 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -41,11 +41,14 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -493,6 +496,31 @@ bool FmFormView::KeyInput(const KeyEvent& rKEvt, 
vcl::Window* pWin)
 
 }
 
+// tdf#139804 Allow selecting form controls with Alt-
+if (rKeyCode.IsMod2() && rKeyCode.GetCode())
+{
+FmFormPage* pCurPage = GetCurPage();
+for (size_t a = 0; a < pCurPage->GetObjCount(); ++a)
+{
+SdrObject* pObj = pCurPage->GetObj(a);
+FmFormObj* pFormObject = FmFormObj::GetFormObject(pObj);
+if (!pFormObject)
+continue;
+
+Reference xControl = 
pFormObject->GetUnoControl(*this, *pWin);
+if (!xControl.is())
+continue;
+const vcl::I18nHelper& rI18nHelper = 
Application::GetSettings().GetUILocaleI18nHelper();
+VclPtr pWindow = 
VCLUnoHelper::GetWindow(xControl->getPeer());
+if (rI18nHelper.MatchMnemonic(pWindow->GetText(), 
rKEvt.GetCharCode()))
+{
+pWindow->GrabFocus();
+bDone = true;
+break;
+}
+}
+}
+
 if ( !bDone )
 bDone = E3dView::KeyInput(rKEvt,pWin);
 return bDone;
__

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit aa0fb6ed5c9bd17f9fe339de981291120431c370
Author: Seth Chaiklin 
AuthorDate: Mon Mar 15 12:30:17 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 15 12:30:17 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 1e37bc66a03bbc4b096147addcebfbe41030557c
  - tdf#139667 (tdf#135895) improvements/updating to making lists

   ( swriter/guide/using_numbered_lists.xhp )

 * update command names
 * in paragraphs where changes were needed, also updated
   to 
 * move icon out of sentence
 + embed icon table
 + add 
 + add unordered list to items about formatting bullets
 * update to ,,

   ( shared/02/0612.xhp )
 * "Bullets On/Off" -> "Toggle Unordered List"
 - remove "colspan= rowspan="

   ( swriter/guide/using_numbered_lists2.xhp )
 * replace icon table with embed to another table
   with updated command name
 + add tip about using paragraph style for numbering
 * change  to paragraph with heading about removing
   numbering
 * elaborate section about formatting lists, and move some
   paragraphs about this topic out of the "Adding Numbering"
   section.
 + add to  about formatting being reset with toggling a list.

Change-Id: I1e0d7d46dfce2f69f7a0954cf5d3094d413dd95d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112424
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index 339aa19b6692..1e37bc66a03b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 339aa19b6692e3257d5395007a176a6a4d617b88
+Subproject commit 1e37bc66a03bbc4b096147addcebfbe41030557c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 source/text/shared/02/0612.xhp  |4 -
 source/text/swriter/guide/using_numbered_lists.xhp  |   29 ++---
 source/text/swriter/guide/using_numbered_lists2.xhp |   61 ++--
 3 files changed, 54 insertions(+), 40 deletions(-)

New commits:
commit 1e37bc66a03bbc4b096147addcebfbe41030557c
Author: Seth Chaiklin 
AuthorDate: Sun Mar 14 23:18:22 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Mon Mar 15 12:30:17 2021 +0100

tdf#139667 (tdf#135895) improvements/updating to making lists

   ( swriter/guide/using_numbered_lists.xhp )

 * update command names
 * in paragraphs where changes were needed, also updated
   to 
 * move icon out of sentence
 + embed icon table
 + add 
 + add unordered list to items about formatting bullets
 * update to ,,

   ( shared/02/0612.xhp )
 * "Bullets On/Off" -> "Toggle Unordered List"
 - remove "colspan= rowspan="

   ( swriter/guide/using_numbered_lists2.xhp )
 * replace icon table with embed to another table
   with updated command name
 + add tip about using paragraph style for numbering
 * change  to paragraph with heading about removing
   numbering
 * elaborate section about formatting lists, and move some
   paragraphs about this topic out of the "Adding Numbering"
   section.
 + add to  about formatting being reset with toggling a list.

Change-Id: I1e0d7d46dfce2f69f7a0954cf5d3094d413dd95d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112424
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/shared/02/0612.xhp 
b/source/text/shared/02/0612.xhp
index 5318c8c88..ddf3d1557 100644
--- a/source/text/shared/02/0612.xhp
+++ b/source/text/shared/02/0612.xhp
@@ -43,8 +43,8 @@
 
   Icon
 
-
-  Bullets 
On/Off
+
+  Toggle 
Unordered List
 
   
 
diff --git a/source/text/swriter/guide/using_numbered_lists.xhp 
b/source/text/swriter/guide/using_numbered_lists.xhp
index 391fd0330..6b84146bc 100644
--- a/source/text/swriter/guide/using_numbered_lists.xhp
+++ b/source/text/swriter/guide/using_numbered_lists.xhp
@@ -28,33 +28,42 @@
 
 
 
-  bullet lists;turning on and off
+  unordered lists;turning on and off
   paragraphs; bulleted
   bullets;adding and editing
   formatting;bullets
   removing;bullets in text documents
   changing;bulleting symbols
 
-mw deleted "editing;" and "adding;"
 
-Adding 
Bullets
+Adding 
Bullets
 
-To Add 
Bullets
+To Add Bullets
 
 
   
 Select the 
paragraph(s) that you want to add bullets to.
   
   
-On the 
Formatting Bar, click the Bullets On/Off icon Icon (Shift-F12).
+On the 
Formatting Bar, click the Toggle Unordered 
List icon (Shift+F12).
   
 
-To remove bullets, 
select the bulleted paragraphs, and then click the Bullets On/Off 
icon on the Formatting Bar.
+
 
-To 
Format Bullets
-To change the 
formatting of a bulleted list, choose Format - Bullets 
and Numbering.
-Click on the 
Bullet tab or the Image tab, and then select a symbol style in the Selection area. 
-To introduce 
another bulleting symbol, click on the Customize 
tab, click the Select button next to Character, then select a special character.
+To remove bullets, select the 
bulleted paragraphs, and then click the Toggle Unordered List icon 
on the Formatting Bar.
+
+To Format Bullets
+
+  
+To change 
the formatting of an unordered list, choose Format - Bullets and 
Numbering.
+  
+  
+Click on 
the Unordered tab or the Image tab, 
and then select a symbol style in the Selection 
area.
+  
+  
+To 
introduce another bulleting symbol, click on the Customize tab, click the Select button next to Character, then select a special character.
+  
+
 
 
 
diff --git a/source/text/swriter/guide/using_numbered_lists2.xhp 
b/source/text/swriter/guide/using_numbered_lists2.xhp
index 8bd7afb2f..7b0c7b52a 100644
--- a/source/text/swriter/guide/using_numbered_lists2.xhp
+++ b/source/text/swriter/guide/using_numbered_lists2.xhp
@@ -27,39 +27,44 @@


 numbering;paragraphs, on and 
off
-  paragraphs; numbering on/off
-  formatting;numbered lists
+  paragraphs;toggle ordered list
+  formatting;ordered lists
   inserting;numbering
 
 Adding Numbering
   To Add Numbering to a List
   
- 
-Select the paragraph(s) that you want to add numbering 
to.
- 
- 
-On 
the Formatting Bar, click the Toggle Numbered List 
icon (F12).
- 
- 
-To 
change the formatting and the hierarchy of a numbered list, click in the list, 
and then open the Bullets and Numbering toolbar.
- 
-  
- 
-
-
-
-Toggle Numbered List 
Icon
-
-   
-   
-   Toggle 
Numbered List
-   
-
-
-  To remove numberin

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

[Gökay Şatır (via logerrit)]

 desktop/source/lib/init.cxx   |1 +
 sc/source/ui/view/gridwin.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit d7dcecb76b15e1df9a1f3afaf56164a8bf597b71
Author: Gökay Şatır 
AuthorDate: Sun Mar 14 12:36:30 2021 +0300
Commit: Gökay ŞATIR 
CommitDate: Mon Mar 15 11:51:57 2021 +0100

Calc: Update selected cell range before calculating the selection area.

Change-Id: I7a814be03acb246e1eb9d68425418ee1357510fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112472
Tested-by: Jenkins
Reviewed-by: Dennis Francis 
Reviewed-by: Gökay ŞATIR 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112487
Tested-by: Jenkins CollaboraOffice 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a3ea934e9ebf..3e25780e00cb 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1455,6 +1455,7 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 case LOK_CALLBACK_CELL_VIEW_CURSOR:
 case LOK_CALLBACK_CELL_FORMULA:
 case LOK_CALLBACK_CELL_ADDRESS:
+case LOK_CALLBACK_CELL_SELECTION_AREA:
 case LOK_CALLBACK_CURSOR_VISIBLE:
 case LOK_CALLBACK_VIEW_CURSOR_VISIBLE:
 case LOK_CALLBACK_SET_PART:
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 35bce5d35625..a7ae6626325a 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5883,6 +5883,7 @@ void ScGridWindow::UpdateKitSelection(const 
std::vector& rRect
 }
 
 ScTabViewShell* pViewShell = pViewData->GetViewShell();
+pViewShell->UpdateInputHandler();
 OString sBoundingBoxString = "EMPTY";
 if (!aBoundingBox.IsEmpty())
 sBoundingBoxString = aBoundingBox.toString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 6dee2081c4dae3aaf1906130bee8d1337d5d4f07
Author: Johnny_M 
AuthorDate: Mon Mar 15 11:49:18 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 15 11:49:18 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 339aa19b6692e3257d5395007a176a6a4d617b88
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 1a57e06deea9..339aa19b6692 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1a57e06deea95baf3c2a079a4801d79e9cc79429
+Subproject commit 339aa19b6692e3257d5395007a176a6a4d617b88
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/02/07070200.xhp |2 +-
 source/text/shared/main0212.xhp|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 339aa19b6692e3257d5395007a176a6a4d617b88
Author: Johnny_M 
AuthorDate: Sat Mar 13 16:43:06 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 15 11:49:18 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/07070200.xhp 
b/source/text/shared/02/07070200.xhp
index 800a23acd..06ca1721f 100644
--- a/source/text/shared/02/07070200.xhp
+++ b/source/text/shared/02/07070200.xhp
@@ -28,7 +28,7 @@
   
 
 
-
+
 Save 
Record
 records; saving
 
diff --git a/source/text/shared/main0212.xhp b/source/text/shared/main0212.xhp
index f59809f61..2e534a1da 100644
--- a/source/text/shared/main0212.xhp
+++ b/source/text/shared/main0212.xhp
@@ -32,7 +32,7 @@
  Use the Table Data bar to control the data 
view. 
   
   The 
filtered data view is active until you change or cancel the sorting or 
filtering criteria. If a filter is active, the Apply Filter icon 
on the Table Data bar is activated.
-  
+  
   
  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit a0190607f765b07b1c713b5121767f7d433263c9
Author: Johnny_M 
AuthorDate: Mon Mar 15 11:48:40 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 15 11:48:40 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 1a57e06deea95baf3c2a079a4801d79e9cc79429
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index a28537f01335..1a57e06deea9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a28537f013358655717d30ee44b8483eeb884a71
+Subproject commit 1a57e06deea95baf3c2a079a4801d79e9cc79429
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/02/1404.xhp  |4 ++--
 source/text/shared/main0214.xhp |4 ++--
 source/text/smath/01/0309.xhp   |2 +-
 source/text/smath/01/03090400.xhp   |2 +-
 source/text/smath/01/03090900.xhp   |2 +-
 source/text/smath/01/03090907.xhp   |2 +-
 source/text/smath/01/03091504.xhp   |2 +-
 source/text/swriter/01/0409.xhp |2 +-
 source/text/swriter/01/04090003.xhp |2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 1a57e06deea95baf3c2a079a4801d79e9cc79429
Author: Johnny_M 
AuthorDate: Sat Mar 13 16:40:26 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 15 11:48:40 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/1404.xhp 
b/source/text/shared/02/1404.xhp
index 6d4e23283..1b8b1ca31 100644
--- a/source/text/shared/02/1404.xhp
+++ b/source/text/shared/02/1404.xhp
@@ -28,12 +28,12 @@
   
 
 
-
+
 
 Functions
 Displays the 
Function row in the lower part of the design view of the Query 
Design window.
 
-
+
 
   
 
diff --git a/source/text/shared/main0214.xhp b/source/text/shared/main0214.xhp
index 0538e721f..14194f287 100644
--- a/source/text/shared/main0214.xhp
+++ b/source/text/shared/main0214.xhp
@@ -44,8 +44,8 @@
 Add 
Tables
 
 
-
-
+
+
 
 
 
diff --git a/source/text/smath/01/0309.xhp 
b/source/text/smath/01/0309.xhp
index aa61177e6..78670e698 100644
--- a/source/text/smath/01/0309.xhp
+++ b/source/text/smath/01/0309.xhp
@@ -49,7 +49,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/source/text/smath/01/03090400.xhp 
b/source/text/smath/01/03090400.xhp
index 463fd5760..efd84ade9 100644
--- a/source/text/smath/01/03090400.xhp
+++ b/source/text/smath/01/03090400.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 functions; in $[officename] 
Math
 natural exponential functions
 natural logarithms
diff --git a/source/text/smath/01/03090900.xhp 
b/source/text/smath/01/03090900.xhp
index fca439d0c..a39cfd2d3 100644
--- a/source/text/smath/01/03090900.xhp
+++ b/source/text/smath/01/03090900.xhp
@@ -45,7 +45,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/smath/01/03090907.xhp 
b/source/text/smath/01/03090907.xhp
index 01efab1fc..08f98a713 100644
--- a/source/text/smath/01/03090907.xhp
+++ b/source/text/smath/01/03090907.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 Functions
 Here is an 
example of how to create functions with $[officename] Math. If you 
want to use the example in your own formula, copy it to the 
Commands window using the clipboard.
 
diff --git a/source/text/smath/01/03091504.xhp 
b/source/text/smath/01/03091504.xhp
index 62704032b..47cb24247 100644
--- a/source/text/smath/01/03091504.xhp
+++ b/source/text/smath/01/03091504.xhp
@@ -437,7 +437,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/swriter/01/0409.xhp 
b/source/text/swriter/01/0409.xhp
index fc0ba1c15..ade134c85 100644
--- a/source/text/swriter/01/0409.xhp
+++ b/source/text/swriter/01/0409.xhp
@@ -35,7 +35,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/swriter/01/04090003.xhp 
b/source/text/swriter/01/04090003.xhp
index add0c8a30..92567df35 100644
--- a/source/text/swriter/01/04090003.xhp
+++ b/source/text/swriter/01/04090003.xhp
@@ -25,7 +25,7 @@
 
 
 
-
+
 Functions
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit f4c165ac4fa85d5296d5a9ca5f507c3d52208fa7
Author: Johnny_M 
AuthorDate: Mon Mar 15 11:47:17 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 15 11:47:17 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to a28537f013358655717d30ee44b8483eeb884a71
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 237a7aff38cc..a28537f01335 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 237a7aff38cc27712c99d703616ffe7540599883
+Subproject commit a28537f013358655717d30ee44b8483eeb884a71
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/scalc/main0208.xhp |2 +-
 source/text/shared/02/2005.xhp |2 +-
 source/text/swriter/main0208.xhp   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a28537f013358655717d30ee44b8483eeb884a71
Author: Johnny_M 
AuthorDate: Sat Mar 13 16:32:02 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 15 11:47:17 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/scalc/main0208.xhp b/source/text/scalc/main0208.xhp
index c77cf559c..5b34bb4e7 100644
--- a/source/text/scalc/main0208.xhp
+++ b/source/text/scalc/main0208.xhp
@@ -35,7 +35,7 @@
   
   
   
-  
+  
   
   Digital Signature
   See also Digital 
Signatures.
diff --git a/source/text/shared/02/2005.xhp 
b/source/text/shared/02/2005.xhp
index 530eb3738..5bf675883 100644
--- a/source/text/shared/02/2005.xhp
+++ b/source/text/shared/02/2005.xhp
@@ -25,7 +25,7 @@
   
 
 
-
+
 
 selection modes in text
 text; selection modes
diff --git a/source/text/swriter/main0208.xhp b/source/text/swriter/main0208.xhp
index 915b63152..8d72f41fe 100644
--- a/source/text/swriter/main0208.xhp
+++ b/source/text/swriter/main0208.xhp
@@ -51,7 +51,7 @@
 
 
 
-
+
 
 
 Digital Signature
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 2595d5d64cecbf7d0879cba1ced749d66ff4bdc6
Author: Johnny_M 
AuthorDate: Mon Mar 15 11:46:41 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 15 11:46:41 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 237a7aff38cc27712c99d703616ffe7540599883
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index d93fe2c65b1d..237a7aff38cc 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d93fe2c65b1d4f9ea5c186b876e6d59286284eea
+Subproject commit 237a7aff38cc27712c99d703616ffe7540599883
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/02/0606.xhp |4 ++--
 source/text/simpress/main0203.xhp  |4 ++--
 source/text/swriter/main0206.xhp   |4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 237a7aff38cc27712c99d703616ffe7540599883
Author: Johnny_M 
AuthorDate: Sat Mar 13 16:26:40 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 15 11:46:41 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/0606.xhp 
b/source/text/shared/02/0606.xhp
index e815238bc..30ce06ee7 100644
--- a/source/text/shared/02/0606.xhp
+++ b/source/text/shared/02/0606.xhp
@@ -28,7 +28,7 @@
   
 
 
-
+
 
 
 Promote One 
Level
@@ -37,7 +37,7 @@
 
 The Promote One Level 
icon is on the Bullets and Numbering bar, which appears when the 
cursor is positioned on a numbering or bullets item.
 The Promote icon is on 
the Text Formatting bar, which appears when working in the outline 
view.
-
+
 
   
 
diff --git a/source/text/simpress/main0203.xhp 
b/source/text/simpress/main0203.xhp
index 72af4c0a6..6b0391388 100644
--- a/source/text/simpress/main0203.xhp
+++ b/source/text/simpress/main0203.xhp
@@ -82,11 +82,11 @@
 
   
 
-
+
 
 
 
-
+
 
 
 
diff --git a/source/text/swriter/main0206.xhp b/source/text/swriter/main0206.xhp
index a66e10135..8030ca3a3 100644
--- a/source/text/swriter/main0206.xhp
+++ b/source/text/swriter/main0206.xhp
@@ -30,8 +30,8 @@
 Bullets and Numbering Bar
 The Bullets and Numbering bar contains 
functions to modify the structure of numbered paragraphs, including changing 
the order of paragraphs and defining different paragraph 
levels.
 
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 6da573f78e7e2101a101c1aa61e931e358a40f4e
Author: Johnny_M 
AuthorDate: Mon Mar 15 11:45:56 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 15 11:45:56 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to d93fe2c65b1d4f9ea5c186b876e6d59286284eea
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 76614b12605a..d93fe2c65b1d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 76614b12605a40fb5ace22e4a5137f9bbdfe2479
+Subproject commit d93fe2c65b1d4f9ea5c186b876e6d59286284eea
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/scalc/main0210.xhp |4 ++--
 source/text/shared/02/1004.xhp |4 ++--
 source/text/swriter/main0210.xhp   |4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d93fe2c65b1d4f9ea5c186b876e6d59286284eea
Author: Johnny_M 
AuthorDate: Sat Mar 13 16:29:50 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 15 11:45:56 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/scalc/main0210.xhp b/source/text/scalc/main0210.xhp
index 75aee4254..fe0d0be62 100644
--- a/source/text/scalc/main0210.xhp
+++ b/source/text/scalc/main0210.xhp
@@ -40,8 +40,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/source/text/shared/02/1004.xhp 
b/source/text/shared/02/1004.xhp
index 0121abec7..cc570578e 100644
--- a/source/text/shared/02/1004.xhp
+++ b/source/text/shared/02/1004.xhp
@@ -28,13 +28,13 @@
   
 
 
-
+
 
 
  To Document EndLast 
Page
 Moves to the last page of the document. This function is only 
active when you select the Print Preview function on the 
File menu.
 
-
+
 
   
 
diff --git a/source/text/swriter/main0210.xhp b/source/text/swriter/main0210.xhp
index ee9390bf5..b6775a513 100644
--- a/source/text/swriter/main0210.xhp
+++ b/source/text/swriter/main0210.xhp
@@ -39,8 +39,8 @@
 
 
 
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 56269c2856190d8ea2db561e13831f14af2aa7d7
Author: Johnny_M 
AuthorDate: Mon Mar 15 11:44:58 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 15 11:44:58 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 76614b12605a40fb5ace22e4a5137f9bbdfe2479
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index b7209c8bbf7d..76614b12605a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b7209c8bbf7d0bb868c9f0dc47bebfa078f32cd2
+Subproject commit 76614b12605a40fb5ace22e4a5137f9bbdfe2479
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/02/0421.xhp |4 ++--
 source/text/shared/main0204.xhp|4 ++--
 source/text/swriter/main0204.xhp   |4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 76614b12605a40fb5ace22e4a5137f9bbdfe2479
Author: Johnny_M 
AuthorDate: Sat Mar 13 16:19:24 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 15 11:44:58 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/0421.xhp 
b/source/text/shared/02/0421.xhp
index 31cfca42a..be18750fb 100644
--- a/source/text/shared/02/0421.xhp
+++ b/source/text/shared/02/0421.xhp
@@ -25,12 +25,12 @@
   
 
 
-
+
 
 Optimize 
Size
 Opens a toolbar that contains functions for optimizing 
the rows and columns in a table.
 
-
+
 
   
 
diff --git a/source/text/shared/main0204.xhp b/source/text/shared/main0204.xhp
index 467f4148c..f0445275e 100644
--- a/source/text/shared/main0204.xhp
+++ b/source/text/shared/main0204.xhp
@@ -47,8 +47,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/source/text/swriter/main0204.xhp b/source/text/swriter/main0204.xhp
index b96c14e50..90535684b 100644
--- a/source/text/swriter/main0204.xhp
+++ b/source/text/swriter/main0204.xhp
@@ -47,8 +47,8 @@
 
 
 
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 1790b047fe73ec61234fd2fc3b49eac0be8489b6
Author: Johnny_M 
AuthorDate: Mon Mar 15 11:44:14 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 15 11:44:14 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to b7209c8bbf7d0bb868c9f0dc47bebfa078f32cd2
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index b004d30b3708..b7209c8bbf7d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b004d30b3708b72029a63ed81ba2480b19892adb
+Subproject commit b7209c8bbf7d0bb868c9f0dc47bebfa078f32cd2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/02/01170100.xhp |2 +-
 source/text/shared/02/01170200.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b7209c8bbf7d0bb868c9f0dc47bebfa078f32cd2
Author: Johnny_M 
AuthorDate: Sat Mar 13 16:23:13 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 15 11:44:14 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/01170100.xhp 
b/source/text/shared/02/01170100.xhp
index 501f7e9be..4ef8cc49c 100644
--- a/source/text/shared/02/01170100.xhp
+++ b/source/text/shared/02/01170100.xhp
@@ -41,7 +41,7 @@
   
 
 You can only call the Properties dialog when in the 
Design mode with a control selected.
-
+
 If you enter 
data in the Properties dialog, note that multiline input is 
possible for certain drop-down combo boxes. This concerns all fields in which 
an SQL statement can be entered, as well as the properties of text boxes or 
label fields. You can open these fields and enter text in the opened list. The 
following shortcut keys are valid:
 
   
diff --git a/source/text/shared/02/01170200.xhp 
b/source/text/shared/02/01170200.xhp
index 641e959cf..01c9e8c38 100644
--- a/source/text/shared/02/01170200.xhp
+++ b/source/text/shared/02/01170200.xhp
@@ -41,7 +41,7 @@
   
 
   
-  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit c041e71f606d852b9e6687dfcb114fe5ef6deb50
Author: Johnny_M 
AuthorDate: Mon Mar 15 11:43:40 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 15 11:43:40 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to b004d30b3708b72029a63ed81ba2480b19892adb
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 440e45a0d50e..b004d30b3708 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 440e45a0d50e4977f303ec54f7593a2c628ca5d4
+Subproject commit b004d30b3708b72029a63ed81ba2480b19892adb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/scalc/main0210.xhp |4 ++--
 source/text/shared/02/1001.xhp |4 ++--
 source/text/swriter/main0210.xhp   |4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit b004d30b3708b72029a63ed81ba2480b19892adb
Author: Johnny_M 
AuthorDate: Sat Mar 13 16:16:56 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 15 11:43:40 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/scalc/main0210.xhp b/source/text/scalc/main0210.xhp
index 0e40a1070..75aee4254 100644
--- a/source/text/scalc/main0210.xhp
+++ b/source/text/scalc/main0210.xhp
@@ -34,8 +34,8 @@
 Print Preview Bar
 The Print Preview bar is displayed when 
you choose File - Print Preview.
 
-
-
+
+
 
 
 
diff --git a/source/text/shared/02/1001.xhp 
b/source/text/shared/02/1001.xhp
index 6793e20ed..d5b03db67 100644
--- a/source/text/shared/02/1001.xhp
+++ b/source/text/shared/02/1001.xhp
@@ -28,13 +28,13 @@
   
 
 
-
+
 
 
 Previous Page
 Moves back to the previous page in the document. This function 
is only active when you select the Print Preview function on the 
File menu.
 
-
+
 
   
 
diff --git a/source/text/swriter/main0210.xhp b/source/text/swriter/main0210.xhp
index 27eafa969..ee9390bf5 100644
--- a/source/text/swriter/main0210.xhp
+++ b/source/text/swriter/main0210.xhp
@@ -33,8 +33,8 @@
 Print 
Preview
 The 
Print Preview Bar appears when you view the current document in 
the print preview mode.
 
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit bfaf5536063341997242603de35b335a1f99aab9
Author: Johnny_M 
AuthorDate: Mon Mar 15 11:42:58 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 15 11:42:58 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 440e45a0d50e4977f303ec54f7593a2c628ca5d4
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index e033a894bf05..440e45a0d50e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e033a894bf057fe7b38837b0d7c780682e3ce686
+Subproject commit 440e45a0d50e4977f303ec54f7593a2c628ca5d4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/02/2406.xhp |4 ++--
 source/text/shared/02/colortoolbar.xhp |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 440e45a0d50e4977f303ec54f7593a2c628ca5d4
Author: Johnny_M 
AuthorDate: Sat Mar 13 16:13:53 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 15 11:42:58 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/2406.xhp 
b/source/text/shared/02/2406.xhp
index 57a0aa085..90a2dd254 100644
--- a/source/text/shared/02/2406.xhp
+++ b/source/text/shared/02/2406.xhp
@@ -28,12 +28,12 @@
   
 
 
-
+
 
 Brightness
 Specifies the brightness for the 
selected graphic object. Values from -100% (only black) to +100% (only 
white) are possible.
 
-
+
 
   
 
diff --git a/source/text/shared/02/colortoolbar.xhp 
b/source/text/shared/02/colortoolbar.xhp
index d17c68db6..3dd1b9a88 100644
--- a/source/text/shared/02/colortoolbar.xhp
+++ b/source/text/shared/02/colortoolbar.xhp
@@ -42,8 +42,8 @@
 
 
 
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 00f68d238878eb7137b2c10875525787fb2a25a4
Author: Johnny_M 
AuthorDate: Mon Mar 15 11:42:23 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 15 11:42:23 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to e033a894bf057fe7b38837b0d7c780682e3ce686
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index f49b8a9bf0d2..e033a894bf05 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f49b8a9bf0d25148085d818006e9ecd344d0ca84
+Subproject commit e033a894bf057fe7b38837b0d7c780682e3ce686
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sal/osl

[Armin Le Grand (Allotropia) (via logerrit)]

 sal/osl/w32/file.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5f7e94735ecd38faa8beb825f76e0d483fee7101
Author: Armin Le Grand (Allotropia) 
AuthorDate: Tue Mar 9 19:53:25 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Mar 15 11:42:32 2021 +0100

tdf#126742 make Windows file handling more unx-like

The bug mentioned happens due to a system-dependent
difference: Unx-systems allow files to be opened for
write multiple times while our windows implementation
until now did prevent that.
For that reason an embedded OLE which is still opened
in the same LO instance behaves wrong/strange - the
e.g. changed size cannot be written (to the file).
Since we already have unx-like handling and in that
scenario useful sync has to be done anyways, no new
scenario will be created. Only Windows implemenation
will change to behave closer to unx-like behaviour,
I already test-built that on gerrit to make sure all
tests for Windows work as before.
I thought about this for quite some time, but see no
too big risk. For thoughts/discussion please refer
to the task.

Change-Id: I8dbfd70c2f69d0a013f445e152e597f37fa6ecc7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112237
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 
(cherry picked from commit 2b4cd99d3360ccffb9829a02412824864d045753)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112427
Reviewed-by: Thorsten Behrens 

diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index ca31d714dfef..44b8ac97ba09 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -657,15 +657,15 @@ oslFileError SAL_CALL osl_openFile(
 if (result != osl_File_E_None)
 return result;
 
-DWORD dwAccess = GENERIC_READ, dwShare = FILE_SHARE_READ, dwCreation = 0;
+// tdf126742 use FILE_SHARE_WRITE to get closer to non-Windows plattform 
behavoiur,
+// for details and discussion see task please
+DWORD dwAccess = GENERIC_READ, dwShare = FILE_SHARE_READ | 
FILE_SHARE_WRITE, dwCreation = 0;
 
 if (uFlags & osl_File_OpenFlag_Write)
 dwAccess |= GENERIC_WRITE;
-else
-dwShare  |= FILE_SHARE_WRITE;
 
 if (uFlags & osl_File_OpenFlag_NoLock)
-dwShare  |= FILE_SHARE_WRITE | FILE_SHARE_DELETE;
+dwShare  |= FILE_SHARE_DELETE;
 
 if (uFlags & osl_File_OpenFlag_Create)
 dwCreation |= CREATE_NEW;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/02/2404.xhp |4 ++--
 source/text/shared/02/colortoolbar.xhp |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e033a894bf057fe7b38837b0d7c780682e3ce686
Author: Johnny_M 
AuthorDate: Sat Mar 13 16:11:16 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 15 11:42:23 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/2404.xhp 
b/source/text/shared/02/2404.xhp
index 28a4d11ec..b5fa8fbf0 100644
--- a/source/text/shared/02/2404.xhp
+++ b/source/text/shared/02/2404.xhp
@@ -25,12 +25,12 @@
   
 
 
-
+
 
 Green
 Specifies the proportion of green RGB color components for 
the selected graphic object. Values from -100% (no green) to +100% 
(full green) are possible.
 
-
+
 
   
 
diff --git a/source/text/shared/02/colortoolbar.xhp 
b/source/text/shared/02/colortoolbar.xhp
index c887df26d..d17c68db6 100644
--- a/source/text/shared/02/colortoolbar.xhp
+++ b/source/text/shared/02/colortoolbar.xhp
@@ -38,8 +38,8 @@
 To open the 
Color toolbar, click the Color icon on the Image toolbar.
 
 
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Rafael Lima (via logerrit)]

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

New commits:
commit a944c21dcc9bafe18902fb26dca06ac5347230e7
Author: Rafael Lima 
AuthorDate: Mon Mar 15 11:39:11 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 15 11:39:11 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to f49b8a9bf0d25148085d818006e9ecd344d0ca84
  - tdf#140377 Add example of Hyperlink to folders

Adds examples about how to create Hyperlinks to folders in Writer and 
Calc.

Add bookmarks to the corresponding Writer help page, so that it can be 
found in the online search.

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

diff --git a/helpcontent2 b/helpcontent2
index 49b9dad2f749..f49b8a9bf0d2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 49b9dad2f749a9bab2d3b30e9688b9115dceefa4
+Subproject commit f49b8a9bf0d25148085d818006e9ecd344d0ca84
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rafael Lima (via logerrit)]

 source/text/scalc/01/04060109.xhp  |   16 +---
 source/text/shared/02/09070300.xhp |5 +
 2 files changed, 14 insertions(+), 7 deletions(-)

New commits:
commit f49b8a9bf0d25148085d818006e9ecd344d0ca84
Author: Rafael Lima 
AuthorDate: Sat Mar 13 21:39:47 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 15 11:39:10 2021 +0100

tdf#140377 Add example of Hyperlink to folders

Adds examples about how to create Hyperlinks to folders in Writer and Calc.

Add bookmarks to the corresponding Writer help page, so that it can be 
found in the online search.

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

diff --git a/source/text/scalc/01/04060109.xhp 
b/source/text/scalc/01/04060109.xhp
index 68b3c..15bc2a7b7 100644
--- a/source/text/scalc/01/04060109.xhp
+++ b/source/text/scalc/01/04060109.xhp
@@ -641,19 +641,21 @@
  The number 0 is returned for empty cells and matrix 
elements.
  
  
-=HYPERLINK("http://www.example.org";) 
displays the text "http://www.example.org"; in the cell and executes the 
hyperlink http://www.example.org when clicked.
+=HYPERLINK("http://www.example.org";) displays the 
text "http://www.example.org"; in the cell and executes the hyperlink 
http://www.example.org when clicked.
  
-=HYPERLINK("http://www.example.org";"Click 
here") displays the text "Click here" in the cell and executes the 
hyperlink http://www.example.org when clicked.
+=HYPERLINK("http://www.example.org";"Click here") 
displays the text "Click here" in the cell and executes the hyperlink 
http://www.example.org when clicked.
  
-=HYPERLINK("http://www.example.org";12345) displays the 
number 12345 and executes the hyperlink http://www.example.org when 
clicked.
+=HYPERLINK("http://www.example.org";12345) displays 
the number 12345 and executes the hyperlink http://www.example.org when 
clicked.
  
-=HYPERLINK($B4) where cell B4 contains 
http://www.example.org. The function adds 
http://www.example.org to the URL of the hyperlink cell and returns the same 
text which is used as formula result.
+=HYPERLINK($B4) where cell B4 contains 
http://www.example.org. The function adds 
http://www.example.org to the URL of the hyperlink cell and returns the same 
text which is used as formula result.
  
-=HYPERLINK("http://www.";"Click ") & 
"example.org" displays the text Click example.org in the cell and 
executes the hyperlink http://www.example.org when clicked.
+=HYPERLINK("http://www.";"Click ") & 
"example.org" displays the text Click example.org in the cell and 
executes the hyperlink http://www.example.org when clicked.
  
-=HYPERLINK("#Sheet1.A1";"Go to top") 
displays the text Go to top and jumps to cell Sheet1.A1 in this 
document.
+=HYPERLINK("#Sheet1.A1";"Go to top") displays the 
text Go to top and jumps to cell Sheet1.A1 in this document.
  
-=HYPERLINK("file:///C:/writer.odt#Specification";"Go to Writer 
bookmark") displays the text "Go to Writer bookmark", loads the 
specified text document and jumps to bookmark "Specification".
+=HYPERLINK("file:///C:/writer.odt#Specification";"Go to 
Writer bookmark") displays the text "Go to Writer bookmark", loads the 
specified text document and jumps to bookmark "Specification".
+ 
+=HYPERLINK("file:///C:/Documents/";"Open Documents 
folder") displays the text "Open Documents folder" and shows the folder 
contents using the standard file manager in your operating system.
   
   
 GETPIVOTDATA function
diff --git a/source/text/shared/02/09070300.xhp 
b/source/text/shared/02/09070300.xhp
index 14648719f..29de0ff1b 100644
--- a/source/text/shared/02/09070300.xhp
+++ b/source/text/shared/02/09070300.xhp
@@ -36,8 +36,13 @@
 
 
 Document
+
+  hyperlinks;to files
+  hyperlinks;to folders
+
 Path
 Enter a URL for the file that you want to open when you 
click the hyperlink. If you do not specify a target frame, the file opens in 
the current document or frame.
+If the URL refers to a 
folder, the standard file manager in your operating system opens 
showing the contents of the specified folder.
 Open File
 Opens the Open dialog, 
where you can select a file.
 Target in document
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Rafael Lima (via logerrit)]

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

New commits:
commit 0f70426af7d9c3354bbb934d143eeed7146daba7
Author: Rafael Lima 
AuthorDate: Mon Mar 15 11:28:56 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 15 11:28:56 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 49b9dad2f749a9bab2d3b30e9688b9115dceefa4
  - tdf#140889 Update Slide menu Help page in Impress

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

diff --git a/helpcontent2 b/helpcontent2
index f5d99bca347d..49b9dad2f749 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f5d99bca347d24156579a10d9ae2127eac2e1913
+Subproject commit 49b9dad2f749a9bab2d3b30e9688b9115dceefa4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rafael Lima (via logerrit)]

 source/text/simpress/00/slide_menu.xhp   |2 
 source/text/simpress/01/0413.xhp |8 -
 source/text/simpress/01/0414.xhp |   10 --
 source/text/simpress/01/0512.xhp |6 -
 source/text/simpress/01/0513.xhp |9 +-
 source/text/simpress/01/0604.xhp |7 -
 source/text/simpress/01/new_slide.xhp|7 -
 source/text/simpress/01/slide_properties.xhp |8 +
 source/text/simpress/guide/page_copy.xhp |   20 ++--
 source/text/simpress/main_slide.xhp  |  111 +++
 10 files changed, 140 insertions(+), 48 deletions(-)

New commits:
commit 49b9dad2f749a9bab2d3b30e9688b9115dceefa4
Author: Rafael Lima 
AuthorDate: Fri Mar 12 15:53:54 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 15 11:28:56 2021 +0100

tdf#140889 Update Slide menu Help page in Impress

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

diff --git a/source/text/simpress/00/slide_menu.xhp 
b/source/text/simpress/00/slide_menu.xhp
index 587b55e1f..5ef3f5944 100644
--- a/source/text/simpress/00/slide_menu.xhp
+++ b/source/text/simpress/00/slide_menu.xhp
@@ -30,7 +30,7 @@
 
 Choose Slide - Slide Properties and then 
click the Background tab
 
-Choose Slide - Slide Layout
+Choose Slide - Layout
 
 Choose Slide - Change Slide Master
 
diff --git a/source/text/simpress/01/0413.xhp 
b/source/text/simpress/01/0413.xhp
index 319585755..bc0bc79d2 100644
--- a/source/text/simpress/01/0413.xhp
+++ b/source/text/simpress/01/0413.xhp
@@ -19,7 +19,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-   
+
 
 
 
@@ -31,13 +31,13 @@
 
 
 
-
 expanding;slides
 slides;expanding
 
 
-Expand 
Slide
-Creates a new slide from every top-level outline point 
(text one level below the title text in the outline hierarchy) in the selected 
slide. The outline text becomes the title of the new slide. Outline 
pointspoints? below the top level on the original slide are 
moved up one level on the new slide.
+
+  Expand 
Slide
+  Creates a new slide from every top-level outline point 
(text one level below the title text in the outline hierarchy) in the selected 
slide. The outline text becomes the title of the new slide. Outline 
pointspoints? below the top level on the original slide are 
moved up one level on the new slide.
 
 
   
diff --git a/source/text/simpress/01/0414.xhp 
b/source/text/simpress/01/0414.xhp
index 63dac17ba..df38e5a7e 100644
--- a/source/text/simpress/01/0414.xhp
+++ b/source/text/simpress/01/0414.xhp
@@ -30,13 +30,11 @@
 
 
 
-  
-  
-  
   summary slide
-
-Summary 
Slide
-  Creates a new slide that contains a 
bulleted list from the titles of the slides that follow the selected slide. The 
summary slide is inserted behind the last slide.
+  
+  
+Summary Slide
+Creates a new slide that contains a 
bulleted list from the titles of the slides that follow the selected slide. The 
summary slide is inserted behind the last slide.
   
   
   
diff --git a/source/text/simpress/01/0512.xhp 
b/source/text/simpress/01/0512.xhp
index 679f7c0e1..a4a471a2d 100644
--- a/source/text/simpress/01/0512.xhp
+++ b/source/text/simpress/01/0512.xhp
@@ -27,8 +27,10 @@
 
 
 
-Change Slide Master
-Displays the 
Available Master Slides dialog, where you can select a layout 
scheme for the current slide. Any objects in the slide design are inserted 
behind objects in the current slide.
+
+  Change Slide Master
+  Displays the Available Master Slides 
dialog, where you can select a layout scheme for the current slide. Any objects 
in the slide design are inserted behind objects in the current 
slide.
+
 
   
 
diff --git a/source/text/simpress/01/0513.xhp 
b/source/text/simpress/01/0513.xhp
index d6d5fe77d..c3e2c8c7e 100644
--- a/source/text/simpress/01/0513.xhp
+++ b/source/text/simpress/01/0513.xhp
@@ -19,7 +19,7 @@
 
   
 
-  Slide Layout
+  Layout
   /text/simpress/01/0513.xhp
 
   
@@ -29,9 +29,10 @@
   slide layouts
 
 
-Slide Layout
-Opens a submenu with slide 
layouts.
-
+
+  Layout
+  Opens a 
submenu with slide layouts.
+
 
   
 
diff --git a/source/text/simpress/01/0604.xhp 
b/source/text/simpress/01/0604.xhp
index 689ff51d2..d58188fcc 100644
--- a/source/text/simpress/01/0604.xhp
+++ b/source/text/simpress/01/0604.xhp
@@ -29,7 +29,6 @@
 
 
 
-
 slide transitions; manual
 slide transitions; sounds
 sounds; on slide transitions
@@ -37,8 +36,10 @@
 
 
 
-Slide Transition
-Defines the special effect that plays when you display a slide during a 
slide show.
+
+
+  Slide 
Transition
+  Defines the special effect that plays when you display a slid

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

[Gökay Şatır (via logerrit)]

 desktop/source/lib/init.cxx   |1 +
 sc/source/ui/view/gridwin.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 10f8764ff9c3945e3e51c7d483dc7a07bdea29f9
Author: Gökay Şatır 
AuthorDate: Sun Mar 14 12:36:30 2021 +0300
Commit: Gökay ŞATIR 
CommitDate: Mon Mar 15 10:29:07 2021 +0100

Calc: Update selected cell range before calculating the selection area.

Change-Id: I7a814be03acb246e1eb9d68425418ee1357510fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112472
Tested-by: Jenkins
Reviewed-by: Dennis Francis 
Reviewed-by: Gökay ŞATIR 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5701f5965ce2..6275bf691946 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1442,6 +1442,7 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 case LOK_CALLBACK_CELL_VIEW_CURSOR:
 case LOK_CALLBACK_CELL_FORMULA:
 case LOK_CALLBACK_CELL_ADDRESS:
+case LOK_CALLBACK_CELL_SELECTION_AREA:
 case LOK_CALLBACK_CURSOR_VISIBLE:
 case LOK_CALLBACK_VIEW_CURSOR_VISIBLE:
 case LOK_CALLBACK_SET_PART:
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 790ab75713b0..1497988b7f16 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5863,6 +5863,7 @@ void ScGridWindow::UpdateKitSelection(const 
std::vector& rRect
 }
 
 ScTabViewShell* pViewShell = mrViewData.GetViewShell();
+pViewShell->UpdateInputHandler();
 OString sBoundingBoxString = "EMPTY";
 if (!aBoundingBox.IsEmpty())
 sBoundingBoxString = aBoundingBox.toString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sc/qa/unit/data/fods/shapes_foreground_background.fods |  214 +
 sc/qa/unit/subsequent_export-test.cxx  |   35 ++
 sc/source/filter/xml/xmlwrap.cxx   |   20 +
 3 files changed, 269 insertions(+)

New commits:
commit b4f38c6b8bbc6ea6a5d9354bfd24e411fc5a51fc
Author: Michael Stahl 
AuthorDate: Tue Mar 9 10:47:50 2021 +0100
Commit: Michael Stahl 
CommitDate: Mon Mar 15 10:16:15 2021 +0100

tdf#133487 sc ODF export: reorder flys' ZOrder/z-index...

... so background shapes have lower z-index than foreground shapes,
as is recommended by ODF 1.3.

Spreadsheets use a different attribute, table:table-background="true"
on the shape itself.

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

diff --git a/sc/qa/unit/data/fods/shapes_foreground_background.fods 
b/sc/qa/unit/data/fods/shapes_foreground_background.fods
new file mode 100644
index ..0f203a93dc20
--- /dev/null
+++ b/sc/qa/unit/data/fods/shapes_foreground_background.fods
@@ -0,0 +1,214 @@
+
+
+http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:config="urn:oasis:nam
 es:tc:opendocument:xmlns:config:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:fo
 rm:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms"; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2021-03-04T18:17:27.6250825342021-03-09T10:25:11.233256125PT3M21S2LibreOfficeDev/7.2.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/4128e96d5f39754695ff9e3cb0989de731dd9698
+
+ 
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+   
+
+   
+   
+  
+  
+   
+  
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+ 
+ 
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+   
+
+   
+   
+
+   
+  
+  
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+ 
+ 
+  
+   
+???
+   
+   
+   
+Page 1
+   
+   
+  
+  
+   
+
+ 
???(???)
+
+
+ 00.00., 00:00:00
+
+   
+   
+   
+Page 1/ 
99
+   
+   
+  
+ 
+ 
+  
+   
+   
+
+
+ 
+  
+   
+   
+
+
+
+
+
+
+
+
+
+   
+  
+ 
+ 
+  
+   
+   
+  
+ 
+
+
+ 
+
+
+ 
+  
+   
+   
+  
+ 
+ 
+
+   
+   
+  
+ 
+
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index a313ee4c9076..0d14b1046793 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -156,6 +156,8 @@ public:
 void testTrackChangesSimpleXLSX();
 void testSheetTabColorsXLSX();
 
+void testTdf133487();
+
 

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

[Michael Stahl (via logerrit)]

 include/svx/strings.hrc   |1 
 include/xmloff/shapeexport.hxx|9 +
 svx/source/svdraw/svdpage.cxx |   20 
 sw/qa/extras/odfexport/data/MadeByLO7.odt |binary
 sw/qa/extras/odfexport/odfexport.cxx  |   14 
 sw/source/filter/xml/wrtxml.cxx   |   18 +++
 sw/source/filter/xml/xmlexp.cxx   |9 +
 xmloff/source/draw/shapeexport.cxx|   47 ++
 8 files changed, 112 insertions(+), 6 deletions(-)

New commits:
commit 9bc6160e0acbc78be998129ea55ed7e4529959fa
Author: Michael Stahl 
AuthorDate: Mon Mar 8 20:03:35 2021 +0100
Commit: Michael Stahl 
CommitDate: Mon Mar 15 10:15:57 2021 +0100

tdf#133487 sw ODF export: reorder flys' ZOrder/z-index...

... so background shapes have lower z-index than foreground shapes,
as is recommended by ODF 1.3.

Also let SdrObjList::sort() record Undo actions, because earlier Undo
actions could expect the previous sort order.

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

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 1b59e4d765e8..3a307cdc6a36 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -155,6 +155,7 @@
 #define STR_EditPutToTop
NC_("STR_EditPutToTop", "Move %1 to front")
 #define STR_EditPutToBtm
NC_("STR_EditPutToBtm", "Move %1 to back")
 #define STR_EditRevOrder
NC_("STR_EditRevOrder", "Reverse order of %1")
+#define STR_SortShapes  
NC_("STR_SortShapes", "Sort shapes")
 #define STR_EditMove
NC_("STR_EditMove", "Move %1")
 #define STR_EditResize  
NC_("STR_EditResize", "Resize %1")
 #define STR_EditRotate  
NC_("STR_EditRotate", "Rotate %1")
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index ff38aeaf4cab..e5012d84836d 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -297,6 +298,14 @@ public:
 const rtl::Reference< XMLTableExport >& GetShapeTableExport();
 };
 
+namespace xmloff {
+
+XMLOFF_DLLPUBLIC void FixZOrder(
+css::uno::Reference const& xShapes,
+std::function const&)> 
const& rIsInBackground);
+
+} // namespace xmloff
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 0c7c806ad4a8..d07f40e4f701 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -40,6 +40,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
 
@@ -667,12 +670,29 @@ void SdrObjList::sort( std::vector& sortOrder)
 }
 #endif
 
+SdrModel & rModel(getSdrPageFromSdrObjList()->getSdrModelFromSdrPage());
+bool const isUndo(rModel.IsUndoEnabled());
+if (isUndo)
+{
+rModel.BegUndo(SvxResId(STR_SortShapes));
+}
+
 for (size_t i = 0; i < aNewSortOrder.size(); ++i)
 {
 aNewList[i] = maList[ aNewSortOrder[i] ];
+if (isUndo && i != sal::static_int_cast(aNewSortOrder[i]))
+{
+rModel.AddUndo(rModel.GetSdrUndoFactory().CreateUndoObjectOrdNum(
+*aNewList[i], aNewSortOrder[i], i));
+}
 aNewList[i]->SetOrdNum(i);
 }
 
+if (isUndo)
+{
+rModel.EndUndo();
+}
+
 std::swap(aNewList, maList);
 }
 
diff --git a/sw/qa/extras/odfexport/data/MadeByLO7.odt 
b/sw/qa/extras/odfexport/data/MadeByLO7.odt
new file mode 100644
index ..9587fffe6470
Binary files /dev/null and b/sw/qa/extras/odfexport/data/MadeByLO7.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index 7e49bbd1b048..285da20616e0 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -232,6 +232,20 @@ DECLARE_ODFEXPORT_TEST(testTdf130314, "tdf130314.docx")
 CPPUNIT_ASSERT_EQUAL(2, getPages());
 }
 
+DECLARE_ODFEXPORT_EXPORTONLY_TEST(testTdf133487, "MadeByLO7.odt")
+{
+xmlDocUniquePtr pXmlDoc = parseExport("content.xml");
+// shape in background has lowest index
+assertXPath(pXmlDoc, 
"/office:document-content/office:body/office:text/text:p[2]/draw:custom-shape", 
"z-index", "0");
+assertXPath(pXmlDoc, 
"/office:document-content/office:automatic-styles/style:style[@style:name = 
/office:document-content/office:body/office:text/text:p[2]/draw:custom-shape[@draw:z-index
 = '0']/attribute::draw:style-name]/style:graphic-properties", "run-through", 
"background");
+// shape in foreground, 

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

[Mike Kaganski (via logerrit)]

 include/basegfx/numeric/ftools.hxx |9 -
 1 file changed, 9 deletions(-)

New commits:
commit bfa320ef2ac7ab9a84f86eee6dfa7f3ee67fa630
Author: Mike Kaganski 
AuthorDate: Mon Mar 15 08:50:31 2021 +0100
Commit: Mike Kaganski 
CommitDate: Mon Mar 15 10:11:47 2021 +0100

Drop obsolete comments

... since f14b9d30293f180500fc56d81e5390021758e7c1
and 7d8e9d989d0ac4a4055b207726708e9ec0da.

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

diff --git a/include/basegfx/numeric/ftools.hxx 
b/include/basegfx/numeric/ftools.hxx
index 78f4eb1e722f..54a8436f86a5 100644
--- a/include/basegfx/numeric/ftools.hxx
+++ b/include/basegfx/numeric/ftools.hxx
@@ -91,15 +91,6 @@ namespace basegfx
  */
 inline double pruneScaleValue( double fVal )
 {
-// old version used ::std::min/max, but this collides if min is 
defined as preprocessor
-// macro which is the case e.g with windows.h headers. The simplest 
way to avoid this is to
-// just use the full comparison. I keep the original here, maybe there 
will be a better
-// solution some day.
-
-//return fVal < 0.0 ?
-//(::std::min(fVal,-0.1)) :
-//(::std::max(fVal,0.1));
-
 if(fVal < 0.0)
 return std::min(fVal, -0.1);
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit c18e5fd7d6c85d4755f1a70d97336d07b2add510
Author: Stephan Bergmann 
AuthorDate: Fri Mar 12 14:24:33 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Mar 15 10:02:31 2021 +0100

GCC trunk already calls it C++23

...since


"c++: Add support for -std=c++23"

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

diff --git a/configure.ac b/configure.ac
index 90b0cf01633b..fece7f768759 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7055,7 +7055,7 @@ if test "$COM" = MSC -a "$COM_IS_CLANG" != TRUE; then
 elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 my_flags='-std=c++17 -std=c++1z'
 if test "$with_latest_c__" = yes; then
-my_flags="-std=c++2b -std=c++20 -std=c++2a $my_flags"
+my_flags="-std=c++23 -std=c++2b -std=c++20 -std=c++2a $my_flags"
 fi
 for flag in $my_flags; do
 if test "$COM" = MSC; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 include/rtl/stringconcat.hxx |2 +-
 include/rtl/ustrbuf.hxx  |1 -
 include/rtl/ustring.hxx  |1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 5d83d14ef8e3a149f2dbcddc18a70edda021fbfe
Author: Stephan Bergmann 
AuthorDate: Fri Mar 12 16:04:19 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Mar 15 09:25:27 2021 +0100

Clarify that rtl::ToStringHelper::length must be precise

d87f5d30879aca73fff271c254589fc41a91fdd0 "support for fast O(U)String
concatenation using operator+", introducing rtl::ToStringHelper, had 
intended
that length can return an optimistic maximum value if the exact value 
cannot be
determined (e.g., when creating the textual representation of a numerical 
value
only on the fly, not upfront), witness the comments removed now, but never 
made
use of that, always returning precise values from the various
rtl::ToStringHelper::length specializations.

And then cbe3b2fe0b9d745e22a2bf436ce55141b15f9502 "Avoid conversion warning 
in
O[U]String[Buffer] constructors", not being aware that length could
theoretically return an imprecise value, made certain code rely on it always
returning a precise value.

So clarify the status quo, that length always returns a precise value.  (See
also the discussion in the comments of abandoned
 "Drop obsolete comments".)

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

diff --git a/include/rtl/stringconcat.hxx b/include/rtl/stringconcat.hxx
index 7f55d6c3473d..554fdd3f4403 100644
--- a/include/rtl/stringconcat.hxx
+++ b/include/rtl/stringconcat.hxx
@@ -59,7 +59,7 @@ Helper class for converting a given type to a string 
representation.
 template< typename T >
 struct ToStringHelper
 {
-/// Return length of the string representation of the given object (if not 
known exactly, it needs to be the maximum).
+/// Return length of the string representation of the given object.
 static std::size_t length( const T& );
 /// Add 8-bit representation of the given object to the given buffer and 
return position right after the added data.
 static char* addData( char* buffer, const T& ) SAL_RETURNS_NONNULL;
diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index f1f2521a8ae5..170b76908dff 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -239,7 +239,6 @@ public:
 sal_Unicode* end = c.addData( pData->buffer );
 *end = '\0';
 pData->length = l;
-// TODO realloc in case pData->>length is noticeably smaller than l ?
 }
 
 /**
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 597a56832ad5..bb3390c19985 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -457,7 +457,6 @@ public:
 sal_Unicode* end = c.addData( pData->buffer );
 pData->length = l;
 *end = '\0';
-// TODO realloc in case pData->length is noticeably smaller than l?
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 include/vcl/ITiledRenderable.hxx |2 +-
 include/vcl/uitest/uiobject.hxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0a900287cff32c7fd94f498f8077a3a2d162e131
Author: Noel 
AuthorDate: Sun Mar 14 18:02:13 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Mar 15 09:17:13 2021 +0100

no need for this map<> key to be const

it is a value type

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

diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 42689ed98c2a..1fa0d7dcd060 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -46,7 +46,7 @@ class VCL_DLLPUBLIC ITiledRenderable
 {
 public:
 
-typedef std::map  StringMap;
+typedef std::map  StringMap;
 
 virtual ~ITiledRenderable();
 
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index e2cb07384cf7..c9f2b922a792 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -40,7 +40,7 @@ class MenuButton;
 class ToolBox;
 namespace weld { class CustomWidgetController; }
 
-typedef std::map StringMap;
+typedef std::map StringMap;
 
 /**
  * This class wraps a UI object like vcl::Window and provides
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits