diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-07-26 20:14:09 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-07-27 08:35:43 +0200 |
| commit | df2b617b612f24b1dd394faf6fd605bdc69790cb (patch) | |
| tree | b6b4713d0c9f8b2c8322831a0fa680d23b4b5276 | |
| parent | 230125da232510fb2cc08c28fb0bc36222c7600e (diff) | |
sw: document the last parameter of FieldVanish() where it's not used
To resolve docx vs rtf/doc inconsistency.
Change-Id: I349cfb4aa9575df31c29eb35a32d72474d089c6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119527
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
| -rw-r--r-- | sw/source/filter/ww8/attributeoutputbase.hxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.hxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8attributeoutput.hxx | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx index dc86307b40b5..1be43833b109 100644 --- a/sw/source/filter/ww8/attributeoutputbase.hxx +++ b/sw/source/filter/ww8/attributeoutputbase.hxx @@ -207,7 +207,7 @@ public: /// Output URL end. virtual bool EndURL(bool isAtEndOfParagraph) = 0; - virtual void FieldVanish(const OUString& rText, ww::eField eType, OUString const*) = 0; + virtual void FieldVanish(const OUString& rText, ww::eField eType, OUString const* pBookmarkName) = 0; /// MSO uses bookmarks to reference sequence fields, so we need to generate these additional bookmarks during export void GenerateBookmarksForSequenceField(const SwTextNode& rNode, SwWW8AttrIter& rAttrIter); diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 16892f24833b..0323b5ace16e 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -598,7 +598,7 @@ bool RtfAttributeOutput::EndURL(bool const isAtEndOfParagraph) } void RtfAttributeOutput::FieldVanish(const OUString& /*rText*/, ww::eField /*eType*/, - OUString const*) + OUString const* /*pBookmarkName*/) { SAL_INFO("sw.rtf", "TODO: " << __func__); } diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index c3e20ddca49b..3a4bb5a18d9c 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -104,7 +104,8 @@ public: /// Output URL end. bool EndURL(bool isAtEndOfParagraph) override; - void FieldVanish(const OUString& rText, ww::eField eType, OUString const*) override; + void FieldVanish(const OUString& rText, ww::eField eType, + OUString const* pBookmarkName) override; /// Output redlining. /// diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index d2735ca3c8e3..5eeb9f6001f5 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -1250,7 +1250,7 @@ void SwWW8AttrIter::SplitRun( sal_Int32 nSplitEndPos ) nCurrentSwPos = SearchNext(1); } -void WW8AttributeOutput::FieldVanish(const OUString& rText, ww::eField /*eType*/, OUString const*const) +void WW8AttributeOutput::FieldVanish(const OUString& rText, ww::eField /*eType*/, OUString const*const /*pBookmarkName*/) { ww::bytes aItems; m_rWW8Export.GetCurrentItems( aItems ); diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index f601cd361303..aee7ce33f2f0 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.hxx @@ -84,7 +84,7 @@ public: /// Output URL end. virtual bool EndURL(bool) override; - virtual void FieldVanish(const OUString& rText, ww::eField eType, OUString const*) override; + virtual void FieldVanish(const OUString& rText, ww::eField eType, OUString const* pBookmarkName) override; /// Output redlining. virtual void Redline( const SwRedlineData* pRedline ) override; |