summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-02-28 10:17:00 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-02-28 21:01:20 +0100
commitf23738139429358c11fa62708fbdf5bb0c43d199 (patch)
tree2189f9c923cf2f1299f2e6aa3c55a5207951578e /editeng
parentf4fbb127897ea6afe27055d3b6cfcb0441080902 (diff)
use the xmlTextWriterPtr typedef consistently
this is the single biggest chunk of stuff my upcoming paramtypedef loplugin will warn about, so do it separately Change-Id: I412e69e76406d6d947101885d4cd92c65e021508 Reviewed-on: https://gerrit.libreoffice.org/68486 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/inc/editattr.hxx2
-rw-r--r--editeng/inc/editdoc.hxx8
-rw-r--r--editeng/source/editeng/editdoc.cxx8
-rw-r--r--editeng/source/editeng/editeng.cxx2
-rw-r--r--editeng/source/editeng/editobj2.hxx2
-rw-r--r--editeng/source/items/numitem.cxx4
-rw-r--r--editeng/source/outliner/outliner.cxx2
-rw-r--r--editeng/source/outliner/paralist.cxx4
-rw-r--r--editeng/source/outliner/paralist.hxx3
9 files changed, 18 insertions, 17 deletions
diff --git a/editeng/inc/editattr.hxx b/editeng/inc/editattr.hxx
index e00feb41d75b..2b74427f6619 100644
--- a/editeng/inc/editattr.hxx
+++ b/editeng/inc/editattr.hxx
@@ -81,7 +81,7 @@ public:
EditCharAttrib(const EditCharAttrib&) = delete;
EditCharAttrib& operator=(const EditCharAttrib&) = delete;
- void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+ void dumpAsXml(xmlTextWriterPtr pWriter) const;
sal_uInt16 Which() const { return pItem->Which(); }
const SfxPoolItem* GetItem() const { return pItem; }
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index 31c15e201a5e..089addc59c07 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -163,7 +163,7 @@ private:
public:
ContentAttribs( SfxItemPool& rItemPool );
- void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+ void dumpAsXml(xmlTextWriterPtr pWriter) const;
SvxTabStop FindTabStop( sal_Int32 nCurPos, sal_uInt16 nDefTab );
SfxItemSet& GetItems() { return aAttribSet; }
@@ -198,7 +198,7 @@ public:
CharAttribList();
~CharAttribList();
- void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+ void dumpAsXml(xmlTextWriterPtr pWriter) const;
void DeleteEmptyAttribs( SfxItemPool& rItemPool );
@@ -254,7 +254,7 @@ public:
ContentNode(const ContentNode&) = delete;
ContentNode& operator=(const ContentNode&) = delete;
- void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+ void dumpAsXml(xmlTextWriterPtr pWriter) const;
ContentAttribs& GetContentAttribs() { return aContentAttribs; }
const ContentAttribs& GetContentAttribs() const { return aContentAttribs; }
@@ -755,7 +755,7 @@ public:
EditDoc( SfxItemPool* pItemPool );
~EditDoc();
- void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+ void dumpAsXml(xmlTextWriterPtr pWriter) const;
void ClearSpellErrors();
bool IsModified() const { return bModified; }
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index d86d39fbf18a..8c27e0dbf09a 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1788,7 +1788,7 @@ void ContentNode::DestroyWrongList()
mpWrongList.reset();
}
-void ContentNode::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void ContentNode::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST("ContentNode"));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("maString"), BAD_CAST(maString.toUtf8().getStr()));
@@ -1863,7 +1863,7 @@ bool ContentAttribs::HasItem( sal_uInt16 nWhich ) const
return bHasItem;
}
-void ContentAttribs::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void ContentAttribs::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST("ContentAttribs"));
xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("style"), "%s", pStyle->GetName().toUtf8().getStr());
@@ -2659,7 +2659,7 @@ void EditDoc::FindAttribs( ContentNode* pNode, sal_Int32 nStartPos, sal_Int32 nE
}
}
-void EditDoc::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void EditDoc::dumpAsXml(xmlTextWriterPtr pWriter) const
{
bool bOwns = false;
if (!pWriter)
@@ -2980,7 +2980,7 @@ void CharAttribList::DbgCheckAttribs(CharAttribList const& rAttribs)
}
#endif
-void CharAttribList::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void CharAttribList::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST("CharAttribList"));
for (auto const & i : aAttribs) {
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 9925a39ecf74..a301145d9473 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -887,7 +887,7 @@ const EditDoc& EditEngine::GetEditDoc() const
return pImpEditEngine->GetEditDoc();
}
-void EditEngine::dumpAsXmlEditDoc(struct _xmlTextWriter* pWriter) const
+void EditEngine::dumpAsXmlEditDoc(xmlTextWriterPtr pWriter) const
{
pImpEditEngine->GetEditDoc().dumpAsXml(pWriter);
}
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 349ce205104b..24c399db53a1 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -147,7 +147,7 @@ public:
OUString GetText() const;
void SetText( const OUString& rStr );
- void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+ void dumpAsXml(xmlTextWriterPtr pWriter) const;
const XEditAttributesType& GetCharAttribs() const { return maCharAttribs; }
XEditAttributesType& GetCharAttribs() { return maCharAttribs; }
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 5ed48a2b6f11..4d727743cf12 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -691,7 +691,7 @@ void SvxNumRule::Store( SvStream &rStream )
rStream.WriteUInt16( static_cast<sal_uInt16>(nFeatureFlags) );
}
-void SvxNumRule::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void SvxNumRule::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST("SvxNumRule"));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("levelCount"), BAD_CAST(OUString::number(nLevelCount).getStr()));
@@ -973,7 +973,7 @@ bool SvxNumBulletItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberI
return false;
}
-void SvxNumBulletItem::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void SvxNumBulletItem::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST("SvxNumBulletItem"));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 72fece8bfaff..458de0c6df05 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2148,7 +2148,7 @@ void Outliner::ClearOverflowingParaNum()
pEditEngine->ClearOverflowingParaNum();
}
-void Outliner::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void Outliner::dumpAsXml(xmlTextWriterPtr pWriter) const
{
bool bOwns = false;
if (!pWriter)
diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx
index 2dd6a56f8798..db3ec1817ea4 100644
--- a/editeng/source/outliner/paralist.cxx
+++ b/editeng/source/outliner/paralist.cxx
@@ -83,7 +83,7 @@ void Paragraph::SetParaIsNumberingRestart( bool bParaIsNumberingRestart )
mnNumberingStartValue = -1;
}
-void Paragraph::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void Paragraph::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST("Paragraph"));
xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("nDepth"), "%" SAL_PRIdINT32, static_cast<sal_Int32>(nDepth));
@@ -247,7 +247,7 @@ sal_Int32 ParagraphList::GetAbsPos( Paragraph const * pParent ) const
return EE_PARA_NOT_FOUND;
}
-void ParagraphList::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void ParagraphList::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST("ParagraphList"));
for (auto const & pParagraph : maEntries)
diff --git a/editeng/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx
index a3a1b5158c28..e2f67249cf66 100644
--- a/editeng/source/outliner/paralist.hxx
+++ b/editeng/source/outliner/paralist.hxx
@@ -29,6 +29,7 @@
#include <tools/link.hxx>
class Paragraph;
+typedef struct _xmlTextWriter* xmlTextWriterPtr;
class ParagraphList
{
@@ -69,7 +70,7 @@ public:
void SetVisibleStateChangedHdl( const Link<Paragraph&,void>& rLink ) { aVisibleStateChangedHdl = rLink; }
- void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+ void dumpAsXml(xmlTextWriterPtr pWriter) const;
private: