Date: prev next · Thread: first prev next last
2012 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1519

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/19/1519/1

fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT

Changed some OSL_ and DBG_ to SAL_

Change-Id: I192994238b949ffc51697a356a2f49072d5cedb2
---
M basctl/source/basicide/basobj2.cxx
1 file changed, 6 insertions(+), 6 deletions(-)



diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 25d43a0..6fac397 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -66,7 +66,7 @@
     }
     SAL_DLLPUBLIC_EXPORT void basicide_macro_organizer( sal_Int16 nTabId )
     {
-        OSL_TRACE("in basicide_macro_organizer");
+        SAL_INFO("basctl.basicide","in basicide_macro_organizer");
         basctl::Organize( nTabId );
     }
 }
@@ -165,7 +165,7 @@
 {
     if ( !rDocument.hasModule( rLibName, rOldName ) )
     {
-        OSL_FAIL( "basctl::RenameModule: old module name is invalid!" );
+        SAL_WARN( "basctl.basicide","basctl::RenameModule: old module name is invalid!" );
         return false;
     }
 
@@ -199,7 +199,7 @@
 
             // update tabwriter
             sal_uInt16 nId = pShell->GetWindowId( pWin );
-            DBG_ASSERT( nId, "No entry in Tabbar!" );
+            SAL_WARN_IF( nId == 0 , "basctl.basicide ", "No entry in Tabbar!");
             if ( nId )
             {
                 TabBar& rTabBar = pShell->GetTabBar();
@@ -243,7 +243,7 @@
         // take ownership of the data
         ::std::auto_ptr< MacroExecutionData > pData( i_pData );
 
-        DBG_ASSERT( pData->xMethod->GetParent()->GetFlags() & SBX_EXTSEARCH, "Kein EXTSEARCH!" );
+        SAL_WARN_IF( !(pData->xMethod->GetParent()->GetFlags() & SBX_EXTSEARCH), 
"basctl.basicide","No EXTSEARCH!" );
 
         // in case this is a document-local macro, try to protect the document's Undo Manager from
         // flawed scripts
@@ -349,7 +349,7 @@
                             xLimitToDocument.set( xScripts, UNO_QUERY );
                             if ( !xLimitToDocument.is() )
                             {
-                                OSL_ENSURE( false, "basctl::ChooseMacro: a script container which 
is no document!?" );
+                                SAL_WARN_IF(!xLimitToDocument.is(), "basctl.basicide", 
"basctl::ChooseMacro: a script container which is no document!?" );
                                 xLimitToDocument = rxLimitToDocument;
                             }
                         }
@@ -423,7 +423,7 @@
             SbMethod* pMethod = (SbMethod*)xModule->GetMethods()->Get( i );
             if( pMethod->IsHidden() )
                 continue;
-            DBG_ASSERT( pMethod, "Method not found! (NULL)" );
+            SAL_WARN_IF( !pMethod, "basctl.basicide","Method not found! (NULL)" );
             aSeqMethods.getArray()[ iTarget++ ] = pMethod->GetName();
         }
     }

-- 
To view, visit https://gerrit.libreoffice.org/1519
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I192994238b949ffc51697a356a2f49072d5cedb2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ioan Radu <ioan.radu.g@gmail.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.