diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-07-19 00:12:38 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-07-19 09:31:34 +0100 |
commit | 45384abc83a0c7323374563d5f659e01d29b1636 (patch) | |
tree | 199bf3e2405adaeee7b5d65da58c4070c940f7d4 | |
parent | eb1d986b424a07a32dcc07e854e2b078150a3396 (diff) |
callcatcher: remove some unused methods
-rw-r--r-- | binfilter/bf_basic/source/basmgr/basmgr.cxx | 29 | ||||
-rw-r--r-- | binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx | 82 | ||||
-rw-r--r-- | binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx | 8 | ||||
-rw-r--r-- | binfilter/bf_sfx2/source/inc/cfgmgr.hxx | 4 | ||||
-rw-r--r-- | binfilter/bf_svtools/source/config/svt_addxmltostorageoptions.cxx | 21 | ||||
-rw-r--r-- | binfilter/inc/bf_basic/basmgr.hxx | 1 | ||||
-rw-r--r-- | binfilter/inc/bf_sfx2/objsh.hxx | 1 | ||||
-rw-r--r-- | binfilter/inc/bf_svtools/addxmltostorageoptions.hxx | 21 |
8 files changed, 0 insertions, 167 deletions
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx index 9edf21826..34832e794 100644 --- a/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -1178,35 +1178,6 @@ BasicLibInfo* BasicManager::CreateLibInfo() return pInf; } -BOOL BasicManager::CopyBasicData( SotStorage* pStorFrom, const String& rSourceURL, const String& rBaseURL, SotStorage* pStorTo ) -{ - /*----------------------------------------------------------------- - Diese Methode wird vom SXF gerufen bei 'Datei speichern unter', - damit die Basic-Storages kopiert werden. - Neu: ggf. muessen relative Pfade angepasst werden! - ------------------------------------------------------------------*/ - BOOL bOk = TRUE; - - // bei remote Dokumenten identische Storage - if ( pStorFrom != pStorTo ) - { - if( pStorFrom->IsStorage( BasicStreamName ) ) - bOk = pStorFrom->CopyTo( BasicStreamName, pStorTo, BasicStreamName ); - if( bOk && pStorFrom->IsStream( ManagerStreamName ) ) - { - BasicManager aBasMgr; - // Die aktuelle Base-URL ist die vom speichern... - String aStorName( pStorFrom->GetName() ); - DBG_ASSERT( aStorName.Len(), "No Storage Name!" ); - - aBasMgr.LoadBasicManager( *pStorFrom, rSourceURL, FALSE ); - aBasMgr.Store( *pStorTo, rBaseURL, FALSE ); - } - } - - return bOk; -} - BOOL BasicManager::ImpStoreLibary( StarBASIC* pLib, SotStorage& rStorage ) const { DBG_CHKTHIS( BasicManager, 0 ); diff --git a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx index 67b1bc07a..db034a1ab 100644 --- a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx +++ b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx @@ -219,88 +219,6 @@ static const char pStorageName[] = "Configurations"; /*N*/ return TRUE; /*N*/ } -/*N*/ BOOL SfxConfigManager::StoreConfiguration( SotStorage* pStorage ) -/*N*/ { -/*N*/ // What about the Modified flag ?! ( see also appmisc, config dialog, objcont! ) -/*N*/ BOOL bOwnSaveDone = FALSE; -/*N*/ BOOL bRet = TRUE; -/*N*/ if ( m_xStorage.Is() ) -/*N*/ { -/*N*/ // first update own storage -/*N*/ bRet = !bModified || (StoreConfiguration_Impl( m_xStorage ) && m_xStorage->Commit()); -/*N*/ bOwnSaveDone = TRUE; -/*N*/ if ( !pStorage && pObjShell ) -/*N*/ { -/*?*/ // pStorage == NULL means : storage of document should be updated also -/*?*/ SotStorage* pDocumentStorage = pObjShell->GetStorage(); -/*?*/ if ( !pDocumentStorage->IsOLEStorage() ) -/*?*/ { -/*?*/ // use the configuration substorage of the document -/*?*/ SotStorageRef xCfgStorage = pDocumentStorage->OpenSotStorage( -/*?*/ String::CreateFromAscii(pStorageName), STREAM_STD_READWRITE, STORAGE_TRANSACTED ); -/*?*/ bRet = m_xStorage->CopyTo( xCfgStorage ) && xCfgStorage->Commit(); -/*?*/ } -/*?*/ else -/*?*/ { -/*?*/ // 5.0 format : store compact configuration stream -/*?*/ SfxConfigManagerImExport_Impl aExporter( pObjShell, pItemArr ); -/*?*/ nErrno = aExporter.Export( m_xStorage, pDocumentStorage ); -/*?*/ bRet = ( nErrno == ERR_NO ); -/*?*/ } -/*?*/ -/*?*/ if ( bRet ) -/*?*/ { -/*?*/ // can't commit changes if the documents' storage is under control of the document -/*?*/ if( pObjShell->GetCreateMode() == SFX_CREATE_MODE_ORGANIZER ) -/*?*/ bRet = pDocumentStorage->Commit(); -/*?*/ else -/*?*/ { -/*?*/ // The configuration will be stored together the document, so the modified flag -/*?*/ // must remain set! -/*?*/ return TRUE; -/*?*/ } -/*?*/ } -/*N*/ } -/*N*/ -/*N*/ if ( (bRet && !pStorage) || pStorage == (SotStorage*) m_xStorage ) -/*N*/ { -/*N*/ // only storing into own storage was requested -/*N*/ bModified = FALSE; -/*N*/ return TRUE; -/*N*/ } -/*N*/ } -/*N*/ else -/*?*/ DBG_ASSERT( pStorage, "Can't save configuration!" ); -/*?*/ -/*?*/ if ( !bRet || !pStorage ) -/*?*/ return FALSE; -/*?*/ -/*?*/ // store also into storage passed as parameter, but don't commit the changes, because this will be done by the caller -/*?*/ if ( !pStorage->IsOLEStorage() ) -/*?*/ { -/*?*/ // 6.0 format -/*?*/ if ( bOwnSaveDone ) -/*?*/ { -/*?*/ // if own storage is updated, just copy it to the destination storage -/*?*/ bRet = m_xStorage->CopyTo( pStorage ); -/*?*/ } -/*?*/ else -/*?*/ { -/*?*/ bRet = StoreConfiguration_Impl( pStorage ); -/*?*/ } -/*?*/ } -/*?*/ else -/*?*/ { -/*?*/ // 5.0 format : store compact configuration stream -/*?*/ SfxConfigManagerImExport_Impl aExporter( pObjShell, pItemArr ); -/*?*/ nErrno = aExporter.Export( m_xStorage, pStorage ); -/*?*/ bRet = ( nErrno == ERR_NO ); -/*?*/ } -/*?*/ -/*?*/ bModified = !bRet; -/*?*/ return bRet; -/*N*/ } - /*?*/ BOOL SfxConfigManager::StoreConfiguration_Impl( SotStorage* /*pStorage*/ ) /*?*/ {DBG_BF_ASSERT(0, "STRIP"); /*?*/ BOOL bRet = TRUE; diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx index 7ca0679f9..7d5001b83 100644 --- a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx +++ b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx @@ -95,14 +95,6 @@ using namespace ::com::sun::star::uno; /*?*/ { return NULL; /*?*/ } -/*N*/ bool SfxObjectShell::SaveWindows_Impl( SvStorage & /*rStor*/ ) const -/*N*/ { -/*N*/ return FALSE; -/*N*/ } - -//==================================================================== - - //==================================================================== /*N*/ void SfxObjectShell::UpdateDocInfoForSave() diff --git a/binfilter/bf_sfx2/source/inc/cfgmgr.hxx b/binfilter/bf_sfx2/source/inc/cfgmgr.hxx index c729421c8..b25428570 100644 --- a/binfilter/bf_sfx2/source/inc/cfgmgr.hxx +++ b/binfilter/bf_sfx2/source/inc/cfgmgr.hxx @@ -82,10 +82,6 @@ public: USHORT GetErrorCode() { return nErrno; } - // store the whole configuration into a storage - // pStore == NULL means store into own storage - BOOL StoreConfiguration( SotStorage* pStorage=NULL ); - BOOL LoadConfigItem( SfxConfigItem& ); BOOL StoreConfigItem( SfxConfigItem& ); BOOL StoreAlwaysConfigItem( SfxConfigItem& ); diff --git a/binfilter/bf_svtools/source/config/svt_addxmltostorageoptions.cxx b/binfilter/bf_svtools/source/config/svt_addxmltostorageoptions.cxx index c605a2f6a..4e5979861 100644 --- a/binfilter/bf_svtools/source/config/svt_addxmltostorageoptions.cxx +++ b/binfilter/bf_svtools/source/config/svt_addxmltostorageoptions.cxx @@ -251,27 +251,6 @@ SvtAddXMLToStorageOptions::~SvtAddXMLToStorageOptions() delete m_pDataContainer, m_pDataContainer = 0; } -sal_Bool SvtAddXMLToStorageOptions::IsWriter_Add_XML_to_Storage() const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->IsWriter_Add_XML_to_Storage(); -} -sal_Bool SvtAddXMLToStorageOptions::IsCalc_Add_XML_to_Storage() const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->IsCalc_Add_XML_to_Storage(); -} -sal_Bool SvtAddXMLToStorageOptions::IsImpress_Add_XML_to_Storage() const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->IsImpress_Add_XML_to_Storage(); -} -sal_Bool SvtAddXMLToStorageOptions::IsDraw_Add_XML_to_Storage() const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->IsDraw_Add_XML_to_Storage(); -} - //***************************************************************************************************************** // private method //***************************************************************************************************************** diff --git a/binfilter/inc/bf_basic/basmgr.hxx b/binfilter/inc/bf_basic/basmgr.hxx index 6f434e472..c09397771 100644 --- a/binfilter/inc/bf_basic/basmgr.hxx +++ b/binfilter/inc/bf_basic/basmgr.hxx @@ -189,7 +189,6 @@ public: static BOOL HasBasicWithModules( const SotStorage& rStorage, const String& rBaseURL ); - static BOOL CopyBasicData( SotStorage* pFrom, const String& rSourceURL, const String& rBaseURL, SotStorage* pTo); USHORT GetLibCount() const; StarBASIC* GetLib( USHORT nLib ) const; diff --git a/binfilter/inc/bf_sfx2/objsh.hxx b/binfilter/inc/bf_sfx2/objsh.hxx index 496da2278..e7354b1a2 100644 --- a/binfilter/inc/bf_sfx2/objsh.hxx +++ b/binfilter/inc/bf_sfx2/objsh.hxx @@ -376,7 +376,6 @@ public: void SetProgress_Impl( SfxProgress *pProgress ); sal_uInt16& GetAktViewNo() { return nViewNo; } void SetActivateEvent_Impl(sal_uInt16 ); - bool SaveWindows_Impl( SvStorage &rStor ) const; #endif }; diff --git a/binfilter/inc/bf_svtools/addxmltostorageoptions.hxx b/binfilter/inc/bf_svtools/addxmltostorageoptions.hxx index 18ba1a928..d335d7779 100644 --- a/binfilter/inc/bf_svtools/addxmltostorageoptions.hxx +++ b/binfilter/inc/bf_svtools/addxmltostorageoptions.hxx @@ -96,27 +96,6 @@ class SvtAddXMLToStorageOptions: public Options SvtAddXMLToStorageOptions(); virtual ~SvtAddXMLToStorageOptions(); - //--------------------------------------------------------------------------------------------------------- - // interface - //--------------------------------------------------------------------------------------------------------- - - /*-****************************************************************************************************//** - @short interface methods to get value of config key - @descr - - @seealso - - - @param - @return The values which represent current state of internal variable. - - @onerror No error should occurre! - *//*-*****************************************************************************************************/ - - sal_Bool IsWriter_Add_XML_to_Storage() const; - sal_Bool IsCalc_Add_XML_to_Storage() const; - sal_Bool IsImpress_Add_XML_to_Storage() const; - sal_Bool IsDraw_Add_XML_to_Storage() const; - //------------------------------------------------------------------------------------------------------------- // private methods //------------------------------------------------------------------------------------------------------------- |