diff options
Diffstat (limited to 'sw/source/filter')
37 files changed, 257 insertions, 7 deletions
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx index 9490e1bfc926..ddf2dec8c56d 100644 --- a/sw/source/filter/ascii/ascatr.cxx +++ b/sw/source/filter/ascii/ascatr.cxx @@ -45,6 +45,8 @@ * For all nodes, attributes, formats and chars. */ +namespace { + class SwASC_AttrIter { SwASCWriter& rWrt; @@ -69,6 +71,8 @@ public: bool OutAttr( sal_Int32 nSwPos ); }; +} + SwASC_AttrIter::SwASC_AttrIter( SwASCWriter& rWr, const SwTextNode& rTextNd, @@ -168,6 +172,8 @@ bool SwASC_AttrIter::OutAttr( sal_Int32 nSwPos ) return bRet; } +namespace { + class SwASC_RedlineIter { private: @@ -236,6 +242,8 @@ public: } }; +} + // Output of the node static Writer& OutASC_SwTextNode( Writer& rWrt, SwContentNode& rNode ) diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index cbdae221ed1e..a2c0538ebf9b 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -49,6 +49,8 @@ #define ASC_BUFFLEN 4096 +namespace { + class SwASCIIParser { SwDoc* pDoc; @@ -74,6 +76,8 @@ public: ErrCode CallParser(); }; +} + // Call for the general reader interface ErrCode AsciiReader::Read( SwDoc &rDoc, const OUString&, SwPaM &rPam, const OUString & ) { diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 909ec61ba98c..093409868ebc 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -210,6 +210,8 @@ OString GetCSS1_Color(const Color& rColor) return "#" + lclConvToHex(rColor.GetRed()) + lclConvToHex(rColor.GetGreen()) + lclConvToHex(rColor.GetBlue()); } +namespace { + class SwCSS1OutMode { SwHTMLWriter& rWrt; @@ -234,6 +236,8 @@ public: } }; +} + void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, const sal_Char *pVal, const OUString *pSVal ) diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 67ca2a1b4aec..72c3e20b68e8 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -201,6 +201,8 @@ sal_uInt16 SwHTMLWriter::GetCSS1ScriptForScriptType( sal_uInt16 nScriptType ) * Otherwise, attributes of the format are output as well. */ +namespace { + struct SwHTMLTextCollOutputInfo { OString aToken; // End token to be output @@ -223,6 +225,8 @@ struct SwHTMLTextCollOutputInfo bool ShouldOutputToken() const { return bOutPara || !HasParaToken(); } }; +} + SwHTMLFormatInfo::SwHTMLFormatInfo( const SwFormat *pF, SwDoc *pDoc, SwDoc *pTemplate, bool bOutStyles, LanguageType eDfltLang, @@ -1029,6 +1033,8 @@ static void OutHTML_SwFormatOff( Writer& rWrt, const SwHTMLTextCollOutputInfo& r } } +namespace { + class HTMLStartEndPos { sal_Int32 nStart; @@ -1048,6 +1054,8 @@ public: void SetEnd( sal_Int32 nE ) { nEnd = nE; } }; +} + HTMLStartEndPos::HTMLStartEndPos( const SfxPoolItem& rItem, sal_Int32 nStt, sal_Int32 nE ) : nStart( nStt ), @@ -1069,8 +1077,6 @@ enum HTMLOnOffState { HTML_NOT_SUPPORTED, // unsupported Attribute HTML_DROPCAP_VALUE, // DropCap-Attribute HTML_AUTOFMT_VALUE }; // Attribute for automatic character styles -} - class HTMLEndPosLst { HTMLStartEndPositions aStartLst; // list, sorted for start positions @@ -1153,6 +1159,8 @@ public: bool IsHTMLMode( sal_uLong nMode ) const { return (nHTMLMode & nMode) != 0; } }; +} + void HTMLEndPosLst::InsertItem_( HTMLStartEndPos *pPos, HTMLStartEndPositions::size_type nEndPos ) { // Insert the attribute in the Start list behind all attributes that diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index 92ecf5578909..e7de3fad7ee6 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -38,12 +38,16 @@ using namespace nsSwDocInfoSubType; using namespace ::com::sun::star; +namespace { + struct HTMLNumFormatTableEntry { const sal_Char *pName; NfIndexTableOffset const eFormat; }; +} + static HTMLOptionEnum<SwFieldIds> const aHTMLFieldTypeTable[] = { { OOO_STRING_SW_HTML_FT_author, SwFieldIds::Author }, diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 13f33ac57839..6f536bab0bdc 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -365,6 +365,8 @@ const uno::Reference< script::XEventAttacherManager >& return m_xFormEventManager; } +namespace { + class SwHTMLImageWatcher : public cppu::WeakImplHelper< awt::XImageConsumer, XEventListener > { @@ -408,6 +410,8 @@ public: virtual void SAL_CALL disposing( const EventObject& Source ) override; }; +} + SwHTMLImageWatcher::SwHTMLImageWatcher( const uno::Reference< drawing::XShape >& rShape, bool bWidth, bool bHeight ) : diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 0d659d7dfd65..12153fb74c4d 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -82,6 +82,8 @@ static HTMLOptionEnum<sal_Int16> const aHTMLTableVAlignTable[] = // table tags options +namespace { + struct HTMLTableOptions { sal_uInt16 nCols; @@ -165,6 +167,8 @@ public: size_t GetContextStAttrMin() const { return nContextStAttrMin; } }; +} + // Cell content is a linked list with SwStartNodes and // HTMLTables. @@ -208,6 +212,8 @@ public: const std::shared_ptr<SwHTMLTableLayoutCnts>& CreateLayoutInfo(); }; +namespace { + // Cell of a HTML table class HTMLTableCell { @@ -271,9 +277,13 @@ public: bool IsCovered() const { return mbCovered; } }; +} + // Row of a HTML table typedef std::vector<HTMLTableCell> HTMLTableCells; +namespace { + class HTMLTableRow { HTMLTableCells m_aCells; ///< cells of the row @@ -365,6 +375,8 @@ public: std::unique_ptr<SwHTMLTableLayoutColumn> CreateLayoutInfo(); }; +} + // HTML table typedef std::vector<HTMLTableRow> HTMLTableRows; @@ -3874,6 +3886,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, xSaveStruct.reset(); } +namespace { + class RowSaveStruct : public SwPendingData { public: @@ -3886,6 +3900,8 @@ public: {} }; +} + void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions, SvxAdjust eGrpAdjust, sal_Int16 eGrpVertOri ) @@ -4245,6 +4261,8 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable, // now we stand (perhaps) in front of <TBODY>,... or </TABLE> } +namespace { + struct TableColGrpSaveStruct : public SwPendingData { sal_uInt16 nColGrpSpan; @@ -4258,6 +4276,8 @@ struct TableColGrpSaveStruct : public SwPendingData inline void CloseColGroup( HTMLTable *pTable ); }; +} + inline TableColGrpSaveStruct::TableColGrpSaveStruct() : nColGrpSpan( 1 ), nColGrpWidth( 0 ), bRelColGrpWidth( false ), eColGrpAdjust( SvxAdjust::End ), @@ -4677,6 +4697,8 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) *m_pPam->GetPoint() = xSaveStruct->GetPos(); } +namespace { + class TableSaveStruct : public SwPendingData { public: @@ -4692,6 +4714,8 @@ public: void MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc ); }; +} + void TableSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc ) { m_xCurrentTable->MakeTable(nullptr, nWidth); diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 577a9f5c7b11..b34ae8485d6e 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -56,6 +56,8 @@ using namespace ::com::sun::star; +namespace { + class SwHTMLWrtTable : public SwWriteTable { static void Pixelize( sal_uInt16& rValue ); @@ -88,6 +90,8 @@ public: sal_uInt16 nHSpace=0, sal_uInt16 nVSpace=0 ) const; }; +} + SwHTMLWrtTable::SwHTMLWrtTable( const SwTableLines& rLines, long nWidth, sal_uInt32 nBWidth, bool bRel, sal_uInt16 nLSub, sal_uInt16 nRSub, diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 721a9e4afd59..cbfbe2e919f3 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -256,6 +256,8 @@ static sal_uInt16 const aBorderWidths[] = #undef SBORDER_ENTRY #undef DBORDER_ENTRY +namespace { + struct SvxCSS1ItemIds { sal_uInt16 nFont; @@ -295,6 +297,8 @@ struct SvxCSS1ItemIds sal_uInt16 nDirection; }; +} + static SvxCSS1ItemIds aItemIds; struct SvxCSS1BorderInfo @@ -3062,6 +3066,8 @@ static void ParseCSS1_so_language( const CSS1Expression *pExpr, } } +namespace { + // the assignment of property to parsing function struct CSS1PropEntry { @@ -3069,6 +3075,8 @@ struct CSS1PropEntry FnParseCSS1Prop pFunc; }; +} + #define CSS1_PROP_ENTRY(p) \ { sCSS1_P_##p, ParseCSS1_##p } diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index e9854065b387..394da93ad3a0 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -39,12 +39,15 @@ using namespace ::com::sun::star; +namespace +{ /// Glue class to call RtfImport as an internal filter, needed by copy&paste support. class SwRTFReader : public Reader { ErrCode Read(SwDoc& rDoc, const OUString& rBaseURL, SwPaM& rPam, const OUString& rFileName) override; }; +} ErrCode SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& rPam, const OUString& /*rFileName*/) diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index b6caf17412b3..152a947c3afb 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -180,6 +180,8 @@ static const sal_Int32 Tag_TableDefinition = 15; static const sal_Int32 Tag_OutputFlyFrame = 16; static const sal_Int32 Tag_StartSection = 17; +namespace { + class FFDataWriterHelper { ::sax_fastparser::FSHelperPtr m_pSerializer; @@ -289,6 +291,9 @@ class FieldMarkParamsHelper return bResult; } }; + +} + void DocxAttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 /*nScript*/ ) { if (bIsRTL) @@ -5749,6 +5754,8 @@ oox::drawingml::DrawingML& DocxAttributeOutput::GetDrawingML() return m_rDrawingML; } +namespace { + /// Functor to do case-insensitive ordering of OUString instances. struct OUStringIgnoreCase { @@ -5758,6 +5765,8 @@ struct OUStringIgnoreCase } }; +} + /// Guesses if a style created in Writer (no grab-bag) should be qFormat or not. static bool lcl_guessQFormat(const OUString& rName, sal_uInt16 nWwId) { diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index f29268032ed0..db27ad412270 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -1433,6 +1433,8 @@ void RtfExport::WriteHeaderFooter(const SwFrameFormat& rFormat, bool bHeader, co SAL_INFO("sw.rtf", OSL_THIS_FUNC << " end"); } +namespace +{ /// Glue class to call RtfExport as an internal filter, needed by copy&paste support. class SwRTFWriter : public Writer { @@ -1444,6 +1446,7 @@ public: ErrCode WriteStream() override; }; +} SwRTFWriter::SwRTFWriter(const OUString& rFilterName, const OUString& rBaseURL) { diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index fa56ce68878e..cf2a051bd237 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -686,6 +686,8 @@ namespace sw maStack.emplace_back(new SwFltStackEntry(rPos, std::unique_ptr<SfxPoolItem>(rAttr.Clone()))); } + namespace { + class SameOpenRedlineType { private: @@ -700,6 +702,8 @@ namespace sw } }; + } + bool RedlineStack::close(const SwPosition& rPos, RedlineType eType) { //Search from end for same type diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index 9853bb36fee6..d2ae4e6e7b19 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -321,6 +321,8 @@ namespace myImplHelpers return GetSubsFontName(rFont, SubsFontFlags::ONLYONE | SubsFontFlags::MS); } + namespace { + //Utility to remove entries before a given starting position class IfBeforeStart { @@ -333,6 +335,8 @@ namespace myImplHelpers return rEntry.mnEndPos < mnStart; } }; + + } } /// Count what Word calls left/right margin from a format's LRSpace + Box. diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 89de28bf5182..13732268af52 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -169,6 +169,8 @@ MSWordAttrIter::~MSWordAttrIter() m_rExport.m_pChpIter = pOld; } +namespace { + class sortswflys { public: @@ -178,6 +180,8 @@ public: } }; +} + void SwWW8AttrIter::IterToCurrent() { OSL_ENSURE(maCharRuns.begin() != maCharRuns.end(), "Impossible"); @@ -1936,6 +1940,8 @@ bool MSWordExportBase::GetAnnotationMarks( const SwWW8AttrIter& rAttrs, sal_Int3 return ( !rArr.empty() ); } +namespace { + class CompareMarksEnd { public: @@ -1948,6 +1954,8 @@ public: } }; +} + bool MSWordExportBase::NearestBookmark( sal_Int32& rNearest, const sal_Int32 nCurrentPos, bool bNextPositionOnly ) { bool bHasBookmark = false; diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 3c6813406420..aad292dc5b18 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -88,6 +88,8 @@ struct WW8_PdAttrDesc { } }; +namespace { + struct WW8_SED { SVBT16 aBits1; // orientation change + internal, Default: 6 @@ -99,6 +101,8 @@ struct WW8_SED // cbSED is 12 (decimal)), C (hex). }; +} + // class WW8_WrPlc0 is only used for header and footer positioning // ie there is no content support structure class WW8_WrPlc0 diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index e908cab35162..bf755c606808 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2665,6 +2665,8 @@ void WW8Export::SectionBreaksAndFrames( const SwTextNode& rNode ) OutputSectionBreaks( rNode.GetpSwAttrSet(), rNode ); } +namespace { + class TrackContentToExport { private: @@ -2707,6 +2709,8 @@ public: } }; +} + void MSWordExportBase::WriteText() { TrackContentToExport aContentTracking(m_pCurPam.get(), m_nCurStart, m_nCurEnd); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 00dd85bdb6cd..b5cfddc8fde2 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -4872,6 +4872,8 @@ void WW8AttributeOutput::ParaWidows( const SvxWidowsItem& rWidows ) m_rWW8Export.pO->push_back( rWidows.GetValue() ? 1 : 0 ); } +namespace { + class SwWW8WrTabu { std::unique_ptr<sal_uInt8[]> pDel; // DelArray @@ -4891,6 +4893,8 @@ public: void PutAll(WW8Export& rWW8Wrt); }; +} + SwWW8WrTabu::SwWW8WrTabu(sal_uInt16 nDelMax, sal_uInt16 nAddMax) : nAdd(0), nDel(0) { diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index a49d9dea7054..b780e3ac6c66 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -574,6 +574,8 @@ static void lcl_StripFields(OUString &rString, WW8_CP &rNewStartCp) } } +namespace { + class Chunk { private: @@ -595,8 +597,6 @@ public: } }; -namespace -{ bool IsValidSel(const EditEngine& rEngine, const ESelection& rSel) { const auto nParaCount = rEngine.GetParagraphCount(); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index ca2c97b2125d..bf9c2804a16a 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -360,6 +360,8 @@ void SwWW8ImplReader::ReadEmbeddedData(SvStream& rStrm, SwDocShell const * pDocS } } +namespace { + class BasicProjImportHelper { SwDocShell& mrDocShell; @@ -373,6 +375,8 @@ public: OUString getProjectName() const; }; +} + bool BasicProjImportHelper::import( const uno::Reference< io::XInputStream >& rxIn ) { bool bRet = false; @@ -412,6 +416,8 @@ OUString BasicProjImportHelper::getProjectName() const return sProjName; } +namespace { + class Sttb : public TBBase { struct SBBItem @@ -436,6 +442,8 @@ public: OUString getStringAtIndex( sal_uInt32 ); }; +} + Sttb::Sttb() : fExtend(0) , cData(0) @@ -4870,6 +4878,8 @@ static void lcl_createTemplateToProjectEntry( const uno::Reference< container::X } } +namespace { + class WW8Customizations { SvStream* mpTableStream; @@ -4879,6 +4889,8 @@ public: void Import( SwDocShell* pShell ); }; +} + WW8Customizations::WW8Customizations( SvStream* pTableStream, WW8Fib const & rFib ) : mpTableStream(pTableStream), mWw8Fib( rFib ) { } diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index c07da7e81efb..eafe88b8392c 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -327,6 +327,8 @@ typedef sal_uInt16 WW8aIdSty[WW8ListManager::nMaxLevel]; // Character Style Pointer typedef SwCharFormat* WW8aCFormat[WW8ListManager::nMaxLevel]; +namespace { + struct WW8LST // only THOSE entries, WE need! { WW8aIdSty aIdSty; // Style Id's for each level, @@ -338,8 +340,12 @@ struct WW8LST // only THOSE entries, WE need! // true if the list should start numbering over }; // at the beginning of each section +} + const sal_uInt32 cbLSTF=28; +namespace { + struct WW8LFO // only THOSE entries, WE need! { SwNumRule* pNumRule; // Parent NumRule @@ -388,6 +394,8 @@ struct WW8LFOLVL nStartAt(1), nLevel(0), bStartAt(true), bFormat(false) {} }; +} + // Data to be saved in ListInfo struct WW8LSTInfo // sorted by nIdLst (in WW8 used list-Id) @@ -457,6 +465,8 @@ SprmResult WW8ListManager::GrpprlHasSprm(sal_uInt16 nId, sal_uInt8& rSprms, return maSprmParser.findSprmData(nId, &rSprms, nLen); } +namespace { + class ListWithId { private: @@ -467,6 +477,8 @@ public: { return (pEntry->nIdLst == mnIdLst); } }; +} + // Access via List-Id of LST Entry WW8LSTInfo* WW8ListManager::GetLSTByListId( sal_uInt32 nIdLst ) const { diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index 3b5535ef430a..ceaed401a577 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -60,6 +60,8 @@ #include "ww8par.hxx" #include "ww8par2.hxx" +namespace { + struct OLE_MFP { sal_Int16 mm; // 0x6 int @@ -68,6 +70,8 @@ struct OLE_MFP sal_Int16 hMF; // 0xc int }; +} + using namespace ::com::sun::star; static bool SwWw8ReadScaling(long& rX, long& rY, tools::SvRef<SotStorage> const & rSrc1) diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 142d20c8ee98..4e522698dede 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -3015,6 +3015,8 @@ void WW8PLCFx::SetIdx2(sal_uInt32) { } +namespace { + class SamePos { private: @@ -3025,6 +3027,8 @@ public: {return mnPo == pFkp->GetFilePos();} }; +} + bool WW8PLCFx_Fc_FKP::NewFkp() { WW8_CP nPLCFStart, nPLCFEnd; @@ -7031,7 +7035,6 @@ std::unique_ptr<WW8_STD> WW8Style::Read1Style(sal_uInt16& rSkip, OUString* pStri namespace { const sal_uInt16 maxStrSize = 65; -} struct WW8_FFN_Ver6 { @@ -7062,6 +7065,8 @@ struct WW8_FFN_Ver8 : public WW8_FFN_BASE // font does not exist on this system. }; +} + // #i43762# check font name for illegal characters static void lcl_checkFontname( OUString& sString ) { diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index d3b52cce6cc3..5d34c76fee6e 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -35,6 +35,8 @@ const short nVisualData = 5; typedef std::map< sal_Int16, OUString > IdToString; +namespace { + class MSOWordCommandConvertor : public MSOCommandConvertor { IdToString msoToOOcmd; @@ -46,6 +48,8 @@ public: virtual OUString MSOTCIDToOOCommand( sal_Int16 key ) override; }; +} + MSOWordCommandConvertor::MSOWordCommandConvertor() { // mso command id to ooo command string diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index bfd4e488fcb8..1075588797ce 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -86,6 +86,8 @@ static SwDoc* lcl_GetDocViaTunnel( Reference<XTextRange> const & rRange ) // the matter that (e.g in section import) we delete a few characters, // which may cause bookmarks (as used by XTextRange) to be deleted. +namespace { + class XTextRangeOrNodeIndexPosition { Reference<XTextRange> xRange; @@ -104,6 +106,8 @@ public: bool IsValid() const; }; +} + XTextRangeOrNodeIndexPosition::XTextRangeOrNodeIndexPosition() { } diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index b0a453d48443..fd6f957be4a1 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -64,6 +64,8 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; +namespace { + class SwXMLConditionParser_Impl { OUString const sInput; @@ -89,6 +91,8 @@ public: sal_uInt32 GetSubCondition() const { return nSubCondition; } }; +} + inline bool SwXMLConditionParser_Impl::SkipWS() { while( nPos < nLength && ' ' == sInput[nPos] ) @@ -197,6 +201,8 @@ SwXMLConditionParser_Impl::SwXMLConditionParser_Impl( const OUString& rInp ) : } } +namespace { + class SwXMLConditionContext_Impl : public SvXMLImportContext { Master_CollCondition nCondition; @@ -218,6 +224,8 @@ public: OUString const &getApplyStyle() const { return sApplyStyle; } }; +} + SwXMLConditionContext_Impl::SwXMLConditionContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -258,6 +266,8 @@ SwXMLConditionContext_Impl::SwXMLConditionContext_Impl( typedef std::vector<rtl::Reference<SwXMLConditionContext_Impl>> SwXMLConditions_Impl; +namespace { + class SwXMLTextStyleContext_Impl : public XMLTextStyleContext { std::unique_ptr<SwXMLConditions_Impl> pConditions; @@ -283,6 +293,7 @@ public: const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override; }; +} uno::Reference < style::XStyle > SwXMLTextStyleContext_Impl::Create() { @@ -388,6 +399,8 @@ SvXMLImportContextRef SwXMLTextStyleContext_Impl::CreateChildContext( return xContext; } +namespace { + class SwXMLItemSetStyleContext_Impl : public SvXMLStyleContext { OUString sMasterPageName; @@ -442,6 +455,8 @@ public: bool ResolveDataStyleName(); }; +} + void SwXMLItemSetStyleContext_Impl::SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, const OUString& rValue ) @@ -665,6 +680,8 @@ bool SwXMLItemSetStyleContext_Impl::ResolveDataStyleName() } } +namespace { + class SwXMLStylesContext_Impl : public SvXMLStylesContext { SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } @@ -706,6 +723,8 @@ public: virtual void EndElement() override; }; +} + SvXMLStyleContext *SwXMLStylesContext_Impl::CreateStyleChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) @@ -887,6 +906,8 @@ void SwXMLStylesContext_Impl::EndElement() GetSwImport().InsertStyles( IsAutomaticStyle() ); } +namespace { + class SwXMLMasterStylesContext_Impl : public XMLTextMasterStylesContext { protected: @@ -907,6 +928,7 @@ public: virtual void EndElement() override; }; +} SwXMLMasterStylesContext_Impl::SwXMLMasterStylesContext_Impl( SwXMLImport& rImport, diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index 642e9d1d93fd..485bf87e764e 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -257,6 +257,8 @@ void SwXMLExport::ExportMasterStyles_() GetPageExport()->exportMasterStyles( false ); } +namespace { + class SwXMLAutoStylePoolP : public SvXMLAutoStylePoolP { SvXMLExport& rExport; @@ -278,6 +280,8 @@ public: explicit SwXMLAutoStylePoolP( SvXMLExport& rExport ); }; +} + void SwXMLAutoStylePoolP::exportStyleAttributes( SvXMLAttributeList& rAttrList, sal_Int32 nFamily, diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx index 7b92a8c43419..1f910e60944e 100644 --- a/sw/source/filter/xml/xmlfonte.cxx +++ b/sw/source/filter/xml/xmlfonte.cxx @@ -30,12 +30,16 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::text; +namespace { + class SwXMLFontAutoStylePool_Impl: public XMLFontAutoStylePool { public: SwXMLFontAutoStylePool_Impl(SwXMLExport& rExport, bool bFontEmbedding); }; +} + SwXMLFontAutoStylePool_Impl::SwXMLFontAutoStylePool_Impl(SwXMLExport& _rExport, bool bFontEmbedding) : XMLFontAutoStylePool(_rExport, bFontEmbedding) { diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 43040d441db3..9c983b882db5 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -135,6 +135,8 @@ static const SvXMLTokenMapEntry aDocTokenMap[] = XML_TOKEN_MAP_END }; +namespace { + class SwXMLBodyContext_Impl : public SvXMLImportContext { SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } @@ -149,6 +151,8 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList ) override; }; +} + SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -187,6 +191,8 @@ SvXMLImportContextRef SwXMLBodyContext_Impl::CreateChildContext( return GetSwImport().CreateBodyContentContext( rLocalName ); } +namespace { + // #i69629# // enhance class <SwXMLDocContext_Impl> in order to be able to create subclasses // NB: virtually inherit so we can multiply inherit properly @@ -212,6 +218,8 @@ public: sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override; }; +} + SwXMLDocContext_Impl::SwXMLDocContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -286,6 +294,8 @@ SvXMLImportContextRef SwXMLDocContext_Impl::CreateChildContext( return pContext; } +namespace { + // #i69629# - new subclass <SwXMLOfficeDocContext_Impl> of class <SwXMLDocContext_Impl> class SwXMLOfficeDocContext_Impl : public SwXMLDocContext_Impl, public SvXMLMetaDocumentContext @@ -299,6 +309,8 @@ public: sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override; }; +} + SwXMLOfficeDocContext_Impl::SwXMLOfficeDocContext_Impl( SwXMLImport& rImport, const Reference< document::XDocumentProperties >& xDocProps) : @@ -331,6 +343,8 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL SwXMLOfficeDocContext_I } } +namespace { + // #i69629# - new subclass <SwXMLDocStylesContext_Impl> of class <SwXMLDocContext_Impl> class SwXMLDocStylesContext_Impl : public SwXMLDocContext_Impl { @@ -343,6 +357,8 @@ public: virtual void EndElement() override; }; +} + SwXMLDocStylesContext_Impl::SwXMLDocStylesContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, @@ -1154,6 +1170,8 @@ void SwXMLImport::MergeListsAtDocumentInsertPosition(SwDoc *pDoc) } } +namespace { + // Locally derive XMLTextShapeImportHelper, so we can take care of the // form import This is Writer, but not text specific, so it should go // here! @@ -1175,6 +1193,8 @@ public: virtual ~SvTextShapeImportHelper() override; }; +} + SvTextShapeImportHelper::SvTextShapeImportHelper(SvXMLImport& rImp) : XMLTextShapeImportHelper(rImp) { diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 2436e2e4f1c8..1da664861205 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -215,6 +215,8 @@ SvXMLImportItemMapper::finished(SfxItemSet &, SvXMLUnitConverter const&) const // nothing to do here } +namespace { + struct BoxHolder { std::unique_ptr<SvxBorderLine> pTop; @@ -238,6 +240,8 @@ struct BoxHolder } }; +} + // put an XML-string value into an item bool SvXMLImportItemMapper::PutXMLValue( SfxPoolItem& rItem, diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index b307a5c10872..433eb1fc2397 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -46,6 +46,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; +namespace { + class SwXMLTableItemMapper_Impl: public SvXMLExportItemMapper { SwXMLBrushItemExport aBrushItemExport; @@ -79,6 +81,8 @@ public: inline void SetAbsWidth( sal_uInt32 nAbs ); }; +} + SwXMLTableItemMapper_Impl::SwXMLTableItemMapper_Impl( SvXMLItemMapEntriesRef rMapEntries, SwXMLExport& rExp ) : diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index e6542b33157d..7708985d0adc 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -52,6 +52,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; +namespace { + class SwXMLImportTableItemMapper_Impl: public SvXMLImportItemMapper { @@ -85,6 +87,8 @@ private: bool m_bHaveMargin[4]; }; +} + SwXMLImportTableItemMapper_Impl::SwXMLImportTableItemMapper_Impl( const SvXMLItemMapEntriesRef& rMapEntries ) : SvXMLImportItemMapper( rMapEntries ) @@ -229,6 +233,8 @@ void SwXMLImportTableItemMapper_Impl::finished( } } +namespace { + class SwXMLItemSetContext_Impl : public SvXMLItemSetContext { SvXMLImportContextRef xBackground; @@ -252,6 +258,8 @@ public: const SvXMLUnitConverter& rUnitConv ) override; }; +} + SwXMLItemSetContext_Impl::SwXMLItemSetContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx index 2a95dc8106cb..c8739eeafa14 100644 --- a/sw/source/filter/xml/xmlmeta.cxx +++ b/sw/source/filter/xml/xmlmeta.cxx @@ -87,8 +87,6 @@ enum SvXMLTokenMapAttrs XML_TOK_META_STAT_END=XML_TOK_UNKNOWN }; -} - struct statistic { SvXMLTokenMapAttrs const token; const char* name; @@ -96,6 +94,8 @@ struct statistic { sal_uLong SwDocStat::* target32; /* or 64, on LP64 platforms */ }; +} + static const struct statistic s_stats [] = { { XML_TOK_META_STAT_TABLE, "TableCount", &SwDocStat::nTable, nullptr }, { XML_TOK_META_STAT_IMAGE, "ImageCount", &SwDocStat::nGrf, nullptr }, diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index bef72a6f5357..13d004732c37 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -84,6 +84,8 @@ public: sal_uInt32 GetRelWidth() const { return nRelWidth; } }; +namespace { + struct SwXMLTableColumnCmpWidth_Impl { bool operator()( SwXMLTableColumn_Impl* const& lhs, SwXMLTableColumn_Impl* const& rhs ) const @@ -98,6 +100,8 @@ struct SwXMLTableColumnCmpWidth_Impl class SwXMLTableColumns_Impl : public o3tl::sorted_vector<std::unique_ptr<SwXMLTableColumn_Impl>, o3tl::less_uniqueptr_to<SwXMLTableColumn_Impl> > { }; +} + class SwXMLTableColumnsSortByWidth_Impl : public o3tl::sorted_vector<SwXMLTableColumn_Impl*, SwXMLTableColumnCmpWidth_Impl> {}; class SwXMLTableLines_Impl diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 657ac47e6c4f..db95b73a328b 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -378,6 +378,8 @@ void SwXMLTableRow_Impl::Dispose() } } +namespace { + class SwXMLTableCellContext_Impl : public SvXMLImportContext { OUString m_aStyleName; @@ -422,6 +424,8 @@ public: SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } }; +} + SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList, @@ -708,6 +712,8 @@ void SwXMLTableCellContext_Impl::EndElement() GetImport().GetTextImport()->SetCellParaStyleDefault(m_sSaveParaDefault); } +namespace { + class SwXMLTableColContext_Impl : public SvXMLImportContext { SvXMLImportContextRef const xMyTable; @@ -724,6 +730,8 @@ public: SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } }; +} + SwXMLTableColContext_Impl::SwXMLTableColContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList, @@ -793,6 +801,8 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl( } } +namespace { + class SwXMLTableColsContext_Impl : public SvXMLImportContext { SvXMLImportContextRef const xMyTable; @@ -813,6 +823,8 @@ public: SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } }; +} + SwXMLTableColsContext_Impl::SwXMLTableColsContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, SwXMLTableContext *pTable ) : @@ -841,6 +853,8 @@ SvXMLImportContextRef SwXMLTableColsContext_Impl::CreateChildContext( return pContext; } +namespace { + class SwXMLTableRowContext_Impl : public SvXMLImportContext { SvXMLImportContextRef const xMyTable; @@ -865,6 +879,8 @@ public: SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } }; +} + SwXMLTableRowContext_Impl::SwXMLTableRowContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -957,6 +973,8 @@ SvXMLImportContextRef SwXMLTableRowContext_Impl::CreateChildContext( return pContext; } +namespace { + class SwXMLTableRowsContext_Impl : public SvXMLImportContext { SvXMLImportContextRef const xMyTable; @@ -979,6 +997,8 @@ public: SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } }; +} + SwXMLTableRowsContext_Impl::SwXMLTableRowsContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx index be51bf82ed68..690c3cac4d8d 100644 --- a/sw/source/filter/xml/xmltext.cxx +++ b/sw/source/filter/xml/xmltext.cxx @@ -24,6 +24,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; +namespace { + class SwXMLBodyContentContext_Impl : public SvXMLImportContext { SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } @@ -41,6 +43,8 @@ public: virtual void EndElement() override; }; +} + SwXMLBodyContentContext_Impl::SwXMLBodyContentContext_Impl( SwXMLImport& rImport, const OUString& rLName ) : SvXMLImportContext( rImport, XML_NAMESPACE_OFFICE, rLName ) diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 788bec5c2d47..dac99fc9c7ac 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -70,6 +70,8 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; using namespace xml::sax; +namespace { + struct XMLServiceMapEntry_Impl { const sal_Char *sFilterService; @@ -80,6 +82,8 @@ struct XMLServiceMapEntry_Impl sal_uInt8 n4, n5, n6, n7, n8, n9, n10, n11; }; +} + #define SERVICE_MAP_ENTRY( app, s ) \ { XML_IMPORT_FILTER_##app, sizeof(XML_IMPORT_FILTER_##app)-1, \ SO3_##s##_CLASSID } |