com::sun::star->css in sd

Change-Id: Ic0cbc857a3a9c66241b94c30bf8c859435f5a4b4

15 files changed, 47 insertions, 50 deletions

diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
index 967ba30e69f2..4890d5014b2d 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
@@ -140,10 +140,10 @@ IMPL_LINK_NOARG_TYPED(CacheCompactor, CompactionCallback, Timer *, void)
     {
         Run();
     }
-    catch (const ::com::sun::star::uno::RuntimeException&)
+    catch (const css::uno::RuntimeException&)
     {
     }
-    catch (const ::com::sun::star::uno::Exception&)
+    catch (const css::uno::Exception&)
     {
     }
 
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
index 606233b38a2e..27ff28ef01d3 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
@@ -43,7 +43,7 @@ public:
         MultiPaneGUI/SlideSorter/PreviewCache.   When the specified value
         does not exist then an empty Any is returned.
     */
-    ::com::sun::star::uno::Any GetValue (const OUString& rName);
+    css::uno::Any GetValue (const OUString& rName);
 
 private:
     /** When a caller holds a reference after we have released ours we use
@@ -51,8 +51,7 @@ private:
     */
     static std::weak_ptr<CacheConfiguration> mpWeakInstance;
     static Timer maReleaseTimer;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::container::XNameAccess> mxCacheNode;
+    css::uno::Reference<css::container::XNameAccess> mxCacheNode;
 
     CacheConfiguration();
 
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index b3ef313c100a..c2cc64f453f5 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -45,7 +45,7 @@ QueueProcessor::QueueProcessor (
       mbIsPaused(false)
 {
     // Look into the configuration if there for overriding values.
-    ::com::sun::star::uno::Any aTimeBetweenReqeusts;
+    css::uno::Any aTimeBetweenReqeusts;
     aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue("TimeBetweenHighPriorityRequests");
     if (aTimeBetweenReqeusts.has<sal_Int32>())
         aTimeBetweenReqeusts >>= mnTimeBetweenHighPriorityRequests;
@@ -171,11 +171,11 @@ void QueueProcessor::ProcessOneRequest (
             }
         }
     }
-    catch (::com::sun::star::uno::RuntimeException &)
+    catch (css::uno::RuntimeException &)
     {
         OSL_FAIL("RuntimeException caught in QueueProcessor");
     }
-    catch (::com::sun::star::uno::Exception &)
+    catch (css::uno::Exception &)
     {
         OSL_FAIL("Exception caught in QueueProcessor");
     }
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index d6fb03b1b274..d75151ea1ebd 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -196,7 +196,7 @@ CacheKey RequestQueue::GetFront()
     ::osl::MutexGuard aGuard (maMutex);
 
     if (mpRequestQueue->empty())
