diff options
Diffstat (limited to 'sd/source/ui/tools')
-rw-r--r-- | sd/source/ui/tools/EventMultiplexer.cxx | 50 | ||||
-rw-r--r-- | sd/source/ui/tools/PreviewRenderer.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/tools/PropertySet.cxx | 2 |
3 files changed, 27 insertions, 31 deletions
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index 13e8360c1ce0..f218a21d81df 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -52,10 +52,10 @@ static const sal_Int32 ConfigurationUpdateEvent = 2; namespace sd { namespace tools { typedef cppu::WeakComponentImplHelper< - ::com::sun::star::beans::XPropertyChangeListener, - ::com::sun::star::frame::XFrameActionListener, - ::com::sun::star::view::XSelectionChangeListener, - ::com::sun::star::drawing::framework::XConfigurationChangeListener + css::beans::XPropertyChangeListener, + css::frame::XFrameActionListener, + css::view::XSelectionChangeListener, + css::drawing::framework::XConfigurationChangeListener > EventMultiplexerImplementationInterfaceBase; class EventMultiplexer::Implementation @@ -81,20 +81,20 @@ public: //===== lang::XEventListener ============================================== virtual void SAL_CALL - disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) + throw (css::uno::RuntimeException, std::exception) override; //===== beans::XPropertySetListener ======================================= virtual void SAL_CALL propertyChange ( - const com::sun::star::beans::PropertyChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::beans::PropertyChangeEvent& rEvent) + throw (css::uno::RuntimeException, std::exception) override; //===== view::XSelectionChangeListener ==================================== virtual void SAL_CALL selectionChanged ( - const com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) + throw (css::uno::RuntimeException, std::exception) override; //===== frame::XFrameActionListener ====================================== /** For certain actions the listener connects to a new controller of the @@ -102,14 +102,14 @@ public: in the center pane is replaced by another view shell. */ virtual void SAL_CALL - frameAction (const ::com::sun::star::frame::FrameActionEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + frameAction (const css::frame::FrameActionEvent& rEvent) + throw (css::uno::RuntimeException, std::exception) override; //===== drawing::framework::XConfigurationChangeListener ================== virtual void SAL_CALL notifyConfigurationChange ( - const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL disposing() override; @@ -129,16 +129,12 @@ private: /// Remember whether we are listening to the frame. bool mbListeningToFrame; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::frame::XController> mxControllerWeak; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::frame::XFrame> mxFrameWeak; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::view::XSelectionSupplier> mxSlideSorterSelectionWeak; + css::uno::WeakReference<css::frame::XController> mxControllerWeak; + css::uno::WeakReference<css::frame::XFrame> mxFrameWeak; + css::uno::WeakReference<css::view::XSelectionSupplier> mxSlideSorterSelectionWeak; SdDrawDocument* mpDocument; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::drawing::framework::XConfigurationController> - mxConfigurationControllerWeak; + css::uno::WeakReference<css::drawing::framework::XConfigurationController> + mxConfigurationControllerWeak; void ReleaseListeners(); @@ -153,7 +149,7 @@ private: disposed. */ void ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException); + throw (css::lang::DisposedException); DECL_LINK_TYPED(SlideSorterSelectionChangeListener, LinkParamNone*, void); }; @@ -514,7 +510,7 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange ( void SAL_CALL EventMultiplexer::Implementation::frameAction ( const frame::FrameActionEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { Reference<frame::XFrame> xFrame (mxFrameWeak); if (rEvent.Frame == xFrame) @@ -546,7 +542,7 @@ void SAL_CALL EventMultiplexer::Implementation::frameAction ( void SAL_CALL EventMultiplexer::Implementation::selectionChanged ( const lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { CallListeners (EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION); } @@ -630,7 +626,7 @@ void SAL_CALL EventMultiplexer::Implementation::disposing() } void EventMultiplexer::Implementation::ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException) + throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index a6ad71a60f5e..67e3f5ac6eb5 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -142,7 +142,7 @@ Image PreviewRenderer::RenderPage ( Cleanup(); } } - catch (const com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -201,7 +201,7 @@ Image PreviewRenderer::RenderSubstitution ( mpPreviewDevice->PixelToLogic(Point(0,0)), mpPreviewDevice->PixelToLogic(aSize))); } - catch (const com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -316,7 +316,7 @@ void PreviewRenderer::PaintPage ( { mpView->CompleteRedraw(mpPreviewDevice.get(), aRegion, pRedirector.get()); } - catch (const ::com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { DBG_UNHANDLED_EXCEPTION(); } diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx index 0640b03561af..184a3f159237 100644 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx @@ -173,7 +173,7 @@ void PropertySet::CallListeners ( } void PropertySet::ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException) + throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { |