Revert tdf#115639 fixes

This reverts commit 62cf24fbd48064e3ba309109a92a2c408ae654b6.
This reverts commit ea4a9ca0a6ccf747a34997dc1d50efb82f9106ee.
This reverts commit 2a664263d043f0327a92d5d5f7507bd10143fd31.

Change-Id: If57c9f2aed054335d214ce87f17ab3f62dbebe65
Reviewed-on: https://gerrit.libreoffice.org/65645
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>

2 files changed, 0 insertions, 23 deletions

diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 4f6d9a44a891..807e31fc6da9 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -344,7 +344,6 @@ SdrOutliner* SdrMakeOutliner(OutlinerMode nOutlinerMode, SdrModel& rModel)
     pOutl->SetAsianCompressionMode(rModel.GetCharCompressType());
     pOutl->SetKernAsianPunctuation(rModel.IsKernAsianPunctuation());
     pOutl->SetAddExtLeading(rModel.IsAddExtLeading());
-    pOutl->SetHoriAlignIgnoreTrailingWhitespace(rModel.IsHoriAlignIgnoreTrailingWhitespace());
     return pOutl;
 }
 
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index e7cce55439a6..95532a7b6b34 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -108,7 +108,6 @@ struct SdrModelImpl
     SdrUndoFactory* mpUndoFactory;
 
     bool mbAnchoredTextOverflowLegacy; // tdf#99729 compatibility flag
-    bool mbHoriAlignIgnoreTrailingWhitespace; // tdf#115639 compatibility flag
 };
 
 
@@ -119,7 +118,6 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
     mpImpl->mpUndoManager=nullptr;
     mpImpl->mpUndoFactory=nullptr;
     mpImpl->mbAnchoredTextOverflowLegacy = false;
-    mpImpl->mbHoriAlignIgnoreTrailingWhitespace = false;
     mbInDestruction = false;
     aObjUnit=SdrEngineDefaults::GetMapFraction();
     eObjUnit=SdrEngineDefaults::GetMapUnit();
@@ -1892,17 +1890,6 @@ bool SdrModel::IsAnchoredTextOverflowLegacy() const
     return mpImpl->mbAnchoredTextOverflowLegacy;
 }
 
-void SdrModel::SetHoriAlignIgnoreTrailingWhitespace(bool bEnabled)
-{
-    mpImpl->mbHoriAlignIgnoreTrailingWhitespace = bEnabled;
-    pDrawOutliner->SetHoriAlignIgnoreTrailingWhitespace(bEnabled);
-}
-
-bool SdrModel::IsHoriAlignIgnoreTrailingWhitespace() const
-{
-    return mpImpl->mbHoriAlignIgnoreTrailingWhitespace;
-}
-
 void SdrModel::ReformatAllTextObjects()
 {
     ImpReformatAllTextObjects();
@@ -1952,13 +1939,6 @@ void SdrModel::ReadUserDataSequenceValue(const css::beans::PropertyValue* pValue
             mpImpl->mbAnchoredTextOverflowLegacy = bBool;
         }
     }
-    if (pValue->Name == "HoriAlignIgnoreTrailingWhitespace")
-    {
-        if (pValue->Value >>= bBool)
-        {
-            SetHoriAlignIgnoreTrailingWhitespace(bBool);
-        }
-    }
 }
 
 template <typename T>
@@ -1971,8 +1951,6 @@ void SdrModel::WriteUserDataSequence(css::uno::Sequence < css::beans::PropertyVa
 {
     std::vector< std::pair< OUString, Any > > aUserData;
     addPair(aUserData, "AnchoredTextOverflowLegacy", IsAnchoredTextOverflowLegacy());
-    if (IsHoriAlignIgnoreTrailingWhitespace())
-        addPair(aUserData, "HoriAlignIgnoreTrailingWhitespace", IsHoriAlignIgnoreTrailingWhitespace());
 
     const sal_Int32 nOldLength = rValues.getLength();
     rValues.realloc(nOldLength + aUserData.size());