summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-11-23 15:45:43 +0100
committerStephan Bergmann <sbergman@redhat.com>2011-11-23 15:50:58 +0100
commit0c7bff02710f8ad7915e215f723b6abad0079221 (patch)
tree30ddfb6fedcd954f91bfa24f36df1dd7413804c4 /sw
parentf4573ceb2965ccc8abc1f5165b0fa63f5d63649f (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 'sw')
-rw-r--r--sw/source/ui/docvw/srcedtw.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx
index 04adab9ac1d4..9b468a827748 100644
--- a/sw/source/ui/docvw/srcedtw.cxx
+++ b/sw/source/ui/docvw/srcedtw.cxx
@@ -35,7 +35,7 @@
#include <rtl/oustringostreaminserter.hxx>
#include <rtl/ustring.hxx>
-#include <sal/log.h>
+#include <sal/log.hxx>
#include <svtools/textview.hxx>
#include <svx/svxids.hrc>
#include <vcl/scrbar.hxx>
@@ -163,7 +163,7 @@ static void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList)
else
{
// what was that?
- SAL_WARN_S(
+ SAL_WARN(
"sw.level2",
"Token " << rtl::OUString(sToken)
<< " not recognised!");