diff options
66 files changed, 132 insertions, 184 deletions
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index 4a671e7c6dfc..522d77fafc01 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -29,7 +29,7 @@ #include <vector> -namespace com{ namespace sun { namespace star{namespace sdbc{ class XParameters; } } } } +namespace com::sun::star::sdbc{ class XParameters; } namespace dbaccess { diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 81b151bd15d8..1031ed5dcce7 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -43,10 +43,10 @@ #include <functional> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace sdb { struct RowChangeEvent; } namespace lang { struct Locale; } -} } } +} namespace dbaccess { diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx index 429d3d93c5aa..5246984ce97e 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx @@ -27,9 +27,7 @@ #include <memory> -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } +namespace com::sun::star::uno { class XComponentContext; } namespace dbaccess { diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index e78c7bf06be7..87686496a77d 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -37,9 +37,7 @@ #include <connectivity/sqlerror.hxx> #include <memory> -namespace com { namespace sun { namespace star { namespace beans { - struct PropertyValue; -} } } } +namespace com::sun::star::beans { struct PropertyValue; } namespace dbaccess { diff --git a/dbaccess/source/core/inc/RefreshListener.hxx b/dbaccess/source/core/inc/RefreshListener.hxx index 1659874a5f97..37c6ea511bc5 100644 --- a/dbaccess/source/core/inc/RefreshListener.hxx +++ b/dbaccess/source/core/inc/RefreshListener.hxx @@ -22,11 +22,8 @@ #include <com/sun/star/uno/Reference.h> -namespace com { namespace sun { namespace star { namespace container -{ - class XNameAccess; -} -}}} +namespace com::sun::star::container { class XNameAccess; } + namespace dbaccess { diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx index bb2634b7611d..be2f48fdb30d 100644 --- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx +++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx @@ -35,10 +35,10 @@ #include <comphelper/propertycontainer.hxx> #include <svx/ParseContext.hxx> -namespace com { namespace sun { namespace star { namespace util { +namespace com::sun::star::util { class XNumberFormatsSupplier; class XNumberFormatter; -}}}} +} namespace dbaccess { diff --git a/dbaccess/source/core/inc/databasecontext.hxx b/dbaccess/source/core/inc/databasecontext.hxx index 209e44ce1c05..0c1848042b26 100644 --- a/dbaccess/source/core/inc/databasecontext.hxx +++ b/dbaccess/source/core/inc/databasecontext.hxx @@ -42,13 +42,13 @@ #include <cppuhelper/compbase.hxx> // needed for registration -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace lang { class XMultiServiceFactory; class IllegalArgumentException; } -} } } +} namespace dbaccess { diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index d70f4a199039..2edda8efd485 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -47,7 +47,7 @@ class SvTreeListBox; class TransferableHelper; class TransferableClipboardListener; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace container { class XNameContainer; class XContainer; @@ -55,7 +55,7 @@ namespace com { namespace sun { namespace star { namespace ucb { class XContent; } -}}} +} namespace dbaui { diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 75db4cb47cb3..1dd89d84a28a 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -34,9 +34,9 @@ #include <vcl/graph.hxx> #include <vcl/GraphicObject.hxx> -namespace com{ namespace sun { namespace star { namespace awt { class XWindow; } } } } -namespace com{ namespace sun { namespace star { namespace frame { class XFrame2; } } } } -namespace com{ namespace sun { namespace star { namespace io { class XPersist; } } } } +namespace com::sun::star::awt { class XWindow; } +namespace com::sun::star::frame { class XFrame2; } +namespace com::sun::star::io { class XPersist; } #define ELEMENT_COUNT size_t(E_ELEMENT_TYPE_COUNT) diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index febe987a319f..0d492953a5e4 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -27,7 +27,7 @@ #include <IClipBoardTest.hxx> #include <AppElementType.hxx> -namespace com{ namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com::sun::star::beans { class XPropertySet; } class Control; class SvTreeListEntry; diff --git a/dbaccess/source/ui/browser/dbtreemodel.hxx b/dbaccess/source/ui/browser/dbtreemodel.hxx index 8b8db2792685..42887fd00e3d 100644 --- a/dbaccess/source/ui/browser/dbtreemodel.hxx +++ b/dbaccess/source/ui/browser/dbtreemodel.hxx @@ -33,7 +33,7 @@ #define CONTAINER_QUERIES sal_uLong( 0 ) #define CONTAINER_TABLES sal_uLong( 1 ) -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com::sun::star::lang { class XMultiServiceFactory; } namespace dbaui { diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 8a558ccae04c..09098e30a428 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -22,11 +22,11 @@ #include <TableGrantCtrl.hxx> #include "adminpages.hxx" -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace sdbc { class XConnection; } -}}} +} namespace dbaui { diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index f14fbb38554e..fca471a84265 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -36,7 +36,7 @@ #include "commontypes.hxx" #include "IUpdateHelper.hxx" -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace awt{ struct FontDescriptor; } @@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star { class XPreparedStatement; class XDatabaseMetaData; } -}}} +} #define COLUMN_POSITION_NOT_FOUND (sal_Int32(-1)) diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx index 2d8f42508696..8b0fe5f88278 100644 --- a/dbaccess/source/ui/inc/IItemSetHelper.hxx +++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/XComponentContext.hpp> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace sdbc { class XConnection; class XDriver; @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } -}}} +} class SfxItemSet; namespace dbaui diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index 135c1350e92a..2cb947a9fee8 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -26,14 +26,14 @@ #include <memory> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XPropertySet; } namespace uno { class XComponentContext; } -}}} +} namespace dbaui { diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index ad5ef5cfb1e5..ecf8f9442e58 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -36,11 +36,11 @@ #include <svx/dataaccessdescriptor.hxx> #include <vcl/weld.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace sdbc{ class XRowUpdate; } -}}} +} class SvStream; diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index b4ec36341a1d..0ea5b03c93c3 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -31,7 +31,7 @@ #define RET_ALL 100 // we only need forward decl here -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XPropertySet;} namespace container @@ -60,8 +60,7 @@ namespace com { namespace sun { namespace star { } namespace ucb { class XContent; } namespace uno { class XComponentContext; } - -}}} +} namespace svt { diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 1c595513f649..b30f2cd95d91 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -24,14 +24,14 @@ #include "IItemSetHelper.hxx" #include <memory> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace sdbc { class XConnection; } namespace lang { class XMultiServiceFactory; } -}}} +} namespace dbaui { diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index 8ba0ae5dd8cb..82a7129f6985 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -25,11 +25,11 @@ #include <dbaccess/dataview.hxx> #include <unotools/eventlisteneradapter.hxx> -namespace com { namespace sun { namespace star { namespace awt { +namespace com::sun::star::awt { class XControl; class XControlContainer; class XControlModel; -}}}} +} class Splitter; diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx index 40cd3c4fb1d3..6562555e6f5c 100644 --- a/dbaccess/source/ui/inc/commontypes.hxx +++ b/dbaccess/source/ui/inc/commontypes.hxx @@ -24,11 +24,11 @@ #include <unotools/sharedunocomponent.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace sdbc { class XConnection; } -} } } +} namespace dbaui { diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 4403f818efa8..f0c6ed6c7e71 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -25,7 +25,7 @@ #include "IItemSetHelper.hxx" #include <memory> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XPropertySet; } @@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } -}}} +} namespace dbaui { diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index 10d2c2feee2d..7ee0f5ca2cf2 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -26,9 +26,9 @@ #include <rtl/ref.hxx> -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class XComponentContext; -} } } } +} namespace dbaui { diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index ffacf517bd4c..776d19b52ba8 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -25,7 +25,7 @@ #include <vcl/wizardmachine.hxx> #include <memory> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XPropertySet; } @@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } -}}} +} using vcl::WizardTypes::WizardState; using vcl::WizardTypes::CommitPageReason; diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index cc40eb25d17c..e204dc1f49ba 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -26,7 +26,7 @@ #include <memory> #include <vcl/roadmapwizard.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XPropertySet; } @@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } -}}} +} using vcl::WizardTypes::WizardState; using vcl::WizardTypes::CommitPageReason; diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index de0470737bb8..598cbfb7cc7f 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -25,11 +25,11 @@ #include <vcl/weld.hxx> #include <memory> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace sdbc { class XConnection; } -}}} +} enum class SADFlags { NONE = 0x0000, diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 629ea7c5087c..30fb9fa73112 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -36,11 +36,11 @@ class SvNumberFormatter; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace lang { class XMultiServiceFactory; } -}}} +} namespace dbaui { diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index 4bb1e8c9c113..8337ae398c64 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -25,9 +25,7 @@ #include <svtools/editsyntaxhighlighter.hxx> #include <svtools/colorcfg.hxx> -namespace com { namespace sun { namespace star { namespace beans { - class XMultiPropertySet; -} } } } +namespace com::sun::star::beans { class XMultiPropertySet; } namespace dbaui { diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 434250b39e41..ff80b962f52e 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -25,14 +25,14 @@ #include <memory> // some forwards -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace sdb { class SQLContext; } namespace sdbc { class SQLException; } -} } } +} namespace dbaui { diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index e0674cd541ca..6ea21d08b52c 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -43,7 +43,7 @@ class SvTreeListEntry; class Splitter; struct SvSortData; -namespace com { namespace sun{ namespace star { namespace container { class XNameContainer; } } } } +namespace com::sun::star::container { class XNameContainer; } class SvTreeList; namespace dbaui diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index 235639c31919..1d69e1ea2903 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -23,9 +23,7 @@ #include <toolkit/controls/unocontrol.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } +namespace com::sun::star::uno { class XComponentContext; } namespace dbaui { diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index bbe509eab2fc..66e0bfb164f5 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -31,9 +31,7 @@ #include <com/sun/star/sdb/ParametersRequest.hpp> #include <com/sun/star/sdb/DocumentSaveRequest.hpp> -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } +namespace com::sun::star::uno { class XComponentContext; } namespace dbtools { diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 4e61b58e7422..5b388493e0b1 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -32,9 +32,7 @@ #include <memory> #include <thread> -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } +namespace com::sun::star::uno { class XComponentContext; } namespace desktop { diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx index 24abcf22cbd6..ccc19d3a18e8 100644 --- a/desktop/source/app/langselect.hxx +++ b/desktop/source/app/langselect.hxx @@ -22,11 +22,11 @@ #include <sal/config.h> -namespace desktop { namespace langselect { +namespace desktop::langselect { bool prepareLocale(); -} } +} #endif diff --git a/desktop/source/app/userinstall.hxx b/desktop/source/app/userinstall.hxx index dd3876c3af73..add45aed9b20 100644 --- a/desktop/source/app/userinstall.hxx +++ b/desktop/source/app/userinstall.hxx @@ -22,7 +22,7 @@ #include <sal/config.h> -namespace desktop { namespace userinstall { +namespace desktop::userinstall { enum Status { EXISTED, @@ -34,7 +34,7 @@ enum Status { Status finalize(); -} } +} #endif diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx index ff8fd73a6923..9bc9b608ed21 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx @@ -31,10 +31,10 @@ /// @HTML -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace task { class XInteractionRequest; } namespace uno { class XComponentContext; } -} } } +} namespace dp_gui { diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx index 1148ba03c86a..2edf071df932 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx @@ -23,12 +23,12 @@ #include <rtl/ustring.hxx> #include <com/sun/star/uno/Reference.hxx> -namespace com { namespace sun { namespace star { namespace deployment { +namespace com::sun::star::deployment { class XPackage; -}}}} -namespace com { namespace sun { namespace star { namespace xml { namespace dom { +} +namespace com::sun::star::xml::dom { class XNode; -}}}}} +} namespace dp_gui { diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index e9cfd6f234f8..291f028504c4 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -40,11 +40,11 @@ class MouseEvent; class ResId; namespace vcl { class Window; } -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace deployment { class XExtensionManager; class XPackage; } namespace uno { class XComponentContext; } -} } } +} namespace dp_gui { /** diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index ea42a7273a5b..714bb969877f 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -26,12 +26,12 @@ #include <vector> /// @HTML -namespace com { namespace sun { namespace star { namespace deployment { +namespace com::sun::star::deployment { class XExtensionManager; -}}}} -namespace com { namespace sun { namespace star { namespace uno { +} +namespace com::sun::star::uno { class XComponentContext; -}}}} +} namespace vcl { class Window; } diff --git a/desktop/source/deployment/inc/dp_dependencies.hxx b/desktop/source/deployment/inc/dp_dependencies.hxx index ba8233aa9778..24c8a86fdc28 100644 --- a/desktop/source/deployment/inc/dp_dependencies.hxx +++ b/desktop/source/deployment/inc/dp_dependencies.hxx @@ -28,9 +28,9 @@ /// @HTML -namespace com { namespace sun { namespace star { namespace xml { namespace dom { +namespace com::sun::star::xml::dom { class XElement; -} } } } } +} namespace dp_misc { class DescriptionInfoset; } namespace dp_misc { diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx index 03990c9405b2..b404751fce52 100644 --- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx +++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx @@ -30,7 +30,7 @@ /// @HTML -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XComponentContext; } namespace xml { namespace dom { @@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star { } namespace xpath { class XXPathAPI; } } -} } } +} namespace dp_misc { diff --git a/desktop/source/deployment/inc/dp_identifier.hxx b/desktop/source/deployment/inc/dp_identifier.hxx index a3eb0681bb1e..5d766d5b21d1 100644 --- a/desktop/source/deployment/inc/dp_identifier.hxx +++ b/desktop/source/deployment/inc/dp_identifier.hxx @@ -27,9 +27,9 @@ #include "dp_misc_api.hxx" -namespace com { namespace sun { namespace star { namespace deployment { +namespace com::sun::star::deployment { class XPackage; -} } } } +} namespace dp_misc { diff --git a/desktop/source/deployment/inc/dp_package.hxx b/desktop/source/deployment/inc/dp_package.hxx index 22ab1a5a2d4b..cf788c40bd31 100644 --- a/desktop/source/deployment/inc/dp_package.hxx +++ b/desktop/source/deployment/inc/dp_package.hxx @@ -25,12 +25,12 @@ #include <com/sun/star/uno/Reference.hxx> #include <rtl/ustring.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace deployment { class XPackageRegistry; } namespace uno { class XComponentContext; } -} } } +} -namespace dp_registry { namespace backend { namespace bundle { +namespace dp_registry::backend::bundle { css::uno::Reference<css::deployment::XPackageRegistry> create( css::uno::Reference<css::deployment::XPackageRegistry> const & @@ -38,7 +38,7 @@ css::uno::Reference<css::deployment::XPackageRegistry> create( OUString const & context, OUString const & cachePath, css::uno::Reference<css::uno::XComponentContext> const & xComponentContext); -} } } +} #endif diff --git a/desktop/source/deployment/inc/dp_registry.hxx b/desktop/source/deployment/inc/dp_registry.hxx index 43746ddfc642..d58ec9a59039 100644 --- a/desktop/source/deployment/inc/dp_registry.hxx +++ b/desktop/source/deployment/inc/dp_registry.hxx @@ -25,10 +25,10 @@ #include <com/sun/star/uno/Reference.hxx> #include <rtl/ustring.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace deployment { class XPackageRegistry; } namespace uno { class XComponentContext; } -} } } +} namespace dp_registry { diff --git a/desktop/source/deployment/inc/dp_services.hxx b/desktop/source/deployment/inc/dp_services.hxx index 846e55a078dd..f40f908de0cd 100644 --- a/desktop/source/deployment/inc/dp_services.hxx +++ b/desktop/source/deployment/inc/dp_services.hxx @@ -12,7 +12,7 @@ #include <sal/config.h> -namespace comphelper { namespace service_decl { class ServiceDecl; } } +namespace comphelper::service_decl { class ServiceDecl; } namespace dp_info { extern comphelper::service_decl::ServiceDecl const serviceDecl; @@ -32,7 +32,7 @@ extern comphelper::service_decl::ServiceDecl const serviceDecl; } -namespace dp_registry { namespace backend { +namespace dp_registry::backend { namespace component { extern comphelper::service_decl::ServiceDecl const serviceDecl; @@ -58,7 +58,7 @@ namespace sfwk { extern comphelper::service_decl::ServiceDecl const serviceDecl; } -} } +} #endif diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx index 56f9579f0003..b7bcdf50aa14 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx @@ -26,11 +26,7 @@ #include <deque> #include <dp_backenddb.hxx> -namespace com { namespace sun { namespace star { - namespace uno { - class XComponentContext; - } -}}} +namespace com::sun::star::uno { class XComponentContext; } namespace dp_registry { namespace backend { diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx index 264030c0ef79..0b345cb3fe09 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx @@ -26,11 +26,7 @@ #include <optional> #include <dp_backenddb.hxx> -namespace com { namespace sun { namespace star { - namespace uno { - class XComponentContext; - } -}}} +namespace com::sun::star::uno { class XComponentContext; } namespace dp_registry { namespace backend { diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx index 2dc951c14ece..d992b0248913 100644 --- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx +++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx @@ -23,11 +23,7 @@ #include <rtl/ustring.hxx> #include <dp_backenddb.hxx> -namespace com { namespace sun { namespace star { - namespace uno { - class XComponentContext; - } -}}} +namespace com::sun::star::uno { class XComponentContext; } namespace dp_registry { namespace backend { diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx index 1f072f7429df..18e0aa4a0743 100644 --- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx +++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx @@ -24,11 +24,7 @@ #include <optional> #include <dp_backenddb.hxx> -namespace com { namespace sun { namespace star { - namespace uno { - class XComponentContext; - } -}}} +namespace com::sun::star::uno { class XComponentContext; } namespace dp_registry { namespace backend { diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index 57e3131cb1f9..8fd0cd0e8ad1 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -25,18 +25,18 @@ #include <deque> #include <vector> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { - class XComponentContext; + class XComponentContext; } - namespace xml { namespace dom { + namespace xml::dom { class XDocument; class XNode; - }} - namespace xml { namespace xpath { + } + namespace xml::xpath { class XXPathAPI; - }} -}}} + } +} namespace dp_registry { namespace backend { diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx index ac91a62e9252..51427e73b9fd 100644 --- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx +++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx @@ -27,11 +27,7 @@ #include <dp_backenddb.hxx> -namespace com { namespace sun { namespace star { - namespace uno { - class XComponentContext; - } -}}} +namespace com::sun::star::uno { class XComponentContext; } namespace dp_registry { namespace backend { diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h index adccfa44e05b..00e9ab34842e 100644 --- a/desktop/source/deployment/registry/script/dp_lib_container.h +++ b/desktop/source/deployment/registry/script/dp_lib_container.h @@ -22,14 +22,14 @@ #include <com/sun/star/uno/Reference.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XComponentContext; } namespace ucb { class XCommandEnvironment; } -}}} +} namespace dp_registry { diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx index 3f2cfed20a2e..61e993c9025a 100644 --- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx +++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx @@ -24,11 +24,7 @@ #include <dp_backenddb.hxx> #include <optional> -namespace com { namespace sun { namespace star { - namespace uno { - class XComponentContext; - } -}}} +namespace com::sun::star::uno { class XComponentContext; } namespace dp_registry { namespace backend { diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index 3d2c4b5d8a86..089c343aa0d6 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -32,11 +32,7 @@ #include <osl/mutex.hxx> #include <cppuhelper/implbase.hxx> -namespace com { namespace sun { namespace star { - namespace uno { - class XComponentContext; - } -}}} +namespace com::sun::star::uno { class XComponentContext; } class INetURLObject; diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx index 17d3b8ac0d80..a7cc9c4e961c 100644 --- a/desktop/source/offacc/acceptor.hxx +++ b/desktop/source/offacc/acceptor.hxx @@ -36,9 +36,7 @@ #include <osl/conditn.hxx> #include <osl/thread.hxx> -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } +namespace com::sun::star::uno { class XComponentContext; } namespace desktop { diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx index 94838d3ccd19..0a31258d740e 100644 --- a/desktop/source/splash/splash.hxx +++ b/desktop/source/splash/splash.hxx @@ -25,14 +25,14 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XComponentContext; class XInterface; } -} } } +} -namespace desktop { namespace splash { +namespace desktop::splash { css::uno::Reference< css::uno::XInterface > create( css::uno::Reference< css::uno::XComponentContext > const & ); @@ -42,7 +42,7 @@ OUString getImplementationName(); css::uno::Sequence< OUString > getSupportedServiceNames(); -} } +} #endif diff --git a/drawinglayer/inc/emfplushelper.hxx b/drawinglayer/inc/emfplushelper.hxx index 929a0dc46e09..22b9acb60538 100644 --- a/drawinglayer/inc/emfplushelper.hxx +++ b/drawinglayer/inc/emfplushelper.hxx @@ -25,7 +25,7 @@ namespace emfplushelper { struct EmfPlusHelperData; } namespace wmfemfhelper { class TargetHolders; } -namespace drawinglayer { namespace geometry { class ViewInformation2D; }} +namespace drawinglayer::geometry { class ViewInformation2D; } class SvMemoryStream; namespace emfplushelper diff --git a/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx b/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx index c2057db81f11..9a4d62cbc24f 100644 --- a/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx +++ b/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx @@ -34,13 +34,13 @@ namespace basegfx { class B2DVector; } -namespace drawinglayer { namespace attribute { +namespace drawinglayer::attribute { class SdrLineAttribute; class SdrFillAttribute; class Sdr3DObjectAttribute; class FillGradientAttribute; class SdrShadowAttribute; -}} +} namespace drawinglayer diff --git a/drawinglayer/inc/processor3d/defaultprocessor3d.hxx b/drawinglayer/inc/processor3d/defaultprocessor3d.hxx index 2a8b179a1ba7..f23a826a669e 100644 --- a/drawinglayer/inc/processor3d/defaultprocessor3d.hxx +++ b/drawinglayer/inc/processor3d/defaultprocessor3d.hxx @@ -31,13 +31,13 @@ namespace basegfx { class B3DPolyPolygon; } -namespace drawinglayer { namespace attribute { +namespace drawinglayer::attribute { class SdrSceneAttribute; class SdrLightingAttribute; class MaterialAttribute3D; -}} +} -namespace drawinglayer { namespace primitive3d { +namespace drawinglayer::primitive3d { class PolygonHairlinePrimitive3D; class PolyPolygonMaterialPrimitive3D; class GradientTexturePrimitive3D; @@ -45,11 +45,11 @@ namespace drawinglayer { namespace primitive3d { class BitmapTexturePrimitive3D; class TransformPrimitive3D; class ModifiedColorPrimitive3D; -}} +} -namespace drawinglayer { namespace texture { +namespace drawinglayer::texture { class GeoTexSvx; -}} +} namespace drawinglayer diff --git a/drawinglayer/inc/texture/texture3d.hxx b/drawinglayer/inc/texture/texture3d.hxx index b5ac6e514f04..47ef9ff450a1 100644 --- a/drawinglayer/inc/texture/texture3d.hxx +++ b/drawinglayer/inc/texture/texture3d.hxx @@ -24,9 +24,9 @@ #include <texture/texture.hxx> #include <vcl/bitmapex.hxx> -namespace drawinglayer { namespace primitive3d { +namespace drawinglayer::primitive3d { class HatchTexturePrimitive3D; -}} +} namespace drawinglayer { diff --git a/drawinglayer/inc/wmfemfhelper.hxx b/drawinglayer/inc/wmfemfhelper.hxx index ae8b8f16fb1f..214d2a5d785c 100644 --- a/drawinglayer/inc/wmfemfhelper.hxx +++ b/drawinglayer/inc/wmfemfhelper.hxx @@ -28,7 +28,7 @@ #include <memory> // predefines -namespace drawinglayer { namespace geometry { class ViewInformation2D; }} +namespace drawinglayer::geometry { class ViewInformation2D; } class GDIMetaFile; namespace wmfemfhelper { class PropertyHolder; } diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx index 2d355dd78dad..ba18f9ba3096 100644 --- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx +++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx @@ -26,12 +26,12 @@ #include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustring.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace lang { class XMultiServiceFactory; } namespace uno { class XInterface; } -} } } +} -namespace drawinglayer { namespace unorenderer { +namespace drawinglayer::unorenderer { css::uno::Sequence<OUString> XPrimitive2DRenderer_getSupportedServiceNames(); @@ -42,7 +42,7 @@ css::uno::Reference<css::uno::XInterface> XPrimitive2DRenderer_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const &); -} } +} #endif diff --git a/drawinglayer/source/processor2d/getdigitlanguage.hxx b/drawinglayer/source/processor2d/getdigitlanguage.hxx index 9ee4b5aaa5d4..c634321b36f9 100644 --- a/drawinglayer/source/processor2d/getdigitlanguage.hxx +++ b/drawinglayer/source/processor2d/getdigitlanguage.hxx @@ -14,12 +14,12 @@ #include <i18nlangtag/lang.h> -namespace drawinglayer { namespace detail { +namespace drawinglayer::detail { /// Get digit language derived from SvtCTLOptions LanguageType getDigitLanguage(); -} } +} #endif diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx index ebb3046478e7..2bfa8d0f0a77 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx @@ -40,14 +40,14 @@ class Gradient; class SvtGraphicFill; class SvtGraphicStroke; -namespace drawinglayer { namespace attribute { +namespace drawinglayer::attribute { class FillGradientAttribute; class LineAttribute; class StrokeAttribute; class LineStartEndAttribute; -}} +} -namespace drawinglayer { namespace primitive2d { +namespace drawinglayer::primitive2d { class GraphicPrimitive2D; class ControlPrimitive2D; class TextHierarchyFieldPrimitive2D; @@ -67,7 +67,7 @@ namespace drawinglayer { namespace primitive2d { class UnifiedTransparencePrimitive2D; class TransparencePrimitive2D; class StructureTagPrimitive2D; -}} +} namespace basegfx { class BColor; diff --git a/dtrans/source/win32/dnd/globals.hxx b/dtrans/source/win32/dnd/globals.hxx index 373270358d5c..7851c2eec142 100644 --- a/dtrans/source/win32/dnd/globals.hxx +++ b/dtrans/source/win32/dnd/globals.hxx @@ -24,9 +24,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <osl/mutex.hxx> -namespace com { namespace sun { namespace star { namespace datatransfer { - class XTransferable; -} } } } +namespace com::sun::star::datatransfer { class XTransferable; } #include <wtypes.h> #include <sal/types.h> diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx index 52d4bab1982f..8ec0162c3ace 100644 --- a/dtrans/source/win32/dnd/source.hxx +++ b/dtrans/source/win32/dnd/source.hxx @@ -31,9 +31,7 @@ #include <systools/win32/comtools.hxx> -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } +namespace com::sun::star::uno { class XComponentContext; } using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx index 9becfe484260..3f266b24033b 100644 --- a/dtrans/source/win32/dnd/target.hxx +++ b/dtrans/source/win32/dnd/target.hxx @@ -31,9 +31,7 @@ #include <oleidl.h> #include "globals.hxx" -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } +namespace com::sun::star::uno { class XComponentContext; } using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; |