[Libreoffice-commits] .: sfx2/source svx/source

[Thorsten Behrens]

 sfx2/source/appl/sfxhelp.cxx     |    2 +-
 sfx2/source/doc/sfxbasemodel.cxx |    2 +-
 svx/source/dialog/rlrcitem.cxx   |   20 ++++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit b2c2657feae01f04f099f5d38944e5a6e89aa503
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Mar 18 20:56:01 2011 +0100

    Misc dbgutil build fixes
    
    Various leftover DBG_TRACE and tooltype removal fallouts

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 1edce23..78272e7 100755
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -847,7 +847,7 @@ sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const S
 #ifdef DBG_UTIL
     ByteString aTmp("SfxHelp: HelpId = ");
     aTmp += ByteString( aHelpURL, RTL_TEXTENCODING_UTF8 );
-    DBG_TRACE( aTmp.GetBuffer() );
+    OSL_TRACE( aTmp.GetBuffer() );
 #endif
 
     pHelpWindow->SetHelpURL( aHelpURL );
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index d0fd506..9b993f2 100755
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3001,7 +3001,7 @@ void SfxBaseModel::postEvent_Impl( const ::rtl::OUString& aName, const uno::Refe
 #ifdef DBG_UTIL
         ByteString aTmp( "SfxDocumentEvent: " );
         aTmp += ByteString( String(aName), RTL_TEXTENCODING_UTF8 );
-        DBG_TRACE( aTmp.GetBuffer() );
+        OSL_TRACE( aTmp.GetBuffer() );
 #endif
 
         document::DocumentEvent aDocumentEvent( (frame::XModel*)this, aName, xController, uno::Any() );
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index 9254dc5..23493a2 100755
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -77,14 +77,14 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
         case SID_ATTR_LONG_LRSPACE:
         {
             const SvxLongLRSpaceItem *pItem = PTR_CAST(SvxLongLRSpaceItem, pState);
-            DBG_ASSERT(pState? 0 != pItem: TRUE, "SvxLRSpaceItem expected");
+            DBG_ASSERT(pState? 0 != pItem: true, "SvxLRSpaceItem expected");
             rRuler.UpdateFrame(pItem);
             break;
         }
         case SID_ATTR_LONG_ULSPACE:
         {
             const SvxLongULSpaceItem *pItem = PTR_CAST(SvxLongULSpaceItem, pState);
-            DBG_ASSERT(pState? 0 != pItem: TRUE, "SvxULSpaceItem expected");
+            DBG_ASSERT(pState? 0 != pItem: true, "SvxULSpaceItem expected");
             rRuler.UpdateFrame(pItem);
             break;
         }
@@ -92,7 +92,7 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
         case SID_ATTR_TABSTOP:
         {
             const SvxTabStopItem *pItem = PTR_CAST(SvxTabStopItem, pState);
-            DBG_ASSERT(pState?  0 != pItem: TRUE, "SvxTabStopItem expected");
+            DBG_ASSERT(pState?  0 != pItem: true, "SvxTabStopItem expected");
             rRuler.Update(pItem);
             break;
         }
@@ -100,7 +100,7 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
         case SID_ATTR_PARA_LRSPACE:
         {
             const SvxLRSpaceItem *pItem = PTR_CAST(SvxLRSpaceItem, pState);
-            DBG_ASSERT(pState?  0 != pItem: TRUE, "SvxLRSpaceItem expected");
+            DBG_ASSERT(pState?  0 != pItem: true, "SvxLRSpaceItem expected");
             rRuler.UpdatePara(pItem);
             break;
         }
@@ -110,7 +110,7 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
         case SID_RULER_ROWS_VERTICAL:
         {
             const SvxColumnItem *pItem = PTR_CAST(SvxColumnItem, pState);
-            DBG_ASSERT(pState?  0 != pItem: TRUE, "SvxColumnItem expected");
+            DBG_ASSERT(pState?  0 != pItem: true, "SvxColumnItem expected");
 #ifdef DBG_UTIL
             if(pItem)
             {
@@ -129,35 +129,35 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
         case SID_RULER_PAGE_POS:
         {	// Position page, page width
             const SvxPagePosSizeItem *pItem = PTR_CAST(SvxPagePosSizeItem, pState);
-            DBG_ASSERT(pState?  0 != pItem: TRUE, "SvxPagePosSizeItem expected");
+            DBG_ASSERT(pState?  0 != pItem: true, "SvxPagePosSizeItem expected");
             rRuler.Update(pItem);
             break;
         }
         case SID_RULER_OBJECT:
         {	// Object selection
             const SvxObjectItem *pItem = PTR_CAST(SvxObjectItem, pState);
-            DBG_ASSERT(pState?  0 != pItem: TRUE, "SvxObjectItem expected");
+            DBG_ASSERT(pState?  0 != pItem: true, "SvxObjectItem expected");
             rRuler.Update(pItem);
             break;
         }
         case SID_RULER_PROTECT:
         {
             const SvxProtectItem *pItem = PTR_CAST(SvxProtectItem, pState);
-            DBG_ASSERT(pState?  0 != pItem: TRUE, "SvxProtectItem expected");
+            DBG_ASSERT(pState?  0 != pItem: true, "SvxProtectItem expected");
             rRuler.Update(pItem);
             break;
         }
         case SID_RULER_BORDER_DISTANCE:
         {
             const SvxLRSpaceItem *pItem = PTR_CAST(SvxLRSpaceItem, pState);
-            DBG_ASSERT(pState?  0 != pItem: TRUE, "SvxLRSpaceItem expected");
+            DBG_ASSERT(pState?  0 != pItem: true, "SvxLRSpaceItem expected");
             rRuler.UpdateParaBorder(pItem);
         }
         break;
         case SID_RULER_TEXT_RIGHT_TO_LEFT :
         {
             const SfxBoolItem *pItem = PTR_CAST(SfxBoolItem, pState);
-            DBG_ASSERT(pState?  0 != pItem: TRUE, "SfxBoolItem expected");
+            DBG_ASSERT(pState?  0 != pItem: true, "SfxBoolItem expected");
             rRuler.UpdateTextRTL(pItem);
         }
         break;