summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdmodel.cxx
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2018-11-16 17:06:02 +0100
committerTamás Zolnai <tamas.zolnai@collabora.com>2018-11-16 18:22:04 +0100
commitcb1d625aee558c9aa3c0bf3ea44b65f37dca48a8 (patch)
treec711b9932b44cb1132311df696f138d8aa601e1a /svx/source/svdraw/svdmodel.cxx
parentc4c1636b5132261e64492de38f252b19b77e69b8 (diff)
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>
Diffstat (limited to 'svx/source/svdraw/svdmodel.cxx')
-rw-r--r--svx/source/svdraw/svdmodel.cxx22
1 files changed, 0 insertions, 22 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 95167af2005e..be9cc533a2d0 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -94,7 +94,6 @@ struct SdrModelImpl
SdrUndoFactory* mpUndoFactory;
bool mbAnchoredTextOverflowLegacy; // tdf#99729 compatibility flag
- bool mbHoriAlignIgnoreTrailingWhitespace; // tdf#115639 compatibility flag
};
@@ -107,7 +106,6 @@ void SdrModel::ImpCtor(
mpImpl->mpUndoManager=nullptr;
mpImpl->mpUndoFactory=nullptr;
mpImpl->mbAnchoredTextOverflowLegacy = false;
- mpImpl->mbHoriAlignIgnoreTrailingWhitespace = false;
mbInDestruction = false;
aObjUnit=SdrEngineDefaults::GetMapFraction();
eObjUnit=SdrEngineDefaults::GetMapUnit();
@@ -1844,17 +1842,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();
@@ -1898,13 +1885,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>
@@ -1917,8 +1897,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());