From 66a175834c39ccde9475eac3adb72a843110d01f Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@suse.com>
Date: Thu, 29 Nov 2012 21:26:09 +0100
Subject: c++ API: use css alias in generated headers, adds global css decl

This changes all generated API headers (.hpp and .hdl) to use a
namespace alias 'css' instead of the pointlessly long com::sun::star

Makes the change in cppumaker & associated tools, adds a global
namespace alias definition in sal/types.h, and removes a kiloton
of local, now pointless-to-harmful versions of that alias from all
over the code.

Change-Id: Ice5a644a6b971a981f01dc0589d48f5add31cc0f
---
 sd/source/ui/annotations/annotationtag.hxx                           | 2 --
 sd/source/ui/dlg/filedlg.cxx                                         | 5 -----
 .../framework/configuration/ConfigurationControllerBroadcaster.hxx   | 2 --
 .../configuration/ConfigurationControllerResourceManager.hxx         | 2 --
 sd/source/ui/framework/configuration/ConfigurationUpdater.hxx        | 2 --
 .../ui/framework/configuration/GenericConfigurationChangeRequest.hxx | 2 --
 sd/source/ui/framework/configuration/ResourceFactoryManager.hxx      | 2 --
 sd/source/ui/framework/factories/BasicPaneFactory.hxx                | 2 --
 sd/source/ui/framework/factories/BasicToolBarFactory.hxx             | 2 --
 sd/source/ui/framework/factories/BasicViewFactory.hxx                | 2 --
 sd/source/ui/framework/factories/FullScreenPane.hxx                  | 2 --
 sd/source/ui/framework/factories/TaskPanelFactory.hxx                | 2 --
 sd/source/ui/framework/module/ResourceManager.hxx                    | 2 --
 sd/source/ui/framework/module/ShellStackGuard.hxx                    | 3 ---
 sd/source/ui/framework/module/SlideSorterModule.hxx                  | 2 --
 sd/source/ui/framework/module/ToolBarModule.hxx                      | 2 --
 sd/source/ui/framework/module/ToolPanelModule.hxx                    | 2 --
 sd/source/ui/framework/module/ViewTabBarModule.hxx                   | 2 --
 sd/source/ui/inc/DocumentRenderer.hxx                                | 2 --
 sd/source/ui/inc/DrawController.hxx                                  | 2 --
 sd/source/ui/inc/RemoteServer.hxx                                    | 3 ---
 sd/source/ui/inc/SdUnoDrawView.hxx                                   | 2 --
 sd/source/ui/inc/SdUnoOutlineView.hxx                                | 2 --
 sd/source/ui/inc/SdUnoSlideView.hxx                                  | 2 --
 sd/source/ui/inc/ViewShell.hxx                                       | 2 --
 sd/source/ui/inc/framework/ConfigurationController.hxx               | 2 --
 sd/source/ui/inc/framework/FrameworkHelper.hxx                       | 2 --
 sd/source/ui/inc/framework/ModuleController.hxx                      | 2 --
 sd/source/ui/inc/framework/Pane.hxx                                  | 1 -
 sd/source/ui/inc/framework/PresentationFactory.hxx                   | 2 --
 sd/source/ui/inc/framework/ResourceId.hxx                            | 3 ---
 sd/source/ui/inc/tools/ConfigurationAccess.hxx                       | 2 --
 sd/source/ui/inc/tools/PropertySet.hxx                               | 2 --
 sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx                 | 2 --
 sd/source/ui/presenter/CanvasUpdateRequester.hxx                     | 2 --
 sd/source/ui/presenter/PresenterCanvas.hxx                           | 2 --
 sd/source/ui/presenter/PresenterHelper.hxx                           | 2 --
 sd/source/ui/presenter/PresenterPreviewCache.hxx                     | 2 --
 sd/source/ui/presenter/PresenterTextView.hxx                         | 2 --
 sd/source/ui/presenter/SlideRenderer.hxx                             | 2 --
 sd/source/ui/remotecontrol/Communicator.hxx                          | 2 --
 sd/source/ui/remotecontrol/DiscoveryService.hxx                      | 2 --
 sd/source/ui/remotecontrol/ImagePreparer.hxx                         | 2 --
 sd/source/ui/remotecontrol/Listener.hxx                              | 2 --
 sd/source/ui/remotecontrol/Receiver.hxx                              | 2 --
 sd/source/ui/slideshow/slideshowimpl.hxx                             | 2 --
 sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx           | 2 --
 sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx    | 2 --
 sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx              | 2 --
 sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx             | 2 --
 sd/source/ui/slidesorter/shell/SlideSorterService.hxx                | 2 --
 51 files changed, 107 deletions(-)

