Kaydet (Commit) 4ec8afaf authored tarafından Noel Grandin's avatar Noel Grandin

tdf#117075 TOC numberings have incorrect right indent

This reverts parts of
    commit 867a22fd
    Date:   Wed Mar 28 10:00:30 2018 +0200
    loplugin:virtualdown in xmloff/xmlsecurity
and
    commit 73e6a797
    Date:   Thu Mar 29 09:35:22 2018 +0200
    loplugin:unusedmethods

Change-Id: Id4230fafc10bbfe5822f7011a1b1d3d9dff30735
Reviewed-on: https://gerrit.libreoffice.org/53149Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 07c29038
...@@ -43,7 +43,7 @@ public: ...@@ -43,7 +43,7 @@ public:
const OUString& rQName, const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
void ExportContent(); virtual void ExportContent() override;
private: private:
void AddContent( rtl::Reference<XMLAxisOOoContext> const & pContent ); void AddContent( rtl::Reference<XMLAxisOOoContext> const & pContent );
......
...@@ -66,7 +66,7 @@ public: ...@@ -66,7 +66,7 @@ public:
return !m_aChildContexts.empty(); return !m_aChildContexts.empty();
} }
void ExportContent(); virtual void ExportContent() override;
}; };
#endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_DEEPTCONTEXT_HXX #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_DEEPTCONTEXT_HXX
......
...@@ -49,4 +49,9 @@ void XMLPersTextContentTContext::Characters( const OUString& rChars ) ...@@ -49,4 +49,9 @@ void XMLPersTextContentTContext::Characters( const OUString& rChars )
m_aCharacters += rChars; m_aCharacters += rChars;
} }
void XMLPersTextContentTContext::ExportContent()
{
GetTransformer().GetDocHandler()->characters( m_aCharacters );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -51,6 +51,8 @@ public: ...@@ -51,6 +51,8 @@ public:
// current element. // current element.
virtual void Characters( const OUString& rChars ) override; virtual void Characters( const OUString& rChars ) override;
virtual void ExportContent() override;
const OUString& GetTextContent() const { return m_aCharacters; } const OUString& GetTextContent() const { return m_aCharacters; }
}; };
......
...@@ -84,7 +84,7 @@ public: ...@@ -84,7 +84,7 @@ public:
virtual bool IsPersistent() const override; virtual bool IsPersistent() const override;
virtual void Export() override; virtual void Export() override;
void ExportContent(); virtual void ExportContent() override;
const OUString& GetExportQName() const { return m_aElemQName; } const OUString& GetExportQName() const { return m_aElemQName; }
......
...@@ -905,6 +905,13 @@ void XMLStyleOASISTContext::Characters( const OUString& ) ...@@ -905,6 +905,13 @@ void XMLStyleOASISTContext::Characters( const OUString& )
// element content only: // element content only:
} }
void XMLStyleOASISTContext::ExportContent()
{
if( m_xPropContext.is() )
m_xPropContext->Export();
XMLPersElemContentTContext::ExportContent();
}
bool XMLStyleOASISTContext::IsPersistent() const bool XMLStyleOASISTContext::IsPersistent() const
{ {
return m_bPersistent; return m_bPersistent;
......
...@@ -54,6 +54,8 @@ public: ...@@ -54,6 +54,8 @@ public:
virtual void EndElement() override; virtual void EndElement() override;
virtual void Characters( const OUString& rChars ) override; virtual void Characters( const OUString& rChars ) override;
virtual void ExportContent() override;
virtual bool IsPersistent() const override; virtual bool IsPersistent() const override;
static XMLTransformerActions *CreateTransformerActions( sal_uInt16 nType ); static XMLTransformerActions *CreateTransformerActions( sal_uInt16 nType );
......
...@@ -85,4 +85,9 @@ void XMLTransformerContext::Export() ...@@ -85,4 +85,9 @@ void XMLTransformerContext::Export()
OSL_ENSURE( false, "context is not persistent" ); OSL_ENSURE( false, "context is not persistent" );
} }
void XMLTransformerContext::ExportContent()
{
OSL_ENSURE( false, "context is not persistent" );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -91,6 +91,9 @@ public: ...@@ -91,6 +91,9 @@ public:
// Export the whole element. By default, nothing is done here // Export the whole element. By default, nothing is done here
virtual void Export(); virtual void Export();
// Export the element content. By default, nothing is done here
virtual void ExportContent();
}; };
......
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