chart2/qa/extras/chart2geometry.cxx | 32 ++---
comphelper/qa/string/test_string.cxx | 12 --
compilerplugins/clang/elidestringvar.cxx | 47 ++++---
compilerplugins/clang/test/elidestringvar.cxx | 12 +-
cui/source/dialogs/AdditionsDialog.cxx | 4
desktop/qa/desktop_lib/test_desktop_lib.cxx | 3
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 25 +---
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 59 +++------
sal/qa/rtl/digest/rtl_digest.cxx | 18 ---
sal/qa/rtl/oustring/rtl_OUString2.cxx | 78 ++++---------
sal/qa/rtl/uri/rtl_Uri.cxx | 3
sc/qa/unit/copy_paste_test.cxx | 3
sc/qa/unit/screenshots/screenshots.cxx | 3
sc/qa/unit/subsequent_export-test.cxx | 8 -
sd/qa/unit/dialogs-test.cxx | 4
sd/qa/unit/export-tests-ooxml1.cxx | 6 -
sd/qa/unit/export-tests-ooxml2.cxx | 4
sd/qa/unit/tiledrendering/tiledrendering.cxx | 10 +
sd/source/ui/remotecontrol/Communicator.cxx | 5
sfx2/source/bastyp/frmhtmlw.cxx | 5
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 8 -
sw/qa/extras/uiwriter/uiwriter.cxx | 10 -
sw/source/filter/html/wrthtml.cxx | 4
23 files changed, 145 insertions(+), 218 deletions(-)
New commits:
commit 40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Oct 27 23:18:23 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Oct 28 08:03:52 2020 +0100
Extend loplugin:elidestringvar to OString
(In VisitVarDecl, filtering out AbstractConditionalOperator avoids an
unhelpful
> ~/lo/core/vcl/source/pdf/XmpMetadata.cxx:63:32: error: replace single use
of literal 'rtl::OString' variable with a literal [loplugin:elidestringvar]
> aXmlWriter.content(sPdfConformance);
> ^~~~~~~~~~~~~~~
> ~/lo/core/vcl/source/pdf/XmpMetadata.cxx:52:21: note: literal
'rtl::OString' variable defined here [loplugin:elidestringvar]
> OString sPdfConformance = (mnPDF_A == 1) ? "A" : "B";
> ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
)
Change-Id: I7d0410f04827d79b4b526752917c37d33cad2671
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104911
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/chart2/qa/extras/chart2geometry.cxx
b/chart2/qa/extras/chart2geometry.cxx
index be6d842d7780..08e909162766 100644
--- a/chart2/qa/extras/chart2geometry.cxx
+++ b/chart2/qa/extras/chart2geometry.cxx
@@ -296,9 +296,9 @@ void
Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import()
// Find transparency gradient name
xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");
CPPUNIT_ASSERT(pXmlDoc);
- const OString sChartPath(
+ const OUString sOUChartStyleName = getXPathContent(
+ pXmlDoc,
"//office:document-content/office:body/office:chart/chart:chart/@chart:style-name");
- const OUString sOUChartStyleName = getXPathContent(pXmlDoc, sChartPath);
const OString sStylePath(
"//office:document-content/office:automatic-styles/style:style[@style:name='"
+ OU2O(sOUChartStyleName) + "']");
@@ -310,9 +310,8 @@ void
Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import()
// Verify the content of the opacity definition
xmlDocUniquePtr pXmlDoc2 = parseExport("Object 1/styles.xml", "impress8");
CPPUNIT_ASSERT(pXmlDoc2);
- const OString
sOpacityPath("//office:document-styles/office:styles/draw:opacity");
const OString sAttribute("@draw:name='" + OU2O(sOUOpacityName) + "'");
- const OString sStart(sOpacityPath + "[" + sAttribute);
+ const OString
sStart("//office:document-styles/office:styles/draw:opacity[" + sAttribute);
assertXPath(pXmlDoc2, sStart + "]", 1);
assertXPath(pXmlDoc2, sStart + " and @draw:style='linear']");
assertXPath(pXmlDoc2, sStart + " and @draw:start='30%']");
@@ -348,9 +347,9 @@ void
Chart2GeometryTest::testTdf128345ChartWall_CS_TG_import()
// Find transparency gradient name
xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");
CPPUNIT_ASSERT(pXmlDoc);
- const OString
sChartPath("//office:document-content/office:body/office:chart/chart:chart/"
- "chart:plot-area/chart:wall/@chart:style-name");
- const OUString sOUChartStyleName = getXPathContent(pXmlDoc, sChartPath);
+ const OUString sOUChartStyleName
+ = getXPathContent(pXmlDoc,
"//office:document-content/office:body/office:chart/chart:chart/"
+
"chart:plot-area/chart:wall/@chart:style-name");
const OString sStylePath(
"//office:document-content/office:automatic-styles/style:style[@style:name='"
+ OU2O(sOUChartStyleName) + "']");
@@ -362,9 +361,8 @@ void
Chart2GeometryTest::testTdf128345ChartWall_CS_TG_import()
// Verify content of the opacity definition
xmlDocUniquePtr pXmlDoc2 = parseExport("Object 1/styles.xml", "impress8");
CPPUNIT_ASSERT(pXmlDoc2);
- const OString
sOpacityPath("//office:document-styles/office:styles/draw:opacity");
const OString sAttribute("@draw:name='" + OU2O(sOUOpacityName) + "'");
- const OString sStart(sOpacityPath + "[" + sAttribute);
+ const OString
sStart("//office:document-styles/office:styles/draw:opacity[" + sAttribute);
assertXPath(pXmlDoc2, sStart + "]", 1);
assertXPath(pXmlDoc2, sStart + " and @draw:style='linear']");
assertXPath(pXmlDoc2, sStart + " and @draw:start='0%']");
@@ -400,9 +398,9 @@ void
Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_import()
// Find transparency gradient name
xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");
CPPUNIT_ASSERT(pXmlDoc);
- const OString
sChartPath("//office:document-content/office:body/office:chart/chart:chart/"
- "chart:legend/@chart:style-name");
- const OUString sOUChartStyleName = getXPathContent(pXmlDoc, sChartPath);
+ const OUString sOUChartStyleName
+ = getXPathContent(pXmlDoc,
"//office:document-content/office:body/office:chart/chart:chart/"
+ "chart:legend/@chart:style-name");
const OString sStylePath(
"//office:document-content/office:automatic-styles/style:style[@style:name='"
+ OU2O(sOUChartStyleName) + "']");
@@ -414,9 +412,8 @@ void
Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_import()
// Verify content of the opacity definition
xmlDocUniquePtr pXmlDoc2 = parseExport("Object 1/styles.xml", "impress8");
CPPUNIT_ASSERT(pXmlDoc2);
- const OString
sOpacityPath("//office:document-styles/office:styles/draw:opacity");
const OString sAttribute("@draw:name='" + OU2O(sOUOpacityName) + "'");
- const OString sStart(sOpacityPath + "[" + sAttribute);
+ const OString
sStart("//office:document-styles/office:styles/draw:opacity[" + sAttribute);
assertXPath(pXmlDoc2, sStart + "]", 1);
assertXPath(pXmlDoc2, sStart + " and @draw:style='axial']");
assertXPath(pXmlDoc2, sStart + " and @draw:start='0%']");
@@ -517,10 +514,9 @@ void Chart2GeometryTest::testTdf135366LabelExport()
CPPUNIT_ASSERT(pXmlDoc);
// Find label style
- const OString sLabelPath(
-
"//office:document-content/office:body/office:chart/chart:chart/chart:plot-area"
-
"/chart:series/chart:data-point[1]/chart:data-label/@chart:style-name");
- const OUString sOULabelStyleName = getXPathContent(pXmlDoc, sLabelPath);
+ const OUString sOULabelStyleName = getXPathContent(
+ pXmlDoc,
"//office:document-content/office:body/office:chart/chart:chart/chart:plot-area"
+
"/chart:series/chart:data-point[1]/chart:data-label/@chart:style-name");
// Verify content of graphic properties of label style
const OString sStylePath(
diff --git a/comphelper/qa/string/test_string.cxx
b/comphelper/qa/string/test_string.cxx
index aa427bea8a65..faedac30260f 100644
--- a/comphelper/qa/string/test_string.cxx
+++ b/comphelper/qa/string/test_string.cxx
@@ -75,14 +75,11 @@ void TestString::testDecimalStringToNumber()
void TestString::testIsdigitAsciiString()
{
- OString s1("1234");
- CPPUNIT_ASSERT_EQUAL(true, comphelper::string::isdigitAsciiString(s1));
+ CPPUNIT_ASSERT_EQUAL(true,
comphelper::string::isdigitAsciiString(OString("1234")));
- OString s2("1A34");
- CPPUNIT_ASSERT_EQUAL(false, comphelper::string::isdigitAsciiString(s2));
+ CPPUNIT_ASSERT_EQUAL(false,
comphelper::string::isdigitAsciiString(OString("1A34")));
- OString s3;
- CPPUNIT_ASSERT_EQUAL(true, comphelper::string::isdigitAsciiString(s3));
+ CPPUNIT_ASSERT_EQUAL(true,
comphelper::string::isdigitAsciiString(OString()));
}
using namespace ::com::sun::star;
@@ -369,8 +366,7 @@ void TestString::testTokenCount()
void TestString::testReverseString()
{
- OString aIn("ABC");
- OString aOut = ::comphelper::string::reverseString(aIn);
+ OString aOut = ::comphelper::string::reverseString(OString("ABC"));
CPPUNIT_ASSERT_EQUAL(OString("CBA"), aOut);
}
diff --git a/compilerplugins/clang/elidestringvar.cxx
b/compilerplugins/clang/elidestringvar.cxx
index 27b0e5ab77bd..6fd57c44ff4f 100644
--- a/compilerplugins/clang/elidestringvar.cxx
+++ b/compilerplugins/clang/elidestringvar.cxx
@@ -17,7 +17,7 @@
#include "compat.hxx"
#include "plugin.hxx"
-// Find cases where a variable of a string type (at least for now, only
OUString) is initialized
+// Find cases where a variable of a OString/OUString type is initialized
// with a literal value (incl. as an empty string) and used only once.
Conservatively this only
// covers local non-static variables that are not defined outside of the loop
(if any) in which they
// are used, as other cases may deliberately use the variable for performance
(or even correctness,
@@ -37,6 +37,13 @@
namespace
{
+bool isStringType(QualType type)
+{
+ loplugin::TypeCheck const c(type);
+ return c.Class("OString").Namespace("rtl").GlobalNamespace()
+ || c.Class("OUString").Namespace("rtl").GlobalNamespace();
+}
+
class ElideStringVar : public loplugin::FilteringPlugin<ElideStringVar>
{
public:
@@ -67,12 +74,12 @@ public:
continue;
}
report(DiagnosticsEngine::Warning,
- "replace single use of literal OUString variable with a
literal",
+ "replace single use of literal %0 variable with a literal",
(*var.second.singleUse)->getExprLoc())
- << (*var.second.singleUse)->getSourceRange();
- report(DiagnosticsEngine::Note, "literal OUString variable defined
here",
+ << var.first->getType() <<
(*var.second.singleUse)->getSourceRange();
+ report(DiagnosticsEngine::Note, "literal %0 variable defined here",
var.first->getLocation())
- << var.first->getSourceRange();
+ << var.first->getType() << var.first->getSourceRange();
}
}
@@ -94,10 +101,7 @@ public:
{
return true;
}
- if (!loplugin::TypeCheck(decl->getType())
- .Class("OUString")
- .Namespace("rtl")
- .GlobalNamespace())
+ if (!isStringType(decl->getType()))
{
return true;
}
@@ -110,10 +114,7 @@ public:
{
return true;
}
- if (!loplugin::TypeCheck(e1->getType())
- .Class("OUString")
- .Namespace("rtl")
- .GlobalNamespace())
+ if (!isStringType(e1->getType()))
{
return true;
}
@@ -124,10 +125,9 @@ public:
case 1:
{
auto const e2 = e1->getArg(0);
- if (loplugin::TypeCheck(e2->getType())
- .Class("OUStringLiteral")
- .Namespace("rtl")
- .GlobalNamespace())
+ loplugin::TypeCheck const c(e2->getType());
+ if
(c.Class("OStringLiteral").Namespace("rtl").GlobalNamespace()
+ ||
c.Class("OUStringLiteral").Namespace("rtl").GlobalNamespace())
{
break;
}
@@ -139,14 +139,19 @@ public:
}
case 2:
{
- auto const t = e1->getArg(0)->getType();
+ auto const e2 = e1->getArg(0);
+ auto const t = e2->getType();
if (!(t.isConstQualified() && t->isConstantArrayType()))
{
return true;
}
- auto const e2 = e1->getArg(1);
- if (!(isa<CXXDefaultArgExpr>(e2)
- && loplugin::TypeCheck(e2->getType())
+ if
(isa<AbstractConditionalOperator>(e2->IgnoreParenImpCasts()))
+ {
+ return true;
+ }
+ auto const e3 = e1->getArg(1);
+ if (!(isa<CXXDefaultArgExpr>(e3)
+ && loplugin::TypeCheck(e3->getType())
.Struct("Dummy")
.Namespace("libreoffice_internal")
.Namespace("rtl")
diff --git a/compilerplugins/clang/test/elidestringvar.cxx
b/compilerplugins/clang/test/elidestringvar.cxx
index 1835c183bb39..3e8e6592bbae 100644
--- a/compilerplugins/clang/test/elidestringvar.cxx
+++ b/compilerplugins/clang/test/elidestringvar.cxx
@@ -14,25 +14,25 @@
OUString f(sal_Unicode c, int n)
{
OUString s1(c);
- // expected-note@+1 {{literal OUString variable defined here
[loplugin:elidestringvar]}}
+ // expected-note@+1 {{literal 'rtl::OUString' variable defined here
[loplugin:elidestringvar]}}
OUString s2('a');
- // expected-note@+1 {{literal OUString variable defined here
[loplugin:elidestringvar]}}
+ // expected-note@+1 {{literal 'rtl::OUString' variable defined here
[loplugin:elidestringvar]}}
OUString s3(u'a');
static constexpr OUStringLiteral s4lit(u"a");
- // expected-note@+1 {{literal OUString variable defined here
[loplugin:elidestringvar]}}
+ // expected-note@+1 {{literal 'rtl::OUString' variable defined here
[loplugin:elidestringvar]}}
OUString s4 = s4lit;
switch (n)
{
case 1:
return s1;
case 2:
- // expected-error@+1 {{replace single use of literal OUString
variable with a literal [loplugin:elidestringvar]}}
+ // expected-error@+1 {{replace single use of literal
'rtl::OUString' variable with a literal [loplugin:elidestringvar]}}
return s2;
case 3:
- // expected-error@+1 {{replace single use of literal OUString
variable with a literal [loplugin:elidestringvar]}}
+ // expected-error@+1 {{replace single use of literal
'rtl::OUString' variable with a literal [loplugin:elidestringvar]}}
return s3;
default:
- // expected-error@+1 {{replace single use of literal OUString
variable with a literal [loplugin:elidestringvar]}}
+ // expected-error@+1 {{replace single use of literal
'rtl::OUString' variable with a literal [loplugin:elidestringvar]}}
return s4;
}
}
diff --git a/cui/source/dialogs/AdditionsDialog.cxx
b/cui/source/dialogs/AdditionsDialog.cxx
index cf9a605d5970..dd994839681a 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -511,9 +511,7 @@ AdditionsDialog::AdditionsDialog(weld::Window* pParent,
const OUString& sAdditio
m_sTag = "allextensions"; // Means empty parameter
}
//FIXME: Temporary URL
- OString sPrefixURL = "https://yusufketen.com/api/";;
- OString sSuffixURL = ".json";
- OString rURL = sPrefixURL + m_sTag + sSuffixURL;
+ OString rURL = "https://yusufketen.com/api/"; + m_sTag + ".json";
m_sURL = rURL;
m_xExtensionManager
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 2d338d20014a..b2015dbafcf2 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -1783,8 +1783,7 @@ void DesktopLOKTest::testInput()
Scheduler::ProcessEventsToIdle();
char* pText = pDocument->pClass->getTextSelection(pDocument,
"text/plain;charset=utf-8", nullptr);
CPPUNIT_ASSERT(pText != nullptr);
- OString aLovely("far beyond lovely ");
- CPPUNIT_ASSERT_EQUAL(aLovely, OString(pText));
+ CPPUNIT_ASSERT_EQUAL(OString("far beyond lovely "), OString(pText));
free(pText);
}
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 04603bc03f77..1a3e27ee3afd 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1207,8 +1207,6 @@ void
VclMetafileProcessor2D::processTextHierarchyFieldPrimitive2D(
// support for FIELD_SEQ_BEGIN, FIELD_SEQ_END and URL. It wraps text
primitives (but is not limited to)
// thus do the MetafileAction embedding stuff but just handle recursively.
const OString aCommentStringCommon("FIELD_SEQ_BEGIN");
- const OString aCommentStringPage("FIELD_SEQ_BEGIN;PageField");
- const OString aCommentStringEnd("FIELD_SEQ_END");
OUString aURL;
switch (rFieldPrimitive.getType())
@@ -1220,7 +1218,7 @@ void
VclMetafileProcessor2D::processTextHierarchyFieldPrimitive2D(
}
case drawinglayer::primitive2d::FIELD_TYPE_PAGE:
{
- mpMetaFile->AddAction(new MetaCommentAction(aCommentStringPage));
+ mpMetaFile->AddAction(new
MetaCommentAction("FIELD_SEQ_BEGIN;PageField"));
break;
}
case drawinglayer::primitive2d::FIELD_TYPE_URL:
@@ -1244,7 +1242,7 @@ void
VclMetafileProcessor2D::processTextHierarchyFieldPrimitive2D(
process(rContent);
// for the end comment the type is not relevant yet, they are all the
same. Just add.
- mpMetaFile->AddAction(new MetaCommentAction(aCommentStringEnd));
+ mpMetaFile->AddAction(new MetaCommentAction("FIELD_SEQ_END"));
if (!(mpPDFExtOutDevData
&& drawinglayer::primitive2d::FIELD_TYPE_URL ==
rFieldPrimitive.getType()))
@@ -1266,20 +1264,14 @@ void
VclMetafileProcessor2D::processTextHierarchyFieldPrimitive2D(
void VclMetafileProcessor2D::processTextHierarchyLinePrimitive2D(
const primitive2d::TextHierarchyLinePrimitive2D& rLinePrimitive)
{
- const OString aCommentString("XTEXT_EOL");
-
// process recursively and add MetaFile comment
process(rLinePrimitive);
- mpMetaFile->AddAction(new MetaCommentAction(aCommentString));
+ mpMetaFile->AddAction(new MetaCommentAction("XTEXT_EOL"));
}
void VclMetafileProcessor2D::processTextHierarchyBulletPrimitive2D(
const primitive2d::TextHierarchyBulletPrimitive2D& rBulletPrimitive)
{
- // in Outliner::PaintBullet(), a MetafileComment for bullets is added,
too. The
- // "XTEXT_EOC" is used, use here, too.
- const OString aCommentString("XTEXT_EOC");
-
// this is a part of list item, start LILabel ( = bullet)
if (mbInListItem)
{
@@ -1289,7 +1281,9 @@ void
VclMetafileProcessor2D::processTextHierarchyBulletPrimitive2D(
// process recursively and add MetaFile comment
process(rBulletPrimitive);
- mpMetaFile->AddAction(new MetaCommentAction(aCommentString));
+ // in Outliner::PaintBullet(), a MetafileComment for bullets is added,
too. The
+ // "XTEXT_EOC" is used, use here, too.
+ mpMetaFile->AddAction(new MetaCommentAction("XTEXT_EOC"));
if (mbInListItem)
{
@@ -1400,11 +1394,8 @@ void
VclMetafileProcessor2D::processTextHierarchyParagraphPrimitive2D(
void VclMetafileProcessor2D::processTextHierarchyBlockPrimitive2D(
const primitive2d::TextHierarchyBlockPrimitive2D& rBlockPrimitive)
{
- const OString aCommentStringA("XTEXT_PAINTSHAPE_BEGIN");
- const OString aCommentStringB("XTEXT_PAINTSHAPE_END");
-
// add MetaFile comment, process recursively and add MetaFile comment
- mpMetaFile->AddAction(new MetaCommentAction(aCommentStringA));
+ mpMetaFile->AddAction(new MetaCommentAction("XTEXT_PAINTSHAPE_BEGIN"));
process(rBlockPrimitive);
if (mnCurrentOutlineLevel >= 0)
@@ -1416,7 +1407,7 @@ void
VclMetafileProcessor2D::processTextHierarchyBlockPrimitive2D(
}
}
- mpMetaFile->AddAction(new MetaCommentAction(aCommentStringB));
+ mpMetaFile->AddAction(new MetaCommentAction("XTEXT_PAINTSHAPE_END"));
}
void VclMetafileProcessor2D::processTextSimplePortionPrimitive2D(
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index c8a7ccce2a89..cfc73ca42dfb 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -211,9 +211,8 @@ namespace rtl_OStringBuffer
void makeStringAndClear_001()
{
OStringBuffer aStrBuf1;
- OString aStr1;
- bool lastRes = (aStrBuf1.makeStringAndClear() == aStr1 );
+ bool lastRes = aStrBuf1.makeStringAndClear().isEmpty();
CPPUNIT_ASSERT_MESSAGE
(
@@ -236,9 +235,8 @@ namespace rtl_OStringBuffer
void makeStringAndClear_002()
{
OStringBuffer aStrBuf2(26);
- OString aStr2;
- bool lastRes = (aStrBuf2.makeStringAndClear() == aStr2 );
+ bool lastRes = aStrBuf2.makeStringAndClear().isEmpty();
CPPUNIT_ASSERT_MESSAGE
(
@@ -975,7 +973,6 @@ namespace rtl_OStringBuffer
{
OStringBuffer aStrBuf( arrOUS[0] );
sal_Int32 expVal1 = 0;
- OString expVal2;
sal_Int32 expVal3 = 32;
sal_Int32 input = 0;
@@ -984,7 +981,7 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"newLength equal to 0",
- aStrBuf.getStr() == expVal2 &&
+ aStrBuf.getStr()[0] == '\0' &&
aStrBuf.getLength() == expVal1 &&
aStrBuf.getCapacity() == expVal3
);
@@ -1035,7 +1032,6 @@ namespace rtl_OStringBuffer
{
OStringBuffer aStrBuf( arrOUS[1] );
sal_Int32 expVal1 = 0;
- OString expVal2;
sal_Int32 expVal3 = 17;
sal_Int32 input = 0;
@@ -1044,7 +1040,7 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"newLength less than the length of OUStringBuffer(1)",
- aStrBuf.getStr() == expVal2 &&
+ aStrBuf.getStr()[0] == '\0' &&
aStrBuf.getLength() == expVal1 &&
aStrBuf.getCapacity() == expVal3
);
@@ -1055,7 +1051,6 @@ namespace rtl_OStringBuffer
{
OStringBuffer aStrBuf( arrOUS[2] );
sal_Int32 expVal1 = 20;
- OString expVal2;
sal_Int32 expVal3 = 20;
sal_Int32 input = 20;
@@ -1064,7 +1059,7 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"newLength more than the capacity of OStringBuffer()",
- aStrBuf.getStr() == expVal2 &&
+ aStrBuf.getStr()[0] == '\0' &&
aStrBuf.getLength() == expVal1 &&
aStrBuf.getCapacity() == expVal3
);
@@ -1075,7 +1070,6 @@ namespace rtl_OStringBuffer
{
OStringBuffer aStrBuf( arrOUS[2] );
sal_Int32 expVal1 = 3;
- OString expVal2;
sal_Int32 expVal3 = 16;
sal_Int32 input = 3;
@@ -1084,7 +1078,7 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"newLength more than the length of OStringBuffer()",
- aStrBuf.getStr() == expVal2 &&
+ aStrBuf.getStr()[0] == '\0' &&
aStrBuf.getLength() == expVal1 &&
aStrBuf.getCapacity() == expVal3
);
@@ -1095,7 +1089,6 @@ namespace rtl_OStringBuffer
{
OStringBuffer aStrBuf( arrOUS[2] );
sal_Int32 expVal1 = 0;
- OString expVal2;
sal_Int32 expVal3 = 16;
sal_Int32 input = 0;
@@ -1104,7 +1097,7 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"newLength more than the length of OStringBuffer()",
- aStrBuf.getStr() == expVal2 &&
+ aStrBuf.getStr()[0] == '\0' &&
aStrBuf.getLength() == expVal1 &&
aStrBuf.getCapacity() == expVal3
);
@@ -1115,7 +1108,6 @@ namespace rtl_OStringBuffer
{
OStringBuffer aStrBuf( arrOUS[3] );
sal_Int32 expVal1 = 20;
- OString expVal2;
sal_Int32 expVal3 = 20;
sal_Int32 input = 20;
@@ -1124,7 +1116,7 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"newLength more than the capacity of OStringBuffer("")",
- aStrBuf.getStr() == expVal2 &&
+ aStrBuf.getStr()[0] == '\0' &&
aStrBuf.getLength() == expVal1 &&
aStrBuf.getCapacity() == expVal3
);
@@ -1135,7 +1127,6 @@ namespace rtl_OStringBuffer
{
OStringBuffer aStrBuf( arrOUS[3] );
sal_Int32 expVal1 = 5;
- OString expVal2;
sal_Int32 expVal3 = 16;
sal_Int32 input = 5;
@@ -1144,7 +1135,7 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"newLength more than the length of OStringBuffer("")",
- aStrBuf.getStr() == expVal2 &&
+ aStrBuf.getStr()[0] == '\0' &&
aStrBuf.getLength() == expVal1 &&
aStrBuf.getCapacity() == expVal3
);
@@ -1155,7 +1146,6 @@ namespace rtl_OStringBuffer
{
OStringBuffer aStrBuf( arrOUS[3] );
sal_Int32 expVal1 = 0;
- OString expVal2;
sal_Int32 expVal3 = 16;
sal_Int32 input = 0;
@@ -1164,7 +1154,7 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"newLength less than the length of OStringBuffer("")",
- aStrBuf.getStr() == expVal2 &&
+ aStrBuf.getStr()[0] == '\0' &&
aStrBuf.getLength() == expVal1 &&
aStrBuf.getCapacity() == expVal3
);
@@ -1175,7 +1165,6 @@ namespace rtl_OStringBuffer
{
OStringBuffer aStrBuf( arrOUS[4] );
sal_Int32 expVal1 = 20;
- OString expVal2;
sal_Int32 expVal3 = 20;
sal_Int32 input = 20;
@@ -1184,7 +1173,7 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"newLength more than the length of OStringBuffer(\0)",
- aStrBuf.getStr() == expVal2 &&
+ aStrBuf.getStr()[0] == '\0' &&
aStrBuf.getLength() == expVal1 &&
aStrBuf.getCapacity() == expVal3
);
@@ -1195,7 +1184,6 @@ namespace rtl_OStringBuffer
{
OStringBuffer aStrBuf( arrOUS[4] );
sal_Int32 expVal1 = 5;
- OString expVal2;
sal_Int32 expVal3 = 17;
sal_Int32 input = 5;
@@ -1204,7 +1192,7 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"newLength more than the length of OStringBuffer(\0)",
- aStrBuf.getStr() == expVal2 &&
+ aStrBuf.getStr()[0] == '\0' &&
aStrBuf.getLength() == expVal1 &&
aStrBuf.getCapacity() == expVal3
);
@@ -1215,7 +1203,6 @@ namespace rtl_OStringBuffer
{
OStringBuffer aStrBuf( arrOUS[4] );
sal_Int32 expVal1 = 0;
- OString expVal2;
sal_Int32 expVal3 = 17;
sal_Int32 input = 0;
@@ -1224,7 +1211,7 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"newLength less than the length of OStringBuffer(\0)",
- aStrBuf.getStr() == expVal2 &&
+ aStrBuf.getStr()[0] == '\0' &&
aStrBuf.getLength() == expVal1 &&
aStrBuf.getCapacity() == expVal3
);
@@ -1315,7 +1302,6 @@ namespace rtl_OStringBuffer
{
OStringBuffer aStrBuf( arrOUS[5] );
sal_Int32 expVal1 = 0;
- OString expVal2;
sal_Int32 expVal3 = 48;
sal_Int32 input = 0;
@@ -1324,7 +1310,7 @@ namespace rtl_OStringBuffer
CPPUNIT_ASSERT_MESSAGE
(
"newLength equal to 0",
- aStrBuf.getStr() == expVal2 &&
+ aStrBuf.getStr()[0] == '\0' &&
aStrBuf.getLength() == expVal1 &&
aStrBuf.getCapacity() == expVal3
);
@@ -1443,6 +1429,8 @@ namespace rtl_OStringBuffer
{
OString arrOUS[5];
+ OString empty; // silence loplugin
+
public:
void setUp() override
{
@@ -1508,9 +1496,8 @@ namespace rtl_OStringBuffer
{
OString expVal( kTestStr7 );
OStringBuffer aStrBuf( arrOUS[0] );
- OString input2;
- aStrBuf.append( input2 );
+ aStrBuf.append( empty );
CPPUNIT_ASSERT_MESSAGE
(
@@ -1576,9 +1563,8 @@ namespace rtl_OStringBuffer
{
OString expVal;
OStringBuffer aStrBuf( arrOUS[1] );
- OString input2;
- aStrBuf.append( input2 );
+ aStrBuf.append( empty );
CPPUNIT_ASSERT_MESSAGE
(
@@ -1644,9 +1630,8 @@ namespace rtl_OStringBuffer
{
OString expVal;
OStringBuffer aStrBuf( arrOUS[2] );
- OString input2;
- aStrBuf.append( input2 );
+ aStrBuf.append( empty );
CPPUNIT_ASSERT_MESSAGE
(
@@ -1712,9 +1697,8 @@ namespace rtl_OStringBuffer
{
OString expVal;
OStringBuffer aStrBuf( arrOUS[3] );
- OString input2;
- aStrBuf.append( input2 );
+ aStrBuf.append( empty );
CPPUNIT_ASSERT_MESSAGE
(
@@ -1780,9 +1764,8 @@ namespace rtl_OStringBuffer
{
OString expVal( kTestStr28 );
OStringBuffer aStrBuf( arrOUS[4] );
- OString input2;
- aStrBuf.append( input2 );
+ aStrBuf.append( empty );
CPPUNIT_ASSERT_MESSAGE
(
diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx
index d890f924ddb1..3d27ba52c9c7 100644
--- a/sal/qa/rtl/digest/rtl_digest.cxx
+++ b/sal/qa/rtl/digest/rtl_digest.cxx
@@ -194,22 +194,16 @@ public:
void testEqual()
{
{
- OString aMsg1 = sSampleString;
- OString aMsg2 = sSampleString;
-
- OString aSum1 = getDigest(aMsg1, rtl_Digest_AlgorithmMD5);
- OString aSum2 = getDigest(aMsg2, rtl_Digest_AlgorithmMD5);
+ OString aSum1 = getDigest(sSampleString, rtl_Digest_AlgorithmMD5);
+ OString aSum2 = getDigest(sSampleString, rtl_Digest_AlgorithmMD5);
CPPUNIT_ASSERT_MESSAGE("md5sum must have a length",
aSum1.getLength() == 32 && aSum2.getLength() == 32 );
CPPUNIT_ASSERT_EQUAL_MESSAGE("source is the same, dest must be
also the same", aSum1, aSum2);
}
{
- OString aMsg1 = sSampleString;
- OString aMsg2 = sSampleString_only_one_diff;
-
- OString aSum1 = getDigest(aMsg1, rtl_Digest_AlgorithmMD5);
- OString aSum2 = getDigest(aMsg2, rtl_Digest_AlgorithmMD5);
+ OString aSum1 = getDigest(sSampleString, rtl_Digest_AlgorithmMD5);
+ OString aSum2 = getDigest(sSampleString_only_one_diff,
rtl_Digest_AlgorithmMD5);
CPPUNIT_ASSERT_MESSAGE("md5sum must have a length",
aSum1.getLength() == 32 && aSum2.getLength() == 32 );
CPPUNIT_ASSERT_MESSAGE("differ only in one char", aSum1 != aSum2);
@@ -380,13 +374,11 @@ public:
std::unique_ptr<sal_uInt8[]> pResult(new
sal_uInt8[RTL_DIGEST_LENGTH_SHA1]);
- OString sExpected = "06f460d693aecdd3b5cbe8365408eccfc570f32a";
-
rtl_digest_SHA1(aData, sizeof(aData), pResult.get(),
RTL_DIGEST_LENGTH_SHA1);
OString sKey = createHex(pResult.get(), RTL_DIGEST_LENGTH_SHA1);
- CPPUNIT_ASSERT_EQUAL(sExpected, sKey);
+
CPPUNIT_ASSERT_EQUAL(OString("06f460d693aecdd3b5cbe8365408eccfc570f32a"), sKey);
}
// tdf#114939, verify that rtl_digest_SHA1 computes broken results for
certain input (which
diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx
b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index cbfdd800f1c3..516378dc14a7 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -296,65 +296,53 @@ public:
void toDouble_test_3()
{
- OString sValue("3");
- toDouble_test(sValue);
+ toDouble_test("3");
}
void toDouble_test_3_5()
{
- OString sValue("3.5");
- toDouble_test(sValue);
+ toDouble_test("3.5");
}
void toDouble_test_3_0625()
{
- OString sValue("3.0625");
- toDouble_test(sValue);
+ toDouble_test("3.0625");
}
void toDouble_test_pi()
{
// value from http://www.angio.net/pi/digits/50.txt
- OString
sValue("3.141592653589793238462643383279502884197169399375");
- toDouble_test(sValue);
+
toDouble_test("3.141592653589793238462643383279502884197169399375");
}
void toDouble_test_1()
{
- OString sValue("1");
- toDouble_test(sValue);
+ toDouble_test("1");
}
void toDouble_test_10()
{
- OString sValue("10");
- toDouble_test(sValue);
+ toDouble_test("10");
}
void toDouble_test_100()
{
- OString sValue("100");
- toDouble_test(sValue);
+ toDouble_test("100");
}
void toDouble_test_1000()
{
- OString sValue("1000");
- toDouble_test(sValue);
+ toDouble_test("1000");
}
void toDouble_test_10000()
{
- OString sValue("10000");
- toDouble_test(sValue);
+ toDouble_test("10000");
}
void toDouble_test_1e99()
{
- OString sValue("1e99");
- toDouble_test(sValue);
+ toDouble_test("1e99");
}
void toDouble_test_1e_n99()
{
- OString sValue("1e-99");
- toDouble_test(sValue);
+ toDouble_test("1e-99");
}
void toDouble_test_1e308()
{
- OString sValue("1e308");
- toDouble_test(sValue);
+ toDouble_test("1e308");
}
// Change the following lines only, if you add, remove or rename
@@ -424,75 +412,61 @@ public:
void toFloat_test_3()
{
- OString sValue("3");
- toFloat_test(sValue);
+ toFloat_test("3");
}
void toFloat_test_3_5()
{
- OString sValue("3.5");
- toFloat_test(sValue);
+ toFloat_test("3.5");
}
void toFloat_test_3_0625()
{
- OString sValue("3.0625");
- toFloat_test(sValue);
+ toFloat_test("3.0625");
}
void toFloat_test_3_0625_e()
{
- OString sValue("3.0625e-4");
- toFloat_test(sValue);
+ toFloat_test("3.0625e-4");
}
void toFloat_test_pi()
{
// value from http://www.angio.net/pi/digits/50.txt
- OString
sValue("3.141592653589793238462643383279502884197169399375");
- toFloat_test(sValue);
+
toFloat_test("3.141592653589793238462643383279502884197169399375");
}
void toFloat_test_1()
{
- OString sValue("1");
- toFloat_test(sValue);
+ toFloat_test("1");
}
void toFloat_test_10()
{
- OString sValue("10");
- toFloat_test(sValue);
+ toFloat_test("10");
}
void toFloat_test_100()
{
- OString sValue("100");
- toFloat_test(sValue);
+ toFloat_test("100");
}
void toFloat_test_1000()
{
- OString sValue("1000");
- toFloat_test(sValue);
+ toFloat_test("1000");
}
void toFloat_test_10000()
{
- OString sValue("10000");
- toFloat_test(sValue);
+ toFloat_test("10000");
}
void toFloat_test_mix()
{
- OString sValue("456789321455.123456789012");
- toFloat_test(sValue);
+ toFloat_test("456789321455.123456789012");
}
void toFloat_test_1e99()
{
- OString sValue("1e99");
- toFloat_test(sValue);
+ toFloat_test("1e99");
}
void toFloat_test_1e_n99()
{
- OString sValue("1e-9");
- toFloat_test(sValue);
+ toFloat_test("1e-9");
}
void toFloat_test_1e308()
{
- OString sValue("1e308");
- toFloat_test(sValue);
+ toFloat_test("1e308");
}
// Change the following lines only, if you add, remove or rename
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index 81ec983450f5..1084926c65bb 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -47,8 +47,7 @@ namespace Stringtest
void test_FromUTF8_001()
{
// string --> ustring
- OString sStrUTF8("h%C3%A4llo");
- OUString suStrUTF8 = OStringToOUString(sStrUTF8,
RTL_TEXTENCODING_ASCII_US);
+ OUString suStrUTF8 = OStringToOUString("h%C3%A4llo",
RTL_TEXTENCODING_ASCII_US);
// UTF8 --> real ustring
OUString suStr_UriDecodeToIuri =
rtl::Uri::decode(suStrUTF8, rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8);
diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index 54202137d0de..527afccaafe6 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -407,9 +407,8 @@ void ScCopyPasteTest::testTdf107394()
ScImportExport aObj(rDoc, ScAddress(0,0,0));
aObj.SetImportBroadcast(true);
- OString aHTML("<pre>First\nVery long sentence.</pre>");
SvMemoryStream aStream;
- aStream.WriteOString(aHTML);
+ aStream.WriteOString("<pre>First\nVery long sentence.</pre>");
aStream.Seek(0);
CPPUNIT_ASSERT(aObj.ImportStream(aStream, OUString(),
SotClipboardFormatId::HTML));
diff --git a/sc/qa/unit/screenshots/screenshots.cxx
b/sc/qa/unit/screenshots/screenshots.cxx
index b7113ee1658c..8cd66991674f 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -193,10 +193,9 @@ VclPtr<VclAbstractDialog>
ScScreenshotTest::createDialogByID(sal_uInt32 nID)
case 8: // "modules/scalc/ui/inputstringdialog.ui"
{
- const OString aEmpty("");
pReturnDialog =
mpFact->CreateScStringInputDlg(mpViewShell->GetFrameWeld(),
ScResId(SCSTR_APDTABLE), ScResId(SCSTR_NAME),
- aDefaultSheetName,
"modules/scalc/ui/inputstringdialog/InputStringDialog", aEmpty );
+ aDefaultSheetName,
"modules/scalc/ui/inputstringdialog/InputStringDialog", "" );
break;
}
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 08ef8c7fcdb0..6eba2bf05e84 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -5124,9 +5124,11 @@ void ScExportTest::testRotatedImageODS()
xmlDocUniquePtr pXmlDoc = XPathHelper::parseExport(pTemp, m_xSFactory,
"content.xml");
CPPUNIT_ASSERT(pXmlDoc);
- const OString sPathStart =
"/office:document-content/office:body/office:spreadsheet/"
- "table:table/table:shapes/draw:frame";
- const OUString sTransform = getXPath(pXmlDoc, sPathStart, "transform");
+ const OUString sTransform = getXPath(
+ pXmlDoc,
+ "/office:document-content/office:body/office:spreadsheet/"
+ "table:table/table:shapes/draw:frame",
+ "transform");
// Attribute transform has the structure skew (...) rotate (...) translate
(x y)
// parts are separated by blank
OUString sTranslate(sTransform.copy(sTransform.lastIndexOf('(')));
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index b0f5ce782969..cd3a3cf82151 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -634,9 +634,7 @@ void SdDialogsTest::openAnyDialog()
//
// Take any example here, it's only for demonstration - using
// even a known one to demonstrate the fallback possibility
- const OString aUIXMLDescription("modules/sdraw/ui/breakdialog.ui");
-
- dumpDialogToPath(aUIXMLDescription);
+ dumpDialogToPath("modules/sdraw/ui/breakdialog.ui");
}
}
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx
b/sd/qa/unit/export-tests-ooxml1.cxx
index db64dc374481..7e47d964f7a0 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -1100,8 +1100,7 @@ void SdOOXMLExportTest1::testDashOnHairline()
xDocShRef->DoClose();
xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "ppt/slides/slide1.xml");
- const OString sXmlPath =
"/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:ln/a:custDash/a:ds";
- assertXPath(pXmlDoc, sXmlPath, 11);
+ assertXPath(pXmlDoc,
"/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:ln/a:custDash/a:ds", 11);
}
void SdOOXMLExportTest1::testCustomshapeBitmapfillSrcrect()
@@ -1170,8 +1169,7 @@ void
SdOOXMLExportTest1::testTdf128345FullTransparentGradient()
// Make sure the shape has no fill. Without the patch, fill was solid red.
xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "ppt/slides/slide1.xml");
- const OString sPathStart("//p:sld/p:cSld/p:spTree/p:sp/p:spPr");
- assertXPath(pXmlDoc, sPathStart + "/a:noFill");
+ assertXPath(pXmlDoc, "//p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:noFill");
}
void SdOOXMLExportTest1::testTdf128345GradientLinear()
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index 135cfb5b8b78..9f967b7963b9 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -2685,8 +2685,8 @@ void SdOOXMLExportTest2::testTdf1225573_FontWorkScaleX()
// Error was, that attribute 'fromWordArt' was ignored
// ensure, resulting pptx has fromWordArt="1" on textArchDown shape
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile,
"ppt/slides/slide1.xml");
- const OString
sPathStart("/p:sld/p:cSld/p:spTree/p:sp[1]/p:txBody/a:bodyPr");
- assertXPath(pXmlDocContent, sPathStart + "[@fromWordArt='1']");
+ assertXPath(
+ pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:txBody/a:bodyPr[@fromWordArt='1']");
// Error was, that text in legacy shapes of category "Follow Path" was not
scaled to the path.
uno::Reference<beans::XPropertySet> xShapeArchProps(getShapeFromPage(0, 0,
xDocShRef));
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 22e2b4bfe2a4..86c522723904 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1611,10 +1611,14 @@ void SdTiledRenderingTest::testTdf104405()
// check that the first cell has acquired the resulting vertical style
xmlDocUniquePtr pXmlDoc = parseXmlDump();
- OString aPrefix =
"/SdDrawDocument/SdrModel/SdPage/SdrObjList/SdrTableObj/SdrTableObjImpl"
-
"/TableModel/Cell[1]/DefaultProperties/SfxItemSet/SdrTextVertAdjustItem";
// the following name has a compiler-dependent part
- CPPUNIT_ASSERT_EQUAL(OUString("2"), getXPath(pXmlDoc, aPrefix, "value"));
+ CPPUNIT_ASSERT_EQUAL(
+ OUString("2"),
+ getXPath(
+ pXmlDoc,
+
"/SdDrawDocument/SdrModel/SdPage/SdrObjList/SdrTableObj/SdrTableObjImpl"
+
"/TableModel/Cell[1]/DefaultProperties/SfxItemSet/SdrTextVertAdjustItem",
+ "value"));
}
void SdTiledRenderingTest::testTdf81754()
diff --git a/sd/source/ui/remotecontrol/Communicator.cxx
b/sd/source/ui/remotecontrol/Communicator.cxx
index b93112d9542c..a500d9191131 100644
--- a/sd/source/ui/remotecontrol/Communicator.cxx
+++ b/sd/source/ui/remotecontrol/Communicator.cxx
@@ -58,9 +58,8 @@ void Communicator::execute()
pTransmitter->addMessage( "LO_SERVER_SERVER_PAIRED\n\n",
Transmitter::PRIORITY_HIGH );
- OString aServerInformation = "LO_SERVER_INFO\n" LIBO_VERSION_DOTTED "\n\n";
-
- pTransmitter->addMessage( aServerInformation, Transmitter::PRIORITY_HIGH );
+ pTransmitter->addMessage( "LO_SERVER_INFO\n" LIBO_VERSION_DOTTED "\n\n",
+ Transmitter::PRIORITY_HIGH );
Receiver aReceiver( pTransmitter.get() );
try {
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 66593b3cf2fd..4c8b237bb90a 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -112,9 +112,8 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm,
const OUString& rBaseURL,
if( pIndent )
rStrm.WriteCharPtr( pIndent );
- OString sOut = "<" OOO_STRING_SVTOOLS_HTML_base " "
- OOO_STRING_SVTOOLS_HTML_O_target "=\"";
- rStrm.WriteOString( sOut );
+ rStrm.WriteOString( "<" OOO_STRING_SVTOOLS_HTML_base " "
+ OOO_STRING_SVTOOLS_HTML_O_target "=\"" );
HTMLOutFuncs::Out_String( rStrm, rTarget, eDestEnc,
pNonConvertableChars )
.WriteCharPtr( "\">" );
}
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index ba955f016cce..d38b5cfcd605 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -810,9 +810,11 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase,
testSemiTransparentText)
mbExported = true;
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
CPPUNIT_ASSERT(pXmlDoc);
- OString aXPath
- =
"/w:document/w:body/w:p/w:r/w:rPr/w14:textFill/w14:solidFill/w14:srgbClr/w14:alpha";
- double fValue = getXPath(pXmlDoc, aXPath, "val").toDouble();
+ double fValue = getXPath(
+ pXmlDoc,
+
"/w:document/w:body/w:p/w:r/w:rPr/w14:textFill/w14:solidFill/w14:srgbClr/w14:alpha",
+ "val")
+ .toDouble();
sal_Int16 nActual = basegfx::fround(fValue / oox::drawingml::PER_PERCENT);
// Without the accompanying fix in place, this test would have failed, as
the w14:textFill
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 26a2f8a21056..884d896ccf62 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -7463,13 +7463,9 @@ void SwUiWriterTest::testInconsistentBookmark()
{
const OString
aPath("/office:document-content/office:body/office:text/text:p");
- const OString aTagBookmarkStart("bookmark-start");
- const OString aTagControl("control");
- const OString aTagBookmarkEnd("bookmark-end");
-
- const int pos1 = getXPathPosition(pXmlDoc, aPath,
aTagBookmarkStart);
- const int pos2 = getXPathPosition(pXmlDoc, aPath, aTagControl);
- const int pos3 = getXPathPosition(pXmlDoc, aPath, aTagBookmarkEnd);
+ const int pos1 = getXPathPosition(pXmlDoc, aPath,
"bookmark-start");
+ const int pos2 = getXPathPosition(pXmlDoc, aPath, "control");
+ const int pos3 = getXPathPosition(pXmlDoc, aPath, "bookmark-end");
CPPUNIT_ASSERT_GREATER(pos1, pos2);
CPPUNIT_ASSERT_GREATER(pos2, pos3);
diff --git a/sw/source/filter/html/wrthtml.cxx
b/sw/source/filter/html/wrthtml.cxx
index c72b7ee4d14f..2071271e580c 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1273,9 +1273,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem
*pBrushItem, bool bGraphic
/// only checking, if transparency is not set.
if( rBackColor != COL_TRANSPARENT )
{
- OString sOut =
- " " OOO_STRING_SVTOOLS_HTML_O_bgcolor "=";
- Strm().WriteOString( sOut );
+ Strm().WriteOString( " " OOO_STRING_SVTOOLS_HTML_O_bgcolor "=" );
HTMLOutFuncs::Out_Color( Strm(), rBackColor);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
