diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-13 19:48:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-31 18:36:09 +0100 |
| commit | c82efb610bf556ea12cbe4f94568ac619897799f (patch) | |
| tree | 997f443876b4f3c9f10a46f2d0df65093f9d8731 /forms | |
| parent | 04405edc3fac32938b8940bc767656ea6c7820f9 (diff) | |
clang-tidy modernize-concat-nested-namespace
Change-Id: Iab35a8b85b3ba1df791c774f40b037f9420a071a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86708
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/resource/frm_resource.cxx | 5 | ||||
| -rw-r--r-- | forms/source/xforms/xformsevent.cxx | 7 | ||||
| -rw-r--r-- | forms/source/xforms/xpathlib/extension.cxx | 4 |
3 files changed, 5 insertions, 11 deletions
diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx index 3375ce4ceae6..362c41974192 100644 --- a/forms/source/resource/frm_resource.cxx +++ b/forms/source/resource/frm_resource.cxx @@ -20,15 +20,12 @@ #include <frm_resource.hxx> #include <unotools/resmgr.hxx> -namespace frm +namespace frm::ResourceManager { - namespace ResourceManager - { OUString loadString(const char* pResId) { return Translate::get(pResId, Translate::Create("frm")); } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/xforms/xformsevent.cxx b/forms/source/xforms/xformsevent.cxx index a3943d945dbd..fb9758f1ff54 100644 --- a/forms/source/xforms/xformsevent.cxx +++ b/forms/source/xforms/xformsevent.cxx @@ -20,10 +20,7 @@ #include "xformsevent.hxx" -namespace com { -namespace sun { -namespace star { -namespace xforms { +namespace com::sun::star::xforms { void SAL_CALL XFormsEventConcrete::initXFormsEvent(const OUString& typeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg) @@ -81,6 +78,6 @@ void SAL_CALL XFormsEventConcrete::initEvent(const OUString& eventTypeArg, sal_B m_cancelable = cancelableArg; } -} } } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx index 914e3b8010e7..10725ae3a990 100644 --- a/forms/source/xforms/xpathlib/extension.cxx +++ b/forms/source/xforms/xpathlib/extension.cxx @@ -24,9 +24,9 @@ #include "xpathlib.hxx" #include <services.hxx> -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class XComponentContext; -} } } } +} using namespace com::sun::star::uno; using namespace com::sun::star::lang; |