summaryrefslogtreecommitdiff
path: root/xmloff/source/text
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/text
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/text')
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx4
-rw-r--r--xmloff/source/text/XMLTextHeaderFooterContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextListBlockContext.cxx1
-rw-r--r--xmloff/source/text/XMLTextListBlockContext.hxx1
-rw-r--r--xmloff/source/text/txtfldi.cxx3
-rw-r--r--xmloff/source/text/txtparai.cxx1
-rw-r--r--xmloff/source/text/txtparai.hxx2
-rw-r--r--xmloff/source/text/txtvfldi.cxx5
8 files changed, 6 insertions, 13 deletions
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 50c8eae919ea..c8bb159869c2 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -339,8 +339,6 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext
OUString sHRef;
OUString sFilterName;
OUString sCode;
- OUString sObject;
- OUString sArchive;
OUString sMimeType;
OUString sFrameName;
OUString sAppletName;
@@ -1069,10 +1067,8 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl(
sCode = rValue;
break;
case XML_TOK_TEXT_FRAME_OBJECT:
- sObject = rValue;
break;
case XML_TOK_TEXT_FRAME_ARCHIVE:
- sArchive = rValue;
break;
case XML_TOK_TEXT_FRAME_MAY_SCRIPT:
bMayScript = IsXMLToken( rValue, XML_TRUE );
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index f744a0926074..3a048b0be50c 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -45,7 +45,6 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa
xPropSet( rPageStylePropSet ),
sOn( bFooter ? OUString("FooterIsOn") : OUString("HeaderIsOn") ),
sShareContent( bFooter ? OUString("FooterIsShared") : OUString("HeaderIsShared") ),
- sShareContentFirst( "FirstIsShared" ),
sText( bFooter ? OUString("FooterText") : OUString("HeaderText") ),
sTextFirst(bFooter ? OUString("FooterTextFirst") : OUString("HeaderTextFirst")),
sTextLeft( bFooter ? OUString("FooterTextLeft") : OUString("HeaderTextLeft") ),
@@ -53,6 +52,7 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa
bLeft( bLft ),
bFirst( bFrst )
{
+ const OUString sShareContentFirst( "FirstIsShared" );
// NOTE: if this ever handles XML_DISPLAY attr then beware of fdo#72850 !
if( bLeft || bFirst )
{
diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx
index 11ea6737f2d0..e6054f082f6e 100644
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.cxx
@@ -101,7 +101,6 @@ XMLTextListBlockContext::XMLTextListBlockContext(
switch( rTokenMap.Get( nPrefix, aLocalName ) )
{
case XML_TOK_TEXT_LIST_BLOCK_XMLID:
- sXmlId = rValue;
//FIXME: there is no UNO API for lists
// xml:id is also the list ID (#i92221#)
if ( mnLevel == 0 ) // root <list> element
diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx
index 8af3b8d73f69..d60e5f52589f 100644
--- a/xmloff/source/text/XMLTextListBlockContext.hxx
+++ b/xmloff/source/text/XMLTextListBlockContext.hxx
@@ -33,7 +33,6 @@ class XMLTextListBlockContext : public SvXMLImportContext
// text:style-name property of <list> element
OUString msListStyleName;
- OUString sXmlId;
SvXMLImportContextRef mxParentListBlock;
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 017f0fe40e21..99962c40e43e 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -661,13 +661,12 @@ XMLAuthorFieldImportContext::XMLAuthorFieldImportContext(
sal_uInt16 nToken)
: XMLSenderFieldImportContext(rImport, rHlp, nPrfx, sLocalName, nToken)
, bAuthorFullName(true)
-, sServiceAuthor(sAPI_author)
, sPropertyAuthorFullName("FullName")
, sPropertyFixed(sAPI_is_fixed)
, sPropertyContent(sAPI_content)
{
// overwrite service name from XMLSenderFieldImportContext
- SetServiceName(sServiceAuthor);
+ SetServiceName(sAPI_author);
}
void XMLAuthorFieldImportContext::StartElement(
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index e2ee74e1651c..3af76c706883 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -2215,7 +2215,6 @@ XMLNumberedParaContext::XMLNumberedParaContext(
switch( rTokenMap.Get( nPrefix, aLocalName ) )
{
case XML_TOK_TEXT_NUMBERED_PARAGRAPH_XMLID:
- m_XmlId = rValue;
//FIXME: there is no UNO API for lists
break;
case XML_TOK_TEXT_NUMBERED_PARAGRAPH_LIST_ID:
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index 163236c8e71c..24bf5dc4271a 100644
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
@@ -79,8 +79,6 @@ class XMLNumberedParaContext : public SvXMLImportContext
sal_Int16 m_Level;
/// text:start-value
sal_Int16 m_StartValue;
- /// xml:id
- OUString m_XmlId;
/// text:list-id
OUString m_ListId;
/// text:style-name
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index b45ffe132f47..78c9780bf6dc 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -712,8 +712,11 @@ XMLVariableDeclImportContext::XMLVariableDeclImportContext(
SvXMLImportContext(rImport, nPrfx, rLocalName),
// bug?? which properties for userfield/userfieldmaster
aValueHelper(rImport, rHlp, true, false, true, false),
- nNumLevel(-1), cSeparationChar('.')
+ cSeparationChar('.')
{
+ sal_Int8 nNumLevel(-1);
+ OUString sName;
+
if ( (XML_NAMESPACE_TEXT == nPrfx) &&
( ( IsXMLToken( rLocalName, XML_SEQUENCE_DECL )) ||
( IsXMLToken( rLocalName, XML_VARIABLE_DECL)) ||