From a65d5450b3254a8f880c39819ece980e69624283 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 30 Sep 2008 06:36:06 +0000 Subject: CWS-TOOLING: integrate CWS sfxnotifyremoval --- sd/inc/stlpool.hxx | 4 ++-- sd/inc/stlsheet.hxx | 4 ++-- sd/source/core/stlsheet.cxx | 9 ++++----- sd/source/ui/dlg/docprev.cxx | 2 +- sd/source/ui/inc/FormShellManager.hxx | 8 ++------ sd/source/ui/inc/PreviewRenderer.hxx | 7 ++----- sd/source/ui/inc/SlideView.hxx | 5 ++--- sd/source/ui/inc/ViewShellBase.hxx | 7 ++----- sd/source/ui/inc/docprev.hxx | 4 ++-- sd/source/ui/inc/drawview.hxx | 3 +-- sd/source/ui/slidesorter/view/SlideSorterView.cxx | 2 +- sd/source/ui/tools/PreviewRenderer.cxx | 8 ++------ sd/source/ui/view/FormShellManager.cxx | 8 ++------ sd/source/ui/view/ViewShellBase.cxx | 7 ++----- sd/source/ui/view/drawview.cxx | 5 ++--- sd/source/ui/view/drviews1.cxx | 6 +++--- sd/source/ui/view/drviews2.cxx | 4 ++-- 17 files changed, 34 insertions(+), 59 deletions(-) (limited to 'sd') diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index 4c1c5e955fef..d4a2d192cadc 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: stlpool.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.34.1 $ * * This file is part of OpenOffice.org. * @@ -135,7 +135,7 @@ protected: using SfxStyleSheetPool::Create; virtual ~SdStyleSheetPool(); - virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); void AddStyleFamily( const SdPage* pPage ); void RemoveStyleFamily( const SdPage* pPage ); diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index 8c3aa187da69..f85a5c4c0d77 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: stlsheet.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.32.1 $ * * This file is part of OpenOffice.org. * @@ -136,7 +136,7 @@ protected: virtual void Load (SvStream& rIn, USHORT nVersion); virtual void Store(SvStream& rOut); - virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); virtual ~SdStyleSheet(); void throwIfDisposed() throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index ab7af7dfe51c..f4fcf9e87181 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: stlsheet.cxx,v $ - * $Revision: 1.24 $ + * $Revision: 1.23.32.2 $ * * This file is part of OpenOffice.org. * @@ -113,7 +113,7 @@ class ModifyListenerForewarder : public SfxListener public: ModifyListenerForewarder( SdStyleSheet* pStyleSheet ); - virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); private: SdStyleSheet* mpStyleSheet; @@ -129,7 +129,7 @@ ModifyListenerForewarder::ModifyListenerForewarder( SdStyleSheet* pStyleSheet ) } } -void ModifyListenerForewarder::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId& /*rBCType*/, const SfxHint& /*rHint*/, const TypeId& /*rHintType*/) +void ModifyListenerForewarder::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/) { if( mpStyleSheet ) mpStyleSheet->notifyModifyListener(); @@ -559,8 +559,7 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const |* \************************************************************************/ -void SdStyleSheet::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, - const SfxHint& rHint, const TypeId& rHintType) +void SdStyleSheet::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { // erstmal die Basisklassenfunktionalitaet SfxStyleSheet::Notify(rBC, rHint); diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 51e65618a607..b53b570f813e 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -305,7 +305,7 @@ void SdDocPreviewWin::updateViewSettings() Invalidate(); } -void SdDocPreviewWin::SFX_NOTIFY(SfxBroadcaster&, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType) +void SdDocPreviewWin::Notify(SfxBroadcaster&, const SfxHint& rHint) { if( rHint.ISA( SfxSimpleHint ) && ( (SfxSimpleHint&) rHint ).GetId() == SFX_HINT_COLORS_CHANGED ) { diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index d79714f7d223..c919e5f95c91 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: FormShellManager.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.34.1 $ * * This file is part of OpenOffice.org. * @@ -138,11 +138,7 @@ private: the factory working properly this method should not be necessary (and may be removed in the future.) */ - virtual void SFX_NOTIFY( - SfxBroadcaster& rBC, - const TypeId& rBCType, - const SfxHint& rHint, - const TypeId& rHintType); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); }; } // end of namespace sd diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index d90eb914f5f7..54cd483272d5 100644 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: PreviewRenderer.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.34.1 $ * * This file is part of OpenOffice.org. * @@ -116,10 +116,7 @@ public: int nWidth); protected: - virtual void SFX_NOTIFY(SfxBroadcaster& rBC, - const TypeId& rBCType, - const SfxHint& rHint, - const TypeId& rHintType); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); private: ::std::auto_ptr mpPreviewDevice; diff --git a/sd/source/ui/inc/SlideView.hxx b/sd/source/ui/inc/SlideView.hxx index f04cbcd47de5..8c4211c2b6d5 100644 --- a/sd/source/ui/inc/SlideView.hxx +++ b/sd/source/ui/inc/SlideView.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SlideView.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.34.1 $ * * This file is part of OpenOffice.org. * @@ -107,8 +107,7 @@ public: void AddToCache( SdPage* pPage, const Bitmap& rBitmap, long nZoom ); const GraphicObject* GetFromCache( SdPage* pPage, long& rZoom, long nZoomTolerance ) const; - virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, - const SfxHint& rHint, const TypeId& rHintType ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual void DoCut( ::Window* pWindow = NULL ); virtual void DoCopy( ::Window* pWindow = NULL ); diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 8921bdc844d7..8187d308bfb8 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ViewShellBase.hxx,v $ - * $Revision: 1.23 $ + * $Revision: 1.23.34.1 $ * * This file is part of OpenOffice.org. * @@ -262,10 +262,7 @@ public: protected: osl::Mutex maMutex; - virtual void SFX_NOTIFY(SfxBroadcaster& rBC, - const TypeId& rBCType, - const SfxHint& rHint, - const TypeId& rHintType); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); virtual void InitializeFramework (void); diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 0e52df5d3728..746df06794ea 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docprev.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.34.1 $ * * This file is part of OpenOffice.org. * @@ -67,7 +67,7 @@ protected: svtools::ColorConfig maColorConfig; - virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); void updateViewSettings(); diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 152a138a9a90..b6a1182339f4 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -65,8 +65,7 @@ public: virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE); - virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, - const SfxHint& rHint, const TypeId& rHintType); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); void BlockPageOrderChangedHint(BOOL bBlock); diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index f0c4d67b09aa..f92b0161a04d 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -754,7 +754,7 @@ void SlideSorterView::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint if (pDocShell!=NULL && pDocShell->IsEnableSetModified()) mbModelChangedWhileModifyEnabled = true; - ::sd::View::SFX_NOTIFY(rBroadcaster, rBroadcastType, rHint, rHintType); + ::sd::View::Notify(rBroadcaster, rHint); } diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index c11c4c107a73..224efb5a67f6 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: PreviewRenderer.cxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.34.1 $ * * This file is part of OpenOffice.org. * @@ -477,11 +477,7 @@ Image PreviewRenderer::ScaleBitmap ( -void PreviewRenderer::SFX_NOTIFY( - SfxBroadcaster&, - const TypeId& rBCType, - const SfxHint& rHint, - const TypeId& rHintType) +void PreviewRenderer::Notify(SfxBroadcaster&, const SfxHint& rHint) { if (rHint.IsA(TYPE(SfxSimpleHint)) && mpDocShellOfView != NULL) diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index 57e37738baac..d1aebf44f07b 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: FormShellManager.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.34.1 $ * * This file is part of OpenOffice.org. * @@ -323,11 +323,7 @@ IMPL_LINK(FormShellManager, WindowEventHandler, VclWindowEvent*, pEvent) -void FormShellManager::SFX_NOTIFY( - SfxBroadcaster&, - const TypeId& rBCType, - const SfxHint& rHint, - const TypeId& rHintType) +void FormShellManager::Notify(SfxBroadcaster&, const SfxHint& rHint) { const SfxSimpleHint* pSimpleHint = dynamic_cast(&rHint); if (pSimpleHint!=NULL && pSimpleHint->GetId()==SFX_HINT_DYING) diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 9a0b583fa4e0..0ffd83faa2c2 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -479,12 +479,9 @@ SdDrawDocument* ViewShellBase::GetDocument (void) const -void ViewShellBase::SFX_NOTIFY(SfxBroadcaster& rBC, - const TypeId& rBCType, - const SfxHint& rHint, - const TypeId& rHintType) +void ViewShellBase::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { - SfxViewShell::SFX_NOTIFY(rBC, rBCType, rHint, rHintType); + SfxViewShell::Notify(rBC, rHint); if (rHint.IsA(TYPE(SfxEventHint))) { diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index a3b38e391583..45a22dd9f56b 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -403,8 +403,7 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, |* \************************************************************************/ -void DrawView::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, - const SfxHint& rHint, const TypeId& rHintType) +void DrawView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { if ( mpDrawViewShell && rHint.ISA(SdrHint) ) { @@ -435,7 +434,7 @@ void DrawView::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, } } - ::sd::View::SFX_NOTIFY(rBC, rBCType, rHint, rHintType); + ::sd::View::Notify(rBC, rHint); } /************************************************************************* diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 5dbfe34babf1..cdc7dd1e71af 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: drviews1.cxx,v $ - * $Revision: 1.80 $ + * $Revision: 1.79.34.2 $ * * This file is part of OpenOffice.org. * @@ -387,7 +387,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) // If the master view toolbar is not shown we hide it before // switching the edit mode. - if (mpImpl->mbIsInitialized + if (::sd::ViewShell::mpImpl->mbIsInitialized && IsMainViewShell() && ! bShowMasterViewToolbar) { @@ -460,7 +460,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) // If the master view toolbar is to be shown we turn it on after the // edit mode has been changed. - if (mpImpl->mbIsInitialized + if (::sd::ViewShell::mpImpl->mbIsInitialized && IsMainViewShell() && bShowMasterViewToolbar) { diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index ce4c91e22a71..9f0acbdd5b00 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -409,7 +409,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } USHORT nPage = maTabControl.GetCurPageId() - 1; mpActualPage = GetDoc()->GetSdPage(nPage, mePageKind); - mpImpl->ProcessModifyPageSlot ( + ::sd::ViewShell::mpImpl->ProcessModifyPageSlot ( rReq, mpActualPage, mePageKind); @@ -431,7 +431,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SFX_REQUEST_ARG (rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, FALSE); SFX_REQUEST_ARG (rReq, pWhatLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, FALSE); - mpImpl->AssignLayout ( + ::sd::ViewShell::mpImpl->AssignLayout ( GetDoc()->GetSdPage((USHORT)pWhatPage->GetValue(), mePageKind), (AutoLayout)pWhatLayout->GetValue()); } -- cgit