include/sal/log-areas.dox | 1 vcl/inc/textlineinfo.hxx | 5 ---- vcl/source/outdev/font.cxx | 6 ----- vcl/source/outdev/text.cxx | 53 --------------------------------------------- 4 files changed, 65 deletions(-)
New commits: commit afa4a054596e0e850f8886f196e6bdd25bfc0e33 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Dec 14 11:33:28 2016 +0100 Remove the sal.rtl.xub SAL_INFOs ...that were apparently meant to flag cases where conversion from old tools strings to rtl strings was done wrongly. But that flagging is probably of no use: SAL_INFOs are usually disabled, so won't be noticed; and SAL_WARN or assert would not be acceptable, as cases like 'nLen == 0x0FFFF' can legitimately happen with long strings. I did a successful 'make check' with these SAL_INFOs temporarily turned into assert, so there seems to be at least no gross conversion error remaining. Change-Id: I57f11db9119fb12555e3bfef17c077ee5eef3844 diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index c343151e..5175459 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -28,7 +28,6 @@ certain functionality. @li @c sal.osl.mutex @li @c sal.osl.pipe @li @c sal.rtl - SAL RTL library -@li @c sal.rtl.xub - SAL RTL warnings related to possible String->OUString conversion issues. @li @c sal.textenc - the textencoding SAL library @section basctl diff --git a/vcl/inc/textlineinfo.hxx b/vcl/inc/textlineinfo.hxx index a14d774..519aa48 100644 --- a/vcl/inc/textlineinfo.hxx +++ b/vcl/inc/textlineinfo.hxx @@ -30,11 +30,6 @@ private: public: ImplTextLineInfo( long nWidth, sal_Int32 nIndex, sal_Int32 nLen ) { - if(nIndex == -1 || nIndex == 0x0FFFF || nLen == -1 || nLen == 0x0FFFF) - { - SAL_INFO("sal.rtl.xub", - "ImplTextLine Info Suspicious arguments nIndex:" << nIndex << " nLen:" << nLen); - } mnWidth = nWidth; mnIndex = nIndex; mnLen = nLen; diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index fe54a3d..fe5e49c 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -1479,12 +1479,6 @@ bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const OUString& rSt rVector.clear(); - if(nLen == 0x0FFFF) - { - SAL_INFO("sal.rtl.xub", - "GetGlyphBoundRects Suspicious arguments nLen:" << nLen); - } - if( nIndex >= rStr.getLength() ) return false; diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 74ce12f..a3f3d83 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -806,11 +806,6 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr, { assert(!is_double_buffered_window()); - if(nLen == 0x0FFFF) - { - SAL_INFO("sal.rtl.xub", - "DrawText Suspicious arguments nLen:" << nLen); - } if( (nLen < 0) || (nIndex + nLen >= rStr.getLength())) { nLen = rStr.getLength() - nIndex; @@ -929,11 +924,6 @@ void OutputDevice::DrawTextArray( const Point& rStartPt, const OUString& rStr, { assert(!is_double_buffered_window()); - if(nLen == 0x0FFFF) - { - SAL_INFO("sal.rtl.xub", - "DrawTextArray Suspicious arguments nLen:" << nLen); - } if( nLen < 0 || nIndex + nLen >= rStr.getLength() ) { nLen = rStr.getLength() - nIndex; @@ -965,12 +955,6 @@ long OutputDevice::GetTextArray( const OUString& rStr, long* pDXAry, sal_Int32 nIndex, sal_Int32 nLen, vcl::TextLayoutCache const*const pLayoutCache) const { - if(nLen == 0x0FFFF) - { - SAL_INFO("sal.rtl.xub", - "GetTextArray Suspicious arguments nLen:" << nLen); - } - if( nIndex >= rStr.getLength() ) return 0; // TODO: this looks like a buggy caller? @@ -1137,11 +1121,6 @@ void OutputDevice::DrawStretchText( const Point& rStartPt, sal_uLong nWidth, { assert(!is_double_buffered_window()); - if(nIndex < 0 || nIndex == 0x0FFFF || nLen == 0x0FFFF) - { - SAL_INFO("sal.rtl.xub", - "DrawStretchText Suspicious arguments nIndex:" << nIndex << " nLen:" << nLen); - } if( (nLen < 0) || (nIndex + nLen >= rStr.getLength())) { nLen = rStr.getLength() - nIndex; @@ -2101,11 +2080,6 @@ void OutputDevice::DrawCtrlText( const Point& rPos, const OUString& rStr, { assert(!is_double_buffered_window()); - if(nLen == 0x0FFFF) - { - SAL_INFO("sal.rtl.xub", - "DrawCtrlText Suspicious arguments nLen:" << nLen); - } if( (nLen < 0) || (nIndex + nLen >= rStr.getLength())) { nLen = rStr.getLength() - nIndex; @@ -2314,11 +2288,6 @@ OUString OutputDevice::GetNonMnemonicString( const OUString& rStr, sal_Int32& rM SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen, const long* pDXAry) const { - if(nLen == 0x0FFFF) - { - SAL_INFO("sal.rtl.xub", - "GetSysTextLayoutData Suspicious arguments nLen:" << nLen); - } if( (nLen < 0) || (nIndex + nLen >= rStr.getLength())) { nLen = rStr.getLength() - nIndex; @@ -2371,12 +2340,6 @@ bool OutputDevice::GetTextBoundRect( Rectangle& rRect, sal_Int32 nIndex, sal_Int32 nLen, sal_uLong nLayoutWidth, const long* pDXAry ) const { - if(nLen == 0x0FFFF) - { - SAL_INFO("sal.rtl.xub", - "GetTextBoundRect Suspicious arguments nLen:" << nLen); - } - bool bRet = false; rRect.SetEmpty(); @@ -2442,11 +2405,6 @@ bool OutputDevice::GetTextOutlines( basegfx::B2DPolyPolygonVector& rVector, sal_Int32 nIndex, sal_Int32 nLen, sal_uLong nLayoutWidth, const long* pDXArray ) const { - if(nLen == 0x0FFFF) - { - SAL_INFO("sal.rtl.xub", - "GetTextOutlines Suspicious arguments nLen:" << nLen); - } // the fonts need to be initialized if( mbNewFont ) ImplNewFont(); @@ -2540,12 +2498,6 @@ bool OutputDevice::GetTextOutlines( PolyPolyVector& rResultVector, sal_Int32 nIndex, sal_Int32 nLen, sal_uLong nTWidth, const long* pDXArray ) const { - if(nLen == 0x0FFFF) - { - SAL_INFO("sal.rtl.xub", - "GetTextOutlines Suspicious arguments nLen:" << nLen); - } - rResultVector.clear(); // get the basegfx polypolygon vector @@ -2567,11 +2519,6 @@ bool OutputDevice::GetTextOutline( tools::PolyPolygon& rPolyPoly, const OUString sal_Int32 nLen, sal_uLong nTWidth, const long* pDXArray ) const { - if(nLen == 0x0FFFF) - { - SAL_INFO("sal.rtl.xub", - "GetTextOutline Suspicious arguments nLen:" << nLen); - } rPolyPoly.Clear(); // get the basegfx polypolygon vector _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits