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.

3 files changed, 14 insertions, 14 deletions

diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 71bde6baa5d2..8c93716ba940 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -72,7 +72,7 @@
 
 #include <rtl/oustringostreaminserter.hxx>
 #include <rtl/strbuf.hxx>
-#include <sal/log.h>
+#include <sal/log.hxx>
 
 using namespace comphelper;
 using namespace cppu;
@@ -1852,7 +1852,7 @@ String BasicFrame::GenRealString( const String &aResString )
         }
         else
         {
-            SAL_WARN_S(
+            SAL_WARN(
                 "basic",
                 "Unknown replacement in String: "
                     << rtl::OUString(aResult.Copy(nStart, nEnd - nStart)));
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;
 }
 
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 5815e61867ba..c8e9608c6de1 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -40,7 +40,7 @@
 #include <rtl/oustringostreaminserter.hxx>
 #include <rtl/uri.hxx>
 #include <rtl/strbuf.hxx>
-#include <sal/log.h>
+#include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/anytostring.hxx>
 
@@ -822,12 +822,12 @@ sal_Bool SfxLibraryContainer::init_Impl(
             }
             catch ( const xml::sax::SAXException& e )
             {
-                SAL_WARN_S("basic", e.Message);
+                SAL_WARN("basic", e.Message);
                 return sal_False;
             }
             catch ( const io::IOException& e )
             {
-                SAL_WARN_S("basic", e.Message);
+                SAL_WARN("basic", e.Message);
                 return sal_False;
             }
 
@@ -915,7 +915,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
                         {
                         #if OSL_DEBUG_LEVEL > 0
                             Any aError( ::cppu::getCaughtException() );
-                            SAL_WARN_S(
+                            SAL_WARN(
                                 "basic",
                                 "couldn't open sub storage for library \""
                                     << rLib.aName << "\". Exception: "
@@ -1405,7 +1405,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
 
             if( !isLibraryElementValid( pLib->getByName( aElementName ) ) )
             {
-                SAL_WARN_S(
+                SAL_WARN(
                     "basic",
                     "invalid library element \"" << aElementName << '"');
                 continue;
@@ -1487,7 +1487,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
 
                 if( !isLibraryElementValid( pLib->getByName( aElementName ) ) )
                 {
-                    SAL_WARN_S(
+                    SAL_WARN(
                         "basic",
                         "invalid library element \"" << aElementName << '"');
                     continue;
@@ -1904,7 +1904,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
                     {
                     #if OSL_DEBUG_LEVEL > 0
                         Any aError( ::cppu::getCaughtException() );
-                        SAL_WARN_S(
+                        SAL_WARN(
                             "basic",
                             "couldn't create sub storage for library \""
                                 << rLib.aName << "\". Exception: "
@@ -2337,7 +2337,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name )
             {
             #if OSL_DEBUG_LEVEL > 0
                 Any aError( ::cppu::getCaughtException() );
-                SAL_WARN_S(
+                SAL_WARN(
                     "basic",
                     "couldn't open sub storage for library \"" << Name
                         << "\". Exception: "
@@ -2386,7 +2386,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name )
 
                 if ( !xInStream.is() )
                 {
-                    SAL_WARN_S(
+                    SAL_WARN(
                         "basic",
                         "couldn't open library element stream - attempted to"
                             " open library \"" << Name << '"');