Kaydet (Commit) af36ccc2 authored tarafından Jens Carl's avatar Jens Carl

tdf#43157 Clean up OSL_VERIFY (replace with SAL_WARN)

Replace OSL_VERIFY with if-statement and SAL_WARN.

Change-Id: Iccc7e079d9f8778060bbebba3f8e9204fc351d8e
Reviewed-on: https://gerrit.libreoffice.org/73289
Tested-by: Jenkins
Reviewed-by: 's avatarJens Carl <j.carl43@gmx.de>
üst eebc452a
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <comphelper/namedvaluecollection.hxx> #include <comphelper/namedvaluecollection.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <sal/macros.h> #include <sal/macros.h>
#include <sal/log.hxx>
#include <boost/optional.hpp> #include <boost/optional.hpp>
...@@ -278,7 +279,8 @@ namespace dbtools ...@@ -278,7 +279,8 @@ namespace dbtools
bool restrict( false ); bool restrict( false );
Any setting; Any setting;
if ( lcl_getConnectionSetting( "EnableSQL92Check", *m_pImpl, setting ) ) if ( lcl_getConnectionSetting( "EnableSQL92Check", *m_pImpl, setting ) )
OSL_VERIFY( setting >>= restrict ); if( ! (setting >>= restrict) )
SAL_WARN("connectivity.commontools", "restrictIdentifiersToSQL92: unable to assign EnableSQL92Check");
return restrict; return restrict;
} }
...@@ -288,7 +290,8 @@ namespace dbtools ...@@ -288,7 +290,8 @@ namespace dbtools
bool doGenerate( false ); bool doGenerate( false );
Any setting; Any setting;
if ( lcl_getConnectionSetting( "GenerateASBeforeCorrelationName", *m_pImpl, setting ) ) if ( lcl_getConnectionSetting( "GenerateASBeforeCorrelationName", *m_pImpl, setting ) )
OSL_VERIFY( setting >>= doGenerate ); if( ! (setting >>= doGenerate) )
SAL_WARN("connectivity.commontools", "generateASBeforeCorrelationName: unable to assign GenerateASBeforeCorrelationName");
return doGenerate; return doGenerate;
} }
...@@ -297,7 +300,8 @@ namespace dbtools ...@@ -297,7 +300,8 @@ namespace dbtools
bool doGenerate( true ); bool doGenerate( true );
Any setting; Any setting;
if ( lcl_getConnectionSetting( "EscapeDateTime", *m_pImpl, setting ) ) if ( lcl_getConnectionSetting( "EscapeDateTime", *m_pImpl, setting ) )
OSL_VERIFY( setting >>= doGenerate ); if( ! (setting >>= doGenerate) )
SAL_WARN("connectivity.commontools", "shouldEscapeDateTime: unable to assign EscapeDateTime");
return doGenerate; return doGenerate;
} }
...@@ -306,7 +310,8 @@ namespace dbtools ...@@ -306,7 +310,8 @@ namespace dbtools
bool doSubstitute( true ); bool doSubstitute( true );
Any setting; Any setting;
if ( lcl_getConnectionSetting( "ParameterNameSubstitution", *m_pImpl, setting ) ) if ( lcl_getConnectionSetting( "ParameterNameSubstitution", *m_pImpl, setting ) )
OSL_VERIFY( setting >>= doSubstitute ); if( ! (setting >>= doSubstitute) )
SAL_WARN("connectivity.commontools", "shouldSubstituteParameterNames: unable to assign ParameterNameSubstitution");
return doSubstitute; return doSubstitute;
} }
...@@ -315,7 +320,8 @@ namespace dbtools ...@@ -315,7 +320,8 @@ namespace dbtools
bool is( true ); bool is( true );
Any setting; Any setting;
if ( lcl_getDriverSetting( "AutoIncrementIsPrimaryKey", *m_pImpl, setting ) ) if ( lcl_getDriverSetting( "AutoIncrementIsPrimaryKey", *m_pImpl, setting ) )
OSL_VERIFY( setting >>= is ); if( ! (setting >>= is) )
SAL_WARN("connectivity.commontools", "isAutoIncrementPrimaryKey: unable to assign AutoIncrementIsPrimaryKey");
return is; return is;
} }
...@@ -324,7 +330,8 @@ namespace dbtools ...@@ -324,7 +330,8 @@ namespace dbtools
sal_Int32 mode( BooleanComparisonMode::EQUAL_INTEGER ); sal_Int32 mode( BooleanComparisonMode::EQUAL_INTEGER );
Any setting; Any setting;
if ( lcl_getConnectionSetting( "BooleanComparisonMode", *m_pImpl, setting ) ) if ( lcl_getConnectionSetting( "BooleanComparisonMode", *m_pImpl, setting ) )
OSL_VERIFY( setting >>= mode ); if( ! (setting >>= mode) )
SAL_WARN("connectivity.commontools", "getBooleanComparisonMode: unable to assign BooleanComparisonMode");
return mode; return mode;
} }
...@@ -361,7 +368,8 @@ namespace dbtools ...@@ -361,7 +368,8 @@ namespace dbtools
bool doGenerate( true ); bool doGenerate( true );
Any setting; Any setting;
if ( lcl_getConnectionSetting( "ColumnAliasInOrderBy", *m_pImpl, setting ) ) if ( lcl_getConnectionSetting( "ColumnAliasInOrderBy", *m_pImpl, setting ) )
OSL_VERIFY( setting >>= doGenerate ); if( ! (setting >>= doGenerate) )
SAL_WARN("connectivity.commontools", "supportsColumnAliasInOrderBy: unable to assign ColumnAliasInOrderBy");
return doGenerate; return doGenerate;
} }
...@@ -401,7 +409,8 @@ namespace dbtools ...@@ -401,7 +409,8 @@ namespace dbtools
#ifdef IMPLEMENTED_LATER #ifdef IMPLEMENTED_LATER
Any setting; Any setting;
if ( lcl_getConnectionSetting( "DisplayEmptyTableFolders", *m_pImpl, setting ) ) if ( lcl_getConnectionSetting( "DisplayEmptyTableFolders", *m_pImpl, setting ) )
OSL_VERIFY( setting >>= doDisplay ); if( ! (setting >>= doDisplay) )
SAL_WARN("connectivity.commontools", "displayEmptyTableFolders: unable to assign DisplayEmptyTableFolders");
#else #else
try try
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment