diff options
-rw-r--r-- | basic/inc/basic/basmgr.hxx | 1 | ||||
-rw-r--r-- | basic/source/basmgr/basmgr.cxx | 18 | ||||
-rw-r--r-- | editeng/source/editeng/editdoc.hxx | 1 | ||||
-rw-r--r-- | editeng/source/editeng/editdoc2.cxx | 6 | ||||
-rw-r--r-- | svx/inc/svx/gallery1.hxx | 1 | ||||
-rw-r--r-- | svx/source/gallery2/gallery1.cxx | 77 |
6 files changed, 0 insertions, 104 deletions
diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx index 8dc90817c936..fec6bb89f201 100644 --- a/basic/inc/basic/basmgr.hxx +++ b/basic/inc/basic/basmgr.hxx @@ -164,7 +164,6 @@ protected: sal_Bool ImplEncryptStream( SvStream& rStream ) const; BasicLibInfo* FindLibInfo( StarBASIC* pBasic ) const; void CheckModules( StarBASIC* pBasic, sal_Bool bReference ) const; - void SetFlagToAllLibs( short nFlag, sal_Bool bSet ) const; BasicManager(); // This is used only to customize the paths for 'Save as'. ~BasicManager(); diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index c077246d6fb0..54c0a87101b4 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -1841,24 +1841,6 @@ sal_Bool BasicManager::IsBasicModified() const return sal_False; } -void BasicManager::SetFlagToAllLibs( short nFlag, sal_Bool bSet ) const -{ - sal_uInt16 nLibs = GetLibCount(); - for ( sal_uInt16 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 ); - } - } -} - sal_Bool BasicManager::HasErrors() { DBG_CHKTHIS( BasicManager, 0 ); diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index ee2be03d7a6c..c923ee2c127a 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -382,7 +382,6 @@ struct ExtraPortionInfo ~ExtraPortionInfo(); void SaveOrgDXArray( const sal_Int32* pDXArray, sal_uInt16 nLen ); - void DestroyOrgDXArray(); }; diff --git a/editeng/source/editeng/editdoc2.cxx b/editeng/source/editeng/editdoc2.cxx index 8eee45722ef5..abd8388800c0 100644 --- a/editeng/source/editeng/editdoc2.cxx +++ b/editeng/source/editeng/editdoc2.cxx @@ -152,12 +152,6 @@ void ExtraPortionInfo::SaveOrgDXArray( const sal_Int32* pDXArray, sal_uInt16 nLe memcpy( pOrgDXArray, pDXArray, nLen*sizeof(sal_Int32) ); } -void ExtraPortionInfo::DestroyOrgDXArray() -{ - delete[] pOrgDXArray; - pOrgDXArray = NULL; -} - ParaPortion::ParaPortion( ContentNode* pN ) { diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx index b858b042d0ce..aa5cc4aa0f8e 100644 --- a/svx/inc/svx/gallery1.hxx +++ b/svx/inc/svx/gallery1.hxx @@ -167,7 +167,6 @@ public: String GetThemeName( sal_uIntPtr nThemeId ) const; SVX_DLLPUBLIC sal_Bool CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom = 0 ); - sal_Bool CreateImportTheme( const INetURLObject& rURL, const String& rFileName ); sal_Bool RenameTheme( const String& rOldName, const String& rNewName ); SVX_DLLPUBLIC sal_Bool RemoveTheme( const String& rThemeName ); diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 0eba3f66d248..165936cae991 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -633,83 +633,6 @@ sal_Bool Gallery::CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom ) // ------------------------------------------------------------------------ -sal_Bool Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImportName ) -{ - INetURLObject aURL( rURL ); - sal_Bool bRet = sal_False; - - DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); - - if( FileExists( aURL ) ) - { - SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ); - - if( pIStm ) - { - sal_uIntPtr nStmErr; - sal_uInt16 nId; - - *pIStm >> nId; - - if( nId > 0x0004 ) - ErrorHandler::HandleError( ERRCODE_IO_GENERAL ); - else - { - ByteString aTmpStr; - String aThemeName; *pIStm >> aTmpStr; aThemeName = String( aTmpStr, RTL_TEXTENCODING_UTF8 ); - GalleryThemeEntry* pThemeEntry = new GalleryThemeEntry( aURL, rImportName, - String(aURL.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32(), - sal_True, sal_True, sal_True, 0, sal_False ); - GalleryTheme* pImportTheme = new GalleryTheme( this, pThemeEntry ); - - pIStm->Seek( STREAM_SEEK_TO_BEGIN ); - *pIStm >> *pImportTheme; - nStmErr = pIStm->GetError(); - - if( nStmErr ) - { - delete pThemeEntry; - ErrorHandler::HandleError( ERRCODE_IO_GENERAL ); - } - else - { - String aName( rImportName ); - String aNewName( aName ); - sal_uIntPtr nCount = 0; - - aName += ' '; - - while ( HasTheme( aNewName ) && ( nCount++ < 16000 ) ) - { - aNewName = aName; - aNewName += String::CreateFromInt32( nCount ); - } - - pImportTheme->SetImportName( aNewName ); - aThemeList.push_back( pThemeEntry ); - - // Thema in Import-Liste eintragen und Import-Liste speichern - GalleryImportThemeEntry* pImportEntry = new GalleryImportThemeEntry; - pImportEntry->aThemeName = pImportEntry->aUIName = aNewName; - pImportEntry->aURL = rURL; - pImportEntry->aImportName = rImportName; - aImportList.push_back( pImportEntry ); - ImplWriteImportList(); - bRet = sal_True; - } - - delete pImportTheme; - } - - delete pIStm; - } - } - - return bRet; -} - -// ------------------------------------------------------------------------ - sal_Bool Gallery::RenameTheme( const String& rOldName, const String& rNewName ) { GalleryThemeEntry* pThemeEntry = ImplGetThemeEntry( rOldName ); |