summaryrefslogtreecommitdiff
path: root/toolkit
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 /toolkit
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 'toolkit')
-rw-r--r--toolkit/source/awt/asynccallback.cxx4
-rw-r--r--toolkit/source/awt/vclxmenu.cxx2
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx2
3 files changed, 0 insertions, 8 deletions
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index a147c2a18968..4c5a981f078a 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -31,8 +31,6 @@
// component helper namespace
namespace comp_AsyncCallback {
-namespace css = ::com::sun::star;
-
// component and service helper functions:
::rtl::OUString SAL_CALL _getImplementationName();
css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames();
@@ -45,8 +43,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Referenc
/// anonymous implementation namespace
namespace {
-namespace css = ::com::sun::star;
-
class AsyncCallback:
public ::cppu::WeakImplHelper2<
css::lang::XServiceInfo,
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index b59b9e97ce7f..be0712a0e152 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -641,8 +641,6 @@ void SAL_CALL VCLXMenu::setHelpCommand( sal_Int16 nItemId, const ::rtl::OUString
// BEGIN ANONYMOUS NAMESPACE
namespace
{
- namespace css = ::com::sun::star;
-
Image lcl_XGraphic2VCLImage(
const css::uno::Reference< css::graphic::XGraphic >& xGraphic,
sal_Bool bResize )
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index f54f8b97b1f0..8879054c8cea 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -124,8 +124,6 @@ using org::libreoffice::touch::ByteBufferWrapper;
#include <comphelper/processfactory.hxx>
#include <toolkit/awt/scrollabledialog.hxx>
-namespace css = ::com::sun::star;
-
#define VCLWINDOW_FRAMEWINDOW 0x1000
#define VCLWINDOW_SYSTEMCHILDWINDOW 0x1001