[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Noel Grandin (via logerrit)]

 include/sfx2/frmhtml.hxx       |    7 ++-----
 sfx2/source/bastyp/frmhtml.cxx |    5 ++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 5adc833f960d57719d8784dfd53e6070b26bf034
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Oct 29 17:12:14 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Oct 30 08:33:19 2019 +0100

    SfxFrameHTMLParser does not need to extend SfxHTMLParser
    
    since it's constructor is deleted, it is just a standalone function
    
    Change-Id: Ic872ecc6fa360b109224f4d80be64e30a48d84a3
    Reviewed-on: https://gerrit.libreoffice.org/81725
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/sfx2/frmhtml.hxx b/include/sfx2/frmhtml.hxx
index cb1fb6a2335c..c489390ec384 100644
--- a/include/sfx2/frmhtml.hxx
+++ b/include/sfx2/frmhtml.hxx
@@ -27,13 +27,10 @@
 
 class SfxFrameDescriptor;
 
-class SFX2_DLLPUBLIC SfxFrameHTMLParser : public SfxHTMLParser
+namespace SfxFrameHTMLParser
 {
-   SfxFrameHTMLParser() = delete;
-
-public:
     // These methods can also be used by other parsers.
-    static void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions&, const OUString& );
+    SFX2_DLLPUBLIC void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions&, const OUString& );
 
 };
 
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index 5ff72824c7a8..c1641582934f 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -42,7 +42,9 @@ static HTMLOptionEnum<ScrollingMode> const aScrollingTable[] =
     { nullptr,          ScrollingMode(0) }
 };
 
-void SfxFrameHTMLParser::ParseFrameOptions(
+namespace SfxFrameHTMLParser
+{
+void ParseFrameOptions(
     SfxFrameDescriptor *pFrame, const HTMLOptions& rOptions, const OUString& rBaseURL )
 {
     // Get and set the options
@@ -101,5 +103,6 @@ void SfxFrameHTMLParser::ParseFrameOptions(
 
     pFrame->SetMargin( aMargin );
 }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */