Skip to content

C
core
Kaydet (Commit) 4687ce06 authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski
Dosyalara gözat
Seçenekler

Constify dumpAsXml and friends 

All these dump functions should never change the dumped objects
so 'const' all of them.

Change-Id: Id83422e3950a73e48feb4708fbd4c251506997e0
üst d10f6d49
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 55 deletions
sw/inc/anchoreddrawobject.hxx
Dosyayı görüntüle @ 4687ce06
......@@ -188,7 +188,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
/** The element name to show in the XML dump.
*/
virtual const char* getElementName( ) SAL_OVERRIDE { return "SwAnchoredDrawObject"; }
virtual const char* getElementName( ) const SAL_OVERRIDE { return "SwAnchoredDrawObject"; }
};
#endif
......
sw/inc/anchoredobject.hxx
Dosyayı görüntüle @ 4687ce06
......@@ -542,11 +542,11 @@ class SW_DLLPUBLIC SwAnchoredObject
/** Dump a bunch of useful data to an XML representation to ease
layout understanding, debugging and testing.
*/
virtual void dumpAsXml( xmlTextWriterPtr pWriter );
virtual void dumpAsXml( xmlTextWriterPtr pWriter ) const;
/** The element name to show in the XML dump.
*/
virtual const char* getElementName( ) { return "SwAnchoredObject"; }
virtual const char* getElementName( ) const { return "SwAnchoredObject"; }
};
/// Helper class for notify that positioning of an anchored object is in progress.
......
sw/inc/doc.hxx
Dosyayı görüntüle @ 4687ce06
......@@ -1669,7 +1669,7 @@ public:
* Dumps the entire nodes structure to the given destination (file nodes.xml in the current directory by default)
* @since 3.5
*/
void dumpAsXml( xmlTextWriterPtr writer = NULL );
void dumpAsXml( xmlTextWriterPtr writer = NULL ) const;
std::vector<Color> GetDocColors();
......
sw/inc/docary.hxx
Dosyayı görüntüle @ 4687ce06
......@@ -81,7 +81,7 @@ public:
virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); }
sal_uInt16 GetPos(const SwFrmFmt* pFmt) const;
bool Contains(const SwFrmFmt* pFmt) const;
void dumpAsXml(xmlTextWriterPtr w, const char* pName);
void dumpAsXml(xmlTextWriterPtr w, const char* pName) const;
/// free's any remaining child objects
virtual ~SwFrmFmts();
};
......@@ -93,7 +93,7 @@ public:
virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); }
sal_uInt16 GetPos(const SwCharFmt* pFmt) const;
bool Contains(const SwCharFmt* pFmt) const;
void dumpAsXml(xmlTextWriterPtr w);
void dumpAsXml(xmlTextWriterPtr w) const;
/// free's any remaining child objects
virtual ~SwCharFmts();
};
......@@ -104,7 +104,7 @@ public:
virtual size_t GetFmtCount() const SAL_OVERRIDE { return size(); }
virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); }
sal_uInt16 GetPos(const SwTxtFmtColl* pFmt) const;
void dumpAsXml(xmlTextWriterPtr w);
void dumpAsXml(xmlTextWriterPtr w) const;
virtual ~SwTxtFmtColls() {}
};
......@@ -116,7 +116,7 @@ public:
virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); }
sal_uInt16 GetPos(const SwSectionFmt* pFmt) const;
bool Contains(const SwSectionFmt* pFmt) const;
void dumpAsXml(xmlTextWriterPtr w);
void dumpAsXml(xmlTextWriterPtr w) const;
/// free's any remaining child objects
virtual ~SwSectionFmts();
};
......@@ -141,7 +141,7 @@ public:
/// the destructor will free all objects still in the vector
~SwNumRuleTbl();
sal_uInt16 GetPos(const SwNumRule* pRule) const;
void dumpAsXml(xmlTextWriterPtr w);
void dumpAsXml(xmlTextWriterPtr w) const;
};
struct CompareSwRedlineTbl
......@@ -171,7 +171,7 @@ public:
void DeleteAndDestroy( sal_uInt16 nPos, sal_uInt16 nLen = 1 );
void DeleteAndDestroyAll();
void dumpAsXml(xmlTextWriterPtr w);
void dumpAsXml(xmlTextWriterPtr w) const;
/** Search next or previous Redline with the same Seq. No.
Search can be restricted via Lookahaed.
......@@ -214,7 +214,7 @@ public:
void DeleteAndDestroy( sal_uInt16 nPos, sal_uInt16 nLen = 1 );
void DeleteAndDestroyAll();
void dumpAsXml(xmlTextWriterPtr w);
void dumpAsXml(xmlTextWriterPtr w) const;
sal_uInt16 GetSize() const { return m_aExtraRedlines.size(); }
SwExtraRedline* GetRedline( sal_uInt16 uIndex ) const { return m_aExtraRedlines.operator[]( uIndex ); }
......
sw/inc/ndarr.hxx
Dosyayı görüntüle @ 4687ce06
......@@ -333,7 +333,7 @@ public:
* Dumps the entire nodes structure to the given destination (file nodes.xml in the current directory by default)
* @since 3.5
*/
void dumpAsXml( xmlTextWriterPtr writer = NULL );
void dumpAsXml( xmlTextWriterPtr writer = NULL ) const;
};
#endif
......
sw/inc/ndhints.hxx
Dosyayı görüntüle @ 4687ce06
......@@ -117,7 +117,9 @@ public:
inline size_t GetStartOf( const SwTxtAttr *pHt ) const;
bool Contains( const SwTxtAttr *pHt ) const;
inline SwTxtAttr * GetTextHint( const size_t nIdx )
inline const SwTxtAttr * GetTextHint( const size_t nIdx ) const
{ return GetStart(nIdx); }
inline SwTxtAttr * GetTextHint( const size_t nIdx )
{ return GetStart(nIdx); }
inline const SwTxtAttr * operator[]( const size_t nIdx ) const
{ return m_HintStarts[nIdx]; }
......
sw/inc/ndtxt.hxx
Dosyayı görüntüle @ 4687ce06
......@@ -792,7 +792,7 @@ public:
bool IsCollapse() const;
virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ) SAL_OVERRIDE;
virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ) const SAL_OVERRIDE;
sal_uInt32 GetRsid( sal_Int32 nStt, sal_Int32 nEnd ) const;
sal_uInt32 GetParRsid() const;
......
sw/inc/node.hxx
Dosyayı görüntüle @ 4687ce06
......@@ -285,7 +285,7 @@ public:
* Dumps the node structure to the given destination (file nodes.xml in the current directory by default)
* @since 3.5
*/
virtual void dumpAsXml( xmlTextWriterPtr writer = NULL );
virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ) const;
private:
/// Private constructor because copying is never allowed!!
......@@ -318,7 +318,7 @@ public:
/// Call ChkCondcoll to all ContentNodes of section.
void CheckSectionCondColl() const;
virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ) SAL_OVERRIDE;
virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ) const SAL_OVERRIDE;
private:
/// Private constructor because copying is never allowed!!
......
sw/inc/numrule.hxx
Dosyayı görüntüle @ 4687ce06
......@@ -272,7 +272,7 @@ public:
void SetIndentOfFirstListLevelAndChangeOthers( const short nNewIndent );
void Validate();
void dumpAsXml(xmlTextWriterPtr w);
void dumpAsXml(xmlTextWriterPtr w) const;
void GetGrabBagItem(com::sun::star::uno::Any& rVal) const;
void SetGrabBagItem(const com::sun::star::uno::Any& rVal);
};
......
sw/source/core/docnode/nodedump.cxx
Dosyayı görüntüle @ 4687ce06
......@@ -180,7 +180,7 @@ void lcl_dumpSdrModel(WriterHelper& writer, const SdrModel* pModel)
writer.endElement();
}
void SwDoc::dumpAsXml( xmlTextWriterPtr w )
void SwDoc::dumpAsXml( xmlTextWriterPtr w ) const
{
WriterHelper writer( w );
writer.startElement( "doc" );
......@@ -208,7 +208,7 @@ void SwDoc::dumpAsXml( xmlTextWriterPtr w )
namespace sw {
namespace mark {
void MarkManager::dumpAsXml( xmlTextWriterPtr w )
void MarkManager::dumpAsXml( xmlTextWriterPtr w ) const
{
WriterHelper writer(w);
writer.startElement("markManager");
......@@ -287,7 +287,7 @@ void SwFldTypes::dumpAsXml( xmlTextWriterPtr w ) const
writer.endElement();
}
void SwNodes::dumpAsXml( xmlTextWriterPtr w )
void SwNodes::dumpAsXml( xmlTextWriterPtr w ) const
{
WriterHelper writer( w );
writer.startElement( "swnodes" );
......@@ -299,7 +299,7 @@ void SwNodes::dumpAsXml( xmlTextWriterPtr w )
writer.endElement();
}
void SwNode::dumpAsXml( xmlTextWriterPtr w )
void SwNode::dumpAsXml( xmlTextWriterPtr w ) const
{
WriterHelper writer( w );
const char* name = "???";
......@@ -330,7 +330,7 @@ void SwNode::dumpAsXml( xmlTextWriterPtr w )
writer.endElement(); // end start node
}
void SwStartNode::dumpAsXml( xmlTextWriterPtr w )
void SwStartNode::dumpAsXml( xmlTextWriterPtr w ) const
{
WriterHelper writer( w );
const char* name = "???";
......@@ -603,7 +603,7 @@ void lcl_dumpSfxItemSet(WriterHelper& writer, const SfxItemSet* pSet)
}
}
void SwFrmFmts::dumpAsXml(xmlTextWriterPtr w, const char* pName)
void SwFrmFmts::dumpAsXml(xmlTextWriterPtr w, const char* pName) const
{
WriterHelper writer(w);
if (size())
......@@ -638,7 +638,7 @@ void SwFrmFmts::dumpAsXml(xmlTextWriterPtr w, const char* pName)
}
}
void SwCharFmts::dumpAsXml(xmlTextWriterPtr w)
void SwCharFmts::dumpAsXml(xmlTextWriterPtr w) const
{
WriterHelper writer(w);
if (size())
......@@ -658,7 +658,7 @@ void SwCharFmts::dumpAsXml(xmlTextWriterPtr w)
}
}
void SwSectionFmts::dumpAsXml(xmlTextWriterPtr w)
void SwSectionFmts::dumpAsXml(xmlTextWriterPtr w) const
{
WriterHelper writer(w);
if (size())
......@@ -675,7 +675,7 @@ void SwSectionFmts::dumpAsXml(xmlTextWriterPtr w)
}
}
void SwTxtFmtColls::dumpAsXml(xmlTextWriterPtr w)
void SwTxtFmtColls::dumpAsXml(xmlTextWriterPtr w) const
{
WriterHelper writer(w);
if (size())
......@@ -695,7 +695,7 @@ void SwTxtFmtColls::dumpAsXml(xmlTextWriterPtr w)
}
}
void SwNumRule::dumpAsXml(xmlTextWriterPtr w)
void SwNumRule::dumpAsXml(xmlTextWriterPtr w) const
{
WriterHelper writer(w);
writer.startElement("swnumrule");
......@@ -707,7 +707,7 @@ void SwNumRule::dumpAsXml(xmlTextWriterPtr w)
writer.endElement();
}
void SwNumRuleTbl::dumpAsXml(xmlTextWriterPtr w)
void SwNumRuleTbl::dumpAsXml(xmlTextWriterPtr w) const
{
if (!empty())
{
......@@ -719,7 +719,7 @@ void SwNumRuleTbl::dumpAsXml(xmlTextWriterPtr w)
}
}
void SwTxtNode::dumpAsXml( xmlTextWriterPtr w )
void SwTxtNode::dumpAsXml( xmlTextWriterPtr w ) const
{
WriterHelper writer( w );
writer.startElement( "text" );
......@@ -753,16 +753,16 @@ void SwTxtNode::dumpAsXml( xmlTextWriterPtr w )
if (HasHints())
{
writer.startElement("hints");
SwpHints& rHints = GetSwpHints();
const SwpHints& rHints = GetSwpHints();
for (size_t i = 0; i < rHints.Count(); ++i)
{
writer.startElement("hint");
SwTxtAttr* pHint = rHints.GetTextHint(i);
const SwTxtAttr* pHint = rHints.GetTextHint(i);
if (pHint->GetStart())
writer.writeFormatAttribute("start", TMP_FORMAT, pHint->GetStart());
if (pHint->GetEnd())
writer.writeFormatAttribute("end", TMP_FORMAT, *pHint->GetEnd());
if (pHint->End())
writer.writeFormatAttribute("end", TMP_FORMAT, *pHint->End());
writer.writeFormatAttribute("whichId", TMP_FORMAT, pHint->Which());
const char* pWhich = 0;
......@@ -801,7 +801,7 @@ void SwTxtNode::dumpAsXml( xmlTextWriterPtr w )
writer.endElement();
}
void SwRedlineTbl::dumpAsXml( xmlTextWriterPtr w )
void SwRedlineTbl::dumpAsXml( xmlTextWriterPtr w ) const
{
WriterHelper writer( w );
......@@ -938,7 +938,7 @@ void SwRedlineTbl::dumpAsXml( xmlTextWriterPtr w )
writer.endElement( ); // swredlinetbl
}
void SwExtraRedlineTbl::dumpAsXml( xmlTextWriterPtr w )
void SwExtraRedlineTbl::dumpAsXml( xmlTextWriterPtr w ) const
{
WriterHelper writer( w );
......
sw/source/core/inc/MarkManager.hxx
Dosyayı görüntüle @ 4687ce06
......@@ -85,7 +85,7 @@ namespace sw {
virtual ::sw::mark::IFieldmark* getDropDownFor(const SwPosition &rPos) const SAL_OVERRIDE;
virtual std::vector< ::sw::mark::IFieldmark* > getDropDownsFor(const SwPaM &rPaM) const SAL_OVERRIDE;
void dumpAsXml(xmlTextWriterPtr w);
void dumpAsXml(xmlTextWriterPtr w) const;
// Annotation Marks
virtual const_iterator_t getAnnotationMarksBegin() const SAL_OVERRIDE;
......
sw/source/core/inc/flyfrm.hxx
Dosyayı görüntüle @ 4687ce06
......@@ -284,7 +284,7 @@ public:
virtual const SwFlyFrmFmt *GetFmt() const SAL_OVERRIDE;
virtual SwFlyFrmFmt *GetFmt() SAL_OVERRIDE;
virtual void dumpAsXml( xmlTextWriterPtr writer ) SAL_OVERRIDE { SwLayoutFrm::dumpAsXml( writer ); };
virtual void dumpAsXml( xmlTextWriterPtr writer ) const SAL_OVERRIDE { SwLayoutFrm::dumpAsXml( writer ); };
virtual void Calc() const SAL_OVERRIDE;
......
sw/source/core/inc/frame.hxx
Dosyayı görüntüle @ 4687ce06
......@@ -899,10 +899,10 @@ public:
public:
// if writer is NULL, dumps the layout structure as XML in layout.xml
virtual void dumpAsXml(xmlTextWriterPtr writer = NULL);
virtual void dumpInfosAsXml(xmlTextWriterPtr writer);
virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer);
void dumpChildrenAsXml(xmlTextWriterPtr writer);
virtual void dumpAsXml(xmlTextWriterPtr writer = NULL) const;
virtual void dumpInfosAsXml(xmlTextWriterPtr writer) const;
virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const;
void dumpChildrenAsXml(xmlTextWriterPtr writer) const;
bool IsCollapse() const;
};
......
sw/source/core/inc/sectfrm.hxx
Dosyayı görüntüle @ 4687ce06
......@@ -127,7 +127,7 @@ public:
bool IsBalancedSection() const;
virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) SAL_OVERRIDE;
virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const SAL_OVERRIDE;
bool IsFtnAtEnd() const { return bFtnAtEnd; }
bool IsEndnAtEnd() const { return bEndnAtEnd; }
......
sw/source/core/inc/tabfrm.hxx
Dosyayı görüntüle @ 4687ce06
......@@ -215,7 +215,7 @@ public:
sal_uInt16 GetBottomLineSize() const;
virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) SAL_OVERRIDE;
virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const SAL_OVERRIDE;
DECL_FIXEDMEMPOOL_NEWDEL(SwTabFrm)
};
......
sw/source/core/inc/txtfrm.hxx
Dosyayı görüntüle @ 4687ce06
......@@ -581,7 +581,7 @@ public:
static void repaintTextFrames( const SwTxtNode& rNode );
virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) SAL_OVERRIDE;
virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const SAL_OVERRIDE;
};
class SwTxtFrmLocker
......
sw/source/core/text/xmldump.cxx
Dosyayı görüntüle @ 4687ce06
......@@ -223,7 +223,7 @@ namespace
}
}
void SwFrm::dumpAsXml( xmlTextWriterPtr writer )
void SwFrm::dumpAsXml( xmlTextWriterPtr writer ) const
{
bool bCreateWriter = ( NULL == writer );
if ( bCreateWriter )
......@@ -292,7 +292,7 @@ void SwFrm::dumpAsXml( xmlTextWriterPtr writer )
if (IsRootFrm())
{
// Root frame has access to the edit shell, so dump the current selection ranges here.
SwRootFrm* const pRootFrm = static_cast<SwRootFrm* const>(this);
const SwRootFrm* const pRootFrm = static_cast<const SwRootFrm* const>(this);
SwEditShell* pEditShell = pRootFrm->GetCurrShell()->GetDoc()->GetEditShell();
xmlTextWriterStartElement(writer, BAD_CAST("shellCrsr"));
SwPaM* pPaM = pEditShell->getShellCrsr(false);
......@@ -316,7 +316,7 @@ void SwFrm::dumpAsXml( xmlTextWriterPtr writer )
xmlTextWriterEndElement( writer );
// Dump Anchored objects if any
SwSortedObjs* pAnchored = GetDrawObjs();
const SwSortedObjs* pAnchored = GetDrawObjs();
if ( pAnchored && pAnchored->size() > 0 )
{
xmlTextWriterStartElement( writer, BAD_CAST( "anchored" ) );
......@@ -358,7 +358,7 @@ void SwFrm::dumpAsXml( xmlTextWriterPtr writer )
lcl_freeWriter( writer );
}
void SwFrm::dumpInfosAsXml( xmlTextWriterPtr writer )
void SwFrm::dumpInfosAsXml( xmlTextWriterPtr writer ) const
{
// output the Frm
xmlTextWriterStartElement( writer, BAD_CAST( "bounds" ) );
......@@ -373,7 +373,7 @@ void SwFrm::dumpInfosAsXml( xmlTextWriterPtr writer )
// bomb on two string litterals in the format.
static const char* TMP_FORMAT = "%" SAL_PRIuUINTPTR;
void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) const
{
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "ptr" ), "%p", this );
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "id" ), "%" SAL_PRIuUINT32, GetFrmId() );
......@@ -401,16 +401,16 @@ void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
}
}
void SwFrm::dumpChildrenAsXml( xmlTextWriterPtr writer )
void SwFrm::dumpChildrenAsXml( xmlTextWriterPtr writer ) const
{
SwFrm *pFrm = GetLower( );
const SwFrm *pFrm = GetLower( );
for ( ; pFrm != NULL; pFrm = pFrm->GetNext( ) )
{
pFrm->dumpAsXml( writer );
}
}
void SwAnchoredObject::dumpAsXml( xmlTextWriterPtr writer )
void SwAnchoredObject::dumpAsXml( xmlTextWriterPtr writer ) const
{
bool bCreateWriter = ( NULL == writer );
if ( bCreateWriter )
......@@ -432,7 +432,7 @@ void SwAnchoredObject::dumpAsXml( xmlTextWriterPtr writer )
lcl_freeWriter( writer );
}
void SwTxtFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
void SwTxtFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) const
{
SwFrm::dumpAsXmlAttributes( writer );
if ( HasFollow() )
......@@ -442,7 +442,7 @@ void SwTxtFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%" SAL_PRIuUINT32, static_cast<SwTxtFrm*>(m_pPrecede)->GetFrmId() );
}
void SwSectionFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
void SwSectionFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) const
{
SwFrm::dumpAsXmlAttributes( writer );
if ( HasFollow() )
......@@ -452,7 +452,7 @@ void SwSectionFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%" SAL_PRIuUINT32, static_cast<SwSectionFrm*>( m_pPrecede )->GetFrmId() );
}
void SwTabFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
void SwTabFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) const
{
SwFrm::dumpAsXmlAttributes( writer );
if ( HasFollow() )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment