diff options
Diffstat (limited to 'include/xmloff')
51 files changed, 179 insertions, 182 deletions
diff --git a/include/xmloff/DashStyle.hxx b/include/xmloff/DashStyle.hxx index fc21640a380f..e9c5aac073c3 100644 --- a/include/xmloff/DashStyle.hxx +++ b/include/xmloff/DashStyle.hxx @@ -26,11 +26,11 @@ class SvXMLImport; class SvXMLExport; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { template<class A> class Reference; } - namespace xml { namespace sax { class XAttributeList; } } + namespace xml::sax { class XAttributeList; } namespace uno { class Any; } -} } } +} class UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) XMLDashStyleImport diff --git a/include/xmloff/GradientStyle.hxx b/include/xmloff/GradientStyle.hxx index 9442147e31d3..94f2fb2b9b28 100644 --- a/include/xmloff/GradientStyle.hxx +++ b/include/xmloff/GradientStyle.hxx @@ -27,11 +27,11 @@ class SvXMLImport; class SvXMLExport; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { template<class A> class Reference; } - namespace xml { namespace sax { class XAttributeList; } } + namespace xml::sax { class XAttributeList; } namespace uno { class Any; } -} } } +} class UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) XMLGradientStyleImport diff --git a/include/xmloff/HatchStyle.hxx b/include/xmloff/HatchStyle.hxx index e556f719da46..17d69fcc825d 100644 --- a/include/xmloff/HatchStyle.hxx +++ b/include/xmloff/HatchStyle.hxx @@ -27,11 +27,11 @@ class SvXMLImport; class SvXMLExport; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { template<class A> class Reference; } - namespace xml { namespace sax { class XAttributeList; } } + namespace xml::sax { class XAttributeList; } namespace uno { class Any; } -} } } +} class UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) XMLHatchStyleImport diff --git a/include/xmloff/ImageStyle.hxx b/include/xmloff/ImageStyle.hxx index ce2af86d62c8..3b017faa2120 100644 --- a/include/xmloff/ImageStyle.hxx +++ b/include/xmloff/ImageStyle.hxx @@ -25,9 +25,9 @@ #include <xmloff/dllapi.h> #include <rtl/ustring.hxx> -namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } -namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } -namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } } +namespace com::sun::star::uno { class Any; } +namespace com::sun::star::uno { template <typename > class Reference; } +namespace com::sun::star::xml::sax { class XAttributeList; } class SvXMLExport; class SvXMLImport; diff --git a/include/xmloff/MarkerStyle.hxx b/include/xmloff/MarkerStyle.hxx index 3cf49ae9e7b7..947039d435b3 100644 --- a/include/xmloff/MarkerStyle.hxx +++ b/include/xmloff/MarkerStyle.hxx @@ -27,11 +27,11 @@ class SvXMLImport; class SvXMLExport; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { template<class A> class Reference; } - namespace xml { namespace sax { class XAttributeList; } } + namespace xml::sax { class XAttributeList; } namespace uno { class Any; } -} } } +} class UNLESS_MERGELIBS(XMLOFF_DLLPUBLIC) XMLMarkerStyleImport diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx index 7d6fa466880f..09031b2ccc21 100644 --- a/include/xmloff/SchXMLImportHelper.hxx +++ b/include/xmloff/SchXMLImportHelper.hxx @@ -25,10 +25,10 @@ #include <xmloff/families.hxx> #include <xmloff/xmltkmap.hxx> -namespace com { namespace sun { namespace star { namespace chart { class XChartDocument; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com::sun::star::chart { class XChartDocument; } +namespace com::sun::star::beans { class XPropertySet; } -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace frame { class XModel; } @@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star { class XChartDocument; class XDataSeries; } -}}} +} class SvXMLStylesContext; class SvXMLImportContext; diff --git a/include/xmloff/SchXMLSeriesHelper.hxx b/include/xmloff/SchXMLSeriesHelper.hxx index c8857ae06370..78c729306123 100644 --- a/include/xmloff/SchXMLSeriesHelper.hxx +++ b/include/xmloff/SchXMLSeriesHelper.hxx @@ -27,10 +27,10 @@ #include <vector> #include <map> -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::chart2 { class XDataSeries; } +namespace com::sun::star::chart2 { class XDiagram; } +namespace com::sun::star::frame { class XModel; } class XMLOFF_DLLPUBLIC SchXMLSeriesHelper { diff --git a/include/xmloff/SettingsExportHelper.hxx b/include/xmloff/SettingsExportHelper.hxx index 505ecce1b00a..0937935a9c39 100644 --- a/include/xmloff/SettingsExportHelper.hxx +++ b/include/xmloff/SettingsExportHelper.hxx @@ -24,16 +24,16 @@ #include <com/sun/star/uno/Reference.hxx> -namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -namespace com { namespace sun { namespace star { namespace formula { struct SymbolDescriptor; } } } } -namespace com { namespace sun { namespace star { namespace util { class XStringSubstitution; } } } } +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::formula { struct SymbolDescriptor; } +namespace com::sun::star::util { class XStringSubstitution; } namespace com { - namespace sun { namespace star { + namespace sun::star { namespace container { class XNameAccess; class XIndexAccess; } namespace util { struct DateTime; } - } } + } } namespace xmloff diff --git a/include/xmloff/SinglePropertySetInfoCache.hxx b/include/xmloff/SinglePropertySetInfoCache.hxx index 052aeef6ee93..0377c46bb09f 100644 --- a/include/xmloff/SinglePropertySetInfoCache.hxx +++ b/include/xmloff/SinglePropertySetInfoCache.hxx @@ -26,8 +26,8 @@ #include <com/sun/star/uno/Reference.hxx> -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::beans { class XPropertySetInfo; } class SinglePropertySetInfoCache { diff --git a/include/xmloff/XMLBase64ImportContext.hxx b/include/xmloff/XMLBase64ImportContext.hxx index 9ec437ea0784..298158db1329 100644 --- a/include/xmloff/XMLBase64ImportContext.hxx +++ b/include/xmloff/XMLBase64ImportContext.hxx @@ -25,10 +25,8 @@ #include <xmloff/dllapi.h> #include <xmloff/xmlictxt.hxx> -namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } } - -namespace com { namespace sun { namespace star { namespace io { - class XOutputStream; } } } } +namespace com::sun::star::xml::sax { class XAttributeList; } +namespace com::sun::star::io { class XOutputStream; } class XMLOFF_DLLPUBLIC XMLBase64ImportContext final : public SvXMLImportContext { diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx index 364878e38dfe..bb118dc212c7 100644 --- a/include/xmloff/XMLCharContext.hxx +++ b/include/xmloff/XMLCharContext.hxx @@ -22,7 +22,7 @@ #include <xmloff/dllapi.h> #include <xmloff/xmlictxt.hxx> -namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } +namespace com::sun::star::uno { template <typename > class Reference; } class XMLOFF_DLLPUBLIC XMLCharContext : public SvXMLImportContext { diff --git a/include/xmloff/XMLEventExport.hxx b/include/xmloff/XMLEventExport.hxx index 98caf8502232..d37cb6717399 100644 --- a/include/xmloff/XMLEventExport.hxx +++ b/include/xmloff/XMLEventExport.hxx @@ -30,15 +30,15 @@ #include <memory> class SvXMLExport; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace document { class XEventsSupplier; } namespace container { class XNameReplace; } namespace container { class XNameAccess; } namespace beans { struct PropertyValue; } -} } } +} -namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } } -namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } } +namespace com::sun::star::uno { template <class interface_type> class Reference; } +namespace com::sun::star::uno { template <typename > class Sequence; } typedef ::std::map< OUString, std::unique_ptr<XMLEventExportHandler> > HandlerMap; typedef ::std::map< OUString, XMLEventName > NameMap; diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx index 8e98853796d1..4fb08ffb9d40 100644 --- a/include/xmloff/XMLEventsImportContext.hxx +++ b/include/xmloff/XMLEventsImportContext.hxx @@ -27,14 +27,14 @@ #include <vector> -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; } namespace container { class XNameReplace; } namespace document { class XEventsSupplier; } -} } } +} -namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } } +namespace com::sun::star::uno { template <class E> class Sequence; } typedef ::std::pair< OUString, diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx index 818b79b66c24..9800502f60a5 100644 --- a/include/xmloff/XMLPageExport.hxx +++ b/include/xmloff/XMLPageExport.hxx @@ -29,11 +29,11 @@ #include <salhelper/simplereferenceobject.hxx> #include <com/sun/star/uno/Reference.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace style { class XStyle; } namespace container { class XNameAccess;} namespace beans { class XPropertySet; } -} } } +} class SvXMLExport; class XMLPropertyHandlerFactory; diff --git a/include/xmloff/XMLSettingsExportContext.hxx b/include/xmloff/XMLSettingsExportContext.hxx index aad2db51ecd8..1daf35ada17c 100644 --- a/include/xmloff/XMLSettingsExportContext.hxx +++ b/include/xmloff/XMLSettingsExportContext.hxx @@ -22,7 +22,7 @@ #include <xmloff/xmltoken.hxx> -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::uno { class XComponentContext; } namespace xmloff diff --git a/include/xmloff/XMLTextListAutoStylePool.hxx b/include/xmloff/XMLTextListAutoStylePool.hxx index 9f40ac48de60..6237cda709e7 100644 --- a/include/xmloff/XMLTextListAutoStylePool.hxx +++ b/include/xmloff/XMLTextListAutoStylePool.hxx @@ -28,9 +28,8 @@ #include <memory> #include <set> -namespace com { namespace sun { namespace star { namespace container { - class XIndexReplace; } } } } -namespace com { namespace sun { namespace star { namespace ucb { class XAnyCompare; } } } } +namespace com::sun::star::container { class XIndexReplace; } +namespace com::sun::star::ucb { class XAnyCompare; } class XMLTextListAutoStylePool_Impl; diff --git a/include/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx index 70503a5cc631..4f9592e3235c 100644 --- a/include/xmloff/XMLTextMasterPageContext.hxx +++ b/include/xmloff/XMLTextMasterPageContext.hxx @@ -25,9 +25,9 @@ #include <xmloff/xmlstyle.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace style { class XStyle; } -} } } +} class XMLOFF_DLLPUBLIC XMLTextMasterPageContext : public SvXMLStyleContext { diff --git a/include/xmloff/XMLTextMasterPageExport.hxx b/include/xmloff/XMLTextMasterPageExport.hxx index 907652e898e5..57f02ec88620 100644 --- a/include/xmloff/XMLTextMasterPageExport.hxx +++ b/include/xmloff/XMLTextMasterPageExport.hxx @@ -24,9 +24,9 @@ #include <xmloff/dllapi.h> #include <xmloff/XMLPageExport.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace text { class XText; } -} } } +} class XMLOFF_DLLPUBLIC XMLTextMasterPageExport : public XMLPageExport { diff --git a/include/xmloff/animationexport.hxx b/include/xmloff/animationexport.hxx index 8c7d478cb698..644d98b865bf 100644 --- a/include/xmloff/animationexport.hxx +++ b/include/xmloff/animationexport.hxx @@ -26,9 +26,9 @@ #include <salhelper/simplereferenceobject.hxx> #include <memory> -namespace com { namespace sun { namespace star { namespace animations { class XAnimationNode; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } +namespace com::sun::star::animations { class XAnimationNode; } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::uno { template <typename > class Reference; } class SvXMLExport; diff --git a/include/xmloff/animexp.hxx b/include/xmloff/animexp.hxx index 2722869c5ea5..8f20dce4f86c 100644 --- a/include/xmloff/animexp.hxx +++ b/include/xmloff/animexp.hxx @@ -23,8 +23,8 @@ #include <salhelper/simplereferenceobject.hxx> #include <memory> -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } -namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } +namespace com::sun::star::drawing { class XShape; } +namespace com::sun::star::uno { template <typename > class Reference; } class AnimExpImpl; class SvXMLExport; diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx index 8800c709aacd..bd0b72e24e46 100644 --- a/include/xmloff/formlayerexport.hxx +++ b/include/xmloff/formlayerexport.hxx @@ -26,13 +26,13 @@ #include <salhelper/simplereferenceobject.hxx> #include <memory> -namespace com { namespace sun { namespace star { namespace awt { +namespace com::sun::star::awt { class XControlModel; -} } } } +} -namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } +namespace com::sun::star::drawing { class XDrawPage; } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::uno { template <typename > class Reference; } class SvXMLExport; diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx index 7c77bea0816b..5d3b25948ae6 100644 --- a/include/xmloff/formlayerimport.hxx +++ b/include/xmloff/formlayerimport.hxx @@ -26,9 +26,9 @@ #include <salhelper/simplereferenceobject.hxx> #include <memory> -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } } -namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::drawing { class XDrawPage; } +namespace com::sun::star::xml::sax { class XAttributeList; } class SvXMLImport; class SvXMLImportContext; diff --git a/include/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx index 0c32b595f3f7..8414fba6c3b4 100644 --- a/include/xmloff/numehelp.hxx +++ b/include/xmloff/numehelp.hxx @@ -28,8 +28,8 @@ #include <set> -namespace com { namespace sun { namespace star { namespace util { class XNumberFormats; } } } } -namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } } +namespace com::sun::star::util { class XNumberFormats; } +namespace com::sun::star::util { class XNumberFormatsSupplier; } class SvXMLExport; diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx index ef42a6ad5e5c..f1bf99e6e859 100644 --- a/include/xmloff/prstylei.hxx +++ b/include/xmloff/prstylei.hxx @@ -29,11 +29,11 @@ struct XMLPropertyState; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XPropertySet; } -} } } +} -namespace com { namespace sun { namespace star { namespace style { class XStyle; } } } } +namespace com::sun::star::style { class XStyle; } typedef std::unordered_set<OUString> OldFillStyleDefinitionSet; diff --git a/include/xmloff/settingsstore.hxx b/include/xmloff/settingsstore.hxx index 2cd0bc196e04..ba5526f72195 100644 --- a/include/xmloff/settingsstore.hxx +++ b/include/xmloff/settingsstore.hxx @@ -14,9 +14,9 @@ #include <com/sun/star/uno/Sequence.hxx> -namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } } -namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::embed { class XStorage; } +namespace com::sun::star::uno { template <typename > class Reference; } // Scans list of properties for certain URL properties that could refer // to internal objects, and initializes from these. diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx index e91ff36ec071..ff38aeaf4cab 100644 --- a/include/xmloff/shapeexport.hxx +++ b/include/xmloff/shapeexport.hxx @@ -34,10 +34,10 @@ #include <xmloff/txtparae.hxx> #include <o3tl/typed_flags_set.hxx> -namespace com { namespace sun { namespace star { namespace awt { struct Point; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } +namespace com::sun::star::awt { struct Point; } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::drawing { class XShape; } +namespace com::sun::star::drawing { class XShapes; } class XMLTableExport; class SvXMLAttributeList; diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index 4ccd94d9e432..810665d354ec 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -32,11 +32,11 @@ #include <vector> #include <memory> -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::drawing { class XShape; } +namespace com::sun::star::drawing { class XShapes; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::xml::sax { class XAttributeList; } class SvXMLImport; class SvXMLTokenMap; diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx index db7f11616863..4cd11971ccee 100644 --- a/include/xmloff/styleexp.hxx +++ b/include/xmloff/styleexp.hxx @@ -25,10 +25,10 @@ #include <salhelper/simplereferenceobject.hxx> -namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } } +namespace com::sun::star::uno { template <class interface_type> class Reference; } namespace rtl { template <class reference_type> class Reference; } -namespace com { namespace sun { namespace star +namespace com::sun::star { namespace style { @@ -43,7 +43,7 @@ namespace com { namespace sun { namespace star class XNameAccess; } -} } } +} class SvXMLExportPropertyMapper; class SvXMLAutoStylePoolP; diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index db79f9c24dbd..22f4b339c3ca 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -47,7 +47,7 @@ namespace xmloff { struct ParsedRDFaAttributes; } -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace text { class XText; class XTextCursor; @@ -58,9 +58,9 @@ namespace text { namespace frame { class XModel; } namespace container { class XNameContainer; class XIndexReplace; } namespace beans { class XPropertySet; } -namespace xml { namespace sax { class XAttributeList; } } +namespace xml::sax { class XAttributeList; } namespace util { struct DateTime; } -} } } +} namespace rtl { template <class reference_type> class Reference; } diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index a46b3e6e5974..80131b11e9f7 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -45,7 +45,7 @@ class MultiPropertySetHelper; enum class XMLShapeExportFlags; class SvXMLExportPropertyMapper; -namespace com { namespace sun { namespace star +namespace com::sun::star { namespace beans { class XPropertySet; class XPropertyState; class XPropertySetInfo; } @@ -53,7 +53,7 @@ namespace com { namespace sun { namespace star namespace text { class XTextContent; class XTextRange; class XText; class XFootnote; class XTextFrame; class XTextSection; class XTextField; } -} } } +} namespace xmloff { diff --git a/include/xmloff/xformsexport.hxx b/include/xmloff/xformsexport.hxx index 5911d4a0c41f..4ab7034ecf5a 100644 --- a/include/xmloff/xformsexport.hxx +++ b/include/xmloff/xformsexport.hxx @@ -23,12 +23,12 @@ #include <rtl/ustring.hxx> class SvXMLExport; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { template<typename T> class Reference; } namespace uno { template<typename T> class Sequence; } namespace beans { class XPropertySet; struct PropertyValue; } namespace container { class XNameAccess; } -} } } +} /** export an XForms model. */ diff --git a/include/xmloff/xformsimport.hxx b/include/xmloff/xformsimport.hxx index 5975ea993416..b580af57608b 100644 --- a/include/xmloff/xformsimport.hxx +++ b/include/xmloff/xformsimport.hxx @@ -26,13 +26,13 @@ class SvXMLImport; class SvXMLImportContext; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { template<typename T> class Reference; } namespace uno { template <typename > class Sequence; } namespace beans { class XPropertySet; struct PropertyValue; } namespace frame { class XModel; } namespace container { class XNameAccess; } -} } } +} /** create import context for xforms:model element. */ XMLOFF_DLLPUBLIC SvXMLImportContext* createXFormsModelContext( diff --git a/include/xmloff/xmlaustp.hxx b/include/xmloff/xmlaustp.hxx index 4f754c170f25..ed389d9530bb 100644 --- a/include/xmloff/xmlaustp.hxx +++ b/include/xmloff/xmlaustp.hxx @@ -36,13 +36,13 @@ class SvXMLUnitConverter; struct XMLPropertyState; enum class XmlStyleFamily; -namespace com { namespace sun { namespace star { namespace uno - { template<typename A> class Sequence; } -} } } +namespace com::sun::star::uno { + template<typename A> class Sequence; +} -namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } +namespace com::sun::star::uno { template <typename > class Reference; } -namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } } +namespace com::sun::star::xml::sax { class XDocumentHandler; } namespace xmloff { struct AutoStyleEntry; } namespace rtl { template <class reference_type> class Reference; } diff --git a/include/xmloff/xmlerror.hxx b/include/xmloff/xmlerror.hxx index f6b0479c0a30..2b4c8717d50c 100644 --- a/include/xmloff/xmlerror.hxx +++ b/include/xmloff/xmlerror.hxx @@ -87,11 +87,11 @@ namespace o3tl template<> struct typed_flags<SvXMLErrorFlags> : is_typed_flags<SvXMLErrorFlags, 0x7> {}; } -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { template<class X> class Sequence; } namespace uno { template<class X> class Reference; } - namespace xml { namespace sax { class XLocator; } } -} } } + namespace xml::sax { class XLocator; } +} class ErrorRecord; diff --git a/include/xmloff/xmlevent.hxx b/include/xmloff/xmlevent.hxx index f365a2ce4417..c212e4415e73 100644 --- a/include/xmloff/xmlevent.hxx +++ b/include/xmloff/xmlevent.hxx @@ -22,8 +22,8 @@ #include <rtl/ustring.hxx> -namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } } -namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } } +namespace com::sun::star::uno { template <class interface_type> class Reference; } +namespace com::sun::star::uno { template <typename > class Sequence; } /** @@ -32,10 +32,10 @@ namespace com { namespace sun { namespace star { namespace uno { template <typen * Several definition used in im- and export of events */ -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; } -} } } +} class SvXMLExport; class SvXMLImportContext; diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index e1c9b2eb6129..75595d35ea29 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -54,19 +54,19 @@ #include <memory> #include <o3tl/typed_flags_set.hxx> -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace document { class XEmbeddedObjectResolver; } } } } -namespace com { namespace sun { namespace star { namespace document { class XGraphicStorageHandler; } } } } -namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } } -namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XEventListener; } } } } -namespace com { namespace sun { namespace star { namespace task { class XStatusIndicator; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } } -namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } } -namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } } -namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XExtendedDocumentHandler; } } } } } -namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XLocator; } } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::document { class XEmbeddedObjectResolver; } +namespace com::sun::star::document { class XGraphicStorageHandler; } +namespace com::sun::star::embed { class XStorage; } +namespace com::sun::star::graphic { class XGraphic; } +namespace com::sun::star::lang { class XEventListener; } +namespace com::sun::star::task { class XStatusIndicator; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::util { class XNumberFormatsSupplier; } +namespace com::sun::star::xml::sax { class XAttributeList; } +namespace com::sun::star::xml::sax { class XDocumentHandler; } +namespace com::sun::star::xml::sax { class XExtendedDocumentHandler; } +namespace com::sun::star::xml::sax { class XLocator; } class SvXMLNamespaceMap; class SvXMLExport_Impl; @@ -80,10 +80,10 @@ enum class SvXMLErrorFlags; // Shapes in Writer cannot be named via context menu (#i51726#) #include <unotools/moduleoptions.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace frame { class XModel; } namespace lang { struct Locale; } -} } } +} namespace comphelper { class UnoInterfaceToUniqueIdentifierMapper; } enum class SvXMLExportFlags { diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx index 84d2d60c2fb5..f2f1e6adf72e 100644 --- a/include/xmloff/xmlexppr.hxx +++ b/include/xmloff/xmlexppr.hxx @@ -29,8 +29,8 @@ #include <memory> #include <vector> -namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com::sun::star::uno { template <typename > class Reference; } +namespace com::sun::star::beans { class XPropertySet; } namespace rtl { template <class reference_type> class Reference; } class XMLPropertySetMapper; diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx index 5ab75bce286e..64927daf693b 100644 --- a/include/xmloff/xmlictxt.hxx +++ b/include/xmloff/xmlictxt.hxx @@ -29,7 +29,7 @@ #include <xmloff/nmspmap.hxx> #include <memory> -namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } } +namespace com::sun::star::xml::sax { class XAttributeList; } class SvXMLImport; diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 9b9052e46f1a..39990af79d7a 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -47,23 +47,23 @@ #include <o3tl/typed_flags_set.hxx> #include <memory> -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } } -namespace com { namespace sun { namespace star { namespace document { class XEmbeddedObjectResolver; } } } } -namespace com { namespace sun { namespace star { namespace document { class XGraphicStorageHandler; } } } } -namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } } -namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } } -namespace com { namespace sun { namespace star { namespace task { class XStatusIndicator; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } } -namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } } -namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XFastAttributeList; } } } } } -namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XFastContextHandler; } } } } } -namespace com { namespace sun { namespace star { +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::beans { struct NamedValue; } +namespace com::sun::star::document { class XEmbeddedObjectResolver; } +namespace com::sun::star::document { class XGraphicStorageHandler; } +namespace com::sun::star::embed { class XStorage; } +namespace com::sun::star::graphic { class XGraphic; } +namespace com::sun::star::task { class XStatusIndicator; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::util { class XNumberFormatsSupplier; } +namespace com::sun::star::xml::sax { class XAttributeList; } +namespace com::sun::star::xml::sax { class XFastAttributeList; } +namespace com::sun::star::xml::sax { class XFastContextHandler; } +namespace com::sun::star { namespace frame { class XModel; } namespace io { class XOutputStream; } namespace rdf { class XMetadatable; } -} } } +} namespace comphelper { class UnoInterfaceToUniqueIdentifierMapper; } namespace comphelper { class AttributeList; } diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx index de10dd3b7b10..5f5a72d17cb3 100644 --- a/include/xmloff/xmlimppr.hxx +++ b/include/xmloff/xmlimppr.hxx @@ -28,15 +28,15 @@ #include <vector> #include <salhelper/simplereferenceobject.hxx> -namespace com { namespace sun { namespace star { namespace beans { class XMultiPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XTolerantMultiPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } -namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } -namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } } -namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } } +namespace com::sun::star::beans { class XMultiPropertySet; } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::beans { class XPropertySetInfo; } +namespace com::sun::star::beans { class XTolerantMultiPropertySet; } +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::uno { class Any; } +namespace com::sun::star::uno { template <typename > class Reference; } +namespace com::sun::star::uno { template <typename > class Sequence; } +namespace com::sun::star::xml::sax { class XAttributeList; } struct XMLPropertyState; class XMLPropertySetMapper; diff --git a/include/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx index 505d31382266..2dc6ec2f3dc3 100644 --- a/include/xmloff/xmlmetae.hxx +++ b/include/xmloff/xmlmetae.hxx @@ -32,8 +32,8 @@ #include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; } } } } -namespace com { namespace sun { namespace star { namespace util { struct DateTime; } } } } +namespace com::sun::star::document { class XDocumentProperties; } +namespace com::sun::star::util { struct DateTime; } class SvXMLExport; diff --git a/include/xmloff/xmlmetai.hxx b/include/xmloff/xmlmetai.hxx index ca908b41c114..b35291adc707 100644 --- a/include/xmloff/xmlmetai.hxx +++ b/include/xmloff/xmlmetai.hxx @@ -25,9 +25,9 @@ #include <xmloff/xmlictxt.hxx> -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; } } } } -namespace com { namespace sun { namespace star { namespace xml { namespace dom { class XSAXDocumentBuilder2; } } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::document { class XDocumentProperties; } +namespace com::sun::star::xml::dom { class XSAXDocumentBuilder2; } /// handles the top-level office:document-meta element of meta.xml documents // NB: virtual inheritance is needed so that the context that handles the diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx index a7615930db4b..683d3025d4dd 100644 --- a/include/xmloff/xmlnume.hxx +++ b/include/xmloff/xmlnume.hxx @@ -23,14 +23,14 @@ #include <rtl/ustring.hxx> #include <xmloff/dllapi.h> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace style { class XStyle; } namespace container { class XIndexReplace; } namespace beans { struct PropertyValue; } -} } } +} -namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } } -namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } } +namespace com::sun::star::uno { template <class E> class Sequence; } +namespace com::sun::star::uno { template <class interface_type> class Reference; } class SvXMLExport; class XMLTextListAutoStylePool; diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx index 3798c7bd6977..80388ba758c1 100644 --- a/include/xmloff/xmlnumfe.hxx +++ b/include/xmloff/xmlnumfe.hxx @@ -28,9 +28,9 @@ #include <i18nlangtag/lang.h> #include <memory> -namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } } -namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } -namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } } +namespace com::sun::star::lang { struct Locale; } +namespace com::sun::star::uno { template <typename > class Reference; } +namespace com::sun::star::util { class XNumberFormatsSupplier; } #define XML_WRITTENNUMBERSTYLES "WrittenNumberStyles" diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx index a37335ef67bc..21eac93a3cd9 100644 --- a/include/xmloff/xmlnumfi.hxx +++ b/include/xmloff/xmlnumfi.hxx @@ -29,9 +29,9 @@ #include <memory> #include <vector> -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } } -namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::util { class XNumberFormatsSupplier; } +namespace com::sun::star::xml::sax { class XAttributeList; } #define XML_NUMBERSTYLES "NumberStyles" diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx index ca82d8f55295..baafeeac81ec 100644 --- a/include/xmloff/xmlnumi.hxx +++ b/include/xmloff/xmlnumi.hxx @@ -27,8 +27,8 @@ #include <xmloff/xmlstyle.hxx> -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace container { class XIndexReplace; } } } } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::container { class XIndexReplace; } class SvxXMLListLevelStyleContext_Impl; typedef std::vector<rtl::Reference<SvxXMLListLevelStyleContext_Impl>> SvxXMLListStyle_Impl; diff --git a/include/xmloff/xmlprhdl.hxx b/include/xmloff/xmlprhdl.hxx index 7e98304349f8..e0b5a7edcdbc 100644 --- a/include/xmloff/xmlprhdl.hxx +++ b/include/xmloff/xmlprhdl.hxx @@ -24,7 +24,7 @@ #include <xmloff/dllapi.h> #include <rtl/ustring.hxx> -namespace com{ namespace sun{ namespace star{ namespace uno{ class Any; } } } } +namespace com::sun::star::uno { class Any; } class SvXMLUnitConverter; diff --git a/include/xmloff/xmlscripti.hxx b/include/xmloff/xmlscripti.hxx index 06d2e3fcaafa..bfe390dd68b9 100644 --- a/include/xmloff/xmlscripti.hxx +++ b/include/xmloff/xmlscripti.hxx @@ -24,9 +24,9 @@ #include <xmloff/dllapi.h> #include <xmloff/xmlictxt.hxx> -namespace com { namespace sun { namespace star { namespace frame { +namespace com::sun::star::frame { class XModel; -}}}} +} class XMLOFF_DLLPUBLIC XMLScriptContext final : public SvXMLImportContext { diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx index 7b81350e2c31..e6de64251f34 100644 --- a/include/xmloff/xmlstyle.hxx +++ b/include/xmloff/xmlstyle.hxx @@ -32,10 +32,10 @@ class SvXMLStylesContext_Impl; class SvXMLImportPropertyMapper; class SvXMLTokenMap; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace container { class XNameContainer; } namespace style { class XAutoStyleFamily; } -} } } +} enum XMLStyleStylesElemTokens { diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 4b4e416a882f..6acceaeae1a5 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -38,7 +38,7 @@ * methods and the SvXMLElementExport constructor. */ -namespace xmloff { namespace token { +namespace xmloff::token { /** @@ -3370,7 +3370,7 @@ namespace xmloff { namespace token { XMLOFF_DLLPUBLIC bool IsXMLToken( const sax_fastparser::FastAttributeList::FastAttributeIter& aIter, enum XMLTokenEnum eToken ); -} } +} #endif diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index cbeb41907b16..647472d2b7b5 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -32,22 +32,22 @@ #include <tools/fldunit.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace text { class XNumberingTypeInfo; } -}}} +} namespace basegfx { class B3DVector; } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -namespace com { namespace sun { namespace star { namespace drawing { struct Position3D; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } } -namespace com { namespace sun { namespace star { namespace util { struct Date; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::drawing { struct Position3D; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::uno { template <class E> class Sequence; } +namespace com::sun::star::util { struct Date; } template <typename EnumT> struct SvXMLEnumMapEntry; template <typename EnumT> struct SvXMLEnumStringMapEntry; |