[Libreoffice-commits] core.git: chart2/source codemaker/source compilerplugins/clang connectivity/source cppcanvas/source cppuhelper/source dbaccess/source desktop/source extensions/source filter/source forms/source framework/source helpcompiler/source i18nlangtag/source i18npool/source jvmfwk/plugins l10ntools/source lotuswordpro/source sal/qa sc/qa sc/source sd/source svl/source svx/source sw/source unodevtools/source vcl/generic vcl/source vcl/unx
Stephan Bergmann
sbergman at redhat.com
Tue Jul 1 06:46:40 PDT 2014
chart2/source/view/main/DummyXShape.cxx | 2
chart2/source/view/main/GL3DRenderer.cxx | 4
chart2/source/view/main/OpenGLRender.cxx | 4
codemaker/source/cppumaker/cpputype.cxx | 7 -
compilerplugins/clang/stringconcat.cxx | 82 +++++++++++++
connectivity/source/cpool/ZPoolCollection.cxx | 2
connectivity/source/drivers/flat/ETable.cxx | 2
cppcanvas/source/mtfrenderer/emfplus.cxx | 7 -
cppuhelper/source/shlib.cxx | 4
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 2
dbaccess/source/ui/inc/directsql.hxx | 2
desktop/source/lib/init.cxx | 2
desktop/source/migration/services/jvmfwk.cxx | 10 -
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 8 -
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 6 -
extensions/source/dbpilots/gridwizard.cxx | 2
filter/source/svg/svgwriter.cxx | 20 +--
forms/source/component/FormComponent.cxx | 2
framework/source/loadenv/loadenv.cxx | 3
helpcompiler/source/HelpLinker.cxx | 3
i18nlangtag/source/languagetag/languagetag.cxx | 9 -
i18npool/source/calendar/calendar_gregorian.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 13 --
l10ntools/source/common.cxx | 12 +-
l10ntools/source/helpex.cxx | 16 +-
l10ntools/source/localize.cxx | 24 +++-
l10ntools/source/pocheck.cxx | 34 +++--
l10ntools/source/propmerge.cxx | 4
l10ntools/source/treemerge.cxx | 4
l10ntools/source/treex.cxx | 16 +-
l10ntools/source/uimerge.cxx | 5
lotuswordpro/source/filter/xfilter/xfimagestyle.cxx | 2
lotuswordpro/source/filter/xfilter/xfshadow.cxx | 8 -
sal/qa/rtl/textenc/rtl_textcvt.cxx | 15 --
sc/qa/unit/ucalc.cxx | 2
sc/source/core/data/formulacell.cxx | 5
sc/source/core/opencl/op_addin.cxx | 6 -
sc/source/core/opencl/op_financial.cxx | 16 +-
sc/source/core/opencl/op_math.cxx | 2
sc/source/core/opencl/op_spreadsheet.cxx | 4
sc/source/core/opencl/op_statistical.cxx | 34 ++---
sc/source/filter/xml/xmlexprt.cxx | 2
sc/source/ui/view/viewdata.cxx | 2
sd/source/ui/remotecontrol/BluetoothServer.cxx | 2
svl/source/items/whassert.hxx | 2
svx/source/unodraw/recoveryui.cxx | 2
sw/source/core/doc/poolfmt.cxx | 4
sw/source/core/doc/tblafmt.cxx | 2
sw/source/filter/html/css1atr.cxx | 2
sw/source/filter/html/htmlcss1.cxx | 4
sw/source/filter/ww8/WW8Sttbf.cxx | 4
unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 66 +++++------
unodevtools/source/skeletonmaker/cpptypemaker.cxx | 3
unodevtools/source/skeletonmaker/javacompskeleton.cxx | 16 +-
unodevtools/source/skeletonmaker/javatypemaker.cxx | 5
unodevtools/source/skeletonmaker/skeletonmaker.cxx | 18 +--
vcl/generic/fontmanager/helper.cxx | 2
vcl/source/filter/wmf/enhwmf.cxx | 100 ++++++++---------
vcl/source/filter/wmf/winwmf.cxx | 18 +--
vcl/source/window/debugevent.cxx | 6 -
vcl/unx/generic/app/sm.cxx | 6 -
61 files changed, 373 insertions(+), 300 deletions(-)
New commits:
commit e50ef195bc95f3f410119f623928382cb88b45d2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jul 1 15:45:52 2014 +0200
New loplugin:stringconcat
Change-Id: Id7c517fb37bc28797c45fc0dde83e866f2aa4aac
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 1880d7f..3ab2f63 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -221,7 +221,7 @@ void SAL_CALL DummyXShape::setPropertyValue( const OUString& rName, const uno::A
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException, std::exception)
{
- SAL_INFO("chart2", "DummyXShape::setProperty: " << rName << " " << "Any");
+ SAL_INFO("chart2", "DummyXShape::setProperty: " << rName << " Any");
maProperties[rName] = rValue;
if(rName == "Transformation")
{
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index a28b5bc..810db33 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -43,9 +43,9 @@ int static checkGLError(const char *file, int line)
{
const char* sError = OpenGLHelper::GLErrorString(glErr);
if (sError)
- SAL_WARN("chart2.opengl", "GL Error #" << glErr << "(" << sError << ") " << " in File " << file << " at line: " << line);
+ SAL_WARN("chart2.opengl", "GL Error #" << glErr << "(" << sError << ") in File " << file << " at line: " << line);
else
- SAL_WARN("chart2.opengl", "GL Error #" << glErr << " (no message available)" << " in File " << file << " at line: " << line);
+ SAL_WARN("chart2.opengl", "GL Error #" << glErr << " (no message available) in File " << file << " at line: " << line);
retCode = -1;
return retCode;
}
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index da7a60f..884e0af 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -84,9 +84,9 @@ int static checkGLError(const char *file, int line)
const char* sError = OpenGLHelper::GLErrorString(glErr);
if (sError)
- SAL_WARN("chart2.opengl", "GL Error #" << glErr << "(" << sError << ") " << " in File " << file << " at line: " << line);
+ SAL_WARN("chart2.opengl", "GL Error #" << glErr << "(" << sError << ") in File " << file << " at line: " << line);
else
- SAL_WARN("chart2.opengl", "GL Error #" << glErr << " (no message available)" << " in File " << file << " at line: " << line);
+ SAL_WARN("chart2.opengl", "GL Error #" << glErr << " (no message available) in File " << file << " at line: " << line);
retCode = -1;
return retCode;
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 5e166fa..83d0a41 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -2562,7 +2562,7 @@ void PolyStructType::dumpComprehensiveGetCppuType(FileStream & out) {
dec();
out << indent() << "}\n";
dec();
- out << indent() << "};\n" << " }" << " }\n\n";
+ out << indent() << "};\n } }\n\n";
dumpGetCppuTypePreamble(out);
out << indent() << "return *detail::" << staticTypeClass;
dumpTemplateParameters(out);
@@ -3785,8 +3785,7 @@ void SingletonType::dumpHxxFile(
inc();
o << indent() << "assert(the_context.is());\n" << indent()
<< "::css::uno::Reference< " << scopedBaseName
- << " > instance;\n"
- << ("#if defined LO_URE_CURRENT_ENV && defined "
+ << (" > instance;\n#if defined LO_URE_CURRENT_ENV && defined "
"LO_URE_CTOR_ENV_")
<< name_.replaceAll(".", "_dot_")
<< " && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_"
@@ -3803,7 +3802,7 @@ void SingletonType::dumpHxxFile(
" ::css::uno::UNO_QUERY);\n#else\n")
<< indent() << ("the_context->getValueByName("
"::rtl::OUString( \"/singletons/")
- << name_ << "\" )) >>= instance;\n" << "#endif\n"
+ << name_ << "\" )) >>= instance;\n#endif\n"
<< indent() << "if (!instance.is()) {\n";
inc();
o << indent()
diff --git a/compilerplugins/clang/stringconcat.cxx b/compilerplugins/clang/stringconcat.cxx
new file mode 100644
index 0000000..43907e9
--- /dev/null
+++ b/compilerplugins/clang/stringconcat.cxx
@@ -0,0 +1,82 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "plugin.hxx"
+
+namespace {
+
+class StringConcat:
+ public RecursiveASTVisitor<StringConcat>, public loplugin::Plugin
+{
+public:
+ explicit StringConcat(InstantiationData const & data): Plugin(data) {}
+
+ void run() override
+ { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+
+ bool VisitCallExpr(CallExpr const * expr);
+};
+
+bool StringConcat::VisitCallExpr(CallExpr const * expr) {
+ if (ignoreLocation(expr)) {
+ return true;
+ }
+ FunctionDecl const * fdecl = expr->getDirectCallee();
+ if (fdecl == nullptr) {
+ return true;
+ }
+ OverloadedOperatorKind oo = fdecl->getOverloadedOperator();
+ if ((oo != OverloadedOperatorKind::OO_Plus
+ && oo != OverloadedOperatorKind::OO_LessLess)
+ || fdecl->getNumParams() != 2 || expr->getNumArgs() != 2
+ || !isa<StringLiteral>(expr->getArg(1)->IgnoreParenImpCasts()))
+ {
+ return true;
+ }
+ CallExpr const * left = dyn_cast<CallExpr>(
+ expr->getArg(0)->IgnoreParenImpCasts());
+ if (left == nullptr) {
+ return true;
+ }
+ FunctionDecl const * ldecl = left->getDirectCallee();
+ if (ldecl == nullptr) {
+ return true;
+ }
+ OverloadedOperatorKind loo = ldecl->getOverloadedOperator();
+ if ((loo != OverloadedOperatorKind::OO_Plus
+ && loo != OverloadedOperatorKind::OO_LessLess)
+ || ldecl->getNumParams() != 2 || left->getNumArgs() != 2
+ || !isa<StringLiteral>(left->getArg(1)->IgnoreParenImpCasts()))
+ {
+ return true;
+ }
+ StringRef name {
+ compiler.getSourceManager().getFilename(
+ compiler.getSourceManager().getSpellingLoc(expr->getLocStart())) };
+ if (name == SRCDIR "/sal/qa/rtl/strings/test_ostring_concat.cxx"
+ || name == SRCDIR "/sal/qa/rtl/strings/test_oustring_concat.cxx")
+ {
+ return true;
+ }
+ CXXOperatorCallExpr const * op = dyn_cast<CXXOperatorCallExpr>(expr);
+ report(
+ DiagnosticsEngine::Warning,
+ "replace '%0' between string literals with juxtaposition",
+ op == nullptr ? expr->getExprLoc() : op->getOperatorLoc())
+ << (oo == OverloadedOperatorKind::OO_Plus ? "+" : "<<")
+ << SourceRange(
+ left->getArg(1)->getLocStart(), expr->getArg(1)->getLocEnd());
+ return true;
+}
+
+loplugin::Plugin::Registration<StringConcat> X("stringconcat");
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index c445045..2bc0bd5 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -404,7 +404,7 @@ Any OPoolCollection::getNodeValue(const OUString& _rPath,const Reference<XInterf
}
catch(NoSuchElementException& e)
{
- SAL_WARN("connectivity.cpool", "::getNodeValue: caught a " <<
+ SAL_WARN("connectivity.cpool", "::getNodeValue: caught a "
"NoSuchElementException while trying to open " <<
e.Message << "!" );
}
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 90cbe94..307f4ca 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -951,7 +951,7 @@ void OFlatTable::setRowPos(const vector<TRowPositionInFile>::size_type rowNum, c
{
SAL_WARN_IF(m_aRowPosToFilePos[rowNum] != rowPos,
"connectivity.flat",
- "Setting position for row " << rowNum << " to (" << rowPos.first << ", " << rowPos.second << "), " <<
+ "Setting position for row " << rowNum << " to (" << rowPos.first << ", " << rowPos.second << "), "
"but already had different position (" << m_aRowPosToFilePos[rowNum].first << ", " << m_aRowPosToFilePos[rowNum].second << ")");
m_aRowPosToFilePos[rowNum] = rowPos;
}
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 4ff1ea2..91e84d6 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1053,8 +1053,7 @@ namespace cppcanvas
OSL_ASSERT( ( header >> 12 ) == 0xdbc01 );
- SAL_INFO("cppcanvas.emf", "EMF+\tfont\n"
- << "EMF+\theader: 0x" << std::hex << (header >> 12) << " version: 0x" << (header & 0x1fff) << " size: " << std::dec << emSize << " unit: 0x" << std::hex << sizeUnit << std::dec);
+ SAL_INFO("cppcanvas.emf", "EMF+\tfont\nEMF+\theader: 0x" << std::hex << (header >> 12) << " version: 0x" << (header & 0x1fff) << " size: " << std::dec << emSize << " unit: 0x" << std::hex << sizeUnit << std::dec);
SAL_INFO("cppcanvas.emf", "EMF+\tflags: 0x" << std::hex << fontFlags << " reserved: 0x" << reserved << " length: 0x" << std::hex << length << std::dec);
if( length > 0 && length < 0x4000 ) {
@@ -1804,7 +1803,7 @@ namespace cppcanvas
polygon.append (Map (x + width, y + height));
polygon.append (Map (x, y + height));
- SAL_INFO("cppcanvas.emf", "EMF+\trectangle: " << x << "," << " " << width << "x" << height);
+ SAL_INFO("cppcanvas.emf", "EMF+\trectangle: " << x << ", " << width << "x" << height);
} else {
/* Single's */
float x, y, width, height;
@@ -1816,7 +1815,7 @@ namespace cppcanvas
polygon.append (Map (x + width, y + height));
polygon.append (Map (x, y + height));
- SAL_INFO("cppcanvas.emf", "EMF+\trectangle: " << x << "," << " " << width << "x" << height);
+ SAL_INFO("cppcanvas.emf", "EMF+\trectangle: " << x << ", " << width << "x" << height);
}
::basegfx::B2DPolyPolygon polyPolygon (polygon);
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index baa9428..c150364 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -239,9 +239,9 @@ void cppuhelper::detail::loadSharedLibComponentFactory(
if (constructor.isEmpty()) {
rtl::OUString sym;
if (prefix == "direct") {
- sym = implementation.replace('.', '_') + "_" + COMPONENT_GETFACTORY;
+ sym = implementation.replace('.', '_') + "_" COMPONENT_GETFACTORY;
} else if (!prefix.isEmpty()) {
- sym = prefix + "_" + COMPONENT_GETFACTORY;
+ sym = prefix + "_" COMPONENT_GETFACTORY;
} else {
sym = COMPONENT_GETFACTORY;
}
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 7f4efb2..26134b2 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -770,7 +770,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
bCase = m_xMetaData->supportsMixedCaseQuotedIdentifiers();
aSelectColumns = m_aSqlIterator.getSelectColumns();
- OUStringBuffer aSQL( m_aPureSelectSQL + STR_WHERE + " ( 0 = 1 )");
+ OUStringBuffer aSQL( m_aPureSelectSQL + STR_WHERE " ( 0 = 1 )");
// preserve the original WHERE clause
// #i102234#
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index 36e74cc..ef4aff4 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -112,7 +112,7 @@ namespace dbaui
{ \
const sal_Char* pError = impl_CheckInvariants(); \
if (pError) \
- SAL_WARN("dbaccess.ui", methodname << ": " << pError); \
+ SAL_WARN("dbaccess.ui", methodname ": " << pError); \
}
#else
#define CHECK_INVARIANTS(methodname)
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 231de70..88d618c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -535,7 +535,7 @@ static void aBasicErrorFunc(const OUString& rError, const OUString& rAction)
static void initialize_uno(const OUString &aAppProgramURL)
{
- rtl::Bootstrap::setIniFilename(aAppProgramURL + "/" + SAL_CONFIGFILE("soffice"));
+ rtl::Bootstrap::setIniFilename(aAppProgramURL + "/" SAL_CONFIGFILE("soffice"));
xContext = cppu::defaultBootstrap_InitialComponentContext();
fprintf(stderr, "Uno initialized %d\n", xContext.is());
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 25a3626..888bb5e 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -302,7 +302,7 @@ void JavaMigration::migrateJavarc()
return;
OUString sValue;
- rtl::Bootstrap javaini(m_sUserDir + "/user/config/" + SAL_CONFIGFILE("java"));
+ rtl::Bootstrap javaini(m_sUserDir + "/user/config/" SAL_CONFIGFILE("java"));
bool bSuccess = javaini.getFrom("Home", sValue);
OSL_ENSURE(bSuccess, "[Service implementation " IMPL_NAME
"] XJob::execute: Could not get Home entry from java.ini/javarc.");
@@ -415,11 +415,11 @@ void SAL_CALL JavaMigration::setPropertyValue(
bool val;
if (!(aValue >>= val))
throw MalformedDataException(
- OUString("[Service implementation ") + IMPL_NAME +
+ "[Service implementation " IMPL_NAME
"] XLayerHandler::setPropertyValue received wrong type for Enable property", 0, Any());
if (jfw_setEnabled(val) != JFW_E_NONE)
throw WrappedTargetException(
- OUString("[Service implementation ") + IMPL_NAME +
+ "[Service implementation " IMPL_NAME
"] XLayerHandler::setPropertyValue: jfw_setEnabled failed.", 0, Any());
break;
@@ -429,12 +429,12 @@ void SAL_CALL JavaMigration::setPropertyValue(
OUString cp;
if (!(aValue >>= cp))
throw MalformedDataException(
- OUString("[Service implementation ") + IMPL_NAME +
+ "[Service implementation " IMPL_NAME
"] XLayerHandler::setPropertyValue received wrong type for UserClassPath property", 0, Any());
if (jfw_setUserClassPath(cp.pData) != JFW_E_NONE)
throw WrappedTargetException(
- OUString("[Service implementation ") + IMPL_NAME +
+ "[Service implementation " IMPL_NAME
"] XLayerHandler::setPropertyValue: jfw_setUserClassPath failed.", 0, Any());
break;
}
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index e11f09e..04dcac8 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -268,8 +268,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
dp_misc::writeConsoleError(
"\nERROR: unexpected option " +
cmdArg +
- "!\n" +
- " Use " + APP_NAME + " " +
+ "!\n Use " APP_NAME " " +
toString(info_help) +
" to print all options.\n");
return 1;
@@ -537,14 +536,13 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
{
dp_misc::writeConsoleError(
"\nERROR: unknown sub-command " +
- subCommand + "!\n" +
- " Use " + APP_NAME + " " +
+ subCommand + "!\n Use " APP_NAME " " +
toString(info_help) + " to print all options.\n");
return 1;
}
if (option_verbose)
- dp_misc::writeConsole(OUString("\n") + APP_NAME + " done.\n");
+ dp_misc::writeConsole("\n" APP_NAME " done.\n");
//Force to release all bridges which connect us to the child processes
dp_misc::disposeBridges(xLocalComponentContext);
return 0;
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index a69bb1f..199355e 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -112,15 +112,15 @@ bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex )
if (len == 2 && arg[ 1 ] == option_info->m_short_option)
{
++(*pIndex);
- dp_misc::TRACE(OUString(__FILE__) + ": identified option \'"
- + "\'" + OUString( option_info->m_short_option ) + "\n");
+ dp_misc::TRACE(__FILE__ ": identified option \'\'"
+ + OUString( option_info->m_short_option ) + "\n");
return true;
}
if (arg[ 1 ] == '-' && rtl_ustr_ascii_compare(
arg.pData->buffer + 2, option_info->m_name ) == 0)
{
++(*pIndex);
- dp_misc::TRACE(OUString( __FILE__) + ": identified option \'"
+ dp_misc::TRACE(__FILE__ ": identified option \'"
+ OUString::createFromAscii(option_info->m_name) + "\'\n");
return true;
}
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index a9ed641..d7482a2 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -217,7 +217,7 @@ namespace dbp
}
catch(const Exception&)
{
- SAL_WARN( "extensions.dbpilots", "OGridWizard::implApplySettings: " <<
+ SAL_WARN( "extensions.dbpilots", "OGridWizard::implApplySettings: "
"unexpected exception while creating the grid column for field " <<
pFormFieldName->getStr() << "!" );
}
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index c65dda2..80e90ac 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1092,8 +1092,7 @@ bool SVGTextWriter::nextTextPortion()
}
#if OSL_DEBUG_LEVEL > 0
- sInfo += "text field type: " + sFieldName + "; " +
- "content: " + xTextField->getPresentation( /* show command: */ sal_False ) + "; ";
+ sInfo += "text field type: " + sFieldName + "; content: " + xTextField->getPresentation( /* show command: */ sal_False ) + "; ";
#endif
if( sFieldName.equalsAscii( "DateTime" ) || sFieldName.equalsAscii( "Header" )
|| sFieldName.equalsAscii( "Footer" ) || sFieldName.equalsAscii( "PageNumber" ) )
@@ -1253,9 +1252,9 @@ void SVGTextWriter::startTextPosition( bool bExportX, bool bExportY )
Point aRot( maTextPos );
OUString aTransform =
OUString("translate(") + OUString::number( aRot.X() ) +
- "," + OUString::number( aRot.Y() ) + ")" +
- " rotate(" + OUString::number( rFont.GetOrientation() * -0.1 ) +
- ")" + " translate(" + OUString::number( -aRot.X() ) +
+ "," + OUString::number( aRot.Y() ) + ") rotate(" +
+ OUString::number( rFont.GetOrientation() * -0.1 ) +
+ ") translate(" + OUString::number( -aRot.X() ) +
"," + OUString::number( -aRot.Y() ) + ")";
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform );
@@ -2435,13 +2434,10 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
{
Point aRot( aPos );
OUString aTransform =
- OUString("translate") +
- "(" + OUString::number( aRot.X() ) +
- "," + OUString::number( aRot.Y() ) + ")" +
- " rotate" +
- "(" + OUString::number( rFont.GetOrientation() * -0.1 ) + ")" +
- " translate" +
- "(" + OUString::number( -aRot.X() ) +
+ "translate(" + OUString::number( aRot.X() ) +
+ "," + OUString::number( aRot.Y() ) + ") rotate(" +
+ OUString::number( rFont.GetOrientation() * -0.1 ) +
+ ") translate(" + OUString::number( -aRot.X() ) +
"," + OUString::number( -aRot.Y() ) + ")";
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform );
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 6cbe180..ea99117 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -1962,7 +1962,7 @@ bool OBoundControlModel::connectToField(const Reference<XRowSet>& rForm)
else
{
- SAL_WARN("forms.component", "OBoundControlModel::connectToField: property " << PROPERTY_VALUE << " not supported!");
+ SAL_WARN("forms.component", "OBoundControlModel::connectToField: property " PROPERTY_VALUE " not supported!");
impl_setField_noNotify( NULL );
}
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index a87e618..d3f6e95 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -176,8 +176,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
case LoadEnvException::ID_UNSUPPORTED_CONTENT:
throw css::lang::IllegalArgumentException(
- ("Unsupported URL <" + sURL + ">" + ": \"" + ex.m_sMessage
- + "\""),
+ "Unsupported URL <" + sURL + ">: \"" + ex.m_sMessage + "\"",
xLoader, 1);
default:
diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
index 4cc0585..fccd2d3 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -357,8 +357,7 @@ void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerEx
SAL_WARN("helpcompiler",
"ERROR: input list entry '"
<< xhpFileName
- << "' has the wrong extension (only files with extension .xhp "
- << "are accepted)");
+ << "' has the wrong extension (only files with extension .xhp are accepted)");
continue;
}
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index c81197a..25b6723 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -871,13 +871,11 @@ LanguageTag::ImplPtr LanguageTag::registerImpl() const
theMapBcp47::get().insert( ::std::make_pair( pImpl->maBcp47, pImpl)));
if (res.second)
{
- SAL_INFO( "i18nlangtag", "LanguageTag::registerImpl: cross-inserted '" << pImpl->maBcp47 << "'"
- << " for 0x" << ::std::hex << mnLangID);
+ SAL_INFO( "i18nlangtag", "LanguageTag::registerImpl: cross-inserted '" << pImpl->maBcp47 << "' for 0x" << ::std::hex << mnLangID);
}
else
{
- SAL_INFO( "i18nlangtag", "LanguageTag::registerImpl: not cross-inserted '" << pImpl->maBcp47 << "'"
- << " for 0x" << ::std::hex << mnLangID << " have 0x"
+ SAL_INFO( "i18nlangtag", "LanguageTag::registerImpl: not cross-inserted '" << pImpl->maBcp47 << "' for 0x" << ::std::hex << mnLangID << " have 0x"
<< ::std::hex << (*res.first).second->mnLangID);
}
}
@@ -885,8 +883,7 @@ LanguageTag::ImplPtr LanguageTag::registerImpl() const
{
if (!pImpl->mbInitializedBcp47)
pImpl->convertLocaleToBcp47();
- SAL_INFO( "i18nlangtag", "LanguageTag::registerImpl: not cross-inserted '" << pImpl->maBcp47 << "'"
- << " for 0x" << ::std::hex << mnLangID << " round-trip to 0x" << ::std::hex << nLang);
+ SAL_INFO( "i18nlangtag", "LanguageTag::registerImpl: not cross-inserted '" << pImpl->maBcp47 << "' for 0x" << ::std::hex << mnLangID << " round-trip to 0x" << ::std::hex << nLang);
}
}
}
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index 35e01e2..1722a48 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -691,7 +691,7 @@ void Calendar_gregorian::setValue() throw(RuntimeException)
DUMP_ICU_CAL_MSG(("%s\n","setValue() after Zone/DST glitch 2nd resubmit"));
DUMP_I18N_CAL_MSG(("%s\n","setValue() after Zone/DST glitch 2nd resubmit"));
}
- SAL_INFO( "i18npool", "Calendar_gregorian::setValue:" <<
+ SAL_INFO( "i18npool", "Calendar_gregorian::setValue:"
" nZone0 " << nZone0 << ", nDST0 " << nDST0 <<
", nZone1 " << nZone1 << ", nDST1 " << nDST1 <<
", nZone2 " << nZone2 << ", nDST2 " << nDST2 <<
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index abad760..ccf29fc 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -889,9 +889,8 @@ rtl::Reference<VendorBase> getJREInfoByPath(
if (entry2 != mapJREs.end())
{
JFW_TRACE2(OUString("[Java framework] sunjavaplugin")
- + SAL_DLLEXTENSION + ": "
- + "JRE found again (detected before): " + sResolvedDir
- + ".\n");
+ + SAL_DLLEXTENSION ": JRE found again (detected before): "
+ + sResolvedDir + ".\n");
return entry2->second;
}
@@ -941,9 +940,8 @@ rtl::Reference<VendorBase> getJREInfoByPath(
if (entry != mapJREs.end())
{
JFW_TRACE2(OUString("[Java framework] sunjavaplugin")
- + SAL_DLLEXTENSION + ": "
- + "JRE found again (detected before): " + sFilePath
- + ".\n");
+ + SAL_DLLEXTENSION ": JRE found again (detected before): "
+ + sFilePath + ".\n");
return entry->second;
}
@@ -1038,8 +1036,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
else
{
JFW_TRACE2(OUString("[Java framework] sunjavaplugin")
- + SAL_DLLEXTENSION + ": "
- + "Found JRE: " + sResolvedDir
+ + SAL_DLLEXTENSION ": Found JRE: " + sResolvedDir
+ " \n at: " + path + ".\n");
mapJREs.insert(MAPJRE::value_type(sResolvedDir, ret));
diff --git a/l10ntools/source/common.cxx b/l10ntools/source/common.cxx
index 78274b8..426b09d 100644
--- a/l10ntools/source/common.cxx
+++ b/l10ntools/source/common.cxx
@@ -95,12 +95,12 @@ void writeUsage(const OString& rName, const OString& rFileType)
std::cout
<< " Syntax: " << rName.getStr()
<< " -i FileIn -o FileOut [-m DataBase] [-l Lang] [-b]\n"
- << " FileIn: Source files (" << rFileType.getStr() << ")\n"
- << " FileOut: Destination file (*.*)\n"
- << " DataBase: Mergedata (*.po)\n"
- << " Lang: Restrict the handled language; one element of\n"
- << " (de, en-US, ...) or all\n"
- << " -b: Add UTF-8 Byte Order Mark to FileOut(use with -m option)\n";
+ " FileIn: Source files (" << rFileType.getStr() << ")\n"
+ " FileOut: Destination file (*.*)\n"
+ " DataBase: Mergedata (*.po)\n"
+ " Lang: Restrict the handled language; one element of\n"
+ " (de, en-US, ...) or all\n"
+ " -b: Add UTF-8 Byte Order Mark to FileOut(use with -m option)\n";
}
void writePoEntry(
diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index c45564d..3188a6c 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -37,14 +37,14 @@
void WriteUsage()
{
std::cout
- << " Syntax: Helpex -[m]i FileIn -o FileOut [-m DataBase] [-l Lang]\n"
- << " FileIn + i: Source file (*.xhp)\n"
- << " FileIn + -mi: File including paths of source files"
- << " (only for merge)\n"
- << " FileOut: Destination file (*.*) or files (in case of -mi)\n"
- << " DataBase: Mergedata (*.po)\n"
- << " Lang: Restrict the handled languages; one element of\n"
- << " (de, en-US, ...) or all\n";
+ << (" Syntax: Helpex -[m]i FileIn -o FileOut [-m DataBase] [-l Lang]\n"
+ " FileIn + i: Source file (*.xhp)\n"
+ " FileIn + -mi: File including paths of source files"
+ " (only for merge)\n"
+ " FileOut: Destination file (*.*) or files (in case of -mi)\n"
+ " DataBase: Mergedata (*.po)\n"
+ " Lang: Restrict the handled languages; one element of\n"
+ " (de, en-US, ...) or all\n");
}
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 6f7dbde..10b446c 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -134,8 +134,12 @@ void InitPoFile(
if (osl::FileBase::getFileURLFromSystemPath(outDir, outDirUrl)
!= osl::FileBase::E_None)
{
- cerr << "Error: Cannot convert pathname to URL in " << __FILE__ << ", in line " << __LINE__ << "\n"
- << " outDir: " << OUStringToOString(outDir, RTL_TEXTENCODING_ASCII_US).getStr() << "\n";
+ cerr
+ << ("Error: Cannot convert pathname to URL in " __FILE__
+ ", in line ")
+ << __LINE__ << "\n outDir: "
+ << OUStringToOString(outDir, RTL_TEXTENCODING_ASCII_US).getStr()
+ << "\n";
throw false; //TODO
}
osl::Directory::createPath(outDirUrl);
@@ -411,8 +415,12 @@ void handleDirectory(
if (osl::FileBase::getFileURLFromSystemPath(sPoPath, sPoUrl)
!= osl::FileBase::E_None)
{
- cerr << "Error: Cannot convert pathname to URL in " << __FILE__ << ", in line " << __LINE__ << "\n"
- << OUStringToOString(sPoPath, RTL_TEXTENCODING_UTF8).getStr() << "\n";
+ cerr
+ << ("Error: Cannot convert pathname to URL in " __FILE__
+ ", in line ")
+ << __LINE__ << "\n"
+ << OUStringToOString(sPoPath, RTL_TEXTENCODING_UTF8).getStr()
+ << "\n";
throw false; //TODO
}
osl::Directory::remove(sPoUrl);
@@ -435,8 +443,12 @@ void handleProjects(char * sSourceRoot, char const * sDestRoot)
if (osl::FileBase::getFileURLFromSystemPath(root16, rootUrl)
!= osl::FileBase::E_None)
{
- cerr << "Error: Cannot convert pathname to URL in " << __FILE__ << ", in line " << __LINE__ << "\n"
- << " root16: " << OUStringToOString(root16, RTL_TEXTENCODING_ASCII_US).getStr() << "\n";
+ cerr
+ << ("Error: Cannot convert pathname to URL in " __FILE__
+ ", in line ")
+ << __LINE__ << "\n root16: "
+ << OUStringToOString(root16, RTL_TEXTENCODING_ASCII_US).getStr()
+ << "\n";
throw false; //TODO
}
handleDirectory(rootUrl, 0, OString(), OString(sDestRoot));
diff --git a/l10ntools/source/pocheck.cxx b/l10ntools/source/pocheck.cxx
index 9990a69..a1836ca 100644
--- a/l10ntools/source/pocheck.cxx
+++ b/l10ntools/source/pocheck.cxx
@@ -272,9 +272,11 @@ static void checkFunctionNames(const OString& aLanguage)
{
if( it->second > 1 )
{
- std::cout << "ERROR: Spreadsheet function name translations must be unique.\n" <<
- "Language: " << aLanguage <<
- "\nDuplicated translation is: " << it->first << "\n\n";
+ std::cout
+ << ("ERROR: Spreadsheet function name translations must be"
+ " unique.\nLanguage: ")
+ << aLanguage << "\nDuplicated translation is: " << it->first
+ << "\n\n";
}
}
@@ -377,12 +379,14 @@ static void checkVerticalBar(const OString& aLanguage)
if( !aPoEntry.isFuzzy() && aPoEntry.getMsgId().endsWith("|") &&
!aPoEntry.getMsgStr().isEmpty() && !aPoEntry.getMsgStr().endsWith("|") )
{
- std::cout << "ERROR: Missing '|' character at the end of translated string.\n" <<
- "It causes runtime error in installer.\n" <<
- "File: " << aPoPath << std::endl <<
- "Language: " << aLanguage << std::endl <<
- "English: " << aPoEntry.getMsgId() << std::endl <<
- "Localized: " << aPoEntry.getMsgStr() << std::endl << std::endl;
+ std::cout
+ << ("ERROR: Missing '|' character at the end of translated"
+ " string.\nIt causes runtime error in installer.\nFile: ")
+ << aPoPath << std::endl
+ << "Language: " << aLanguage << std::endl
+ << "English: " << aPoEntry.getMsgId() << std::endl
+ << "Localized: " << aPoEntry.getMsgStr() << std::endl
+ << std::endl;
bError = true;
}
else
@@ -425,11 +429,13 @@ static void checkMathSymbolNames(const OString& aLanguage)
if( !aPoEntry.isFuzzy() && aPoEntry.getGroupId() == "RID_UI_SYMBOL_NAMES" &&
!aPoEntry.getMsgStr().isEmpty() && (aPoEntry.getMsgStr().indexOf(" ") != -1) )
{
- std::cout << "ERROR: Math symbol names must not contain spaces.\n" <<
- "File: " << aPoPath << std::endl <<
- "Language: " << aLanguage << std::endl <<
- "English: " << aPoEntry.getMsgId() << std::endl <<
- "Localized: " << aPoEntry.getMsgStr() << std::endl << std::endl;
+ std::cout
+ << "ERROR: Math symbol names must not contain spaces.\nFile: "
+ << aPoPath << std::endl
+ << "Language: " << aLanguage << std::endl
+ << "English: " << aPoEntry.getMsgId() << std::endl
+ << "Localized: " << aPoEntry.getMsgStr() << std::endl
+ << std::endl;
bError = true;
}
else
diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index 72070fb..a41cd15 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -175,8 +175,8 @@ void PropParser::Merge( const OString &rMergeSrc, const OString &rDestinationFil
if( vLanguages.size()>=1 && vLanguages[0] != m_sLang )
{
std::cerr
- << "Propex error: given language conflicts with "
- << "language of Mergedata file: "
+ << ("Propex error: given language conflicts with language of"
+ " Mergedata file: ")
<< m_sLang.getStr() << " - "
<< vLanguages[0].getStr() << std::endl;
delete pMergeDataFile;
diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx
index f2e959f..3cc2b40 100644
--- a/l10ntools/source/treemerge.cxx
+++ b/l10ntools/source/treemerge.cxx
@@ -262,8 +262,8 @@ void TreeParser::Merge(
if( vLanguages.size()>=1 && vLanguages[0] != m_sLang )
{
std::cerr
- << "Treex error: given language conflicts with "
- << "language of Mergedata file: "
+ << ("Treex error: given language conflicts with language of"
+ " Mergedata file: ")
<< m_sLang.getStr() << " - "
<< vLanguages[0].getStr() << std::endl;
delete pMergeDataFile;
diff --git a/l10ntools/source/treex.cxx b/l10ntools/source/treex.cxx
index 7c57230..dafc80b 100644
--- a/l10ntools/source/treex.cxx
+++ b/l10ntools/source/treex.cxx
@@ -17,14 +17,14 @@
void WriteUsage()
{
std::cout
- << "Syntax: Treex [-r Root] -i FileIn -o FileOut"
- << " [-m DataBase] [-l Lang]\n"
- << " Root: Path to root of localized xhp files\n"
- << " FileIn: Source files (*.tree)\n"
- << " FileOut: Destination file (*.*)\n"
- << " DataBase: Mergedata (*.po)\n"
- << " Lang: Restrict the handled languages; one element of\n"
- << " (de, en-US, ...) or all\n";
+ << ("Syntax: Treex [-r Root] -i FileIn -o FileOut"
+ " [-m DataBase] [-l Lang]\n"
+ " Root: Path to root of localized xhp files\n"
+ " FileIn: Source files (*.tree)\n"
+ " FileOut: Destination file (*.*)\n"
+ " DataBase: Mergedata (*.po)\n"
+ " Lang: Restrict the handled languages; one element of\n"
+ " (de, en-US, ...) or all\n");
}
diff --git a/l10ntools/source/uimerge.cxx b/l10ntools/source/uimerge.cxx
index 9610687..5954ab1 100644
--- a/l10ntools/source/uimerge.cxx
+++ b/l10ntools/source/uimerge.cxx
@@ -113,9 +113,8 @@ namespace
if (sOut.isEmpty())
continue;
- aDestination << " <e "
- << "g=\"" << aI->second->sGID.getStr() << "\" "
- << "i=\"" << aI->second->sLID.getStr() << "\">"
+ aDestination << " <e g=\"" << aI->second->sGID.getStr() << "\" i=\""
+ << aI->second->sLID.getStr() << "\">"
<< helper::QuotHTML(sOut).getStr() << "</e>\n";
}
diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
index 4cdfd2f..63097ff 100644
--- a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
@@ -193,7 +193,7 @@ void XFImageStyle::ToXml(IXFStream *pStrm)
OUString clip = "rect(" + OUString::number(m_fClipTop) + "cm " +
OUString::number(m_fClipRight) + "cm " +
OUString::number(m_fClipBottom) + "cm " +
- OUString::number(m_fClipLeft) + "cm" + ")";
+ OUString::number(m_fClipLeft) + "cm)";
pAttrList->AddAttribute("fo:clip",clip);
}
diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.cxx b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
index 73b5374..851530b 100644
--- a/lotuswordpro/source/filter/xfilter/xfshadow.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
@@ -73,16 +73,16 @@ OUString XFShadow::ToString()
switch(m_ePosition)
{
case enumXFShadowRightBottom:
- buf = m_aColor.ToString() + " " + strOff + "cm" + " " + strOff + "cm";
+ buf = m_aColor.ToString() + " " + strOff + "cm " + strOff + "cm";
break;
case enumXFShadowRightTop:
- buf = m_aColor.ToString() + " " + strOff + "cm" + " -" + strOff + "cm";
+ buf = m_aColor.ToString() + " " + strOff + "cm -" + strOff + "cm";
break;
case enumXFShadowLeftBottom:
- buf = m_aColor.ToString() + " -" + strOff + "cm" + " " + strOff + "cm";
+ buf = m_aColor.ToString() + " -" + strOff + "cm " + strOff + "cm";
break;
case enumXFShadowLeftTop:
- buf = m_aColor.ToString() + " -" + strOff + "cm" + " -" + strOff + "cm";
+ buf = m_aColor.ToString() + " -" + strOff + "cm -" + strOff + "cm";
break;
default:
buf = m_aColor.ToString();
diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx
index 2a40d3a..b6b7001 100644
--- a/sal/qa/rtl/textenc/rtl_textcvt.cxx
+++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx
@@ -87,8 +87,7 @@ void testSingleByteCharSet(SingleByteCharSet const & rSet) {
rSet.m_aMap[i] == 0xFFFF);
CPPUNIT_ASSERT_MESSAGE(OUStringToOString(OUString("aUnicode[" + OUString::number(j) + "] == " +
OUString::number(aUnicode[j], 16) +
- ", " +
- "rSet.m_aMap[" + OUString::number(i) + "] == " +
+ ", rSet.m_aMap[" + OUString::number(i) + "] == " +
OUString::number(rSet.m_aMap[i], 16)),
RTL_TEXTENCODING_UTF8).getStr(),
aUnicode[j] == rSet.m_aMap[i]);
@@ -225,8 +224,7 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) {
for (sal_Size i = 0; i < rTest.m_nUnicodeSize; ++i) {
CPPUNIT_ASSERT_MESSAGE(OUStringToOString(OUString("aUnicode[" + OUString::number(i) + "] == " +
OUString::number(aUnicode[i], 16) +
- ", " +
- "rTest.m_aUnicode[" + OUString::number(i) + "] == " +
+ ", rTest.m_aUnicode[" + OUString::number(i) + "] == " +
OUString::number(rTest.m_aUnicode[i], 16)),
RTL_TEXTENCODING_UTF8).getStr(),
aUnicode[i] == rTest.m_aUnicode[i]);
@@ -361,8 +359,7 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) {
for (sal_Size i = 0; i < rTest.m_nUnicodeSize; ++i) {
CPPUNIT_ASSERT_MESSAGE(OUStringToOString(OUString("aUnicode[" + OUString::number(i) + "] == " +
OUString::number(aUnicode[i], 16) +
- ", " +
- "rTest.m_aUnicode[" + OUString::number(i) + "] == " +
+ ", rTest.m_aUnicode[" + OUString::number(i) + "] == " +
OUString::number(rTest.m_aUnicode[i], 16)),
RTL_TEXTENCODING_UTF8).getStr(),
aUnicode[i] == rTest.m_aUnicode[i]);
@@ -402,8 +399,7 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) {
for (sal_Size i = 0; i < rTest.m_nTextSize; ++i) {
CPPUNIT_ASSERT_MESSAGE(OUStringToOString(OUString("aText[" + OUString::number(i) + "] == " +
OUString::number(aText[i], 16) +
- ", " +
- "rTest.m_pText[" + OUString::number(i) + "] == " +
+ ", rTest.m_pText[" + OUString::number(i) + "] == " +
OUString::number(rTest.m_pText[i], 16)),
RTL_TEXTENCODING_UTF8).getStr(),
aText[i] == rTest.m_pText[i]);
@@ -442,8 +438,7 @@ void doComplexCharSetCutTest(ComplexCharSetTest const & rTest) {
for (sal_Size i = 0; i < nSize; ++i) {
CPPUNIT_ASSERT_MESSAGE(OUStringToOString(OUString("aUnicode[" + OUString::number(i) + "] == " +
OUString::number(aUnicode[i], 16) +
- ", " +
- "rTest.m_aUnicode[" + OUString::number(i) + "] == " +
+ ", rTest.m_aUnicode[" + OUString::number(i) + "] == " +
OUString::number(rTest.m_aUnicode[i], 16)),
RTL_TEXTENCODING_UTF8).getStr(),
aUnicode[i] == rTest.m_aUnicode[i]);
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index d412abd..c0e1eb9 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -177,7 +177,7 @@ void Test::tearDown()
if ((dfscaled) >= (time)) \
{ \
std::ostringstream os; \
- os << message << " took " << dfscaled << " pseudo-cycles (" << df << " real-time seconds), expected: " << time << " pseudo-cycles."; \
+ os << message " took " << dfscaled << " pseudo-cycles (" << df << " real-time seconds), expected: " << time << " pseudo-cycles."; \
CPPUNIT_FAIL(os.str().c_str()); \
} \
} while (false)
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index f36eea3..5e051f6 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1207,9 +1207,8 @@ void ScFormulaCell::CompileXML( sc::CompileFormulaContext& rCxt, ScProgress& rPr
bSkipCompile = true;
pCode = pPreviousCell->pCode;
- SAL_INFO( "sc", "merged '" << aFormula << "' == "
- "'" << aShouldBe << "'" <<
- " extend group to " << xGroup->mnLength );
+ SAL_INFO( "sc", "merged '" << aFormula << "' == '" << aShouldBe
+ << "'extend group to " << xGroup->mnLength );
}
}
}
diff --git a/sc/source/core/opencl/op_addin.cxx b/sc/source/core/opencl/op_addin.cxx
index e3bc13e..e3e5787 100644
--- a/sc/source/core/opencl/op_addin.cxx
+++ b/sc/source/core/opencl/op_addin.cxx
@@ -39,7 +39,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream &ss,
ss << " double N = 0.0;\n";
if(vSubArguments.size() != 2)
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken();
@@ -68,7 +68,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream &ss,
}
else
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
}
@@ -104,7 +104,7 @@ void OpBesselj::GenSlidingWindowFunction(std::stringstream &ss,
}
else
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
}
diff --git a/sc/source/core/opencl/op_financial.cxx b/sc/source/core/opencl/op_financial.cxx
index cc4e757..2c249fa 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -1080,7 +1080,7 @@ void IRR::GenSlidingWindowFunction(std::stringstream &ss,
#endif
ss << " arg0 = ";
ss << vSubArguments[0]->GenSlidingWindowDeclRef() << ";\n";
- ss << " i++;" << ";\n";
+ ss << " i++;;\n";
ss << " arg1 = ";
ss << vSubArguments[0]->GenSlidingWindowDeclRef() << ";\n";
#ifdef ISNAN
@@ -1150,7 +1150,7 @@ void IRR::GenSlidingWindowFunction(std::stringstream &ss,
#endif
ss << " arg0 = ";
ss << vSubArguments[0]->GenSlidingWindowDeclRef() << ";\n";
- ss << " i++;" << ";\n";
+ ss << " i++;;\n";
ss << " arg1 = ";
ss << vSubArguments[0]->GenSlidingWindowDeclRef() << ";\n";
#ifdef ISNAN
@@ -1183,7 +1183,7 @@ void IRR::GenSlidingWindowFunction(std::stringstream &ss,
#endif
ss << " arg0 = ";
ss << vSubArguments[0]->GenSlidingWindowDeclRef() << ";\n";
- ss << " i++;" << ";\n";
+ ss << " i++;;\n";
ss << " arg1 = ";
ss << vSubArguments[0]->GenSlidingWindowDeclRef() << ";\n";
#ifdef ISNAN
@@ -2221,7 +2221,7 @@ void OpYield::GenSlidingWindowFunction(
vSubArguments[i]->GenSlidingWindowDecl(ss);
}
ss << ") {\n\t";
- ss << "double tmp = " <<"0"<<";\n\t";
+ ss << "double tmp = 0;\n\t";
ss << "int gid0 = get_global_id(0);\n\t";
ss << "double tmp000;\n\t";
ss << "double tmp001;\n\t";
@@ -2377,7 +2377,7 @@ void OpSLN::GenSlidingWindowFunction(std::stringstream &ss,
vSubArguments[i]->GenSlidingWindowDecl(ss);
}
ss << ") {\n";
- ss << " double tmp = " <<"0"<<";\n";
+ ss << " double tmp = 0;\n";
ss << " int gid0 = get_global_id(0);\n";
ss << " double wert;\n";
ss << " double rest;\n";
@@ -2461,7 +2461,7 @@ void OpYieldmat::GenSlidingWindowFunction(
vSubArguments[i]->GenSlidingWindowDecl(ss);
}
ss << ") {\n\t";
- ss << "double tmp = " <<"0"<<";\n\t";
+ ss << "double tmp = 0;\n\t";
ss << "int gid0 = get_global_id(0);\n\t";
ss << "double tmp000;\n\t";
ss << "double tmp001;\n\t";
@@ -4471,7 +4471,7 @@ void OpYielddisc::GenSlidingWindowFunction(
vSubArguments[i]->GenSlidingWindowDecl(ss);
}
ss << ") {\n\t";
- ss << "double tmp = " <<"0"<<";\n\t";
+ ss << "double tmp = 0;\n\t";
ss << "int gid0 = get_global_id(0);\n\t";
ss << "double tmp000;\n\t";
ss << "double tmp001;\n\t";
@@ -4978,7 +4978,7 @@ vSubArguments)
vSubArguments[i]->GenSlidingWindowDecl(ss);
}
ss << ") {\n";
- ss << " double result = " <<"0"<<";\n";
+ ss << " double result = 0;\n";
ss << " int gid0 = get_global_id(0);\n";
ss << " double zins;\n";
ss << " double zzr;\n";
diff --git a/sc/source/core/opencl/op_math.cxx b/sc/source/core/opencl/op_math.cxx
index f9a7785..60f9438 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -2457,7 +2457,7 @@ void OpBitLshift::GenSlidingWindowFunction(std::stringstream &ss,
#endif
ss << " shift_amount = floor(";
ss << vSubArguments[1]->GenSlidingWindowDeclRef() << ");\n";
- ss << " return floor(" << "shift_amount >= 0 ? ";
+ ss << " return floor(shift_amount >= 0 ? ";
ss << "num * pow(2.0, shift_amount) : ";
ss << "num / pow(2.0, fabs(shift_amount)));\n";
ss << "}";
diff --git a/sc/source/core/opencl/op_spreadsheet.cxx b/sc/source/core/opencl/op_spreadsheet.cxx
index a5823d4..221ee36 100644
--- a/sc/source/core/opencl/op_spreadsheet.cxx
+++ b/sc/source/core/opencl/op_spreadsheet.cxx
@@ -172,7 +172,7 @@ void OpVLookup::GenSlidingWindowFunction(std::stringstream &ss,
ss << " tmp = isNan(";
vSubArguments[1+j]->GenNumDeclRef(ss);
- ss << "[rowNum]"<<")?";
+ ss << "[rowNum])?";
vSubArguments[1+j]->GenNumDeclRef(ss);
ss << "[rowNum]:";
vSubArguments[1+j]->GenStringDeclRef(ss);
@@ -251,7 +251,7 @@ void OpVLookup::GenSlidingWindowFunction(std::stringstream &ss,
{
ss << " tmp = isNan(";
vSubArguments[1+j]->GenNumDeclRef(ss);
- ss << "[rowNum]"<<")?";
+ ss << "[rowNum])?";
vSubArguments[1+j]->GenNumDeclRef(ss);
ss << "[rowNum]:";
vSubArguments[1+j]->GenStringDeclRef(ss);
diff --git a/sc/source/core/opencl/op_statistical.cxx b/sc/source/core/opencl/op_statistical.cxx
index c378e56..d2ece0d 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -1257,7 +1257,7 @@ void OpTDist::GenSlidingWindowFunction(std::stringstream &ss,
ss << " double fFlag = 0.0;\n";
if(vSubArguments.size() != 3)
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken();
@@ -1287,7 +1287,7 @@ void OpTDist::GenSlidingWindowFunction(std::stringstream &ss,
}
else
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
}
@@ -1328,7 +1328,7 @@ void OpTDist::GenSlidingWindowFunction(std::stringstream &ss,
}
else
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
}
@@ -1371,7 +1371,7 @@ void OpTDist::GenSlidingWindowFunction(std::stringstream &ss,
}
else
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
}
@@ -1577,7 +1577,7 @@ void OpStandard::GenSlidingWindowFunction(std::stringstream &ss,
ss << " double sigma = 0.0;\n";
if(vSubArguments.size() != 3)
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken();
@@ -1606,7 +1606,7 @@ void OpStandard::GenSlidingWindowFunction(std::stringstream &ss,
}
else
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
}
@@ -1642,7 +1642,7 @@ void OpStandard::GenSlidingWindowFunction(std::stringstream &ss,
}
else
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
}
@@ -1715,7 +1715,7 @@ void OpWeibull::GenSlidingWindowFunction(std::stringstream &ss,
ss << " double kum = 0.0;\n";
if(vSubArguments.size() != 4)
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken();
@@ -1744,7 +1744,7 @@ void OpWeibull::GenSlidingWindowFunction(std::stringstream &ss,
}
else
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
}
@@ -1780,7 +1780,7 @@ void OpWeibull::GenSlidingWindowFunction(std::stringstream &ss,
}
else
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
}
@@ -1816,7 +1816,7 @@ void OpWeibull::GenSlidingWindowFunction(std::stringstream &ss,
}
else
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
}
@@ -1852,7 +1852,7 @@ void OpWeibull::GenSlidingWindowFunction(std::stringstream &ss,
}
else
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
}
@@ -2601,7 +2601,7 @@ void OpTInv::GenSlidingWindowFunction(std::stringstream &ss,
ss << " double fDF = 0.0;\n";
if(vSubArguments.size() != 2)
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken();
@@ -2631,7 +2631,7 @@ void OpTInv::GenSlidingWindowFunction(std::stringstream &ss,
}
else
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
}
@@ -2672,7 +2672,7 @@ void OpTInv::GenSlidingWindowFunction(std::stringstream &ss,
}
else
{
- ss << " return DBL_MAX;\n" << "}\n";
+ ss << " return DBL_MAX;\n}\n";
return ;
}
}
@@ -2814,7 +2814,7 @@ void OpStDev::GenSlidingWindowFunction(std::stringstream &ss,
}
if (i == 0)
{
- ss << " fMean = fSum * pow(fCount,-1.0)" << ";\n";
+ ss << " fMean = fSum * pow(fCount,-1.0);\n";
}
}
i = vSubArguments.size();
@@ -3045,7 +3045,7 @@ void OpStDevP::GenSlidingWindowFunction(std::stringstream &ss,
}
if (i == 0)
{
- ss << " fMean = fSum * pow(fCount,-1.0)" << ";\n";
+ ss << " fMean = fSum * pow(fCount,-1.0);\n";
}
}
i = vSubArguments.size();
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 6063051..32181cd 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -4576,7 +4576,7 @@ void ScXMLExport::WriteExternalRefCaches()
if (!pTable.get() || !pTable->isReferenced())
continue;
- AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, "'" + *pUrl + "'" + "#" + *itr);
+ AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, "'" + *pUrl + "'#" + *itr);
AddAttribute(XML_NAMESPACE_TABLE, XML_PRINT, GetXMLToken(XML_FALSE));
AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, sExternalRefTabStyleName);
SvXMLElementExport aElemTable(*this, XML_NAMESPACE_TABLE, XML_TABLE, true, true);
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 95fadba..a89b31c 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2201,7 +2201,7 @@ void ScViewData::WriteUserData(OUString& rData)
else
rData += "0";
- rData += ";" + OUString::number( nTabNo ) + ";" + TAG_TABBARWIDTH +
+ rData += ";" + OUString::number( nTabNo ) + ";" TAG_TABBARWIDTH +
OUString::number( pView->GetTabBarWidth() );
SCTAB nTabCount = pDoc->GetTableCount();
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index f2f1733..d778f56 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -1279,7 +1279,7 @@ void SAL_CALL BluetoothServer::run()
}
else
SAL_INFO( "sdremote.bluetooth", "unknown incoming dbus message, "
- << " type: " << dbus_message_get_type( pMsg )
+ " type: " << dbus_message_get_type( pMsg )
<< " path: '" << dbus_message_get_path( pMsg )
<< "' interface: '" << dbus_message_get_interface( pMsg )
<< "' member: '" << dbus_message_get_member( pMsg ) );
diff --git a/svl/source/items/whassert.hxx b/svl/source/items/whassert.hxx
index 7c73688..253debb 100644
--- a/svl/source/items/whassert.hxx
+++ b/svl/source/items/whassert.hxx
@@ -24,7 +24,7 @@
#include <sal/log.hxx>
#define SFX_ASSERT( bCondition, nId, sMessage ) SAL_WARN_IF( \
- !(bCondition), "svl", (sMessage) << ", with ID/pos " << (nId));
+ !(bCondition), "svl", sMessage ", with ID/pos " << (nId));
#endif
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index a8f620d..6ca0b58 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -248,7 +248,7 @@ static OUString GetCrashConfigDir()
static OUString GetUnsentURL()
{
- OUString aURL = GetCrashConfigDir() + "/" + LCKFILE;
+ OUString aURL = GetCrashConfigDir() + "/" LCKFILE;
return aURL;
}
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index da5151e..0984cd0 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1414,8 +1414,8 @@ bool SwDoc::IsPoolFmtUsed( sal_uInt16 nId ) const
}
else
{
- SAL_WARN("sw.core", "Invalid Pool Id: " << nId << " should be within " <<
- "[" << int(RES_POOLCHR_BEGIN) << "," << int(RES_POOLCHR_END) << ") or " <<
+ SAL_WARN("sw.core", "Invalid Pool Id: " << nId << " should be within "
+ "[" << int(RES_POOLCHR_BEGIN) << "," << int(RES_POOLCHR_END) << ") or "
"[" << int(RES_POOLFRM_BEGIN) << "," << int(RES_POOLFRM_END) << ")");
bFnd = false;
}
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 851496b..3bfa33d 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -1118,7 +1118,7 @@ bool SwTableAutoFmtTbl::Load()
bool SwTableAutoFmtTbl::Save() const
{
SvtPathOptions aPathOpt;
- const OUString sNm( aPathOpt.GetUserConfigPath() + "/" + AUTOTABLE_FORMAT_NAME );
+ const OUString sNm( aPathOpt.GetUserConfigPath() + "/" AUTOTABLE_FORMAT_NAME );
SfxMedium aStream(sNm, STREAM_STD_WRITE );
return Save( *aStream.GetOutStream() ) && aStream.Commit();
}
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index ab62ba6..2874ffd 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -3274,7 +3274,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
sOut += " ";
sOut += OStringToOUString(sCSS1_url, RTL_TEXTENCODING_ASCII_US) +
- "(\'" + OOO_STRING_SVTOOLS_HTML_O_data + ":" + aGraphicInBase64 + "\')";
+ "(\'" OOO_STRING_SVTOOLS_HTML_O_data ":" + aGraphicInBase64 + "\')";
if( pRepeat )
{
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 634c229..0631e70 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -370,7 +370,7 @@ void SwCSS1Parser::SetTableTxtColl( bool bHeader )
pStyleEntry->GetPropertyInfo(), this );
}
- OUString sTmp = sTag + " " + OOO_STRING_SVTOOLS_HTML_parabreak;
+ OUString sTmp = sTag + " " OOO_STRING_SVTOOLS_HTML_parabreak;
pStyleEntry = GetTag( sTmp );
if( pStyleEntry )
{
@@ -960,7 +960,7 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
}
else
{
- OUString sTmp = aToken2 + " " + OOO_STRING_SVTOOLS_HTML_parabreak;
+ OUString sTmp = aToken2 + " " OOO_STRING_SVTOOLS_HTML_parabreak;
if( CSS1_SCRIPT_ALL == nScript )
{
diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx
index b791df6..0fa8903 100644
--- a/sw/source/filter/ww8/WW8Sttbf.cxx
+++ b/sw/source/filter/ww8/WW8Sttbf.cxx
@@ -89,8 +89,8 @@ namespace ww8
#endif
}
- SAL_INFO( "sw.ww8.level2", "<WW8Struct-getUString" << " offset=\"" << nOffset
- << "\" count=\"" << nCount << "\"" << ">" << aResult << "</WW8Struct-getUString>" );
+ SAL_INFO( "sw.ww8.level2", "<WW8Struct-getUString offset=\"" << nOffset
+ << "\" count=\"" << nCount << "\">" << aResult << "</WW8Struct-getUString>" );
return aResult;
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index 31a59ff..17b46cf 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -40,7 +40,7 @@ void generateIncludes(std::ostream & o,
o << "#include \"sal/config.h\"\n";
if (serviceobject) {
o << "#include \"cppuhelper/factory.hxx\"\n"
- << "#include \"cppuhelper/implementationentry.hxx\"\n";
+ "#include \"cppuhelper/implementationentry.hxx\"\n";
} else {
o << "#include \"com/sun/star/uno/XComponentContext.hpp\"\n";
}
@@ -147,12 +147,12 @@ void generateCompHelperDefinition(std::ostream & o,
short nbrackets = generateNamespace(o, implname, true, nm);
o << "::rtl::OUString SAL_CALL _getImplementationName() {\n"
- << " return ::rtl::OUString(\n"
- << " \"" << implname << "\");\n}\n\n";
+ " return ::rtl::OUString(\n"
+ " \"" << implname << "\");\n}\n\n";
o << "css::uno::Sequence< ::rtl::OUString > SAL_CALL "
"_getSupportedServiceNames()\n{\n css::uno::Sequence< "
- << "::rtl::OUString >" << " s(" << services.size() << ");\n";
+ "::rtl::OUString > s(" << services.size() << ");\n";
std::set< OUString >::const_iterator iter = services.begin();
short i=0;
@@ -165,9 +165,9 @@ void generateCompHelperDefinition(std::ostream & o,
o << " return s;\n}\n\n";
o << "css::uno::Reference< css::uno::XInterface > SAL_CALL _create("
- << "\n const css::uno::Reference< css::uno::XComponentContext > & "
- << "context)\n{\n"
- << " return static_cast< ::cppu::OWeakObject * >(new "
+ "\n const css::uno::Reference< css::uno::XComponentContext > & "
+ "context)\n{\n"
+ " return static_cast< ::cppu::OWeakObject * >(new "
<< classname << "(context));\n}\n\n";
// close namepsace
@@ -180,21 +180,21 @@ void generateCompHelperDefinition(std::ostream & o,
void generateCompFunctions(std::ostream & o, const OString & nmspace)
{
o << "static ::cppu::ImplementationEntry const entries[] = {\n"
- << " { &" << nmspace << "::_create,\n &"
+ " { &" << nmspace << "::_create,\n &"
<< nmspace << "::_getImplementationName,\n &"
<< nmspace << "::_getSupportedServiceNames,\n"
- << " &::cppu::createSingleComponentFactory, 0, 0 },\n"
- << " { 0, 0, 0, 0, 0, 0 }\n};\n\n";
+ " &::cppu::createSingleComponentFactory, 0, 0 },\n"
+ " { 0, 0, 0, 0, 0, 0 }\n};\n\n";
o << "extern \"C\" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(\n"
- << " const char * implName, void * serviceManager, void * registryKey)\n{\n"
- << " return ::cppu::component_getFactoryHelper(\n"
- << " implName, serviceManager, registryKey, entries);\n}\n\n";
+ " const char * implName, void * serviceManager, void * registryKey)\n{\n"
+ " return ::cppu::component_getFactoryHelper(\n"
+ " implName, serviceManager, registryKey, entries);\n}\n\n";
o << "extern \"C\" sal_Bool SAL_CALL component_writeInfo(\n"
- << " void * serviceManager, void * registryKey)\n{\n"
- << " return ::cppu::component_writeInfoHelper("
- << "serviceManager, registryKey, entries);\n}\n";
+ " void * serviceManager, void * registryKey)\n{\n"
+ " return ::cppu::component_writeInfoHelper("
+ "serviceManager, registryKey, entries);\n}\n";
}
void generateXPropertySetBodies(std::ostream& o,
@@ -508,7 +508,7 @@ void generateAddinConstructorAndHelper(std::ostream& o,
{
o << classname << "::" << classname
<< "(css::uno::Reference< css::uno::XComponentContext > const & context) :\n"
- << " m_xContext(context), m_locale()\n{\n";
+ " m_xContext(context), m_locale()\n{\n";
if (options.backwardcompatible) {
o << " try {\n";
@@ -631,7 +631,7 @@ OString generateClassDefinition(std::ostream& o,
parentname.append("::cppu::WeakComponentImplHelper");
parentname.append(static_cast<sal_Int32>(interfaces.size()));
o << " private ::cppu::BaseMutex,\n"
- << " public ::cppu::WeakComponentImplHelper"
+ " public ::cppu::WeakComponentImplHelper"
<< interfaces.size() << "<";
} else {
parentname.append("::cppu::WeakImplHelper");
@@ -657,8 +657,8 @@ OString generateClassDefinition(std::ostream& o,
}
o << "\n{\npublic:\n"
- << " explicit " << classname << "("
- << "css::uno::Reference< css::uno::XComponentContext > const & context);\n\n";
+ " explicit " << classname << "("
+ "css::uno::Reference< css::uno::XComponentContext > const & context);\n\n";
// generate component/service helper functions
// o << " // component and service helper functions:\n"
@@ -706,9 +706,9 @@ OString generateClassDefinition(std::ostream& o,
}
o << "private:\n " << classname << "(const " << classname << " &); // not defined\n"
- << " " << classname << "& operator=(const " << classname << " &); // not defined\n\n"
- << " // destructor is private and will be called indirectly by the release call"
- << " virtual ~" << classname << "() {}\n\n";
+ " " << classname << "& operator=(const " << classname << " &); // not defined\n\n"
+ " // destructor is private and will be called indirectly by the release call"
+ " virtual ~" << classname << "() {}\n\n";
if (options.componenttype == 2) {
o << " typedef boost::unordered_map< ::sal_Int32, rtl::OUString, "
@@ -801,7 +801,7 @@ OString generateClassDefinition(std::ostream& o,
if (propertyhelper.getLength() > 1) {
o << " ::cppu::PropertySetMixin< "
<< scopedCppName(u2b(propertyhelper)) << " >(\n"
- << " context, static_cast< Implements >(\n ";
+ " context, static_cast< Implements >(\n ";
OStringBuffer buffer(128);
if (propinterfaces.find("com/sun/star/beans/XPropertySet")
!= propinterfaces.end()) {
@@ -851,22 +851,22 @@ void generateXServiceInfoBodies(std::ostream& o,
OString const & comphelpernamespace)
{
o << "// com.sun.star.uno.XServiceInfo:\n"
- << "::rtl::OUString SAL_CALL " << classname << "getImplementationName() "
- << "throw (css::uno::RuntimeException)\n{\n "
- << "return " << comphelpernamespace << "::_getImplementationName();\n}\n\n";
+ "::rtl::OUString SAL_CALL " << classname << "getImplementationName() "
+ "throw (css::uno::RuntimeException)\n{\n "
+ "return " << comphelpernamespace << "::_getImplementationName();\n}\n\n";
o << "sal_Bool SAL_CALL " << classname
<< "supportsService(::rtl::OUString const & "
- << "serviceName) throw (css::uno::RuntimeException)\n{\n "
- << "css::uno::Sequence< ::rtl::OUString > serviceNames = "
+ "serviceName) throw (css::uno::RuntimeException)\n{\n "
+ "css::uno::Sequence< ::rtl::OUString > serviceNames = "
<< comphelpernamespace << "::_getSupportedServiceNames();\n "
- << "for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) {\n "
- << " if (serviceNames[i] == serviceName)\n return sal_True;\n"
- << " }\n return sal_False;\n}\n\n";
+ "for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) {\n "
+ " if (serviceNames[i] == serviceName)\n return sal_True;\n"
+ " }\n return sal_False;\n}\n\n";
o << "css::uno::Sequence< ::rtl::OUString > SAL_CALL " << classname
<< "getSupportedServiceNames() throw (css::uno::RuntimeException)\n{\n "
- << "return " << comphelpernamespace
+ "return " << comphelpernamespace
<< "::_getSupportedServiceNames();\n}\n\n";
}
diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
index 0a587c3..b36ab80 100644
--- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
@@ -386,8 +386,7 @@ void printSetPropertyMixinBody(
o << " css::uno::Any v;\n";
if (optional) {
- o << " if(" << buffer1.makeStringAndClear() << ")\n {\n"
- << " v <<= " << buffer2.makeStringAndClear() << ";\n }\n";
+ o << " if(" << buffer1.makeStringAndClear() << ")\n {\n v <<= " << buffer2.makeStringAndClear() << ";\n }\n";
} else {
o << " v <<= " << buffer2.makeStringAndClear() << ";\n\n";
}
diff --git a/unodevtools/source/skeletonmaker/javacompskeleton.cxx b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
index 1777dab..3c1733a 100644
--- a/unodevtools/source/skeletonmaker/javacompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
@@ -96,17 +96,17 @@ void generateXServiceInfoBodies(std::ostream& o)
{
o << " // com.sun.star.lang.XServiceInfo:\n";
o << " public String getImplementationName() {\n"
- << " return m_implementationName;\n }\n\n";
+ " return m_implementationName;\n }\n\n";
o << " public boolean supportsService( String sService ) {\n"
- << " int len = m_serviceNames.length;\n\n"
- << " for( int i=0; i < len; i++) {\n"
- << " if (sService.equals(m_serviceNames[i]))\n"
- << " return true;\n"
- << " }\n return false;\n }\n\n";
+ " int len = m_serviceNames.length;\n\n"
+ " for( int i=0; i < len; i++) {\n"
+ " if (sService.equals(m_serviceNames[i]))\n"
+ " return true;\n"
+ " }\n return false;\n }\n\n";
o << " public String[] getSupportedServiceNames() {\n"
- << " return m_serviceNames;\n }\n\n";
+ " return m_serviceNames;\n }\n\n";
}
void generateXPropertySetBodies(std::ostream& o)
@@ -798,7 +798,7 @@ void generateClassDefinition(std::ostream& o,
if (propertyhelper.getLength() > 1) {
o << propcomment
<< " m_prophlp = new PropertySetMixin(m_xContext, this,\n"
- << " new Type(" << propertyhelper
+ " new Type(" << propertyhelper
<< ".class), null);\n";
}
}
diff --git a/unodevtools/source/skeletonmaker/javatypemaker.cxx b/unodevtools/source/skeletonmaker/javatypemaker.cxx
index 50244b1..9e13570 100644
--- a/unodevtools/source/skeletonmaker/javatypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/javatypemaker.cxx
@@ -540,8 +540,7 @@ void printMethods(std::ostream & o,
if ( defaultbody ) {
o << "\n" << indentation << "{\n";
if (i->returnType != "void") {
- o << indentation << " // TODO: Exchange the default return "
- << "implementation for \"" << i->name << "\" !!!\n";
+ o << indentation << " // TODO: Exchange the default return implementation for \"" << i->name << "\" !!!\n";
o << indentation << " // NOTE: "
"Default initialized polymorphic structs can cause problems"
"\n" << indentation << " // because of missing default "
@@ -664,7 +663,7 @@ void printMapsToJavaType(
codemaker::UnoType::Sort sort, OUString const & nucleus, sal_Int32 rank,
std::vector< OUString > const & arguments, const char * javaTypeSort)
{
- o << "maps to Java " << "1.5" << " ";
+ o << "maps to Java 1.5 ";
if (javaTypeSort != 0) {
o << javaTypeSort << ' ';
}
diff --git a/unodevtools/source/skeletonmaker/skeletonmaker.cxx b/unodevtools/source/skeletonmaker/skeletonmaker.cxx
index b2d5461..17f6307 100644
--- a/unodevtools/source/skeletonmaker/skeletonmaker.cxx
+++ b/unodevtools/source/skeletonmaker/skeletonmaker.cxx
@@ -104,15 +104,15 @@ void printUsageAndExit(const char* programname, const char* version)
{
std::cerr
<< "\n using: " << programname << "\n"
- << " dump [<options>] -t <type> ...\n"
- << " " << programname << "\n"
- << " component [<options>] -n <name> -t <type> ...\n"
- << " " << programname << "\n"
- << " calc-add-in [<options>] -n <name> -t <add-in_service>\n"
- << " " << programname << "\n"
- << " add-on [<options>] -n <name> -p <protocol_name:command,...>\n"
- << " " << programname << " -V, --version\n"
- << " " << programname << " -h, --help\n"
+ " dump [<options>] -t <type> ...\n"
+ " " << programname << "\n"
+ " component [<options>] -n <name> -t <type> ...\n"
+ " " << programname << "\n"
+ " calc-add-in [<options>] -n <name> -t <add-in_service>\n"
+ " " << programname << "\n"
+ " add-on [<options>] -n <name> -p <protocol_name:command,...>\n"
+ " " << programname << " -V, --version\n"
+ " " << programname << " -h, --help\n"
<< usageText
<< programname << " Version " << version << "\n\n";
}
diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx
index bf65e32..6b59aef 100644
--- a/vcl/generic/fontmanager/helper.cxx
+++ b/vcl/generic/fontmanager/helper.cxx
@@ -50,7 +50,7 @@ OUString getOfficePath( enum whichOfficePath ePath )
bOnce = true;
OUString aIni;
Bootstrap::get( "BRAND_BASE_DIR", aInstallationRootPath );
- aIni = aInstallationRootPath + "/" LIBO_ETC_FOLDER "/" + SAL_CONFIGFILE( "bootstrap" );
+ aIni = aInstallationRootPath + "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" );
Bootstrap aBootstrap( aIni );
aBootstrap.getFrom( "CustomDataUrl", aConfigPath );
aBootstrap.getFrom( "UserInstallation", aUserPath );
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 6c806db..e917947 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1581,56 +1581,56 @@ bool EnhWMFReader::ReadEnhWMF()
}
break;
- case EMR_MASKBLT : SAL_INFO("vcl.emf", "not implemented '" << "MaskBlt" << "'"); break;
- case EMR_PLGBLT : SAL_INFO("vcl.emf", "not implemented '" << "PlgBlt" << "'"); break;
- case EMR_SETDIBITSTODEVICE : SAL_INFO("vcl.emf", "not implemented '" << "SetDIBitsToDevice" << "'"); break;
- case EMR_FRAMERGN : SAL_INFO("vcl.emf", "not implemented '" << "FrameRgn" << "'"); break;
- case EMR_INVERTRGN : SAL_INFO("vcl.emf", "not implemented '" << "InvertRgn" << "'"); break;
- case EMR_PAINTRGN : SAL_INFO("vcl.emf", "not implemented '" << "PaintRgn" << "'"); break;
- case EMR_FLATTENPATH : SAL_INFO("vcl.emf", "not implemented '" << "FlattenPath" << "'"); break;
- case EMR_WIDENPATH : SAL_INFO("vcl.emf", "not implemented '" << "WidenPath" << "'"); break;
- case EMR_POLYDRAW : SAL_INFO("vcl.emf", "not implemented '" << "Polydraw" << "'"); break;
- case EMR_SETARCDIRECTION : SAL_INFO("vcl.emf", "not implemented '" << "SetArcDirection" << "'"); break;
- case EMR_SETPALETTEENTRIES : SAL_INFO("vcl.emf", "not implemented '" << "SetPaletteEntries" << "'"); break;
- case EMR_RESIZEPALETTE : SAL_INFO("vcl.emf", "not implemented '" << "ResizePalette" << "'"); break;
- case EMR_EXTFLOODFILL : SAL_INFO("vcl.emf", "not implemented '" << "ExtFloodFill" << "'"); break;
- case EMR_ANGLEARC : SAL_INFO("vcl.emf", "not implemented '" << "AngleArc" << "'"); break;
- case EMR_SETCOLORADJUSTMENT : SAL_INFO("vcl.emf", "not implemented '" << "SetColorAdjustment" << "'"); break;
- case EMR_POLYDRAW16 : SAL_INFO("vcl.emf", "not implemented '" << "PolyDraw16" << "'"); break;
- case EMR_POLYTEXTOUTA : SAL_INFO("vcl.emf", "not implemented '" << "PolyTextOutA" << "'"); break;
- case EMR_POLYTEXTOUTW : SAL_INFO("vcl.emf", "not implemented '" << "PolyTextOutW" << "'"); break;
- case EMR_CREATECOLORSPACE : SAL_INFO("vcl.emf", "not implemented '" << "CreateColorSpace" << "'"); break;
- case EMR_SETCOLORSPACE : SAL_INFO("vcl.emf", "not implemented '" << "SetColorSpace" << "'"); break;
- case EMR_DELETECOLORSPACE : SAL_INFO("vcl.emf", "not implemented '" << "DeleteColorSpace" << "'"); break;
- case EMR_GLSRECORD : SAL_INFO("vcl.emf", "not implemented '" << "GlsRecord" << "'"); break;
- case EMR_GLSBOUNDEDRECORD : SAL_INFO("vcl.emf", "not implemented '" << "GlsBoundRecord" << "'"); break;
- case EMR_PIXELFORMAT : SAL_INFO("vcl.emf", "not implemented '" << "PixelFormat" << "'"); break;
- case EMR_DRAWESCAPE : SAL_INFO("vcl.emf", "not implemented '" << "DrawEscape" << "'"); break;
- case EMR_EXTESCAPE : SAL_INFO("vcl.emf", "not implemented '" << "ExtEscape" << "'"); break;
- case EMR_STARTDOC : SAL_INFO("vcl.emf", "not implemented '" << "StartDoc" << "'"); break;
- case EMR_SMALLTEXTOUT : SAL_INFO("vcl.emf", "not implemented '" << "SmallTextOut" << "'"); break;
- case EMR_FORCEUFIMAPPING : SAL_INFO("vcl.emf", "not implemented '" << "ForceUFIMapping" << "'"); break;
- case EMR_NAMEDESCAPE : SAL_INFO("vcl.emf", "not implemented '" << "NamedEscape" << "'"); break;
- case EMR_COLORCORRECTPALETTE : SAL_INFO("vcl.emf", "not implemented '" << "ColorCorrectPalette" << "'"); break;
- case EMR_SETICMPROFILEA : SAL_INFO("vcl.emf", "not implemented '" << "SetICMProfileA" << "'"); break;
- case EMR_SETICMPROFILEW : SAL_INFO("vcl.emf", "not implemented '" << "SetICMProfileW" << "'"); break;
- case EMR_TRANSPARENTBLT : SAL_INFO("vcl.emf", "not implemented '" << "TransparenBlt" << "'"); break;
- case EMR_TRANSPARENTDIB : SAL_INFO("vcl.emf", "not implemented '" << "TransparenDib" << "'"); break;
- case EMR_GRADIENTFILL : SAL_INFO("vcl.emf", "not implemented '" << "GradientFill" << "'"); break;
- case EMR_SETLINKEDUFIS : SAL_INFO("vcl.emf", "not implemented '" << "SetLinkedUFIS" << "'"); break;
-
- case EMR_SETMAPPERFLAGS : SAL_INFO("vcl.emf", "not implemented '" << "SetMapperFlags" << "'"); break;
- case EMR_SETICMMODE : SAL_INFO("vcl.emf", "not implemented '" << "SetICMMode" << "'"); break;
- case EMR_CREATEMONOBRUSH : SAL_INFO("vcl.emf", "not implemented '" << "CreateMonoBrush" << "'"); break;
- case EMR_SETBRUSHORGEX : SAL_INFO("vcl.emf", "not implemented '" << "SetBrushOrgEx" << "'"); break;
- case EMR_SETMETARGN : SAL_INFO("vcl.emf", "not implemented '" << "SetMetArgn" << "'"); break;
- case EMR_SETMITERLIMIT : SAL_INFO("vcl.emf", "not implemented '" << "SetMiterLimit" << "'"); break;
- case EMR_EXCLUDECLIPRECT : SAL_INFO("vcl.emf", "not implemented '" << "ExcludeClipRect" << "'"); break;
- case EMR_REALIZEPALETTE : SAL_INFO("vcl.emf", "not implemented '" << "RealizePalette" << "'"); break;
- case EMR_SELECTPALETTE : SAL_INFO("vcl.emf", "not implemented '" << "SelectPalette" << "'"); break;
- case EMR_CREATEPALETTE : SAL_INFO("vcl.emf", "not implemented '" << "CreatePalette" << "'"); break;
- case EMR_ALPHADIBBLEND : SAL_INFO("vcl.emf", "not implemented '" << "AlphaDibBlend" << "'"); break;
- case EMR_SETTEXTJUSTIFICATION : SAL_INFO("vcl.emf", "not implemented '" << "SetTextJustification" << "'"); break;
+ case EMR_MASKBLT : SAL_INFO("vcl.emf", "not implemented 'MaskBlt'"); break;
+ case EMR_PLGBLT : SAL_INFO("vcl.emf", "not implemented 'PlgBlt'"); break;
+ case EMR_SETDIBITSTODEVICE : SAL_INFO("vcl.emf", "not implemented 'SetDIBitsToDevice'"); break;
+ case EMR_FRAMERGN : SAL_INFO("vcl.emf", "not implemented 'FrameRgn'"); break;
+ case EMR_INVERTRGN : SAL_INFO("vcl.emf", "not implemented 'InvertRgn'"); break;
+ case EMR_PAINTRGN : SAL_INFO("vcl.emf", "not implemented 'PaintRgn'"); break;
+ case EMR_FLATTENPATH : SAL_INFO("vcl.emf", "not implemented 'FlattenPath'"); break;
+ case EMR_WIDENPATH : SAL_INFO("vcl.emf", "not implemented 'WidenPath'"); break;
+ case EMR_POLYDRAW : SAL_INFO("vcl.emf", "not implemented 'Polydraw'"); break;
+ case EMR_SETARCDIRECTION : SAL_INFO("vcl.emf", "not implemented 'SetArcDirection'"); break;
+ case EMR_SETPALETTEENTRIES : SAL_INFO("vcl.emf", "not implemented 'SetPaletteEntries'"); break;
+ case EMR_RESIZEPALETTE : SAL_INFO("vcl.emf", "not implemented 'ResizePalette'"); break;
+ case EMR_EXTFLOODFILL : SAL_INFO("vcl.emf", "not implemented 'ExtFloodFill'"); break;
+ case EMR_ANGLEARC : SAL_INFO("vcl.emf", "not implemented 'AngleArc'"); break;
+ case EMR_SETCOLORADJUSTMENT : SAL_INFO("vcl.emf", "not implemented 'SetColorAdjustment'"); break;
+ case EMR_POLYDRAW16 : SAL_INFO("vcl.emf", "not implemented 'PolyDraw16'"); break;
+ case EMR_POLYTEXTOUTA : SAL_INFO("vcl.emf", "not implemented 'PolyTextOutA'"); break;
+ case EMR_POLYTEXTOUTW : SAL_INFO("vcl.emf", "not implemented 'PolyTextOutW'"); break;
+ case EMR_CREATECOLORSPACE : SAL_INFO("vcl.emf", "not implemented 'CreateColorSpace'"); break;
+ case EMR_SETCOLORSPACE : SAL_INFO("vcl.emf", "not implemented 'SetColorSpace'"); break;
+ case EMR_DELETECOLORSPACE : SAL_INFO("vcl.emf", "not implemented 'DeleteColorSpace'"); break;
+ case EMR_GLSRECORD : SAL_INFO("vcl.emf", "not implemented 'GlsRecord'"); break;
+ case EMR_GLSBOUNDEDRECORD : SAL_INFO("vcl.emf", "not implemented 'GlsBoundRecord'"); break;
+ case EMR_PIXELFORMAT : SAL_INFO("vcl.emf", "not implemented 'PixelFormat'"); break;
+ case EMR_DRAWESCAPE : SAL_INFO("vcl.emf", "not implemented 'DrawEscape'"); break;
+ case EMR_EXTESCAPE : SAL_INFO("vcl.emf", "not implemented 'ExtEscape'"); break;
+ case EMR_STARTDOC : SAL_INFO("vcl.emf", "not implemented 'StartDoc'"); break;
+ case EMR_SMALLTEXTOUT : SAL_INFO("vcl.emf", "not implemented 'SmallTextOut'"); break;
+ case EMR_FORCEUFIMAPPING : SAL_INFO("vcl.emf", "not implemented 'ForceUFIMapping'"); break;
+ case EMR_NAMEDESCAPE : SAL_INFO("vcl.emf", "not implemented 'NamedEscape'"); break;
+ case EMR_COLORCORRECTPALETTE : SAL_INFO("vcl.emf", "not implemented 'ColorCorrectPalette'"); break;
+ case EMR_SETICMPROFILEA : SAL_INFO("vcl.emf", "not implemented 'SetICMProfileA'"); break;
+ case EMR_SETICMPROFILEW : SAL_INFO("vcl.emf", "not implemented 'SetICMProfileW'"); break;
+ case EMR_TRANSPARENTBLT : SAL_INFO("vcl.emf", "not implemented 'TransparenBlt'"); break;
+ case EMR_TRANSPARENTDIB : SAL_INFO("vcl.emf", "not implemented 'TransparenDib'"); break;
+ case EMR_GRADIENTFILL : SAL_INFO("vcl.emf", "not implemented 'GradientFill'"); break;
+ case EMR_SETLINKEDUFIS : SAL_INFO("vcl.emf", "not implemented 'SetLinkedUFIS'"); break;
+
+ case EMR_SETMAPPERFLAGS : SAL_INFO("vcl.emf", "not implemented 'SetMapperFlags'"); break;
+ case EMR_SETICMMODE : SAL_INFO("vcl.emf", "not implemented 'SetICMMode'"); break;
+ case EMR_CREATEMONOBRUSH : SAL_INFO("vcl.emf", "not implemented 'CreateMonoBrush'"); break;
+ case EMR_SETBRUSHORGEX : SAL_INFO("vcl.emf", "not implemented 'SetBrushOrgEx'"); break;
+ case EMR_SETMETARGN : SAL_INFO("vcl.emf", "not implemented 'SetMetArgn'"); break;
+ case EMR_SETMITERLIMIT : SAL_INFO("vcl.emf", "not implemented 'SetMiterLimit'"); break;
+ case EMR_EXCLUDECLIPRECT : SAL_INFO("vcl.emf", "not implemented 'ExcludeClipRect'"); break;
+ case EMR_REALIZEPALETTE : SAL_INFO("vcl.emf", "not implemented 'RealizePalette'"); break;
+ case EMR_SELECTPALETTE : SAL_INFO("vcl.emf", "not implemented 'SelectPalette'"); break;
+ case EMR_CREATEPALETTE : SAL_INFO("vcl.emf", "not implemented 'CreatePalette'"); break;
+ case EMR_ALPHADIBBLEND : SAL_INFO("vcl.emf", "not implemented 'AlphaDibBlend'"); break;
+ case EMR_SETTEXTJUSTIFICATION : SAL_INFO("vcl.emf", "not implemented 'SetTextJustification'"); break;
case EMR_GDICOMMENT :
case EMR_HEADER : // has already been read at ReadHeader()
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 54163f7..a6cac25 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -1152,7 +1152,7 @@ bool WMFReader::ReadHeader()
aPlaceableBound = aExtRect;
SAL_INFO("vcl.wmf", "External header size "
- << " t: " << aPlaceableBound.Left() << " l: " << aPlaceableBound.Top()
+ " t: " << aPlaceableBound.Left() << " l: " << aPlaceableBound.Top()
<< " b: " << aPlaceableBound.Right() << " r: " << aPlaceableBound.Bottom());
pOut->SetMapMode( pExternalHeader->mapMode );
@@ -1176,7 +1176,7 @@ bool WMFReader::ReadHeader()
aPlaceableBound.Bottom() / fRatio);
SAL_INFO("vcl.wmf", "Placeable bounds "
- << " t: " << aPlaceableBound.Left() << " l: " << aPlaceableBound.Top()
+ " t: " << aPlaceableBound.Left() << " l: " << aPlaceableBound.Top()
<< " b: " << aPlaceableBound.Right() << " r: " << aPlaceableBound.Bottom());
}
}
@@ -1188,8 +1188,7 @@ bool WMFReader::ReadHeader()
Size aWMFSize( labs( aPlaceableBound.GetWidth() ), labs( aPlaceableBound.GetHeight() ) );
pOut->SetWinExt( aWMFSize );
- SAL_INFO("vcl.wmf", "WMF size "
- << " w: " << aWMFSize.Width() << " h: " << aWMFSize.Height());
+ SAL_INFO("vcl.wmf", "WMF size w: " << aWMFSize.Width() << " h: " << aWMFSize.Height());
Size aDevExt( 10000, 10000 );
if( ( labs( aWMFSize.Width() ) > 1 ) && ( labs( aWMFSize.Height() ) > 1 ) )
@@ -1201,8 +1200,7 @@ bool WMFReader::ReadHeader()
}
pOut->SetDevExt( aDevExt );
- SAL_INFO("vcl.wmf", "Dev size "
- << " w: " << aDevExt.Width() << " h: " << aDevExt.Height());
+ SAL_INFO("vcl.wmf", "Dev size w: " << aDevExt.Width() << " h: " << aDevExt.Height());
// read the METAHEADER
sal_uInt32 nMetaKey(0);
@@ -1636,21 +1634,21 @@ bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pStm )
{
rPlaceableBound = Rectangle(aWinOrg, *aWinExt);
SAL_INFO("vcl.wmf", "Window dimension "
- << " t: " << rPlaceableBound.Left() << " l: " << rPlaceableBound.Top()
+ " t: " << rPlaceableBound.Left() << " l: " << rPlaceableBound.Top()
<< " b: " << rPlaceableBound.Right() << " r: " << rPlaceableBound.Bottom());
}
else if (aViewportExt)
{
rPlaceableBound = Rectangle(aViewportOrg, *aViewportExt);
SAL_INFO("vcl.wmf", "Viewport dimension "
- << " t: " << rPlaceableBound.Left() << " l: " << rPlaceableBound.Top()
+ " t: " << rPlaceableBound.Left() << " l: " << rPlaceableBound.Top()
<< " b: " << rPlaceableBound.Right() << " r: " << rPlaceableBound.Bottom());
}
else if (bBoundsDetermined)
{
rPlaceableBound = aBound;
SAL_INFO("vcl.wmf", "Determined dimension "
- << " t: " << rPlaceableBound.Left() << " l: " << rPlaceableBound.Top()
+ " t: " << rPlaceableBound.Left() << " l: " << rPlaceableBound.Top()
<< " b: " << rPlaceableBound.Right() << " r: " << rPlaceableBound.Bottom());
}
else
@@ -1660,7 +1658,7 @@ bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pStm )
rPlaceableBound.Right() = aMaxWidth;
rPlaceableBound.Bottom() = aMaxWidth;
SAL_INFO("vcl.wmf", "Default dimension "
- << " t: " << rPlaceableBound.Left() << " l: " << rPlaceableBound.Top()
+ " t: " << rPlaceableBound.Left() << " l: " << rPlaceableBound.Top()
<< " b: " << rPlaceableBound.Right() << " r: " << rPlaceableBound.Bottom());
}
}
diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx
index 0f5e61e..9d622a9 100644
--- a/vcl/source/window/debugevent.cxx
+++ b/vcl/source/window/debugevent.cxx
@@ -111,9 +111,9 @@ void DebugEventInjector::InjectMenuEvent()
SAL_INFO( "vcl.debugevent",
"Injected menu event " << aEvent.mpMenu
- << " (" << aEvent.mnId << ") "
- << "'" << ((Menu *)aEvent.mpMenu)->GetItemText( aEvent.mnId ) << "'"
- << " -> " << bHandled );
+ << " (" << aEvent.mnId << ") '"
+ << ((Menu *)aEvent.mpMenu)->GetItemText( aEvent.mnId ) << "' -> "
+ << bHandled );
}
static void InitKeyEvent( SalKeyEvent &rKeyEvent )
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index 51a1bc3..5ce45b8 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -316,13 +316,13 @@ void SessionManagerClient::SaveYourselfProc(
Bool
)
{
- SAL_INFO("vcl.sm", "Session: save yourself," <<
- "save_type " <<
+ SAL_INFO("vcl.sm", "Session: save yourself, "
+ "save_type "
" local: " << (save_type == SmSaveLocal) <<
" global: " << (save_type == SmSaveGlobal) <<
" both: " << (save_type == SmSaveBoth) <<
" shutdown: " << shutdown <<
- " interact_style: " <<
+ " interact_style: "
" SmInteractStyleNone: " << (interact_style == SmInteractStyleNone) <<
" SmInteractStyleErrors: " << (interact_style == SmInteractStyleErrors) <<
" SmInteractStyleErrors: " << (interact_style == SmInteractStyleAny));
More information about the Libreoffice-commits
mailing list