date:20210610

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

2021-06-10 Thread panoskorovesis (via logerrit)

 vcl/qa/cppunit/svm/data/intersectrectclipregion.svm   |binary
 vcl/qa/cppunit/svm/data/intersectregionclipregion.svm |binary
 vcl/qa/cppunit/svm/svmtest.cxx|   96 +-
 3 files changed, 92 insertions(+), 4 deletions(-)

New commits:
commit 794eda02133699830913b37e094a07edeaeff22d
Author: panoskorovesis 
AuthorDate: Thu Jun 10 11:51:32 2021 +0300
Commit: Tomaž Vajngerl 
CommitDate: Fri Jun 11 03:07:42 2021 +0200

Add IntersectClipRegion cppunit tests to vcl

Two tests where added, IntersectRectClipRegion and
IntersectRegionClipRegion, along with their .svm files.
The tests create mutliple IntersectClipRegions and test
their attributes.

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

diff --git a/vcl/qa/cppunit/svm/data/intersectrectclipregion.svm 
b/vcl/qa/cppunit/svm/data/intersectrectclipregion.svm
new file mode 100644
index ..23179cbe8a27
Binary files /dev/null and 
b/vcl/qa/cppunit/svm/data/intersectrectclipregion.svm differ
diff --git a/vcl/qa/cppunit/svm/data/intersectregionclipregion.svm 
b/vcl/qa/cppunit/svm/data/intersectregionclipregion.svm
new file mode 100644
index ..6f8571863282
Binary files /dev/null and 
b/vcl/qa/cppunit/svm/data/intersectregionclipregion.svm differ
diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx
index 844a12bd1214..ec9c80614e22 100644
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@@ -128,10 +128,10 @@ class SvmTest : public test::BootstrapFixture, public 
XmlTestTools
 void checkClipRegion(const GDIMetaFile& rMetaFile);
 void testClipRegion();
 
-//void checkIntersectRectClipRegion(const GDIMetaFile& rMetaFile);
+void checkIntersectRectClipRegion(const GDIMetaFile& rMetaFile);
 void testIntersectRectClipRegion();
 
-//void checkIntersectRegionClipRegion(const GDIMetaFile& rMetaFile);
+void checkIntersectRegionClipRegion(const GDIMetaFile& rMetaFile);
 void testIntersectRegionClipRegion();
 
 //void checkMoveClipRegion(const GDIMetaFile& rMetaFile);
@@ -1467,10 +1467,98 @@ void SvmTest::testClipRegion()
 checkClipRegion(readFile(u"clipregion.svm"));
 }
 
+void SvmTest::checkIntersectRectClipRegion(const GDIMetaFile& rMetaFile)
+{
+xmlDocUniquePtr pDoc = dumpMeta(rMetaFile);
+
+assertXPathAttrs(pDoc, "/metafile/sectregionclipregion[1]", {
+{"left", "1"},
+{"top", "2"},
+{"right", "4"},
+{"bottom", "9"}
+});
+}
+
 void SvmTest::testIntersectRectClipRegion()
-{}
+{
+GDIMetaFile aGDIMetaFile;
+ScopedVclPtrInstance pVirtualDev;
+setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
+
+tools::Rectangle aRectangle(Point(1, 2), Size(4, 8));
+
+vcl::Region aRegion(aRectangle);
+
+pVirtualDev->IntersectClipRegion(aRegion);
+checkIntersectRectClipRegion(writeAndReadStream(aGDIMetaFile));
+checkIntersectRectClipRegion(readFile(u"intersectrectclipregion.svm"));
+}
+
+void SvmTest::checkIntersectRegionClipRegion(const GDIMetaFile& rMetaFile)
+{
+xmlDocUniquePtr pDoc = dumpMeta(rMetaFile);
+
+assertXPathAttrs(pDoc, "/metafile/sectregionclipregion[1]", {
+{"left", "1"},
+{"top", "2"},
+{"right", "5"},
+{"bottom", "6"}
+});
+
+assertXPathAttrs(pDoc, "/metafile/sectregionclipregion[2]", {
+{"left", "1"},
+{"top", "2"},
+{"right", "7"},
+{"bottom", "8"}
+});
+
+assertXPathAttrs(pDoc, "/metafile/sectregionclipregion[3]", {
+{"left", "0"},
+{"top", "3"},
+{"right", "2"},
+{"bottom", "6"}
+});
+}
+
 void SvmTest::testIntersectRegionClipRegion()
