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 <tamas.zolnai@collabora.com>

6 files changed, 0 insertions, 49 deletions

diff --git a/sd/qa/unit/data/odp/tdf115639.odp b/sd/qa/unit/data/odp/tdf115639.odp
deleted file mode 100644
index b732e4e7652b..000000000000
--- a/sd/qa/unit/data/odp/tdf115639.odp
+++ /dev/null
diff --git a/sd/qa/unit/data/ppt/tdf115639.ppt b/sd/qa/unit/data/ppt/tdf115639.ppt
deleted file mode 100644
index dade453bfeee..000000000000
--- a/sd/qa/unit/data/ppt/tdf115639.ppt
+++ /dev/null
diff --git a/sd/qa/unit/data/pptx/tdf115639.pptx b/sd/qa/unit/data/pptx/tdf115639.pptx
deleted file mode 100644
index 7e00b60cb397..000000000000
--- a/sd/qa/unit/data/pptx/tdf115639.pptx
+++ /dev/null
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 356cc99859a2..7323fd300718 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -180,7 +180,6 @@ public:
     void testTdf115394();
     void testTdf115394PPT();
     void testTdf51340();
-    void testTdf115639();
     void testTdf116899();
     void testTdf77747();
     void testTdf116266();
@@ -267,7 +266,6 @@ public:
     CPPUNIT_TEST(testTdf115394);
     CPPUNIT_TEST(testTdf115394PPT);
     CPPUNIT_TEST(testTdf51340);
-    CPPUNIT_TEST(testTdf115639);
     CPPUNIT_TEST(testTdf116899);
     CPPUNIT_TEST(testTdf77747);
     CPPUNIT_TEST(testTdf116266);
@@ -2462,36 +2460,6 @@ void SdImportTest::testTdf51340()
     xDocShRef->DoClose();
 }
 
-void SdImportTest::testTdf115639()
-{
-    // Check whether the new compatibility option is loaded correctly
-    // For PPTX we have the flag enabled by default
-    {
-        sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf115639.pptx"), PPTX);
-        SdDrawDocument *pDoc = xDocShRef->GetDoc();
-        CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != nullptr );
-        CPPUNIT_ASSERT( pDoc->IsHoriAlignIgnoreTrailingWhitespace() );
-    }
-
-    // For PPT we have the flag enabled by default
-    {
-        sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/tdf115639.ppt"), PPT);
-        SdDrawDocument *pDoc = xDocShRef->GetDoc();
-        CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != nullptr );
-        CPPUNIT_ASSERT( pDoc->IsHoriAlignIgnoreTrailingWhitespace() );
-        xDocShRef->DoClose();
-    }
-
-    // For ODP we have the flag disabled by default
-    {
-        sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf115639.odp"), ODP);
-        SdDrawDocument *pDoc = xDocShRef->GetDoc();
-        CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != nullptr );
-        CPPUNIT_ASSERT( !pDoc->IsHoriAlignIgnoreTrailingWhitespace() );
-        xDocShRef->DoClose();
-    }
-}
-
 void SdImportTest::testTdf116899()
 {
     // This is a PPT created in Impress and roundtripped in PP, the key times become [1, -1] in PP,
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 672181e24fbb..465ccf4481bb 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -409,14 +409,6 @@ bool DrawDocShell::ImportFrom(SfxMedium &rMedium,
         mpDoc->SetSummationOfParagraphs();
     }
 
-    // Set this flag for MSO formats
-    if (aFilterName.startsWith("MS PowerPoint 97") ||
-        aFilterName.startsWith("Impress MS PowerPoint 2007 XML") ||
-        aFilterName.startsWith("Impress Office Open XML"))
-    {
-        mpDoc->SetHoriAlignIgnoreTrailingWhitespace(true);
-    }
-
     const bool bRet = SfxObjectShell::ImportFrom(rMedium, xInsertPosition);
 
     SfxItemSet* pSet = rMedium.GetItemSet();
@@ -512,14 +504,6 @@ bool DrawDocShell::ConvertFrom( SfxMedium& rMedium )
         bRet = SdGRFFilter( rMedium, *this ).Import();
     }
 
-    // Set this flag for MSO formats
-    if (aFilterName.startsWith("MS PowerPoint 97") ||
-        aFilterName.startsWith("Impress MS PowerPoint 2007 XML") ||
-        aFilterName.startsWith("Impress Office Open XML"))
-    {
-        mpDoc->SetHoriAlignIgnoreTrailingWhitespace(true);
-    }
-
     FinishedLoading();
 
     // tell SFX to change viewshell when in preview mode
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 5cb954286aba..ed25f27e2d34 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -224,7 +224,6 @@ SdOutliner::SdOutliner( SdDrawDocument* pDoc, OutlinerMode nMode )
         SetHyphenator( xHyphenator );
 
     SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() );
-    SetHoriAlignIgnoreTrailingWhitespace( pDoc->IsHoriAlignIgnoreTrailingWhitespace() );
 }
 
 /// Nothing spectacular in the destructor.