[Libreoffice-commits] .: 6 commits - binfilter/bf_sch binfilter/bf_sfx2 binfilter/bf_svx binfilter/bf_sw binfilter/inc filter/inc filter/source lotuswordpro/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Jul 26 04:39:16 PDT 2011
binfilter/bf_sch/source/core/sch_chtmode2.cxx | 95 ---------
binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx | 8
binfilter/bf_svx/source/editeng/editobj2.hxx | 2
binfilter/bf_svx/source/editeng/svx_editobj.cxx | 100 ---------
binfilter/bf_svx/source/engine3d/svx_scene3d.cxx | 40 ---
binfilter/bf_svx/source/outliner/svx_outlobj.cxx | 10
binfilter/bf_sw/source/core/inc/laycache.hxx | 3
binfilter/bf_sw/source/core/layout/sw_laycache.cxx | 172 ----------------
binfilter/bf_sw/source/core/sw3io/sw3imp.hxx | 14 -
binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx | 167 ----------------
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx | 187 ------------------
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 134 ------------
binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx | 17 -
binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx | 217 --------------------
binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx | 30 --
binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx | 75 -------
binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx | 108 ----------
binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx | 27 --
binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx | 18 -
binfilter/inc/bf_sch/chtmodel.hxx | 5
binfilter/inc/bf_svx/editobj.hxx | 2
binfilter/inc/bf_svx/outlobj.hxx | 2
binfilter/inc/bf_svx/scene3d.hxx | 4
binfilter/inc/bf_sw/sw3io.hxx | 2
filter/inc/filter/msfilter/msdffimp.hxx | 11 -
filter/source/msfilter/msdffimp.cxx | 68 +++---
lotuswordpro/source/filter/lwpbulletstylemgr.cxx | 218 ---------------------
lotuswordpro/source/filter/lwpbulletstylemgr.hxx | 8
lotuswordpro/source/filter/lwpoleobject.cxx | 53 -----
lotuswordpro/source/filter/lwpoleobject.hxx | 4
30 files changed, 39 insertions(+), 1762 deletions(-)
New commits:
commit 7909e151773029280706f56a064a75186c359425
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 26 00:38:44 2011 +0100
enforce checking the return value of these
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index e51791e..51bd8da 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -594,12 +594,11 @@ public:
static void MSDFFReadZString( SvStream& rIn, String& rStr, sal_uLong nMaxLen, bool bUniCode = sal_False );
- static sal_Bool ReadCommonRecordHeader( DffRecordHeader& rRec, SvStream& rIn );
- static sal_Bool ReadCommonRecordHeader( SvStream& rSt,
- sal_uInt8& rVer,
- sal_uInt16& rInst,
- sal_uInt16& rFbt,
- sal_uInt32& rLength );
+ static bool ReadCommonRecordHeader(DffRecordHeader& rRec, SvStream& rIn)
+ SAL_WARN_UNUSED_RESULT;
+ static bool ReadCommonRecordHeader(SvStream& rSt, sal_uInt8& rVer,
+ sal_uInt16& rInst, sal_uInt16& rFbt, sal_uInt32& rLength)
+ SAL_WARN_UNUSED_RESULT;
/*
Konstruktor
===========
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index e2ebba0..ac9f128 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6942,22 +6942,17 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData,
}
/* static */
-sal_Bool SvxMSDffManager::ReadCommonRecordHeader(DffRecordHeader& rRec, SvStream& rIn)
+bool SvxMSDffManager::ReadCommonRecordHeader(DffRecordHeader& rRec,
+ SvStream& rIn)
{
rRec.nFilePos = rIn.Tell();
- return SvxMSDffManager::ReadCommonRecordHeader( rIn,rRec.nRecVer,
- rRec.nRecInstance,
- rRec.nRecType,
- rRec.nRecLen );
+ return SvxMSDffManager::ReadCommonRecordHeader(rIn,rRec.nRecVer,
+ rRec.nRecInstance, rRec.nRecType, rRec.nRecLen);
}
-
-/* auch static */
-sal_Bool SvxMSDffManager::ReadCommonRecordHeader( SvStream& rSt,
- sal_uInt8& rVer,
- sal_uInt16& rInst,
- sal_uInt16& rFbt,
- sal_uInt32& rLength )
+/* also static */
+bool SvxMSDffManager::ReadCommonRecordHeader(SvStream& rSt,
+ sal_uInt8& rVer, sal_uInt16& rInst, sal_uInt16& rFbt, sal_uInt32& rLength)
{
sal_uInt16 nTmp(0);
rSt >> nTmp >> rFbt >> rLength;
commit bc99f5a3666c95adad3569338d64bd58e974314a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 26 00:30:11 2011 +0100
callcatcher: ditch various unused write methods
diff --git a/binfilter/bf_sch/source/core/sch_chtmode2.cxx b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
index f0bf6a4..e0411f2 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
@@ -634,99 +634,6 @@ enum ChartStyleV0
/*N*/ return pGroup;
/*N*/ }
-/*N*/ void ChartModel::PrepareOld3DStorage()
-/*N*/ {
-/*N*/ SfxItemSet aTmpSet(*pItemPool,nRowWhichPairs);
-/*N*/ aTmpSet.Put(XLineStyleItem(XLINE_SOLID));
-/*N*/ aTmpSet.Put(XLineWidthItem(0));
-/*N*/ aTmpSet.Put(XLineColorItem(String(), RGBColor(COL_BLACK)));
-/*N*/
-/*N*/
-/*N*/ long i,nCount=aDataRowAttrList.size();
-/*N*/ for (i=0;i<nCount;i++)
-/*N*/ {
-/*N*/ SfxItemSet *pDataRowAttr = new SfxItemSet (*pItemPool, nRowWhichPairs);
-/*N*/ pDataRowAttr->Put( *( aDataRowAttrList[ i ] ) );
-/*N*/ pDataRowAttr->Put(aTmpSet);
-/*N*/ aTmpDataRowAttrList.push_back( pDataRowAttr );
-/*N*/ }
-/*N*/
-/*N*/ SfxItemSet * pItemSet;
-/*N*/ nCount=aDataPointAttrList.size();
-/*N*/ for (i=0;i<nCount;i++)
-/*N*/ {
-/*N*/ SfxItemSet* pSet=new SfxItemSet(*pItemPool, nRowWhichPairs);
-/*N*/ pItemSet = aDataPointAttrList[ i ];
-/*N*/ if (pItemSet != NULL)
-/*N*/ pSet->Put(*pItemSet);
-/*N*/ pSet->Put(aTmpSet);
-/*N*/ aTmpDataPointAttrList.push_back( pSet );
-/*N*/ }
-/*N*/
-/*N*/ nCount=aSwitchDataPointAttrList.size();
-/*N*/ for (i=0;i<nCount;i++)
-/*N*/ {
-/*N*/ SfxItemSet* pSet=new SfxItemSet(*pItemPool, nRowWhichPairs);
-/*N*/ pItemSet = aSwitchDataPointAttrList[ i ];
-/*N*/ if (pItemSet != NULL)
-/*N*/ pSet->Put(*pItemSet);
-/*N*/ pSet->Put(aTmpSet);
-/*N*/ aTmpSwitchDataPointAttrList.push_back( pSet );
-/*N*/ }
-/*N*/ }
-/*N*/ void ChartModel::CleanupOld3DStorage()
-/*N*/ {
-/*N*/ long i,nCount = aTmpDataRowAttrList.size();
-/*N*/ for (i = 0 ; i < nCount; i++)
-/*N*/ delete aTmpDataRowAttrList[ i ];
-/*N*/ aTmpDataRowAttrList.clear();
-/*N*/
-/*N*/ nCount = aTmpDataPointAttrList.size();
-/*N*/ for (i = 0 ; i < nCount; i++)
-/*N*/ delete aTmpDataPointAttrList[ i ];
-/*N*/ aTmpDataPointAttrList.clear();
-/*N*/
-/*N*/ nCount = aTmpSwitchDataPointAttrList.size();
-/*N*/ for (i = 0 ; i < nCount; i++)
-/*N*/ delete aTmpSwitchDataPointAttrList[ i ];
-/*N*/ aTmpSwitchDataPointAttrList.clear();
-/*N*/ }
-/*************************************************************************
-|*
-|* Chart-Attribute speichern
-
-\************************************************************************/
-/*N*/ void ChartModel::PrepareAxisStorage()
-/*N*/ {
-/*N*/ if(pTmpXItems)
-/*?*/ delete pTmpXItems;
-/*N*/ if(pTmpYItems)
-/*?*/ delete pTmpYItems;
-/*N*/ if(pTmpZItems)
-/*?*/ delete pTmpZItems;
-/*N*/ //Leider muss das ummappen vorm speichern des pools stattfinden
-/*N*/ pTmpXItems = new SfxItemSet(*pItemPool,nCompatAxisWhichPairs);
-/*N*/ pTmpYItems = new SfxItemSet(*pItemPool,nCompatAxisWhichPairs);
-/*N*/ pTmpZItems = new SfxItemSet(*pItemPool,nCompatAxisWhichPairs);
-/*N*/
-/*N*/ pTmpXItems->Put(GetAttr(CHOBJID_DIAGRAM_X_AXIS));
-/*N*/ AxisAttrNew2Old(*pTmpXItems,CHOBJID_DIAGRAM_X_AXIS,TRUE);
-/*N*/
-/*N*/ pTmpYItems->Put(GetAttr(CHOBJID_DIAGRAM_Y_AXIS));
-/*N*/ AxisAttrNew2Old(*pTmpYItems,CHOBJID_DIAGRAM_Y_AXIS,TRUE);
-/*N*/
-/*N*/ pTmpZItems->Put(GetAttr(CHOBJID_DIAGRAM_Z_AXIS));
-/*N*/ AxisAttrNew2Old(*pTmpZItems,CHOBJID_DIAGRAM_Z_AXIS,TRUE);
-/*N*/
-/*N*/
-/*N*/ //Achse wird auf Attr-Basis gestreamt!
-/*N*/ pChartXAxis->FillItemSet();
-/*N*/ pChartYAxis->FillItemSet();
-/*N*/ pChartZAxis->FillItemSet();
-/*N*/ pChartBAxis->FillItemSet();
-/*N*/ pChartAAxis->FillItemSet();
-/*N*/ }
-
/*N*/ void ChartModel::StoreAttributes(SvStream& rOut) const
/*N*/ {
/*N*/ #ifdef DBG_UTIL
@@ -887,7 +794,7 @@ enum ChartStyleV0
/*N*/
/*N*/
/*N*/
-/*N*/ //Abwaertskompatibel speichern (this->PrepareAxisStorage())
+/*N*/ //Abwaertskompatibel speichern
/*N*/ pTmpXItems->Store(rOut);
/*N*/ pTmpYItems->Store(rOut);
/*N*/ pTmpZItems->Store(rOut);
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
index a010432..ac32cd3 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
@@ -395,14 +395,6 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ aSection.aId = aIdP;
/*N*/ }
-
-/*N*/ SvStream& PaddWithBlanks_Impl(SvStream &rStream, USHORT nCount)
-/*N*/ {
-/*N*/ for ( USHORT n = nCount; n; --n )
-/*N*/ rStream << ' ';
-/*N*/ return rStream;
-/*N*/ }
-
//-------------------------------------------------------------------------
/*N*/ inline SvStream& Skip(SvStream &rStream, USHORT nCount)
diff --git a/binfilter/bf_svx/source/editeng/editobj2.hxx b/binfilter/bf_svx/source/editeng/editobj2.hxx
index 0a6cace..645906c 100644
--- a/binfilter/bf_svx/source/editeng/editobj2.hxx
+++ b/binfilter/bf_svx/source/editeng/editobj2.hxx
@@ -257,8 +257,6 @@ public:
BOOL IsOwnerOfPool() const { return bOwnerOfPool; }
void StoreUnicodeStrings( BOOL b ) { bStoreUnicodeStrings = b; }
- void PrepareStore( SfxStyleSheetPool* pStyleSheetPool );
- void FinishStore();
void FinishLoad( SfxStyleSheetPool* pStyleSheetPool );
};
diff --git a/binfilter/bf_svx/source/editeng/svx_editobj.cxx b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
index d0e3900..8b5230b 100644
--- a/binfilter/bf_svx/source/editeng/svx_editobj.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
@@ -383,16 +383,6 @@ void EditTextObject::AdjustImportedLRSpaceItems( BOOL /*bTurnOfBullets*/ )
OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
}
-void EditTextObject::PrepareStore( SfxStyleSheetPool* /*pStyleSheetPool*/ )
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
-}
-
-void EditTextObject::FinishStore()
-{
- OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
-}
-
void EditTextObject::FinishLoad( SfxStyleSheetPool* /*pStyleSheetPool*/ )
{
OSL_FAIL( "V-Methode direkt vom EditTextObject!" );
@@ -981,96 +971,6 @@ USHORT BinTextObject::GetVersion() const
return nVersion;
}
-
-void BinTextObject::PrepareStore( SfxStyleSheetPool* pStyleSheetPool )
-{
- // Some Items must be generated for the 5.0 file format,
- // because we don't have a special format for 5.x or 6.x
- USHORT nParas = GetContents().Count();
- const SvxNumBulletItem** ppNumBulletItems = new const SvxNumBulletItem*[nParas];
- for ( USHORT nPara = nParas; nPara; )
- {
- ContentInfo* pC = GetContents().GetObject( --nPara );
- const SvxNumBulletItem* pSvxNumBulletItem = NULL;
- const SfxPoolItem* pTmpItem = NULL;
- if ( pC->GetParaAttribs().GetItemState(EE_PARA_NUMBULLET, FALSE, &pTmpItem ) == SFX_ITEM_ON )
- {
- pSvxNumBulletItem = (const SvxNumBulletItem*)pTmpItem;
- }
- else if ( pStyleSheetPool && pC->GetStyle().Len() )
- {
- SfxStyleSheet* pStyle = (SfxStyleSheet*)pStyleSheetPool->Find( pC->GetStyle(), pC->GetFamily() );
- if ( pStyle )
- pSvxNumBulletItem = &(const SvxNumBulletItem&)pStyle->GetItemSet().Get(EE_PARA_NUMBULLET);
- }
-
- ppNumBulletItems[nPara] = pSvxNumBulletItem;
-
- if ( pSvxNumBulletItem )
- {
- // Check if Item allready used, don't create a new one in this case.
- BOOL bInserted = FALSE;
- for ( USHORT nP = nPara+1; nP < nParas; nP++ )
- {
- if ( ppNumBulletItems[nP] == pSvxNumBulletItem )
- {
- ContentInfo* pTmpC = GetContents().GetObject( nP );
- pC->GetParaAttribs().Put( pTmpC->GetParaAttribs().Get( EE_PARA_BULLET ) );
- bInserted = TRUE;
- break;
- }
- }
- if ( !bInserted )
- {
- SvxBulletItem aNewBullet( EE_PARA_BULLET );
- const SfxUInt16Item& rLevel = (const SfxUInt16Item&) pC->GetParaAttribs().Get( EE_PARA_OUTLLEVEL );
- lcl_CreateBulletItem( *pSvxNumBulletItem, rLevel.GetValue(), aNewBullet );
- pC->GetParaAttribs().Put( aNewBullet );
- }
- }
-
- // SymbolConvertion because of StyleSheet?
- pC->DestroyLoadStoreTempInfos(); // Maybe old infos, if somebody is not calling FinishLoad after CreateData, but PrepareStore...
-
- if ( ( pC->GetParaAttribs().GetItemState( EE_CHAR_FONTINFO ) != SFX_ITEM_ON ) && pC->aStyle.Len() && pStyleSheetPool )
- {
- SfxStyleSheet* pStyle = (SfxStyleSheet*)pStyleSheetPool->Find( pC->GetStyle(), pC->GetFamily() );
- if ( pStyle )
- {
- const SvxFontItem& rFontItem = (const SvxFontItem&)pStyle->GetItemSet().Get( EE_CHAR_FONTINFO );
- if ( rFontItem.GetCharSet() == RTL_TEXTENCODING_SYMBOL )
- {
- if ( !pC->GetLoadStoreTempInfos() )
- pC->CreateLoadStoreTempInfos();
- pC->GetLoadStoreTempInfos()->bSymbolParagraph_Store = TRUE;
- }
-
- FontToSubsFontConverter hConv = CreateFontToSubsFontConverter( rFontItem.GetFamilyName(), FONTTOSUBSFONT_EXPORT | FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS );
- if ( hConv )
- {
- // #88414# Convert StarSymbol back to StarBats
- if ( !pC->GetLoadStoreTempInfos() )
- pC->CreateLoadStoreTempInfos();
- pC->GetLoadStoreTempInfos()->hOldSymbolConv_Store = hConv;
- }
- }
- }
- }
-
- delete[] ppNumBulletItems;
-}
-
-void BinTextObject::FinishStore()
-{
- for ( USHORT nPara = GetContents().Count(); nPara; )
- {
- ContentInfo* pC = GetContents().GetObject( --nPara );
- pC->GetParaAttribs().ClearItem( EE_PARA_BULLET );
-
- pC->DestroyLoadStoreTempInfos();
- }
-}
-
void BinTextObject::FinishLoad( SfxStyleSheetPool* pStyleSheetPool )
{
BOOL bCreateNumBulletItem = nVersion && ( nVersion < 501 );
diff --git a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
index 2ef728e..3ab9ccc 100644
--- a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
@@ -783,46 +783,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Licht-Objekte erzeugen, um kompatibel zur 4.0
-|* speichern zu koennen
-|*
-\************************************************************************/
-
-/*N*/ void E3dScene::CreateLightObjectsFromLightGroup()
-/*N*/ {
-/*N*/ if(aLightGroup.IsLightingEnabled())
-/*N*/ {
-/*N*/ // Global Ambient Light
-/*N*/ const Color& rAmbient = aLightGroup.GetGlobalAmbientLight();
-/*N*/ if(rAmbient != Color(COL_BLACK))
-/*N*/ Insert3DObj(new E3dLight(Vector3D(), rAmbient, 1.0));
-/*N*/
-/*N*/ // Andere Lichter
-/*N*/ for(UINT16 a=0;a<BASE3D_MAX_NUMBER_LIGHTS;a++)
-/*N*/ {
-/*N*/ B3dLight& rLight = aLightGroup.GetLightObject((Base3DLightNumber)(Base3DLight0 + a));
-/*N*/ if(rLight.IsEnabled())
-/*N*/ {
-/*N*/ if(rLight.IsDirectionalSource())
-/*N*/ {
-/*N*/ // erzeuge E3dDistantLight
-/*N*/ Insert3DObj(new E3dDistantLight(Vector3D(),
-/*N*/ rLight.GetPosition(),
-/*N*/ rLight.GetIntensity(Base3DMaterialDiffuse), 1.0));
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // erzeuge E3dPointLight
-/*N*/ Insert3DObj(new E3dPointLight(rLight.GetPosition(),
-/*N*/ rLight.GetIntensity(Base3DMaterialDiffuse), 1.0));
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
-/*************************************************************************
-|*
|* Beleuchtung aus dem alten Beleuchtungsmodell uebernehmen
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/outliner/svx_outlobj.cxx b/binfilter/bf_svx/source/outliner/svx_outlobj.cxx
index d4b5e47..c024515 100644
--- a/binfilter/bf_svx/source/outliner/svx_outlobj.cxx
+++ b/binfilter/bf_svx/source/outliner/svx_outlobj.cxx
@@ -216,16 +216,6 @@ namespace binfilter {
/*N*/ pText->MergeParaAttribs( rAttribs, nStart, nEnd );
/*N*/ }
-/*N*/ void OutlinerParaObject::PrepareStore( SfxStyleSheetPool* pStyleSheetPool )
-/*N*/ {
-/*N*/ pText->PrepareStore( pStyleSheetPool );
-/*N*/ }
-
-/*N*/ void OutlinerParaObject::FinishStore()
-/*N*/ {
-/*N*/ pText->FinishStore();
-/*N*/ }
-
/*N*/ void OutlinerParaObject::FinishLoad( SfxStyleSheetPool* pStyleSheetPool )
/*N*/ {
/*N*/ pText->FinishLoad( pStyleSheetPool );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
index b52c709..bb786a4 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
@@ -535,7 +535,6 @@ public:
sal_Unicode cDelim,
rtl_TextEncoding eSource );
static sal_uInt32 InULong( SvStream& ); // ULONG komprimiert lesen
- static void OutULong( SvStream&, sal_uInt32 ); // ULONG komprimiert schreiben
inline SvStream& InString( SvStream& rStrm, String& rStr );
inline SvStream& OutString( SvStream& rStrm, const String& rStr );
@@ -544,10 +543,6 @@ public:
USHORT GetTblLineBoxFmtStrPoolId40( SwFrmFmt *pFmt );
SwFrmFmt *GetTblLineBoxFmt( USHORT nIdx );
-
- void InsertHiddenDrawObjs();
- void RemoveHiddenDrawObjs();
-
// Ist eingelene Datei neuer oder gleich nMinVers und aelter
// (und ungleeich) nMaxVers?
inline BOOL IsVersion( USHORT nMinVers ) const;
@@ -588,7 +583,6 @@ public:
// SW3STYLE.CXX
void LoadStyleSheets( BOOL bNew ); // I: StyleSheets
- void SaveStyleSheets( BOOL bUsed ); // O: StyleSheets
// SW3BLOCK.CXX
void DetectAndSetFFVersion( SvStorage *pRoot );
@@ -605,16 +599,13 @@ public:
// SW3DOC.CXX
void LoadDocContents( SwPaM* ); // I: Dokumentinhalt
- void SaveDocContents( SwPaM&, const String* = NULL );
USHORT GetStreamFlags(); // I: Stream-Flags laden
void InHeader( BOOL bReadRecSizes=FALSE); // I: Dateikopf
void OutHeader( ULONG nRecSzPos=0UL ); // O: Dateikopf
- void OutRecordSizesPos( ULONG nRecSzPos );
BOOL InHeaderForScan( BOOL bReadRecSizes=FALSE );
// SW3FIELD.CXX
SwField* InField(); // I: Feld
- void OutField( const SwFmtFld& ); // O: Feld
void OutFieldTypes(); // O: alle Feldtypen
SwFieldType* InFieldType(); // I: ein Feldtyp
BOOL OutFieldType(const SwFieldType&);// O: ein Feldtyp
@@ -651,7 +642,6 @@ public:
void InPasswd(); // I: Passwort
void SetPasswd( const String& rPass );// IO: Passwort setzen
// O: TOX- und Bookmark-Bereiche suchen
- void CollectMarks( SwPaM*, BOOL bPageStylesOnly );
void InNodeMark( const SwNodeIndex&, xub_StrLen nOffset ); // I: Markierung
void OutNodeMarks( ULONG ); // O: Markierung
void InBookmarks(); // I: Bookmarks
@@ -705,7 +695,6 @@ public:
SwNumRule* InNumRule( BYTE ); // I: Numerierungs-Regelwerk
void OutNumRule( BYTE, const SwNumRule& );
void InNumRules(); // I: NumRules
- void OutNumRules( BOOL bUsed=FALSE ); // O: alle (benutzten) NumRules
void InOutlineExt();
void InNodeNum( SwNodeNum& ); // I: Absatz-Numerierung
void OutNodeNum( const SwNodeNum& ); // O: Absatz-Numerierung
@@ -725,7 +714,6 @@ public:
void InPageFtnInfo( SwPageFtnInfo& ); // I: Fussnoten-Info
void OutPageFtnInfo( const SwPageFtnInfo& rFtn );
void InPageDescs(); // I: alle Seitenvorlagen
- void OutPageDescs( BOOL=FALSE ); // O: alle Seitenvorlagen
SwPageDesc* InPageDesc( USHORT& ); // I: Seitenvorlage
void OutPageDesc( const SwPageDesc& );// O: Seitenvorlage
void ConnectPageDescAttrs(); // I: PageDesc-Referenzen aufloesen
@@ -744,7 +732,6 @@ public:
ULONG OutTOXSection(const SwSectionNode&);// O: TOX SwSection
// SW3TABLE.CXX
- void CollectTblLineBoxFmts40();
void InTable( SwNodeIndex& rPos ); // I: Tabelle
void OutTable( const SwTableNode& ); // O: Tabelle
void InTableLine( SwTableLines&, SwTableBox*, USHORT, SwNodeIndex& );
@@ -757,7 +744,6 @@ public:
void OutRedline( const SwRedline& rRedline );
/*N*/ void InRedlines(); //SW50.SDW
void OutRedlines( BOOL bPageStyles );
- void CollectRedlines( SwPaM* pPaM, BOOL bPageOnly );
/*N*/ void InNodeRedline( const SwNodeIndex& rNodeIdx, INT32& nOffset, BYTE=0 ); //SW50.SDW
void OutNodeRedlines( ULONG );
void CleanupRedlines();
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx
index 2109ed8..9a66ac2 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx
@@ -364,163 +364,6 @@ void lcl_sw3doc_ChgChartName( SwDoc* pDoc )
/*N*/ }
/*N*/ }
-
-// Doc-Header
-// SWG_COMMENT Build des Writers (opt.)
-// SWG_STRINGPOOL Stringpool
-// SWG_PASSWORD Passwort fuer Bereiche (opt.)
-// SWG_OUTLINE Outline-Numerierung (nicht bei Textbausteinen)
-// SWG_NUMRULE Default-Numerierung (nicht bei Textbausteinen)
-// SWG_MACROTBL Makro-Tabelle (nicht bei Textbausteinen)
-// SWG_DICTIONARY Woerterbuecher des Onlinespellings
-// SWG_FOOTINFO globale Fuánoten-Infos (nicht bei Textbausteinen)
-// SWG_FLYFRAMES Seitengebundene Frames (nicht bei Textbausteinen)
-// SWG_FIELDTYPES Feldtypen
-// SWG_TOXDESCS Verzeichnisbereiche
-// SWG_BOOKMARKS Bookmarks
-// SWG_CONTENTS Dokumentinhalt
-// SWG_FRAMEINFO Layout-Frames
-// SWG_STRINGPOOL Liste aller Namen von embedded-Grafiken
-// SWG_JOBSETUP Job-Setup (nicht bei Textbausteinen)
-// SWG_EOF Streamende
-
-/*N*/ void Sw3IoImp::SaveDocContents( SwPaM& rPaM, const String* pBlockName )
-/*N*/ {
-/*N*/ if( pBlockName )
-/*?*/ bBlock = TRUE, aBlkName = *pBlockName;
-/*N*/ OutHeader();
-/*N*/ // Alle FlyFrames am Doc sammeln
-/*N*/ CollectFlyFrms( &rPaM );
-/*N*/ aStringPool.Setup( *pDoc, pStrm->GetVersion(), pExportInfo );
-/*N*/ // Ausgabe des Versions-Textes, falls vorhanden
-/*N*/ String aVersion = GetSWGVersion();
-/*N*/ if( aVersion.Len() )
-/*N*/ {
-/*N*/ ByteString sTmp( aVersion, eSrcSet );
-/*N*/ OpenRec( SWG_COMMENT );
-/*N*/ *pStrm << sTmp.GetBuffer();
-/*N*/ CloseRec( SWG_COMMENT );
-/*N*/ }
-/*N*/ // der DatenbankName
-/*N*/ OutDBName();
-/*N*/
-/*N*/ // Der String-Pool
-/*N*/ OutStringPool( SWG_STRINGPOOL, aStringPool );
-/*N*/ if( !bBlock )
-/*N*/ {
-/*N*/ if( !nRes )
-/*N*/ {
-/*N*/ aStat.Reset();
-/*N*/ aStat.nPara = 0; // default ist auf 1
-/*N*/ OutDocStat( TRUE );
-/*N*/ aDefWordDelim = SW_MOD()->GetDocStatWordDelim();
-/*N*/ }
-/*N*/
-/*N*/ // Outline-Numerierung, falls vorhanden
-/*N*/ if( pDoc->GetOutlineNumRule() && IsSw31Or40Export() )
-/*N*/ OutNumRule( SWG_OUTLINE, *pDoc->GetOutlineNumRule() );
-/*N*/
-/*N*/ // globale Fussnoten-Info
-/*N*/ if( !nRes )
-/*N*/ OutFtnInfo();
-/*N*/ if( !nRes && !IsSw31Or40Export() )
-/*N*/ OutEndNoteInfo();
-/*N*/ if( !nRes && !IsSw31Or40Export() )
-/*N*/ OutLineNumberInfo();
-/*N*/ }
-/*N*/
-/*N*/ // Woerterbuecher des Onlinespellings
-/*N*/ if( !nRes && !IsSw31Export() ) OutDictionary();
-/*N*/ // Numberformatter schreiben bei Textbausteinen. Bei normalen
-/*N*/ // Dokumenten erfolgt es schon bei den PageDescs
-/*N*/ if( !nRes && !IsSw31Export() && bBlock ) OutNumberFormatter();
-/*N*/
-/*N*/ // Makro-Tabellen
-/*N*/ if( !nRes ) OutMacroTbl();
-/*N*/ // Nicht-Systemfeldtypen
-/*N*/ if( !nRes ) OutFieldTypes();
-/*N*/ // Verzeichnisbereiche
-/*N*/ if( !nRes )
-/*N*/ {
-/*N*/ OutTOXs51();
-/*N*/ if( !nRes && !IsSw31Or40Export() )
-/*N*/ OutTOXs();
-/*N*/ }
-/*N*/
-/*N*/ // Bookmarks (nicht, wenn ein SW2-TextBlockDoc konvertiert wird)
-/*N*/ // JP 16.10.95: werden jetzt im OutPageDesc geschrieben
-/*N*/ // MIB 11.12.96: es werden jetzt die Bookmarks der Seiten-Vorlagen und
-/*N*/ // im Dok jeweils getrennt in die Streams geschrieben
-/*N*/ if( !nRes && !( nGblFlags & SW3F_CONVBLOCK ) && !IsSw31Export() )
-/*N*/ OutBookmarks( FALSE );
-/*N*/
-/*N*/ // Solange Textbausteine ueber Zwischen-Dokumente geladen und
-/*N*/ // gespeichert werden, kann es dort keine Redlines geben. Also
-/*N*/ // muss man dies nirgendwo abfangen (nicht nur hier nicht).
-/*N*/ if( !nRes && !IsSw31Or40Export() )
-/*N*/ OutRedlines( FALSE );
-/*N*/
-/*N*/ // Einstellungen der PagePreView speichern
-/*N*/ if( !nRes && !bBlock && !IsSw31Or40Export() )
-/*N*/ OutPagePreViewPrintData();
-/*N*/
-/*N*/ // Eine handvoll persistenten Dummy-Member
-/*N*/ if( !nRes && !IsSw31Or40Export() )
-/*N*/ OutDocDummies();
-/*N*/
-/*N*/ // Der Inhalt
-/*N*/ SwPaM* pPaM = &rPaM;
-/*N*/ while( !nRes )
-/*N*/ {
-/*N*/ pCurPaM = pPaM;
-/*N*/ // seitengebundene FlyFrames
-/*N*/ if( !pBlockName ) OutFlyFrames( *pPaM );
-/*N*/ OutContents( pPaM );
-/*N*/ if( (SwPaM*) pPaM->GetNext() != &rPaM )
-/*N*/ {
-/*?*/ pPaM = (SwPaM*) pPaM->GetNext();
-/*N*/ }
-/*N*/ else break;
-/*N*/ }
-/*N*/ // der Job-Setup. Vor dem Layout, damit das Layout bei veraendertem Drucker
-/*N*/ // gleich geeignet invalidiert werden kann.
-/*N*/ if( !bBlock && !nRes )
-/*N*/ OutJobSetup();
-/*N*/
-/*N*/ #ifdef TEST_HUGE_DOCS
-/*N*/ BOOL b = FALSE;
-/*N*/ if( b )
-/*N*/ OutHugeRecord( 1024, 32*1024 );
-/*N*/ #endif
-/*N*/
-/*N*/ ULONG nRecSzPos = 0;
-/*N*/ if( !nRes && HasRecSizes() && !IsSw31Or40Export() )
- nRecSzPos = OutRecSizes();
-/*N*/
-/*N*/ OpenRec( SWG_EOF );
-/*N*/ CloseRec( SWG_EOF );
-/*N*/ // Ggf. Fehlerflag schreiben
-/*N*/ if( nRes )
-/*N*/ {
-/*?*/ nFileFlags |= SWGF_BAD_FILE;
-/*N*/ }
-/*N*/ // Datei-Flags noch einmal schreiben
-/*N*/ pStrm->Seek( 0L );
-/*N*/ OutHeader( nRecSzPos );
-/*N*/ // Temporaere Namenserweiterungen entfernen
-/*N*/ aStringPool.RemoveExtensions( *pDoc );
-/*N*/ FreeFlyFrms();
-/*N*/ // Die gesammelte Statistik am Doc setzen
-/*N*/ if( !bBlock )
-/*N*/ {
-/*N*/ // Bis das Layout gespeichert wird, die Seiten uebernehmen
-/*N*/ if( pDoc->GetRootFrm() )
-/*N*/ aStat.nPage = pDoc->GetRootFrm()->GetPageNum();
-/*N*/ pDoc->SetDocStat( aStat );
-/*N*/ OutDocStat( FALSE );
-/*N*/ }
-/*N*/ }
-
//////////////////////////////////////////////////////////////////////////////
// Laden des Doc-Headers.
@@ -732,16 +575,6 @@ void lcl_sw3doc_ChgChartName( SwDoc* pDoc )
/*N*/ }
/*N*/ }
-void Sw3IoImp::OutRecordSizesPos( ULONG nRecSzPos )
-{
- ULONG nPos = pStrm->Tell();
-
- pStrm->Seek( 16UL );
- *pStrm << (UINT32)nRecSzPos;
-
- pStrm->Seek( nPos );
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index 4feede9..a1735e0 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -2576,97 +2576,6 @@ static Sw3InFieldFn aInFieldFnTbl[] =
/*N*/ return pFld;
/*N*/ }
-typedef void (*Sw3OutFieldFn)( Sw3IoImp&, SwField* );
-
-static Sw3OutFieldFn aOutFieldFnTbl40[] =
-{
- &lcl_sw3io_OutDBField40, // RES_DBFLD
- &lcl_sw3io_OutUserField, // RES_USERFLD
- 0, // RES_FILENAMEFLD
- &lcl_sw3io_OutDBNameField, // RES_DBNAMEFLD
- 0, // RES_DATEFLD
- 0, // RES_TIMEFLD
- &lcl_sw3io_OutPageNumberField40, // RES_PAGENUMBERFLD
- 0, // RES_AUTHORFLD
- &lcl_sw3io_OutChapterField, // RES_CHAPTERFLD
- &lcl_sw3io_OutDocStatField40, // RES_DOCSTATFLD
- &lcl_sw3io_OutGetExpField40, // RES_GETEXPFLD
- &lcl_sw3io_OutSetExpField40, // RES_SETEXPFLD
- &lcl_sw3io_OutGetRefField40, // RES_GETREFFLD
- &lcl_sw3io_OutHiddenTxtField40, // RES_HIDDENTXTFLD
- &lcl_sw3io_OutPostItField, // RES_POSTITFLD
- &lcl_sw3io_OutFixDateField40, // RES_FIXDATEFLD
- &lcl_sw3io_OutFixTimeField40, // RES_FIXTIMEFLD
- 0, // RES_REGFLD
- 0, // RES_VARREGFLD
- 0, // RES_SETREFFLD
- &lcl_sw3io_OutInputField40, // RES_INPUTFLD
- &lcl_sw3io_OutMacroField, // RES_MACROFLD
- &lcl_sw3io_OutDDEField, // RES_DDEFLD
- &lcl_sw3io_OutTblField, // RES_TABLEFLD
- &lcl_sw3io_OutHiddenParaField, // RES_HIDDENPARAFLD
- &lcl_sw3io_OutDocInfoField40, // RES_DOCINFOFLD
- 0, // RES_TEMPLNAMEFLD
- &lcl_sw3io_OutDBNextSetField, // RES_DBNEXTSETFLD
- &lcl_sw3io_OutDBNumSetField, // RES_DBNUMSETFLD
- &lcl_sw3io_OutDBSetNumberField, // RES_DBSETNUMBERFLD
- &lcl_sw3io_OutExtUserField40, // RES_EXTUSERFLD
- &lcl_sw3io_OutRefPageSetField, // RES_REFPAGESETFLD
- &lcl_sw3io_OutRefPageGetField, // RES_REFPAGEGETFLD
- 0, // RES_INTERNETFLD
- &lcl_sw3io_OutJumpEditField, // RES_JUMPEDITFLD
- &lcl_sw3io_OutScriptField40, // RES_SCRIPTFLD
- 0, // RES_DATETIMEFLD
- 0, // RES_AUTHORITY
- 0, // RES_COMBINED_CHARS
- 0 // RES_DROPDOWN #108791#
-};
-
-static Sw3OutFieldFn aOutFieldFnTbl[] =
-{
- &lcl_sw3io_OutDBField, // RES_DBFLD
- &lcl_sw3io_OutUserField, // RES_USERFLD
- &lcl_sw3io_OutFileNameField, // RES_FILENAMEFLD
- &lcl_sw3io_OutDBNameField, // RES_DBNAMEFLD
- 0, // RES_DATEFLD
- 0, // RES_TIMEFLD
- &lcl_sw3io_OutPageNumberField, // RES_PAGENUMBERFLD
- &lcl_sw3io_OutAuthorField, // RES_AUTHORFLD
- &lcl_sw3io_OutChapterField, // RES_CHAPTERFLD
- 0, // RES_DOCSTATFLD
- &lcl_sw3io_OutGetExpField, // RES_GETEXPFLD
- &lcl_sw3io_OutSetExpField, // RES_SETEXPFLD
- &lcl_sw3io_OutGetRefField, // RES_GETREFFLD
- &lcl_sw3io_OutHiddenTxtField, // RES_HIDDENTXTFLD
- &lcl_sw3io_OutPostItField, // RES_POSTITFLD
- 0, // RES_FIXDATEFLD
- 0, // RES_FIXTIMEFLD
- 0, // RES_REGFLD
- 0, // RES_VARREGFLD
- 0, // RES_SETREFFLD
- &lcl_sw3io_OutInputField, // RES_INPUTFLD
- &lcl_sw3io_OutMacroField, // RES_MACROFLD
- &lcl_sw3io_OutDDEField, // RES_DDEFLD
- &lcl_sw3io_OutTblField, // RES_TABLEFLD
- &lcl_sw3io_OutHiddenParaField, // RES_HIDDENPARAFLD
- &lcl_sw3io_OutDocInfoField, // RES_DOCINFOFLD
- 0, // RES_TEMPLNAMEFLD
- &lcl_sw3io_OutDBNextSetField, // RES_DBNEXTSETFLD
- &lcl_sw3io_OutDBNumSetField, // RES_DBNUMSETFLD
- &lcl_sw3io_OutDBSetNumberField, // RES_DBSETNUMBERFLD
- &lcl_sw3io_OutExtUserField, // RES_EXTUSERFLD
- &lcl_sw3io_OutRefPageSetField, // RES_REFPAGESETFLD
- &lcl_sw3io_OutRefPageGetField, // RES_REFPAGEGETFLD
- 0, // RES_INTERNETFLD
- &lcl_sw3io_OutJumpEditField, // RES_JUMPEDITFLD
- &lcl_sw3io_OutScriptField, // RES_SCRIPTFLD
- &lcl_sw3io_OutDateTimeField, // RES_DATETIMEFLD
- &lcl_sw3io_OutAuthorityField, // RES_AUTHORITY
- 0, // RES_COMBINED_CHARS
- 0 // RES_DROPDOWN #108791#
-};
-
-
/*N*/ void lcl_sw3io_OutAnySetExpField40( Sw3IoImp& rIo, const sal_Char *pName,
/*N*/ const String& rExpand )
/*N*/ {
@@ -2693,102 +2602,6 @@ static Sw3OutFieldFn aOutFieldFnTbl[] =
/*N*/ lcl_sw3io_OutSetExpField( rIo, &aFld );
/*N*/ }
-/*N*/ void Sw3IoImp::OutField( const SwFmtFld& rAttr )
-/*N*/ {
-/*N*/ OSL_ENSURE( RES_FIELDS_END-RES_FIELDS_BEGIN ==
-/*N*/ sizeof(aOutFieldFnTbl) / sizeof(Sw3OutFieldFn),
-/*N*/ "Neues Feld? Und tschuess..." );
-/*N*/ OSL_ENSURE( RES_FIELDS_END-RES_FIELDS_BEGIN ==
-/*N*/ sizeof(aOutFieldFnTbl40) / sizeof(Sw3OutFieldFn),
-/*N*/ "Neues Feld? Und tschuess..." );
-/*N*/
-/*N*/ const SwField* pFld = rAttr.GetFld();
-/*N*/ OSL_ENSURE( pFld, "SWG-Writer: SwAttrFld-Hint ohne Inhalt!" );
-/*N*/ if( !pFld )
-/*N*/ return;
-/*N*/
-/*N*/ SwFieldType* pType = pFld->GetTyp();
-/*N*/ if( !pType )
-/*N*/ return;
-/*N*/
-/*N*/ UINT16 nWhich = pType->Which();
-/*N*/ sal_uInt32 nFmt = pFld->GetFormat();
-/*N*/
-/*N*/ if( SOFFICE_FILEFORMAT_40 >= pStrm->GetVersion() )
-/*N*/ {
-/*N*/ const sal_Char *pExportSetExpFld = 0;
-/*N*/ switch( nWhich )
-/*N*/ {
-/*N*/ case RES_DOCINFOFLD:
-/*N*/ if( ((SwDocInfoField*)pFld)->IsFixed() )
-/*N*/ pExportSetExpFld = sSW3IO_FixedField;
-/*N*/ break;
-/*N*/ case RES_AUTHORFLD:
-/*N*/ if( ((SwAuthorField*)pFld)->IsFixed() )
-/*N*/ pExportSetExpFld = sSW3IO_FixedField;
-/*N*/ break;
-/*N*/ case RES_EXTUSERFLD:
-/*N*/ if( ((SwExtUserField*)pFld)->IsFixed() )
-/*N*/ pExportSetExpFld = sSW3IO_FixedField;
-/*N*/ break;
-/*N*/ case RES_FILENAMEFLD:
-/*N*/ if( ((SwFileNameField*)pFld)->IsFixed() )
-/*N*/ pExportSetExpFld = sSW3IO_FixedField;
-/*N*/ break;
-/*N*/ case RES_AUTHORITY:
-/*N*/ pExportSetExpFld = sSW3IO_AuthorityField;
-/*N*/ break;
-/*N*/
-/*N*/ /* #108791# */
-/*N*/ case RES_DROPDOWN:
-/*N*/ pExportSetExpFld = sSW3IO_DropDownField;
-/*N*/ break;
-/*N*/ }
-/*N*/
-/*N*/ if( pExportSetExpFld )
-/*N*/ {
-/*N*/ lcl_sw3io_OutAnySetExpField40( *this, pExportSetExpFld,
-/*N*/ pFld->Expand() );
-/*N*/ return;
-/*N*/ }
-/*N*/
-/*N*/ // Format wandeln
-/*N*/ sw3io_ConvertToOldField( pFld, nWhich, nFmt, pStrm->GetVersion() );
-/*N*/ }
-/*N*/ /* #108791# */
-/*N*/ else if (RES_DROPDOWN == nWhich)
-/*N*/ {
-/*N*/ lcl_sw3io_OutAnySetExpField( *this, sSW3IO_DropDownField,
-/*N*/ pFld->Expand() );
-/*N*/
-/*N*/ return;
-/*N*/ }
-/*N*/
-/*N*/ // nField koennte von sw3io_GetOldFieldFormat geaendert worden sein
-/*N*/ *pStrm << (UINT16) ( nWhich - RES_FIELDS_BEGIN );
-/*N*/
-/*N*/ if( SOFFICE_FILEFORMAT_40 >= pStrm->GetVersion() )
-/*N*/ {
-/*N*/ *pStrm << (UINT16) nFmt;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ *pStrm << (UINT32) nFmt
-/*N*/ << (UINT16)pFld->GetSubType();
-/*N*/ }
-/*N*/
-/*N*/ Sw3OutFieldFn *pFnTbl;
-/*N*/ if( IsSw31Or40Export() )
-/*N*/ pFnTbl = aOutFieldFnTbl40;
-/*N*/ else
-/*N*/ pFnTbl = aOutFieldFnTbl;
-/*N*/
-/*N*/ Sw3OutFieldFn pFn = pFnTbl[nWhich-RES_FIELDS_BEGIN];
-/*N*/
-/*N*/ if( pFn )
-/*N*/ (*pFn)( *this, (SwField *)pFld );
-/*N*/ }
-
// Ausgabe aller Feldtypen, die keine Systemtypen sind
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 60c8d86..0c6dcf2 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -362,93 +362,6 @@ public:
/*N*/ bAdditive = bNormal ? !bOverwrite : rOpt.IsMerge();
/*N*/ }
-/*N*/ void Sw3IoImp::InsertHiddenDrawObjs()
-/*N*/ {
-/*N*/ if( !pDoc->GetDrawModel() )
-/*N*/ return;
-/*N*/
-/*N*/ const SwSpzFrmFmts* pFlys = pDoc->GetSpzFrmFmts();
-/*N*/ sal_uInt16 nArrLen = pFlys->Count();
-/*N*/
-/*N*/ SdrPage *pPage = pDoc->GetDrawModel()->GetPage( 0 );
-/*N*/ OSL_ENSURE( !pHiddenDrawObjs, "hidden obj list exists" );
-/*N*/ delete pHiddenDrawObjs;
-/*N*/ pHiddenDrawObjs = 0;
-/*N*/
-/*N*/ sal_uInt16 nCount = pPage->GetObjCount();
-/*N*/ nHiddenDrawObjs = nCount;
-/*N*/ for( sal_uInt16 i=0; i<nArrLen; i++ )
-/*N*/ {
-/*N*/ const SwFrmFmt* pFmt = (*pFlys)[ i ];
-/*N*/ if( RES_DRAWFRMFMT != pFmt->Which() )
-/*N*/ continue;
-/*N*/
-/*N*/ SwClientIter aIter( *(SwFrmFmt*)pFmt );
-/*N*/ if( aIter.First( TYPE(SwDrawContact) ) )
-/*N*/ {
-/*N*/ SdrObject *pObj = ((SwDrawContact*)aIter())->GetMaster();
-/*N*/
-/*N*/ // Nowadays, all objects have to be in a page, while in earlier
-/*N*/ // version, hidden objects were not in the page.
-/*N*/ OSL_ENSURE( pObj->GetPage(), "draw objects have to be in a page" );
-/*N*/ if( !pObj->GetPage() )
-/*N*/ pPage->InsertObject( pObj );
-/*N*/ }
-/*N*/ }
-/*N*/ if( nHiddenDrawObjs == pPage->GetObjCount() )
-/*N*/ nHiddenDrawObjs = ULONG_MAX;
-/*N*/
-/*N*/ for( sal_uInt16 j=0; j<nCount; j++ )
-/*N*/ {
-/*N*/ SdrObject *pObj = pPage->GetObj( j );
-/*N*/
-/*N*/ SdrLayerID nLayerId = pObj->GetLayer();
-/*N*/ if( !pDoc->IsVisibleLayerId( nLayerId ) )
-/*N*/ {
-/*N*/ nLayerId = pDoc->GetVisibleLayerIdByInvisibleOne( nLayerId );
-/*N*/ if( !pHiddenDrawObjs )
-/*N*/ pHiddenDrawObjs = new SwHiddenDrawObjList_Impl;
-/*N*/ pHiddenDrawObjs->push_back( pObj );
-/*N*/ pObj->NbcSetLayer( nLayerId );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
-/*N*/ void Sw3IoImp::RemoveHiddenDrawObjs()
-/*N*/ {
-/*N*/ if( pHiddenDrawObjs )
-/*N*/ {
-/*N*/ if( pDoc->GetDrawModel() )
-/*N*/ {
-/*N*/ pDoc->GetDrawModel()->GetPage( 0 );
-/*N*/ SwHiddenDrawObjList_Impl::const_iterator aIter = pHiddenDrawObjs->begin();
-/*N*/ while( aIter != pHiddenDrawObjs->end() )
-/*N*/ {
-/*N*/ SdrObject *pObj = *aIter;
-/*N*/ SdrLayerID nLayerId = pObj->GetLayer();
-/*N*/ nLayerId = pDoc->GetInvisibleLayerIdByVisibleOne( nLayerId );
-/*N*/ pObj->NbcSetLayer( nLayerId );
-/*N*/ ++aIter;
-/*N*/ }
-/*N*/ }
-/*N*/ delete pHiddenDrawObjs;
-/*N*/ pHiddenDrawObjs = 0;
-/*N*/ }
-/*N*/
-/*N*/ if( ULONG_MAX != nHiddenDrawObjs )
-/*N*/ {
-/*N*/ if( pDoc->GetDrawModel() )
-/*N*/ {
-/*N*/ SdrPage *pPage = pDoc->GetDrawModel()->GetPage( 0 );
-/*N*/ sal_uInt32 nPos = pPage->GetObjCount();
-/*N*/ while( nPos > nHiddenDrawObjs )
-/*N*/ pPage->RemoveObject( --nPos );
-/*N*/ }
-/*N*/
-/*N*/ nHiddenDrawObjs = ULONG_MAX;
-/*N*/ }
-/*N*/ }
-
/*************************************************************************
*
* Stream-Verwaltung
@@ -1177,53 +1090,6 @@ ULONG Sw3IoImp::OutRecSizes()
/*N*/ return (sal_uInt32)n32;
/*N*/ }
-/*N*/ void Sw3IoImp::OutULong( SvStream& rStrm, sal_uInt32 n32 )
-/*N*/ {
-/*N*/ if( n32 < 0x00000080 )
-/*N*/ {
-/*N*/ // 0w0000 0000 0000 0000 0000 0000 0www wwww
-/*N*/ // -> 0w0www wwww
-/*N*/
-/*N*/ rStrm << (sal_uInt8)n32;
-/*N*/ }
-/*N*/ else if( n32 < 0x00004000 )
-/*N*/ {
-/*N*/ // 0x0000 0000 0000 0000 00xx xxxx wwww wwww
-/*N*/ // --> 0x10xx xxxx wwww wwww
-/*N*/
-/*?*/ n32 |= 0x00008000;
-/*?*/ rStrm << (sal_uInt8)(n32 >> 8);
-/*?*/ rStrm << (sal_uInt8)n32;
-/*?*/ }
-/*?*/ else if( n32 < 0x00200000 )
-/*?*/ {
-/*?*/ // 0x110y yyyy xxxx xxxx wwww wwww
-/*?*/ // --> 0x0000 0000 000y yyyy wwww wwww xxxx xxxx
-/*?*/
-/*?*/ n32 |= 0x00C00000;
-/*?*/ rStrm << (sal_uInt8)(n32 >> 16);
-/*?*/ rStrm << (sal_uInt16)n32;
-/*?*/ }
-/*?*/ else if( n32 < 0x10000000 )
-/*?*/ {
-/*?*/ // 0x1110 zzzz yyyy yyyy xxxx xxxx wwww wwww
-/*?*/ // --> 0x0000 zzzz yyyy yyyy wwww wwww xxxx xxxx
-/*?*/
-/*?*/ n32 |= 0xE0000000;
-/*?*/ rStrm << (sal_uInt8)(n32 >> 24);
-/*?*/ rStrm << (sal_uInt8)(n32 >> 16);
-/*?*/ rStrm << (sal_uInt16)n32;
-/*?*/ }
-/*?*/ else
-/*?*/ {
-/*?*/ // zzzz zzzz yyyy yyyy xxxx xxxx wwww wwww
-/*?*/ // --> 0x1111 00000 wwww wwww xxxx xxxx yyyy yyyy zzzz zzzz
-/*?*/
-/*?*/ rStrm << (sal_uInt8)0xF0;
-/*?*/ rStrm << (sal_uInt32)n32;
-/*N*/ }
-/*N*/ }
-
/*************************************************************************
*
* Prozentanzeige
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx
index 0e269d9..7abd9fa 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx
@@ -154,30 +154,13 @@ namespace binfilter {
// Falls der Storage gewechselt hat, muessen die Streams
// neu geoeffnet werden.
-
-/*N*/ SvStorage* Sw3Io::GetStorage()
-/*N*/ {
-/*N*/ if( !pImp->pRoot.Is() )
-/*N*/ pImp->pRoot = pImp->pDoc->GetPersist()->GetStorage();
-/*N*/ return &pImp->pRoot;
-/*N*/ }
-
-
/*N*/ void Sw3Io::SetReadOptions( const SwgReaderOption& rOpt, BOOL bOverwrite )
/*N*/ {
/*N*/ pImp->SetReadOptions( rOpt, bOverwrite );
/*N*/ }
-
- ULONG Sw3Io::SaveStyles()
- {
- OSL_ASSERT("method removed");
- return 0;
- }
-
// Erzeugen eines eindeutigen Stream-Namens in einem Storage
-
/*N*/ String Sw3Io::UniqueName( SvStorage* pStg, const sal_Char* p )
/*N*/ {
/*N*/ String aName;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
index e050b86..25668fd 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
@@ -587,223 +587,6 @@ void Sw3IoImp::InPasswd()
/*N*/ IMPL_CONTAINER_SORT( Sw3Marks, Sw3Mark, sw3mark_compare )
-extern sal_Bool lcl_sw3io_isTOXHeaderSection( const SwStartNode& rSttNd );
-/*N*/ void Sw3IoImp::CollectMarks( SwPaM* pPaM, sal_Bool bPageOnly )
-/*N*/ {
-/*N*/ sal_uInt32 nEndOfIcons = pDoc->GetNodes().GetEndOfExtras().GetIndex();
-/*N*/
-/*N*/ // Bereich bestimmen
-/*N*/ sal_uInt32 nStart, nEnd;
-/*N*/ if( !bSaveAll && pPaM )
-/*?*/ nStart = pPaM->GetPoint()->nNode.GetIndex(),
-/*?*/ nEnd = pPaM->GetMark()->nNode.GetIndex();
-/*N*/ else
-/*N*/ nStart = 0,
-/*N*/ nEnd = pDoc->GetNodes().GetEndOfContent().GetIndex();
-/*N*/ if( nStart > nEnd )
-/*N*/ {
-/*N*/ // Start muss kleiner als Ende sein
-/*N*/ sal_uInt32 n = nStart; nStart = nEnd; nEnd = n;
-/*N*/ }
-/*N*/ // Array anlegen
-/*N*/ delete pMarks;
-/*N*/ pMarks = 0;
-/*N*/
-/*N*/ delete pBookmarks;
-/*N*/ pBookmarks = new Sw3Bookmarks;
-/*N*/ nCntntBkmkStart = 0;
-/*N*/
-/*N*/ Sw3Mark aMark;
-/*N*/ // text::Bookmarks absammeln (nicht, wenn Konversion SW2-Textbausteine auf SW3)
-/*N*/ if( !( nGblFlags & SW3F_CONVBLOCK ) )
-/*N*/ {
-/*N*/ //JP 23.09.95: wenn Selektion geschrieben wird, dann auch alle aus
-/*N*/ // den Sonderbereichen mit nehmen!!
-/*N*/ const SwBookmarks& rMarks = pDoc->GetBookmarks();
-/*N*/ sal_uInt16 nArrLen = rMarks.Count();
-/*N*/
-/*N*/ for( sal_uInt16 n = 0; n < nArrLen; ++n )
-/*N*/ {
-/*N*/ SwBookmark* pMark = rMarks.GetObject( n );
-/*N*/ if( !pMark->IsBookMark() )
-/*N*/ continue;
-/*N*/
-/*N*/ const SwPosition& rPos1 = pMark->GetPos();
-/*N*/
-/*N*/ if( pDoc->IsInHeaderFooter( rPos1.nNode ) )
-/*N*/ {
-/*?*/ pBookmarks->Insert( pMark, nCntntBkmkStart );
-/*?*/ nCntntBkmkStart++;
-/*N*/ }
-/*N*/ else if( !bPageOnly )
-/*N*/ {
-/*N*/ pBookmarks->Insert( pMark, pBookmarks->Count() );
-/*N*/ }
-/*N*/ }
-/*N*/ nArrLen = pBookmarks->Count();
-/*N*/ if( nArrLen )
-/*N*/ {
-/*N*/ pMarks = new Sw3Marks( nArrLen + nArrLen / 4, nArrLen / 4 );
-/*N*/
-/*N*/ if( pPaM )
-/*N*/ {
-/*N*/ for( sal_uInt16 n = 0; n < nArrLen; ++n )
-/*N*/ {
-/*N*/ const SwBookmark* pMark = pBookmarks->GetObject( n );
-/*N*/ OSL_ENSURE( pMark->IsBookMark(),
-/*N*/ "Wo kommt da die Nicht text::Bookmark her?" );
-/*N*/
-/*N*/ if( !IsSw31Export() && n >= nCntntBkmkStart )
-/*N*/ aMark.SetId( n - nCntntBkmkStart );
-/*N*/ else
-/*N*/ aMark.SetId( n );
-/*N*/ const SwPosition* pPos1 = &pMark->GetPos();
-/*N*/ const SwPosition* pPos2 = pMark->GetOtherPos();
-/*N*/ OSL_ENSURE( pPos1->nNode.GetNode().IsTxtNode(),
-/*N*/ "Bookmark position outside text node" );
-/*N*/ aMark.SetNodePos( pPos1->nNode.GetIndex() );
-/*N*/ if( aMark.GetNodePos() < nEndOfIcons ||
-/*N*/ ( aMark.GetNodePos() >= nStart && aMark.GetNodePos() <= nEnd ))
-/*N*/ {
-/*N*/ aMark.SetNodeOff( pPos1->nContent.GetIndex() );
-/*N*/ aMark.SetType( SW3_BOOK_POINT );
-/*N*/ pMarks->Insert( new Sw3Mark(aMark) );
-/*N*/ }
-/*N*/ if( pPos2 )
-/*N*/ {
-/*?*/ OSL_ENSURE( pPos2->nNode.GetNode().IsTxtNode(),
-/*?*/ "Other bookmark position outside text node" );
-/*?*/ aMark.SetNodePos( pPos2->nNode.GetIndex() );
-/*?*/ if( aMark.GetNodePos() < nEndOfIcons ||
-/*?*/ ( aMark.GetNodePos() >= nStart && aMark.GetNodePos() <= nEnd ))
-/*?*/ {
-/*?*/ aMark.SetNodeOff( pPos2->nContent.GetIndex() );
-/*?*/ aMark.SetType( SW3_BOOK_MARK );
-/*?*/ pMarks->Insert( new Sw3Mark(aMark) );
-/*?*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*?*/ for( sal_uInt16 n = 0; n < nArrLen; ++n )
-/*?*/ {
-/*?*/ const SwBookmark* pMark = pBookmarks->GetObject( n );
-/*?*/ OSL_ENSURE( pMark->IsBookMark(),
-/*?*/ "Wo kommt da die Nicht Bookmark her?" );
-/*?*/
-/*?*/ if( !IsSw31Export() && n >= nCntntBkmkStart )
-/*?*/ aMark.SetId( n - nCntntBkmkStart );
-/*?*/ else
-/*?*/ aMark.SetId( n );
-/*?*/
-/*?*/ const SwPosition* pPos = &pMark->GetPos();
-/*?*/ OSL_ENSURE( pPos->nNode.GetNode().IsTxtNode(),
-/*?*/ "Bookmark position outside text node" );
-/*?*/
-/*?*/ aMark.SetNodePos( pPos->nNode.GetIndex() );
-/*?*/ aMark.SetNodeOff( pPos->nContent.GetIndex() );
-/*?*/ aMark.SetType( SW3_BOOK_POINT );
-/*?*/ pMarks->Insert( new Sw3Mark(aMark) );
-/*?*/
-/*?*/ pPos = pMark->GetOtherPos();
-/*?*/ if( pPos )
-/*?*/ {
-/*?*/ OSL_ENSURE( pPos->nNode.GetNode().IsTxtNode(),
-/*?*/ "Other bookmark position outside text node" );
-/*?*/ aMark.SetNodePos( pPos->nNode.GetIndex() );
-/*?*/ aMark.SetNodeOff( pPos->nContent.GetIndex() );
-/*?*/ aMark.SetType( SW3_BOOK_MARK );
-/*?*/ pMarks->Insert( new Sw3Mark(aMark) );
-/*?*/ }
-/*?*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ // Collect TOX sections. To be compatible with the 5.0 file format and
-/*N*/ // earlier file format versions, TOX section are not exported directly.
-/*N*/ // Instead of this, the start and end positions of this sections is
-/*N*/ // exported.
-/*N*/ // MIB 01.09.97: wenn Selektion geschrieben wird, dann auch alle aus
-/*N*/ // den Sonderbereichen mit nehmen (##)
-/*N*/
-/*N*/ aMark.SetId( 0 );
-/*N*/ const SwSectionFmts& rSectFmts = pDoc->GetSections();
-/*N*/
-/*N*/ for( sal_uInt16 i=0; i < rSectFmts.Count(); i++ )
-/*N*/ {
-/*N*/ const SwSectionFmt* pSectFmt = rSectFmts[i];
-/*N*/
-/*N*/ // Skip TOXs that are somehow incomplete.
-/*N*/ const SwSection* pSect = pSectFmt->GetSection();
-/*N*/ if( !pSect || TOX_CONTENT_SECTION != pSect->GetType() )
-/*N*/ continue;
-/*N*/
-/*N*/ const SwSectionNode *pSectNd = pSectFmt->GetSectionNode();
-/*N*/ if( !pSectNd )
-/*N*/ continue;
-/*N*/
-/*N*/ const SwTOXBaseSection *pTOXBaseSect =
-/*N*/ PTR_CAST( SwTOXBaseSection, pSect );
-/*N*/ if( !pTOXBaseSect || !pTOXBaseSect->GetTOXType() )
-/*N*/ continue;
-/*N*/
-/*N*/ ULONG nStartIdx = pSectNd->GetIndex();
-/*N*/ ULONG nEndIdx = pSectNd->EndOfSectionIndex();
-/*N*/
-/*N*/ // Skip TOXs that are not contained within the saved area completely.
-/*N*/ if( nStart >= nEndOfIcons && (nStartIdx < nStart || nEndIdx > nEnd) )
-/*N*/ continue;
-/*N*/
-/*N*/ if( !pMarks )
-/*N*/ pMarks = new Sw3Marks( 16, 4 );
-/*N*/
-/*N*/ // The start pos is the first section node. If this is the start node
-/*N*/ // of a TOX header section that starts with a text node, the start pos
-/*N*/ // is the second node. See Sw3IoImp::OutSection in sw3sect.cxx.
-/*N*/ nStartIdx++;
-/*N*/ const SwStartNode *pSttNd = pDoc->GetNodes()[nStartIdx]->GetStartNode();
-/*N*/ if( pSttNd && lcl_sw3io_isTOXHeaderSection( *pSttNd ) &&
-/*N*/ pDoc->GetNodes()[nStartIdx+1]->IsTxtNode() ) // could be a start nd
-/*N*/ nStartIdx++;
-/*N*/
-/*N*/ aMark.SetNodePos( nStartIdx );
-/*N*/ aMark.SetNodeOff( 0 );
-/*N*/ aMark.SetType( SW3_TOX_POINT );
-/*N*/ pMarks->Insert( new Sw3Mark(aMark) );
-/*N*/
-/*N*/ // The end pos is the last but one section node. If this is the end
-/*N*/ // node of a TOX header section that ends with a text node, the end
-/*N*/ // pos is the last but two node. See Sw3IoImp::OutSection in
-/*N*/ // sw3sect.cxx.
-/*N*/ nEndIdx--;
-/*N*/ const SwEndNode *pEndNd = pDoc->GetNodes()[nEndIdx]->GetEndNode();
-/*N*/ if( pEndNd &&
-/*N*/ lcl_sw3io_isTOXHeaderSection( *pEndNd->StartOfSectionNode() ) &&
-/*N*/ pDoc->GetNodes()[nEndIdx-1]->IsTxtNode() ) // could be an end node
-/*N*/ nEndIdx--;
-/*N*/
-/*N*/ aMark.SetNodePos( nEndIdx );
-/*N*/
-/*N*/ const SwTxtNode *pTxtNd = pDoc->GetNodes()[nEndIdx]->GetTxtNode();
-/*N*/ xub_StrLen nCntntIdx = pTxtNd ? pTxtNd->Len() : 0;
-/*N*/ aMark.SetNodeOff( nCntntIdx );
-/*N*/ aMark.SetType( SW3_TOX_MARK );
-/*N*/ pMarks->Insert( new Sw3Mark(aMark) );
-/*N*/
-/*N*/ aMark.SetId( aMark.GetId() + 1 );
-/*N*/ }
-/*N*/
-/*N*/ // Ist was da?
-/*N*/ if( !pBookmarks->Count() )
-/*N*/ delete pBookmarks, pBookmarks = NULL;
-/*N*/ OSL_ENSURE( !pMarks || pMarks->Count(),
-/*N*/ "Marks-Array haette nicht angelegt werden muessen" );
-/*N*/ if( pMarks && !pMarks->Count() )
-/*?*/ delete pMarks, pMarks = NULL;
-/*N*/ }
-
// Eine Mark einlesen
/*N*/ void Sw3IoImp::InNodeMark( const SwNodeIndex& rPos, xub_StrLen nCntntOff )
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
index c1f3c71..677e20a 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
@@ -983,36 +983,6 @@ void lcl_sw3io__copyNumRule( const SwNumRule& rSrc, SwNumRule& rDst )
/*N*/ }
/*N*/ }
-// Numerierungs-Regelwerk ausgeben
-
-/*N*/ void Sw3IoImp::OutNumRules( BOOL bUsed )
-/*N*/ {
-/*N*/ OutHeader();
-/*N*/
-/*N*/ // Stringpool (nur mit den wirklioch benoetigten) Namen fuellen.
-/*N*/ aStringPool.SetupForNumRules( *pDoc, pStrm->GetVersion() );
-/*N*/ OutStringPool( SWG_STRINGPOOL, aStringPool );
-/*N*/
-/*N*/ // Die Outline-Numerierung schreiben
-/*N*/ if( pDoc->GetOutlineNumRule() )
-/*N*/ OutNumRule( SWG_OUTLINE, *pDoc->GetOutlineNumRule() );
-/*N*/
-/*N*/ // Und alle Numerierungen schreiben
-/*N*/ USHORT nArrLen = pDoc->GetNumRuleTbl().Count();
-/*N*/ for( USHORT n=0; n<nArrLen; n++ )
-/*N*/ {
-/*N*/ const SwNumRule *pNumRule = pDoc->GetNumRuleTbl()[n];
-/*N*/ if( !bUsed || pDoc->IsUsed( *pNumRule ) )
-/*N*/ OutNumRule( SWG_NUMRULE, *pNumRule );
-/*N*/ }
-/*N*/
-/*N*/ #ifdef TEST_HUGE_DOCS
-/*N*/ BOOL b = FALSE;
-/*N*/ if( b )
-/*N*/ OutHugeRecord( 1024, 32*1024 );
-/*N*/ #endif
-/*N*/ }
-
// Absatz-Numerierung einlesen (seit 5.0)
/*N*/ void Sw3IoImp::InNodeNum( SwNodeNum& rNodeNum )
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx
index 3f4b48d..b64c986 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx
@@ -298,81 +298,6 @@ void Sw3IoImp::SetDBName()
pContents->SetBufferSize( 0 );
}
-/*N*/ void Sw3IoImp::OutPageDescs( BOOL bUsed )
-/*N*/ {
-/*N*/ OutHeader();
-/*N*/ CollectFlyFrms( NULL );
-/*N*/ // Stringpool fuellen, Namen im Doc erweitern
-/*N*/ aStringPool.Setup( *pDoc, pStrm->GetVersion(), pExportInfo );
-/*N*/ OutStringPool( SWG_STRINGPOOL, aStringPool );
-/*N*/
-/*N*/ // Nicht-Systemfeldtypen
-/*N*/ if( !nRes ) OutFieldTypes();
-/*N*/
-/*N*/ // Bookmarks (nicht, wenn ein SW2-TextBlockDoc konvertiert wird)
-/*N*/ // Wenn nicht nach 3.1 exportiert wird, werden nur die Bookmarks
-/*N*/ // der Seitenvorlagen geschrieben
-/*N*/ if( !nRes && !( nGblFlags & SW3F_CONVBLOCK ) )
-/*N*/ OutBookmarks( TRUE );
-/*N*/
-/*N*/ if( !nRes && !IsSw31Or40Export() )
-/*N*/ OutRedlines( TRUE );
-/*N*/
-/*N*/ // Numberformatter schreiben bei normalen Dokumenten. Bei Textbausteinen
-/*N*/ // erfolgt es im SaveDocContents
-/*N*/ if( !nRes && !IsSw31Export() && !bBlock )
-/*N*/ OutNumberFormatter();
-/*N*/
-/*N*/ USHORT nArrLen = pDoc->GetPageDescCnt();
-/*N*/ USHORT nCnt = 0;
-/*N*/ if( bUsed )
-/*N*/ {
-/*?*/ for( USHORT n = 0; n < nArrLen; n++ )
-/*?*/ {
-/*?*/ const SwPageDesc& rDesc = pDoc->GetPageDesc( n );
-/*?*/ if( pDoc->IsUsed( rDesc ) )
-/*?*/ nCnt++;
-/*?*/ }
-/*N*/ }
-/*N*/ else
-/*N*/ nCnt = nArrLen;
-/*N*/
-/*N*/ OpenRec( SWG_PAGEDESCS );
-/*N*/ *pStrm << (BYTE) 0x02
-/*N*/ << (INT16) nCnt;
-/*N*/ if( bUsed )
-/*N*/ {
-/*?*/ for( USHORT n = 0; n < nArrLen; n++ )
-/*?*/ {
-/*?*/ const SwPageDesc& rDesc = pDoc->GetPageDesc( n );
-/*?*/ if( pDoc->IsUsed( rDesc ) )
-/*?*/ OutPageDesc( rDesc );
-/*?*/ }
-/*N*/ }
-/*N*/ else for( USHORT n = 0; n < nArrLen; n++ )
-/*N*/ OutPageDesc( pDoc->GetPageDesc( n ) );
-/*N*/
-/*N*/ #ifdef TEST_HUGE_DOCS
-/*N*/ BOOL b = FALSE;
-/*N*/ if( b )
-/*N*/ OutHugeRecord( 1024, 32*1024 );
-/*N*/ #endif
-/*N*/
-/*N*/ CloseRec( SWG_PAGEDESCS );
-/*N*/
-/*N*/ // Temporaere Namenserweiterungen entfernen
-/*N*/ aStringPool.RemoveExtensions( *pDoc );
-/*N*/
-/*N*/ // Die Redlines der Seiten-Vorlagen werden jetzt nicht mehr gebraucht
-/*N*/ // und muessen sogar geloescht werden, weil die Indizierung im
-/*N*/ // Content-Bereich wieder mit 0 anfaengt.
-/*N*/ if( pRedlines && nCntntRedlineStart )
-/*N*/ {
-/*?*/ pRedlines->Remove( 0, nCntntRedlineStart );
-/*?*/ nCntntRedlineStart = 0;
-/*N*/ }
-/*N*/ }
-
// Seitenvorlage einlesen
/*N*/ SwPageDesc* Sw3IoImp::InPageDesc( USHORT& nFollow )
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx
index 7a4733e..e0733bd 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx
@@ -262,114 +262,6 @@ xub_StrLen lcl_sw3io_getNodeOff( const SwNodeIndex& rNdIdx, xub_StrLen nCntntIdx
return USHRT_MAX;
}
-/*N*/ void Sw3IoImp::CollectRedlines( SwPaM* pPaM, BOOL bPageOnly )
-/*N*/ {
-/*N*/ OSL_ENSURE( !IsSw31Or40Export(), "Redlines werden nicht exportiert!" );
-/*N*/
-/*N*/ delete pRedlines;
-/*N*/ pRedlines = new Sw3Redlines;
-/*N*/ nCntntRedlineStart = 0;
-/*N*/
-/*N*/ const SwPosition *pPaMStart = pPaM ? pPaM->Start() : 0;
-/*N*/ const SwPosition *pPaMEnd = pPaM ? pPaM->End() : 0;
-/*N*/ ULONG nEndOfExtras = pDoc->GetNodes().GetEndOfExtras().GetIndex();
-/*N*/
-/*N*/ const SwRedlineTbl& rRedlines = pDoc->GetRedlineTbl();
- USHORT i=0;
-/*N*/ for( i=0; i<rRedlines.Count(); i++ )
-/*N*/ {
-/*?*/ SwRedline *pRedline = rRedlines[i];
-/*?*/ const SwPosition *pPos = pRedline->Start();
-/*?*/ const SwPosition *pEndPos = pRedline->End();
-/*?*/ if( !pRedline->GetContentIdx() && *pPos == *pEndPos )
-/*?*/ {
-/*?*/ // "Leere" Redlines werden nicht gespeichert!
-/*?*/ OSL_ENSURE( !this, "Redline in leer" );
-/*?*/ continue;
-/*?*/ }
-/*?*/
-/*?*/ if( pDoc->IsInHeaderFooter( pPos->nNode ) )
-/*?*/ {
-/*?*/ pRedlines->Insert( pRedline, nCntntRedlineStart );
-/*?*/ nCntntRedlineStart++;
-/*?*/ }
-/*?*/ else if( !bPageOnly )
-/*?*/ {
-/*?*/ // Bei gegebenen PaM alle Redlines mitnehmen, die in
-/*?*/ // Sonderbereichen liegen oder ganz oder teilweise im PaM.
-/*?*/ const SwPosition *pStart = pRedline->Start();
-/*?*/ SwComparePosition eCmp =
-/*?*/ bSaveAll || !pPaM || pStart->nNode.GetIndex() <= nEndOfExtras
-/*?*/ ? POS_INSIDE
-/*?*/ : ComparePosition( *pStart, *pRedline->End(),
-/*?*/ *pPaMStart, *pPaMEnd );
-/*?*/ if( POS_BEFORE != eCmp && POS_BEHIND != eCmp &&
-/*?*/ POS_COLLIDE_END != eCmp && POS_COLLIDE_START != eCmp )
-/*?*/ pRedlines->Insert( pRedline, pRedlines->Count() );
-/*?*/ }
-/*N*/ }
-/*N*/
-/*N*/ if( !pRedlines->Count() )
-/*N*/ {
-/*N*/ // Keine Redlines? Dann nicht weiter.
-/*N*/ delete pRedlines;
-/*N*/ pRedlines = 0;
-/*N*/ return;
-/*N*/ }
-/*N*/
-/*?*/ OSL_ENSURE( !bBlock, "In Textbausteinen darf es keine Redlines geben!" );
-/*?*/
-/*?*/ Sw3Mark aMark;
-/*?*/ USHORT nArrLen = pRedlines->Count();
-/*?*/
-/*?*/ if( !pRedlineMarks )
-/*?*/ pRedlineMarks = new Sw3Marks( 2*nArrLen, 2 );
-/*?*/
-/*?*/ for( i = 0; i < nArrLen; i++ )
- {
-/*?*/ const SwRedline* pRedline = pRedlines->GetObject( i );
-/*?*/
-/*?*/ if( i >= nCntntRedlineStart )
-/*?*/ aMark.SetId( i - nCntntRedlineStart );
-/*?*/ else
-/*?*/ aMark.SetId( i );
-/*?*/
-/*?*/ // Bei gegebenen Redlines die Positionen auf den PaM reduzieren
-/*?*/ const SwPosition *pStart = pRedline->Start();
-/*?*/ const SwPosition *pEnd = pRedline->End();
-/*?*/ SwComparePosition eCmp =
-/*?*/ bSaveAll || !pPaM || pStart->nNode.GetIndex() <= nEndOfExtras
-/*?*/ ? POS_INSIDE
-/*?*/ : ComparePosition( *pStart, *pEnd, *pPaMStart, *pPaMEnd );
-/*?*/
-/*?*/ OSL_ENSURE( POS_BEFORE != eCmp && POS_BEHIND != eCmp &&
-/*?*/ POS_COLLIDE_END != eCmp && POS_COLLIDE_START != eCmp,
-/*?*/ "Redline mit ungeultigem Bereich" );
-/*?*/
-/*?*/ if( POS_OUTSIDE == eCmp || POS_OVERLAP_BEFORE == eCmp )
-/*?*/ pStart = pPaMStart;
-/*?*/ if( POS_OUTSIDE == eCmp || POS_OVERLAP_BEHIND == eCmp )
-/*?*/ pEnd = pPaMEnd;
-/*?*/
-/*?*/ aMark.SetType( SW3_REDLINE_START );
-/*?*/ aMark.SetNodePos( pStart->nNode.GetIndex() );
-/*?*/ aMark.SetNodeOff( lcl_sw3io_getNodeOff( pStart->nNode,
-/*?*/ pStart->nContent.GetIndex() ) );
-/*?*/ pRedlineMarks->Insert( new Sw3Mark(aMark) );
-/*?*/
-/*?*/ if( pRedline->HasMark() )
-/*?*/ {
-/*?*/ // Wenn der PaM ein Mark besitzt, dann End die jeweils
-/*?*/ // andere Position.
-/*?*/ aMark.SetType( SW3_REDLINE_END );
-/*?*/ aMark.SetNodePos( pEnd->nNode.GetIndex() );
-/*?*/ aMark.SetNodeOff( lcl_sw3io_getNodeOff( pEnd->nNode,
-/*?*/ pEnd->nContent.GetIndex() ) );
-/*?*/ pRedlineMarks->Insert( new Sw3Mark(aMark) );
-/*?*/ }
-/*?*/ }
-/*N*/ }
-
/* */
// NODEREDLINE:
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
index ec22bb2..42a236c 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
@@ -1149,33 +1149,6 @@ sal_Char const SW_CONSTASCII_DEF( sHTML_listing, "LISTING" );
/*N*/ pConvToSymbolFmts = 0;
/*N*/ }
/*N*/ }
-
-/*N*/ void Sw3IoImp::SaveStyleSheets( BOOL bUsed )
-/*N*/ {
-/*N*/ OSL_ENSURE( !HasRecSizes(), "Hier darf es noch keine RecSizes geben" );
-/*N*/ // Bisher wurde allenfalls der Drawing-Layer gespeichert. Deshalb
-/*N*/ // kann es hier noch gar keine RecSizes geben. Besser ist aber besser ...
-/*N*/ if( HasRecSizes() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
-/*N*/ SfxItemPool *pTmp = pDoc->GetAttrPool().GetSecondaryPool();
-/*N*/ pDoc->GetAttrPool().SetSecondaryPool( 0 );
-/*N*/ SfxItemPool* pPool = pDoc->GetAttrPool().Clone();
-/*N*/ pDoc->GetAttrPool().SetSecondaryPool( pTmp );
-/*N*/
-/*N*/ pStyles->Seek( 0L );
-/*N*/ pStyles->SetSize( 0L );
-/*N*/ pStyles->SetBufferSize( SW3_BSW_STYLES );
-/*N*/ pStrm = pStyles;
-/*N*/ SwStyleSheetPool* p = new SwStyleSheetPool( *pDoc, *pPool,
-/*N*/ pStrm->GetVersion(), 0 );
-/*N*/ nRes = p->Store( *pStyles, bUsed ) ? 0 : ERR_SWG_WRITE_ERROR;
-/*N*/ pStyles->SetBufferSize( 0 );
-/*N*/ pStyles->Commit();
-/*N*/ delete p;
-/*N*/ delete pPool;
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx
index a570c2b..de8453b 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx
@@ -108,24 +108,6 @@ BOOL lcl_sw3io_CollectLineFmts( const SwTableLine*& rpLine, void* pPara );
/*N*/ return TRUE;
/*N*/ }
-/*N*/ void Sw3IoImp::CollectTblLineBoxFmts40()
-/*N*/ {
-/*N*/ OSL_ENSURE( pExportInfo, "Wo ist die Export-Info?" );
-/*N*/ for( USHORT i=0; i<pDoc->GetTblFrmFmts()->Count(); i++ )
-/*N*/ {
-/*N*/ SwClientIter aIter( *(*pDoc->GetTblFrmFmts())[i] );
-/*N*/ SwTable *pTable = (SwTable *)aIter.First( TYPE(SwTable) );
-/*N*/ OSL_ENSURE( pTable, "Tabellen-Format ohne Tabelle" );
-/*N*/ if( !pTable )
-/*N*/ continue;
-/*N*/
-/*N*/ if( !pExportInfo->pTblLineBoxFmts40 )
-/*N*/ pExportInfo->pTblLineBoxFmts40 = new Sw3FrmFmts;
-/*N*/ pTable->GetTabLines().ForEach( &lcl_sw3io_CollectLineFmts,
-/*N*/ pExportInfo->pTblLineBoxFmts40 );
-/*N*/ }
-/*N*/ }
-
/* */
/*N*/ void Sw3IoImp::AddTblLineBoxFmt( SwFrmFmt *pFmt )
diff --git a/binfilter/inc/bf_sch/chtmodel.hxx b/binfilter/inc/bf_sch/chtmodel.hxx
index 83d9f2c..901cdd4 100644
--- a/binfilter/inc/bf_sch/chtmodel.hxx
+++ b/binfilter/inc/bf_sch/chtmodel.hxx
@@ -201,10 +201,6 @@ public:
inline BOOL IsDataSwitched() const;
void SetTextFromObject( SdrTextObj* pObj, OutlinerParaObject* pTextObject );
- void PrepareOld3DStorage();
- void CleanupOld3DStorage();
-
-
BOOL IsReal3D()const
{ return (Is3DChart() /*&& !IsPieChart()*/); }
@@ -229,7 +225,6 @@ public:
const long nRow,
const long nMode = SYMBOLMODE_LEGEND );
ChartAxis* GetAxisByUID( long nUId );
- void PrepareAxisStorage();
ChartAxis* GetAxis( long nId );
BOOL HasSecondYAxis() const;
/// is the x-axis vertical, ie we have bars not columns
diff --git a/binfilter/inc/bf_svx/editobj.hxx b/binfilter/inc/bf_svx/editobj.hxx
index b0f922b..b084a7b 100644
--- a/binfilter/inc/bf_svx/editobj.hxx
+++ b/binfilter/inc/bf_svx/editobj.hxx
@@ -84,8 +84,6 @@ public:
// Zur 5.1 hat sich die Bedeutung des LRSpaceItems fuer den Outliner geaendert...
virtual void AdjustImportedLRSpaceItems( BOOL bTurnOfBullets );
- virtual void PrepareStore( SfxStyleSheetPool* pStyleSheetPool );
- virtual void FinishStore();
virtual void FinishLoad( SfxStyleSheetPool* pStyleSheetPool );
virtual USHORT GetParagraphCount() const;
diff --git a/binfilter/inc/bf_svx/outlobj.hxx b/binfilter/inc/bf_svx/outlobj.hxx
index 5ca3c6e..38d44aa 100644
--- a/binfilter/inc/bf_svx/outlobj.hxx
+++ b/binfilter/inc/bf_svx/outlobj.hxx
@@ -82,8 +82,6 @@ public:
void MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart = EE_CHAR_START, USHORT nEnd = EE_CHAR_END );
- void PrepareStore( SfxStyleSheetPool* pStyleSheetPool );
- void FinishStore();
void FinishLoad( SfxStyleSheetPool* pStyleSheetPool );
};
diff --git a/binfilter/inc/bf_svx/scene3d.hxx b/binfilter/inc/bf_svx/scene3d.hxx
index 9944c04..d0647b8 100644
--- a/binfilter/inc/bf_svx/scene3d.hxx
+++ b/binfilter/inc/bf_svx/scene3d.hxx
@@ -302,10 +302,6 @@ public:
// Licht-Objekte rauswerfen
void RemoveLightObjects();
- // Licht-Objekte erzeugen, um kompatibel zur 4.0
- // speichern zu koennen
- void CreateLightObjectsFromLightGroup();
-
// Lichter zaehlen
UINT16 CountNumberOfLights();
diff --git a/binfilter/inc/bf_sw/sw3io.hxx b/binfilter/inc/bf_sw/sw3io.hxx
index a5e426b..fecae09 100644
--- a/binfilter/inc/bf_sw/sw3io.hxx
+++ b/binfilter/inc/bf_sw/sw3io.hxx
@@ -62,10 +62,8 @@ public:
Sw3IoImp* GetImp() { return pImp; }
void SetReadOptions( const SwgReaderOption& rOpt, BOOL bOverwrite=TRUE );
- SvStorage* GetStorage();
void HandsOff();
- ULONG SaveStyles();
// Erzeugen eines eindeutigen Streamnamens im gegebenen Storage
static UniString UniqueName( SvStorage*, const sal_Char* pPrefix );
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index bca610b..551108f 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -246,197 +246,6 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
}
-/**
- * @short No use now.
- * @param rContent
- * @param nFontID
- * @param pIndent
- */
-/*rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(const rtl::OUString& rContent, sal_uInt32 nFontID, LwpIndentOverride* pIndent)
-{
- if (!pIndent)
- {
- assert(false);
- }
-
- if (!m_pFoundry)
- {
- return rtl::OUString();
- }
- LwpFontManager* pFontMgr = m_pFoundry->GetFontManger();
-
- rtl::OUString aFontName = pFontMgr->GetNameByID(nFontID);
- UChar32 cBulletChar = rContent.toChar();
- rtl::OUString aSuffix = rContent.copy(1);
- XFListStyle* pListStyle = new XFListStyle();
- XFStyleManager* pXFStyleMgr = XFStyleManager::Instance();
-
- for (sal_uInt8 nC = 1; nC < 11; nC++)
- {
- pListStyle->SetListBullet(nC, cBulletChar, aFontName, rtl::OUString(), aSuffix);
-
- if (pIndent->GetMRest() > 0.001)
- {
- pListStyle->SetListPosition(nC, 0.0,
- LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(pIndent->GetMRest())), 0.0);
- }
- else
- {
- pListStyle->SetListPosition(nC, 0.0,
- 0.0, LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(pIndent->GetMFirst())));
- }
- }
- return pXFStyleMgr->AddStyle(pListStyle);
-}*/
-
-/**
- * @short No use now.
- * @param pListStyle
- * @param pXFStyleMgr
- */
-/*void LwpBulletStyleMgr::CreateNewListStyle(XFListStyle*& pListStyle, XFStyleManager* pXFStyleMgr)
-{
- pListStyle = new XFListStyle();
- m_aBulletStyleList.push_back(pListStyle);
- m_aCurrentStyleName = pXFStyleMgr->AddStyle(pListStyle);
-}*/
-
-/**
- * @short No use now.
- * @param pSilverBullet
- * @param nLevel
- */
-/*rtl::OUString LwpBulletStyleMgr::AddStyleToList(LwpSilverBullet* pSilverBullet, sal_uInt16 nLevel)
-{
- XFListStyle* pListStyle = NULL;
- XFStyleManager* pXFStyleMgr = XFStyleManager::Instance();
-
- if (m_aBulletStyleList.empty())
- {
- // pListStyle = new XFListStyle();
- // m_aBulletStyleList.push_back(pListStyle);
- // m_aCurrentStyleName = pXFStyleMgr->AddStyle(pListStyle);
- // this->CreateNewListStyle(pListStyle, pXFStyleMgr);
- if (pSilverBullet->IsBulletOrdered())
- {
- m_strCurrentNumberingName = pSilverBullet->GetNumberingName();
- }
- else
- {
- m_nCurrentChar = pSilverBullet->GetBulletChar();
- m_strCurrentFontName = pSilverBullet->GetBulletFontName();
- }
- }
- else if (nLevel == 1)
- {
- if (pSilverBullet->IsBulletOrdered())
- {
- if (m_strCurrentNumberingName == pSilverBullet->GetNumberingName())
- {
- pListStyle = m_aBulletStyleList.back();
- }
- else
- {
- this->CreateNewListStyle(pListStyle, pXFStyleMgr);
- }
- }
- else
- {
- if ((m_nCurrentChar == pSilverBullet->GetBulletChar()) &&
- (m_strCurrentFontName == pSilverBullet->GetBulletFontName()))
- {
- pListStyle = m_aBulletStyleList.back();
- }
- else
- {
- this->CreateNewListStyle(pListStyle, pXFStyleMgr);
- }
- }
- }
- else
- {
- pListStyle = m_aBulletStyleList.back();
- }
-
- if (pSilverBullet->IsBulletOrdered())
- {
-// pListStyle->SetListNumber(int level, XFNumFmt & fmt, sal_Int16 start);
- }
- else
- {
- pListStyle->SetListBullet(nLevel, pSilverBullet->GetBulletChar(), pSilverBullet->GetBulletFontName(),
- pSilverBullet->GetPrefix(), pSilverBullet->GetSuffix());
- }
-
- return m_aCurrentStyleName;
-}*/
-
-/**
- * @short Output bullet list header, such as <text:ordered-list> and <text:list-item>
- * @param pOutputStream pointer of XFstream to be written in.
- * @param bIsOrdered if the list if ordered or not.
- * @param rStyleName style name of the list
- * @param nLevel level of the paragraph
- */
-void LwpBulletStyleMgr::OutputBulletListHeader(IXFStream* pOutputStream, sal_Bool bIsOrdered,
- const rtl::OUString& rStyleName, sal_Int16 nLevel, sal_Bool bIsBulletSkiped)
-{
- if (nLevel == 0)
- {
- return;
- }
-
- m_bIsBulletSkipped = bIsBulletSkiped;
-
- if (m_pBulletList)
- {
- delete m_pBulletList;
- }
-
- m_pBulletList = new XFList();
-
- //todo: need judge here.
- sal_Bool bContinue = m_bContinue;
-
- if (bIsOrdered)
- {
- m_pBulletList->SetOrdered(sal_True);
- }
- else
- {
- bContinue = sal_False;
- m_pBulletList->SetOrdered(sal_False);
- }
- m_pBulletList->SetStyleName(rStyleName);
-// if (nLevels < 0)
-// {
-// m_pBulletList->StartList(pOutputStream);
-// }
-// else
-// {
- for (sal_uInt8 nC = 0; nC < nLevel; nC++)
- {
- //continue numbering
- if (nC == nLevel-1)
- {
- m_pBulletList->StartList(pOutputStream, bContinue);
- }
- else
- {
- m_pBulletList->StartList(pOutputStream);
- }
- if ((nC == nLevel-1) && bIsBulletSkiped)
- {
- XFList::StartListHeader(pOutputStream);
- }
- else
- {
- XFList::StartListItem(pOutputStream);
- }
- }
-// }
-}
-
#include "xfilter/xflistitem.hxx"
//Create nested XFList and XFItems and then add it to XFContentContainer(pCont)
//Return the inner XFItem created.
@@ -504,33 +313,6 @@ XFContentContainer* LwpBulletStyleMgr::AddBulletList(
return InnerItem;
}
-/**
- * @short Output bullet list header, such as </text:ordered-list> and </text:list-item>
- * @param pOutputStream pointer of XFstream to be written in.
- * @param nLevel level of the paragraph
- */
-void LwpBulletStyleMgr::OutputBulletListTail(IXFStream* pOutputStream, sal_uInt16 nLevel)
-{
- if ( !m_pBulletList )
- {
- return;
- }
-
- for (sal_uInt8 nC = 0; nC < nLevel; nC++)
- {
- if (m_bIsBulletSkipped)
- {
- XFList::EndListHeader(pOutputStream);
- m_bIsBulletSkipped = sal_False;
- }
- else
- {
- XFList::EndListItem(pOutputStream);
- }
- m_pBulletList->EndList(pOutputStream);
- }
-}
-
rtl::OUString LwpBulletStyleMgr::GetSectionName(LwpPara* pPara)
{
LwpObjectID* pStoryID = pPara->GetStoryID();
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
index e5590ff..4ca161a 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
@@ -90,17 +90,10 @@ public:
virtual ~LwpBulletStyleMgr();
rtl::OUString RegisterBulletStyle(LwpPara* pPara, LwpBulletOverride* pBullOver,
LwpIndentOverride* pIndent);
-// rtl::OUString RegisterBulletStyle(const rtl::OUString& rContent, sal_uInt32 nFontID, LwpIndentOverride* pIndent);
-// rtl::OUString AddStyleToList(LwpSilverBullet* pSilverBullet, sal_uInt16 nLevel);
inline void SetFoundry(LwpFoundry* pFoundry);
inline void SetContinueFlag(sal_Bool bFlag);
- void OutputBulletListHeader(IXFStream* pOutputStream, sal_Bool bIsOrdered,
- const rtl::OUString& rStyleName, sal_Int16 nLevel, sal_Bool bIsBulletSkiped);
- //Added by Helen
XFContentContainer* AddBulletList(XFContentContainer* pCont, sal_Bool bIsOrdered,
const rtl::OUString& rStyleName, sal_Int16 nLevel, sal_Bool bIsBulletSkiped);
- //End of Add
- void OutputBulletListTail(IXFStream* pOutputStream, sal_uInt16 nLevel);
inline void SetCurrentPos(sal_uInt16 nNewPos);
inline void SetCurrentSilverBullet(const LwpObjectID& rNewID);
inline LwpObjectID GetCurrentSilverBullet();
@@ -109,7 +102,6 @@ public:
inline LwpNumberingOverride* GetCurrentNumOver();
private:
-// void CreateNewListStyle(XFListStyle*& pListStyle, XFStyleManager* pXFStyleMgr);
rtl::OUString GetSectionName(LwpPara* pPara);
private:
commit 99e9c097b66196984f9bf754ab78c3ed00e964a2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 25 23:33:13 2011 +0100
callcatcher: remove SwLayoutCache::Write
diff --git a/binfilter/bf_sw/source/core/inc/laycache.hxx b/binfilter/bf_sw/source/core/inc/laycache.hxx
index 0945baa..d1bbf4d 100644
--- a/binfilter/bf_sw/source/core/inc/laycache.hxx
+++ b/binfilter/bf_sw/source/core/inc/laycache.hxx
@@ -38,8 +38,6 @@ class SwLayCacheImpl;
*
* This class allows to save layout information in the file and it contains
* this information after loading of a file.
- * Call Write(..) with a stream and the document to save and the page break
- * information of the document will be written.
* Call Read(..) with a stream and the member pLayCacheImpl will
* read the information from the stream and store it in an internal structur.
* There's a simple locking mechanism at these classes,
@@ -57,7 +55,6 @@ public:
~SwLayoutCache();
void Read( SvStream &rStream );
- void Write( SvStream &rStream, const SwDoc& rDoc );
void ClearImpl();
sal_Bool IsLocked() const { return nLockCount > 0; }
diff --git a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
index 3b8f339..75fbe7a 100644
--- a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
@@ -163,178 +163,6 @@ namespace binfilter {
/*N*/ return !aIo.HasError();
/*N*/ }
-/*
- * SwLayoutCache::Write(..)
- * writes the index (more precise: the difference between
- * the index and the first index of the document content)
- * of the first paragraph/table at the top of every page.
- * If at the top of a page is the rest of a paragraph/table
- * from the bottom of the previous page, the character/row
- * number is stored, too.
- * The position, size and page number of the text frames
- * are stored, too
- */
-
-/*N*/ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
-/*N*/ {
-/*N*/ if( rDoc.GetRootFrm() ) // the layout itself ..
-/*N*/ {
-/*N*/ SwLayCacheIoImpl aIo( rStream, TRUE );
-/*N*/ // We want to save the relative index, so we need the index
-/*N*/ // of the first content
-/*N*/ ULONG nStartOfContent = rDoc.GetNodes().GetEndOfContent().
-/*N*/ FindStartNode()->GetIndex();
-/*N*/ // The first page..
-/*N*/ SwPageFrm* pPage = (SwPageFrm*)rDoc.GetRootFrm()->Lower();
-/*N*/
-/*N*/ aIo.OpenRec( SW_LAYCACHE_IO_REC_PAGES );
-/*N*/ aIo.OpenFlagRec( 0, 0 );
-/*N*/ aIo.CloseFlagRec();
-/*N*/ while( pPage )
-/*N*/ {
-/*N*/ if( pPage->GetPrev() )
-/*N*/ {
-/*N*/ SwLayoutFrm* pLay = pPage->FindBodyCont();
-/*N*/ SwFrm* pTmp = pLay ? pLay->ContainsAny() : NULL;
-/*N*/ // We are only interested in paragraph or table frames,
-/*N*/ // a section frames contains paragraphs/tables.
-/*N*/ if( pTmp && pTmp->IsSctFrm() )
-/*?*/ pTmp = ((SwSectionFrm*)pTmp)->ContainsAny();
-/*N*/
-/*N*/ if( pTmp ) // any content
-/*N*/ {
-/*N*/ if( pTmp->IsTxtFrm() )
-/*N*/ {
-/*N*/ ULONG nNdIdx = ((SwTxtFrm*)pTmp)->GetNode()->GetIndex();
-/*N*/ if( nNdIdx > nStartOfContent )
-/*N*/ {
-/*N*/ /* Open Paragraph Record */
-/*N*/ aIo.OpenRec( SW_LAYCACHE_IO_REC_PARA );
-/*N*/ BOOL bFollow = ((SwTxtFrm*)pTmp)->IsFollow();
-/*N*/ aIo.OpenFlagRec( bFollow ? 0x01 : 0x00,
-/*N*/ bFollow ? 8 : 4 );
-/*N*/ nNdIdx -= nStartOfContent;
-/*N*/ aIo.GetStream() << static_cast<sal_uInt32>(nNdIdx);
-/*N*/ if( bFollow )
-/*?*/ aIo.GetStream() << static_cast<sal_uInt32>(((SwTxtFrm*)pTmp)->GetOfst());
-/*N*/ aIo.CloseFlagRec();
-/*N*/ /* Close Paragraph Record */
-/*N*/ aIo.CloseRec( SW_LAYCACHE_IO_REC_PARA );
-/*N*/ }
-/*N*/ }
-/*N*/ else if( pTmp->IsTabFrm() )
-/*N*/ {
-/*N*/ SwTabFrm* pTab = (SwTabFrm*)pTmp;
-/*N*/ ULONG nOfst = STRING_LEN;
-/*N*/ if( pTab->IsFollow() )
-/*N*/ {
-/*N*/ // If the table is a follow, we have to look for the
-/*N*/ // master and to count all rows to get the row number
-/*N*/ nOfst = 0;
-/*N*/ while( pTab->IsFollow() )
-/*N*/ pTab = pTab->FindMaster();
-/*N*/ while( pTab != pTmp )
-/*N*/ {
-/*N*/ SwFrm* pSub = pTab->Lower();
-/*N*/ while( pSub )
-/*N*/ {
-/*N*/ ++nOfst;
-/*N*/ pSub = pSub->GetNext();
-/*N*/ }
-/*N*/ pTab = pTab->GetFollow();
-/*N*/ OSL_ENSURE( pTab, "Table follow without master" );
-/*N*/ }
-/*N*/ }
-/*N*/ do
-/*N*/ {
-/*N*/ ULONG nNdIdx =
-/*N*/ pTab->GetTable()->GetTableNode()->GetIndex();
-/*N*/ if( nNdIdx > nStartOfContent )
-/*N*/ {
-/*N*/ /* Open Table Record */
-/*N*/ aIo.OpenRec( SW_LAYCACHE_IO_REC_TABLE );
-/*N*/ aIo.OpenFlagRec( 0, 8 );
-/*N*/ nNdIdx -= nStartOfContent;
-/*N*/ aIo.GetStream() << static_cast<sal_uInt32>(nNdIdx)
-/*N*/ << static_cast<sal_uInt32>(nOfst);
-/*N*/ aIo.CloseFlagRec();
-/*N*/ /* Close Table Record */
-/*N*/ aIo.CloseRec( SW_LAYCACHE_IO_REC_TABLE );
-/*N*/ }
-/*N*/ // If the table has a follow on the next page,
-/*N*/ // we know already the row number and store this
-/*N*/ // immediately.
-/*N*/ if( pTab->GetFollow() )
-/*N*/ {
-/*N*/ if( nOfst == STRING_LEN )
-/*?*/ nOfst = 0;
-/*N*/ do
-/*N*/ {
-/*N*/ SwFrm* pSub = pTab->Lower();
-/*N*/ while( pSub )
-/*N*/ {
-/*N*/ ++nOfst;
-/*N*/ pSub = pSub->GetNext();
-/*N*/ }
-/*N*/ pTab = pTab->GetFollow();
-/*N*/ SwPageFrm *pTabPage = pTab->FindPageFrm();
-/*N*/ if( pTabPage != pPage )
-/*N*/ {
-/*N*/ OSL_ENSURE( pPage->GetPhyPageNum() <
-/*N*/ pTabPage->GetPhyPageNum(),
-/*N*/ "Looping Tableframes" );
-/*N*/ pPage = pTabPage;
-/*N*/ break;
-/*N*/ }
-/*?*/ } while ( pTab->GetFollow() );
-/*N*/ }
-/*N*/ else
-/*N*/ break;
-/*N*/ } while( pTab );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ if( pPage->GetSortedObjs() )
-/*N*/ {
-/*?*/ SwSortDrawObjs &rObjs = *pPage->GetSortedObjs();
-/*?*/ for ( USHORT i = 0; i < rObjs.Count(); ++i )
-/*?*/ {
-/*?*/ SdrObject *pO = rObjs[i];
-/*?*/ if ( pO->IsWriterFlyFrame() )
-/*?*/ {
-/*?*/ SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pO)->GetFlyFrm();
-/*?*/ if( pFly->Frm().Left() != WEIT_WECH &&
-/*?*/ !pFly->GetAnchor()->FindFooterOrHeader() )
-/*?*/ {
-/*?*/ const SwContact *pC = (SwContact*)GetUserCall(pO);
-/*?*/ if( pC )
-/*?*/ {
-/*?*/ sal_uInt32 nOrdNum = pO->GetOrdNum();
-/*?*/ USHORT nPageNum = pPage->GetPhyPageNum();
-/*?*/ /* Open Fly Record */
-/*?*/ aIo.OpenRec( SW_LAYCACHE_IO_REC_FLY );
-/*?*/ aIo.OpenFlagRec( 0, 0 );
-/*?*/ aIo.CloseFlagRec();
-/*?*/ SwRect &rRct = pFly->Frm();
-/*?*/ sal_Int32 nX = rRct.Left() - pPage->Frm().Left();
-/*?*/ sal_Int32 nY = rRct.Top() - pPage->Frm().Top();
-/*?*/ aIo.GetStream() << nPageNum << nOrdNum
-/*?*/ << nX << nY << rRct.Width()
-/*?*/ << rRct.Height();
-/*?*/ /* Close Fly Record */
-/*?*/ aIo.CloseRec( SW_LAYCACHE_IO_REC_FLY );
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*N*/ }
-/*N*/ pPage = (SwPageFrm*)pPage->GetNext();
-/*N*/ }
-/*N*/ aIo.CloseRec( SW_LAYCACHE_IO_REC_PAGES );
-/*N*/ }
-/*N*/ }
-
-
/*N*/ void SwLayoutCache::ClearImpl()
/*N*/ {
/*N*/ if( !IsLocked() )
commit 39141ffe6e9086e92b27e4ccf35c04d12704ef12
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 25 23:30:11 2011 +0100
callcatcher: remove unused Write methods
diff --git a/lotuswordpro/source/filter/lwpoleobject.cxx b/lotuswordpro/source/filter/lwpoleobject.cxx
index 823d811..1163b7d 100644
--- a/lotuswordpro/source/filter/lwpoleobject.cxx
+++ b/lotuswordpro/source/filter/lwpoleobject.cxx
@@ -329,57 +329,4 @@ sal_Bool LwpOlePres::Read( SvStream & /*rStm*/ )
return sal_True;
}
-/**
-* @descr: Write OLE object picture information.
-*/
-void LwpOlePres::Write( SvStream & rStm )
-{
- WriteClipboardFormat( rStm, FORMAT_GDIMETAFILE );
- rStm << (sal_Int32)(nJobLen +4); // immer leeres TargetDevice
- if( nJobLen )
- rStm.Write( pJob, nJobLen );
- rStm << (sal_uInt32)nAspect;
- rStm << (sal_Int32)-1; //L-Index immer -1
- rStm << (sal_Int32)nAdvFlags;
- rStm << (sal_Int32)0; //Compression
- rStm << (sal_Int32)aSize.Width();
- rStm << (sal_Int32)aSize.Height();
- sal_uLong nPos = rStm.Tell();
- rStm << (sal_Int32)0;
-
- if( GetFormat() == FORMAT_GDIMETAFILE && pMtf )
- {
- // Immer auf 1/100 mm, bis Mtf-Loesung gefunden
- // Annahme (keine Skalierung, keine Org-Verschiebung)
- DBG_ASSERT( pMtf->GetPrefMapMode().GetScaleX() == Fraction( 1, 1 ),
- "X-Skalierung im Mtf" );
- DBG_ASSERT( pMtf->GetPrefMapMode().GetScaleY() == Fraction( 1, 1 ),
- "Y-Skalierung im Mtf" );
- DBG_ASSERT( pMtf->GetPrefMapMode().GetOrigin() == Point(),
- "Origin-Verschiebung im Mtf" );
- MapUnit nMU = pMtf->GetPrefMapMode().GetMapUnit();
- if( MAP_100TH_MM != nMU )
- {
- Size aPrefS( pMtf->GetPrefSize() );
- Size aS( aPrefS );
- aS = OutputDevice::LogicToLogic( aS, nMU, MAP_100TH_MM );
-
- pMtf->Scale( Fraction( aS.Width(), aPrefS.Width() ),
- Fraction( aS.Height(), aPrefS.Height() ) );
- pMtf->SetPrefMapMode( MAP_100TH_MM );
- pMtf->SetPrefSize( aS );
- }
- WriteWindowMetafileBits( rStm, *pMtf );
- }
- else
- {
- OSL_FAIL( "unknown format" );
- }
- sal_uLong nEndPos = rStm.Tell();
- rStm.Seek( nPos );
- rStm << (sal_uInt32)(nEndPos - nPos - 4);
- rStm.Seek( nEndPos );
-}
-//End by
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx
index ef08525..afcd915 100644
--- a/lotuswordpro/source/filter/lwpoleobject.hxx
+++ b/lotuswordpro/source/filter/lwpoleobject.hxx
@@ -183,12 +183,10 @@ public:
sal_uLong GetAdviseFlags() const { return nAdvFlags; }
void SetAdviseFlags( sal_uLong nAdv ) { nAdvFlags = nAdv; }
void SetSize( const Size & rSize ) { aSize = rSize; }
- Size GetSize() const { return aSize; } //Add by , 10/26/2005
+ Size GetSize() const { return aSize; }
/// return FALSE => unknown format
sal_Bool Read( SvStream & rStm );
- void Write( SvStream & rStm );
};
-//End by
#endif
commit de7bfceb9bd5ead97523f399625f989adb5b0f3c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 25 22:38:21 2011 +0100
ByteString::CreateFromInt32->rtl::OStringBuffer::append
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index dcaeae8..e2ebba0 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -142,6 +142,7 @@
#include <com/sun/star/beans/PropertyValues.hpp>
#include <com/sun/star/drawing/ProjectionMode.hpp>
#include "svx/EnhancedCustomShape2d.hxx"
+#include <rtl/strbuf.hxx>
using namespace ::com::sun::star ;
using namespace ::com::sun::star::drawing;
@@ -724,19 +725,19 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const
if ( IsProperty( DFF_Prop_adjustValue ) || IsProperty( DFF_Prop_pVertices ) )
{
pOut->WriteLine( "" );
- ByteString aString( "ShapeId: " );
- aString.Append( ByteString::CreateFromInt32( nShapeId ) );
- pOut->WriteLine( aString );
+ rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("ShapeId: "));
+ aString.append(static_cast<sal_Int32>(nShapeId));
+ pOut->WriteLine(aString.makeStringAndClear());
}
for ( sal_uInt32 i = DFF_Prop_adjustValue; i <= DFF_Prop_adjust10Value; i++ )
{
if ( IsProperty( i ) )
{
- ByteString aString( "Prop_adjustValue" );
- aString.Append( ByteString::CreateFromInt32( ( i - DFF_Prop_adjustValue ) + 1 ) );
- aString.Append( ":" );
- aString.Append( ByteString::CreateFromInt32( GetPropertyValue( i ) ) );
- pOut->WriteLine( aString );
+ rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("Prop_adjustValue"));
+ aString.append(static_cast<sal_Int32>( ( i - DFF_Prop_adjustValue ) + 1 ) );
+ aString.append(':');
+ aString.append(static_cast<sal_Int32>(GetPropertyValue(i)));
+ pOut->WriteLine(aString.makeStringAndClear());
}
}
sal_Int32 i;
@@ -752,18 +753,18 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const
if ( nLen )
{
pOut->WriteLine( "" );
- ByteString aDesc( "Property:" );
- aDesc.Append( ByteString::CreateFromInt32( i ) );
- aDesc.Append( ByteString( " Size:" ) );
- aDesc.Append( ByteString::CreateFromInt32( nLen ) );
- pOut->WriteLine( aDesc );
+ rtl::OStringBuffer aDesc(RTL_CONSTASCII_STRINGPARAM("Property:"));
+ aDesc.append(static_cast<sal_Int32>(i));
+ aDesc.append(RTL_CONSTASCII_STRINGPARAM(" Size:"));
+ aDesc.append(nLen);
+ pOut->WriteLine(aDesc.makeStringAndClear());
sal_Int16 nNumElem, nNumElemMem, nNumSize;
rIn >> nNumElem >> nNumElemMem >> nNumSize;
- aDesc = ByteString( "Entries: " );
- aDesc.Append( ByteString::CreateFromInt32( nNumElem ) );
- aDesc.Append( ByteString( " Size:" ) );
- aDesc.Append( ByteString::CreateFromInt32( nNumSize ) );
- pOut->WriteLine( aDesc );
+ aDesc.append(RTL_CONSTASCII_STRINGPARAM("Entries: "));
+ aDesc.append(static_cast<sal_Int32>(nNumElem));
+ aDesc.append(RTL_CONSTASCII_STRINGPARAM(" Size:"));
+ aDesc.append(static_cast<sal_Int32>(nNumSize));
+ pOut->WriteLine(aDesc.makeStringAndClear());
if ( nNumSize < 0 )
nNumSize = ( ( -nNumSize ) >> 2 );
if ( !nNumSize )
@@ -801,11 +802,11 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const
}
else
{
- ByteString aString( "Property" );
- aString.Append( ByteString::CreateFromInt32( i ) );
- aString.Append( ":" );
- aString.Append( ByteString::CreateFromInt32( GetPropertyValue( i ) ) );
- pOut->WriteLine( aString );
+ rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("Property"));
+ aString.append(static_cast<sal_Int32>(i));
+ aString.append(':');
+ aString.append(static_cast<sal_Int32>(GetPropertyValue(i)));
+ pOut->WriteLine(aString.makeStringAndClear());
}
}
}
commit 8296dad151262e793f298e8c9eda83f8d892fd71
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 25 22:29:28 2011 +0100
fix STRING->USTRING bug hidden behind ifdef
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index dbc458a..dcaeae8 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -713,7 +713,7 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const
String aURLStr;
- if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( String( RTL_CONSTASCII_STRINGPARAM( "d:\\ashape.dbg" ) ), aURLStr ) )
+ if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("d:\\ashape.dbg")), aURLStr ) )
{
SvStream* pOut = ::utl::UcbStreamHelper::CreateStream( aURLStr, STREAM_WRITE );
More information about the Libreoffice-commits
mailing list