summaryrefslogtreecommitdiff
path: root/desktop
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 /desktop
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 'desktop')
-rw-r--r--desktop/source/app/app.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_service.cxx1
-rw-r--r--desktop/source/deployment/gui/dp_gui_shared.hxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx1
-rw-r--r--desktop/source/deployment/inc/dp_interact.h2
-rw-r--r--desktop/source/deployment/inc/dp_ucb.h2
-rw-r--r--desktop/source/deployment/inc/dp_xml.h2
-rw-r--r--desktop/source/deployment/manager/dp_commandenvironments.cxx1
-rw-r--r--desktop/source/deployment/manager/dp_commandenvironments.hxx2
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.cxx1
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.hxx2
-rw-r--r--desktop/source/deployment/manager/dp_manager.h2
-rw-r--r--desktop/source/deployment/manager/dp_properties.cxx1
-rw-r--r--desktop/source/deployment/manager/dp_properties.hxx2
-rw-r--r--desktop/source/deployment/misc/dp_dependencies.cxx2
-rw-r--r--desktop/source/deployment/misc/dp_descriptioninfoset.cxx1
-rw-r--r--desktop/source/deployment/misc/dp_identifier.cxx4
-rw-r--r--desktop/source/deployment/misc/dp_platform.cxx1
-rw-r--r--desktop/source/deployment/registry/component/dp_compbackenddb.cxx1
-rw-r--r--desktop/source/deployment/registry/component/dp_compbackenddb.hxx2
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx1
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx1
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx2
-rw-r--r--desktop/source/deployment/registry/dp_backenddb.cxx1
-rw-r--r--desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx2
-rw-r--r--desktop/source/deployment/registry/help/dp_helpbackenddb.cxx1
-rw-r--r--desktop/source/deployment/registry/help/dp_helpbackenddb.hxx2
-rw-r--r--desktop/source/deployment/registry/inc/dp_backend.h2
-rw-r--r--desktop/source/deployment/registry/inc/dp_backenddb.hxx2
-rw-r--r--desktop/source/deployment/registry/package/dp_extbackenddb.cxx1
-rw-r--r--desktop/source/deployment/registry/package/dp_extbackenddb.hxx2
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx2
-rw-r--r--desktop/source/deployment/registry/script/dp_lib_container.h2
-rw-r--r--desktop/source/deployment/registry/script/dp_script.cxx1
-rw-r--r--desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx1
-rw-r--r--desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx1
-rw-r--r--desktop/source/migration/services/jvmfwk.cxx1
-rw-r--r--desktop/source/migration/services/jvmfwk.hxx2
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_app.cxx1
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx1
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_shared.h2
-rw-r--r--desktop/source/splash/splash.cxx2
-rw-r--r--desktop/test/deployment/active/active_native.cxx2
-rw-r--r--desktop/test/deployment/passive/passive_native.cxx2
44 files changed, 0 insertions, 71 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 34ef4c439236..f83d8c24b4f7 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -127,8 +127,6 @@ using namespace ::com::sun::star::system;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::container;
-namespace css = ::com::sun::star;
-
ResMgr* desktop::Desktop::pResMgr = 0;
namespace desktop
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index de558fb27653..c2873914d121 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -46,7 +46,6 @@ using namespace ::com::sun::star::uno;
using ::rtl::OUString;
-namespace css = ::com::sun::star;
namespace dp_gui {
//==============================================================================
diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx
index 31fa1aab1084..f407ed92ff46 100644
--- a/desktop/source/deployment/gui/dp_gui_shared.hxx
+++ b/desktop/source/deployment/gui/dp_gui_shared.hxx
@@ -24,8 +24,6 @@
#include "tools/resmgr.hxx"
-namespace css = ::com::sun::star;
-
namespace dp_gui {
struct DeploymentGuiResMgr :
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index e844cb895295..d123cec177a8 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -76,7 +76,6 @@
class Window;
namespace cssu = ::com::sun::star::uno;
-namespace css = ::com::sun::star;
using dp_misc::StrTitle;
using ::rtl::OUString;
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index 9f803c757bc9..9d3a105fd786 100644
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
@@ -27,8 +27,6 @@
#include "com/sun/star/task/XAbortChannel.hpp"
#include "dp_misc_api.hxx"
-namespace css = ::com::sun::star;
-
namespace dp_misc
{
diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h
index 37090587a5cb..7da43b7f64c8 100644
--- a/desktop/source/deployment/inc/dp_ucb.h
+++ b/desktop/source/deployment/inc/dp_ucb.h
@@ -33,8 +33,6 @@ namespace ucbhelper
class Content;
}
-namespace css = ::com::sun::star;
-
namespace dp_misc {
struct DESKTOP_DEPLOYMENTMISC_DLLPUBLIC StrTitle
diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h
index d5fbb523d702..607c717c9307 100644
--- a/desktop/source/deployment/inc/dp_xml.h
+++ b/desktop/source/deployment/inc/dp_xml.h
@@ -33,8 +33,6 @@ namespace ucbhelper
class Content;
}
-namespace css = ::com::sun::star;
-
namespace dp_misc
{
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index baaa0cb63779..fcd51f4e3eec 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -34,7 +34,6 @@ namespace deployment = com::sun::star::deployment;
namespace task = com::sun::star::task;
namespace ucb = com::sun::star::ucb;
namespace uno = com::sun::star::uno;
-namespace css = com::sun::star;
#define OUSTR(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index adead8c788da..93d1626e26a3 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -24,8 +24,6 @@
#include "ucbhelper/content.hxx"
#include "com/sun/star/uno/Type.hxx"
-namespace css = ::com::sun::star;
-
namespace dp_manager {
/**
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 492c33a50168..3213c1a18a55 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -66,7 +66,6 @@ namespace ucb = com::sun::star::ucb;
namespace uno = com::sun::star::uno;
namespace beans = com::sun::star::beans;
namespace util = com::sun::star::util;
-namespace css = com::sun::star;
using ::com::sun::star::uno::Reference;
using ::rtl::OUString;
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index dd4f3748dbeb..b57a155f15e4 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -33,8 +33,6 @@
#include <list>
#include <boost/unordered_map.hpp>
-namespace css = ::com::sun::star;
-
namespace dp_manager {
typedef ::boost::unordered_map<
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 79301d630ab8..17d170d5a97e 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -33,8 +33,6 @@
#include <memory>
-namespace css = ::com::sun::star;
-
namespace dp_manager {
typedef ::cppu::WeakComponentImplHelper1<
diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx
index 7ca3f7e38c4d..7c227aa35975 100644
--- a/desktop/source/deployment/manager/dp_properties.cxx
+++ b/desktop/source/deployment/manager/dp_properties.cxx
@@ -31,7 +31,6 @@
namespace lang = com::sun::star::lang;
namespace ucb = com::sun::star::ucb;
namespace uno = com::sun::star::uno;
-namespace css = com::sun::star;
#define OUSTR(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx
index 25a0594114da..34d8ebe56194 100644
--- a/desktop/source/deployment/manager/dp_properties.hxx
+++ b/desktop/source/deployment/manager/dp_properties.hxx
@@ -27,8 +27,6 @@
#include "boost/optional.hpp"
-namespace css = ::com::sun::star;
-
namespace dp_manager {
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 66cd2691822a..84f72fdfb000 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -40,8 +40,6 @@
namespace {
-namespace css = com::sun::star;
-
static char const namespaceLibreOffice[] =
"http://libreoffice.org/extensions/description/2011";
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 534b1c6afabc..81c0e85e73f8 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -56,7 +56,6 @@
namespace {
-namespace css = ::com::sun::star;
using css::uno::Reference;
using ::rtl::OUString;
diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx
index ec90c1d06fa7..c1528f2503cc 100644
--- a/desktop/source/deployment/misc/dp_identifier.cxx
+++ b/desktop/source/deployment/misc/dp_identifier.cxx
@@ -31,10 +31,6 @@
#include "dp_identifier.hxx"
-namespace {
- namespace css = ::com::sun::star;
-}
-
namespace dp_misc {
::rtl::OUString generateIdentifier(
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index a5500f65b236..4a39d8dc03bb 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -73,7 +73,6 @@
#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
using ::rtl::OUString;
-namespace css = ::com::sun::star;
namespace dp_misc
{
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
index 648a19a39043..3e57d15fb2a5 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
@@ -29,7 +29,6 @@
#include "dp_compbackenddb.hxx"
-namespace css = ::com::sun::star;
using namespace ::com::sun::star::uno;
using ::rtl::OUString;
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
index 24a08e88487f..c7b9522da73b 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
@@ -26,8 +26,6 @@
#include <list>
#include "dp_backenddb.hxx"
-namespace css = ::com::sun::star;
-
namespace com { namespace sun { namespace star {
namespace uno {
class XComponentContext;
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 5d7082ab34ae..7205a17c88f2 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -55,7 +55,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
using ::rtl::OUString;
-namespace css = com::sun::star;
namespace dp_registry {
namespace backend {
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
index 0fd3ba1a38cc..3d97ce2c484e 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
@@ -29,7 +29,6 @@
#include "dp_configurationbackenddb.hxx"
-namespace css = ::com::sun::star;
using namespace ::com::sun::star::uno;
using ::rtl::OUString;
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
index 2d17e72566c3..31435015811c 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
@@ -26,8 +26,6 @@
#include "boost/optional.hpp"
#include "dp_backenddb.hxx"
-namespace css = ::com::sun::star;
-
namespace com { namespace sun { namespace star {
namespace uno {
class XComponentContext;
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx
index 308fb238033b..40a15c93e540 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -35,7 +35,6 @@
#include "dp_backenddb.hxx"
-namespace css = ::com::sun::star;
using namespace ::com::sun::star::uno;
using ::rtl::OUString;
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
index 4113d072b7d9..496d2765fd74 100644
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
@@ -23,8 +23,6 @@
#include "rtl/ustring.hxx"
#include "dp_backenddb.hxx"
-namespace css = ::com::sun::star;
-
namespace com { namespace sun { namespace star {
namespace uno {
class XComponentContext;
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
index 7d61cf30efaa..24382f85ff45 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
@@ -29,7 +29,6 @@
#include "dp_helpbackenddb.hxx"
-namespace css = ::com::sun::star;
using namespace ::com::sun::star::uno;
using ::rtl::OUString;
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
index 9a38d0e703bd..eeda03533db6 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
@@ -25,8 +25,6 @@
#include "boost/optional.hpp"
#include "dp_backenddb.hxx"
-namespace css = ::com::sun::star;
-
namespace com { namespace sun { namespace star {
namespace uno {
class XComponentContext;
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 9416f36050a0..457ca6251d93 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -43,8 +43,6 @@ namespace dp_registry
namespace backend
{
-namespace css = ::com::sun::star;
-
class PackageRegistryBackend;
#define BACKEND_SERVICE_NAME "com.sun.star.deployment.PackageRegistryBackend"
diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
index bb47e3c853b4..53e555c3bf71 100644
--- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx
+++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
@@ -24,8 +24,6 @@
#include <list>
#include <vector>
-namespace css = ::com::sun::star;
-
namespace com { namespace sun { namespace star {
namespace uno {
class XComponentContext;
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
index fe527e61da0e..7c8b6145918b 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
@@ -28,7 +28,6 @@
#include "dp_extbackenddb.hxx"
-namespace css = ::com::sun::star;
using namespace ::com::sun::star::uno;
using ::rtl::OUString;
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
index 59ffacf93205..9cb5b3619da2 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
@@ -27,8 +27,6 @@
#include "dp_backenddb.hxx"
-namespace css = ::com::sun::star;
-
namespace com { namespace sun { namespace star {
namespace uno {
class XComponentContext;
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 3e2615bb3385..3e5d31c6d348 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -70,8 +70,6 @@ using namespace ::dp_misc;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace css = ::com::sun::star;
-
using ::rtl::OUString;
namespace dp_registry {
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h
index 90efd68a35c1..53696cf5b11a 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.h
+++ b/desktop/source/deployment/registry/script/dp_lib_container.h
@@ -35,8 +35,6 @@ namespace rtl {
class OUString;
}
-namespace css = ::com::sun::star;
-
namespace dp_registry {
namespace backend {
namespace script {
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index 3f061f130ad1..0791ef5045ff 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -40,7 +40,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
using ::rtl::OUString;
-namespace css = ::com::sun::star;
namespace dp_registry {
namespace backend {
diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
index cd7a6d70e08f..37266ef54e71 100644
--- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
+++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
@@ -23,7 +23,6 @@
#include "rtl/ustring.hxx"
#include "dp_backenddb.hxx"
#include "boost/optional.hpp"
-namespace css = ::com::sun::star;
namespace com { namespace sun { namespace star {
namespace uno {
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
index 04bd407fb2f5..34f9a4d52ffe 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
@@ -27,7 +27,6 @@
#include <com/sun/star/lang/NoSupportException.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-namespace css = ::com::sun::star;
namespace dp_registry
{
namespace backend
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index c13cc7420a7a..6a6067f14bf3 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -51,7 +51,6 @@ using ::rtl::OUString;
#define ENABLE_JAVA 1
#define USER_CLASS_PATH 2
-namespace css = com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
diff --git a/desktop/source/migration/services/jvmfwk.hxx b/desktop/source/migration/services/jvmfwk.hxx
index 0d28c75a40d8..0cd512e539e5 100644
--- a/desktop/source/migration/services/jvmfwk.hxx
+++ b/desktop/source/migration/services/jvmfwk.hxx
@@ -29,8 +29,6 @@
#include "com/sun/star/task/XJob.hpp"
-namespace css = com::sun::star;
-
namespace migration
{
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 91ab6e315480..b2b09a6ede96 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -50,7 +50,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::unopkg;
using ::rtl::OUString;
-namespace css = ::com::sun::star;
namespace {
struct ExtensionName
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 39844e31dbbd..f93a049d0131 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -43,7 +43,6 @@
#include "deployment.hrc"
#include "dp_version.hxx"
-namespace css = ::com::sun::star;
using namespace ::com::sun::star;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::uno;
diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index d75ca67e822a..93afa9091e0e 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -28,8 +28,6 @@
#define APP_NAME "unopkg"
-namespace css = ::com::sun::star;
-
namespace unopkg {
inline ::com::sun::star::lang::Locale toLocale( ::rtl::OUString const & slang )
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index d8ad660abd8b..2c2ecd255df5 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -47,8 +47,6 @@ using namespace ::com::sun::star::uno;
namespace {
-namespace css = com::sun::star;
-
class SplashScreen
: public ::cppu::WeakImplHelper2< XStatusIndicator, XInitialization >
, public IntroWindow
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx
index 0881e04f1e9b..3e5e0c5581c8 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -58,8 +58,6 @@
namespace {
-namespace css = com::sun::star;
-
class Provider:
public cppu::WeakImplHelper2<
css::lang::XServiceInfo, css::frame::XDispatchProvider >,
diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx
index 401e50f9dd0a..c3fb5a3b0e72 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -55,8 +55,6 @@
namespace {
-namespace css = com::sun::star;
-
class Provider:
public cppu::WeakImplHelper2<
css::lang::XServiceInfo, css::frame::XDispatchProvider >,