-{}
+{
+GDIMetaFile aGDIMetaFile;
+ScopedVclPtrInstance pVirtualDev;
+setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
+
+tools::Polygon aPolygon(3);
+aPolygon.SetPoint(Point(1, 2), 0);
+aPolygon.SetPoint(Point(3, 4), 1);
+aPolygon.SetPoint(Point(5, 6), 2);
+
+vcl::Region aRegion(aPolygon);
+pVirtualDev->IntersectClipRegion(aRegion);
+
+tools::Polygon aPolygon1(2);
+aPolygon1.SetPoint(Point(5, 6), 0);
+aPolygon1.SetPoint(Point(7, 8), 1);
+
+tools::PolyPolygon aPolyPolygon(2);
+aPolyPolygon.Insert(aPolygon);
+aPolyPolygon.Insert(aPolygon1);
+
+vcl::Region aRegion1(aPolyPolygon);
+pVirtualDev->IntersectClipRegion(aRegion1);
+
+basegfx::B2DPolygon aB2DPolygon;
+aB2DPolygon.append(basegfx::B2DPoint(0.0, 3.3));
+aB2DPolygon.append(basegfx::B2DPoint(1.1, 4.4));
+aB2DPolygon.append(basegfx::B2DPoint(2.2, 5.5));
+
+basegfx::B2DPolyPolygon aB2DPolyPolygon(aB2DPolygon);
+
+vcl::Region aRegion2(aB2DPolyPolygon);
+pVirtualDev->IntersectClipRegion(aRegion2);
+
+checkIntersectRegionClipRegion(writeAndReadStream(aGDIMetaFile));
+checkIntersectRegionCli

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

2021-06-10 Thread Jim Raykowski (via logerrit)

 sw/source/core/crsr/crsrsh.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 239b4bb27fd8db26e8416045b3015688a8b1b0ae
Author: Jim Raykowski 
AuthorDate: Tue Jun 8 16:17:37 2021 -0800
Commit: Jim Raykowski 
CommitDate: Fri Jun 11 00:25:28 2021 +0200

Resolves tdf#142651 Writer: Next Change stopped working

by normalizing copy of PaM instead of reference

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

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 6f5516d69c1f..e747b1753601 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -3351,11 +3351,12 @@ bool SwCursorShell::HasReadonlySel() const
 SwWrtShell* pWrtSh = GetDoc()->GetDocShell()->GetWrtShell();
 if (pWrtSh)
 {
-for(SwPaM& rPaM : GetCursor()->GetRingContainer())
+for(const SwPaM& rPaM : GetCursor()->GetRingContainer())
 {
-rPaM.Normalize();
-SwNodeIndex aPointIdx(rPaM.GetPoint()->nNode.GetNode());
-SwNodeIndex aMarkIdx(rPaM.GetMark()->nNode.GetNode());
+SwPaM aPaM(*rPaM.GetMark(), *rPaM.GetPoint());
+aPaM.Normalize();
+SwNodeIndex aPointIdx(aPaM.GetPoint()->nNode.GetNode());
+SwNodeIndex aMarkIdx(aPaM.GetMark()->nNode.GetNode());
 if (aPointIdx == aMarkIdx)
 continue;
 // If any nodes in PaM are folded outline content nodes, then 
set read-only.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-06-10 Thread Xisco Fauli (via logerrit)

 sw/qa/extras/uiwriter/uiwriter.cxx  |  209 +++--
 sw/qa/extras/uiwriter/uiwriter2.cxx |  105 +++-
 sw/qa/extras/uiwriter/uiwriter4.cxx |  223 
 3 files changed, 248 insertions(+), 289 deletions(-)

New commits:
commit b0712101351b084e5073d41052a0abc4f36f4789
Author: Xisco Fauli 
AuthorDate: Thu Jun 10 22:39:48 2021 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 10 23:56:18 2021 +0200

sw_uiwriter: remove duplicated createDoc method

Change-Id: Ie29cd4aa6907018d1bfe492c22ac1d431d0331ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117020
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index c6bac664bac3..0129e66630af 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -411,23 +411,10 @@ public:
 CPPUNIT_TEST_SUITE_END();
 
 private:
-SwDoc* createDoc(const char* pName = nullptr);
 std::unique_ptr readDOCXAutotext(
 std::u16string_view sFileName, bool bEmpty = false);
 };
 
-SwDoc* SwUiWriterTest::createDoc(const char* pName)
-{
-if (!pName)
-loadURL("private:factory/swriter", nullptr);
-else
-load(DATA_DIRECTORY, pName);
-
-SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get());
-CPPUNIT_ASSERT(pTextDoc);
-return pTextDoc->GetDocShell()->GetDoc();
-}
-
 std::unique_ptr 
SwUiWriterTest::readDOCXAutotext(std::u16string_view sFileName, bool bEmpty)
 {
 utl::TempFile tmp;
@@ -438,7 +425,7 @@ std::unique_ptr 
SwUiWriterTest::readDOCXAutotext(std::u16string_vi
 osl::File::copy(m_directories.getURLFromSrc(DATA_DIRECTORY) + 
sFileName, rURL));
 
 SfxMedium aSrcMed(rURL, StreamMode::STD_READ);
-SwDoc* pDoc = createDoc();
+SwDoc* pDoc = createSwDoc();
 
 SwReader aReader(aSrcMed, rURL, pDoc);
 Reader* pDOCXReader = SwReaderWriter::GetDOCXReader();
@@ -464,7 +451,7 @@ constexpr OUStringLiteral EXPECTED_REPLACE_CONTENT(u"toto 
toto tutu");
 
 void SwUiWriterTest::testReplaceForward()
 {
-SwDoc* pDoc = createDoc();
+SwDoc* pDoc = createSwDoc();
 
 sw::UndoManager& rUndoManager = pDoc->GetUndoManager();
 
@@ -486,7 +473,7 @@ void SwUiWriterTest::testReplaceForward()
 
 void SwUiWriterTest::testRedlineFrame(char const*const file)
 {
-SwDoc * pDoc(createDoc(file));
+SwDoc * pDoc(createSwDoc(DATA_DIRECTORY, file));
 SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
 
 // there is exactly one frame
@@ -557,7 +544,7 @@ void SwUiWriterTest::testThreadedException()
 
 void SwUiWriterTest::testBookmarkCopy()
 {
-SwDoc * pDoc(createDoc());
+SwDoc * pDoc(createSwDoc());
 
 // add text and bookmark
 IDocumentMarkAccess & rIDMA(*pDoc->getIDocumentMarkAccess());
@@ -614,7 +601,7 @@ void SwUiWriterTest::testBookmarkCopy()
 void SwUiWriterTest::testTdf67238()
 {
 //create a new writer document
-SwDoc* pDoc = createDoc();
+SwDoc* pDoc = createSwDoc();
 SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
 sw::UndoManager& rUndoManager = pDoc->GetUndoManager();
 //insert a 3X3 table in the newly created document
@@ -706,7 +693,7 @@ void SwUiWriterTest::testTdf67238()
 
 void SwUiWriterTest::testFdo75110()
 {
-SwDoc* pDoc = createDoc("fdo75110.odt");
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "fdo75110.odt");
 SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
 
 pWrtShell->SelAll();
@@ -719,7 +706,7 @@ void SwUiWriterTest::testFdo75110()
 
 void SwUiWriterTest::testFdo75898()
 {
-SwDoc* pDoc = createDoc("fdo75898.odt");
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "fdo75898.odt");
 SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
 pWrtShell->SelAll();
 pWrtShell->InsertRow(1, true);
@@ -734,7 +721,7 @@ void SwUiWriterTest::testFdo75898()
 
 void SwUiWriterTest::testReplaceBackward()
 {
-SwDoc* pDoc = createDoc();
+SwDoc* pDoc = createSwDoc();
 
 sw::UndoManager& rUndoManager = pDoc->GetUndoManager();
 
@@ -756,7 +743,7 @@ void SwUiWriterTest::testReplaceBackward()
 
 void SwUiWriterTest::testFdo69893()
 {
-SwDoc* pDoc = createDoc("fdo69893.odt");
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "fdo69893.odt");
 SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
 
 pWrtShell->SelAll(); // A1 is empty -> selects the whole table.
@@ -799,7 +786,7 @@ void SwUiWriterTest::testFdo70807()
 void SwUiWriterTest::testImportRTF()
 {
 // Insert "foobar" and position the cursor between "foo" and "bar".
-SwDoc* pDoc = createDoc();
+SwDoc* pDoc = createSwDoc();
 SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
 pWrtShell->Insert("foobar");
 pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 3, 
/*bBasicCall=*/false);
@@ -820,7 +807,7 @@ void SwUiWriterTest::testImportRTF()
 void SwUiWriterTest::testExportRTF()
 {

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

2021-06-10 Thread Xisco Fauli (via logerrit)

 sw/qa/extras/layout/layout.cxx  |  160 +++-
 sw/qa/extras/layout/layout2.cxx |  146 
 2 files changed, 142 insertions(+), 164 deletions(-)

New commits:
commit 9cfb555bb4f985ec3b759291721f0f7a2e4c355e
Author: Xisco Fauli 
AuthorDate: Thu Jun 10 22:50:16 2021 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 10 23:49:17 2021 +0200

sw_layoutwriter: remove duplicated createDoc method

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

diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 4c69dc6dcf05..4940a37e41c4 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -61,22 +61,8 @@ class SwLayoutWriter : public SwModelTestBase
 protected:
 void CheckRedlineFootnotesHidden();
 void CheckRedlineSectionsHidden();
-
-SwDoc* createDoc(const char* pName = nullptr);
 };
 
-SwDoc* SwLayoutWriter::createDoc(const char* pName)
-{
-if (!pName)
-loadURL("private:factory/swriter", nullptr);
-else
-load(DATA_DIRECTORY, pName);
-
-SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
-CPPUNIT_ASSERT(pTextDoc);
-return pTextDoc->GetDocShell()->GetDoc();
-}
-
 // this is a member because our test classes have protected members :(
 void SwLayoutWriter::CheckRedlineFootnotesHidden()
 {
@@ -120,7 +106,7 @@ void SwLayoutWriter::CheckRedlineSectionsHidden()
 
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFootnotes)
 {
-createDoc("redline_footnotes.odt");
+createSwDoc(DATA_DIRECTORY, "redline_footnotes.odt");
 SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
 CPPUNIT_ASSERT(pTextDoc);
 SwDoc* pDoc(pTextDoc->GetDocShell()->GetDoc());
@@ -493,7 +479,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInBody)
 
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf134272)
 {
-SwDoc* pDoc = createDoc("tdf134472.odt");
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf134472.odt");
 CPPUNIT_ASSERT(pDoc);
 xmlDocUniquePtr pXmlDoc = parseLayoutDump();
 assertXPath(pXmlDoc, "/root/page[1]/header/txt[2]/infos/bounds", "height", 
"843");
@@ -502,7 +488,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf134272)
 
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestNestedTableMoveFwd)
 {
-SwDoc* pDoc = createDoc("tabellen_test_windows_1.odt");
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tabellen_test_windows_1.odt");
 CPPUNIT_ASSERT(pDoc);
 xmlDocUniquePtr pXmlDoc = parseLayoutDump();
 // the row with the nested table should not be split but be the first row 
on page 2
@@ -514,7 +500,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestNestedTableMoveFwd)
 
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf136613)
 {
-SwDoc* pDoc = createDoc("tdf136613.docx");
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf136613.docx");
 CPPUNIT_ASSERT(pDoc);
 
 //get the flys and the root frame
@@ -545,7 +531,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf136613)
 
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf88496)
 {
-SwDoc* pDoc = createDoc("tdf88496.docx");
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf88496.docx");
 CPPUNIT_ASSERT(pDoc);
 xmlDocUniquePtr pXmlDoc = parseLayoutDump();
 // This was 4, table fallback "switch off repeating header" started on a 
new page
@@ -838,7 +824,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, 
testRedlineFlysInHeader)
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf137025)
 {
 // Check the padding of the textbox
-SwDoc* pDoc = createDoc("tdf137025.docx");
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf137025.docx");
 CPPUNIT_ASSERT(pDoc);
 xmlDocUniquePtr pXmlDoc = parseLayoutDump();
 CPPUNIT_ASSERT(pXmlDoc);
@@ -1313,7 +1299,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, 
testTableOverlapFooterFly)
 
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf134277)
 {
-SwDoc* pDoc = createDoc("tdf134277.docx");
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf134277.docx");
 CPPUNIT_ASSERT(pDoc);
 SwDocShell* pShell = pDoc->GetDocShell();
 
@@ -1331,7 +1317,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf134277)
 
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf116486)
 {
-SwDoc* pDoc = createDoc("tdf116486.docx");
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf116486.docx");
 CPPUNIT_ASSERT(pDoc);
 OUString aTop = parseDump("/root/page/body/txt/Special", "nHeight");
 CPPUNIT_ASSERT_EQUAL(OUString("4006"), aTop);
@@ -1355,7 +1341,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf142080)
 
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf128198)
 {
-SwDoc* pDoc = createDoc("tdf128198-1.docx");
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf128198-1.docx");
 CPPUNIT_ASSERT(pDoc);
 xmlDocUniquePtr pLayout = parseLayoutDump();
 // the problem was that line 5 was truncated at

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

2021-06-10 Thread Noel Grandin (via logerrit)

 sc/source/ui/cctrl/tbzoomsliderctrl.cxx |   45 
 sc/source/ui/inc/tbzoomsliderctrl.hxx   |2 -
 2 files changed, 30 insertions(+), 17 deletions(-)

New commits:
commit 8619e743564a241eb951866616aec82e1ab3965f
Author: Noel Grandin 
AuthorDate: Thu Jun 10 14:04:17 2021 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 10 23:01:14 2021 +0200

tdf#136766 Zoom slider in calc print preview has white background

I cannot figure out any way to make transparent stuff on the toolbar
behave under all rendering backends, so just revert this

this reverts
commit 00cffc20e40b2412c7e9867eed24c9834504e24f
Date:   Mon Sep 7 13:28:33 2020 +0200
tdf#135181 Calc print preview zoom slider print preview not
transparent (gen)

commit 444c7c736be7545344298a9cbb3a69886edc5ecb
Date:   Mon May 18 18:23:13 2020 +0200
tdf#125538 fix background of zoom control

Change-Id: I7c351796b2c0778c1520fc8177d05567b2ae8a48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116982
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit d693223b84b518701d308678801ccc50877490dc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116904
Reviewed-by: Xisco Fauli 

diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx 
b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 12d12c19beda..b7a6781dcd07 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -97,9 +97,8 @@ struct ScZoomSlider::ScZoomSliderWnd_Impl
 ImagemaIncreaseButton;
 ImagemaDecreaseButton;
 bool mbOmitPaint;
-VclPtr  mxParentWindow;
 
-explicit ScZoomSliderWnd_Impl( sal_uInt16 nCurrentZoom, vcl::Window* 
parentWindow ) :
+explicit ScZoomSliderWnd_Impl( sal_uInt16 nCurrentZoom ) :
 mnCurrentZoom( nCurrentZoom ),
 mnMinZoom( 10 ),
 mnMaxZoom( 400 ),
@@ -108,8 +107,7 @@ struct ScZoomSlider::ScZoomSliderWnd_Impl
 maSliderButton(),
 maIncreaseButton(),
 maDecreaseButton(),
-mbOmitPaint( false ),
-mxParentWindow(parentWindow)
+mbOmitPaint( false )
 {
 }
 };
