diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-23 15:45:43 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-23 15:50:58 +0100 |
commit | 0c7bff02710f8ad7915e215f723b6abad0079221 (patch) | |
tree | 30ddfb6fedcd954f91bfa24f36df1dd7413804c4 /basic/source/sbx/sbxbase.cxx | |
parent | f4573ceb2965ccc8abc1f5165b0fa63f5d63649f (diff) |
Changed sal/log.h -> sal/log.hxx, drop _S from C++ streaming log macros.
A compile time check ensures the common case of streaming just a plain
C-style string literal still produces reasonably compact call-site code.
The format-string variants are still available in sal/detail/log.h, but
only to be used in obsolete osl/diagnose.h etc., and going to be removed
again eventually.
Diffstat (limited to 'basic/source/sbx/sbxbase.cxx')
-rw-r--r-- | basic/source/sbx/sbxbase.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index fa831ab36bd6..d1cf0d516c24 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -39,7 +39,7 @@ #include <rtl/instance.hxx> #include <rtl/oustringostreaminserter.hxx> -#include <sal/log.h> +#include <sal/log.hxx> // AppData-Structure for SBX: @@ -213,7 +213,7 @@ SbxBase* SbxBase::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator ) if( pNew ) break; } - SAL_WARN_IF_S(!pNew, "basic", "No factory for SBX ID " << nSbxId); + SAL_WARN_IF(!pNew, "basic", "No factory for SBX ID " << nSbxId); return pNew; } @@ -227,7 +227,7 @@ SbxObject* SbxBase::CreateObject( const rtl::OUString& rClass ) if( pNew ) break; } - SAL_WARN_IF_S(!pNew, "basic", "No factory for object class " << rClass); + SAL_WARN_IF(!pNew, "basic", "No factory for object class " << rClass); return pNew; } |