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

2018-11-16 Thread Libreoffice Gerrit user 
 dev/null |binary
 editeng/qa/unit/core-test.cxx|  144 ---
 editeng/source/editeng/editeng.cxx   |5 -
 editeng/source/editeng/impedit.hxx   |9 --
 editeng/source/editeng/impedit2.cxx  |   10 --
 editeng/source/editeng/impedit3.cxx  |   12 --
 editeng/source/outliner/outliner.cxx |5 -
 include/editeng/editeng.hxx  |3 
 include/editeng/outliner.hxx |3 
 include/svx/svdmodel.hxx |4 
 sd/qa/unit/import-tests.cxx  |   32 ---
 sd/source/ui/docshell/docshel4.cxx   |   16 ---
 sd/source/ui/view/Outliner.cxx   |1 
 svx/source/svdraw/svdetc.cxx |1 
 svx/source/svdraw/svdmodel.cxx   |   22 -
 15 files changed, 7 insertions(+), 260 deletions(-)

New commits:
commit cb1d625aee558c9aa3c0bf3ea44b65f37dca48a8
Author: Tamás Zolnai 
AuthorDate: Fri Nov 16 17:06:02 2018 +0100
Commit: Tamás Zolnai 
CommitDate: Fri Nov 16 18:22:04 2018 +0100

Revert "tdf#115639: Align right/center with trailing spaces the same"

.. as MS PowerPoint"
This reverts commit 1da3a3cb74a415a76fa547ef0c8f61780e260e7f.
It was a bad solution for the problem.

Change-Id: I6f6fecb7c74a884fbfb04c6e7204eb8bf347a272
Reviewed-on: https://gerrit.libreoffice.org/63473
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 

diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index ad56407d4dca..6d600b462f39 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -33,7 +33,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 
@@ -100,9 +99,6 @@ public:
 
 void testTransliterate();
 
-/// Test HoriAlignIgnoreTrailingWhitespace compatibility flag
-void testHoriAlignIgnoreTrailingWhitespace();
-
 DECL_STATIC_LINK( Test, CalcFieldValueHdl, EditFieldInfo*, void );
 
 CPPUNIT_TEST_SUITE(Test);
@@ -125,7 +121,6 @@ public:
 CPPUNIT_TEST(testSectionAttributes);
 CPPUNIT_TEST(testLargeParaCopyPaste);
 CPPUNIT_TEST(testTransliterate);
-CPPUNIT_TEST(testHoriAlignIgnoreTrailingWhitespace);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1843,145 +1838,6 @@ void Test::testTransliterate()
 CPPUNIT_ASSERT_EQUAL(OUString("One (Two) Three"), aEditEngine.GetText());
 }
 
