summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2012-11-29 21:26:09 +0100
committerThorsten Behrens <tbehrens@suse.com>2012-11-30 14:36:36 +0100
commit66a175834c39ccde9475eac3adb72a843110d01f (patch)
treeef925daaf84a85731525c2b14f0cd4a2ed84e2de /sdext
parent90eac3e69749a9227c4b6902b1f3cef1e338c6d1 (diff)
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
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/presenter/PresenterAccessibility.hxx1
-rw-r--r--sdext/source/presenter/PresenterBitmapContainer.hxx2
-rw-r--r--sdext/source/presenter/PresenterButton.hxx2
-rw-r--r--sdext/source/presenter/PresenterCanvasHelper.hxx2
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.hxx2
-rw-r--r--sdext/source/presenter/PresenterController.hxx2
-rw-r--r--sdext/source/presenter/PresenterCurrentSlideObserver.hxx2
-rw-r--r--sdext/source/presenter/PresenterFrameworkObserver.hxx2
-rw-r--r--sdext/source/presenter/PresenterGeometryHelper.hxx2
-rw-r--r--sdext/source/presenter/PresenterHelpView.hxx2
-rw-r--r--sdext/source/presenter/PresenterHelper.hxx2
-rw-r--r--sdext/source/presenter/PresenterNotesView.hxx2
-rw-r--r--sdext/source/presenter/PresenterPaintManager.hxx2
-rw-r--r--sdext/source/presenter/PresenterPane.hxx2
-rw-r--r--sdext/source/presenter/PresenterPaneBase.hxx1
-rw-r--r--sdext/source/presenter/PresenterPaneBorderManager.hxx2
-rw-r--r--sdext/source/presenter/PresenterPaneBorderPainter.hxx2
-rw-r--r--sdext/source/presenter/PresenterPaneContainer.hxx2
-rw-r--r--sdext/source/presenter/PresenterPaneFactory.hxx2
-rw-r--r--sdext/source/presenter/PresenterProtocolHandler.hxx2
-rw-r--r--sdext/source/presenter/PresenterScreen.hxx2
-rw-r--r--sdext/source/presenter/PresenterScrollBar.hxx2
-rw-r--r--sdext/source/presenter/PresenterSlidePreview.hxx2
-rw-r--r--sdext/source/presenter/PresenterSlideShowView.hxx2
-rw-r--r--sdext/source/presenter/PresenterSlideSorter.hxx2
-rw-r--r--sdext/source/presenter/PresenterSprite.hxx2
-rw-r--r--sdext/source/presenter/PresenterSpritePane.hxx2
-rw-r--r--sdext/source/presenter/PresenterTextView.hxx1
-rw-r--r--sdext/source/presenter/PresenterTheme.hxx2
-rw-r--r--sdext/source/presenter/PresenterTimer.hxx2
-rw-r--r--sdext/source/presenter/PresenterToolBar.hxx2
-rw-r--r--sdext/source/presenter/PresenterUIPainter.hxx2
-rw-r--r--sdext/source/presenter/PresenterViewFactory.hxx2
-rw-r--r--sdext/source/presenter/PresenterWindowManager.hxx2
34 files changed, 0 insertions, 65 deletions
diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx
index d23a381e5888..6a70c9ed625e 100644
--- a/sdext/source/presenter/PresenterAccessibility.hxx
+++ b/sdext/source/presenter/PresenterAccessibility.hxx
@@ -39,7 +39,6 @@
#include <rtl/ref.hxx>
#include <boost/shared_ptr.hpp>
-namespace css = ::com::sun::star;
namespace cssu = ::com::sun::star::uno;
namespace cssa = ::com::sun::star::accessibility;
diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx
index c06f6cf58bd5..60f029629f29 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.hxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.hxx
@@ -34,8 +34,6 @@
#include <vector>
#include <boost/shared_ptr.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
/** Manage a set of bitmap groups as they are used for buttons: three
diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx
index 10ccbe78958b..2c56e2195498 100644
--- a/sdext/source/presenter/PresenterButton.hxx
+++ b/sdext/source/presenter/PresenterButton.hxx
@@ -35,8 +35,6 @@
#include <boost/noncopyable.hpp>
#include <rtl/ref.hxx>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
class PresenterController;
diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sdext/source/presenter/PresenterCanvasHelper.hxx
index cb7d10980a81..d9e10dd04967 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.hxx
+++ b/sdext/source/presenter/PresenterCanvasHelper.hxx
@@ -30,8 +30,6 @@
#include <rtl/ref.hxx>
#include <boost/noncopyable.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
/** Collection of functions to ease the life of a canvas user.
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx
index 0ddb80c3843d..c38d5b44e231 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.hxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx
@@ -28,8 +28,6 @@
#include <vector>
#include <boost/function.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
/** This class gives access to the configuration. Create an object of this
diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx
index b68638d6434c..fb66f31b2e4b 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -50,8 +50,6 @@
#include <boost/shared_ptr.hpp>
#include <boost/scoped_ptr.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
class PresenterCanvasHelper;
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
index 1ad7fafaaaed..1c009c3af53d 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
@@ -29,8 +29,6 @@
#include <rtl/ref.hxx>
#include <salhelper/timer.hxx>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
namespace {
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx
index ae338faaa5af..659beddcb29f 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.hxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx
@@ -27,8 +27,6 @@
#include <boost/function.hpp>
#include <boost/noncopyable.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
typedef ::cppu::WeakComponentImplHelper1 <
diff --git a/sdext/source/presenter/PresenterGeometryHelper.hxx b/sdext/source/presenter/PresenterGeometryHelper.hxx
index 7fd249e06b43..0279933fd5b2 100644
--- a/sdext/source/presenter/PresenterGeometryHelper.hxx
+++ b/sdext/source/presenter/PresenterGeometryHelper.hxx
@@ -28,8 +28,6 @@
#include <com/sun/star/geometry/RealRectangle2D.hpp>
#include <vector>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
/** Collection of geometry related convenience functions.
diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx
index 50e43ff97130..4d7427007377 100644
--- a/sdext/source/presenter/PresenterHelpView.hxx
+++ b/sdext/source/presenter/PresenterHelpView.hxx
@@ -30,8 +30,6 @@
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
-namespace css = ::com::sun::star;
-
namespace {
typedef cppu::WeakComponentImplHelper3<
css::drawing::framework::XView,
diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sdext/source/presenter/PresenterHelper.hxx
index 28fa0b5f1741..d0145afffc53 100644
--- a/sdext/source/presenter/PresenterHelper.hxx
+++ b/sdext/source/presenter/PresenterHelper.hxx
@@ -26,8 +26,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <boost/noncopyable.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
/** Collection of helper functions that do not fit in anywhere else.
diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx
index c7213da73442..012206d3386e 100644
--- a/sdext/source/presenter/PresenterNotesView.hxx
+++ b/sdext/source/presenter/PresenterNotesView.hxx
@@ -39,8 +39,6 @@
#include <rtl/ref.hxx>
#include <boost/shared_ptr.hpp>
-namespace css = ::com::sun::star;
-
namespace {
typedef cppu::WeakComponentImplHelper5<
css::awt::XWindowListener,
diff --git a/sdext/source/presenter/PresenterPaintManager.hxx b/sdext/source/presenter/PresenterPaintManager.hxx
index bf0620fff0c9..494dc101df5c 100644
--- a/sdext/source/presenter/PresenterPaintManager.hxx
+++ b/sdext/source/presenter/PresenterPaintManager.hxx
@@ -26,8 +26,6 @@
#include <rtl/ref.hxx>
#include <boost/function.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
class PresenterPaneContainer;
diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx
index ef6169978a21..67bf1814c2f4 100644
--- a/sdext/source/presenter/PresenterPane.hxx
+++ b/sdext/source/presenter/PresenterPane.hxx
@@ -34,8 +34,6 @@
#include <rtl/ref.hxx>
#include <boost/noncopyable.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
/** Pane used by the presenter screen. Pane objects are stored in the
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index d6f62f94f0a4..eb9fa8d9b3a3 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 css = ::com::sun::star;
namespace cssu = ::com::sun::star::uno;
namespace sdext { namespace presenter {
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx b/sdext/source/presenter/PresenterPaneBorderManager.hxx
index 22cc87409b20..a37fde6db78e 100644
--- a/sdext/source/presenter/PresenterPaneBorderManager.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderManager.hxx
@@ -44,8 +44,6 @@
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
class PresenterController;
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
index ab0f0b36c7dc..50f630038712 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
@@ -33,8 +33,6 @@
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
class PresenterPane;
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
index 2531256c40d1..951ee1564c40 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -38,8 +38,6 @@
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
class PresenterPaneBase;
diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx
index 9152bb519829..c03674dd69ad 100644
--- a/sdext/source/presenter/PresenterPaneFactory.hxx
+++ b/sdext/source/presenter/PresenterPaneFactory.hxx
@@ -33,8 +33,6 @@
#include <boost/scoped_ptr.hpp>
#include <map>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
class PresenterController;
diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx
index 34920217b42b..0d3994fa24d1 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.hxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.hxx
@@ -30,8 +30,6 @@
#include <rtl/ref.hxx>
#include <boost/scoped_ptr.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
namespace {
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx
index b83e62fa6555..cc0102b235be 100644
--- a/sdext/source/presenter/PresenterScreen.hxx
+++ b/sdext/source/presenter/PresenterScreen.hxx
@@ -38,8 +38,6 @@
#include <boost/shared_ptr.hpp>
#include <boost/scoped_ptr.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
class PresenterController;
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx
index 191d30cac366..5bac82280025 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sdext/source/presenter/PresenterScrollBar.hxx
@@ -32,8 +32,6 @@
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
class PresenterCanvasHelper;
diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx
index 0a795f667d39..d98a4860ac19 100644
--- a/sdext/source/presenter/PresenterSlidePreview.hxx
+++ b/sdext/source/presenter/PresenterSlidePreview.hxx
@@ -38,8 +38,6 @@
#include <cppuhelper/compbase4.hxx>
#include <rtl/ref.hxx>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
namespace {
diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx
index 76aa439b9b96..ed676c13ccb3 100644
--- a/sdext/source/presenter/PresenterSlideShowView.hxx
+++ b/sdext/source/presenter/PresenterSlideShowView.hxx
@@ -41,8 +41,6 @@
#include <cppuhelper/basemutex.hxx>
#include <boost/noncopyable.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
namespace {
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx
index f9b397d735d5..6212e773449e 100644
--- a/sdext/source/presenter/PresenterSlideSorter.hxx
+++ b/sdext/source/presenter/PresenterSlideSorter.hxx
@@ -38,8 +38,6 @@
#include <com/sun/star/rendering/XSprite.hpp>
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
-namespace css = ::com::sun::star;
-
namespace {
typedef cppu::WeakComponentImplHelper8<
css::drawing::framework::XView,
diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx
index 4cc23598e211..ca60f9711105 100644
--- a/sdext/source/presenter/PresenterSprite.hxx
+++ b/sdext/source/presenter/PresenterSprite.hxx
@@ -24,8 +24,6 @@
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <boost/noncopyable.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
/** A wrapper around a com::sun::star::rendering::XCustomSprite that allows
diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx
index 4d4c33bd2b71..43687e3b87df 100644
--- a/sdext/source/presenter/PresenterSpritePane.hxx
+++ b/sdext/source/presenter/PresenterSpritePane.hxx
@@ -40,8 +40,6 @@
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
/** Use a sprite to display the contents and the border of a pane. Windows
diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx
index 4f9a5dadd87f..aeac34c76977 100644
--- a/sdext/source/presenter/PresenterTextView.hxx
+++ b/sdext/source/presenter/PresenterTextView.hxx
@@ -34,7 +34,6 @@
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx>
-namespace css = ::com::sun::star;
namespace cssu = ::com::sun::star::uno;
namespace cssa = ::com::sun::star::accessibility;
diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx
index 7e1c6bead071..436758f123e1 100644
--- a/sdext/source/presenter/PresenterTheme.hxx
+++ b/sdext/source/presenter/PresenterTheme.hxx
@@ -29,8 +29,6 @@
#include <com/sun/star/util/Color.hpp>
#include <boost/shared_ptr.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
/** A theme is a set of properties describing fonts, colors, and bitmaps to be used to draw
diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx
index 5006a4488c2d..31bff655d0ab 100644
--- a/sdext/source/presenter/PresenterTimer.hxx
+++ b/sdext/source/presenter/PresenterTimer.hxx
@@ -32,8 +32,6 @@
#include <boost/function.hpp>
#include <vector>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
/** The timer allows tasks to be scheduled for execution at a specified time
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index 141db899414a..1158b84a22e2 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -48,8 +48,6 @@
#include <boost/function.hpp>
#include <boost/noncopyable.hpp>
-namespace css = ::com::sun::star;
-
namespace {
typedef cppu::WeakComponentImplHelper5<
css::awt::XWindowListener,
diff --git a/sdext/source/presenter/PresenterUIPainter.hxx b/sdext/source/presenter/PresenterUIPainter.hxx
index 141287fb5ee0..d2749ab44cb5 100644
--- a/sdext/source/presenter/PresenterUIPainter.hxx
+++ b/sdext/source/presenter/PresenterUIPainter.hxx
@@ -26,8 +26,6 @@
#include <com/sun/star/rendering/XBitmap.hpp>
#include <boost/noncopyable.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
/** Functions for painting UI elements.
diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx
index e590f564d7f2..80df427fa171 100644
--- a/sdext/source/presenter/PresenterViewFactory.hxx
+++ b/sdext/source/presenter/PresenterViewFactory.hxx
@@ -32,8 +32,6 @@
#include <rtl/ref.hxx>
#include <boost/scoped_ptr.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
namespace {
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index f065b7fed2cb..efbf895c6b77 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -42,8 +42,6 @@
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
-namespace css = ::com::sun::star;
-
namespace sdext { namespace presenter {
class PresenterController;