summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-06-14 09:56:49 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-06-14 09:56:49 +0100
commit43de0b244329378adc8406e97df882c527faf9a5 (patch)
tree7b307cece173bcd2fddf3cabc470bf5d62d7c1e9 /sw/source
parent0e619cb550390e08930ec2ad58bc5419b1965b0b (diff)
Related: #i119548# document that ms changed the meaning of fWidowControl
Change-Id: I884c3c57dfd1d2e7bfa0675fd0c0184113cdda9c
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx2
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx7
2 files changed, 7 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 4b9449b31d73..3ff4585c9b0e 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3727,7 +3727,7 @@ void WW8RStyle::Set1StyleDefaults()
pIo->pAktColl->SetFmtAttr(aAttr);
}
- if( /*pIo->pWDop->fWidowControl &&*/ !bWidowsChanged ) // Widows ?
+ if( !bWidowsChanged ) // Widows ?
{
pIo->pAktColl->SetFmtAttr( SvxWidowsItem( 2, RES_PARATR_WIDOWS ) );
pIo->pAktColl->SetFmtAttr( SvxOrphansItem( 2, RES_PARATR_ORPHANS ) );
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index e52cbc5b7361..5e381e664f13 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -1496,7 +1496,12 @@ public:
sal_uInt8 nDataStart;
//-------------------------
sal_uInt16 fFacingPages : 1; // 1 when facing pages should be printed
- sal_uInt16 fWidowControl : 1; // 1 when widow control is in effect. 0 when widow control disabled.
+
+ sal_uInt16 fWidowControl : 1; //a: orig 97 docs say
+ // 1 when widow control is in effect. 0 when widow control disabled.
+ //b: MS-DOC: Word Binary File Format (.doc) Structure Specification 2008 says
+ // B - unused1 (1 bit): Undefined and MUST be ignored.
+
sal_uInt16 fPMHMainDoc : 1; // 1 when doc is a main doc for Print Merge Helper, 0 when not; default=0
sal_uInt16 grfSuppression : 2; // 0 Default line suppression storage; 0= form letter line suppression; 1= no line suppression; default=0
sal_uInt16 fpc : 2; // 1 footnote position code: 0 as endnotes, 1 at bottom of page, 2 immediately beneath text