(limited to 'sd/source/ui')

diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index 9deae0b0d0a3..e2a7f22f564e 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -25,8 +25,6 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include "smarttag.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace sd {
 
 class View;
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index b3fe6fa1d40a..b34b2cd85ebe 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -43,11 +43,6 @@
 #include <svtools/filter.hxx>
 
 
-//-----------------------------------------------------------------------------
-
-namespace css = ::com::sun::star;
-
-
 // --------------------------------------------------------------------
 // -----------      SdFileDialog_Imp        ---------------------------
 // --------------------------------------------------------------------
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
index 8329543bf4ee..288ad97f392b 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
@@ -28,8 +28,6 @@
 #include <vector>
 #include <boost/unordered_map.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace framework {
 
 /** This class manages the set of XConfigurationChangeListeners and
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
index d154e1ccf21b..f9945892f872 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
@@ -28,8 +28,6 @@
 #include <map>
 #include <vector>
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace framework {
 
 class ConfigurationControllerBroadcaster;
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index 7723ad1951ca..5149b23544d2 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -28,8 +28,6 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace framework {
 
 class ConfigurationClassifier;
diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
index cc6a97c885a8..28b56736bfd0 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
@@ -29,8 +29,6 @@
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <cppuhelper/compbase2.hxx>
 
-namespace css = ::com::sun::star;
-
 namespace {
 
 typedef ::cppu::WeakComponentImplHelper2 <
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
index 267aa0505196..81b1efd01d22 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
@@ -28,8 +28,6 @@
 #include <comphelper/stl_types.hxx>
 #include <boost/unordered_map.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace framework {
 
 /** Container of resource factories of the drawing framework.
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
index b1d5c8b3449b..472609a17677 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
@@ -35,8 +35,6 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 
-namespace css = ::com::sun::star;
-
 
 namespace {
 
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
index fd59a1eba450..377619c2ec57 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
@@ -33,8 +33,6 @@
 #include <cppuhelper/basemutex.hxx>
 
 
-namespace css = ::com::sun::star;
-
 namespace {
 
 typedef ::cppu::WeakComponentImplHelper3 <
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx
index 486970d8a822..88d33a4dc1ce 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
@@ -35,8 +35,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd {
 class ViewShell;
 class ViewShellBase;
diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx
index b880d1f199a9..4cef40a3c4bd 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.hxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.hxx
@@ -26,8 +26,6 @@
 #include <vcl/vclevent.hxx>
 #include <boost/scoped_ptr.hpp>
 
-namespace css = ::com::sun::star;
-
 class WorkWindow;
 
 namespace sd { class ViewShellBase; }
diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.hxx b/sd/source/ui/framework/factories/TaskPanelFactory.hxx
index 787eb0090da0..d23a0378fca0 100644
--- a/sd/source/ui/framework/factories/TaskPanelFactory.hxx
+++ b/sd/source/ui/framework/factories/TaskPanelFactory.hxx
@@ -29,8 +29,6 @@
 
 #include <boost/scoped_ptr.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace {
 
 typedef ::cppu::WeakComponentImplHelper2 <
diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx
index 60da4dd1609d..71e440840899 100644
--- a/sd/source/ui/framework/module/ResourceManager.hxx
+++ b/sd/source/ui/framework/module/ResourceManager.hxx
@@ -27,8 +27,6 @@
 #include <cppuhelper/compbase1.hxx>
 #include <boost/scoped_ptr.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace {
 
 typedef ::cppu::WeakComponentImplHelper1 <
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
index 83d908a0e074..021e62c4fc56 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -33,9 +33,6 @@
 #include <boost/scoped_ptr.hpp>
 
 
-namespace css = ::com::sun::star;
-
-
 namespace {
 
 typedef ::cppu::WeakComponentImplHelper1 <
diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx
index c183954d00cb..64897c09d5c9 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.hxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.hxx
@@ -25,8 +25,6 @@
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <com/sun/star/drawing/framework/XTabBar.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace framework {
 
 /** This module is responsible for showing the slide sorter bar and the the
diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx
index d88b0960f4e9..8ba51892ae26 100644
--- a/sd/source/ui/framework/module/ToolBarModule.hxx
+++ b/sd/source/ui/framework/module/ToolBarModule.hxx
@@ -30,8 +30,6 @@
 #include <cppuhelper/compbase1.hxx>
 #include <boost/scoped_ptr.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd {
 class ViewShellBase;
 }
diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx
index cfc1f7c32b97..d02404fa9a14 100644
--- a/sd/source/ui/framework/module/ToolPanelModule.hxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.hxx
@@ -25,8 +25,6 @@
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <com/sun/star/drawing/framework/XTabBar.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace framework {
 
 /** This module is responsible for showing the toolpanel bar.
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx
index 91716f6c4757..f06870ff29bf 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.hxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx
@@ -29,8 +29,6 @@
 #include <osl/mutex.hxx>
 #include <cppuhelper/compbase1.hxx>
 
-namespace css = ::com::sun::star;
-
 namespace {
 
 typedef ::cppu::WeakComponentImplHelper1 <
diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx
index 69772cb18d53..f45020c7b5a0 100644
--- a/sd/source/ui/inc/DocumentRenderer.hxx
+++ b/sd/source/ui/inc/DocumentRenderer.hxx
@@ -27,8 +27,6 @@
 #include <cppuhelper/basemutex.hxx>
 #include <boost/scoped_ptr.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd {
 
 namespace {
diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx
index 7a7a91eddf0a..7cf975da08d5 100644
--- a/sd/source/ui/inc/DrawController.hxx
+++ b/sd/source/ui/inc/DrawController.hxx
@@ -41,8 +41,6 @@
 #include <vector>
 #include <boost/scoped_ptr.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd {
 
 typedef ::cppu::ImplInheritanceHelper7 <
diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx
index 1bfae2e973f9..740465c2934c 100644
--- a/sd/source/ui/inc/RemoteServer.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -25,15 +25,12 @@
 
 #include "sddllapi.h"
 
-namespace css = ::com::sun::star;
-
 /**
 * The port for use for the main communication between LibO and remote control app.
 */
 #define PORT 1599
 
 #define CHARSET RTL_TEXTENCODING_UTF8
