diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-02 09:34:26 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-02 11:08:40 +0100 |
| commit | 2a253f886743d4a0e08109f9826c06e4744a7230 (patch) | |
| tree | 5f4267d01ec8772ae7eeb39687524fee295ef0b2 | |
| parent | 96272f26e93bc70820cb1472a38320a29db650c2 (diff) | |
bPgChpLevel is always false, so remove if (bPgChpLevel) branches
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 1 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 25 |
3 files changed, 1 insertions, 27 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 9932661f90..785b8e6051 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -3667,7 +3667,7 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage, mpPostProcessAttrsInfo = 0; - bNoAttrImport = bPgChpLevel = bEmbeddObj = false; + bNoAttrImport = bEmbeddObj = false; bAktAND_fNumberAcross = false; bNoLnNumYet = true; bInHyperlink = false; diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 5a941ba52c..3eab646c06 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1232,7 +1232,6 @@ private: bool bVer7; // (7 == nVersion); bool bVer8; // (8 == nVersion); - bool bPgChpLevel; // ChapterLevel of Heading from PageNum bool bEmbeddObj; // EmbeddField gelesen bool bAktAND_fNumberAcross; // current active Annotated List Deskriptor - ROW flag diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 759293dda2..845e5667f1 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -1919,31 +1919,6 @@ eF_ResT SwWW8ImplReader::Read_F_Anz( WW8FieldDesc* pF, String& rStr ) eF_ResT SwWW8ImplReader::Read_F_CurPage( WW8FieldDesc*, String& rStr ) { - // zusaetzlich mit Kapitelnummer? - if( bPgChpLevel ) - { - SwChapterField aFld( (SwChapterFieldType*) - rDoc.GetSysFldType( RES_CHAPTERFLD ), CF_NUMBER ); - aFld.SetLevel( nPgChpLevel ); - rDoc.InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 ); - - static const sal_Char aDelim[] = "-.:\x97\x96"; - sal_uInt8 nDelim = nPgChpDelim; - if( nDelim > 4 ) - nDelim = 0; - - sal_Unicode c = ByteString::ConvertToUnicode( aDelim[ nDelim ], - RTL_TEXTENCODING_MS_1252 ); - if( '-' == c ) - { - rDoc.InsertString( *pPaM, CHAR_HARDHYPHEN ); - } - else - { - rDoc.InsertString( *pPaM, c ); // maybe insert ZWNBSP? - } - } - // Seitennummer SwPageNumberField aFld( (SwPageNumberFieldType*) rDoc.GetSysFldType( RES_PAGENUMBERFLD ), PG_RANDOM, |