diff options
31 files changed, 253 insertions, 270 deletions
diff --git a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx index a9a4adee25a2..13294c723ef6 100644 --- a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx +++ b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XFrame.hpp> -namespace cssu = ::com::sun::star::uno; class SfxViewShell; @@ -41,7 +40,7 @@ public: The activated context. */ static void NotifyContextChange ( - const cssu::Reference<css::frame::XController>& rxController, + const css::uno::Reference<css::frame::XController>& rxController, const ::sfx2::sidebar::EnumContext::Context eContext); /** Notify the activation of a context. @@ -58,7 +57,7 @@ public: private: static ::rtl::OUString GetModuleName ( - const cssu::Reference<css::frame::XFrame>& rxFrame); + const css::uno::Reference<css::frame::XFrame>& rxFrame); }; #endif diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx index 7b81b5b5c45d..0b9ed762b933 100644 --- a/include/svx/sidebar/SelectionChangeHandler.hxx +++ b/include/svx/sidebar/SelectionChangeHandler.hxx @@ -31,8 +31,6 @@ #include <boost/noncopyable.hpp> #include <boost/function.hpp> -namespace cssu = ::com::sun::star::uno; - class SdrMarkView; @@ -54,25 +52,25 @@ class SVX_DLLPUBLIC SelectionChangeHandler public: SelectionChangeHandler ( const boost::function<rtl::OUString(void)>& rSelectionChangeCallback, - const cssu::Reference<css::frame::XController>& rxController, + const css::uno::Reference<css::frame::XController>& rxController, const sfx2::sidebar::EnumContext::Context eDefaultContext); virtual ~SelectionChangeHandler (void); virtual void SAL_CALL selectionChanged (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing (void) - throw (cssu::RuntimeException) SAL_OVERRIDE; + throw (css::uno::RuntimeException) SAL_OVERRIDE; void Connect (void); void Disconnect (void); private: const boost::function<rtl::OUString(void)> maSelectionChangeCallback; - cssu::Reference<css::frame::XController> mxController; + css::uno::Reference<css::frame::XController> mxController; const sfx2::sidebar::EnumContext::Context meDefaultContext; bool mbIsConnected; }; diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index d90332759ea8..af9a47f03ce1 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -59,17 +59,17 @@ public: //----- XPane ------------------------------------------------------------- virtual sal_Bool SAL_CALL isVisible (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setVisible (sal_Bool bIsVisible) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual cssu::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAccessible ( - const cssu::Reference<css::accessibility::XAccessible>& rxAccessible) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LINK(WindowEventHandler, VclWindowEvent*); diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 1340814d0ae9..539f07f99ca5 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -161,19 +161,19 @@ namespace { class FrameworkHelperAllPassFilter { public: - bool operator() (const cssdf::ConfigurationChangeEvent&) { return true; } + bool operator() (const css::drawing::framework::ConfigurationChangeEvent&) { return true; } }; class FrameworkHelperResourceIdFilter { public: FrameworkHelperResourceIdFilter ( - const cssu::Reference<cssdf::XResourceId>& rxResourceId); - bool operator() (const cssdf::ConfigurationChangeEvent& rEvent) + const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId); + bool operator() (const css::drawing::framework::ConfigurationChangeEvent& rEvent) { return mxResourceId.is() && rEvent.ResourceId.is() && mxResourceId->compareTo(rEvent.ResourceId) == 0; } private: - cssu::Reference<cssdf::XResourceId> mxResourceId; + css::uno::Reference<css::drawing::framework::XResourceId> mxResourceId; }; } // end of anonymous namespace diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 18495a90212c..a5d29a28b939 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -39,8 +39,6 @@ class ViewShell; class ViewShellBase; } -namespace cssu = ::com::sun::star::uno; -namespace cssdf = ::com::sun::star::drawing::framework; namespace sd { namespace framework { @@ -112,7 +110,7 @@ public: static ::boost::shared_ptr<FrameworkHelper> Instance (ViewShellBase& rBase); static ::boost::shared_ptr<FrameworkHelper> Instance ( - const cssu::Reference<css::frame::XController>& rxController); + const css::uno::Reference<css::frame::XController>& rxController); /** Mark the FrameworkHelper object for the given ViewShellBase as disposed. A following ReleaseInstance() call will destroy the @@ -149,15 +147,15 @@ public: reference then an empty pointer is returned. */ static ::boost::shared_ptr<ViewShell> GetViewShell ( - const cssu::Reference<cssdf::XView>& rxView); + const css::uno::Reference<css::drawing::framework::XView>& rxView); - typedef ::boost::function<bool(const cssdf::ConfigurationChangeEvent&)> + typedef ::boost::function<bool(const css::drawing::framework::ConfigurationChangeEvent&)> ConfigurationChangeEventFilter; typedef ::boost::function<void(bool bEventSeen)> Callback; typedef ::boost::function< void( - const cssu::Reference< - cssdf::XResourceId>&) + const css::uno::Reference< + css::drawing::framework::XResourceId>&) > ResourceFunctor; /** Test whether the called FrameworkHelper object is valid. @@ -190,8 +188,8 @@ public: of the involved objects does not support XTunnel (where necessary). */ - cssu::Reference<cssdf::XView> GetView ( - const cssu::Reference<cssdf::XResourceId>& rxPaneOrViewId); + css::uno::Reference<css::drawing::framework::XView> GetView ( + const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneOrViewId); /** Request the specified view to be displayed in the specified pane. When the pane is not visible its creation is also requested. The @@ -205,7 +203,7 @@ public: the caller can, for example, call RunOnResourceActivation() to do some initialization after the requested view becomes active. */ - cssu::Reference<cssdf::XResourceId> RequestView ( + css::uno::Reference<css::drawing::framework::XResourceId> RequestView ( const OUString& rsResourceURL, const OUString& rsAnchorURL); @@ -237,7 +235,7 @@ public: */ void RunOnResourceActivation( - const cssu::Reference<cssdf::XResourceId>& rxResourceId, + const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, const Callback& rCallback); /** Normally the requested changes of the configuration are executed @@ -273,35 +271,35 @@ public: /** Return a string representation of the given XResourceId object. */ static OUString ResourceIdToString ( - const cssu::Reference< - cssdf::XResourceId>& rxResourceId); + const css::uno::Reference< + css::drawing::framework::XResourceId>& rxResourceId); /** Create a new XResourceId object for the given resource URL. */ - static cssu::Reference< - cssdf::XResourceId> + static css::uno::Reference< + css::drawing::framework::XResourceId> CreateResourceId ( const OUString& rsResourceURL); /** Create a new XResourceId object for the given resource URL and a single anchor URL. */ - static cssu::Reference< - cssdf::XResourceId> + static css::uno::Reference< + css::drawing::framework::XResourceId> CreateResourceId ( const OUString& rsResourceURL, const OUString& rsAnchorURL); /** Create a new XResourceId object for the given resource URL. */ - static cssu::Reference< - cssdf::XResourceId> + static css::uno::Reference< + css::drawing::framework::XResourceId> CreateResourceId ( const OUString& rsResourceURL, - const cssu::Reference< - cssdf::XResourceId>& rxAnchor); + const css::uno::Reference< + css::drawing::framework::XResourceId>& rxAnchor); - cssu::Reference<cssdf::XConfigurationController> + css::uno::Reference<css::drawing::framework::XConfigurationController> GetConfigurationController (void) const { return mxConfigurationController;} private: @@ -316,12 +314,12 @@ private: static ::boost::scoped_ptr<ViewURLMap> mpViewURLMap; ViewShellBase& mrBase; - cssu::Reference<cssdf::XConfigurationController> + css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController; class DisposeListener; friend class DisposeListener; - cssu::Reference<css::lang::XComponent> + css::uno::Reference<css::lang::XComponent> mxDisposeListener; FrameworkHelper (ViewShellBase& rBase); diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index 2d7a061483ec..7f0f3393fb69 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -32,7 +32,6 @@ class Window; -namespace cssu = ::com::sun::star::uno; namespace { @@ -94,28 +93,28 @@ public: important method of this class because the view is only interested in the window of the pane. */ - virtual cssu::Reference<css::awt::XWindow> + virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual cssu::Reference<css::rendering::XCanvas> + virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XPane2 ------------------------------------------------------------- virtual sal_Bool SAL_CALL isVisible (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setVisible (sal_Bool bIsVisible) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual cssu::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAccessible ( - const cssu::Reference<css::accessibility::XAccessible>& rxAccessible) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XResource --------------------------------------------------------- diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx index 19f825822e3e..9d1d71e3b1b6 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx @@ -80,7 +80,7 @@ public: MasterPagesSelector* AllMasterPagesSelector::Create ( ::Window* pParent, ViewShellBase& rViewShellBase, - const cssu::Reference<css::ui::XSidebar>& rxSidebar) + const css::uno::Reference<css::ui::XSidebar>& rxSidebar) { SdDrawDocument* pDocument = rViewShellBase.GetDocument(); if (pDocument == NULL) @@ -106,7 +106,7 @@ AllMasterPagesSelector::AllMasterPagesSelector ( SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, - const cssu::Reference<css::ui::XSidebar>& rxSidebar) + const css::uno::Reference<css::ui::XSidebar>& rxSidebar) : MasterPagesSelector(pParent, rDocument, rBase, rpContainer, rxSidebar), mpSortedMasterPages(new SortedMasterPageDescriptorList()) { diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx index 56cef88ffdd3..eebc8691fa8a 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx @@ -40,7 +40,7 @@ public: static MasterPagesSelector* Create ( ::Window* pParent, ViewShellBase& rViewShellBase, - const cssu::Reference<css::ui::XSidebar>& rxSidebar); + const css::uno::Reference<css::ui::XSidebar>& rxSidebar); /** Scan the set of templates for the ones whose first master pages are shown by this control and store them in the MasterPageContainer. @@ -63,7 +63,7 @@ private: SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, - const cssu::Reference<css::ui::XSidebar>& rxSidebar); + const css::uno::Reference<css::ui::XSidebar>& rxSidebar); virtual ~AllMasterPagesSelector (void); void AddTemplate (const TemplateEntry& rEntry); diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index 1b5807150e41..4525bc8c16cb 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -45,7 +45,7 @@ namespace sd { namespace sidebar { MasterPagesSelector* CurrentMasterPagesSelector::Create ( ::Window* pParent, ViewShellBase& rViewShellBase, - const cssu::Reference<css::ui::XSidebar>& rxSidebar) + const css::uno::Reference<css::ui::XSidebar>& rxSidebar) { SdDrawDocument* pDocument = rViewShellBase.GetDocument(); if (pDocument == NULL) @@ -71,7 +71,7 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector ( SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, - const cssu::Reference<css::ui::XSidebar>& rxSidebar) + const css::uno::Reference<css::ui::XSidebar>& rxSidebar) : MasterPagesSelector (pParent, rDocument, rBase, rpContainer, rxSidebar) { // For this master page selector only we change the default action for diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx index d233980ab0a6..2a11328a88e6 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx @@ -23,7 +23,6 @@ #include "MasterPagesSelector.hxx" #include <com/sun/star/lang/XComponent.hpp> -namespace cssu = ::com::sun::star::uno; namespace sd { namespace tools { class EventMultiplexerEvent; } } @@ -39,7 +38,7 @@ public: static MasterPagesSelector* Create ( ::Window* pParent, ViewShellBase& rViewShellBase, - const cssu::Reference<css::ui::XSidebar>& rxSidebar); + const css::uno::Reference<css::ui::XSidebar>& rxSidebar); /** Set the selection so that the master page is selected that is used by the currently selected page of the document in the @@ -60,14 +59,14 @@ protected: virtual void ExecuteCommand (const sal_Int32 nCommandId) SAL_OVERRIDE; private: - cssu::Reference<css::lang::XComponent> mxListener; + css::uno::Reference<css::lang::XComponent> mxListener; CurrentMasterPagesSelector ( ::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, - const cssu::Reference<css::ui::XSidebar>& rxSidebar); + const css::uno::Reference<css::ui::XSidebar>& rxSidebar); virtual ~CurrentMasterPagesSelector (void); virtual void LateInit (void) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx index c0ed23cc4bcf..d0bd23a5fcbe 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx @@ -27,7 +27,7 @@ namespace sd { namespace sidebar { CustomAnimationPanel::CustomAnimationPanel ( ::Window* pParentWindow, ViewShellBase& rViewShellBase, - const cssu::Reference<css::frame::XFrame>& rxFrame + const css::uno::Reference<css::frame::XFrame>& rxFrame ) : PanelBase( pParentWindow, diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.hxx b/sd/source/ui/sidebar/CustomAnimationPanel.hxx index be03b8da401d..cb391919564c 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.hxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.hxx @@ -31,7 +31,7 @@ public: CustomAnimationPanel ( ::Window* pParentWindow, ViewShellBase& rViewShellBase, - const cssu::Reference<css::frame::XFrame>& rxFrame); + const css::uno::Reference<css::frame::XFrame>& rxFrame); virtual ~CustomAnimationPanel (void); // ILayoutableWindow @@ -43,7 +43,7 @@ protected: ViewShellBase& rViewShellBase) SAL_OVERRIDE; private: - cssu::Reference<css::frame::XFrame> mxFrame; + css::uno::Reference<css::frame::XFrame> mxFrame; }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index d6b61a26b098..2e65d19f938e 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -38,7 +38,6 @@ class SfxModule; -namespace cssu = ::com::sun::star::uno; namespace sd { class DrawDocShell; @@ -72,7 +71,7 @@ public: LayoutMenu ( ::Window* pParent, ViewShellBase& rViewShellBase, - const cssu::Reference<css::ui::XSidebar>& rxSidebar); + const css::uno::Reference<css::ui::XSidebar>& rxSidebar); virtual ~LayoutMenu (void); virtual void Dispose (void); @@ -130,10 +129,10 @@ private: many columns for the calculation. */ const int mnPreferredColumnCount; - cssu::Reference<css::frame::XStatusListener> mxListener; + css::uno::Reference<css::frame::XStatusListener> mxListener; bool mbSelectionUpdatePending; bool mbIsMainViewChangePending; - cssu::Reference<css::ui::XSidebar> mxSidebar; + css::uno::Reference<css::ui::XSidebar> mxSidebar; bool mbIsDisposed; /** Calculate the number of displayed rows. This depends on the given diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index 04380bc070e5..e299b12eae8c 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -35,7 +35,6 @@ #include <queue> -namespace cssu = ::com::sun::star::uno; class MouseEvent; class SdDrawDocument; @@ -62,7 +61,7 @@ public: SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, - const cssu::Reference<css::ui::XSidebar>& rxSidebar); + const css::uno::Reference<css::ui::XSidebar>& rxSidebar); virtual ~MasterPagesSelector (void); virtual void LateInit (void); @@ -205,7 +204,7 @@ protected: virtual void ExecuteCommand (const sal_Int32 nCommandId); private: - cssu::Reference<css::ui::XSidebar> mxSidebar; + css::uno::Reference<css::ui::XSidebar> mxSidebar; /** The offset between ValueSet index and MasterPageContainer::Token last seen. This value is used heuristically to speed up the lookup diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx index e1e368e31470..270705054c93 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -77,7 +77,7 @@ void PanelBase::Resize (void) return NULL; } -void PanelBase::SetSidebar (const cssu::Reference<css::ui::XSidebar>& rxSidebar) +void PanelBase::SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSidebar) { mxSidebar = rxSidebar; if (mxSidebar.is() && mpWrappedControl!=0) diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx index b41f58110eab..f2e54b0f1aae 100644 --- a/sd/source/ui/sidebar/PanelBase.hxx +++ b/sd/source/ui/sidebar/PanelBase.hxx @@ -27,7 +27,6 @@ #include <boost/scoped_ptr.hpp> -namespace cssu = ::com::sun::star::uno; namespace sd { class ViewShellBase; @@ -56,7 +55,7 @@ public: virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; // ISidebarReceiver - virtual void SetSidebar (const cssu::Reference<css::ui::XSidebar>& rxSidebar) SAL_OVERRIDE; + virtual void SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSidebar) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessibleObject ( @@ -70,7 +69,7 @@ protected: ViewShellBase& rViewShellBase) = 0; private: - cssu::Reference<css::ui::XSidebar> mxSidebar; + css::uno::Reference<css::ui::XSidebar> mxSidebar; ViewShellBase& mrViewShellBase; bool ProvideWrappedControl (void); diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index 8d38c4c7b455..a64b986ffbba 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -101,7 +101,7 @@ void SAL_CALL PanelFactory::disposing (void) Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( const ::rtl::OUString& rsUIElementResourceURL, - const ::cssu::Sequence<css::beans::PropertyValue>& rArguments) + const css::uno::Sequence<css::beans::PropertyValue>& rArguments) throw( css::container::NoSuchElementException, css::lang::IllegalArgumentException, diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx index ae4f307b81b4..8365a49764f9 100644 --- a/sd/source/ui/sidebar/PanelFactory.hxx +++ b/sd/source/ui/sidebar/PanelFactory.hxx @@ -32,7 +32,6 @@ #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> -namespace cssu = ::com::sun::star::uno; namespace sd { class ViewShellBase; @@ -54,24 +53,24 @@ class PanelFactory { public: static ::rtl::OUString SAL_CALL getImplementationName (void); - static cssu::Reference<cssu::XInterface> SAL_CALL createInstance ( - const cssu::Reference<css::lang::XMultiServiceFactory>& rxFactory); - static cssu::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames (void); + static css::uno::Reference<css::uno::XInterface> SAL_CALL createInstance ( + const css::uno::Reference<css::lang::XMultiServiceFactory>& rxFactory); + static css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames (void); - PanelFactory (const cssu::Reference<cssu::XComponentContext>& rxContext); + PanelFactory (const css::uno::Reference<css::uno::XComponentContext>& rxContext); virtual ~PanelFactory (void); virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XUIElementFactory - cssu::Reference<css::ui::XUIElement> SAL_CALL createUIElement ( + css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement ( const ::rtl::OUString& rsResourceURL, - const ::cssu::Sequence<css::beans::PropertyValue>& rArguments) + const css::uno::Sequence<css::beans::PropertyValue>& rArguments) throw( css::container::NoSuchElementException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx index 0ebcff4c640e..2705e2b31392 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx @@ -35,7 +35,7 @@ namespace sd { namespace sidebar { MasterPagesSelector* RecentMasterPagesSelector::Create ( ::Window* pParent, ViewShellBase& rViewShellBase, - const cssu::Reference<css::ui::XSidebar>& rxSidebar) + const css::uno::Reference<css::ui::XSidebar>& rxSidebar) { SdDrawDocument* pDocument = rViewShellBase.GetDocument(); if (pDocument == NULL) @@ -61,7 +61,7 @@ RecentMasterPagesSelector::RecentMasterPagesSelector ( SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, - const cssu::Reference<css::ui::XSidebar>& rxSidebar) + const css::uno::Reference<css::ui::XSidebar>& rxSidebar) : MasterPagesSelector (pParent, rDocument, rBase, rpContainer, rxSidebar) { } diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx index 931663966f1d..f5bacc780c53 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx @@ -33,7 +33,7 @@ public: static MasterPagesSelector* Create ( ::Window* pParent, ViewShellBase& rViewShellBase, - const cssu::Reference<css::ui::XSidebar>& rxSidebar); + const css::uno::Reference<css::ui::XSidebar>& rxSidebar); protected: DECL_LINK(MasterPageListListener, void*); @@ -63,7 +63,7 @@ private: SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, - const cssu::Reference<css::ui::XSidebar>& rxSidebar); + const css::uno::Reference<css::ui::XSidebar>& rxSidebar); virtual ~RecentMasterPagesSelector (void); virtual void LateInit (void) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx index 04d47524f862..cc9a5776cafc 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx @@ -27,7 +27,7 @@ namespace sd { namespace sidebar { SlideTransitionPanel::SlideTransitionPanel ( ::Window* pParentWindow, ViewShellBase& rViewShellBase, - const cssu::Reference<css::frame::XFrame>& rxFrame + const css::uno::Reference<css::frame::XFrame>& rxFrame ) : PanelBase(pParentWindow, rViewShellBase), mxFrame( rxFrame ) diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.hxx b/sd/source/ui/sidebar/SlideTransitionPanel.hxx index 251976ba7c63..74ef56a4d9a9 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.hxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.hxx @@ -31,7 +31,7 @@ public: SlideTransitionPanel ( ::Window* pParentWindow, ViewShellBase& rViewShellBase, - const cssu::Reference<css::frame::XFrame>& rxFrame ); + const css::uno::Reference<css::frame::XFrame>& rxFrame ); virtual ~SlideTransitionPanel (void); // ILayoutableWindow @@ -43,7 +43,7 @@ protected: ViewShellBase& rViewShellBase) SAL_OVERRIDE; private: - cssu::Reference<css::frame::XFrame> mxFrame; + css::uno::Reference<css::frame::XFrame> mxFrame; }; } } // end of namespace sd::sidebar diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 9ee589ec9ea2..b89752fa775f 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -53,10 +53,10 @@ namespace sdext { namespace presenter { namespace { typedef ::cppu::PartialWeakComponentImplHelper5 < - cssa::XAccessible, - cssa::XAccessibleContext, - cssa::XAccessibleComponent, - cssa::XAccessibleEventBroadcaster, + css::accessibility::XAccessible, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleEventBroadcaster, css::awt::XWindowListener > PresenterAccessibleObjectInterfaceBase; } @@ -75,9 +75,9 @@ public: virtual ~AccessibleObject (void); virtual void SetWindow ( - const cssu::Reference<css::awt::XWindow>& rxContentWindow, - const cssu::Reference<css::awt::XWindow>& rxBorderWindow); - void SetAccessibleParent (const cssu::Reference<cssa::XAccessible>& rxAccessibleParent); + const css::uno::Reference<css::awt::XWindow>& rxContentWindow, + const css::uno::Reference<css::awt::XWindow>& rxBorderWindow); + void SetAccessibleParent (const css::uno::Reference<css::accessibility::XAccessible>& rxAccessibleParent); virtual void SAL_CALL disposing (void) SAL_OVERRIDE; @@ -89,132 +89,132 @@ public: void FireAccessibleEvent ( const sal_Int16 nEventId, - const cssu::Any& rOldValue, - const cssu::Any& rNewValue); + const css::uno::Any& rOldValue, + const css::uno::Any& rNewValue); void UpdateStateSet (void); //----- XComponent --------------------------------------------------- - virtual void SAL_CALL dispose()throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const cssu::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const cssu::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } //----- XAccessible ------------------------------------------------------- - virtual cssu::Reference<cssa::XAccessibleContext> SAL_CALL + virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XAccessibleContext ---------------------------------------------- virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual cssu::Reference< cssa::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual cssu::Reference< cssa::XAccessible> SAL_CALL getAccessibleParent (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getAccessibleRole (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleDescription (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleName (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual cssu::Reference<cssa::XAccessibleRelationSet> SAL_CALL + virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual cssu::Reference<cssa::XAccessibleStateSet> SAL_CALL + virtual css::uno::Reference<css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::lang::Locale SAL_CALL getLocale (void) - throw (cssu::RuntimeException, - cssa::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, + css::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; //----- XAccessibleComponent -------------------------------------------- virtual sal_Bool SAL_CALL containsPoint ( const css::awt::Point& aPoint) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual cssu::Reference<cssa::XAccessible> SAL_CALL + virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessibleAtPoint ( const css::awt::Point& aPoint) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Rectangle SAL_CALL getBounds (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Point SAL_CALL getLocation (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Point SAL_CALL getLocationOnScreen (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Size SAL_CALL getSize (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XAccessibleEventBroadcaster -------------------------------------- virtual void SAL_CALL addAccessibleEventListener ( - const cssu::Reference<cssa::XAccessibleEventListener>& rxListener) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference<css::accessibility::XAccessibleEventListener>& rxListener) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener ( - const cssu::Reference<cssa::XAccessibleEventListener>& rxListener) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference<css::accessibility::XAccessibleEventListener>& rxListener) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XWindowListener --------------------------------------------------- virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: OUString msName; - cssu::Reference<css::awt::XWindow2> mxContentWindow; - cssu::Reference<css::awt::XWindow2> mxBorderWindow; + css::uno::Reference<css::awt::XWindow2> mxContentWindow; + css::uno::Reference<css::awt::XWindow2> mxBorderWindow; const css::lang::Locale maLocale; const sal_Int16 mnRole; sal_uInt32 mnStateSet; bool mbIsFocused; - cssu::Reference<cssa::XAccessible> mxParentAccessible; + css::uno::Reference<css::accessibility::XAccessible> mxParentAccessible; ::std::vector<rtl::Reference<AccessibleObject> > maChildren; ::std::vector<Reference<XAccessibleEventListener> > maListeners; @@ -236,7 +236,7 @@ protected: namespace { typedef ::cppu::WeakComponentImplHelper1 < - cssa::XAccessibleStateSet + css::accessibility::XAccessibleStateSet > AccessibleStateSetInterfaceBase; } @@ -253,16 +253,16 @@ public: //----- XAccessibleStateSet ----------------------------------------------- virtual sal_Bool SAL_CALL isEmpty (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL contains (sal_Int16 nState) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL containsAll (const cssu::Sequence<sal_Int16>& rStateSet) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL containsAll (const css::uno::Sequence<sal_Int16>& rStateSet) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual cssu::Sequence<sal_Int16> SAL_CALL getStates (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates (void) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: const sal_Int32 mnStateSet; @@ -272,7 +272,7 @@ private: namespace { typedef ::cppu::WeakComponentImplHelper1 < - cssa::XAccessibleRelationSet + css::accessibility::XAccessibleRelationSet > AccessibleRelationSetInterfaceBase; } @@ -291,16 +291,16 @@ public: //----- XAccessibleRelationSet -------------------------------------------- virtual sal_Int32 SAL_CALL getRelationCount (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual AccessibleRelation SAL_CALL getRelation (sal_Int32 nIndex) - throw (cssu::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL containsRelation (sal_Int16 nRelationType) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual AccessibleRelation SAL_CALL getRelationByType (sal_Int16 nRelationType) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::std::vector<AccessibleRelation> maRelations; @@ -311,7 +311,7 @@ private: namespace { typedef ::cppu::ImplInheritanceHelper1 < PresenterAccessible::AccessibleObject, - cssa::XAccessibleText + css::accessibility::XAccessibleText > PresenterAccessibleParagraphInterfaceBase; } @@ -330,79 +330,79 @@ public: //----- XAccessibleContext ------------------------------------------------ - virtual cssu::Reference<cssa::XAccessibleRelationSet> SAL_CALL + virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XAccessibleText --------------------------------------------------- virtual sal_Int32 SAL_CALL getCaretPosition (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setCaretPosition (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Unicode SAL_CALL getCharacter (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual cssu::Sequence<css::beans::PropertyValue> SAL_CALL + virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getCharacterAttributes ( ::sal_Int32 nIndex, - const cssu::Sequence<OUString>& rRequestedAttributes) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Sequence<OUString>& rRequestedAttributes) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getCharacterCount (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getSelectedText (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectionStart (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectionEnd (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getText (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTextRange ( sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual cssa::TextSegment SAL_CALL getTextAtIndex ( + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex ( sal_Int32 nIndex, sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual cssa::TextSegment SAL_CALL getTextBeforeIndex ( + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex ( sal_Int32 nIndex, sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual cssa::TextSegment SAL_CALL getTextBehindIndex ( + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex ( sal_Int32 nIndex, sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL copyText (sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual awt::Point GetRelativeLocation (void) SAL_OVERRIDE; @@ -496,8 +496,8 @@ public: void SetTextView (const ::boost::shared_ptr<PresenterTextView>& rpTextView); virtual void SetWindow ( - const cssu::Reference<css::awt::XWindow>& rxContentWindow, - const cssu::Reference<css::awt::XWindow>& rxBorderWindow) SAL_OVERRIDE; + const css::uno::Reference<css::awt::XWindow>& rxContentWindow, + const css::uno::Reference<css::awt::XWindow>& rxBorderWindow) SAL_OVERRIDE; private: ::boost::shared_ptr<PresenterTextView> mpTextView; @@ -738,7 +738,7 @@ void SAL_CALL PresenterAccessible::disposing (void) //----- XAccessible ----------------------------------------------------------- Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext (void) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { if ( ! mpAccessibleConsole.is()) { @@ -762,7 +762,7 @@ Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext //----- XFocusListener ---------------------------------------------------- void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent& rEvent) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; SAL_INFO("sdext.presenter", OSL_THIS_FUNC << ": PresenterAccessible::focusGained at " << this @@ -771,7 +771,7 @@ void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent& rEve } void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent& rEvent) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; SAL_INFO("sdext.presenter", OSL_THIS_FUNC << ": PresenterAccessible::focusLost at " << this); @@ -781,7 +781,7 @@ void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent& rEvent //----- XEventListener ---------------------------------------------------- void SAL_CALL PresenterAccessible::disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { if (rEvent.Source == mxMainWindow) mxMainWindow = NULL; @@ -789,8 +789,8 @@ void SAL_CALL PresenterAccessible::disposing (const css::lang::EventObject& rEve //----- XInitialize ----------------------------------------------------------- -void SAL_CALL PresenterAccessible::initialize (const cssu::Sequence<cssu::Any>& rArguments) - throw (cssu::RuntimeException, std::exception) +void SAL_CALL PresenterAccessible::initialize (const css::uno::Sequence<css::uno::Any>& rArguments) + throw (css::uno::RuntimeException, std::exception) { if (rArguments.getLength() >= 1) { @@ -880,7 +880,7 @@ Reference<XAccessibleContext> SAL_CALL //----- XAccessibleContext ---------------------------------------------- sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCount (void) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -952,7 +952,7 @@ OUString SAL_CALL OUString SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleName (void) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1134,7 +1134,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::removeAccessibleEventListen void SAL_CALL PresenterAccessible::AccessibleObject::windowResized ( const css::awt::WindowEvent& rEvent) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; @@ -1143,7 +1143,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowResized ( void SAL_CALL PresenterAccessible::AccessibleObject::windowMoved ( const css::awt::WindowEvent& rEvent) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; @@ -1152,7 +1152,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowMoved ( void SAL_CALL PresenterAccessible::AccessibleObject::windowShown ( const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; UpdateStateSet(); @@ -1160,7 +1160,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowShown ( void SAL_CALL PresenterAccessible::AccessibleObject::windowHidden ( const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; UpdateStateSet(); @@ -1169,7 +1169,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowHidden ( //----- XEventListener -------------------------------------------------------- void SAL_CALL PresenterAccessible::AccessibleObject::disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { if (rEvent.Source == mxContentWindow) { @@ -1389,19 +1389,19 @@ sal_uInt32 AccessibleStateSet::GetStateMask (const sal_Int16 nState) //----- XAccessibleStateSet --------------------------------------------------- sal_Bool SAL_CALL AccessibleStateSet::isEmpty (void) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return mnStateSet==0; } sal_Bool SAL_CALL AccessibleStateSet::contains (sal_Int16 nState) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return (mnStateSet & GetStateMask(nState)) != 0; } -sal_Bool SAL_CALL AccessibleStateSet::containsAll (const cssu::Sequence<sal_Int16>& rStateSet) - throw (cssu::RuntimeException, std::exception) +sal_Bool SAL_CALL AccessibleStateSet::containsAll (const css::uno::Sequence<sal_Int16>& rStateSet) + throw (css::uno::RuntimeException, std::exception) { for (sal_Int32 nIndex=0,nCount=rStateSet.getLength(); nIndex<nCount; ++nIndex) { @@ -1411,8 +1411,8 @@ sal_Bool SAL_CALL AccessibleStateSet::containsAll (const cssu::Sequence<sal_Int1 return sal_True; } -cssu::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates (void) - throw (cssu::RuntimeException, std::exception) +css::uno::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates (void) + throw (css::uno::RuntimeException, std::exception) { ::std::vector<sal_Int16> aStates; aStates.reserve(sizeof(mnStateSet)*8); @@ -1447,13 +1447,13 @@ void AccessibleRelationSet::AddRelation ( //----- XAccessibleRelationSet ------------------------------------------------ sal_Int32 SAL_CALL AccessibleRelationSet::getRelationCount (void) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return maRelations.size(); } AccessibleRelation SAL_CALL AccessibleRelationSet::getRelation (sal_Int32 nIndex) - throw (cssu::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) + throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) { if (nIndex<0 && sal_uInt32(nIndex)>=maRelations.size()) return AccessibleRelation(); @@ -1462,7 +1462,7 @@ AccessibleRelation SAL_CALL AccessibleRelationSet::getRelation (sal_Int32 nIndex } sal_Bool SAL_CALL AccessibleRelationSet::containsRelation (sal_Int16 nRelationType) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { for (::std::vector<AccessibleRelation>::const_iterator iRelation(maRelations.begin()); iRelation!=maRelations.end(); @@ -1475,7 +1475,7 @@ sal_Bool SAL_CALL AccessibleRelationSet::containsRelation (sal_Int16 nRelationTy } AccessibleRelation SAL_CALL AccessibleRelationSet::getRelationByType (sal_Int16 nRelationType) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { for (::std::vector<AccessibleRelation>::const_iterator iRelation(maRelations.begin()); iRelation!=maRelations.end(); @@ -1538,7 +1538,7 @@ Reference<XAccessibleRelationSet> SAL_CALL //----- XAccessibleText ------------------------------------------------------- sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition (void) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1550,7 +1550,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition (v } sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setCaretPosition (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) + throw (::com::sun::star::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1564,7 +1564,7 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setCaretPosition (sa } sal_Unicode SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacter (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) + throw (::com::sun::star::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1576,8 +1576,8 @@ sal_Unicode SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacter (sal Sequence<css::beans::PropertyValue> SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterAttributes ( ::sal_Int32 nIndex, - const cssu::Sequence<OUString>& rRequestedAttributes) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) + const css::uno::Sequence<OUString>& rRequestedAttributes) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1602,7 +1602,7 @@ Sequence<css::beans::PropertyValue> SAL_CALL awt::Rectangle SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterBounds ( sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1629,7 +1629,7 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterBo } sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount (void) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1642,7 +1642,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount ( sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint ( const css::awt::Point& rPoint) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1654,7 +1654,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint ( } OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText (void) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1662,7 +1662,7 @@ OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText (voi } sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart (void) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1670,7 +1670,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart ( } sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd (void) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1680,7 +1680,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd (vo sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection ( sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { (void)nEndIndex; ThrowIfDisposed(); @@ -1689,7 +1689,7 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection ( } OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText (void) - throw (cssu::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1703,7 +1703,7 @@ OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText (void) OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getTextRange ( sal_Int32 nLocalStartIndex, sal_Int32 nLocalEndIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1723,7 +1723,7 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextAtIndex ( sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1739,7 +1739,7 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBeforeInde sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1755,7 +1755,7 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBehindInde sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1769,7 +1769,7 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBehindInde sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::copyText ( sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1941,8 +1941,8 @@ void AccessibleNotes::SetTextView ( } void AccessibleNotes::SetWindow ( - const cssu::Reference<css::awt::XWindow>& rxContentWindow, - const cssu::Reference<css::awt::XWindow>& rxBorderWindow) + const css::uno::Reference<css::awt::XWindow>& rxContentWindow, + const css::uno::Reference<css::awt::XWindow>& rxBorderWindow) { AccessibleObject::SetWindow(rxContentWindow, rxBorderWindow); diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index 00e94887cdad..58317e73afa7 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -39,8 +39,6 @@ #include <rtl/ref.hxx> #include <boost/shared_ptr.hpp> -namespace cssu = ::com::sun::star::uno; -namespace cssa = ::com::sun::star::accessibility; namespace sdext { namespace presenter { @@ -66,7 +64,7 @@ public: const css::uno::Reference<css::drawing::framework::XPane>& rxMainPane); virtual ~PresenterAccessible (void); - void SetAccessibleParent (const cssu::Reference<cssa::XAccessible>& rxAccessibleParent); + void SetAccessibleParent (const css::uno::Reference<css::accessibility::XAccessible>& rxAccessibleParent); void UpdateAccessibilityHierarchy (void); @@ -78,27 +76,27 @@ public: //----- XAccessible ------------------------------------------------------- - virtual cssu::Reference<cssa::XAccessibleContext> SAL_CALL + virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext (void) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XFocusListener ---------------------------------------------------- virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XInitialization --------------------------------------------------- - virtual void SAL_CALL initialize (const cssu::Sequence<cssu::Any>& rArguments) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; class AccessibleObject; class AccessibleParagraph; diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index 2ccc71e4d408..079b89a4b954 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -399,8 +399,8 @@ void SAL_CALL PresenterNotesView::keyPressed (const awt::KeyEvent& rEvent) mpTextView->MoveCaret( -1, (rEvent.Modifiers == awt::KeyModifier::SHIFT) - ? cssa::AccessibleTextType::CHARACTER - : cssa::AccessibleTextType::WORD); + ? css::accessibility::AccessibleTextType::CHARACTER + : css::accessibility::AccessibleTextType::WORD); break; case awt::Key::L: @@ -408,8 +408,8 @@ void SAL_CALL PresenterNotesView::keyPressed (const awt::KeyEvent& rEvent) mpTextView->MoveCaret( +1, (rEvent.Modifiers == awt::KeyModifier::SHIFT) - ? cssa::AccessibleTextType::CHARACTER - : cssa::AccessibleTextType::WORD); + ? css::accessibility::AccessibleTextType::CHARACTER + : css::accessibility::AccessibleTextType::WORD); break; } } diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index 9ecd430cb487..2cd5c1d5709f 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -32,9 +32,9 @@ #include <com/sun/star/rendering/TexturingMode.hpp> #include <osl/mutex.hxx> -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::drawing::framework; +using namespace css; +using namespace css::uno; +using namespace css::drawing::framework; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index 9f732e7b5d02..0dfe86261ce1 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -38,7 +38,6 @@ #include <rtl/ref.hxx> #include <boost/noncopyable.hpp> -namespace cssu = ::com::sun::star::uno; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index 4f67b5724a25..60beb1bb21ef 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -34,8 +34,6 @@ #include <cppuhelper/compbase1.hxx> #include <cppuhelper/basemutex.hxx> -namespace cssu = ::com::sun::star::uno; -namespace cssa = ::com::sun::star::accessibility; namespace sdext { namespace presenter { @@ -91,13 +89,13 @@ class PresenterTextParagraph public: PresenterTextParagraph ( const sal_Int32 nParagraphIndex, - const cssu::Reference<css::i18n::XBreakIterator>& rxBreakIterator, - const cssu::Reference<css::i18n::XScriptTypeDetector>& rxScriptTypeDetector, - const cssu::Reference<css::text::XTextRange>& rxTextRange, + const css::uno::Reference<css::i18n::XBreakIterator>& rxBreakIterator, + const css::uno::Reference<css::i18n::XScriptTypeDetector>& rxScriptTypeDetector, + const css::uno::Reference<css::text::XTextRange>& rxTextRange, const SharedPresenterTextCaret& rpCaret); void Paint ( - const cssu::Reference<css::rendering::XCanvas>& rxCanvas, + const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::geometry::RealSize2D& rSize, const PresenterTheme::SharedFontDescriptor& rpFont, const css::rendering::ViewState& rViewState, @@ -112,14 +110,14 @@ public: sal_Int32 GetCharacterCount (void) const; sal_Unicode GetCharacter (const sal_Int32 nGlobalCharacterIndex) const; OUString GetText (void) const; - cssa::TextSegment GetTextSegment ( + css::accessibility::TextSegment GetTextSegment ( const sal_Int32 nOffset, const sal_Int32 nGlobalCharacterIndex, const sal_Int16 nTextType) const; - cssa::TextSegment GetWordTextSegment ( + css::accessibility::TextSegment GetWordTextSegment ( const sal_Int32 nOffset, const sal_Int32 nIndex) const; - cssa::TextSegment CreateTextSegment ( + css::accessibility::TextSegment CreateTextSegment ( sal_Int32 nStartIndex, sal_Int32 nEndIndex) const; css::awt::Rectangle GetCharacterBounds ( @@ -168,10 +166,10 @@ private: sal_Int32 mnLineEndCharacterIndex; sal_Int32 mnLineStartCellIndex; sal_Int32 mnLineEndCellIndex; - cssu::Reference<css::rendering::XTextLayout> mxLayoutedLine; + css::uno::Reference<css::rendering::XTextLayout> mxLayoutedLine; double mnBaseLine; double mnWidth; - cssu::Sequence<css::geometry::RealRectangle2D> maCellBoxes; + css::uno::Sequence<css::geometry::RealRectangle2D> maCellBoxes; void ProvideLayoutedLine ( const OUString& rsParagraphText, @@ -181,8 +179,8 @@ private: bool IsEmpty (void) const; }; - cssu::Reference<css::i18n::XBreakIterator> mxBreakIterator; - cssu::Reference<css::i18n::XScriptTypeDetector> mxScriptTypeDetector; + css::uno::Reference<css::i18n::XBreakIterator> mxBreakIterator; + css::uno::Reference<css::i18n::XScriptTypeDetector> mxScriptTypeDetector; ::std::vector<Line> maLines; ::std::vector<sal_Int32> maWordBoundaries; // Offset of the top of the paragraph with respect to the origin of the diff --git a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx index 58a5dc5fefbb..58eb5e49049a 100644 --- a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx +++ b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx @@ -28,11 +28,11 @@ #include <tools/diagnose_ex.h> using namespace css; -using namespace cssu; +using namespace css::uno; void ContextChangeEventMultiplexer::NotifyContextChange ( - const cssu::Reference<css::frame::XController>& rxController, + const css::uno::Reference<css::frame::XController>& rxController, const ::sfx2::sidebar::EnumContext::Context eContext) { if (rxController.is() && rxController->getFrame().is()) @@ -42,7 +42,7 @@ void ContextChangeEventMultiplexer::NotifyContextChange ( GetModuleName(rxController->getFrame()), ::sfx2::sidebar::EnumContext::GetContextName(eContext)); - cssu::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer ( + css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer ( css::ui::ContextChangeEventMultiplexer::get( ::comphelper::getProcessComponentContext())); if (xMultiplexer.is()) @@ -65,7 +65,7 @@ void ContextChangeEventMultiplexer::NotifyContextChange ( ::rtl::OUString ContextChangeEventMultiplexer::GetModuleName ( - const cssu::Reference<css::frame::XFrame>& rxFrame) + const css::uno::Reference<css::frame::XFrame>& rxFrame) { try { diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index 3f6cb355b319..cf45ff59f777 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -45,9 +45,8 @@ #include <boost/bind.hpp> #include <boost/noncopyable.hpp> -namespace cssu = ::com::sun::star::uno; using namespace css; -using namespace cssu; +using namespace css::uno; using namespace svx::sidebar; @@ -71,13 +70,13 @@ public: virtual ~PanelFactory (void); // XUIElementFactory - cssu::Reference<css::ui::XUIElement> SAL_CALL createUIElement ( + css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement ( const ::rtl::OUString& rsResourceURL, - const ::cssu::Sequence<css::beans::PropertyValue>& rArguments) + const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) throw( css::container::NoSuchElementException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; PanelFactory::PanelFactory (void) @@ -97,7 +96,7 @@ PanelFactory::~PanelFactory (void) Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( const ::rtl::OUString& rsResourceURL, - const ::cssu::Sequence<css::beans::PropertyValue>& rArguments) + const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) throw( container::NoSuchElementException, lang::IllegalArgumentException, diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx index c6ee295afe51..bf62a1dc2314 100644 --- a/svx/source/sidebar/SelectionChangeHandler.cxx +++ b/svx/source/sidebar/SelectionChangeHandler.cxx @@ -26,7 +26,7 @@ using namespace css; -using namespace cssu; +using namespace css::uno; using namespace sfx2::sidebar; |