diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-01 14:52:05 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-03 09:21:51 +0200 |
commit | 47cd34a60ff9048404075823e519f1abdd4b0e9a (patch) | |
tree | e9728dd7c686d23f90b4331f105d6f5f8c1176cd /include/vbahelper | |
parent | c79dd92480cbc409a7061da7f3dd3abaaf9a4883 (diff) |
use more compact namespace syntax in /include
excluding the UDK headers of course
Change-Id: Iac7ab83d60265f7d362c860776f1de9d5e444ec0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93268
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/vbahelper')
-rw-r--r-- | include/vbahelper/vbaapplicationbase.hxx | 4 | ||||
-rw-r--r-- | include/vbahelper/vbacollectionimpl.hxx | 8 | ||||
-rw-r--r-- | include/vbahelper/vbadialogbase.hxx | 8 | ||||
-rw-r--r-- | include/vbahelper/vbadialogsbase.hxx | 8 | ||||
-rw-r--r-- | include/vbahelper/vbadocumentbase.hxx | 8 | ||||
-rw-r--r-- | include/vbahelper/vbadocumentsbase.hxx | 8 | ||||
-rw-r--r-- | include/vbahelper/vbaeventshelperbase.hxx | 6 | ||||
-rw-r--r-- | include/vbahelper/vbafontbase.hxx | 8 | ||||
-rw-r--r-- | include/vbahelper/vbaglobalbase.hxx | 8 | ||||
-rw-r--r-- | include/vbahelper/vbahelper.hxx | 4 | ||||
-rw-r--r-- | include/vbahelper/vbapagesetupbase.hxx | 8 | ||||
-rw-r--r-- | include/vbahelper/vbashape.hxx | 8 | ||||
-rw-r--r-- | include/vbahelper/vbashaperange.hxx | 8 | ||||
-rw-r--r-- | include/vbahelper/vbashapes.hxx | 8 | ||||
-rw-r--r-- | include/vbahelper/vbatextframe.hxx | 8 | ||||
-rw-r--r-- | include/vbahelper/vbawindowbase.hxx | 8 |
16 files changed, 59 insertions, 59 deletions
diff --git a/include/vbahelper/vbaapplicationbase.hxx b/include/vbahelper/vbaapplicationbase.hxx index be2f6765e951..24bac8204d7e 100644 --- a/include/vbahelper/vbaapplicationbase.hxx +++ b/include/vbahelper/vbaapplicationbase.hxx @@ -33,10 +33,10 @@ #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace frame { class XModel; } namespace uno { class XComponentContext; } -} } } +} typedef InheritedHelperInterfaceWeakImpl< ov::XApplicationBase > ApplicationBase_BASE; diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx index 73058d0f4b7c..e2441457643f 100644 --- a/include/vbahelper/vbacollectionimpl.hxx +++ b/include/vbahelper/vbacollectionimpl.hxx @@ -46,14 +46,14 @@ #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace container { class XEnumerationAccess; } namespace uno { class XComponentContext; } -} } } +} -namespace ooo { namespace vba { +namespace ooo::vba { class XHelperInterface; -} } +} typedef ::cppu::WeakImplHelper< css::container::XEnumeration > EnumerationHelper_BASE; diff --git a/include/vbahelper/vbadialogbase.hxx b/include/vbahelper/vbadialogbase.hxx index 4c7a2636917a..3125e5da2d59 100644 --- a/include/vbahelper/vbadialogbase.hxx +++ b/include/vbahelper/vbadialogbase.hxx @@ -30,15 +30,15 @@ #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace frame { class XModel; } namespace uno { class XComponentContext; } -} } } +} -namespace ooo { namespace vba { +namespace ooo::vba { class XDialogBase; class XHelperInterface; -} } +} typedef InheritedHelperInterfaceWeakImpl< ov::XDialogBase > VbaDialogBase_BASE; diff --git a/include/vbahelper/vbadialogsbase.hxx b/include/vbahelper/vbadialogsbase.hxx index 6e695152a47f..9b04b40cf906 100644 --- a/include/vbahelper/vbadialogsbase.hxx +++ b/include/vbahelper/vbadialogsbase.hxx @@ -30,15 +30,15 @@ #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace frame { class XModel; } namespace uno { class XComponentContext; } -} } } +} -namespace ooo { namespace vba { +namespace ooo::vba { class XDialogsBase; class XHelperInterface; -} } +} typedef InheritedHelperInterfaceWeakImpl< ov::XDialogsBase > VbaDialogsBase_BASE; diff --git a/include/vbahelper/vbadocumentbase.hxx b/include/vbahelper/vbadocumentbase.hxx index 7ea44b5e0814..60a0bbed9158 100644 --- a/include/vbahelper/vbadocumentbase.hxx +++ b/include/vbahelper/vbadocumentbase.hxx @@ -33,15 +33,15 @@ #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace frame { class XModel; } namespace uno { class XComponentContext; } -} } } +} -namespace ooo { namespace vba { +namespace ooo::vba { class XDocumentBase; class XHelperInterface; -} } +} typedef InheritedHelperInterfaceWeakImpl< ooo::vba::XDocumentBase > VbaDocumentBase_BASE; diff --git a/include/vbahelper/vbadocumentsbase.hxx b/include/vbahelper/vbadocumentsbase.hxx index ac6d316a0256..3f8acd3e70bd 100644 --- a/include/vbahelper/vbadocumentsbase.hxx +++ b/include/vbahelper/vbadocumentsbase.hxx @@ -33,16 +33,16 @@ #include <vbahelper/vbadllapi.h> #include <vbahelper/vbahelper.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { struct PropertyValue; } namespace container { class XEnumeration; } namespace uno { class XComponentContext; } -} } } +} -namespace ooo { namespace vba { +namespace ooo::vba { class XDocumentsBase; class XHelperInterface; -} } +} typedef CollTestImplHelper< ooo::vba::XDocumentsBase > VbaDocumentsBase_BASE; diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx index 91c8bf72c7c5..0126db442ee8 100644 --- a/include/vbahelper/vbaeventshelperbase.hxx +++ b/include/vbahelper/vbaeventshelperbase.hxx @@ -38,13 +38,13 @@ #include <sal/types.h> #include <vbahelper/vbadllapi.h> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace document { struct EventObject; } namespace frame { class XModel; } - namespace script { namespace vba { class XVBAModuleInfo; } } + namespace script::vba { class XVBAModuleInfo; } namespace uno { class XComponentContext; } namespace util { struct ChangesEvent; } -} } } +} class SfxObjectShell; diff --git a/include/vbahelper/vbafontbase.hxx b/include/vbahelper/vbafontbase.hxx index 32c8270e1783..732a67bc1d1e 100644 --- a/include/vbahelper/vbafontbase.hxx +++ b/include/vbahelper/vbafontbase.hxx @@ -30,15 +30,15 @@ #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XPropertySet; } namespace container { class XIndexAccess; } namespace uno { class XComponentContext; } -} } } +} -namespace ooo { namespace vba { +namespace ooo::vba { class XHelperInterface; -} } +} typedef InheritedHelperInterfaceWeakImpl< ov::XFontBase > VbaFontBase_BASE; diff --git a/include/vbahelper/vbaglobalbase.hxx b/include/vbahelper/vbaglobalbase.hxx index 517784d64773..6cd5edb726ed 100644 --- a/include/vbahelper/vbaglobalbase.hxx +++ b/include/vbahelper/vbaglobalbase.hxx @@ -33,15 +33,15 @@ #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { struct PropertyValue; } namespace uno { class XComponentContext; } namespace uno { class XInterface; } -} } } +} -namespace ooo { namespace vba { +namespace ooo::vba { class XHelperInterface; -} } +} typedef InheritedHelperInterfaceWeakImpl< ov::XGlobalsBase > Globals_BASE; class VBAHELPER_DLLPUBLIC VbaGlobalsBase : public Globals_BASE diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx index f56b34730c08..6f05013cbdfc 100644 --- a/include/vbahelper/vbahelper.hxx +++ b/include/vbahelper/vbahelper.hxx @@ -32,7 +32,7 @@ #include <vcl/ptrstyle.hxx> #include <vcl/errcode.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace awt { class XControl; } namespace awt { class XDevice; } namespace awt { class XUnitConversion; } @@ -45,7 +45,7 @@ namespace com { namespace sun { namespace star { namespace script { class XTypeConverter; } namespace uno { class Exception; } namespace uno { class XComponentContext; } -} } } +} class SfxObjectShell; class SfxViewFrame; diff --git a/include/vbahelper/vbapagesetupbase.hxx b/include/vbahelper/vbapagesetupbase.hxx index 527c625c4739..c1b4668364d8 100644 --- a/include/vbahelper/vbapagesetupbase.hxx +++ b/include/vbahelper/vbapagesetupbase.hxx @@ -29,15 +29,15 @@ #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XPropertySet; } namespace frame { class XModel; } namespace uno { class XComponentContext; } -} } } +} -namespace ooo { namespace vba { +namespace ooo::vba { class XHelperInterface; -} } +} typedef InheritedHelperInterfaceWeakImpl< ooo::vba::XPageSetupBase > VbaPageSetupBase_BASE; diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx index 8c723f3d2cd5..d6a79968bbfb 100644 --- a/include/vbahelper/vbashape.hxx +++ b/include/vbahelper/vbashape.hxx @@ -37,21 +37,21 @@ #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XPropertySet; } namespace drawing { class XShape; } namespace drawing { class XShapes; } namespace frame { class XModel; } namespace uno { class XComponentContext; } -} } } +} -namespace ooo { namespace vba { +namespace ooo::vba { class ShapeHelper; class XHelperInterface; namespace msforms { class XFillFormat; } namespace msforms { class XLineFormat; } namespace msforms { class XPictureFormat; } -} } +} typedef ::cppu::WeakImplHelper< ov::msforms::XShape, css::lang::XEventListener > ListeningShape; diff --git a/include/vbahelper/vbashaperange.hxx b/include/vbahelper/vbashaperange.hxx index 2560dbe99f5f..54a052cac0dd 100644 --- a/include/vbahelper/vbashaperange.hxx +++ b/include/vbahelper/vbashaperange.hxx @@ -33,21 +33,21 @@ #include <vbahelper/vbadllapi.h> #include <vbahelper/vbahelper.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace container { class XEnumeration; } namespace container { class XIndexAccess; } namespace drawing { class XDrawPage; } namespace drawing { class XShapes; } namespace frame { class XModel; } namespace uno { class XComponentContext; } -} } } +} -namespace ooo { namespace vba { +namespace ooo::vba { class XHelperInterface; namespace msforms { class XFillFormat; } namespace msforms { class XLineFormat; } namespace msforms { class XShape; } -} } +} typedef CollTestImplHelper< ov::msforms::XShapeRange > ScVbaShapeRange_BASE; diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx index ad4dc93fbf20..cc8cdcdf16fb 100644 --- a/include/vbahelper/vbashapes.hxx +++ b/include/vbahelper/vbashapes.hxx @@ -34,7 +34,7 @@ #include <vbahelper/vbadllapi.h> #include <vbahelper/vbahelper.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace container { class XEnumeration; } namespace container { class XIndexAccess; } namespace drawing { class XDrawPage; } @@ -42,12 +42,12 @@ namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } namespace frame { class XModel; } namespace uno { class XComponentContext; } -} } } +} -namespace ooo { namespace vba { +namespace ooo::vba { class XHelperInterface; namespace msforms { class XShapeRange; } -} } +} typedef CollTestImplHelper< ov::msforms::XShapes > ScVbaShapes_BASE; diff --git a/include/vbahelper/vbatextframe.hxx b/include/vbahelper/vbatextframe.hxx index 22f07bd3e9e3..a93c511a8a39 100644 --- a/include/vbahelper/vbatextframe.hxx +++ b/include/vbahelper/vbatextframe.hxx @@ -32,15 +32,15 @@ #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XPropertySet; } namespace drawing { class XShape; } namespace uno { class XComponentContext; } -} } } +} -namespace ooo { namespace vba { +namespace ooo::vba { class XHelperInterface; -} } +} typedef InheritedHelperInterfaceWeakImpl< ov::msforms::XTextFrame > VbaTextFrame_BASE; diff --git a/include/vbahelper/vbawindowbase.hxx b/include/vbahelper/vbawindowbase.hxx index 9b0c31e65e21..bf2c6460ca23 100644 --- a/include/vbahelper/vbawindowbase.hxx +++ b/include/vbahelper/vbawindowbase.hxx @@ -34,17 +34,17 @@ #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace awt { class XWindow2; } namespace awt { class XWindow; } namespace frame { class XController; } namespace frame { class XModel; } namespace uno { class XComponentContext; } -} } } +} -namespace ooo { namespace vba { +namespace ooo::vba { class XHelperInterface; -} } +} typedef InheritedHelperInterfaceWeakImpl< ov::XWindowBase > WindowBaseImpl_BASE; |