summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-04-13 14:56:54 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-04-13 21:14:26 +0200
commitb6491f09e9dc3e41d571abce3c4f16467cb60c9c (patch)
treedfe1b5ad2273be6f5423a2b1994e1855811d3f78 /oox
parent5e1719ff1ed5b4350684c3ed67b5375bb49e0223 (diff)
loplugin:sequentialassign in oox..reportdesign
Change-Id: I59ef0a6da411b8af8bdf8d8efb1d733db7475d9c Reviewed-on: https://gerrit.libreoffice.org/70707 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/core/filterdetect.cxx3
-rw-r--r--oox/source/core/xmlfilterbase.cxx6
-rw-r--r--oox/source/drawingml/diagram/diagramlayoutatoms.cxx4
-rw-r--r--oox/source/export/chartexport.cxx3
-rw-r--r--oox/source/export/drawingml.cxx3
-rw-r--r--oox/source/helper/binaryoutputstream.cxx3
-rw-r--r--oox/source/vml/vmlshape.cxx3
7 files changed, 8 insertions, 17 deletions
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index b68f05160a62..59a4f605ab5c 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -316,8 +316,7 @@ Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescript
(according to the verifier), or with an empty string if
user has cancelled the password input dialog. */
PasswordVerifier aVerifier( aDecryptor );
- Sequence<NamedValue> aEncryptionData;
- aEncryptionData = rMediaDescriptor.requestAndVerifyDocPassword(
+ Sequence<NamedValue> aEncryptionData = rMediaDescriptor.requestAndVerifyDocPassword(
aVerifier,
comphelper::DocPasswordRequestType::MS,
&aDefaultPasswords );
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 8050c91b0d8e..632a3ce357b6 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -870,8 +870,7 @@ Reference< XInputStream > XmlFilterBase::implGetInputStream( MediaDescriptor& rM
Reference<XStream> XmlFilterBase::implGetOutputStream( MediaDescriptor& rMediaDescriptor ) const
{
- Sequence< NamedValue > aMediaEncData;
- aMediaEncData = rMediaDescriptor.getUnpackedValueOrDefault(
+ Sequence< NamedValue > aMediaEncData = rMediaDescriptor.getUnpackedValueOrDefault(
MediaDescriptor::PROP_ENCRYPTIONDATA(),
Sequence< NamedValue >() );
@@ -902,8 +901,7 @@ bool XmlFilterBase::implFinalizeExport( MediaDescriptor& rMediaDescriptor )
{
bool bRet = true;
- Sequence< NamedValue > aMediaEncData;
- aMediaEncData = rMediaDescriptor.getUnpackedValueOrDefault(
+ Sequence< NamedValue > aMediaEncData = rMediaDescriptor.getUnpackedValueOrDefault(
MediaDescriptor::PROP_ENCRYPTIONDATA(),
Sequence< NamedValue >() );
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 7d64e82059af..7686ddf2413c 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -362,9 +362,7 @@ sal_Int32 ConditionAtom::getNodeCount() const
const dgm::Point* pPoint = getPresNode();
if (pPoint)
{
- OUString sNodeId = "";
-
- sNodeId
+ OUString sNodeId
= navigate(mrLayoutNode, XML_presOf, pPoint->msModelId, /*bSourceToDestination*/ false);
if (sNodeId.isEmpty())
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 5641d62119a1..15e9bca1c1c9 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2303,8 +2303,7 @@ void ChartExport::exportSeriesValues( const Reference< chart2::data::XDataSequen
pFS->writeEscaped( aCellRange );
pFS->endElement( FSNS( XML_c, XML_f ) );
- ::std::vector< double > aValues;
- aValues = lcl_getAllValuesFromSequence( xValueSeq );
+ ::std::vector< double > aValues = lcl_getAllValuesFromSequence( xValueSeq );
sal_Int32 ptCount = aValues.size();
pFS->startElement( FSNS( XML_c, XML_numCache ),
FSEND );
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 1cebeaa84ec1..e259aa856906 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1316,8 +1316,7 @@ void DrawingML::WriteBlipFill( const Reference< XPropertySet >& rXPropSet, const
uno::Reference<graphic::XGraphic> xGraphic;
if (mAny.has<uno::Reference<awt::XBitmap>>())
{
- uno::Reference<awt::XBitmap> xBitmap;
- xBitmap = mAny.get<uno::Reference<awt::XBitmap>>();
+ uno::Reference<awt::XBitmap> xBitmap = mAny.get<uno::Reference<awt::XBitmap>>();
if (xBitmap.is())
xGraphic.set(xBitmap, uno::UNO_QUERY);
}
diff --git a/oox/source/helper/binaryoutputstream.cxx b/oox/source/helper/binaryoutputstream.cxx
index 43cf86277c1e..ccfd6e4ed9f2 100644
--- a/oox/source/helper/binaryoutputstream.cxx
+++ b/oox/source/helper/binaryoutputstream.cxx
@@ -109,8 +109,7 @@ BinaryOutputStream::writeCharArrayUC( const OUString& rString, rtl_TextEncoding
void
BinaryOutputStream::writeUnicodeArray( const OUString& rString )
{
- OUString sBuf( rString );
- sBuf = sBuf.replace( '\0', '?' );
+ OUString sBuf = rString.replace( '\0', '?' );
#ifdef OSL_BIGENDIAN
// need a non-const buffer for swapping byte order
sal_Unicode notConst[sBuf.getLength()];
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 951c164b0b94..bc4e77818e18 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -678,8 +678,7 @@ Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes
SdrObject* pShape = GetSdrObjectFromXShape( xShape );
if( pShape && getShapeType() >= 0 )
{
- OUString aShapeType;
- aShapeType = EnhancedCustomShapeTypeNames::Get( static_cast< MSO_SPT >(getShapeType()) );
+ OUString aShapeType = EnhancedCustomShapeTypeNames::Get( static_cast< MSO_SPT >(getShapeType()) );
//The resize autoshape to fit text attr of FontWork/Word-Art should always be false
//for the fallback geometry.
if(aShapeType.startsWith("fontwork"))