diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-02 13:50:43 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-03-19 10:45:00 +0200 |
commit | 5133b27e638140ba574016b33dae70ca92edc323 (patch) | |
tree | 8c113b072c017a2beb6b96fa144c7ccb399373f5 /sfx2/source | |
parent | 062e40c76bcab664907737feace74f134a25c29c (diff) |
loplugin:constantfunction: sfx2
Change-Id: I7b4c18b1f9644048f506fc1b1d1fb8c8c590ea7f
Diffstat (limited to 'sfx2/source')
31 files changed, 14 insertions, 303 deletions
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 270ef7aa28a7..28a709f707cd 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -258,7 +258,6 @@ bool SfxApplication::Initialize_Impl() // Subklasse initialisieren pAppData_Impl->bDowning = false; - Init(); // get CHAOS item pool... pAppData_Impl->pPool = NoChaos::GetItemPool(); diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index 9f97c007a489..8bbd1974e971 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -46,52 +46,6 @@ TYPEINIT2(SfxApplication,SfxShell,SfxBroadcaster); -void SfxApplication::Init -( -) - -/* [Description] - - This virtual method is called from SFx through Application::Main(), - before Execute() is called and: - - the Intro is already displayed, - - the Applications window exists, but it is still hidden, - - the Bindings already exist (Controller can be registered), - - the Init and Config-Manager already exists, - - the Standard-Controller already exists, - - the SFx-Shells have alredy registered their Interfaces. - - [Cross-reference] - - <SfxApplication::Exit()> - <SfxApplication::OpenClients()> -*/ -{ -} - - - -void SfxApplication::Exit() - -/* [Description] - - This virtual method is called from SFx through Application::Main(), - after Execute() has finished and - - the configuration (SfxConfigManager) was already saved, - - the window positions etc. in the SfxIniManager were written, - - the Application window still exists, but is hidden - - all Documents and their Views already are closed. - - Dispatcher, Bindings etc. already destroyed. - - [Cross-reference] - <SfxApplication::Init(int,char*[])> -*/ - -{ -} - - - SfxFilterMatcher& SfxApplication::GetFilterMatcher() { if( !pAppData_Impl->pMatcher ) diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 5983cfc3fc4a..e49675d7f4a9 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -90,9 +90,6 @@ void SfxApplication::Deinitialize() pAppData_Impl->bDowning = true; pAppData_Impl->pAppDispat->DoDeactivate_Impl( true, NULL ); - // call derived application-exit - Exit(); - // Release Controller and others // then the remaining components should also disappear ( Beamer! ) diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 90f5e428aa77..6e19bb762b83 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -543,11 +543,6 @@ void SfxChildWindowContext::Resizing( Size& ) { } -bool SfxChildWindowContext::Close() -{ - return true; -} - void SfxChildWindow::SetFactory_Impl( SfxChildWinFactory *pF ) { pImp->pFact = pF; diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index c58c2d8128f3..7ea881fa76a8 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -136,10 +136,6 @@ TYPEINIT1(SfxModule, SfxShell); SFX_IMPL_SUPERCLASS_INTERFACE(SfxModule, SfxShell) -void SfxModule::InitInterface_Impl() -{ -} - ResMgr* SfxModule::GetResMgr() { return pResMgr; diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 9b22f4e7857e..b002aabcefb6 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -300,9 +300,6 @@ void SfxBindings::DeleteControllers_Impl() SfxStateCache *pCache = (*pImp->pCaches)[nCache]; sal_uInt16 nSlotId = pCache->GetId(); - // Delete SfxPopupWindow - pCache->DeleteFloatingWindows(); - // Re-align, because the cache may have been reduced sal_uInt16 nNewCount = pImp->pCaches->size(); if ( nNewCount < nCount ) @@ -385,8 +382,6 @@ void SfxBindings::HidePopupCtrls_Impl( bool bHide ) pImp->ePopupAction = SFX_POPUP_SHOW; } - for(SfxStateCacheArr_Impl::const_iterator it = pImp->pCaches->begin(); it != pImp->pCaches->end(); ++it) - (*it)->DeleteFloatingWindows(); pImp->ePopupAction = SFX_POPUP_DELETE; } diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index c602e443b457..c1fa1624daa5 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -260,12 +260,6 @@ void SfxControllerItem::StateChanged -void SfxControllerItem::DeleteFloatingWindow() -{ -} - - - void SfxStatusForwarder::StateChanged ( sal_uInt16 nSID, // <SID> of the triggering slot diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 16cca9d30ea2..bf6e77f738f7 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -692,8 +692,6 @@ void SfxDispatcher::DoActivate_Impl(bool bMDI, SfxViewFrame* /* pOld */) void SfxDispatcher::DoParentActivate_Impl() { - for ( int i = int(xImp->aStack.size()) - 1; i >= 0; --i ) - (*(xImp->aStack.rbegin() + i ))->ParentActivate(); } /** This method controls the deactivation of a dispatcher. @@ -775,8 +773,6 @@ void SfxDispatcher::DoDeactivate_Impl(bool bMDI, SfxViewFrame* pNew) void SfxDispatcher::DoParentDeactivate_Impl() { - for ( int i = int(xImp->aStack.size()) - 1; i >= 0; --i ) - (*(xImp->aStack.rbegin() + i))->ParentDeactivate(); } /** This method searches in SfxDispatcher after <SfxShell> , from the Slot Id @@ -1658,22 +1654,7 @@ bool SfxDispatcher::_TryIntercept_Impl sal_uInt16 nLevels = xImp->aStack.size(); while ( pParent && pParent->xImp->pFrame ) { - if ( pParent->xImp->pFrame->GetFrame().HasComponent() ) - { - // Components may be intercepted - if ( pParent->_TryIntercept_Impl( nSlot, rServer, true ) ) - { - // The own shells are added to the Shell Level - rServer.SetShellLevel( rServer.GetShellLevel() + nLevels ); - return true; - } - else - // No further Interception - break; - } - else - nLevels = nLevels + pParent->xImp->aStack.size(); - + nLevels = nLevels + pParent->xImp->aStack.size(); pParent = pParent->xImp->pParent; } diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 3d28d8045396..b055444c1808 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -395,18 +395,6 @@ void SfxShell::Deactivate BroadcastContextForActivation(false); } -void SfxShell::ParentActivate -( -) -{ -} - -void SfxShell::ParentDeactivate -( -) -{ -} - bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot ) { // Get Slot status diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 9a679e66853a..553cf4a1b645 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -478,19 +478,6 @@ void SfxStateCache::SetCachedState( bool bAlways ) -// Destroy FloatingWindows in all Controls with this Id - -void SfxStateCache::DeleteFloatingWindows() -{ - - SfxControllerItem *pNextCtrl=0; - for ( SfxControllerItem *pCtrl=pController; pCtrl; pCtrl=pNextCtrl ) - { - pNextCtrl = pCtrl->GetItemLink(); - pCtrl->DeleteFloatingWindow(); - } -} - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SfxStateCache::GetDispatch() const { if ( pDispatch ) diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 45bd65e95774..d355efacaba5 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -241,16 +241,6 @@ void SfxUnoControllerItem::GetNewDispatch() // parent may intercept xDisp = TryGetDispatch( pParent ); - // only components may intercept - if ( !xDisp.is() && pFrame->HasComponent() ) - { - // no interception - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame = pFrame->GetFrameInterface(); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > xProv( xFrame, ::com::sun::star::uno::UNO_QUERY ); - if ( xProv.is() ) - xDisp = xProv->queryDispatch( aCommand, OUString(), 0 ); - } - return xDisp; } @@ -611,7 +601,6 @@ class UsageInfo { public: UsageInfo() { - load(); } ~UsageInfo() @@ -622,9 +611,6 @@ public: /// Increment command's use. void increment(const OUString &rCommand); - /// Load the usage data from the previous session. - void load(); - /// Save the usage data for the next session. void save(); }; @@ -639,11 +625,6 @@ void UsageInfo::increment(const OUString &rCommand) maUsage[rCommand] = 1; } -void UsageInfo::load() -{ - // TODO - do the real loading here -} - void UsageInfo::save() { if (!officecfg::Office::Common::Misc::CollectUsageInformation::get()) diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 5e21f99bdce8..bc0a3bf83774 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -1900,10 +1900,6 @@ void SfxDockingWindow::AutoShow_Impl( bool bShow ) } } -void SfxDockingWindow::FadeIn( bool /*bFadeIn*/ ) -{ -} - void SfxDockingWindow::StateChanged( StateChangedType nStateChange ) { if ( nStateChange == StateChangedType::INITSHOW ) diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index eb3c76e97ba9..bee29462f5ee 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -77,12 +77,8 @@ void SfxNavigator::Resizing( Size &rSize ) bool SfxNavigator::Close() { - SfxChildWindowContext *pCon = GetChildWindow_Impl()->GetContext_Impl(); - DBG_ASSERT( pCon, "No Context!" ); - if ( !pCon || pCon->Close() ) - return SfxDockingWindow::Close(); - else - return false; + DBG_ASSERT( GetChildWindow_Impl()->GetContext_Impl(), "No Context!" ); + return SfxDockingWindow::Close(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index af2c2a419818..b3fcb3dd50ca 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -226,8 +226,7 @@ bool SfxSecurityPage_Impl::FillItemSet_Impl( SfxItemSet & ) // open read-only? const bool bDoOpenReadonly = m_pOpenReadonlyCB->IsChecked(); - if (pCurDocShell->HasSecurityOptOpenReadOnly() && - bDoOpenReadonly != pCurDocShell->IsSecurityOptOpenReadOnly()) + if (bDoOpenReadonly != pCurDocShell->IsSecurityOptOpenReadOnly()) { pCurDocShell->SetSecurityOptOpenReadOnly( bDoOpenReadonly ); bModified = true; @@ -269,7 +268,7 @@ void SfxSecurityPage_Impl::Reset_Impl( const SfxItemSet & ) } bool bIsReadonly = pCurDocShell->IsReadOnly(); - if (pCurDocShell->HasSecurityOptOpenReadOnly() && !bIsHTMLDoc) + if (!bIsHTMLDoc) { m_pOpenReadonlyCB->Check( pCurDocShell->IsSecurityOptOpenReadOnly() ); m_pOpenReadonlyCB->Enable( !bIsReadonly ); diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index ca6f7be22812..9270710ae285 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -156,7 +156,6 @@ void SfxEmptySplitWin_Impl::FadeIn() if (!bAutoHide ) bAutoHide = IsFadeNoButtonMode(); pOwner->SetFadeIn_Impl( true ); - pOwner->Show_Impl(); if ( bAutoHide ) { // Set Timer to close; the caller has to ensure themselves that the @@ -1225,7 +1224,6 @@ void SfxSplitWindow::FadeOut_Impl() } SetFadeIn_Impl( false ); - Show_Impl(); } void SfxSplitWindow::FadeOut() @@ -1237,18 +1235,6 @@ void SfxSplitWindow::FadeOut() void SfxSplitWindow::FadeIn() { SetFadeIn_Impl( true ); - Show_Impl(); -} - -void SfxSplitWindow::Show_Impl() -{ - sal_uInt16 nCount = pDockArr->size(); - for ( sal_uInt16 n=0; n<nCount; n++ ) - { - const SfxDock_Impl& rDock = (*pDockArr)[n]; - if ( rDock.pWin ) - rDock.pWin->FadeIn( pEmptyWin->bFadeIn ); - } } bool SfxSplitWindow::ActivateNextChild_Impl( bool bForward ) diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 70f8c977880d..7d0bea97a369 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -1941,7 +1941,6 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *) for (; it != itEnd; ++it) { const OUString aTemplName(pTreeBox ? pTreeBox->GetEntryText(*it) : aFmtLb.GetEntryText(*it)); - PrepareDeleteAction(); bDontUpdate = true; // To prevent the Treelistbox to shut down while deleting Execute_Impl( SID_STYLE_DELETE, aTemplName, OUString(), (sal_uInt16)GetFamilyItem_Impl()->GetFamily() ); @@ -2154,12 +2153,6 @@ void SfxCommonTemplateDialog_Impl::EnableExample_Impl(sal_uInt16 nId, bool bEnab EnableItem(nId, bEnable); } -void SfxCommonTemplateDialog_Impl::PrepareDeleteAction() -{ -} - - - PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu( void ) { if ( bBindingUpdate ) diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 0af4abec2be4..d8f6cf22156f 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -1240,15 +1240,6 @@ SfxDocumentTemplates::SfxDocumentTemplates() -void SfxDocumentTemplates::Construct() - -// Delayed build-up of administrative data - -{ -} - - - SfxDocumentTemplates::~SfxDocumentTemplates() /* [Description] diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index 084bb1093c5e..e8ca9ef9209b 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -175,17 +175,6 @@ void* GraphicHelper::getWinMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta, co // static -bool GraphicHelper::supportsMetaFileHandle_Impl() -{ -#ifdef WNT - return true; -#else - return false; -#endif -} - - -// static bool GraphicHelper::getThumbnailFormatFromGDI_Impl(GDIMetaFile* pMetaFile, const uno::Reference<io::XStream>& xStream) { bool bResult = false; diff --git a/sfx2/source/doc/graphhelp.hxx b/sfx2/source/doc/graphhelp.hxx index c0c3ed1c7747..30201edcbbac 100644 --- a/sfx2/source/doc/graphhelp.hxx +++ b/sfx2/source/doc/graphhelp.hxx @@ -38,7 +38,14 @@ public: static void* getWinMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta, const Size& aMetaSize ); - static bool supportsMetaFileHandle_Impl(); + static bool supportsMetaFileHandle_Impl() + { +#ifdef WNT + return true; +#else + return false; +#endif + } static bool getThumbnailFormatFromGDI_Impl( GDIMetaFile* pMetaFile, diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 933fd3047a91..f3bd0d362f6e 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -407,7 +407,6 @@ void SfxObjectShell::UpdateFromTemplate_Impl( ) // the templates of all parts in the master document but it is NOT // an error if the template filename points not to a valid file SfxDocumentTemplates aTempl; - aTempl.Construct(); if (!aTemplURL.isEmpty()) { try { diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 55f73c05d01e..987cf9a4f3fd 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -3027,11 +3027,6 @@ sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, vcl:: return nRet; } -bool SfxObjectShell::HasSecurityOptOpenReadOnly() const -{ - return true; -} - bool SfxObjectShell::IsSecurityOptOpenReadOnly() const { return IsLoadReadonly(); diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 8c08addfa2dd..4b7d6dd6a47b 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -421,17 +421,6 @@ bool SfxObjectShell::Stamp_GetPrintCancelState() const -void SfxObjectShell::ViewAssigned() - -/* [Description] - - This method is called when a view is assigned. -*/ - -{ -} - - // closes the Object and all its views bool SfxObjectShell::Close() diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx index 9e7efb2f1e39..1a332e8e5e58 100644 --- a/sfx2/source/inc/splitwin.hxx +++ b/sfx2/source/inc/splitwin.hxx @@ -123,7 +123,6 @@ public: virtual void AutoHide() SAL_OVERRIDE; virtual void FadeOut() SAL_OVERRIDE; virtual void FadeIn() SAL_OVERRIDE; - void Show_Impl(); void Pin_Impl( bool bPinned ); bool ActivateNextChild_Impl( bool bForward = true ); void SetActiveWindow_Impl( SfxDockingWindow* pWin ); diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index f2fb797edf15..3b8acbce85f6 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -97,7 +97,6 @@ public: void SetState( SfxItemState, const SfxPoolItem*, bool bMaybeDirty=false ); void SetCachedState(bool bAlways = false); - void DeleteFloatingWindows(); void Invalidate( bool bWithSlot ); void SetVisibleState( bool bShow=true ); diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 828955ec9f48..df406d29e2c1 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -280,8 +280,6 @@ public: OUString GetSelectedEntry() const; SfxObjectShell* GetObjectShell() const { return pCurObjShell; } - void PrepareDeleteAction(); // disable buttons, change button text, etc. when del is going to happen - inline bool CanEdit( void ) const { return bCanEdit; } inline bool CanDel( void ) const { return bCanDel; } inline bool CanNew( void ) const { return bCanNew; } diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index a69e3c3db5c2..ee16671f3944 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -415,8 +415,6 @@ throw ( uno::RuntimeException, std::exception ) void SAL_CALL SfxStatusBarControl::doubleClick( const awt::Point& ) throw ( uno::RuntimeException, std::exception ) { - SolarMutexGuard aGuard; - DoubleClick(); } @@ -512,7 +510,6 @@ bool SfxStatusBarControl::MouseMove( const MouseEvent & ) } - bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & ) /* [Description] @@ -570,21 +567,6 @@ void SfxStatusBarControl::Click() -void SfxStatusBarControl::DoubleClick() - -/* [Description] - - This virtual method is called when the user double-clicks on the - field in the status row that belongs to this control. - - The default implementation is empty. -*/ - -{ -} - - - void SfxStatusBarControl::Paint ( const UserDrawEvent& /* Reference to an UserDrawEvent */ @@ -605,18 +587,6 @@ void SfxStatusBarControl::Paint -void SfxStatusBarControl::CaptureMouse() -{ -} - - - -void SfxStatusBarControl::ReleaseMouse() -{ -} - - - SfxStatusBarControl* SfxStatusBarControl::CreateControl ( sal_uInt16 nSlotID, diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 7d6fe2de6daa..4b3696887b3e 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -695,11 +695,6 @@ SfxFrame* SfxFrameIterator::NextSibling_Impl( SfxFrame& rPrev ) return pRet; } -bool SfxFrame::HasComponent() const -{ - return false; -} - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SfxFrame::GetController() const { if ( pImp->pCurrentViewFrame && pImp->pCurrentViewFrame->GetViewShell() ) diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 6d6f70346a61..05cce6e5c097 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -346,8 +346,6 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingInplace() { if ( !m_pClient || !m_pClient->GetViewShell() ) throw uno::RuntimeException(); - - m_pClient->GetViewShell()->InplaceActivating( m_pClient ); } @@ -370,8 +368,6 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedInplace() { if ( !m_pClient || !m_pClient->GetViewShell() ) throw uno::RuntimeException(); - - m_pClient->GetViewShell()->InplaceDeactivated( m_pClient ); } diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 1d27f842eda2..9f160d7615e9 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -1528,8 +1528,6 @@ void SAL_CALL SfxBaseController::removeTitleChangeListener(const Reference< fram void SfxBaseController::initialize( const css::uno::Sequence< css::uno::Any >& /*aArguments*/ ) throw (css::uno::RuntimeException, std::exception) { - if (m_pData->m_pViewShell) - m_pData->m_pViewShell->Initialize(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 24ad62e384a2..0501ed65cb34 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -328,9 +328,6 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) { case SID_EDITDOC: { - if ( GetFrame().HasComponent() ) - break; - // Due to Double occupancy in toolboxes (with or without Ctrl), // it is also possible that the slot is enabled, but Ctrl-click // despite this is not! @@ -857,14 +854,6 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet ) SfxWhichIter aIter( rSet ); for ( sal_uInt16 nWhich = aIter.FirstWhich(); nWhich; nWhich = aIter.NextWhich() ) { - if ( GetFrame().HasComponent() ) - { - // If the component is not self-dispatched, then - // it makes no sense! - rSet.DisableItem( nWhich ); - continue; - } - switch ( nWhich ) { case SID_EDITDOC: @@ -1441,7 +1430,6 @@ void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh ) pDispatcher->Push( *pObjSh ); pDispatcher->Flush(); StartListening( *pObjSh ); - pObjSh->ViewAssigned(); Notify( *pObjSh, SfxSimpleHint(SFX_HINT_TITLECHANGED) ); Notify( *pObjSh, SfxSimpleHint(SFX_HINT_DOCCHANGED) ); pDispatcher->SetReadOnly_Impl( pObjSh->IsReadOnly() ); @@ -1756,8 +1744,7 @@ void SfxViewFrame::Show() // Display Frame-window, but only if the ViewFrame has no window of its // own or if it does not contain a Component - if ( &GetWindow() == &GetFrame().GetWindow() || !GetFrame().HasComponent() ) - GetWindow().Show(); + GetWindow().Show(); GetFrame().GetWindow().Show(); } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index c16d285bf4bf..2d4ec9b4aec6 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -923,21 +923,6 @@ void SfxViewShell::OutplaceActivated( bool bActive, SfxInPlaceClient* /*pClient* -void SfxViewShell::InplaceActivating( SfxInPlaceClient* /*pClient*/ ) -{ - // TODO/LATER: painting of the bitmap can be stopped, it is required if CLIPCHILDREN problem #i25788# is not solved, - // but may be the bug will not affect the real office vcl windows, then it is not required -} - - - -void SfxViewShell::InplaceDeactivated( SfxInPlaceClient* /*pClient*/ ) -{ - // TODO/LATER: paint the replacement image in normal way if the painting was stopped -} - - - void SfxViewShell::UIActivating( SfxInPlaceClient* /*pClient*/ ) { uno::Reference < frame::XFrame > xOwnFrame( pFrame->GetFrame().GetFrameInterface() ); @@ -1316,11 +1301,6 @@ SfxViewShell::~SfxViewShell() DELETEZ( pImp ); } -void SfxViewShell::Initialize() -{ - // override by the application. -} - bool SfxViewShell::PrepareClose ( bool bUI // TRUE: Allow Dialog and so on, FALSE: silent-mode @@ -1699,24 +1679,6 @@ void SfxViewShell::ShowCursor( bool /*bOn*/ ) -void SfxViewShell::GotFocus() const - -/* [Description] - - This Method has to be called by the programmer, when the - Edit window has received the focus. This gives for example the SFx - the power to turn on the accelerator. - - [Note] - - <StarView> does sadly enough not provide the possibillity to attach - such "side-way" events. -*/ - -{ -} - - void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP ) { |