diff options
194 files changed, 285 insertions, 556 deletions
diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx index 98cf0f8cc430..30d5591fadf0 100644 --- a/oox/source/core/binarycodec.cxx +++ b/oox/source/core/binarycodec.cxx @@ -27,8 +27,7 @@ using namespace ::com::sun::star; -namespace oox { -namespace core { +namespace oox::core { sal_uInt16 CodecHelper::getPasswordHash( const AttributeList& rAttribs, sal_Int32 nElement ) { @@ -39,7 +38,6 @@ sal_uInt16 CodecHelper::getPasswordHash( const AttributeList& rAttribs, sal_Int3 -} // namespace core } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/contexthandler.cxx b/oox/source/core/contexthandler.cxx index f484fa1a8a69..a68d51951770 100644 --- a/oox/source/core/contexthandler.cxx +++ b/oox/source/core/contexthandler.cxx @@ -21,8 +21,7 @@ #include <oox/core/fragmenthandler.hxx> -namespace oox { -namespace core { +namespace oox::core { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -129,7 +128,6 @@ void ContextHandler::endRecord( sal_Int32 ) { } -} // namespace core } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx index ab9cea4a49fc..7de45ef56c8c 100644 --- a/oox/source/core/contexthandler2.cxx +++ b/oox/source/core/contexthandler2.cxx @@ -24,8 +24,7 @@ #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> -namespace oox { -namespace core { +namespace oox::core { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -256,7 +255,6 @@ void ContextHandler2::onEndRecord() { } -} // namespace core } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx index 94b3921bff73..f8aed31f32c3 100644 --- a/oox/source/core/fastparser.cxx +++ b/oox/source/core/fastparser.cxx @@ -31,8 +31,7 @@ #include <sax/fastparser.hxx> -namespace oox { -namespace core { +namespace oox::core { using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; @@ -137,7 +136,6 @@ void FastParser::parseStream( StorageBase& rStorage, const OUString& rStreamName parseStream( rStorage.openInputStream( rStreamName ), rStreamName ); } -} // namespace core } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/fasttokenhandler.cxx b/oox/source/core/fasttokenhandler.cxx index 7486b8505b60..9b3345acb82b 100644 --- a/oox/source/core/fasttokenhandler.cxx +++ b/oox/source/core/fasttokenhandler.cxx @@ -26,8 +26,7 @@ using namespace ::com::sun::star; -namespace oox { -namespace core { +namespace oox::core { using namespace ::com::sun::star::uno; @@ -72,7 +71,6 @@ sal_Int32 FastTokenHandler::getTokenDirect( const char *pToken, sal_Int32 nLengt return mrTokenMap.getTokenFromUTF8( pToken, nLength ); } -} // namespace core } // namespace oox extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index fced97e765fe..2c763ac6311f 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -47,8 +47,7 @@ #include <oox/ole/oleobjecthelper.hxx> #include <oox/ole/vbaproject.hxx> -namespace oox { -namespace core { +namespace oox::core { using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; @@ -579,7 +578,6 @@ bool FilterBase::isExportTemplate() const return mxImpl->mbExportTemplate; } -} // namespace core } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index 8325752360ec..7581b40f332b 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -39,8 +39,7 @@ using namespace ::com::sun::star; -namespace oox { -namespace core { +namespace oox::core { using namespace ::com::sun::star::beans; using namespace ::com::sun::star::io; @@ -433,7 +432,6 @@ OUString SAL_CALL FilterDetect::detect( Sequence< PropertyValue >& rMediaDescSeq return aFilterName; } -} // namespace core } // namespace oox extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* diff --git a/oox/source/core/fragmenthandler.cxx b/oox/source/core/fragmenthandler.cxx index c3b8c9243832..1036d0e4d116 100644 --- a/oox/source/core/fragmenthandler.cxx +++ b/oox/source/core/fragmenthandler.cxx @@ -21,8 +21,7 @@ #include <oox/core/xmlfilterbase.hxx> -namespace oox { -namespace core { +namespace oox::core { using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; @@ -115,7 +114,6 @@ const RecordInfo* FragmentHandler::getRecordInfos() const return nullptr; } -} // namespace core } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/fragmenthandler2.cxx b/oox/source/core/fragmenthandler2.cxx index 79b58ce70f0e..1f8ef418cb34 100644 --- a/oox/source/core/fragmenthandler2.cxx +++ b/oox/source/core/fragmenthandler2.cxx @@ -23,8 +23,7 @@ #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> -namespace oox { -namespace core { +namespace oox::core { using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -217,7 +216,6 @@ void FragmentHandler2::finalizeImport() { } -} // namespace core } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx index 5d4889584867..c8f33fd1552e 100644 --- a/oox/source/core/recordparser.cxx +++ b/oox/source/core/recordparser.cxx @@ -28,8 +28,7 @@ #include <osl/diagnose.h> #include <oox/core/fragmenthandler.hxx> -namespace oox { -namespace core { +namespace oox::core { using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; @@ -323,7 +322,6 @@ const RecordInfo* RecordParser::getEndRecordInfo( sal_Int32 nRecId ) const return (aIt == maEndMap.end()) ? nullptr : &aIt->second; } -} // namespace core } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx index 25e8646d1669..5b60c98f7f0d 100644 --- a/oox/source/core/relations.cxx +++ b/oox/source/core/relations.cxx @@ -22,8 +22,7 @@ #include <rtl/ustrbuf.hxx> #include <oox/helper/helper.hxx> -namespace oox { -namespace core { +namespace oox::core { namespace { @@ -149,7 +148,6 @@ OUString Relations::getFragmentPathFromFirstTypeFromOfficeDoc( const OUString& r return pRelation ? getFragmentPathFromRelation( *pRelation ) : OUString(); } -} // namespace core } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/relationshandler.cxx b/oox/source/core/relationshandler.cxx index fe448bc43a7b..ff604602db7a 100644 --- a/oox/source/core/relationshandler.cxx +++ b/oox/source/core/relationshandler.cxx @@ -29,8 +29,7 @@ #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> -namespace oox { -namespace core { +namespace oox::core { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -92,7 +91,6 @@ Reference< XFastContextHandler > RelationsFragment::createFastChildContext( return xRet; } -} // namespace core } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 48e1ad66f079..aae8be89b9f7 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -77,8 +77,7 @@ using ::com::sun::star::xml::dom::DocumentBuilder; using ::com::sun::star::xml::dom::XDocument; using ::com::sun::star::xml::dom::XDocumentBuilder; -namespace oox { -namespace core { +namespace oox::core { using namespace ::com::sun::star; using namespace ::com::sun::star::beans; @@ -1141,7 +1140,6 @@ void XmlFilterBase::exportCustomFragments() } } -} // namespace core } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/crypto/AgileEngine.cxx b/oox/source/crypto/AgileEngine.cxx index 7c2a0e9c93d2..c544b53441a0 100644 --- a/oox/source/crypto/AgileEngine.cxx +++ b/oox/source/crypto/AgileEngine.cxx @@ -42,8 +42,7 @@ using namespace css::uno; using namespace css::xml::sax; using namespace css::xml; -namespace oox { -namespace core { +namespace oox::core { namespace { @@ -820,7 +819,6 @@ void AgileEngine::encrypt(css::uno::Reference<css::io::XInputStream> & rxInputS encryptHmacValue(); } -} // namespace core } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx index 6ca316b0a9b6..e55c0849f2bc 100644 --- a/oox/source/crypto/CryptTools.cxx +++ b/oox/source/crypto/CryptTools.cxx @@ -26,8 +26,7 @@ #include <sechash.h> #endif // USE_TLS_NSS -namespace oox { -namespace core { +namespace oox::core { #if USE_TLS_OPENSSL struct CryptoImpl @@ -481,7 +480,6 @@ std::vector<sal_uInt8> CryptoHash::finalize() return aHash; } -} // namespace core } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx index 6ccbfc18d225..a7806f8d32cb 100644 --- a/oox/source/crypto/DocumentDecryption.cxx +++ b/oox/source/crypto/DocumentDecryption.cxx @@ -22,8 +22,7 @@ #include <oox/helper/binaryoutputstream.hxx> #include <oox/ole/olestorage.hxx> -namespace oox { -namespace core { +namespace oox::core { using namespace css; @@ -111,7 +110,6 @@ bool DocumentDecryption::decrypt(const uno::Reference<io::XStream>& xDocumentStr return bResult; } -} // namespace core } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/crypto/DocumentEncryption.cxx b/oox/source/crypto/DocumentEncryption.cxx index 8cb62c23f006..c32c184db31a 100644 --- a/oox/source/crypto/DocumentEncryption.cxx +++ b/oox/source/crypto/DocumentEncryption.cxx @@ -19,8 +19,7 @@ #include <oox/helper/binaryoutputstream.hxx> #include <oox/ole/olestorage.hxx> -namespace oox { -namespace core { +namespace oox::core { using namespace css::io; using namespace css::uno; @@ -68,7 +67,6 @@ bool DocumentEncryption::encrypt() return true; } -} // namespace core } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/crypto/Standard2007Engine.cxx b/oox/source/crypto/Standard2007Engine.cxx index 38c4e03baf15..1113542d886d 100644 --- a/oox/source/crypto/Standard2007Engine.cxx +++ b/oox/source/crypto/Standard2007Engine.cxx @@ -18,8 +18,7 @@ #include <comphelper/hash.hxx> -namespace oox { -namespace core { +namespace oox::core { /* =========================================================================== */ /* Kudos to Caolan McNamara who provided the core decryption implementations. */ @@ -318,7 +317,6 @@ bool Standard2007Engine::readEncryptionInfo(css::uno::Reference<css::io::XInputS return !aBinaryStream.isEof(); } -} // namespace core } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx index 258270774595..cb1870f799f5 100644 --- a/oox/source/docprop/docprophandler.cxx +++ b/oox/source/docprop/docprophandler.cxx @@ -39,8 +39,7 @@ using namespace ::com::sun::star; -namespace oox { -namespace docprop { +namespace oox::docprop { OOXMLDocPropHandler::OOXMLDocPropHandler( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< document::XDocumentProperties >& rDocProp ) @@ -685,7 +684,6 @@ void SAL_CALL OOXMLDocPropHandler::characters( const OUString& aChars ) } } -} // namespace docprop } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx index b6a2c5a0b812..5377c55099d6 100644 --- a/oox/source/docprop/ooxmldocpropimport.cxx +++ b/oox/source/docprop/ooxmldocpropimport.cxx @@ -36,8 +36,7 @@ using namespace ::com::sun::star; -namespace oox { -namespace docprop { +namespace oox::docprop { using namespace ::com::sun::star::beans; using namespace ::com::sun::star::document; @@ -160,7 +159,6 @@ void SAL_CALL DocumentPropertiesImport::importProperties( } } -} // namespace docprop } // namespace oox extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* diff --git a/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx index 147f3861157e..730348ee33f1 100644 --- a/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx +++ b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx @@ -15,8 +15,7 @@ using namespace ::oox::core; -namespace oox { -namespace drawingml { +namespace oox::drawingml { ThemeOverrideFragmentHandler::ThemeOverrideFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, Theme& rTheme ) : FragmentHandler2( rFilter, rFragmentPath ), @@ -44,7 +43,6 @@ ContextHandlerRef ThemeOverrideFragmentHandler::onCreateContext( sal_Int32 nElem return nullptr; } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/axiscontext.cxx b/oox/source/drawingml/chart/axiscontext.cxx index 45f61a9a019c..11127b3f7c38 100644 --- a/oox/source/drawingml/chart/axiscontext.cxx +++ b/oox/source/drawingml/chart/axiscontext.cxx @@ -28,9 +28,7 @@ #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using ::oox::core::ContextHandlerRef; using ::oox::core::ContextHandler2Helper; @@ -295,8 +293,6 @@ ContextHandlerRef ValAxisContext::onCreateContext( sal_Int32 nElement, const Att return AxisContextBase::onCreateContext( nElement, rAttribs ); } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx index 5f64586ffbb0..1b836d01124b 100644 --- a/oox/source/drawingml/chart/axisconverter.cxx +++ b/oox/source/drawingml/chart/axisconverter.cxx @@ -44,9 +44,7 @@ #include <comphelper/processfactory.hxx> #include <osl/diagnose.h> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using namespace ::com::sun::star::beans; using namespace ::com::sun::star::chart2; @@ -411,8 +409,6 @@ void AxisDispUnitsConverter::convertFromModel( const Reference< XAxis >& rxAxis } } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/axismodel.cxx b/oox/source/drawingml/chart/axismodel.cxx index 6659990cca21..1fd55d4afc23 100644 --- a/oox/source/drawingml/chart/axismodel.cxx +++ b/oox/source/drawingml/chart/axismodel.cxx @@ -19,9 +19,7 @@ #include <drawingml/chart/axismodel.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { AxisDispUnitsModel::AxisDispUnitsModel() : mfCustomUnit( 0.0 ) @@ -59,8 +57,6 @@ AxisModel::~AxisModel() { } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/chartcontextbase.cxx b/oox/source/drawingml/chart/chartcontextbase.cxx index 65ad2a100953..410a1ad9d39c 100644 --- a/oox/source/drawingml/chart/chartcontextbase.cxx +++ b/oox/source/drawingml/chart/chartcontextbase.cxx @@ -25,9 +25,7 @@ #include <oox/token/tokens.hxx> #include <drawingml/shapepropertiescontext.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using ::oox::core::ContextHandler2Helper; using ::oox::core::ContextHandlerRef; @@ -104,8 +102,6 @@ ContextHandlerRef LayoutContext::onCreateContext( sal_Int32 nElement, const Attr return nullptr; } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx index 739092d72b02..fa78d0f22166 100644 --- a/oox/source/drawingml/chart/chartconverter.cxx +++ b/oox/source/drawingml/chart/chartconverter.cxx @@ -30,9 +30,7 @@ using ::oox::drawingml::chart::DataSequenceModel; using ::com::sun::star::uno::Any; -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -154,8 +152,6 @@ Reference< XDataSequence > ChartConverter::createDataSequence( return nullptr; } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx b/oox/source/drawingml/chart/chartdrawingfragment.cxx index a1d162ae648a..63f7837b091f 100644 --- a/oox/source/drawingml/chart/chartdrawingfragment.cxx +++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx @@ -32,9 +32,7 @@ #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using namespace ::com::sun::star; using namespace ::com::sun::star::drawing; @@ -230,8 +228,6 @@ void ChartDrawingFragment::onEndElement() } } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx index 997aa4d41fbe..d9376064f804 100644 --- a/oox/source/drawingml/chart/chartspaceconverter.cxx +++ b/oox/source/drawingml/chart/chartspaceconverter.cxx @@ -53,9 +53,7 @@ using ::com::sun::star::drawing::XShapes; using ::com::sun::star::chart2::XDiagram; using ::com::sun::star::chart2::XTitled; -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using namespace ::com::sun::star::awt; using namespace ::com::sun::star::chart2; @@ -292,8 +290,6 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern } } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx index cefda2ebd2ba..129dbd7cff9c 100644 --- a/oox/source/drawingml/chart/chartspacefragment.cxx +++ b/oox/source/drawingml/chart/chartspacefragment.cxx @@ -28,9 +28,7 @@ #include <oox/helper/attributelist.hxx> #include <oox/token/namespaces.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using namespace ::oox::core; @@ -121,8 +119,6 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( sal_Int32 nElement, const return nullptr; } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/chartspacemodel.cxx b/oox/source/drawingml/chart/chartspacemodel.cxx index fa5e52f4c9db..afdaf41dd19d 100644 --- a/oox/source/drawingml/chart/chartspacemodel.cxx +++ b/oox/source/drawingml/chart/chartspacemodel.cxx @@ -20,9 +20,7 @@ #include <drawingml/chart/chartspacemodel.hxx> #include <oox/token/tokens.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { ChartSpaceModel::ChartSpaceModel(bool bMSO2007Doc) : mnDispBlanksAs( bMSO2007Doc ? XML_gap : XML_zero ), // difference between OOXML spec and MSO 2007 @@ -38,8 +36,6 @@ ChartSpaceModel::~ChartSpaceModel() { } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx index 0b6b876a11a0..069b75bbe83a 100644 --- a/oox/source/drawingml/chart/converterbase.cxx +++ b/oox/source/drawingml/chart/converterbase.cxx @@ -40,9 +40,7 @@ #include <comphelper/processfactory.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { namespace cssc = ::com::sun::star::chart; @@ -437,8 +435,6 @@ void LayoutConverter::convertFromModel( const Reference< XShape >& rxShape, doub } } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx index 7fa7b12852a7..c79578b62411 100644 --- a/oox/source/drawingml/chart/datasourcecontext.cxx +++ b/oox/source/drawingml/chart/datasourcecontext.cxx @@ -29,9 +29,7 @@ #include <svl/zforlist.hxx> #include <osl/diagnose.h> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using ::oox::core::ContextHandler2Helper; using ::oox::core::ContextHandlerRef; @@ -301,8 +299,6 @@ ContextHandlerRef DataSourceContext::onCreateContext( sal_Int32 nElement, const return nullptr; } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/datasourceconverter.cxx b/oox/source/drawingml/chart/datasourceconverter.cxx index bcfbf1bf8406..0f72da69a9c5 100644 --- a/oox/source/drawingml/chart/datasourceconverter.cxx +++ b/oox/source/drawingml/chart/datasourceconverter.cxx @@ -24,9 +24,7 @@ #include <oox/drawingml/chart/datasourcemodel.hxx> #include <oox/token/properties.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using namespace ::com::sun::star::chart2::data; using namespace ::com::sun::star::uno; @@ -99,8 +97,6 @@ Reference< XDataSequence > DataSourceConverter::createDataSequence( const OUStri return xDataSeq; } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/datasourcemodel.cxx b/oox/source/drawingml/chart/datasourcemodel.cxx index ecb9afe4f2cb..92409d432df5 100644 --- a/oox/source/drawingml/chart/datasourcemodel.cxx +++ b/oox/source/drawingml/chart/datasourcemodel.cxx @@ -19,9 +19,7 @@ #include <oox/drawingml/chart/datasourcemodel.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { DataSequenceModel::DataSequenceModel() : mnPointCount( -1 ), @@ -41,8 +39,6 @@ DataSourceModel::~DataSourceModel() { } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/modelbase.cxx b/oox/source/drawingml/chart/modelbase.cxx index fd5225ebb9ce..0e959403929a 100644 --- a/oox/source/drawingml/chart/modelbase.cxx +++ b/oox/source/drawingml/chart/modelbase.cxx @@ -22,9 +22,7 @@ #include <oox/helper/attributelist.hxx> #include <oox/token/tokens.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { NumberFormat::NumberFormat() : mbSourceLinked( true ) @@ -55,8 +53,6 @@ LayoutModel::~LayoutModel() { } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index b071126be53d..db1045c5cc33 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -37,9 +37,7 @@ #include <oox/helper/graphichelper.hxx> #include <oox/token/properties.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::graphic; @@ -1155,8 +1153,6 @@ bool ObjectFormatter::getTextRotation( const ModelRef< TextBody >& rxTextProp, s } } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/plotareacontext.cxx b/oox/source/drawingml/chart/plotareacontext.cxx index c02b640a162c..bbda258abfe3 100644 --- a/oox/source/drawingml/chart/plotareacontext.cxx +++ b/oox/source/drawingml/chart/plotareacontext.cxx @@ -30,9 +30,7 @@ #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using ::oox::core::ContextHandler2Helper; using ::oox::core::ContextHandlerRef; @@ -203,8 +201,6 @@ ContextHandlerRef PlotAreaContext::onCreateContext( sal_Int32 nElement, const At return nullptr; } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx index af3139618824..1862dea1c8cb 100644 --- a/oox/source/drawingml/chart/plotareaconverter.cxx +++ b/oox/source/drawingml/chart/plotareaconverter.cxx @@ -37,9 +37,7 @@ #include <oox/token/tokens.hxx> #include <tools/helpers.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -478,8 +476,6 @@ void PlotAreaConverter::convertPositionFromModel() } } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/plotareamodel.cxx b/oox/source/drawingml/chart/plotareamodel.cxx index d9d91cb1cbf1..cff935bca3d0 100644 --- a/oox/source/drawingml/chart/plotareamodel.cxx +++ b/oox/source/drawingml/chart/plotareamodel.cxx @@ -19,9 +19,7 @@ #include <drawingml/chart/plotareamodel.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { View3DModel::View3DModel(bool bMSO2007Doc) : mnDepthPercent( 100 ), @@ -61,8 +59,6 @@ PlotAreaModel::~PlotAreaModel() { } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx index 10e3af70108f..912b7252e02b 100644 --- a/oox/source/drawingml/chart/seriescontext.cxx +++ b/oox/source/drawingml/chart/seriescontext.cxx @@ -29,9 +29,7 @@ #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using ::oox::core::ContextHandler2; using ::oox::core::ContextHandler2Helper; @@ -705,8 +703,6 @@ ContextHandlerRef SurfaceSeriesContext::onCreateContext( sal_Int32 nElement, con return SeriesContextBase::onCreateContext( nElement, rAttribs ); } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index 10edab47fd11..1ac4ec9226fa 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -51,9 +51,7 @@ #include <drawingml/textfield.hxx> #include <drawingml/textbody.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using namespace com::sun::star; using namespace ::com::sun::star::beans; @@ -828,8 +826,6 @@ Reference< XLabeledDataSequence > SeriesConverter::createLabeledDataSequence( return lclCreateLabeledDataSequence( *this, pValues, rRole, pTitle ); } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/seriesmodel.cxx b/oox/source/drawingml/chart/seriesmodel.cxx index f40ef585a9c4..3a9f3f64c412 100644 --- a/oox/source/drawingml/chart/seriesmodel.cxx +++ b/oox/source/drawingml/chart/seriesmodel.cxx @@ -20,9 +20,7 @@ #include <drawingml/chart/seriesmodel.hxx> #include <oox/token/tokens.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { DataLabelModelBase::DataLabelModelBase(bool bMSO2007Doc) : mbDeleted( !bMSO2007Doc ) @@ -126,8 +124,6 @@ SeriesModel::~SeriesModel() { } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/titlecontext.cxx b/oox/source/drawingml/chart/titlecontext.cxx index 2dbbaac69746..36bf48c8d375 100644 --- a/oox/source/drawingml/chart/titlecontext.cxx +++ b/oox/source/drawingml/chart/titlecontext.cxx @@ -32,9 +32,7 @@ #include <osl/diagnose.h> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using ::oox::core::ContextHandler2Helper; using ::oox::core::ContextHandlerRef; @@ -177,8 +175,6 @@ ContextHandlerRef LegendContext::onCreateContext( sal_Int32 nElement, const Attr return nullptr; } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index fa79d0d9457a..115589105584 100644 --- a/oox/source/drawingml/chart/titleconverter.cxx +++ b/oox/source/drawingml/chart/titleconverter.cxx @@ -41,9 +41,7 @@ #include <com/sun/star/drawing/Alignment.hpp> #include <oox/drawingml/chart/modelbase.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using namespace ::com::sun::star::awt; using namespace ::com::sun::star::chart2; @@ -344,8 +342,6 @@ void LegendConverter::legendEntriesFormatting(const Reference<XDiagram>& rxDiagr } } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/titlemodel.cxx b/oox/source/drawingml/chart/titlemodel.cxx index 846ec218b5bf..73709db0ac37 100644 --- a/oox/source/drawingml/chart/titlemodel.cxx +++ b/oox/source/drawingml/chart/titlemodel.cxx @@ -20,9 +20,7 @@ #include <drawingml/chart/titlemodel.hxx> #include <oox/token/tokens.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { TextModel::TextModel() { @@ -62,8 +60,6 @@ LegendModel::~LegendModel() { } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/typegroupcontext.cxx b/oox/source/drawingml/chart/typegroupcontext.cxx index 0814dedf93b4..9bea7540e234 100644 --- a/oox/source/drawingml/chart/typegroupcontext.cxx +++ b/oox/source/drawingml/chart/typegroupcontext.cxx @@ -27,9 +27,7 @@ #include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using ::oox::core::ContextHandler2Helper; using ::oox::core::ContextHandlerRef; @@ -369,8 +367,6 @@ ContextHandlerRef SurfaceTypeGroupContext::onCreateContext( sal_Int32 nElement, return nullptr; } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx index 671aa2bd4cb4..37a5390a189f 100644 --- a/oox/source/drawingml/chart/typegroupconverter.cxx +++ b/oox/source/drawingml/chart/typegroupconverter.cxx @@ -43,9 +43,7 @@ #include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { using namespace ::com::sun::star::beans; using namespace ::com::sun::star::chart2; @@ -601,8 +599,6 @@ void TypeGroupConverter::insertDataSeries( const Reference< XChartType >& rxChar } } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/typegroupmodel.cxx b/oox/source/drawingml/chart/typegroupmodel.cxx index aae01ed0f58e..2fdd3c488680 100644 --- a/oox/source/drawingml/chart/typegroupmodel.cxx +++ b/oox/source/drawingml/chart/typegroupmodel.cxx @@ -20,9 +20,7 @@ #include <drawingml/chart/typegroupmodel.hxx> #include <oox/token/tokens.hxx> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { UpDownBarsModel::UpDownBarsModel() : mnGapWidth( 150 ) @@ -65,8 +63,6 @@ TypeGroupModel::~TypeGroupModel() { } -} // namespace chart -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/clrscheme.cxx b/oox/source/drawingml/clrscheme.cxx index e1d184f9f413..202b30a619b2 100644 --- a/oox/source/drawingml/clrscheme.cxx +++ b/oox/source/drawingml/clrscheme.cxx @@ -23,7 +23,7 @@ #include <oox/drawingml/clrscheme.hxx> #include <oox/token/tokens.hxx> -namespace oox { namespace drawingml { +namespace oox::drawingml { bool ClrMap::getColorMap( sal_Int32& nClrToken ) { @@ -102,6 +102,6 @@ bool ClrScheme::getColorByIndex(size_t nIndex, ::Color& rColor) const return true; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/clrschemecontext.cxx b/oox/source/drawingml/clrschemecontext.cxx index 398775ee4f7d..e8850974c683 100644 --- a/oox/source/drawingml/clrschemecontext.cxx +++ b/oox/source/drawingml/clrschemecontext.cxx @@ -27,7 +27,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { static void setClrMap( const ::oox::AttributeList& rAttributes, ClrMap& rClrMap, sal_Int32 nToken ) @@ -97,6 +97,6 @@ ContextHandlerRef clrSchemeContext::onCreateContext( return nullptr; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx index 09b033352877..5410d5fc7498 100644 --- a/oox/source/drawingml/color.cxx +++ b/oox/source/drawingml/color.cxx @@ -28,8 +28,7 @@ #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> -namespace oox { -namespace drawingml { +namespace oox::drawingml { namespace { @@ -769,7 +768,6 @@ void Color::toHsl() const } } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/colorchoicecontext.cxx b/oox/source/drawingml/colorchoicecontext.cxx index cf6c17ecd3b4..6d08c7b18963 100644 --- a/oox/source/drawingml/colorchoicecontext.cxx +++ b/oox/source/drawingml/colorchoicecontext.cxx @@ -24,8 +24,7 @@ #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> -namespace oox { -namespace drawingml { +namespace oox::drawingml { ColorValueContext::ColorValueContext( ContextHandler2Helper const & rParent, Color& rColor ) : ContextHandler2( rParent ), @@ -149,7 +148,6 @@ ColorContext::ColorContext( ContextHandler2Helper const & rParent, Color& rColor return nullptr; } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/connectorshapecontext.cxx b/oox/source/drawingml/connectorshapecontext.cxx index e9c6d31938e4..7e5a4b516c9d 100644 --- a/oox/source/drawingml/connectorshapecontext.cxx +++ b/oox/source/drawingml/connectorshapecontext.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::text; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { ConnectorShapeContext::ConnectorShapeContext( ContextHandler2Helper const & rParent, const ShapePtr& pMasterShapePtr, const ShapePtr& pGroupShapePtr ) @@ -65,6 +65,6 @@ ContextHandlerRef ConnectorShapeContext::onCreateContext( sal_Int32 aElementToke return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index 6b436c05cdb8..a0112ebc3da8 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { namespace { @@ -1291,6 +1291,6 @@ ContextHandlerRef PresetTextShapeContext::onCreateContext( sal_Int32 aElementTok return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx index 043b25cd633b..b4d6a2ecb1c2 100644 --- a/oox/source/drawingml/customshapepresetdata.cxx +++ b/oox/source/drawingml/customshapepresetdata.cxx @@ -704,9 +704,7 @@ void lcl_parsePath(std::vector<beans::PropertyValue>& rPath, const OString& rVal } -namespace oox -{ -namespace drawingml +namespace oox::drawingml { void CustomShapeProperties::initializePresetDataMap() @@ -837,6 +835,5 @@ void CustomShapeProperties::initializePresetDataMap() } } -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index f9e19314414e..3b530bddfed6 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::drawing; -namespace oox { namespace drawingml { +namespace oox::drawingml { CustomShapeProperties::CustomShapeProperties() : mnShapePresetType ( -1 ) @@ -397,6 +397,6 @@ void CustomShapeProperties::pushToPropSet( } } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/diagram/constraintlistcontext.cxx b/oox/source/drawingml/diagram/constraintlistcontext.cxx index 42cefee41d28..cc1f13026342 100644 --- a/oox/source/drawingml/diagram/constraintlistcontext.cxx +++ b/oox/source/drawingml/diagram/constraintlistcontext.cxx @@ -26,7 +26,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { // CT_ConstraintLists ConstraintListContext::ConstraintListContext( ContextHandler2Helper const & rParent, @@ -73,6 +73,6 @@ ConstraintListContext::onCreateContext( ::sal_Int32 aElement, return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/diagram/datamodel.cxx b/oox/source/drawingml/diagram/datamodel.cxx index afffab1685af..b29d13d6668c 100644 --- a/oox/source/drawingml/diagram/datamodel.cxx +++ b/oox/source/drawingml/diagram/datamodel.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star; -namespace oox { namespace drawingml { +namespace oox::drawingml { namespace dgm { @@ -473,6 +473,6 @@ void DiagramData::build() #endif } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx index 3746addb8550..1879408b9105 100644 --- a/oox/source/drawingml/diagram/datamodelcontext.cxx +++ b/oox/source/drawingml/diagram/datamodelcontext.cxx @@ -29,7 +29,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::uno; -namespace oox { namespace drawingml { +namespace oox::drawingml { namespace { @@ -370,6 +370,6 @@ DataModelContext::onCreateContext( ::sal_Int32 aElement, return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx index d4e8f18f8bc0..abe580e3c735 100644 --- a/oox/source/drawingml/diagram/diagram.cxx +++ b/oox/source/drawingml/diagram/diagram.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star; -namespace oox { namespace drawingml { +namespace oox::drawingml { static void sortChildrenByZOrder(const ShapePtr& pShape) { @@ -425,6 +425,6 @@ void reloadDiagram(SdrObject* pObj, core::XmlFilterBase& rFilter) child->addShape(rFilter, rFilter.getCurrentTheme(), xShapes, aTransformation, pShape->getFillProperties()); } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx index 731cec9a4702..62e88806e8e8 100644 --- a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx +++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx @@ -28,7 +28,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { // CT_DiagramDefinition DiagramDefinitionContext::DiagramDefinitionContext( ContextHandler2Helper const & rParent, @@ -94,6 +94,6 @@ DiagramDefinitionContext::onCreateContext( ::sal_Int32 aElement, return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx index 6e1000af3627..9a7a8f3de760 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx @@ -29,7 +29,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::uno; -namespace oox { namespace drawingml { +namespace oox::drawingml { DiagramDataFragmentHandler::DiagramDataFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, @@ -234,6 +234,6 @@ void ColorFragmentHandler::onEndElement( ) mrColorsMap[maColorName] = maColorEntry; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 14af84da6ac4..5bdccda0d0c7 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -106,7 +106,7 @@ bool containsDataNodeType(const oox::drawingml::ShapePtr& pShape, sal_Int32 nTyp } } -namespace oox { namespace drawingml { +namespace oox::drawingml { IteratorAttr::IteratorAttr( ) : mnCnt( -1 ) @@ -1441,6 +1441,6 @@ void ShapeAtom::accept( LayoutAtomVisitor& rVisitor ) rVisitor.visit(*this); } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/diagram/layoutatomvisitorbase.cxx b/oox/source/drawingml/diagram/layoutatomvisitorbase.cxx index 98206433653a..22ba236033fa 100644 --- a/oox/source/drawingml/diagram/layoutatomvisitorbase.cxx +++ b/oox/source/drawingml/diagram/layoutatomvisitorbase.cxx @@ -24,7 +24,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace oox { namespace drawingml { +namespace oox::drawingml { void LayoutAtomVisitorBase::defaultVisit(LayoutAtom const& rAtom) { @@ -166,6 +166,6 @@ void ShallowPresNameVisitor::visit(ShapeAtom& /*rAtom*/) // stop processing } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/diagram/layoutatomvisitors.cxx b/oox/source/drawingml/diagram/layoutatomvisitors.cxx index 4bfadc3affe8..5207a6d9b532 100644 --- a/oox/source/drawingml/diagram/layoutatomvisitors.cxx +++ b/oox/source/drawingml/diagram/layoutatomvisitors.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::oox::core; -namespace oox { namespace drawingml { +namespace oox::drawingml { void ShapeCreationVisitor::visit(ConstraintAtom& /*rAtom*/) { @@ -243,6 +243,6 @@ void ShapeLayoutingVisitor::visit(ShapeAtom& /*rAtom*/) // stop processing } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx index 35128debddb9..28e492130ab5 100644 --- a/oox/source/drawingml/diagram/layoutnodecontext.cxx +++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx @@ -32,7 +32,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { namespace { @@ -288,6 +288,6 @@ LayoutNodeContext::onCreateContext( ::sal_Int32 aElement, return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx index f341ff3f9587..be9c3832fa64 100644 --- a/oox/source/drawingml/drawingmltypes.cxx +++ b/oox/source/drawingml/drawingmltypes.cxx @@ -35,8 +35,7 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::geometry; using namespace ::com::sun::star::style; -namespace oox { -namespace drawingml { +namespace oox::drawingml { /** converts EMUs into 1/100th mmm */ sal_Int32 GetCoordinate( sal_Int32 nValue ) @@ -398,7 +397,6 @@ IndexRange GetIndexRange( const Reference< XFastAttributeList >& xAttributes ) return range; } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/effectproperties.cxx b/oox/source/drawingml/effectproperties.cxx index bbfee474b3f2..ff50919646c6 100644 --- a/oox/source/drawingml/effectproperties.cxx +++ b/oox/source/drawingml/effectproperties.cxx @@ -16,8 +16,7 @@ #include <basegfx/numeric/ftools.hxx> -namespace oox { -namespace drawingml { +namespace oox::drawingml { void EffectShadowProperties::assignUsed(const EffectShadowProperties& rSourceProps) { @@ -92,7 +91,6 @@ css::beans::PropertyValue Effect::getEffect() return aRet; } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx index 4c779e75f1ef..7941920ed370 100644 --- a/oox/source/drawingml/effectpropertiescontext.cxx +++ b/oox/source/drawingml/effectpropertiescontext.cxx @@ -21,7 +21,7 @@ using namespace ::com::sun::star::xml::sax; // CT_EffectProperties -namespace oox { namespace drawingml { +namespace oox::drawingml { EffectPropertiesContext::EffectPropertiesContext( ContextHandler2Helper const& rParent, EffectProperties& rEffectProperties ) throw() @@ -119,6 +119,6 @@ ContextHandlerRef EffectPropertiesContext::onCreateContext( sal_Int32 nElement, return nullptr; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/embeddedwavaudiofile.cxx b/oox/source/drawingml/embeddedwavaudiofile.cxx index 193e0c1822cd..a46c3b5d757e 100644 --- a/oox/source/drawingml/embeddedwavaudiofile.cxx +++ b/oox/source/drawingml/embeddedwavaudiofile.cxx @@ -22,7 +22,7 @@ #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> -namespace oox { namespace drawingml { +namespace oox::drawingml { // CT_EmbeddedWAVAudioFile OUString getEmbeddedWAVAudioFile( const core::Relations& rRelations, const AttributeList& rAttribs ) @@ -33,6 +33,6 @@ OUString getEmbeddedWAVAudioFile( const core::Relations& rRelations, const Attri return rRelations.getFragmentPathFromRelId( rAttribs.getString( R_TOKEN(embed) ).get() ); } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index c64b0862d225..3574d9054cc1 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -55,8 +55,7 @@ using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::geometry::IntegerRectangle2D; -namespace oox { -namespace drawingml { +namespace oox::drawingml { namespace { @@ -1031,7 +1030,6 @@ sal_Int32 ArtisticEffectProperties::getEffectToken( const OUString& sName ) return XML_none; } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx index 527c43f9be3d..f85202afcaa8 100644 --- a/oox/source/drawingml/graphicshapecontext.cxx +++ b/oox/source/drawingml/graphicshapecontext.cxx @@ -67,8 +67,7 @@ static OUString lcl_GetMediaReference(const OUString& rStream) return rStream.isEmpty() ? OUString() : "vnd.sun.star.Package:" + rStream; } -namespace oox { -namespace drawingml { +namespace oox::drawingml { // CT_Picture @@ -312,7 +311,6 @@ ContextHandlerRef ChartGraphicDataContext::onCreateContext( ::sal_Int32 nElement return nullptr; } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/guidcontext.cxx b/oox/source/drawingml/guidcontext.cxx index 97e3979a94e5..022359562e2e 100644 --- a/oox/source/drawingml/guidcontext.cxx +++ b/oox/source/drawingml/guidcontext.cxx @@ -23,7 +23,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { GuidContext::GuidContext( ContextHandler2Helper const & rParent, OUString& rGuidId ) : ContextHandler2( rParent ) @@ -35,6 +35,6 @@ void GuidContext::onCharacters( const OUString& aChars ) mrGuidId += aChars; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx index 35b29b29f20d..9e5631eb7b38 100644 --- a/oox/source/drawingml/hyperlinkcontext.cxx +++ b/oox/source/drawingml/hyperlinkcontext.cxx @@ -33,8 +33,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { -namespace drawingml { +namespace oox::drawingml { HyperLinkContext::HyperLinkContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, PropertyMap& aProperties ) @@ -164,7 +163,6 @@ ContextHandlerRef HyperLinkContext::onCreateContext( return this; } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx index adaafcf91f0c..90f79f760cae 100644 --- a/oox/source/drawingml/lineproperties.cxx +++ b/oox/source/drawingml/lineproperties.cxx @@ -40,8 +40,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::drawing; -namespace oox { -namespace drawingml { +namespace oox::drawingml { namespace { @@ -519,7 +518,6 @@ sal_Int32 LineProperties::getLineWidth() const return convertEmuToHmm( moLineWidth.get( 0 ) ); } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/linepropertiescontext.cxx b/oox/source/drawingml/linepropertiescontext.cxx index 3dd7d50b8b1d..6b04bcd42210 100644 --- a/oox/source/drawingml/linepropertiescontext.cxx +++ b/oox/source/drawingml/linepropertiescontext.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star::xml::sax; // CT_LineProperties -namespace oox { namespace drawingml { +namespace oox::drawingml { LinePropertiesContext::LinePropertiesContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, LineProperties& rLineProperties ) throw() @@ -134,6 +134,6 @@ ContextHandlerRef LinePropertiesContext::onCreateContext( sal_Int32 nElement, co return nullptr; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/misccontexts.cxx b/oox/source/drawingml/misccontexts.cxx index 5a977fd4ee75..b54cda58a329 100644 --- a/oox/source/drawingml/misccontexts.cxx +++ b/oox/source/drawingml/misccontexts.cxx @@ -35,8 +35,7 @@ using namespace ::com::sun::star::xml::sax; using ::oox::core::ContextHandler2; using ::oox::core::ContextHandlerRef; -namespace oox { -namespace drawingml { +namespace oox::drawingml { SolidFillContext::SolidFillContext( ContextHandler2Helper const & rParent, FillProperties& rFillProps ) : @@ -379,7 +378,6 @@ ContextHandlerRef ArtisticEffectContext::onCreateContext( return nullptr; } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/objectdefaultcontext.cxx b/oox/source/drawingml/objectdefaultcontext.cxx index 1c9c1b58c820..8466b353accc 100644 --- a/oox/source/drawingml/objectdefaultcontext.cxx +++ b/oox/source/drawingml/objectdefaultcontext.cxx @@ -27,7 +27,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { objectDefaultContext::objectDefaultContext( ContextHandler2Helper const & rParent, Theme& rTheme ) : ContextHandler2( rParent ) @@ -49,6 +49,6 @@ ContextHandlerRef objectDefaultContext::onCreateContext( sal_Int32 aElementToken return nullptr; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/scene3dcontext.cxx b/oox/source/drawingml/scene3dcontext.cxx index f6e0ee38d5fc..3e99c8adc504 100644 --- a/oox/source/drawingml/scene3dcontext.cxx +++ b/oox/source/drawingml/scene3dcontext.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { Scene3DPropertiesContext::Scene3DPropertiesContext( ContextHandler2Helper const & rParent, Shape3DProperties& r3DProperties ) throw() : ContextHandler2( rParent ) @@ -132,6 +132,6 @@ ContextHandlerRef Scene3DRotationPropertiesContext::onCreateContext( sal_Int32 a return nullptr; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index a99b403829fe..c679a869e4c8 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -113,7 +113,7 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::style; -namespace oox { namespace drawingml { +namespace oox::drawingml { Shape::Shape( const char* pServiceName, bool bDefaultHeight ) : mpLinePropertiesPtr( new LineProperties ) @@ -1916,6 +1916,6 @@ void Shape::cloneFillProperties() pFillProperties->assignUsed(*mpFillPropertiesPtr); mpFillPropertiesPtr = pFillProperties; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/shape3dproperties.cxx b/oox/source/drawingml/shape3dproperties.cxx index ac94f882d539..8045b27660a4 100644 --- a/oox/source/drawingml/shape3dproperties.cxx +++ b/oox/source/drawingml/shape3dproperties.cxx @@ -38,8 +38,7 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::graphic; -namespace oox { -namespace drawingml { +namespace oox::drawingml { OUString Shape3DProperties::getCameraPrstName( sal_Int32 nElement ) { @@ -400,7 +399,6 @@ css::uno::Sequence< css::beans::PropertyValue > Shape3DProperties::getShape3DAtt return aSeq; } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx index 60feae99f656..d32e448c6227 100644 --- a/oox/source/drawingml/shapecontext.cxx +++ b/oox/source/drawingml/shapecontext.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::text; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { // CT_Shape ShapeContext::ShapeContext( ContextHandler2Helper const & rParent, ShapePtr const & pMasterShapePtr, ShapePtr const & pShapePtr ) @@ -134,6 +134,6 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 aElementToken, const return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/shapegroupcontext.cxx b/oox/source/drawingml/shapegroupcontext.cxx index 6d7756e86d5b..c7f84cf7ef1c 100644 --- a/oox/source/drawingml/shapegroupcontext.cxx +++ b/oox/source/drawingml/shapegroupcontext.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::text; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { ShapeGroupContext::ShapeGroupContext( FragmentHandler2 const & rParent, ShapePtr const & pMasterShapePtr, ShapePtr const & pGroupShapePtr ) : FragmentHandler2( rParent ) @@ -116,6 +116,6 @@ ContextHandlerRef ShapeGroupContext::onCreateContext( sal_Int32 aElementToken, c return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx index ffedcfa5bf13..0b6956ef87c3 100644 --- a/oox/source/drawingml/shapepropertiescontext.cxx +++ b/oox/source/drawingml/shapepropertiescontext.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { // CT_ShapeProperties ShapePropertiesContext::ShapePropertiesContext( ContextHandler2Helper const & rParent, Shape& rShape ) @@ -107,6 +107,6 @@ ContextHandlerRef ShapePropertiesContext::onCreateContext( sal_Int32 aElementTok return FillPropertiesContext::createFillContext( *this, aElementToken, rAttribs, mrShape.getFillProperties() ); } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/shapepropertymap.cxx b/oox/source/drawingml/shapepropertymap.cxx index c6168be243ab..3cecae3f9e9b 100644 --- a/oox/source/drawingml/shapepropertymap.cxx +++ b/oox/source/drawingml/shapepropertymap.cxx @@ -29,8 +29,7 @@ #include <oox/helper/modelobjecthelper.hxx> #include <oox/token/properties.hxx> -namespace oox { -namespace drawingml { +namespace oox::drawingml { using namespace ::com::sun::star; using namespace ::com::sun::star::beans; @@ -231,7 +230,6 @@ bool ShapePropertyMap::setFillBitmapName(const Any& rValue) return false; } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/shapestylecontext.cxx b/oox/source/drawingml/shapestylecontext.cxx index 796849efd04b..f0bc061a58a3 100644 --- a/oox/source/drawingml/shapestylecontext.cxx +++ b/oox/source/drawingml/shapestylecontext.cxx @@ -28,7 +28,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { // CT_ShapeStyle @@ -65,6 +65,6 @@ ContextHandlerRef ShapeStyleContext::onCreateContext( sal_Int32 aElementToken, c return nullptr; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/spdefcontext.cxx b/oox/source/drawingml/spdefcontext.cxx index 27f99e996fb1..660ba623a655 100644 --- a/oox/source/drawingml/spdefcontext.cxx +++ b/oox/source/drawingml/spdefcontext.cxx @@ -29,7 +29,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { spDefContext::spDefContext( ContextHandler2Helper const & rParent, Shape& rDefaultObject ) : ContextHandler2( rParent ) @@ -58,6 +58,6 @@ ContextHandlerRef spDefContext::onCreateContext( sal_Int32 aElementToken, const return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx index bbe57ffe178a..fc56ae48f205 100644 --- a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx +++ b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { namespace table { +namespace oox::drawingml::table { TableBackgroundStyleContext::TableBackgroundStyleContext( ContextHandler2Helper const & rParent, TableStyle& rTableStyle ) : ContextHandler2( rParent ) @@ -69,6 +69,6 @@ TableBackgroundStyleContext::onCreateContext( ::sal_Int32 aElementToken, const A return this; } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index e270d5155d20..f8abf8b6a4b5 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using ::com::sun::star::table::BorderLine2; -namespace oox { namespace drawingml { namespace table { +namespace oox::drawingml::table { TableCell::TableCell() : mpTextBody( new TextBody() ) @@ -475,6 +475,6 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons xPropSet->setPropertyValue("RotateAngle", Any(short(9000))); } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/table/tablecellcontext.cxx b/oox/source/drawingml/table/tablecellcontext.cxx index 4d037447293e..6a029150e50e 100644 --- a/oox/source/drawingml/table/tablecellcontext.cxx +++ b/oox/source/drawingml/table/tablecellcontext.cxx @@ -29,7 +29,7 @@ using namespace ::oox::core; using namespace ::com::sun::star; -namespace oox { namespace drawingml { namespace table { +namespace oox::drawingml::table { TableCellContext::TableCellContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, TableCell& rTableCell ) : ContextHandler2( rParent ) @@ -98,6 +98,6 @@ TableCellContext::onCreateContext( ::sal_Int32 aElementToken, const AttributeLis return this; } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/table/tablecontext.cxx b/oox/source/drawingml/table/tablecontext.cxx index 90191f615d4d..a753a3401e49 100644 --- a/oox/source/drawingml/table/tablecontext.cxx +++ b/oox/source/drawingml/table/tablecontext.cxx @@ -29,7 +29,7 @@ using namespace ::oox::core; using namespace ::com::sun::star; -namespace oox { namespace drawingml { namespace table { +namespace oox::drawingml::table { TableContext::TableContext( ContextHandler2Helper const & rParent, const ShapePtr& pShapePtr ) : ShapeContext( rParent, ShapePtr(), pShapePtr ) @@ -87,6 +87,6 @@ TableContext::onCreateContext( ::sal_Int32 aElementToken, const AttributeList& r return this; } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/table/tablepartstylecontext.cxx b/oox/source/drawingml/table/tablepartstylecontext.cxx index 95f90bf73b71..4438c9a43e1f 100644 --- a/oox/source/drawingml/table/tablepartstylecontext.cxx +++ b/oox/source/drawingml/table/tablepartstylecontext.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { namespace table { +namespace oox::drawingml::table { TablePartStyleContext::TablePartStyleContext( ContextHandler2Helper const & rParent, TableStylePart& rTableStylePart ) : ContextHandler2( rParent ) @@ -56,6 +56,6 @@ TablePartStyleContext::onCreateContext( ::sal_Int32 aElementToken, const Attribu return this; } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx index f867ee144003..d5fa302f7c3d 100644 --- a/oox/source/drawingml/table/tableproperties.cxx +++ b/oox/source/drawingml/table/tableproperties.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::table; -namespace oox { namespace drawingml { namespace table { +namespace oox::drawingml::table { TableProperties::TableProperties() : mbFirstRow( false ) @@ -259,6 +259,6 @@ void TableProperties::pullFromTextBody(oox::drawingml::TextBodyPtr pTextBody, sa } } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/table/tablerow.cxx b/oox/source/drawingml/table/tablerow.cxx index b87a72033d9e..51ad03c8f614 100644 --- a/oox/source/drawingml/table/tablerow.cxx +++ b/oox/source/drawingml/table/tablerow.cxx @@ -31,13 +31,13 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -namespace oox { namespace drawingml { namespace table { +namespace oox::drawingml::table { TableRow::TableRow() : mnHeight( 0 ) { } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/table/tablerowcontext.cxx b/oox/source/drawingml/table/tablerowcontext.cxx index fd27924cf1fb..aafd13b00e20 100644 --- a/oox/source/drawingml/table/tablerowcontext.cxx +++ b/oox/source/drawingml/table/tablerowcontext.cxx @@ -28,7 +28,7 @@ using namespace ::oox::core; using namespace ::com::sun::star; -namespace oox { namespace drawingml { namespace table { +namespace oox::drawingml::table { TableRowContext::TableRowContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, TableRow& rTableRow ) : ContextHandler2( rParent ) @@ -60,6 +60,6 @@ TableRowContext::onCreateContext( ::sal_Int32 aElementToken, const AttributeList return this; } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/table/tablestyle.cxx b/oox/source/drawingml/table/tablestyle.cxx index 04d1173f7fe1..15ae746eaede 100644 --- a/oox/source/drawingml/table/tablestyle.cxx +++ b/oox/source/drawingml/table/tablestyle.cxx @@ -19,12 +19,12 @@ #include <drawingml/table/tablestyle.hxx> -namespace oox { namespace drawingml { namespace table { +namespace oox::drawingml::table { TableStyle::TableStyle() { } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/table/tablestylecellstylecontext.cxx b/oox/source/drawingml/table/tablestylecellstylecontext.cxx index 788f8eb6113b..9093e99c75c9 100644 --- a/oox/source/drawingml/table/tablestylecellstylecontext.cxx +++ b/oox/source/drawingml/table/tablestylecellstylecontext.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { namespace table { +namespace oox::drawingml::table { TableStyleCellStyleContext::TableStyleCellStyleContext( ContextHandler2Helper const & rParent, TableStylePart& rTableStylePart ) : ContextHandler2( rParent ) @@ -104,6 +104,6 @@ TableStyleCellStyleContext::onCreateContext( ::sal_Int32 aElementToken, const At return this; } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/table/tablestylecontext.cxx b/oox/source/drawingml/table/tablestylecontext.cxx index e87c2d4fbed6..7dc4ce468cf1 100644 --- a/oox/source/drawingml/table/tablestylecontext.cxx +++ b/oox/source/drawingml/table/tablestylecontext.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { namespace table { +namespace oox::drawingml::table { TableStyleContext::TableStyleContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, TableStyle& rTableStyle ) @@ -84,6 +84,6 @@ TableStyleContext::onCreateContext( ::sal_Int32 aElementToken, const AttributeLi return this; } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/table/tablestylelist.cxx b/oox/source/drawingml/table/tablestylelist.cxx index f218c61e4182..b04ed5188da9 100644 --- a/oox/source/drawingml/table/tablestylelist.cxx +++ b/oox/source/drawingml/table/tablestylelist.cxx @@ -20,7 +20,7 @@ #include <drawingml/table/tablestylelist.hxx> #include <drawingml/table/tablestyle.hxx> -namespace oox { namespace drawingml { namespace table { +namespace oox::drawingml::table { TableStyleList::TableStyleList() { @@ -30,6 +30,6 @@ TableStyleList::~TableStyleList() { } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx b/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx index 4774f2f3fa70..309077f09689 100644 --- a/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx +++ b/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx @@ -29,9 +29,7 @@ using namespace ::oox::drawingml; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { -namespace drawingml { -namespace table { +namespace oox::drawingml::table { TableStyleListFragmentHandler::TableStyleListFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, TableStyleList& rTableStyleList ): FragmentHandler2( rFilter, rFragmentPath ), @@ -60,8 +58,6 @@ ContextHandlerRef TableStyleListFragmentHandler::onCreateContext( return this; } -} // namespace table -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/table/tablestylepart.cxx b/oox/source/drawingml/table/tablestylepart.cxx index 322021e1e6ef..e9fed946021f 100644 --- a/oox/source/drawingml/table/tablestylepart.cxx +++ b/oox/source/drawingml/table/tablestylepart.cxx @@ -25,12 +25,12 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -namespace oox { namespace drawingml { namespace table { +namespace oox::drawingml::table { TableStylePart::TableStylePart() { } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/table/tablestyletextstylecontext.cxx b/oox/source/drawingml/table/tablestyletextstylecontext.cxx index 7567ac4c8130..d4206439f162 100644 --- a/oox/source/drawingml/table/tablestyletextstylecontext.cxx +++ b/oox/source/drawingml/table/tablestyletextstylecontext.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { namespace table { +namespace oox::drawingml::table { TableStyleTextStyleContext::TableStyleTextStyleContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, TableStylePart& rTableStylePart ) @@ -93,6 +93,6 @@ TableStyleTextStyleContext::onCreateContext( ::sal_Int32 aElementToken, const At return new ColorValueContext( *this, mrTableStylePart.getTextColor() ); } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textbody.cxx b/oox/source/drawingml/textbody.cxx index 219128c7f6e0..4c3564b4d63b 100644 --- a/oox/source/drawingml/textbody.cxx +++ b/oox/source/drawingml/textbody.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; -namespace oox { namespace drawingml { +namespace oox::drawingml { TextBody::TextBody() { @@ -134,6 +134,6 @@ void TextBody::ApplyStyleEmpty( } } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx index d0f8769cc962..c3221df82d4f 100644 --- a/oox/source/drawingml/textbodycontext.cxx +++ b/oox/source/drawingml/textbodycontext.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { namespace { @@ -203,6 +203,6 @@ ContextHandlerRef TextBodyContext::onCreateContext( sal_Int32 aElementToken, con return nullptr; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textbodyproperties.cxx b/oox/source/drawingml/textbodyproperties.cxx index 5998c429b494..7aff131cd0fb 100644 --- a/oox/source/drawingml/textbodyproperties.cxx +++ b/oox/source/drawingml/textbodyproperties.cxx @@ -27,8 +27,7 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::text; -namespace oox { -namespace drawingml { +namespace oox::drawingml { TextBodyProperties::TextBodyProperties() : mbAnchorCtr(false) @@ -96,7 +95,6 @@ void TextBodyProperties::pushRotationAdjustments() } } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx b/oox/source/drawingml/textbodypropertiescontext.cxx index d696b4c3ac70..6118fffa2543 100644 --- a/oox/source/drawingml/textbodypropertiescontext.cxx +++ b/oox/source/drawingml/textbodypropertiescontext.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { // CT_TextBodyProperties TextBodyPropertiesContext::TextBodyPropertiesContext(ContextHandler2Helper const& rParent, @@ -189,6 +189,6 @@ ContextHandlerRef TextBodyPropertiesContext::onCreateContext( sal_Int32 aElement return nullptr; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx index 54b939ac6827..3bfff3377e9a 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -38,8 +38,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -namespace oox { -namespace drawingml { +namespace oox::drawingml { void TextCharacterProperties::assignUsed( const TextCharacterProperties& rSourceProps ) { @@ -209,7 +208,6 @@ float TextCharacterProperties::getCharHeightPoints( float fDefault ) const return moHeight.has() ? GetFontHeight( moHeight.get() ) : fDefault; } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx index 236219d844cf..9c0157c9d5b9 100644 --- a/oox/source/drawingml/textcharacterpropertiescontext.cxx +++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::awt; -namespace oox { namespace drawingml { +namespace oox::drawingml { // CT_TextCharacterProperties TextCharacterPropertiesContext::TextCharacterPropertiesContext( @@ -240,6 +240,6 @@ ContextHandlerRef TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/texteffectscontext.cxx b/oox/source/drawingml/texteffectscontext.cxx index 4bf165fe9dae..8b42d2061379 100644 --- a/oox/source/drawingml/texteffectscontext.cxx +++ b/oox/source/drawingml/texteffectscontext.cxx @@ -15,7 +15,7 @@ #include <map> -namespace oox { namespace drawingml { +namespace oox::drawingml { namespace { @@ -314,6 +314,6 @@ ContextHandlerRef TextEffectsContext::onCreateContext(sal_Int32 aElementToken, c return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx index 61b50e8ef549..8d22d0f57161 100644 --- a/oox/source/drawingml/textfield.cxx +++ b/oox/source/drawingml/textfield.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; -namespace oox { namespace drawingml { +namespace oox::drawingml { TextField::TextField() { @@ -247,6 +247,6 @@ sal_Int32 TextField::insertAt( return nCharHeight; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textfieldcontext.cxx b/oox/source/drawingml/textfieldcontext.cxx index ea23e1d0b9b1..8cfb17c08b18 100644 --- a/oox/source/drawingml/textfieldcontext.cxx +++ b/oox/source/drawingml/textfieldcontext.cxx @@ -29,7 +29,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { TextFieldContext::TextFieldContext( ContextHandler2Helper const & rParent, const AttributeList& rAttributes, @@ -73,6 +73,6 @@ ContextHandlerRef TextFieldContext::onCreateContext( sal_Int32 aElementToken, co return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textfont.cxx b/oox/source/drawingml/textfont.cxx index 961453e85737..374d564d1282 100644 --- a/oox/source/drawingml/textfont.cxx +++ b/oox/source/drawingml/textfont.cxx @@ -27,8 +27,7 @@ using ::oox::core::XmlFilterBase; -namespace oox { -namespace drawingml { +namespace oox::drawingml { namespace { @@ -92,7 +91,6 @@ bool TextFont::implGetFontData( OUString& rFontName, sal_Int16& rnFontPitch, sal return !rFontName.isEmpty(); } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textliststyle.cxx b/oox/source/drawingml/textliststyle.cxx index 15475ddcacb0..d900e3cef338 100644 --- a/oox/source/drawingml/textliststyle.cxx +++ b/oox/source/drawingml/textliststyle.cxx @@ -20,7 +20,7 @@ #include <drawingml/textliststyle.hxx> #include <sal/log.hxx> -namespace oox { namespace drawingml { +namespace oox::drawingml { TextListStyle::TextListStyle() { @@ -94,6 +94,6 @@ void TextListStyle::dump() const } } #endif -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textliststylecontext.cxx b/oox/source/drawingml/textliststylecontext.cxx index 9c43e7206f1b..25323c314016 100644 --- a/oox/source/drawingml/textliststylecontext.cxx +++ b/oox/source/drawingml/textliststylecontext.cxx @@ -27,7 +27,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { // CT_TextListStyle TextListStyleContext::TextListStyleContext( ContextHandler2Helper const & rParent, TextListStyle& rTextListStyle ) @@ -73,6 +73,6 @@ ContextHandlerRef TextListStyleContext::onCreateContext( sal_Int32 aElementToken return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index 078fd777bff4..46bb5b5a38bc 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -namespace oox { namespace drawingml { +namespace oox::drawingml { TextParagraph::TextParagraph() { @@ -183,6 +183,6 @@ formulaimport::XmlStreamBuilder & TextParagraph::GetMathXml() return *m_pMathXml; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 1043323f26d6..b35a8e21ce39 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -57,7 +57,7 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::container; using ::com::sun::star::awt::FontDescriptor; -namespace oox { namespace drawingml { +namespace oox::drawingml { BulletList::BulletList( ) : maBulletColorPtr( new Color() ) @@ -523,6 +523,6 @@ void TextParagraphProperties::dump() const aPropSet.dump(); } #endif -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx index f194d04c5ee0..e4d066c78085 100644 --- a/oox/source/drawingml/textparagraphpropertiescontext.cxx +++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::style; using namespace ::com::sun::star::text; -namespace oox { namespace drawingml { +namespace oox::drawingml { // CT_TextParagraphProperties TextParagraphPropertiesContext::TextParagraphPropertiesContext( ContextHandler2Helper const & rParent, @@ -338,6 +338,6 @@ ContextHandlerRef TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx index 3f66c7a852e4..ea51f1472a0e 100644 --- a/oox/source/drawingml/textrun.cxx +++ b/oox/source/drawingml/textrun.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; -namespace oox { namespace drawingml { +namespace oox::drawingml { TextRun::TextRun() : mbIsLineBreak( false ) @@ -177,6 +177,6 @@ sal_Int32 TextRun::insertAt( return nCharHeight; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textspacingcontext.cxx b/oox/source/drawingml/textspacingcontext.cxx index b7d3232e9dfa..f96f1a20caac 100644 --- a/oox/source/drawingml/textspacingcontext.cxx +++ b/oox/source/drawingml/textspacingcontext.cxx @@ -28,7 +28,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::uno; -namespace oox { namespace drawingml { +namespace oox::drawingml { TextSpacingContext::TextSpacingContext( ContextHandler2Helper const & rParent, TextSpacing & aSpacing ) : ContextHandler2( rParent ) @@ -58,6 +58,6 @@ namespace oox { namespace drawingml { return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/texttabstoplistcontext.cxx b/oox/source/drawingml/texttabstoplistcontext.cxx index 30f0a0f64288..f20493a4bf6b 100644 --- a/oox/source/drawingml/texttabstoplistcontext.cxx +++ b/oox/source/drawingml/texttabstoplistcontext.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::style; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace drawingml { +namespace oox::drawingml { TextTabStopListContext::TextTabStopListContext( ContextHandler2Helper const & rParent, std::vector< TabStop > & aTabList ) : ContextHandler2( rParent ) @@ -71,6 +71,6 @@ namespace oox { namespace drawingml { } return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/theme.cxx b/oox/source/drawingml/theme.cxx index df48d5c78f61..db3124fa9f67 100644 --- a/oox/source/drawingml/theme.cxx +++ b/oox/source/drawingml/theme.cxx @@ -21,8 +21,7 @@ #include <oox/token/tokens.hxx> #include <drawingml/textcharacterproperties.hxx> -namespace oox { -namespace drawingml { +namespace oox::drawingml { Theme::Theme() { @@ -106,7 +105,6 @@ const TextFont* Theme::resolveFont( const OUString& rName ) const return nullptr; } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/themeelementscontext.cxx b/oox/source/drawingml/themeelementscontext.cxx index 3919a3790bd6..ab2c6f972a71 100644 --- a/oox/source/drawingml/themeelementscontext.cxx +++ b/oox/source/drawingml/themeelementscontext.cxx @@ -35,8 +35,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { -namespace drawingml { +namespace oox::drawingml { namespace { @@ -235,7 +234,6 @@ ContextHandlerRef ThemeElementsContext::onCreateContext( sal_Int32 nElement, con return nullptr; } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/themefragmenthandler.cxx b/oox/source/drawingml/themefragmenthandler.cxx index e1b539e075ee..6b31383cb0f9 100644 --- a/oox/source/drawingml/themefragmenthandler.cxx +++ b/oox/source/drawingml/themefragmenthandler.cxx @@ -26,8 +26,7 @@ using namespace ::oox::core; -namespace oox { -namespace drawingml { +namespace oox::drawingml { ThemeFragmentHandler::ThemeFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, Theme& rTheme ) : FragmentHandler2( rFilter, rFragmentPath ), @@ -71,7 +70,6 @@ ContextHandlerRef ThemeFragmentHandler::onCreateContext( sal_Int32 nElement, con return nullptr; } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/transform2dcontext.cxx b/oox/source/drawingml/transform2dcontext.cxx index 7798ecdecdba..bdc567d6c7b9 100644 --- a/oox/source/drawingml/transform2dcontext.cxx +++ b/oox/source/drawingml/transform2dcontext.cxx @@ -27,8 +27,7 @@ using namespace ::com::sun::star; using ::oox::core::ContextHandlerRef; -namespace oox { -namespace drawingml { +namespace oox::drawingml { /** context to import a CT_Transform2D */ Transform2DContext::Transform2DContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, Shape& rShape, bool btxXfrm ) throw() @@ -113,7 +112,6 @@ ContextHandlerRef Transform2DContext::onCreateContext( sal_Int32 aElementToken, return nullptr; } -} // namespace drawingml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx index dc02a1fa498b..1da86eda6c06 100644 --- a/oox/source/dump/dffdumper.cxx +++ b/oox/source/dump/dffdumper.cxx @@ -21,8 +21,7 @@ #ifdef DBG_UTIL -namespace oox { -namespace dump { +namespace oox::dump { namespace { @@ -221,7 +220,6 @@ sal_uInt16 DffStreamObject::dumpDffOptPropHeader() return dumpHex< sal_uInt16 >( "id", "DFFOPT-PROPERTY-ID" ); } -} // namespace dump } // namespace oox #endif diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 5c44e54600b8..21b87b1b4a66 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -36,8 +36,7 @@ #ifdef DBG_UTIL -namespace oox { -namespace dump { +namespace oox::dump { using namespace ::com::sun::star; using namespace ::com::sun::star::beans; @@ -2565,7 +2564,6 @@ void DumperBase::construct( const ConfigRef& rxConfig ) ObjectBase::construct( rxConfig ); } -} // namespace dump } // namespace oox #endif diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx index f0ad198edef0..a2c6c98b1661 100644 --- a/oox/source/dump/oledumper.cxx +++ b/oox/source/dump/oledumper.cxx @@ -31,8 +31,7 @@ #ifdef DBG_UTIL -namespace oox { -namespace dump { +namespace oox::dump { using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; @@ -2081,7 +2080,6 @@ void ActiveXStorageObject::implDumpBaseStream( const BinaryInputStreamRef& rxStr FormControlStreamObject( *this, rxStrm, rSysFileName ).dump(); } -} // namespace dump } // namespace oox #endif diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx index df9555f235e8..695fc4dfe721 100644 --- a/oox/source/dump/pptxdumper.cxx +++ b/oox/source/dump/pptxdumper.cxx @@ -26,9 +26,7 @@ #ifdef DBG_UTIL -namespace oox { -namespace dump { -namespace pptx { +namespace oox::dump::pptx { using namespace ::com::sun::star::io; //using namespace ::com::sun::star::lang; @@ -124,8 +122,6 @@ void Dumper::implDump() RootStorageObject( *this ).dump(); } -} // namespace pptx -} // namespace dump } // namespace oox #endif diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx index c5e1b4ae30b5..c26d1eea3bb5 100644 --- a/oox/source/export/ColorPropertySet.cxx +++ b/oox/source/export/ColorPropertySet.cxx @@ -78,9 +78,7 @@ sal_Bool SAL_CALL lcl_ColorPropertySetInfo::hasPropertyByName( const OUString& N } // anonymous namespace -namespace oox -{ -namespace drawingml +namespace oox::drawingml { ColorPropertySet::ColorPropertySet( ::Color nColor, bool bFillColor /* = true */ ) : @@ -176,7 +174,6 @@ uno::Any SAL_CALL ColorPropertySet::getPropertyDefault( const OUString& aPropert return uno::Any(); } -} // namespace chart } // namespace xmloff /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 02c2bdf951f4..035aedc54023 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -127,7 +127,7 @@ using ::sax_fastparser::FSHelperPtr; namespace cssc = css::chart; -namespace oox { namespace drawingml { +namespace oox::drawingml { namespace { @@ -4121,7 +4121,6 @@ OUString ChartExport::getNumberFormatCode(sal_Int32 nKey) const return aCode; } -}// drawingml }// oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 8c9f641b5d4f..03ca4c8bd243 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -148,8 +148,7 @@ sal_Int32 GetAlphaFromTransparenceGradient(const awt::Gradient& rGradient, bool } } -namespace oox { -namespace drawingml { +namespace oox::drawingml { URLTransformer::~URLTransformer() { @@ -4462,6 +4461,5 @@ void DrawingML::writeDiagramRels(const uno::Sequence<uno::Sequence<uno::Any>>& x } } -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 9f69e316cbec..4ba651f91dbc 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -340,7 +340,7 @@ uno::Reference<io::XInputStream> GetOLEObjectStream( } // namespace oox -namespace oox { namespace drawingml { +namespace oox::drawingml { #define GETA(propName) \ GetProperty( rXPropSet, #propName) @@ -2235,6 +2235,6 @@ sal_Int32 ShapeExport::GetShapeID( const Reference< XShape >& rXShape, ShapeHash return aIter->second; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx index 178a3eed6791..e50aa70e6f0f 100644 --- a/oox/source/mathml/importutils.cxx +++ b/oox/source/mathml/importutils.cxx @@ -25,10 +25,7 @@ using namespace com::sun::star; -namespace oox -{ - -namespace formulaimport +namespace oox::formulaimport { namespace @@ -337,6 +334,5 @@ void XmlStreamBuilder::appendCharacters( const OUString& chars ) } } // namespace -} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/axbinaryreader.cxx b/oox/source/ole/axbinaryreader.cxx index cbd7051637a5..04f020663087 100644 --- a/oox/source/ole/axbinaryreader.cxx +++ b/oox/source/ole/axbinaryreader.cxx @@ -24,8 +24,7 @@ #include <osl/diagnose.h> -namespace oox { -namespace ole { +namespace oox::ole { namespace { @@ -287,7 +286,6 @@ bool AxBinaryPropertyReader::startNextProperty() return ensureValid() && bHasProp; } -} // namespace ole } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/axbinarywriter.cxx b/oox/source/ole/axbinarywriter.cxx index 85b3621b2733..7d76aefc9086 100644 --- a/oox/source/ole/axbinarywriter.cxx +++ b/oox/source/ole/axbinarywriter.cxx @@ -10,8 +10,7 @@ #include <oox/ole/olehelper.hxx> -namespace oox { -namespace ole { +namespace oox::ole { namespace { @@ -199,7 +198,6 @@ void AxBinaryPropertyWriter::startNextProperty( bool bSkip ) mnNextProp <<= 1; } -} // namespace exp } // namespace ole /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 57606fa1ce0b..8ce93ea1ffa5 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -64,8 +64,7 @@ #include <oox/token/tokens.hxx> #include <tools/diagnose_ex.h> -namespace oox { -namespace ole { +namespace oox::ole { using namespace ::com::sun::star; using namespace ::com::sun::star::awt; @@ -2779,7 +2778,6 @@ Reference< XIndexContainer > const & EmbeddedForm::createXForm() return mxFormIC; } -} // namespace ole } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/axcontrolfragment.cxx b/oox/source/ole/axcontrolfragment.cxx index fbc0546879ca..3e1f5c363126 100644 --- a/oox/source/ole/axcontrolfragment.cxx +++ b/oox/source/ole/axcontrolfragment.cxx @@ -31,8 +31,7 @@ #include <osl/diagnose.h> -namespace oox { -namespace ole { +namespace oox::ole { using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; @@ -163,7 +162,6 @@ ContextHandlerRef AxControlFragment::onCreateContext( sal_Int32 nElement, const return nullptr; } -} // namespace ole } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/axfontdata.cxx b/oox/source/ole/axfontdata.cxx index 184a7d03ed10..2ebedd0cbdf5 100644 --- a/oox/source/ole/axfontdata.cxx +++ b/oox/source/ole/axfontdata.cxx @@ -22,8 +22,7 @@ #include <oox/ole/axbinaryreader.hxx> #include <oox/ole/axbinarywriter.hxx> -namespace oox { -namespace ole { +namespace oox::ole { AxFontData::AxFontData() : mnFontEffects( AxFontFlags::NONE ), @@ -113,7 +112,6 @@ bool AxFontData::importGuidAndFont( BinaryInputStream& rInStrm ) return false; } -} // namespace ole } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 05b787d9f85a..93de727d5097 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -46,8 +46,7 @@ #include <unotools/streamwrap.hxx> #include <comphelper/processfactory.hxx> -namespace oox { -namespace ole { +namespace oox::ole { using ::com::sun::star::form::XFormComponent; using ::com::sun::star::awt::XControlModel; @@ -570,7 +569,6 @@ bool MSConvertOCXControls::WriteOCXStream( const Reference< XModel >& rxModel, t return true; } -} // namespace ole } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx index cb909592f9b2..b7377d073e5d 100644 --- a/oox/source/ole/oleobjecthelper.cxx +++ b/oox/source/ole/oleobjecthelper.cxx @@ -34,8 +34,7 @@ #include <oox/helper/propertymap.hxx> #include <oox/token/properties.hxx> -namespace oox { -namespace ole { +namespace oox::ole { using namespace ::com::sun::star; using namespace ::com::sun::star::container; @@ -174,7 +173,6 @@ bool OleObjectHelper::importOleObject( PropertyMap& rPropMap, const OleObjectInf return bRet; } -} // namespace ole } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx index c53f252554d9..39482fef013f 100644 --- a/oox/source/ole/olestorage.cxx +++ b/oox/source/ole/olestorage.cxx @@ -38,8 +38,7 @@ #include <oox/helper/containerhelper.hxx> #include <oox/helper/helper.hxx> -namespace oox { -namespace ole { +namespace oox::ole { using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; @@ -378,7 +377,6 @@ void OleStorage::implCommit() const } } -} // namespace ole } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx index da61e818c149..7ea5482e1e72 100644 --- a/oox/source/ole/vbacontrol.cxx +++ b/oox/source/ole/vbacontrol.cxx @@ -43,8 +43,7 @@ #include <oox/token/tokens.hxx> #include <unordered_map> -namespace oox { -namespace ole { +namespace oox::ole { using namespace ::com::sun::star::awt; using namespace ::com::sun::star::container; @@ -863,7 +862,6 @@ void VbaUserForm::importForm( const Reference< XNameContainer >& rxDialogLib, } } -} // namespace ole } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/vbahelper.cxx b/oox/source/ole/vbahelper.cxx index 0869b2d05f44..477405ecf35d 100644 --- a/oox/source/ole/vbahelper.cxx +++ b/oox/source/ole/vbahelper.cxx @@ -22,8 +22,7 @@ #include <osl/diagnose.h> #include <oox/helper/binaryinputstream.hxx> -namespace oox { -namespace ole { +namespace oox::ole { using namespace ::com::sun::star::uno; @@ -55,7 +54,6 @@ bool VbaHelper::extractKeyValue( OUString& rKey, OUString& rValue, const OUStrin return false; } -} // namespace ole } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/vbainputstream.cxx b/oox/source/ole/vbainputstream.cxx index d00a02f32d7e..ae2ba98fa983 100644 --- a/oox/source/ole/vbainputstream.cxx +++ b/oox/source/ole/vbainputstream.cxx @@ -20,8 +20,7 @@ #include <oox/ole/vbainputstream.hxx> #include <osl/diagnose.h> -namespace oox { -namespace ole { +namespace oox::ole { namespace { @@ -204,7 +203,6 @@ bool VbaInputStream::updateChunk() return !mbEof; } -} // namespace ole } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx index 82a368934794..b96e6f444a0a 100644 --- a/oox/source/ole/vbamodule.cxx +++ b/oox/source/ole/vbamodule.cxx @@ -33,8 +33,7 @@ #include <oox/ole/vbahelper.hxx> #include <oox/ole/vbainputstream.hxx> -namespace oox { -namespace ole { +namespace oox::ole { using namespace ::com::sun::star::lang; using namespace ::com::sun::star::script::vba; @@ -335,7 +334,6 @@ void VbaModule::createModule( const OUString& rVBASourceCode, } } -} // namespace ole } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index bf31f2a2350f..d53fa0780e0c 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -48,8 +48,7 @@ #include <oox/ole/vbamodule.hxx> #include <oox/token/properties.hxx> -namespace oox { -namespace ole { +namespace oox::ole { using namespace ::com::sun::star; using namespace ::com::sun::star::container; @@ -552,7 +551,6 @@ void VbaProject::copyStorage( StorageBase& rVbaPrjStrg ) } } -} // namespace ole } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/animationspersist.cxx b/oox/source/ppt/animationspersist.cxx index c9215a90980e..baae105d5d6d 100644 --- a/oox/source/ppt/animationspersist.cxx +++ b/oox/source/ppt/animationspersist.cxx @@ -75,7 +75,7 @@ Any addToSequence( const Any& rOldValue, const Any& rNewValue ) } // namespace oox -namespace oox { namespace ppt { +namespace oox::ppt { void ShapeTargetElement::convert( css::uno::Any & rTarget, sal_Int16 & rSubType ) const { @@ -218,6 +218,6 @@ namespace oox { namespace ppt { return aAny; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/animationtypes.cxx b/oox/source/ppt/animationtypes.cxx index 98ffee85cd9e..c3fa2b53ebd0 100644 --- a/oox/source/ppt/animationtypes.cxx +++ b/oox/source/ppt/animationtypes.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::animations; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace ppt { +namespace oox::ppt { // ST_TLTime Any GetTime( const OUString & val ) @@ -59,6 +59,6 @@ Any GetTimeAnimateValueTime( const OUString & val ) return aPercent; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/animvariantcontext.cxx b/oox/source/ppt/animvariantcontext.cxx index 81a70acfe26e..d4185a337bd5 100644 --- a/oox/source/ppt/animvariantcontext.cxx +++ b/oox/source/ppt/animvariantcontext.cxx @@ -37,7 +37,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace ppt { +namespace oox::ppt { AnimVariantContext::AnimVariantContext( FragmentHandler2 const & rParent, sal_Int32 aElement, Any & aValue ) : FragmentHandler2( rParent ) , mnElement( aElement ) @@ -95,6 +95,6 @@ namespace oox { namespace ppt { return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/backgroundproperties.cxx b/oox/source/ppt/backgroundproperties.cxx index e6051de5d2ad..75524ec5e6fb 100644 --- a/oox/source/ppt/backgroundproperties.cxx +++ b/oox/source/ppt/backgroundproperties.cxx @@ -28,7 +28,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace ppt { +namespace oox::ppt { BackgroundPropertiesContext::BackgroundPropertiesContext( FragmentHandler2 const & rParent, ::oox::drawingml::FillProperties& rFillProperties ) : FragmentHandler2( rParent ) @@ -47,6 +47,6 @@ BackgroundPropertiesContext::BackgroundPropertiesContext( FragmentHandler2 const return ::oox::drawingml::FillPropertiesContext::createFillContext( *this, aElementToken, rAttribs, mrFillProperties ).get(); } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/buildlistcontext.cxx b/oox/source/ppt/buildlistcontext.cxx index ae38a0e09ee3..495eb83b97bf 100644 --- a/oox/source/ppt/buildlistcontext.cxx +++ b/oox/source/ppt/buildlistcontext.cxx @@ -23,7 +23,7 @@ #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> -namespace oox { namespace ppt { +namespace oox::ppt { BuildListContext::BuildListContext( FragmentHandler2 const & rParent ) : FragmentHandler2( rParent ) @@ -81,6 +81,6 @@ namespace oox { namespace ppt { return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/comments.cxx b/oox/source/ppt/comments.cxx index 483a2a8f0d4d..810ac57eb755 100644 --- a/oox/source/ppt/comments.cxx +++ b/oox/source/ppt/comments.cxx @@ -11,7 +11,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <rtl/math.hxx> -namespace oox { namespace ppt { +namespace oox::ppt { void CommentAuthorList::setValues(const CommentAuthorList& list) { @@ -81,6 +81,6 @@ const Comment& CommentList::getCommentAtIndex (int index) ; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx index 3112e084f8a6..ae3c12598a9e 100644 --- a/oox/source/ppt/commonbehaviorcontext.cxx +++ b/oox/source/ppt/commonbehaviorcontext.cxx @@ -37,7 +37,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace ppt { +namespace oox::ppt { CommonBehaviorContext::CommonBehaviorContext( FragmentHandler2 const & rParent, const TimeNodePtr & pNode) @@ -143,6 +143,6 @@ namespace oox { namespace ppt { return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx index dc1d1b4a901c..faf4b2d8afca 100644 --- a/oox/source/ppt/commontimenodecontext.cxx +++ b/oox/source/ppt/commontimenodecontext.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace ppt { +namespace oox::ppt { const convert_subtype* convert_subtype::getList() { @@ -666,6 +666,6 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/conditioncontext.cxx b/oox/source/ppt/conditioncontext.cxx index f32f8c490c5c..77996aacfee9 100644 --- a/oox/source/ppt/conditioncontext.cxx +++ b/oox/source/ppt/conditioncontext.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::animations; -namespace oox { namespace ppt { +namespace oox::ppt { CondContext::CondContext( FragmentHandler2 const & rParent, const Reference< XFastAttributeList >& xAttribs, const TimeNodePtr & pNode, AnimationCondition & aValue ) @@ -179,6 +179,6 @@ namespace oox { namespace ppt { return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx index 3be796d639d9..174ca1bbe91a 100644 --- a/oox/source/ppt/customshowlistcontext.cxx +++ b/oox/source/ppt/customshowlistcontext.cxx @@ -27,7 +27,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace ppt { +namespace oox::ppt { namespace { @@ -97,6 +97,6 @@ CustomShowListContext::~CustomShowListContext( ) return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx b/oox/source/ppt/extdrawingfragmenthandler.cxx index cf8d8e50ed3c..86d65c61c3a4 100644 --- a/oox/source/ppt/extdrawingfragmenthandler.cxx +++ b/oox/source/ppt/extdrawingfragmenthandler.cxx @@ -17,7 +17,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::uno; -namespace oox { namespace ppt { +namespace oox::ppt { ExtDrawingFragmentHandler::ExtDrawingFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, @@ -59,6 +59,6 @@ ExtDrawingFragmentHandler::onCreateContext( ::sal_Int32 aElement, return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/headerfootercontext.cxx b/oox/source/ppt/headerfootercontext.cxx index 42944819c279..2a51fdafd4cd 100644 --- a/oox/source/ppt/headerfootercontext.cxx +++ b/oox/source/ppt/headerfootercontext.cxx @@ -25,7 +25,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace ppt { +namespace oox::ppt { HeaderFooterContext::HeaderFooterContext( FragmentHandler2 const & rParent, const AttributeList& rAttribs, HeaderFooter& rHeaderFooter ) @@ -53,6 +53,6 @@ namespace oox { namespace ppt { { } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/layoutfragmenthandler.cxx b/oox/source/ppt/layoutfragmenthandler.cxx index a405e13a0cdd..626af14203a4 100644 --- a/oox/source/ppt/layoutfragmenthandler.cxx +++ b/oox/source/ppt/layoutfragmenthandler.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::container; -namespace oox { namespace ppt { +namespace oox::ppt { // CT_SlideLayout @@ -74,6 +74,6 @@ ContextHandlerRef LayoutFragmentHandler::onCreateContext( sal_Int32 aElementToke return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/pptfilterhelpers.cxx b/oox/source/ppt/pptfilterhelpers.cxx index c794cdba297a..20be11f77e21 100644 --- a/oox/source/ppt/pptfilterhelpers.cxx +++ b/oox/source/ppt/pptfilterhelpers.cxx @@ -44,7 +44,7 @@ namespace { } } -namespace oox { namespace ppt { +namespace oox::ppt { const ImplAttributeNameConversion *getAttributeConversionList() { @@ -415,6 +415,6 @@ namespace oox { namespace ppt { return bRet; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx index f40e6468ba9c..94638e2e5070 100644 --- a/oox/source/ppt/pptgraphicshapecontext.cxx +++ b/oox/source/ppt/pptgraphicshapecontext.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::text; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace ppt { +namespace oox::ppt { // CT_Shape PPTGraphicShapeContext::PPTGraphicShapeContext( ContextHandler2Helper const & rParent, const SlidePersistPtr& rSlidePersistPtr, const oox::drawingml::ShapePtr& pMasterShapePtr, const oox::drawingml::ShapePtr& pShapePtr ) @@ -193,6 +193,6 @@ ContextHandlerRef PPTGraphicShapeContext::onCreateContext( sal_Int32 aElementTok return GraphicShapeContext::onCreateContext( aElementToken, rAttribs ); } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index 01f572a54dcf..184d0e5b5976 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -52,7 +52,7 @@ using namespace oox::core; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::lang::XComponent; -namespace oox { namespace ppt { +namespace oox::ppt { #if OSL_DEBUG_LEVEL > 0 XmlFilterBase* PowerPointImport::mpDebugFilterBase = nullptr; @@ -326,7 +326,7 @@ OUString PowerPointImport::getImplementationName() return "com.sun.star.comp.oox.ppt.PowerPointImport"; } -}} +} extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_oox_ppt_PowerPointImport_get_implementation( diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index 9b4f93378ef0..e9610112e5ee 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::text; using namespace ::com::sun::star::drawing; -namespace oox { namespace ppt { +namespace oox::ppt { PPTShape::PPTShape( const oox::ppt::ShapeLocation eShapeLocation, const char* pServiceName ) : Shape( pServiceName ) @@ -510,6 +510,6 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholderByIndex( const sal_Int32 nIdx, return aShapePtr; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx index c0c81effba0c..fd9ccfba5f8c 100644 --- a/oox/source/ppt/pptshapecontext.cxx +++ b/oox/source/ppt/pptshapecontext.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::text; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace ppt { +namespace oox::ppt { // CT_Shape PPTShapeContext::PPTShapeContext( ContextHandler2Helper const & rParent, const SlidePersistPtr& rSlidePersistPtr, const oox::drawingml::ShapePtr& pMasterShapePtr, const oox::drawingml::ShapePtr& pShapePtr ) @@ -186,6 +186,6 @@ ContextHandlerRef PPTShapeContext::onCreateContext( sal_Int32 aElementToken, con return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx index b445a3eec703..8990a12bd3fa 100644 --- a/oox/source/ppt/pptshapegroupcontext.cxx +++ b/oox/source/ppt/pptshapegroupcontext.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::text; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace ppt { +namespace oox::ppt { PPTShapeGroupContext::PPTShapeGroupContext( FragmentHandler2 const & rParent, @@ -178,6 +178,6 @@ void PPTShapeGroupContext::applyFontRefColor(const oox::drawingml::ShapePtr& pSh } } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/pptshapepropertiescontext.cxx b/oox/source/ppt/pptshapepropertiescontext.cxx index b2dfcbce8980..31ea812a1886 100644 --- a/oox/source/ppt/pptshapepropertiescontext.cxx +++ b/oox/source/ppt/pptshapepropertiescontext.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::text; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace ppt { +namespace oox::ppt { // CT_Shape PPTShapePropertiesContext::PPTShapePropertiesContext( ContextHandler2Helper const & rParent, ::oox::drawingml::Shape& rShape ) @@ -65,6 +65,6 @@ ContextHandlerRef PPTShapePropertiesContext::onCreateContext( sal_Int32 aElement } } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/presPropsfragmenthandler.cxx b/oox/source/ppt/presPropsfragmenthandler.cxx index effee38dfaa0..48d0dbc2d891 100644 --- a/oox/source/ppt/presPropsfragmenthandler.cxx +++ b/oox/source/ppt/presPropsfragmenthandler.cxx @@ -15,9 +15,7 @@ #include <oox/ppt/presPropsfragmenthandler.hxx> #include <oox/token/namespaces.hxx> -namespace oox -{ -namespace ppt +namespace oox::ppt { PresPropsFragmentHandler::PresPropsFragmentHandler(core::XmlFilterBase& rFilter, const OUString& rFragmentPath) @@ -49,7 +47,6 @@ core::ContextHandlerRef PresPropsFragmentHandler::onCreateContext(sal_Int32 aEle } return this; } -} // namespace ppt } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index 2c423faedbc2..63ac3ee10953 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -64,7 +64,7 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace ppt { +namespace oox::ppt { static std::map<PredefinedClrSchemeId, sal_Int32> PredefinedClrTokens = { @@ -615,6 +615,6 @@ void PresentationFragmentHandler::importSlide( const FragmentHandlerRef& rxSlide getFilter().importFragment( rxSlideFragmentHandler ); } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index 3257c31bfdde..a0872d365b5f 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::container; -namespace oox { namespace ppt { +namespace oox::ppt { SlideFragmentHandler::SlideFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, const SlidePersistPtr& pPersistPtr, const ShapeLocation eShapeLocation ) : FragmentHandler2( rFilter, rFragmentPath ) @@ -254,6 +254,6 @@ void SlideFragmentHandler::finalizeImport() } } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/slidemastertextstylescontext.cxx b/oox/source/ppt/slidemastertextstylescontext.cxx index 0b0bbecefe6e..f3b041fcb894 100644 --- a/oox/source/ppt/slidemastertextstylescontext.cxx +++ b/oox/source/ppt/slidemastertextstylescontext.cxx @@ -27,7 +27,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace ppt { +namespace oox::ppt { SlideMasterTextStylesContext::SlideMasterTextStylesContext( FragmentHandler2 const & rParent, SlidePersistPtr const & pSlidePersistPtr ) : FragmentHandler2( rParent ) @@ -75,6 +75,6 @@ SlideMasterTextStylesContext::~SlideMasterTextStylesContext() return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx index f8bd76846404..f9ee8ef91d5b 100644 --- a/oox/source/ppt/slidepersist.cxx +++ b/oox/source/ppt/slidepersist.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::container; using namespace ::com::sun::star::animations; -namespace oox { namespace ppt { +namespace oox::ppt { SlidePersist::SlidePersist( XmlFilterBase& rFilter, bool bMaster, bool bNotes, const css::uno::Reference< css::drawing::XDrawPage >& rxPage, @@ -328,6 +328,6 @@ Reference<XAnimationNode> SlidePersist::getAnimationNode(const OUString& sId) co return aResult; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/slidetimingcontext.cxx b/oox/source/ppt/slidetimingcontext.cxx index 972454ecfaa7..dc93ae4c1c65 100644 --- a/oox/source/ppt/slidetimingcontext.cxx +++ b/oox/source/ppt/slidetimingcontext.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace ppt { +namespace oox::ppt { SlideTimingContext::SlideTimingContext( FragmentHandler2 const & rParent, TimeNodePtrList & aTimeNodeList ) throw() : FragmentHandler2( rParent ) @@ -72,6 +72,6 @@ SlideTimingContext::~SlideTimingContext() throw() } } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index 59c30b7bc1d6..721f3666bfbf 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::animations; using namespace ::com::sun::star::presentation; -namespace oox { namespace ppt { +namespace oox::ppt { SlideTransition::SlideTransition() : mnTransitionType( 0 ) @@ -453,6 +453,6 @@ namespace oox { namespace ppt { } } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/slidetransitioncontext.cxx b/oox/source/ppt/slidetransitioncontext.cxx index 32439a2ea70f..558f2f50a0f5 100644 --- a/oox/source/ppt/slidetransitioncontext.cxx +++ b/oox/source/ppt/slidetransitioncontext.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::container; -namespace oox { namespace ppt { +namespace oox::ppt { SlideTransitionContext::SlideTransitionContext( FragmentHandler2 const & rParent, const AttributeList& rAttribs, PropertyMap & aProperties ) throw() : FragmentHandler2( rParent ) @@ -196,6 +196,6 @@ void SlideTransitionContext::onEndElement() } } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx index 06d416982e25..7ce2a8119c53 100644 --- a/oox/source/ppt/soundactioncontext.cxx +++ b/oox/source/ppt/soundactioncontext.cxx @@ -38,7 +38,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::uno; -namespace oox { namespace ppt { +namespace oox::ppt { SoundActionContext::SoundActionContext( FragmentHandler2 const & rParent, PropertyMap & aProperties ) throw() : FragmentHandler2( rParent ) @@ -106,6 +106,6 @@ namespace oox { namespace ppt { return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/timeanimvaluecontext.cxx b/oox/source/ppt/timeanimvaluecontext.cxx index cf020ca62b4a..e81f4967af72 100644 --- a/oox/source/ppt/timeanimvaluecontext.cxx +++ b/oox/source/ppt/timeanimvaluecontext.cxx @@ -29,7 +29,7 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -namespace oox { namespace ppt { +namespace oox::ppt { TimeAnimValueListContext::TimeAnimValueListContext( FragmentHandler2 const & rParent, TimeAnimationValueList & aTavList ) @@ -79,6 +79,6 @@ namespace oox { namespace ppt { return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx index 3c59b54c9cdc..928f52053a87 100644 --- a/oox/source/ppt/timenode.cxx +++ b/oox/source/ppt/timenode.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::animations; using namespace ::com::sun::star::presentation; -namespace oox { namespace ppt { +namespace oox::ppt { OUString TimeNode::getServiceName( sal_Int16 nNodeType ) { @@ -626,6 +626,6 @@ namespace oox { namespace ppt { maNodeProperties[ NP_BY ] = aBy; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 1a69bb97a729..a50ac20fcb48 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -96,7 +96,7 @@ namespace { } } -namespace oox { namespace ppt { +namespace oox::ppt { namespace { @@ -1036,6 +1036,6 @@ namespace oox { namespace ppt { return pContext ? pContext : this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx index ab524c513e58..266c46fdaf72 100644 --- a/oox/source/ppt/timetargetelementcontext.cxx +++ b/oox/source/ppt/timetargetelementcontext.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::oox::core; -namespace oox { namespace ppt { +namespace oox::ppt { namespace { @@ -164,6 +164,6 @@ namespace oox { namespace ppt { return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/shape/LockedCanvasContext.cxx b/oox/source/shape/LockedCanvasContext.cxx index faf9644a1e37..ad6c9a7ea48f 100644 --- a/oox/source/shape/LockedCanvasContext.cxx +++ b/oox/source/shape/LockedCanvasContext.cxx @@ -18,9 +18,7 @@ using namespace com::sun::star; -namespace oox -{ -namespace shape +namespace oox::shape { LockedCanvasContext::LockedCanvasContext(FragmentHandler2 const& rParent) @@ -60,6 +58,5 @@ LockedCanvasContext::~LockedCanvasContext() = default; } } -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index f0dfae3366ab..b42669490bd2 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; -namespace oox { namespace shape { +namespace oox::shape { using namespace core; using namespace drawingml; @@ -608,7 +608,7 @@ sal_Bool SAL_CALL ShapeContextHandler::supportsService(const OUString & ServiceN return cppu::supportsService(this, ServiceName); } -}} +} extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_oox_ShapeContextHandler_get_implementation( diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.cxx b/oox/source/shape/ShapeDrawingFragmentHandler.cxx index b26bbd7f992a..895e26eb482b 100644 --- a/oox/source/shape/ShapeDrawingFragmentHandler.cxx +++ b/oox/source/shape/ShapeDrawingFragmentHandler.cxx @@ -14,7 +14,7 @@ using namespace com::sun::star; -namespace oox { namespace shape { +namespace oox::shape { ShapeDrawingFragmentHandler::ShapeDrawingFragmentHandler(oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr const & pGroupShapePtr) : FragmentHandler2(rFilter, rFragmentPath) @@ -43,6 +43,6 @@ void SAL_CALL ShapeDrawingFragmentHandler::endDocument() return this; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/shape/ShapeFilterBase.cxx b/oox/source/shape/ShapeFilterBase.cxx index 6f96395c2806..6bc9babac5cf 100644 --- a/oox/source/shape/ShapeFilterBase.cxx +++ b/oox/source/shape/ShapeFilterBase.cxx @@ -27,8 +27,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/xml/sax/XFastSAXSerializable.hpp> -namespace oox { -namespace shape { +namespace oox::shape { using namespace ::com::sun::star; @@ -141,6 +140,5 @@ void ShapeFilterBase::importTheme() } } -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx index 36fb5cb976c0..01484c50c361 100644 --- a/oox/source/shape/WpgContext.cxx +++ b/oox/source/shape/WpgContext.cxx @@ -18,9 +18,7 @@ using namespace com::sun::star; -namespace oox -{ -namespace shape +namespace oox::shape { WpgContext::WpgContext(FragmentHandler2 const& rParent) @@ -70,6 +68,5 @@ oox::core::ContextHandlerRef WpgContext::onCreateContext(sal_Int32 nElementToken } } -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx index 863621b3931c..28c0a1f7cafc 100644 --- a/oox/source/shape/WpsContext.cxx +++ b/oox/source/shape/WpsContext.cxx @@ -29,9 +29,7 @@ using namespace com::sun::star; -namespace oox -{ -namespace shape +namespace oox::shape { WpsContext::WpsContext(ContextHandler2Helper const& rParent, uno::Reference<drawing::XShape> xShape, const drawingml::ShapePtr& pMasterShapePtr, @@ -236,6 +234,5 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken return nullptr; } } -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx index 16e08c0e15a2..058ee5c91815 100644 --- a/oox/source/vml/vmldrawing.cxx +++ b/oox/source/vml/vmldrawing.cxx @@ -38,8 +38,7 @@ #include <tools/diagnose_ex.h> #include <tools/gen.hxx> -namespace oox { -namespace vml { +namespace oox::vml { using namespace ::com::sun::star; using namespace ::com::sun::star::awt; @@ -338,7 +337,6 @@ void Drawing::notifyXShapeInserted( const Reference< XShape >& /*rxShape*/, { } -} // namespace vml } // namespave oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/vml/vmldrawingfragment.cxx b/oox/source/vml/vmldrawingfragment.cxx index ed47e1446b4d..d56177ffdda6 100644 --- a/oox/source/vml/vmldrawingfragment.cxx +++ b/oox/source/vml/vmldrawingfragment.cxx @@ -26,8 +26,7 @@ #include <oox/vml/vmlinputstream.hxx> #include <oox/vml/vmlshapecontext.hxx> -namespace oox { -namespace vml { +namespace oox::vml { using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; @@ -78,7 +77,6 @@ void DrawingFragment::finalizeImport() mrDrawing.finalizeFragmentImport(); } -} // namespace vml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx index 3d1d10e16fc2..de01cbab22b3 100644 --- a/oox/source/vml/vmlformatting.cxx +++ b/oox/source/vml/vmlformatting.cxx @@ -45,8 +45,7 @@ #include <comphelper/propertysequence.hxx> #include <vcl/virdev.hxx> -namespace oox { -namespace vml { +namespace oox::vml { using namespace ::com::sun::star; using namespace ::com::sun::star::geometry; @@ -982,7 +981,6 @@ void TextpathModel::pushToPropMap(ShapePropertyMap& rPropMap, const uno::Referen } } -} // namespace vml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx index c2ab0fa2d914..2b8b97ca6ff7 100644 --- a/oox/source/vml/vmlinputstream.cxx +++ b/oox/source/vml/vmlinputstream.cxx @@ -28,8 +28,7 @@ #include <oox/helper/helper.hxx> #include <oox/helper/textinputstream.hxx> -namespace oox { -namespace vml { +namespace oox::vml { using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; @@ -392,7 +391,6 @@ OString InputStream::readToElementEnd() return aText; } -} // namespace vml } // namespave oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index b928638954c4..15972cd0ff08 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -87,8 +87,7 @@ using ::com::sun::star::uno::Any; using namespace ::com::sun::star; using namespace ::com::sun::star::text; -namespace oox { -namespace vml { +namespace oox::vml { using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::graphic; @@ -1435,7 +1434,6 @@ Reference< XShape > GroupShape::implConvertAndInsert( const Reference< XShapes > return xGroupShape; } -} // namespace vml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/vml/vmlshapecontainer.cxx b/oox/source/vml/vmlshapecontainer.cxx index 71713d3e7120..d1a155465be3 100644 --- a/oox/source/vml/vmlshapecontainer.cxx +++ b/oox/source/vml/vmlshapecontainer.cxx @@ -24,8 +24,7 @@ #include <osl/diagnose.h> -namespace oox { -namespace vml { +namespace oox::vml { using namespace ::com::sun::star::awt; using namespace ::com::sun::star::drawing; @@ -129,7 +128,6 @@ void ShapeContainer::convertAndInsert( const Reference< XShapes >& rxShapes, con shape->convertAndInsert( rxShapes, pParentAnchor ); } -} // namespace vml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx index 76953fe750e7..d82d22ec2d7f 100644 --- a/oox/source/vml/vmlshapecontext.cxx +++ b/oox/source/vml/vmlshapecontext.cxx @@ -31,8 +31,7 @@ #include <osl/diagnose.h> -namespace oox { -namespace vml { +namespace oox::vml { using namespace ::com::sun::star; @@ -604,7 +603,6 @@ ControlShapeContext::ControlShapeContext( ::oox::core::ContextHandler2Helper con rShapes.getDrawing().registerControl(aInfo); } -} // namespace vml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx index f0f4a28f72d3..7713f2cdebaf 100644 --- a/oox/source/vml/vmltextbox.cxx +++ b/oox/source/vml/vmltextbox.cxx @@ -31,8 +31,7 @@ #include <comphelper/sequence.hxx> #include <comphelper/sequenceashashmap.hxx> -namespace oox { -namespace vml { +namespace oox::vml { using namespace com::sun::star; @@ -200,7 +199,6 @@ void TextBox::convert(const uno::Reference<drawing::XShape>& xShape) const } } -} // namespace vml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx index 5f84ca33c2c6..57f611c9eea6 100644 --- a/oox/source/vml/vmltextboxcontext.cxx +++ b/oox/source/vml/vmltextboxcontext.cxx @@ -27,8 +27,7 @@ #include <osl/diagnose.h> #include <sal/log.hxx> -namespace oox { -namespace vml { +namespace oox::vml { using ::oox::core::ContextHandler2; using ::oox::core::ContextHandler2Helper; @@ -285,7 +284,6 @@ void TextBoxContext::onEndElement() } } -} // namespace vml } // namespace oox /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |