diff options
41 files changed, 1 insertions, 516 deletions
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index c099128991bb..47d3ba82d1a5 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -1044,16 +1044,6 @@ void TPGalleryThemeProperties::SearchFiles() // ------------------------------------------------------------------------ -IMPL_LINK( TPGalleryThemeProperties, ClickCloseBrowserHdl, void *, EMPTYARG ) -{ - if( bInputAllowed ) - aPreviewTimer.Stop(); - - return 0L; -} - -// ------------------------------------------------------------------------ - IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG ) { if( bInputAllowed ) diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 1009ce0e7283..8add0f849588 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -354,7 +354,6 @@ class TPGalleryThemeProperties : public SfxTabPage void DoPreview(); DECL_LINK( ClickPreviewHdl, void* ); - DECL_LINK( ClickCloseBrowserHdl, void* ); DECL_LINK( ClickSearchHdl, void* ); DECL_LINK( ClickTakeHdl, void* ); DECL_LINK( ClickTakeAllHdl, void* ); diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx index 428e4865aa9c..a29c04eecfd7 100644 --- a/sfx2/inc/sfx2/basedlgs.hxx +++ b/sfx2/inc/sfx2/basedlgs.hxx @@ -109,8 +109,6 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog protected: SfxModelessDialog( SfxBindings*, SfxChildWindow*, Window*, const ResId& ); - SfxModelessDialog( SfxBindings*, SfxChildWindow*, - Window*, WinBits nWinStyle = WB_STDMODELESS ); ~SfxModelessDialog(); virtual sal_Bool Close(); virtual void Resize(); diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx index d17151dbe273..bcaa79234fd3 100644 --- a/sfx2/inc/sfx2/minarray.hxx +++ b/sfx2/inc/sfx2/minarray.hxx @@ -324,7 +324,6 @@ public: void*& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } void Insert( sal_uInt16 nPos, void* rElem ); void Append( void* rElem ); - sal_Bool Replace( void* pOldElem, void* pNewElem ); sal_Bool Remove( void* rElem ); sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen ); sal_uInt16 Count() const { return nUsed; } @@ -371,9 +370,6 @@ public:\ void Append( T aElement ) {\ SfxPtrArr::Append((void *)aElement);\ }\ - sal_Bool Replace( T aOldElem, T aNewElem ) {\ - return SfxPtrArr::Replace((void *)aOldElem, (void*) aNewElem);\ - }\ void Remove( T aElement ) {\ SfxPtrArr::Remove((void*)aElement);\ }\ diff --git a/sfx2/inc/sfx2/minstack.hxx b/sfx2/inc/sfx2/minstack.hxx index 4c98ec5ef0f2..5a64e31cbee1 100644 --- a/sfx2/inc/sfx2/minstack.hxx +++ b/sfx2/inc/sfx2/minstack.hxx @@ -78,8 +78,6 @@ public: \ \ sal_uInt16 Count() const { return ARR##arr_::Count(); } \ void Push( T rElem ) { Append( rElem ); } \ - sal_Bool Replace( T rOldElem, T rNewElem ) \ - { return ARR##arr_::Replace( rOldElem, rNewElem ); } \ T Top( sal_uInt16 nLevel = 0 ) const \ { return (*this)[Count()-nLevel-1]; } \ T Bottom() const { return (*this)[0]; } \ diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx index 5d39f178fbee..49051160d761 100644 --- a/sfx2/inc/sfx2/mnuitem.hxx +++ b/sfx2/inc/sfx2/mnuitem.hxx @@ -70,14 +70,11 @@ public: String GetTitle() const; SfxVirtualMenu* GetPopupMenu() const; virtual PopupMenu* GetPopup() const; - void SetOwnMenu( SfxVirtualMenu* pMenu ); - void RemovePopup(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); static SfxMenuControl* CreateControl( sal_uInt16 nId, Menu &, SfxBindings & ); - static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, SfxBindings&, SfxVirtualMenu* ); static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, const String& sItemText, SfxBindings&, SfxVirtualMenu* ); static void RegisterMenuControl(SfxModule*, SfxMenuCtrlFactory*); diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx index 4dcd035fd49f..98fff6619b36 100644 --- a/sfx2/inc/sfx2/module.hxx +++ b/sfx2/inc/sfx2/module.hxx @@ -86,7 +86,6 @@ public: void RegisterToolBoxControl(SfxTbxCtrlFactory*); void RegisterChildWindow(SfxChildWinFactory*); - void RegisterChildWindowContext( sal_uInt16, SfxChildWinContextFactory* ); void RegisterStatusBarControl(SfxStbCtrlFactory*); void RegisterMenuControl(SfxMenuCtrlFactory*); @@ -94,7 +93,6 @@ public: Window* pParent, const SfxItemSet& rSet ); virtual void Invalidate(sal_uInt16 nId = 0); - sal_Bool IsActive() const; /*virtual*/ bool IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const; diff --git a/sfx2/inc/sfx2/new.hxx b/sfx2/inc/sfx2/new.hxx index bb1250a43a21..fbff13ae5b7e 100644 --- a/sfx2/inc/sfx2/new.hxx +++ b/sfx2/inc/sfx2/new.hxx @@ -56,19 +56,6 @@ class MoreButton; #define RET_TEMPLATE_LOAD 100 -class SFX2_DLLPUBLIC SfxPreviewWin: public Window -{ - SfxObjectShellLock &rDocShell; -protected: - virtual void Paint( const Rectangle& rRect ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - -public: - SfxPreviewWin( Window* pParent, - const ResId& rResId, - SfxObjectShellLock &rDocSh ); -}; - class SfxNewFileDialog_Impl; class SFX2_DLLPUBLIC SfxNewFileDialog : public SfxModalDialog { diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx index cef2730687d5..d8f35b3581ff 100644 --- a/sfx2/inc/sfx2/tbxctrl.hxx +++ b/sfx2/inc/sfx2/tbxctrl.hxx @@ -142,7 +142,6 @@ protected: void UnbindListener(); void AddStatusListener( const rtl::OUString& rCommandURL ); void RemoveStatusListener( const rtl::OUString& rCommandURL ); - void UpdateStatus( const rtl::OUString& rCommandURL ); // SfxStatusListenerInterface using FloatingWindow::StateChanged; @@ -159,10 +158,6 @@ public: SfxPopupWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow, - const ResId &rId ); - SfxPopupWindow( sal_uInt16 nId, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow, WinBits nBits ); ~SfxPopupWindow(); @@ -170,7 +165,6 @@ public: virtual void MouseMove( const MouseEvent& rMEvt ); void StartCascading(); - void EndCascading(); SAL_DLLPRIVATE void SetDeleteLink_Impl( const Link& rLink ) { m_aDeleteLink = rLink; diff --git a/sfx2/inc/sfx2/viewfac.hxx b/sfx2/inc/sfx2/viewfac.hxx index da4d7902c30a..590dc5d065ca 100644 --- a/sfx2/inc/sfx2/viewfac.hxx +++ b/sfx2/inc/sfx2/viewfac.hxx @@ -49,7 +49,6 @@ public: ~SfxViewFactory(); SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh); - void InitFactory(); sal_uInt16 GetOrdinal() const { return nOrd; } /// returns a legacy view name. This is "view" with an appended ordinal/ID. diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 8048e4b85a55..8fa50b38077a 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -219,29 +219,6 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact) //------------------------------------------------------------------------- -void SfxModule::RegisterChildWindowContext( sal_uInt16 nId, - SfxChildWinContextFactory *pFact) -{ - DBG_ASSERT( pImpl, "No real Module!" ); - - sal_uInt16 nCount = pImpl->pFactArr->Count(); - for (sal_uInt16 nFactory=0; nFactory<nCount; ++nFactory) - { - SfxChildWinFactory *pF = (*pImpl->pFactArr)[nFactory]; - if ( nId == pF->nId ) - { - if ( !pF->pArr ) - pF->pArr = new SfxChildWinContextArr_Impl; - pF->pArr->C40_INSERT( SfxChildWinContextFactory, pFact, pF->pArr->Count() ); - return; - } - } - - OSL_FAIL( "No ChildWindow for this Context!" ); -} - -//------------------------------------------------------------------------- - void SfxModule::RegisterToolBoxControl( SfxTbxCtrlFactory *pFact ) { if (!pImpl->pTbxCtrlFac) @@ -372,14 +349,6 @@ void SfxModule::Invalidate( sal_uInt16 nId ) Invalidate_Impl( pFrame->GetBindings(), nId ); } -sal_Bool SfxModule::IsActive() const -{ - SfxViewFrame* pFrame = SfxViewFrame::Current(); - if ( pFrame && pFrame->GetObjectShell()->GetFactory().GetModule() == this ) - return sal_True; - return sal_False; -} - bool SfxModule::IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const { if ( i_nId != SID_TASKPANE ) diff --git a/sfx2/source/bastyp/minarray.cxx b/sfx2/source/bastyp/minarray.cxx index 70e4bfbfc6ca..891baa74aa8e 100644 --- a/sfx2/source/bastyp/minarray.cxx +++ b/sfx2/source/bastyp/minarray.cxx @@ -198,26 +198,6 @@ sal_Bool SfxPtrArr::Remove( void* aElem ) // ----------------------------------------------------------------------- -sal_Bool SfxPtrArr::Replace( void* aOldElem, void* aNewElem ) -{ - DBG_MEMTEST(); - // simple tasks ... - if ( nUsed == 0 ) - return sal_False; - - // backwards, since most of the last is first removed - void* *pIter = pData + nUsed - 1; - for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter ) - if ( *pIter == aOldElem ) - { - pData[nUsed-n-1] = aNewElem; - return sal_True; - } - return sal_False; -} - -// ----------------------------------------------------------------------- - sal_Bool SfxPtrArr::Contains( const void* rItem ) const { DBG_MEMTEST(); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 81f0d6ece67f..2635aba3f0d6 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -345,25 +345,6 @@ IMPL_LINK( SfxModelessDialog, TimerHdl, Timer*, EMPTYARG) // ----------------------------------------------------------------------- SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx, - SfxChildWindow *pCW, - Window* pParent, WinBits nWinBits ) : - ModelessDialog (pParent, nWinBits), - pBindings(pBindinx), - pImp( new SfxModelessDialog_Impl ) -{ - pImp->pMgr = pCW; - pImp->bConstructed = sal_False; - SetUniqueId( GetHelpId() ); - SetHelpId(""); - if ( pBindinx ) - pImp->StartListening( *pBindinx ); - pImp->aMoveTimer.SetTimeout(50); - pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxModelessDialog,TimerHdl)); -} - -// ----------------------------------------------------------------------- - -SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx, SfxChildWindow *pCW, Window *pParent, const ResId& rResId ) : ModelessDialog(pParent, rResId), diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index b54b292f20d7..cc7c0040f328 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -147,58 +147,6 @@ void SfxPreviewWin_Impl::Paint( const Rectangle& rRect ) ImpPaint( rRect, pMetaFile.get(), this ); } -SfxPreviewWin::SfxPreviewWin( - Window* pParent, const ResId& rResId, SfxObjectShellLock &rDocSh ) - : Window(pParent, rResId), rDocShell( rDocSh ) -{ - SetHelpId( HID_PREVIEW_FRAME ); - - // adjust contrast mode initially - SetDrawMode( OUTPUT_DRAWMODE_COLOR ); - - // This preview window is for document previews. Therefore - // right-to-left mode should be off - EnableRTL( sal_False ); -} - -void SfxPreviewWin::Paint( const Rectangle& rRect ) -{ - SfxViewFrame *pFrame = SfxViewFrame::GetFirst( &rDocShell ); - if ( pFrame && pFrame->GetViewShell() && - pFrame->GetViewShell()->GetPrinter() && - pFrame->GetViewShell()->GetPrinter()->IsPrinting() ) - { - return; - } - - Size aTmpSize( rDocShell->GetFirstPageSize() ); - GDIMetaFile aMtf; - VirtualDevice aDevice; - - DBG_ASSERT( aTmpSize.Height() * aTmpSize.Width(), "size of first page is 0, overload GetFirstPageSize or set vis-area!" ); - - aMtf.SetPrefSize( aTmpSize ); - aDevice.EnableOutput( sal_False ); - aDevice.SetMapMode( rDocShell->GetMapUnit() ); - aDevice.SetDrawMode( GetDrawMode() ); - aMtf.Record( &aDevice ); - rDocShell->DoDraw( &aDevice, Point(0,0), aTmpSize, JobSetup(), ASPECT_THUMBNAIL ); - aMtf.Stop(); - aMtf.WindStart(); - SfxPreviewWin_Impl::ImpPaint( rRect, &aMtf, this ); -} - -void SfxPreviewWin::DataChanged( const DataChangedEvent& rDCEvt ) -{ - Window::DataChanged( rDCEvt ); - - if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) - { - SetDrawMode( OUTPUT_DRAWMODE_COLOR ); - } -} - class SfxNewFileDialog_Impl { FixedText aRegionFt; diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 62e88fe01068..560f51af4a5c 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -122,16 +122,6 @@ void SfxEnumMenu::Select() //-------------------------------------------------------------------- -void SfxMenuControl::SetOwnMenu( SfxVirtualMenu* pMenu ) -{ - pOwnMenu = pMenu; - if ( pSubMenu ) - pSubMenu->SetParentMenu( pMenu ); -} - - -//-------------------------------------------------------------------- - // binds the instance to the specified id and assignes the title void SfxMenuControl::Bind( @@ -221,11 +211,6 @@ SfxMenuControl::~SfxMenuControl() delete pSubMenu; } -void SfxMenuControl::RemovePopup() -{ - DELETEZ( pSubMenu ); -} - //-------------------------------------------------------------------- // changes the state in the virtual menu @@ -478,12 +463,6 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu ) } SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd, - sal_uInt16 nId, Menu& rMenu, SfxBindings &rBindings, SfxVirtualMenu* pVirt ) -{ - return new SfxUnoMenuControl( rCmd, nId, rMenu, rBindings, pVirt ); -} - -SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd, sal_uInt16 nId, Menu& rMenu, const String& sItemText, SfxBindings& rBindings, SfxVirtualMenu* pVirt) { diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index da3042599ae7..24b1f897f2b4 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -1271,27 +1271,6 @@ SfxPopupWindow::SfxPopupWindow( //-------------------------------------------------------------------- -SfxPopupWindow::SfxPopupWindow( - sal_uInt16 nId, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow, - const ResId &rId ) : - FloatingWindow( pParentWindow, rId ) - , m_bFloating(sal_False) - , m_bCascading( sal_False ) - , m_nId( nId ) - , m_xFrame( rFrame ) - , m_pStatusListener( 0 ) -{ - m_xServiceManager = ::comphelper::getProcessServiceFactory(); - - Window* pWindow = GetTopMostParentSystemWindow( this ); - if ( pWindow ) - ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); -} - -//-------------------------------------------------------------------- - SfxPopupWindow::~SfxPopupWindow() { if ( m_xStatusListener.is() ) @@ -1360,15 +1339,6 @@ void SfxPopupWindow::RemoveStatusListener( const rtl::OUString& rCommandURL ) //-------------------------------------------------------------------- -void SfxPopupWindow::UpdateStatus( const rtl::OUString& rCommandURL ) -{ - GetOrCreateStatusListener(); - if ( m_xStatusListener.is() ) - m_pStatusListener->updateStatus( rCommandURL ); -} - -//-------------------------------------------------------------------- - sal_Bool SfxPopupWindow::Close() { m_bFloating = sal_False; @@ -1439,11 +1409,6 @@ void SfxPopupWindow::StartCascading() m_bCascading= sal_True; } -void SfxPopupWindow::EndCascading() -{ - m_bCascading = sal_False; -} - //-------------------------------------------------------------------- SfxPopupWindow* SfxPopupWindow::Clone() const diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx index 16fd68505ad9..1514c574c644 100644 --- a/sfx2/source/view/viewfac.cxx +++ b/sfx2/source/view/viewfac.cxx @@ -44,12 +44,6 @@ SfxViewShell *SfxViewFactory::CreateInstance(SfxViewFrame *pFrame, SfxViewShell return (*fnCreate)(pFrame, pOldSh); } -void SfxViewFactory::InitFactory() -{ - DBG_CHKTHIS(SfxViewFactory, 0); - (*fnInit)(); -} - String SfxViewFactory::GetLegacyViewName() const { ::rtl::OUStringBuffer aViewName; diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx index a71332b3108b..32a7cdb23e6a 100644 --- a/sot/inc/sot/storage.hxx +++ b/sot/inc/sot/storage.hxx @@ -137,9 +137,6 @@ public: SotStorage( sal_Bool bUCBStorage, const String &, StreamMode = STREAM_STD_READWRITE, StorageMode = 0 ); - SotStorage( const ::ucbhelper::Content& rContent, const String &, - StreamMode = STREAM_STD_READWRITE, - StorageMode = 0 ); SotStorage( BaseStorage * ); SotStorage( SvStream & rStm ); SotStorage( sal_Bool bUCBStorage, SvStream & rStm ); @@ -214,9 +211,6 @@ public: SotStorage * OpenUCBStorage( const String & rEleName, StreamMode = STREAM_STD_READWRITE, StorageMode = STORAGE_TRANSACTED ); - SotStorage * OpenOLEStorage( const String & rEleName, - StreamMode = STREAM_STD_READWRITE, - StorageMode = STORAGE_TRANSACTED ); // Abfrage auf Storage oder Stream virtual sal_Bool IsStream( const String & rEleName ) const; virtual sal_Bool IsStorage( const String & rEleName ) const; diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 3d99b0ad2f6f..d2e3cd701ab5 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -502,20 +502,6 @@ SotStorage::SotStorage() #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <ucbhelper/content.hxx> -SotStorage::SotStorage( const ::ucbhelper::Content& rContent, const String & rName, StreamMode nMode, StorageMode nStorageMode ) - INIT_SotStorage() -{ - m_aName = rName; // Namen merken - m_pOwnStg = new UCBStorage( rContent, m_aName, nMode, (nStorageMode & STORAGE_TRANSACTED) ? sal_False : sal_True ); - - SetError( m_pOwnStg->GetError() ); - - if ( IsOLEStorage() ) - m_nVersion = SOFFICE_FILEFORMAT_50; - - SignAsRoot( m_pOwnStg->IsRoot() ); -} - SotStorage::SotStorage( const String & rName, StreamMode nMode, StorageMode nStorageMode ) INIT_SotStorage() { @@ -1067,27 +1053,6 @@ SotStorage * SotStorage::OpenUCBStorage( const String & rEleName, return pStor; } -SotStorage * SotStorage::OpenOLEStorage( const String & rEleName, - StreamMode nMode, - StorageMode nStorageMode ) -{ - SotStorage * pStor = NULL; - DBG_ASSERT( Owner(), "must be owner" ); - if( m_pOwnStg ) - { - nMode |= STREAM_SHARE_DENYALL; - ErrCode nE = m_pOwnStg->GetError(); - BaseStorage * p = m_pOwnStg->OpenOLEStorage( rEleName, nMode, - (nStorageMode & STORAGE_TRANSACTED) ? sal_False : sal_True ); - pStor = new SotStorage( p ); - if( !nE ) - m_pOwnStg->ResetError(); // kein Fehler setzen - } - else - SetError( SVSTREAM_GENERALERROR ); - return pStor; -} - /************************************************************************* |* SotStorage::IsStream() |* SotStorage::IsStorage() diff --git a/svl/inc/svl/rectitem.hxx b/svl/inc/svl/rectitem.hxx index 31f5717ee1f1..0d0119ff24a0 100644 --- a/svl/inc/svl/rectitem.hxx +++ b/svl/inc/svl/rectitem.hxx @@ -47,7 +47,6 @@ public: TYPEINFO(); SfxRectangleItem(); SfxRectangleItem( sal_uInt16 nWhich, const Rectangle& rVal ); - SfxRectangleItem( sal_uInt16 nWhich, SvStream & ); SfxRectangleItem( const SfxRectangleItem& ); ~SfxRectangleItem() { DBG_DTOR(SfxRectangleItem, 0); } diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx index 3aa181d5cf7d..18dff4091205 100644 --- a/svl/inc/svl/slstitm.hxx +++ b/svl/inc/svl/slstitm.hxx @@ -75,7 +75,6 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; - void Sort( sal_Bool bAscending = sal_True); virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index 5a7899ffb693..1f809bc2f92a 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -362,8 +362,6 @@ public: TYPEINFO(); SfxStyleSheetHintExtended( - sal_uInt16, const String& rOld ); - SfxStyleSheetHintExtended( sal_uInt16, const String& rOld, SfxStyleSheetBase& ); const String& GetOldName() { return aName; } diff --git a/svl/inc/svl/szitem.hxx b/svl/inc/svl/szitem.hxx index b3b78d9e8891..a02ee3cfcfeb 100644 --- a/svl/inc/svl/szitem.hxx +++ b/svl/inc/svl/szitem.hxx @@ -48,7 +48,6 @@ public: TYPEINFO(); SfxSizeItem(); SfxSizeItem( sal_uInt16 nWhich, const Size& rVal ); - SfxSizeItem( sal_uInt16 nWhich, SvStream & ); SfxSizeItem( const SfxSizeItem& ); ~SfxSizeItem() { DBG_DTOR(SfxSizeItem, 0); } diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index ddf19201e63b..2b782d40a5d4 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -64,15 +64,6 @@ SfxRectangleItem::SfxRectangleItem( sal_uInt16 nW, const Rectangle& rVal ) : // ----------------------------------------------------------------------- -SfxRectangleItem::SfxRectangleItem( sal_uInt16 nW, SvStream &rStream ) : - SfxPoolItem( nW ) -{ - DBG_CTOR(SfxRectangleItem, 0); - rStream >> aVal; -} - -// ----------------------------------------------------------------------- - SfxRectangleItem::SfxRectangleItem( const SfxRectangleItem& rItem ) : SfxPoolItem( rItem ), aVal( rItem.aVal ) diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 74239d48546e..ffaaf8390d6a 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -332,15 +332,6 @@ int SfxStringListItem::IsPoolable() const #endif -//------------------------------------------------------------------------ - -void SfxStringListItem::Sort( sal_Bool bAscending) -{ - DBG_ASSERT(GetRefCount()==0,"Sort:RefCount!=0"); - if( pImp ) - pImp->Sort( bAscending); -} - //---------------------------------------------------------------------------- void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< rtl::OUString >& rList ) { diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 1250451a2db1..1830f25a2f5a 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -83,14 +83,6 @@ TYPEINIT1(SfxStyleSheetPoolHint, SfxHint); SfxStyleSheetHintExtended::SfxStyleSheetHintExtended ( sal_uInt16 nAction, // SFX_STYLESHEET_... (s.o.) - const String& rOldName -) -: SfxStyleSheetHint( nAction ), - aName( rOldName ) -{} -SfxStyleSheetHintExtended::SfxStyleSheetHintExtended -( - sal_uInt16 nAction, // SFX_STYLESHEET_... (s.o.) const String& rOldName, SfxStyleSheetBase& rStyleSheet // geh"ort weiterhin dem Aufrufer ) diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index 4bb7238c9b76..720db8f911e2 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -64,15 +64,6 @@ SfxSizeItem::SfxSizeItem( sal_uInt16 nW, const Size& rVal ) : // ----------------------------------------------------------------------- -SfxSizeItem::SfxSizeItem( sal_uInt16 nW, SvStream &rStream ) : - SfxPoolItem( nW ) -{ - DBG_CTOR(SfxSizeItem, 0); - rStream >> aVal; -} - -// ----------------------------------------------------------------------- - SfxSizeItem::SfxSizeItem( const SfxSizeItem& rItem ) : SfxPoolItem( rItem ), aVal( rItem.aVal ) diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx index 75422e4b185e..37d8e2fc3f26 100644 --- a/svtools/inc/svtools/fileview.hxx +++ b/svtools/inc/svtools/fileview.hxx @@ -85,8 +85,6 @@ private: ::com::sun::star::uno::Sequence< ::rtl::OUString > mpBlackList; - SVT_DLLPRIVATE void OpenFolder( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aContents ); - DECL_DLLPRIVATE_LINK( HeaderSelect_Impl, HeaderBar * ); DECL_DLLPRIVATE_LINK( HeaderEndDrag_Impl, HeaderBar * ); @@ -186,7 +184,6 @@ public: ); void SetNoSelection(); - void ResetCursor(); void SetSelectHdl( const Link& rHdl ); void SetDoubleClickHdl( const Link& rHdl ); diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index f9267dea728a..404c667a8069 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1283,59 +1283,6 @@ SvtFileView::~SvtFileView() // ----------------------------------------------------------------------- -void SvtFileView::OpenFolder( const Sequence< OUString >& aContents ) -{ - mpImp->mpView->ClearAll(); - const OUString* pFileProperties = aContents.getConstArray(); - sal_uInt32 i, nCount = aContents.getLength(); - for ( i = 0; i < nCount; ++i ) - { - String aRow( pFileProperties[i] ); - // extract columns - // the columns are: title, type, size, date, target url, is folder, image url - String aTitle, aType, aSize, aDate, aURL, aImageURL; - xub_StrLen nIdx = 0; - aTitle = aRow.GetToken( 0, '\t', nIdx ); - aType = aRow.GetToken( 0, '\t', nIdx ); - aSize = aRow.GetToken( 0, '\t', nIdx ); - aDate = aRow.GetToken( 0, '\t', nIdx ); - aURL = aRow.GetToken( 0, '\t', nIdx ); - sal_Unicode cFolder = aRow.GetToken( 0, '\t', nIdx ).GetChar(0); - sal_Bool bIsFolder = ( '1' == cFolder ); - if ( nIdx != STRING_NOTFOUND ) - aImageURL = aRow.GetToken( 0, '\t', nIdx ); - - if ( mpImp->mbOnlyFolder && !bIsFolder ) - continue; - - // build new row - String aNewRow = aTitle; - aNewRow += '\t'; - aNewRow += aType; - aNewRow += '\t'; - aNewRow += aSize; - aNewRow += '\t'; - aNewRow += aDate; - // detect image - sal_Bool bDoInsert = sal_True; - INetURLObject aObj( aImageURL.Len() > 0 ? aImageURL : aURL ); - Image aImage = SvFileInformationManager::GetImage( aObj, sal_False ); - - if ( bDoInsert ) - { - // insert entry and set user data - SvLBoxEntry* pEntry = mpImp->mpView->InsertEntry( aNewRow, aImage, aImage, NULL ); - SvtContentEntry* pUserData = new SvtContentEntry( aURL, bIsFolder ); - pEntry->SetUserData( pUserData ); - } - } - - mpImp->InitSelection(); - mpImp->ResetCursor(); -} - -// ----------------------------------------------------------------------- - String SvtFileView::GetURL( SvLBoxEntry* pEntry ) const { String aURL; @@ -1568,13 +1515,6 @@ void SvtFileView::GetFocus() // ----------------------------------------------------------------------- -void SvtFileView::ResetCursor() -{ - mpImp->ResetCursor(); -} - -// ----------------------------------------------------------------------- - void SvtFileView::SetSelectHdl( const Link& rHdl ) { mpImp->SetSelectHandler( rHdl ); diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx index ebc0e393c0de..248eafa5a027 100644 --- a/svtools/source/contnr/templwin.hxx +++ b/svtools/source/contnr/templwin.hxx @@ -149,7 +149,6 @@ public: inline void SetSelectHdl( const Link& rLink ) { aFileView.SetSelectHdl( rLink ); } inline void SetDoubleClickHdl( const Link& rLink ) { aFileView.SetDoubleClickHdl( rLink ); } inline void SetNewFolderHdl( const Link& rLink ) { aNewFolderLink = rLink; } - inline void ResetCursor() { aFileView.ResetCursor(); } inline sal_Bool IsTemplateFolder() const { return bIsTemplateFolder; } inline String GetFolderURL() const { return aFolderURL; } inline String GetRootURL() const { return aCurrentRootURL; } diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx index db15ceff56dd..4ae2bc89847e 100644 --- a/svx/inc/svx/charmap.hxx +++ b/svx/inc/svx/charmap.hxx @@ -84,9 +84,6 @@ public: sal_uInt16 GetRowPos(sal_uInt16 _nPos) const; sal_uInt16 GetColumnPos(sal_uInt16 _nPos) const; - void ImplFireAccessibleEvent( short nEventId, - const ::com::sun::star::uno::Any& rOldValue, - const ::com::sun::star::uno::Any& rNewValue ); ScrollBar* getScrollBar(); void ReleaseAccessible(); sal_Int32 getMaxCharCount() const; diff --git a/svx/inc/svx/drawitem.hxx b/svx/inc/svx/drawitem.hxx index ae864cc442af..42fbfd2bcd35 100644 --- a/svx/inc/svx/drawitem.hxx +++ b/svx/inc/svx/drawitem.hxx @@ -202,7 +202,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XDashList* GetDashList() const { return pDashList; } - void SetDashList( XDashList* pList ); }; diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index fb12e3443a02..9867707a80ed 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -49,7 +49,6 @@ protected: virtual long PreNotify( NotifyEvent& rNEvt ); public: - SvxSimpleTableContainer( Window* pParent, WinBits nWinStyle = WB_BORDER ); SvxSimpleTableContainer( Window* pParent, const ResId& rResId ); void SetTable(SvxSimpleTable* pTable); diff --git a/svx/inc/svx/txencbox.hxx b/svx/inc/svx/txencbox.hxx index 7358e19c842a..c1bce0acaca6 100644 --- a/svx/inc/svx/txencbox.hxx +++ b/svx/inc/svx/txencbox.hxx @@ -104,16 +104,12 @@ public: const String& rEntry, sal_uInt16 nPos = LISTBOX_APPEND ); - void RemoveTextEncoding( const rtl_TextEncoding nEnc ); - void SelectTextEncoding( const rtl_TextEncoding nEnc, sal_Bool bSelect = sal_True ); rtl_TextEncoding GetSelectTextEncoding() const; const String& GetSelectTextString() const; - - sal_Bool IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const; }; #endif diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 5f1a2a6c1ab0..517d5c6cbf5e 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -689,12 +689,7 @@ void SvxShowCharSet::ReleaseAccessible() return aFind->second; } -// ----------------------------------------------------------------------------- -void SvxShowCharSet::ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue ) -{ - if( m_pAccessible ) - m_pAccessible->fireEvent( nEventId, rOldValue, rNewValue ); -} + // ----------------------------------------------------------------------------- ScrollBar* SvxShowCharSet::getScrollBar() { diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx index 1e101266d7f3..9e79c545ce8e 100644 --- a/svx/source/dialog/simptabl.cxx +++ b/svx/source/dialog/simptabl.cxx @@ -39,13 +39,6 @@ // SvxSimpleTableContainer ------------------------------------------------------ -SvxSimpleTableContainer::SvxSimpleTableContainer(Window* pParent, WinBits nStyle) - : Control(pParent, nStyle) - , m_pTable(NULL) -{ - SetBorderStyle(WINDOW_BORDER_NOBORDER); -} - SvxSimpleTableContainer::SvxSimpleTableContainer( Window* pParent, const ResId& rResId) : Control(pParent, rResId) , m_pTable(NULL) diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 99e8fc8911dd..27f679658c5b 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -212,16 +212,6 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_uI //------------------------------------------------------------------------ -void SvxTextEncodingBox::RemoveTextEncoding( const rtl_TextEncoding nEnc ) -{ - sal_uInt16 nAt = EncodingToPos_Impl( nEnc ); - - if ( nAt != LISTBOX_ENTRY_NOTFOUND ) - RemoveEntry( nAt ); -} - -//------------------------------------------------------------------------ - rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const { sal_uInt16 nPos = GetSelectEntryPos(); @@ -242,16 +232,4 @@ void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, sal_Bo SelectEntryPos( nAt, bSelect ); } -//------------------------------------------------------------------------ - -sal_Bool SvxTextEncodingBox::IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const -{ - sal_uInt16 nAt = EncodingToPos_Impl( nEnc ); - - if ( nAt != LISTBOX_ENTRY_NOTFOUND ) - return IsEntryPosSelected( nAt ); - else - return sal_False; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index d19325d5b387..50b2b9561621 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -468,13 +468,6 @@ bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 return false; } -// ----------------------------------------------------------------------- - -void SvxDashListItem::SetDashList( XDashList* pList ) -{ - pDashList = pList; -} - //================================================================== // // SvxLineEndListItem diff --git a/unusedcode.easy b/unusedcode.easy index d5fc25fafdd3..c67fa1e35811 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -899,12 +899,6 @@ SfxMacroStatement::SfxMacroStatement(String const&, SfxSlot const&, unsigned cha SfxMailModel::GetCount() const SfxMedium::GetHdl() SfxMedium::GetReferer() const -SfxMenuControl::CreateControl(String const&, unsigned short, Menu&, SfxBindings&, SfxVirtualMenu*) -SfxMenuControl::RemovePopup() -SfxMenuControl::SetOwnMenu(SfxVirtualMenu*) -SfxModelessDialog::SfxModelessDialog(SfxBindings*, SfxChildWindow*, Window*, long) -SfxModule::IsActive() const -SfxModule::RegisterChildWindowContext(unsigned short, SfxChildWinContextFactory*) SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short) SfxNavigatorWrapper::GetChildWindowId() SfxObjectShell::Count() @@ -918,29 +912,20 @@ SfxOleString16Property::SfxOleString16Property(int, String const&) SfxOrganizeDlg_Impl::OkHdl(Button*) SfxPartChildWnd_Impl::GetChildWindowId() SfxPasswordDialog::SetMaxLen(unsigned short) -SfxPopupWindow::EndCascading() SfxPopupWindow::LinkStubDelete(void*, void*) SfxPopupWindow::RemoveStatusListener(rtl::OUString const&) -SfxPopupWindow::SfxPopupWindow(unsigned short, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&, Window*, ResId const&) -SfxPopupWindow::UpdateStatus(rtl::OUString const&) -SfxPreviewWin::SfxPreviewWin(Window*, ResId const&, SfxObjectShellLock&) SfxProgress::GetWaitMode() const SfxProgress::Lock() SfxProgress::SetWaitMode(unsigned char) -SfxPtrArr::Replace(void*, void*) SfxRangeItem::SfxRangeItem(unsigned short, SvStream&) SfxRecordingFloatWrapper_Impl::GetChildWindowId() -SfxRectangleItem::SfxRectangleItem(unsigned short, SvStream&) SfxRequest::IsRecording() const SfxRequest::SetTarget(String const&) SfxShell::GetBroadcaster() SfxShell::RemoveItem(unsigned short) SfxSingleTabDialog::GetInputRanges(SfxItemPool const&) -SfxSizeItem::SfxSizeItem(unsigned short, SvStream&) SfxSlotPool::NextInterface() -SfxStringListItem::Sort(unsigned char) SfxStyleSheet::SfxStyleSheet() -SfxStyleSheetHintExtended::SfxStyleSheetHintExtended(unsigned short, String const&) SfxTabDialog::FillOutputItemSet() SfxTabDialog::GetApplyButton() SfxTabDialog::GetApplyButton() const @@ -971,7 +956,6 @@ SfxUShortRangesItem::SfxUShortRangesItem(unsigned short, unsigned short const*) SfxUnoMenuControl::Select() SfxUnoStyleSheet::SfxUnoStyleSheet(SfxStyleSheet const&) SfxVersionTableDtor::GetVersions() const -SfxViewFactory::InitFactory() SfxViewFactory::~SfxViewFactory() SfxViewFrame::Hide() SfxViewShell::PlugInsActive() const @@ -996,8 +980,6 @@ SotExchange::GetExchangeAction(com::sun::star::uno::Reference<com::sun::star::da SotFactory::TestInvariant() SotObject::RemoveOwnerLock() SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&) -SotStorage::OpenOLEStorage(String const&, unsigned short, short) -SotStorage::SotStorage(ucbhelper::Content const&, String const&, unsigned short, short) SourceTreeIterator::EndExecute() SpinButton::SpinButton(Window*, ResId const&) SplitWindow::CalcWindowSizePixel(Size const&, WindowAlign, long, unsigned char) @@ -1093,13 +1075,6 @@ SvUnoAttributeContainer::getImplementation(com::sun::star::uno::Reference<com::s SvXMLAttributeList::SetAttributeList(com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&) SvXMLAutoStylePoolNamesP_Impl::GetPos(rtl::OUString const*) const SvXMLAutoStylePoolNamesP_Impl::Remove(rtl::OUString*) -SvXMLAutoStylePoolP::Add(rtl::OUString&, int, std::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&) -SvXMLAutoStylePoolP::AddAndCache(int, rtl::OUString const&) -SvXMLAutoStylePoolP::AddAndCache(int, rtl::OUString const&, std::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&) -SvXMLAutoStylePoolP::AddAndCache(int, std::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&) -SvXMLAutoStylePoolP::Find(int, std::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&) const -SvXMLAutoStylePoolP::FindAndRemoveCached(int) const -SvXMLAutoStylePoolP::SvXMLAutoStylePoolP() SvXMLAutoStylePoolParentsP_Impl::GetPos(SvXMLAutoStylePoolParentP_Impl const*) const SvXMLAutoStylePoolParentsP_Impl::Remove(SvXMLAutoStylePoolParentP_Impl*) SvXMLElementExport::SvXMLElementExport(SvXMLExport&, unsigned char, unsigned short, char const*, unsigned char, unsigned char) @@ -1155,8 +1130,6 @@ SvtExtendedSecurityOptions::GetSecureExtensionList() const SvtExtendedSecurityOptions::IsOpenHyperlinkModeReadOnly() const SvtExtendedSecurityOptions::IsSecureHyperlink(rtl::OUString const&) const SvtExtendedSecurityOptions::SetOpenHyperlinkMode(SvtExtendedSecurityOptions::OpenHyperlinkMode) -SvtFileView::OpenFolder(com::sun::star::uno::Sequence<rtl::OUString> const&) -SvtFileView::ResetCursor() SvtFilterOptions::SetUseEnhancedFields(unsigned char) SvtFontOptions::EnableReplacementTable(unsigned char) SvtFontOptions::IsReplacementTableEnabled() const @@ -1293,7 +1266,6 @@ SvxContourDlg::SetGraphic(Graphic const&) SvxContourDlg::SetGraphicLinked(unsigned char) SvxContourDlg::SetPolyPolygon(PolyPolygon const&) SvxContourDlgChildWindow::UpdateContourDlg(Graphic const&, unsigned char, PolyPolygon const*, void*) -SvxDashListItem::SetDashList(XDashList*) SvxDoCapitals::Do(String const&, unsigned short, unsigned short, unsigned char) SvxDrawOutlinerViewForwarder::SetShapePos(Point const&) SvxDrawPage::GetPageForSdrPage(SdrPage*) @@ -1382,10 +1354,8 @@ SvxShape::getMaster() SvxShape::getMaster() const SvxShapePolyPolygonBezier::GetPolygonKind() const SvxShapeText::SvxShapeText() -SvxShowCharSet::ImplFireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&) SvxSimpleTable::ClearAll() SvxSimpleTable::TableToTop() -SvxSimpleTableContainer::SvxSimpleTableContainer(Window*, long) SvxStringArray::GetStringByType(long) const SvxStringArray::GetValueByStr(String const&) const SvxSuperContourDlg::DoAutoCreate() @@ -1400,8 +1370,6 @@ SvxTabStopArr_SAR::Replace(SvxTabStop const&, unsigned short) SvxTabStopArr_SAR::Replace(SvxTabStop const*, unsigned short, unsigned short) SvxTabStopArr_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(SvxTabStop const&, void*), void*) SvxTextEditSource::GetSdrObject() const -SvxTextEncodingBox::IsTextEncodingSelected(unsigned short) const -SvxTextEncodingBox::RemoveTextEncoding(unsigned short) SvxUnoFontDescriptor::getPropertyState(SfxItemSet const&) SvxUnoTextBase::InsertField(SvxFieldItem const&) SvxUnoTextBase::SvxUnoTextBase(SvxEditSource const*, SvxItemPropertySet const*) @@ -1567,7 +1535,6 @@ TEWritingDirectionInfos::Insert(TEWritingDirectionInfos const*, unsigned short, TEWritingDirectionInfos::Replace(TEWritingDirectionInfo const&, unsigned short) TEWritingDirectionInfos::Replace(TEWritingDirectionInfo const*, unsigned short, unsigned short) TEWritingDirectionInfos::_ForEach(unsigned short, unsigned short, unsigned char (*)(TEWritingDirectionInfo const&, void*), void*) -TPGalleryThemeProperties::LinkStubClickCloseBrowserHdl(void*, void*) TTBasic::CreateMyBasic() TTProfiler::Dec(unsigned long) TTProperties::Img(Bitmap*) diff --git a/xmloff/inc/xmloff/xmlaustp.hxx b/xmloff/inc/xmloff/xmlaustp.hxx index 1eb26a766e90..ba7783476d94 100644 --- a/xmloff/inc/xmloff/xmlaustp.hxx +++ b/xmloff/inc/xmloff/xmlaustp.hxx @@ -76,7 +76,6 @@ public: SvXMLAutoStylePoolP( SvXMLExport& rExport); - SvXMLAutoStylePoolP(); virtual ~SvXMLAutoStylePoolP(); SvXMLExport& GetExport() const; @@ -107,7 +106,6 @@ public: /// Add an item set to the pool and return its generated name. ::rtl::OUString Add( sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties ); ::rtl::OUString Add( sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties, bool bDontSeek = false ); - sal_Bool Add( ::rtl::OUString& rName, sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties ); sal_Bool Add( ::rtl::OUString& rName, sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ); /// Add an item set with a pre-defined name (needed for saving sheets separately in Calc). @@ -115,16 +113,8 @@ public: const ::std::vector< XMLPropertyState >& rProperties ); /// Find an item set's name. - ::rtl::OUString Find( sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties ) const; ::rtl::OUString Find( sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) const; - // Add a property set to the pool and cache its name. - ::rtl::OUString AddAndCache( sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties ); - ::rtl::OUString AddAndCache( sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ); - ::rtl::OUString AddAndCache( sal_Int32 nFamily, const ::rtl::OUString& rParent ); - - ::rtl::OUString FindAndRemoveCached( sal_Int32 nFamily ) const; - /** Export all item sets ofs a certain class in the order in that they have been added. */ void exportXML( sal_Int32 nFamily , const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index 669a4a169531..7f6efeb92e56 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -277,12 +277,6 @@ void SvXMLAutoStylePoolP::exportStyleContent( } } -SvXMLAutoStylePoolP::SvXMLAutoStylePoolP() -{ - OSL_FAIL("This constuctor is obsoleted and should not be used!"); - pImpl = NULL; -} - SvXMLAutoStylePoolP::SvXMLAutoStylePoolP( SvXMLExport& rExport ) { pImpl = new SvXMLAutoStylePoolP_Impl( rExport ); @@ -366,12 +360,6 @@ OUString SvXMLAutoStylePoolP::Add( sal_Int32 nFamily, return sName; } -sal_Bool SvXMLAutoStylePoolP::Add(OUString& rName, sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties ) -{ - OUString sEmpty; - return pImpl->Add(rName, nFamily, sEmpty, rProperties); -} - sal_Bool SvXMLAutoStylePoolP::Add(OUString& rName, sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) { return pImpl->Add(rName, nFamily, rParent, rProperties); @@ -384,37 +372,6 @@ sal_Bool SvXMLAutoStylePoolP::AddNamed( const OUString& rName, sal_Int32 nFamily return pImpl->AddNamed(rName, nFamily, rParent, rProperties); } -OUString SvXMLAutoStylePoolP::AddAndCache( sal_Int32 nFamily, - const vector< XMLPropertyState >& rProperties ) -{ - OUString sEmpty; - OUString sName; - pImpl->Add(sName, nFamily, sEmpty, rProperties, sal_True ); - return sName; -} - -OUString SvXMLAutoStylePoolP::AddAndCache( sal_Int32 nFamily, - const OUString& rParent, - const vector< XMLPropertyState >& rProperties ) -{ - OUString sName; - pImpl->Add(sName, nFamily, rParent, rProperties, sal_True ); - return sName; -} - -OUString SvXMLAutoStylePoolP::AddAndCache( sal_Int32 nFamily, - const OUString& rParent ) -{ - return pImpl->AddToCache( nFamily, rParent ); -} - -OUString SvXMLAutoStylePoolP::Find( sal_Int32 nFamily, - const vector< XMLPropertyState >& rProperties ) const -{ - OUString sEmpty; - return pImpl->Find( nFamily, sEmpty, rProperties ); -} - OUString SvXMLAutoStylePoolP::Find( sal_Int32 nFamily, const OUString& rParent, const vector< XMLPropertyState >& rProperties ) const @@ -422,12 +379,6 @@ OUString SvXMLAutoStylePoolP::Find( sal_Int32 nFamily, return pImpl->Find( nFamily, rParent, rProperties ); } -OUString SvXMLAutoStylePoolP::FindAndRemoveCached( sal_Int32 nFamily ) const -{ - return pImpl->FindAndRemoveCached( nFamily ); -} - - void SvXMLAutoStylePoolP::exportXML( sal_Int32 nFamily, const uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > &, const SvXMLUnitConverter&, |