summaryrefslogtreecommitdiff
path: root/vcl
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 /vcl
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 'vcl')
-rw-r--r--vcl/generic/fontmanager/fontmanager.cxx6
-rw-r--r--vcl/source/app/session.cxx6
-rw-r--r--vcl/source/app/svdata.cxx6
-rw-r--r--vcl/source/gdi/impimagetree.cxx2
-rw-r--r--vcl/source/helper/xconnection.cxx6
-rw-r--r--vcl/source/window/dialog.cxx2
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.cxx6
-rw-r--r--vcl/unx/generic/dtrans/X11_service.cxx6
8 files changed, 0 insertions, 40 deletions
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index cae0bc93c664..aa84fc749d34 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -79,12 +79,6 @@
#define PRINTER_METRICDIR "fontmetric"
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
using namespace vcl;
using namespace utl;
using namespace psp;
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 543fe7197d00..728a1df66ef2 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -36,12 +36,6 @@
#include <list>
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::frame;
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index b238497e3a00..d933348b5905 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -54,12 +54,6 @@
#include <stdio.h>
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::awt;
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index a67e8f56f0cf..79541e67d44d 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -63,8 +63,6 @@
namespace {
-namespace css = com::sun::star;
-
rtl::OUString createPath(
rtl::OUString const & name, sal_Int32 pos, rtl::OUString const & locale)
{
diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx
index d63b4b123390..69136d6b0b05 100644
--- a/vcl/source/helper/xconnection.cxx
+++ b/vcl/source/helper/xconnection.cxx
@@ -24,12 +24,6 @@
#include "svdata.hxx"
#include "salinst.hxx"
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
using namespace osl;
using namespace vcl;
using namespace com::sun::star::uno;
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 4fca0b17d7f1..20f143124080 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -474,8 +474,6 @@ Dialog::Dialog( WindowType nType )
rtl::OUString VclBuilderContainer::getUIRootDir()
{
- namespace css = ::com::sun::star;
-
/*to-do, check if user config has an override before using shared one, etc*/
css::uno::Reference< css::beans::XPropertySet > xPathSettings(
::comphelper::getProcessServiceFactory()->createInstance(SERVICENAME_PATHSETTINGS),
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 1421a5b09870..9c11fe0587d2 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -71,12 +71,6 @@
EnterWindowMask |\
LeaveWindowMask
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
using namespace com::sun::star::datatransfer;
using namespace com::sun::star::datatransfer::dnd;
using namespace com::sun::star::lang;
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx
index 056d791888fc..dc2ff1766ee2 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -29,12 +29,6 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/compbase1.hxx>
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
using namespace cppu;
using namespace com::sun::star::lang;
using namespace com::sun::star::datatransfer::clipboard;