diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-08 14:03:34 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-08 21:15:41 +0200 |
commit | aa3e3efbfe8ce7b25bcbda6020bd3f6b8712c61e (patch) | |
tree | c67f0ab3b8e9072c802836dde39f55a7886f9fe3 /extensions | |
parent | eecf74d417800138e39304857901bf69c0b756de (diff) |
compact namespace in editeng..extensions
Change-Id: Ie93ac69592c3625b8e2e5db3619ce24597a07a7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93722
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/abpilot/datasourcehandling.hxx | 4 | ||||
-rw-r--r-- | extensions/source/abpilot/fieldmappingimpl.hxx | 4 | ||||
-rw-r--r-- | extensions/source/bibliography/bibview.hxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/framectr.hxx | 8 | ||||
-rw-r--r-- | extensions/source/config/ldap/ldapaccess.hxx | 4 | ||||
-rw-r--r-- | extensions/source/config/ldap/ldapuserprofilebe.hxx | 8 | ||||
-rw-r--r-- | extensions/source/propctrlr/browserline.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/handlerhelper.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/propertyhandler.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/xsddatatypes.hxx | 4 |
10 files changed, 23 insertions, 23 deletions
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx index 98e62e90ef3b..b6fbfc2c8f3b 100644 --- a/extensions/source/abpilot/datasourcehandling.hxx +++ b/extensions/source/abpilot/datasourcehandling.hxx @@ -27,11 +27,11 @@ #include "abptypes.hxx" -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XPropertySet; } -} } } +} namespace weld { class Window; } diff --git a/extensions/source/abpilot/fieldmappingimpl.hxx b/extensions/source/abpilot/fieldmappingimpl.hxx index 4d0b26e9c166..d95fe14faa1c 100644 --- a/extensions/source/abpilot/fieldmappingimpl.hxx +++ b/extensions/source/abpilot/fieldmappingimpl.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/uno/Reference.hxx> #include "addresssettings.hxx" -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace lang { class XMultiServiceFactory; } @@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } -} } } +} namespace weld { class Window; } namespace abp diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx index cd6d77633346..4198dac03987 100644 --- a/extensions/source/bibliography/bibview.hxx +++ b/extensions/source/bibliography/bibview.hxx @@ -26,7 +26,7 @@ class BibGeneralPage; class BibDataManager; -namespace com{ namespace sun{ namespace star{ namespace awt{ class XFocusListener;}}}} +namespace com::sun::star::awt{ class XFocusListener;} namespace bib diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx index 22a0900f707d..50bf20cfd057 100644 --- a/extensions/source/bibliography/framectr.hxx +++ b/extensions/source/bibliography/framectr.hxx @@ -34,11 +34,11 @@ #include "bibmod.hxx" class BibDataManager; class BibFrameCtrl_Impl; -namespace com{namespace sun{namespace star{ - namespace form { namespace runtime { +namespace com::sun::star{ + namespace form::runtime { class XFormController; - } } -}}} + } +} class BibStatusDispatch { public: diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx index a0e6bce3b569..34ba5a04f625 100644 --- a/extensions/source/config/ldap/ldapaccess.hxx +++ b/extensions/source/config/ldap/ldapaccess.hxx @@ -38,7 +38,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> -namespace extensions { namespace config { namespace ldap { +namespace extensions::config::ldap { namespace uno = css::uno ; namespace lang = css::lang ; @@ -128,7 +128,7 @@ private: } ; -}} } +} #endif // EXTENSIONS_CONFIG_LDAP_LDAPUSERPROFILE_HXX_ diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx index 88f14eabc474..aaefcd8344e6 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.hxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx @@ -27,11 +27,11 @@ #include "ldapaccess.hxx" -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class XComponentContext; -} } } } +} -namespace extensions { namespace config { namespace ldap { +namespace extensions::config::ldap { namespace uno = css::uno ; namespace lang = css::lang ; @@ -121,7 +121,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase LdapData data_; } ; -}}} +} #endif // EXTENSIONS_CONFIG_LDAP_LDAPUSERPROFILE_HXX_ diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index cbe577e58da6..346904415682 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -23,10 +23,10 @@ #include <com/sun/star/inspection/XPropertyControl.hpp> #include <vcl/weld.hxx> -namespace com { namespace sun { namespace star { namespace inspection { namespace PropertyLineElement +namespace com::sun::star::inspection::PropertyLineElement { const sal_Int16 CompleteLine = 0x4000; -} } } } } +} namespace pcr diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index 6d61cd12e10a..127082536430 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -30,11 +30,11 @@ #include <vector> namespace weld { class Builder; class Widget; class Window; } -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace inspection { struct LineDescriptor; } -} } } +} namespace pcr { diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index b667a50a8f38..f09e8bf523b9 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -44,12 +44,12 @@ #include <memory> #include <vector> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace inspection { struct LineDescriptor; class XPropertyControlFactory; } -} } } +} namespace vcl { class Window; } namespace weld { class Window; } diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx index d6470a1809cd..aff845cbed95 100644 --- a/extensions/source/propctrlr/xsddatatypes.hxx +++ b/extensions/source/propctrlr/xsddatatypes.hxx @@ -24,14 +24,14 @@ #include <rtl/ref.hxx> #include <salhelper/simplereferenceobject.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace xsd { class XDataType; } namespace beans { class XPropertySetInfo; } -} } } +} namespace pcr |