summaryrefslogtreecommitdiff
path: root/sw/source/core/text/portab.hxx
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2011-10-31 17:39:16 +0100
committerCédric Bosdonnat <cedric.bosdonnat@free.fr>2011-11-02 15:10:24 +0100
commitfd886cdc6a8c047a9fb1bd10a00f901b4adb525e (patch)
treed60515f1141181c9ef0e96de4a0783c2536a0b24 /sw/source/core/text/portab.hxx
parentb2e0b5f3f5b9a4c6b8483e6fb9855054c84aab92 (diff)
n#693238: fixed docx import of tabs set after the end margin
Added a new compatibility option to keep the previous behavior, but changed the default to avoid lines insertion for tabs when there are tab stops set beyond the end margin
Diffstat (limited to 'sw/source/core/text/portab.hxx')
-rw-r--r--sw/source/core/text/portab.hxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index 3cda7b9d1f96..bb5fe9d03968 100644
--- a/sw/source/core/text/portab.hxx
+++ b/sw/source/core/text/portab.hxx
@@ -38,17 +38,19 @@ class SwTabPortion : public SwFixPortion
{
const KSHORT nTabPos;
const xub_Unicode cFill;
+ const bool bAutoTabStop;
// Das Format() verzweigt entweder in Pre- oder PostFormat()
sal_Bool PreFormat( SwTxtFormatInfo &rInf );
public:
- SwTabPortion( const KSHORT nTabPos, const xub_Unicode cFill = '\0' );
+ SwTabPortion( const KSHORT nTabPos, const xub_Unicode cFill = '\0', const bool bAutoTab = true );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
virtual void FormatEOL( SwTxtFormatInfo &rInf );
sal_Bool PostFormat( SwTxtFormatInfo &rInf );
inline sal_Bool IsFilled() const { return 0 != cFill; }
inline KSHORT GetTabPos() const { return nTabPos; }
+ inline sal_Bool IsAutoTabStop() const { return bAutoTabStop; }
// Accessibility: pass information about this portion to the PortionHandler
virtual void HandlePortion( SwPortionHandler& rPH ) const;
@@ -63,8 +65,8 @@ public:
class SwTabLeftPortion : public SwTabPortion
{
public:
- inline SwTabLeftPortion( const KSHORT nTabPosVal, const xub_Unicode cFillChar='\0' )
- : SwTabPortion( nTabPosVal, cFillChar )
+ inline SwTabLeftPortion( const KSHORT nTabPosVal, const xub_Unicode cFillChar='\0', bool bAutoTab = true )
+ : SwTabPortion( nTabPosVal, cFillChar, bAutoTab )
{ SetWhichPor( POR_TABLEFT ); }
OUTPUT_OPERATOR
};