summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-05-10 09:19:36 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-05-10 18:28:34 +0200
commitde61e14d0b6ee90cb4d170af340275d811b9fbbf (patch)
treebebbb5d2d82144c2ef73cb9a2918196b80ee5ddd /unotools
parentcb3e249e4dbc851f39bd80dfc7fd076543734c6d (diff)
compact namespace in ucb..uui
Change-Id: I644d5e418028b4b4e66cf67b20a1155a689acab0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93906 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'unotools')
-rw-r--r--unotools/IwyuFilter_unotools.yaml2
-rw-r--r--unotools/inc/unotoolsservices.hxx2
-rw-r--r--unotools/source/misc/ServiceDocumenter.hxx4
3 files changed, 4 insertions, 4 deletions
diff --git a/unotools/IwyuFilter_unotools.yaml b/unotools/IwyuFilter_unotools.yaml
index 52d7e7da280d..74d2033fad7e 100644
--- a/unotools/IwyuFilter_unotools.yaml
+++ b/unotools/IwyuFilter_unotools.yaml
@@ -3,7 +3,7 @@ assumeFilename: unotools/source/i18n/resmgr.cxx
blacklist:
unotools/inc/unotoolsservices.hxx:
# Needed for extern declaration
- - namespace comphelper { namespace service_decl { class ServiceDecl; } }
+ - namespace comphelper::service_decl { class ServiceDecl; } }
unotools/source/config/itemholder1.hxx:
# Base class needs complete type
- com/sun/star/lang/XEventListener.hpp
diff --git a/unotools/inc/unotoolsservices.hxx b/unotools/inc/unotoolsservices.hxx
index 59d760a48246..8a99f09e99ac 100644
--- a/unotools/inc/unotoolsservices.hxx
+++ b/unotools/inc/unotoolsservices.hxx
@@ -12,7 +12,7 @@
#include <sal/config.h>
-namespace comphelper { namespace service_decl { class ServiceDecl; } }
+namespace comphelper::service_decl { class ServiceDecl; }
extern comphelper::service_decl::ServiceDecl const OTempFileServiceDecl;
extern comphelper::service_decl::ServiceDecl const ServiceDocumenterDecl;
diff --git a/unotools/source/misc/ServiceDocumenter.hxx b/unotools/source/misc/ServiceDocumenter.hxx
index 874e3313c5c6..cad333ddb59a 100644
--- a/unotools/source/misc/ServiceDocumenter.hxx
+++ b/unotools/source/misc/ServiceDocumenter.hxx
@@ -14,7 +14,7 @@
namespace com::sun::star::uno { class XComponentContext; }
-namespace unotools { namespace misc {
+namespace unotools::misc {
class ServiceDocumenter : public ::cppu::WeakImplHelper<
css::script::XServiceDocumenter>
@@ -46,6 +46,6 @@ class ServiceDocumenter : public ::cppu::WeakImplHelper<
OUString m_sServiceBaseUrl;
};
-}}
+}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */