diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2018-02-17 15:49:27 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-02-19 09:23:00 +0100 |
| commit | ed7fb360f9c1693355cd602de77ea680b286b55a (patch) | |
| tree | dc1884216f6a4ecf5266f9daa56dbd4ca22c97ab /include | |
| parent | 79b32f930b66e202778d93ea577eacf1ac9c5bc3 (diff) | |
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.
Reviewed-on: https://gerrit.libreoffice.org/49889
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 1da3a3cb74a415a76fa547ef0c8f61780e260e7f)
Change-Id: Ie22233d33a25e605de46120bfc2195038dffd63c
Reviewed-on: https://gerrit.libreoffice.org/49909
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit f26899be899f1a39ea1e6b5ad8b46bad9cf1216f)
Reviewed-on: https://gerrit.libreoffice.org/49970
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/editeng.hxx | 6 | ||||
| -rw-r--r-- | include/editeng/outliner.hxx | 4 | ||||
| -rw-r--r-- | include/svx/svdmodel.hxx | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 4d771074214c..b30d689c25c0 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -274,7 +274,7 @@ public: sal_uInt32 GetTextLen() const; sal_uInt32 GetTextHeight() const; sal_uInt32 GetTextHeightNTP() const; - sal_uInt32 CalcTextWidth(); + sal_uInt32 CalcTextWidth( bool bIgnoreTrailingWhiteSpaces = false ); OUString GetText( sal_Int32 nParagraph ) const; sal_Int32 GetTextLen( sal_Int32 nParagraph ) const; @@ -610,6 +610,10 @@ public: sal_Int32 GetOverflowingLineNum() const; void ClearOverflowingParaNum(); bool IsPageOverflow(); + + // tdf#115639 compatibility flag + void SetHoriAlignIgnoreTrailingWhitespace(bool bEnabled); + bool IsHoriAlignIgnoreTrailingWhitespace() const; }; #endif // INCLUDED_EDITENG_EDITENG_HXX diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 7fe332587e43..1f6983e9088f 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -1006,6 +1006,10 @@ public: // convenient method to determine the bullets/numbering status for all paragraphs sal_Int32 GetBulletsNumberingStatus() const; + + // tdf#115639 compatibility flag + void SetHoriAlignIgnoreTrailingWhitespace(bool bEnabled); + bool IsHoriAlignIgnoreTrailingWhitespace() const; }; #endif diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 79337a826a60..6e1424f389e1 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -546,6 +546,10 @@ public: void SetAnchoredTextOverflowLegacy(bool bEnabled); bool IsAnchoredTextOverflowLegacy() const; + // tdf#115639 compatibility flag + void SetHoriAlignIgnoreTrailingWhitespace(bool bEnabled); + bool IsHoriAlignIgnoreTrailingWhitespace() const; + void ReformatAllTextObjects(); SdrOutliner* createOutliner( OutlinerMode nOutlinerMode ); |