package/inc/ByteChucker.hxx | 4 ++-- package/inc/ByteGrabber.hxx | 4 ++-- package/inc/CRC32.hxx | 4 ++-- package/inc/ZipFile.hxx | 4 ++-- package/inc/ZipPackage.hxx | 4 ++-- package/source/manifest/ManifestExport.hxx | 6 +++--- package/source/manifest/ManifestImport.hxx | 6 +++--- package/source/manifest/ManifestReader.hxx | 4 ++-- package/source/manifest/ManifestWriter.hxx | 4 ++-- package/source/xstor/owriteablestream.hxx | 4 ++-- package/source/xstor/xstorage.hxx | 4 ++-- package/source/zipapi/XUnbufferedStream.hxx | 4 ++-- reportdesign/inc/RptDef.hxx | 4 ++-- reportdesign/source/ui/inc/Formula.hxx | 4 ++-- reportdesign/source/ui/inc/RptUndo.hxx | 4 ++-- 15 files changed, 32 insertions(+), 32 deletions(-)
New commits: commit de3ba2df0a5ddccee02d9cf55f60a5ce348c00f1 Author: Noel Grandin <[email protected]> AuthorDate: Sat May 9 15:53:48 2020 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat May 9 20:01:51 2020 +0200 compact namespace in reportdesign Change-Id: I30d6f8436cc85097a4d8e64db266fc31773e5351 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93859 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index 92a7c5b6f6d8..fab7f9df7a57 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -31,12 +31,12 @@ #include <svx/fmglob.hxx> #include <svx/svdtypes.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace report { class XReportComponent; class XReportDefinition; } -}}} +} namespace rptui { diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index 504c445ddaac..8ec93075b5b0 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -26,9 +26,9 @@ #include <com/sun/star/report/meta/XFormulaParser.hpp> #include <memory> -namespace com { namespace sun { namespace star { namespace lang { +namespace com::sun::star::lang { class XMultiServiceFactory; -} } } } +} namespace svl { diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx index 91e37d54ad44..9f0b6c1aa24b 100644 --- a/reportdesign/source/ui/inc/RptUndo.hxx +++ b/reportdesign/source/ui/inc/RptUndo.hxx @@ -23,11 +23,11 @@ #include <UndoActions.hxx> #include <functional> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace drawing { class XShape; } -}}} +} namespace rptui { commit 3c800667b75c6b5def45035d69be4fefc6cd3809 Author: Noel Grandin <[email protected]> AuthorDate: Sat May 9 15:53:22 2020 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat May 9 20:01:31 2020 +0200 compact namespace in package Change-Id: I9956f715e00a0c2814b79617f37dd0c09f049ad0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93858 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/package/inc/ByteChucker.hxx b/package/inc/ByteChucker.hxx index 03988e925ccb..156b41f6001a 100644 --- a/package/inc/ByteChucker.hxx +++ b/package/inc/ByteChucker.hxx @@ -27,9 +27,9 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace io { class XSeekable; class XOutputStream; } -} } } +} class ByteChucker final { css::uno::Reference < css::io::XOutputStream > xStream; diff --git a/package/inc/ByteGrabber.hxx b/package/inc/ByteGrabber.hxx index 7a8e0c379596..27d01deb1ca9 100644 --- a/package/inc/ByteGrabber.hxx +++ b/package/inc/ByteGrabber.hxx @@ -29,9 +29,9 @@ #include <osl/mutex.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace io { class XSeekable; class XInputStream; } -} } } +} class ByteGrabber final { ::osl::Mutex m_aMutex; diff --git a/package/inc/CRC32.hxx b/package/inc/CRC32.hxx index 0791875217cb..2539d8e8c44e 100644 --- a/package/inc/CRC32.hxx +++ b/package/inc/CRC32.hxx @@ -22,9 +22,9 @@ #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/RuntimeException.hpp> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace io { class XInputStream; } -} } } +} class CRC32 final { sal_uInt32 nCRC; diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index 3dceb036c3bd..221a89a69d76 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -34,10 +34,10 @@ #include <memory> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XComponentContext; } namespace ucb { class XProgressHandler; } -} } } +} namespace rtl { template < class T > class Reference; diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx index d1f956068327..779e5cd7ed41 100644 --- a/package/inc/ZipPackage.hxx +++ b/package/inc/ZipPackage.hxx @@ -41,13 +41,13 @@ class ZipOutputStream; class ZipPackageFolder; class ZipFile; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace container { class XNameContainer; } namespace io { class XStream; class XOutputStream; class XInputStream; class XSeekable; class XActiveDataStreamer; } namespace lang { class XMultiServiceFactory; } namespace uno { class XComponentContext; } namespace task { class XInteractionHandler; } -} } } +} enum InitialisationMode { diff --git a/package/source/manifest/ManifestExport.hxx b/package/source/manifest/ManifestExport.hxx index 410a5fead470..f7fbff66bd2b 100644 --- a/package/source/manifest/ManifestExport.hxx +++ b/package/source/manifest/ManifestExport.hxx @@ -24,10 +24,10 @@ #include <com/sun/star/uno/Reference.h> #include <rtl/ustring.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { struct PropertyValue;} - namespace xml { namespace sax { class XDocumentHandler; } } -} } } + namespace xml::sax { class XDocumentHandler; } +} class ManifestExport { public: diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 636835fdf573..08ee251f6e81 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -28,10 +28,10 @@ #include <HashMaps.hxx> -namespace com { namespace sun { namespace star { - namespace xml { namespace sax { class XAttributeList; } } +namespace com::sun::star { + namespace xml::sax { class XAttributeList; } namespace beans { struct PropertyValue; } -} } } +} typedef std::unordered_map< OUString, OUString > StringHashMap; diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx index ba3ad1a1bef2..e30884424f77 100644 --- a/package/source/manifest/ManifestReader.hxx +++ b/package/source/manifest/ManifestReader.hxx @@ -25,10 +25,10 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace lang { class XSingleServiceFactory; } namespace uno { class XComponentContext; } -} } } +} class ManifestReader: public ::cppu::WeakImplHelper < diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx index ef16d311b6ba..7d83a7383bc9 100644 --- a/package/source/manifest/ManifestWriter.hxx +++ b/package/source/manifest/ManifestWriter.hxx @@ -25,10 +25,10 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace lang { class XSingleServiceFactory; } namespace uno { class XComponentContext; } -} } } +} class ManifestWriter: public ::cppu::WeakImplHelper < diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx index ff1a60ac0934..3c8bbbf2aed5 100644 --- a/package/source/xstor/owriteablestream.hxx +++ b/package/source/xstor/owriteablestream.hxx @@ -50,9 +50,9 @@ #include "ocompinstream.hxx" -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class XComponentContext; -} } } } +} namespace package { // all data in aHash1 is contained in aHash2 diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx index 21f3131de2e2..a54ef671db17 100644 --- a/package/source/xstor/xstorage.hxx +++ b/package/source/xstor/xstorage.hxx @@ -55,9 +55,9 @@ #include <vector> #include <memory> -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class XComponentContext; -} } } } +} #define RELINFO_NO_INIT 1 #define RELINFO_READ 2 diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx index dbd88fea073a..9cb97b1c35c5 100644 --- a/package/source/zipapi/XUnbufferedStream.hxx +++ b/package/source/zipapi/XUnbufferedStream.hxx @@ -32,9 +32,9 @@ #include <ZipEntry.hxx> #include <CRC32.hxx> -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class XComponentContext; -} } } } +} #define UNBUFF_STREAM_DATA 0 #define UNBUFF_STREAM_RAW 1 _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