@@ -209,7 +207,7 @@ ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent,
 const css::uno::Reference< css::frame::XDispatchProvider >& 
rDispatchProvider,
 sal_uInt16 nCurrentZoom ):
 InterimItemWindow(pParent, "modules/scalc/ui/zoombox.ui", 
"ZoomBox"),
-mxWidget(new ScZoomSlider(rDispatchProvider, nCurrentZoom, 
pParent)),
+mxWidget(new ScZoomSlider(rDispatchProvider, nCurrentZoom)),
 mxWeld(new weld::CustomWeld(*m_xBuilder, "zoom", *mxWidget))
 {
 Size aLogicalSize( 115, 40 );
@@ -233,8 +231,8 @@ void ScZoomSliderWnd::dispose()
 }
 
 ScZoomSlider::ScZoomSlider(const css::uno::Reference< 
css::frame::XDispatchProvider>& rDispatchProvider,
-   sal_uInt16 nCurrentZoom, vcl::Window* parentWindow)
-: mpImpl(new ScZoomSliderWnd_Impl(nCurrentZoom, parentWindow))
+   sal_uInt16 nCurrentZoom)
+: mpImpl(new ScZoomSliderWnd_Impl(nCurrentZoom))
 , m_xDispatchProvider(rDispatchProvider)
 {
 mpImpl->maSliderButton  = Image(StockImage::Yes, 
RID_SVXBMP_SLIDERBUTTON);
@@ -277,8 +275,9 @@ bool ScZoomSlider::MouseButtonDown( const MouseEvent& rMEvt 
)
 if( nOldZoom == mpImpl->mnCurrentZoom )
 return true;
 
-// need to invalidate parent since we rely on the toolbox drawing it's 
fancy gradient background
-mpImpl->mxParentWindow->Invalidate();
+tools::Rectangle aRect( Point( 0, 0 ), aSliderWindowSize );
+
+Invalidate(aRect);
 mpImpl->mbOmitPaint = true;
 
 SvxZoomSliderItem   aZoomSliderItem( mpImpl->mnCurrentZoom );
@@ -312,8 +311,8 @@ bool ScZoomSlider::MouseMove( const MouseEvent& rMEvt )
 {
 mpImpl->mnCurrentZoom = Offset2Zoom( aPoint.X() );
 
-// need to invalidate parent since we rely on the toolbox drawing 
it's fancy gradient background
-mpImpl->mxParentWindow->Invalidate();
+tools::Rectangle aRect(Point(0, 0), aSliderWindowSize);
+Invalidate(aRect);
 
 mpImpl->mbOmitPaint = true; // optimization: paint before 
executing command,
 
@@ -379,9 +378,11 @@ void ScZoomSlider::UpdateFromItem(const SvxZoomSliderItem* 
pZoomSliderItem)
 }
 }
 
