[Libreoffice-commits] .: 2 commits - binfilter/bf_svx binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Aug 10 03:50:32 PDT 2011
binfilter/bf_svx/source/xoutdev/svx_xattr.cxx | 8
binfilter/bf_sw/source/core/fields/sw_authfld.cxx | 25 --
binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx | 216 -------------------
binfilter/bf_sw/source/core/sw3io/sw3imp.hxx | 20 -
binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx | 215 -------------------
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 31 --
binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx | 32 --
binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx | 241 ----------------------
binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx | 33 ---
binfilter/inc/bf_svx/xtxasit.hxx | 1
binfilter/inc/bf_sw/authfld.hxx | 4
binfilter/inc/bf_sw/ndgrf.hxx | 5
12 files changed, 831 deletions(-)
New commits:
commit 82de00bd8d17a924c2800321255129986d2cc234
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 10 08:58:26 2011 +0100
callcatcher: remove unused code
diff --git a/binfilter/bf_sw/source/core/fields/sw_authfld.cxx b/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
index 8e16cd9..f9b149c 100644
--- a/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
@@ -306,24 +306,6 @@ long SwAuthorityFieldType::GetHandle(USHORT nPos)
return nRet;
}
-USHORT SwAuthorityFieldType::GetPosition(long nHandle)
-{
- USHORT j = 0;
- for( ; j < m_pDataArr->Count(); ++j )
- {
- const SwAuthEntry* pTemp = m_pDataArr->GetObject(j);
- long nTmp = (long)(void*)pTemp;
- if( nTmp == nHandle )
- break;
- }
- if( j == m_pDataArr->Count() )
- j = USHRT_MAX;
-
- OSL_ENSURE( USHRT_MAX != j, "handle not found" );
- return j;
-}
-
-
USHORT SwAuthorityFieldType::GetEntryCount() const
{
return m_pDataArr->Count();
diff --git a/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx b/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx
index e69c40b..e9ccd55 100644
--- a/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx
+++ b/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx
@@ -445,207 +445,6 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
return nRet;
}
-// Falls die Grafik noch nicht im Doc-Storage existiert,
-// wird sie neu geschrieben; falls sie bereits drin ist,
-// wird nicht geschrieben. Wenn der Storage nicht dem
-// Doc-Storage entspricht, wird, falls aNewStrmName nicht
-// besetzt ist, in diesem Storage unter dem angegebenen
-// Streamnamen abgelegt (SaveAs). nach einem SaveAs wird
-// vom SW3-I/O-System noch SaveCompleted() aufgerufen,
-// da nun der Doc-Storage dem neuen Storage entspricht.
-// This method is called only to store graphics
-// in the 3.1 to 5.0 formats. For the 6.0 format, graphics
-// are exported using the SvXMLGraphicObjectHelper class.
-
-
-/*N*/ BOOL SwGrfNode::StoreGraphics( SvStorage* pInRoot )
-/*N*/ {
-/*N*/ if( !refLink.Is() )
-/*N*/ {
-/*N*/ BOOL bGraphic = TRUE; // Does the graphic stream (if it exists)
-/*N*/ // contain a streamed graphic (TRUE) or the
-/*N*/ // raw image data only (FALSE)
-/*N*/ String aSrcStrmName, aSrcPicStgName;
-/*N*/ if( HasStreamName() )
-/*N*/ bGraphic = GetStreamStorageNames( aSrcStrmName, aSrcPicStgName );
-/*N*/ SvStorage* pDocStg = GetDoc()->GetDocStorage();
-/*N*/ if( !pInRoot )
-/*N*/ pInRoot = pDocStg;
-/*N*/ OSL_ENSURE( SOFFICE_FILEFORMAT_60 > pInRoot->GetVersion(),
-/*N*/ "SwGrfNode::StoreGraphic called for 6.0+ file format" );
-/*N*/
-/*N*/ String aDstPicStgName(
-/*N*/ RTL_CONSTASCII_USTRINGPARAM( "EmbeddedPictures" ) );
-/*N*/ String aDstStrmName( aSrcStrmName );
-/*N*/ if( pInRoot != pDocStg || !bGraphic )
-/*N*/ {
-/*N*/ // If the stream does not contain a streamed graphic object,
-/*N*/ // the graphic has to be stored again.
-/*N*/ OSL_ENSURE( pInRoot != pDocStg || aSrcStrmName.Len(),
-/*N*/ "raw image data stream but no stream name" );
-/*N*/ // Neuer Storage. Wenn die Grafik im DocStg drin ist,
-/*N*/ // kann sie bequem per CopyTo() kopiert werden.
-/*N*/ if( aSrcStrmName.Len() )
-/*N*/ {
-/*N*/ SvStorageRef refSrcPics = aSrcPicStgName.Len()
-/*N*/ ? pDocStg->OpenStorage( aSrcPicStgName,
-/*N*/ STREAM_READ | STREAM_SHARE_DENYWRITE )
-/*N*/ : pDocStg;
-/*N*/
-/*N*/ SvStorageStreamRef refStrm;
-/*N*/
-/*N*/ BOOL bWriteNew = pDocStg->GetVersion() != pInRoot->GetVersion() ||
-/*N*/ !bGraphic;
-/*N*/ if( !bWriteNew &&
-/*N*/ SOFFICE_FILEFORMAT_40 <= pInRoot->GetVersion() )
-/*N*/ {
-/*N*/ refStrm = refSrcPics->OpenStream( aSrcStrmName,
-/*N*/ STREAM_READ | STREAM_SHARE_DENYWRITE );
-/*N*/ if( SVSTREAM_OK == refStrm->GetError() )
-/*N*/ {
-/*N*/ // JP 21.06.98: pruefe ob der CompressMode uebereinstimmt
-/*N*/ USHORT nCmprsMode =
-/*N*/ Graphic::GetGraphicsCompressMode(*refStrm ) &
-/*N*/ ~(COMPRESSMODE_ZBITMAP|COMPRESSMODE_NATIVE );
-/*N*/ USHORT nNewCmprsMode = 0;
-/*N*/ if( GRAPHIC_BITMAP == aGrfObj.GetType() &&
-/*N*/ GetDoc()->GetInfo()->IsSaveGraphicsCompressed() )
-/*N*/ nNewCmprsMode |= COMPRESSMODE_ZBITMAP;
-/*N*/ if( SOFFICE_FILEFORMAT_40 < pInRoot->GetVersion() &&
-/*N*/ GetDoc()->GetInfo()->IsSaveOriginalGraphics() )
-/*N*/ nNewCmprsMode |= COMPRESSMODE_NATIVE;
-/*N*/
-/*N*/ if( nCmprsMode != nNewCmprsMode )
-/*N*/ {
-/*N*/ // der Kompressedmode stimmt nicht, also muss
-/*N*/ // ggfs. die Grafik reingeswappt und ueber den
-/*N*/ // unteren Teil neu geschrieben werden.
-/*N*/ bWriteNew = TRUE;
-/*N*/ refStrm->Seek( STREAM_SEEK_TO_BEGIN );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ if( bWriteNew )
-/*N*/ {
-/*N*/ if( aGrfObj.IsSwappedOut() &&
-/*N*/ SVSTREAM_OK == refSrcPics->GetError() )
-/*N*/ {
-/*N*/ if( !refStrm.Is() )
-/*?*/ refStrm = refSrcPics->OpenStream( aSrcStrmName,
-/*?*/ STREAM_READ | STREAM_SHARE_DENYWRITE );
-/*N*/ if( SVSTREAM_OK == refStrm->GetError() )
-/*N*/ {
-/*N*/ refStrm->SetVersion( pDocStg->GetVersion() );
-/*N*/ if( !(bGraphic ? aGrfObj.SwapIn( refStrm )
-/*N*/ : ImportGraphic( *refStrm ) ) )
-/*N*/ return FALSE;
-/*N*/ }
-/*N*/ }
-/*N*/ // If the graphic is restored within the same storage,
-/*N*/ // its storage has to be removed.
-/*N*/ if( pInRoot == pDocStg )
-/*N*/ {
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ }
-/*N*/ aDstStrmName.Erase();
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ SvStorageRef refDstPics =
-/*N*/ pInRoot->OpenStorage( aDstPicStgName,
-/*N*/ STREAM_READWRITE | STREAM_SHARE_DENYALL );
-/*N*/ if( refDstPics->IsContained( aDstStrmName ) )
-/*N*/ // nur neu erzeugen, wenn Name schon vorhanden ist!
-/*?*/ aDstStrmName = Sw3Io::UniqueName( refDstPics, "Pic" );
-/*N*/
-/*N*/ if( refSrcPics->CopyTo( aSrcStrmName, refDstPics,
-/*N*/ aDstStrmName )
-/*N*/ && refDstPics->Commit() )
-/*N*/ aNewStrmName = aDstStrmName;
-/*N*/ else
-/*N*/ return FALSE;
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ if( !aDstStrmName.Len() )
-/*N*/ {
-/*N*/ OSL_ENSURE( pInRoot, "Kein Storage gegeben" );
-/*N*/ if( pInRoot )
-/*N*/ {
-/*N*/ SvStorageRef refPics =
-/*N*/ pInRoot->OpenStorage( aDstPicStgName,
-/*N*/ STREAM_READWRITE | STREAM_SHARE_DENYALL );
-/*N*/ if( SVSTREAM_OK == refPics->GetError() )
-/*N*/ {
-/*N*/ aDstStrmName = Sw3Io::UniqueName( refPics, "Pic" );
-/*N*/ SvStorageStreamRef refStrm =
-/*N*/ refPics->OpenStream( aDstStrmName,
-/*N*/ STREAM_READWRITE | STREAM_SHARE_DENYALL );
-/*N*/ if( SVSTREAM_OK == refStrm->GetError() )
-/*N*/ {
-/*N*/ // HACK bis die Grafik als Portable markiert
-/*N*/ // werden kann!!!
-/*N*/ // Die Grafik kann in einer TempFile sein!
-/*N*/ bool bIsSwapOut = aGrfObj.IsSwappedOut();
-/*N*/ if( bIsSwapOut && !aGrfObj.SwapIn() )
-/*N*/ return FALSE;
-/*N*/
-/*N*/ refStrm->SetVersion( pInRoot->GetVersion() );
-/*N*/
-/*N*/ //JP 04.05.98: laut ChangesMail vom KA und Bug 49617
-/*N*/ //JP 21.06.98: laut ChangesMail vom KA, natives Save
-/*N*/ USHORT nComprMode = refStrm->GetCompressMode();
-/*N*/ if( SOFFICE_FILEFORMAT_40 <= refStrm->GetVersion() &&
-/*N*/ GRAPHIC_BITMAP == aGrfObj.GetType() &&
-/*N*/ GetDoc()->GetInfo()->IsSaveGraphicsCompressed() )
-/*N*/ nComprMode |= COMPRESSMODE_ZBITMAP;
-/*N*/ else
-/*N*/ nComprMode &= ~COMPRESSMODE_ZBITMAP;
-/*N*/
-/*N*/ //JP 21.06.98: laut ChangesMail vom KA, natives Save
-/*N*/ if( SOFFICE_FILEFORMAT_40 < refStrm->GetVersion() &&
-/*N*/ GetDoc()->GetInfo()->IsSaveOriginalGraphics() )
-/*N*/ nComprMode |= COMPRESSMODE_NATIVE;
-/*N*/ else
-/*N*/ nComprMode &= ~COMPRESSMODE_NATIVE;
-/*N*/ refStrm->SetCompressMode( nComprMode );
-/*N*/
-/*N*/ BOOL bRes = FALSE;
-/*N*/ if( pInRoot == pDocStg )
-/*N*/ {
-/*?*/ if( aGrfObj.SwapOut( refStrm ) &&
-/*?*/ ( refStrm->Commit() | refPics->Commit()
-/*?*/ /*| pInRoot->Commit()*/ ))
-/*?*/ {
-/*?*/ SetStreamName( aDstStrmName );
-/*?*/ bRes = TRUE;
-/*?*/ }
-/*N*/ }
-/*N*/ else if( ((Graphic&)aGrfObj.GetGraphic()).
-/*N*/ WriteEmbedded( *refStrm )
-/*N*/ && ( refStrm->Commit() | refPics->Commit()
-/*N*/ /*| pInRoot->Commit()*/ ))
-/*N*/ {
-/*N*/ if( bIsSwapOut )
-/*?*/ aGrfObj.SwapOut();
-/*N*/ aNewStrmName = aDstStrmName;
-/*N*/ bRes = TRUE;
-/*N*/ }
-/*N*/ return bRes;
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ // Da fehlte doch was?
-/*N*/ return FALSE;
-/*N*/ }
-/*N*/ }
-/*N*/ // Schon drin im Storage oder Linked
-/*N*/ return TRUE;
-/*N*/ }
-
-
/*N*/ BOOL SwGrfNode::GetFileFilterNms( String* pFileNm, String* pFilterNm ) const
/*N*/ {
/*N*/ BOOL bRet = FALSE;
@@ -672,21 +471,6 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ return bRet;
/*N*/ }
-
-/*N*/ String SwGrfNode::GetStreamName() const
-/*N*/ {
-/*N*/ if( aNewStrmName.Len() )
-/*N*/ return aNewStrmName;
-/*N*/ return aGrfObj.GetUserData();
-/*N*/ }
-
-// Eine Grafik Undo-faehig machen. Falls sie sich bereits in
-// einem Storage befindet, muss sie geladen werden.
-
-
-
-
-
/*N*/ void SwGrfNode::InsertLink( const String& rGrfName, const String& rFltName )
/*N*/ {
/*N*/ refLink = new SwBaseLink( ::binfilter::LINKUPDATE_ONCALL, FORMAT_GDIMETAFILE, this );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
index 43cbb00..707eb04 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
@@ -601,7 +601,6 @@ public:
void InAttrSet( SwAttrSet& rSet ); // I: AttrSet
void OutAttrSet( const SfxItemSet&, BOOL bSFmt=FALSE ); // O: AttrSet
SwFmt* InFormat( BYTE cKind, SwFmt* ); // I: Format
- void OutFormat( BYTE, const SwFmt& ); // O: Format
void InFlyFrames(); // I: globale FlyFrames
// SW3MISC.CXX
@@ -645,12 +644,9 @@ public:
// I/O: ImageMap-Infos
ImageMap *InImageMap( String& rURL, String& rTarget, BOOL& rIsMap );
- void OutImageMap( const String& rURL, const String& rTarget,
- const ImageMap *pIMap, BOOL bIsMap );
// I/O: Contour
PolyPolygon *InContour();
- void OutContour( const PolyPolygon& rPoly );
// SW3NUM.CXX
void InNumFmt( SwNumFmt& rFmt ); // I: Numerierungs-Format
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
index 8e8db19..1bc479f 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
@@ -744,221 +744,6 @@ sal_Bool lcl_sw3io_insFtn( const SwTxtNode *pTxtNd )
/*N*/ return pFmt;
/*N*/ }
-// Ausgabe eines Formats:
-// BYTE Flags
-// 0x10 - Namensindex des Formats folgt
-// 0x20 - SdrObject-Referenz folgt
-// UINT16 String-ID des Parents (IDX_NO_VALUE: Formatname folgt)
-// UINT16 Pool-ID
-// UINT16 String-ID des Formatnamens (opt.)
-// INT32 Z-Order des Drawing-Objekts (opt.)
-// String Name des Formats, falls nicht im Pool gefunden (opt.)
-// SWG_ATTRSET Attribute (opt.)
-
-/*N*/ void Sw3IoImp::OutFormat( BYTE cType, const SwFmt& rFmt )
-/*N*/ {
-/*N*/ // Freifliegende Formate werden immer geschrieben, da sie niemals
-/*N*/ // mehrfach referenziert werden!
-/*N*/ if( cType != SWG_FREEFMT && cType != SWG_SECTFMT && rFmt.IsWritten() )
-/*N*/ return;
-/*N*/
-/*N*/ OpenRec( cType );
-/*N*/ // Von welchem Format isses abgeleitet?
-/*N*/ USHORT nDerived = IDX_NO_VALUE;
-/*N*/ SwFmt* pDerived = rFmt.DerivedFrom();
-/*N*/ if( pDerived && SWG_SECTFMT == cType )
-/*N*/ {
-/*N*/ // The parent format of TOX content sections must not to be stored,
-/*N*/ // because the parent format will not exist if the document is read
-/*N*/ // again. In fact, this format is copied to a newly created one only.
-/*N*/ // The parent format of TOX header sections has not to be stored,
-/*N*/ // because the section is inserted into the newly created TOX content
-/*N*/ // section and that for will be replaced always.
-/*N*/ const SwSectionFmt* pSectFmt = PTR_CAST( SwSectionFmt, &rFmt );
-/*N*/ OSL_ENSURE( pSectFmt, "no section format?" );
-/*N*/ if( pSectFmt )
-/*N*/ {
-/*N*/ const SwSection* pSect = pSectFmt->GetSection();
-/*N*/ if( pSect && (TOX_CONTENT_SECTION == pSect->GetType() ||
-/*N*/ TOX_HEADER_SECTION == pSect->GetType()) )
-/*N*/ {
-/*N*/ pDerived = 0;
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ if( pDerived )
-/*N*/ {
-/*N*/ if( pDerived->IsDefault() )
-/*N*/ nDerived = IDX_DFLT_VALUE;
-/*N*/ else
-/*N*/ nDerived = aStringPool.Find( pDerived->GetName(),
-/*N*/ pDerived->GetPoolFmtId() );
-/*N*/ }
-/*N*/ // Flag Bits:
-/*N*/ // SW3.1/4.0: Byte 1
-/*N*/ // 0x0L - Laenge der Daten
-/*N*/ // 0x10 - Namensindex des Formats folgt
-/*N*/ // 0x20 - SdrObject-Referenz folgt
-/*N*/ // 0x40 - zusaetzliches Flag-Byte folgt (nur 4.0)
-/*N*/ // SW3.1/40: Byte 2
-/*N*/ // 0x01 - Auto-Update-Fmt (nur 4.0)
-/*N*/ // SW5.0
-/*N*/ // 0x0L - Laenge der Daten
-/*N*/ // 0x10 - Namensindex des Formats folgt
-/*N*/ // 0x20 - SdrObject-Referenz folgt
-/*N*/ // 0x40 - frei (fuer ein haeufig benutztes Flag gedacht)
-/*N*/ // 0x80 - zusaetzliches Flag-Byte folgt
-/*N*/ // SW5.0: Byte 2
-/*N*/ // 0x01 - Auto-Update-Fmt
-/*N*/ // 0x02 - Name des Formats ist als String enthalten
-/*N*/ BYTE cFlags = 0x04; // Derived, PoolId
-/*N*/ BYTE cMoreFlags = 0x00;
-/*N*/
-/*N*/ const SwFlyFrm* pExportFlyFrm = NULL;
-/*N*/
-/*N*/ if( rFmt.IsAutoUpdateFmt() && !IsSw31Export() )
-/*N*/ cMoreFlags += 0x01;
-/*N*/
-/*N*/ ULONG nSdrRef = 0;
-/*N*/ USHORT nStrIdx = IDX_NO_VALUE;
-/*N*/ BOOL bWriteName = FALSE;
-/*N*/ if( IsSw31Or40Export() )
-/*N*/ {
-/*N*/ if( SWG_FRAMEFMT==cType && ( rFmt.IsA(TYPE(SwTableLineFmt)) ||
-/*N*/ rFmt.IsA(TYPE(SwTableBoxFmt)) ) )
-/*N*/ {
-/*N*/ nStrIdx = GetTblLineBoxFmtStrPoolId40( (SwFrmFmt *)&rFmt );
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ nStrIdx = aStringPool.Find( rFmt.GetName(), rFmt.GetPoolFmtId() );
-/*N*/ }
-/*N*/ if( nStrIdx != IDX_NO_VALUE )
-/*N*/ cFlags += 0x12;
-/*N*/ else
-/*N*/ bWriteName = TRUE;
-/*N*/
-/*N*/ if( cMoreFlags != 0 )
-/*N*/ cFlags += 0x41;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ if( rFmt.GetName().Len() )
-/*N*/ {
-/*N*/ nStrIdx = aStringPool.Find( rFmt.GetName(), rFmt.GetPoolFmtId() );
-/*N*/ if( nStrIdx != IDX_NO_VALUE )
-/*N*/ {
-/*N*/ cFlags += 0x12;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ cMoreFlags += 0x20;
-/*N*/ bWriteName = TRUE;
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ if( cMoreFlags != 0 )
-/*N*/ cFlags += 0x81;
-/*N*/ }
-/*N*/
-/*N*/ // #72785#: In organizer mode, no drawing layer will be written. That for
-/*N*/ // no sdr object references must be written.
-/*N*/ if( !bOrganizer )
-/*N*/ {
-/*N*/ // Gibt es ein SdrObject?
-/*N*/ // Zur Zeit nur fuer SDR-Formate!!!
-/*N*/ if( cType == SWG_SDRFMT )
-/*N*/ {
-/*N*/ // Schauen, ob es ein SdrObject dafuer gibt
-/*N*/ SwClientIter aIter( (SwFmt&) rFmt );
-/*N*/ if( aIter.First( TYPE(SwDrawContact) ) )
-/*N*/ {
-/*N*/ nSdrRef = ((SwDrawContact*)aIter())->GetMaster()->GetOrdNum();
-/*N*/ cFlags += 0x24;
-/*N*/ }
-/*N*/ }
-/*N*/ else if( cType == SWG_FLYFMT )
-/*N*/ {
-/*N*/ // Schauen, ob es ein SdrObject dafuer gibt
-/*N*/ SwClientIter aIter( (SwFmt&) rFmt );
-/*N*/ if( aIter.First( TYPE( SwFlyFrm) ) )
-/*N*/ {
-/*N*/ pExportFlyFrm = (SwFlyFrm*)aIter();
-/*N*/ nSdrRef = pExportFlyFrm->GetVirtDrawObj()->GetOrdNum();
-/*N*/ cFlags += 0x24;
-/*N*/ }
-/*N*/ else if( aIter.First( TYPE( SwFlyDrawContact) ) )
-/*N*/ {
-/*N*/ // fix #45256#: Wenn Seitenvorlagen eines Doks importiert werden,
-/*N*/ // werden dafuer u.U. Master-Objekte in die Page eingetragen.
-/*N*/ // Wenn diese jetzt noch in der Page stehen, muss dafuer gesorgt
-/*N*/ // werden, dass beim Laden des Dokuments wieder an der gleichen
-/*N*/ // Stelle Master-Objekte angelegt werden, weil sonst die Indizes
-/*N*/ // der Zeichen-Objekte in der Page nicht stimmen.
-/*N*/ const SdrObject *pMaster =
-/*N*/ ((SwFlyDrawContact*)aIter())->GetMaster();
-/*N*/ if( pMaster->GetPage() )
-/*N*/ {
-/*?*/ nSdrRef = pMaster->GetOrdNum();
-/*?*/ cFlags += 0x24;
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ #ifdef DBG_UTIL
-/*N*/ if( (cFlags & 0x20) && pRefSdrObjects )
-/*N*/ {
-/*N*/ size_t nPos = nSdrRef / 8;
-/*N*/ BYTE nByte = 1 << (nSdrRef % 8);
-/*N*/ OSL_ENSURE( (pRefSdrObjects[nPos] & nByte) == 0,
-/*N*/ "Zeichen-Object doppelt referenziert" );
-/*N*/
-/*N*/ pRefSdrObjects[nPos] |= nByte;
-/*N*/ }
-/*N*/ #endif
-/*N*/
-/*N*/ USHORT nPoolId = rFmt.GetPoolFmtId();
-/*N*/ // In Colls darf nur das FrmFmt einen PoolId haben
-/*N*/ if( nPoolId == USHRT_MAX )
-/*N*/ nPoolId = IDX_NO_VALUE;
-/*N*/ *pStrm << (BYTE) cFlags
-/*N*/ << (UINT16) nDerived
-/*N*/ << (UINT16) nPoolId;
-/*N*/ if( cFlags & 0x10 )
-/*N*/ *pStrm << (UINT16) nStrIdx;
-/*N*/ if( cFlags & 0x20 )
-/*N*/ *pStrm << (INT32) nSdrRef;
-/*N*/ if( cMoreFlags != 0 )
-/*N*/ *pStrm << (BYTE) cMoreFlags;
-/*N*/
-/*N*/ // Falls der Name nicht im Pool ist, direkt raus damit!
-/*N*/ if( bWriteName )
-/*N*/ OutString( *pStrm, rFmt.GetName() );
-/*N*/
-/*N*/ BOOL bOldExportFlyFrmFmt = sal_False;
-/*N*/ const SwFlyFrm* pOldExportFlyFrm = NULL;
-/*N*/ if( pExportInfo )
-/*N*/ {
-/*N*/ bOldExportFlyFrmFmt = pExportInfo->bFlyFrmFmt;
-/*N*/ pOldExportFlyFrm = pExportInfo->pFlyFrm;
-/*N*/ pExportInfo->bFlyFrmFmt = (cType == SWG_FLYFMT);
-/*N*/ pExportInfo->pFlyFrm = pExportFlyFrm;
-/*N*/ }
-/*N*/ OutAttrSet( rFmt.GetAttrSet(), SWG_SECTFMT == cType );
-/*N*/ if( pExportInfo )
-/*N*/ {
-/*N*/ pExportInfo->bFlyFrmFmt = bOldExportFlyFrmFmt;
-/*N*/ pExportInfo->pFlyFrm = pOldExportFlyFrm;
-/*N*/ }
-/*N*/ CloseRec( cType );
-/*N*/ if( cType != SWG_FREEFMT && cType != SWG_SECTFMT )
-/*N*/ ((SwFmt&)rFmt).SetWritten();
-/*N*/ }
-
-////////////////////////////////////////////////////////////////////////////
-
// globale FlyFrames
/*N*/ void Sw3IoImp::InFlyFrames()
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
index 0b77502..93547c3 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
@@ -2103,45 +2103,6 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 )
/*N*/ }
/*N*/ }
-/*N*/ void Sw3IoImp::OutImageMap( const String& rURL, const String& rTarget,
-/*N*/ const ImageMap *pIMap, BOOL bIsServerMap )
-/*N*/ {
-/*N*/ // Dieser Record ist fuer den 31-Export ein SWG_GRAPHIC_EXT und
-/*N*/ // enthaelt dann nur eine URL
-/*N*/ OpenRec( SWG_IMAGEMAP );
-/*N*/ BYTE cFlags = 0x00;
-/*N*/ if( !IsSw31Export() && bIsServerMap )
-/*N*/ cFlags += 0x10; // es ist eine Image-Map
-/*N*/ if( !IsSw31Export() && pIMap )
-/*N*/ cFlags += 0x20; // es folgt eine Image-Map
-/*N*/
-/*N*/ *pStrm << cFlags;
-/*N*/
-/*N*/ // Unabhaengigkeit von der AbsToRel-Schnittstelle sicherstellen!
-/*N*/ String aURL( rURL );
-/*N*/ if( aURL.Len() )
-/*N*/ {
-/*N*/ lcl_sw3io__ConvertMarkToOutline( aURL );
-/*N*/ aURL = ::binfilter::StaticBaseUrl::AbsToRel( aURL URL_DECODE);
-/*N*/ }
-/*N*/ OutString( *pStrm, aURL );
-/*N*/
-/*N*/ // bis hier hatten wir frueher einen SWG_GRAPHIC_EXT-Record!
-/*N*/
-/*N*/ if( !IsSw31Export() )
-/*N*/ {
-/*N*/ OutString( *pStrm, rTarget );
-/*N*/ OutString( *pStrm, aEmptyStr );
-/*N*/
-/*N*/ if( pIMap )
-/*?*/ pIMap->Write(
- *pStrm,
- ::binfilter::StaticBaseUrl::GetBaseURL(INetURLObject::NO_DECODE));
-/*N*/ }
-/*N*/
-/*N*/ CloseRec( SWG_IMAGEMAP );
-/*N*/ }
-
PolyPolygon *Sw3IoImp::InContour()
{
PolyPolygon *pContour = 0;
@@ -2161,20 +2122,6 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 )
return pContour;
}
-void Sw3IoImp::OutContour( const PolyPolygon& rPoly )
-{
- OpenRec( SWG_CONTOUR );
-
- BYTE cFlags = 0x10; // es folgt ein Contour Poly-Polygon
- *pStrm << cFlags;
-
- // das Contour-PolyPolygon rausschreiben
- *pStrm << rPoly;
-
- CloseRec( SWG_CONTOUR );
-}
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sw/authfld.hxx b/binfilter/inc/bf_sw/authfld.hxx
index c0498c7..25fd849 100644
--- a/binfilter/inc/bf_sw/authfld.hxx
+++ b/binfilter/inc/bf_sw/authfld.hxx
@@ -119,7 +119,6 @@ public:
// import interface
USHORT AppendField(const SwAuthEntry& rInsert);
long GetHandle(USHORT nPos);
- USHORT GetPosition(long nHandle);
USHORT GetEntryCount() const;
const SwAuthEntry* GetEntryByPosition(USHORT nPos) const;
diff --git a/binfilter/inc/bf_sw/ndgrf.hxx b/binfilter/inc/bf_sw/ndgrf.hxx
index e9a1161..4f57cd8 100644
--- a/binfilter/inc/bf_sw/ndgrf.hxx
+++ b/binfilter/inc/bf_sw/ndgrf.hxx
@@ -135,11 +135,6 @@ public:
BOOL bModify = TRUE );
// Laden der Grafik unmittelbar vor der Anzeige
short SwapIn( BOOL bWaitForData = FALSE );
- // Entfernen der Grafik, um Speicher freizugeben
- // Schreiben der Grafik
- BOOL StoreGraphics( SvStorage* pDocStg = NULL );
- // Zugriff auf den Storage-Streamnamen
- String GetStreamName() const;
void SetStreamName( const String& r ) { aGrfObj.SetUserData( r ); }
void SetNewStreamName( const String& r ) { aNewStrmName = r; }
// is this node selected by any shell?
commit 426e25b1cf66c6b02307dabe1102a0085b44e1b1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 9 22:32:33 2011 +0100
callcatcher: remove some unused methods
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
index e5a18bd..80cea04 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
@@ -3901,14 +3901,6 @@ XubString aNameOrIndexEmptyString;
/************************************************************************/
-/*N*/ XTextAttrSetItem::XTextAttrSetItem( SfxItemPool* pItemPool ) :
-/*N*/ SfxSetItem( XATTRSET_TEXT,
-/*N*/ new SfxItemSet( *pItemPool, XATTR_TEXT_FIRST, XATTR_TEXT_LAST))
-/*N*/ {
-/*N*/ }
-
-/************************************************************************/
-
/*?*/ XTextAttrSetItem::XTextAttrSetItem( const XTextAttrSetItem& rTextAttr ) :
/*?*/ SfxSetItem( rTextAttr )
/*?*/ {
diff --git a/binfilter/bf_sw/source/core/fields/sw_authfld.cxx b/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
index 5540deb..8e16cd9 100644
--- a/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
@@ -649,13 +649,6 @@ void SwAuthorityField::SetPar1(const String& rStr)
nHandle = pType3->AddField(rStr);
}
-USHORT SwAuthorityField::GetHandlePosition() const
-{
- SwAuthorityFieldType* pAuthType = (SwAuthorityFieldType*)GetTyp();
- DBG_ASSERT(pAuthType, "no field type");
- return pAuthType->GetPosition(nHandle);
-}
-
const char* aFieldNames[] =
{
"Identifier",
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
index cadac95..43cbb00 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
@@ -484,10 +484,8 @@ public:
BOOL IsSw31Export() const { return bSw31Export; }
#ifndef DBG_UTIL
inline BOOL IsSw31Or40Export() const;
- inline BOOL IsSw40Export() const;
#else
BOOL IsSw31Or40Export() const;
- BOOL IsSw40Export() const;
#endif
void Error( ULONG = 0 );
void Warning( ULONG = 0 );
@@ -511,8 +509,6 @@ public:
void InRecSizes( ULONG nRecPos );
BYTE OpenFlagRec(); // Endeposition eines Flag-Records merken
void CloseFlagRec(); // Flag-Record schliessen
- void OpenValuePos16( UINT16 ); // Position fuer UINT16-Wert merken
- void OpenValuePos32( UINT32 ); // Position fuer UINT32-Wert merken
ULONG BytesLeft(); // wie viele Bytes hat der Record noch?
void CheckIoError( SvStream*); // korrekten E/A-Fehlercode setzen
static String ConvertStringNoDbDelim( const ByteString& rStr,
@@ -624,7 +620,6 @@ public:
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 InTOXs51(); // I: TOX-Bereiche
void InTOXs(); // I: TOX-Bereiche
@@ -632,7 +627,6 @@ public:
void ConnectTOXs(); // I: insert TOXs
// SW3NODES.CXX
- void OutNodeFlyFrames( ULONG nNdId );// O: Absatz- und Zeichen-Flys
void ConvertText( SwTxtNode& rNd, const ByteString& rText8,
xub_StrLen, SvUShorts*, SvXub_StrLens* ); // I: Zeichensatz-Konversion
void InTxtNode( SwTxtNode*, SwNodeIndex&, xub_StrLen, BYTE = 0 );
@@ -644,14 +638,10 @@ public:
void InTxtAttr( SwTxtNode&, const ByteString& rText8,
xub_StrLen, SvStringsDtor**, SvXub_StrLens**,
SvXub_StrLens**, SvUShorts**, SvXub_StrLens** );
- void OutTxtAttrs( const SwTxtNode&, xub_StrLen, xub_StrLen);
void ExportTxtAttrs( const Sw3ExportTxtAttrs*, xub_StrLen, xub_StrLen);
void InGrfNode( SwNodeIndex& rPos ); // I: Grafik-Node
- void OutGrfNode( const SwNoTxtNode& );// O: Grafik-Node
void InOLENode( SwNodeIndex& rPos ); // I: OLE-Node
- void OutOLENode( const SwNoTxtNode& );// O: OLE-Node
void InRepTxtNode( SwNodeIndex& ); // I: Textwiederholung
- void OutRepTxtNode( ULONG ); // O: Textwiederholung
// I/O: ImageMap-Infos
ImageMap *InImageMap( String& rURL, String& rTarget, BOOL& rIsMap );
@@ -668,7 +658,6 @@ public:
void InNumRules(); // I: NumRules
void InOutlineExt();
void InNodeNum( SwNodeNum& ); // I: Absatz-Numerierung
- void OutNodeNum( const SwNodeNum& ); // O: Absatz-Numerierung
void InEndNoteInfo( SwEndNoteInfo &rENInf ); // I: globale Endnoten-Info
void InEndNoteInfo(); // I: globale Endnoten-Info
@@ -745,11 +734,6 @@ inline BOOL Sw3IoImp::IsVersion( USHORT nMinVers1, USHORT nMaxVers1,
}
#ifndef DBG_UTIL
-inline BOOL Sw3IoImp::IsSw40Export() const
-{
- return pRoot->GetVersion() == SOFFICE_FILEFORMAT_40;
-}
-
inline BOOL Sw3IoImp::IsSw31Or40Export() const
{
return pRoot->GetVersion() <= SOFFICE_FILEFORMAT_40;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 6eb69a0..1c4660d 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -312,13 +312,6 @@ public:
/*N*/ }
#ifdef DBG_UTIL
-/*N*/ sal_Bool Sw3IoImp::IsSw40Export() const
-/*N*/ {
-/*N*/ OSL_ENSURE( !pStrm || pStrm->GetVersion()==pRoot->GetVersion(),
-/*N*/ "Fileformat-Version am Stream stimmt nicht." );
-/*N*/ return pRoot->GetVersion() == SOFFICE_FILEFORMAT_40;
-/*N*/ }
-
/*N*/ sal_Bool Sw3IoImp::IsSw31Or40Export() const
/*N*/ {
/*N*/ OSL_ENSURE( !pStrm || pStrm->GetVersion()==pRoot->GetVersion(),
@@ -899,30 +892,6 @@ void Sw3IoImp::InRecSizes( ULONG nRecPos )
/*?*/ pStrm->Seek( nFlagRecEnd );
/*N*/ }
-// Merken der Position fuer einen 16-Bit-Wert, der spaeter dort eingefuegt wird
-// Der Parameter ist nur Dokumentation
-
-/*N*/ void Sw3IoImp::OpenValuePos16( sal_uInt16 )
-/*N*/ {
-/*N*/ sal_uInt16 nLvl = aValPositions.Count();
-/*N*/ if( nLvl >= 31 && IsSw31Or40Export() )
-/*N*/ Error( ERR_SWG_LARGE_DOC_ERROR );
-/*N*/ aValPositions.Insert( pStrm->Tell(), nLvl );
-/*N*/ *pStrm << (sal_uInt16) 0;
-/*N*/ }
-
-// Merken der Position fuer einen 32-Bit-Wert, der spaeter dort eingefuegt wird
-// Der Parameter ist nur Dokumentation
-
-/*N*/ void Sw3IoImp::OpenValuePos32( sal_uInt32 )
-/*N*/ {
-/*N*/ sal_uInt16 nLvl = aValPositions.Count();
-/*N*/ if( nLvl >= 31 && IsSw31Or40Export() )
-/*N*/ Error( ERR_SWG_LARGE_DOC_ERROR );
-/*N*/ aValPositions.Insert( pStrm->Tell(), nLvl );
-/*N*/ *pStrm << (sal_uInt32) 0;
-/*N*/ }
-
/*N*/ void Sw3IoImp::CheckIoError( SvStream* p )
/*N*/ {
/*N*/ const sal_uInt32 nErr = p->GetErrorCode();
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
index 15788a4..435e0e8 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
@@ -584,38 +584,6 @@ void Sw3IoImp::InPasswd()
/*N*/ }
/*N*/ }
-// Die Marks eines Nodes schreiben
-
-/*N*/ void Sw3IoImp::OutNodeMarks( ULONG nIdx )
-/*N*/ {
-/*N*/ if(pMarks )
-/*N*/ {
-/*N*/ for( sal_uInt16 nPos = 0; nPos < pMarks->Count(); ++nPos )
-/*N*/ {
-/*N*/ Sw3Mark *pMark = (*pMarks)[ nPos ];
-/*N*/ if( pMark->GetNodePos() == nIdx )
-/*N*/ {
-/*N*/ OpenRec( SWG_MARK );
-/*N*/ xub_StrLen nOffs = pMark->GetNodeOff();
-/*N*/ *pStrm << (sal_uInt8) pMark->GetType()
-/*N*/ << (sal_uInt16) pMark->GetId()
-/*N*/ << (sal_uInt16) nOffs;
-/*N*/ CloseRec( SWG_MARK );
-/*N*/ pMarks->Remove( nPos-- );
-/*N*/ delete pMark;
-/*N*/ if( !pMarks->Count() )
-/*N*/ {
-/*N*/ delete pMarks;
-/*N*/ pMarks = NULL;
-/*N*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/ else if( pMark->GetNodePos() > nIdx )
-/*N*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
// text::Bookmark einlesen
/*N*/ void Sw3IoImp::InBookmarks()
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
index 751311b..0b77502 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
@@ -143,44 +143,6 @@ public:
void OutAttr( Sw3IoImp& rIo, xub_StrLen nStt, xub_StrLen nEnd );
};
-
-////////////////////////////////////////////////////////////////////////////
-
-// Ausgabe von FlyFrames, die an einem Node kleben
-
-/*N*/ void Sw3IoImp::OutNodeFlyFrames( ULONG nNodeId )
-/*N*/ {
-/*N*/ // FlyFrames duerfen Tabellen enthalten, koennen also Tabelle in Tabelle
-/*N*/ // simulieren
-/*N*/ SwTable* pSave = pCurTbl; pCurTbl = NULL;
-/*N*/ SwFmt* pFly;
-/*N*/ while( ( pFly = FindFlyFrm( nNodeId ) ) != NULL )
-/*N*/ {
-/*N*/ if( !pFly->IsDefault() )
-/*N*/ {
-/*N*/ BYTE cType = SWG_FLYFMT;
-/*N*/ // do *not* export drawing objects in header/footer
-/*N*/ bool bExport = true;
-/*N*/ if( RES_DRAWFRMFMT == pFly->Which() )
-/*N*/ {
-/*N*/ cType = SWG_SDRFMT;
-/*N*/ SwFrmFmt* pDrawFrmFmt = static_cast<SwFrmFmt*>(pFly);
-/*N*/ const SwFmtAnchor& rFmtAnchor = pDrawFrmFmt->GetAnchor();
-/*N*/ if ( rFmtAnchor.GetAnchorId() != FLY_PAGE &&
-/*N*/ pDrawFrmFmt->GetDoc()->IsInHeaderFooter( rFmtAnchor.GetCntntAnchor()->nNode ) )
-/*N*/ {
-/*N*/ bExport = false;
-/*N*/ }
-/*N*/ }
-/*N*/ if ( bExport )
-/*N*/ {
-/*N*/ OutFormat( cType, *pFly );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ pCurTbl = pSave;
-/*N*/ }
-
/*N*/ sal_Char Sw3IoImp::ConvStarSymbolCharToStarBats( sal_Unicode c )
/*N*/ {
/*N*/ if( !hBatsFontConv )
@@ -1709,37 +1671,6 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 )
/*N*/ delete pItem;
/*N*/ }
-// Schreiben aller harten Attributierungen
-
-/*N*/ void Sw3IoImp::OutTxtAttrs( const SwTxtNode& rNd, xub_StrLen nStart,
-/*N*/ xub_StrLen nEnd )
-/*N*/ {
-/*N*/ USHORT nCntAttr = rNd.HasHints() ? rNd.GetSwpHints().Count() : 0;
-/*N*/ if( nCntAttr )
-/*N*/ {
-/*N*/ for( USHORT n = 0; n < nCntAttr; n++ )
-/*N*/ {
-/*N*/ const SwTxtAttr* pHt = rNd.GetSwpHints()[ n ];
-/*N*/ BOOL bHtEnd = BOOL( pHt->GetEnd() != NULL );
-/*N*/ xub_StrLen nHtStart = *pHt->GetStart();
-/*N*/ xub_StrLen nHtEnd = *pHt->GetAnyEnd();
-/*N*/
-/*N*/ // MIB 11.11.96: Der Bereich des Hints muss sich nur irgendwie
-/*N*/ // mit dem auszugenden Bereich ueberschneiden
-/*N*/ if( (bHtEnd && nHtEnd > nStart && nHtStart < nEnd) ||
-/*N*/ (!bHtEnd && nHtStart >= nStart && nHtStart < nEnd ) )
-/*N*/ {
-/*N*/ // Der Hint liegt zumindest teilweise im Text, also
-/*N*/ // Start und Ende korrigieren und Hint ausgeben
-/*N*/ nHtStart = ( nHtStart < nStart ) ? 0 : ( nHtStart - nStart );
-/*N*/ nHtEnd = ( nHtEnd > nEnd ? nEnd : nHtEnd ) - nStart;
-/*N*/ const SfxPoolItem& rAttr = pHt->GetAttr();
-/*N*/ OutAttr( rAttr, nHtStart, nHtEnd );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
/*N*/ void Sw3IoImp::ExportTxtAttrs( const Sw3ExportTxtAttrs* pInfo,
/*N*/ xub_StrLen nStart, xub_StrLen nEnd )
/*N*/ {
@@ -1926,83 +1857,6 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 )
/*N*/ delete pContour;
/*N*/ }
-// Ausgabe eines Grafik-Nodes
-
-/*N*/ void Sw3IoImp::OutGrfNode( const SwNoTxtNode& rNode )
-/*N*/ {
-/*N*/ if( CheckPersist() )
-/*N*/ {
-/*N*/ SwGrfNode& rGrf = (SwGrfNode&) rNode;
-/*N*/
-/*N*/ String aName, sFilterNm;
-/*N*/ BYTE cFlags = 0x00;
-/*N*/ if( !rGrf.IsGrfLink() ) // gelinkte Graphic
-/*N*/ {
-/*N*/ cFlags = 0x10;
-/*N*/ if( GRAPHIC_NONE == rGrf.GetGrf().GetType() )
-/*N*/ cFlags |= 0x20;
-/*N*/ else
-/*N*/ {
-/*N*/ // Falls die Grafik bereits im Storage ist, ist der Stream-Name
-/*N*/ // gesetzt. Dann brauchen wir sie nicht mehr zu speichern.
-/*N*/ // oder es ist ein SaveAs, dann auf jedenfall kopieren
-/*N*/ if( !rGrf.StoreGraphics( pRoot ) )
-/*N*/ {
-/*N*/ Warning( WARN_SWG_POOR_LOAD );
-/*N*/ cFlags |= 0x20; // dann als leere Grf kennzeichnen!
-/*N*/ // Error( ERR_SWG_WRITE_ERROR );
-/*N*/ }
-/*N*/ // Den Namen merken
-/*N*/ else
-/*N*/ aName = rGrf.GetStreamName();
-/*N*/ }
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ nFileFlags |= SWGF_HAS_GRFLNK;
-/*N*/ rGrf.GetFileFilterNms( &aName, &sFilterNm );
-/*N*/ aName = ::binfilter::StaticBaseUrl::AbsToRel( aName );
-/*N*/ }
-/*N*/
-/*N*/ // Beim 31-Export muss die URL noch am Node gespeichert werden
-/*N*/ const SfxPoolItem *pURLItem = 0;
-/*N*/ if( IsSw31Export() &&
-/*N*/ SFX_ITEM_SET == rNode.GetFlyFmt()->GetAttrSet().
-/*N*/ GetItemState( RES_URL, FALSE, &pURLItem ) )
-/*N*/ {
-/*N*/ if ( ((SwFmtURL*)pURLItem)->IsServerMap() )
-/*N*/ cFlags |= 0x40;
-/*N*/ }
-/*N*/
-/*N*/ OpenRec( SWG_GRFNODE );
-/*N*/ *pStrm << cFlags;
-/*N*/ OutString( *pStrm, aName );
-/*N*/ OutString( *pStrm, sFilterNm );
-/*N*/ if( !IsSw31Export() )
-/*N*/ OutString( *pStrm, rGrf.GetAlternateText() );
-/*N*/ if( rNode.GetpSwAttrSet() )
-/*N*/ OutAttrSet( *rNode.GetpSwAttrSet() );
-/*N*/
-/*N*/ if( pURLItem )
-/*N*/ {
-/*N*/ const String& rURL = ((SwFmtURL*)pURLItem)->GetURL();
-/*N*/ const String& rTarget = ((SwFmtURL*)pURLItem)->GetTargetFrameName();
-/*N*/ const ImageMap *pIMap = ((SwFmtURL*)pURLItem)->GetMap();
-/*N*/ if( rURL.Len() || rTarget.Len() || pIMap || (cFlags & 0x40) )
-/*N*/ OutImageMap( rURL, rTarget, pIMap, (cFlags & 0x40) );
-/*N*/ }
-/*N*/
-/*N*/ // wegen der while( BytesLeft() )-Schleife beim Einlesen brauchen
-/*N*/ // wir hier einen eigenen Record, der aber auch fuer andere Sachen
-/*N*/ // verwendet werden kann und sollte
-/*N*/ if( !IsSw31Export() && rNode.HasContour() )
- OutContour( *rNode.HasContour() );
-/*N*/
-/*N*/ CloseRec( SWG_GRFNODE );
-/*N*/ aStat.nGrf++;
-/*N*/ }
-/*N*/ }
-
// Einlesen eines OLE-Nodes
/*N*/ void Sw3IoImp::InOLENode( SwNodeIndex& rPos )
@@ -2168,39 +2022,6 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 )
/*N*/ CloseRec( SWG_OLENODE );
/*N*/ }
-// Ausgabe eines OLE-Nodes
-
-/*N*/ void Sw3IoImp::OutOLENode( const SwNoTxtNode& rNd )
-/*N*/ {
-/*N*/ if( CheckPersist() )
-/*N*/ {
-/*N*/ OpenRec( SWG_OLENODE );
-/*N*/ SwOLENode& rNode = (SwOLENode&) rNd;
-/*N*/ SwOLEObj& rObj = rNode.GetOLEObj();
-/*N*/
-/*N*/ String aName( rObj.GetName() );
-/*N*/ OutString( *pStrm, aName );
-/*N*/ if( !IsSw31Export() )
-/*?*/ OutString( *pStrm, rNode.GetAlternateText() );
-/*N*/ if( rNode.GetpSwAttrSet() )
-/*N*/ OutAttrSet( *rNode.GetpSwAttrSet() );
-/*N*/
-/*N*/ if( rNode.GetChartTblName().Len() )
-/*N*/ {
-/*N*/ OpenRec( SW_OLE_CHARTNAME );
-/*N*/ OutString( *pStrm, rNode.GetChartTblName() );
-/*N*/ CloseRec( SW_OLE_CHARTNAME );
-/*N*/ }
-/*N*/
-/*N*/ if( !IsSw31Export() && rNode.HasContour() )
- OutContour( *rNode.HasContour() );
-/*N*/
-/*N*/ CloseRec( SWG_OLENODE );
-/*N*/ aStat.nOLE++;
-/*N*/ }
-/*N*/ }
-
-
// Einlesen eines Text-Wiederholungs-Nodes
/*N*/ void Sw3IoImp::InRepTxtNode( SwNodeIndex& rPos )
@@ -2220,15 +2041,6 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 )
/*N*/ CloseRec( SWG_REPTEXTNODE );
/*N*/ }
/*N*/
-/*N*/
-/*N*/ // Ausgabe eines Text-Wiederholungs-Nodes
-/*N*/
-/*N*/ void Sw3IoImp::OutRepTxtNode( ULONG nRepetitions )
-/*N*/ {
-/*N*/ OpenRec( SWG_REPTEXTNODE );
-/*N*/ *pStrm << (UINT32)nRepetitions;
-/*N*/ CloseRec( SWG_REPTEXTNODE );
-/*N*/ }
// Der Image-Map-Record war frueher ein SWG_GRAPHIC_EXT-Record.
// Deshalb enthaelt er immer der URL fuer eine Server-seitige
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
index 2080830..691e916 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
@@ -734,39 +734,6 @@ void lcl_sw3io__copyNumRule( const SwNumRule& rSrc, SwNumRule& rDst )
/*N*/ CloseRec( SWG_NODENUM );
/*N*/ }
-// Absatz-Numerierung ausgeben (seit 5.0)
-
-/*N*/ void Sw3IoImp::OutNodeNum( const SwNodeNum& rNodeNum )
-/*N*/ {
-/*N*/ OpenRec( SWG_NODENUM );
-/*N*/
-/*N*/ BYTE nLevel = rNodeNum.GetLevel();
-/*N*/
-/*N*/ // 0x10: Start-Flag ist gesetzt.
-/*N*/ // 0x20: Start-Wert ist vorhanden.
-/*N*/ BYTE cFlags = rNodeNum.IsStart() ? 0x11 : 0x01;
-/*N*/ if( rNodeNum.GetSetValue() != USHRT_MAX )
-/*N*/ cFlags += 0x22;
-/*N*/
-/*N*/ *pStrm << (BYTE) cFlags
-/*N*/ << (BYTE) nLevel;
-/*N*/ if( (cFlags & 0x20) != 0 )
-/*N*/ *pStrm << (UINT16)rNodeNum.GetSetValue();
-/*N*/
-/*N*/ if( nLevel != NO_NUMBERING )
-/*N*/ {
-/*N*/ BYTE nRealLevel = GetRealLevel( nLevel );
-/*N*/ const USHORT *pLevelVal = rNodeNum.GetLevelVal();
-/*N*/ for( BYTE i=0; i<=nRealLevel; i++ )
-/*N*/ {
-/*N*/ *pStrm << (UINT16)pLevelVal[i];
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ CloseRec( SWG_NODENUM );
-/*N*/ }
-
-
// globale Fussnoten-Info einlesen
/*N*/ void Sw3IoImp::InEndNoteInfo( SwEndNoteInfo &rENInf )
diff --git a/binfilter/inc/bf_svx/xtxasit.hxx b/binfilter/inc/bf_svx/xtxasit.hxx
index 36fb8ec..f7b2eda 100644
--- a/binfilter/inc/bf_svx/xtxasit.hxx
+++ b/binfilter/inc/bf_svx/xtxasit.hxx
@@ -43,7 +43,6 @@ class XTextAttrSetItem : public SfxSetItem
public:
TYPEINFO();
XTextAttrSetItem(SfxItemSet* pItemSet );
- XTextAttrSetItem(SfxItemPool* pItemPool);
XTextAttrSetItem(const XTextAttrSetItem& rAttr);
XTextAttrSetItem(const XTextAttrSetItem& rAttr,
SfxItemPool* pItemPool);
diff --git a/binfilter/inc/bf_sw/authfld.hxx b/binfilter/inc/bf_sw/authfld.hxx
index b181767..c0498c7 100644
--- a/binfilter/inc/bf_sw/authfld.hxx
+++ b/binfilter/inc/bf_sw/authfld.hxx
@@ -182,9 +182,6 @@ public:
virtual BOOL PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMId );
long GetHandle() const { return nHandle; }
-
- //import interface
- USHORT GetHandlePosition() const;
};
// --- inlines -----------------------------------------------------------
More information about the Libreoffice-commits
mailing list