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.

4 files changed, 10 insertions, 10 deletions

diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index a4fc06dea36e..ad81dfc97332 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -50,7 +50,7 @@
 #include "sfx2/taskpane.hxx"
 #include <tools/diagnose_ex.h>
 #include <rtl/strbuf.hxx>
-#include <sal/log.h>
+#include <sal/log.hxx>
 
 #define SfxModule
 #include "sfxslots.hxx"
@@ -392,7 +392,7 @@ FieldUnit SfxModule::GetModuleFieldUnit( ::com::sun::star::uno::Reference< ::com
     SfxPoolItem const * pItem = pModule->GetItem( SID_ATTR_METRIC );
     if ( pItem == NULL )
     {
-        SAL_WARN_S(
+        SAL_WARN(
             "sfx2",
             "SfxModule::GetFieldUnit: no metric item in the module implemented"
                 " by '" << typeid(*pModule).name() << "'!");
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index ce1d60468c1e..9806290344ff 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -33,7 +33,7 @@
 #include <iomanip>
 
 #include <boost/unordered_map.hpp>
-#include <sal/log.h>
+#include <sal/log.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemiter.hxx>
 #include <svl/eitem.hxx>
@@ -1743,7 +1743,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
 sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine)
 {
     DBG_MEMTEST();
-    SAL_INFO_S(
+    SAL_INFO(
         "sfx2",
         std::setw(Min(nRegLevel, sal_uInt16(8))) << ' ' << "this = " << this
             << " Level = " << nRegLevel << " SfxBindings::EnterRegistrations "
@@ -1844,7 +1844,7 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int
         }
     }
 
-    SAL_INFO_S(
+    SAL_INFO(
         "sfx2",
         std::setw(Min(nRegLevel, sal_uInt16(8))) << ' ' << "this = " << this
             << " Level = " << nRegLevel << " SfxBindings::LeaveRegistrations "
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index c26229146af0..ee7916dd1f04 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -476,7 +476,7 @@ void SfxDispatcher::Pop
 
     SfxApplication *pSfxApp = SFX_APP();
 
-    SAL_INFO_S(
+    SAL_INFO(
         "sfx2",
         "-SfxDispatcher(" << this << (bPush ? ")::Push(" : ")::Pop(")
             << (rShell.GetInterface()
@@ -1803,7 +1803,7 @@ void SfxDispatcher::FlushImpl()
     for (sal_uInt16 n=0; n<SFX_OBJECTBAR_MAX; n++)
         pImp->aFixedObjBars[n].nResId = 0;
 
-    SAL_INFO_S("sfx2", "SfxDispatcher(" << this << ")::Flush() done");
+    SAL_INFO("sfx2", "SfxDispatcher(" << this << ")::Flush() done");
 }
 
 //--------------------------------------------------------------------
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 33a6f47e0c18..22a23be267d1 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/embed/VerbAttributes.hpp>
 #include <basic/sbstar.hxx>
 #include <rtl/oustringostreaminserter.hxx>
-#include <sal/log.h>
+#include <sal/log.hxx>
 #include <svl/itempool.hxx>
 #include <svl/undo.hxx>
 #include <svtools/itemdel.hxx>
@@ -625,7 +625,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
     if ( !p_IF )
         return;
 #endif
-    SAL_INFO_S(
+    SAL_INFO(
         "sfx2.vb",
         "SfxShell::DoActivate() " << this << "  " << GetInterface()->GetName()
             << " bMDI " << (bMDI ? "MDI" : ""));
@@ -661,7 +661,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
     if ( !p_IF )
         return;
 #endif
-    SAL_INFO_S(
+    SAL_INFO(
         "sfx2.vb",
         "SfxShell::DoDeactivate()" << this << "  " << GetInterface()->GetName()
             << " bMDI " << (bMDI ? "MDI" : ""));