summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-22 21:51:44 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-23 10:35:44 +0100
commit43f8cba7d238e6db25e05edd0d9713dcc42fc861 (patch)
tree797d2e5aeae4d288a143e7483997538758ea7af9 /svl
parent6c1e8719013b47ff3d3954173a17e49f3a361009 (diff)
callcatcher: yet more unused code
Diffstat (limited to 'svl')
-rw-r--r--svl/inc/svl/style.hxx3
-rw-r--r--svl/source/items/style.cxx106
2 files changed, 0 insertions, 109 deletions
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index d21897fe3400..5a7899ffb693 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -214,7 +214,6 @@ friend class SfxStyleSheetBase;
SfxStyleSheetBasePool_Impl *pImp;
private:
- SVL_DLLPRIVATE sal_Bool Load1_Impl( SvStream& );
SVL_DLLPRIVATE SfxStyleSheetIterator& GetIterator_Impl();
protected:
String aAppName;
@@ -234,8 +233,6 @@ public:
SfxStyleSheetBasePool( SfxItemPool& );
SfxStyleSheetBasePool( const SfxStyleSheetBasePool& );
- static String GetStreamName();
-
const String& GetAppName() const { return aAppName; }
SfxItemPool& GetPool();
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index d5c04cfa93ee..be5c51e38ab3 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -52,9 +52,6 @@
#include <algorithm>
#include <comphelper/servicehelper.hxx>
-#define STYLESTREAM "SfxStyleSheets"
-#define STYLESTREAM_VERSION sal_uInt16(50)
-
#ifdef DBG_UTIL
class DbgStyleSheetReferences
{
@@ -659,14 +656,6 @@ sal_uInt16 SfxStyleSheetBasePool::GetSearchMask() const
return nMask;
}
-
-// Der Name des Streams
-
-String SfxStyleSheetBasePool::GetStreamName()
-{
- return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(STYLESTREAM));
-}
-
/////////////////////////////////// Factory ////////////////////////////////
@@ -894,101 +883,6 @@ void SfxStyleSheetBase::Store( SvStream& )
{
}
-sal_Bool SfxStyleSheetBasePool::Load1_Impl( SvStream& rStream )
-{
- aAppName = rPool.GetName();
- sal_uInt16 nVersion;
- short nCharSet;
- rStream >> nVersion;
-
- if(nVersion!=STYLESTREAM_VERSION)
- nCharSet=nVersion;
- else
- rStream >> nCharSet;
-
- rtl_TextEncoding eEnc = GetSOLoadTextEncoding(
- (rtl_TextEncoding)nCharSet,
- sal::static_int_cast< sal_uInt16 >(rStream.GetVersion()) );
- rtl_TextEncoding eOldEnc = rStream.GetStreamCharSet();
- rStream.SetStreamCharSet( eEnc );
-
- sal_uInt16 nStyles;
- rStream >> nStyles;
- sal_uInt16 i;
- for ( i = 0; i < nStyles; i++ )
- {
- // kann nicht mehr weiterlesen?
- if ( rStream.GetError() )
- {
- nStyles = i;
- break;
- }
-
- // Globale Teile
- XubString aName, aParent, aFollow;
- String aHelpFile;
- sal_uInt16 nFamily, nStyleMask,nCount;
- sal_uInt32 nHelpId;
- rStream.ReadByteString(aName, eEnc );
- rStream.ReadByteString(aParent, eEnc );
- rStream.ReadByteString(aFollow, eEnc );
- rStream >> nFamily >> nStyleMask;
- SfxPoolItem::readByteString(rStream, aHelpFile);
- if(nVersion!=STYLESTREAM_VERSION)
- {
- sal_uInt16 nTmpHelpId;
- rStream >> nTmpHelpId;
- nHelpId=nTmpHelpId;
- }
- else
- rStream >> nHelpId;
-
- SfxStyleSheetBase& rSheet = Make( aName, (SfxStyleFamily)nFamily , nStyleMask);
- rSheet.SetHelpId( aHelpFile, nHelpId );
- // Hier erst einmal Parent und Follow zwischenspeichern
- rSheet.aParent = aParent;
- rSheet.aFollow = aFollow;
- sal_uInt32 nPos = rStream.Tell();
- rStream >> nCount;
- if(nCount) {
- rStream.Seek( nPos );
- // Das Laden des ItemSets bedient sich der Methode GetItemSet(),
- // damit eigene ItemSets untergeschoben werden koennen
- SfxItemSet& rSet = rSheet.GetItemSet();
- rSet.ClearItem();
-//! SfxItemSet aTmpSet( *pTmpPool );
- /*!aTmpSet*/ rSet.Load( rStream );
- //! rSet.Put( aTmpSet );
- }
- // Lokale Teile
- sal_uInt32 nSize;
- sal_uInt16 nVer;
- rStream >> nVer >> nSize;
- nPos = rStream.Tell() + nSize;
- rSheet.Load( rStream, nVer );
- rStream.Seek( nPos );
- }
-
- //! delete pTmpPool;
- // Jetzt Parent und Follow setzen. Alle Sheets sind geladen.
- // Mit Setxxx() noch einmal den String eintragen, da diese
- // virtuellen Methoden evtl. ueberlagert sind.
- for ( i = 0; i < nStyles; i++ )
- {
- SfxStyleSheetBase* p = aStyles[ i ].get();
- XubString aText = p->aParent;
- p->aParent.Erase();
- p->SetParent( aText );
- aText = p->aFollow;
- p->aFollow.Erase();
- p->SetFollow( aText );
- }
-
- rStream.SetStreamCharSet( eOldEnc );
-
- return sal_Bool( rStream.GetError() == SVSTREAM_OK );
-}
-
SfxItemPool& SfxStyleSheetBasePool::GetPool()
{
return rPool;