diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-19 12:15:08 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-19 13:12:18 +0200 |
commit | 4ec8afafea320f40806abc7bdc9149a9b26b3d4c (patch) | |
tree | 0c56c5d7e6b3cd8605dc2de30a58c071acf9b3b3 /xmloff | |
parent | 07c29038d0ffb1cb62f47c61f3611b36eaf87f7c (diff) |
tdf#117075 TOC numberings have incorrect right indent
This reverts parts of
commit 867a22fd199e732803c9050fe9f84ad630ec27fb
Date: Wed Mar 28 10:00:30 2018 +0200
loplugin:virtualdown in xmloff/xmlsecurity
and
commit 73e6a7975b3508c5cfccb3df7c35b0303f87d9bb
Date: Thu Mar 29 09:35:22 2018 +0200
loplugin:unusedmethods
Change-Id: Id4230fafc10bbfe5822f7011a1b1d3d9dff30735
Reviewed-on: https://gerrit.libreoffice.org/53149
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/transform/ChartPlotAreaOOoTContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/DeepTContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/FlatTContext.cxx | 5 | ||||
-rw-r--r-- | xmloff/source/transform/FlatTContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/PersAttrListTContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/StyleOASISTContext.cxx | 7 | ||||
-rw-r--r-- | xmloff/source/transform/StyleOASISTContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/TransformerContext.cxx | 5 | ||||
-rw-r--r-- | xmloff/source/transform/TransformerContext.hxx | 3 |
9 files changed, 27 insertions, 3 deletions
diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx index 1554fe6b2ff3..93388283dacb 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx @@ -43,7 +43,7 @@ public: const OUString& rQName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; - void ExportContent(); + virtual void ExportContent() override; private: void AddContent( rtl::Reference<XMLAxisOOoContext> const & pContent ); diff --git a/xmloff/source/transform/DeepTContext.hxx b/xmloff/source/transform/DeepTContext.hxx index c846fdb7c3ef..efbed3b40415 100644 --- a/xmloff/source/transform/DeepTContext.hxx +++ b/xmloff/source/transform/DeepTContext.hxx @@ -66,7 +66,7 @@ public: return !m_aChildContexts.empty(); } - void ExportContent(); + virtual void ExportContent() override; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_DEEPTCONTEXT_HXX diff --git a/xmloff/source/transform/FlatTContext.cxx b/xmloff/source/transform/FlatTContext.cxx index 1b735442fe34..0b00a0314791 100644 --- a/xmloff/source/transform/FlatTContext.cxx +++ b/xmloff/source/transform/FlatTContext.cxx @@ -49,4 +49,9 @@ void XMLPersTextContentTContext::Characters( const OUString& rChars ) m_aCharacters += rChars; } +void XMLPersTextContentTContext::ExportContent() +{ + GetTransformer().GetDocHandler()->characters( m_aCharacters ); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/transform/FlatTContext.hxx b/xmloff/source/transform/FlatTContext.hxx index 0f39c0f4af05..06d525c76df6 100644 --- a/xmloff/source/transform/FlatTContext.hxx +++ b/xmloff/source/transform/FlatTContext.hxx @@ -51,6 +51,8 @@ public: // current element. virtual void Characters( const OUString& rChars ) override; + virtual void ExportContent() override; + const OUString& GetTextContent() const { return m_aCharacters; } }; diff --git a/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx index 0d91cc92ab31..1112376503ce 100644 --- a/xmloff/source/transform/PersAttrListTContext.hxx +++ b/xmloff/source/transform/PersAttrListTContext.hxx @@ -84,7 +84,7 @@ public: virtual bool IsPersistent() const override; virtual void Export() override; - void ExportContent(); + virtual void ExportContent() override; const OUString& GetExportQName() const { return m_aElemQName; } diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index 9d26f853cbee..3546f0bc7377 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -905,6 +905,13 @@ void XMLStyleOASISTContext::Characters( const OUString& ) // element content only: } +void XMLStyleOASISTContext::ExportContent() +{ + if( m_xPropContext.is() ) + m_xPropContext->Export(); + XMLPersElemContentTContext::ExportContent(); +} + bool XMLStyleOASISTContext::IsPersistent() const { return m_bPersistent; diff --git a/xmloff/source/transform/StyleOASISTContext.hxx b/xmloff/source/transform/StyleOASISTContext.hxx index a2a9886d3e45..081bacedb436 100644 --- a/xmloff/source/transform/StyleOASISTContext.hxx +++ b/xmloff/source/transform/StyleOASISTContext.hxx @@ -54,6 +54,8 @@ public: virtual void EndElement() override; virtual void Characters( const OUString& rChars ) override; + virtual void ExportContent() override; + virtual bool IsPersistent() const override; static XMLTransformerActions *CreateTransformerActions( sal_uInt16 nType ); diff --git a/xmloff/source/transform/TransformerContext.cxx b/xmloff/source/transform/TransformerContext.cxx index 6a65ba145c75..fd4005d73274 100644 --- a/xmloff/source/transform/TransformerContext.cxx +++ b/xmloff/source/transform/TransformerContext.cxx @@ -85,4 +85,9 @@ void XMLTransformerContext::Export() OSL_ENSURE( false, "context is not persistent" ); } +void XMLTransformerContext::ExportContent() +{ + OSL_ENSURE( false, "context is not persistent" ); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/transform/TransformerContext.hxx b/xmloff/source/transform/TransformerContext.hxx index 07b0dbcb04b4..0a2446f252d4 100644 --- a/xmloff/source/transform/TransformerContext.hxx +++ b/xmloff/source/transform/TransformerContext.hxx @@ -91,6 +91,9 @@ public: // Export the whole element. By default, nothing is done here virtual void Export(); + + // Export the element content. By default, nothing is done here + virtual void ExportContent(); }; |