summaryrefslogtreecommitdiff
path: root/configmgr
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 /configmgr
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 'configmgr')
-rw-r--r--configmgr/qa/unit/test.cxx2
-rw-r--r--configmgr/source/access.cxx6
-rw-r--r--configmgr/source/broadcaster.cxx2
-rw-r--r--configmgr/source/childaccess.cxx6
-rw-r--r--configmgr/source/components.cxx2
-rw-r--r--configmgr/source/configurationprovider.cxx2
-rw-r--r--configmgr/source/configurationregistry.cxx2
-rw-r--r--configmgr/source/data.cxx2
-rw-r--r--configmgr/source/defaultprovider.cxx2
-rw-r--r--configmgr/source/localizedvaluenode.cxx6
-rw-r--r--configmgr/source/node.cxx6
-rw-r--r--configmgr/source/parsemanager.cxx6
-rw-r--r--configmgr/source/partial.cxx2
-rw-r--r--configmgr/source/propertynode.cxx6
-rw-r--r--configmgr/source/readonlyaccess.cxx2
-rw-r--r--configmgr/source/readwriteaccess.cxx2
-rw-r--r--configmgr/source/rootaccess.cxx6
-rw-r--r--configmgr/source/services.cxx2
-rw-r--r--configmgr/source/type.cxx6
-rw-r--r--configmgr/source/update.cxx2
-rw-r--r--configmgr/source/valueparser.cxx2
-rw-r--r--configmgr/source/writemodfile.cxx2
-rw-r--r--configmgr/source/xcdparser.cxx6
-rw-r--r--configmgr/source/xcsparser.cxx2
-rw-r--r--configmgr/source/xcuparser.cxx6
-rw-r--r--configmgr/source/xmldata.cxx6
26 files changed, 0 insertions, 96 deletions
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index abfc224d8d20..a721f77bf839 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -57,8 +57,6 @@
namespace {
-namespace css = com::sun::star;
-
void normalize(
rtl::OUString const & path, rtl::OUString const & relative,
rtl::OUString * normalizedPath, rtl::OUString * name)
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index e8c91acafaf9..664127397cfb 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -101,12 +101,6 @@
namespace configmgr {
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
oslInterlockedCount Access::acquireCounting() {
return osl_atomic_increment(&m_refCount);
}
diff --git a/configmgr/source/broadcaster.cxx b/configmgr/source/broadcaster.cxx
index adceeef2d73e..d7592c683c68 100644
--- a/configmgr/source/broadcaster.cxx
+++ b/configmgr/source/broadcaster.cxx
@@ -44,8 +44,6 @@ namespace configmgr {
namespace {
-namespace css = com::sun::star;
-
void appendMessage(
rtl::OUStringBuffer & buffer, css::uno::Exception const & exception)
{
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index 99c4d2df587c..6b2cd4186e33 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -61,12 +61,6 @@
namespace configmgr {
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
namespace
{
class theChildAccessUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theChildAccessUnoTunnelId > {};
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 82b4be70d9bb..779a030ce72f 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -70,8 +70,6 @@ namespace configmgr {
namespace {
-namespace css = com::sun::star;
-
struct UnresolvedListItem {
rtl::OUString name;
rtl::Reference< ParseManager > manager;
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index db10168e4b8f..4f0b53291552 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -66,8 +66,6 @@ namespace configmgr { namespace configuration_provider {
namespace {
-namespace css = com::sun::star;
-
char const accessServiceName[] =
"com.sun.star.configuration.ConfigurationAccess";
char const updateAccessServiceName[] =
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index 40b694109da3..7df357e728b8 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -67,8 +67,6 @@ namespace configmgr { namespace configuration_registry {
namespace {
-namespace css = com::sun::star;
-
class Service:
public cppu::WeakImplHelper3<
css::lang::XServiceInfo, css::registry::XSimpleRegistry,
diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx
index d7d77555c630..4602f004bde7 100644
--- a/configmgr/source/data.cxx
+++ b/configmgr/source/data.cxx
@@ -45,8 +45,6 @@ namespace configmgr {
namespace {
-namespace css = com::sun::star;
-
bool decode(
rtl::OUString const & encoded, sal_Int32 begin, sal_Int32 end,
rtl::OUString * decoded)
diff --git a/configmgr/source/defaultprovider.cxx b/configmgr/source/defaultprovider.cxx
index 06b8356610a5..ea620321d917 100644
--- a/configmgr/source/defaultprovider.cxx
+++ b/configmgr/source/defaultprovider.cxx
@@ -33,8 +33,6 @@
namespace configmgr { namespace default_provider {
-namespace css = com::sun::star;
-
css::uno::Reference< css::uno::XInterface > create(
css::uno::Reference< css::uno::XComponentContext > const & context)
{
diff --git a/configmgr/source/localizedvaluenode.cxx b/configmgr/source/localizedvaluenode.cxx
index db0989112600..b5f36e94e5d3 100644
--- a/configmgr/source/localizedvaluenode.cxx
+++ b/configmgr/source/localizedvaluenode.cxx
@@ -29,12 +29,6 @@
namespace configmgr {
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
LocalizedValueNode::LocalizedValueNode(int layer, css::uno::Any const & value):
Node(layer), value_(value)
{}
diff --git a/configmgr/source/node.cxx b/configmgr/source/node.cxx
index 456723cf5acc..59662ffdb8e6 100644
--- a/configmgr/source/node.cxx
+++ b/configmgr/source/node.cxx
@@ -34,12 +34,6 @@
namespace configmgr {
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
NodeMap & Node::getMembers() {
assert(false);
throw css::uno::RuntimeException(
diff --git a/configmgr/source/parsemanager.cxx b/configmgr/source/parsemanager.cxx
index 27f3f2028956..bf2a998b63f3 100644
--- a/configmgr/source/parsemanager.cxx
+++ b/configmgr/source/parsemanager.cxx
@@ -33,12 +33,6 @@
namespace configmgr {
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
ParseManager::ParseManager(
rtl::OUString const & url, rtl::Reference< Parser > const & parser)
SAL_THROW((
diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx
index 29d85ddb40e9..e82cf59b81cc 100644
--- a/configmgr/source/partial.cxx
+++ b/configmgr/source/partial.cxx
@@ -37,8 +37,6 @@ namespace configmgr {
namespace {
-namespace css = com::sun::star;
-
bool parseSegment(
rtl::OUString const & path, sal_Int32 * index, rtl::OUString * segment)
{
diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx
index e5ecb6bd8b15..4ef895bb5dcb 100644
--- a/configmgr/source/propertynode.cxx
+++ b/configmgr/source/propertynode.cxx
@@ -35,12 +35,6 @@
namespace configmgr {
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
PropertyNode::PropertyNode(
int layer, Type staticType, bool nillable, css::uno::Any const & value,
bool extension):
diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx
index 264eae14b3dd..aee12125942f 100644
--- a/configmgr/source/readonlyaccess.cxx
+++ b/configmgr/source/readonlyaccess.cxx
@@ -60,8 +60,6 @@ namespace configmgr { namespace read_only_access {
namespace {
-namespace css = com::sun::star;
-
class Service:
public cppu::WeakImplHelper3<
css::lang::XServiceInfo, css::lang::XInitialization,
diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx
index 5d8d1dedd800..b302ad8f4ded 100644
--- a/configmgr/source/readwriteaccess.cxx
+++ b/configmgr/source/readwriteaccess.cxx
@@ -62,8 +62,6 @@ namespace configmgr { namespace read_write_access {
namespace {
-namespace css = com::sun::star;
-
class Service:
public cppu::WeakImplHelper3<
css::lang::XServiceInfo, css::lang::XInitialization,
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index 56e5204b5e38..6b9b3b5f84a9 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -57,12 +57,6 @@
namespace configmgr {
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
RootAccess::RootAccess(
Components & components, rtl::OUString const & pathRepresentation,
rtl::OUString const & locale, bool update):
diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx
index 6d691bf71ab1..3fa16fa03522 100644
--- a/configmgr/source/services.cxx
+++ b/configmgr/source/services.cxx
@@ -38,8 +38,6 @@
namespace {
-namespace css = com::sun::star;
-
css::uno::Reference< css::uno::XInterface > SAL_CALL dummy(
SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext >
const &)
diff --git a/configmgr/source/type.cxx b/configmgr/source/type.cxx
index 2265daa46ad6..01d930eed586 100644
--- a/configmgr/source/type.cxx
+++ b/configmgr/source/type.cxx
@@ -38,12 +38,6 @@
namespace configmgr {
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
bool isListType(Type type) {
return type >= TYPE_BOOLEAN_LIST;
}
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 24400990b0da..157a39830f07 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -49,8 +49,6 @@ namespace configmgr { namespace update {
namespace {
-namespace css = com::sun::star;
-
std::set< rtl::OUString > seqToSet(
css::uno::Sequence< rtl::OUString > const & sequence)
{
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index 75ddef26e077..65190e41b6f1 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -49,8 +49,6 @@ namespace configmgr {
namespace {
-namespace css = com::sun::star;
-
bool parseHexDigit(char c, int * value) {
assert(value != 0);
if (c >= '0' && c <= '9') {
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 7e69cd9e5d64..89616bc8f607 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -57,8 +57,6 @@ class Components;
namespace {
-namespace css = com::sun::star;
-
rtl::OString convertToUtf8(
rtl::OUString const & text, sal_Int32 offset, sal_Int32 length)
{
diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx
index d7bc544ad7ae..0f267db95ad4 100644
--- a/configmgr/source/xcdparser.cxx
+++ b/configmgr/source/xcdparser.cxx
@@ -40,12 +40,6 @@
namespace configmgr {
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
XcdParser::XcdParser(
int layer, std::set< OUString > const & processedDependencies, Data & data):
layer_(layer), processedDependencies_(processedDependencies), data_(data),
diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx
index 686bfdb003eb..1e6f914a3fbf 100644
--- a/configmgr/source/xcsparser.cxx
+++ b/configmgr/source/xcsparser.cxx
@@ -51,8 +51,6 @@ namespace configmgr {
namespace {
-namespace css = com::sun::star;
-
// Conservatively merge a template or component (and its recursive parts) into
// an existing instance:
void merge(
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 56f9e2133c9a..3515cce905c1 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -54,12 +54,6 @@
namespace configmgr {
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
XcuParser::XcuParser(
int layer, Data & data, Partial const * partial,
Modifications * broadcastModifications, Additions * additions):
diff --git a/configmgr/source/xmldata.cxx b/configmgr/source/xmldata.cxx
index 8ba6ae5ca92a..6e3def05159c 100644
--- a/configmgr/source/xmldata.cxx
+++ b/configmgr/source/xmldata.cxx
@@ -54,12 +54,6 @@ namespace configmgr {
namespace xmldata {
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
Type parseType(
xmlreader::XmlReader const & reader, xmlreader::Span const & text)
{