diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-16 18:14:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-16 20:31:01 +0200 |
| commit | 079ebdc3fd8413d3ab4d254d7576500a9547965f (patch) | |
| tree | 5523bcc495287ec595ee9fd37aeafbb9f1634354 /include/filter | |
| parent | 5087a64842b3e4c96905cc8a9304ec0154ea0d11 (diff) | |
compact namespace: editeng-filter
Change-Id: I240bff8de9489d3c0c9c9be6b31ce7e15661bff8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98922
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/filter')
| -rw-r--r-- | include/filter/msfilter/msvbahelper.hxx | 6 | ||||
| -rw-r--r-- | include/filter/msfilter/rtfutil.hxx | 5 | ||||
| -rw-r--r-- | include/filter/msfilter/util.hxx | 5 |
3 files changed, 5 insertions, 11 deletions
diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx index 0693e71a265f..7bc7483b660c 100644 --- a/include/filter/msfilter/msvbahelper.hxx +++ b/include/filter/msfilter/msvbahelper.hxx @@ -39,8 +39,7 @@ namespace com::sun::star { class SfxObjectShell; -namespace ooo { -namespace vba { +namespace ooo::vba { struct MSFILTER_DLLPUBLIC MacroResolvedInfo @@ -106,8 +105,7 @@ private: }; -} // namespace vba -} // namespace ooo +} // namespace ooo::vba #endif diff --git a/include/filter/msfilter/rtfutil.hxx b/include/filter/msfilter/rtfutil.hxx index ffc0d9ee779d..fd7473149df6 100644 --- a/include/filter/msfilter/rtfutil.hxx +++ b/include/filter/msfilter/rtfutil.hxx @@ -22,9 +22,7 @@ class SvStream; -namespace msfilter -{ -namespace rtfutil +namespace msfilter::rtfutil { /// Outputs a single character in hex form. MSFILTER_DLLPUBLIC OString OutHex(sal_uLong nHex, sal_uInt8 nLen); @@ -74,7 +72,6 @@ MSFILTER_DLLPUBLIC bool ExtractOLE2FromObjdata(const OString& rObjdata, SvStream /// Strips the header of a WMF file. MSFILTER_DLLPUBLIC bool StripMetafileHeader(const sal_uInt8*& rpGraphicAry, sal_uInt64& rSize); } -} #endif diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx index 5ce3b2a2159c..ea72d72b3d20 100644 --- a/include/filter/msfilter/util.hxx +++ b/include/filter/msfilter/util.hxx @@ -25,8 +25,7 @@ namespace com::sun::star { namespace lang { struct Locale; } } -namespace msfilter { -namespace util { +namespace msfilter::util { /// Returns the best-fit default 8bit encoding for a given locale /// i.e. useful when dealing with legacy formats which use legacy text encodings without recording @@ -137,7 +136,7 @@ MSFILTER_DLLPUBLIC sal_uInt8 TransColToIco( const Color& rCol ); } -} + #endif |