diff options
13 files changed, 55 insertions, 94 deletions
diff --git a/dbaccess/source/filter/hsqldb/utils.hxx b/dbaccess/source/filter/hsqldb/utils.hxx index b2d54fbc1a50..1381d1d21c19 100644 --- a/dbaccess/source/filter/hsqldb/utils.hxx +++ b/dbaccess/source/filter/hsqldb/utils.hxx @@ -12,9 +12,7 @@ #include <rtl/ustring.hxx> -namespace dbahsql -{ -namespace utils +namespace dbahsql::utils { OUString convertToUTF8(const OString& original); @@ -22,7 +20,6 @@ OUString getTableNameFromStmt(const OUString& sSql); void ensureFirebirdTableLength(const OUString& sName); } -} #endif // INCLUDED_DBACCESS_SOURCE_FILTER_HSQLDB_UTILS_HXX diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index b7917fdeb526..77e0dc7ab632 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -26,32 +26,26 @@ #include <connectivity/predicateinput.hxx> #include <svx/ParseContext.hxx> -namespace com -{ - namespace sun +namespace com::sun::star { + namespace sdb + { + class XSingleSelectQueryComposer; + } + namespace sdbc + { + class XConnection; + class XDatabaseMetaData; + } + namespace container + { + class XNameAccess; + } + namespace beans { - namespace star - { - namespace sdb - { - class XSingleSelectQueryComposer; - } - namespace sdbc - { - class XConnection; - class XDatabaseMetaData; - } - namespace container - { - class XNameAccess; - } - namespace beans - { - struct PropertyValue; - } - } + struct PropertyValue; } } + // DlgFilterCrit namespace dbaui { diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index 2207be16a051..c229a538642f 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -23,25 +23,18 @@ #define DOG_ROWS 3 -namespace com -{ - namespace sun +namespace com::sun::star{ + namespace sdb + { + class XSingleSelectQueryComposer; + } + namespace sdbc + { + class XConnection; + } + namespace container { - namespace star - { - namespace sdb - { - class XSingleSelectQueryComposer; - } - namespace sdbc - { - class XConnection; - } - namespace container - { - class XNameAccess; - } - } + class XNameAccess; } } diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx index b7bcdf50aa14..ab964df2eaf2 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx @@ -28,9 +28,7 @@ namespace com::sun::star::uno { class XComponentContext; } -namespace dp_registry { -namespace backend { -namespace component { +namespace dp_registry::backend::component { /* The XML file stores the extensions which are currently registered. They will be removed when they are revoked. @@ -91,8 +89,8 @@ public: } -} -} + + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx index 0b345cb3fe09..70d4d101cabf 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx @@ -28,9 +28,7 @@ namespace com::sun::star::uno { class XComponentContext; } -namespace dp_registry { -namespace backend { -namespace configuration { +namespace dp_registry::backend::configuration { /* The XML file stores the extensions which are currently registered. They will be removed when they are revoked. @@ -71,8 +69,8 @@ public: } -} -} + + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx index d992b0248913..f9d553a6d2ee 100644 --- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx +++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx @@ -25,9 +25,7 @@ namespace com::sun::star::uno { class XComponentContext; } -namespace dp_registry { -namespace backend { -namespace executable { +namespace dp_registry::backend::executable { /* The XML file stores the extensions which are currently registered. They will be removed when they are revoked. @@ -55,8 +53,8 @@ public: } -} -} + + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx index 18e0aa4a0743..4d27a8fceb3c 100644 --- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx +++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx @@ -26,9 +26,7 @@ namespace com::sun::star::uno { class XComponentContext; } -namespace dp_registry { -namespace backend { -namespace help { +namespace dp_registry::backend::help { /* The XML file stores the extensions which are currently registered. They will be removed when they are revoked. @@ -69,8 +67,8 @@ public: } -} -} + + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 41029950af4b..d464da4a81a1 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -32,9 +32,7 @@ #include <unordered_map> #include <strings.hrc> -namespace dp_registry -{ -namespace backend +namespace dp_registry::backend { class PackageRegistryBackend; @@ -284,7 +282,7 @@ public: }; } -} + #endif diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index 8fd0cd0e8ad1..ef6d34bfeb3e 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -38,8 +38,7 @@ namespace com::sun::star { } } -namespace dp_registry { -namespace backend { +namespace dp_registry::backend { class BackendDb { @@ -162,7 +161,7 @@ public: }; } -} + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx index 51427e73b9fd..d084141cd98c 100644 --- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx +++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx @@ -29,9 +29,7 @@ namespace com::sun::star::uno { class XComponentContext; } -namespace dp_registry { -namespace backend { -namespace bundle { +namespace dp_registry::backend::bundle { /* The XML file stores the extensions which are currently registered. They will be removed when they are revoked. @@ -64,8 +62,8 @@ public: }; } -} -} + + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h index 00e9ab34842e..f90e26e53ea1 100644 --- a/desktop/source/deployment/registry/script/dp_lib_container.h +++ b/desktop/source/deployment/registry/script/dp_lib_container.h @@ -32,9 +32,7 @@ namespace com::sun::star { } -namespace dp_registry { -namespace backend { -namespace script { +namespace dp_registry::backend::script { class LibraryContainer @@ -47,8 +45,6 @@ public: }; } -} -} #endif diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx index 61e993c9025a..01ed70c987ba 100644 --- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx +++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx @@ -26,9 +26,7 @@ namespace com::sun::star::uno { class XComponentContext; } -namespace dp_registry { -namespace backend { -namespace script { +namespace dp_registry::backend::script { /* The XML file stores the extensions which are currently registered. They will be removed when they are revoked. @@ -53,8 +51,8 @@ public: } -} -} + + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx index 0d09f6288d99..6683fc546c16 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx @@ -25,11 +25,7 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -namespace dp_registry -{ -namespace backend -{ -namespace sfwk +namespace dp_registry::backend::sfwk { class ParcelDescDocHandler : public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > @@ -63,8 +59,8 @@ public: const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override; }; } -} -} + + #endif // INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_SFWK_DP_PARCELDESC_HXX |