diff options
20 files changed, 43 insertions, 50 deletions
diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index 34995191e978..e8ce727cfe12 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -27,7 +27,7 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase.hxx> -namespace filter{ namespace config { +namespace filter::config { class TerminateDetection; @@ -400,7 +400,7 @@ public: } }; -}} +} #endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_TYPEDETECTION_HXX diff --git a/filter/source/graphic/GraphicExportFilter.hxx b/filter/source/graphic/GraphicExportFilter.hxx index 17c18af332f2..e35404250d13 100644 --- a/filter/source/graphic/GraphicExportFilter.hxx +++ b/filter/source/graphic/GraphicExportFilter.hxx @@ -28,12 +28,12 @@ #include <cppuhelper/implbase.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace drawing { class XShapes; class XShape; } -}}} +} class GraphicExportFilter : public cppu::WeakImplHelper < css::document::XFilter, css::document::XExporter, css::lang::XInitialization > diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index 52bd852146d8..3461a253c2f8 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -89,7 +89,7 @@ public: // fractions of the Draw PPTWriter class EscherEx; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace drawing { class XDrawPage; class XShape; @@ -97,7 +97,7 @@ namespace com { namespace sun { namespace star { namespace task { class XStatusIndicator; } -}}} +} class EscherExHostAppData; class ImplEESdrWriter diff --git a/filter/source/xmlfilterdetect/filterdetect.hxx b/filter/source/xmlfilterdetect/filterdetect.hxx index 77d716387f90..964f32419e31 100644 --- a/filter/source/xmlfilterdetect/filterdetect.hxx +++ b/filter/source/xmlfilterdetect/filterdetect.hxx @@ -25,9 +25,9 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase.hxx> -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class XComponentContext; -} } } } +} class FilterDetect final : public cppu::WeakImplHelper < css::document::XExtendedFilterDetection, diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx index 672ea40e38af..1771eef77e5e 100644 --- a/filter/source/xsltdialog/typedetectionimport.hxx +++ b/filter/source/xsltdialog/typedetectionimport.hxx @@ -31,10 +31,10 @@ #include <vector> #include <stack> -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; } -} } } +} enum ImportState { diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index 383d537b2efe..3d23e9aaac16 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -69,9 +69,7 @@ #include <cppuhelper/implbase7.hxx> #include <rtl/ref.hxx> -namespace com { namespace sun { namespace star { namespace sdbc { - class SQLException; -} } } } +namespace com::sun::star::sdbc { class SQLException; } class Timer; class INetMIMEMessage; diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx index 6b53d58d0e71..eff824b90ea8 100644 --- a/forms/source/component/imgprod.hxx +++ b/forms/source/component/imgprod.hxx @@ -31,10 +31,7 @@ class SvStream; class Graphic; - -namespace com { namespace sun { namespace star { namespace io { - class XInputStream; -}}}} +namespace com::sun::star::io { class XInputStream; } class ImageProducer : public css::awt::XImageProducer, diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index 4e3c1326ca72..690b93d49da6 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -41,9 +41,7 @@ #include <cppuhelper/implbase8.hxx> #include <unordered_map> -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } +namespace com::sun::star::uno { class XComponentContext; } using namespace comphelper; diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx index 5a3abe669a6f..464e1aeb4d4a 100644 --- a/forms/source/xforms/binding.hxx +++ b/forms/source/xforms/binding.hxx @@ -44,7 +44,7 @@ namespace xforms class Model; class EvaluationContext; } -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace xml { namespace xpath { class XXPathAPI; } namespace dom @@ -56,7 +56,7 @@ namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } namespace xforms { class XModel; } namespace xsd { class XDataType; } -} } } +} namespace xforms diff --git a/forms/source/xforms/computedexpression.hxx b/forms/source/xforms/computedexpression.hxx index 374acef95584..e4511b4c1873 100644 --- a/forms/source/xforms/computedexpression.hxx +++ b/forms/source/xforms/computedexpression.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/uno/Reference.hxx> // forward declaractions -namespace com { namespace sun { namespace star +namespace com::sun::star { namespace xml { @@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star namespace xpath { class XXPathObject; } } namespace container { class XNameContainer; } -} } } +} namespace xforms { class EvaluationContext; } diff --git a/forms/source/xforms/convert.hxx b/forms/source/xforms/convert.hxx index cba7611a9216..8d4555d580ec 100644 --- a/forms/source/xforms/convert.hxx +++ b/forms/source/xforms/convert.hxx @@ -23,11 +23,11 @@ #include <com/sun/star/uno/Sequence.hxx> #include <map> -namespace com { namespace sun { namespace star { namespace uno +namespace com::sun::star::uno { class Any; class Type; -} } } } +} namespace xforms { diff --git a/forms/source/xforms/enumeration.hxx b/forms/source/xforms/enumeration.hxx index f5cc97ae0dd5..f790f17bc65c 100644 --- a/forms/source/xforms/enumeration.hxx +++ b/forms/source/xforms/enumeration.hxx @@ -25,13 +25,13 @@ #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/uno/Reference.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace container { class XIndexAccess; } namespace uno { class Any; } namespace container { class NoSuchElementException; } namespace lang { class WrappedTargetException; } namespace uno { class RuntimeException; } -} } } +} /** implement XEnumeration based on container::XIndexAccess */ class Enumeration diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx index a56554c0888f..af7075e072ab 100644 --- a/forms/source/xforms/model.hxx +++ b/forms/source/xforms/model.hxx @@ -34,10 +34,10 @@ // forward declaractions -namespace com { namespace sun { namespace star +namespace com::sun::star { - namespace xml { namespace dom { class XDocument; } } - namespace xml { namespace dom { class XNode; } } + namespace xml::dom { class XDocument; } + namespace xml::dom { class XNode; } namespace uno { template<typename T> class Sequence; } namespace lang { class IndexOutOfBoundsException; } namespace lang { class IllegalArgumentException; } @@ -45,7 +45,7 @@ namespace com { namespace sun { namespace star namespace container { class XSet; } namespace container { class XNameContainer; } namespace frame { class XModel; } -} } } +} namespace xforms { class BindingCollection; diff --git a/forms/source/xforms/pathexpression.hxx b/forms/source/xforms/pathexpression.hxx index 2d1743837198..7f01c673ce72 100644 --- a/forms/source/xforms/pathexpression.hxx +++ b/forms/source/xforms/pathexpression.hxx @@ -25,14 +25,14 @@ #include <vector> // forward declaractions -namespace com { namespace sun { namespace star +namespace com::sun::star { - namespace xml { namespace dom + namespace xml::dom { class XNodeList; namespace events { class XEventListener; } - } } -} } } + } +} namespace xforms diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx index 630934270a79..d6ba2efda2eb 100644 --- a/forms/source/xforms/propertysetbase.hxx +++ b/forms/source/xforms/propertysetbase.hxx @@ -28,11 +28,11 @@ #include <map> -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class Any; class RuntimeException; template<class T> class Sequence; -} } } } +} /** base class which encapsulates accessing (reading/writing) concrete property values */ diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx index c8f833e7c516..d6283034c226 100644 --- a/forms/source/xforms/submission.hxx +++ b/forms/source/xforms/submission.hxx @@ -33,14 +33,14 @@ #include "computedexpression.hxx" // forward declaractions -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace xforms { class XModel; } namespace uno { class Any; } namespace beans { class UnknownPropertyException; class PropertyVetoException; } namespace lang { class IllegalArgumentException; class WrappedTargetException; } -} } } +} namespace xforms { class Model; } diff --git a/forms/source/xforms/unohelper.hxx b/forms/source/xforms/unohelper.hxx index d3bf9b730922..a2e6bd8b4ac4 100644 --- a/forms/source/xforms/unohelper.hxx +++ b/forms/source/xforms/unohelper.hxx @@ -21,7 +21,7 @@ #include <sal/types.h> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XInterface; template<class T> class Reference; @@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } -} } } +} namespace xforms { diff --git a/forms/source/xforms/xmlhelper.hxx b/forms/source/xforms/xmlhelper.hxx index 076fe1ab6648..8a2286bb9239 100644 --- a/forms/source/xforms/xmlhelper.hxx +++ b/forms/source/xforms/xmlhelper.hxx @@ -22,11 +22,11 @@ #include <rtl/ustring.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { template<typename T> class Reference; } namespace container { class XNameContainer; } - namespace xml { namespace dom { class XDocumentBuilder; } } -} } } + namespace xml::dom { class XDocumentBuilder; } +} bool isValidQName( const OUString& sName, diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx index 97c462c84e28..51cf859f0462 100644 --- a/framework/inc/helper/wakeupthread.hxx +++ b/framework/inc/helper/wakeupthread.hxx @@ -28,9 +28,9 @@ #include <osl/mutex.hxx> #include <salhelper/thread.hxx> -namespace com { namespace sun { namespace star { namespace util { +namespace com::sun::star::util { class XUpdatable; -} } } } +} namespace framework{ diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index 55ecb81bb16c..db5602fd2690 100644 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -26,9 +26,9 @@ #include <cppuhelper/weakref.hxx> #include <tools/link.hxx> -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class XComponentContext; -} } } } +} class VclWindowEvent; namespace framework{ |