-namespace css = ::com::sun::star;
 
 namespace sd
 {
diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx
index 00cf7228ed11..d572ac7a8227 100644
--- a/sd/source/ui/inc/SdUnoDrawView.hxx
+++ b/sd/source/ui/inc/SdUnoDrawView.hxx
@@ -26,8 +26,6 @@
 
 class SdXImpressDocument;
 
-namespace css = ::com::sun::star;
-
 namespace com { namespace sun { namespace star { namespace drawing {
 class XLayer;
 } } } }
diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx
index 7960a124966b..21b3432b759a 100644
--- a/sd/source/ui/inc/SdUnoOutlineView.hxx
+++ b/sd/source/ui/inc/SdUnoOutlineView.hxx
@@ -25,8 +25,6 @@
 #include <com/sun/star/lang/EventObject.hpp>
 
 
-namespace css = ::com::sun::star;
-
 namespace sd {
 
 class OutlineViewShell;
diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx
index 8a56fe15bd53..2fb06b520562 100644
--- a/sd/source/ui/inc/SdUnoSlideView.hxx
+++ b/sd/source/ui/inc/SdUnoSlideView.hxx
@@ -24,8 +24,6 @@
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace slidesorter {
 class SlideSorter;
 } }
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index e05b74d80cc7..f1411652c8b7 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -51,8 +51,6 @@ namespace embed {
     class XEmbeddedObject;
 }}}}
 
