diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-02-07 17:54:49 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-02-08 09:07:19 +0100 |
| commit | 303f8e5160ddb39914ba7f669698d5dbe958878a (patch) | |
| tree | 9fb7eaf336df3434dd7ffe883323b2513edb427e /sw/inc | |
| parent | 89fa5e45c3cc87cba450aff965918bf5af8f2fa9 (diff) | |
sw HTML import: avoid loading the Writer/Web template for the Writer filter
The share/template/common/internal/html.stw template we have is for
Writer/Web, loading that into Writer is questionable at best. Also it
means that the outline numbering of the heading styles is not set, which
is a problem, as the sw HTML import only sets the style, not the
outline numbering.
Change-Id: I86d11d8a5744c3c2ca71b03fd41a24d3f88ea333
Reviewed-on: https://gerrit.libreoffice.org/49381
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/shellio.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index ac1cd9e50d48..5cbd0f502639 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -211,7 +211,7 @@ protected: bool bIgnoreHTMLComments : 1; bool bSkipImages : 1; - virtual OUString GetTemplateName() const; + virtual OUString GetTemplateName(SwDoc& rDoc) const; public: Reader(); @@ -230,7 +230,7 @@ public: static void ResetFrameFormats( SwDoc& rDoc ); // Load filter template, set it and release it again. - SwDoc* GetTemplateDoc(); + SwDoc* GetTemplateDoc(SwDoc& rDoc); bool SetTemplate( SwDoc& rDoc ); void ClearTemplate(); void SetTemplateName( const OUString& rDir ); |