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

[Miklos Vajna]

 sw/source/core/text/txttab.cxx              |   14 --------------
 sw/source/filter/ww8/rtfattributeoutput.hxx |    2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 832c1f16ddbdc626c6ae11900038e1a88f94b8e4
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Nov 10 09:28:19 2017 +0100

    sw: remove temporary debug code in txttab that no longer builds anyway
    
    Change-Id: I40dfa40dd157046aa5c1285b1855fb8c100fc315
    Reviewed-on: https://gerrit.libreoffice.org/44577
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 908ef295314f..08582e0c1387 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -513,20 +513,6 @@ bool SwTabPortion::PostFormat( SwTextFormatInfo &rInf )
  */
 void SwTabPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
-#if OSL_DEBUG_LEVEL > 1
-    // We want to view the fixed width
-    if( rInf.OnWin() && OPTDBG( rInf ) &&
-        !rInf.GetOpt().IsPagePreview() &&
-        !rInf.GetOpt().IsReadonly() &&
-        SwViewOption::IsFieldShadings()    )
-    {
-        const sal_uInt16 nTmpWidth = PrtWidth();
-        const_cast<SwTabPortion*>(this)->PrtWidth( GetFixWidth() );
-        rInf.DrawViewOpt( *this, POR_TAB );
-        const_cast<SwTabPortion*>(this)->PrtWidth( nTmpWidth );
-    }
-#endif
-
     // #i89179#
     // tab portion representing the list tab of a list label gets the
     // same font as the corresponding number portion
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 9b73bf49f22d..0d21d40b42b2 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -218,7 +218,7 @@ public:
     void WriteBookmarks_Impl(std::vector< OUString >& rStarts, std::vector< OUString >& rEnds);
     void WriteAnnotationMarks_Impl(std::vector< OUString >& rStarts, std::vector< OUString >& rEnds);
     void WriteHeaderFooter_Impl(const SwFrameFormat& rFormat, bool bHeader, const sal_Char* pStr, bool bTitlepg);
-    void WriteBookmarkInActParagraph( const OUString& /*rName*/, sal_Int32 /*nFirstRunPos*/, sal_Int32 /*nLastRunPos*/ ) override {};
+    void WriteBookmarkInActParagraph(const OUString& /*rName*/, sal_Int32 /*nFirstRunPos*/, sal_Int32 /*nLastRunPos*/) override {};
 
 protected:
     /// Output frames - the implementation.