[Libreoffice-commits] .: binfilter/bf_goodies binfilter/bf_sch binfilter/bf_svx binfilter/bf_sw binfilter/inc lotuswordpro/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jul 28 01:06:35 PDT 2011
binfilter/bf_goodies/source/base3d/goodies_b3dlight.cxx | 11
binfilter/bf_sch/source/core/sch_globfunc.cxx | 93 -
binfilter/bf_svx/source/editeng/svx_editobj.cxx | 82 -
binfilter/bf_sw/source/core/crsr/sw_pam.cxx | 42
binfilter/bf_sw/source/core/layout/layhelp.hxx | 3
binfilter/bf_sw/source/core/layout/sw_laycache.cxx | 10
binfilter/bf_sw/source/core/sw3io/sw3imp.hxx | 26
binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx | 85 -
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx | 641 -----------
binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx | 126 --
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 395 -------
binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx | 900 ----------------
binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx | 54
binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx | 43
binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx | 55
binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx | 38
binfilter/bf_sw/source/ui/app/makefile.mk | 1
binfilter/bf_sw/source/ui/app/sw_version.cxx | 55
binfilter/bf_sw/source/ui/inc/initui.hxx | 1
binfilter/inc/bf_goodies/b3dlight.hxx | 1
binfilter/inc/bf_sch/globfunc.hxx | 1
binfilter/inc/bf_sw/pam.hxx | 5
lotuswordpro/source/filter/lwpoleobject.cxx | 46
lotuswordpro/source/filter/lwpoleobject.hxx | 2
lotuswordpro/source/filter/xfilter/xflist.cxx | 29
lotuswordpro/source/filter/xfilter/xflist.hxx | 8
26 files changed, 2753 deletions(-)
New commits:
commit ddbbc1cbfe4c604646d1c7540737edeefd0dc505
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 28 09:03:03 2011 +0100
callcatcher: ditch various unused methods
diff --git a/binfilter/bf_goodies/source/base3d/goodies_b3dlight.cxx b/binfilter/bf_goodies/source/base3d/goodies_b3dlight.cxx
index 5b9512e..573b21a 100644
--- a/binfilter/bf_goodies/source/base3d/goodies_b3dlight.cxx
+++ b/binfilter/bf_goodies/source/base3d/goodies_b3dlight.cxx
@@ -282,17 +282,6 @@ void B3dLightGroup::EnableLighting(BOOL bNew)
/*************************************************************************
|*
-|* Abfrage, ob das Beleuchtungsmodell aktiviert/deaktiviert ist
-|*
-\************************************************************************/
-
-BOOL B3dLightGroup::IsLightingEnabled()
-{
- return bLightingEnabled;
-}
-
-/*************************************************************************
-|*
|* Die Intensitaet eines bestimmten Aspekts einer Lichtquelle setzen
|*
\************************************************************************/
diff --git a/binfilter/bf_sch/source/core/sch_globfunc.cxx b/binfilter/bf_sch/source/core/sch_globfunc.cxx
index 01d5afe..b5d2981 100644
--- a/binfilter/bf_sch/source/core/sch_globfunc.cxx
+++ b/binfilter/bf_sch/source/core/sch_globfunc.cxx
@@ -957,99 +957,6 @@ namespace binfilter {
/*N*/ const long nOffY = SCHATTR_AXIS_AUTO_MIN - SCHATTR_Y_AXIS_AUTO_MIN;
/*N*/ const long nOffZ = SCHATTR_AXIS_AUTO_MIN - SCHATTR_Z_AXIS_AUTO_MIN;
-//neue in alte Achsenattr konvertieren
-/*N*/ void AxisAttrNew2Old(SfxItemSet &rDestSet,long nId,BOOL bClear)
-/*N*/ {
-/*N*/ USHORT nOff(0);
-/*N*/ double f;
-/*N*/ BOOL b;
-/*N*/ SfxItemSet aSet(rDestSet); //Kopie
-/*N*/
-/*N*/ switch(nId)
-/*N*/ {
-/*N*/ case CHOBJID_DIAGRAM_X_AXIS:
-/*N*/ nOff=nOffX;
-/*N*/ rDestSet.Put(SvxChartTextOrderItem(CHTXTORDER_SIDEBYSIDE));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_X_AXIS_AUTO_MIN, TRUE));
-/*N*/ rDestSet.Put(SvxDoubleItem(0.0, SCHATTR_X_AXIS_MIN));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_X_AXIS_AUTO_MAX, TRUE));
-/*N*/ rDestSet.Put(SvxDoubleItem(0.0, SCHATTR_X_AXIS_MAX));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_X_AXIS_AUTO_STEP_MAIN, TRUE));
-/*N*/ rDestSet.Put(SvxDoubleItem(0.0, SCHATTR_X_AXIS_STEP_MAIN));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_X_AXIS_AUTO_STEP_HELP, TRUE));
-/*N*/ rDestSet.Put(SvxDoubleItem(0.0, SCHATTR_X_AXIS_STEP_HELP));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_X_AXIS_LOGARITHM, FALSE));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_X_AXIS_AUTO_ORIGIN, TRUE));
-/*N*/ rDestSet.Put(SvxDoubleItem(0.0, SCHATTR_X_AXIS_ORIGIN));
-/*N*/ break;
-/*N*/ case CHOBJID_DIAGRAM_Y_AXIS:
-/*N*/ nOff=nOffY;
-/*N*/ rDestSet.Put(SvxChartTextOrderItem(CHTXTORDER_SIDEBYSIDE));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_Y_AXIS_AUTO_MIN, TRUE));
-/*N*/ rDestSet.Put(SvxDoubleItem(0.0, SCHATTR_Y_AXIS_MIN));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_Y_AXIS_AUTO_MAX, TRUE));
-/*N*/ rDestSet.Put(SvxDoubleItem(0.0, SCHATTR_Y_AXIS_MAX));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_Y_AXIS_AUTO_STEP_MAIN, TRUE));
-/*N*/ rDestSet.Put(SvxDoubleItem(0.0, SCHATTR_Y_AXIS_STEP_MAIN));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_Y_AXIS_AUTO_STEP_HELP, TRUE));
-/*N*/ rDestSet.Put(SvxDoubleItem(0.0, SCHATTR_Y_AXIS_STEP_HELP));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_Y_AXIS_LOGARITHM, FALSE));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_Y_AXIS_AUTO_ORIGIN, FALSE));
-/*N*/ rDestSet.Put(SvxDoubleItem(0.0, SCHATTR_Y_AXIS_ORIGIN));
-/*N*/ break;
-/*N*/ case CHOBJID_DIAGRAM_Z_AXIS:
-/*N*/ nOff=nOffZ;
-/*N*/ rDestSet.Put(SvxChartTextOrderItem(CHTXTORDER_SIDEBYSIDE));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_Z_AXIS_AUTO_MIN, TRUE));
-/*N*/ rDestSet.Put(SvxDoubleItem(0.0, SCHATTR_Z_AXIS_MIN));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_Z_AXIS_AUTO_MAX, TRUE));
-/*N*/ rDestSet.Put(SvxDoubleItem(0.0, SCHATTR_Z_AXIS_MAX));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_Z_AXIS_AUTO_STEP_MAIN, TRUE));
-/*N*/ rDestSet.Put(SvxDoubleItem(0.0, SCHATTR_Z_AXIS_STEP_MAIN));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_Z_AXIS_AUTO_STEP_HELP, TRUE));
-/*N*/ rDestSet.Put(SvxDoubleItem(0.0, SCHATTR_Z_AXIS_STEP_HELP));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_Z_AXIS_LOGARITHM, FALSE));
-/*N*/ rDestSet.Put(SfxBoolItem(SCHATTR_Z_AXIS_AUTO_ORIGIN, TRUE));
-/*N*/ rDestSet.Put(SvxDoubleItem(0.0, SCHATTR_Z_AXIS_ORIGIN));
-/*N*/ break;
-/*N*/ }
-/*N*/
-/*N*/ SfxWhichIter aIter(aSet);
-/*N*/ USHORT nWhich = aIter.FirstWhich();
-/*N*/
-/*N*/ while(nWhich)
-/*N*/ {
-/*N*/ switch(nWhich)
-/*N*/ {
-/*N*/ case SCHATTR_AXIS_AUTO_MIN:
-/*N*/ case SCHATTR_AXIS_AUTO_MAX:
-/*N*/ case SCHATTR_AXIS_AUTO_STEP_MAIN:
-/*N*/ case SCHATTR_AXIS_AUTO_STEP_HELP:
-/*N*/ case SCHATTR_AXIS_LOGARITHM:
-/*N*/ case SCHATTR_AXIS_AUTO_ORIGIN:
-/*N*/
-/*N*/ b=((const SfxBoolItem&)rDestSet.Get(nWhich)).GetValue();
-/*N*/ rDestSet.Put(SfxBoolItem(nWhich-nOff,b));
-/*N*/ if(bClear)
-/*N*/ rDestSet.ClearItem(nWhich);
-/*N*/ break;
-/*N*/
-/*N*/ case SCHATTR_AXIS_MIN:
-/*N*/ case SCHATTR_AXIS_MAX:
-/*N*/ case SCHATTR_AXIS_STEP_MAIN:
-/*N*/ case SCHATTR_AXIS_STEP_HELP:
-/*N*/ case SCHATTR_AXIS_ORIGIN:
-/*N*/
-/*N*/ f=((const SvxDoubleItem&)rDestSet.Get(nWhich)).GetValue();
-/*N*/ rDestSet.Put(SvxDoubleItem(f,nWhich-nOff));
-/*N*/ if(bClear)
-/*N*/ rDestSet.ClearItem(nWhich);
-/*N*/ break;
-/*N*/
-/*N*/ }
-/*N*/ nWhich = aIter.NextWhich();
-/*N*/ }
-/*N*/ }
//alte in neue Achsenattr konvertieren
/*N*/ void AxisAttrOld2New(SfxItemSet &rDestSet,BOOL bClear,long nId)
/*N*/ {
diff --git a/binfilter/bf_svx/source/editeng/svx_editobj.cxx b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
index 8b5230b..cc55598 100644
--- a/binfilter/bf_svx/source/editeng/svx_editobj.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
@@ -57,86 +57,6 @@ namespace binfilter {
DBG_NAME( EE_EditTextObject )
DBG_NAME( XEditAttribute )
-//--------------------------------------------------------------
-
-BOOL lcl_CreateBulletItem( const SvxNumBulletItem& rNumBullet, USHORT nLevel, SvxBulletItem& rBullet )
-{
- const SvxNumberFormat* pFmt = rNumBullet.GetNumRule()->Get( nLevel );
- if ( pFmt )
- {
- rBullet.SetWidth( (-pFmt->GetFirstLineOffset()) + pFmt->GetCharTextDistance() );
- rBullet.SetSymbol( pFmt->GetBulletChar() );
- rBullet.SetPrevText( pFmt->GetPrefix() );
- rBullet.SetFollowText( pFmt->GetSuffix() );
- rBullet.SetStart( pFmt->GetStart() );
- rBullet.SetScale( pFmt->GetBulletRelSize() );
-
- Font aBulletFont( rBullet.GetFont() );
- if ( pFmt->GetBulletFont() )
- aBulletFont = *pFmt->GetBulletFont();
- aBulletFont.SetColor( pFmt->GetBulletColor() );
- rBullet.SetFont( aBulletFont );
-
- if ( pFmt->GetBrush() && pFmt->GetBrush()->GetGraphic() )
- {
- DBG_BF_ASSERT(0, "STRIP");
- }
-
- switch ( pFmt->GetNumberingType() )
- {
- case SVX_NUM_CHARS_UPPER_LETTER:
- case SVX_NUM_CHARS_UPPER_LETTER_N:
- rBullet.SetStyle( BS_ABC_BIG );
- break;
- case SVX_NUM_CHARS_LOWER_LETTER:
- case SVX_NUM_CHARS_LOWER_LETTER_N:
- rBullet.SetStyle( BS_ABC_SMALL );
- break;
- case SVX_NUM_ROMAN_UPPER:
- rBullet.SetStyle( BS_ROMAN_BIG );
- break;
- case SVX_NUM_ROMAN_LOWER:
- rBullet.SetStyle( BS_ROMAN_SMALL );
- break;
- case SVX_NUM_ARABIC:
- rBullet.SetStyle( BS_123 );
- break;
- case SVX_NUM_NUMBER_NONE:
- rBullet.SetStyle( BS_NONE );
- break;
- case SVX_NUM_CHAR_SPECIAL:
- rBullet.SetStyle( BS_BULLET );
- break;
- case SVX_NUM_PAGEDESC:
- OSL_FAIL( "Unknown: SVX_NUM_PAGEDESC" );
- rBullet.SetStyle( BS_BULLET );
- break;
- case SVX_NUM_BITMAP:
- rBullet.SetStyle( BS_BMP );
- break;
- default:
- OSL_FAIL( "Unknown NumType" );
- }
-
- switch ( pFmt->GetNumAdjust() )
- {
- case SVX_ADJUST_LEFT:
- rBullet.SetJustification( BJ_VCENTER|BJ_HLEFT );
- break;
- case SVX_ADJUST_RIGHT:
- rBullet.SetJustification( BJ_VCENTER|BJ_HRIGHT );
- break;
- case SVX_ADJUST_CENTER:
- rBullet.SetJustification( BJ_VCENTER|BJ_HCENTER );
- break;
- default:
- OSL_FAIL( "Unknown or invalid NumAdjust" );
- }
- }
- return pFmt ? TRUE : FALSE;
-}
-
-
XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& rItem, USHORT nStart, USHORT nEnd )
{
// das neue Attribut im Pool anlegen
@@ -146,8 +66,6 @@ XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& rItem
return pNew;
}
-
-
XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr, USHORT nS, USHORT nE )
{
DBG_CTOR( XEditAttribute, 0 );
diff --git a/binfilter/bf_sw/source/core/crsr/sw_pam.cxx b/binfilter/bf_sw/source/core/crsr/sw_pam.cxx
index da18866..dc9855c 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_pam.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_pam.cxx
@@ -148,48 +148,6 @@ namespace binfilter {
/*N*/ return ( nContent != rPos.nContent );
/*N*/ }
-SwComparePosition ComparePosition(
- const SwPosition& rStt1, const SwPosition& rEnd1,
- const SwPosition& rStt2, const SwPosition& rEnd2 )
-{
- SwComparePosition nRet;
- if( rStt1 < rStt2 )
- {
- if( rEnd1 > rStt2 )
- {
- if( rEnd1 >= rEnd2 )
- nRet = POS_OUTSIDE;
- else
- nRet = POS_OVERLAP_BEFORE;
-
- }
- else if( rEnd1 == rStt2 )
- nRet = POS_COLLIDE_END;
- else
- nRet = POS_BEFORE;
- }
- else if( rEnd2 > rStt1 )
- {
- if( rEnd2 >= rEnd1 )
- {
- if( rEnd2 == rEnd1 && rStt2 == rStt1 )
- nRet = POS_EQUAL;
- else
- nRet = POS_INSIDE;
- }
- else
- nRet = POS_OVERLAP_BEHIND;
- }
- else if( rEnd2 == rStt1 )
- nRet = POS_COLLIDE_START;
- else
- nRet = POS_BEHIND;
- return nRet;
-}
-
-
-/* */
-
enum CHKSECTION { Chk_Both, Chk_One, Chk_None };
diff --git a/binfilter/bf_sw/source/core/layout/layhelp.hxx b/binfilter/bf_sw/source/core/layout/layhelp.hxx
index 9bfa227..ca60afb 100644
--- a/binfilter/bf_sw/source/core/layout/layhelp.hxx
+++ b/binfilter/bf_sw/source/core/layout/layhelp.hxx
@@ -213,9 +213,6 @@ public:
// be nested.
BYTE OpenFlagRec();
- // Open flag record for writing;
- void OpenFlagRec( BYTE nFlags, BYTE nLen );
-
// Close a flag record. Any bytes left are skipped.
void CloseFlagRec();
diff --git a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
index 75fbe7a..8bc37ec 100644
--- a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
@@ -910,16 +910,6 @@ namespace binfilter {
/*N*/ return (cFlags >> 4);
/*N*/ }
-/*N*/ void SwLayCacheIoImpl::OpenFlagRec( BYTE nFlags, BYTE nLen )
-/*N*/ {
-/*N*/ OSL_ENSURE( bWriteMode, "OpenFlagRec illegal in read mode" );
-/*N*/ OSL_ENSURE( (nFlags & 0xF0) == 0, "illegal flags set" );
-/*N*/ OSL_ENSURE( nLen < 16, "wrong flag record length" );
-/*N*/ BYTE cFlags = (nFlags << 4) + nLen;
-/*N*/ *pStream << cFlags;
-/*N*/ nFlagRecEnd = pStream->Tell() + nLen;
-/*N*/ }
-
/*N*/ void SwLayCacheIoImpl::CloseFlagRec()
/*N*/ {
/*N*/ if( bWriteMode )
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
index bb786a4..d93ea2b 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
@@ -267,9 +267,7 @@ public:
Sw3StringPool();
USHORT Count() { return aPool.Count(); }
void Clear();
- void Setup( SwDoc&, long nFFVersion, Sw3ExportInfo* pEI );
void SetupRedlines( SwDoc& );
- void SetupForNumRules( SwDoc&, long nFFVersion );
void RemoveExtensions( SwDoc& );
static void RemoveExtension( String& );
USHORT Add( const String&, USHORT nPoolId /*= 0*/, BOOL bDontSearch=FALSE );
@@ -513,7 +511,6 @@ public:
BOOL HasRecSizes() const { return pRecSizes != 0; }
void FlushRecSizes();
void InRecSizes( ULONG nRecPos );
- ULONG OutRecSizes();
BYTE OpenFlagRec(); // Endeposition eines Flag-Records merken
void CloseFlagRec(); // Flag-Record schliessen
void OpenValuePos16( UINT16 ); // Position fuer UINT16-Wert merken
@@ -601,12 +598,10 @@ public:
void LoadDocContents( SwPaM* ); // I: Dokumentinhalt
USHORT GetStreamFlags(); // I: Stream-Flags laden
void InHeader( BOOL bReadRecSizes=FALSE); // I: Dateikopf
- void OutHeader( ULONG nRecSzPos=0UL ); // O: Dateikopf
BOOL InHeaderForScan( BOOL bReadRecSizes=FALSE );
// SW3FIELD.CXX
SwField* InField(); // I: Feld
- void OutFieldTypes(); // O: alle Feldtypen
SwFieldType* InFieldType(); // I: ein Feldtyp
BOOL OutFieldType(const SwFieldType&);// O: ein Feldtyp
@@ -619,37 +614,27 @@ public:
SwFmt* InFormat( BYTE cKind, SwFmt* ); // I: Format
void OutFormat( BYTE, const SwFmt& ); // O: Format
void InFlyFrames(); // I: globale FlyFrames
- void OutFlyFrames( SwPaM& ); // O: globale FlyFrames
// SW3MISC.CXX
SwFmt* FindFmt( USHORT nIdx, BYTE c ); // Suchen eines Formats per StringId
SwFmt* FindNamedFmt( USHORT nIdx, BYTE);// Suchen einer Formatvorlage
SwTxtFmtColl* FindTxtColl( USHORT n ); // Suchen einer Absatzvorlage
SwPageDesc* FindPageDesc( USHORT nIdx );// Suchen einer Seitenvorlage
- void CollectFlyFrms( const SwPaM* ); // vor Ausgabe: alle FlyFrms finden
void FreeFlyFrms(); // nach Ausgabe. Infos freigeben
SwFmt* FindFlyFrm( ULONG nNodeId ); // O: absatzgebundenen Fly suchen
void InMacroTbl(); // I: globale Makros
- void OutMacroTbl(); // O: globale Makros
void InDictionary(); // I: Woerterbuecher (Online-Spl.)
- void OutDictionary(); // O: Woerterbuecher (Online-Spl.)
void InJobSetup(); // I: Job Setup
- void OutJobSetup(); // O: Job Setup
void InDBName(); // I: Datenbankname
- void OutDBName(); // O: Datenbankname
void InStringPool( BYTE, Sw3StringPool& );
- void OutStringPool( BYTE, Sw3StringPool& );
void InPasswd(); // I: Passwort
void SetPasswd( const String& rPass );// IO: Passwort setzen
// O: TOX- und Bookmark-Bereiche suchen
void InNodeMark( const SwNodeIndex&, xub_StrLen nOffset ); // I: Markierung
void OutNodeMarks( ULONG ); // O: Markierung
void InBookmarks(); // I: Bookmarks
- void OutBookmarks( BOOL bPageStyles );// O: Bookmarks
void InTOXs51(); // I: TOX-Bereiche
- void OutTOXs51(); // O: TOX-Bereiche
void InTOXs(); // I: TOX-Bereiche
- void OutTOXs(); // O: TOX-Bereiche
void CleanupMarks(); // I: nicht ben. Marks loeschen
void ConnectTOXs(); // I: insert TOXs
@@ -702,11 +687,8 @@ public:
void InEndNoteInfo( SwEndNoteInfo &rENInf ); // I: globale Endnoten-Info
void OutEndNoteInfo( const SwEndNoteInfo &rENInf ); // O: globale Endnoten-Info
void InEndNoteInfo(); // I: globale Endnoten-Info
- void OutEndNoteInfo(); // O: globale Endnoten-Info
void InFtnInfo(); // I: globale Fussnoten-Info
- void OutFtnInfo(); // O: globale Fussnoten-Info
void InFtnInfo40(); // I: globale Fussn.-Info 3.1/4.0
- void OutFtnInfo40(); // O: globale Fussn.-Info 3.1/4.0
void OpenNumRange40( const SwNodeIndex& ); // I: Numerierungsregel-Beginn
void CloseNumRange40( const SwNodeIndex& ); // I: Numerierungsregel-Ende
@@ -715,13 +697,11 @@ public:
void OutPageFtnInfo( const SwPageFtnInfo& rFtn );
void InPageDescs(); // I: alle Seitenvorlagen
SwPageDesc* InPageDesc( USHORT& ); // I: Seitenvorlage
- void OutPageDesc( const SwPageDesc& );// O: Seitenvorlage
void ConnectPageDescAttrs(); // I: PageDesc-Referenzen aufloesen
// SW3SECTN.CXX
void InContents( SwNodeIndex&, xub_StrLen=0, BOOL=TRUE, BYTE=0, BOOL=FALSE );
SwStartNode& InContents(); // I: neue Section anlegen
- void OutContents( SwPaM* ); // O: per PaM definierter Bereich
void OutContents( const SwNodeIndex& ); // O: abgeschlossener Bereich
// O: contents
void OutContents( ULONG,ULONG,xub_StrLen,xub_StrLen, BOOL bTopLevel=FALSE );
@@ -743,25 +723,19 @@ public:
/*N*/ void InRedline(); //SW50.SDW // I: Redline
void OutRedline( const SwRedline& rRedline );
/*N*/ void InRedlines(); //SW50.SDW
- void OutRedlines( BOOL bPageStyles );
/*N*/ void InNodeRedline( const SwNodeIndex& rNodeIdx, INT32& nOffset, BYTE=0 ); //SW50.SDW
void OutNodeRedlines( ULONG );
void CleanupRedlines();
- void OutDocStat( BOOL bFirst );
void InDocStat();
void InNumberFormatter();
- void OutNumberFormatter();
void InLineNumberInfo();
- void OutLineNumberInfo();
void InDocDummies();
- void OutDocDummies();
void InPagePreViewPrintData();
- void OutPagePreViewPrintData();
// die folgenden Methoden sind zum Suchen von Sections
void GetSectionList( SvStrings& rSectionList, SvStringsDtor& rBookmarks );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx
index 9a66ac2..37f1687 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx
@@ -53,9 +53,6 @@
#include "sw3imp.hxx"
namespace binfilter {
-
-extern String GetSWGVersion();
-
// Wird von der GUI-Seite gesetzt, wenn Layouts ignoriert werden sollen
//////////////////////////////////////////////////////////////////////////////
@@ -493,88 +490,6 @@ void lcl_sw3doc_ChgChartName( SwDoc* pDoc )
InRecSizes( nRecSzPos );
/*N*/ }
-
-/*N*/ void Sw3IoImp::OutHeader( ULONG nRecSzPos )
-/*N*/ {
-/*N*/ Reset2();
-/*N*/ nFileFlags |= SWGF_NO_FRAMES;
-/*N*/ if( aBlkName.Len() )
-/*N*/ nFileFlags |= SWGF_BLOCKNAME;
-/*N*/
-/*N*/ INT32 nDocFlags = 0;
-/*N*/ if ( pDoc->IsBrowseMode() )
-/*N*/ nDocFlags |= 0x0002;
-/*N*/ if ( pDoc->IsHTMLMode() )
-/*N*/ nDocFlags |= 0x0004;
-/*N*/ if ( pDoc->IsHeadInBrowse() )
-/*N*/ nDocFlags |= 0x0008;
-/*N*/ if ( pDoc->IsFootInBrowse() )
-/*N*/ nDocFlags |= 0x0010;
-/*N*/ if( pDoc->IsGlobalDoc() )
-/*N*/ nDocFlags |= 0x0020;
-/*N*/ if( pDoc->IsGlblDocSaveLinks() )
-/*N*/ nDocFlags |= 0x0040;
-/*N*/ if( !bBlock && !IsSw31Or40Export() && pDoc->IsLabelDoc() )
-/*N*/ nDocFlags |= 0x0080;
-/*N*/
-/*N*/ BYTE cRedlineMode = 0;
-/*N*/ if( !bBlock && !IsSw31Or40Export() )
-/*N*/ cRedlineMode = (BYTE)pDoc->GetRedlineMode();
-/*N*/
-/*N*/ UINT16 nVers = SWG_VERSION;
-/*N*/ const sal_Char *sHeader = SW5HEADER;
-/*N*/
-/*N*/ switch( pStrm->GetVersion() )
-/*N*/ {
-/*N*/ case SOFFICE_FILEFORMAT_40:
-/*N*/ nVers = SWG_EXPORT40;
-/*N*/ sHeader = SW4HEADER;
-/*N*/ break;
-/*N*/ case SOFFICE_FILEFORMAT_31:
-/*N*/ nVers = SWG_EXPORT31;
-/*N*/ sHeader = SW3HEADER;
-/*N*/ break;
-/*N*/ }
-/*N*/
-/*N*/ OSL_ENSURE( !nRecSzPos || !IsSw31Or40Export(),
-/*N*/ "Lange Records gibt's erst ab der 5.0" );
-/*N*/ OSL_ENSURE( GetSOStoreTextEncoding( gsl_getSystemTextEncoding(),
-/*N*/ pStrm->GetVersion() ) == eSrcSet,
-/*N*/ "wrong encoding while writing" );
-/*N*/ OSL_ENSURE( pStrm->GetStreamCharSet() == eSrcSet,
-/*N*/ "wrong encoding at stream while writing" );
-/*N*/
-/*N*/ OutputMode( TRUE );
-/*N*/ pStrm->Seek( 0L );
-/*N*/ *pStrm << sHeader
-/*N*/ << (BYTE) 0
-/*N*/ << (BYTE) ( aBlkName.Len() ? 46+64 : 46 ) // Laenge der Daten
-/*N*/ << (UINT16) nVers
-/*N*/ << (UINT16) nFileFlags
-/*N*/ << (INT32) nDocFlags
-/*N*/ << (UINT32) nRecSzPos
-/*N*/ << (INT32) 0
-/*N*/ << (INT8) 0
-/*N*/ << (INT8) 0
-/*N*/ << (BYTE) cRedlineMode
-/*N*/ << (INT8) SWG_CVERSION;
-/*N*/ pStrm->Write( cPasswd, 16 );
-/*N*/ *pStrm << (BYTE) eSrcSet
-/*N*/ << (BYTE) 0 // OLD: eSysType
-/*N*/ << (UINT32) nDate // fuer Passwortcheck wichtig
-/*N*/ << (UINT32) nTime;
-/*N*/ if( aBlkName.Len() )
-/*N*/ {
-/*N*/ // den langen Blocknamen rausschreiben
-/*?*/ ByteString sTmp( aBlkName, eSrcSet );
-/*?*/ sal_Char cBuf[ 64 ];
-/*?*/ sTmp.Erase( 63 );
-/*?*/ memset( cBuf, 0, 64 );
-/*?*/ memcpy( cBuf, sTmp.GetBuffer(), sTmp.Len() );
-/*?*/ pStrm->Write( cBuf, 64 );
-/*N*/ }
-/*N*/ }
-
}
/* 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 a1735e0..8818879 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -307,118 +307,6 @@ static OldFormats aOldGetSetExpFmt30[] =
/*N*/ }
/*N*/ }
-/*N*/ void sw3io_ConvertToOldField( const SwField* pFld, USHORT& rWhich,
-/*N*/ UINT32& rFmt, ULONG nFFVersion )
-/*N*/ {
-/*N*/ const OldFormats *pOldFmt = 0L;
-/*N*/ UINT32 nOldFmt = rFmt;
-/*N*/
-/*N*/ switch( rWhich )
-/*N*/ {
-/*N*/ case RES_DOCINFOFLD:
-/*N*/ if( SOFFICE_FILEFORMAT_40 >= nFFVersion )
-/*N*/ {
-/*N*/ switch (pFld->GetSubType() & 0xff00)
-/*N*/ {
-/*N*/ case DI_SUB_AUTHOR: rFmt = RF_AUTHOR; break;
-/*N*/ case DI_SUB_TIME: rFmt = RF_TIME; break;
-/*N*/ case DI_SUB_DATE: rFmt = RF_DATE; break;
-/*N*/ }
-/*N*/ }
-/*N*/ break;
-/*N*/
-/*N*/ case RES_DATETIMEFLD:
-/*N*/ if( SOFFICE_FILEFORMAT_40 >= nFFVersion )
-/*N*/ {
-/*N*/ USHORT nSubType = ((SwDateTimeField*) pFld)->GetSubType();
-/*N*/ switch( nSubType )
-/*N*/ {
-/*N*/ case DATEFLD: rWhich = RES_DATEFLD; break;
-/*N*/ case TIMEFLD: rWhich = RES_TIMEFLD; break;
-/*N*/ case DATEFLD|FIXEDFLD: rWhich = RES_FIXDATEFLD; break;
-/*N*/ case TIMEFLD|FIXEDFLD: rWhich = RES_FIXTIMEFLD; break;
-/*N*/ }
-/*N*/
-/*N*/ if( nSubType & DATEFLD )
-/*N*/ {
-/*N*/ rFmt = DFF_DMY;
-/*N*/ pOldFmt = aOldDateFmt40;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ rFmt = TF_SYSTEM;
-/*N*/ pOldFmt = aOldTimeFmt;
-/*N*/ }
-/*N*/ }
-/*N*/ break;
-/*N*/
-/*N*/ case RES_DBFLD:
-/*N*/ case RES_TABLEFLD:
-/*N*/ case RES_GETEXPFLD:
-/*N*/ case RES_SETEXPFLD:
-/*N*/ case RES_USERFLD:
-/*N*/ if( SOFFICE_FILEFORMAT_40 >= nFFVersion )
-/*N*/ {
-/*N*/ USHORT nSubType = pFld->GetSubType();
-/*N*/
-/*N*/ if (nSubType & SUB_INVISIBLE)
-/*N*/ rFmt = VVF_INVISIBLE;
-/*N*/ else if (nSubType & SUB_CMD)
-/*N*/ rFmt = VVF_CMD;
-/*N*/ else if( !(GSE_SEQ & nSubType) )
-/*N*/ {
-/*N*/ pOldFmt = aOldGetSetExpFmt40;
-/*N*/ rFmt = VVF_SYS;
-/*N*/ }
-/*N*/ }
-/*N*/ break;
-/*N*/
-/*N*/ case RES_GETREFFLD:
-/*N*/ if( SOFFICE_FILEFORMAT_31 == nFFVersion )
-/*N*/ {
-/*N*/ switch( rFmt )
-/*N*/ {
-/*N*/ case REF_PAGE:
-/*N*/ case REF_CHAPTER:
-/*N*/ case REF_CONTENT:
-/*N*/ break;
-/*N*/
-/*N*/ default:
-/*N*/ // case REF_UPDOWN:
-/*N*/ // case REF_PAGE_PGDESC:
-/*N*/ rFmt = REF_PAGE;
-/*N*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/ break;
-/*N*/ }
-/*N*/
-/*N*/ if( pOldFmt && nOldFmt )
-/*N*/ {
-/*N*/ USHORT i = 0;
-/*N*/
-/*N*/ SvNumberFormatter *pFormatter = ((SwValueField*)pFld)->GetDoc()->GetNumberFormatter();
-/*N*/ const SvNumberformat* pEntry = pFormatter->GetEntry( nOldFmt );
-/*N*/
-/*N*/ if( pEntry )
-/*N*/ {
-/*N*/ while( pOldFmt[i].eFormatIdx != NF_NUMERIC_START ||
-/*N*/ pOldFmt[i].nOldFormat )
-/*N*/ {
-/*N*/ sal_uInt32 nKey = pFormatter->GetFormatIndex(
-/*N*/ pOldFmt[i].eFormatIdx, pEntry->GetLanguage() );
-/*N*/
-/*N*/ if( nOldFmt == nKey )
-/*N*/ {
-/*N*/ rFmt = pOldFmt[i].nOldFormat;
-/*N*/ break;
-/*N*/ }
-/*N*/ i++;
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
/*N*/ void lcl_sw3io_FillSetExpFieldName( Sw3IoImp& rIo, USHORT nStrId,
/*N*/ String& rName )
/*N*/ {
@@ -930,64 +818,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutDBField40( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ BYTE cFlag = 0;
-/*N*/ String sTxt( ((SwDBField *)pFld)->GetOldContent() );
-/*N*/ if( ((SwDBField *)pFld)->IsValidValue() )
-/*N*/ {
-/*?*/ cFlag = 0x01;
-/*?*/ rtl::OString sValue(rtl::OString::valueOf(((SwDBField *)pFld)->GetValue()));
-/*?*/ sTxt.AssignAscii(sValue.getStr());
-/*N*/ }
-/*N*/ *rIo.pStrm << (UINT16)rIo.aStringPool.Find( ((SwDBFieldType *)pFld->GetTyp())->GetColumnName(), USHRT_MAX );
-/*N*/ rIo.OutString( *rIo.pStrm, sTxt );
-/*N*/ *rIo.pStrm << cFlag;
-/*N*/
-/*N*/ if( !rIo.IsSw31Export() )
-/*N*/ {
-/*N*/ SwDBData aData = ((SwDBFieldType *)pFld->GetTyp())->GetDBData();
-/*N*/ String sDBName;
-/*N*/ if(aData.sDataSource.getLength() || aData.sCommand.getLength())
-/*N*/ {
-/*?*/ sDBName = aData.sDataSource;
-/*?*/ sDBName += DB_DELIM;
-/*?*/ sDBName += (String)aData.sCommand;
-/*N*/ }
-/*N*/ *rIo.pStrm << (UINT16)rIo.aStringPool.Find( sDBName, IDX_NOCONV_FF );
-/*N*/ }
-/*N*/ }
-
-/*N*/ void lcl_sw3io_OutDBField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ BYTE cFlag = ((SwDBField *)pFld)->IsValidValue() ? 0x01 : 0x00;
-/*N*/ SwDBData aData = ((SwDBFieldType *)pFld->GetTyp())->GetDBData();
-/*N*/ String sDBName;
-/*N*/ if(aData.sDataSource.getLength() || aData.sCommand.getLength())
-/*N*/ {
-/*N*/ sDBName = aData.sDataSource;
-/*N*/ sDBName += DB_DELIM;
-/*N*/ sDBName += (String)aData.sCommand;
-/*N*/ }
-/*N*/
-/*N*/ *rIo.pStrm << cFlag
-/*N*/ << (UINT16)rIo.aStringPool.Find(
-/*N*/ ((SwDBFieldType *)pFld->GetTyp())->GetColumnName(),
-/*N*/ USHRT_MAX )
-/*N*/ << (UINT16)rIo.aStringPool.Find(
-/*N*/ sDBName,
-/*N*/ IDX_NOCONV_FF );
-/*N*/
-/*N*/ if( ((SwDBField *)pFld)->IsValidValue() )
-/*N*/ {
-/*?*/ *rIo.pStrm << (double)((SwDBField *)pFld)->GetValue();
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ rIo.OutString( *rIo.pStrm, ((SwDBField *)pFld)->GetOldContent() );
-/*N*/ }
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InFileNameField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& rFmt )
/*N*/ {
@@ -1009,15 +839,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-// Wird for 4.0-Export gar nicht erst aufgerufen!
-/*N*/ void lcl_sw3io_OutFileNameField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ if( ((SwFileNameField *)pFld)->IsFixed() )
-/*?*/ rIo.OutString( *rIo.pStrm, ((SwFileNameField *)pFld)->GetContent() );
-/*N*/ }
-
-/* */
-
/*N*/ SwField* lcl_sw3io_InDBNameField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -1035,18 +856,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return new SwDBNameField( (SwDBNameFieldType *)pType, aData );
/*N*/ }
-/*N*/ void lcl_sw3io_OutDBNameField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ if( !rIo.IsSw31Export() )
-/*N*/ {
-/*N*/ SwDBData aData(((SwDBNameField*)pFld)->GetRealDBData());
-/*N*/ String sDBName(aData.sDataSource);
-/*N*/ sDBName += DB_DELIM;
-/*N*/ sDBName += (String)aData.sCommand;
-/*N*/ *rIo.pStrm << (UINT16)rIo.aStringPool.Find( sDBName, IDX_NOCONV_FF );
-/*N*/ }
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InDateField40( Sw3IoImp& /*rIo*/, SwFieldType* pType,
/*N*/ USHORT nSubType, UINT32& )
/*N*/ { //SW40.SDW
@@ -1105,32 +914,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutPageNumberField40( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ INT16 nOff = (INT16)pFld->GetPar2().ToInt32();
-/*N*/ UINT16 nSub = pFld->GetSubType();
-/*N*/
-/*N*/ if( rIo.IsSw31Export() )
-/*N*/ {
-/*N*/ if( PG_NEXT == nSub )
-/*N*/ nOff = 1;
-/*N*/ else if( PG_PREV == nSub )
-/*N*/ nOff = -1;
-/*N*/ }
-/*N*/
-/*N*/ *rIo.pStrm << nOff
-/*N*/ << nSub;
-/*N*/ rIo.OutString( *rIo.pStrm, ((SwPageNumberField*)pFld)->GetUserString() );
-/*N*/ }
-
-/*N*/ void lcl_sw3io_OutPageNumberField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ // nur Offset, deshalb kein long noetig!
-/*N*/ INT16 nOff = (INT16)pFld->GetPar2().ToInt32();
-/*N*/ *rIo.pStrm << nOff;
-/*N*/ rIo.OutString( *rIo.pStrm, ((SwPageNumberField*)pFld)->GetUserString() );
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InUserField40( Sw3IoImp& rIo, SwFieldType *pType,
/*N*/ USHORT nSubType, UINT32& rFmt )
/*N*/ {
@@ -1182,12 +965,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutUserField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ *rIo.pStrm << (UINT16)rIo.aStringPool.Find(
-/*N*/ ((SwUserField*)pFld)->GetTyp()->GetName(), USHRT_MAX );
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InGetRefField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& rFmt )
/*N*/ {
@@ -1232,25 +1009,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutGetRefField40( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ rIo.OutString( *rIo.pStrm, ((SwGetRefField*)pFld)->GetSetRefName() );
-/*N*/ rIo.OutString( *rIo.pStrm, pFld->Expand() );
-/*N*/
-/*N*/ if( !rIo.IsSw31Export() )
-/*N*/ {
-/*N*/ *rIo.pStrm << (UINT16)pFld->GetSubType()
-/*N*/ << (UINT16)((SwGetRefField*)pFld)->GetSeqNo();
-/*N*/ }
-/*N*/ }
-
-/*N*/ void lcl_sw3io_OutGetRefField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ rIo.OutString( *rIo.pStrm, ((SwGetRefField*)pFld)->GetSetRefName() );
-/*N*/ rIo.OutString( *rIo.pStrm, pFld->Expand() );
-/*N*/ *rIo.pStrm << (UINT16)((SwGetRefField*)pFld)->GetSeqNo();
-/*N*/ }
-
/*N*/ void lcl_sw3io_ChkHiddenExp( String& rCond ) //SW40.SDW
/*N*/ {
/*N*/ // die Expression wurde bei 4.0 Export einmal gedreht, beim erneuten
@@ -1322,79 +1080,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutHiddenTxtField40( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
- String aText(pFld->GetPar2());
- BYTE cFlags = ((SwHiddenTxtField*)pFld)->GetValue() ? 0x10 : 0;
-
- if( ((SwHiddenTxtField*)pFld)->IsValid() )
- {
- if( !rIo.IsSw31Export() )
- {
- aText = pFld->GetPar2();
- aText += '|';
- aText += ((SwHiddenTxtField*)pFld)->GetCntnt();
- }
- else
- {
- if (((SwHiddenTxtField*)pFld)->GetValue())
- {
- aText = ((SwHiddenTxtField*)pFld)->GetPar2().GetToken(0, '|');
- aText += '|';
- aText += ((SwHiddenTxtField*)pFld)->GetCntnt();
- }
- else
- {
- aText = ((SwHiddenTxtField*)pFld)->GetCntnt();
- aText += '|';
- aText += pFld->GetPar2().GetToken(1, '|');
- }
- }
- }
- else
- aText = pFld->GetPar2();
-
- if( ((SwHiddenTxtField*)pFld)->IsConditional() )
- cFlags |= 0x20;
-
- String sCond( pFld->GetPar1() );
- USHORT nSubType = pFld->GetSubType();
- if( 0x20 & cFlags && TYP_CONDTXTFLD != nSubType )
- {
- lcl_sw3io_ChkHiddenExp( sCond );
- if( 0x10 & cFlags )
- cFlags &= ~0x10;
- else
- cFlags |= 0x10;
- }
-
- *rIo.pStrm << cFlags;
- rIo.OutString( *rIo.pStrm, aText ); // text
- rIo.OutString( *rIo.pStrm, sCond ); // condition
- *rIo.pStrm << nSubType;
-/*N*/ }
-
-/*N*/ void lcl_sw3io_OutHiddenTxtField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ String aText(pFld->GetPar2());
-/*N*/ BYTE cFlags = ((SwHiddenTxtField*)pFld)->GetValue() ? 0x10 : 0;
-/*N*/
-/*N*/ if( ((SwHiddenTxtField*)pFld)->IsValid() )
-/*N*/ {
-/*N*/ aText = pFld->GetPar2();
-/*N*/ aText += '|';
-/*N*/ aText += ((SwHiddenTxtField*)pFld)->GetCntnt();
-/*N*/ }
-/*N*/ else
-/*N*/ aText = pFld->GetPar2();
-/*N*/
-/*N*/ if( ((SwHiddenTxtField*)pFld)->IsConditional() )
-/*N*/ cFlags |= 0x20;
-/*N*/ *rIo.pStrm << cFlags;
-/*N*/ rIo.OutString( *rIo.pStrm, aText ); // text
-/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar1() ); // condition
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InPostItField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -1406,14 +1091,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
return new SwPostItField( (SwPostItFieldType*)pType, aAuthor, aText, Date( nDate ) );
/*N*/ }
-/*N*/ void lcl_sw3io_OutPostItField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
- Date aDate = ((SwPostItField*)pFld)->GetDate();
- *rIo.pStrm << (INT32) aDate.GetDate();
- rIo.OutString( *rIo.pStrm, pFld->GetPar1() ); // Author
- rIo.OutString( *rIo.pStrm, pFld->GetPar2() ); // Text
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InDateTimeField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT nSubType, UINT32& )
/*N*/ {
@@ -1435,12 +1112,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutDateTimeField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ *rIo.pStrm << ((SwDateTimeField*)pFld)->GetValue()
-/*N*/ << (INT32)((SwDateTimeField*)pFld)->GetOffset();
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InFixDateField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -1454,11 +1125,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutFixDateField40( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ *rIo.pStrm << (INT32) ((SwDateTimeField*)pFld)->GetDate(TRUE).GetDate();
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InFixTimeField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -1471,11 +1137,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutFixTimeField40( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
- *rIo.pStrm << (INT32)((SwDateTimeField*)pFld)->GetTime(TRUE).GetTime();
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InAuthorField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -1492,12 +1153,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-// Wird for 4.0-Export gar nicht erst aufgerufen!
-/*N*/ void lcl_sw3io_OutAuthorField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ rIo.OutString( *rIo.pStrm, ((SwAuthorField *)pFld)->GetContent() );
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InChapterField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -1513,15 +1168,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutChapterField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ BYTE cLvl = ((SwChapterField*)pFld)->GetLevel();
-/*N*/ if( rIo.IsSw31Or40Export() && cLvl >= OLD_MAXLEVEL)
-/*N*/ cLvl = OLD_MAXLEVEL - 1;
-/*N*/
-/*N*/ *rIo.pStrm << cLvl;
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InDocStatField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& rFmt )
/*N*/ {
@@ -1536,11 +1182,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return new SwDocStatField( (SwDocStatFieldType*)pType, nSubType, rFmt );
/*N*/ }
-/*N*/ void lcl_sw3io_OutDocStatField40( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ *rIo.pStrm << (UINT16) pFld->GetSubType();
-/*N*/ }
-
// Im 5.0-Format bleibt nix, was geschrieben werden muesste.
/*N*/ SwField* lcl_sw3io_InDDEField( Sw3IoImp& rIo, SwFieldType* pType,
@@ -1564,14 +1205,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return new SwDDEField( (SwDDEFieldType*)pType );
/*N*/ }
-/*N*/ void lcl_sw3io_OutDDEField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ *rIo.pStrm << (UINT16)rIo.aStringPool.Find( ((SwDDEField*)pFld)->GetTyp()->GetName(), USHRT_MAX );
-/*N*/ rIo.nFileFlags |= SWGF_HAS_DDELNK;
-/*N*/ }
-
-/* */
-
/*N*/ SwField* lcl_sw3io_InInputField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ { //SW40.SDW
@@ -1592,19 +1225,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return new SwInputField( (SwInputFieldType*)pType, aContent, aPrompt, nSubType );
/*N*/ }
-/*N*/ void lcl_sw3io_OutInputField40( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
- rIo.OutString( *rIo.pStrm, pFld->GetPar1() );// Content oder SwUserFieldName
- rIo.OutString( *rIo.pStrm, pFld->GetPar2() );// PromptText
- *rIo.pStrm << (UINT16) pFld->GetSubType();
-/*N*/ }
-
-/*N*/ void lcl_sw3io_OutInputField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar1() );// Content oder SwUserFieldName
-/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar2() );// PromptText
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InMacroField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -1615,12 +1235,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return new SwMacroField( (SwMacroFieldType*)pType, aName, aText );
/*N*/ }
-/*N*/ void lcl_sw3io_OutMacroField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar1() );
-/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar2() );
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InTblField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT nSubType, UINT32& )
/*N*/ {
@@ -1642,19 +1256,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-// Die Variable rIo.pCurTbl wird in Sw3IoImp::OutTable()
-// besetzt und enthaelt die zur Zeit ausgegebene Tabelle
-
-/*N*/ void lcl_sw3io_OutTblField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ if( rIo.pCurTbl )
-/*N*/ ((SwTblField*)pFld)->PtrToBoxNm( rIo.pCurTbl );
-/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar2() );
-/*N*/ rIo.OutString( *rIo.pStrm, ((SwTblField*)pFld)->GetExpStr() );
-/*N*/ if( rIo.IsSw31Or40Export() )
-/*N*/ *rIo.pStrm << (UINT16) ((SwTblField*)pFld)->GetSubType();
-/*N*/ }
-
/*N*/ SwField *lcl_sw3io_InGetExpField40( Sw3IoImp& rIo, SwFieldType *pType,
/*N*/ USHORT nSubType, UINT32& rFmt )
/*N*/ { //SW40.SDW
@@ -1690,21 +1291,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutGetExpField40( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
- rIo.OutString( *rIo.pStrm, ((SwGetExpField*)pFld)->GetFormula() );
- rIo.OutString( *rIo.pStrm, ((SwGetExpField*)pFld)->GetExpStr() );
- *rIo.pStrm << (UINT16) pFld->GetSubType();
-/*N*/ }
-
-/*N*/ void lcl_sw3io_OutGetExpField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ rIo.OutString( *rIo.pStrm, ((SwGetExpField*)pFld)->GetFormula() );
-/*N*/ rIo.OutString( *rIo.pStrm, ((SwGetExpField*)pFld)->GetExpStr() );
-/*N*/ }
-
-/* */
-
/*N*/ SwField* lcl_sw3io_InSetExpField40( Sw3IoImp& rIo, SwFieldType *pType,
/*N*/ USHORT nSubType, UINT32& rFmt )
/*N*/ {
@@ -1915,12 +1501,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutHiddenParaField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ *rIo.pStrm << (BYTE)((SwHiddenParaField*)pFld)->IsHidden();
-/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar1() );
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InDocInfoField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT nSubType, UINT32& rFmt )
/*N*/ {
@@ -1954,44 +1534,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutDocInfoField40( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
- UINT16 nSubType = pFld->GetSubType();
- nSubType &= 0x00ff;
-
- *rIo.pStrm << nSubType;
-/*N*/ }
-
-/*N*/ void lcl_sw3io_OutDocInfoField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ BYTE cFlags = 0x00;
-/*N*/ if( ((SwDocInfoField*)pFld)->IsFixed() )
-/*N*/ {
-/*?*/ USHORT nSub = pFld->GetSubType();
-/*?*/ switch( nSub & 0x00ff )
-/*?*/ {
-/*?*/ case DI_EDIT:
-/*?*/ cFlags = 0x01;
-/*?*/ break;
-/*?*/ case DI_CREATE:
-/*?*/ case DI_CHANGE:
-/*?*/ case DI_PRINT:
-/*?*/ switch( nSub & ~(DI_SUB_FIXED|0x00ff) )
-/*?*/ {
-/*?*/ case DI_SUB_TIME:
-/*?*/ case DI_SUB_DATE:
-/*?*/ cFlags = 0x01;
-/*?*/ break;
-/*?*/ }
-/*?*/ break;
-/*?*/ }
-/*N*/ }
-/*N*/ *rIo.pStrm << cFlags;
-/*N*/ rIo.OutString( *rIo.pStrm, pFld->Expand() );
-/*N*/ if( cFlags & 0x01 )
-/*N*/ *rIo.pStrm << ((SwDocInfoField*)pFld)->GetValue();
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InTemplNameField( Sw3IoImp& /*rIo*/, SwFieldType* pType,
/*N*/ USHORT, UINT32& rFmt )
/*N*/ {
@@ -2016,21 +1558,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return new SwDBNextSetField( (SwDBNextSetFieldType*)pType, aCond, aName, aData );
/*N*/ }
-/*N*/ void lcl_sw3io_OutDBNextSetField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar1() );
-/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar2() );
-/*N*/
-/*N*/ if( !rIo.IsSw31Export() )
-/*N*/ {
-/*N*/ SwDBData aData(((SwDBNextSetField*)pFld)->GetRealDBData());
-/*N*/ String sDBName(aData.sDataSource);
-/*N*/ sDBName += DB_DELIM;
-/*N*/ sDBName += (String)aData.sCommand;
-/*N*/ *rIo.pStrm << (UINT16)rIo.aStringPool.Find( sDBName, IDX_NOCONV_FF );
-/*N*/ }
-/*N*/ }
-
// der 3.1-Writer hat beim Einlesen Condition und Number vertauscht.
// Deshalb exportieren wir diese beiden Werte vertauscht und lesen sie
// in der exportierten Version auch verkehrt herum wieder ein.
@@ -2063,29 +1590,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return new SwDBNumSetField( (SwDBNumSetFieldType*)pType, aCond, aNumber, aData );
/*N*/ }
-/*N*/ void lcl_sw3io_OutDBNumSetField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ if( rIo.IsSw31Export() )
-/*N*/ {
-/*?*/ rIo.OutString( *rIo.pStrm, pFld->GetPar2() );
-/*?*/ rIo.OutString( *rIo.pStrm, pFld->GetPar1() );
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar1() );
-/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar2() );
-/*N*/ }
-/*N*/
-/*N*/ if( !rIo.IsSw31Export() )
-/*N*/ {
-/*N*/ SwDBData aData(((SwDBNumSetField*)pFld)->GetRealDBData());
-/*N*/ String sDBName(aData.sDataSource);
-/*N*/ sDBName += DB_DELIM;
-/*N*/ sDBName += (String)aData.sCommand;
-/*N*/ *rIo.pStrm << (UINT16)rIo.aStringPool.Find( sDBName, IDX_NOCONV_FF );
-/*N*/ }
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InDBSetNumberField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -2106,20 +1610,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutDBSetNumberField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ *rIo.pStrm << (INT32) ((SwDBSetNumberField*)pFld)->GetSetNumber();
-/*N*/
-/*N*/ if( !rIo.IsSw31Export() )
-/*N*/ {
-/*N*/ SwDBData aData(((SwDBSetNumberField*)pFld)->GetRealDBData());
-/*N*/ String sDBName(aData.sDataSource);
-/*N*/ sDBName += DB_DELIM;
-/*N*/ sDBName += (String)aData.sCommand;
-/*N*/ *rIo.pStrm<< (UINT16)rIo.aStringPool.Find( sDBName, IDX_NOCONV_FF );
-/*N*/ }
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InExtUserField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -2151,20 +1641,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutExtUserField40( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ SwExtUserFieldType* pType = (SwExtUserFieldType*) pFld->GetTyp();
-/*N*/ rIo.OutString( *rIo.pStrm, pType->GetData() );
-/*N*/ *rIo.pStrm << (UINT16) pFld->GetSubType();
-/*N*/ }
-
-/*N*/ void lcl_sw3io_OutExtUserField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ SwExtUserFieldType* pType = (SwExtUserFieldType*) pFld->GetTyp();
-/*N*/ rIo.OutString( *rIo.pStrm, pType->GetData() );
-/*N*/ rIo.OutString( *rIo.pStrm, ((SwExtUserField *)pFld)->GetContent() );
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InRefPageSetField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -2174,12 +1650,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
return new SwRefPageSetField( (SwRefPageSetFieldType*)pType, nOffset, cIsOn!=0 );
/*N*/ }
-/*N*/ void lcl_sw3io_OutRefPageSetField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
- *rIo.pStrm << (INT16)((SwRefPageSetField*)pFld)->GetOffset()
- << (BYTE)((SwRefPageSetField*)pFld)->IsOn();
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InRefPageGetField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -2190,11 +1660,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutRefPageGetField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
- rIo.OutString( *rIo.pStrm, ((SwRefPageGetField*)pFld)->GetText() );
-/*N*/ }
-
/*N*/ SwField *lcl_sw3io_InINetField31( Sw3IoImp& rIo, SwFieldType *, USHORT, UINT32& )
/*N*/ {
/*N*/ OSL_ENSURE( !(rIo.pFmtINetFmt || rIo.aINetFldText.Len()),
@@ -2244,12 +1709,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutJumpEditField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
-/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar1() );
-/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar2() );
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InScriptField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -2296,44 +1755,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutScriptField40( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
- OSL_ENSURE( !rIo.IsSw31Export(),
- "Wer will denn da ein Script-Feld exportieren" );
-
- String aCode;
- if( ((SwScriptField*)pFld)->IsCodeURL() )
- {
- aCode.AssignAscii( "// @url: " );
- aCode += ::binfilter::StaticBaseUrl::AbsToRel( ((SwScriptField*)pFld)->GetCode() );
- }
- else
- aCode = ((SwScriptField*)pFld)->GetCode();
-
- rIo.OutString( *rIo.pStrm, pFld->GetPar1() );
- rIo.OutString( *rIo.pStrm, aCode );
-/*N*/ }
-
-/*N*/ void lcl_sw3io_OutScriptField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
- OSL_ENSURE( !rIo.IsSw31Export(),
- "Wer will denn da ein Script-Feld exportieren" );
-
- BYTE cFlags = ((SwScriptField*)pFld)->IsCodeURL() ? 0x01 : 0x00;
-
- String aCode;
- if( ((SwScriptField*)pFld)->IsCodeURL() )
- aCode = ::binfilter::StaticBaseUrl::AbsToRel( ((SwScriptField*)pFld)->GetCode() );
- else
- aCode = ((SwScriptField*)pFld)->GetCode();
-
- rIo.OutString( *rIo.pStrm, pFld->GetPar1() );
- rIo.OutString( *rIo.pStrm, aCode );
- *rIo.pStrm << cFlags;
-/*N*/ }
-
-/* */
-
/*N*/ SwField* lcl_sw3io_InAuthorityField( Sw3IoImp& rIo, SwFieldType*,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -2359,13 +1780,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutAuthorityField( Sw3IoImp& rIo, SwField* pFld )
-/*N*/ {
- BYTE cFlags = 0x02;
- *rIo.pStrm << cFlags
- << (UINT16)((SwAuthorityField *)pFld)->GetHandlePosition();
-/*N*/ }
-
//////////////////////////////////////////////////////////////////////////////
// Die Beta-1-Version hatte noch eine eigene Kapselung fuer das Feld.
// Da dieser Inhalt als Teil eines SWG_ATTRIBUTE-Records vorkommt,ist
@@ -2576,35 +1990,8 @@ static Sw3InFieldFn aInFieldFnTbl[] =
/*N*/ return pFld;
/*N*/ }
-/*N*/ void lcl_sw3io_OutAnySetExpField40( Sw3IoImp& rIo, const sal_Char *pName,
-/*N*/ const String& rExpand )
-/*N*/ {
-/*N*/ SwSetExpFieldType aType( rIo.pDoc, String::CreateFromAscii(pName),
-/*N*/ GSE_STRING );
-/*N*/ SwSetExpField aFld( &aType, rExpand );
-/*N*/ aFld.ChgExpStr( rExpand );
-/*N*/ *rIo.pStrm << (UINT16) ( RES_SETEXPFLD - RES_FIELDS_BEGIN ); // Which
-/*N*/ *rIo.pStrm << (UINT16) 1; // Format: GSE_STRING
-/*N*/ lcl_sw3io_OutSetExpField40( rIo, &aFld );
-/*N*/ }
-
-/* #108791# */
-/*N*/ void lcl_sw3io_OutAnySetExpField( Sw3IoImp& rIo, const sal_Char *pName,
-/*N*/ const String& rExpand )
-/*N*/ {
-/*N*/ SwSetExpFieldType aType( rIo.pDoc, String::CreateFromAscii(pName),
-/*N*/ GSE_STRING );
-/*N*/ SwSetExpField aFld( &aType, rExpand );
-/*N*/ aFld.ChgExpStr( rExpand );
-/*N*/ *rIo.pStrm << (UINT16) ( RES_SETEXPFLD - RES_FIELDS_BEGIN ) // Which
-/*N*/ << (UINT32) 1 // Format: GSE_STRING
-/*N*/ << (UINT16)aFld.GetSubType();
-/*N*/ lcl_sw3io_OutSetExpField( rIo, &aFld );
-/*N*/ }
-
// Ausgabe aller Feldtypen, die keine Systemtypen sind
-
/*N*/ BOOL lcl_sw3io_HasFixedFields40( Sw3IoImp& rIo, USHORT nWhich )
/*N*/ {
/*N*/ SwFieldType* pFldType = rIo.pDoc->GetSysFldType( nWhich );
@@ -2642,34 +2029,6 @@ static Sw3InFieldFn aInFieldFnTbl[] =
/*N*/ return FALSE;
/*N*/ }
-/*N*/ void Sw3IoImp::OutFieldTypes()
-/*N*/ {
-/*N*/ const SwFldTypes* p = pDoc->GetFldTypes();
-/*N*/ for( USHORT i=INIT_FLDTYPES-INIT_SEQ_FLDTYPES; i<p->Count(); ++i )
-/*N*/ if( !OutFieldType( *(*p)[ i ] ) )
-/*N*/ break;
-/*N*/
-/*N*/ // Fixe DocInfo Author und ExtUser-Felder in SetExpFields wandeln
-/*N*/ String sFixedField( String::CreateFromAscii(sSW3IO_FixedField) );
-/*N*/ if( pStrm->GetVersion() <= SOFFICE_FILEFORMAT_40 &&
-/*N*/ !pDoc->GetFldType( RES_SETEXPFLD, sFixedField ) &&
-/*N*/ ( lcl_sw3io_HasFixedFields40( *this, RES_DOCINFOFLD ) ||
-/*N*/ lcl_sw3io_HasFixedFields40( *this, RES_AUTHORFLD ) ||
-/*N*/ lcl_sw3io_HasFixedFields40( *this, RES_EXTUSERFLD ) ||
-/*N*/ lcl_sw3io_HasFixedFields40( *this, RES_FILENAMEFLD ) ) )
-/*N*/ {
-/*?*/ SwSetExpFieldType aType( pDoc, sFixedField, GSE_STRING );
-/*?*/ OutFieldType( aType );
-/*N*/ }
-/*N*/ {
-/*N*/ /* #108791# */
-/*N*/ String sDropDown( String::CreateFromAscii(sSW3IO_DropDownField) );
-/*N*/ SwSetExpFieldType aType( pDoc, sDropDown, GSE_STRING );
-/*N*/ OutFieldType( aType );
-/*N*/ }
-/*N*/ }
-
-
/*N*/ SwFieldType* Sw3IoImp::InFieldType()
/*N*/ {
/*N*/ BYTE ch;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
index 5e4d7a6..92f5978 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
@@ -1008,132 +1008,6 @@ sal_Bool lcl_sw3io_insFtn( const SwTxtNode *pTxtNd )
/*N*/ bInsIntoHdrFtr = bInsIntoHdrFtrSave;
/*N*/ }
-// Ausgabe von FlyFrames, die nicht an einem Node kleben
-
-/*N*/ void Sw3IoImp::OutFlyFrames( SwPaM& rPaM )
-/*N*/ {
-/*N*/ if( bSaveAll )
-/*N*/ {
-/*N*/ // Alle Frames: ueber das Array gehen
-/*N*/ const SwSpzFrmFmts* pFlys = pDoc->GetSpzFrmFmts();
-/*N*/ USHORT nArrLen = pFlys->Count();
-/*N*/ if( nArrLen )
-/*N*/ {
-/*N*/ OpenRec( SWG_FLYFRAMES );
-/*N*/ for( USHORT i = 0; i < nArrLen; i++ )
-/*N*/ {
-/*N*/ const SwFrmFmt* pFmt = (*pFlys)[ i ];
-/*N*/ const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
-/*N*/ switch( rAnchor.GetAnchorId() )
-/*N*/ {
-/*N*/ case FLY_AT_CNTNT:
-/*N*/ case FLY_AUTO_CNTNT:
-/*N*/ case FLY_IN_CNTNT:
-/*N*/ break; // nicht die, die am Node kleben
-/*N*/ case FLY_AT_FLY:
-/*N*/ // Rahmengebunde Rahmen werden als seitengebunde
-/*N*/ // Rahmen ins 3.1/4.0-Format exportiert. Sonst
-/*N*/ // werden sie in der Section exportiert.
-/*?*/ if( SOFFICE_FILEFORMAT_40 < pStrm->GetVersion() )
-/*?*/ break;
-/*N*/ default:
-/*N*/ OSL_ENSURE( FLY_PAGE==rAnchor.GetAnchorId() ||
-/*N*/ FLY_AT_FLY==rAnchor.GetAnchorId(),
-/*N*/ "Rahmen ist nicht Seitengebunden" );
-/*N*/ if( !pFmt->IsDefault() )
-/*N*/ {
-/*N*/ BYTE cType = SWG_FLYFMT;
-/*N*/ if( RES_DRAWFRMFMT == pFmt->Which() )
-/*N*/ cType = SWG_SDRFMT;
-/*N*/ OutFormat( cType, *pFmt );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ CloseRec( SWG_FLYFRAMES );
-/*N*/ }
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*?*/ // Selektion: Frames absammeln
-/*?*/ USHORT nArrLen = pDoc->GetSpzFrmFmts()->Count();
-/*?*/ if( nArrLen > 255 )
-/*?*/ nArrLen = 255;
-/*?*/ SwPosFlyFrms aFlys( (BYTE)nArrLen, 50 );
-/*?*/ pDoc->GetAllFlyFmts( aFlys, &rPaM, TRUE );
-/*?*/ nArrLen = aFlys.Count();
-/*?*/ if( nArrLen )
-/*?*/ {
-/*?*/ OpenRec( SWG_FLYFRAMES );
-/*?*/ for( USHORT i = 0; i < nArrLen; i++ )
-/*?*/ {
-/*?*/ const SwFrmFmt& rFmt = aFlys[ i ]->GetFmt();
-/*?*/ const SwFmtAnchor& rAnchor = rFmt.GetAnchor();
-/*?*/ switch( rAnchor.GetAnchorId() )
-/*?*/ {
-/*?*/ case FLY_AT_CNTNT:
-/*?*/ case FLY_IN_CNTNT:
-/*?*/ case FLY_AUTO_CNTNT:
-/*?*/ break; // nicht die, die am Node kleben
-/*?*/ case FLY_AT_FLY:
-/*?*/ // Rahmengebunde Rahmen werden als seitengebunde
-/*?*/ // Rahmen ins 3.1/4.0-Format exportiert. Sonst
-/*?*/ // werden sie in der Section exportiert.
-/*?*/ if( SOFFICE_FILEFORMAT_40 < pStrm->GetVersion() )
-/*?*/ break;
-/*?*/ default:
-/*?*/ OSL_ENSURE( FLY_PAGE==rAnchor.GetAnchorId() ||
-/*?*/ FLY_AT_FLY==rAnchor.GetAnchorId(),
-/*?*/ "Rahmen ist nicht Seitengebunden" );
-/*?*/ if( !rFmt.IsDefault() )
-/*?*/ {
-/*?*/ BYTE cType = SWG_FLYFMT;
-/*?*/ if( RES_DRAWFRMFMT == rFmt.Which() )
-/*?*/ cType = SWG_SDRFMT;
-/*?*/ OutFormat( cType, rFmt );
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*?*/ CloseRec( SWG_FLYFRAMES );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
-// in FLYPOS.CXX
-
-extern BOOL TstFlyRange( const SwPaM* pPam, const SwIndex& rFlyPos );
-
-/*N*/ void Sw3IoImp::CollectFlyFrms( const SwPaM* /*pPaM*/ )
-/*N*/ {
-/*N*/ if( !pFlyFrms )
-/*N*/ {
-/*N*/ pFlyFrms = new SwPosFlyFrms;
-/*N*/ SwPosFlyFrm *pFPos = 0;
-/*N*/ const SwPosition* pAPos;
-/*N*/
-/*N*/ // alle absatzgebundenen Flys einsammeln
-/*N*/ for( USHORT n = 0; n < pDoc->GetSpzFrmFmts()->Count(); ++n )
-/*N*/ {
-/*N*/ SwFrmFmt *pFly = (*pDoc->GetSpzFrmFmts())[ n ];
-/*N*/ if( RES_DRAWFRMFMT == pFly->Which() ||
-/*N*/ RES_FLYFRMFMT == pFly->Which() )
-/*N*/ {
-/*N*/ const SwFmtAnchor& rAnchor = pFly->GetAnchor();
-/*N*/ if( ( FLY_AT_CNTNT == rAnchor.GetAnchorId() ||
-/*N*/ FLY_AT_FLY == rAnchor.GetAnchorId() ||
-/*N*/ FLY_AUTO_CNTNT == rAnchor.GetAnchorId() ) &&
-/*N*/ NULL != ( pAPos = rAnchor.GetCntntAnchor()) )
-/*N*/ {
-/*N*/ pFPos = new SwPosFlyFrm( pAPos->nNode, pFly,
-/*N*/ pFlyFrms->Count() );
-/*N*/ pFlyFrms->Insert( pFPos );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ if( !pFlyFrms->Count() )
-/*N*/ delete pFlyFrms, pFlyFrms = NULL;
-/*N*/ }
-/*N*/ }
-
// Freigabe der gesammelten FlyFrame-Infos nach dem Schreiben
/*N*/ void Sw3IoImp::FreeFlyFrms()
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 0c6dcf2..69417d8 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -877,40 +877,6 @@ void Sw3IoImp::InRecSizes( ULONG nRecPos )
}
}
-ULONG Sw3IoImp::OutRecSizes()
-{
- ULONG nRecPos = 0;
- if( pRecSizes )
- {
- sal_uInt32 nCount = pRecSizes->Count();
- OSL_ENSURE( nCount, "RecSize-Tabelle ist leer" );
-
- if( (nCount*8 + 4) > MAX_SMALL_RECSIZE )
- {
- // Der Record darf kein langer sein, sonst haben wir ein
- // Problem ...
- Error( ERR_SWG_LARGE_DOC_ERROR );
- }
- else
- {
- nRecPos = pStrm->Tell();
- OpenRec( SWG_RECSIZES );
-
- *pStrm << (sal_uInt8)0x04 << (sal_uInt32)nCount;
-
- for( sal_uInt32 i=0; i < nCount; i++ )
- {
- *pStrm << (sal_uInt32)pRecSizes->GetObjectKey( i )
- << (sal_uInt32)pRecSizes->GetObject( i );
- }
-
- CloseRec( SWG_RECSIZES );
- }
- }
-
- return nRecPos;
-}
-
// Ein Flag-Byte enthaelt immer die Anzahl Daten im unteren Nybble.
// Hier wird das Flagbyte mit der aktuellen Position ausgewertet.
@@ -1380,367 +1346,6 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ return nId;
/*N*/ }
-
-// Sammeln der Strings am Doc. Es werden alle Strings aus benannten
-// Formaten, Collections und PageDescs gesammelt. Weiter wird allen
-// Auto-Frameformaten eine Extension im Namen verpasst, weil die Namen
-// nicht eindeutig sind.
-
-/*N*/ void Sw3StringPool::Setup( SwDoc& rDoc, long nFFVersion,
-/*N*/ Sw3ExportInfo *pExportInfo )
-/*N*/ {
-/*N*/ Clear();
-/*N*/ nExpFFVersion = nFFVersion;
-/*N*/
-/*N*/ // Das Written-Flag wird gleich mit geknackt!
-/*N*/ // Das ist wichtig, da Formate (theoretisch) in verschiedenen
-/*N*/ // Streams landen koennen.
-/*N*/ SwMsgPoolItem aMsgHint( RES_RESET_FMTWRITTEN );
-/*N*/ rDoc.GetDfltFrmFmt()->Modify( &aMsgHint, &aMsgHint );
-/*N*/
-/*N*/ bFixed = sal_False;
-/*N*/ // Defaultformate:
-/*N*/ Setup( rDoc, *rDoc.GetDfltFrmFmt() );
-/*N*/ Setup( rDoc, *rDoc.GetDfltCharFmt() );
-/*N*/ // Text-Collections
-/*N*/ sal_uInt16 nArrLen = rDoc.GetTxtFmtColls()->Count();
- sal_uInt16 n=0;
-/*N*/ for( n = 0; n < nArrLen; n++ )
-/*N*/ Setup( rDoc, *(*rDoc.GetTxtFmtColls())[ n ] );
-/*N*/ // benannte Zeichen- und Rahmenvorlagen
-/*N*/ nArrLen = rDoc.GetCharFmts()->Count();
-/*N*/ // Element 0 ist das Default-Format!
-/*N*/ for( n = 1; n < nArrLen; n++ )
-/*N*/ Setup( rDoc, *(*rDoc.GetCharFmts())[ n ] );
-/*N*/ nArrLen = rDoc.GetFrmFmts()->Count();
-/*N*/ // Element 0 ist das Default-Format!
-/*N*/ for( n = 1; n < nArrLen; n++ )
-/*N*/ {
-/*N*/ const SwFmt& rFmt = *(*rDoc.GetFrmFmts())[ n ];
-/*N*/ // Autoformate in dieser Liste muessen mit einer
-/*N*/ // Extension versehen werden!
-/*N*/ sal_uInt16 nFmtId = 0;
-/*N*/ // TODO: unicode: correct?
-/*N*/ if( rFmt.IsAuto() ) // Autoformat
-/*N*/ nFmtId = Count()+1; //++nId;
-/*N*/ Setup( rDoc, rFmt, nFmtId );
-/*N*/ }
-/*N*/ nArrLen = rDoc.GetSpzFrmFmts()->Count();
-/*N*/ for( n = 0; n < nArrLen; n++ )
-/*N*/ Setup( rDoc, *(*rDoc.GetSpzFrmFmts())[ n ], Count()+1 /*++nId*/ );
-/*N*/ // Auch hier muss eine Extension mit ran
-/*N*/ nArrLen = rDoc.GetTblFrmFmts()->Count();
-/*N*/ for( n = 0; n < nArrLen; n++ )
-/*N*/ Setup( rDoc, *(*rDoc.GetTblFrmFmts())[ n ], Count()+1 /*++nId*/ );
-/*N*/ nArrLen = rDoc.GetSections().Count();
-/*N*/ for( n = 0; n < nArrLen; n++ )
-/*N*/ Setup( rDoc, *rDoc.GetSections()[ n ], Count()+1 /*++nId*/ );
-/*N*/ // Seitenvorlagen
-/*N*/ nArrLen = rDoc.GetPageDescCnt();
-/*N*/ for( n = 0; n < nArrLen; n++ )
-/*N*/ {
-/*N*/ const SwPageDesc& rPg = rDoc.GetPageDesc( n );
-/*N*/ Add( rPg.GetName(), rPg.GetPoolFmtId() );
-/*N*/ }
-/*N*/
-/*N*/ if( nExpFFVersion <= SOFFICE_FILEFORMAT_40 )
-/*N*/ {
-/*N*/ Add( String::CreateFromAscii(sSW3IO_FixedField), USHRT_MAX );
-/*N*/ Add( String::CreateFromAscii(sSW3IO_AuthorityField), USHRT_MAX );
-/*N*/ }
-/*N*/ /* #108791# */
-/*N*/ Add( String::CreateFromAscii(sSW3IO_DropDownField), USHRT_MAX );
-/*N*/
-/*N*/ // fix #26064#: Namen der 3 Label Numernkreise: Hier wird zusaetzlich
-/*N*/ // noch die Pool-Id des dazugehoerigen Formats gespeichert
-/*N*/ {
-/*N*/ String aAbb( SW_RES(STR_POOLCOLL_LABEL_ABB) );
-/*N*/ String aTable( SW_RES(STR_POOLCOLL_LABEL_TABLE) );
-/*N*/ String aFrame( SW_RES(STR_POOLCOLL_LABEL_FRAME) );
-/*N*/ String aDrawing( SW_RES(STR_POOLCOLL_LABEL_DRAWING) );
-/*N*/
-/*N*/ for( n = 0; n < INIT_FLDTYPES; n++ )
-/*N*/ {
-/*N*/ SwFieldType *pFldType = (*rDoc.GetFldTypes())[n];
-/*N*/ switch (pFldType->Which())
-/*N*/ {
-/*N*/ case RES_SETEXPFLD:
-/*N*/ {
-/*N*/ if( GSE_SEQ & ((const SwSetExpFieldType *)pFldType)->GetType() )
-/*N*/ {
-/*N*/ sal_uInt16 nPoolId = USHRT_MAX;
-/*N*/ const String& rName = pFldType->GetName();
-/*N*/ if( aAbb == rName )
-/*N*/ nPoolId = RES_POOLCOLL_LABEL_ABB;
-/*N*/ else if( aTable == rName )
-/*N*/ nPoolId = RES_POOLCOLL_LABEL_TABLE;
-/*N*/ else if( aFrame == rName )
-/*N*/ nPoolId = RES_POOLCOLL_LABEL_FRAME;
-/*N*/ else if( aDrawing == rName )
-/*N*/ nPoolId = RES_POOLCOLL_LABEL_DRAWING;
-/*N*/
-/*N*/ Add( rName, nPoolId );
-/*N*/ }
-/*N*/ }
-/*N*/ break;
-/*N*/
-/*N*/ case RES_DBSETNUMBERFLD:
-/*N*/ case RES_DBNUMSETFLD:
-/*N*/ case RES_DBNEXTSETFLD:
-/*N*/ case RES_DBNAMEFLD:
-/*N*/ if( nExpFFVersion > SOFFICE_FILEFORMAT_31 )
-/*N*/ {
-/*N*/ SwClientIter aIter( *pFldType );
-/*N*/
-/*N*/ for( SwFmtFld* pFmtFld = (SwFmtFld*)aIter.First( TYPE(SwFmtFld) );
-/*N*/ pFmtFld; pFmtFld = (SwFmtFld*)aIter.Next() )
-/*N*/ {
-/*N*/ if( pFmtFld->GetTxtFld() )
-/*N*/ {
-/*N*/ SwDBNameInfField* pFld = (SwDBNameInfField *)pFmtFld->GetFld();
-/*N*/ SwDBData aData(pFld->GetRealDBData());
-/*N*/ String sDBName(aData.sDataSource);
-/*N*/ sDBName += DB_DELIM;
-/*N*/ sDBName += (String)aData.sCommand;
-/*N*/ Add( sDBName, IDX_NOCONV_FF );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ break;
-/*N*/ }
-/*N*/
-/*N*/ }
-/*N*/ }
-/*N*/ // Namen benutzerdefinierter Felder
-/*N*/ nArrLen = rDoc.GetFldTypes()->Count();
-/*N*/ if( nArrLen > INIT_FLDTYPES )
-/*N*/ {
-/*N*/ for( n = INIT_FLDTYPES; n < nArrLen; n++ )
-/*N*/ {
-/*N*/ SwFieldType *pFldType = (*rDoc.GetFldTypes())[n];
-/*N*/
-/*N*/ switch (pFldType->Which())
-/*N*/ {
-/*N*/ case RES_DBFLD:
-/*N*/ Add( ((SwDBFieldType*)pFldType)->GetColumnName(), USHRT_MAX );
-/*N*/ if( nExpFFVersion > SOFFICE_FILEFORMAT_31 )
-/*N*/ {
-/*N*/ SwDBData aData(((SwDBFieldType*)pFldType)->GetDBData());
-/*N*/ String sDBName(aData.sDataSource);
-/*N*/ sDBName += DB_DELIM;
-/*N*/ sDBName += (String)aData.sCommand;
-/*N*/ Add( sDBName, IDX_NOCONV_FF );
-/*N*/ }
-/*N*/ break;
-/*N*/
-/*N*/ default:
-/*N*/ Add( pFldType->GetName(), USHRT_MAX );
-/*N*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ // Ab dem 5.0-FF stehen auch die Benutzer-definierten Verzeichnisnamen
-/*N*/ // im String-Pool
-/*N*/ if( nExpFFVersion > SOFFICE_FILEFORMAT_40 )
-/*N*/ {
-/*N*/ const SwSectionFmts& rSectFmts = rDoc.GetSections();
-/*N*/ for( sal_uInt16 nn = rSectFmts.Count(); nn; )
-/*N*/ {
-/*N*/ const SwTOXType* pType;
-/*N*/ const SwTOXBaseSection *pTOXBaseSect;
-/*N*/ const SwSectionFmt* pSectFmt = rSectFmts[ --nn ];
-/*N*/ const SwSection* pSect = pSectFmt->GetSection();
-/*N*/ if( pSect && TOX_CONTENT_SECTION == pSect->GetType() &&
-/*N*/ pSect->GetFmt() && pSectFmt->GetSectionNode() &&
-/*N*/ 0 != (pTOXBaseSect = PTR_CAST( SwTOXBaseSection, pSect )) &&
-/*N*/ 0 != (pType = pTOXBaseSect->GetTOXType()) )
-/*N*/ {
-/*N*/ // All types above TOX_USER are new in version 5.2. That for,
-/*N*/ // their names must be added to the string pool.
-/*N*/ if( pType->GetType() >= TOX_ILLUSTRATIONS ||
-/*N*/ pType->GetTypeName() !=
-/*N*/ SwTOXBase::GetTOXName(pType->GetType()) )
-/*N*/ {
-/*?*/ Add( pType->GetTypeName(), USHRT_MAX );
-/*N*/ }
-/*N*/ // Add template names
-/*N*/ const SwForm& rForm = pTOXBaseSect->GetTOXForm();
- sal_uInt16 i=0;
-/*N*/ for( i = 0; i < rForm.GetFormMax(); i++ )
-/*N*/ {
-/*N*/ const String& rCollNm = rForm.GetTemplate( i );
-/*N*/ if( rCollNm.Len() )
-/*N*/ SetupTxtCollByName( rDoc, rCollNm );
-/*N*/ }
-/*N*/ // Add text style names used in patterns
-/*N*/ for( i = 0; i < rForm.GetFormMax(); i++ )
-/*N*/ {
-/*N*/ const String& rPattern = rForm.GetPattern(i);
-/*N*/ if( rPattern.Len() )
-/*N*/ {
-/*N*/ SwFormTokenEnumerator aEnum( rPattern );
-/*N*/ while( aEnum.HasNextToken() )
-/*N*/ {
-/*N*/ SwFormToken aToken( aEnum.GetNextToken() );
-/*N*/ if( aToken.sCharStyleName.Len() )
-/*?*/ Add( aToken.sCharStyleName, aToken.nPoolId );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ // Add style names
-/*N*/ for( i=0; i<MAXLEVEL; i++ )
-/*N*/ {
-/*N*/ const String& rStyleNames = pTOXBaseSect->GetStyleNames(i);
-/*N*/ if( rStyleNames.Len() )
-/*N*/ {
-/*?*/ xub_StrLen nStrPos = 0;
-/*?*/ while( nStrPos != STRING_NOTFOUND )
-/*?*/ {
-/*?*/ String aName = rStyleNames.GetToken( 0,
-/*?*/ TOX_STYLE_DELIMITER, nStrPos );
-/*?*/ OSL_ENSURE( aName.Len(), "empty style name" );
-/*?*/ if( aName.Len() )
-/*?*/ SetupTxtCollByName( rDoc, aName );
-/*?*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ // Add text coll names used if new indices are converted to
-/*N*/ // user indices
-/*N*/ sal_uInt16 nPoolId = USHRT_MAX;
-/*N*/ switch( pType->GetType() )
-/*N*/ {
-/*?*/ case TOX_ILLUSTRATIONS:
-/*?*/ nPoolId = RES_POOLCOLL_LABEL_ABB;
-/*?*/ break;
-/*?*/ case TOX_OBJECTS:
-/*?*/ nPoolId = RES_POOLCOLL_LABEL_FRAME;
-/*?*/ break;
-/*?*/ case TOX_TABLES:
-/*?*/ nPoolId = RES_POOLCOLL_LABEL_TABLE;
-/*?*/ break;
- default:
- break;
-/*N*/ }
-/*N*/ if( USHRT_MAX != nPoolId )
-/*N*/ {
-/*?*/ String aName;
-/*?*/ SwStyleNameMapper::FillUIName( nPoolId, aName );
-/*?*/ Add( aName, nPoolId );
-/*N*/ }
-/*N*/ const String& rMainStyle =
-/*N*/ pTOXBaseSect->GetMainEntryCharStyle();
-/*N*/ if( rMainStyle.Len() )
-/*N*/ {
-/*?*/ sal_uInt16 nPoolId2 = SwStyleNameMapper::GetPoolIdFromUIName( rMainStyle,
-/*?*/ GET_POOLID_CHRFMT );
-/*N*/ Add( rMainStyle, nPoolId2 );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ const SwTOXMark* pItem;
-/*N*/ nArrLen = nExpFFVersion > SOFFICE_FILEFORMAT_40
-/*N*/ ? rDoc.GetAttrPool().GetItemCount( RES_TXTATR_TOXMARK )
-/*N*/ : 0;
-/*N*/ for( n = 0; n < nArrLen; ++n )
-/*N*/ {
-/*N*/ pItem = (const SwTOXMark*)rDoc.GetAttrPool().GetItem( RES_TXTATR_TOXMARK, n );
-/*N*/ if( pItem )
-/*N*/ {
-/*N*/ const SwTOXType* pType = pItem->GetTOXType();
-/*N*/ if( pType && pType->GetTypeName() !=
-/*N*/ SwTOXBase::GetTOXName(pType->GetType()) )
-/*N*/ {
-/*?*/ Add( pType->GetTypeName(), USHRT_MAX );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ const SwFmtINetFmt* pINetFmt;
-/*N*/ nArrLen = nExpFFVersion > SOFFICE_FILEFORMAT_31
-/*N*/ ? rDoc.GetAttrPool().GetItemCount( RES_TXTATR_INETFMT )
-/*N*/ : 0;
-/*N*/ for( n = 0; n < nArrLen; ++n )
-/*N*/ {
-/*N*/ pINetFmt = (const SwFmtINetFmt*)rDoc.GetAttrPool().GetItem( RES_TXTATR_INETFMT, n );
-/*N*/ if( pINetFmt )
-/*N*/ {
-/*N*/ if( pINetFmt->GetINetFmt().Len() )
-/*?*/ Add( pINetFmt->GetINetFmt(), pINetFmt->GetINetFmtId() );
-/*N*/ if( pINetFmt->GetVisitedFmt().Len() )
-/*?*/ Add( pINetFmt->GetVisitedFmt(), pINetFmt->GetVisitedFmtId() );
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ // Seit der 5.0 gibt es Redlines. Die Autoren stehen dann im String-Pool
-/*N*/ if( nExpFFVersion > SOFFICE_FILEFORMAT_40 )
-/*N*/ SetupRedlines( rDoc );
-/*N*/
-/*N*/ // Beim 3.1/4.0-Export standen die Tabellen-Line/Box-Formate noch
-/*N*/ // im FrmFmt-Array und wurden ueber den String-Pool dort eingetragen.
-/*N*/ // Deshalb muessen sie jetzt auch dort eingetragen werden. Die
-/*N*/ // Umbennenerei erfolgt allerdings nicht mehr im Format. Stattdessen
-/*N*/ // wird der (erweiterte) Name in einem Array gemerkt und ueber dieses
-/*N*/ // ermittelt.
-/*N*/ if( nExpFFVersion <= SOFFICE_FILEFORMAT_40 && pExportInfo &&
-/*N*/ pExportInfo->pTblLineBoxFmts40 )
-/*N*/ {
-/*N*/ if( !pExportInfo->pTblLineBoxFmtNames40 )
-/*N*/ pExportInfo->pTblLineBoxFmtNames40 = new SvStringsDtor;
-/*N*/
-/*N*/ SvStringsDtor *pNames = pExportInfo->pTblLineBoxFmtNames40;
-/*N*/ if( pNames->Count() )
-/*?*/ pNames->DeleteAndDestroy( 0, pNames->Count() );
-/*N*/
-/*N*/ Sw3FrmFmts *pFmts = pExportInfo->pTblLineBoxFmts40;
-/*N*/ sal_uInt16 nArrLen2 = pFmts->Count();
-/*N*/ for( n=0; n<nArrLen2; n++ )
-/*N*/ {
-/*N*/ // TODO: unicode: currect?
-/*N*/ String * pName = new String( (*pFmts)[n]->GetName() );
-/*N*/ (*pName += EXT_SEPARATOR) += String::CreateFromInt32( Count()+1 );
-/*N*/ Add( *pName, (*pFmts)[n]->GetPoolFmtId() );
-/*N*/ pNames->Insert( pName, pNames->Count() );
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ // Und danach darf nix mehr in den Pool hinein!
-/*N*/ bFixed = sal_True;
-/*N*/ }
-
-/*N*/ void Sw3StringPool::SetupForNumRules( SwDoc& rDoc, long nFFVersion )
-/*N*/ {
-/*N*/ Clear();
-/*N*/ nExpFFVersion = nFFVersion;
-/*N*/ bFixed = sal_False;
-/*N*/
-/*N*/ // Die Namen von Zeichenvorlagen werden benoetigt, weil in den
-/*N*/ // Numerierungen auuf sie verwiesen werden kann.
-/*N*/ sal_uInt16 nArrLen = rDoc.GetCharFmts()->Count();
-/*N*/ // Element 0 ist das Default-Format!
- sal_uInt16 n;
-/*N*/ for( n = 1; n < nArrLen; n++ )
-/*N*/ Setup( rDoc, *(*rDoc.GetCharFmts())[ n ] );
-/*N*/
-/*N*/ // Die Namen der Numerierungen werden sowieso benoetigt.
-/*N*/ nArrLen = rDoc.GetNumRuleTbl().Count();
-/*N*/ for( n=0; n<nArrLen; n++ )
-/*N*/ {
-/*N*/ const SwNumRule *pNumRule = rDoc.GetNumRuleTbl()[n];
-/*N*/ Add( pNumRule->GetName(), pNumRule->GetPoolFmtId() );
-/*N*/ }
-/*N*/
-/*N*/ // Und die Outline-Numerierung hat auch einen Namen.
-/*N*/ const SwNumRule *pOutline = rDoc.GetOutlineNumRule();
-/*N*/ if( pOutline )
-/*N*/ Add( pOutline->GetName(), pOutline->GetPoolFmtId() );
-/*N*/
-/*N*/ // Und danach darf nix mehr in den Pool hinein!
-/*N*/ bFixed = sal_True;
-/*N*/ }
-
// Entfernen der Autoformat-Extension nach dem Laden/Speichern
// Dies ist ein Hash und eine Zahl, mit der Autoformate im
// FrmFmt-Array des Docs erweitert wurden.
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
index 25668fd..f6800d0 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
@@ -408,51 +408,6 @@ void Sw3IoImp::InMacroTbl()
CloseRec( SWG_MACROTBL );
}
-/*N*/ void Sw3IoImp::OutMacroTbl()
-/*N*/ {
-/*N*/ const SvxMacroTableDtor& rTbl = pDoc->GetMacroTable();
-/*N*/ SvxMacro* pMac = ((SvxMacroTableDtor&) rTbl).First();
-/*N*/ if( !pMac )
-/*N*/ return;
-/*N*/
-/*?*/ OSL_ENSURE( SOFFICE_FILEFORMAT_31 == pStrm->GetVersion() ||
-/*?*/ SOFFICE_FILEFORMAT_40 == pStrm->GetVersion() ||
-/*?*/ SOFFICE_FILEFORMAT_50 == pStrm->GetVersion(),
-/*?*/ "Macro-Table: Gibt es ein neues Fileformat?" );
-/*?*/ if( SOFFICE_FILEFORMAT_31 == pStrm->GetVersion() )
-/*?*/ {
-/*?*/ // suche das erste StarBasicMacro!
-/*?*/ while( pMac && STARBASIC != pMac->GetScriptType() )
-/*?*/ pMac = ((SvxMacroTableDtor&) rTbl).Next();
-/*?*/ if( !pMac )
-/*?*/ return ;
-/*?*/ }
-/*?*/
-/*?*/ OpenRec( SWG_MACROTBL );
-/*?*/ while( pMac && Good() )
-/*?*/ {
-/*?*/ OpenRec( SWG_MACRO );
-/*?*/ *pStrm << (sal_uInt16) rTbl.GetCurKey();
-/*?*/ OutString( *pStrm, pMac->GetLibName() );
-/*?*/ OutString( *pStrm, pMac->GetMacName() );
-/*?*/
-/*?*/ if( SOFFICE_FILEFORMAT_31 == pStrm->GetVersion() )
-/*?*/ {
-/*?*/ do {
-/*?*/ pMac = ((SvxMacroTableDtor&) rTbl).Next();
-/*?*/ } while( pMac && STARBASIC != pMac->GetScriptType() );
-/*?*/ }
-/*?*/ else
-/*?*/ {
-/*?*/ *pStrm << (sal_uInt16)pMac->GetScriptType();
-/*?*/ pMac = ((SvxMacroTableDtor&) rTbl).Next();
-/*?*/ }
-/*?*/
-/*?*/ CloseRec( SWG_MACRO );
-/*?*/ }
-/*?*/ CloseRec( SWG_MACROTBL );
-/*N*/ }
-
/*************************************************************************
*
* Job Setup
@@ -493,22 +448,6 @@ void Sw3IoImp::InMacroTbl()
/*N*/ CloseRec( SWG_JOBSETUP );
/*N*/ }
-// Neu fuer OS/2: Wenn das Job-Setup keine Daten enthaelt, dann wird das
-// Job-Setup nicht rausgeschrieben.
-
-/*N*/ void Sw3IoImp::OutJobSetup()
-/*N*/ {
-/*N*/ SfxPrinter* pPrt = pDoc->GetPrt();
-/*N*/ if( pPrt )
-/*N*/ {
-/*N*/ OpenRec( SWG_JOBSETUP );
-/*N*/ sal_uInt8 cFlags = 0x00;
-/*N*/ *pStrm << cFlags;
-/*N*/ pPrt->Store( *pStrm );
-/*N*/ CloseRec( SWG_JOBSETUP );
-/*N*/ }
-/*N*/ }
-
/*************************************************************************
*
* Stringpool (ab Version 2)
@@ -527,13 +466,6 @@ void Sw3IoImp::InMacroTbl()
/*N*/ Error( ERR_SWG_READ_ERROR );
/*N*/ }
-/*N*/ void Sw3IoImp::OutStringPool( sal_uInt8 cType, Sw3StringPool& rPool )
-/*N*/ {
-/*N*/ OpenRec( cType );
-/*N*/ rPool.Store( *pStrm );
-/*N*/ CloseRec( cType );
-/*N*/ }
-
void Sw3IoImp::InPasswd()
{
OpenRec( SWG_PASSWORD );
@@ -743,70 +675,6 @@ void Sw3IoImp::InPasswd()
/*N*/ CloseRec( SWG_BOOKMARKS );
/*N*/ }
-// String Kurzname
-// String voller Name
-// sal_uInt8 Flags
-// sal_uInt16 Offset
-// sal_uInt16 KeyCode
-// sal_uInt16 Modifier
-// String Name des Startmakros
-// String Lib des Startmakros
-// String Name des Endmakros
-// String Lib des Endmakros
-
-/*N*/ void Sw3IoImp::OutBookmarks( sal_Bool bPageStyles )
-/*N*/ {
-/*N*/ OSL_ENSURE( bPageStyles || !IsSw31Export(),
-/*N*/ "Beim 3.1-Export kommen keine text::Bookmarks in den Contents-Stream" );
-/*N*/
-/*N*/ short nArrLen = pBookmarks ? pBookmarks->Count() : 0;
-/*N*/ if( nArrLen && bPageStyles && !IsSw31Export() )
-/*N*/ {
-/*N*/ OSL_ENSURE( nCntntBkmkStart <= nArrLen,
-/*N*/ "Mehr text::Bookmarks in Page-Styles als ueberhaupt vorhanden?" );
-/*N*/ nArrLen = nCntntBkmkStart;
-/*N*/ nCntntBkmkStart = 0;
-/*N*/ }
-/*N*/ OSL_ENSURE( IsSw31Export() || nCntntBkmkStart==0,
-/*N*/ "Wieso sind da noch text::Bookmarks aus Seitenvorlagen?" );
-/*N*/
-/*N*/ if( nArrLen )
-/*N*/ {
-/*N*/ OpenRec( SWG_BOOKMARKS );
-/*N*/ for( int i = 0; i < nArrLen; i++ )
-/*N*/ {
-/*N*/ SwBookmark& rMark = (SwBookmark&) *(*pBookmarks)[i];
-/*N*/ OSL_ENSURE( rMark.IsBookMark(),
-/*N*/ "Wo kommt da die Nicht text::Bookmark her?" );
-/*N*/
-/*N*/ const SvxMacro& rStt = rMark.GetStartMacro();
-/*N*/ const SvxMacro& rEnd = rMark.GetEndMacro();
-/*N*/ OpenRec( SWG_BOOKMARK );
-/*N*/ OutString( *pStrm, rMark.GetShortName() );
-/*N*/ OutString( *pStrm, rMark.GetName() );
-/*N*/ *pStrm << (BYTE) 0x06
-/*N*/ << (sal_uInt16) 0 // frueher: Position, jetzt frei
-/*N*/ << (sal_uInt16) rMark.GetKeyCode().GetCode()
-/*N*/ << (sal_uInt16) rMark.GetKeyCode().GetModifier();
-/*N*/ // JP 10.12.96: die Macros an den text::Bookmarks koennen
-/*N*/ // von der UI nirgends gesetzt/abgefragt
-/*N*/ // werden. Darum werden sie auch nicht
-/*N*/ // um den ScriptType erweitert!
-/*N*/ OutString( *pStrm, rStt.GetMacName() );
-/*N*/ OutString( *pStrm, rStt.GetLibName() );
-/*N*/ OutString( *pStrm, rEnd.GetMacName() );
-/*N*/ OutString( *pStrm, rEnd.GetLibName() );
-/*N*/ CloseRec( SWG_BOOKMARK );
-/*N*/ }
-/*N*/ CloseRec( SWG_BOOKMARKS );
-/*N*/
-/*N*/ // Wenn die text::Bookmarks fuer Page-Styles geschrienen sind, werden
-/*N*/ // sie geloescht
-/*N*/ if( bPageStyles && !IsSw31Export() )
-/*?*/ pBookmarks->Remove( 0, nArrLen );
-/*N*/ }
-/*N*/ }
-
/*N*/ void Sw3IoImp::InTOXs51()
/*N*/ {
/*N*/ OpenRec( SWG_TOXDESCS51 );
@@ -987,225 +855,6 @@ void Sw3IoImp::InPasswd()
/*N*/ }
-/*N*/ void Sw3IoImp::OutTOXs51()
-/*N*/ {
-/*N*/ const SwSectionFmts& rSectFmts = pDoc->GetSections();
-/*N*/
-/*N*/ sal_Bool bTOXs = sal_False;
-/*N*/ for( sal_uInt16 nFmt=0; nFmt<rSectFmts.Count(); nFmt++ )
-/*N*/ {
-/*N*/ const SwSectionFmt* pSectFmt = rSectFmts[nFmt];
-/*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 )
-/*N*/ continue;
-/*N*/
-/*N*/ const SwTOXType* pType = pTOXBaseSect->GetTOXType();
-/*N*/ if( !pType )
-/*N*/ continue;
-/*N*/
-/*N*/ if( !bTOXs )
-/*N*/ {
-/*N*/ OpenRec( SWG_TOXDESCS51 );
-/*N*/ bTOXs = sal_True;
-/*N*/ }
-/*N*/
-/*N*/ OpenRec( SWG_TOXDESC );
-/*N*/
-/*N*/ // If it is one of the predefined indexes, its name isn't exported.
-/*N*/ // This way, the index is found in foreign version, too.
-/*N*/ TOXTypes eType = pType->GetType();
-/*N*/ TOXTypes eOldType = eType >= TOX_ILLUSTRATIONS ? TOX_USER : eType;
-/*N*/ const String& rTypeName = pType->GetTypeName();
-/*N*/ if( IsSw31Or40Export() )
-/*N*/ {
-/*N*/ OutString( *pStrm, rTypeName );
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // All types above TOX_USER are new in version 5.2. That for,
-/*N*/ // their names must be written.
-/*N*/ sal_uInt16 nStrIdx =
-/*N*/ ( eType >= TOX_ILLUSTRATIONS ||
-/*N*/ rTypeName != SwTOXBase::GetTOXName(eType) )
-/*N*/ ? aStringPool.Find( rTypeName, USHRT_MAX )
-/*N*/ : IDX_NO_VALUE;
-/*N*/ *pStrm << nStrIdx;
-/*N*/ }
-/*N*/
-/*N*/ OutString( *pStrm, pTOXBaseSect->GetTitle() );
-/*N*/
-/*N*/ const SwForm& rFrm = pTOXBaseSect->GetTOXForm();
-/*N*/
-/*N*/ sal_uInt8 cFlags = 0x03; // Anzahl Datenbytes
-/*N*/ if( !IsSw31Or40Export() )
-/*N*/ {
-/*N*/ if( rFrm.IsFirstTabPosFlag() )
-/*N*/ cFlags += 0x12;
-/*N*/ if( rFrm.IsGenerateTabPos() )
-/*N*/ cFlags += 0x20;
-/*N*/ if( rFrm.IsRelTabPos() )
-/*N*/ cFlags += 0x40;
-/*N*/ }
-/*N*/
-/*N*/ // TODO: Must some flags be masked out?
-/*N*/ sal_uInt16 nCreateType = pTOXBaseSect->GetCreateType();
-/*N*/ if( eType >= TOX_ILLUSTRATIONS )
-/*N*/ nCreateType |= TOX_TEMPLATE;
-/*N*/ *pStrm << (sal_uInt8) cFlags
-/*N*/ << (sal_Int16) nCreateType
-/*N*/ << (BYTE) eOldType;
-/*N*/ if( (cFlags & 0x10) != 0 )
-/*N*/ *pStrm << (sal_uInt16)rFrm.GetFirstTabPos();
-/*N*/
-/*N*/ // Die SwForm ausgeben
-/*N*/ // Zaehlen der Patterns und Templates
-/*N*/ sal_uInt16 nPat = 0, nTmpl = 0;
-/*N*/ sal_uInt16 nCount = rFrm.GetFormMax();
-/*N*/ if( IsSw31Or40Export() && nCount > OLD_MAXLEVEL+1 )
-/*N*/ nCount = OLD_MAXLEVEL+1;
-/*N*/ else if( TOX_AUTHORITIES == eType && nCount > MAXLEVEL+1 )
-/*N*/ nCount = MAXLEVEL+1;
-/*N*/
- sal_uInt16 i=0;
-/*N*/ for( i = nCount; i > 0; i-- )
-/*N*/ {
-/*N*/ if( rFrm.GetPattern( i - 1 ).Len() )
-/*N*/ {
-/*N*/ nPat = i; break;
-/*N*/ }
-/*N*/ }
-/*N*/ for( i = nCount; i > 0; i-- )
-/*N*/ {
-/*N*/ if( rFrm.GetTemplate( i - 1 ).Len() )
-/*N*/ {
-/*N*/ nTmpl = i; break;
-/*N*/ }
-/*N*/ }
-/*N*/ // und die Strings der form ausgeben
-/*N*/ *pStrm << (BYTE) nPat;
-/*N*/ for( i = 0; i < nPat; i++ )
-/*N*/ {
-/*N*/ String aPattern( rFrm.GetPattern(i) );
-/*N*/ if( aPattern.Len() )
-/*N*/ aPattern = SwForm::ConvertPatternTo51( aPattern );
-/*N*/ if( IsSw31Or40Export() && TOX_CONTENT == eType && aPattern.Len() )
-/*N*/ {
-/*N*/ xub_StrLen nENPos =
-/*N*/ aPattern.SearchAscii( SwForm::aFormEntryNum );
-/*N*/ xub_StrLen nETPos =
-/*N*/ aPattern.SearchAscii( SwForm::aFormEntryTxt );
-/*N*/ xub_StrLen nStart = 0, nLen = 0;
-/*N*/
-/*N*/ if( nENPos != STRING_NOTFOUND &&
-/*N*/ (STRING_NOTFOUND == nETPos || nENPos < nETPos) )
-/*N*/ {
-/*N*/ nStart = nENPos;
-/*N*/ nLen = STRING_NOTFOUND == nETPos
-/*N*/ ? SwForm::nFormEntryNumLen
-/*N*/ : (nETPos - nENPos) + SwForm::nFormEntryTxtLen;
-/*N*/ }
-/*N*/ else if( nETPos != STRING_NOTFOUND &&
-/*N*/ (STRING_NOTFOUND == nENPos || nETPos < nENPos) )
-/*N*/ {
-/*N*/ nStart = nETPos;
-/*N*/ nLen = STRING_NOTFOUND == nENPos
-/*N*/ ? SwForm::nFormEntryTxtLen
-/*N*/ : (nENPos - nETPos) + SwForm::nFormEntryNumLen;
-/*N*/ }
-/*N*/
-/*N*/ if( nLen > 0 )
-/*N*/ {
-/*N*/ aPattern.Erase( nStart, nLen );
-/*N*/ aPattern.InsertAscii( SwForm::aFormEntry, nStart );
-/*N*/ }
-/*N*/ }
-/*N*/ OutString( *pStrm, aPattern );
-/*N*/ }
-/*N*/ *pStrm << (BYTE) nTmpl;
-/*N*/ for( i = 0; i < nTmpl; i++ )
-/*N*/ {
-/*N*/ const String& rCollNm = rFrm.GetTemplate( i );
-/*N*/ const SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName( rCollNm );
-/*N*/ sal_uInt16 nPId = pColl ? pColl->GetPoolFmtId()
-/*N*/ : SwStyleNameMapper::GetPoolIdFromUIName( rCollNm,GET_POOLID_TXTCOLL );
-/*N*/ *pStrm << (sal_uInt16) aStringPool.Find( rCollNm, nPId );
-/*N*/ }
-/*N*/ // Zuletzt noch die Spezial-Variablen
-/*N*/ sal_uInt16 nInf = 0;
-/*N*/ switch( (int) pType->GetType() )
-/*N*/ {
-/*N*/ case TOX_INDEX:
-/*N*/ // TODO: Must some flags be masked out?
-/*N*/ nInf = pTOXBaseSect->GetOptions();
-/*N*/ break;
-/*N*/ case TOX_CONTENT:
-/*N*/ nInf = pTOXBaseSect->GetLevel();
-/*N*/ if( IsSw31Or40Export() && nInf > OLD_MAXLEVEL )
-/*N*/ nInf = OLD_MAXLEVEL;
-/*N*/ break;
-/*N*/ case TOX_ILLUSTRATIONS:
-/*N*/ case TOX_OBJECTS:
-/*N*/ case TOX_TABLES:
-/*N*/ {
-/*N*/ sal_uInt16 nPoolId(0);
-/*N*/ switch( pType->GetType() )
-/*N*/ {
-/*?*/ case TOX_ILLUSTRATIONS:
-/*?*/ nPoolId = RES_POOLCOLL_LABEL_ABB;
-/*?*/ break;
-/*?*/ case TOX_OBJECTS:
-/*?*/ nPoolId = RES_POOLCOLL_LABEL_FRAME;
-/*?*/ break;
-/*?*/ case TOX_TABLES:
-/*?*/ nPoolId = RES_POOLCOLL_LABEL_TABLE;
-/*?*/ break;
- default:
- break;
-/*N*/ }
-/*N*/ String aName;
-/*N*/ SwStyleNameMapper::FillUIName( nPoolId, aName );
-/*N*/ nInf = aStringPool.Find( aName, nPoolId );
-/*N*/ }
-/*N*/ break;
-/*N*/ case TOX_USER:
-/*N*/ case TOX_AUTHORITIES:
-/*N*/ default:
-/*N*/ {
-/*N*/ const String sCollNm = pTOXBaseSect->GetTemplateName();
-/*N*/ if( sCollNm.Len() )
-/*N*/ {
-/*N*/ const SwTxtFmtColl* pColl =
-/*N*/ pDoc->FindTxtFmtCollByName( sCollNm );
-/*N*/ sal_uInt16 nPId = pColl ? pColl->GetPoolFmtId()
-/*N*/ : SwStyleNameMapper::GetPoolIdFromUIName( sCollNm,
-/*N*/ GET_POOLID_TXTCOLL );
-/*N*/ nInf = aStringPool.Find( sCollNm, nPId );
-/*N*/ }
-/*N*/ else
-/*N*/ nInf = IDX_NO_VALUE;
-/*N*/ }
-/*N*/ break;
-/*N*/ }
-/*N*/ *pStrm << (sal_uInt16) nInf;
-/*N*/
-/*N*/ CloseRec( SWG_TOXDESC );
-/*N*/ }
-/*N*/
-/*N*/ if( bTOXs )
-/*N*/ CloseRec( SWG_TOXDESCS51 );
-/*N*/ }
-
extern void lcl_sw3io_FillSetExpFieldName( Sw3IoImp& rIo, sal_uInt16 nStrId,
String& rName );
@@ -1537,286 +1186,6 @@ extern void lcl_sw3io_FillSetExpFieldName( Sw3IoImp& rIo, sal_uInt16 nStrId,
/*N*/ CloseRec( SWG_TOXDESCS );
/*N*/ }
-extern sal_uInt16 lcl_sw3io_GetSetExpFieldPoolId( const String& rName );
-
-/*N*/ void Sw3IoImp::OutTOXs()
-/*N*/ {
-/*N*/ const SwSectionFmts& rSectFmts = pDoc->GetSections();
-/*N*/
-/*N*/ sal_Bool bTOXs = sal_False;
-/*N*/ for( sal_uInt16 nFmt=0; nFmt<rSectFmts.Count(); nFmt++ )
-/*N*/ {
-/*N*/ const SwSectionFmt* pSectFmt = rSectFmts[nFmt];
-/*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 )
-/*N*/ continue;
-/*N*/
-/*N*/ const SwTOXType* pType = pTOXBaseSect->GetTOXType();
-/*N*/ if( !pType )
-/*N*/ continue;
-/*N*/
-/*N*/ if( !bTOXs )
-/*N*/ {
-/*N*/ OpenRec( SWG_TOXDESCS );
-/*N*/ bTOXs = sal_True;
-/*N*/ }
-/*N*/
-/*N*/ OpenRec( SWG_TOXDESC );
-/*N*/
-/*N*/
-/*N*/ sal_uInt8 cFlags = 0x0d; // Anzahl Datenbytes
-/*N*/ if( pTOXBaseSect->IsProtected() )
-/*N*/ cFlags += 0x10;
-/*N*/ if( pTOXBaseSect->IsFromChapter() )
-/*N*/ cFlags += 0x20;
-/*N*/ if( pTOXBaseSect->IsFromObjectNames() )
-/*N*/ cFlags += 0x40;
-/*N*/ if( pTOXBaseSect->IsLevelFromChapter() )
-/*N*/ cFlags += 0x80;
-/*N*/
-/*N*/ TOXTypes eType = pType->GetType();
-/*N*/
-/*N*/ const SwForm& rForm = pTOXBaseSect->GetTOXForm();
-/*N*/ sal_uInt8 cFormFlags = 0x00;
-/*N*/ if( rForm.IsGenerateTabPos() )
-/*N*/ cFormFlags += 0x01;
-/*N*/ if( rForm.IsRelTabPos() )
-/*N*/ cFormFlags += 0x02;
-/*N*/ if( rForm.IsCommaSeparated() )
-/*N*/ cFormFlags += 0x04;
-/*N*/
-/*N*/ sal_uInt16 nSeqStrIdx = IDX_NO_VALUE;
-/*N*/ const String& rSequenceName = pTOXBaseSect->GetSequenceName();
-/*N*/ if( rSequenceName.Len() )
-/*N*/ {
-/*?*/ SwFieldType *pFldType =
-/*?*/ pDoc->GetFldType( RES_SETEXPFLD, rSequenceName );
-/*?*/ OSL_ENSURE( pFldType, "sequence field type not found" );
-/*?*/ if( pFldType )
-/*?*/ {
-/*?*/ sal_uInt16 nPoolId = lcl_sw3io_GetSetExpFieldPoolId(rSequenceName);
-/*?*/ nSeqStrIdx = aStringPool.Find( rSequenceName, nPoolId );
-/*?*/ OSL_ENSURE( IDX_NO_VALUE != nSeqStrIdx,
-/*?*/ "no string pool entry found for sequence field" );
-/*?*/ }
-/*N*/ }
-/*N*/
-/*N*/ // If it is one of the predefined indexes, its name isn't exported.
-/*N*/ // This way, the index is found in foreign version, too.
-/*N*/ const String& rTypeName = pType->GetTypeName();
-/*N*/ sal_uInt16 nStrIdx0 = rTypeName != SwTOXBase::GetTOXName(eType)
-/*N*/ ? aStringPool.Find( rTypeName, USHRT_MAX )
-/*N*/ : IDX_NO_VALUE;
-/*N*/
-/*N*/ // Options or Level;
-/*N*/ sal_uInt16 nData = 0;
-/*N*/ if( TOX_INDEX == eType )
-/*N*/ nData = pTOXBaseSect->GetOptions();
-/*N*/ else
-/*N*/ nData = pTOXBaseSect->GetLevel();
-/*N*/
-/*N*/ *pStrm << cFlags
-/*N*/ << (sal_uInt16) eType
-/*N*/ << (sal_uInt16) pTOXBaseSect->GetCreateType()
-/*N*/ << (sal_uInt16) pTOXBaseSect->GetCaptionDisplay()
-/*N*/ << nStrIdx0
-/*N*/ << nSeqStrIdx
-/*N*/ << nData
-/*N*/ << cFormFlags;
-/*N*/
-/*N*/ sal_uInt16 nMainStyleIdx = IDX_NO_VALUE;
-/*N*/ const String& rMainStyle = pTOXBaseSect->GetMainEntryCharStyle();
-/*N*/ if( rMainStyle.Len() )
-/*N*/ {
-/*?*/ sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromUIName( rMainStyle, GET_POOLID_CHRFMT );
-/*?*/ nMainStyleIdx = aStringPool.Find( rMainStyle, nPoolId );
-/*N*/ }
-/*N*/
-/*N*/ OutString( *pStrm, pTOXBaseSect->GetTOXName() );
-/*N*/ OutString( *pStrm, pTOXBaseSect->GetTitle() );
-/*N*/ *pStrm << (sal_uInt16) pTOXBaseSect->GetOLEOptions()
-/*N*/ << (sal_uInt16) nMainStyleIdx;
-/*N*/
-/*N*/ // form patterns
-/*N*/ sal_uInt8 nPatterns = 0, i;
-/*N*/ for( i = (sal_uInt8)rForm.GetFormMax(); i > 0; i-- )
-/*N*/ {
-/*N*/ if( rForm.GetPattern( i-1 ).Len() )
-/*N*/ {
-/*N*/ nPatterns = i;
-/*N*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ *pStrm << (sal_uInt8)nPatterns;
-/*N*/ for( i = 0; i < nPatterns; i++ )
-/*N*/ {
-/*N*/ OpenRec( SWG_FORMPATTERN_LCL );
-/*N*/ *pStrm << (sal_uInt8)0x03 // flag byte
-/*N*/ << (sal_uInt8)i;
-/*N*/
-/*N*/ sal_uInt16 nToken = 0;
-/*N*/ const String& rPattern = rForm.GetPattern( i );
-/*N*/ if( rPattern.Len() )
-/*N*/ {
-/*N*/ OpenValuePos16( nToken );
-/*N*/
-/*N*/ SwFormTokenEnumerator aEnum( rPattern );
-/*N*/ while( aEnum.HasNextToken() )
-/*N*/ {
-/*N*/ SwFormToken aToken( aEnum.GetNextToken() );
-/*N*/
-/*N*/ OpenRec( SWG_FORMTOKEN_LCL );
-/*N*/ sal_uInt16 nStrIdx1 = IDX_NO_VALUE;
-/*N*/ if( aToken.sCharStyleName.Len() )
-/*N*/ nStrIdx1 = aStringPool.Find( aToken.sCharStyleName,
-/*N*/ aToken.nPoolId );
-/*N*/ *pStrm << (sal_uInt8)0x04
-/*N*/ << (sal_uInt16)aToken.eTokenType
-/*N*/ << nStrIdx1;
-/*N*/ switch( aToken.eTokenType )
-/*N*/ {
-/*N*/ case TOKEN_TAB_STOP:
-/*N*/ *pStrm << (sal_Int32)aToken.nTabStopPosition
-/*N*/ << (sal_uInt16)aToken.eTabAlign
-/*N*/ << (sal_uInt8)aToken.cTabFillChar;
-/*N*/ break;
-/*?*/ case TOKEN_CHAPTER_INFO:
-/*?*/ *pStrm << (sal_uInt16)aToken.nChapterFormat;
-/*?*/ break;
-/*?*/ case TOKEN_TEXT:
-/*?*/ OutString( *pStrm, aToken.sText );
-/*?*/ break;
-/*?*/ case TOKEN_AUTHORITY:
-/*?*/ *pStrm << (sal_uInt16)aToken.nAuthorityField;
-/*?*/ break;
- default:
- break;
-/*N*/ }
-/*N*/
-/*N*/ CloseRec( SWG_FORMTOKEN_LCL );
-/*N*/
-/*N*/ nToken++;
-/*N*/ }
-/*N*/
-/*N*/ CloseValuePos16( nToken );
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ *pStrm << (sal_uInt16)0;
-/*N*/ }
-/*N*/
-/*N*/ CloseRec( SWG_FORMPATTERN_LCL );
-/*N*/ }
-/*N*/
-/*N*/ // form templates
-/*N*/ sal_uInt8 nTemplates = 0;
-/*N*/ for( i = (sal_uInt8)rForm.GetFormMax(); i > 0; i-- )
-/*N*/ {
-/*N*/ if( rForm.GetTemplate( i-1 ).Len() )
-/*N*/ {
-/*N*/ nTemplates = i;
-/*N*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ *pStrm << (sal_uInt8) nTemplates;
-/*N*/ for( i = 0; i < nTemplates; i++ )
-/*N*/ {
-/*N*/ const String& rCollNm = rForm.GetTemplate( i );
-/*N*/ const SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName( rCollNm );
-/*N*/ sal_uInt16 nPId = pColl ? pColl->GetPoolFmtId()
-/*N*/ : SwStyleNameMapper::GetPoolIdFromUIName( rCollNm,GET_POOLID_TXTCOLL );
-/*N*/ *pStrm << (sal_uInt16) aStringPool.Find( rCollNm, nPId );
-/*N*/ }
-/*N*/
-/*N*/ // style names
-/*N*/ sal_uInt8 nStyleNames = 0;
-/*N*/ for( i=0; i<MAXLEVEL; i++ )
-/*N*/ {
-/*N*/ if( pTOXBaseSect->GetStyleNames(i).Len() )
-/*N*/ nStyleNames++;
-/*N*/ }
-/*N*/
-/*N*/ *pStrm << nStyleNames;
-/*N*/
-/*N*/ for( i=0; i<MAXLEVEL; i++ )
-/*N*/ {
-/*N*/ const String& rStyleNames = pTOXBaseSect->GetStyleNames(i);
-/*N*/ if( rStyleNames.Len() )
-/*N*/ {
-/*?*/ *pStrm << (sal_uInt8)i
-/*?*/ << (sal_uInt16)rStyleNames.GetTokenCount(
-/*?*/ TOX_STYLE_DELIMITER );
-/*?*/
-/*?*/ xub_StrLen nStrPos = 0;
-/*?*/ while( nStrPos != STRING_NOTFOUND )
-/*?*/ {
-/*?*/ String aName =
-/*?*/ rStyleNames.GetToken( 0, TOX_STYLE_DELIMITER, nStrPos );
-/*?*/ OSL_ENSURE( aName.Len(), "empty style name" );
-/*?*/ sal_uInt16 nStrIdx2 = IDX_NO_VALUE;
-/*?*/ if( aName.Len() )
-/*?*/ {
-/*?*/ const SwTxtFmtColl *pColl =
-/*?*/ pDoc->FindTxtFmtCollByName( aName );
-/*?*/ sal_uInt16 nPoolId = pColl
-/*?*/ ? pColl->GetPoolFmtId()
-/*?*/ : SwStyleNameMapper::GetPoolIdFromUIName( aName, GET_POOLID_TXTCOLL );
-/*?*/ nStrIdx2 = aStringPool.Find( aName, nPoolId );
-/*?*/ }
-/*?*/
-/*N*/ *pStrm << nStrIdx2;
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ // the following stuff is required to export the TOX sections as
-/*N*/ // TOX range.
-/*N*/ cFlags = 0x02;
-/*N*/ sal_uInt32 nTitleLen = 0UL;
-/*N*/ sal_uInt16 nSectStrIdx = aStringPool.Find( pSectFmt->GetName(),
-/*N*/ pSectFmt->GetPoolFmtId() );
-/*N*/ const SwSectionFmt *pTitleSectFmt = 0;
-/*N*/
-/*N*/ ULONG nNextNdIdx = pSectNd->GetIndex() + 1;
-/*N*/ const SwSectionNode *pNextSectNd =
-/*N*/ pDoc->GetNodes()[nNextNdIdx]->GetSectionNode();
-/*N*/ if( pNextSectNd &&
-/*N*/ TOX_HEADER_SECTION == pNextSectNd->GetSection().GetType() )
-/*N*/ {
-/*N*/ cFlags += 0x14;
-/*N*/ nTitleLen = pNextSectNd->EndOfSectionIndex() - nNextNdIdx - 1;
-/*N*/ pTitleSectFmt = pNextSectNd->GetSection().GetFmt();
-/*N*/ }
-/*N*/
-/*N*/ *pStrm << cFlags
-/*N*/ << nSectStrIdx;
-/*N*/ if( pTitleSectFmt )
-/*N*/ *pStrm << nTitleLen;
-/*N*/
-/*N*/ OutFormat( SWG_SECTFMT, *pSectFmt );
-/*N*/ if( pTitleSectFmt )
-/*N*/ OutFormat( SWG_SECTFMT, *pTitleSectFmt );
-/*N*/
-/*N*/ CloseRec( SWG_TOXDESC );
-/*N*/ }
-/*N*/
-/*N*/ if( bTOXs )
-/*N*/ CloseRec( SWG_TOXDESCS );
-/*N*/ }
-
/*N*/ void Sw3IoImp::ConnectTOXs()
/*N*/ {
/*N*/ if( pTOXs )
@@ -2051,77 +1420,6 @@ extern sal_uInt16 lcl_sw3io_GetSetExpFieldPoolId( const String& rName );
/*N*/ pDoc->ChgDBData( aData3 );
/*N*/ }
-/*N*/ void Sw3IoImp::OutDBName()
-/*N*/ {
-/*N*/ // Erstmal alle verwendeten Datenbanken holen
-/*N*/ SvStringsDtor aDBNameList;
-/*N*/ pDoc->GetAllUsedDB(aDBNameList);
-/*N*/ sal_uInt16 nCount = aDBNameList.Count();
-/*N*/
-/*N*/ OpenRec( SWG_DBNAME );
-/*N*/
-/*N*/ if( IsSw31Export() )
-/*N*/ {
-/*N*/ // Datenbanknamen und das SQL-Statement holen
-/*N*/ String sDBDesc, sDBName;
-/*N*/ if( nCount==1 && pDoc->GetNewDBMgr() )
-/*N*/ {
-/*N*/ sDBDesc = *aDBNameList.GetObject(0);
-/*N*/ sDBName = sDBDesc;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ SwDBData aData = pDoc->_GetDBDesc();
-/*N*/ sDBName = aData.sDataSource;
-/*N*/ sDBName += DB_DELIM;
-/*N*/ sDBName += (String)aData.sCommand;
-/*N*/ }
-/*N*/
-/*N*/ OutString( *pStrm, sDBName.GetToken( 0, DB_DELIM ) );
-/*N*/
-/*N*/ String aTmpStr;
-/*N*/ xub_StrLen nPos = 0;
-/*N*/ if( ( nPos = sDBDesc.Search(';') ) != STRING_NOTFOUND )
-/*?*/ aTmpStr = sDBDesc.Copy( nPos + 1 );
-/*N*/ OutString( *pStrm, aTmpStr );
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // Die Datenbank-Beschreibung koennen wir im 4.0 FF auf einen Schlag
-/*N*/ // rausschreiben
-/*N*/ SwDBData aData1 = pDoc->_GetDBDesc();
-/*N*/ String sTmpDBName = aData1.sDataSource;
-/*N*/ sTmpDBName += DB_DELIM;
-/*N*/ sTmpDBName += (String)aData1.sCommand;
-/*N*/ ByteString s8a = ConvertStringNoDbDelim( sTmpDBName, eSrcSet );
-/*N*/ pStrm->WriteByteString( s8a );
-/*N*/
-/*N*/ // Datenbankname, SQL-Statement und aktuelle Selektion abspeichern
-/*N*/ long nSelStart, nSelEnd;
-/*N*/
-/*N*/ *pStrm << nCount;
-/*N*/
-/*N*/ SwNewDBMgr& rDBMgr = *pDoc->GetNewDBMgr();
-/*N*/ for (sal_uInt16 i = 0; i < nCount; i++)
-/*N*/ {
-/*N*/ String sDesc(*aDBNameList.GetObject(i));
-/*N*/ ByteString s8b = ConvertStringNoDbDelim( sDesc, eSrcSet );
-/*N*/ pStrm->WriteByteString( s8b );
-/*N*/
-/*N*/ SwDBData aData2;
-/*N*/ aData2.sDataSource = sDesc.GetToken(0, DB_DELIM);
-/*N*/ aData2.sCommand = sDesc.GetToken(1, DB_DELIM);
-/*N*/ aData2.nCommandType = -1;
-/*N*/ rDBMgr.GetDSSelection(aData2, nSelStart, nSelEnd);
-/*N*/
-/*N*/ *pStrm << (sal_Int32)nSelStart
-/*N*/ << (sal_Int32)nSelEnd;
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ CloseRec( SWG_DBNAME );
-/*N*/ }
-
/*N*/ void Sw3IoImp::InDocStat()
/*N*/ {
/*N*/ OpenRec( SWG_DOCSTAT );
@@ -2163,49 +1461,6 @@ extern sal_uInt16 lcl_sw3io_GetSetExpFieldPoolId( const String& rName );
/*N*/ pDoc->SetDocStat( aDocStat );
/*N*/ }
-/*N*/ void Sw3IoImp::OutDocStat( sal_Bool bFirst )
-/*N*/ {
-/*N*/ sal_uInt32 nAktPos = 0;
-/*N*/ if( bFirst )
-/*N*/ {
-/*N*/ OpenRec( SWG_DOCSTAT );
-/*N*/ nStatStart = pStrm->Tell();
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ nAktPos = pStrm->Tell();
-/*N*/ pStrm->Seek( nStatStart );
-/*N*/ }
-/*N*/
-/*N*/ const SwDocStat& rDocStat = pDoc->GetDocStat();
-/*N*/ *pStrm << (sal_uInt16)rDocStat.nTbl
-/*N*/ << (sal_uInt16)rDocStat.nGrf
-/*N*/ << (sal_uInt16)rDocStat.nOLE;
-/*N*/
-/*N*/ if( pStrm->GetVersion() <= SOFFICE_FILEFORMAT_40 )
-/*N*/ {
-/*N*/ *pStrm << (sal_uInt16)rDocStat.nPage
-/*N*/ << (sal_uInt16)rDocStat.nPara;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // Die Longs duerfen hier nicht komprimiert geschrieben werden,
-/*N*/ // weil sich dann die Laenge der Dok-Info beim zweiten Schreiben
-/*N*/ // gegenueber dem ersten Schreiben aendern kann.
-/*N*/ *pStrm << (sal_uInt32)rDocStat.nPage
-/*N*/ << (sal_uInt32)rDocStat.nPara;
-/*N*/ }
-/*N*/
-/*N*/ *pStrm << (sal_uInt32)rDocStat.nWord
-/*N*/ << (sal_uInt32)rDocStat.nChar
-/*N*/ << (BYTE)rDocStat.bModified;
-/*N*/
-/*N*/ if( bFirst )
-/*N*/ CloseRec( SWG_DOCSTAT );
-/*N*/ else
-/*N*/ pStrm->Seek( nAktPos );
-/*N*/ }
-
/*N*/ void Sw3IoImp::InDictionary()
/*N*/ {
/*N*/ Reference< XDictionaryList > xDicList( ::binfilter::GetDictionaryList() );
@@ -2279,46 +1534,6 @@ extern sal_uInt16 lcl_sw3io_GetSetExpFieldPoolId( const String& rName );
/*N*/
/*N*/ }
-/*N*/ void Sw3IoImp::OutDictionary()
-/*N*/ {
-/*N*/ OpenRec( SWG_DICTIONARY );
-/*N*/
-/*N*/ Reference< XDictionaryList > xDicList( ::binfilter::GetDictionaryList() );
-/*N*/ Sequence< Reference< XDictionary > > aDics;
-/*N*/ if( xDicList.is() )
-/*N*/ aDics = xDicList->getDictionaries();
-/*N*/ const Reference< XDictionary > *pDic = aDics.getConstArray();
-/*N*/
-/*N*/ sal_uInt16 i, nDicCount = (sal_uInt16)aDics.getLength();
-/*N*/ for( i = 0; i < nDicCount; i++ )
-/*N*/ {
-/*N*/ Reference< XDictionary1 > xDic( pDic[i], UNO_QUERY );
-/*N*/ if( xDic.is() && xDic->isActive() )
-/*N*/ {
-/*N*/ const String aStr( xDic->getName() );
-/*N*/ sal_uInt16 nActLanguage = xDic->getLanguage();
-/*N*/ sal_uInt16 nCount = xDic->getCount();
-/*N*/ sal_Bool bNeg = xDic->getDictionaryType() == DictionaryType_NEGATIVE;
-/*N*/ OutString( *pStrm, aStr );
-/*N*/ *pStrm << (sal_uInt16)nActLanguage
-/*N*/ << (sal_uInt16)nCount
-/*N*/ << (BYTE)bNeg;
-/*N*/ }
-/*N*/ }
-/*N*/ CloseRec( SWG_DICTIONARY );
-/*N*/ }
-
-/*N*/ void Sw3IoImp::OutNumberFormatter()
-/*N*/ {
-/*N*/ SvNumberFormatter* pN = pDoc->GetNumberFormatter( sal_False );
-/*N*/ if( pN )
-/*N*/ {
-/*N*/ OpenRec( SWG_NUMBERFORMATTER );
-/*N*/ pN->Save( *pStrm );
-/*N*/ CloseRec( SWG_NUMBERFORMATTER );
-/*N*/ }
-/*N*/ }
-
/*N*/ void Sw3IoImp::InNumberFormatter()
/*N*/ {
/*N*/ OpenRec( SWG_NUMBERFORMATTER );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list