+Size aSliderWindowSize = GetOutputSizePixel();
+tools::Rectangle aRect(Point(0, 0), aSliderWindowSize);
+
 if ( !mpImpl->mbOmitPaint )
-// need to invalidate parent since we rely on the toolbox drawing it's 
fancy gradient background
-mpImpl->mxParentWindow->Invalidate();
+   Invalidate(aRect);
 }
 
 void ScZoomSlider::Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& /*rRect*/)
@@ -399,9 +400,6

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

2021-06-10 Thread Tünde Tóth (via logerrit)

 chart2/qa/extras/chart2import.cxx|   22 ++
 chart2/qa/extras/data/docx/tdf139658.docx|binary
 chart2/source/tools/InternalDataProvider.cxx |   12 ++--
 3 files changed, 32 insertions(+), 2 deletions(-)

New commits:
commit 1d965fab93a573edf2028d6fc178b4533446fc54
Author: Tünde Tóth 
AuthorDate: Fri Jun 4 13:10:51 2021 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 10 22:54:19 2021 +0200

tdf#139658 OOXML: fix broken chart import at labels with quotes

During the import of the internal data table, incomplete
parsing of category labels with escaped quotation marks
resulted broken category labels and charts.

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

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index fe9ebb5bc502..b3b5a3921d3a 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -174,6 +174,7 @@ public:
 void testTdf137734();
 void testTdf137874();
 void testTdfCustomShapePos();
