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

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit eaa06413554be4ef4c73686c185c3d49e9defba4
Author: Szymon Kłos 
AuthorDate: Mon Mar 8 07:43:55 2021 +0100
Commit: Szymon Kłos 
CommitDate: Mon Mar 8 09:00:21 2021 +0100

jsdialog: fix free JsonWriter assertion

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

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 5c379952a634..c2c1ee2f0078 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -83,6 +83,10 @@ void JSDialogNotifyIdle::send(tools::JsonWriter& aJsonWriter)
 free(aJsonWriter.extractData());
 }
 }
+else
+{
+free(aJsonWriter.extractData());
+}
 }
 
 namespace
___
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/functions/mathematical/fods/sum.fods |   28 +++
 sc/qa/unit/ucalc.hxx |2 -
 sc/qa/unit/ucalc_formula.cxx |   19 
 3 files changed, 28 insertions(+), 21 deletions(-)

New commits:
commit a75799f3e904bd46cffd0bac78e3c0885ac5c447
Author: Xisco Fauli 
AuthorDate: Fri Mar 5 00:34:31 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 8 09:02:07 2021 +0100

tdf#133260: move unittest to function test

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

diff --git a/sc/qa/unit/data/functions/mathematical/fods/sum.fods 
b/sc/qa/unit/data/functions/mathematical/fods/sum.fods
index 1aec65bdebef..4f6ad1ccc61f 100644
--- a/sc/qa/unit/data/functions/mathematical/fods/sum.fods
+++ b/sc/qa/unit/data/functions/mathematical/fods/sum.fods
@@ -2101,6 +2101,34 @@
  
  
 
+
+ 
+  2
+ 
+ 
+  2
+ 
+ 
+  PRAVDA
+ 
+ 
+  =SUM(ABS(MUNIT(2)))
+ 
+
+
+ 
+  2
+ 
+ 
+  2
+ 
+ 
+  PRAVDA
+ 
+ 
+  =SUM(ABS(MUNIT(2)*-1))
+ 
+
 
  
  
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 8ee8d28868c3..9c9b381315ab 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -567,7 +567,6 @@ public:
 void testTdf97369();
 void testTdf97587();
 void testTdf93415();
-void testTdf133260();
 void testTdf100818();
 
 void testEmptyCalcDocDefaults();
@@ -878,7 +877,6 @@ public:
 CPPUNIT_TEST(testTdf97369);
 CPPUNIT_TEST(testTdf97587);
 CPPUNIT_TEST(testTdf93415);
-CPPUNIT_TEST(testTdf133260);
 CPPUNIT_TEST(testTdf100818);
 CPPUNIT_TEST(testEmptyCalcDocDefaults);
 CPPUNIT_TEST(testPrecisionAsShown);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 34325dd8d988..6ff96cfd4b89 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -8641,25 +8641,6 @@ void Test::testTdf93415()
 m_pDoc->DeleteTab(0);
 }
 
