diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-24 22:31:19 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-25 09:42:06 +0100 |
commit | ac1530a37e4544378c22c9358e57ca8a596c1aa8 (patch) | |
tree | b9380514932038897631b6e9f7e509c4fc7f8129 /sfx2/source | |
parent | 798496c5be43771ee478a0ee4288188b28583a8d (diff) |
callcatcher: yet more unused code
Diffstat (limited to 'sfx2/source')
-rw-r--r-- | sfx2/source/appl/module.cxx | 31 | ||||
-rw-r--r-- | sfx2/source/bastyp/minarray.cxx | 20 | ||||
-rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 19 | ||||
-rw-r--r-- | sfx2/source/doc/new.cxx | 52 | ||||
-rw-r--r-- | sfx2/source/menu/mnuitem.cxx | 21 | ||||
-rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 35 | ||||
-rw-r--r-- | sfx2/source/view/viewfac.cxx | 6 |
7 files changed, 0 insertions, 184 deletions
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; |