WaE and build fixes for OSL_DEBUG_LEVEL == 2

11 files changed, 23 insertions, 30 deletions

diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index ddf8636612ca..4b42a904d2ab 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -182,9 +182,9 @@ namespace dbaui
 
                 case SQL_NODE_KEYWORD:
                     {
-                        rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_KEYWORD:"));
+                        rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_KEYWORD:"));
                         ::rtl::OString sT = OSQLParser::TokenIDToStr(_pNode->getTokenID());
-                        rString += ::rtl::OUString(sT,sT.getLength(),RTL_TEXTENCODING_UTF8);
+                        rString += ::rtl::OStringToOUString(sT, RTL_TEXTENCODING_UTF8);
                      break;}
 
                 case SQL_NODE_COMPARISON:
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index d1e3664776ce..410b2ff8a3a8 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -465,9 +465,8 @@ void ScParameterClassification::GenerateDocumentation()
         if ( xMap->getSymbol(eOp).Len() )
         {
             fprintf( stdout, "%s: ", aEnvVarName);
-            rtl::OStringBuffer aStr;
-            aStr.append( rtl::OUStringToOString(rtl::OUString(xMap->getSymbol(eOp).GetBuffer()), RTL_TEXTENCODING_UTF8 ) );
-            aStr.append("(");
+            rtl::OStringBuffer aStr(rtl::OUStringToOString(xMap->getSymbol(eOp), RTL_TEXTENCODING_UTF8));
+            aStr.append('(');
             formula::FormulaByteToken aToken( eOp);
             sal_uInt8 nParams = GetMinimumParameters( eOp);
             // preset parameter count according to opcode value, with some
@@ -523,7 +522,7 @@ void ScParameterClassification::GenerateDocumentation()
             for ( sal_uInt16 j=0; j < nParams; ++j )
             {
                 if ( j > 0 )
-                    aStr.append(",");
+                    aStr.append(',');
                 Type eType = GetParameterType( &aToken, j);
                 switch ( eType )
                 {
@@ -552,8 +551,8 @@ void ScParameterClassification::GenerateDocumentation()
             if ( HasRepeatParameters( eOp) )
                 aStr.append(", ...");
             if ( nParams )
-                aStr.append(" ");
-            aStr.append(")");
+                aStr.append(' ');
+            aStr.append(')');
             switch ( eOp )
             {
                 case ocZGZ:
@@ -573,7 +572,7 @@ void ScParameterClassification::GenerateDocumentation()
                 break;
                 default:;
             }
-            fprintf( stdout, "%s\n", aStr.makeStringAndClear().getStr());
+            fprintf( stdout, "%s\n", aStr.getStr());
         }
     }
     fflush( stdout);
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 75bab47f95f1..8a3c8bd5082b 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -1017,7 +1017,7 @@ sal_Bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( sal_Bool bForOOMLX )
         } else
             bOtherThanPlaceHolders = sal_True;
         }
-        DBG(printf("mType == %s\n", mType.GetBuffer()));
+        DBG(printf("mType == %s\n", mType.getStr()));
     }
 
     return bOtherThanPlaceHolders;
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 1790aba40c4e..6bcab32e20bd 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -170,8 +170,8 @@ namespace slideshow
                         {
                             MetaTextAction* pText = static_cast<MetaTextAction*>(pCurrAct);
                             VERBOSE_TRACE( "Shape text \"%s\" at action #%d",
-                                           ByteString(pText->GetText(),
-                                                      RTL_TEXTENCODING_ISO_8859_1).GetBuffer(),
+                                           rtl::OUStringToOString(pText->GetText(),
+                                                      RTL_TEXTENCODING_ISO_8859_1).getStr(),
                                            nActionIndex );
                         }
 #endif
diff --git a/svtools/source/filter/wmf/enhwmf.cxx b/svtools/source/filter/wmf/enhwmf.cxx
index 97f1d5cc631c..db6a27118e04 100644
--- a/svtools/source/filter/wmf/enhwmf.cxx
+++ b/svtools/source/filter/wmf/enhwmf.cxx
@@ -492,12 +492,12 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
                 // EMF+ comment (fixme: BE?)
                 if( id == 0x2B464D45 && nRecSize >= 12 )
                     ReadEMFPlusComment( length, bHaveDC );
