diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-10 15:19:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-20 10:12:57 +0200 |
| commit | da7489eb6aa9dfedb43f9be6e1b90e3ae06a75cc (patch) | |
| tree | a83a32677046ede93c124af8edc8801bcb6e896f /include/vbahelper | |
| parent | abea0d6647c7f1f7e76c73c26cb80e6a67dc5111 (diff) | |
compact namespace decl
used
git grep -lw namespace
| xargs perl -i -p0e 's/(\w+)\s*.\{.\s*namespace\s*(\w+)/\1::\2/smg;'
to do the initial replace, then compiled and fixed.
Change-Id: If69904d75940c851aeffab0e78c4ba02cc968d44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98526
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/vbahelper')
| -rw-r--r-- | include/vbahelper/helperdecl.hxx | 6 | ||||
| -rw-r--r-- | include/vbahelper/vbaaccesshelper.hxx | 5 | ||||
| -rw-r--r-- | include/vbahelper/vbahelper.hxx | 7 | ||||
| -rw-r--r-- | include/vbahelper/vbareturntypes.hxx | 7 |
4 files changed, 7 insertions, 18 deletions
diff --git a/include/vbahelper/helperdecl.hxx b/include/vbahelper/helperdecl.hxx index 7ee9f2793eb3..6ab78f1df0cf 100644 --- a/include/vbahelper/helperdecl.hxx +++ b/include/vbahelper/helperdecl.hxx @@ -22,8 +22,7 @@ #include <comphelper/servicedecl.hxx> -namespace comphelper { -namespace service_decl { +namespace comphelper::service_decl { template <typename ImplT_, typename WithArgsT = with_args<false> > struct vba_service_class_ : public serviceimpl_base< detail::OwnServiceImpl<ImplT_>, WithArgsT > { @@ -43,8 +42,7 @@ struct vba_service_class_ : public serviceimpl_base< detail::OwnServiceImpl<Impl explicit vba_service_class_( PostProcessFuncT const& postProcessFunc ) : baseT( postProcessFunc ) {} }; -} // namespace service_decl -} // namespace comphelper +} // namespace comphelper::service_decl #endif diff --git a/include/vbahelper/vbaaccesshelper.hxx b/include/vbahelper/vbaaccesshelper.hxx index ce55e01e22ff..e00b25b241e2 100644 --- a/include/vbahelper/vbaaccesshelper.hxx +++ b/include/vbahelper/vbaaccesshelper.hxx @@ -36,10 +36,8 @@ #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> -namespace ooo +namespace ooo::vba { - namespace vba - { inline css::uno::Reference< css::lang::XMultiServiceFactory > getVBAServiceFactory( SfxObjectShell const * pShell ) { @@ -74,7 +72,6 @@ namespace ooo // word seems to return an erroneous mime type :-/ "application/msword" not consistent with the excel one inline bool isAlienWordDoc( SfxObjectShell const & rDocShell ) { return isAlienDoc( rDocShell, "application/msword" ); } - } } #endif diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx index 6f05013cbdfc..7333dd375e1e 100644 --- a/include/vbahelper/vbahelper.hxx +++ b/include/vbahelper/vbahelper.hxx @@ -51,9 +51,7 @@ class SfxObjectShell; class SfxViewFrame; class SfxViewShell; -namespace ooo -{ - namespace vba +namespace ooo::vba { /// @throws css::lang::IllegalArgumentException template < class T > @@ -273,8 +271,7 @@ public: static void runtimeexception( ErrCode err ); }; - } // vba -} // ooo +} // ooo::vba namespace ov = ooo::vba; diff --git a/include/vbahelper/vbareturntypes.hxx b/include/vbahelper/vbareturntypes.hxx index 7893a72cdbd8..96bb168abc01 100644 --- a/include/vbahelper/vbareturntypes.hxx +++ b/include/vbahelper/vbareturntypes.hxx @@ -27,9 +27,7 @@ #include <sal/types.h> #include <vbahelper/vbahelper.hxx> -namespace ooo -{ - namespace vba +namespace ooo::vba { template< typename T1, typename T2 > class DefaultReturnHelper : public ::cppu::WeakImplHelper< T2, css::script::XDefaultProperty > @@ -49,8 +47,7 @@ namespace ooo ReturnInteger( sal_Int32 nValue ) : ReturnInteger_BASE( nValue ){} }; - } // vba -} // ooo +} // ooo::vba #endif |