-namespace css = ::com::sun::star;
-
 namespace sd {
 
 class DrawDocShell;
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx
index 93c73fcc8e7a..1d07e178922b 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -39,8 +39,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace {
 
 typedef ::cppu::WeakComponentImplHelper2 <
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index 2056b9cdeaa0..2024b3ba6ffb 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -43,8 +43,6 @@ namespace rtl {
 class OUString;
 }
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace framework {
 
 /** The FrameworkHelper is a convenience class that simplifies the
diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx
index 10cc2ed4e0a1..bf83930ba8ba 100644
--- a/sd/source/ui/inc/framework/ModuleController.hxx
+++ b/sd/source/ui/inc/framework/ModuleController.hxx
@@ -32,8 +32,6 @@
 #include <boost/scoped_ptr.hpp>
 #include <set>
 
-namespace css = ::com::sun::star;
-
 namespace {
 
 typedef ::cppu::WeakComponentImplHelper2 <
diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx
index b602711ddb90..49a99ce1e38d 100644
--- a/sd/source/ui/inc/framework/Pane.hxx
+++ b/sd/source/ui/inc/framework/Pane.hxx
@@ -32,7 +32,6 @@
 
 class Window;
 
-namespace css = ::com::sun::star;
 namespace cssu = ::com::sun::star::uno;
 
 namespace {
diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx
index 86493dc585a7..4634bed147af 100644
--- a/sd/source/ui/inc/framework/PresentationFactory.hxx
+++ b/sd/source/ui/inc/framework/PresentationFactory.hxx
@@ -35,8 +35,6 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace {
 
 typedef ::cppu::WeakComponentImplHelper2 <
diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx
index 77427608aa74..460db6db2bd6 100644
--- a/sd/source/ui/inc/framework/ResourceId.hxx
+++ b/sd/source/ui/inc/framework/ResourceId.hxx
@@ -26,9 +26,6 @@
 #include <cppuhelper/compbase2.hxx>
 #include <boost/scoped_ptr.hpp>
 
-namespace css = ::com::sun::star;
-
-
 namespace {
 
 typedef ::cppu::WeakImplHelper2 <
diff --git a/sd/source/ui/inc/tools/ConfigurationAccess.hxx b/sd/source/ui/inc/tools/ConfigurationAccess.hxx
index 694c14443e64..6b4e49a727f8 100644
--- a/sd/source/ui/inc/tools/ConfigurationAccess.hxx
+++ b/sd/source/ui/inc/tools/ConfigurationAccess.hxx
@@ -28,8 +28,6 @@
 #include <vector>
 #include <boost/function.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace tools {
 
 /** This class gives access to the configuration.  Create an object of this
diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx
index 1721000e6354..0dedecda0beb 100644
--- a/sd/source/ui/inc/tools/PropertySet.hxx
+++ b/sd/source/ui/inc/tools/PropertySet.hxx
@@ -26,8 +26,6 @@
 #include <boost/scoped_ptr.hpp>
 #include <map>
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace tools {
 
 namespace {
diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
index 7b2832227ea4..239f57188494 100644
--- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
+++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
@@ -25,8 +25,6 @@
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd {
 
 class SdGlobalResource
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
index e2fe5483b49a..bf4b35fcf4a2 100644
--- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
@@ -29,8 +29,6 @@
 #include <tools/link.hxx>
 #include <vector>
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace presenter {
 
 /** Each UpdateRequester handles update requests (calls to
diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx
index efe816c2167d..b2447d1bec62 100644
--- a/sd/source/ui/presenter/PresenterCanvas.hxx
+++ b/sd/source/ui/presenter/PresenterCanvas.hxx
@@ -35,8 +35,6 @@
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace presenter {
 
 namespace {
diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx
index dbe3e80857ed..2bfe3ff1c890 100644
--- a/sd/source/ui/presenter/PresenterHelper.hxx
+++ b/sd/source/ui/presenter/PresenterHelper.hxx
@@ -27,8 +27,6 @@
 #include <cppuhelper/compbase2.hxx>
 #include <boost/noncopyable.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace presenter {
 
 namespace {
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx
index 57c5ca9c116f..5d0ceab59811 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.hxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx
@@ -29,8 +29,6 @@
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace presenter {
 
 namespace {
diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx
index 47adb2644b38..19cfd9110d9c 100644
--- a/sd/source/ui/presenter/PresenterTextView.hxx
+++ b/sd/source/ui/presenter/PresenterTextView.hxx
@@ -28,8 +28,6 @@
 #include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace presenter {
 
 namespace {
diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx
index aa052b7a732f..1638d0067f99 100644
--- a/sd/source/ui/presenter/SlideRenderer.hxx
+++ b/sd/source/ui/presenter/SlideRenderer.hxx
@@ -29,8 +29,6 @@
 #include <cppuhelper/compbase2.hxx>
 #include <boost/noncopyable.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace presenter {
 
 namespace {
diff --git a/sd/source/ui/remotecontrol/Communicator.hxx b/sd/source/ui/remotecontrol/Communicator.hxx
index cd3e312f3065..10078bf63387 100644
--- a/sd/source/ui/remotecontrol/Communicator.hxx
+++ b/sd/source/ui/remotecontrol/Communicator.hxx
@@ -25,8 +25,6 @@
 #include "BufferedStreamSocket.hxx"
 
 #define CHARSET RTL_TEXTENCODING_UTF8
-namespace css = ::com::sun::star;
-
 namespace sd
 {
 
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.hxx b/sd/source/ui/remotecontrol/DiscoveryService.hxx
index 02486ba6a324..eafca4160b6f 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.hxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.hxx
@@ -18,8 +18,6 @@
 #include <rtl/ref.hxx>
 #include <osl/thread.hxx>
 
-namespace css = ::com::sun::star;
-
 /**
 * The port for use for the main communication between LibO and remote control app.
 */
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.hxx b/sd/source/ui/remotecontrol/ImagePreparer.hxx
index 86234d5383a4..aa013d766c16 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.hxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.hxx
@@ -15,8 +15,6 @@
 
 #include "Transmitter.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace sd
 {
 
diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx
index 63f7dc32c41b..e3385eb359fc 100644
--- a/sd/source/ui/remotecontrol/Listener.hxx
+++ b/sd/source/ui/remotecontrol/Listener.hxx
@@ -21,8 +21,6 @@
 #include "Communicator.hxx"
 #include "Transmitter.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace sd {
 /**
  * Slide show listener. This class can also be used for anything else that is
diff --git a/sd/source/ui/remotecontrol/Receiver.hxx b/sd/source/ui/remotecontrol/Receiver.hxx
index e4f19f59203f..0bee508089d5 100644
--- a/sd/source/ui/remotecontrol/Receiver.hxx
+++ b/sd/source/ui/remotecontrol/Receiver.hxx
@@ -21,8 +21,6 @@
 
 #include "Transmitter.hxx"
 
-namespace css = ::com::sun::star;
-
 namespace sd
 {
 
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index cb395e638c2e..7f87ea01ccd5 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -81,8 +81,6 @@
 class SfxViewFrame;
 class SfxRequest;
 
-namespace css = ::com::sun::star;
-
 namespace sd
 {
 class SlideShowView;
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx
index c2916b1af3d4..a5879ca96dc8 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx
@@ -31,8 +31,6 @@ class SdrPage;
 
 namespace sd { namespace slidesorter { namespace cache {
 
-namespace css = ::com::sun::star;
-
 class BitmapCache;
 
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index e49e2aa00df5..1e1ce4df0f8b 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -43,8 +43,6 @@ namespace sd { namespace slidesorter { namespace model {
 class SlideSorterModel;
 } } }
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace slidesorter { namespace controller {
 
 class Animator;
diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
index ef32d53faa8b..197d6280b33c 100644
--- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
@@ -34,8 +34,6 @@ class SdDrawDocument;
 #include <vector>
 #include <functional>
 
-namespace css = ::com::sun::star;
-
 class SdrPage;
 class SdPage;
 
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
index 702b127a4c24..1f5f70f6b9df 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
@@ -36,8 +36,6 @@ class SdrPage;
 
 namespace sd { namespace slidesorter { namespace model {
 
-namespace css = ::com::sun::star;
-
 /** Each PageDescriptor object represents the preview of one draw page,
     slide, or master page of a Draw or Impress document as they are displayed
     in the slide sorter.  This class gives access to some associated
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
index 5e9a6e729019..fcc7ffa83842 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
@@ -35,8 +35,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
 
-namespace css = ::com::sun::star;
-
 namespace sd { namespace slidesorter {
 
 namespace {
-- 
cgit