summaryrefslogtreecommitdiff
path: root/xmloff/source/draw/ximpstyl.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-05-25 17:00:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-05-29 08:21:07 +0200
commit03841dc12ff3ee65ca632039418c65bbfd5ccaea (patch)
tree87149cd102235117ca884404ffe83034c90d59ca /xmloff/source/draw/ximpstyl.cxx
parentd7c2667089535d25b8f0ad4f58810ee54552156b (diff)
loplugin:unusedfields-in-constructor in xmloff
fields that are only referenced in the constructor Change-Id: I44bddb2dce2f30c21ea0f1ada4c1615c854d3334 Reviewed-on: https://gerrit.libreoffice.org/54823 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff/source/draw/ximpstyl.cxx')
-rw-r--r--xmloff/source/draw/ximpstyl.cxx24
1 files changed, 7 insertions, 17 deletions
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index fee2f44bd3fe..fb6d581709f8 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -381,14 +381,12 @@ SdXMLPageMasterContext::SdXMLPageMasterContext(
OUString sAttrName = xAttrList->getNameByIndex(i);
OUString aLocalName;
sal_uInt16 nPrefix = GetSdImport().GetNamespaceMap().GetKeyByAttrName(sAttrName, &aLocalName);
- OUString sValue = xAttrList->getValueByIndex(i);
const SvXMLTokenMap& rAttrTokenMap = GetSdImport().GetPageMasterAttrTokenMap();
switch(rAttrTokenMap.Get(nPrefix, aLocalName))
{
case XML_TOK_PAGEMASTER_NAME:
{
- msName = sValue;
break;
}
}
@@ -678,10 +676,7 @@ SdXMLPresentationPlaceholderContext::SdXMLPresentationPlaceholderContext(
OUString& rLName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList)
: SvXMLImportContext( rImport, nPrfx, rLName),
- mnX(0),
- mnY(0),
- mnWidth(1),
- mnHeight(1)
+ mnX(0)
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for(sal_Int16 i=0; i < nAttrCount; i++)
@@ -707,20 +702,14 @@ SdXMLPresentationPlaceholderContext::SdXMLPresentationPlaceholderContext(
}
case XML_TOK_PRESENTATIONPLACEHOLDER_Y:
{
- GetSdImport().GetMM100UnitConverter().convertMeasureToCore(
- mnY, sValue);
break;
}
case XML_TOK_PRESENTATIONPLACEHOLDER_WIDTH:
{
- GetSdImport().GetMM100UnitConverter().convertMeasureToCore(
- mnWidth, sValue);
break;
}
case XML_TOK_PRESENTATIONPLACEHOLDER_HEIGHT:
{
- GetSdImport().GetMM100UnitConverter().convertMeasureToCore(
- mnHeight, sValue);
break;
}
}
@@ -741,6 +730,7 @@ SdXMLMasterPageContext::SdXMLMasterPageContext(
: SdXMLGenericPageContext( rImport, nPrfx, rLName, xAttrList, rShapes )
{
const bool bHandoutMaster = IsXMLToken( rLName, XML_HANDOUT_MASTER );
+ OUString sStyleName, sPageMasterName;
const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for(sal_Int16 i=0; i < nAttrCount; i++)
@@ -765,12 +755,12 @@ SdXMLMasterPageContext::SdXMLMasterPageContext(
}
case XML_TOK_MASTERPAGE_PAGE_MASTER_NAME:
{
- msPageMasterName = sValue;
+ sPageMasterName = sValue;
break;
}
case XML_TOK_MASTERPAGE_STYLE_NAME:
{
- msStyleName = sValue;
+ sStyleName = sValue;
break;
}
case XML_TOK_MASTERPAGE_PAGE_LAYOUT_NAME:
@@ -812,12 +802,12 @@ SdXMLMasterPageContext::SdXMLMasterPageContext(
}
// set page-master?
- if(!msPageMasterName.isEmpty())
+ if(!sPageMasterName.isEmpty())
{
- SetPageMaster( msPageMasterName );
+ SetPageMaster( sPageMasterName );
}
- SetStyle( msStyleName );
+ SetStyle( sStyleName );
SetLayout();