summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/ww8')
-rw-r--r--sw/source/filter/ww8/attributeoutputbase.hxx2
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx14
-rw-r--r--sw/source/filter/ww8/rtfexport.hxx2
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx4
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx9
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx39
-rw-r--r--sw/source/filter/ww8/ww8toolbar.hxx15
7 files changed, 35 insertions, 50 deletions
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index c6dfe603a070..1c8b6df15ad0 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -640,7 +640,7 @@ public:
void OutputItem( const SfxPoolItem& rHt );
/// Use OutputItem() on an item set - for styles.
- void OutputStyleItemSet( const SfxItemSet& rSet, bool bDeep, bool bTestForDefault );
+ void OutputStyleItemSet( const SfxItemSet& rSet, bool bTestForDefault );
/// Output frames.
void OutputFlyFrame( const ww8::Frame& rFormat );
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 850b0d7f9f05..e6a73593e953 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -545,7 +545,7 @@ void RtfExport::WritePageDescTable()
OutULong(n).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PGDSCUSE);
OutULong((sal_uLong)rPageDesc.ReadUseOn());
- OutPageDescription(rPageDesc, false, false);
+ OutPageDescription(rPageDesc, false);
// search for the next page description
std::size_t i = nSize;
@@ -719,7 +719,7 @@ void RtfExport::ExportDocument_Impl()
// All sections are unlocked by default
Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED);
OutLong(1);
- OutPageDescription(rPageDesc, false, true); // Changed bCheckForFirstPage to true so headers
+ OutPageDescription(rPageDesc, true); // Changed bCheckForFirstPage to true so headers
// following title page are correctly added - i13107
if (pSttPgDsc)
{
@@ -1223,7 +1223,7 @@ const OUString* RtfExport::GetRedline(sal_uInt16 nId)
return nullptr;
}
-void RtfExport::OutPageDescription(const SwPageDesc& rPgDsc, bool bWriteReset, bool bCheckForFirstPage)
+void RtfExport::OutPageDescription(const SwPageDesc& rPgDsc, bool bCheckForFirstPage)
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start");
const SwPageDesc* pSave = m_pAktPageDesc;
@@ -1233,14 +1233,6 @@ void RtfExport::OutPageDescription(const SwPageDesc& rPgDsc, bool bWriteReset, b
m_pAktPageDesc->GetFollow() != m_pAktPageDesc)
m_pAktPageDesc = m_pAktPageDesc->GetFollow();
- if (bWriteReset)
- {
- if (m_pCurPam->GetPoint()->nNode == m_pOrigPam->Start()->nNode)
- Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SECTD).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SBKNONE);
- else
- Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SECT).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SECTD);
- }
-
if (m_pAktPageDesc->GetLandscape())
Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LNDSCPSXN);
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index d8341ce189d5..81d18c119377 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -182,7 +182,7 @@ public:
SvStream& OutLong(long nVal);
void OutUnicode(const sal_Char* pToken, const OUString& rContent, bool bUpr = false);
void OutDateTime(const sal_Char* pStr, const css::util::DateTime& rDT);
- void OutPageDescription(const SwPageDesc& rPgDsc, bool bWriteReset, bool bCheckForFirstPage);
+ void OutPageDescription(const SwPageDesc& rPgDsc, bool bCheckForFirstPage);
sal_uInt16 GetColor(const Color& rColor) const;
void InsColor(const Color& rCol);
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 10286ede4104..3c0a4a32df3f 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1589,7 +1589,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
// Switch off test on default item values, if page description
// set (value of <bOutPgDscSet>) isn't written.
- AttrOutput().OutputStyleItemSet( aSet, true, bOutPgDscSet );
+ AttrOutput().OutputStyleItemSet( aSet, bOutPgDscSet );
bOutputStyleItemSet = true;
//Cannot export as normal page framedir, as continuous sections
@@ -1679,7 +1679,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
m_pISet = &pPdFormat->GetAttrSet();
if (!bOutputStyleItemSet)
- AttrOutput().OutputStyleItemSet( pPdFormat->GetAttrSet(), true, false );
+ AttrOutput().OutputStyleItemSet( pPdFormat->GetAttrSet(), false );
AttrOutput().SectionPageBorders( pPdFormat, pPdFirstPgFormat );
m_pISet = pOldI;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 4ff302d54d6d..0a9f88b3ed1f 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -5043,7 +5043,7 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt )
}
}
-void AttributeOutputBase::OutputStyleItemSet( const SfxItemSet& rSet, bool bDeep, bool bTestForDefault )
+void AttributeOutputBase::OutputStyleItemSet( const SfxItemSet& rSet, bool bTestForDefault )
{
// based on OutputItemSet() from wrt_fn.cxx
@@ -5051,9 +5051,6 @@ void AttributeOutputBase::OutputStyleItemSet( const SfxItemSet& rSet, bool bDeep
const SfxItemSet* pSet = &rSet;
if ( !pSet->Count() )
{
- if ( !bDeep )
- return;
-
while ( nullptr != ( pSet = pSet->GetParent() ) && !pSet->Count() )
;
@@ -5062,7 +5059,7 @@ void AttributeOutputBase::OutputStyleItemSet( const SfxItemSet& rSet, bool bDeep
}
const SfxPoolItem* pItem;
- if ( !bDeep || !pSet->GetParent() )
+ if ( !pSet->GetParent() )
{
OSL_ENSURE( rSet.Count(), "Wurde doch schon behandelt oder?" );
SfxItemIter aIter( *pSet );
@@ -5077,7 +5074,7 @@ void AttributeOutputBase::OutputStyleItemSet( const SfxItemSet& rSet, bool bDeep
sal_uInt16 nWhich = aIter.FirstWhich();
while ( nWhich )
{
- if ( SfxItemState::SET == pSet->GetItemState( nWhich, bDeep, &pItem ) &&
+ if ( SfxItemState::SET == pSet->GetItemState( nWhich, true/*bDeep*/, &pItem ) &&
( !bTestForDefault ||
*pItem != rPool.GetDefaultItem( nWhich ) ||
( pSet->GetParent() && *pItem != pSet->GetParent()->Get( nWhich ) ) ) )
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index b75d96ed5617..15c0abb63c94 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -74,8 +74,8 @@ OUString MSOWordCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key )
return OUString();
}
-SwCTBWrapper::SwCTBWrapper( bool bReadId ) : Tcg255SubStruct( bReadId )
-,reserved2(0)
+SwCTBWrapper::SwCTBWrapper() :
+reserved2(0)
,reserved3(0)
,reserved4(0)
,reserved5(0)
@@ -833,33 +833,33 @@ bool Tcg255::processSubStruct( sal_uInt8 nId, SvStream &rS )
{
case 0x1:
{
- pSubStruct = new PlfMcd( false ); // don't read the id
+ pSubStruct = new PlfMcd;
break;
}
case 0x2:
{
- pSubStruct = new PlfAcd( false );
+ pSubStruct = new PlfAcd;
break;
}
case 0x3:
case 0x4:
{
- pSubStruct = new PlfKme( false );
+ pSubStruct = new PlfKme;
break;
}
case 0x10:
{
- pSubStruct = new TcgSttbf( false );
+ pSubStruct = new TcgSttbf;
break;
}
case 0x11:
{
- pSubStruct = new MacroNames( false );
+ pSubStruct = new MacroNames;
break;
}
case 0x12:
{
- pSubStruct = new SwCTBWrapper( false );
+ pSubStruct = new SwCTBWrapper;
break;
}
default:
@@ -927,7 +927,7 @@ void Tcg255::Print( FILE* fp)
}
#endif
-Tcg255SubStruct::Tcg255SubStruct( bool bReadId ) : mbReadId( bReadId ), ch(0)
+Tcg255SubStruct::Tcg255SubStruct( ) : ch(0)
{
}
@@ -935,14 +935,11 @@ bool Tcg255SubStruct::Read(SvStream &rS)
{
SAL_INFO("sw.ww8","Tcg255SubStruct::Read() stream pos 0x" << std::hex << rS.Tell() );
nOffSet = rS.Tell();
- if ( mbReadId )
- rS.ReadUChar( ch );
return rS.good();
}
-PlfMcd::PlfMcd(bool bReadId)
- : Tcg255SubStruct(bReadId)
- , iMac(0)
+PlfMcd::PlfMcd()
+ : iMac(0)
{
}
@@ -979,8 +976,8 @@ void PlfMcd::Print( FILE* fp )
}
#endif
-PlfAcd::PlfAcd( bool bReadId ) : Tcg255SubStruct( bReadId )
-,iMac(0)
+PlfAcd::PlfAcd() :
+ iMac(0)
,rgacd(nullptr)
{
}
@@ -1031,8 +1028,8 @@ void PlfAcd::Print( FILE* fp )
}
#endif
-PlfKme::PlfKme( bool bReadId ) : Tcg255SubStruct( bReadId )
-,iMac( 0 )
+PlfKme::PlfKme() :
+ iMac( 0 )
,rgkme( nullptr )
{
}
@@ -1075,7 +1072,7 @@ void PlfKme::Print( FILE* fp )
}
#endif
-TcgSttbf::TcgSttbf( bool bReadId ) : Tcg255SubStruct( bReadId )
+TcgSttbf::TcgSttbf()
{
}
@@ -1145,8 +1142,8 @@ void TcgSttbfCore::Print( FILE* fp )
}
#endif
-MacroNames::MacroNames( bool bReadId ) : Tcg255SubStruct( bReadId )
-,iMac( 0 )
+MacroNames::MacroNames() :
+ iMac( 0 )
,rgNames( nullptr )
{
}
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index 2ee0af5f6419..c5079f4eb617 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -100,7 +100,6 @@ class Tcg255SubStruct : public TBBase
{
friend class Tcg255;
- bool mbReadId;
Tcg255SubStruct(const Tcg255SubStruct&) = delete;
Tcg255SubStruct& operator = ( const Tcg255SubStruct&) = delete;
@@ -108,7 +107,7 @@ protected:
sal_uInt8 ch;
public:
- explicit Tcg255SubStruct( bool bReadId );
+ explicit Tcg255SubStruct();
virtual ~Tcg255SubStruct() override {}
sal_uInt8 id() const { return ch; }
bool Read(SvStream &rS) override;
@@ -162,7 +161,7 @@ class SwCTBWrapper : public Tcg255SubStruct
SwCTBWrapper& operator = ( const SwCTBWrapper&) = delete;
public:
- explicit SwCTBWrapper( bool bReadId );
+ explicit SwCTBWrapper();
virtual ~SwCTBWrapper() override;
void InsertDropIndex( sal_Int32 aIndex ) { dropDownMenuIndices.push_back( aIndex ); }
SwTBC* GetTBCAtOffset( sal_uInt32 nStreamOffset );
@@ -206,7 +205,7 @@ class PlfMcd : public Tcg255SubStruct
PlfMcd& operator = ( const PlfMcd&) = delete;
public:
- explicit PlfMcd( bool bReadId );
+ explicit PlfMcd();
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* ) override;
@@ -237,7 +236,7 @@ class PlfAcd: public Tcg255SubStruct
PlfAcd& operator = ( const PlfAcd&) = delete;
public:
- explicit PlfAcd( bool bReadId );
+ explicit PlfAcd();
virtual ~PlfAcd() override;
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
@@ -274,7 +273,7 @@ class PlfKme : public Tcg255SubStruct
PlfKme& operator = ( const PlfKme&) = delete;
public:
- explicit PlfKme( bool bReadId );
+ explicit PlfKme();
virtual ~PlfKme() override;
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
@@ -315,7 +314,7 @@ class TcgSttbf : public Tcg255SubStruct
TcgSttbf& operator = ( const TcgSttbf&) = delete;
public:
- explicit TcgSttbf( bool bReadId );
+ explicit TcgSttbf();
virtual ~TcgSttbf() override {}
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
@@ -365,7 +364,7 @@ class MacroNames : public Tcg255SubStruct
MacroNames& operator = ( const MacroNames&) = delete;
public:
- explicit MacroNames( bool bReadId );
+ explicit MacroNames();
virtual ~MacroNames() override;
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
generated by cgit (git 2.34.1) at 2024-07-29 16:44:29 +0000