diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2004-12-23 09:10:25 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2004-12-23 09:10:25 +0000 |
| commit | e224fba02bebb5eecd0623114e3b04c89d211d16 (patch) | |
| tree | 34b1ffe7b73dd553f99adf360062c9600463d3f2 /sw/source | |
| parent | 7035d361da4d1de17ba251648ff7fda24c6dd91f (diff) | |
INTEGRATION: CWS swqbugfixes10 (1.19.34); FILE MERGED
2004/11/29 09:52:42 fme 1.19.34.1: #i37686# Minimium tab width for centered tab stops
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/text/txttab.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index 7ec4a7f16906..14d01c0a0522 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txttab.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: hr $ $Date: 2004-11-09 13:49:10 $ + * last change: $Author: vg $ $Date: 2004-12-23 10:10:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ - #pragma hdrstop #include "hintids.hxx" @@ -345,14 +344,20 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf ) // Hier lassen wir uns nieder... Fix( rInf.X() ); + const bool bTabCompat = rInf.GetVsh()->IsTabCompat(); + // Die Mindestbreite eines Tabs ist immer mindestens ein Blank + // --> FME 2004-11-25 #i37686# In compatibility mode, the minimum width + // should be 1, even for non-left tab stops. + USHORT nMinimumTabWidth = 1; + // <-- + if ( !bTabCompat ) { XubString aTmp( ' ' ); SwTxtSizeInfo aInf( rInf, aTmp ); - PrtWidth( aInf.GetTxtSize().Width() ); + nMinimumTabWidth = aInf.GetTxtSize().Width(); } - - const bool bTabCompat = rInf.GetVsh()->IsTabCompat(); + PrtWidth( nMinimumTabWidth ); // Break tab stop to next line if: // 1. Minmal width does not fit to line anymore. |