-                // GDIC comment, doesn't do anything useful yet => enabled only for debug
+                // GDIC comment, doesn't do anything useful yet
                 else if( id == 0x43494447 && nRecSize >= 12 ) {
-                    EMFP_DEBUG(ReadGDIComment());
+                    //ToDo: ReadGDIComment()
                 } else {
                     EMFP_DEBUG(printf ("\t\tunknown id: 0x%x\n",(unsigned int) id));
-        }
+                }
             }
         } else if( !bEMFPlus || bHaveDC || nRecType == EMR_EOF )
 
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index ae36c31f809d..c13630d748fc 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -1164,10 +1164,6 @@ static void lcl_CalcNewWidths( std::list<sal_uInt16> &rSpanPos, ChangeList& rCha
         sal_uInt16 nPos = (sal_uInt16)nSum;
         while( pCurr != rChanges.end() && pCurr->first < nPos )
         {
-#if OSL_DEBUG_LEVEL > 1
-            sal_uInt16 nTemp = pCurr->first;
-            nTemp = pCurr->second;
-#endif
             ++nCurr;
             ++pCurr;
         }
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 7ed062d70da9..c26d0c89873d 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -123,6 +123,7 @@ void lcl_DBGCheckStack()
     {
         nElement = *aIter;
     }
+    (void)nElement;
 }
 
 #endif
@@ -303,6 +304,7 @@ SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info* pNumInfo,
 #if OSL_DEBUG_LEVEL > 1
         nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
         lcl_DBGCheckStack();
+        (void)nCurrentStruct;
 #endif
     }
 }
@@ -324,6 +326,7 @@ SwTaggedPDFHelper::~SwTaggedPDFHelper()
 #if OSL_DEBUG_LEVEL > 1
         nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
         lcl_DBGCheckStack();
+        (void)nCurrentStruct;
 #endif
 
     }
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index f8f4b36fb82d..c9b512b8e509 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -832,6 +832,7 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
         (void)bla;
     }
     nRstHeight = GetRstHeight();
+    (void)nRstHeight;
 #endif
     bInFtnConnect = sal_False;
     return;
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 356348861aed..f6bf2e35f003 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1952,10 +1952,6 @@ sal_Bool SwTxtNode::GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd,
                             pPrev = pAttrArr->end();
                         }
 
-#if OSL_DEBUG_LEVEL > 1
-                        SwPoolItemEndPair aTmp = *pPrev;
-#endif
-
                         if( pPrev != pAttrArr->end() )
                         {
                             if( !pPrev->mpItem )
diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx
index aa7117c9da60..ef85c9c1fdd1 100644
--- a/sw/source/core/undo/SwUndoPageDesc.cxx
+++ b/sw/source/core/undo/SwUndoPageDesc.cxx
@@ -99,8 +99,11 @@ void DebugHeaderFooterContent( const SwPageDesc& rPageDesc )
                 nFooterLeft = 0;
         }
     }
-    int i = 0;
-    ++i; // To set a breakpoint
+
+    (void)nHeaderMaster;
+    (void)nHeaderLeft;
+    (void)nFooterMaster;
+    (void)nFooterLeft;
 }
 #endif
 
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 19c3abc5a277..8b3fb8283260 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -1685,11 +1685,6 @@ sal_Bool SwFltOutDoc::SeekCell(short nRow, short nCol, sal_Bool bPam)
     {
         pPaM->GetPoint()->nNode = pTableBox->GetSttIdx() + 1;
         pPaM->GetPoint()->nContent.Assign(pPaM->GetCntntNode(), 0);
-//#pragma message(__FILE__ "(?) : Sw's const problem")
-#if OSL_DEBUG_LEVEL > 1
-        const SwTxtFmtColl* p = GetDoc().GetDfltTxtFmtColl();
-        p = GetDoc().GetTxtCollFromPool(RES_POOLCOLL_STANDARD, false );
-#endif
         GetDoc().SetTxtFmtColl(*pPaM,
             GetDoc().GetTxtCollFromPool(RES_POOLCOLL_STANDARD, false ));
     }