[Libreoffice-commits] .: 6 commits - binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_svtools binfilter/bf_sw binfilter/inc filter/inc filter/source lotuswordpro/qa lotuswordpro/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jul 18 04:25:51 PDT 2011
binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx | 36 ----
binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx | 5
binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx | 124 ---------------
binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx | 89 ----------
binfilter/bf_sfx2/source/inc/cfgmgr.hxx | 2
binfilter/bf_so3/source/inplace/ipenv.cxx | 32 ---
binfilter/bf_svtools/source/items1/svt_poolio.cxx | 146 ------------------
binfilter/bf_svtools/source/items1/svt_poolitem.cxx | 8
binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx | 6
binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx | 18 --
binfilter/bf_sw/source/filter/xml/xmlexp.hxx | 2
binfilter/bf_sw/source/filter/xml/xmlimp.hxx | 4
binfilter/inc/bf_sfx2/objsh.hxx | 4
binfilter/inc/bf_so3/ipenv.hxx | 2
binfilter/inc/bf_svtools/httpcook.hxx | 162 --------------------
binfilter/inc/bf_svtools/itempool.hxx | 7
binfilter/inc/bf_svtools/poolitem.hxx | 11 -
filter/inc/filter/msfilter/msdffimp.hxx | 4
filter/source/graphicfilter/epbm/epbm.cxx | 9 -
filter/source/graphicfilter/eps/eps.cxx | 12 -
filter/source/graphicfilter/expm/expm.cxx | 9 -
filter/source/msfilter/msdffimp.cxx | 19 --
filter/source/svg/svgdialog.cxx | 6
lotuswordpro/qa/cppunit/test_lotuswordpro.cxx | 4
lotuswordpro/source/filter/xfilter/xffilestream.cxx | 9 -
lotuswordpro/source/filter/xfilter/xfutil.cxx | 5
lotuswordpro/source/filter/xfilter/xfutil.hxx | 2
27 files changed, 24 insertions(+), 713 deletions(-)
New commits:
commit 34b1c0659dbc81daaf39e9c6e4e57b020a953318
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 18 01:14:54 2011 +0100
ByteString::CreateFromInt32->rtl::OString::valueOf and simplify
diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx
index 5f3eca3..3ef0d94 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -188,13 +188,10 @@ void PBMWriter::ImplWriteBody()
// ------------------------------------------------------------------------
// eine Dezimalzahl im ASCII format wird in den Stream geschrieben
-void PBMWriter::ImplWriteNumber( sal_Int32 nNumber )
+void PBMWriter::ImplWriteNumber(sal_Int32 nNumber)
{
- const ByteString aNum( ByteString::CreateFromInt32( nNumber ) );
-
- for( sal_Int16 n = 0, nLen = aNum.Len(); n < nLen; n++ )
- m_rOStm << aNum.GetChar( n );
-
+ const rtl::OString aNum(rtl::OString::valueOf(nNumber));
+ m_rOStm << aNum.getStr();
}
// ------------------------------------------------------------------------
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 8ff0ca7..e10b09b 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -2454,14 +2454,12 @@ void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo )
//---------------------------------------------------------------------------------
-void PSWriter::ImplWriteLong( sal_Int32 nNumber, sal_uLong nMode )
+void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode)
{
- const ByteString aNumber( ByteString::CreateFromInt32( nNumber ) );
- sal_uLong nLen = aNumber.Len();
- mnCursorPos += nLen;
- for ( sal_uInt16 n = 0; n < nLen; n++ )
- *mpPS << aNumber.GetChar( n );
- ImplExecMode( nMode );
+ const rtl::OString aNumber(rtl::OString::valueOf(nNumber));
+ mnCursorPos += aNumber.getLength();
+ *mpPS << aNumber.getStr();
+ ImplExecMode(nMode);
}
//---------------------------------------------------------------------------------
diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx
index 856dfcc..c962cee 100644
--- a/filter/source/graphicfilter/expm/expm.cxx
+++ b/filter/source/graphicfilter/expm/expm.cxx
@@ -215,13 +215,10 @@ void XPMWriter::ImplWriteBody()
// ------------------------------------------------------------------------
// eine Dezimalzahl im ASCII format wird in den Stream geschrieben
-void XPMWriter::ImplWriteNumber( sal_Int32 nNumber )
+void XPMWriter::ImplWriteNumber(sal_Int32 nNumber)
{
- const ByteString aNum( ByteString::CreateFromInt32( nNumber ) );
-
- for( sal_Int16 n = 0UL, nLen = aNum.Len(); n < nLen; ++n )
- m_rOStm << aNum.GetChar( n );
-
+ const rtl::OString aNum(rtl::OString::valueOf(nNumber));
+ m_rOStm << aNum.getStr();
}
// ------------------------------------------------------------------------
commit b81e5396ba29b7dc714564aa782cee768a821671
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 17 23:35:09 2011 +0100
not going to get re-enabled, is it
diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx
index eda20bd..66892c8 100644
--- a/filter/source/svg/svgdialog.cxx
+++ b/filter/source/svg/svgdialog.cxx
@@ -112,12 +112,6 @@ Reference< XInterface > SAL_CALL SVGDialog_createInstance( const Reference< XMul
SVGDialog::SVGDialog( const Reference< XMultiServiceFactory > &rxMSF ) :
OGenericUnoDialog( rxMSF )
{
- ByteString aResMgrName( "svgfilter" );
-
- aResMgrName.Append( ByteString::CreateFromInt32( 0/*SOLARUPD*/ ) );
-
- // !!! KA: enable ResMgr
- // mapResMgr.reset( ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() ) );
}
// -----------------------------------------------------------------------------
commit 9d24263957ba12bcc3ff3dedb7c8f99402b1d9ba
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 17 21:49:51 2011 +0100
overlong lines
diff --git a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
index 2766253..cb7075c 100644
--- a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
+++ b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
@@ -70,7 +70,9 @@ namespace
int m_nLoadedDocs;
};
- LotusWordProTest::LotusWordProTest() : m_aSrcRoot( RTL_CONSTASCII_USTRINGPARAM( "file://" ) ), m_nLoadedDocs(0)
+ LotusWordProTest::LotusWordProTest()
+ : m_aSrcRoot(RTL_CONSTASCII_USTRINGPARAM("file://" ))
+ , m_nLoadedDocs(0)
{
m_xContext = cppu::defaultBootstrap_InitialComponentContext();
m_xFactory = m_xContext->getServiceManager();
commit 03e489ea4951fa6c551a8b82a59cf66d094b2fe4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jul 16 22:17:27 2011 +0100
these can be sal_uInt32, and pre-sanity-check massive allocs
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index 2588018..e51791e 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -542,9 +542,9 @@ protected :
/*
folgende Methoden sind zum Excel-Import zu ueberschreiben:
*/
- virtual sal_Bool ProcessClientAnchor(SvStream& rStData, sal_uLong nDatLen, char*& rpBuff, sal_uInt32& rBuffLen ) const;
+ virtual sal_Bool ProcessClientAnchor(SvStream& rStData, sal_uInt32 nDatLen, char*& rpBuff, sal_uInt32& rBuffLen ) const;
virtual void ProcessClientAnchor2( SvStream& rStData, DffRecordHeader& rHd, void* pData, DffObjData& );
- virtual sal_Bool ProcessClientData( SvStream& rStData, sal_uLong nDatLen, char*& rpBuff, sal_uInt32& rBuffLen ) const;
+ virtual sal_Bool ProcessClientData( SvStream& rStData, sal_uInt32 nDatLen, char*& rpBuff, sal_uInt32& rBuffLen ) const;
virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj = NULL);
virtual sal_uLong Calc_nBLIPPos( sal_uLong nOrgVal, sal_uLong nStreamPos ) const;
virtual bool GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const;
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 62a7c76..1f01f10 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6968,29 +6968,26 @@ sal_Bool SvxMSDffManager::ReadCommonRecordHeader( SvStream& rSt,
return rSt.GetError() == 0;
}
-
-
-
-sal_Bool SvxMSDffManager::ProcessClientAnchor(SvStream& rStData, sal_uLong nDatLen,
+sal_Bool SvxMSDffManager::ProcessClientAnchor(SvStream& rStData, sal_uInt32 nDatLen,
char*& rpBuff, sal_uInt32& rBuffLen ) const
{
if( nDatLen )
{
- rpBuff = new char[ nDatLen ];
- rBuffLen = nDatLen;
- rStData.Read( rpBuff, nDatLen );
+ rBuffLen = std::min(rStData.remainingSize(), static_cast<sal_Size>(nDatLen));
+ rpBuff = new char[rBuffLen];
+ rBuffLen = rStData.Read(rpBuff, rBuffLen);
}
return sal_True;
}
-sal_Bool SvxMSDffManager::ProcessClientData(SvStream& rStData, sal_uLong nDatLen,
+sal_Bool SvxMSDffManager::ProcessClientData(SvStream& rStData, sal_uInt32 nDatLen,
char*& rpBuff, sal_uInt32& rBuffLen ) const
{
if( nDatLen )
{
- rpBuff = new char[ nDatLen ];
- rBuffLen = nDatLen;
- rStData.Read( rpBuff, nDatLen );
+ rBuffLen = std::min(rStData.remainingSize(), static_cast<sal_Size>(nDatLen));
+ rpBuff = new char[rBuffLen];
+ rBuffLen = rStData.Read(rpBuff, rBuffLen);
}
return sal_True;
}
commit eb71fecb9901563a488bef62301000e88c6e18c9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 15 22:19:11 2011 +0100
callcatcher: unused methods
diff --git a/binfilter/bf_svtools/source/items1/svt_poolio.cxx b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
index 228d7e2..794ac61 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolio.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
@@ -821,10 +821,6 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
in diesem SfxItemPool
- 'rWhichId' enth"alt die ggf. gemappte Which-Id
Laufzeit: Tiefe des Ziel Sekund"arpools * 10 + 10
-
- [Querverweise]
-
- <SfxItemPool::StoreSurrogate(SvStream&,const SfxPoolItem &)const>
*/
{
@@ -907,48 +903,6 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
return 0;
}
-//-------------------------------------------------------------------------
-
-
-bool SfxItemPool::StoreSurrogate
-(
- SvStream& rStream,
- const SfxPoolItem* pItem
-) const
-
-/* [Beschreibung]
-
- Speichert ein Surrogat f"ur '*pItem' in 'rStream'.
-
-
- [R"uckgabewert]
-
- bool TRUE
- es wurde ein echtes Surrogat gespeichert, auch
- SFX_ITEMS_NULL bei 'pItem==0',
- SFX_ITEMS_STATICDEFAULT und SFX_ITEMS_POOLDEFAULT
- gelten als 'echte' Surrogate
-
- FALSE
- es wurde ein Dummy-Surrogat (SFX_ITEMS_DIRECT)
- gespeichert, das eigentliche Item mu\s direkt
- hinterher selbst gespeichert werden
-*/
-
-{
- if ( pItem )
- {
- bool bRealSurrogate = IsItemFlag(*pItem, SFX_ITEM_POOLABLE);
- rStream << ( bRealSurrogate
- ? GetSurrogate( pItem )
- : (UINT16) SFX_ITEMS_DIRECT );
- return bRealSurrogate;
- }
-
- rStream << (UINT16) SFX_ITEMS_NULL;
- return TRUE;
-}
-
// -----------------------------------------------------------------------
USHORT SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const
@@ -984,14 +938,6 @@ USHORT SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const
// -----------------------------------------------------------------------
-bool SfxItemPool::IsInStoringRange( USHORT nWhich ) const
-{
- return nWhich >= pImp->nStoringStart &&
- nWhich <= pImp->nStoringEnd;
-}
-
-// -----------------------------------------------------------------------
-
void SfxItemPool::SetVersionMap
(
USHORT nVer, /* neue Versionsnummer */
diff --git a/binfilter/inc/bf_svtools/itempool.hxx b/binfilter/inc/bf_svtools/itempool.hxx
index 15d73b2..ce0df76 100644
--- a/binfilter/inc/bf_svtools/itempool.hxx
+++ b/binfilter/inc/bf_svtools/itempool.hxx
@@ -195,8 +195,6 @@ public:
const SfxPoolItem* LoadSurrogate(SvStream& rStream,
USHORT &rWhich, USHORT nSlotId,
const SfxItemPool* pRefPool = 0 );
- bool StoreSurrogate(SvStream& rStream,
- const SfxPoolItem *pItem ) const;
virtual SvStream & Load(SvStream &);
virtual SvStream & Store(SvStream &rStream) const { return rStream; }
@@ -210,7 +208,6 @@ public:
return nWhich >= nStart &&
nWhich <= nEnd; }
bool IsInVersionsRange( USHORT nWhich ) const;
- bool IsInStoringRange( USHORT nWhich ) const;
void SetSecondaryPool( SfxItemPool *pPool );
SfxItemPool* GetSecondaryPool() const {
return pSecondary; }
commit fb94c7e9a514e48fce3d8a348db269b0ba56b3ec
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 14 22:06:04 2011 +0100
callcatcher: remove unused methods
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
index 604e49c..2c64c2e 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
@@ -1274,48 +1274,12 @@ struct ImplRenderPaintProc
const SdrLayerAdmin& rLayerAdmin;
SdrPageView* pSdrPageView;
- sal_Bool IsVisible ( const SdrObject* pObj ) const;
- sal_Bool IsPrintable( const SdrObject* pObj ) const;
-
ImplRenderPaintProc( const SdrLayerAdmin& rLA, SdrPageView* pView ) :
rLayerAdmin ( rLA ),
pSdrPageView ( pView )
{}
};
-sal_Bool ImplRenderPaintProc::IsVisible( const SdrObject* pObj ) const
-{
- sal_Bool bVisible = sal_True;
- SdrLayerID nLayerId = pObj->GetLayer();
- if( pSdrPageView )
- {
- const SdrLayer* pSdrLayer = rLayerAdmin.GetLayer( nLayerId );
- if ( pSdrLayer )
- {
- String aLayerName = pSdrLayer->GetName();
- bVisible = pSdrPageView->IsLayerVisible( aLayerName );
- }
- }
- return bVisible;
-}
-
-sal_Bool ImplRenderPaintProc::IsPrintable( const SdrObject* pObj ) const
-{
- sal_Bool bPrintable = sal_True;
- SdrLayerID nLayerId = pObj->GetLayer();
- if( pSdrPageView )
- {
- const SdrLayer* pSdrLayer = rLayerAdmin.GetLayer( nLayerId );
- if ( pSdrLayer )
- {
- String aLayerName = pSdrLayer->GetName();
- bPrintable = pSdrPageView->IsLayerPrintable( aLayerName );
- }
- }
- return bPrintable;
-
-}
-
void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& /*rSelection*/,
const uno::Sequence< beans::PropertyValue >& rxOptions )
throw (lang::IllegalArgumentException, uno::RuntimeException)
diff --git a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
index bf597c1..67b1bc0 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
@@ -154,11 +154,6 @@ static const char pStorageName[] = "Configurations";
// ------------------------------------------------------------------------
-/*?*/ SotStorage* SfxConfigManager::GetConfigurationStorage( SotStorage* pDocStor )
-/*?*/ {
-/*?*/ return pDocStor->OpenSotStorage( String::CreateFromAscii(pStorageName), STREAM_STD_READWRITE );
-/*?*/ }
-
/*?*/ void SfxConfigManager::SetModified(BOOL /*bMod*/)
/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
index c8be253..7ca0679 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
@@ -147,130 +147,6 @@ using namespace ::com::sun::star::uno;
/*N*/ }
/*N*/ }
-// -----------------------------------------------------------------------
-
-/*N*/ BOOL SfxObjectShell::SaveInfoAndConfig_Impl( SvStorageRef pNewStg )
-/*N*/ {
-/*N*/ //Demnaechst mal gemeinsame Teile zusammenfassen
-/*N*/ UpdateDocInfoForSave();
-/*N*/
-/*N*/ #if !defined( SFX_KEY_MAXPREVIEWSIZE ) && defined( TFPLUGCOMM )
-/*N*/ #define SFX_KEY_MAXPREVIEWSIZE SFX_KEY_ISFREE
-/*N*/ #endif
-/*N*/
-/*N*/ #ifdef MI_doch_wieder_die_alte_preview
-/*N*/ String aMaxSize = SFX_INIMANAGER()->Get( SFX_KEY_MAXPREVIEWSIZE );
-/*N*/ ULONG nMaxSize = aMaxSize.Len() ? ULONG( aMaxSize ) : 50000;
-/*N*/ #else
-/*N*/ ULONG nMaxSize = 0L;
-/*N*/ #endif
-/*N*/ if( nMaxSize && !GetDocInfo().IsPasswd() &&
-/*N*/ SFX_CREATE_MODE_STANDARD == eCreateMode )
-/*N*/ {
-/*N*/ }
-
-/*N*/ if( pImp->bIsSaving )
-/*N*/ {
-/*N*/ //!! kein Aufruf der Basisklasse wegen doppeltem Aufruf in Persist
-/*N*/ SvStorageRef aRef = GetMedium()->GetStorage();
-/*N*/ if ( aRef.Is() )
-/*N*/ {
-/*N*/ SfxDocumentInfo& rDocInfo = GetDocInfo();
-/*N*/ rDocInfo.Save(pNewStg);
-/*N*/
-/*N*/ // wenn es sich um ein Dokument lokales Basic handelt, dieses
-/*N*/ // schreiben
-/*N*/ if ( pImp->pBasicMgr )
-/*?*/ pImp->pBasicMgr->Store(
- *pNewStg,
- ::binfilter::StaticBaseUrl::GetBaseURL(
- INetURLObject::NO_DECODE) );
-/*N*/ else
-/*N*/ {
-/*N*/ String aURL;
-/*N*/ if( HasName() )
-/*N*/ aURL = GetMedium()->GetName();
-/*N*/ else
-/*?*/ {
-/*?*/ aURL = GetDocInfo().GetTemplateFileName();
-/*?*/ // Bei Templates keine URL...
-/*?*/ aURL = ::binfilter::StaticBaseUrl::SmartRelToAbs( aURL );
-/*N*/ }
-/*N*/ #ifndef TFPLUGCOMM
-/*N*/ BasicManager::CopyBasicData(
- GetStorage(), aURL,
- ::binfilter::StaticBaseUrl::GetBaseURL(
- INetURLObject::NO_DECODE),
- pNewStg );
-/*N*/ #endif
-/*N*/ }
-/*N*/
-/*N*/ // Windows-merken
-/*N*/ if ( TRUE ) HACK(aus config)
-/*N*/ SaveWindows_Impl( *pNewStg );
-/*N*/
-/*N*/ // Konfiguration schreiben
-/*N*/ if ( GetConfigManager() )
-/*N*/ {
-/*N*/ {
-/*?*/ GetConfigManager()->StoreConfiguration( pNewStg );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ return TRUE;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ /*SfxApplication *pSfxApp =*/ SFX_APP();
-/*N*/ /*SfxMedium *pActMed =*/ GetMedium();
-/*N*/
-/*N*/ // alte DocInfo laden
-/*N*/ SfxDocumentInfo &rDocInfo = GetDocInfo();
-/*N*/
-/*N*/ // DocInfo speichern
-/*N*/ rDocInfo.Save( pNewStg );
-/*N*/
-/*N*/ // wenn es sich um ein Dokument lokales Basic handelt, dieses schreiben
-/*N*/ if ( pImp->pBasicMgr )
-/*N*/ pImp->pBasicMgr->Store(
- *pNewStg,
- ::binfilter::StaticBaseUrl::GetBaseURL(INetURLObject::NO_DECODE) );
-/*N*/ #ifndef MI_NONOS
-/*N*/ else
-/*N*/ {
-/*?*/ String aURL;
-/*?*/ if( HasName() )
-/*?*/ aURL = GetMedium()->GetName();
-/*?*/ else
-/*?*/ {
-/*?*/ aURL = GetDocInfo().GetTemplateFileName();
-/*?*/ // Bei Templates keine URL...
-/*?*/ aURL = ::binfilter::StaticBaseUrl::SmartRelToAbs( aURL );
-/*?*/ }
-/*?*/ #ifndef TFPLUGCOMM
-/*?*/ BasicManager::CopyBasicData(
- GetStorage(), aURL,
- ::binfilter::StaticBaseUrl::GetBaseURL(INetURLObject::NO_DECODE),
- pNewStg );
-/*?*/ #endif
-/*N*/ }
-/*N*/ #endif
-/*N*/ // Windows-merken
-/*N*/ if ( TRUE ) HACK(aus config)
-/*N*/ SaveWindows_Impl( *pNewStg );
-/*N*/
-/*N*/ // Konfiguration schreiben
-/*N*/ if (GetConfigManager())
-/*N*/ {
-/*N*/ {
-/*?*/ GetConfigManager()->StoreConfiguration(pNewStg);
- }
-/*N*/ }
-/*N*/
-/*N*/ return TRUE;
-/*N*/ }
-/*N*/ }
-
//--------------------------------------------------------------------
// Bearbeitungszeit aktualisieren
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index a34251d..3a3a6e7 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -1351,95 +1351,6 @@ sal_Bool DocSh::ConvertTo( SfxMedium &rMedium )
/*N*/ else
/*N*/ return sal_False;
/*N*/ }
-
-/*N*/ void SfxObjectShell::AddXMLAsZipToTheStorage( SvStorage& rRoot )
-/*N*/ {
-/*N*/ static struct _ObjExpType {
-/*N*/ sal_Bool (SvtAddXMLToStorageOptions:: *fnIsAdd)() const;
-/*N*/ const sal_Char* pModuleNm;
-/*N*/ // GlobalNameId
-/*N*/ UINT32 n1;
-/*N*/ USHORT n2, n3;
-/*N*/ BYTE b8, b9, b10, b11, b12, b13, b14, b15;
-/*N*/ } aArr[] = {
-/*N*/ { &SvtAddXMLToStorageOptions::IsWriter_Add_XML_to_Storage,
-/*N*/ "Writer", BF_SO3_SW_CLASSID_50 },
-/*N*/ { &SvtAddXMLToStorageOptions::IsCalc_Add_XML_to_Storage,
-/*N*/ "Calc", BF_SO3_SC_CLASSID_50 },
-/*N*/ { &SvtAddXMLToStorageOptions::IsImpress_Add_XML_to_Storage,
-/*N*/ "Impress", BF_SO3_SIMPRESS_CLASSID_50 },
-/*N*/ { &SvtAddXMLToStorageOptions::IsDraw_Add_XML_to_Storage,
-/*N*/ "Draw", BF_SO3_SDRAW_CLASSID_50 },
-/*N*/ { NULL,NULL,0,0,0,0,0,0,0,0,0,0,0 }
-/*N*/ };
-/*N*/
-/*N*/ for( const _ObjExpType* pArr = aArr; pArr->fnIsAdd; ++pArr )
-/*N*/ {
-/*N*/ SvGlobalName aGlbNm( pArr->n1, pArr->n2, pArr->n3,
-/*N*/ pArr->b8, pArr->b9, pArr->b10, pArr->b11,
-/*N*/ pArr->b12, pArr->b13, pArr->b14, pArr->b15 );
-/*N*/ if( *GetSvFactory() == aGlbNm )
-/*N*/ {
-/*?*/ // 1. check if the option is set and unequal 0 or is not set
-/*?*/ SvtAddXMLToStorageOptions aOpt;
-/*?*/ if( (aOpt.*pArr->fnIsAdd)() )
-/*?*/ {
-/*?*/ // the flag is set
-/*?*/ String sStr;
-/*?*/ sStr.AssignAscii( "StarOffice XML (" );
-/*?*/ sStr.AppendAscii( pArr->pModuleNm );
-/*?*/ sStr += ')';
-/*?*/ // 2. exist the XML filter? "StarOffice XML (<Application>)"?
-/*?*/ const SfxFilter* pFilter = GetFactory().GetFilterContainer()->
-/*?*/ GetFilter4FilterName( sStr );
-/*?*/ if( pFilter )
-/*?*/ {
-/*?*/ ::utl::TempFile aTempFile;
-/*?*/ SfxMedium aTmpMed( aTempFile.GetURL(), STREAM_READ | STREAM_WRITE, sal_True );
-/*?*/
-/*?*/ aTmpMed.SetFilter( pFilter );
-/*?*/
-/*?*/ if( ConvertTo( aTmpMed ) )
-/*?*/ {
-/*?*/ SvStorage* pXMLStor = aTmpMed.GetStorage();
-/*?*/
-/*?*/ if( pXMLStor )
-/*?*/ {
-/*?*/ const String aContent( String::CreateFromAscii( "Content" ) );
-/*?*/ const String aContentXML( String::CreateFromAscii( "Content.xml" ) );
-/*?*/ const String aXMLFormatName( String::CreateFromAscii( "XMLFormat2" ) );
-/*?*/ String aContentName;
-/*?*/
-/*?*/ if( pXMLStor->IsContained( aContentXML ) )
-/*?*/ aContentName = aContentXML;
-/*?*/ else if( pXMLStor->IsContained( aContent ) )
-/*?*/ aContentName = aContent;
-/*?*/
-/*?*/ if( aContentName.Len() )
-/*?*/ {
-/*?*/ SvStorageStreamRef xOStm( rRoot.OpenStream( aXMLFormatName, STREAM_WRITE | STREAM_TRUNC ) );
-/*?*/ SvStorageStreamRef xIStm( pXMLStor->OpenStream( aContentName, STREAM_READ | STREAM_NOCREATE ) );
-/*?*/
-/*?*/ if( xOStm.Is() && xIStm.Is() )
-/*?*/ {
-/*?*/ ZCodec aCodec;
-/*?*/
-/*?*/ xIStm->Seek( 0 );
-/*?*/ aCodec.BeginCompression( ZCODEC_BEST_COMPRESSION );
-/*?*/ aCodec.Compress( *xIStm, *xOStm );
-/*?*/ aCodec.EndCompression();
-/*?*/ xOStm->Commit();
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*?*/ // that's all
-/*?*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sfx2/source/inc/cfgmgr.hxx b/binfilter/bf_sfx2/source/inc/cfgmgr.hxx
index 69e10f4..c729421 100644
--- a/binfilter/bf_sfx2/source/inc/cfgmgr.hxx
+++ b/binfilter/bf_sfx2/source/inc/cfgmgr.hxx
@@ -76,8 +76,6 @@ public:
SfxConfigManager( SfxObjectShell& rDoc );
~SfxConfigManager();
- SotStorage* GetConfigurationStorage( SotStorage* );
-
void AddConfigItem( SfxConfigItem& rCItem );
void RemoveConfigItem( SfxConfigItem& rCItem );
SfxConfigItem* GetNextItem( SfxConfigItem& rCItem );
diff --git a/binfilter/bf_so3/source/inplace/ipenv.cxx b/binfilter/bf_so3/source/inplace/ipenv.cxx
index c46d418..50c9800 100644
--- a/binfilter/bf_so3/source/inplace/ipenv.cxx
+++ b/binfilter/bf_so3/source/inplace/ipenv.cxx
@@ -508,38 +508,6 @@ void SvContainerEnvironment::Scroll( const Size & rSize )
}
/************************************************************************
-|* SvContainerEnvironment::SetTopToolFramePixel()
-
-|* Beschreibung
-*************************************************************************/
-void SvContainerEnvironment::SetTopToolFramePixel( const SvBorder & rBorder )
-{
- if( rBorder != aTopBorder )
- {
- aTopBorder = rBorder;
- if( pIPEnv )
- // InPlace-Objekt fragt nach rOuter, deshalb vorher setzen
- pIPEnv->DoTopWinResize();
- }
-}
-
-/************************************************************************
-|* SvContainerEnvironment::SetDocToolFramePixel()
-
-|* Beschreibung
-*************************************************************************/
-void SvContainerEnvironment::SetDocToolFramePixel( const SvBorder & rBorder )
-{
- if( rBorder != aDocBorder )
- {
- aDocBorder = rBorder;
- if( pIPEnv )
- // InPlace-Objekt fragt nach rOuter, deshalb vorher setzen
- pIPEnv->DoDocWinResize();
- }
-}
-
-/************************************************************************
|* SvContainerEnvironment::RequestTopToolSpacePixel()
|*
|* Beschreibung
diff --git a/binfilter/bf_svtools/source/items1/svt_poolio.cxx b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
index 4532900..228d7e2 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolio.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
@@ -990,31 +990,6 @@ bool SfxItemPool::IsInStoringRange( USHORT nWhich ) const
nWhich <= pImp->nStoringEnd;
}
-//------------------------------------------------------------------------
-
-void SfxItemPool::SetStoringRange( USHORT nFrom, USHORT nTo )
-
-/* [Beschreibung]
-
- Mit dieser Methode kann der Which-Bereich eingeengt werden, der
- von ItemSets dieses Pool (und dem Pool selbst) gespeichert wird.
- Die Methode muss dazu vor <SfxItemPool::Store()> gerufen werden
- und die Werte muessen auch noch gesetzt sein, wenn das eigentliche
- Dokument (also die ItemSets gespeicher werden).
-
- Ein Zuruecksetzen ist dann nicht noetig, wenn dieser Range vor
- JEDEM Speichern richtig gesetzt wird, da er nur beim Speichern
- beruecksichtigt wird.
-
- Dieses muss fuer das 3.1-Format gemacht werden, da dort eine
- Bug in der Pool-Lade-Methode vorliegt.
-*/
-
-{
- pImp->nStoringStart = nFrom;
- pImp->nStoringEnd = nTo;
-}
-
// -----------------------------------------------------------------------
void SfxItemPool::SetVersionMap
@@ -1270,73 +1245,6 @@ bool SfxItemPool::IsVer2_Impl() const
//-------------------------------------------------------------------------
-
-bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem,
- bool bDirect ) const
-
-/* [Beschreibung]
-
- Speichert das <SfxPoolItem> 'rItem' in den <SvStream> 'rStream'
- entweder als Surrogat ('bDirect == FALSE') oder direkt mit 'rItem.Store()'.
- Nicht poolable Items werden immer direkt gespeichert. Items ohne Which-Id,
- also SID-Items, werden nicht gespeichert, ebenso wenn Items, die in der
- File-Format-Version noch nicht vorhanden waren (return FALSE).
-
- Das Item wird im Stream wie folgt abgelegt:
-
- USHORT rItem.Which()
- USHORT GetSlotId( rItem.Which() ) bzw. 0 falls nicht verf"urbar
- USHORT GetSurrogate( &rItem ) bzw. SFX_ITEM_DIRECT bei '!SFX_ITEM_POOLBLE'
-
- optional (falls 'bDirect == TRUE' oder '!rItem.IsPoolable()':
-
- USHORT rItem.GetVersion()
- ULONG Size
- Size rItem.Store()
-
-
- [Querverweise]
-
- <SfxItemPool::LoadItem(SvStream&,bool)const>
-*/
-
-{
- DBG_ASSERT( !IsInvalidItem(&rItem), "cannot store invalid items" );
-
- if ( IsSlot( rItem.Which() ) )
- return FALSE;
- const SfxItemPool *pPool = this;
- while ( !pPool->IsInStoringRange(rItem.Which()) )
- if ( 0 == ( pPool = pPool->pSecondary ) )
- return FALSE;
-
- DBG_ASSERT( !pImp->bInSetItem || !rItem.ISA(SfxSetItem),
- "SetItem contains ItemSet with SetItem" );
-
- USHORT nSlotId = pPool->GetSlotId( rItem.Which(), TRUE );
- USHORT nItemVersion = rItem.GetVersion(_nFileFormatVersion);
- if ( USHRT_MAX == nItemVersion )
- return FALSE;
-
- rStream << rItem.Which() << nSlotId;
- if ( bDirect || !pPool->StoreSurrogate( rStream, &rItem ) )
- {
- rStream << nItemVersion;
- rStream << (UINT32) 0L; // Platz fuer Laenge in Bytes
- ULONG nIStart = rStream.Tell();
- rItem.Store(rStream, nItemVersion);
- ULONG nIEnd = rStream.Tell();
- rStream.Seek( nIStart-4 );
- rStream << (INT32) ( nIEnd-nIStart );
- rStream.Seek( nIEnd );
- }
-
- return TRUE;
-}
-
-//-------------------------------------------------------------------------
-
-
const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, bool bDirect,
const SfxItemPool *pRefPool )
diff --git a/binfilter/bf_svtools/source/items1/svt_poolitem.cxx b/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
index 8aac9a5..b7c0319 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
@@ -240,14 +240,6 @@ bool SfxPoolItem::readUnicodeString(SvStream & rStream, UniString & rString,
return rStream.GetError() == ERRCODE_NONE;
}
-//============================================================================
-// static
-void SfxPoolItem::writeUnicodeString(SvStream & rStream,
- UniString const & rString)
-{
- rStream.WriteByteString(rString, RTL_TEXTENCODING_UCS2);
-}
-
// ------------------------------------------------------------------------
SfxItemPresentation SfxPoolItem::GetPresentation
(
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx
index 9219561..8fa8886 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx
@@ -200,12 +200,6 @@ SwXMLExport::SwXMLExport(
}
#endif
-void SwXMLExport::setBlockMode()
-{
- bBlock = sal_True;
-
-}
-
sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
{
if( !GetModel().is() )
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
index 84e27c6..3cf577c 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
@@ -364,24 +364,6 @@ void SwXMLImport::setTextInsertMode(
GetTextImport()->SetCursor( xTextCursor );
}
-void SwXMLImport::setStyleInsertMode( sal_uInt16 nFamilies,
- sal_Bool bOverwrite )
-{
- bInsert = !bOverwrite;
- nStyleFamilyMask = nFamilies;
- bLoadDoc = sal_False;
-}
-
-void SwXMLImport::setBlockMode( )
-{
- bBlock = sal_True;
-}
-
-void SwXMLImport::setOrganizerMode( )
-{
- bOrganizerMode = sal_True;
-}
-
const Sequence< sal_Int8 > & SwXMLImport::getUnoTunnelId() throw()
{
static uno::Sequence< sal_Int8 > aSeq = ::binfilter::CreateUnoTunnelId();
diff --git a/binfilter/bf_sw/source/filter/xml/xmlexp.hxx b/binfilter/bf_sw/source/filter/xml/xmlexp.hxx
index b7ea00d..4c0bd17 100644
--- a/binfilter/bf_sw/source/filter/xml/xmlexp.hxx
+++ b/binfilter/bf_sw/source/filter/xml/xmlexp.hxx
@@ -163,8 +163,6 @@ public:
#endif
virtual ~SwXMLExport();
- void setBlockMode();
-
virtual sal_uInt32 exportDoc( enum ::binfilter::xmloff::token::XMLTokenEnum eClass = ::binfilter::xmloff::token::XML_TOKEN_INVALID );
inline const SvXMLUnitConverter& GetTwipUnitConverter() const;
diff --git a/binfilter/bf_sw/source/filter/xml/xmlimp.hxx b/binfilter/bf_sw/source/filter/xml/xmlimp.hxx
index 0d46d7d..d320526 100644
--- a/binfilter/bf_sw/source/filter/xml/xmlimp.hxx
+++ b/binfilter/bf_sw/source/filter/xml/xmlimp.hxx
@@ -128,10 +128,6 @@ public:
void setTextInsertMode(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & rInsertPos );
- void setStyleInsertMode( sal_uInt16 nFamilies,
- sal_Bool bOverwrite );
- void setBlockMode();
- void setOrganizerMode();
// ::com::sun::star::xml::sax::XDocumentHandler
virtual void SAL_CALL startDocument(void)
diff --git a/binfilter/inc/bf_sfx2/objsh.hxx b/binfilter/inc/bf_sfx2/objsh.hxx
index 581186a..496da22 100644
--- a/binfilter/inc/bf_sfx2/objsh.hxx
+++ b/binfilter/inc/bf_sfx2/objsh.hxx
@@ -177,7 +177,6 @@ private:
sal_Bool SaveTo_Impl(SfxMedium &rMedium, const SfxItemSet* pSet, BOOL bPrepareForDirectAccess );
sal_Bool ConnectTmpStorage_Impl( SvStorage* pStg);
sal_Bool IsOwnStorageFormat_Impl(const SfxMedium &) const;
- sal_Bool SaveInfoAndConfig_Impl( SvStorageRef pNewStg );
#endif
protected:
@@ -187,9 +186,6 @@ protected:
virtual void ModifyChanged();
virtual sal_Bool Close();
- // add optional to the storage the XML format as a zip stream
- void AddXMLAsZipToTheStorage( SvStorage& rRoot );
-
public:
TYPEINFO();
diff --git a/binfilter/inc/bf_so3/ipenv.hxx b/binfilter/inc/bf_so3/ipenv.hxx
index 97a936a..717b522 100644
--- a/binfilter/inc/bf_so3/ipenv.hxx
+++ b/binfilter/inc/bf_so3/ipenv.hxx
@@ -195,10 +195,8 @@ public:
virtual void RequestObjAreaPixel( const Rectangle & rObjRect );
// Groessen und Positionsverhandlungen fuer Tools
- void SetTopToolFramePixel( const SvBorder & rBorder );
Rectangle GetTopOuterRectPixel() const;
- void SetDocToolFramePixel( const SvBorder & rBorder );
Rectangle GetDocOuterRectPixel() const;
// Das rInnerRect bezieht sich auf rOuterRect
diff --git a/binfilter/inc/bf_svtools/httpcook.hxx b/binfilter/inc/bf_svtools/httpcook.hxx
deleted file mode 100644
index e00fc06..0000000
--- a/binfilter/inc/bf_svtools/httpcook.hxx
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SVTOOLS_HTTPCOOK_HXX
-#define SVTOOLS_HTTPCOOK_HXX
-
-#include <bf_svtools/bf_solar.h>
-
-#include <tools/datetime.hxx>
-#include <tools/stream.hxx>
-#include <tools/string.hxx>
-
-#include <bf_svtools/poolitem.hxx>
-
-namespace binfilter
-{
-
-/*=======================================================================
- *
- *=====================================================================*/
-#define CNTHTTP_COOKIE_FLAG_SECURE 0x01
-
-#define CNTHTTP_COOKIE_POLICY_INTERACTIVE 0x00
-#define CNTHTTP_COOKIE_POLICY_ACCEPTED 0x01
-#define CNTHTTP_COOKIE_POLICY_BANNED 0x02
-
-#define CNTHTTP_COOKIE_DOMAIN_POLICY 0x10
-
-#define CNTHTTP_COOKIE_DOMAIN_ACCEPTED \
- (CNTHTTP_COOKIE_DOMAIN_POLICY | CNTHTTP_COOKIE_POLICY_ACCEPTED)
-#define CNTHTTP_COOKIE_DOMAIN_BANNED \
- (CNTHTTP_COOKIE_DOMAIN_POLICY | CNTHTTP_COOKIE_POLICY_BANNED)
-
-/*=======================================================================
- *
- * CntHTTPCookie.
- *
- *=====================================================================*/
-struct CntHTTPCookie
-{
- String m_aName;
- String m_aValue;
- String m_aDomain;
- String m_aPath;
- DateTime m_aExpires;
- USHORT m_nFlags;
- USHORT m_nPolicy;
-
- CntHTTPCookie (void)
- : m_aExpires (Date(0), Time(0)),
- m_nFlags (0),
- m_nPolicy (CNTHTTP_COOKIE_POLICY_INTERACTIVE)
- {}
-
- BOOL replaces (const CntHTTPCookie& rOther) const
- {
- return ((m_aDomain == rOther.m_aDomain) &&
- (m_aPath == rOther.m_aPath ) &&
- (m_aName == rOther.m_aName ) );
- }
-
- BOOL operator== (const CntHTTPCookie& rOther) const
- {
- return ((m_aName == rOther.m_aName ) &&
- (m_aValue == rOther.m_aValue ) &&
- (m_aDomain == rOther.m_aDomain ) &&
- (m_aPath == rOther.m_aPath ) &&
- (m_aExpires == rOther.m_aExpires) &&
- (m_nFlags == rOther.m_nFlags ) &&
- (m_nPolicy == rOther.m_nPolicy ) );
- }
-
- void write (SvStream& rStrm) const
- {
- SfxPoolItem::writeUnicodeString(rStrm, m_aName);
- SfxPoolItem::writeUnicodeString(rStrm, m_aValue);
- SfxPoolItem::writeUnicodeString(rStrm, m_aDomain);
- SfxPoolItem::writeUnicodeString(rStrm, m_aPath);
-
- rStrm << m_aExpires.GetDate();
- rStrm << m_aExpires.GetTime();
-
- rStrm << m_nFlags;
- rStrm << m_nPolicy;
- }
-
- void read (SvStream& rStrm, bool bUnicode)
- {
- SfxPoolItem::readUnicodeString(rStrm, m_aName, bUnicode);
- SfxPoolItem::readUnicodeString(rStrm, m_aValue, bUnicode);
- SfxPoolItem::readUnicodeString(rStrm, m_aDomain, bUnicode);
- SfxPoolItem::readUnicodeString(rStrm, m_aPath, bUnicode);
-
- sal_uInt32 nValue = 0;
- rStrm >> nValue;
- m_aExpires.SetDate (nValue);
- rStrm >> nValue;
- m_aExpires.SetTime (nValue);
-
- rStrm >> m_nFlags;
- rStrm >> m_nPolicy;
- }
-};
-
-/*=======================================================================
- *
- * CntHTTPCookieRequest.
- *
- *=====================================================================*/
-enum CntHTTPCookieRequestType
-{
- CNTHTTP_COOKIE_REQUEST_RECV = 0,
- CNTHTTP_COOKIE_REQUEST_SEND
-};
-
-struct CntHTTPCookieRequest
-{
- const String& m_rURL;
- List& m_rCookieList;
- CntHTTPCookieRequestType m_eType;
- USHORT m_nRet;
-
- CntHTTPCookieRequest (
- const String& rURL,
- List& rCookieList,
- CntHTTPCookieRequestType eType)
- : m_rURL (rURL),
- m_rCookieList (rCookieList),
- m_eType(eType),
- m_nRet (CNTHTTP_COOKIE_POLICY_BANNED) {}
-};
-
-}
-
-#endif // SVTOOLS_HTTPCOOK_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_svtools/itempool.hxx b/binfilter/inc/bf_svtools/itempool.hxx
index 548936d..15d73b2 100644
--- a/binfilter/inc/bf_svtools/itempool.hxx
+++ b/binfilter/inc/bf_svtools/itempool.hxx
@@ -188,9 +188,6 @@ public:
const SfxPoolItem* LoadItem( SvStream &rStream,
bool bDirect = FALSE,
const SfxItemPool *pRefPool = 0 );
- bool StoreItem( SvStream &rStream,
- const SfxPoolItem &rItem,
- bool bDirect = FALSE ) const;
USHORT GetSurrogate(const SfxPoolItem *) const;
const SfxPoolItem * GetItem(USHORT nWhich, USHORT nSurrogate) const;
@@ -214,7 +211,6 @@ public:
nWhich <= nEnd; }
bool IsInVersionsRange( USHORT nWhich ) const;
bool IsInStoringRange( USHORT nWhich ) const;
- void SetStoringRange( USHORT nFrom, USHORT nTo );
void SetSecondaryPool( SfxItemPool *pPool );
SfxItemPool* GetSecondaryPool() const {
return pSecondary; }
diff --git a/binfilter/inc/bf_svtools/poolitem.hxx b/binfilter/inc/bf_svtools/poolitem.hxx
index 94f1eda..df379ba 100644
--- a/binfilter/inc/bf_svtools/poolitem.hxx
+++ b/binfilter/inc/bf_svtools/poolitem.hxx
@@ -264,17 +264,6 @@ public:
*/
static bool readUnicodeString(SvStream & rStream, UniString & rString,
bool bUnicode);
-
- /** Write a Unicode string representation of a Unicode string into a
- stream.
-
- @param rStream Some (output) stream.
-
- @param rString Some Unicode string.
- */
- static void writeUnicodeString(SvStream & rStream,
- UniString const & rString);
-
private:
SfxPoolItem& operator=( const SfxPoolItem& ); // n.i.!!
};
diff --git a/lotuswordpro/source/filter/xfilter/xffilestream.cxx b/lotuswordpro/source/filter/xfilter/xffilestream.cxx
index 2daf9af..0d7b50e 100644
--- a/lotuswordpro/source/filter/xfilter/xffilestream.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffilestream.cxx
@@ -61,7 +61,6 @@
#include "xffileattrlist.hxx"
#include "ixfattrlist.hxx"
-void WriteStartTag(std::ofstream& ofs, const char *pStr, int len);
void WriteEndTag(std::ofstream& ofs, const char *pStr, int len);
void WriteString(std::ofstream& ofs, const char *pStr, int len);
void WriteXmlString(std::ofstream& ofs, const char *pStr, int len);
@@ -133,14 +132,6 @@ IXFAttrList* XFFileStream::GetAttrList()
return m_pAttrList;
}
-//------------------------------------------------------------------------------
-
-void WriteStartTag(std::ofstream& ofs, const char *pStr, int len)
-{
- ofs.write("\n<",2);
- ofs.write(pStr,len);
-}
-
void WriteEndTag(std::ofstream& ofs, const char *pStr, int len)
{
ofs.write("</",2);
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx b/lotuswordpro/source/filter/xfilter/xfutil.cxx
index a1a9cd9..e642cef 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx
@@ -109,11 +109,6 @@ rtl::OUString DoubleToOUString(double num, sal_Int32 /*precision*/)
return rtl::OUString::valueOf(num);
}
-rtl::OUString OEMToOUString(const std::string& /*str*/)
-{
- return rtl::OUString();
-}
-
rtl::OUString DateTimeToOUString(XFDateTime& dt)
{
rtl::OUStringBuffer buf;
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.hxx b/lotuswordpro/source/filter/xfilter/xfutil.hxx
index 91ef260..666043b 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.hxx
@@ -77,8 +77,6 @@ rtl::OUString FloatToOUString(float num, sal_Int32 precision=6);
rtl::OUString DoubleToOUString(double num, sal_Int32 precision=6);
-rtl::OUString OEMToOUString(const std::string& str);
-
rtl::OUString DateTimeToOUString(XFDateTime& dt);
rtl::OUString GetTableColName(sal_Int32 col);
More information about the Libreoffice-commits
mailing list