-void Test::testHoriAlignIgnoreTrailingWhitespace()
-{
-// Create EditEngine's instance
-EditEngine aEditEngine(mpItemPool);
-
-// Get EditDoc for current EditEngine's instance
-EditDoc  = aEditEngine.GetEditDoc();
-
-// Initially no text should be there
-CPPUNIT_ASSERT_EQUAL(sal_uLong(0), rDoc.GetTextLen());
-CPPUNIT_ASSERT_EQUAL(OUString(), rDoc.GetParaAsString(sal_Int32(0)));
-
-// Set initial text
-OUString aText = "Some text";
-sal_Int32 aTextLen = aText.getLength();
-aEditEngine.SetText(aText);
-
-// Assert changes - text insertion
-CPPUNIT_ASSERT_EQUAL(static_cast(aTextLen), rDoc.GetTextLen());
-CPPUNIT_ASSERT_EQUAL(aText, 
rDoc.GetParaAsString(static_cast(0)));
-
-// First test case: center alignment with compatibility option enabled
-{
-aEditEngine.SetHoriAlignIgnoreTrailingWhitespace(true);
-std::unique_ptr pSet(new 
SfxItemSet(aEditEngine.GetEmptyItemSet()));
-pSet->Put(SvxAdjustItem( SvxAdjust::Center, EE_PARA_JUST ));
-CPPUNIT_ASSERT_EQUAL(static_cast(1), pSet->Count());
-
-// Select all paragraphs and apply changes
-ESelection aSelection(0, 0, 0, aTextLen);
-aEditEngine.QuickSetAttribs(*pSet, aSelection);
-
-// Use a one line paragraph
-aEditEngine.SetPaperSize(Size(1, 6000));
-CPPUNIT_ASSERT_EQUAL(static_cast(1), 
aEditEngine.GetLineCount(0));
-
-// Check horizontal position
-ParaPortion* pParaPortion = aEditEngine.GetParaPortions()[0];
-EditLine* pLine = >GetLines()[0];
-CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast(4527), 
pLine->GetStartPosX(), 100);
-}
-
-// Second test case: center alignment with compatibility option disabled
-{
-aEditEngine.SetHoriAlignIgnoreTrailingWhitespace(false);
-std::unique_ptr pSet(new 
SfxItemSet(aEditEngine.GetEmptyItemSet()));
-pSet->Put(SvxAdjustItem( SvxAdjust::Center, EE_PARA_JUST ));
-CPPUNIT_ASSERT_EQUAL(static_cast(1), pSet->Count());
-
-// Select all paragraphs and apply changes
-ESelection aSelection(0, 0, 0, aTextLen);
-aEditEngine.QuickSetAttribs(*pSet, aSelection);
-
-// Use a one line paragraph
-aEditEngine.SetPaperSize(Size(1, 6000));
-CPPUNIT_ASSERT_EQUAL(static_cast(1), 
aEditEngine.GetLineCount(0));
-
-// Check horizontal position
-ParaPortion* pParaPortion = aEditEngine.GetParaPortions()[0];
-EditLine* pLine = >GetLines()[0];
-CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast(4407), 
pLine->GetStartPosX(), 100);
-}
-
-// Third test case: right alignment with

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

2018-02-16 Thread Tamás Zolnai 
 editeng/qa/unit/core-test.cxx|  111 +++
 editeng/source/editeng/editeng.cxx   |   14 +++-
 editeng/source/editeng/impedit.hxx   |9 ++
 editeng/source/editeng/impedit2.cxx  |   14 ++--
 editeng/source/editeng/impedit3.cxx  |   12 +++
 editeng/source/outliner/outliner.cxx |   10 +++
 include/editeng/editeng.hxx  |6 +
 include/editeng/outliner.hxx |4 +
 include/svx/svdmodel.hxx |4 +
 sd/qa/unit/data/odp/tdf115639.odp|binary
 sd/qa/unit/data/ppt/tdf115639.ppt|binary
 sd/qa/unit/data/pptx/tdf115639.pptx  |binary
 sd/qa/unit/import-tests.cxx  |   33 ++
 sd/source/ui/docshell/docshel4.cxx   |   16 +
 sd/source/ui/view/Outliner.cxx   |1 
 svx/source/svdraw/svdetc.cxx |1 
 svx/source/svdraw/svdmodel.cxx   |   22 ++
 17 files changed, 245 insertions(+), 12 deletions(-)

New commits:
commit 1da3a3cb74a415a76fa547ef0c8f61780e260e7f
Author: Tamás Zolnai 
Date:   Sat Feb 17 06:35:29 2018 +0100

tdf#115639: Align right/center with trailing spaces the same as MS 
PowerPoint

* Add HoriAlignIgnoreTrailingWhitespace compatibility option.
** For MSO file formats it is set to true
** For ODP format it's set to false by default
** The flag is saved to ODP format as user data if the document
comes from an MSO format.

Change-Id: Ie22233d33a25e605de46120bfc2195038dffd63c
Reviewed-on: https://gerrit.libreoffice.org/49889
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 

diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 2e122cc59c1d..195fae1bcb4a 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -97,6 +98,9 @@ public:
 
 void testTransliterate();
 
+/// Test HoriAlignIgnoreTrailingWhitespace compatibility flag
+void testHoriAlignIgnoreTrailingWhitespace();
+
 DECL_STATIC_LINK( Test, CalcFieldValueHdl, EditFieldInfo*, void );
 
 CPPUNIT_TEST_SUITE(Test);
@@ -117,6 +121,7 @@ public:
 CPPUNIT_TEST(testSectionAttributes);
 CPPUNIT_TEST(testLargeParaCopyPaste);
 CPPUNIT_TEST(testTransliterate);
+CPPUNIT_TEST(testHoriAlignIgnoreTrailingWhitespace);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1848,6 +1853,112 @@ void Test::testTransliterate()
 CPPUNIT_ASSERT_EQUAL(aExpected, aEditEngine.GetText());
 }
 
+void Test::testHoriAlignIgnoreTrailingWhitespace()
+{
+// Create EditEngine's instance
+EditEngine aEditEngine(mpItemPool);
+
+// Get EditDoc for current EditEngine's instance
+EditDoc  = aEditEngine.GetEditDoc();
+
+// Initially no text should be there
+CPPUNIT_ASSERT_EQUAL(sal_uLong(0), rDoc.GetTextLen());
+CPPUNIT_ASSERT_EQUAL(OUString(), rDoc.GetParaAsString(sal_Int32(0)));
+
+// Set initial text
+OUString aText = "Some text";
+sal_Int32 aTextLen = aText.getLength();
+aEditEngine.SetText(aText);
+
+// Assert changes - text insertion
+CPPUNIT_ASSERT_EQUAL(static_cast(aTextLen), rDoc.GetTextLen());
+CPPUNIT_ASSERT_EQUAL(aText, 
rDoc.GetParaAsString(static_cast(0)));
+
+// First test case: center alignment with compatibility option enabled
+{
+aEditEngine.SetHoriAlignIgnoreTrailingWhitespace(true);
+std::unique_ptr pSet(new 
SfxItemSet(aEditEngine.GetEmptyItemSet()));
+pSet->Put(SvxAdjustItem( SvxAdjust::Center, EE_PARA_JUST ));
+CPPUNIT_ASSERT_EQUAL(static_cast(1), pSet->Count());
+
+// Select all paragraphs and apply changes
+ESelection aSelection(0, 0, 0, aTextLen);
+aEditEngine.QuickSetAttribs(*pSet, aSelection);
+
+// Use a one line paragraph
+aEditEngine.SetPaperSize(Size(1, 6000));
+CPPUNIT_ASSERT_EQUAL(static_cast(1), 
aEditEngine.GetLineCount(0));
+
+// Check horizontal position
+ParaPortion* pParaPortion = aEditEngine.GetParaPortions()[0];
+EditLine* pLine = >GetLines()[0];
+CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast(4527), 
pLine->GetStartPosX(), 10);
+}
+
+// Second test case: center alignment with compatibility option disabled
+{
+aEditEngine.SetHoriAlignIgnoreTrailingWhitespace(false);
+std::unique_ptr pSet(new 
SfxItemSet(aEditEngine.GetEmptyItemSet()));
+pSet->Put(SvxAdjustItem( SvxAdjust::Center, EE_PARA_JUST ));
+CPPUNIT_ASSERT_EQUAL(static_cast(1), pSet->Count());
+
+// Select all paragraphs and apply changes
+ESelection aSelection(0, 0, 0, aTextLen);
+aEditEngine.QuickSetAttribs(*pSet, aSelection);
+
+// Use a one line paragraph
+aEditEngine.SetPaperSize(Size(1, 6000));
+CPPUNIT_ASSERT_EQUAL(static_cast(1), 
aEditEngine.GetLineCount(0));
+
+// Check horizontal position
+ParaPortion*