summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-05-09 12:14:32 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-05-09 13:52:30 +0200
commit12191a4f30078bb81c39a74a994ba7b2b410adaf (patch)
tree394626ae75e6b77e4159657847f894e4f7c9495b /xmloff
parent3a9854a92923df8013ca832c48aa9f284bcb1adc (diff)
make loplugin constantparam smarter about string params
Change-Id: Id3df69b38fd35f46735246a6d307a89aa10d4294 Reviewed-on: https://gerrit.libreoffice.org/37426 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/draw/sdxmlexp.cxx2
-rw-r--r--xmloff/source/draw/shapeexport.cxx2
-rw-r--r--xmloff/source/style/styleexp.cxx4
-rw-r--r--xmloff/source/table/XMLTableExport.cxx4
-rw-r--r--xmloff/source/text/txtparae.cxx2
5 files changed, 5 insertions, 9 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 567ba9bf577f..ba792d13f128 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1678,7 +1678,7 @@ void SdXMLExport::ImpWritePresentationStyles()
// write presentation styles (ONLY if presentation)
if(IsImpress() && mxDocStyleFamilies.is() && xNamed.is())
{
- rtl::Reference<XMLStyleExport> aStEx(new XMLStyleExport(*this, OUString(), GetAutoStylePool().get()));
+ rtl::Reference<XMLStyleExport> aStEx(new XMLStyleExport(*this, GetAutoStylePool().get()));
const rtl::Reference< SvXMLExportPropertyMapper > aMapperRef( GetPropertySetMapper() );
OUString aPrefix( xNamed->getName() );
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 93584d1c8f1c..cf378dc65991 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1253,7 +1253,7 @@ void XMLShapeExport::ImpExportGluePoints( const uno::Reference< drawing::XShape
void XMLShapeExport::ExportGraphicDefaults()
{
- rtl::Reference<XMLStyleExport> aStEx(new XMLStyleExport(mrExport, OUString(), mrExport.GetAutoStylePool().get()));
+ rtl::Reference<XMLStyleExport> aStEx(new XMLStyleExport(mrExport, mrExport.GetAutoStylePool().get()));
// construct PropertySetMapper
rtl::Reference< SvXMLExportPropertyMapper > xPropertySetMapper( CreateShapePropMapper( mrExport ) );
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 286097a836b4..b0f145aa9707 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -57,7 +57,6 @@ using ::com::sun::star::document::XEventsSupplier;
XMLStyleExport::XMLStyleExport(
SvXMLExport& rExp,
- const OUString& rPoolStyleName,
SvXMLAutoStylePoolP *pAutoStyleP ) :
rExport( rExp ),
sIsPhysical( "IsPhysical" ),
@@ -65,7 +64,6 @@ XMLStyleExport::XMLStyleExport(
sFollowStyle( "FollowStyle" ),
sNumberingStyleName( "NumberingStyleName" ),
sOutlineLevel( "OutlineLevel" ),
- sPoolStyleName( rPoolStyleName ),
pAutoStylePool( pAutoStyleP )
{
}
@@ -143,8 +141,6 @@ bool XMLStyleExport::exportStyle(
sParent = *pPrefix;
sParent += sParentString;
}
- else
- sParent = sPoolStyleName;
if( !sParent.isEmpty() )
GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_PARENT_STYLE_NAME,
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index e01ada60b83c..7a291c0a2370 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -485,13 +485,13 @@ void XMLTableExport::exportTableStyles()
if (mbWriter)
{
sCellStyleName = "CellStyles";
- aStEx.set(new XMLStyleExport(mrExport, OUString()));
+ aStEx.set(new XMLStyleExport(mrExport));
}
else
{
// write graphic family styles
sCellStyleName = "cell";
- aStEx.set(new XMLStyleExport(mrExport, OUString(), mrExport.GetAutoStylePool().get()));
+ aStEx.set(new XMLStyleExport(mrExport, mrExport.GetAutoStylePool().get()));
}
aStEx->exportStyleFamily(sCellStyleName, OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME), mxCellExportPropertySetMapper.get(), true, XML_STYLE_FAMILY_TABLE_CELL);
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 6c16d7d44eff..903a35f517ce 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1154,7 +1154,7 @@ XMLTextParagraphExport::XMLTextParagraphExport(
SvXMLExport& rExp,
SvXMLAutoStylePoolP & rASP
) :
- XMLStyleExport( rExp, OUString(), &rASP ),
+ XMLStyleExport( rExp, &rASP ),
m_xImpl(new Impl),
rAutoStylePool( rASP ),
pBoundFrameSets(new BoundFrameSets(GetExport().GetModel())),