-void Test::testTdf133260()
-{
-CPPUNIT_ASSERT(m_pDoc->InsertTab (0, "Test"));
-
-ScAddress aPos1(0,0,0);
-m_pDoc->SetString(aPos1, "=SUM(ABS(MUNIT(2)))");
-
-ScAddress aPos2(0,1,0);
-m_pDoc->SetString(aPos2, "=SUM(ABS(MUNIT(2)*-1))");
-
-// Without the fix in place, this test would have failed with
-// - Expected: 2
-// - Actual  : 1
-CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc->GetValue(aPos1));
-CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc->GetValue(aPos2));
-
-m_pDoc->DeleteTab(0);
-}
-
 void Test::testTdf100818()
 {
 CPPUNIT_ASSERT(m_pDoc->InsertTab (0, "Sheet1"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 vcl/win/dtrans/DOTransferable.cxx |   19 ---
 vcl/win/dtrans/DOTransferable.hxx |7 +--
 2 files changed, 1 insertion(+), 25 deletions(-)

New commits:
commit 818a84c4b232518780ff12415a6dad50b3625d5d
Author: Mike Kaganski 
AuthorDate: Sat Mar 6 13:04:24 2021 +0100
Commit: Mike Kaganski 
CommitDate: Mon Mar 8 09:06:22 2021 +0100

[API CHANGE] Remove unused XSystemTransferable interface from 
CDOTransferable

This interface is only implemented on Windows' transferable; it is
not used anywhere in the codebase, and its implementation is wrong:
it passes COM interface pointer as 32-bit integer (thus truncating
64-bit pointers on Win64) to different processes, where the pointer
has no value.

This reverts commit 772fb7b3e482d537482437f5cd898093522d3fb5.

Change-Id: I828c6595ac3f7836a3c72d5498efb279938407ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112072
Tested-by: Mike Kaganski 
Reviewed-by: Mike Kaganski 

diff --git a/vcl/win/dtrans/DOTransferable.cxx 
b/vcl/win/dtrans/DOTransferable.cxx
index 029a21402bac..61edcb9a9348 100644
--- a/vcl/win/dtrans/DOTransferable.cxx
+++ b/vcl/win/dtrans/DOTransferable.cxx
@@ -575,23 +575,4 @@ bool CDOTransferable::compareDataFlavors(
 return bRet;
 }
 
-css::uno::Any SAL_CALL CDOTransferable::getData( const Sequence< sal_Int8>& 
aProcessId  )
-{
-Any retVal;
-
-sal_Int8 const * arProcCaller= aProcessId.getConstArray();
-sal_uInt8 arId[16];
-rtl_getGlobalProcessId(arId);
-if( ! memcmp( arId, arProcCaller,16))
-{
-if (m_rDataObject.is())
-{
-IDataObject* pObj= m_rDataObject.get();
-pObj->AddRef();
-retVal.setValue( &pObj, cppu::UnoType::get());
-}
-}
-return retVal;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/dtrans/DOTransferable.hxx 
b/vcl/win/dtrans/DOTransferable.hxx
index 0e652f9b6a0d..e42555ce6143 100644
--- a/vcl/win/dtrans/DOTransferable.hxx
+++ b/vcl/win/dtrans/DOTransferable.hxx
@@ -37,8 +37,7 @@
 class CFormatEtc;
 
 class CDOTransferable : public ::cppu::WeakImplHelper<
-css::datatransfer::XTransferable,
-css::datatransfer::XSystemTransferable>
+css::datatransfer::XTransferable>
 {
 public:
 typedef css::uno::Sequence< sal_Int8 > ByteSequence_t;
@@ -51,10 +50,6 @@ public:
 
 virtual sal_Bool SAL_CALL isDataFlavorSupported( const 
css::datatransfer::DataFlavor& aFlavor ) override;
 
-// XSystemTransferable
-
-virtual css::uno::Any SAL_CALL getData( const 
css::uno::Sequence& aProcessId  ) override;
-
 explicit CDOTransferable(
 const css::uno::Reference< css::uno::XComponentContext >& rxContext,
 const css::uno::Reference& 
xClipboard,
___
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/inc vcl/osx vcl/qa vcl/quartz

[Thorsten Wagner (via logerrit)]

 vcl/inc/quartz/salgdi.h  |3 -
 vcl/osx/salgdiutils.cxx  |   50 +++
 vcl/osx/salmacos.cxx |4 -
 vcl/qa/cppunit/BackendTest.cxx   |9 
 vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx |9 +++-
 vcl/qa/cppunit/outdev.cxx|4 +
 vcl/quartz/salgdi.cxx|8 ---
 7 files changed, 48 insertions(+), 39 deletions(-)

New commits:
commit 6b3558e3c563427f1bdff7193151c57c59041ddb
Author: Thorsten Wagner 
AuthorDate: Sat Mar 6 23:51:33 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Mar 8 09:22:42 2021 +0100

tdf#138122 Detect window scaling for multi display configurations on macOS

(1) Activate window scaling when at least one retina display is connected

(2) Remove environment variable VCL_MACOS_FORCE_WINDOW_SCALING

(3) Disable related unit tests unless bitmap scaling has been implemented

Backport of 0c36f364b14aacd0eeb53087ae2fce54402dc741 and
06d918dcc47ae3f1c511cbdccfeacc8adb123f28 for LibreOffice 7.1

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

diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index f5ff134259a6..7282c50fef1c 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -175,7 +175,6 @@ class AquaSalGraphics : public SalGraphics
 #ifdef MACOSX
 /// is this a window graphics
 boolmbWindow;
-boolmbWindowScaling;
 
 #else // IOS
 
@@ -197,7 +196,7 @@ public:
 voidcopyResolution( AquaSalGraphics& );
 voidupdateResolution();
 
-float   GetWindowScaling();
+static floatGetWindowScaling();
 voidSetWindowGraphics( AquaSalFrame* pFrame );
 boolIsWindowGraphics()  const   { return mbWindow; 
}
 voidSetPrinterGraphics(CGContextRef, sal_Int32 
nRealDPIX, sal_Int32 nRealDPIY);
diff --git a/vcl/osx/salgdiutils.cxx b/vcl/osx/salgdiutils.cxx
index 892baed13ac9..a1012e704796 100644
--- a/vcl/osx/salgdiutils.cxx
+++ b/vcl/osx/salgdiutils.cxx
@@ -35,37 +35,35 @@
 #include 
 #include 
 
-float AquaSalGraphics::GetWindowScaling()
-{
-float fScale = 1.0f;
-
-#ifdef MACOSX
-
-// Window scaling independent from main display may be forced by setting 
VCL_MACOS_FORCE_WINDOW_SCALING environment variable
-// whose setting is stored in mbWindowScaling. After implementation of 
full support of scaled displays window scaling will be
-// set to 2.0f for macOS as default. This will allow moving of windows 
between non retina and retina displays without blurry
-// text and graphics.
+// TODO: Scale will be set to 2.0f as default after implementation of full 
scaled display support . This will allow moving of
+// windows between non retina and retina displays without blurry text and 
graphics. Static variables have to be removed thereafter.
 
-// TODO: After implementation of full support of scaled displays code has 
to be modified to set a scaling of 2.0f as default.
-
-if (mbWindowScaling)
-{
-fScale = 2.0f;
-return fScale;
-}
+// Currently scaled display support is not implemented for bitmaps. This will 
cause a slight performance degradation on displays
+// with single precision. To preserve performance for now, window scaling is 
only activated if at least one display with double
+// precision is present. Moving windows between displays is then possible 
without blurry text and graphics too. Adapting window
+// scaling when displays are added while application is running is not 
supported.
 
-#endif
+static bool  bWindowScaling = false;
+static float fWindowScale = 1.0f;
 
-AquaSalFrame *pSalFrame = mpFrame;
-if (!pSalFrame)
-pSalFrame = static_cast(GetSalData()->mpInstance->anyFrame());
-if (pSalFrame)
+float AquaSalGraphics::GetWindowScaling()
+{
+if (!bWindowScaling)
 {
-NSWindow *pNSWindow = pSalFrame->getNSWindow();
-if (pNSWindow)
-fScale = [pNSWindow backingScaleFactor];
+NSArray *aScreens = [NSScreen screens];
+if (aScreens != nullptr)
+{
+int nScreens = [aScreens count];
+for (int i = 0; i < nScreens; i++)
+{
+float fScale = [[aScreens objectAtIndex:i] backingScaleFactor];
+if (fScale > fWindowScale)
+  fWindowScale = fScale;
+}
+bWindowScaling = true;
+}
 }
-return fScale;
+return fWindowScale;
 }
 
 void AquaSalGraphics::SetWindowGraphics( AquaSalFrame* pFrame )
diff --git a/vcl/osx/salmacos.cxx b/vcl/osx/salmacos.cxx
index 8

Re: testXAdES failing since 2021-03-03

[Miklos Vajna]

Hi,

On Fri, Mar 05, 2021 at 08:57:32PM +0100, Michael Stahl  
wrote:
> no trace of the "CN=some-uuid" that you get.
> 
> sorry, no idea...

Windows takes the certificate from the system store (visible via the
certmgr tool), I bet Mike has some additional certs installed which
influence the test, and what is not installed on other systems.

unotest::MacrosTest::setUpNssGpg() could be extended to ignore system
certificates on Windows, but I'm not sure how to do that.

Regards,

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

[Libreoffice-commits] core.git: logerrit

[Xisco Fauli (via logerrit)]

 logerrit |9 +
 1 file changed, 9 insertions(+)

New commits:
commit e7a471a8fbac22877973af7e7be8c6a0701b4046
Author: Xisco Fauli 
AuthorDate: Fri Mar 5 12:33:53 2021 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 8 09:27:19 2021 +0100

logerrit: do not submit if parent is older than a week

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

diff --git a/logerrit b/logerrit
index 1d75904578e1..bae806a5939e 100755
--- a/logerrit
+++ b/logerrit
@@ -22,6 +22,15 @@ submit() {
 fi
 echo "no branch specified, guessing current branch $BRANCH"
 fi
+
+if [ "$BRANCH" = "master" ]; then
+WEEKOLDDATE=$(date --date="7 days ago" +%s)
+PARENTDATE=$(git show -s --format=%ct HEAD~1)
+if [[ $PARENTDATE -lt $WEEKOLDDATE ]]; then
+echo "Your branch is older than a week, do './g pull -r' and 
retry"
+exit 1
+fi
+fi
 git push "$GERRITURL" "HEAD:refs/for/$BRANCH$TYPE"
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti (via logerrit)]

 sd/qa/unit/SVGExportTests.cxx   |   87 
 sd/qa/unit/data/odp/slide-bitmap-background.odp |binary
 sd/qa/unit/data/odp/slide-tile-background.odp   |binary
 3 files changed, 87 insertions(+)

New commits:
commit c6abdc690075d7a627a62d04113a4fa911f90b00
Author: Marco Cecchetti 
AuthorDate: Tue Jan 26 09:36:44 2021 +0100
Commit: Andras Timar 
CommitDate: Mon Mar 8 09:51:08 2021 +0100

filter: svg: js engine: unit test: slide background: exporting bitmaps

Two unit tests:
1 - a slide background with a single bitmap
2 - a slide background with bitmap tiles

Change-Id: Iffdb9ea958ba07391dfbdcfd6e925a9461e2af84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109932
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111843
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/sd/qa/unit/SVGExportTests.cxx b/sd/qa/unit/SVGExportTests.cxx
index 48ed7c78af4e..107c698afb68 100644
--- a/sd/qa/unit/SVGExportTests.cxx
+++ b/sd/qa/unit/SVGExportTests.cxx
@@ -21,14 +21,37 @@
 #include 
 #include 
 
+#include 
+
 #define SVG_SVG  *[name()='svg']
 #define SVG_G *[name()='g']
 #define SVG_TEXT *[name()='text']
 #define SVG_TSPAN *[name()='tspan']
 #define SVG_DEFS *[name()='defs']
+#define SVG_IMAGE *[name()='image']
+#define SVG_USE *[name()='use']
 
 using namespace css;
 
+namespace
+{
+bool isValidBitmapId(const OUString& sId)
+{
+std::regex aRegEx("bitmap\\(\\d+\\)");
+return std::regex_match(sId.toUtf8().getStr(), aRegEx);
+}
+
+BitmapChecksum getBitmapChecksumFromId(const OUString& sId)
+{
+sal_Int32 nStart = sId.indexOf("(") + 1;
+sal_Int32 nCount = sId.indexOf(")") - nStart;
+bool bIsValidRange = nStart > 0 && nCount > 0;
+CPPUNIT_ASSERT(bIsValidRange);
+OUString sChecksum = sId.copy( nStart, nCount );
+return sChecksum.toUInt64();
+}
+}
+
 class SdSVGFilterTest : public test::BootstrapFixture, public 
unotest::MacrosTest, public XmlTestTools
 {
 uno::Reference mxComponent;
@@ -164,11 +187,75 @@ public:
 assertXPathContent(svgDoc, SAL_STRINGIFY( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[7]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
 ), "");
 }
 
+void testSVGExportSlideBitmapBackground()
+{
+executeExport("slide-bitmap-background.odp");
+
+xmlDocUniquePtr svgDoc = parseXml(maTempFile);
+CPPUNIT_ASSERT(svgDoc);
+
+assertXPath(svgDoc, SAL_STRINGIFY( /SVG_SVG/SVG_DEFS[9] ), "class", 
"BackgroundBitmaps");
+assertXPath(svgDoc, SAL_STRINGIFY( /SVG_SVG/SVG_DEFS[9]/SVG_IMAGE ), 
1);
+
+OUString sImageId = getXPath(svgDoc, SAL_STRINGIFY( 
/SVG_SVG/SVG_DEFS[9]/SVG_IMAGE ), "id");
+CPPUNIT_ASSERT_MESSAGE(OString("The exported bitmap has not a valid 
id: " + sImageId.toUtf8()).getStr(), isValidBitmapId(sImageId));
+
+BitmapChecksum nChecksum = getBitmapChecksumFromId(sImageId);
+CPPUNIT_ASSERT_MESSAGE(OString("The exported bitmap has not a valid 
checksum: " + sImageId.toUtf8()).getStr(), nChecksum != 0);
+
+// single image case
+assertXPath(svgDoc, SAL_STRINGIFY( 
/SVG_SVG/SVG_G[2]/SVG_G[1]/SVG_G/SVG_G/SVG_G/SVG_DEFS ), "class", 
"SlideBackground");
+assertXPath(svgDoc, SAL_STRINGIFY( 
/SVG_SVG/SVG_G[2]/SVG_G[1]/SVG_G/SVG_G/SVG_G/SVG_DEFS/SVG_G/SVG_G/SVG_USE ), 1);
+OUString sRef = getXPath(svgDoc, SAL_STRINGIFY( 
/SVG_SVG/SVG_G[2]/SVG_G[1]/SVG_G/SVG_G/SVG_G/SVG_DEFS/SVG_G/SVG_G/SVG_USE ), 
"href");
+CPPUNIT_ASSERT_MESSAGE("The  element has not a valid href 
attribute: starting '#' not present.", sRef.startsWith("#"));
+sRef = sRef.copy(1);
+CPPUNIT_ASSERT_MESSAGE(OString("The  element does not point to a 
valid bitmap id: " + sRef.toUtf8()).getStr(), isValidBitmapId(sRef));
+
+BitmapChecksum nUseChecksum = getBitmapChecksumFromId(sRef);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("The bitmap checksum used in  does 
not match the expected one: ", nChecksum, nUseChecksum);
+}
+
+void testSVGExportSlideTileBitmapBackground()
+{
+executeExport("slide-tile-background.odp");
+
+xmlDocUniquePtr svgDoc = parseXml(maTempFile);
+CPPUNIT_ASSERT(svgDoc);
+
+assertXPath(svgDoc, SAL_STRINGIFY( /SVG_SVG/SVG_DEFS[9] ), "class", 
"BackgroundBitmaps");
+assertXPath(svgDoc, SAL_STRINGIFY( /SVG_SVG/SVG_DEFS[9]/SVG_IMAGE ), 
1);
+
+OUString sImageId = getXPath(svgDoc, SAL_STRINGIFY( 
/SVG_SVG/SVG_DEFS[9]/SVG_IMAGE ), "id");
+CPPUNIT_ASSERT_MESSAGE(OString("The exported bitmap has not a valid 
id: " + sImageId.toUtf8()).getStr(), isValidBitmapId(sImageId));
+
+BitmapChecksum nChecksum = getBitmapChecksumFromId(sImageId);
+CPPUNIT_ASSERT_MESSAGE(OString("The exported bitmap has not a valid 
checksum: " + sImageId.toUtf8()).getStr(), nChecksum != 0);
+
+// tiles case
+constexpr unsigned 

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

[Seth Chaiklin (via logerrit)]

 source/text/shared/01/formatting_mark.xhp|   18 +-
 source/text/swriter/guide/hyphen_prevent.xhp |   22 ++
 2 files changed, 19 insertions(+), 21 deletions(-)

New commits:
commit ead459c15f4eb1095d0dff0cb76611bff31d12f8
Author: Seth Chaiklin 
AuthorDate: Mon Mar 8 09:14:44 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Mon Mar 8 09:54:39 2021 +0100

Related to: tdf#140796  No-width no break -> Word Joiner

   ( shared/01/formatting_mark.xhp )
 * No-width no break -> Word Joiner
 * .uno:InsertZWNBSP" -> .uno:InsertWJ"
 * update to ,

   ( swriter/guide/hyphen_prevent.xhp )
* No-width no break -> Word Joiner, and change to  in
  that paragraph
* "paragraph" -> "listitem" for "role"
* update to ,,,

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

diff --git a/source/text/shared/01/formatting_mark.xhp 
b/source/text/shared/01/formatting_mark.xhp
index a358e5a9b..d8e62f95e 100644
--- a/source/text/shared/01/formatting_mark.xhp
+++ b/source/text/shared/01/formatting_mark.xhp
@@ -36,36 +36,36 @@
 
 MW added 2 index entries because of issue 
86750tried to fix i86464 by creating a new file, copy 
everything over, then save & overwrite as 
formatting_mark.xhpbut this did not help
 
-Formatting Mark 

+Formatting 
Mark 
 Opens a submenu to insert special formatting 
marks like non-breaking space, soft hyphen, and optional 
break.
 
 
 
-Non-breaking space
+Non-breaking space
 Inserts a space that will keep bordering characters together on line 
breaks.
 
 
-Non-breaking hyphen
+Non-breaking hyphen
 Inserts a hyphen that will keep bordering characters together on line 
breaks.
 
 
-Soft 
hyphen
+Soft hyphen
 Inserts an invisible optional hyphen within a word that will appear and 
create a line break once it becomes the last character in a 
line.
 
 
-No-width optional break
+No-width optional break
 Inserts an invisible space within a word that will insert a line break 
once it becomes the last character in a line. Available when complex text 
layout (CTL) is enabled.
-
+
 
-No-width no break
+Word Joiner
 Inserts an invisible space within a word that will keep the word 
together at the end of a line. Available when complex text layout (CTL) is 
enabled.
 
 
-Left-to-right mark
+Left-to-right mark
 Inserts a text direction mark that affects the text direction of any 
text following the mark. Available when complex text layout (CTL) is 
enabled.
 
 
-Right-to-left mark
+Right-to-left mark
 Inserts a text direction mark that affects the text direction of any 
text following the mark. Available when complex text layout (CTL) is 
enabled.
 
 
diff --git a/source/text/swriter/guide/hyphen_prevent.xhp 
b/source/text/swriter/guide/hyphen_prevent.xhp
index ff136b3c0..378c1b26a 100644
--- a/source/text/swriter/guide/hyphen_prevent.xhp
+++ b/source/text/swriter/guide/hyphen_prevent.xhp
@@ -1,6 +1,5 @@
 
 
-   
 
- 
-   
 
   
  Preventing Hyphenation of Specific 
Words
@@ -30,9 +27,9 @@
 hyphenation;preventing for specific 
words
   words;wrapping/not wrapping in text
   switching off;hyphenation for specific 
words
-mw copied 2 entries from using_hyphen.xhp and added a new 
entry
-Preventing Hyphenation of Specific Words
-MW created this guide from splitting 
using_hyphen.xhp
+
+Preventing Hyphenation of Specific Words
+MW created this guide from splitting 
using_hyphen.xhp
 If your text 
is automatically 
hyphenated and certain hyphenated words look ugly, or if you want 
specific words never to be hyphenated you can switch off hyphenation for those 
words:
   
  
@@ -50,22 +47,23 @@
 Click New, and then click 
Close.
  
   
-  To quickly 
exclude a word from hyphenation, select the word, choose Format - 
Character, click the Font tab, and select "None" in the 
Language box.
+  To quickly exclude a word from 
hyphenation, select the word, choose Format - Character, click the 
Font tab, and select "None" in the Language box.
   Some words contain special characters that %PRODUCTNAME treats 
as a hyphen. If you do not want such words to be hyphenated, you can insert a 
special code that prevents hyphenation at the position where the special code 
is inserted. Proceed as follows:
   
  
-Enable the special features of complex text layout (CTL) 
languages: Choose %PRODUCTNAME - 
PreferencesTools - 
Options - Language 
Settings - Languages and check Enabled for complex text layout 
(CTL). Click OK.
+Enable the special features of complex text layout (CTL) 
languages: Choose %PRODUCTNAME - 
PreferencesTools - 
Options - Language 
Settings - Languages and check Enabled for complex text layout 
(CTL). Click OK.
  
  
-Position the cursor at the

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit f2de7949a23397d05ef011c78bfe2a70d8e25cdc
Author: Seth Chaiklin 
AuthorDate: Mon Mar 8 09:54:39 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 8 09:54:39 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to ead459c15f4eb1095d0dff0cb76611bff31d12f8
  - Related to: tdf#140796  No-width no break -> Word Joiner

   ( shared/01/formatting_mark.xhp )
 * No-width no break -> Word Joiner
 * .uno:InsertZWNBSP" -> .uno:InsertWJ"
 * update to ,

   ( swriter/guide/hyphen_prevent.xhp )
* No-width no break -> Word Joiner, and change to  in
  that paragraph
* "paragraph" -> "listitem" for "role"
* update to ,,,

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

diff --git a/helpcontent2 b/helpcontent2
index a601b032ba5b..ead459c15f4e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a601b032ba5b63f30026fdfe5ba61941fc8e2b8c
+Subproject commit ead459c15f4eb1095d0dff0cb76611bff31d12f8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sw/source/core/text/itratr.cxx  |  185 +---
 sw/source/core/text/itrcrsr.cxx |6 -
 sw/source/core/text/itrtxt.cxx  |4 
 sw/source/core/text/itrtxt.hxx  |6 -
 sw/source/core/text/porhyph.hxx |4 
 sw/source/core/text/txthyph.cxx |4 
 6 files changed, 110 insertions(+), 99 deletions(-)

New commits:
commit d98920c99f374c83023b0de4e955f22ae6673ca7
Author: Miklos Vajna 
AuthorDate: Mon Mar 8 09:05:16 2021 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 8 09:58:12 2021 +0100

sw: prefix members of SwHyphStrPortion, SwMinMaxArgs, SwMinMaxNodeArgs ...

... and SwTextCursor

See tdf#94879 for motivation.

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

diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index bc39bccc995e..a0ae8073c27b 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -783,20 +783,29 @@ namespace {
 class SwMinMaxArgs
 {
 public:
-VclPtr pOut;
-SwViewShell const * pSh;
-sal_uLong &rMin;
-sal_uLong &rAbsMin;
-tools::Long nRowWidth;
-tools::Long nWordWidth;
-tools::Long nWordAdd;
-sal_Int32 nNoLineBreak;
-SwMinMaxArgs( OutputDevice* pOutI, SwViewShell const * pShI, sal_uLong& 
rMinI, sal_uLong &rAbsI )
-: pOut( pOutI ), pSh( pShI ), rMin( rMinI ), rAbsMin( rAbsI ), 
nRowWidth(0),
-  nWordWidth(0), nWordAdd(0), nNoLineBreak(COMPLETE_STRING)
-{ }
-void Minimum( tools::Long nNew ) const { if( 
static_cast(rMin) < nNew ) rMin = nNew; }
-void NewWord() { nWordAdd = nWordWidth = 0; }
+VclPtr m_pOut;
+SwViewShell const* m_pSh;
+sal_uLong& m_rMin;
+sal_uLong& m_rAbsMin;
+tools::Long m_nRowWidth;
+tools::Long m_nWordWidth;
+tools::Long m_nWordAdd;
+sal_Int32 m_nNoLineBreak;
+SwMinMaxArgs(OutputDevice* pOutI, SwViewShell const* pShI, sal_uLong& 
rMinI, sal_uLong& rAbsI)
+: m_pOut(pOutI)
+, m_pSh(pShI)
+, m_rMin(rMinI)
+, m_rAbsMin(rAbsI)
+, m_nRowWidth(0)
+, m_nWordWidth(0)
+, m_nWordAdd(0)
+, m_nNoLineBreak(COMPLETE_STRING)
+{ }
+void Minimum( tools::Long nNew ) const {
+if (static_cast(m_rMin) < nNew)
+m_rMin = nNew;
+}
+void NewWord() { m_nWordAdd = m_nWordWidth = 0; }
 };
 
 }
@@ -816,24 +825,24 @@ static bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* 
pFnt, const OUString &
  g_pBreakIt->GetLocale( eLang ),
  WordType::DICTIONARY_WORD, true ) );
 nStop = aBndry.endPos;
-if( nIdx <= aBndry.startPos && nIdx && nIdx-1 != rArg.nNoLineBreak )
+if (nIdx <= aBndry.startPos && nIdx && nIdx - 1 != rArg.m_nNoLineBreak)
 rArg.NewWord();
 if( nStop == nIdx )
 ++nStop;
 if( nStop > nEnd )
 nStop = nEnd;
 
-SwDrawTextInfo aDrawInf(rArg.pSh, *rArg.pOut, rText, nIdx, nStop - 
nIdx);
+SwDrawTextInfo aDrawInf(rArg.m_pSh, *rArg.m_pOut, rText, nIdx, nStop - 
nIdx);
 tools::Long nCurrentWidth = pFnt->GetTextSize_( aDrawInf ).Width();
-rArg.nRowWidth += nCurrentWidth;
+rArg.m_nRowWidth += nCurrentWidth;
 if( bClear )
 rArg.NewWord();
 else
 {
-rArg.nWordWidth += nCurrentWidth;
-if( static_cast(rArg.rAbsMin) < rArg.nWordWidth )
-rArg.rAbsMin = rArg.nWordWidth;
-rArg.Minimum( rArg.nWordWidth + rArg.nWordAdd );
+rArg.m_nWordWidth += nCurrentWidth;
+if (static_cast(rArg.m_rAbsMin) < rArg.m_nWordWidth)
+rArg.m_rAbsMin = rArg.m_nWordWidth;
+rArg.Minimum(rArg.m_nWordWidth + rArg.m_nWordAdd);
 bRet = true;
 }
 nIdx = nStop;
@@ -854,14 +863,17 @@ namespace {
 class SwMinMaxNodeArgs
 {
 public:
-sal_uLong nMaxWidth;// sum of all frame widths
-tools::Long nMinWidth; // biggest frame
-tools::Long nLeftRest; // space not already covered by frames in 
the left margin
-tools::Long nRightRest;// space not already covered by frames in 
the right margin
-tools::Long nLeftDiff; // Min/Max-difference of the frame in the 
left margin
-tools::Long nRightDiff;// Min/Max-difference of the frame in the 
right margin
-sal_uLong nIndx;// index of the node
-void Minimum( tools::Long nNew ) { if( nNew > nMinWidth ) nMinWidth = 
nNew; }
+sal_uLong m_nMaxWidth; // sum of all frame widths
+tools::Long m_nMinWidth; // biggest frame
+tools::Long m_nLeftRest; // space not already covered by frames in the 
left margin
+tools::Long m_nRightRest; // space not already covered by frames in the 
right margin
+tools::Long m_nLeftDiff; // Min/Max-difference of the fr

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/navipi/navipi.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit bc5a0676fa107bdad6e860d31a874de4eae2d8ba
Author: Caolán McNamara 
AuthorDate: Sun Mar 7 19:43:42 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 8 09:59:41 2021 +0100

default to 'contents' hidden until toggled to floating mode

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

diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 170c14308c9f..6fea222a7938 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -346,6 +346,8 @@ ScNavigatorDlg::ScNavigatorDlg(SfxBindings* pB, 
vcl::Window* pParent)
 {
 set_id("NavigatorPanelParent"); // for uitests
 
+m_xTbxCmd1->set_item_visible("contents", false); // start off hidden, show 
if made floating
+
 UpdateSheetLimits();
 m_xEdRow->set_width_chars(5);
 //max rows is 1,000,000, which is too long for typical use
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit a71bf40191b31780a3bbac2ee2a3a59c99dcf8b8
Author: Caolán McNamara 
AuthorDate: Sun Mar 7 16:52:43 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 8 10:00:07 2021 +0100

move GetDPIScaleFactor check to ValueSet canvas

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

diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx 
b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 95068a207ec8..bf048f18bebd 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -76,7 +76,7 @@ MasterPagesSelector::MasterPagesSelector (
 LINK(this, MasterPagesSelector, ContextMenuHandler));
 mxPreviewValueSet->SetStyle(mxPreviewValueSet->GetStyle() | 
WB_NO_DIRECTSELECT);
 
-if ( GetDPIScaleFactor() > 1 )
+if 
(mxPreviewValueSet->GetDrawingArea()->get_ref_device().GetDPIScaleFactor() > 1)
 mpContainer->SetPreviewSize(MasterPageContainer::LARGE);
 
 mxPreviewValueSet->SetPreviewSize(mpContainer->GetPreviewSizePixel());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 svx/source/tbxctrls/fontworkgallery.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 9279dce41152ed692c125edfed4c80a7c28c7a0b
Author: Szymon Kłos 
AuthorDate: Wed Jan 20 10:02:53 2021 +0100
Commit: Szymon Kłos 
CommitDate: Mon Mar 8 10:06:49 2021 +0100

Don't insert fontwork outside view

Change-Id: Ib518cc6c70e2595cc191cd353b628729fd220de7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109665
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112151
Tested-by: Jenkins

diff --git a/svx/source/tbxctrls/fontworkgallery.cxx 
b/svx/source/tbxctrls/fontworkgallery.cxx
index 12fb590622b3..bfcde08d09c8 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -195,8 +195,14 @@ void FontWorkGalleryDialog::insertSelectedFontwork()
 tools::Rectangle aObjRect( pNewObject->GetLogicRect() );
 tools::Rectangle aVisArea = 
pOutDev->PixelToLogic(tools::Rectangle(Point(0,0), 
pOutDev->GetOutputSizePixel()));
 Point aPagePos = aVisArea.Center();
-aPagePos.AdjustX( -(aObjRect.GetWidth() / 2) );
-aPagePos.AdjustY( -(aObjRect.GetHeight() / 2) );
+bool bIsInsertedObjectSmallerThanVisibleArea =
+aVisArea.GetSize().getHeight() > aObjRect.GetSize().getHeight() &&
+aVisArea.GetSize().getWidth() > aObjRect.GetSize().getWidth();
+if (bIsInsertedObjectSmallerThanVisibleArea)
+{
+aPagePos.AdjustX( -(aObjRect.GetWidth() / 2) );
+aPagePos.AdjustY( -(aObjRect.GetHeight() / 2) );
+}
 tools::Rectangle aNewObjectRectangle(aPagePos, aObjRect.GetSize());
 pNewObject->SetLogicRect(aNewObjectRectangle);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

External Data Source in Calc

[Vikas Mahato]

Hi,

I wanted to continue with working on External data source in calc (I worked
on it in 2018 as part of Gsoc). It seems the UI has changed quite a bit.
The dropdown for selecting the data source (CSV,HTML, etc) is not longer
there. Reader thread in sc/source/ui/docshell/datastream.cxx launches the
CSVHandler only. What did I miss?


Regards,

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

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

[Tor Lillqvist (via logerrit)]

 sal/osl/unx/backtrace.c |   69 
 1 file changed, 1 insertion(+), 68 deletions(-)

New commits:
commit 7c0838b60b62760e46a81bdd010d8d94536232d7
Author: Tor Lillqvist 
AuthorDate: Thu Mar 4 11:56:50 2021 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Mar 8 10:15:12 2021 +0100

The backtrace() etc API is available on macOS and iOS, too

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

diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index a3aeb3dae3f8..26005f7715af 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -212,74 +212,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd 
)
 }
 }
 
-#elif defined( MACOSX )
-
-#include 
-#include 
-#include "backtrace.h"
-
-/* glib backtrace is only available on MacOsX 10.5 or higher
-   so we do it on our own */
-
-int backtrace( void **buffer, int max_frames )
-{
-void **frame = (void **)__builtin_frame_address(0);
-void **bp = ( void **)(*frame);
-void *ip = frame[1];
-int i;
-
-for ( i = 0; bp && ip && i < max_frames; i++ )
-{
-*(buffer++) = ip;
-
-ip = bp[1];
-bp = (void**)(bp[0]);
-}
-
-return i;
-}
-
-char ** backtrace_symbols(void * const * buffer, int size)
-{
-(void)buffer; (void)size;
-return NULL; /*TODO*/
-}
-
-void backtrace_symbols_fd( void **buffer, int size, int fd )
-{
-FILE*fp = fdopen( fd, "w" );
-
-if ( fp )
-{
-void **pFramePtr;
-
-for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; 
pFramePtr++, size-- )
-{
-Dl_info dli;
-
-if ( 0 != dladdr( *pFramePtr, &dli ) )
-{
-ptrdiff_t offset;
-
-if ( dli.dli_fname && dli.dli_fbase )
-{
-offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
-fprintf( fp, "%s+0x%tx", dli.dli_fname, offset );
-}
-if ( dli.dli_sname && dli.dli_saddr )
-{
-offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
-fprintf( fp, "(%s+0x%tx)", dli.dli_sname, offset );
-}
-}
-fprintf( fp, "[%p]\n", *pFramePtr );
-}
-
-fclose( fp );
-}
-}
-
-#elif !defined LINUX
+#elif !defined LINUX && !defined MACOSX && !defined IOS
 
 int backtrace( void **buffer, int max_frames )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: External Data Source in Calc

[Ilmari Lauhakangas]

On 8.3.2021 11.08, Vikas Mahato wrote:
I wanted to continue with working on External data source in calc (I 
worked on it in 2018 as part of Gsoc). It seems the UI has changed quite 
a bit. The dropdown for selecting the data source (CSV,HTML, etc) is not 
longer there. Reader thread in sc/source/ui/docshell/datastream.cxx 
launches the CSVHandler only. What did I miss?


You could say git log for all the relevant files to check what happened. 
At least data provider was hidden from the menu in 
https://git.libreoffice.org/core/commit/24939a5b43b9fe889c3aace027c668666ff61987


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

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

[ViKrAm-Bais (via logerrit)]

 basic/source/uno/namecont.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 394ad7fa73ec70e576a4b0bdfaa7cc2986e1bf46
Author: ViKrAm-Bais 
AuthorDate: Mon Mar 8 09:51:02 2021 +0530
Commit: Michael Stahl 
CommitDate: Mon Mar 8 11:08:06 2021 +0100

tdf#42982: improve UNO API error reporting

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

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 28bdab04a298..d42b701a5405 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -2327,7 +2327,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const 
OUString& Name )
  " storage!"));
 if ( !xLibrariesStor.is() )
 {
-throw uno::RuntimeException("null returned from 
openStorageElement");
+throw uno::RuntimeException("null returned from 
openStorageElement",static_cast< cppu::OWeakObject * >(this));
 }
 
 xLibraryStor = xLibrariesStor->openStorageElement( Name, 
embed::ElementModes::READ );
@@ -2337,7 +2337,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const 
OUString& Name )
  " storage!"));
 if ( !xLibrariesStor.is() )
 {
-throw uno::RuntimeException("null returned from 
openStorageElement");
+throw uno::RuntimeException("null returned from 
openStorageElement",static_cast< cppu::OWeakObject * >(this));
 }
 #if OSL_DEBUG_LEVEL > 0
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Aditya Pratap Singh (via logerrit)]

 ucb/source/sorter/sortdynres.cxx |4 +--
 ucb/source/sorter/sortresult.cxx |   32 ++--
 ucb/source/sorter/sortresult.hxx |   44 +++
 3 files changed, 40 insertions(+), 40 deletions(-)

New commits:
commit c056b630ef97aab139625d0a7c085825c8a9eb7f
Author: Aditya Pratap Singh 
AuthorDate: Fri Feb 5 23:12:32 2021 +0530
Commit: Ilmari Lauhakangas 
CommitDate: Mon Mar 8 11:09:05 2021 +0100

tdf#75280 Convert some sal_uIntPtr in ucb to more appropriate types

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

diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index a75da8ab4bdf..437919e269da 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -281,7 +281,7 @@ void SortedDynamicResultSet::impl_notify( const ListEvent& 
Changes )
 catch (const UnknownPropertyException&) {}
 catch (const WrappedTargetException&) {}
 
-sal_IntPtr nOldCount = pCurSet->GetCount();
+sal_Int32 nOldCount = pCurSet->GetCount();
 bool bWasFinal = false;
 
 aRet >>= bWasFinal;
@@ -459,7 +459,7 @@ void EventList::Clear()
 maData.clear();
 }
 
-void EventList::AddEvent( sal_IntPtr nType, sal_IntPtr nPos )
+void EventList::AddEvent( sal_IntPtr nType, sal_Int32 nPos )
 {
 std::unique_ptr pAction(new ListAction);
 pAction->Position = nPos;
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 5f9504f2843b..4a4e5956e2d8 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -862,9 +862,9 @@ void SAL_CALL SortedResultSet::removeVetoableChangeListener(
 
 // private methods
 
-sal_IntPtr SortedResultSet::CompareImpl( const Reference < XResultSet >& 
xResultOne,
+sal_Int32 SortedResultSet::CompareImpl( const Reference < XResultSet >& 
xResultOne,
const Reference < XResultSet >& xResultTwo,
-   sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo,
+   sal_Int32 nIndexOne, sal_Int32 nIndexTwo,
SortInfo const * pSortInfo )
 {
 Reference < XRow > xRowOne( xResultOne, UNO_QUERY );
@@ -1073,9 +1073,9 @@ sal_IntPtr SortedResultSet::CompareImpl( const Reference 
< XResultSet >& xResult
 }
 
 
-sal_IntPtr SortedResultSet::CompareImpl( const Reference < XResultSet >& 
xResultOne,
+sal_Int32 SortedResultSet::CompareImpl( const Reference < XResultSet >& 
xResultOne,
const Reference < XResultSet >& xResultTwo,
-   sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo )
+   sal_Int32 nIndexOne, sal_Int32 nIndexTwo )
 {
 sal_IntPtr  nCompare = 0;
 SortInfo*   pInfo = mpSortInfo;
@@ -1114,7 +1114,7 @@ sal_IntPtr SortedResultSet::CompareImpl( const Reference 
< XResultSet >& xResult
 }
 
 
-sal_IntPtr SortedResultSet::Compare( SortListData const *pOne,
+sal_Int32 SortedResultSet::Compare( SortListData const *pOne,
SortListData const *pTwo )
 {
 sal_IntPtr nIndexOne;
@@ -1152,7 +1152,7 @@ sal_IntPtr SortedResultSet::Compare( SortListData const 
*pOne,
 }
 
 
-sal_IntPtr SortedResultSet::FindPos( SortListData const *pEntry,
+sal_Int32 SortedResultSet::FindPos( SortListData const *pEntry,
sal_IntPtr _nStart, sal_IntPtr _nEnd )
 {
 if ( _nStart > _nEnd )
@@ -1305,7 +1305,7 @@ void SortedResultSet::Initialize(
 }
 
 
-void SortedResultSet::CheckProperties( sal_IntPtr nOldCount, bool bWasFinal )
+void SortedResultSet::CheckProperties( sal_Int32 nOldCount, bool bWasFinal )
 {
 osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -1345,7 +1345,7 @@ void SortedResultSet::CheckProperties( sal_IntPtr 
nOldCount, bool bWasFinal )
 }
 
 
-void SortedResultSet::InsertNew( sal_IntPtr nPos, sal_IntPtr nCount )
+void SortedResultSet::InsertNew( sal_Int32 nPos, sal_Int32 nCount )
 {
 // for all entries in the msS20-list, which are >= nPos, increase by nCount
 sal_IntPtr  i, nEnd;
@@ -1375,7 +1375,7 @@ void SortedResultSet::InsertNew( sal_IntPtr nPos, 
sal_IntPtr nCount )
 }
 
 
-void SortedResultSet::Remove( sal_IntPtr nPos, sal_IntPtr nCount, EventList 
*pEvents )
+void SortedResultSet::Remove( sal_Int32 nPos, sal_Int32 nCount, EventList 
*pEvents )
 {
 sal_IntPtrnOldLastSort;
 
@@ -1427,7 +1427,7 @@ void SortedResultSet::Remove( sal_IntPtr nPos, sal_IntPtr 
nCount, EventList *pEv
 }
 
 
-void SortedResultSet::Move( sal_IntPtr nPos, sal_IntPtr nCount, sal_IntPtr 
nOffset )
+void SortedResultSet::Move( sal_Int32 nPos, sal_Int32 nCount, sal_Int32 
nOffset )
 {
 if ( !nOffset )
 return;
@@ -1554,7 +1554,7 @@ void SortedResultSet::BuildSortInfo(
 }
 
 
-void SortedResultSet::

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

[Szymon Kłos (via logerrit)]

 sc/qa/uitest/calc_tests9/pivotTable.py |6 ++--
 sc/source/ui/attrdlg/scdlgfact.cxx |   14 --
 sc/source/ui/attrdlg/scdlgfact.hxx |   10 ---
 sc/source/ui/dbgui/PivotLayoutTreeList.cxx |   26 +++
 sc/source/ui/dbgui/PivotLayoutTreeListData.cxx |   34 ++---
 sc/source/ui/dbgui/pvfundlg.cxx|9 --
 sc/source/ui/inc/PivotLayoutTreeList.hxx   |1 
 sc/source/ui/inc/pvfundlg.hxx  |4 ++
 sfx2/source/appl/sfxhelp.cxx   |7 +
 9 files changed, 74 insertions(+), 37 deletions(-)

New commits:
commit 6b51f618e3ddfc7350a25a1f2bde689fed735f36
Author: Szymon Kłos 
AuthorDate: Mon Feb 8 19:01:00 2021 +0100
Commit: Szymon Kłos 
CommitDate: Mon Mar 8 11:51:02 2021 +0100

lok: send help even when document not ready

Change-Id: I44855ef00a6c54a774965b3c951a4476ed5c8b01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110593
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112159
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 03afafcd4fa4..2e3e80680feb 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -719,6 +719,13 @@ static bool impl_showOnlineHelp( const OUString& rURL )

aHelpLink.toUtf8().getStr());
 return true;
 }
+else if (GetpApp())
+{
+
GetpApp()->libreOfficeKitViewCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
+   
aHelpLink.toUtf8().getStr());
+return true;
+}
+
 return false;
 }
 
commit c883303400158573cfd3dc2bc0ad59fa8f64ce48
Author: Szymon Kłos 
AuthorDate: Tue Dec 15 15:31:49 2020 +0100
Commit: Szymon Kłos 
CommitDate: Mon Mar 8 11:50:51 2021 +0100

pivot table: make subdialogs of pivot table dialog async

Change-Id: I2c1b26ebe661a2f66bc7bf94e4f3ede2fc5e18b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107775
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112095
Tested-by: Jenkins

diff --git a/sc/qa/uitest/calc_tests9/pivotTable.py 
b/sc/qa/uitest/calc_tests9/pivotTable.py
index d85894bf9af6..2da282bb19d3 100644
--- a/sc/qa/uitest/calc_tests9/pivotTable.py
+++ b/sc/qa/uitest/calc_tests9/pivotTable.py
@@ -53,7 +53,7 @@ class pivotTable(UITestCase):
 self.assertEqual('true', 
get_state_as_dict(xEmptyLine)['Selected'])
 
 xOKBtn = dialog2.getChild("ok")
-self.ui_test.close_dialog_through_button(xOKBtn)
+xOKBtn.executeAction("CLICK", tuple())
 
 def handle_options_dialog_second_time(dialog2):
 xEmptyLine = dialog2.getChild("emptyline")
@@ -62,7 +62,7 @@ class pivotTable(UITestCase):
 self.assertEqual('false', 
get_state_as_dict(xEmptyLine)['Selected'])
 
 xCancelBtn = dialog2.getChild("cancel")
-self.ui_test.close_dialog_through_button(xCancelBtn)
+xCancelBtn.executeAction("CLICK", tuple())
 
 def handle_options_dialog_third_time(dialog2):
 xEmptyLine = dialog2.getChild("emptyline")
@@ -70,7 +70,7 @@ class pivotTable(UITestCase):
 self.assertEqual('true', 
get_state_as_dict(xEmptyLine)['Selected'])
 
 xOKBtn = dialog2.getChild("ok")
-self.ui_test.close_dialog_through_button(xOKBtn)
+xOKBtn.executeAction("CLICK", tuple())
 
 self.ui_test.execute_blocking_action(optionBtn.executeAction, 
args=('CLICK', ()),
 dialog_handler=handle_options_dialog_first_time)
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index b77f603540de..bc22a3fb443a 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -230,11 +230,21 @@ short AbstractScDPFunctionDlg_Impl::Execute()
 return m_xDlg->run();
 }
 
+bool 
AbstractScDPFunctionDlg_Impl::StartExecuteAsync(VclAbstractDialog::AsyncContext 
&rCtx)
+{
+return weld::DialogController::runAsync(m_xDlg, rCtx.maEndDialogFn);
+}
+
 short AbstractScDPSubtotalDlg_Impl::Execute()
 {
 return m_xDlg->run();
 }
 
+bool 
AbstractScDPSubtotalDlg_Impl::StartExecuteAsync(VclAbstractDialog::AsyncContext 
&rCtx)
+{
+return weld::DialogController::runAsync(m_xDlg, rCtx.maEndDialogFn);
+}
+
 short AbstractScDPNumGroupDlg_Impl::Execute()
 {
 return m_xDlg->run();
@@ -1123,7 +1133,7 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPFunction

 const ScDPLabelData& rLabelData,

[Libreoffice-commits] core.git: Changes to 'distro/collabora/dcm-6.2'

[Christian Lohmaier (via logerrit)]

New branch 'distro/collabora/dcm-6.2' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/dcm-6.2' - 21 commits - include/svx svx/source sw/qa sw/source writerfilter/source

[Miklos Vajna (via logerrit)]

 include/svx/framelink.hxx   |7 
 svx/source/dialog/framelink.cxx |  117 
++
 sw/qa/extras/ooxmlexport/data/tdf116194.docx|binary
 sw/qa/extras/ooxmlexport/data/tdf119054.docx|binary
 sw/qa/extras/ooxmlexport/data/tdf124399_SingleCellTableBorders.docx |binary
 sw/qa/extras/ooxmlexport/data/tdf127814.docx|binary
 sw/qa/extras/ooxmlexport/data/tdf128752.docx|binary
 sw/qa/extras/ooxmlexport/data/tdf129442_RightBorder.docx|binary
 sw/qa/extras/ooxmlexport/data/tdf129450_BottomBorder.docx   |binary
 sw/qa/extras/ooxmlexport/data/tdf129452_BottomBorders.docx  |binary
 sw/qa/extras/ooxmlexport/data/tdf129575-directAfter.docx|binary
 sw/qa/extras/ooxmlexport/data/tdf129575-directBefore.docx   |binary
 sw/qa/extras/ooxmlexport/data/tdf129575-docDefault.docx |binary
 sw/qa/extras/ooxmlexport/data/tdf129575-styleAfter.docx |binary
 sw/qa/extras/ooxmlexport/data/tdf81100.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx  |   11 
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx  |   20 +
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx   |   48 ++
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx   |   30 +
 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx   |6 
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx   |   65 +++
 sw/qa/extras/rtfimport/rtfimport.cxx|2 
 sw/source/core/inc/cellfrm.hxx  |6 
 sw/source/core/layout/paintfrm.cxx  |   76 
 sw/source/core/layout/tabfrm.cxx|   84 
 sw/source/filter/ww8/docxattributeoutput.cxx|2 
 sw/source/filter/ww8/docxtablestyleexport.cxx   |   23 +
 writerfilter/source/dmapper/ConversionHelper.cxx|9 
 writerfilter/source/dmapper/ConversionHelper.hxx|1 
 writerfilter/source/dmapper/DomainMapper.cxx|8 
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx|  181 
+++---
 writerfilter/source/dmapper/DomainMapperTableHandler.hxx|3 
 writerfilter/source/dmapper/DomainMapperTableManager.cxx|   69 +--
 writerfilter/source/dmapper/DomainMapperTableManager.hxx|2 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx   |   89 +++-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx   |   19 -
 writerfilter/source/dmapper/PropertyIds.cxx |   10 
 writerfilter/source/dmapper/PropertyIds.hxx |   62 +--
 writerfilter/source/dmapper/PropertyMap.cxx |   28 +
 writerfilter/source/dmapper/PropertyMap.hxx |   19 -
 writerfilter/source/dmapper/StyleSheetTable.cxx |   22 -
 writerfilter/source/dmapper/StyleSheetTable.hxx |1 
 writerfilter/source/dmapper/TableData.hxx   |   41 ++
 writerfilter/source/dmapper/TableManager.cxx|   76 
 writerfilter/source/dmapper/TableManager.hxx|8 
 writerfilter/source/dmapper/TblStylePrHandler.cxx   |   12 
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx   |4 
 writerfilter/source/ooxml/model.xml |5 
 48 files changed, 1002 insertions(+), 164 deletions(-)

New commits:
commit 630e1a35d189d07a9bade63279ad179bbcd7318e
Author: Miklos Vajna 
AuthorDate: Thu Mar 4 11:52:58 2021 +0100
Commit: Miklos Vajna 
CommitDate: Fri Mar 5 17:50:38 2021 +0100

sw: fix unwanted long vertical border around vertically merged Word cell

In case cells A1 and A2 are vertically merged, they can still specify
different border properties for the two cells. Word draws the border
properties of the covered cells, while Writer ignores the formatting of
A2 in this case and only uses the properties of the covering cell.

Table cell border collapsing rules already differ in Word and Writer, so
SwTabFramePainter::Insert() knows if the table cell's border is
Word-style or not. Extend this code to handle vertically merged cells
better.

In general, this means a cell no longer has a fixed set of 4 borders,
but each edge may have several sub-borders. This commit is a step in
that direction, and handles the case when a vertical (left or right)
border style is set initially, but not set at the end -- as we iterate
through the list of cells in a vertical merge.

(cherry picked from co

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

[Michael Stahl (via logerrit)]

 svx/source/unodraw/unopage.cxx   |5 +
 sw/inc/dcontact.hxx  |4 ++--
 sw/qa/extras/mailmerge/mailmerge.cxx |2 +-
 sw/source/core/draw/dcontact.cxx |   27 ---
 sw/source/core/inc/flyfrm.hxx|2 +-
 sw/source/core/layout/fly.cxx|6 +++---
 6 files changed, 36 insertions(+), 10 deletions(-)

New commits:
commit 3bc8f90e9693f710f12632f69b9348c1c833c906
Author: Michael Stahl 
AuthorDate: Fri Mar 5 21:06:28 2021 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 8 12:21:42 2021 +0100

(related: tdf#133487) sw: fix ordering of virtual SdrObjects for textboxes

Calling XShapes3::sort() on export of the testTdf130314 fails because of
2 consecutive textboxes; the function requires a textbox to immediately
follow its shape in the list (i.e. textbox has OrdNum of shape + 1).

This is because for shapes in header/footer, one virtual SdrVirtObj is
created per page where the header/footer is shown, and the
SwFlyDrawContact::GetOrdNumForNewRef() does not take textbox ordering
into account.

It's not clear if the assumption that the shape's SdrVirtObj is created
before the textbox's always holds, but let's try this for now.

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

diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 3346b3a00443..52893220dde9 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -179,13 +179,13 @@ private:
 
 SwFlyDrawObjPtr mpMasterObj;
 void SwClientNotify(const SwModify&, const SfxHint& rHint) override;
-sal_uInt32 GetOrdNumForNewRef(const SwFlyFrame* pFly);
+sal_uInt32 GetOrdNumForNewRef(const SwFlyFrame* pFly, SwFrame const& 
rAnchorFrame);
 
 public:
 
 /// Creates DrawObject and registers it with the Model.
 SwFlyDrawContact(SwFlyFrameFormat* pToRegisterIn, SdrModel& rTargetModel);
-static SwVirtFlyDrawObj* CreateNewRef(SwFlyFrame* pFly, SwFlyFrameFormat* 
pFormat);
+static SwVirtFlyDrawObj* CreateNewRef(SwFlyFrame* pFly, SwFlyFrameFormat* 
pFormat, SwFrame const& rAnchorFrame);
 virtual ~SwFlyDrawContact() override;
 
 virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj 
) const override;
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx 
b/sw/qa/extras/mailmerge/mailmerge.cxx
index 83cbee5580ac..67fb47fe6996 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -396,7 +396,7 @@ DECLARE_FILE_MAILMERGE_TEST(testMissingDefaultLineColor, 
"missing-default-line-c
 executeMailMerge();
 // The document was created by LO version which didn't write out the 
default value for line color
 // (see XMLGraphicsDefaultStyle::SetDefaults()).
-uno::Reference xPropertySet(getShape(4), 
uno::UNO_QUERY);
+uno::Reference xPropertySet(getShape(5), 
uno::UNO_QUERY);
 // Lines do not have a line color.
 CPPUNIT_ASSERT( !xPropertySet->getPropertySetInfo()->hasPropertyByName( 
"LineColor" ));
 SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get());
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index d1250d5305de..11687c41d0d5 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -478,8 +478,28 @@ SwFlyDrawContact::~SwFlyDrawContact()
 }
 }
 
-sal_uInt32 SwFlyDrawContact::GetOrdNumForNewRef(const SwFlyFrame* pFly)
+sal_uInt32 SwFlyDrawContact::GetOrdNumForNewRef(const SwFlyFrame* pFly,
+SwFrame const& rAnchorFrame)
 {
+// maintain invariant that a shape's textbox immediately follows the shape
+// also for the multiple SdrVirtObj created for shapes in header/footer
+if (SwFrameFormat const*const pDrawFormat =
+SwTextBoxHelper::getOtherTextBoxFormat(GetFormat(), RES_FLYFRMFMT))
+{
+// assume that the draw SdrVirtObj is always created before the 
flyframe one
+if (SwSortedObjs const*const pObjs = rAnchorFrame.GetDrawObjs())
+{
+for (SwAnchoredObject const*const pAnchoredObj : *pObjs)
+{
+if (&pAnchoredObj->GetFrameFormat() == pDrawFormat)
+{
+return pAnchoredObj->GetDrawObj()->GetOrdNum() + 1;
+}
+}
+}
+// if called from AppendObjs(), this is a problem; if called from 
lcl_SetFlyFrameAttr() it's not
+SAL_INFO("sw", "GetOrdNumForNewRef: cannot find SdrObject for text 
box's shape");
+}
 // search for another Writer fly frame registered at same frame format
 SwIterator aIter(*GetFormat());
 const SwFlyFrame* pFlyFrame(nullptr);
@@ -501,7 +521,8 @@ sal_uInt32 SwFlyDrawContact::GetOrdNumForNewRef(const 
SwFlyFrame* pFly)
 return GetMaster()->GetOrdNumDirect();
 }
 
-SwVirtFlyDrawObj* SwFlyDrawContact::CreateNewRef(SwFlyFrame

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-collect.py

[Xisco Fauli (via logerrit)]

 esc-reporting/esc-collect.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bfc1498c358dfea8c8bdf2a3f47340c8a6145e2c
Author: Xisco Fauli 
AuthorDate: Mon Mar 8 12:24:21 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 8 12:25:14 2021 +0100

esc-collect: do not use is:open+after in gerrit query

Otherwise the script won't know when a ticket has been closed

Change-Id: I80a3bb06e6abb809dc750c48e219bd51500bfd8e

diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py
index 046e007..81721b5 100755
--- a/esc-reporting/esc-collect.py
+++ b/esc-reporting/esc-collect.py
@@ -605,7 +605,7 @@ def get_gerrit(cfg):
 if p.wait() != 0:
 raise CalledProcessError(p.returncode, cmd)
 
-url = 'https://gerrit.libreoffice.org/changes/?q=is:open+after:' + 
searchDate.strftime("%Y-%m-%d") + \
+url = 'https://gerrit.libreoffice.org/changes/?q=after:' + 
searchDate.strftime("%Y-%m-%d") + \
 
'&o=DETAILED_LABELS&o=DETAILED_ACCOUNTS&o=MESSAGES&o=CURRENT_COMMIT&o=CURRENT_REVISION&limit=200&start='
 offset = 0
 if 'offset' in rawList:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-collect.py

[Xisco Fauli (via logerrit)]

 esc-reporting/esc-collect.py |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit ac933a7c5ee08f4551358c79150687797f5fec17
Author: Xisco Fauli 
AuthorDate: Mon Mar 8 13:03:26 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 8 13:03:26 2021 +0100

esc-collect: use is:open only when the file doesn't exist

Change-Id: I0aeb595f814fbf92ba2c612d4af7fe9515ee7f24

diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py
index 81721b5..615f82e 100755
--- a/esc-reporting/esc-collect.py
+++ b/esc-reporting/esc-collect.py
@@ -605,7 +605,13 @@ def get_gerrit(cfg):
 if p.wait() != 0:
 raise CalledProcessError(p.returncode, cmd)
 
-url = 'https://gerrit.libreoffice.org/changes/?q=after:' + 
searchDate.strftime("%Y-%m-%d") + \
+queryType = 'q=after'
+if not os.path.isfile(fileName):
+  # if gerrit_dump.json doesn't exist, the script will request the data 
from the last 365 days.
+  # This is slow and will probably timeout. In this case, only care about 
open tickets
+  queryType = 'q=is:open+after:'
+
+url = 'https://gerrit.libreoffice.org/changes/?' + queryType + ':' + 
searchDate.strftime("%Y-%m-%d") + \
 
'&o=DETAILED_LABELS&o=DETAILED_ACCOUNTS&o=MESSAGES&o=CURRENT_COMMIT&o=CURRENT_REVISION&limit=200&start='
 offset = 0
 if 'offset' in rawList:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[dante (via logerrit)]

 starmath/inc/token.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit db2e9619397f1e53232824a649b5ad0ba3dd368a
Author: dante 
AuthorDate: Sun Mar 7 12:07:02 2021 +0100
Commit: Noel Grandin 
CommitDate: Mon Mar 8 13:08:18 2021 +0100

Remove unused include

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

diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx
index ef405a45c2b4..8555d745fc72 100644
--- a/starmath/inc/token.hxx
+++ b/starmath/inc/token.hxx
@@ -29,7 +29,6 @@
 #pragma once
 
 #include "types.hxx"
-#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-collect.py

[Xisco Fauli (via logerrit)]

 esc-reporting/esc-collect.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a3dbdf72caac4b906b721a10e969da8eb0c53f2b
Author: Xisco Fauli 
AuthorDate: Mon Mar 8 13:10:44 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 8 13:10:44 2021 +0100

esc-collect: fix typo. This doesn't break the request though

Change-Id: I42204b62063624fbdecc7f9a54f2e179526282e6

diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py
index 615f82e..9b39ca3 100755
--- a/esc-reporting/esc-collect.py
+++ b/esc-reporting/esc-collect.py
@@ -609,7 +609,7 @@ def get_gerrit(cfg):
 if not os.path.isfile(fileName):
   # if gerrit_dump.json doesn't exist, the script will request the data 
from the last 365 days.
   # This is slow and will probably timeout. In this case, only care about 
open tickets
-  queryType = 'q=is:open+after:'
+  queryType = 'q=is:open+after'
 
 url = 'https://gerrit.libreoffice.org/changes/?' + queryType + ':' + 
searchDate.strftime("%Y-%m-%d") + \
 
'&o=DETAILED_LABELS&o=DETAILED_ACCOUNTS&o=MESSAGES&o=CURRENT_COMMIT&o=CURRENT_REVISION&limit=200&start='
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 drawinglayer/source/processor2d/vclprocessor2d.cxx |   31 +++--
 sw/qa/extras/uiwriter/uiwriter3.cxx|4 ++
 2 files changed, 20 insertions(+), 15 deletions(-)

New commits:
commit 6b8c157a0b4f37a09fdbf656919b2df06a3abc3e
Author: Luboš Luňák 
AuthorDate: Thu Mar 4 15:35:44 2021 +0100
Commit: Luboš Luňák 
CommitDate: Mon Mar 8 13:46:36 2021 +0100

make RenderMaskPrimitive2DPixel() clip using clipping (tdf#140797)

The original implementation had this peculiar idea of implementing
clipping using transparency, which slows everything down, because
contents need to be copied and then alpha-blended. Keep that only
for when edges of the clip are to be smoothed.
As a side-effect this also seems to fix tdf#115843 again.
The commit also adjusts the test for tdf#133477 to not rely
on the rounding introduced by the optimization from tdf#115843.

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

diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index c2c835e5291d..80c7fbdb6556 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -751,7 +751,7 @@ void VclProcessor2D::RenderPolyPolygonGraphicPrimitive2D(
 }
 }
 
-// mask group. Force output to VDev and create mask from given mask
+// mask group
 void VclProcessor2D::RenderMaskPrimitive2DPixel(const 
primitive2d::MaskPrimitive2D& rMaskCandidate)
 {
 if (rMaskCandidate.getChildren().empty())
@@ -763,6 +763,17 @@ void VclProcessor2D::RenderMaskPrimitive2DPixel(const 
primitive2d::MaskPrimitive
 return;
 
 aMask.transform(maCurrentTransformation);
+
+// Unless smooth edges are needed, simply use clipping.
+if (basegfx::utils::isRectangle(aMask) || 
!getOptionsDrawinglayer().IsAntiAliasing())
+{
+mpOutputDevice->Push(PushFlags::CLIPREGION);
+mpOutputDevice->IntersectClipRegion(vcl::Region(aMask));
+process(rMaskCandidate.getChildren());
+mpOutputDevice->Pop();
+return;
+}
+
 const basegfx::B2DRange aRange(basegfx::utils::getRange(aMask));
 impBufferDevice aBufferDevice(*mpOutputDevice, aRange);
 
@@ -779,19 +790,11 @@ void VclProcessor2D::RenderMaskPrimitive2DPixel(const 
primitive2d::MaskPrimitive
 // back to old OutDev
 mpOutputDevice = pLastOutputDevice;
 
-// if the mask fills the whole area we can skip
-// creating a transparent vd and filling it.
-if (!basegfx::utils::isRectangle(aMask))
-{
-// draw mask
-// with AA, use 8bit AlphaMask to get nice borders; no AA -> use 1bit 
mask
-VirtualDevice& rMask = getOptionsDrawinglayer().IsAntiAliasing()
-   ? aBufferDevice.getTransparence()
-   : aBufferDevice.getMask();
-rMask.SetLineColor();
-rMask.SetFillColor(COL_BLACK);
-rMask.DrawPolyPolygon(aMask);
-}
+// draw mask
+VirtualDevice& rMask = aBufferDevice.getTransparence();
+rMask.SetLineColor();
+rMask.SetFillColor(COL_BLACK);
+rMask.DrawPolyPolygon(aMask);
 
 // dump buffer to outdev
 aBufferDevice.paint();
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index fac99e50ffc9..63a322af868e 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -2555,12 +2555,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf133477)
 aStream.Seek(STREAM_SEEK_TO_BEGIN);
 
 // Read it back and check the color of the first pixel.
+// (Actually check at one-pixel offset, because imprecise shape 
positioning may
+// result in blending with background for the first pixel).
 Graphic aGraphic;
 TypeSerializer aSerializer(aStream);
 aSerializer.readGraphic(aGraphic);
 
 BitmapEx aBitmap = aGraphic.GetBitmapEx();
-CPPUNIT_ASSERT_EQUAL(Color(0, 102, 204), aBitmap.GetPixelColor(0, 0));
+CPPUNIT_ASSERT_EQUAL(Color(0, 102, 204), aBitmap.GetPixelColor(1, 1));
 }
 
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf137964)
___
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' - sc/source

[Mike Kaganski (via logerrit)]

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

New commits:
commit f5f5582fa065000a187a92b47ca44498d1f30c09
Author: Mike Kaganski 
AuthorDate: Sun Feb 14 11:24:42 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 8 13:55:37 2021 +0100

tdf#140700 nullptr dereference

Change-Id: I6a2ffddfd67784ddc2194dafba7d3eaeb6e4e12e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110854
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 20305894243e24eb383ab9feefebf4a0e9f2644f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112083
Tested-by: Michael Weghorn 
Reviewed-by: Xisco Fauli 

diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index b725eb7d3c52..193113429fb8 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -149,7 +149,7 @@ ScSelectionTransferObj::ScSelectionTransferObj( ScTabView* 
pSource, ScSelectionT
 ScSelectionTransferObj::~ScSelectionTransferObj()
 {
 ScModule* pScMod = SC_MOD();
-if ( pScMod->GetSelectionTransfer() == this )
+if (pScMod && pScMod->GetSelectionTransfer() == this)
 {
 //  this is reached when the object wasn't really copied to the 
selection
 //  (CopyToSelection has no effect under Windows)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

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

New commits:
commit ef41f5d2106b68544a078bfac85018e37cab90d1
Author: Mike Kaganski 
AuthorDate: Sun Feb 14 11:24:42 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 8 13:57:28 2021 +0100

tdf#140700 nullptr dereference

Change-Id: I6a2ffddfd67784ddc2194dafba7d3eaeb6e4e12e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110854
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 20305894243e24eb383ab9feefebf4a0e9f2644f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112084
Tested-by: Michael Weghorn 
Reviewed-by: Xisco Fauli 

diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index 1757b64749bd..d16f9b7a49fd 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -149,7 +149,7 @@ ScSelectionTransferObj::ScSelectionTransferObj( ScTabView* 
pSource, ScSelectionT
 ScSelectionTransferObj::~ScSelectionTransferObj()
 {
 ScModule* pScMod = SC_MOD();
-if ( pScMod->GetSelectionTransfer() == this )
+if (pScMod && pScMod->GetSelectionTransfer() == this)
 {
 //  this is reached when the object wasn't really copied to the 
selection
 //  (CopyToSelection has no effect under Windows)
___
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/main0202.xhp |4 ++--
 source/text/scalc/main0205.xhp |4 ++--
 source/text/shared/01/05020100.xhp |2 +-
 source/text/shared/02/0202.xhp |4 ++--
 source/text/simpress/main0203.xhp  |4 ++--
 source/text/swriter/main0202.xhp   |4 ++--
 source/text/swriter/main0220.xhp   |4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit be48910da18cd13cc38793bef8cdec3c2b45b927
Author: Johnny_M 
AuthorDate: Sat Mar 6 13:51:23 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 8 14:25:39 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/scalc/main0202.xhp b/source/text/scalc/main0202.xhp
index 39f440b15..b5f45bad8 100644
--- a/source/text/scalc/main0202.xhp
+++ b/source/text/scalc/main0202.xhp
@@ -34,8 +34,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/source/text/scalc/main0205.xhp b/source/text/scalc/main0205.xhp
index 44ee40f25..fcc49f39c 100644
--- a/source/text/scalc/main0205.xhp
+++ b/source/text/scalc/main0205.xhp
@@ -35,8 +35,8 @@
 Text Formatting 
Bar
 The Text Formatting Bar that is 
displayed when the cursor is in a text object, such as a text box or a drawing 
object, contains formatting and alignment commands.
 
-
-
+
+
 
 
 
diff --git a/source/text/shared/01/05020100.xhp 
b/source/text/shared/01/05020100.xhp
index f1a9e8848..c79c9c663 100644
--- a/source/text/shared/01/05020100.xhp
+++ b/source/text/shared/01/05020100.xhp
@@ -73,7 +73,7 @@
 Enter the name of an installed font 
that you want to use, or select a font from the list.
 
 
-
+
 
 
 
diff --git a/source/text/shared/02/0202.xhp 
b/source/text/shared/02/0202.xhp
index 453f4f3d0..7ee25b43f 100644
--- a/source/text/shared/02/0202.xhp
+++ b/source/text/shared/02/0202.xhp
@@ -25,7 +25,7 @@
   
  
 
-
+
 fonts; specifying several
 alternative fonts
 characters; alternative fonts
@@ -38,7 +38,7 @@
 
 Any font 
changes apply to the selected text or word in which the cursor is positioned. 
If no text has been selected, the font applies to text typed 
afterwards.
 The last five 
font names that have been selected are shown in the top part of the combo 
box.
-
+
 
   
 
diff --git a/source/text/simpress/main0203.xhp 
b/source/text/simpress/main0203.xhp
index e7f55bf5a..4b1c4034a 100644
--- a/source/text/simpress/main0203.xhp
+++ b/source/text/simpress/main0203.xhp
@@ -31,8 +31,8 @@
  Text Formatting Bar
  To 
display the Text Formatting Bar, place the cursor inside a text 
object.
   
-  
-  
+  
+  
   
   
   
diff --git a/source/text/swriter/main0202.xhp b/source/text/swriter/main0202.xhp
index b178e4187..4bf59cff8 100644
--- a/source/text/swriter/main0202.xhp
+++ b/source/text/swriter/main0202.xhp
@@ -33,8 +33,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
diff --git a/source/text/swriter/main0220.xhp b/source/text/swriter/main0220.xhp
index 8f2963540..2ce757f66 100644
--- a/source/text/swriter/main0220.xhp
+++ b/source/text/swriter/main0220.xhp
@@ -35,8 +35,8 @@
 Text Object 
Bar
 Contains formatting commands for text that is 
contained in a draw object. The Text Object bar appears 
when you double-click inside a draw object.
 
-
-
+
+
 
 
 
___
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 412b20233970b41face9ec80b863c145b21dc977
Author: Johnny_M 
AuthorDate: Mon Mar 8 14:25:39 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 8 14:25:39 2021 +0100

Update git submodules

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

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

diff --git a/helpcontent2 b/helpcontent2
index ead459c15f4e..be48910da18c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ead459c15f4eb1095d0dff0cb76611bff31d12f8
+Subproject commit be48910da18cd13cc38793bef8cdec3c2b45b927
___
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/1407.xhp |4 ++--
 source/text/shared/main0214.xhp|4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8adc4461501298ca8aae7266862ac1f08beb63dc
Author: Johnny_M 
AuthorDate: Sat Mar 6 13:54:08 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 8 14:26:17 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/1407.xhp 
b/source/text/shared/02/1407.xhp
index 94a2cb402..3fe2ee672 100644
--- a/source/text/shared/02/1407.xhp
+++ b/source/text/shared/02/1407.xhp
@@ -28,7 +28,7 @@
   
 
 
-
+
 SQL; DISTINCT parameter
 distinct values in SQL queries
 
@@ -36,7 +36,7 @@
 Distinct Values
 Expands the created select statement of the SQL 
Query in the current column by the parameter 
DISTINCT. The consequence is that identical values 
occurring multiple times are listed only once.
 
-
+
 
   
 
diff --git a/source/text/shared/main0214.xhp b/source/text/shared/main0214.xhp
index 0b916e98e..7a33fd294 100644
--- a/source/text/shared/main0214.xhp
+++ b/source/text/shared/main0214.xhp
@@ -50,8 +50,8 @@
 
 
 
-
-
+
+
 The following 
icon is on the SQL tab page:
 
 
___
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 0070b724c105d82d1320112d7ff42bfd49ac65c8
Author: Johnny_M 
AuthorDate: Mon Mar 8 14:26:17 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 8 14:26:17 2021 +0100

Update git submodules

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

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

diff --git a/helpcontent2 b/helpcontent2
index be48910da18c..8adc44615012 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit be48910da18cd13cc38793bef8cdec3c2b45b927
+Subproject commit 8adc4461501298ca8aae7266862ac1f08beb63dc
___
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/1208.xhp |4 ++--
 source/text/shared/main0212.xhp|4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 869fb85513467259c72a42fdd46cd9b08aeefe1e
Author: Johnny_M 
AuthorDate: Sat Mar 6 13:57:13 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 8 14:27:03 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/1208.xhp 
b/source/text/shared/02/1208.xhp
index 28dedf5bd..8fcf4e72b 100644
--- a/source/text/shared/02/1208.xhp
+++ b/source/text/shared/02/1208.xhp
@@ -30,13 +30,13 @@
 
 
 
-
+
 
 
 Data to 
Fields
 Updates the contents of the existing database fields by the marked 
records. The Data to Fields icon is only available if the 
current document is a text document.
 
-
+
 
 
 
diff --git a/source/text/shared/main0212.xhp b/source/text/shared/main0212.xhp
index 410b99a3c..70a820c0b 100644
--- a/source/text/shared/main0212.xhp
+++ b/source/text/shared/main0212.xhp
@@ -82,8 +82,8 @@
 Data to Text
   Inserts all fields of the marked record into the current document at 
the cursor position.
   
-  
-  
+  
+  
 Help ID is here because 
we need it in shared since the F4 browser has another context "sdatabase" so I 
had to move the Help ID from the swriter folder
 Mail Merge
   Starts the Mail Merge Wizard to create form letters.
___
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 a2dc4074a88ed844cda75b187a93e0d69d2b610e
Author: Johnny_M 
AuthorDate: Mon Mar 8 14:27:03 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 8 14:27:03 2021 +0100

Update git submodules

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

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

diff --git a/helpcontent2 b/helpcontent2
index 8adc44615012..869fb8551346 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8adc4461501298ca8aae7266862ac1f08beb63dc
+Subproject commit 869fb85513467259c72a42fdd46cd9b08aeefe1e
___
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/1214.xhp |4 ++--
 source/text/shared/main0212.xhp|4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d2557afa18b3db737ad59567ce39f844ea3124a7
Author: Johnny_M 
AuthorDate: Sat Mar 6 14:00:22 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 8 14:27:56 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/1214.xhp 
b/source/text/shared/02/1214.xhp
index 7678c3a35..4af6c441a 100644
--- a/source/text/shared/02/1214.xhp
+++ b/source/text/shared/02/1214.xhp
@@ -28,7 +28,7 @@
   
 
 
-
+
 data sources; displaying 
current
 
 
@@ -36,7 +36,7 @@
 Data 
Source of Current Document
 Displays, in the data source browser, the table that is linked to the 
current document.
 
-
+
 
   
 
diff --git a/source/text/shared/main0212.xhp b/source/text/shared/main0212.xhp
index 70a820c0b..d37b48d4c 100644
--- a/source/text/shared/main0212.xhp
+++ b/source/text/shared/main0212.xhp
@@ -88,8 +88,8 @@
 Mail Merge
   Starts the Mail Merge Wizard to create form letters.
   
-  
-  
+  
+  
   
   

___
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 f426c31b1a1f94ba75b955ef99cabdc4560eb1aa
Author: Johnny_M 
AuthorDate: Mon Mar 8 14:27:56 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 8 14:27:56 2021 +0100

Update git submodules

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

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

diff --git a/helpcontent2 b/helpcontent2
index 869fb8551346..d2557afa18b3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 869fb85513467259c72a42fdd46cd9b08aeefe1e
+Subproject commit d2557afa18b3db737ad59567ce39f844ea3124a7
___
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/12070200.xhp |2 +-
 source/text/shared/02/12070300.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 67e021516b744a6cd189d77bfec9b54770b06874
Author: Johnny_M 
AuthorDate: Sat Mar 6 14:15:22 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 8 14:28:51 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/12070200.xhp 
b/source/text/shared/02/12070200.xhp
index 9972a9e82..aa7d7ffd7 100644
--- a/source/text/shared/02/12070200.xhp
+++ b/source/text/shared/02/12070200.xhp
@@ -38,7 +38,7 @@
   The 
Insert Database Columns dialog lets you define which database 
fields to insert into the document and how to format the paragraphs.
   Fields
   In the 
Fields area, use the arrow button to select the database table 
columns into which you want to insert field contents.
-  
+  
   Database columns
   Lists all 
columns of the database table, which can be accepted in the selection list box 
to insert them into the document. Select the database columns that you want to insert it in 
the document.
   >
diff --git a/source/text/shared/02/12070300.xhp 
b/source/text/shared/02/12070300.xhp
index 61cb3b862..3338e0b90 100644
--- a/source/text/shared/02/12070300.xhp
+++ b/source/text/shared/02/12070300.xhp
@@ -37,6 +37,6 @@
   If several 
records are selected when you choose the Data to Text function, 
the mail merge fields will be inserted according to the number of 
records.
   Text
   In the 
Text area, use the arrow button to select the database table 
columns into which you want to insert field contents.
-  
+  
  
 
___
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 aa7092a0ed50ef7469bd555ed6238a8059618bb3
Author: Johnny_M 
AuthorDate: Mon Mar 8 14:28:51 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 8 14:28:51 2021 +0100

Update git submodules

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

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

diff --git a/helpcontent2 b/helpcontent2
index d2557afa18b3..67e021516b74 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d2557afa18b3db737ad59567ce39f844ea3124a7
+Subproject commit 67e021516b744a6cd189d77bfec9b54770b06874
___
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/1003.xhp |4 ++--
 source/text/swriter/main0210.xhp   |4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 3e659bb75d9fa1c9de2b7414eb67a1e6a9c7c5ff
Author: Johnny_M 
AuthorDate: Sat Mar 6 14:19:42 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 8 14:30:36 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/scalc/main0210.xhp b/source/text/scalc/main0210.xhp
index 3e75f4437..0e40a1070 100644
--- a/source/text/scalc/main0210.xhp
+++ b/source/text/scalc/main0210.xhp
@@ -38,8 +38,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/source/text/shared/02/1003.xhp 
b/source/text/shared/02/1003.xhp
index 2aea6c30c..ce4ba3f4e 100644
--- a/source/text/shared/02/1003.xhp
+++ b/source/text/shared/02/1003.xhp
@@ -28,13 +28,13 @@
   
 
 
-
+
 
 
  To Document Begin First 
Page 
 Moves to the first 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 00684db83..27eafa969 100644
--- a/source/text/swriter/main0210.xhp
+++ b/source/text/swriter/main0210.xhp
@@ -37,8 +37,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 123edf3d95f7dfa5144f7dd105e7ceaeb6f1e505
Author: Johnny_M 
AuthorDate: Mon Mar 8 14:30:36 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 8 14:30:36 2021 +0100

Update git submodules

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

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

diff --git a/helpcontent2 b/helpcontent2
index 67e021516b74..3e659bb75d9f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 67e021516b744a6cd189d77bfec9b54770b06874
+Subproject commit 3e659bb75d9fa1c9de2b7414eb67a1e6a9c7c5ff
___
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/0605.xhp |4 ++--
 source/text/simpress/main0203.xhp  |4 ++--
 source/text/swriter/main0206.xhp   |4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 865ec92ce6524488f6e005c5578bfbfa11926fa5
Author: Johnny_M 
AuthorDate: Sat Mar 6 14:23:06 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 8 14:32:29 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/0605.xhp 
b/source/text/shared/02/0605.xhp
index 7a56cc1ba..3f9e481ab 100644
--- a/source/text/shared/02/0605.xhp
+++ b/source/text/shared/02/0605.xhp
@@ -28,7 +28,7 @@
   
 
 
-
+
 
 
 Demote One 
Level
@@ -37,7 +37,7 @@
 
 The Demote One Level 
icon is on the Bullets and Numbering bar, which appears 
when the cursor is positioned on a numbering or bullets item.
 The Demote 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 4b1c4034a..4c5a83851 100644
--- a/source/text/simpress/main0203.xhp
+++ b/source/text/simpress/main0203.xhp
@@ -90,11 +90,11 @@
 
 
 
-
+
 
 
 
-
+
 
 
 
diff --git a/source/text/swriter/main0206.xhp b/source/text/swriter/main0206.xhp
index 6c5d11968..bf5055f47 100644
--- a/source/text/swriter/main0206.xhp
+++ b/source/text/swriter/main0206.xhp
@@ -32,8 +32,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 83c8bb4113811f13ee1560287d3a4f59425e7c21
Author: Johnny_M 
AuthorDate: Mon Mar 8 14:32:29 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 8 14:32:29 2021 +0100

Update git submodules

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

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

diff --git a/helpcontent2 b/helpcontent2
index 3e659bb75d9f..865ec92ce652 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3e659bb75d9fa1c9de2b7414eb67a1e6a9c7c5ff
+Subproject commit 865ec92ce6524488f6e005c5578bfbfa11926fa5
___
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/main0203.xhp   |4 ++--
 source/text/scalc/main0214.xhp   |4 ++--
 source/text/sdraw/main0210.xhp   |4 ++--
 source/text/shared/02/0511.xhp   |4 ++--
 source/text/shared/main0226.xhp  |4 ++--
 source/text/simpress/00/0004.xhp |2 +-
 source/text/simpress/main0210.xhp|4 ++--
 source/text/swriter/main0205.xhp |4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit e3168344a7f2cab5e6d5ff9563203eea26bd1dc6
Author: Johnny_M 
AuthorDate: Sat Mar 6 14:29:43 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 8 14:33:35 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/scalc/main0203.xhp b/source/text/scalc/main0203.xhp
index 10fd6c71a..d03811bd4 100644
--- a/source/text/scalc/main0203.xhp
+++ b/source/text/scalc/main0203.xhp
@@ -66,7 +66,7 @@
 
 
 
-
-
+
+
 
 
diff --git a/source/text/scalc/main0214.xhp b/source/text/scalc/main0214.xhp
index bb9b663b0..6a0567ea1 100644
--- a/source/text/scalc/main0214.xhp
+++ b/source/text/scalc/main0214.xhp
@@ -54,7 +54,7 @@
 
 
 
-
-
+
+
 
 
diff --git a/source/text/sdraw/main0210.xhp b/source/text/sdraw/main0210.xhp
index cd65a0bf2..c1e516c1b 100644
--- a/source/text/sdraw/main0210.xhp
+++ b/source/text/sdraw/main0210.xhp
@@ -66,8 +66,8 @@
 
 
 
-
-
+
+
 
 
 From File
diff --git a/source/text/shared/02/0511.xhp 
b/source/text/shared/02/0511.xhp
index b0b86c9bf..28ba50594 100644
--- a/source/text/shared/02/0511.xhp
+++ b/source/text/shared/02/0511.xhp
@@ -28,12 +28,12 @@
   
 
 
-
+
 
 Alignment
 Modifies the alignment of selected 
objects.
 
-
+
 
   
 
diff --git a/source/text/shared/main0226.xhp b/source/text/shared/main0226.xhp
index 1501e6957..9f50c2dfb 100644
--- a/source/text/shared/main0226.xhp
+++ b/source/text/shared/main0226.xhp
@@ -67,8 +67,8 @@
 Exit 
Group
 
 
-
-
+
+
 Display 
Grid
 
 
diff --git a/source/text/simpress/00/0004.xhp 
b/source/text/simpress/00/0004.xhp
index 7dc70aa99..122842d32 100644
--- a/source/text/simpress/00/0004.xhp
+++ b/source/text/simpress/00/0004.xhp
@@ -82,7 +82,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/simpress/main0210.xhp 
b/source/text/simpress/main0210.xhp
index f55166ccf..5422677a3 100644
--- a/source/text/simpress/main0210.xhp
+++ b/source/text/simpress/main0210.xhp
@@ -84,8 +84,8 @@
 Rotate
 This tool is 
used to rotate the object.
 
-
-
+
+
 
 
 Extrusion On/Off
diff --git a/source/text/swriter/main0205.xhp b/source/text/swriter/main0205.xhp
index 45608413c..08befe9ce 100644
--- a/source/text/swriter/main0205.xhp
+++ b/source/text/swriter/main0205.xhp
@@ -64,7 +64,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 4a25cfa0f2769186739070f15cc2c9177d31f2fe
Author: Johnny_M 
AuthorDate: Mon Mar 8 14:33:35 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 8 14:33:35 2021 +0100

Update git submodules

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

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

diff --git a/helpcontent2 b/helpcontent2
index 865ec92ce652..e3168344a7f2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 865ec92ce6524488f6e005c5578bfbfa11926fa5
+Subproject commit e3168344a7f2cab5e6d5ff9563203eea26bd1dc6
___
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/main0218.xhp  |2 +-
 source/text/sdraw/main0210.xhp  |2 +-
 source/text/shared/02/0117.xhp  |4 ++--
 source/text/swriter/02/1801.xhp |2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c6a7ecabb29df6b47eb5116f961e8c636201a855
Author: Johnny_M 
AuthorDate: Sat Mar 6 14:33:53 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 8 14:34:30 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/scalc/main0218.xhp b/source/text/scalc/main0218.xhp
index 6f09fd96a..6126a05b8 100644
--- a/source/text/scalc/main0218.xhp
+++ b/source/text/scalc/main0218.xhp
@@ -42,7 +42,7 @@
 
 Controls
 
-
+
 
 
 
diff --git a/source/text/sdraw/main0210.xhp b/source/text/sdraw/main0210.xhp
index c1e516c1b..70b0bd7a4 100644
--- a/source/text/sdraw/main0210.xhp
+++ b/source/text/sdraw/main0210.xhp
@@ -77,7 +77,7 @@
 
 Form Controls
 
-
+
 Extrusion On/Off
 Switches the 3D 
effects on and off for the selected objects.
 
diff --git a/source/text/shared/02/0117.xhp 
b/source/text/shared/02/0117.xhp
index f9892fe03..382b31918 100644
--- a/source/text/shared/02/0117.xhp
+++ b/source/text/shared/02/0117.xhp
@@ -46,14 +46,14 @@
 controls; select mode
 MW deleted "option field creation", changed "option 
button" to "push button" and "selections;" to "selecting;"
 
-
+
 Form Controls
 The Form Controls 
toolbar or sub-menu contains tools that you need to create an interactive 
form. You can use the toolbar or sub-menu to add controls to 
a form in a text, drawing, spreadsheet, presentation, or HTML document, for 
example a button that runs a macro.
 
 
 Choose View - Toolbars - Form 
Controls.
 Icon on the 
Insert toolbar (you may need to enable this initially invisible 
icon):
-
+
 

 
diff --git a/source/text/swriter/02/1801.xhp 
b/source/text/swriter/02/1801.xhp
index 6fc4f6ff7..68ce629ae 100644
--- a/source/text/swriter/02/1801.xhp
+++ b/source/text/swriter/02/1801.xhp
@@ -70,7 +70,7 @@
 
 Controls
 The Controls 
icon opens a toolbar with the tools that you need to create an interactive 
form.
-
+
 From File
 
 
___
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 bb7355fdf666c750f06e84d8ec0d46decb03b6a6
Author: Johnny_M 
AuthorDate: Mon Mar 8 14:34:30 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 8 14:34:30 2021 +0100

Update git submodules

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

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

diff --git a/helpcontent2 b/helpcontent2
index e3168344a7f2..c6a7ecabb29d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e3168344a7f2cab5e6d5ff9563203eea26bd1dc6
+Subproject commit c6a7ecabb29df6b47eb5116f961e8c636201a855
___
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/0611.xhp |4 ++--
 source/text/simpress/main0203.xhp  |4 ++--
 source/text/swriter/main0206.xhp   |4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 6d54cc23df9cde41adf566122204b38f99139b53
Author: Johnny_M 
AuthorDate: Sat Mar 6 14:37:19 2021 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 8 14:35:27 2021 +0100

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/02/0611.xhp 
b/source/text/shared/02/0611.xhp
index 5549e9bf5..406e6fd98 100644
--- a/source/text/shared/02/0611.xhp
+++ b/source/text/shared/02/0611.xhp
@@ -28,7 +28,7 @@
   
 
 
-
+
 
 
 Move Down
@@ -37,7 +37,7 @@
 If you have 
numbered paragraphs and click the Move Down icon, the numbers will 
be adjusted to the current order. The Move Down icon is only visible when the cursor 
is positioned in a bulleted or numbered list.
 The Move Down icon appears on the Text 
Formatting bar when you use the outline 
view.
 This function 
can be called by pressing CommandCtrl+Down
 Arrow.
-
+
 
   
 
diff --git a/source/text/simpress/main0203.xhp 
b/source/text/simpress/main0203.xhp
index 4c5a83851..91fb57b1c 100644
--- a/source/text/simpress/main0203.xhp
+++ b/source/text/simpress/main0203.xhp
@@ -106,11 +106,11 @@
 
 
 
-
+
 
 
 
-
+
 
 
 Character
diff --git a/source/text/swriter/main0206.xhp b/source/text/swriter/main0206.xhp
index bf5055f47..a66e10135 100644
--- a/source/text/swriter/main0206.xhp
+++ b/source/text/swriter/main0206.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 26bc8b6067a657e8d160fb73bb5d5a48da85dfe9
Author: Johnny_M 
AuthorDate: Mon Mar 8 14:35:27 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 8 14:35:27 2021 +0100

Update git submodules

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

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

diff --git a/helpcontent2 b/helpcontent2
index c6a7ecabb29d..6d54cc23df9c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c6a7ecabb29df6b47eb5116f961e8c636201a855
+Subproject commit 6d54cc23df9cde41adf566122204b38f99139b53
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx |1 -
 vcl/qa/cppunit/outdev.cxx|1 -
 2 files changed, 2 deletions(-)

New commits:
commit 3ac2705d7df55f9288c0843f4f786251b4aad9ff
Author: Stephan Bergmann 
AuthorDate: Mon Mar 8 10:03:18 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Mar 8 14:48:30 2021 +0100

Remove spurious empty lines again

...that had been added by 0c36f364b14aacd0eeb53087ae2fce54402dc741 
"tdf#138122
Detect window scaling for multi display configurations on macOS" and should 
have
been removed again by 06d918dcc47ae3f1c511cbdccfeacc8adb123f28
"loplugin:unreffun (macOS)"

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

diff --git a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx 
b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
index cdb8e4c39fd7..a0303833bacd 100644
--- a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
+++ b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
@@ -49,7 +49,6 @@ public:
 CPPUNIT_TEST_SUITE(BitmapRenderTest);
 CPPUNIT_TEST(testTdf104141);
 CPPUNIT_TEST(testTdf113918);
-
 CPPUNIT_TEST(testDrawAlphaBitmapEx);
 CPPUNIT_TEST(testAlphaVirtualDevice);
 CPPUNIT_TEST(testTdf116888);
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index 58a283749fa1..7bd1b0b53bd4 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -41,7 +41,6 @@ public:
 void testRTLGuard();
 
 CPPUNIT_TEST_SUITE(VclOutdevTest);
-
 CPPUNIT_TEST(testVirtualDevice);
 CPPUNIT_TEST(testUseAfterDispose);
 CPPUNIT_TEST(testPrinterBackgroundColor);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: qa/createBlogReport.py

[Xisco Fauli (via logerrit)]

 qa/createBlogReport.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b66751b1e109f567fa579f5afa72b3dc0404c7aa
Author: Xisco Fauli 
AuthorDate: Mon Mar 8 15:11:35 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 8 15:11:35 2021 +0100

createBlogReport: Rename charts' title

 x1sc0: so the proposal was to change the title of all the 
evolution
charts from "per day" to "over time"
 x1sc0: Yes, what buovjaga said.

Change-Id: I41291adfad06165b33f95fe08de564fa5edcbfe2

diff --git a/qa/createBlogReport.py b/qa/createBlogReport.py
index 04c9396..f09b354 100755
--- a/qa/createBlogReport.py
+++ b/qa/createBlogReport.py
@@ -606,7 +606,7 @@ def createEvolutionSection(fp, value, sectionName, 
urlParam, color):
 print("Check the current list of {} {}".format(sectionName.lower(), 
makeLink(urlPath + urlParam, "here")), file=fp)
 print(''.format(
 sectionName.replace(" ", "_")), file=fp)
-createPlot(value, "line", sectionName + " Per Day", sectionName, color)
+createPlot(value, "line", sectionName + " Over Time", sectionName, color)
 
 
 def createList(fp, value, listName):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: External Data Source in Calc

[julien2412]

Hello,

It seems it wasn't maintained at all so we thought about removing it
completely.
see https://bugs.documentfoundation.org/show_bug.cgi?id=139409

Of course, if you want to work on it and fix the bugs listed here:
https://bugs.documentfoundation.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&list_id=1274925&product=LibreOffice&query_format=advanced&short_desc=data%20provider&short_desc_type=allwordssubstr

don't hesite to "resurrect" it!
But try to focus first on fixing existing bugs related to data provider
before adding it new features.

Julien



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann (via logerrit)]

 desktop/test/deployment/active/active_native.cxx   |7 ---
 desktop/test/deployment/passive/passive_native.cxx |7 ---
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit e208ce965817fb3314634f9087a9989e047b12a5
Author: Stephan Bergmann 
AuthorDate: Mon Mar 8 09:46:58 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Mar 8 15:46:29 2021 +0100

Fix build of Extension_test-{active,passive}

Partial reverts of 1553d3787cbe0cdababf31382bf3376a3640d8cf "use for-range 
on
Sequence in d*" and e37e990650694d7d3a44a38a6bf23751bb33da67 "tdf#88205 
Adapt
uses of css::uno::Sequence to use initializer_list ctor", plus
loplugin:redundantstatic.

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

diff --git a/desktop/test/deployment/active/active_native.cxx 
b/desktop/test/deployment/active/active_native.cxx
index 662ff2c16742..753f0da77312 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -107,7 +107,8 @@ rtl::OUString Provider::static_getImplementationName() {
 
 css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
 {
-return css::uno::Sequence< rtl::OUString 
>{"com.sun.star.test.deployment.active_native"};
+rtl::OUString name("com.sun.star.test.deployment.active_native");
+return css::uno::Sequence< rtl::OUString >(&name, 1);
 }
 
 css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
@@ -135,7 +136,7 @@ Provider::queryDispatches(
 {
 css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > s(
 Requests.getLength());
-for (sal_Int32 i = 0; i < s.(); ++i) {
+for (sal_Int32 i = 0; i < s.getLength(); ++i) {
 s[i] = queryDispatch(
 Requests[i].FeatureURL, Requests[i].FrameName,
 Requests[i].SearchFlags);
@@ -221,7 +222,7 @@ void Dispatch::dispatch(
 xComponent->dispose();
 }
 
-static cppu::ImplementationEntry const services[] = {
+cppu::ImplementationEntry const services[] = {
 { &Provider::static_create, &Provider::static_getImplementationName,
   &Provider::static_getSupportedServiceNames,
   &cppu::createSingleComponentFactory, nullptr, 0 },
diff --git a/desktop/test/deployment/passive/passive_native.cxx 
b/desktop/test/deployment/passive/passive_native.cxx
index 6af233a72d56..9bfbcb7b160f 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -104,7 +104,8 @@ rtl::OUString Provider::static_getImplementationName() {
 
 css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
 {
-return css::uno::Sequence< rtl::OUString 
>{"com.sun.star.test.deployment.passive_native"};
+rtl::OUString name("com.sun.star.test.deployment.passive_native");
+return css::uno::Sequence< rtl::OUString >(&name, 1);
 }
 
 css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
@@ -132,7 +133,7 @@ Provider::queryDispatches(
 {
 css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > s(
 Requests.getLength());
-for (sal_Int32 i = 0; i < s.(); ++i) {
+for (sal_Int32 i = 0; i < s.getLength(); ++i) {
 s[i] = queryDispatch(
 Requests[i].FeatureURL, Requests[i].FrameName,
 Requests[i].SearchFlags);
@@ -218,7 +219,7 @@ void Dispatch::dispatch(
 xComponent->dispose();
 }
 
-static cppu::ImplementationEntry const services[] = {
+cppu::ImplementationEntry const services[] = {
 { &Provider::static_create, &Provider::static_getImplementationName,
   &Provider::static_getSupportedServiceNames,
   &cppu::createSingleComponentFactory, nullptr, 0 },
___
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/0507.xhp |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 79e2b833a14999373171779daf968310e4c126a1
Author: Seth Chaiklin 
AuthorDate: Mon Mar 8 16:05:59 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Mon Mar 8 16:14:45 2021 +0100

related to: tdf#102265 correction to Aligning Objects for embedding

   * submenu name is now "Align Objects", so change page Title and
  label to this new name.
   * update to ,

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

diff --git a/source/text/shared/01/0507.xhp 
b/source/text/shared/01/0507.xhp
index 916b8e6da..ab4757d77 100644
--- a/source/text/shared/01/0507.xhp
+++ b/source/text/shared/01/0507.xhp
@@ -1,6 +1,5 @@
 
 
-   
 
- 
-   
 
 
-Aligning (Objects)
+Align Objects
 /text/shared/01/0507.xhp
 
 
@@ -33,14 +30,14 @@
 ordering; objects
 
 
-Alignment 
(Objects)
+Align 
Objects
 Aligns selected objects with respect to one another.
 
-If one of the 
selected objects is anchored as a character, some of the alignment options do 
not work.
+If one of the selected objects is 
anchored as a character, some of the alignment options do not work.
 
 
 
-Not all types of 
objects can be selected together. Not all modules (Writer, Calc, Impress, Draw) 
support all types of alignment.
+Not all types of objects can be 
selected together. Not all modules (Writer, Calc, Impress, Draw) support all 
types of alignment.
 
 
 
___
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 fe7fd774c7c0398a28f0b2292e53c94d42f02cf3
Author: Seth Chaiklin 
AuthorDate: Mon Mar 8 16:14:45 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 8 16:14:45 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 79e2b833a14999373171779daf968310e4c126a1
  - related to: tdf#102265 correction to Aligning Objects for embedding

   * submenu name is now "Align Objects", so change page Title and
  label to this new name.
   * update to ,

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

diff --git a/helpcontent2 b/helpcontent2
index 6d54cc23df9c..79e2b833a149 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6d54cc23df9cde41adf566122204b38f99139b53
+Subproject commit 79e2b833a14999373171779daf968310e4c126a1
___
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' - uui/source

[Henry Castro (via logerrit)]

 uui/source/secmacrowarnings.cxx |   16 +---
 1 file changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 5f4ab8e319fdfef708b4500616d31355a4d444c0
Author: Henry Castro 
AuthorDate: Fri Mar 5 06:45:45 2021 -0400
Commit: Jan Holesovsky 
CommitDate: Mon Mar 8 16:49:47 2021 +0100

lok: show only the filename of the Macro Security dialog

Apply the patch for desktop case too.

Change-Id: Ia4cf6d2cefd0e02e11e48ca017f8af9f81600b16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112003
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index c1f99f3c01d9..be647c8cf509 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -21,11 +21,9 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -92,15 +90,11 @@ IMPL_STATIC_LINK_NOARG(MacroWarning, InstallLOKNotifierHdl, 
void*, vcl::ILibreOf
 
 void MacroWarning::SetDocumentURL( const OUString& rDocURL )
 {
-OUString aAbbreviatedPath;
-if (comphelper::LibreOfficeKit::isActive())
-{
-osl::FileBase::getFileURLFromSystemPath(rDocURL, aAbbreviatedPath);
-aAbbreviatedPath = INetURLObject(aAbbreviatedPath).GetLastName();
-}
-else
-osl_abbreviateSystemPath(rDocURL.pData, &aAbbreviatedPath.pData, 50, 
nullptr);
-m_xDialog->set_primary_text(aAbbreviatedPath);
+OUString aPath;
+
+osl::FileBase::getFileURLFromSystemPath(rDocURL, aPath);
+aPath = INetURLObject(aPath).GetLastName();
+m_xDialog->set_primary_text(aPath);
 }
 
 IMPL_LINK_NOARG(MacroWarning, ViewSignsBtnHdl, weld::Button&, void)
___
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' - sfx2/source

[Henry Castro (via logerrit)]

 sfx2/source/appl/app.cxx |   21 +
 1 file changed, 21 insertions(+)

New commits:
commit 5b81748d9ef6c57b45bfbd7e4c5790491a97c294
Author: Henry Castro 
AuthorDate: Tue Mar 2 19:35:01 2021 -0400
Commit: Jan Holesovsky 
CommitDate: Mon Mar 8 16:50:55 2021 +0100

lok: show error message dialog for VBA macros

It creates and exclusive message dialog to show
the VBA errors to client side.

Otherwise the IDE window to show the source code
and the error message is not supported yet.

Change-Id: Ie74f911b109cb13aebd39de2cb8e899d779c1cf1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111854
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 14885d95710d..d2e437b758b6 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -433,7 +433,28 @@ IMPL_STATIC_LINK( SfxApplication, 
GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBas
 return false;
 #else
 
+if (comphelper::LibreOfficeKit::isActive())
+{
+OUString aError;
+std::unique_ptr pErrorInfo = 
ErrorInfo::GetErrorInfo(StarBASIC::GetErrorCode());
+if (ErrorStringFactory::CreateString(pErrorInfo.get(), aError))
+{
+const SfxViewFrame* pViewFrame = SfxViewFrame::Current();
+std::shared_ptr xBox(
+Application::CreateMessageDialog(
+pViewFrame->GetWindow().GetFrameWeld(),
+VclMessageType::Error,
+VclButtonsType::Ok,
+aError,
+true));
+
+xBox->runAsync(xBox, [](sal_Int32 /*nResult*/) {});
+}
+return true;
+}
+
 #ifndef DISABLE_DYNLOADING
+
 // load basctl module
 osl::Module aMod;
 aMod.loadRelative(&thisModule, SVLIBRARY("basctl"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Integer overflow in Calc lcl_getSingleCellAddressFromXMLString nColumn computation

[Stephan Bergmann]

On 23/02/2021 11:08, Stephan Bergmann wrote:

On 23/02/2021 08:34, Stephan Bergmann wrote:
I have no idea whether lcl_getSingleCellAddressFromXMLString is 
legitimately getting called here with those arguments (or if the real 
error is somewhere else), what that nColumn computation actually 
means, nor what's going on in general.  If anybody knowledgeable about 
that code could please have a look.


With a little more digging:  However sc/qa/uitest/data/tdf107097.ods was 
generated, its "Object 1/content.xml" sub-file contains the XML element


table:cell-range-address="PivotChart" 
chart:data-source-has-labels="column" svg:x="0.398cm" svg:y="0.991cm" 
svg:width="16.013cm" svg:height="9.381cm">


whose table:cell-range-address attribute appears to what gets processed 
here.


On recent master, if I create a bare-bones pivot.ods containing a pivot 
chart (in a fresh Calc document, type "A" into A1 and "2" into A2, click 
into A1, then "Insert - Pivot Table... - OK" and drag "A" from 
"Available Fields" to "Column Fields" and "OK", then "Insert - Chart... 
- Finish", then save):  The resulting pivot.ods "Object 1/content.xml" 
sub-file contains a chart:plot-area XML element with a 
table:cell-range-address="PivotChart" attribute as above, but which 
appears to be nonsense according to the ODF standard as quoted below.


Maybe some Calc expert can shed some light on what is going on here, and 
if that


  

is legitimate, and should legitimately be processed with 
lcl_getSingleCellAddressFromXMLString as is done here.


Now, 
 
"19.593.6 (deprecated)" specifies that that attribute 
shall be of type 
 
"18.3.6cellRangeAddressList" aka 
 
"9.2.5Cell Range Address List".  Lacking whitespace, "PivotChart" is 
apparently a list containing a single cell range addresses or cell 
addresses, and lacking a colon, it apparently is a cell address.


 
"Referencing Table Cells" specifies the structure of such a cell address:



Cell addresses are constructed as follows:

    1)The name of the table.
    2)A dot “.” (U+002E, FULL STOP).
    3)An alphabetic value representing the column. The letter A 
represents column 1, B represents column 2, and so on. AA represents 
column 27, AB represents column 28, and so on.
    4)A numeric value representing the row. The number 1 represents 
the first row, the number 2 represents the second row, and so on.


But lcl_getCellAddressFromXMLString and 
lcl_getSingleCellAddressFromXMLString in 
chart2/source/tools/XMLRangeHelper.cxx apparently attempt to parse 
something rather different:


* lcl_getCellAddressFromXMLString supports backslash quoting;

* lcl_getCellAddressFromXMLString makes the leading table name and dot 
optional;


* lcl_getSingleCellAddressFromXMLString supports an optional "$";

* lcl_getSingleCellAddressFromXMLString supports lower-case letters in 
addition to upper-case letters for the column;


* lcl_getSingleCellAddressFromXMLString makes the numeric value 
representing the row optional.


I'm still not sure what to make of all that.  Is 
sc/qa/uitest/data/tdf107097.ods bogus and should be rejected?  Xisco, 
can you please clarify how you created that file?  Should the parsing 
code in chart2/source/tools/XMLRangeHelper.cxx be less lenient and 
reject that "PivotChart" value (or is that parsing code also used in 
situations that ask for parsing another grammar)?


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

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

[Szymon Kłos (via logerrit)]

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

New commits:
commit 7c171caa74e0e23d952bdb5289b7e59ab17e61d1
Author: Szymon Kłos 
AuthorDate: Tue Feb 9 17:14:13 2021 +0100
Commit: Szymon Kłos 
CommitDate: Mon Mar 8 17:36:54 2021 +0100

autofilter: handle click for scaled dropdown button

Missing thing for commit:
68892230ddcde135e9951047a3621438eb7987d0
autofilter: scale dropdown button according to zoom level

rendering was scaled but click position was handled
using non scaled button size

Change-Id: I599b7e6aef39e8b5225b53423125f2b271597a46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110646
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112160
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index d71741cda2bc..839c0fc6b6d9 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -351,7 +351,7 @@ bool ScGridWindow::DPTestFieldPopupArrow(
 Size aScrSize(nSizeX-1, nSizeY-1);
 
 // Check if the mouse cursor is clicking on the popup arrow box.
-ScDPFieldButton aBtn(this, &GetSettings().GetStyleSettings());
+ScDPFieldButton aBtn(this, &GetSettings().GetStyleSettings(), 
&GetMapMode().GetScaleY());
 aBtn.setBoundingBox(aScrPos, aScrSize, bLayoutRTL);
 aBtn.setPopupLeft(false);   // DataPilot popup is always right-aligned for 
now
 Point aPopupPos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adolfo Jayme Barrientos (via logerrit)]

 source/text/shared/optionen/java.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 60bc5707b16ad1960a2baa1128a515a8960b6834
Author: Adolfo Jayme Barrientos 
AuthorDate: Mon Mar 8 10:38:59 2021 -0600
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Mar 8 10:38:59 2021 -0600

Hyphenate compound modifier and drop number inflection as it is an adjective

Change-Id: I397f6a528576c2a2ec556966d87e8dc77e20f3a5

diff --git a/source/text/shared/optionen/java.xhp 
b/source/text/shared/optionen/java.xhp
index a0f4d96d2..ee6849843 100644
--- a/source/text/shared/optionen/java.xhp
+++ b/source/text/shared/optionen/java.xhp
@@ -57,7 +57,7 @@
 Allows you to run Java applications in 
%PRODUCTNAME. When a Java application attempts to access your hard 
drive, a prompt opens.UFI: moved this para here from Security tab 
page
 
 
-Make sure to install a JRE compatible with the 
%PRODUCTNAME architecture: 64 bits JRE for 64 bits %PRODUCTNAME and 32 bits JRE 
for 32 bits %PRODUCTNAME.
+Make sure to install a JRE compatible with the 
%PRODUCTNAME architecture: 64-bit JRE for 64-bit %PRODUCTNAME and 32-bit JRE 
for 32-bit %PRODUCTNAME.
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Adolfo Jayme Barrientos (via logerrit)]

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

New commits:
commit 2f813b15dd062c1cd9de4baacd64ae9785cbbd81
Author: Adolfo Jayme Barrientos 
AuthorDate: Mon Mar 8 10:39:05 2021 -0600
Commit: Gerrit Code Review 
CommitDate: Mon Mar 8 17:39:05 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 60bc5707b16ad1960a2baa1128a515a8960b6834
  - Hyphenate compound modifier and drop number inflection as it is an 
adjective

Change-Id: I397f6a528576c2a2ec556966d87e8dc77e20f3a5

diff --git a/helpcontent2 b/helpcontent2
index 79e2b833a149..60bc5707b16a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 79e2b833a14999373171779daf968310e4c126a1
+Subproject commit 60bc5707b16ad1960a2baa1128a515a8960b6834
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sw/qa/uitest/writer_tests5/tdf123378.py |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 3d2ed830d63f0d1adcb0404ad979d5fcf9706ca2
Author: Xisco Fauli 
AuthorDate: Mon Mar 8 15:28:18 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 8 18:30:16 2021 +0100

uitest: sw: re-enable test to see if it still fails

it doesn't fail for me, let's see for others.

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

diff --git a/sw/qa/uitest/writer_tests5/tdf123378.py 
b/sw/qa/uitest/writer_tests5/tdf123378.py
index d7b832e25c8c..6c78e0ecf699 100644
--- a/sw/qa/uitest/writer_tests5/tdf123378.py
+++ b/sw/qa/uitest/writer_tests5/tdf123378.py
@@ -10,8 +10,6 @@ from uitest.framework import UITestCase
 
 class tdf123378(UITestCase):
def test_tdf123378_print_sets_modified(self):
-# FIXME unstable test
-return
 self.ui_test.create_doc_in_start_center("writer")
 document = self.ui_test.get_component()
 xWriterDoc = self.xUITest.getTopFocusWindow()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: 2 commits - esc-reporting/esc-analyze.py

[Xisco Fauli (via logerrit)]

 esc-reporting/esc-analyze.py |   36 +++-
 1 file changed, 27 insertions(+), 9 deletions(-)

New commits:
commit b04d229048177c4bf7d62404c6fe09a95da10e6f
Author: Xisco Fauli 
AuthorDate: Mon Mar 8 18:32:07 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 8 18:32:07 2021 +0100

esc-analyze: Check gerrit patches older than a week

or which parents are older than a week

Change-Id: Iebba269a715dbee1745bad21d794c495e1d47e4f

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index f84009e..a306323 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -643,6 +643,7 @@ def analyze_reports():
 automateList = util_load_data_file(fileAutomate)
 automateList['gerrit']['to_abandon_abandon'] = {}
 automateList['gerrit']['to_abandon_comment'] = {}
+automateList['gerrit']['old_parent'] = {}
 automateList['gerrit']['to_review'] = {}
 automateList['bugzilla']['missing_cc'] = {}
 automateList['bugzilla']['remove_cc'] = {}
@@ -711,11 +712,6 @@ def analyze_reports():
 statList['reportList']['abandonedPatches'].append(x)
 
   if row['status'] == 'NEW':
-cntReview = 0
-for x1 in 'Code-Review', 'Verified':
-  for x in row['labels'][x1]['all']:
-if x['email'] != ownerEmail:
-  cntReview += 1
 
 x = len(row['messages']) - 1
 if x >= 0:
@@ -725,6 +721,31 @@ def analyze_reports():
   patchset = 1
   txt = ''
 
+cntReview = 0
+for x1 in 'Code-Review', 'Verified':
+  for x in row['labels'][x1]['all']:
+if x['email'] != ownerEmail:
+  cntReview += 1
+
+if row['branch'] == 'master' and x['name'] == "Jenkins" and 
x['value'] == 1:
+  bIsOneWeekOld = False
+  verificationDate = datetime.datetime.strptime(x['date'], 
'%Y-%m-%d %H:%M:%S.%f000')
+  if verificationDate < cfg['1weekDate']:
+bIsOneWeekOld = True
+  else:
+currentRevision = row['current_revision']
+parentId = 
row['revisions'][currentRevision]['commit']['parents'][0]['commit']
+parentIdName = "core_" + parentId
+if parentIdName in gitData['commits']:
+  parentIdInfo = gitData['commits'][parentIdName]
+
+  xParentDate = 
datetime.datetime.strptime(parentIdInfo['date'], "%Y-%m-%d %H:%M:%S")
+  if xParentDate < cfg['1weekDate']:
+bIsOneWeekOld = True
+
+  if bIsOneWeekOld:
+automateList['gerrit']['old_parent'][entry['id']] = patchset
+
 if xDate < cfg['1monthDate']:
   # gerrit cli sucks and doesn't accept changeset,patchrev but only 
uses numericID
   if 'A polite ping' in txt:
commit 61c56dc12baf615ccd39ae85008ee14ef2c042e2
Author: Xisco Fauli 
AuthorDate: Mon Mar 8 16:25:18 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 8 16:25:18 2021 +0100

esc-analyze: abandon patches even if they have a -2

Change-Id: Ic300a9ddb71bc52e219321d91ecb5bd9f436b64c

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index 1176c32..f84009e 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -711,13 +711,10 @@ def analyze_reports():
 statList['reportList']['abandonedPatches'].append(x)
 
   if row['status'] == 'NEW':
-doBlock = False
 cntReview = 0
 for x1 in 'Code-Review', 'Verified':
   for x in row['labels'][x1]['all']:
-if x['value'] == -2:
-  doBlock = True
-if x['email'] != ownerEmail and x['email'] != 
'c...@libreoffice.org':
+if x['email'] != ownerEmail:
   cntReview += 1
 
 x = len(row['messages']) - 1
@@ -728,7 +725,7 @@ def analyze_reports():
   patchset = 1
   txt = ''
 
-if xDate < cfg['1monthDate'] and not doBlock:
+if xDate < cfg['1monthDate']:
   # gerrit cli sucks and doesn't accept changeset,patchrev but only 
uses numericID
   if 'A polite ping' in txt:
 automateList['gerrit']['to_abandon_abandon'][entry['id']] = 
patchset
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 connectivity/source/drivers/macab/MacabResultSet.cxx |5 +++--
 connectivity/source/drivers/macab/MacabStatement.cxx |2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 0f0563ebd29f170f65cec749a19efdfcb4e44ba8
Author: Stephan Bergmann 
AuthorDate: Mon Mar 8 15:05:24 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Mar 8 18:54:15 2021 +0100

loplugin:refcounting (macOS)

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

diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx 
b/connectivity/source/drivers/macab/MacabResultSet.cxx
index b35f6e2d57ca..090620af49d0 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace connectivity::macab;
@@ -64,14 +65,14 @@ MacabResultSet::~MacabResultSet()
 
 void MacabResultSet::allMacabRecords()
 {
-MacabConnection* pConnection = static_cast< MacabConnection 
*>(m_xStatement->getConnection().get());
+rtl::Reference pConnection = static_cast< MacabConnection 
*>(m_xStatement->getConnection().get());
 
 m_aMacabRecords = 
pConnection->getAddressBook()->getMacabRecords(m_sTableName);
 }
 
 void MacabResultSet::someMacabRecords(const MacabCondition *pCondition)
 {
-MacabConnection* pConnection = static_cast< MacabConnection 
*>(m_xStatement->getConnection().get());
+rtl::Reference pConnection = static_cast< MacabConnection 
*>(m_xStatement->getConnection().get());
 MacabRecords* allRecords;
 
 allRecords = pConnection->getAddressBook()->getMacabRecords(m_sTableName);
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx 
b/connectivity/source/drivers/macab/MacabStatement.cxx
index 1b7d7f5a7bff..450213f7cca5 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -289,7 +289,7 @@ OUString MacabCommonStatement::getTableName() const
 void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const
 {
 ::rtl::Reference xColumns;   // selected columns
-MacabResultSetMetaData *pMeta;  // meta information - holds 
the list of AddressBook fields
+rtl::Reference pMeta;   // meta 
information - holds the list of AddressBook fields
 
 xColumns = m_aSQLIterator.getSelectColumns();
 if (!xColumns.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

proposition for patch in CommonSalLayout.cxx

[Stanisław Jeśmanowicz]

Dear all,

I noticed that LibreOffice is using the hard coded harfbuzz shapers list in CommonSalLayout.cxx file 
(line 470).

I recommend the patch attached to be more flexible.
This take all possible shapers in a given HarfBuzz implementation.
This also allows the use of newly created shapers.

Just repleces line:
-  const char*const pHbShapers[] = { "dt", "graphite2", "coretext_aat", "ot", 
"fallback", nullptr };

with:
+  const char **pHbShapers = hb_shape_list_shapers();

Best regards,
Stan

= patch

--- libreoffice-7.0.4.9/vcl/source/gdi/CommonSalLayout.cxx 2021-03-07 
18:38:41.339770315 +0100
+++ libreoffice-7.0.4.x/vcl/source/gdi/CommonSalLayout.cxx 2021-03-08 
12:29:37.045184836 +0100
@@ -463,11 +463,8 @@
  nMinRunPos, nRunLen);
  hb_buffer_set_cluster_level(pHbBuffer, 
HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS);

-// The shapers that we want HarfBuzz to use, in the order of
-// preference. The coretext_aat shaper is available only on macOS,
-// but there is no harm in always including it, HarfBuzz will
-// ignore unavailable shapers.
-const char*const pHbShapers[] = { "dt", "graphite2", "coretext_aat", "ot", "fallback", 
nullptr };

+// Take all possible shapers in a given HarfBuzz implementation.
+const char **pHbShapers = hb_shape_list_shapers();
  bool ok = hb_shape_full(pHbFont, pHbBuffer, maFeatures.data(), maFeatures.size(), 
pHbShapers);

  assert(ok);
  (void) ok;

--
__

Stanislaw Jesmanowicz  stan  mail2  jesmanowicz  com
Amsterdam  voice : + 31 20 6126193
The Netherlandsmobile: + 31  653380520

--- libreoffice-7.0.4.9/vcl/source/gdi/CommonSalLayout.cxx  2021-03-07 18:38:41.339770315 +0100
+++ libreoffice-7.0.4.x/vcl/source/gdi/CommonSalLayout.cxx  2021-03-08 12:29:37.045184836 +0100
@@ -463,11 +463,8 @@
 nMinRunPos, nRunLen);
 hb_buffer_set_cluster_level(pHbBuffer, HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS);
 
-// The shapers that we want HarfBuzz to use, in the order of
-// preference. The coretext_aat shaper is available only on macOS,
-// but there is no harm in always including it, HarfBuzz will
-// ignore unavailable shapers.
-const char*const pHbShapers[] = { "dt", "graphite2", "coretext_aat", "ot", "fallback", nullptr };
+// Take all possible shapers in a given HarfBuzz implementation.
+const char **pHbShapers = hb_shape_list_shapers();
 bool ok = hb_shape_full(pHbFont, pHbBuffer, maFeatures.data(), maFeatures.size(), pHbShapers);
 assert(ok);
 (void) ok;


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

Re: Integer overflow in Calc lcl_getSingleCellAddressFromXMLString nColumn computation

[Regina Henschel]

Hi Stephan,

Your problem with table:cell-range-address="PivotChart" might be related 
to bug https://bugs.documentfoundation.org/show_bug.cgi?id=112783

"PIVOT CHARTS: Save produces invalid file because of invalid cell address"

Kind regards
Regina

Stephan Bergmann schrieb am 08.03.2021 um 17:09:

On 23/02/2021 11:08, Stephan Bergmann wrote:

On 23/02/2021 08:34, Stephan Bergmann wrote:
I have no idea whether lcl_getSingleCellAddressFromXMLString is 
legitimately getting called here with those arguments (or if the real 
error is somewhere else), what that nColumn computation actually 
means, nor what's going on in general.  If anybody knowledgeable 
about that code could please have a look.


With a little more digging:  However sc/qa/uitest/data/tdf107097.ods 
was generated, its "Object 1/content.xml" sub-file contains the XML 
element


table:cell-range-address="PivotChart" 
chart:data-source-has-labels="column" svg:x="0.398cm" svg:y="0.991cm" 
svg:width="16.013cm" svg:height="9.381cm">


whose table:cell-range-address attribute appears to what gets 
processed here.


On recent master, if I create a bare-bones pivot.ods containing a pivot 
chart (in a fresh Calc document, type "A" into A1 and "2" into A2, click 
into A1, then "Insert - Pivot Table... - OK" and drag "A" from 
"Available Fields" to "Column Fields" and "OK", then "Insert - Chart... 
- Finish", then save):  The resulting pivot.ods "Object 1/content.xml" 
sub-file contains a chart:plot-area XML element with a 
table:cell-range-address="PivotChart" attribute as above, but which 
appears to be nonsense according to the ODF standard as quoted below.


Maybe some Calc expert can shed some light on what is going on here, and 
if that


   

is legitimate, and should legitimately be processed with 
lcl_getSingleCellAddressFromXMLString as is done here.


Now, 
 
"19.593.6 (deprecated)" specifies that that attribute 
shall be of type 
 
"18.3.6cellRangeAddressList" aka 
 
"9.2.5Cell Range Address List".  Lacking whitespace, "PivotChart" is 
apparently a list containing a single cell range addresses or cell 
addresses, and lacking a colon, it apparently is a cell address.


 
"Referencing Table Cells" specifies the structure of such a cell address:



Cell addresses are constructed as follows:

    1)The name of the table.
    2)A dot “.” (U+002E, FULL STOP).
    3)An alphabetic value representing the column. The letter A 
represents column 1, B represents column 2, and so on. AA represents 
column 27, AB represents column 28, and so on.
    4)A numeric value representing the row. The number 1 represents 
the first row, the number 2 represents the second row, and so on.


But lcl_getCellAddressFromXMLString and 
lcl_getSingleCellAddressFromXMLString in 
chart2/source/tools/XMLRangeHelper.cxx apparently attempt to parse 
something rather different:


* lcl_getCellAddressFromXMLString supports backslash quoting;

* lcl_getCellAddressFromXMLString makes the leading table name and dot 
optional;


* lcl_getSingleCellAddressFromXMLString supports an optional "$";

* lcl_getSingleCellAddressFromXMLString supports lower-case letters in 
addition to upper-case letters for the column;


* lcl_getSingleCellAddressFromXMLString makes the numeric value 
representing the row optional.


I'm still not sure what to make of all that.  Is 
sc/qa/uitest/data/tdf107097.ods bogus and should be rejected?  Xisco, 
can you please clarify how you created that file?  Should the parsing 
code in chart2/source/tools/XMLRangeHelper.cxx be less lenient and 
reject that "PivotChart" value (or is that parsing code also used in 
situations that ask for parsing another grammar)?


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


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

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 7c8a828db184b65db66202ac319834c4e362e0ee
Author: Caolán McNamara 
AuthorDate: Mon Mar 8 15:33:59 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 8 20:37:42 2021 +0100

just call GetWindow once

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

diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 216914946734..728ed10ae3e9 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -2613,8 +2613,8 @@ void ImpEditView::AddDragAndDropListeners()
 css::uno::Reference xDropTarget;
 if (EditViewCallbacks* pCallbacks = getEditViewCallbacks())
 xDropTarget = pCallbacks->GetDropTarget();
-else if (GetWindow())
-xDropTarget = GetWindow()->GetDropTarget();
+else if (auto xWindow = GetWindow())
+xDropTarget = xWindow->GetDropTarget();
 
 if (!xDropTarget.is())
 return;
@@ -2644,8 +2644,8 @@ void ImpEditView::RemoveDragAndDropListeners()
 css::uno::Reference xDropTarget;
 if (EditViewCallbacks* pCallbacks = getEditViewCallbacks())
 xDropTarget = pCallbacks->GetDropTarget();
-else if (GetWindow())
-xDropTarget = GetWindow()->GetDropTarget();
+else if (auto xWindow = GetWindow())
+xDropTarget = xWindow->GetDropTarget();
 
 if (!xDropTarget.is())
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 fpicker/source/win32/VistaFilePickerImpl.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 11380b0a02164e1d4e2b94fb6c2f6b2119367ff0
Author: Stephan Bergmann 
AuthorDate: Mon Mar 8 17:29:01 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Mar 8 20:53:28 2021 +0100

loplugin:external (clang-cl)

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

diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/VistaFilePickerImpl.cxx
index 2fef710b728a..b8642dd1f010 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -120,6 +120,8 @@ private:
 TFileDialog m_iDialog;
 };
 
+namespace {
+
 template  class TDialogImpl : public 
TDialogImplBase
 {
 public:
@@ -142,6 +144,8 @@ public:
 }
 };
 
+}
+
 using TSaveDialogImpl = TDialogImpl;
 using TFolderPickerDialogImpl = TDialogImpl;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 fpicker/source/win32/VistaFilePickerImpl.cxx |6 +-
 vcl/inc/win/salbmp.h |4 ++--
 vcl/win/gdi/salbmp.cxx   |   12 ++--
 3 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 19caafc967441982ba47a1016dbb1b8bf70d675e
Author: Stephan Bergmann 
AuthorDate: Mon Mar 8 17:37:59 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Mar 8 20:54:14 2021 +0100

loplugin:makeshared (clang-cl)

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

diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/VistaFilePickerImpl.cxx
index b8642dd1f010..dbbe72e18ee4 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
+
 #include "VistaFilePickerImpl.hxx"
 
 #include 
@@ -494,7 +498,7 @@ template  void 
VistaFilePickerImpl::impl_sta_CreateDialo
 {
 // SYNCHRONIZED->
 osl::ClearableMutexGuard aLock(m_aMutex);
-m_pDialog.reset(new TDialogImplClass);
+m_pDialog = std::make_shared();
 }
 
 
diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h
index 80ddb38bfd9e..bb589cc4b2f8 100644
--- a/vcl/inc/win/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -42,8 +42,8 @@ private:
 
 sal_uInt16  mnBitCount;
 
-std::unique_ptrImplCreateGdiPlusBitmap(const 
WinSalBitmap& rAlphaSource);
-std::unique_ptr ImplCreateGdiPlusBitmap();
+std::shared_ptrImplCreateGdiPlusBitmap(const 
WinSalBitmap& rAlphaSource);
+std::shared_ptr ImplCreateGdiPlusBitmap();
 
 public:
 
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index 0d9dba981ae7..e807a2faef61 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -233,9 +233,9 @@ std::shared_ptr< Gdiplus::Bitmap > 
WinSalBitmap::ImplGetGdiPlusBitmap(const WinS
 return aRetval;
 }
 
-std::unique_ptr WinSalBitmap::ImplCreateGdiPlusBitmap()
+std::shared_ptr WinSalBitmap::ImplCreateGdiPlusBitmap()
 {
-std::unique_ptr pRetval;
+std::shared_ptr pRetval;
 WinSalBitmap* pSalRGB = this;
 std::unique_ptr pExtraWinSalRGB;
 
@@ -271,7 +271,7 @@ std::unique_ptr 
WinSalBitmap::ImplCreateGdiPlusBitmap()
 const sal_uInt32 nW(pRGB->mnWidth);
 const sal_uInt32 nH(pRGB->mnHeight);
 
-pRetval.reset(new Gdiplus::Bitmap(nW, nH, PixelFormat24bppRGB));
+pRetval = std::make_shared(nW, nH, 
PixelFormat24bppRGB);
 
 if ( pRetval->GetLastStatus() == Gdiplus::Ok )
 {
@@ -315,9 +315,9 @@ std::unique_ptr 
WinSalBitmap::ImplCreateGdiPlusBitmap()
 return pRetval;
 }
 
-std::unique_ptr WinSalBitmap::ImplCreateGdiPlusBitmap(const 
WinSalBitmap& rAlphaSource)
+std::shared_ptr WinSalBitmap::ImplCreateGdiPlusBitmap(const 
WinSalBitmap& rAlphaSource)
 {
-std::unique_ptr pRetval;
+std::shared_ptr pRetval;
 WinSalBitmap* pSalRGB = this;
 std::unique_ptr pExtraWinSalRGB;
 
@@ -388,7 +388,7 @@ std::unique_ptr 
WinSalBitmap::ImplCreateGdiPlusBitmap(const Win
 const sal_uInt32 nW(pRGB->mnWidth);
 const sal_uInt32 nH(pRGB->mnHeight);
 
-pRetval.reset(new Gdiplus::Bitmap(nW, nH, PixelFormat32bppARGB));
+pRetval = std::make_shared(nW, nH, 
PixelFormat32bppARGB);
 
 if ( pRetval->GetLastStatus() == Gdiplus::Ok ) // 2nd place to secure 
with new Gdiplus::Bitmap
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 editeng/source/editeng/editeng.cxx |7 +++
 editeng/source/editeng/impedit.cxx |   21 +
 2 files changed, 12 insertions(+), 16 deletions(-)

New commits:
commit 3bcf251cfe9bb11df63697c14a53c81e0e23c851
Author: Caolán McNamara 
AuthorDate: Mon Mar 8 09:35:49 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 8 21:39:07 2021 +0100

tdf#140498 middle-button paste doesn't depend on a vcl::Window

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

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index da9520aae81a..3c06cbf96f51 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -64,6 +64,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #if OSL_DEBUG_LEVEL > 1
@@ -1112,10 +1113,8 @@ bool EditEngine::PostKeyEvent( const KeyEvent& 
rKeyEvent, EditView* pEditView, v
 aCurSel = pImpEditEngine->MoveCursor( rKeyEvent, pEditView 
);
 
 if ( aCurSel.HasRange() ) {
-if (vcl::Window* pWindow = pEditView->GetWindow()) {
-
Reference 
aSelection(pWindow->GetPrimarySelection());
-pEditView->pImpEditView->CutCopy( aSelection, 
false );
-}
+Reference 
aSelection(GetSystemPrimarySelection());
+pEditView->pImpEditView->CutCopy( aSelection, false );
 }
 
 bMoved = true;
diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 728ed10ae3e9..f42ae0071a3c 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1671,19 +1671,16 @@ bool ImpEditView::MouseButtonUp( const MouseEvent& 
rMouseEvent )
 nExtraCursorFlags = GetCursorFlags::NONE;
 bClickedInSelection = false;
 
-if (vcl::Window* pWindow = GetWindow())
+if ( rMouseEvent.IsMiddle() && !bReadOnly &&
+ Application::GetSettings().GetMouseSettings().GetMiddleButtonAction() 
== MouseMiddleButtonAction::PasteSelection )
 {
-if ( rMouseEvent.IsMiddle() && !bReadOnly &&
- ( 
pWindow->GetSettings().GetMouseSettings().GetMiddleButtonAction() == 
MouseMiddleButtonAction::PasteSelection ) )
-{
-Reference 
aClipBoard(GetSelection());
-Paste( aClipBoard );
-}
-else if ( rMouseEvent.IsLeft() && GetEditSelection().HasRange() )
-{
-Reference 
aClipBoard(GetSelection());
-CutCopy( aClipBoard, false );
-}
+Reference 
aClipBoard(GetSelection());
+Paste( aClipBoard );
+}
+else if ( rMouseEvent.IsLeft() && GetEditSelection().HasRange() )
+{
+Reference 
aClipBoard(GetSelection());
+CutCopy( aClipBoard, false );
 }
 
 return pEditEngine->pImpEditEngine->MouseButtonUp( rMouseEvent, 
GetEditViewPtr() );
___
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' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/inc/hdrcont.hxx  |6 +
 sc/source/ui/view/hdrcont.cxx |   44 +++---
 2 files changed, 39 insertions(+), 11 deletions(-)

New commits:
commit f410d6826e86d55314dfbd4bcf6b0e78ef0ef2a2
Author: Caolán McNamara 
AuthorDate: Sat Mar 6 21:34:22 2021 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Mar 8 22:35:53 2021 +0100

tdf#140833 show ScHeaderControl help tip after double click time has expired

so under gtk the popover isn't active when the double click is processed
by gtk because under load on wayland the double click is getting handled
by something else and getting sent to the the window underneath our
window

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

diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx
index 3bb0e4223ce5..03b14af70c98 100644
--- a/sc/source/ui/inc/hdrcont.hxx
+++ b/sc/source/ui/inc/hdrcont.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_SOURCE_UI_INC_HDRCONT_HXX
 
 #include 
+#include 
 #include 
 #include 
 
@@ -36,6 +37,7 @@ class ScHeaderControl : public vcl::Window
 {
 private:
 SelectionEngine*pSelEngine;
+Timer   aShowHelpTimer;
 vcl::Font   aNormFont;
 vcl::Font   aBoldFont;
 boolbBoldSet;
@@ -67,9 +69,12 @@ private:
 SCCOLROWGetMousePos( const MouseEvent& rMEvt, bool& rBorder ) 
const;
 boolIsSelectionAllowed(SCCOLROW nPos) const;
 voidShowDragHelp();
+voidHideDragHelp();
 
 voidDoPaint( SCCOLROW nStart, SCCOLROW nEnd );
 
+DECL_LINK(ShowDragHelpHdl, Timer*, void);
+
 protected:
 ScTabView*  pTabView;
 
@@ -105,6 +110,7 @@ protected:
 
 virtual voidDrawInvert( tools::Long nDragPos );
 virtual voidCommand( const CommandEvent& rCEvt ) override;
+virtual voiddispose() override;
 
 public:
 ScHeaderControl( vcl::Window* pParent, SelectionEngine* 
pSelectionEngine,
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 12f4ad7c0a4b..78214cb9be68 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -48,6 +48,7 @@ ScHeaderControl::ScHeaderControl( vcl::Window* pParent, 
SelectionEngine* pSelect
   SCCOLROW nNewSize, bool bNewVertical, 
ScTabView* pTab ) :
 Window  ( pParent ),
 pSelEngine  ( pSelectionEngine ),
+aShowHelpTimer("sc HeaderControl Popover Timer"),
 bVertical   ( bNewVertical ),
 nSize   ( nNewSize ),
 nMarkStart  ( 0 ),
@@ -88,9 +89,18 @@ ScHeaderControl::ScHeaderControl( vcl::Window* pParent, 
SelectionEngine* pSelect
 nWidth = nSmallWidth = aSize.Width();
 nBigWidth = LogicToPixel( Size( GetTextWidth("888"), 0 ) ).Width() + 5;
 
+aShowHelpTimer.SetInvokeHandler(LINK(this, ScHeaderControl, 
ShowDragHelpHdl));
+
aShowHelpTimer.SetTimeout(GetSettings().GetMouseSettings().GetDoubleClickTime());
+
 SetBackground();
 }
 
+void ScHeaderControl::dispose()
+{
+aShowHelpTimer.Stop();
+vcl::Window::dispose();
+}
+
 void ScHeaderControl::SetWidth( tools::Long nNew )
 {
 OSL_ENSURE( bVertical, "SetWidth works only on row headers" );
@@ -652,7 +662,11 @@ void ScHeaderControl::MouseButtonDown( const MouseEvent& 
rMEvt )
 else
 nDragStart = rMEvt.GetPosPixel().X();
 nDragPos = nDragStart;
-ShowDragHelp();
+// tdf#140833 launch help tip to show after the double click time 
has expired
+// so under gtk the popover isn't active when the double click is 
processed
+// by gtk because under load on wayland the double click is 
getting handled
+// by something else and getting sent to the the window underneath 
our window
+aShowHelpTimer.Start();
 DrawInvert( nDragPos );
 
 StartTracking();
@@ -713,11 +727,7 @@ void ScHeaderControl::MouseButtonUp( const MouseEvent& 
rMEvt )
 {
 DrawInvert( nDragPos );
 ReleaseMouse();
-if (nTipVisible)
-{
-Help::HidePopover(this, nTipVisible);
-nTipVisible = nullptr;
-}
+HideDragHelp();
 bDragging = false;
 
 tools::Long nScrPos= GetScrPos( nDragNo );
@@ -885,11 +895,7 @@ void ScHeaderControl::StopMarking()
 if ( bDragging )
 {
 DrawInvert( nDragPos );
-if (nTipVisible)
-{
-Help::HidePopover(this, nTipVisible);
-nTipVisible = nullptr;
-}
+HideDragHelp();
 bDragging = false;
 }
 
@@ -902,8 +908,14 @@ void ScHeaderControl::StopMarking()
 ReleaseMouse();
 }
 
+IMPL_LINK_NOARG(ScHeaderControl, ShowDragHel

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

[Szymon Kłos (via logerrit)]

 sc/source/ui/dbgui/PivotLayoutTreeListData.cxx |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 13577b6c3d64c6cae673152c4d10489d8380bb7f
Author: Szymon Kłos 
AuthorDate: Sat Mar 6 17:44:11 2021 +0100
Commit: Michael Meeks 
CommitDate: Mon Mar 8 23:30:14 2021 +0100

Pivot table: fix data field subdialog

Changes done in 'Data field' subdialog were not
applied in the result pivot table.

Change-Id: Ia221380a9ab3d292033512b9b642646f4b53a39d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112096
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx 
b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
index da54e26ad5a1..76c9e45a9ff3 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
@@ -92,23 +92,24 @@ IMPL_LINK_NOARG(ScPivotLayoutTreeListData, DoubleClickHdl, 
weld::TreeView&, bool
 
 mpFunctionDlg = pFactory->CreateScDPFunctionDlg(mxControl.get(), 
mpParent->GetLabelDataVector(), rCurrentLabelData, rCurrentFunctionData);
 
-mpFunctionDlg->StartExecuteAsync([this, pCurrentItemValue, 
rCurrentFunctionData,
+mpFunctionDlg->StartExecuteAsync([this, pCurrentItemValue,
 rCurrentLabelData, nEntry](int nResult) 
mutable {
 if (nResult == RET_OK)
 {
-rCurrentFunctionData.mnFuncMask = mpFunctionDlg->GetFuncMask();
+ScPivotFuncData& rFunctionData = pCurrentItemValue->maFunctionData;
+rFunctionData.mnFuncMask = mpFunctionDlg->GetFuncMask();
 rCurrentLabelData.mnFuncMask = mpFunctionDlg->GetFuncMask();
 
-rCurrentFunctionData.maFieldRef = mpFunctionDlg->GetFieldRef();
+rFunctionData.maFieldRef = mpFunctionDlg->GetFieldRef();
 
-ScDPLabelData& rDFData = 
mpParent->GetLabelData(rCurrentFunctionData.mnCol);
+ScDPLabelData& rDFData = 
mpParent->GetLabelData(rFunctionData.mnCol);
 
 AdjustDuplicateCount(pCurrentItemValue);
 
 OUString sDataItemName = lclCreateDataItemName(
-rCurrentFunctionData.mnFuncMask,
+rFunctionData.mnFuncMask,
 rDFData.maName,
-rCurrentFunctionData.mnDupCount);
+rFunctionData.mnDupCount);
 
 mxControl->set_text(nEntry, sDataItemName);
 }
___
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/0216.xhp  |2 +-
 source/text/swriter/01/05130002.xhp |8 +---
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 3d5548e2fe71a25b09fb984b15251a5da81e02b4
Author: Seth Chaiklin 
AuthorDate: Mon Mar 8 22:42:54 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Mon Mar 8 23:30:45 2021 +0100

improve help page for character style and adjust highlighting label

  ( shared/02/0216.xhp ) "Character Highlighting Color"
   changed  to "Highlighting" because it is embedded into
   the help pages for Character and Character Style as the name of
   the tab.

  ( swriter/01/05130002.xhp ) "Character Style"
* change order of embeds to correspond with order of tabs in dialog.
* improve the embed for the Asian language
+ add embed to "Borders"
* change embed for "Reset" button
+ add embed for "Apply" button

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

diff --git a/source/text/shared/02/0216.xhp 
b/source/text/shared/02/0216.xhp
index 55b689087..411189d3e 100644
--- a/source/text/shared/02/0216.xhp
+++ b/source/text/shared/02/0216.xhp
@@ -30,7 +30,7 @@
 
 
 
-Character Highlighting Color
+Highlighting
 Applies current highlighting 
color to the character 
style or text 
selection.
 
 
diff --git a/source/text/swriter/01/05130002.xhp 
b/source/text/swriter/01/05130002.xhp
index 93af25800..149c17fef 100644
--- a/source/text/swriter/01/05130002.xhp
+++ b/source/text/swriter/01/05130002.xhp
@@ -39,11 +39,13 @@
 Use the Contains section in the 
Organizer to see the properties of the character style.
 
 
-
-
 
 
-
+
+
+
+
+
 
 
 
___
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 165d2bd10bc576f5aa6dc20ffc0f3e699fed846e
Author: Seth Chaiklin 
AuthorDate: Mon Mar 8 23:30:45 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 8 23:30:45 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 3d5548e2fe71a25b09fb984b15251a5da81e02b4
  - improve help page for character style and adjust highlighting label

  ( shared/02/0216.xhp ) "Character Highlighting Color"
   changed  to "Highlighting" because it is embedded into
   the help pages for Character and Character Style as the name of
   the tab.

  ( swriter/01/05130002.xhp ) "Character Style"
* change order of embeds to correspond with order of tabs in dialog.
* improve the embed for the Asian language
+ add embed to "Borders"
* change embed for "Reset" button
+ add embed for "Apply" button

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

diff --git a/helpcontent2 b/helpcontent2
index 60bc5707b16a..3d5548e2fe71 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 60bc5707b16ad1960a2baa1128a515a8960b6834
+Subproject commit 3d5548e2fe71a25b09fb984b15251a5da81e02b4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Integer overflow in Calc lcl_getSingleCellAddressFromXMLString nColumn computation

[Kohei Yoshida]

On 08.03.2021 11:09, Stephan Bergmann wrote:


On recent master, if I create a bare-bones pivot.ods containing a
pivot chart (in a fresh Calc document, type "A" into A1 and "2" into
A2, click into A1, then "Insert - Pivot Table... - OK" and drag "A"
from "Available Fields" to "Column Fields" and "OK", then "Insert -
Chart... - Finish", then save):  The resulting pivot.ods "Object
1/content.xml" sub-file contains a chart:plot-area XML element with a
table:cell-range-address="PivotChart" attribute as above, but which
appears to be nonsense according to the ODF standard as quoted below.

Maybe some Calc expert can shed some light on what is going on here, 
and if that


  

is legitimate, and should legitimately be processed with
lcl_getSingleCellAddressFromXMLString as is done here.


Added Tomaz to the CC list since (I believe) he has worked on pivot 
chart and may have a fresher memory on this topic.


I myself have hard time remembering the detail around this plot area 
data source address requirements.  I do seem to think that there was 
some weird exception that "allowed" a regular name to be used as a data 
source especially when the data source is not from Calc document but is 
from the internal data provider...  But I wouldn't trust my own memory.


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

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

[Seth Chaiklin (via logerrit)]

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

New commits:
commit dc3b64dcbfb0a49c0be65bd8d73ed4e6d3828a21
Author: Seth Chaiklin 
AuthorDate: Mon Mar 8 12:56:27 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Tue Mar 9 00:14:27 2021 +0100

tdf#128469 add extended tooltip for "Reset" to style dialogs

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

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 4cb3c7e07c76..ac4fc7b82621 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -29,7 +29,7 @@
 #define STR_STANDARD_EXTENDEDTIP
NC_("STR_STANDARD_EXTENDEDTIP", "")
 #define STR_RESET_LABEL NC_("STR_RESET_LABEL", "Reset")
 #define STR_RESET_TOOLTIP   NC_("STR_RESET_TOOLTIP", 
"Unsaved modifications to this tab are reverted.")
-#define STR_RESET_EXTENDEDTIP   NC_("STR_RESET_EXTENDEDTIP", 
"")
+#define STR_RESET_EXTENDEDTIP   NC_("STR_RESET_EXTENDEDTIP", 
"Revert any changes made on the current tab to the settings that were present 
when this dialog was opened, or after the last use of “Apply”.")
 #define STR_APPLY_LABEL NC_("STR_APPLY_LABEL", "Apply")
 #define STR_APPLY_TOOLTIP   NC_("STR_APPLY_TOOLTIP", "")
 #define STR_APPLY_EXTENDEDTIP   NC_("STR_APPLY_EXTENDEDTIP", 
"")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Integer overflow in Calc lcl_getSingleCellAddressFromXMLString nColumn computation

[Kohei Yoshida]

On 08.03.2021 18:00, Kohei Yoshida wrote:

On 08.03.2021 11:09, Stephan Bergmann wrote:


On recent master, if I create a bare-bones pivot.ods containing a
pivot chart (in a fresh Calc document, type "A" into A1 and "2" into
A2, click into A1, then "Insert - Pivot Table... - OK" and drag "A"
from "Available Fields" to "Column Fields" and "OK", then "Insert -
Chart... - Finish", then save):  The resulting pivot.ods "Object
1/content.xml" sub-file contains a chart:plot-area XML element with a
table:cell-range-address="PivotChart" attribute as above, but which
appears to be nonsense according to the ODF standard as quoted below.

Maybe some Calc expert can shed some light on what is going on here, 
and if that


  

is legitimate, and should legitimately be processed with
lcl_getSingleCellAddressFromXMLString as is done here.


Added Tomaz to the CC list since (I believe) he has worked on pivot
chart and may have a fresher memory on this topic.


Also, since ODF v1.2 was approved in 2011, and the pivot chart feature 
was added sometime around 2017, it's possible that we are doing 
something "ahead" of the latest standard.


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

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

[Jim Raykowski (via logerrit)]

 sd/source/ui/dlg/navigatr.cxx |   18 +++---
 sd/source/ui/inc/navigatr.hxx |2 ++
 sd/source/ui/inc/sdtreelb.hxx |5 +
 3 files changed, 22 insertions(+), 3 deletions(-)

New commits:
commit 740fca22fc92065436dee9beae89852fc388db54
Author: Jim Raykowski 
AuthorDate: Thu Mar 4 22:54:28 2021 -0900
Commit: Jim Raykowski 
CommitDate: Tue Mar 9 02:24:51 2021 +0100

tdf#139944 Disable navigator in impress and draw master mode

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

diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 6c478bad5741..569ff6a615a2 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -44,6 +44,8 @@
 #include 
 #include 
 
+#include 
+
 /**
  * SdNavigatorWin - FloatingWindow
  */
@@ -628,14 +630,24 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 
nSId,
 if( eState < SfxItemState::DEFAULT || nSId != SID_NAVIGATOR_STATE )
 return;
 
-const SfxUInt32Item& rStateItem = dynamic_cast(*pItem);
-NavState nState = static_cast(rStateItem.GetValue());
-
 // only if doc in LB is the active
 NavDocInfo* pInfo = pNavigatorWin->GetDocInfo();
 if( !(pInfo && pInfo->IsActive()) )
 return;
 
+if (::sd::DrawDocShell* pDrawDocShell = pInfo->GetDrawDocShell())
+{
+const auto pDrawViewShell =
+static_cast<::sd::DrawViewShell 
*>(pDrawDocShell->GetViewShell());
+bool bEditModePage(pDrawViewShell->GetEditMode() == EditMode::Page);
+pNavigatorWin->mxToolbox->set_sensitive(bEditModePage);
+pNavigatorWin->mxLbDocs->set_sensitive(bEditModePage);
+pNavigatorWin->mxTlbObjects->set_sensitive(bEditModePage);
+}
+
+const SfxUInt32Item& rStateItem = dynamic_cast(*pItem);
+NavState nState = static_cast(rStateItem.GetValue());
+
 // First
 if (nState & NavState::BtnFirstEnabled &&
 !pNavigatorWin->mxToolbox->get_item_sensitive("first"))
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 01f8b43d20da..e43175600d24 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -68,6 +68,8 @@ public:
 voidSetName( bool bOn ) { bName = bOn; }
 voidSetActive( bool bOn ) { bActive = bOn; }
 
+::sd::DrawDocShell* GetDrawDocShell() {return mpDocShell;}
+
 private:
 friend class SdNavigatorWin;
 boolbName   : 1;
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 20df211605b7..ecd98842a1c7 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -156,6 +156,11 @@ public:
 SdPageObjsTLV(std::unique_ptr xTreeview);
 ~SdPageObjsTLV();
 
+void set_sensitive(bool bSensitive)
+{
+m_xTreeView->set_sensitive(bSensitive);
+}
+
 void hide()
 {
 m_xTreeView->hide();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jim Raykowski (via logerrit)]

 sw/source/uibase/wrtsh/wrtsh1.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit a2f6b4e8995c149620db4fcfe7e355af4fbc869e
Author: Jim Raykowski 
AuthorDate: Wed Mar 3 14:37:36 2021 -0900
Commit: Jim Raykowski 
CommitDate: Tue Mar 9 02:26:15 2021 +0100

tdf#88064 In add mode don't change SetCursor and KillSel functions

when shell is popped

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

diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 32b91a1ff2fd..be70c7b66014 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1716,8 +1716,11 @@ bool SwWrtShell::Pop(SwCursorShell::PopMode const 
eDelete)
 bool bRet = SwCursorShell::Pop(eDelete);
 if( bRet && IsSelection() )
 {
-m_fnSetCursor = &SwWrtShell::SetCursorKillSel;
-m_fnKillSel = &SwWrtShell::ResetSelect;
+if (!IsAddMode())
+{
+m_fnSetCursor = &SwWrtShell::SetCursorKillSel;
+m_fnKillSel = &SwWrtShell::ResetSelect;
+}
 }
 return bRet;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jim Raykowski (via logerrit)]

 sw/source/core/doc/docdraw.cxx |2 ++
 sw/source/uibase/utlui/content.cxx |   17 +++--
 2 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 1c3e170d56d3cad1e7729f839fa63f607b62e4e3
Author: Jim Raykowski 
AuthorDate: Sun Feb 28 17:10:12 2021 -0900
Commit: Jim Raykowski 
CommitDate: Tue Mar 9 02:27:49 2021 +0100

tdf#140661 Give shapes names when ungrouping if they don't already have

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

diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index c070519cfbf9..4468e648a8a2 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -329,6 +329,8 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
 // #i36010# - set layout direction of the position
 pFormat->SetPositionLayoutDir(
 
text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
+if (pSubObj->GetName().isEmpty())
+pSubObj->SetName(pFormat->GetName());
 pFormatsAndObjs[i].emplace_back( pFormat, pSubObj );
 
 if( bUndo )
diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index ea338a0a00e8..8371dd31c385 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3243,8 +3243,21 @@ void SwContentTree::UpdateTracking()
 {
 SdrObject* pSelected = pSdrView->GetMarkedObjectByIndex(0);
 OUString aName(pSelected->GetName());
-lcl_SelectByContentTypeAndName(this, *m_xTreeView,
-   
SwResId(STR_CONTENT_TYPE_DRAWOBJECT), aName);
+if (!aName.isEmpty())
+lcl_SelectByContentTypeAndName(this, *m_xTreeView,
+   
SwResId(STR_CONTENT_TYPE_DRAWOBJECT), aName);
+else
+{
+// clear treeview selections
+m_xTreeView->unselect_all();
+Select();
+}
+}
+else
+{
+// clear treeview selections
+m_xTreeView->unselect_all();
+Select();
 }
 return;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/inc/hdrcont.hxx  |6 +
 sc/source/ui/view/hdrcont.cxx |   44 +++---
 2 files changed, 39 insertions(+), 11 deletions(-)

New commits:
commit 496c1cda4d52b3e37bfc0d5bb162a9fee00794b3
Author: Caolán McNamara 
AuthorDate: Sat Mar 6 21:34:22 2021 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Mar 9 04:02:10 2021 +0100

tdf#140833 show ScHeaderControl help tip after double click time has expired

so under gtk the popover isn't active when the double click is processed
by gtk because under load on wayland the double click is getting handled
by something else and getting sent to the the window underneath our
window

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

diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx
index 08be7eba5010..d3210062d43f 100644
--- a/sc/source/ui/inc/hdrcont.hxx
+++ b/sc/source/ui/inc/hdrcont.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_SOURCE_UI_INC_HDRCONT_HXX
 
 #include 
+#include 
 #include 
 #include 
 
@@ -36,6 +37,7 @@ class ScHeaderControl : public vcl::Window
 {
 private:
 SelectionEngine*pSelEngine;
+Timer   aShowHelpTimer;
 vcl::Font   aNormFont;
 vcl::Font   aBoldFont;
 boolbBoldSet;
@@ -67,9 +69,12 @@ private:
 SCCOLROWGetMousePos( const MouseEvent& rMEvt, bool& rBorder ) 
const;
 boolIsSelectionAllowed(SCCOLROW nPos) const;
 voidShowDragHelp();
+voidHideDragHelp();
 
 voidDoPaint( SCCOLROW nStart, SCCOLROW nEnd );
 
+DECL_LINK(ShowDragHelpHdl, Timer*, void);
+
 protected:
 ScTabView*  pTabView;
 
@@ -105,6 +110,7 @@ protected:
 
 virtual voidDrawInvert( long nDragPos );
 virtual voidCommand( const CommandEvent& rCEvt ) override;
+virtual voiddispose() override;
 
 public:
 ScHeaderControl( vcl::Window* pParent, SelectionEngine* 
pSelectionEngine,
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index a8aeb47f9f88..0f74b3c0cdb2 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -48,6 +48,7 @@ ScHeaderControl::ScHeaderControl( vcl::Window* pParent, 
SelectionEngine* pSelect
   SCCOLROW nNewSize, bool bNewVertical, 
ScTabView* pTab ) :
 Window  ( pParent ),
 pSelEngine  ( pSelectionEngine ),
+aShowHelpTimer("sc HeaderControl Popover Timer"),
 bVertical   ( bNewVertical ),
 nSize   ( nNewSize ),
 nMarkStart  ( 0 ),
@@ -88,9 +89,18 @@ ScHeaderControl::ScHeaderControl( vcl::Window* pParent, 
SelectionEngine* pSelect
 nWidth = nSmallWidth = aSize.Width();
 nBigWidth = LogicToPixel( Size( GetTextWidth("888"), 0 ) ).Width() + 5;
 
+aShowHelpTimer.SetInvokeHandler(LINK(this, ScHeaderControl, 
ShowDragHelpHdl));
+
aShowHelpTimer.SetTimeout(GetSettings().GetMouseSettings().GetDoubleClickTime());
+
 SetBackground();
 }
 
+void ScHeaderControl::dispose()
+{
+aShowHelpTimer.Stop();
+vcl::Window::dispose();
+}
+
 void ScHeaderControl::SetWidth( long nNew )
 {
 OSL_ENSURE( bVertical, "SetWidth works only on row headers" );
@@ -652,7 +662,11 @@ void ScHeaderControl::MouseButtonDown( const MouseEvent& 
rMEvt )
 else
 nDragStart = rMEvt.GetPosPixel().X();
 nDragPos = nDragStart;
-ShowDragHelp();
+// tdf#140833 launch help tip to show after the double click time 
has expired
+// so under gtk the popover isn't active when the double click is 
processed
+// by gtk because under load on wayland the double click is 
getting handled
+// by something else and getting sent to the the window underneath 
our window
+aShowHelpTimer.Start();
 DrawInvert( nDragPos );
 
 StartTracking();
@@ -713,11 +727,7 @@ void ScHeaderControl::MouseButtonUp( const MouseEvent& 
rMEvt )
 {
 DrawInvert( nDragPos );
 ReleaseMouse();
-if (nTipVisible)
-{
-Help::HidePopover(this, nTipVisible);
-nTipVisible = nullptr;
-}
+HideDragHelp();
 bDragging = false;
 
 long nScrPos= GetScrPos( nDragNo );
@@ -885,11 +895,7 @@ void ScHeaderControl::StopMarking()
 if ( bDragging )
 {
 DrawInvert( nDragPos );
-if (nTipVisible)
-{
-Help::HidePopover(this, nTipVisible);
-nTipVisible = nullptr;
-}
+HideDragHelp();
 bDragging = false;
 }
 
@@ -902,8 +908,14 @@ void ScHeaderControl::StopMarking()
 ReleaseMouse();
 }
 
+IMPL_LINK_NOARG(ScHeaderControl, ShowDragHelpHdl, Timer*, void)
+

[Libreoffice-commits] core.git: accessibility/inc basctl/inc basegfx/inc basic/inc bin/update_pch canvas/inc chart2/inc comphelper/inc configmgr/inc connectivity/inc cppcanvas/inc cppuhelper/inc cui/i

[Mike Kaganski (via logerrit)]

 accessibility/inc/pch/precompiled_acc.hxx |4 -
 basctl/inc/pch/precompiled_basctl.hxx |4 -
 basegfx/inc/pch/precompiled_basegfx.hxx   |4 -
 basic/inc/pch/precompiled_sb.hxx  |4 -
 bin/update_pch|4 +
 canvas/inc/pch/precompiled_cairocanvas.hxx|4 -
 canvas/inc/pch/precompiled_canvastools.hxx|4 -
 canvas/inc/pch/precompiled_oglcanvas.hxx  |4 -
 canvas/inc/pch/precompiled_vclcanvas.hxx  |4 -
 chart2/inc/pch/precompiled_chartcontroller.hxx|4 -
 chart2/inc/pch/precompiled_chartcore.hxx  |6 -
 comphelper/inc/pch/precompiled_comphelper.hxx |4 -
 configmgr/inc/pch/precompiled_configmgr.hxx   |4 -
 connectivity/inc/pch/precompiled_ado.hxx  |4 -
 connectivity/inc/pch/precompiled_calc.hxx |4 -
 connectivity/inc/pch/precompiled_dbase.hxx|4 -
 connectivity/inc/pch/precompiled_dbpool2.hxx  |4 -
 connectivity/inc/pch/precompiled_dbtools.hxx  |5 -
 connectivity/inc/pch/precompiled_file.hxx |4 -
 connectivity/inc/pch/precompiled_firebird_sdbc.hxx|4 -
 connectivity/inc/pch/precompiled_flat.hxx |4 -
 connectivity/inc/pch/precompiled_mysql_jdbc.hxx   |3 
 connectivity/inc/pch/precompiled_odbc.hxx |4 -
 connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx |4 -
 cppcanvas/inc/pch/precompiled_cppcanvas.hxx   |4 -
 cppuhelper/inc/pch/precompiled_cppuhelper.hxx |4 -
 cui/inc/pch/precompiled_cui.hxx   |4 -
 dbaccess/inc/pch/precompiled_dba.hxx  |   44 +-
 dbaccess/inc/pch/precompiled_dbahsql.hxx  |4 -
 dbaccess/inc/pch/precompiled_dbaxml.hxx   |4 -
 dbaccess/inc/pch/precompiled_dbu.hxx  |4 -
 dbaccess/inc/pch/precompiled_sdbt.hxx |3 
 desktop/inc/pch/precompiled_deployment.hxx|4 -
 desktop/inc/pch/precompiled_deploymentgui.hxx |4 -
 desktop/inc/pch/precompiled_deploymentmisc.hxx|5 -
 desktop/inc/pch/precompiled_sofficeapp.hxx|6 +
 drawinglayer/inc/pch/precompiled_drawinglayer.hxx |4 -
 editeng/inc/pch/precompiled_editeng.hxx   |4 -
 emfio/inc/pch/precompiled_emfio.hxx   |4 -
 forms/inc/pch/precompiled_frm.hxx |4 -
 framework/inc/pch/precompiled_fwk.hxx |4 -
 hwpfilter/inc/pch/precompiled_hwp.hxx |4 -
 lotuswordpro/inc/pch/precompiled_lwpft.hxx|4 -
 oox/inc/pch/precompiled_oox.hxx   |4 -
 package/inc/pch/precompiled_package2.hxx  |4 -
 package/inc/pch/precompiled_xstor.hxx |4 -
 reportdesign/inc/pch/precompiled_rpt.hxx  |   11 ++-
 reportdesign/inc/pch/precompiled_rptui.hxx|4 -
 reportdesign/inc/pch/precompiled_rptxml.hxx   |4 -
 sal/inc/pch/precompiled_sal.hxx   |4 -
 sc/inc/pch/precompiled_sc.hxx |   26 +++-
 sc/inc/pch/precompiled_scfilt.hxx |4 -
 sc/inc/pch/precompiled_scui.hxx   |4 -
 sc/inc/pch/precompiled_vbaobj.hxx |4 -
 sd/inc/pch/precompiled_sd.hxx |4 -
 sd/inc/pch/precompiled_sdui.hxx   |4 -
 sdext/inc/pch/precompiled_PresentationMinimizer.hxx   |4 -
 sdext/inc/pch/precompiled_PresenterScreen.hxx |4 -
 sfx2/inc/pch/precompiled_sfx.hxx  |4 -
 slideshow/inc/pch/precompiled_slideshow.hxx   |8 --
 sot/inc/pch/precompiled_sot.hxx   |5 -
 starmath/inc/pch/precompiled_sm.hxx   |4 -
 svgio/inc/pch/precompiled_svgio.hxx   |4 -
 svl/inc/pch/precompiled_svl.hxx   |6 -
 svtools/inc/pch/precompiled_svt.hxx   |4 -
 svx/inc/pch/precompiled_svx.hxx   |4 -
 svx/inc/pch/precompiled_svxcore.hxx   |4 -
 sw/inc/pch/precompiled_msword.hxx |   17 +
 sw/inc/pch/precompiled_sw.hxx |4 -
 sw/inc/pch/precompiled_swui.hxx   |   31 +++--
 sw/inc/pch/precompiled_vbaswobj.hxx   |   15 ++--
 unotools/inc/pch/precompiled_utl.hxx  |4 -
 unoxml/inc/pch/precompiled_unoxml.hxx |3 

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

[Heiko Tietze (via logerrit)]

 setup_native/source/packinfo/osxdndinstall.png |binary
 1 file changed

New commits:
commit 4d3239061c71d43f3e8521160a318873001c3e6a
Author: Heiko Tietze 
AuthorDate: Mon Mar 8 09:17:02 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Mar 9 07:39:39 2021 +0100

Resolves tdf#133373 - macOS installer image

Arrow moved a few pixels to the left

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

diff --git a/setup_native/source/packinfo/osxdndinstall.png 
b/setup_native/source/packinfo/osxdndinstall.png
index 79a92a525a3b..0c8a881a62b6 100644
Binary files a/setup_native/source/packinfo/osxdndinstall.png and 
b/setup_native/source/packinfo/osxdndinstall.png differ
___
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/osx

[Thorsten Wagner (via logerrit)]

 vcl/osx/salframe.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 19badc601594a19b56cff14076435f96e51ce845
Author: Thorsten Wagner 
AuthorDate: Sat Mar 6 23:35:11 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Mar 9 08:04:06 2021 +0100

tdf#138314 Change selected tab text color on macOS Big Sur

Change text color of selected tabs starting with macOS 10.16 (not with
macOS 11.0) to ensure compatibilty with macOS SDKs prior to 11 used
within LibreOffice build process

Backport of d8fc89cdfd0043838c4bc2d3b5a50bf5abfc6738 to LibreOffice 7.1

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

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 9d4f68827a06..b0fbce1e8a81 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1328,7 +1328,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 // used for selected tab text. As a workaround the current OS version has 
to be considered. This code has to be reviewed once
 // issue is covered by documentation.
 
-NSOperatingSystemVersion aOSVersion = { .majorVersion = 11, .minorVersion 
= 0, .patchVersion = 0 };
+NSOperatingSystemVersion aOSVersion = { .majorVersion = 10, .minorVersion 
= 16, .patchVersion = 0 };
 if ([NSProcessInfo.processInfo isOperatingSystemAtLeastVersion: 
aOSVersion])
 aStyleSettings.SetTabHighlightTextColor(aSelectedControlTextColor);
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 vcl/inc/skia/win/gdiimpl.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3186f98a29432400d0627eec992da926dd5852c6
Author: Stephan Bergmann 
AuthorDate: Mon Mar 8 17:41:35 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Mar 9 08:10:10 2021 +0100

loplugin:staticmethods (clang-cl)

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

diff --git a/vcl/inc/skia/win/gdiimpl.hxx b/vcl/inc/skia/win/gdiimpl.hxx
index 594d4bad4b8c..fb82731ad533 100644
--- a/vcl/inc/skia/win/gdiimpl.hxx
+++ b/vcl/inc/skia/win/gdiimpl.hxx
@@ -62,7 +62,7 @@ public:
 protected:
 virtual void createWindowContext(bool forceRaster = false) override;
 virtual void performFlush() override;
-sk_sp createDirectWriteTypeface(HDC hdc, HFONT hfont);
+static sk_sp createDirectWriteTypeface(HDC hdc, HFONT hfont);
 static void initFontInfo();
 inline static sal::systools::COMReference dwriteFactory;
 inline static sal::systools::COMReference 
dwriteGdiInterop;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

CppunitTest_vcl_skia failing on tb68 with illegal instruction

[Stephan Bergmann]

I noticed that at least on 
, all recent builds 
of  failed 
CppunitTest_vcl_skia with



/usr/bin/sh: line 1:  9724 Illegal instruction ( MAX_CONCURRENCY=4 MOZILLA_CERTIFICATE_FOLDER=dbm: SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION=1 LIBO_LANG=C 
PATH="C:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\instdir\program;C:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\instdir\program;C:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\workdir\LinkTarget\Library;C:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\workdir\UnpackedTarball\cppunit\src\cppunit\DebugDll;$PATH"
 $W/LinkTarget/Executable/cppunittester.exe $W/LinkTarget/CppunitTest/test_vcl_skia.dll --headless "-env:BRAND_BASE_DIR=file:///$S/instdir" 
"-env:BRAND_SHARE_SUBDIR=share" "-env:BRAND_SHARE_RESOURCE_SUBDIR=program/resource" "-env:UserInstallation=file:///$W/CppunitTest/vcl_skia.test.user" 
"-env:CONFIGURATION_LAYERS=xcsxcu:file:///$I/share/registry xcsxcu:file:///$W/unittest/registry" "-env:UNO_TYPES=file:///$I/program/types.rdb 
file:///$I/program/types/offapi.rdb" "-env:UNO_SERVICES=file:///$W/Rdb/ure/services.rdb file:///$W/Rdb/services.rdb" -env:URE_INTERNAL_LIB_DIR=file:///$I/program 
-env:LO_LIB_DIR=file:///$I/program -env:LO_JAVA_DIR=file:///$I/program/classes --protector $W/LinkTarget/Library/unoexceptionprotector.dll unoexceptionprotector --protector 
$W/LinkTarget/Library/unobootstrapprotector.dll unobootstrapprotector --protector $W/LinkTarget/Library/vclbootstrapprotector.dll vclbootstrapprotector 
"-env:CPPUNITTESTTARGET=$W/CppunitTest/vcl_skia.test" ) > $W/CppunitTest/vcl_skia.test.log 2>&1
[_RUN_] `anonymous namespace'::SkiaTest::testBitmapErase
`anonymous namespace'::SkiaTest::testBitmapErase finished in: 5ms
[_RUN_] `anonymous namespace'::SkiaTest::testDrawShaders
`anonymous namespace'::SkiaTest::testDrawShaders finished in: 76ms
[_RUN_] `anonymous namespace'::SkiaTest::testInterpretAs8Bit
`anonymous namespace'::SkiaTest::testInterpretAs8Bit finished in: 0ms
[_RUN_] `anonymous namespace'::SkiaTest::testAlphaBlendWith
`anonymous namespace'::SkiaTest::testAlphaBlendWith finished in: 1ms
[_RUN_] `anonymous namespace'::SkiaTest::testBitmapCopyOnWrite
`anonymous namespace'::SkiaTest::testBitmapCopyOnWrite finished in: 1ms
[_RUN_] `anonymous namespace'::SkiaTest::testMatrixQuality
[build CUT] xmloff_style

Error: a unit test failed, please do one of:
make CppunitTest_vcl_skia CPPUNITTRACE=TRUE # which is a shortcut for the 
following line
make CppunitTest_vcl_skia CPPUNITTRACE="'C:/Program Files (x86)/Microsoft Visual 
Studio/2019/Community/Common7/IDE/devenv.exe' /debugexe" # for interactive debugging 
in Visual Studio
make CppunitTest_vcl_skia CPPUNITTRACE="drmemory -free_max_frames 20" # for 
memory checking (install Dr.Memory first, and put it to your PATH)


(e.g., ).

@Luboš:  I assume that external/skia (maybe since 
 
"update Skia to chrome/m90", which reached master on 2021-03-03?) is 
built with support for instruction set extensions that are not available 
on tb68.


@Christian:  I thus now tried to take tb68 off the "Gerrit Windows" 
build, by changing at 
 the 
"Lables" text field from



Gerrit Windows windows_msc_dbgutil_32


to


windows_msc_dbgutil_32


(but not sure that's right? puzzled that that field appears to be a 
free-form text field, with no apparent separator among the label names 
which seemingly can contain spaces like that "Gerrit Windows").


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

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

[Miklos Vajna (via logerrit)]

 sw/qa/core/draw/data/textbox-undo-ordnum.docx |binary
 sw/qa/core/draw/draw.cxx  |   53 ++
 2 files changed, 53 insertions(+)

New commits:
commit d2a45762f1b5f1c7093469e34d9f56defa88e9e4
Author: Miklos Vajna 
AuthorDate: Mon Mar 8 21:06:10 2021 +0100
Commit: Miklos Vajna 
CommitDate: Tue Mar 9 08:37:07 2021 +0100

tdf#140292 sw: fix z-order of textbox on undo

Regression from commit 200cd2b99bee18962a970edc5d059286f6c3ea0e
(tdf#138995 DOCX import: fix handling of textbox zorders, 2021-01-11),
the problem was already fixed by Michael Stahl, this just adds a test
for it.

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

diff --git a/sw/qa/core/draw/data/textbox-undo-ordnum.docx 
b/sw/qa/core/draw/data/textbox-undo-ordnum.docx
new file mode 100644
index ..96b00973289a
Binary files /dev/null and b/sw/qa/core/draw/data/textbox-undo-ordnum.docx 
differ
diff --git a/sw/qa/core/draw/draw.cxx b/sw/qa/core/draw/draw.cxx
index b8544022589a..c4654dde8127 100644
--- a/sw/qa/core/draw/draw.cxx
+++ b/sw/qa/core/draw/draw.cxx
@@ -10,11 +10,14 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
 
 constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/draw/data/";
 
@@ -46,6 +49,56 @@ CPPUNIT_TEST_FIXTURE(SwCoreDrawTest, testTextboxDeleteAsChar)
 CPPUNIT_ASSERT_EQUAL(static_cast(0), nActual);
 }
 
+CPPUNIT_TEST_FIXTURE(SwCoreDrawTest, testTextboxUndoOrdNum)
+{
+// Given a document with 5 frame formats:
+// - picture
+// - draw format + fly format and a picture in it
+// - picture
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "textbox-undo-ordnum.docx");
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats();
+// Test the state before del + undo.
+for (const auto& pFormat : rFormats)
+{
+const SwFrameFormat* pFlyFormat
+= SwTextBoxHelper::getOtherTextBoxFormat(pFormat, RES_DRAWFRMFMT);
+if (!pFlyFormat)
+{
+continue;
+}
+
+sal_Int32 nDrawOrdNum = pFormat->FindRealSdrObject()->GetOrdNum();
+sal_Int32 nFlyOrdNum = pFlyFormat->FindRealSdrObject()->GetOrdNum();
+CPPUNIT_ASSERT_EQUAL(nDrawOrdNum + 1, nFlyOrdNum);
+}
+
+// When selecting the first page, deleting the selection and undoing:
+pWrtShell->Down(true, 3);
+pWrtShell->DelLeft();
+pWrtShell->Undo();
+
+// Then the z-order of the fly format should be still the z-order of the 
draw format + 1, when
+// the fly and draw formats form a textbox pair.
+for (const auto& pFormat : rFormats)
+{
+const SwFrameFormat* pFlyFormat
+= SwTextBoxHelper::getOtherTextBoxFormat(pFormat, RES_DRAWFRMFMT);
+if (!pFlyFormat)
+{
+continue;
+}
+
+sal_Int32 nDrawOrdNum = pFormat->FindRealSdrObject()->GetOrdNum();
+sal_Int32 nFlyOrdNum = pFlyFormat->FindRealSdrObject()->GetOrdNum();
+// Without the accompanying fix in place, this test would have failed 
with:
+// - Expected: 4
+// - Actual  : 2
+// i.e. the fly format was behind the draw format, not visible.
+CPPUNIT_ASSERT_EQUAL(nDrawOrdNum + 1, nFlyOrdNum);
+}
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits