Code deliberately not linking against sal just can't use OSL_ENSURE

Change-Id: I20820ea382ac9933bf2c6118d466625120b49d67
pranavk · Jul 13, 2015 · 67badfc · 67badfc
1 parent cbce40e
commit 67badfc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 31 deletions.
diff --git a/shell/source/win32/ooofilereader/basereader.cxx b/shell/source/win32/ooofilereader/basereader.cxx
@@ -17,11 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#undef OSL_DEBUG_LEVEL
-
-
-#include <osl/diagnose.h>
-
 #include "internal/basereader.hxx"
 
 #include "internal/xml_parser.hxx"
@@ -81,11 +76,11 @@ void CBaseReader::Initialize( const std::string& ContentName)
     }
     catch(std::exception& ex)
     {
-        OSL_ENSURE( false, ex.what() );
+        // OSL_ENSURE( false, ex.what() );
     }
     catch(...)
     {
-        OSL_ENSURE(false, "Unknown error");
+        // OSL_ENSURE(false, "Unknown error");
     }
 }
 

diff --git a/shell/source/win32/ooofilereader/contentreader.cxx b/shell/source/win32/ooofilereader/contentreader.cxx
@@ -17,11 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#undef OSL_DEBUG_LEVEL
-
-
-#include <osl/diagnose.h>
-
 #include "internal/contentreader.hxx"
 #include "dummytag.hxx"
 #include "simpletag.hxx"
@@ -41,11 +36,11 @@ CBaseReader( DocumentName )
     }
     catch(xml_parser_exception& ex)
     {
-        OSL_ENSURE(false, ex.what());
+        // OSL_ENSURE(false, ex.what());
     }
     catch(...)
     {
-        OSL_ENSURE(false, "Unknown error");
+        // OSL_ENSURE(false, "Unknown error");
     }
 }
 
@@ -59,11 +54,11 @@ try
     }
     catch(xml_parser_exception& ex)
     {
-        OSL_ENSURE(false, ex.what());
+        // OSL_ENSURE(false, ex.what());
     }
     catch(...)
     {
-        OSL_ENSURE(false, "Unknown error");
+        // OSL_ENSURE(false, "Unknown error");
     }
 }
 

diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx b/shell/source/win32/ooofilereader/metainforeader.cxx
@@ -17,11 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#undef OSL_DEBUG_LEVEL
-
-
-#include <osl/diagnose.h>
-
 #include "internal/metainforeader.hxx"
 #include "dummytag.hxx"
 #include "simpletag.hxx"
@@ -60,11 +55,11 @@ CBaseReader( DocumentName )
     }
     catch(xml_parser_exception& ex)
     {
-        OSL_ENSURE(false, ex.what());
+        // OSL_ENSURE(false, ex.what());
     }
     catch(...)
     {
-        OSL_ENSURE(false, "Unknown error");
+        // OSL_ENSURE(false, "Unknown error");
     }
 }
 
@@ -97,11 +92,11 @@ try
     }
     catch(xml_parser_exception& ex)
     {
-        OSL_ENSURE(false, ex.what());
+        // OSL_ENSURE(false, ex.what());
     }
     catch(...)
     {
-        OSL_ENSURE(false, "Unknown error");
+        // OSL_ENSURE(false, "Unknown error");
     }
 
 }

diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -17,11 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#undef OSL_DEBUG_LEVEL
-
-
-#include <osl/diagnose.h>
-
 #include "internal/config.hxx"
 #include "internal/utilities.hxx"
 
@@ -97,7 +92,7 @@ std::wstring GetResString(int ResId)
     int rc = LoadStringW( GetModuleHandleW(MODULE_NAME), ResId, szResStr, sizeof(szResStr) );
 
     OutputDebugStringFormat( "GetResString: read %d chars\n", rc );
-    OSL_ENSURE(rc, "String resource not found");
+    // OSL_ENSURE(rc, "String resource not found");
 
     return std::wstring(szResStr);
 }