+void testTdf139658();
 
 CPPUNIT_TEST_SUITE(Chart2ImportTest);
 CPPUNIT_TEST(Fdo60083);
@@ -295,6 +296,7 @@ public:
 CPPUNIT_TEST(testTdf137734);
 CPPUNIT_TEST(testTdf137874);
 CPPUNIT_TEST(testTdfCustomShapePos);
+CPPUNIT_TEST(testTdf139658);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -2845,6 +2847,26 @@ void Chart2ImportTest::testTdfCustomShapePos()
 }
 }
 
+void Chart2ImportTest::testTdf139658()
+{
+load(u"/chart2/qa/extras/data/docx/", "tdf139658.docx");
+uno::Reference xChartDoc(getChartDocFromWriter(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+Reference 
xInternalProvider(xChartDoc->getDataProvider(),
+   uno::UNO_QUERY);
+CPPUNIT_ASSERT(xInternalProvider.is());
+
+Reference xDescAccess(xInternalProvider, 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xDescAccess.is());
+
+// Get the category labels.
+Sequence aCategories = xDescAccess->getRowDescriptions();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aCategories.getLength());
+CPPUNIT_ASSERT_EQUAL(OUString("category1"), aCategories[0]);
+CPPUNIT_ASSERT_EQUAL(OUString("\"category2\""), aCategories[1]);
+CPPUNIT_ASSERT_EQUAL(OUString("category\"3"), aCategories[2]);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/docx/tdf139658.docx 
b/chart2/qa/extras/data/docx/tdf139658.docx
new file mode 100644
index ..59deda9f83f9
Binary files /dev/null and b/chart2/qa/extras/data/docx/tdf139658.docx differ
diff --git a/chart2/source/tools/InternalDataProvider.cxx 
b/chart2/source/tools/InternalDataProvider.cxx
index c1d0008098ab..415f08ac3ea9 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -518,7 +518,14 @@ InternalDataProvider::createDataSequenceFromArray( const 
OUString& rArrayStr, co
 bool bInQuote = false;
 for (; p != pEnd; ++p)
 {
-if (*p == '"')
+// Skip next "" within the title text: it's an escaped double 
quotation mark.
+if (bInQuote && *p == '"' && *(p + 1) == '"')
+{
+if (!pElem)
+pElem = p;
+++p;
+}
+else if (*p == '"')
 {
 bInQuote = !bInQuote;
 if (bInQuote)
@@ -534,7 +541,8 @@ InternalDataProvider::createDataSequenceFromArray( const 
OUString& rArrayStr, co
 // Non empty string
 if (!aElem.isEmpty())
 bAllNumeric = false;
-aRawElems.push_back(aElem);
+// Restore also escaped double quotation marks
+aRawElems.push_back(aElem.replaceAll("\"\"", "\""));
 pElem = nullptr;
 aElem.clear();
 
___
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' - dictionaries

2021-06-10 Thread Andras Timar (via logerrit)

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

New commits:
commit 17fdaf166a360d39e7dce7960bb15562eeb3e516
Author: Andras Timar 
AuthorDate: Thu Jun 10 21:18:36 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Jun 10 21:18:36 2021 +0200

Update git submodules

* Update dictionaries from branch 'libreoffice-7-1'
  to 39658b5705671893f251e78655c3bb775a1b0d2f
  - tdf#141408 updated Ukraininan dictionaries

Change-Id: I56aea01cbff18871bee91118f3f0701284caf87e
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/114308
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/115723
Tested-by: Adolfo Jayme Barrientos 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/dictionaries b/dictionaries
index 44c6b936184e..39658b570567 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 44c6b936184e9f91d6d14fe65805640a0161fdfb
+Subproject commit 39658b5705671893f251e78655c3bb775a1b0d2f
___
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

2021-06-10 Thread Caolán McNamara (via logerrit)

 sc/source/ui/Accessibility/AccessibleEditObject.cxx |9 +
 sc/source/ui/app/inputwin.cxx   |2 +-
 sc/source/ui/inc/AccessibleEditObject.hxx   |8 
 3 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 4b6af3412f72be85706fc5355a36bd8364726c13
Author: Caolán McNamara 
AuthorDate: Wed Jun 9 14:31:05 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Jun 10 21:13:37 2021 +0200

tdf#141769 ScTextWnd has to be available before the editview is created

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

diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx 
b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index d0afd2c8196c..ea6787478abd 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -595,4 +596,12 @@ OutputDevice* 
ScAccessibleEditControlObject::GetOutputDeviceForView()
 return &m_pController->GetDrawingArea()->get_ref_device();
 }
 
+ScAccessibleEditLineObject::ScAccessibleEditLineObject(ScTextWnd* pTextWnd)
+: ScAccessibleEditControlObject(pTextWnd, ScAccessibleEditObject::EditLine)
+{
+// tdf#141769 set this early so its always available, even before the 
on-demand
+// editview is created
+mpTextWnd = pTextWnd;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 2846ca43dc54..6307eee3edd7 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2075,7 +2075,7 @@ void ScTextWnd::SetDrawingArea(weld::DrawingArea* 
pDrawingArea)
 
 css::uno::Reference< css::accessibility::XAccessible > 
ScTextWnd::CreateAccessible()
 {
-pAcc = new ScAccessibleEditControlObject(this, 
ScAccessibleEditObject::EditLine);
+pAcc = new ScAccessibleEditLineObject(this);
 return pAcc;
 }
 
diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx 
b/sc/source/ui/inc/AccessibleEditObject.hxx
index 83dedda9b387..9244964cfae3 100644
--- a/sc/source/ui/inc/AccessibleEditObject.hxx
+++ b/sc/source/ui/inc/AccessibleEditObject.hxx
@@ -175,7 +175,9 @@ private:
 std::unique_ptr mpTextHelper;
 EditView*  mpEditView;
 VclPtr mpWindow;
+protected:
 ScTextWnd* mpTextWnd;
+private:
 EditObjectType meObjectType;
 bool   mbHasFocus;
 
@@ -222,6 +224,12 @@ public:
 virtual void SAL_CALL disposing() override;
 };
 
+class ScAccessibleEditLineObject : public ScAccessibleEditControlObject
+{
+public:
+ScAccessibleEditLineObject(ScTextWnd* pTextWnd);
+};
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-06-10 Thread Noel Grandin (via logerrit)

 include/sot/storage.hxx   |2 +-
 sot/source/sdstor/storage.cxx |3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 6e1bc19044dc154fee30263951e1122028b22b5b
Author: Noel Grandin 
AuthorDate: Thu Jun 10 11:49:20 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 10 20:09:29 2021 +0200

loplugin:unnecessaryreturn SotStorageStream::Commit

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

diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 65cde53d2a67..41b57506946c 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -64,7 +64,7 @@ public:
 
 virtual void SetSize(sal_uInt64 nNewSize) override;
 sal_uInt32 GetSize() const;
-bool Commit();
+void Commit();
 bool SetProperty(OUString const & rName, css::uno::Any const & rValue);
 virtual sal_uInt64 TellEnd() override;
 };
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 596a59d59785..cef5b3d7a02d 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -176,13 +176,12 @@ sal_uInt64 SotStorageStream::TellEnd()
 return pOwnStm->GetSize();
 }
 
-bool SotStorageStream::Commit()
+void SotStorageStream::Commit()
 {
 pOwnStm->Flush();
 if( pOwnStm->GetError() == ERRCODE_NONE )
 pOwnStm->Commit();
 SetError( pOwnStm->GetError() );
-return GetError() == ERRCODE_NONE;
 }
 
 bool SotStorageStream::SetProperty( const OUString& rName, const 
css::uno::Any& rValue )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

MacUpdate - your app listing has been updated

2021-06-10 Thread MacUpdate

Title: Untitled Document

App Listing Updated
Hi The Document Foundation, We have updated your application listing for LibreOffice 7.1.4.2 on MacUpdate.com. Please take a moment to review your application's information to make sure that everything is correct.

View your updated app listing

You can login to your Developer Account to reply to comments and view stats, or submit new updates and changes to your app listing.

Desktop Install Compatibility
MacUpdate Desktop 6 is helping developers make it easier for users to fully install and use their apps. Download Desktop 6 and to ensure your app works with the “Install” link on our download pages.

Advertise With MacUpdate
The best Mac devs advertise their apps on MacUpdate.com because it’s the most targeted, highly performing Mac app advertising you can find on the web. Contact a...@macupdate.com to guarantee your annual ad campaigns get booked and expand your app’s audience.

86 matches

Mail list logo