From 1d3bec99e87c6f1e083f36bc1906839025d640df Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 19 Jul 2020 18:46:31 +0200 Subject: compact namespace: sc Change-Id: I70e518a219a72cfc4ff4cdb7b7b60e1732e4aaa1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99005 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sc/source/core/inc/webservicelink.hxx | 12 ++---------- sc/source/filter/inc/autofiltercontext.hxx | 6 ++---- sc/source/filter/inc/biffhelper.hxx | 6 ++---- sc/source/filter/inc/chartsheetfragment.hxx | 6 ++---- sc/source/filter/inc/commentsbuffer.hxx | 6 ++---- sc/source/filter/inc/commentsfragment.hxx | 6 ++---- sc/source/filter/inc/condformatbuffer.hxx | 6 ++---- sc/source/filter/inc/condformatcontext.hxx | 6 ++---- sc/source/filter/inc/connectionsbuffer.hxx | 6 ++---- sc/source/filter/inc/connectionsfragment.hxx | 6 ++---- sc/source/filter/inc/defnamesbuffer.hxx | 6 ++---- sc/source/filter/inc/drawingbase.hxx | 6 ++---- sc/source/filter/inc/drawingfragment.hxx | 6 ++---- sc/source/filter/inc/excelchartconverter.hxx | 6 ++---- sc/source/filter/inc/excelfilter.hxx | 6 ++---- sc/source/filter/inc/excelhandlers.hxx | 6 ++---- sc/source/filter/inc/excelvbaproject.hxx | 6 ++---- sc/source/filter/inc/externallinkbuffer.hxx | 6 ++---- sc/source/filter/inc/externallinkfragment.hxx | 6 ++---- sc/source/filter/inc/extlstcontext.hxx | 6 ++---- sc/source/filter/inc/formulabase.hxx | 6 ++---- sc/source/filter/inc/formulaparser.hxx | 6 ++---- sc/source/filter/inc/numberformatsbuffer.hxx | 6 ++---- sc/source/filter/inc/ooxformulaparser.hxx | 6 ++---- sc/source/filter/inc/pagesettings.hxx | 6 ++---- sc/source/filter/inc/pivotcachebuffer.hxx | 6 ++---- sc/source/filter/inc/pivotcachefragment.hxx | 6 ++---- sc/source/filter/inc/pivottablebuffer.hxx | 6 ++---- sc/source/filter/inc/pivottablefragment.hxx | 6 ++---- sc/source/filter/inc/querytablebuffer.hxx | 6 ++---- sc/source/filter/inc/querytablefragment.hxx | 6 ++---- sc/source/filter/inc/richstring.hxx | 6 ++---- sc/source/filter/inc/richstringcontext.hxx | 6 ++---- sc/source/filter/inc/scenariobuffer.hxx | 6 ++---- sc/source/filter/inc/scenariocontext.hxx | 6 ++---- sc/source/filter/inc/sharedstringsbuffer.hxx | 6 ++---- sc/source/filter/inc/sharedstringsfragment.hxx | 6 ++---- sc/source/filter/inc/sheetdatabuffer.hxx | 6 ++---- sc/source/filter/inc/sheetdatacontext.hxx | 6 ++---- sc/source/filter/inc/stylesbuffer.hxx | 6 ++---- sc/source/filter/inc/stylesfragment.hxx | 6 ++---- sc/source/filter/inc/tablebuffer.hxx | 6 ++---- sc/source/filter/inc/tablecolumnsbuffer.hxx | 6 ++---- sc/source/filter/inc/tablecolumnscontext.hxx | 6 ++---- sc/source/filter/inc/tablefragment.hxx | 6 ++---- sc/source/filter/inc/themebuffer.hxx | 6 ++---- sc/source/filter/inc/unitconverter.hxx | 6 ++---- sc/source/filter/inc/viewsettings.hxx | 6 ++---- sc/source/filter/inc/workbookfragment.hxx | 6 ++---- sc/source/filter/inc/workbookhelper.hxx | 6 ++---- sc/source/filter/inc/workbooksettings.hxx | 6 ++---- sc/source/filter/inc/worksheetbuffer.hxx | 6 ++---- sc/source/filter/inc/worksheetfragment.hxx | 6 ++---- sc/source/filter/inc/worksheethelper.hxx | 6 ++---- sc/source/filter/inc/worksheetsettings.hxx | 6 ++---- sc/source/ui/inc/condformatdlgentry.hxx | 6 +----- sc/source/ui/inc/condformatdlgitem.hxx | 6 +----- sc/source/ui/vba/excelvbahelper.hxx | 8 ++------ sc/source/ui/vba/helperdecl.hxx | 3 +-- 59 files changed, 115 insertions(+), 244 deletions(-) (limited to 'sc/source') diff --git a/sc/source/core/inc/webservicelink.hxx b/sc/source/core/inc/webservicelink.hxx index 215a5ddb903e..2bcc64f8c268 100644 --- a/sc/source/core/inc/webservicelink.hxx +++ b/sc/source/core/inc/webservicelink.hxx @@ -13,19 +13,11 @@ #include #include -namespace com -{ -namespace sun -{ -namespace star -{ -namespace uno +namespace com::sun::star::uno { class Any; } -} -} -} + class ScDocument; class ScWebServiceLink : public ::sfx2::SvBaseLink, public SvtBroadcaster diff --git a/sc/source/filter/inc/autofiltercontext.hxx b/sc/source/filter/inc/autofiltercontext.hxx index 9a58a8a998e0..1890e41f60ae 100644 --- a/sc/source/filter/inc/autofiltercontext.hxx +++ b/sc/source/filter/inc/autofiltercontext.hxx @@ -22,8 +22,7 @@ #include "excelhandlers.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class AutoFilter; class FilterColumn; @@ -77,8 +76,7 @@ private: AutoFilter& mrAutoFilter; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/biffhelper.hxx b/sc/source/filter/inc/biffhelper.hxx index 9da559a23995..38e1d0438f32 100644 --- a/sc/source/filter/inc/biffhelper.hxx +++ b/sc/source/filter/inc/biffhelper.hxx @@ -25,8 +25,7 @@ namespace oox { class SequenceInputStream; } -namespace oox { -namespace xls { +namespace oox::xls { // BIFF12 record identifiers ================================================== @@ -618,8 +617,7 @@ inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, OUString& or return rStrm; } -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/chartsheetfragment.hxx b/sc/source/filter/inc/chartsheetfragment.hxx index f15a94bc4049..82615cf69f4d 100644 --- a/sc/source/filter/inc/chartsheetfragment.hxx +++ b/sc/source/filter/inc/chartsheetfragment.hxx @@ -22,8 +22,7 @@ #include "excelhandlers.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class ChartsheetFragment : public WorksheetFragmentBase { @@ -49,8 +48,7 @@ private: void importDrawing( SequenceInputStream& rStrm ); }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx index e2d9f3255ac5..9884b164d7a6 100644 --- a/sc/source/filter/inc/commentsbuffer.hxx +++ b/sc/source/filter/inc/commentsbuffer.hxx @@ -24,8 +24,7 @@ #include "worksheethelper.hxx" #include -namespace oox { -namespace xls { +namespace oox::xls { struct CommentModel { @@ -88,8 +87,7 @@ private: CommentVector maComments; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/commentsfragment.hxx b/sc/source/filter/inc/commentsfragment.hxx index 778938a4b6a4..5b706c2275e0 100644 --- a/sc/source/filter/inc/commentsfragment.hxx +++ b/sc/source/filter/inc/commentsfragment.hxx @@ -23,8 +23,7 @@ #include "commentsbuffer.hxx" #include "excelhandlers.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class CommentsFragment : public WorksheetFragmentBase { @@ -52,8 +51,7 @@ private: CommentRef mxComment; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index f3c750afb525..6ce5b7f654c2 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -36,8 +36,7 @@ struct ScIconSetFormatData; namespace oox { class AttributeList; } -namespace oox { -namespace xls { +namespace oox::xls { class CondFormat; @@ -318,8 +317,7 @@ private: sal_Int32 mnNonPrioritizedRuleNextPriority = 1048576; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/condformatcontext.hxx b/sc/source/filter/inc/condformatcontext.hxx index 71924e5ca968..af1b2178604e 100644 --- a/sc/source/filter/inc/condformatcontext.hxx +++ b/sc/source/filter/inc/condformatcontext.hxx @@ -23,8 +23,7 @@ #include "condformatbuffer.hxx" #include "excelhandlers.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class CondFormatContext; @@ -87,8 +86,7 @@ private: CondFormatRuleRef mxRule; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx index 95eec918911e..48eda5a6490d 100644 --- a/sc/source/filter/inc/connectionsbuffer.hxx +++ b/sc/source/filter/inc/connectionsbuffer.hxx @@ -27,8 +27,7 @@ namespace oox { class AttributeList; } namespace oox { class SequenceInputStream; } -namespace oox { -namespace xls { +namespace oox::xls { const sal_Int32 BIFF12_CONNECTION_UNKNOWN = 0; const sal_Int32 BIFF12_CONNECTION_ODBC = 1; @@ -157,8 +156,7 @@ private: sal_Int32 mnUnusedId; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/connectionsfragment.hxx b/sc/source/filter/inc/connectionsfragment.hxx index 9dc23c736304..e5418a7d533b 100644 --- a/sc/source/filter/inc/connectionsfragment.hxx +++ b/sc/source/filter/inc/connectionsfragment.hxx @@ -22,8 +22,7 @@ #include "excelhandlers.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class Connection; @@ -58,8 +57,7 @@ protected: virtual void finalizeImport() override; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx index 45078929e7c8..77ee38fd5ccb 100644 --- a/sc/source/filter/inc/defnamesbuffer.hxx +++ b/sc/source/filter/inc/defnamesbuffer.hxx @@ -31,8 +31,7 @@ class ScTokenArray; namespace oox { class AttributeList; } namespace oox { class SequenceInputStream; } -namespace oox { -namespace xls { +namespace oox::xls { // codes for built-in names const sal_Unicode BIFF_DEFNAME_CONSOLIDATEAREA = '\x00'; @@ -177,8 +176,7 @@ private: DefNameTokenIdMap maTokenIdMap; /// Maps all defined names by API token index. }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx index 244779eeb5ce..4f6294002dca 100644 --- a/sc/source/filter/inc/drawingbase.hxx +++ b/sc/source/filter/inc/drawingbase.hxx @@ -25,8 +25,7 @@ namespace oox { class AttributeList; } -namespace oox { -namespace xls { +namespace oox::xls { /** Absolute position in a spreadsheet (in EMUs) independent from cells. */ struct AnchorPointModel : public ::oox::drawingml::EmuPoint @@ -130,8 +129,7 @@ private: AnchorType meEditAs; /// Anchor mode as shown in the UI. }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 8d264472e2fb..de71677f41ea 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -35,8 +35,7 @@ namespace oox::ole { struct AxFontData; } -namespace oox { -namespace xls { +namespace oox::xls { // DrawingML @@ -202,8 +201,7 @@ protected: virtual void finalizeImport() override; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/excelchartconverter.hxx b/sc/source/filter/inc/excelchartconverter.hxx index 4103d19fba2d..89af4d9988b2 100644 --- a/sc/source/filter/inc/excelchartconverter.hxx +++ b/sc/source/filter/inc/excelchartconverter.hxx @@ -23,8 +23,7 @@ #include #include "workbookhelper.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class ExcelChartConverter : public ::oox::drawingml::chart::ChartConverter, public WorkbookHelper { @@ -43,8 +42,7 @@ public: const oox::drawingml::chart::DataSequenceModel& rDataSeq, const OUString& rRole ) override; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx index dfacf12502bf..b841564f2dd6 100644 --- a/sc/source/filter/inc/excelfilter.hxx +++ b/sc/source/filter/inc/excelfilter.hxx @@ -22,8 +22,7 @@ #include -namespace oox { -namespace xls { +namespace oox::xls { class WorkbookGlobals; @@ -58,8 +57,7 @@ private: WorkbookGlobals* mpBookGlob; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx index cd9f42076d80..20d0d982e43f 100644 --- a/sc/source/filter/inc/excelhandlers.hxx +++ b/sc/source/filter/inc/excelhandlers.hxx @@ -25,8 +25,7 @@ #include "workbookhelper.hxx" #include "worksheethelper.hxx" -namespace oox { -namespace xls { +namespace oox::xls { /** Context handler derived from the WorkbookHelper helper class. @@ -77,8 +76,7 @@ public: }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/excelvbaproject.hxx b/sc/source/filter/inc/excelvbaproject.hxx index 21429d264de3..0a58ff507ec6 100644 --- a/sc/source/filter/inc/excelvbaproject.hxx +++ b/sc/source/filter/inc/excelvbaproject.hxx @@ -26,8 +26,7 @@ namespace com::sun::star { namespace sheet { class XSpreadsheetDocument; } } -namespace oox { -namespace xls { +namespace oox::xls { /** Special implementation of the VBA project for the Excel filters. */ class ExcelVbaProject : public ::oox::ole::VbaProject @@ -46,8 +45,7 @@ private: mxDocument; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx index c1379ed688d7..6e2a528698dc 100644 --- a/sc/source/filter/inc/externallinkbuffer.hxx +++ b/sc/source/filter/inc/externallinkbuffer.hxx @@ -38,8 +38,7 @@ namespace oox::core { class Relations; } -namespace oox { -namespace xls { +namespace oox::xls { struct ExternalNameModel { @@ -349,8 +348,7 @@ private: bool mbUseRefSheets; /// True = use maRefSheets list (BIFF12 only). }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/externallinkfragment.hxx b/sc/source/filter/inc/externallinkfragment.hxx index e2964c961401..85a3cf8a40d9 100644 --- a/sc/source/filter/inc/externallinkfragment.hxx +++ b/sc/source/filter/inc/externallinkfragment.hxx @@ -23,8 +23,7 @@ #include "excelhandlers.hxx" #include "externallinkbuffer.hxx" -namespace oox { -namespace xls { +namespace oox::xls { /** This class implements importing the sheetData element in external sheets. @@ -96,8 +95,7 @@ private: sal_Int32 mnResultType; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/extlstcontext.hxx b/sc/source/filter/inc/extlstcontext.hxx index 4c7b697299e8..7793437a6c55 100644 --- a/sc/source/filter/inc/extlstcontext.hxx +++ b/sc/source/filter/inc/extlstcontext.hxx @@ -24,8 +24,7 @@ namespace oox { class AttributeList; } namespace oox::xls { class WorkbookFragment; } namespace oox::xls { class WorksheetFragment; } -namespace oox { -namespace xls { +namespace oox::xls { class ExtCfRuleContext : public WorksheetContextBase { @@ -134,8 +133,7 @@ protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; -} //namespace xls -} //namespace oox +} //namespace oox::xls #endif diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index 3814eba3c809..ebd10122f9ad 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -38,8 +38,7 @@ namespace oox { class SequenceInputStream; } namespace oox::xls { struct BinAddress; } class ScRangeList; -namespace oox { -namespace xls { +namespace oox::xls { // Constants ================================================================== @@ -777,8 +776,7 @@ public: bool bTrimLeadingSpaces ) const; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/formulaparser.hxx b/sc/source/filter/inc/formulaparser.hxx index a71ba98a5c7b..be759926e8a5 100644 --- a/sc/source/filter/inc/formulaparser.hxx +++ b/sc/source/filter/inc/formulaparser.hxx @@ -23,8 +23,7 @@ #include #include "formulabase.hxx" -namespace oox { -namespace xls { +namespace oox::xls { // formula finalizer ========================================================== @@ -128,8 +127,7 @@ private: ::std::unique_ptr< FormulaParserImpl > mxImpl; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx index 3e17b818f8e1..2d42b0bfb313 100644 --- a/sc/source/filter/inc/numberformatsbuffer.hxx +++ b/sc/source/filter/inc/numberformatsbuffer.hxx @@ -32,8 +32,7 @@ class SfxItemSet; namespace oox { class AttributeList; } namespace oox { class SequenceInputStream; } -namespace oox { -namespace xls { +namespace oox::xls { struct NumFmtModel { @@ -113,8 +112,7 @@ private: sal_uInt32 mnHighestId; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx index 39f7a48f51a7..8cb0e3e97351 100644 --- a/sc/source/filter/inc/ooxformulaparser.hxx +++ b/sc/source/filter/inc/ooxformulaparser.hxx @@ -28,8 +28,7 @@ namespace com::sun::star::lang { class XComponent; } -namespace oox { -namespace xls { +namespace oox::xls { class OOXMLFormulaParserImpl; @@ -86,8 +85,7 @@ private: ParserImplRef mxParserImpl; /// Implementation of import parser. }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/pagesettings.hxx b/sc/source/filter/inc/pagesettings.hxx index 59332ae62c1a..13e7eba7f779 100644 --- a/sc/source/filter/inc/pagesettings.hxx +++ b/sc/source/filter/inc/pagesettings.hxx @@ -27,8 +27,7 @@ namespace oox { class AttributeList; } namespace oox { class PropertySet; } namespace oox::core { class Relations; } -namespace oox { -namespace xls { +namespace oox::xls { class HeaderFooterParser; @@ -176,8 +175,7 @@ private: HFHelperData maFooterData; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index cd20ab9c1033..22f327a8878b 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -38,8 +38,7 @@ class ScDPSaveDimension; class ScDPObject; class DateTime; -namespace oox { -namespace xls { +namespace oox::xls { class WorksheetHelper; @@ -455,8 +454,7 @@ private: std::vector< sal_Int32 > maCacheIds; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx index ded475e4b2e8..f862edaeb85c 100644 --- a/sc/source/filter/inc/pivotcachefragment.hxx +++ b/sc/source/filter/inc/pivotcachefragment.hxx @@ -22,8 +22,7 @@ #include "excelhandlers.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class PivotCache; class PivotCacheField; @@ -88,8 +87,7 @@ private: bool mbInRecord; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index 418941bd1871..a13f3d730a24 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -30,8 +30,7 @@ namespace com::sun::star { class ScDPObject; -namespace oox { -namespace xls { +namespace oox::xls { class PivotTable; @@ -401,8 +400,7 @@ private: PivotTableVector maTables; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/pivottablefragment.hxx b/sc/source/filter/inc/pivottablefragment.hxx index 74f893b63da9..821fd74650ca 100644 --- a/sc/source/filter/inc/pivottablefragment.hxx +++ b/sc/source/filter/inc/pivottablefragment.hxx @@ -23,8 +23,7 @@ #include "excelhandlers.hxx" #include "worksheethelper.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class PivotTable; class PivotTableField; @@ -80,8 +79,7 @@ private: PivotTable& mrPivotTable; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/querytablebuffer.hxx b/sc/source/filter/inc/querytablebuffer.hxx index 82572b11b808..3a9931762a15 100644 --- a/sc/source/filter/inc/querytablebuffer.hxx +++ b/sc/source/filter/inc/querytablebuffer.hxx @@ -23,8 +23,7 @@ #include "stylesbuffer.hxx" #include "worksheethelper.hxx" -namespace oox { -namespace xls { +namespace oox::xls { struct QueryTableModel : public AutoFormatModel { @@ -80,8 +79,7 @@ private: QueryTableVector maQueryTables; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/querytablefragment.hxx b/sc/source/filter/inc/querytablefragment.hxx index 10d60242f0b2..12ba56b16d26 100644 --- a/sc/source/filter/inc/querytablefragment.hxx +++ b/sc/source/filter/inc/querytablefragment.hxx @@ -22,8 +22,7 @@ #include "excelhandlers.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class QueryTable; @@ -44,8 +43,7 @@ private: QueryTable& mrQueryTable; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index 3db609828a86..46f564b9150a 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -33,8 +33,7 @@ namespace com::sun::star { namespace oox { class SequenceInputStream; } -namespace oox { -namespace xls { +namespace oox::xls { /** Contains text data and font attributes for a part of a rich formatted string. */ class RichStringPortion : public WorkbookHelper @@ -261,8 +260,7 @@ private: typedef std::shared_ptr< RichString > RichStringRef; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/richstringcontext.hxx b/sc/source/filter/inc/richstringcontext.hxx index 9ddd0a993f55..f0144062102c 100644 --- a/sc/source/filter/inc/richstringcontext.hxx +++ b/sc/source/filter/inc/richstringcontext.hxx @@ -24,8 +24,7 @@ #include "richstring.hxx" #include -namespace oox { -namespace xls { +namespace oox::xls { class RichStringContext : public WorkbookContextBase { @@ -52,8 +51,7 @@ RichStringContext::RichStringContext( ParentType& rParent, RichStringRef xString OSL_ENSURE( mxString, "RichStringContext::RichStringContext - missing string object" ); } -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/scenariobuffer.hxx b/sc/source/filter/inc/scenariobuffer.hxx index 66b93848d482..03591aa455a2 100644 --- a/sc/source/filter/inc/scenariobuffer.hxx +++ b/sc/source/filter/inc/scenariobuffer.hxx @@ -27,8 +27,7 @@ namespace oox { class AttributeList; } namespace oox { class SequenceInputStream; } -namespace oox { -namespace xls { +namespace oox::xls { struct ScenarioCellModel { @@ -123,8 +122,7 @@ private: SheetScenariosMap maSheetScenarios; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/scenariocontext.hxx b/sc/source/filter/inc/scenariocontext.hxx index 300e61f3f83b..e60b20d35e29 100644 --- a/sc/source/filter/inc/scenariocontext.hxx +++ b/sc/source/filter/inc/scenariocontext.hxx @@ -22,8 +22,7 @@ #include "excelhandlers.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class Scenario; class SheetScenarios; @@ -60,8 +59,7 @@ private: SheetScenarios& mrSheetScenarios; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/sharedstringsbuffer.hxx b/sc/source/filter/inc/sharedstringsbuffer.hxx index eabb6dc944f2..8cf6201656b0 100644 --- a/sc/source/filter/inc/sharedstringsbuffer.hxx +++ b/sc/source/filter/inc/sharedstringsbuffer.hxx @@ -22,8 +22,7 @@ #include "richstring.hxx" -namespace oox { -namespace xls { +namespace oox::xls { /** Collects all strings from the shared strings substream. */ class SharedStringsBuffer : public WorkbookHelper @@ -45,8 +44,7 @@ private: StringVector maStrings; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/sharedstringsfragment.hxx b/sc/source/filter/inc/sharedstringsfragment.hxx index f0cf30ae5ac1..7aa518aa29ee 100644 --- a/sc/source/filter/inc/sharedstringsfragment.hxx +++ b/sc/source/filter/inc/sharedstringsfragment.hxx @@ -22,8 +22,7 @@ #include "excelhandlers.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class SharedStringsFragment : public WorkbookFragmentBase { @@ -40,8 +39,7 @@ protected: virtual void finalizeImport() override; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index 1539b29b43ee..0ec68aad291f 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -32,8 +32,7 @@ namespace com::sun::star { namespace util { struct DateTime; } } -namespace oox { -namespace xls { +namespace oox::xls { /** Stores basic data about cell values and formatting. */ struct CellModel @@ -234,8 +233,7 @@ private: std::map< sal_Int32, std::vector< ValueRange > > maXfIdRowRangeList; /// Cached XF identifiers for a ranges of rows, we try and process rowranges with the same XF id together }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx index 562ec15abaa3..cf69c3d01b28 100644 --- a/sc/source/filter/inc/sheetdatacontext.hxx +++ b/sc/source/filter/inc/sheetdatacontext.hxx @@ -29,8 +29,7 @@ #define MULTI_THREAD_SHEET_PARSING 1 -namespace oox { -namespace xls { +namespace oox::xls { /** This class implements importing the sheetData element. @@ -121,8 +120,7 @@ private: sal_Int32 mnCol; /// column index (0-based) }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index 0541f3cda65e..f52cad55f863 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -42,8 +42,7 @@ namespace oox { class PropertySet; class PropertyMap; class AttributeList; } -namespace oox { -namespace xls { +namespace oox::xls { const sal_Int32 OOX_COLOR_WINDOWTEXT3 = 24; /// System window text color (BIFF3-BIFF4). const sal_Int32 OOX_COLOR_WINDOWBACK3 = 25; /// System window background color (BIFF3-BIFF4). @@ -886,8 +885,7 @@ private: mutable DxfStyleMap maDxfStyles; /// Maps DXF identifiers to Calc style sheet names. }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/stylesfragment.hxx b/sc/source/filter/inc/stylesfragment.hxx index c6e19dd3f723..4d65a3ea960d 100644 --- a/sc/source/filter/inc/stylesfragment.hxx +++ b/sc/source/filter/inc/stylesfragment.hxx @@ -23,8 +23,7 @@ #include "excelhandlers.hxx" #include "stylesbuffer.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class IndexedColorsContext : public WorkbookContextBase { @@ -126,8 +125,7 @@ protected: virtual void finalizeImport() override; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/tablebuffer.hxx b/sc/source/filter/inc/tablebuffer.hxx index af1fc6334056..d8d0d210568b 100644 --- a/sc/source/filter/inc/tablebuffer.hxx +++ b/sc/source/filter/inc/tablebuffer.hxx @@ -24,8 +24,7 @@ #include "tablecolumnsbuffer.hxx" #include "workbookhelper.hxx" -namespace oox { -namespace xls { +namespace oox::xls { struct TableModel { @@ -121,8 +120,7 @@ private: RefMap< OUString, Table > maNameTables; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/tablecolumnsbuffer.hxx b/sc/source/filter/inc/tablecolumnsbuffer.hxx index 24d5557747f8..e15ed0754f7b 100644 --- a/sc/source/filter/inc/tablecolumnsbuffer.hxx +++ b/sc/source/filter/inc/tablecolumnsbuffer.hxx @@ -27,8 +27,7 @@ namespace oox { class AttributeList; } namespace oox { class SequenceInputStream; } class ScDBData; -namespace oox { -namespace xls { +namespace oox::xls { /** A column in a table (database range). */ @@ -93,8 +92,7 @@ private: TableColumnsVector maTableColumnsVector; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/tablecolumnscontext.hxx b/sc/source/filter/inc/tablecolumnscontext.hxx index 8d25ce9e28b5..6c9cb3949567 100644 --- a/sc/source/filter/inc/tablecolumnscontext.hxx +++ b/sc/source/filter/inc/tablecolumnscontext.hxx @@ -22,8 +22,7 @@ #include "excelhandlers.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class TableColumn; class TableColumns; @@ -60,8 +59,7 @@ private: TableColumns& mrTableColumns; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/tablefragment.hxx b/sc/source/filter/inc/tablefragment.hxx index 67760683d56c..ac81db9d0e2d 100644 --- a/sc/source/filter/inc/tablefragment.hxx +++ b/sc/source/filter/inc/tablefragment.hxx @@ -22,8 +22,7 @@ #include "excelhandlers.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class Table; @@ -44,8 +43,7 @@ private: Table& mrTable; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/themebuffer.hxx b/sc/source/filter/inc/themebuffer.hxx index 99771541e01f..211fa87cd7b8 100644 --- a/sc/source/filter/inc/themebuffer.hxx +++ b/sc/source/filter/inc/themebuffer.hxx @@ -25,8 +25,7 @@ #include "workbookhelper.hxx" #include "stylesbuffer.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class ThemeBuffer : public ::oox::drawingml::Theme, public WorkbookHelper { @@ -47,8 +46,7 @@ private: FontModelPtr mxDefFontModel; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/unitconverter.hxx b/sc/source/filter/inc/unitconverter.hxx index 6cfa8b7b5842..22a7c791cbe7 100644 --- a/sc/source/filter/inc/unitconverter.hxx +++ b/sc/source/filter/inc/unitconverter.hxx @@ -29,8 +29,7 @@ namespace com::sun::star { namespace util { struct Date; struct DateTime; } } -namespace oox { -namespace xls { +namespace oox::xls { /** Units supported by the UnitConverter class. */ enum class Unit @@ -100,8 +99,7 @@ private: sal_Int32 mnNullDate; /// Nulldate of this workbook (number of days since 0000-01-01). }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/viewsettings.hxx b/sc/source/filter/inc/viewsettings.hxx index af21342b9fdb..69132dd3620c 100644 --- a/sc/source/filter/inc/viewsettings.hxx +++ b/sc/source/filter/inc/viewsettings.hxx @@ -25,8 +25,7 @@ #include "worksheethelper.hxx" #include "workbookhelper.hxx" -namespace oox { -namespace xls { +namespace oox::xls { /** Contains all settings for a selection in a single pane of a sheet. */ struct PaneSelectionModel @@ -186,8 +185,7 @@ private: bool mbValidOleSize; /// True = imported OLE size is a valid cell range. }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/workbookfragment.hxx b/sc/source/filter/inc/workbookfragment.hxx index 4e22b7b9f3d4..c641424dc9e6 100644 --- a/sc/source/filter/inc/workbookfragment.hxx +++ b/sc/source/filter/inc/workbookfragment.hxx @@ -23,8 +23,7 @@ #include "defnamesbuffer.hxx" #include "excelhandlers.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class ExternalLink; @@ -61,8 +60,7 @@ private: DefinedNameRef mxCurrName; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index fdf9b41f3307..ad1018302265 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -54,8 +54,7 @@ class ScEditEngineDefaulter; class ScDBData; class ScRangeData; -namespace oox { -namespace xls { +namespace oox::xls { class ExcelFilter; @@ -267,8 +266,7 @@ private: WorkbookGlobals& mrBookGlob; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/workbooksettings.hxx b/sc/source/filter/inc/workbooksettings.hxx index 88618712410d..70ecbd3496cf 100644 --- a/sc/source/filter/inc/workbooksettings.hxx +++ b/sc/source/filter/inc/workbooksettings.hxx @@ -27,8 +27,7 @@ namespace oox { class SequenceInputStream; } namespace com::sun::star::util { struct Date; } -namespace oox { -namespace xls { +namespace oox::xls { /** Settings for workbook write protection. */ struct FileSharingModel @@ -116,8 +115,7 @@ private: CalcSettingsModel maCalcSettings; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/worksheetbuffer.hxx b/sc/source/filter/inc/worksheetbuffer.hxx index d77e05ac83f4..cb16c589acd0 100644 --- a/sc/source/filter/inc/worksheetbuffer.hxx +++ b/sc/source/filter/inc/worksheetbuffer.hxx @@ -28,8 +28,7 @@ namespace oox { class SequenceInputStream; } namespace oox { class AttributeList; } -namespace oox { -namespace xls { +namespace oox::xls { /** Contains data from the 'sheet' element describing a sheet in the workbook. */ struct SheetInfoModel @@ -105,8 +104,7 @@ private: RefMap< OUString, SheetInfo, IgnoreCaseCompare > maSheetInfosByName; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/worksheetfragment.hxx b/sc/source/filter/inc/worksheetfragment.hxx index 4993bc67f198..4faf6bff1589 100644 --- a/sc/source/filter/inc/worksheetfragment.hxx +++ b/sc/source/filter/inc/worksheetfragment.hxx @@ -23,8 +23,7 @@ #include #include "excelhandlers.hxx" -namespace oox { -namespace xls { +namespace oox::xls { class DataValidationsContextBase { @@ -179,8 +178,7 @@ private: void importEmbeddedOleData( StreamDataSequence& orEmbeddedData, const OUString& rRelId ); }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index 55e8dd1c2171..eb4e1e32a58d 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -39,8 +39,7 @@ namespace com::sun::star { namespace table { class XCellRange; } } -namespace oox { -namespace xls { +namespace oox::xls { class AutoFilterBuffer; class CommentsBuffer; @@ -302,8 +301,7 @@ private: WorksheetGlobals& mrSheetGlob; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/filter/inc/worksheetsettings.hxx b/sc/source/filter/inc/worksheetsettings.hxx index 46e19ee15f6c..3f382ba74daf 100644 --- a/sc/source/filter/inc/worksheetsettings.hxx +++ b/sc/source/filter/inc/worksheetsettings.hxx @@ -24,8 +24,7 @@ #include "worksheethelper.hxx" #include -namespace oox { -namespace xls { +namespace oox::xls { /** Sheet and outline settings. */ struct SheetSettingsModel @@ -112,8 +111,7 @@ private: SheetProtectionModel maSheetProt; }; -} // namespace xls -} // namespace oox +} // namespace oox::xls #endif diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 7110115355d6..9f868d8e849b 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -25,9 +25,7 @@ class ScDataBarFormat; class ScIconSetFormat; struct ScDataBarFormatData; -namespace condformat { - -namespace entry { +namespace condformat::entry { enum ScCondFrmtEntryType { @@ -42,8 +40,6 @@ enum ScCondFrmtEntryType } -} - class ScCondFrmtEntry { protected: diff --git a/sc/source/ui/inc/condformatdlgitem.hxx b/sc/source/ui/inc/condformatdlgitem.hxx index 27df99ef9b54..66efdf4b5090 100644 --- a/sc/source/ui/inc/condformatdlgitem.hxx +++ b/sc/source/ui/inc/condformatdlgitem.hxx @@ -14,9 +14,7 @@ #include -namespace condformat { - -namespace dialog { +namespace condformat::dialog { enum ScCondFormatDialogType { @@ -30,8 +28,6 @@ enum ScCondFormatDialogType } -} - class ScConditionalFormatList; class ScCondFormatDlgItem : public SfxPoolItem diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 59fa052c3b8e..b47e0b3fabe9 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -39,9 +39,7 @@ class ScCellRangesBase; class ScTabViewShell; class SfxViewFrame; -namespace ooo { -namespace vba { -namespace excel { +namespace ooo::vba::excel { // nTabs empty means apply zoom to all sheets void implSetZoom( const css::uno::Reference< css::frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs ); @@ -95,9 +93,7 @@ template < typename ImplObject > return pObj; } -} // namespace excel -} // namespace vba -} // namespace ooo +} // namespace ooo::vba::excel #endif diff --git a/sc/source/ui/vba/helperdecl.hxx b/sc/source/ui/vba/helperdecl.hxx index 8413f0c08d12..9aedecc83347 100644 --- a/sc/source/ui/vba/helperdecl.hxx +++ b/sc/source/ui/vba/helperdecl.hxx @@ -22,8 +22,7 @@ #include -namespace comphelper { -namespace service_decl { +namespace comphelper::service_decl { template > struct vba_service_class_ : public serviceimpl_base< detail::OwnServiceImpl, WithArgsT > { -- cgit