sw/source/filter/ww8/ww8par.cxx | 31 ------------------------------- sw/source/ui/index/cnttab.cxx | 14 -------------- 2 files changed, 45 deletions(-)
New commits: commit 853e3fb639a540b2a452ee7116ae61e7b581f8fd Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Thu Jan 25 22:24:55 2018 +0100 sw: remove remaining not-compiling debug code to fix dbglevel=2 build Change-Id: Ia94cb6b52d34e741106a9b0c84ec2158465f0843 Reviewed-on: https://gerrit.libreoffice.org/48641 Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> Tested-by: Jenkins <c...@libreoffice.org> diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 3195a498f74c..e658111d03fd 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -392,9 +392,6 @@ public: Sttb(); bool Read(SvStream &rS) override; -#if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* fp ) override; -#endif OUString getStringAtIndex( sal_uInt32 ); }; @@ -427,28 +424,6 @@ bool Sttb::Read( SvStream& rS ) return true; } -#if OSL_DEBUG_LEVEL > 1 -void Sttb::Print( FILE* fp ) -{ - fprintf( fp, "[ 0x%" SAL_PRIxUINT32 " ] Sttb - dump\n", nOffSet); - fprintf( fp, " fExtend 0x%x [expected 0xFFFF ]\n", fExtend ); - fprintf( fp, " cData no. or string data items %d (0x%x)\n", cData, cData ); - - if ( cData ) - { - for (sal_uInt16 index = 0; index < cData; ++index) - { - if (index >= dataItems.size()) - { - fprintf(fp, " Sttb truncated at entry %d(0x%x)\n", static_cast< int >( index ), static_cast< unsigned int >( index )); - break; - } - fprintf(fp," string dataItem[ %d(0x%x) ] has name %s\n", static_cast< int >( index ), static_cast< unsigned int >( index ), OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr() ); - } - } -} -#endif - OUString Sttb::getStringAtIndex( sal_uInt32 index ) { @@ -4756,9 +4731,6 @@ void SwWW8ImplReader::ReadDocInfo() if (!checkSeek(*m_pTableStream, m_xWwFib->m_fcSttbfAssoc) || !aSttb.Read(*m_pTableStream)) SAL_WARN("sw.ww8", "** Read of SttbAssoc data failed!!!! "); m_pTableStream->Seek( nCur ); // return to previous position, is that necessary? -#if OSL_DEBUG_LEVEL > 1 - aSttb.Print( stderr ); -#endif OUString sPath = aSttb.getStringAtIndex( 0x1 ); OUString aURL; // attempt to convert to url (won't work for obvious reasons on linux) @@ -4840,9 +4812,6 @@ void WW8Customizations::Import( SwDocShell* pShell ) SAL_WARN("sw.ww8", "** Read of Customization data failed!!!! "); return; } -#if OSL_DEBUG_LEVEL > 1 - aTCG.Print( stderr ); -#endif aTCG.ImportCustomToolBar( *pShell ); } catch(...) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index bd4e812f8680..70b4a46ec031 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -3333,20 +3333,6 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, Button*, pBtn, void ) return; const long nSpace = m_pCtrlParentWin->GetSizePixel().Width(); -#if OSL_DEBUG_LEVEL > 1 - //find all start/end positions and print it - OUString sMessage("Space: " + OUString::number(nSpace) + " | "); - - for (VclPtr<Control> const & pDebugCtrl : aControlList) - { - long nDebugXPos = pDebugCtrl->GetPosPixel().X(); - long nDebugWidth = pDebugCtrl->GetSizePixel().Width(); - - sMessage += OUString::number(nDebugXPos) + " " - + OUString::number(nDebugXPos + nDebugWidth) + " | "; - } - -#endif long nMove = 0; if(pBtn == m_pLeftScrollWin) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits