[Libreoffice-commits] .: 2 commits - binfilter/bf_basic binfilter/bf_sc binfilter/bf_sw binfilter/inc filter/source lotuswordpro/Library_lwpft.mk lotuswordpro/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Aug 5 02:04:26 PDT 2011
binfilter/bf_basic/source/basmgr/basmgr.cxx | 18 ---
binfilter/bf_sc/source/core/data/sc_column2.cxx | 36 ------
binfilter/bf_sc/source/core/tool/sc_rechead.cxx | 16 ---
binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 85 ----------------
binfilter/bf_sw/source/core/layout/layhelp.hxx | 1
binfilter/bf_sw/source/core/layout/sw_laycache.cxx | 68 ------------
binfilter/inc/bf_basic/basmgr.hxx | 1
binfilter/inc/bf_sc/column.hxx | 2
binfilter/inc/bf_sc/rechead.hxx | 3
binfilter/inc/bf_sw/doc.hxx | 6 -
filter/source/msfilter/msdffimp.cxx | 111 ---------------------
filter/source/msfilter/viscache.hxx | 2
lotuswordpro/Library_lwpft.mk | 1
lotuswordpro/source/filter/bencont.cxx | 65 ------------
lotuswordpro/source/filter/bento.hxx | 1
lotuswordpro/source/filter/lwpdefobj.cxx | 91 -----------------
lotuswordpro/source/filter/lwpdefobj.hxx | 84 ---------------
lotuswordpro/source/filter/lwpobjfactory.cxx | 2
18 files changed, 1 insertion(+), 592 deletions(-)
New commits:
commit e4df1fafdafe23f6c36ecd3993bb30e71948e6dc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 4 22:46:12 2011 +0100
fix up wrong .cxx
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index 82f6901..6ffc6a0 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -87,7 +87,6 @@ $(eval $(call gb_Library_add_exception_objects,lwpft,\
lotuswordpro/source/filter/lwpcharsetmgr \
lotuswordpro/source/filter/lwpcolor \
lotuswordpro/source/filter/lwpcontent \
- lotuswordpro/source/filter/lwpdefobj \
lotuswordpro/source/filter/lwpdivinfo \
lotuswordpro/source/filter/lwpdivopts \
lotuswordpro/source/filter/lwpdllist \
@@ -124,6 +123,7 @@ $(eval $(call gb_Library_add_exception_objects,lwpft,\
lotuswordpro/source/filter/lwpnumberingoverride \
lotuswordpro/source/filter/lwpnumericfmt \
lotuswordpro/source/filter/lwpobj \
+ lotuswordpro/source/filter/lwpobjfactory \
lotuswordpro/source/filter/lwpobjhdr \
lotuswordpro/source/filter/lwpobjid \
lotuswordpro/source/filter/lwpobjstrm \
diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx
index cf431d1..c826f68 100644
--- a/lotuswordpro/source/filter/lwpobjfactory.cxx
+++ b/lotuswordpro/source/filter/lwpobjfactory.cxx
@@ -69,7 +69,6 @@
#endif
#include "lwpdoc.hxx"
-#include "lwpdefobj.hxx"
#include "lwptemp.hxx"
#include "lwpstory.hxx"
#include "lwplayout.hxx"
commit 4ba93185b24687793e4ea2b4096be1d67df4aaf1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 4 22:42:14 2011 +0100
callcatcher: unused methods
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index 8a26d61..b7cfc6f 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -1649,24 +1649,6 @@ BasicLibInfo* BasicManager::FindLibInfo( StarBASIC* pBasic ) const
return 0;
}
-void BasicManager::SetFlagToAllLibs( short nFlag, BOOL bSet ) const
-{
- USHORT nLibs = GetLibCount();
- for ( USHORT nL = 0; nL < nLibs; nL++ )
- {
- BasicLibInfo* pInfo = pLibs->GetObject( nL );
- DBG_ASSERT( pInfo, "Info?!" );
- StarBASIC* pLib = pInfo->GetLib();
- if ( pLib )
- {
- if ( bSet )
- pLib->SetFlag( nFlag );
- else
- pLib->ResetFlag( nFlag );
- }
- }
-}
-
BOOL BasicManager::HasErrors()
{
DBG_CHKTHIS( BasicManager, 0 );
diff --git a/binfilter/bf_sc/source/core/data/sc_column2.cxx b/binfilter/bf_sc/source/core/data/sc_column2.cxx
index ce4a82b..3670da7 100644
--- a/binfilter/bf_sc/source/core/data/sc_column2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_column2.cxx
@@ -177,30 +177,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ BOOL lcl_RemoveAny( ScDocument* pDocument, USHORT nCol, USHORT nTab )
-/*N*/ {
-/*N*/ ScDBCollection* pDBColl = pDocument->GetDBCollection();
-/*N*/ if ( pDBColl )
-/*N*/ {
-/*N*/ USHORT nCount = pDBColl->GetCount();
-/*N*/ for (USHORT i=0; i<nCount; i++)
-/*N*/ {
-/*N*/ ScDBData* pData = (*pDBColl)[i];
-/*N*/ if ( pData->IsStripData() &&
-/*N*/ pData->HasImportParam() && !pData->HasImportSelection() )
-/*N*/ {
-/*?*/ ScRange aDBRange;
-/*?*/ pData->GetArea(aDBRange);
-/*?*/ if ( nTab == aDBRange.aStart.Tab() &&
-/*?*/ nCol >= aDBRange.aStart.Col() && nCol <= aDBRange.aEnd.Col() )
-/*?*/ return TRUE;
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ return FALSE;
-/*N*/ }
-
/*N*/ void ScColumn::LoadNotes( SvStream& rStream )
/*N*/ {
/*N*/ ScReadHeader aHdr(rStream);
@@ -221,18 +197,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ USHORT ScColumn::NoteCount( USHORT nMaxRow ) const
-/*N*/ {
-/*N*/ USHORT nNoteCount = 0;
-/*N*/ USHORT i;
-/*N*/
-/*N*/ for (i=0; i<nCount; i++)
-/*N*/ if ( pItems[i].pCell->GetNotePtr() && pItems[i].nRow<=nMaxRow )
-/*N*/ ++nNoteCount;
-/*N*/
-/*N*/ return nNoteCount;
-/*N*/ }
-
/*N*/ void ScColumn::CorrectSymbolCells( CharSet eStreamCharSet )
/*N*/ {
/*N*/ // #99139# find and correct string cells that are formatted with a symbol font,
diff --git a/binfilter/bf_sc/source/core/tool/sc_rechead.cxx b/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
index 114bd0c..014b2f5 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
@@ -212,22 +212,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void ScMultipleWriteHeader::EndEntry()
-/*N*/ {
-/*N*/ ULONG nPos = rStream.Tell();
-/*N*/ aMemStream << static_cast<sal_uInt32>(nPos - nEntryStart);
-/*N*/ }
-
-/*N*/ void ScMultipleWriteHeader::StartEntry()
-/*N*/ {
-/*N*/ ULONG nPos = rStream.Tell();
-/*N*/ nEntryStart = nPos;
-/*N*/ }
-
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
index 5d9411e..81e984a 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
@@ -1138,91 +1138,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ GetNewDBMgr()->SetInitDBFields( b );
/*N*/ }
-/*--------------------------------------------------------------------
- Beschreibung: Alle von Feldern verwendete Datenbanken herausfinden
- --------------------------------------------------------------------*/
-/*N*/ String lcl_DBDataToString(const SwDBData& rData)
-/*N*/ {
-/*N*/ String sRet = rData.sDataSource;
-/*N*/ sRet += DB_DELIM;
-/*N*/ sRet += (String)rData.sCommand;
-/*N*/ sRet += DB_DELIM;
-/*N*/ sRet += String::CreateFromInt32(rData.nCommandType);
-/*N*/ return sRet;
-/*N*/ }
-
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-/*N*/ void SwDoc::GetAllDBNames( SvStringsDtor& rAllDBNames )
-/*N*/ {
-/*N*/ SwNewDBMgr* pMgr = GetNewDBMgr();
-/*N*/
-/*N*/ const SwDSParamArr& rArr = pMgr->GetDSParamArray();
-/*N*/ for(USHORT i = 0; i < rArr.Count(); i++)
-/*N*/ {
-/*N*/ SwDSParam* pParam = rArr[i];
-/*N*/ String* pStr = new String( pParam->sDataSource );
-/*N*/ (*pStr) += DB_DELIM;
-/*N*/ (*pStr) += (String)pParam->sCommand;
-/*N*/ rAllDBNames.Insert( pStr, rAllDBNames.Count() );
-/*N*/ }
-/*N*/ }
-
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-/*N*/ SvStringsDtor& SwDoc::FindUsedDBs( const SvStringsDtor& rAllDBNames,
-/*N*/ const String& rFormel,
-/*N*/ SvStringsDtor& rUsedDBNames )
-/*N*/ {
-/*N*/ const CharClass& rCC = GetAppCharClass();
-/*N*/ String sFormel( rFormel);
-/*N*/ #ifndef UNX
-/*N*/ rCC.toUpper( sFormel );
-/*N*/ #endif
-/*N*/
-/*N*/ xub_StrLen nPos;
-/*N*/ for (USHORT i = 0; i < rAllDBNames.Count(); ++i )
-/*N*/ {
-/*N*/ const String* pStr = rAllDBNames.GetObject(i);
-/*N*/
-/*N*/ if( STRING_NOTFOUND != (nPos = sFormel.Search( *pStr )) &&
-/*N*/ sFormel.GetChar( nPos + pStr->Len() ) == '.' &&
-/*N*/ (!nPos || !rCC.isLetterNumeric( sFormel, nPos - 1 )))
-/*N*/ {
-/*N*/ // Tabellenname suchen
-/*?*/ xub_StrLen nEndPos;
-/*?*/ nPos += pStr->Len() + 1;
-/*?*/ if( STRING_NOTFOUND != (nEndPos = sFormel.Search('.', nPos)) )
-/*?*/ {
-/*?*/ String* pDBNm = new String( *pStr );
-/*?*/ pDBNm->Append( DB_DELIM );
-/*?*/ pDBNm->Append( sFormel.Copy( nPos, nEndPos - nPos ));
-/*?*/ rUsedDBNames.Insert( pDBNm, rUsedDBNames.Count() );
-/*?*/ }
-/*?*/ }
-/*N*/ }
-/*N*/ return rUsedDBNames;
-/*N*/ }
-
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-/*N*/ void SwDoc::AddUsedDBToList( SvStringsDtor& rDBNameList,
-/*N*/ const SvStringsDtor& rUsedDBNames )
-/*N*/ {
-/*N*/ for (USHORT i = 0; i < rUsedDBNames.Count(); i++)
-/*?*/ AddUsedDBToList( rDBNameList, *rUsedDBNames.GetObject(i) );
-/*N*/ }
-
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
/*N*/ void SwDoc::AddUsedDBToList( SvStringsDtor& rDBNameList, const String& rDBName)
/*N*/ {
/*N*/ if( !rDBName.Len() )
diff --git a/binfilter/bf_sw/source/core/layout/layhelp.hxx b/binfilter/bf_sw/source/core/layout/layhelp.hxx
index ca60afb..e1a35da 100644
--- a/binfilter/bf_sw/source/core/layout/layhelp.hxx
+++ b/binfilter/bf_sw/source/core/layout/layhelp.hxx
@@ -79,7 +79,6 @@ class SwLayCacheImpl : public SvULongs
public:
SwLayCacheImpl() : SvULongs( 20, 10 ), aOffset( 20, 10 ), aType( 20, 10 ) {}
- BOOL Read( SvStream& rStream );
ULONG GetBreakIndex( USHORT nIdx ) const { return GetObject( nIdx ); }
xub_StrLen GetBreakOfst( USHORT nIdx ) const { return aOffset[ nIdx ]; }
diff --git a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
index dbfc802..966d7d7 100644
--- a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
@@ -72,73 +72,6 @@ namespace binfilter {
/*N*/ aOffset.Insert( nOffset, aOffset.Count() );
/*N*/ }
-/*N*/ BOOL SwLayCacheImpl::Read( SvStream& rStream )
-/*N*/ {
-/*N*/ SwLayCacheIoImpl aIo( rStream, FALSE );
-/*N*/ if( aIo.GetMajorVersion() > SW_LAYCACHE_IO_VERSION_MAJOR )
-/*?*/ return FALSE;
-/*N*/
-/*N*/ // Due to an evil bug in the layout cache (#102759#), we cannot trust the
-/*N*/ // sizes of fly frames which have been written using the "old" layout cache.
-/*N*/ // This flag should indicate that we do not want to trust the width and
-/*N*/ // height of fly frames
-/*N*/ bUseFlyCache = aIo.GetMinorVersion() >= 1;
-/*N*/
-/*N*/ BYTE cFlags;
-/*N*/ UINT32 nIndex, nOffset;
-/*N*/
-/*N*/ aIo.OpenRec( SW_LAYCACHE_IO_REC_PAGES );
-/*N*/ aIo.OpenFlagRec();
-/*N*/ aIo.CloseFlagRec();
-/*N*/ while( aIo.BytesLeft() && !aIo.HasError() )
-/*N*/ {
-/*N*/ switch( aIo.Peek() )
-/*N*/ {
-/*N*/ case SW_LAYCACHE_IO_REC_PARA:
-/*N*/ aIo.OpenRec( SW_LAYCACHE_IO_REC_PARA );
-/*N*/ cFlags = aIo.OpenFlagRec();
-/*N*/ aIo.GetStream() >> nIndex;
-/*N*/ if( (cFlags & 0x01) != 0 )
-/*N*/ aIo.GetStream() >> nOffset;
-/*N*/ else
-/*N*/ nOffset = STRING_LEN;
-/*N*/ aIo.CloseFlagRec();
-/*N*/ Insert( SW_LAYCACHE_IO_REC_PARA, nIndex, (xub_StrLen)nOffset );
-/*N*/ aIo.CloseRec( SW_LAYCACHE_IO_REC_PARA );
-/*N*/ break;
-/*N*/ case SW_LAYCACHE_IO_REC_TABLE:
-/*?*/ aIo.OpenRec( SW_LAYCACHE_IO_REC_TABLE );
-/*?*/ aIo.OpenFlagRec();
-/*?*/ aIo.GetStream() >> nIndex
-/*?*/ >> nOffset;
-/*?*/ Insert( SW_LAYCACHE_IO_REC_TABLE, nIndex, (xub_StrLen)nOffset );
-/*?*/ aIo.CloseFlagRec();
-/*?*/ aIo.CloseRec( SW_LAYCACHE_IO_REC_TABLE );
-/*?*/ break;
-/*N*/ case SW_LAYCACHE_IO_REC_FLY:
-/*N*/ {
-/*N*/ aIo.OpenRec( SW_LAYCACHE_IO_REC_FLY );
-/*N*/ aIo.OpenFlagRec();
-/*N*/ aIo.CloseFlagRec();
-/*N*/ long nX, nY, nW, nH;
-/*N*/ USHORT nPgNum;
-/*N*/ aIo.GetStream() >> nPgNum >> nIndex
-/*N*/ >> nX >> nY >> nW >> nH;
-/*N*/ SwFlyCache* pFly = new SwFlyCache( nPgNum, nIndex, nX, nY, nW, nH );
-/*N*/ aFlyCache.Insert( pFly, aFlyCache.Count() );
-/*N*/ aIo.CloseRec( SW_LAYCACHE_IO_REC_FLY );
-/*N*/ break;
-/*N*/ }
-/*N*/ default:
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/ aIo.CloseRec( SW_LAYCACHE_IO_REC_PAGES );
-/*N*/
-/*N*/ return !aIo.HasError();
-/*N*/ }
-
/*N*/ void SwLayoutCache::ClearImpl()
/*N*/ {
/*N*/ if( !IsLocked() )
@@ -148,7 +81,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-
/*N*/ SwLayoutCache::~SwLayoutCache()
/*N*/ {
/*N*/ OSL_ENSURE( !nLockCount, "Deleting a locked SwLayoutCache!?" );
diff --git a/binfilter/inc/bf_basic/basmgr.hxx b/binfilter/inc/bf_basic/basmgr.hxx
index cf9b482..2cacefa 100644
--- a/binfilter/inc/bf_basic/basmgr.hxx
+++ b/binfilter/inc/bf_basic/basmgr.hxx
@@ -163,7 +163,6 @@ protected:
BOOL ImplEncryptStream( SvStream& rStream ) const;
BasicLibInfo* FindLibInfo( StarBASIC* pBasic ) const;
void CheckModules( StarBASIC* pBasic, BOOL bReference ) const;
- void SetFlagToAllLibs( short nFlag, BOOL bSet ) const;
~BasicManager();
public:
diff --git a/binfilter/inc/bf_sc/column.hxx b/binfilter/inc/bf_sc/column.hxx
index 1288fa9..e173a11 100644
--- a/binfilter/inc/bf_sc/column.hxx
+++ b/binfilter/inc/bf_sc/column.hxx
@@ -287,8 +287,6 @@ public:
- USHORT NoteCount( USHORT nMaxRow = MAXROW ) const;
-
void LoadData( SvStream& rStream );
void LoadNotes( SvStream& rStream );
diff --git a/binfilter/inc/bf_sc/rechead.hxx b/binfilter/inc/bf_sc/rechead.hxx
index 3226c7a..2a1bde2 100644
--- a/binfilter/inc/bf_sc/rechead.hxx
+++ b/binfilter/inc/bf_sc/rechead.hxx
@@ -191,9 +191,6 @@ private:
public:
ScMultipleWriteHeader(SvStream& rNewStream, sal_uInt32 nDefault = 0);
~ScMultipleWriteHeader();
-
- void StartEntry();
- void EndEntry();
};
} //namespace binfilter
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index aecadc4..939ced5 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -454,13 +454,7 @@ class SwDoc
void _MakeFldList( int eMode );
// Datenbankfelder:
void UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc );
- void AddUsedDBToList( SvStringsDtor& rDBNameList,
- const SvStringsDtor& rUsedDBNames );
void AddUsedDBToList( SvStringsDtor& rDBNameList, const String& rDBName );
- void GetAllDBNames( SvStringsDtor& rAllDBNames );
- SvStringsDtor& FindUsedDBs( const SvStringsDtor& rAllDBNames,
- const String& rFormel,
- SvStringsDtor& rUsedDBNames );
void InitDrawModel();
void ReleaseDrawModel();
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 7d6e923..22eb41f 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -158,117 +158,6 @@ using namespace container ;
static sal_uInt32 nMSOleObjCntr = 0;
#define MSO_OLE_Obj "MSO_OLE_Obj"
-
-/*************************************************************************/
-sal_Bool Impl_OlePres::Read( SvStream & rStm )
-{
- sal_uLong nBeginPos = rStm.Tell();
- sal_Int32 n;
- rStm >> n;
- if( n != -1 )
- {
- pBmp = new Bitmap;
- rStm >> *pBmp;
- if( rStm.GetError() == SVSTREAM_OK )
- {
- nFormat = FORMAT_BITMAP;
- aSize = pBmp->GetPrefSize();
- MapMode aMMSrc;
- if( !aSize.Width() || !aSize.Height() )
- {
- // letzte Chance
- aSize = pBmp->GetSizePixel();
- aMMSrc = MAP_PIXEL;
- }
- else
- aMMSrc = pBmp->GetPrefMapMode();
- MapMode aMMDst( MAP_100TH_MM );
- aSize = OutputDevice::LogicToLogic( aSize, aMMSrc, aMMDst );
- return sal_True;
- }
- else
- {
- delete pBmp;
- pBmp = NULL;
-
- pMtf = new GDIMetaFile();
- rStm.ResetError();
- rStm >> *pMtf;
- if( rStm.GetError() == SVSTREAM_OK )
- {
- nFormat = FORMAT_GDIMETAFILE;
- aSize = pMtf->GetPrefSize();
- MapMode aMMSrc = pMtf->GetPrefMapMode();
- MapMode aMMDst( MAP_100TH_MM );
- aSize = OutputDevice::LogicToLogic( aSize, aMMSrc, aMMDst );
- return sal_True;
- }
- else
- {
- delete pMtf;
- pMtf = NULL;
- }
- }
-
- }
-
- rStm.ResetError();
- if (nBeginPos != rStm.Seek(nBeginPos))
- return sal_False;
-
- nFormat = ReadClipboardFormat( rStm );
- // JobSetup, bzw. TargetDevice ueberlesen
- // Information aufnehmen, um sie beim Schreiben nicht zu verlieren
- nJobLen = 0;
- rStm >> nJobLen;
- if( nJobLen >= 4 )
- {
- nJobLen -= 4;
- if( nJobLen )
- {
- pJob = new sal_uInt8[ nJobLen ];
- rStm.Read( pJob, nJobLen );
- }
- }
- else
- {
- rStm.SetError( SVSTREAM_GENERALERROR );
- return sal_False;
- }
- sal_uInt32 nAsp(0);
- rStm >> nAsp;
- sal_uInt16 nSvAsp = sal_uInt16( nAsp );
- SetAspect( nSvAsp );
- rStm.SeekRel( 4 ); //L-Index ueberlesen
- rStm >> nAdvFlags;
- rStm.SeekRel( 4 ); //Compression
- sal_uInt32 nWidth = 0;
- sal_uInt32 nHeight = 0;
- sal_uInt32 nSize = 0;
- rStm >> nWidth >> nHeight >> nSize;
- aSize.Width() = nWidth;
- aSize.Height() = nHeight;
-
- if( nFormat == FORMAT_GDIMETAFILE )
- {
- pMtf = new GDIMetaFile();
- ReadWindowMetafile( rStm, *pMtf, NULL );
- }
- else if( nFormat == FORMAT_BITMAP )
- {
- pBmp = new Bitmap();
- rStm >> *pBmp;
- }
- else
- {
- sal_uInt8 * p = new sal_uInt8[ nSize ];
- rStm.Read( p, nSize );
- delete [] p;
- return sal_False;
- }
- return sal_True;
-}
-
/************************************************************************/
void Impl_OlePres::Write( SvStream & rStm )
{
diff --git a/filter/source/msfilter/viscache.hxx b/filter/source/msfilter/viscache.hxx
index 686926e..4ca5b1e 100644
--- a/filter/source/msfilter/viscache.hxx
+++ b/filter/source/msfilter/viscache.hxx
@@ -69,8 +69,6 @@ public:
sal_uLong GetAdviseFlags() const { return nAdvFlags; }
void SetAdviseFlags( sal_uLong nAdv ) { nAdvFlags = nAdv; }
void SetSize( const Size & rSize ) { aSize = rSize; }
- /// return sal_False => unknown format
- sal_Bool Read( SvStream & rStm );
void Write( SvStream & rStm );
};
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index ca02b40..82f6901 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -124,7 +124,6 @@ $(eval $(call gb_Library_add_exception_objects,lwpft,\
lotuswordpro/source/filter/lwpnumberingoverride \
lotuswordpro/source/filter/lwpnumericfmt \
lotuswordpro/source/filter/lwpobj \
- lotuswordpro/source/filter/lwpobjfactory \
lotuswordpro/source/filter/lwpobjhdr \
lotuswordpro/source/filter/lwpobjid \
lotuswordpro/source/filter/lwpobjstrm \
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx
index 4d19731..55a2611 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -538,72 +538,9 @@ BenError LtcBenContainer::CreateGraphicStream(SvStream * &pStream, const char *p
pStream = pMemStream;
return BenErr_OK;
}
-/**
-* Find ole object stream according to object name
-* @date 10/24/2005
-* @param
-* @return the value ole storage stream pointers
-*/
+
#include <tools/globname.hxx>
-SotStorageStreamRef LtcBenContainer::ConvertAswStorageToOLE2Stream(const char * sObjectName)
-{
- SotStorageStreamRef xOleObjStm;
-
- SvStream* pOleStorageStream = NULL;
- //Get Ole Storage stream
- AswEntry aEntry;
- pOleStorageStream = FindOLEStorageStreamWithObjectName(sObjectName, aEntry);
-
- if( !pOleStorageStream )
- return xOleObjStm;
- //Find it, create Ole stream
- //xOleObjStm = new SotStorageStream(String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Ole-Object" ) ));
- xOleObjStm = new SotStorageStream(String());
- if( xOleObjStm->GetError() )
- return xOleObjStm;
- xOleObjStm->SetBufferSize( 0xff00 );
-
- SotStorageRef xOleObjStor = new SotStorage( *xOleObjStm );
- if( xOleObjStor->GetError() )
- return xOleObjStm;
- //Set class id
- ClsId aClsId = aEntry.GetClassId();
- SvGlobalName aGName( aClsId.n1, aClsId.n2, aClsId.n3, aClsId.n4,
- aClsId.n5, aClsId.n6,aClsId.n7,aClsId.n8,
- aClsId.n9,aClsId.n10,aClsId.n11);
- xOleObjStor->SetClass( aGName, 0, String());
-
- xOleObjStor->SetVersion( SOFFICE_FILEFORMAT_60 );
- std::string aOleStreamName("OleStream");
- sal_uInt32 nDLen = 0;
- nDLen = GetSvStreamSize(pOleStorageStream);
- for(sal_uInt32 nIndex = 0; nIndex < nDLen / ASWENTRY_SIZE; nIndex ++)
- {
- AswEntry aOleEntry;
- ReadAswEntry(pOleStorageStream, aOleEntry);
- if(aOleEntry.GetType()== BEN_STGTY_STREAM)
- {
- SvStream* pOleStream = FindObjectValueStreamWithObjectIDAndProperty(aOleEntry.GetObjectID(), aOleStreamName.c_str());
- if(pOleStream)
- {
- String strName;
- aOleEntry.GetName(strName);
- SotStorageStreamRef xStm = xOleObjStor->OpenSotStream( strName );
- if( xStm->GetError() )
- break;
- xStm->SetBufferSize( 8192 );
- (*pOleStream) >> (*xStm);
- xStm->Commit();
- delete pOleStream;
- pOleStream = NULL;
- }
- }
- }
- xOleObjStor->Commit();
- xOleObjStm->Commit();
- return xOleObjStm;
-}
/**
* Find ole object storage stream data according to object name
* @date 10/24/2005
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index 5c769ea..eb63a84 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -299,7 +299,6 @@ public: // Internal methods
BenError CreateGraphicStreams(std::vector<SvStream *> * pStreamVector) ;
BenError CreateGraphicStream(SvStream * &pStream, const char *pObjectName);
- SotStorageStreamRef ConvertAswStorageToOLE2Stream(const char * sObjectName);
LtcUtBenValueStream * FindOLEStorageStreamWithObjectName(const char * sObjectName, AswEntry& rDirStruct);
void ReadAswEntry(SvStream * pStream, AswEntry& rEntry);
diff --git a/lotuswordpro/source/filter/lwpdefobj.cxx b/lotuswordpro/source/filter/lwpdefobj.cxx
deleted file mode 100644
index 4d2ddee..0000000
--- a/lotuswordpro/source/filter/lwpdefobj.cxx
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: IBM Corporation
- *
- * Copyright: 2008 by IBM Corporation
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-/*************************************************************************
- * @file
- * For LWP filter architecture prototype
- ************************************************************************/
-/*************************************************************************
- * Change History
- Jan 2005 Created
- ************************************************************************/
-
-#include "lwpdefobj.hxx"
-
-LwpDefaultObject::LwpDefaultObject(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
- :LwpObject(objHdr, pStrm),m_DataBuffer(NULL)
-{}
-
-LwpDefaultObject::~LwpDefaultObject()
-{
- if(m_DataBuffer)
- {
- delete [] m_DataBuffer;
- m_DataBuffer = NULL;
- }
-}
-
-void LwpDefaultObject::Read()
-{
- if(m_DataBuffer)
- {
- delete [] m_DataBuffer;
- m_DataBuffer = NULL;
- }
- m_DataBuffer = new sal_uInt8[m_ObjHdr.GetSize()];
- m_pObjStrm->QuickRead(m_DataBuffer, m_ObjHdr.GetSize());
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpdefobj.hxx b/lotuswordpro/source/filter/lwpdefobj.hxx
deleted file mode 100644
index b821752..0000000
--- a/lotuswordpro/source/filter/lwpdefobj.hxx
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: IBM Corporation
- *
- * Copyright: 2008 by IBM Corporation
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-/*************************************************************************
- * @file
- * For LWP filter architecture prototype
- ************************************************************************/
-/*************************************************************************
- * Change History
- Jan 2005 Created
- ************************************************************************/
-
-#ifndef LWPDEFAULTOBJECT_HXX_
-#define LWPDEFAULTOBJECT_HXX_
-
-#include "lwpobj.hxx"
-#include "lwpheader.hxx"
-
-class LwpDefaultObject : public LwpObject
-{
-public:
- LwpDefaultObject(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
- ~LwpDefaultObject();
-private:
- sal_uInt8 *m_DataBuffer;
-public:
- //inline sal_uInt8* GetBuffer(){return m_DataBuffer;}
- void Read();
-};
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx
index 2043c31..cf431d1 100644
--- a/lotuswordpro/source/filter/lwpobjfactory.cxx
+++ b/lotuswordpro/source/filter/lwpobjfactory.cxx
@@ -690,7 +690,6 @@ LwpObject* LwpObjectFactory::CreateObject(sal_uInt32 type, LwpObjectHeader &objH
//Unknown object type
assert(false);
newObj = NULL;
- //newObj = new LwpDefaultObject(objHdr, m_pSvStream);
break;
}
}
More information about the Libreoffice-commits
mailing list