-        throw ::com::sun::star::uno::RuntimeException("RequestQueue::GetFront(): queue is empty",
+        throw css::uno::RuntimeException("RequestQueue::GetFront(): queue is empty",
             NULL);
 
     return mpRequestQueue->begin()->maKey;
@@ -207,7 +207,7 @@ RequestPriorityClass RequestQueue::GetFrontPriorityClass()
     ::osl::MutexGuard aGuard (maMutex);
 
     if (mpRequestQueue->empty())
-        throw ::com::sun::star::uno::RuntimeException("RequestQueue::GetFrontPriorityClass(): queue is empty",
+        throw css::uno::RuntimeException("RequestQueue::GetFrontPriorityClass(): queue is empty",
             NULL);
 
     return mpRequestQueue->begin()->meClass;
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 04cf53820e43..dfa797f8333d 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -868,7 +868,7 @@ void SlideSorterController::PageNameHasChanged (int nPageIndex, const OUString&
     if ( ! pWindow)
         return;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+    css::uno::Reference< css::accessibility::XAccessible >
         xAccessible (pWindow->GetAccessible(false));
     if ( ! xAccessible.is())
         return;
@@ -896,7 +896,7 @@ void SlideSorterController::PageNameHasChanged (int nPageIndex, const OUString&
     OUString sOldName (rsOldName);
     OUString sNewName (pChild->GetPage()->GetName());
     pChild->FireAccessibleEvent(
-        ::com::sun::star::accessibility::AccessibleEventId::NAME_CHANGED,
+        css::accessibility::AccessibleEventId::NAME_CHANGED,
         makeAny(sOldName),
         makeAny(sNewName));
 }
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 99278b1c6613..9f72e7ab078e 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -634,7 +634,7 @@ sal_Int8 Clipboard::AcceptDrop (
             if (pDragTransferable != NULL
                 && pDragTransferable->IsPageTransferable()
                 && ((rEvent.maDragEvent.DropAction
-                        & ::com::sun::star::datatransfer::dnd::DNDConstants::ACTION_DEFAULT) != 0)
+                        & css::datatransfer::dnd::DNDConstants::ACTION_DEFAULT) != 0)
                 && (mrSlideSorter.GetModel().GetDocument()->GetDocSh()
                     != pDragTransferable->GetPageDocShell()))
             {
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 486834e17fe0..6628f31bc15a 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -496,7 +496,7 @@ void SAL_CALL Listener::propertyChange (
 //===== frame::XFrameActionListener  ==========================================
 
 void SAL_CALL Listener::frameAction (const frame::FrameActionEvent& rEvent)
-    throw (::com::sun::star::uno::RuntimeException, std::exception)
+    throw (css::uno::RuntimeException, std::exception)
 {
     switch (rEvent.Action)
     {
@@ -630,7 +630,7 @@ void Listener::HandleShapeModification (const SdrPage* pPage)
 }
 
 void Listener::ThrowIfDisposed()
-    throw (::com::sun::star::lang::DisposedException)
+    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx
index f281cdaadec9..eff122700593 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx
@@ -49,10 +49,10 @@ class SlideSorter;
 namespace sd { namespace slidesorter { namespace controller {
 
 typedef cppu::WeakComponentImplHelper<
-    ::com::sun::star::document::XEventListener,
-    ::com::sun::star::beans::XPropertyChangeListener,
-    ::com::sun::star::accessibility::XAccessibleEventListener,
-    ::com::sun::star::frame::XFrameActionListener
+    css::document::XEventListener,
+    css::beans::XPropertyChangeListener,
+    css::accessibility::XAccessibleEventListener,
+    css::frame::XFrameActionListener
     > ListenerInterfaceBase;
 
 class SlideSorterController;
@@ -96,27 +96,27 @@ 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;
 
     //=====  document::XEventListener  ========================================
     virtual void SAL_CALL
         notifyEvent (
-            const ::com::sun::star::document::EventObject& rEventObject)
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            const css::document::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;
 
     //===== accessibility::XAccessibleEventListener  ==========================
     virtual void SAL_CALL
         notifyEvent (
-            const ::com::sun::star::accessibility::AccessibleEventObject&
+            const css::accessibility::AccessibleEventObject&
             rEvent)
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     //===== frame::XFrameActionListener  ======================================
     /** For certain actions the listener connects to a new controller of the
@@ -124,8 +124,8 @@ 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;
 
     virtual void SAL_CALL disposing() override;
 
@@ -144,8 +144,8 @@ private:
     bool mbListeningToFrame;
     bool mbIsMainViewChangePending;
 
-    ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XController> mxControllerWeak;
-    ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame> mxFrameWeak;
+    css::uno::WeakReference< css::frame::XController> mxControllerWeak;
+    css::uno::WeakReference< css::frame::XFrame> mxFrameWeak;
 
     /** This object is used to lock the model between some
         events.  It is references counted in order to cope with events that
@@ -174,7 +174,7 @@ private:
         disposed.
     */
     void ThrowIfDisposed()
-        throw (::com::sun::star::lang::DisposedException);
+        throw (css::lang::DisposedException);
 
     DECL_LINK_TYPED(EventMultiplexerCallback, tools::EventMultiplexerEvent&, void);
 };
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx
index 10126e663c4b..fe0ff6ae1f86 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx
@@ -89,7 +89,7 @@ public:
         same model but have different preview sizes may access previews of
         each other in order to create fast previews of the previews.
     */
-    virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() = 0;
+    virtual css::uno::Reference<css::uno::XInterface> GetModel() = 0;
 };
 
 typedef std::shared_ptr<CacheContext> SharedCacheContext;
diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
index fbbc804c00ce..8f22b6ba4d3d 100644
--- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
@@ -114,7 +114,7 @@ public:
             there is no such page descriptor.
     */
     sal_Int32 GetIndex (
-        const ::com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage>& rxSlide) const;
+        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) const;
 
     /** Return a page descriptor for the given SdrPage.  Page descriptors
         are created on demand.  The page descriptor is found (or not found)
@@ -207,7 +207,7 @@ public:
 private:
     mutable ::osl::Mutex maMutex;
     SlideSorter& mrSlideSorter;
-    ::com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> mxSlides;
+    css::uno::Reference<css::container::XIndexAccess> mxSlides;
     PageKind mePageKind;
     EditMode meEditMode;
     typedef ::std::vector<SharedPageDescriptor> DescriptorContainer;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index d1e138e60a84..18137ae6ecf0 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -461,7 +461,7 @@ void SlideSorterService::Resize()
 }
 
 void SlideSorterService::ThrowIfDisposed()
-    throw (::com::sun::star::lang::DisposedException)
+    throw (css::lang::DisposedException)
 {
     if (SlideSorterServiceInterfaceBase::rBHelper.bDisposed || SlideSorterServiceInterfaceBase::rBHelper.bInDispose)
     {
@@ -473,9 +473,9 @@ void SlideSorterService::ThrowIfDisposed()
 } } // end of namespace ::sd::slidesorter
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Draw_SlideSorter_get_implementation(::com::sun::star::uno::XComponentContext* context,
-                                                      ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_SlideSorter_get_implementation(css::uno::XComponentContext* context,
+                                                      css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new sd::slidesorter::SlideSorterService(context));
 }
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 1461c7045071..140680136356 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -146,15 +146,14 @@ SlideSorterViewShell::~SlideSorterViewShell()
         ::sd::Window* pWindow = GetActiveWindow();
         if (pWindow!=NULL)
         {
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::lang::XComponent> xComponent (
+            css::uno::Reference<css::lang::XComponent> xComponent (
                     pWindow->GetAccessible(false),
-                    ::com::sun::star::uno::UNO_QUERY);
+                    css::uno::UNO_QUERY);
             if (xComponent.is())
                 xComponent->dispose();
         }
     }
-    catch( ::com::sun::star::uno::Exception& )
+    catch( css::uno::Exception& )
     {
         OSL_FAIL("sd::SlideSorterViewShell::~SlideSorterViewShell(), exception caught!" );
     }
@@ -250,8 +249,7 @@ Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController
     to the base class to return a default object (probably an empty
     reference).
 */
-::com::sun::star::uno::Reference<
-    ::com::sun::star::accessibility::XAccessible>
+css::uno::Reference<css::accessibility::XAccessible>
     SlideSorterViewShell::CreateAccessibleDocumentView (::sd::Window* pWindow)
 {
     // When the view is not set then the initialization is not yet complete
@@ -267,14 +265,14 @@ Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController
         pWindow->GetAccessibleParentWindow()->GetAccessible(),
         pWindow);
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> xRet(pAccessibleView);
+    css::uno::Reference< css::accessibility::XAccessible> xRet(pAccessibleView);
 
     pAccessibleView->Init();
 
     return xRet;
 }
 
-void SlideSorterViewShell::SwitchViewFireFocus(::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc )
+void SlideSorterViewShell::SwitchViewFireFocus(css::uno::Reference< css::accessibility::XAccessible > xAcc )
 {
     if (xAcc.get())
     {
diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx
index cc44e487f18a..3ac3e7da06dd 100644
--- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx
+++ b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx
@@ -56,7 +56,7 @@ FontProvider& FontProvider::Instance()
     // We throw an exception when for some strange reason no instance of
     // this class exists.
     if (mpInstance == NULL)
-        throw ::com::sun::star::uno::RuntimeException("com.sun.star.document.IndexedPropertyValues",
+        throw css::uno::RuntimeException("com.sun.star.document.IndexedPropertyValues",
             NULL);
 
     return *mpInstance;
diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx
index 3ad7c0ba7151..55e1111b8743 100644
--- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx
+++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx
@@ -112,7 +112,7 @@ model::SharedPageDescriptor ViewCacheContext::GetDescriptor (cache::CacheKey aKe
     return mrModel.GetPageDescriptor(nPageIndex);
 }
 
-::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ViewCacheContext::GetModel()
+css::uno::Reference<css::uno::XInterface> ViewCacheContext::GetModel()
 {
     if (mrModel.GetDocument() == NULL)
         return NULL;
diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx
index fe994e5710e9..e9e577b6583e 100644
--- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx
+++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx
@@ -47,7 +47,7 @@ public:
     virtual const SdrPage* GetPage (cache::CacheKey aKey) override;
     virtual std::shared_ptr<std::vector<cache::CacheKey> > GetEntryList (bool bVisible) override;
     virtual sal_Int32 GetPriority (cache::CacheKey aKey) override;
-    virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() override;
+    virtual css::uno::Reference<css::uno::XInterface> GetModel() override;
 
 private:
     model::SlideSorterModel& mrModel;