[Libreoffice-commits] .: 3 commits - binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_svtools binfilter/bf_sw binfilter/bf_xmloff binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jan 5 01:20:00 PST 2012
binfilter/bf_sc/source/core/tool/sc_interpr2.cxx | 16
binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx | 3
binfilter/bf_sch/source/core/sch_chtmodel.cxx | 6
binfilter/bf_sch/source/core/sch_memchrt.cxx | 6
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx | 10
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx | 10
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx | 5
binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx | 10
binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx | 10
binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx | 14
binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx | 11
binfilter/bf_svtools/source/numbers/svt_zforlist.cxx | 7
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx | 180 ----------
binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx | 8
binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx | 26 -
binfilter/bf_sw/source/core/layout/sw_laycache.cxx | 9
binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx | 3
binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx | 18 -
binfilter/bf_sw/source/core/text/sw_frmform.cxx | 76 ----
binfilter/bf_sw/source/core/text/sw_guess.cxx | 11
binfilter/bf_sw/source/core/text/sw_itrform2.cxx | 3
binfilter/bf_sw/source/core/text/sw_txtfrm.cxx | 4
binfilter/bf_sw/source/core/text/sw_txtftn.cxx | 13
binfilter/bf_sw/source/core/text/sw_txtio.cxx | 6
binfilter/bf_sw/source/core/unocore/sw_unofield.cxx | 3
binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx | 8
binfilter/bf_sw/source/core/unocore/sw_unoportenum.cxx | 6
binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx | 9
binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx | 26 -
binfilter/inc/bf_sw/iodetect.hxx | 17
31 files changed, 62 insertions(+), 476 deletions(-)
New commits:
commit 96bcd0c08004d7bd69c3a77c731f3401ceafede0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 28 08:55:15 2011 +0000
WaE and build errors with OSL_DEBUG_LEVEL == 2
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
index 2d2cef7..9f47454 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
@@ -1865,22 +1865,6 @@ void ScInterpreter::ScBase()
// so ist es etwas besser
double fInt = ::rtl::math::approxFloor( fVal / fBase );
double fMult = fInt * fBase;
-#if OSL_DEBUG_LEVEL > 1
- // #53943# =BASIS(1e308;36) => GPF mit
- // nDig = (size_t) ::rtl::math::approxFloor( fVal - fMult );
- // trotz vorheriger Pruefung ob fVal >= fMult
- double fDebug1 = fVal - fMult;
- // fVal := 7,5975311883090e+290
- // fMult := 7,5975311883090e+290
- // fDebug1 := 1,3848924157003e+275 <- RoundOff-Error
- // fVal != fMult, aber: ::rtl::math::approxEqual( fVal, fMult ) == TRUE
- double fDebug2 = ::rtl::math::approxSub( fVal, fMult );
- // und ::rtl::math::approxSub( fVal, fMult ) == 0
- double fDebug3 = ( fInt ? fVal / fInt : 0.0 );
- // Nach dem strange fDebug1 und fVal < fMult ist eigentlich
- // fDebug2 == fBase, trotzdem wird das mit einem Vergleich
- // nicht erkannt, dann schlaegt bDirt zu und alles wird wieder gut..
-#endif
size_t nDig;
if ( fVal < fMult )
{ // da ist was gekippt
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
index a1bceb8..463caa3 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
@@ -936,9 +936,6 @@ void ScFormatRangeStyles::GetFormatRanges(const sal_Int32 nStartColumn, const sa
sal_Int32 nColumns = 0;
while (aItr != pFormatRanges->end() && nColumns < nTotalColumns)
{
-#if OSL_DEBUG_LEVEL > 1
- table::CellRangeAddress aTempRangeAddress = (*aItr).aRangeAddress;
-#endif
if (((*aItr).aRangeAddress.StartRow <= nRow) &&
((*aItr).aRangeAddress.EndRow >= nRow))
{
diff --git a/binfilter/bf_sch/source/core/sch_memchrt.cxx b/binfilter/bf_sch/source/core/sch_memchrt.cxx
index 73b8138..a7db746 100644
--- a/binfilter/bf_sch/source/core/sch_memchrt.cxx
+++ b/binfilter/bf_sch/source/core/sch_memchrt.cxx
@@ -777,9 +777,9 @@ using namespace ::com::sun::star;
/*N*/ nDelimiterPos >= nEndPos )
/*N*/ {
/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ String aStr( rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ));
-/*N*/ ByteString aBstr( aStr, RTL_TEXTENCODING_ASCII_US );
-/*N*/ OSL_TRACE( "Invalid Cell Address <%s> found in XML file", aBstr.GetBuffer());
+/*N*/ rtl::OUString aStr( rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ));
+/*N*/ rtl::OString aBstr(rtl::OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US));
+/*N*/ OSL_TRACE( "Invalid Cell Address <%s> found in XML file", aBstr.getStr());
/*N*/ #endif
/*N*/ return false;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
index 232037b..7f3f5df 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
@@ -657,14 +657,6 @@ static int
/*M*/ SwCalcOper SwCalc::GetToken()
/*M*/ {
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*M*/ // static for switch back to the "old" implementation of the
-/*M*/ // calculator, which don't use the I18N routines.
-/*M*/ static int nUseOld = 0;
-/*M*/ if( !nUseOld )
-/*M*/ {
-/*M*/ #endif
-/*M*/
/*M*/ if( nCommandPos >= sCommand.Len() )
/*M*/ return eCurrOper = CALC_ENDCALC;
/*M*/
@@ -850,178 +842,6 @@ static int
/*M*/ nCommandPos = (xub_StrLen)aRes.EndPos;
/*M*/ };
/*M*/
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*M*/
-/*M*/ #define NextCh( s, n ) (nCommandPos < sCommand.Len() ? sCommand.GetChar( nCommandPos++ ) : 0)
-/*M*/
-/*M*/ }
-/*M*/ else
-/*M*/ {
-/*M*/ sal_Unicode ch;
-/*M*/ sal_Unicode cTSep = pLclData->getNumThousandSep().GetChar(0),
-/*M*/ cDSep = pLclData->getNumDecimalSep().GetChar(0);
-/*M*/
-/*M*/ do {
-/*M*/ if( 0 == ( ch = NextCh( sCommand, nCommandPos ) ) )
-/*M*/ return eCurrOper = CALC_ENDCALC;
-/*M*/ } while ( ch == '\t' || ch == ' ' || ch == cTSep );
-/*M*/
-/*M*/ if( ch == cDSep )
-/*M*/ ch = '.';
-/*M*/
-/*M*/ switch( ch )
-/*M*/ {
-/*M*/ case ';':
-/*M*/ case '\n':
-/*M*/ {
-/*M*/ sal_Unicode c;
-/*M*/ while( nCommandPos < sCommand.Len() && ( ( c =
-/*M*/ sCommand.GetChar( nCommandPos ) ) == ' ' ||
-/*M*/ c == '\t' || c == '\x0a' || c == '\x0d' ))
-/*M*/ ++nCommandPos;
-/*M*/ eCurrOper = CALC_PRINT;
-/*M*/ }
-/*M*/ break;
-/*M*/ case '%':
-/*M*/ case '^':
-/*M*/ case '*':
-/*M*/ case '/':
-/*M*/ case '+':
-/*M*/ case '-':
-/*M*/ case '(':
-/*M*/ case ')': eCurrOper = SwCalcOper(ch);
-/*M*/ break;
-/*M*/
-/*M*/ case '=': if( '=' == sCommand.GetChar( nCommandPos ) )
-/*M*/ {
-/*M*/ ++nCommandPos;
-/*M*/ eCurrOper = CALC_EQ;
-/*M*/ }
-/*M*/ else
-/*M*/ eCurrOper = SwCalcOper(ch);
-/*M*/ break;
-/*M*/
-/*M*/ case '!': if( '=' == sCommand.GetChar( nCommandPos ) )
-/*M*/ {
-/*M*/ ++nCommandPos;
-/*M*/ eCurrOper = CALC_NEQ;
-/*M*/ }
-/*M*/ else
-/*M*/ eCurrOper = CALC_NOT;
-/*M*/ break;
-/*M*/
-/*M*/ case '>':
-/*M*/ case '<': eCurrOper = '>' == ch ? CALC_GRE : CALC_LES;
-/*M*/ if( '=' == (ch = sCommand.GetChar( nCommandPos ) ) )
-/*M*/ {
-/*M*/ ++nCommandPos;
-/*M*/ eCurrOper = CALC_GRE == eCurrOper ? CALC_GEQ : CALC_LEQ;
-/*M*/ }
-/*M*/ else if( ' ' != ch )
-/*M*/ {
-/*M*/ eError = CALC_SYNTAX;
-/*M*/ eCurrOper = CALC_PRINT;
-/*M*/ }
-/*M*/ break;
-/*M*/
-/*M*/ case cListDelim :
-/*M*/ eCurrOper = eCurrListOper;
-/*M*/ break;
-/*M*/
-/*M*/ case '0': case '1': case '2': case '3': case '4':
-/*M*/ case '5': case '6': case '7': case '8': case '9':
-/*M*/ case ',':
-/*M*/ case '.': break;
-/*M*/
-/*M*/ case '[': {
-/*M*/ String aStr;
-/*M*/ BOOL bIgnore = FALSE;
-/*M*/ do {
-/*M*/ while( ( ch = NextCh( sCommand, nCommandPos ))
-/*M*/ && ch != ']' )
-/*M*/ {
-/*M*/ if( !bIgnore && '\\' == ch )
-/*M*/ bIgnore = TRUE;
-/*M*/ else if( bIgnore )
-/*M*/ bIgnore = FALSE;
-/*M*/ aStr += ch;
-/*M*/ }
-/*M*/
-/*M*/ if( !bIgnore )
-/*M*/ break;
-/*M*/
-/*M*/ aStr.SetChar( aStr.Len() - 1, ch );
-/*M*/ } while( ch );
-/*M*/
-/*M*/ aVarName = aStr;
-/*M*/ eCurrOper = CALC_NAME;
-/*M*/ }
-/*M*/ break;
-/*M*/
-/*M*/ case '"': {
-/*M*/ xub_StrLen nStt = nCommandPos;
-/*M*/ while( ( ch = NextCh( sCommand, nCommandPos ))
-/*M*/ && '"' != ch )
-/*M*/ ;
-/*M*/
-/*M*/ xub_StrLen nLen = nCommandPos - nStt;
-/*M*/ if( '"' == ch )
-/*M*/ --nLen;
-/*M*/ nNumberValue.PutString( sCommand.Copy( nStt, nLen ));
-/*M*/ eCurrOper = CALC_NUMBER;
-/*M*/ }
-/*M*/ break;
-/*M*/
-/*M*/ default: if( ch && pCharClass->isLetter( sCommand, nCommandPos - 1)
-/*M*/ || '_' == ch )
-/*M*/ {
-/*M*/ xub_StrLen nStt = nCommandPos-1;
-/*M*/ while( 0 != (ch = NextCh( sCommand, nCommandPos )) &&
-/*M*/ (pCharClass->isLetterNumeric(
-/*M*/ sCommand, nCommandPos - 1) ||
-/*M*/ ch == '_' || ch == '.' ) )
-/*M*/ ;
-/*M*/
-/*M*/ if( ch )
-/*M*/ --nCommandPos;
-/*M*/
-/*M*/ String aStr( sCommand.Copy( nStt, nCommandPos-nStt ));
-/*M*/ pCharClass->toLower( aStr );
-/*M*/
-/*M*/
-/*M*/ // Currency-Symbol abfangen
-/*M*/ if( aStr == sCurrSym )
-/*M*/ return GetToken(); // also nochmal aufrufen
-/*M*/
-/*M*/ // Operations abfangen
-/*M*/ _CalcOp* pFnd = ::binfilter::FindOperator( aStr );
-/*M*/ if( pFnd )
-/*M*/ {
-/*M*/ switch( ( eCurrOper = ((_CalcOp*)pFnd)->eOp ) )
-/*M*/ {
-/*M*/ case CALC_SUM :
-/*M*/ case CALC_MEAN : eCurrListOper = CALC_PLUS;
-/*M*/ break;
-/*M*/ case CALC_MIN : eCurrListOper = CALC_MIN_IN;
-/*M*/ break;
-/*M*/ case CALC_MAX : eCurrListOper = CALC_MAX_IN;
-/*M*/ break;
-/*M*/ }
-/*M*/ return eCurrOper;
-/*M*/ }
-/*M*/ aVarName = aStr;
-/*M*/ eCurrOper = CALC_NAME;
-/*M*/ }
-/*M*/ else
-/*M*/ {
-/*M*/ eError = CALC_SYNTAX;
-/*M*/ eCurrOper = CALC_PRINT;
-/*M*/ }
-/*M*/ break;
-/*M*/ }
-/*M*/
-/*M*/ }
-/*M*/ #endif
/*M*/ return eCurrOper;
/*M*/ }
diff --git a/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx
index a80dc82..d5d84ff 100644
--- a/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx
@@ -505,31 +505,12 @@ namespace binfilter {
/*N*/
/*N*/ SwTwips SwFtnFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
/*N*/ {
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ static USHORT nNum = USHRT_MAX;
-/*N*/ SwTxtFtn* pTxtFtn = GetAttr();
-/*N*/ if ( pTxtFtn->GetFtn().GetNumber() == nNum )
-/*N*/ {
-/*?*/ int bla = 5;
-/*N*/ }
-/*N*/ #endif
/*N*/ return SwLayoutFrm::GrowFrm( nDist, bTst, bInfo );
/*N*/ }
/*N*/ SwTwips SwFtnFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
/*N*/ {
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ static USHORT nNum = USHRT_MAX;
-/*N*/ if( nNum != USHRT_MAX )
-/*N*/ {
-/*?*/ SwTxtFtn* pTxtFtn = GetAttr();
-/*?*/ if( &pTxtFtn->GetAttr() && pTxtFtn->GetFtn().GetNumber() == nNum )
-/*?*/ {
-/*?*/ int bla = 5;
-/*?*/ }
-/*N*/ }
-/*N*/ #endif
/*N*/ return SwLayoutFrm::ShrinkFrm( nDist, bTst, bInfo );
/*N*/ }
/*N*/ #endif
@@ -1007,13 +988,6 @@ namespace binfilter {
/*N*/ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
/*N*/ {
-/*N*/ #if (OSL_DEBUG_LEVEL > 1) && defined(DBG_UTIL)
-/*N*/ static USHORT nStop = 0;
-/*N*/ if ( nStop == pNew->GetFrmId() )
-/*N*/ {
-/*?*/ int bla = 5;
-/*N*/ }
-/*N*/ #endif
/*N*/ //Die Fussnote haben wir, sie muss jetzt nur noch irgendwo
/*N*/ //hin und zwar vor die Fussnote, deren Attribut vor das
/*N*/ //der neuen zeigt (Position wird ueber das Doc ermittelt)
diff --git a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
index 6f35e6e..ac6abe2 100644
--- a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
@@ -341,10 +341,7 @@ namespace binfilter {
/*N*/ ( ++nIndex < pImpl->Count() &&
/*N*/ pImpl->GetBreakIndex( nIndex ) == nNodeIndex ) ) )
/*?*/ bFirst = FALSE;
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ ULONG nBreakIndex = ( pImpl && nIndex < pImpl->Count() ) ?
-/*N*/ pImpl->GetBreakIndex(nIndex) : 0xffff;
-/*N*/ #endif
+/*N*/
/*N*/ // always split a big tables.
/*N*/ if ( !bFirst ||
/*N*/ ( rpFrm->IsTabFrm() && bLongTab )
@@ -355,10 +352,6 @@ namespace binfilter {
/*N*/ {
/*N*/ if( pImpl || bLongTab )
/*N*/ {
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ ULONG nBrkIndex = ( pImpl && nIndex < pImpl->Count() ) ?
-/*N*/ pImpl->GetBreakIndex(nIndex) : 0xffff;
-/*N*/ #endif
/*N*/ xub_StrLen nOfst = STRING_LEN;
/*N*/ USHORT nType = SW_LAYCACHE_IO_REC_PAGES;
/*N*/ if( bLongTab )
diff --git a/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx
index 9156e09..b2f85e4 100644
--- a/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx
@@ -528,9 +528,6 @@ namespace binfilter {
/*N*/ if( !bValidPos && ToMaximize( FALSE ) )
/*N*/ bValidSize = FALSE;
/*N*/
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ const SwFmtCol &rCol = GetFmt()->GetCol();
-/*N*/ #endif
/*N*/ SwLayoutFrm::MakeAll();
/*N*/ UnlockJoin();
/*N*/ if( pSection && IsSuperfluous() )
diff --git a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
index 2c7864d..0c1a837 100644
--- a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
@@ -86,16 +86,6 @@ namespace binfilter {
/*N*/ , pPrev( 0 )
/*N*/ , pDrawObjs( 0 )
/*N*/ {
-/*N*/ #ifdef DBG_UTIL
-/*N*/ bFlag01 = bFlag02 = bFlag03 = bFlag04 = bFlag05 = 0;
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ static USHORT nStopAt = USHRT_MAX;
-/*N*/ if ( nFrmId == nStopAt )
-/*N*/ {
-/*N*/ int bla = 5;
-/*N*/ }
-/*N*/ #endif
-/*N*/ #endif
/*N*/
/*N*/ OSL_ENSURE( pMod, "Kein Frameformat uebergeben." );
/*N*/ bInvalidR2L = bInvalidVert = 1;
@@ -296,14 +286,6 @@ namespace binfilter {
|*************************************************************************/
/*N*/ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const
/*N*/ {
-/*N*/ #if (OSL_DEBUG_LEVEL > 1) && defined(DBG_UTIL)
-/*N*/ static USHORT nStop = 0;
-/*N*/ if ( nStop == GetFrmId() )
-/*N*/ {
-/*N*/ int bla = 5;
-/*N*/ }
-/*N*/ #endif
-/*N*/
/*N*/ if ( !pPage )
/*N*/ pPage = FindPageFrm();
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
index 09a5171..5f21f94 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
@@ -549,10 +549,6 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ // Der Ofst hat sich verschoben.
/*N*/ if( GetFollow() )
/*N*/ {
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ static sal_Bool bTest = sal_False;
-/*N*/ if( !bTest || ( nMode & 1 ) )
-/*N*/ #endif
/*N*/ if ( nMode )
/*N*/ GetFollow()->ManipOfst( 0 );
/*N*/
@@ -1561,25 +1557,6 @@ MSHORT FormatLevel::nLevel = 0;
/*M*/ void SwTxtFrm::Format( const SwBorderAttrs * )
/*M*/ {
-///*M*/ DBG_LOOP;
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*M*/ const XubString aXXX = GetTxtNode()->GetTxt();
-/*M*/ const SwTwips nDbgY = Frm().Top();
-/*M*/ const SwPageFrm *pDbgPage = FindPageFrm();
-/*M*/ const MSHORT nDbgPageNr = pDbgPage->GetPhyPageNum();
-/*M*/ // Um zu gucken, ob es einen Ftn-Bereich gibt.
-/*M*/ const SwFrm *pDbgFtnCont = (const SwFrm*)(FindPageFrm()->FindFtnCont());
-/*M*/
-/*M*/ #ifdef DBG_UTIL
-/*M*/ // nStopAt laesst sich vom CV bearbeiten.
-/*M*/ static MSHORT nStopAt = 0;
-/*M*/ if( nStopAt == GetFrmId() )
-/*M*/ {
-/*M*/ int i = GetFrmId();
-/*M*/ }
-/*M*/ #endif
-/*M*/ #endif
-/*M*/
/*M*/ MSHORT nRepeat = 0;
/*M*/
/*M*/ SWRECTFN( this )
@@ -1633,15 +1610,6 @@ MSHORT FormatLevel::nLevel = 0;
/*M*/ // Waehrend wir formatieren, wollen wir nicht gestoert werden.
/*M*/ SwTxtFrmLocker aLock(this);
/*M*/
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*M*/ //MA 25. Jan. 94 Das Flag stimmt sehr haufig beim Eintritt nicht. Das muss
-/*M*/ // bei naechster Gelegenheit geprueft und gefixt werden.
-/*M*/ const sal_Bool bOldFtnFlag = HasFtn();
-/*M*/ CalcFtnFlag();
-/*M*/ if ( bOldFtnFlag != HasFtn() )
-/*M*/ {int bla = 5;}
-/*M*/ #endif
-/*M*/
/*M*/ // 8708: Vorsicht, das Format() kann auch durch GetFormatted()
/*M*/ // angestossen werden.
/*M*/ if( IsHiddenNow() )
@@ -1741,32 +1709,6 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ if ( pPara )
/*N*/ pPara->SetPrepMustFit( sal_False );
/*N*/
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*M*/ // Hier ein Instrumentarium, um ungewoehnlichen Master/Follow-Kombinationen,
-/*M*/ // insbesondere bei Fussnoten, auf die Schliche zu kommen
-/*M*/ if( IsFollow() || GetFollow() )
-/*M*/ {
-/*M*/ SwTxtFrm *pTmpFrm = IsFollow() ? FindMaster() : this;
-/*M*/ const SwPageFrm *pTmpPage = pTmpFrm->FindPageFrm();
-/*M*/ MSHORT nPgNr = pTmpPage->GetPhyPageNum();
-/*M*/ MSHORT nLast;
-/*M*/ MSHORT nDummy = 0; // nur zum Breakpoint setzen
-/*M*/ while( pTmpFrm->GetFollow() )
-/*M*/ {
-/*M*/ pTmpFrm = pTmpFrm->GetFollow();
-/*M*/ nLast = nPgNr;
-/*M*/ pTmpPage = pTmpFrm->FindPageFrm();
-/*M*/ nPgNr = pTmpPage->GetPhyPageNum();
-/*M*/ if( nLast > nPgNr )
-/*M*/ ++nDummy; // schon fast eine Assertion wert
-/*M*/ else if( nLast == nPgNr )
-/*M*/ ++nDummy; // bei Spalten voellig normal, aber sonst!?
-/*M*/ else if( nLast < nPgNr - 1 )
-/*M*/ ++nDummy; // kann schon mal temporaer vorkommen
-/*M*/ }
-/*M*/ }
-/*M*/ #endif
-/*N*/
/*N*/ CalcBaseOfstForFly();
/*M*/ }
@@ -1781,20 +1723,6 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
/*N*/ "SwTxtFrm::FormatQuick with swapped frame" );
/*N*/
-///*N*/ DBG_LOOP;
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ const XubString aXXX = GetTxtNode()->GetTxt();
-/*N*/ const SwTwips nDbgY = Frm().Top();
-/*N*/ #ifdef DBG_UTIL
-/*N*/ // nStopAt laesst sich vom CV bearbeiten.
-/*N*/ static MSHORT nStopAt = 0;
-/*N*/ if( nStopAt == GetFrmId() )
-/*N*/ {
-/*?*/ int i = GetFrmId();
-/*N*/ }
-/*N*/ #endif
-/*N*/ #endif
-/*N*/
/*N*/ if( IsEmpty() && FormatEmpty() )
/*N*/ return sal_True;
/*N*/
@@ -1837,10 +1765,6 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ const SwTwips nOldHeight = aTopLeft.Y() + Prt().Height();
/*N*/ if( nNewHeight != nOldHeight && !IsUndersized() )
/*N*/ {
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*?*/ // Achtung: Durch FormatLevel==12 kann diese Situation auftreten, don't panic!
-/*?*/ // OSL_ENSURE( nNewHeight == nOldHeight, "!FormatQuick: rosebud" );
-/*?*/ #endif
/*?*/ xub_StrLen nStrt = GetOfst();
/*?*/ _InvalidateRange( SwCharRange( nStrt, nEnd - nStrt) );
/*?*/ return sal_False;
diff --git a/binfilter/bf_sw/source/core/text/sw_guess.cxx b/binfilter/bf_sw/source/core/text/sw_guess.cxx
index 1ef3345..30dda36 100644
--- a/binfilter/bf_sw/source/core/text/sw_guess.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_guess.cxx
@@ -404,17 +404,6 @@ using rtl::OUString;
/*M*/ xHyphWord = aResult.rHyphenatedWord;
/*M*/ nBreakPos += xHyphWord->getHyphenationPos() + 1;
/*M*/
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*M*/ // e.g., Schif-fahrt, referes to our string
-/*M*/ const String aWord = xHyphWord->getWord();
-/*M*/ // e.g., Schiff-fahrt, referes to the word after hyphenation
-/*M*/ const String aHyphenatedWord = xHyphWord->getHyphenatedWord();
-/*M*/ // e.g., Schif-fahrt: 5, referes to our string
-/*M*/ const USHORT nHyphenationPos = xHyphWord->getHyphenationPos();
-/*M*/ // e.g., Schiff-fahrt: 6, referes to the word after hyphenation
-/*M*/ const USHORT nHyphenPos = xHyphWord->getHyphenPos();
-/*M*/ #endif
-/*M*/
/*M*/ // if not in interactive mode, we have to break behind a soft hyphen
/*M*/ if ( ! rInf.IsInterHyph() && rInf.GetIdx() )
/*M*/ {
diff --git a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
index 1d73869..60fddf3 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
@@ -1506,9 +1506,6 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*N*/ default: OSL_FAIL( ": unknown InterLineSpaceRule" );
/*N*/ }
/*N*/ }
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ KSHORT nDummy = nLineHeight + 1;
-/*N*/ #endif
/*N*/
/*N*/ if( IsRegisterOn() )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/text/sw_txtftn.cxx b/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
index 21f357e..2c3ce29 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
@@ -497,10 +497,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/
/*N*/ SwFtnBossFrm *pBoss = pCntnt->FindFtnBossFrm( !bEnd );
/*N*/
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ SwTwips nRstHeight = GetRstHeight();
-/*N*/ #endif
-/*N*/
/*N*/ pSect = pBoss->FindSctFrm();
/*N*/ sal_Bool bDocEnd = bEnd ? !( pSect && pSect->IsEndnAtEnd() ) :
/*N*/ ( !( pSect && pSect->IsFtnAtEnd() ) &&
@@ -605,15 +601,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*?*/ ValidateFrm();
/*N*/ }
/*N*/
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ // pFtnFrm kann sich durch Calc veraendert haben ...
-/*N*/ SwFtnFrm *pFtnFrm = pBoss->FindFtn( this, pFtn );
-/*N*/ if( pFtnFrm && pBoss != pFtnFrm->FindFtnBossFrm( !bEnd ) )
-/*N*/ {
-/*N*/ int bla = 5;
-/*N*/ }
-/*N*/ nRstHeight = GetRstHeight();
-/*N*/ #endif
/*N*/ bInFtnConnect = sal_False;
/*N*/ return;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_txtio.cxx b/binfilter/bf_sw/source/core/text/sw_txtio.cxx
index 044ec1a..743a92a 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtio.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtio.cxx
@@ -446,8 +446,10 @@ namespace binfilter {
/*N*/
/*N*/ SvStream &SwFlyCntPortion::operator<<( SvStream &rOs ) const //$ ostream
/*N*/ {
-/*N*/ CONSTCHAR( pTxt, " {FLYCNT:" );
-/*N*/ rOs << pTxt;
+/*N*/ {
+/*N*/ CONSTCHAR( pTxt, " {FLYCNT:" );
+/*N*/ rOs << pTxt;
+/*N*/ }
/*N*/ SwLinePortion::operator<<( rOs );
/*N*/ if( bDraw )
/*N*/ {
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
index fae1ada..faa370d 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
@@ -925,12 +925,13 @@ void SchXMLExportHelper::exportPlotArea( uno::Reference< chart::XDiagram > xDiag
rShapeExport->export3DSceneAttributes( xPropSet );
}
}
- catch( uno::Exception aEx )
+ catch (const uno::Exception &rEx)
{
#if OSL_DEBUG_LEVEL > 1
- String aStr( aEx.Message );
- ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "chart:exportPlotAreaException caught: %s", aBStr.GetBuffer());
+ rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "chart:exportPlotAreaException caught: %s", aBStr.getStr());
+#else
+ (void)rEx;
#endif
}
}
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx
index d0c9125..2d7576c 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx
@@ -365,9 +365,9 @@ void SchXMLPlotAreaContext::EndElement()
xProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NumberOfLines" )),
uno::makeAny( mnNumOfLines ));
}
- catch (const uno::Exception & aEx)
+ catch (const uno::Exception &rEx)
{
- rtl::OString aBStr(rtl::OUStringToOString(aEx.Message, RTL_TEXTENCODING_ASCII_US));
+ rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
OSL_TRACE( "Exception caught for property NumberOfLines: %s", aBStr.getStr());
}
}
@@ -381,9 +381,9 @@ void SchXMLPlotAreaContext::EndElement()
xProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Volume" )),
uno::makeAny( mbStockHasVolume ));
}
- catch (const uno::Exception & aEx)
+ catch (const uno::Exception &rEx)
{
- rtl::OString aBStr(rtl::OUStringToOString(aEx.Message, RTL_TEXTENCODING_ASCII_US));
+ rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
OSL_TRACE( "Exception caught for property NumberOfLines: %s", aBStr.getStr());
}
}
@@ -473,12 +473,13 @@ void SchXMLPlotAreaContext::EndElement()
}
}
}
- catch( uno::Exception aEx )
+ catch (const uno::Exception& rEx)
{
#if OSL_DEBUG_LEVEL > 1
- String aStr( aEx.Message );
- ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "PlotAreaContext:EndElement(): Exception caught: %s", aBStr.GetBuffer());
+ rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "PlotAreaContext:EndElement(): Exception caught: %s", aBStr.getStr());
+#else
+ (void)rEx;
#endif
}
}
@@ -510,12 +511,13 @@ void SchXMLPlotAreaContext::EndElement()
(( XMLPropStyleContext* )pStyle )->FillPropertySet( xProp );
}
}
- catch( uno::Exception aEx )
+ catch (const uno::Exception& rEx)
{
#if OSL_DEBUG_LEVEL > 1
- String aStr( aEx.Message );
- ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "PlotAreaContext:EndElement(): Exception caught: %s", aBStr.GetBuffer());
+ rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "PlotAreaContext:EndElement(): Exception caught: %s", aBStr.getStr());
+#else
+ (void)rEx;
#endif
}
}
commit 22ac5294ce1777d556c682f8332c512aba95b283
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Dec 27 21:46:35 2011 +0000
bizarre to support extra format variations at an arbitrary debug level
diff --git a/binfilter/inc/bf_sw/iodetect.hxx b/binfilter/inc/bf_sw/iodetect.hxx
index d81c4db..b939acd 100644
--- a/binfilter/inc/bf_sw/iodetect.hxx
+++ b/binfilter/inc/bf_sw/iodetect.hxx
@@ -156,19 +156,6 @@ struct W1_FIB
USHORT fFlagsGet() { return SVBT16ToShort(fFlags); }
BOOL fComplexGet() { return ((fFlagsGet() >> 2) & 1); }
};
-#if OSL_DEBUG_LEVEL > 1
-#define WW2B || ((W1_FIB*)pHeader)->wIdentGet() == 0xA5DB && \
- ((W1_FIB*)pHeader)->nFibGet() == 0x2D
-#else
-#define WW2B
-#endif
-
-#if OSL_DEBUG_LEVEL > 1
-#define WW3B || ((W1_FIB*)pHeader)->wIdentGet() == 0xA5DC && \
- ((W1_FIB*)pHeader)->nFibGet() == 0x65
-#else
-#define WW3B
-#endif
#define IO_DETECT_IMPL2 \
const sal_Char* SwIoDetect::IsReader(const sal_Char* pHeader, ULONG nInLen )\
@@ -204,8 +191,8 @@ const sal_Char* SwIoDetect::IsReader(const sal_Char* pHeader, ULONG nInLen )\
else if( sWW1 == pName ) \
{ \
bRet = (( ((W1_FIB*)pHeader)->wIdentGet() == 0xA59C \
- && ((W1_FIB*)pHeader)->nFibGet() == 0x21 \
- WW2B ) && ((W1_FIB*)pHeader)->fComplexGet() == 0); \
+ && ((W1_FIB*)pHeader)->nFibGet() == 0x21) \
+ && ((W1_FIB*)pHeader)->fComplexGet() == 0); \
} \
else if( sSwDos == pName ) \
{ \
commit 542f6e4d58190ccbb53e2a15d94ea2d1e9dd138d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 23 22:48:24 2011 +0000
WaE and build fixes for OSL_DEBUG_LEVEL == 2
diff --git a/binfilter/bf_sch/source/core/sch_chtmodel.cxx b/binfilter/bf_sch/source/core/sch_chtmodel.cxx
index 5013ee9..f964f8f 100644
--- a/binfilter/bf_sch/source/core/sch_chtmodel.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmodel.cxx
@@ -338,10 +338,8 @@ using namespace ::com::sun::star;
/*N*/ catch( uno::Exception aEx )
/*N*/ {
/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ // convert ::rtl::OUString => tools String => ByteString
-/*N*/ String aStr( aEx.Message );
-/*N*/ ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
-/*N*/ OSL_TRACE( "LinguProperties threw exception: %s", aBStr.GetBuffer());
+/*N*/ rtl::OString aBStr(rtl::OUStringToOString(aEx.Message, RTL_TEXTENCODING_ASCII_US));
+/*N*/ OSL_TRACE( "LinguProperties threw exception: %s", aBStr.getStr());
/*N*/ #endif
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx
index 8d66dc3..d878bdd 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx
@@ -368,9 +368,8 @@ void SAL_CALL ChXChartAxis::setPropertyValue( const ::rtl::OUString& aPropertyNa
else if( nWID != SID_ATTR_NUMBERFORMAT_SOURCE )
{
#if OSL_DEBUG_LEVEL > 1
- String aTmpString( aPropertyName );
- ByteString aProp( aTmpString, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "ChartAxis: Property %s has an invalid ID (%d)", aProp.GetBuffer(), nWID );
+ rtl::OString aProp(rtl::OUStringToOString(aPropertyName, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "ChartAxis: Property %s has an invalid ID (%d)", aProp.getStr(), nWID );
#endif
}
}
@@ -606,9 +605,8 @@ void SAL_CALL ChXChartAxis::setPropertyValues (
#if OSL_DEBUG_LEVEL > 1
else if (nWID != SID_ATTR_NUMBERFORMAT_SOURCE)
{
- String aTmpString (*pPropertyName);
- ByteString aProp( aTmpString, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "ChartAxis: Property %s has an invalid ID (%d)", aProp.GetBuffer(), nWID );
+ rtl::OString aProp(rtl::OUStringToOString(*pPropertyName, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "ChartAxis: Property %s has an invalid ID (%d)", aProp.getStr(), nWID );
}
#endif
}
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
index 798f0ec..cf8d39f 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
@@ -661,9 +661,8 @@ void SAL_CALL ChXChartDocument::setPropertyValue( const ::rtl::OUString& aProper
else
{
#if OSL_DEBUG_LEVEL > 1
- String aTmpString( aPropertyName );
- ByteString aProp( aTmpString, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.GetBuffer(), nWID );
+ rtl::OString aProp(rtl::OUStringToOString(aPropertyName, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.getStr(), nWID );
#endif
}
}
@@ -840,9 +839,8 @@ uno::Any SAL_CALL ChXChartDocument::getPropertyValue( const ::rtl::OUString& aPr
else
{
#if OSL_DEBUG_LEVEL > 1
- String aTmpString( aPropertyName );
- ByteString aProp( aTmpString, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.GetBuffer(), nWID );
+ rtl::OString aProp(rtl::OUStringToOString(aPropertyName, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.getStr(), nWID );
#endif
}
}
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
index 2fd43e0..8704c6a 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
@@ -528,9 +528,8 @@ uno::Any SAL_CALL ChXChartObject::getPropertyValue( const ::rtl::OUString& Prope
else
{
#if OSL_DEBUG_LEVEL > 1
- String aTmpString( PropertyName );
- ByteString aProp( aTmpString, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.GetBuffer(), nWID );
+ rtl::OString aProp(rtl::OUStringToOString(PropertyName, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.getStr(), nWID );
#endif
}
}
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx
index 264a1d7..143e54b 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx
@@ -219,9 +219,8 @@ void SAL_CALL ChXDataPoint::setPropertyValue( const ::rtl::OUString& aPropertyNa
else
{
#if OSL_DEBUG_LEVEL > 1
- String aTmpString( aPropertyName );
- ByteString aProp( aTmpString, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.GetBuffer(), nWID );
+ rtl::OString aProp(rtl::OUStringToOString(aPropertyName, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.getStr(), nWID );
#endif
}
}
@@ -414,9 +413,8 @@ uno::Any SAL_CALL ChXDataPoint::getPropertyValue( const ::rtl::OUString& Propert
else
{
#if OSL_DEBUG_LEVEL > 1
- String aTmpString( PropertyName );
- ByteString aProp( aTmpString, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.GetBuffer(), nWID );
+ rtl::OString aProp(rtl::OUStringToOString(PropertyName, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.getStr(), nWID );
#endif
}
}
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx
index ffb37cf..a254d25 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx
@@ -225,9 +225,8 @@ void SAL_CALL ChXDataRow::setPropertyValue( const ::rtl::OUString& aPropertyName
else
{
#if OSL_DEBUG_LEVEL > 1
- String aTmpString( aPropertyName );
- ByteString aProp( aTmpString, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.GetBuffer(), nWID );
+ rtl::OString aProp(rtl::OUStringToOString(aPropertyName, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.getStr(), nWID );
#endif
}
}
@@ -468,9 +467,8 @@ uno::Any SAL_CALL ChXDataRow::getPropertyValue( const ::rtl::OUString& PropertyN
else
{
#if OSL_DEBUG_LEVEL > 1
- String aTmpString( PropertyName );
- ByteString aProp( aTmpString, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.GetBuffer(), nWID );
+ rtl::OString aProp(rtl::OUStringToOString(PropertyName, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.getStr(), nWID );
#endif
}
}
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
index 849d2f5..f0dd23e 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
@@ -926,9 +926,8 @@ void SAL_CALL ChXDiagram::setPropertyValue( const ::rtl::OUString& aPropertyName
else
{
#if OSL_DEBUG_LEVEL > 1
- String aTmpString( aPropertyName );
- ByteString aProp( aTmpString, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.GetBuffer(), nWID );
+ rtl::OString aProp(rtl::OUStringToOString(aPropertyName, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.getStr(), nWID );
#endif
}
}
@@ -1224,9 +1223,8 @@ uno::Any SAL_CALL ChXDiagram::getPropertyValue( const ::rtl::OUString& PropertyN
else
{
#if OSL_DEBUG_LEVEL > 1
- String aTmpString( PropertyName );
- ByteString aProp( aTmpString, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.GetBuffer(), nWID );
+ rtl::OString aProp(rtl::OUStringToOString(PropertyName, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "Diagram: Property %s has an invalid ID (%d)", aProp.getStr(), nWID );
#endif
}
}
@@ -1459,9 +1457,9 @@ Sequence<Any> SAL_CALL ChXDiagram::getPropertyValues (
RTL_CONSTASCII_USTRINGPARAM (" is not known in :ChXDiagram::getPropertyValues"));
}
#if OSL_DEBUG_LEVEL > 1
- ByteString sName = ByteString(String(*pPropertyName), RTL_TEXTENCODING_ASCII_US);
+ rtl::OString sName = rtl::OUStringToOString(*pPropertyName, RTL_TEXTENCODING_ASCII_US);
OSL_TRACE("Diagram: Property %s has an invalid ID (%d)",
- sName.GetBuffer(), nWID);
+ sName.getStr(), nWID);
#endif
}
}
diff --git a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx b/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
index 9bf7c6e..2e328ce 100644
--- a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
+++ b/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
@@ -27,6 +27,7 @@
************************************************************************/
#include <rtl/logfile.hxx>
+#include <rtl/strbuf.hxx>
#include <com/sun/star/xml/sax/SAXParseException.hdl>
#include <bf_sfx2/docfile.hxx>
@@ -369,12 +370,14 @@ sal_Bool SdXMLFilter::Export()
}
}
}
- catch(uno::Exception e)
+ catch (const uno::Exception &e)
{
#if OSL_DEBUG_LEVEL > 1
- ByteString aError( "uno Exception caught while exporting:\n" );
- aError += ByteString( String( e.Message), RTL_TEXTENCODING_ASCII_US );
- OSL_FAIL( aError.GetBuffer() );
+ rtl::OStringBuffer aError( "uno Exception caught while exporting:\n" );
+ aError.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US));
+ OSL_FAIL(aError.getStr());
+#else
+ (void)e;
#endif
bDocRet = sal_False;
}
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
index 6510b7f..f055f90 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
@@ -3179,13 +3179,6 @@ void SvNumberFormatter::ImpInitCurrencyTable()
{
LanguageType eLang = MsLangId::convertLocaleToLanguage(
pLocales[nLocale]);
-#if OSL_DEBUG_LEVEL > 1
- LanguageType eReal = MsLangId::getRealLanguage( eLang );
- if ( eReal != eLang ) {
- BOOL bBreak;
- bBreak = TRUE;
- }
-#endif
pLocaleData->setLocale( pLocales[nLocale] );
Sequence< Currency2 > aCurrSeq = pLocaleData->getAllCurrencies();
sal_Int32 nCurrencyCount = aCurrSeq.getLength();
diff --git a/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx b/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
index 7c90c71..ed60312 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
@@ -342,14 +342,6 @@ namespace binfilter {
/*?*/ ReleaseRef();
/*N*/ }
/*N*/
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ {
-/*N*/ String sGrfNm;
-/*N*/ GetLinkManager()->GetDisplayNames( this, 0, &sGrfNm, 0, 0 );
-/*N*/ int x = 0;
-/*N*/ }
-/*N*/ #endif
-/*N*/
/*N*/ if( GetObj() )
/*N*/ {
/*N*/ String aMimeType( SotExchange::GetFormatMimeType( GetContentType() ));
diff --git a/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx b/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx
index 18572fd..7d0fc77 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx
@@ -1058,10 +1058,6 @@ namespace binfilter {
/*N*/ {
/*N*/ SwFrmSwapper aSwapper( this, sal_False );
/*N*/
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ const SwTwips nDbgY = Frm().Top();
-/*N*/ #endif
-/*N*/
/*N*/ if ( IsEmpty() )
/*N*/ {
/*N*/ switch ( ePrep )
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx b/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx
index f595f52..ae972b9 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx
@@ -2540,9 +2540,6 @@ uno::Any SwXFieldEnumeration::nextElement(void)
if (!(nNextIndex < aItems.getLength()))
throw NoSuchElementException();
-#if OSL_DEBUG_LEVEL > 1
- uno::Reference< XTextField > *pItems = aItems.getArray();
-#endif
uno::Reference< XTextField > &rxFld = aItems.getArray()[ nNextIndex++ ];
uno::Any aRet(&rxFld, ::getCppuType((const uno::Reference<XTextField>*)0));
rxFld = 0; // free memory for item that is not longer used
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
index 15fc057..7360cd4 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
@@ -2135,10 +2135,6 @@ uno::Reference< XTextCursor > SwXTextFrame::createTextCursorByRange(const uno::
if(pFmt && SwXTextRange::XTextRangeToSwPaM(aPam, aTextPosition))
{
SwNode& rNode = pFmt->GetCntnt().GetCntntIdx()->GetNode();
-#if OSL_DEBUG_LEVEL > 1
- const SwStartNode* p1 = aPam.GetNode()->FindFlyStartNode();
- const SwStartNode* p2 = rNode.FindFlyStartNode();
-#endif
if(aPam.GetNode()->FindFlyStartNode() == rNode.FindFlyStartNode())
aRef = (XWordCursor*)new SwXTextCursor(this ,
*aPam.GetPoint(), CURSOR_FRAME, pFmt->GetDoc(), aPam.GetMark());
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
index 364db35..e309ab8 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
@@ -292,10 +292,6 @@ uno::Sequence< beans::PropertyValue > SwXTextCursor::createSortDescriptor(sal_Bo
if (nLen > 0)
aCollAlg = aSeq.getConstArray()[0];
-#if OSL_DEBUG_LEVEL > 1
- const OUString *pTxt = aSeq.getConstArray();
-#endif
-
pFields[0].Field = 1;
pFields[0].IsAscending = sal_True;
pFields[0].IsCaseSensitive = sal_False;
@@ -1508,10 +1504,6 @@ uno::Reference< XTextRange > SwXTextRange::CreateTextRangeFromPosition(SwDoc* p
const SwTxtFtn* pTxtFtn = pDoc->GetFtnIdxs()[ n ];
const SwFmtFtn& rFtn = pTxtFtn->GetFtn();
pTxtFtn = rFtn.GetTxtFtn();
-#if OSL_DEBUG_LEVEL > 1
- const SwStartNode* pTmpSttNode = pTxtFtn->GetStartNode()->GetNode().
- FindSttNodeByType(SwFootnoteStartNode);
-#endif
if(pSttNode == pTxtFtn->GetStartNode()->GetNode().
FindSttNodeByType(SwFootnoteStartNode))
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoportenum.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoportenum.cxx
index d5e8189..9d52c7d 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoportenum.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoportenum.cxx
@@ -692,13 +692,7 @@ void SwXTextPortionEnumeration::CreatePortions()
SwDoc* pDoc = pUnoCrsr->GetDoc();
lcl_FillRedlineArray(*pDoc, *pUnoCrsr, aRedArr);
lcl_FillBookmarkArray(*pDoc, *pUnoCrsr, aBkmArr );
-#if OSL_DEBUG_LEVEL > 1
- for(long i_debug = 0; i_debug <aBkmArr.Count(); i_debug++)
- {
- SwXBookmarkPortion_ImplPtr pPtr = aBkmArr.GetObject(i_debug);
- }
-#endif
while(!bAtEnd)
{
if(pUnoCrsr->HasMark())
More information about the Libreoffice-commits
mailing list