[Libreoffice-commits] core.git: sw/source

[Michael Stahl]

 sw/source/filter/ww8/attributeoutputbase.hxx |    2 +-
 sw/source/filter/ww8/docxattributeoutput.cxx |    8 ++------
 sw/source/filter/ww8/docxattributeoutput.hxx |    2 +-
 sw/source/filter/ww8/rtfattributeoutput.cxx  |    2 +-
 sw/source/filter/ww8/rtfattributeoutput.hxx  |    2 +-
 sw/source/filter/ww8/wrtw8sty.cxx            |   13 +++----------
 sw/source/filter/ww8/ww8attributeoutput.hxx  |    2 +-
 7 files changed, 10 insertions(+), 21 deletions(-)

New commits:
commit 2a11499583cfc8c65e2fa99fbcdfdd7b94e966c1
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Jun 6 12:49:17 2016 +0200

    sw: simplify identical branches in WW8AttributeOutput::DefaultStyle
    
    Change-Id: I0d500ecbcd0bc0d6b9f772304345acd4ddb5df11

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index 092153a..d09988f 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -267,7 +267,7 @@ public:
     virtual void EndStyles( sal_uInt16 nNumberOfStyles ) = 0;
 
     /// Write default style.
-    virtual void DefaultStyle( sal_uInt16 nStyle ) = 0;
+    virtual void DefaultStyle() = 0;
 
     /// Start of a style in the styles table.
     virtual void StartStyle( const OUString& rName, StyleType eType,
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6dc190e..9e40395 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4107,14 +4107,10 @@ void DocxAttributeOutput::EndStyles( sal_uInt16 nNumberOfStyles )
     m_pSerializer->endElementNS( XML_w, XML_styles );
 }
 
-void DocxAttributeOutput::DefaultStyle( sal_uInt16 nStyle )
+void DocxAttributeOutput::DefaultStyle()
 {
     // are these the values of enum ww::sti (see ../inc/wwstyles.hxx)?
-#if OSL_DEBUG_LEVEL > 1
-    OSL_TRACE( "TODO DocxAttributeOutput::DefaultStyle( sal_uInt16 nStyle )- %d", nStyle );
-#else
-    (void) nStyle; // to quiet the warning
-#endif
+    OSL_TRACE("TODO DocxAttributeOutput::DefaultStyle()");
 }
 
 /* Writes <a:srcRect> tag back to document.xml if a file conatins a cropped image.
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 611ad01..ab0a43a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -250,7 +250,7 @@ public:
     virtual void EndStyles( sal_uInt16 nNumberOfStyles ) override;
 
     /// Write default style.
-    virtual void DefaultStyle( sal_uInt16 nStyle ) override;
+    virtual void DefaultStyle() override;
 
     /// Write Doc Defaults
     void DocDefaults( );
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 854b599..7fbcee2 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1129,7 +1129,7 @@ void RtfAttributeOutput::EndStyles(sal_uInt16 /*nNumberOfStyles*/)
     m_rExport.Strm().WriteChar('}');
 }
 
-void RtfAttributeOutput::DefaultStyle(sal_uInt16 /*nStyle*/)
+void RtfAttributeOutput::DefaultStyle()
 {
     /* noop, the default style is always 0 in RTF */
 }
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 1c3e32e..baa3cce 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -134,7 +134,7 @@ public:
     virtual void EndStyles(sal_uInt16 nNumberOfStyles) override;
 
     /// Write default style.
-    virtual void DefaultStyle(sal_uInt16 nStyle) override;
+    virtual void DefaultStyle() override;
 
     /// Start of a style in the styles table.
     virtual void StartStyle(const OUString& rName, StyleType eType,
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index e7121af..21fcf62 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -563,16 +563,9 @@ void MSWordStyles::GetStyleData( SwFormat* pFormat, bool& bFormatColl, sal_uInt1
     nNext = GetSlot( pNext );
 }
 
-void WW8AttributeOutput::DefaultStyle( sal_uInt16 nStyle )
+void WW8AttributeOutput::DefaultStyle()
 {
-    if ( nStyle == 10 )           // Default Char-Style ( only WW )
-    {
-        m_rWW8Export.pTableStrm->WriteUInt16(0);   // empty Style
-    }
-    else
-    {
-        m_rWW8Export.pTableStrm->WriteUInt16(0);   // empty Style
-    }
+    m_rWW8Export.pTableStrm->WriteUInt16(0);   // empty Style
 }
 
 void MSWordStyles::OutputStyle(const SwNumRule* pNumRule, sal_uInt16 nPos)
@@ -588,7 +581,7 @@ void MSWordStyles::OutputStyle(const SwNumRule* pNumRule, sal_uInt16 nPos)
 void MSWordStyles::OutputStyle( SwFormat* pFormat, sal_uInt16 nPos )
 {
     if ( !pFormat )
-        m_rExport.AttrOutput().DefaultStyle( nPos );
+        m_rExport.AttrOutput().DefaultStyle();
     else
     {
         bool bFormatColl;
diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx
index f48eb38..68216d2 100644
--- a/sw/source/filter/ww8/ww8attributeoutput.hxx
+++ b/sw/source/filter/ww8/ww8attributeoutput.hxx
@@ -120,7 +120,7 @@ public:
     virtual void EndStyles( sal_uInt16 nNumberOfStyles ) override;
 
     /// Write default style.
-    virtual void DefaultStyle( sal_uInt16 nStyle ) override;
+    virtual void DefaultStyle() override;
 
     /// Start of a style in the styles table.
     virtual void StartStyle( const OUString& rName, StyleType eType,