[Libreoffice-commits] core.git: 2 commits - dbaccess/source xmloff/inc xmloff/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue May 29 06:21:28 UTC 2018
dbaccess/source/ui/dlg/dlgattr.cxx | 4 +--
dbaccess/source/ui/inc/dlgattr.hxx | 2 -
xmloff/inc/XMLTextHeaderFooterContext.hxx | 1
xmloff/inc/animationimport.hxx | 1
xmloff/inc/txtfldi.hxx | 1
xmloff/inc/txtvfldi.hxx | 2 -
xmloff/source/draw/animationimport.cxx | 6 ++---
xmloff/source/draw/animimp.cxx | 10 +++------
xmloff/source/draw/eventimp.cxx | 10 +++------
xmloff/source/draw/ximpbody.cxx | 12 +++++------
xmloff/source/draw/ximpbody.hxx | 2 -
xmloff/source/draw/ximpnote.cxx | 8 +++----
xmloff/source/draw/ximpnote.hxx | 3 --
xmloff/source/draw/ximpstyl.cxx | 24 ++++++----------------
xmloff/source/draw/ximpstyl.hxx | 6 -----
xmloff/source/style/xmlexppr.cxx | 2 -
xmloff/source/style/xmlnumi.cxx | 13 ++++-------
xmloff/source/text/XMLTextFrameContext.cxx | 4 ---
xmloff/source/text/XMLTextHeaderFooterContext.cxx | 2 -
xmloff/source/text/XMLTextListBlockContext.cxx | 1
xmloff/source/text/XMLTextListBlockContext.hxx | 1
xmloff/source/text/txtfldi.cxx | 3 --
xmloff/source/text/txtparai.cxx | 1
xmloff/source/text/txtparai.hxx | 2 -
xmloff/source/text/txtvfldi.cxx | 5 +++-
25 files changed, 42 insertions(+), 84 deletions(-)
New commits:
commit 2e80fe39a438ab702ad8f3e2456159328cb16365
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri May 18 13:46:59 2018 +0200
loplugin:useuniqueptr in dbaui::SbaSbAttrDlg
Change-Id: Ia24f948370b30ccc3870e36c19312e9eebb309b3
Reviewed-on: https://gerrit.libreoffice.org/54851
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index f64c42e3e8ba..d2c3031b72ee 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -38,7 +38,7 @@ SbaSbAttrDlg::SbaSbAttrDlg(vcl::Window* pParent, const SfxItemSet* pCellAttrs,
: SfxTabDialog(pParent, "FieldDialog", "dbaccess/ui/fielddialog.ui", pCellAttrs)
, m_nNumberFormatId(0)
{
- pNumberInfoItem = new SvxNumberInfoItem( pFormatter, 0 );
+ pNumberInfoItem.reset( new SvxNumberInfoItem( pFormatter, 0 ) );
if (bHasFormat)
m_nNumberFormatId = AddTabPage("format", RID_SVXPAGE_NUMBERFORMAT);
@@ -54,7 +54,7 @@ SbaSbAttrDlg::~SbaSbAttrDlg()
void SbaSbAttrDlg::dispose()
{
- delete pNumberInfoItem;
+ pNumberInfoItem.reset();
SfxTabDialog::dispose();
}
diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx
index d5b5c20b4102..1a10d63ace86 100644
--- a/dbaccess/source/ui/inc/dlgattr.hxx
+++ b/dbaccess/source/ui/inc/dlgattr.hxx
@@ -29,7 +29,7 @@ namespace dbaui
class SbaSbAttrDlg : public SfxTabDialog
{
- SvxNumberInfoItem* pNumberInfoItem;
+ std::unique_ptr<SvxNumberInfoItem> pNumberInfoItem;
sal_uInt32 m_nNumberFormatId;
public:
commit 03841dc12ff3ee65ca632039418c65bbfd5ccaea
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri May 25 17:00:23 2018 +0200
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 at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx
index 47688ba08021..385190dd5674 100644
--- a/xmloff/inc/XMLTextHeaderFooterContext.hxx
+++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx
@@ -34,7 +34,6 @@ class XMLTextHeaderFooterContext: public SvXMLImportContext
const OUString sOn;
const OUString sShareContent;
- const OUString sShareContentFirst;
const OUString sText;
const OUString sTextFirst;
const OUString sTextLeft;
diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx
index 6d59ad9a4898..b59f8cb60b30 100644
--- a/xmloff/inc/animationimport.hxx
+++ b/xmloff/inc/animationimport.hxx
@@ -34,7 +34,6 @@ class AnimationsImportHelperImpl;
class AnimationNodeContext : public SvXMLImportContext
{
std::shared_ptr<AnimationsImportHelperImpl> mpHelper;
- bool mbRootContext;
css::uno::Reference< css::animations::XAnimationNode > mxNode;
void init_node( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 350ca6d11e0e..936c7102b3fb 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -216,7 +216,6 @@ protected:
class XMLAuthorFieldImportContext : public XMLSenderFieldImportContext
{
bool bAuthorFullName;
- const OUString sServiceAuthor;
const OUString sPropertyAuthorFullName;
const OUString sPropertyFixed;
const OUString sPropertyContent;
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index 78f9fc6565b9..3ec143de2425 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -403,9 +403,7 @@ public:
*/
class XMLVariableDeclImportContext : public SvXMLImportContext
{
- OUString sName;
XMLValueImportHelper aValueHelper;
- sal_Int8 nNumLevel;
sal_Unicode cSeparationChar;
public:
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 2b3c740be2d7..ae6556b99b0c 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -628,12 +628,12 @@ AnimationNodeContext::AnimationNodeContext(
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
const std::shared_ptr<AnimationsImportHelperImpl>& pHelper )
: SvXMLImportContext(rImport, nPrfx, rLocalName),
- mpHelper( pHelper ),
- mbRootContext( !pHelper )
+ mpHelper( pHelper )
{
+ bool bRootContext = !pHelper;
try
{
- if( mbRootContext )
+ if( bRootContext )
{
mpHelper = std::make_shared<AnimationsImportHelperImpl>( rImport );
mxNode = xParentNode;
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 7e6fe99f379b..00c723b283d2 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -393,8 +393,6 @@ public:
class XMLAnimationsSoundContext : public SvXMLImportContext
{
- XMLAnimationsEffectContext* mpParent;
-
public:
XMLAnimationsSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, XMLAnimationsEffectContext* pParent );
@@ -402,9 +400,9 @@ public:
XMLAnimationsSoundContext::XMLAnimationsSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, XMLAnimationsEffectContext* pParent )
-: SvXMLImportContext( rImport, nPrfx, rLocalName ), mpParent( pParent )
+: SvXMLImportContext( rImport, nPrfx, rLocalName )
{
- if( mpParent && nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_SOUND ) )
+ if( pParent && nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_SOUND ) )
{
const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for(sal_Int16 i=0; i < nAttrCount; i++)
@@ -419,13 +417,13 @@ XMLAnimationsSoundContext::XMLAnimationsSoundContext( SvXMLImport& rImport, sal_
case XML_NAMESPACE_XLINK:
if( IsXMLToken( aLocalName, XML_HREF ) )
{
- mpParent->maSoundURL = rImport.GetAbsoluteReference(sValue);
+ pParent->maSoundURL = rImport.GetAbsoluteReference(sValue);
}
break;
case XML_NAMESPACE_PRESENTATION:
if( IsXMLToken( aLocalName, XML_PLAY_FULL ) )
{
- mpParent->mbPlayFull = IsXMLToken( sValue, XML_TRUE );
+ pParent->mbPlayFull = IsXMLToken( sValue, XML_TRUE );
}
}
}
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index 4da85b134646..b2b7749b1d76 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -98,8 +98,6 @@ public:
class XMLEventSoundContext : public SvXMLImportContext
{
- SdXMLEventContext* mpParent;
-
public:
XMLEventSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, SdXMLEventContext* pParent );
@@ -107,9 +105,9 @@ public:
XMLEventSoundContext::XMLEventSoundContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, SdXMLEventContext* pParent )
-: SvXMLImportContext( rImp, nPrfx, rLocalName ), mpParent( pParent )
+: SvXMLImportContext( rImp, nPrfx, rLocalName )
{
- if( mpParent && nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_SOUND ) )
+ if( pParent && nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_SOUND ) )
{
const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for(sal_Int16 i=0; i < nAttrCount; i++)
@@ -124,13 +122,13 @@ XMLEventSoundContext::XMLEventSoundContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
case XML_NAMESPACE_XLINK:
if( IsXMLToken( aAttrLocalName, XML_HREF ) )
{
- mpParent->msSoundURL = rImp.GetAbsoluteReference(sValue);
+ pParent->msSoundURL = rImp.GetAbsoluteReference(sValue);
}
break;
case XML_NAMESPACE_PRESENTATION:
if( IsXMLToken( aAttrLocalName, XML_PLAY_FULL ) )
{
- mpParent->mbPlayFull = IsXMLToken( sValue, XML_TRUE );
+ pParent->mbPlayFull = IsXMLToken( sValue, XML_TRUE );
}
}
}
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index fddc7e051912..fae52c7d06c2 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -49,7 +49,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
, mbHadSMILNodes( false )
{
bool bHaveXmlId( false );
- OUString sXmlId;
+ OUString sXmlId, sStyleName, sContextName;
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -65,12 +65,12 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
{
case XML_TOK_DRAWPAGE_NAME:
{
- maContextName = sValue;
+ sContextName = sValue;
break;
}
case XML_TOK_DRAWPAGE_STYLE_NAME:
{
- maStyleName = sValue;
+ sStyleName = sValue;
break;
}
case XML_TOK_DRAWPAGE_MASTER_PAGE_NAME:
@@ -128,13 +128,13 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
uno::Reference< drawing::XDrawPage > xShapeDrawPage(rShapes, uno::UNO_QUERY);
// set PageName?
- if(!maContextName.isEmpty())
+ if(!sContextName.isEmpty())
{
if(xShapeDrawPage.is())
{
uno::Reference < container::XNamed > xNamed(xShapeDrawPage, uno::UNO_QUERY);
if(xNamed.is())
- xNamed->setName(maContextName);
+ xNamed->setName(sContextName);
}
}
@@ -181,7 +181,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
}
}
- SetStyle( maStyleName );
+ SetStyle( sStyleName );
if( !maHREF.isEmpty() )
{
diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx
index 801fa0e2eca8..bb6df0fcef2d 100644
--- a/xmloff/source/draw/ximpbody.hxx
+++ b/xmloff/source/draw/ximpbody.hxx
@@ -29,9 +29,7 @@
class SdXMLDrawPageContext : public SdXMLGenericPageContext
{
- OUString maContextName;
OUString maMasterPageName;
- OUString maStyleName;
OUString maHREF;
bool mbHadSMILNodes;
diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx
index d7ab3c60d38a..503cb1c4f12d 100644
--- a/xmloff/source/draw/ximpnote.cxx
+++ b/xmloff/source/draw/ximpnote.cxx
@@ -27,7 +27,7 @@ SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport,
uno::Reference< drawing::XShapes > const & rShapes)
: SdXMLGenericPageContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
{
- OUString sStyleName;
+ OUString sStyleName, sPageMasterName;
const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for(sal_Int16 i=0; i < nAttrCount; i++)
@@ -42,7 +42,7 @@ SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport,
{
case XML_TOK_MASTERPAGE_PAGE_MASTER_NAME:
{
- msPageMasterName = sValue;
+ sPageMasterName = sValue;
break;
}
case XML_TOK_MASTERPAGE_STYLE_NAME:
@@ -81,9 +81,9 @@ SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport,
}
// set page-master?
- if(!msPageMasterName.isEmpty())
+ if(!sPageMasterName.isEmpty())
{
- SetPageMaster( msPageMasterName );
+ SetPageMaster( sPageMasterName );
}
}
diff --git a/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx
index b9fd9bdaa7ef..7c16c041bc7d 100644
--- a/xmloff/source/draw/ximpnote.hxx
+++ b/xmloff/source/draw/ximpnote.hxx
@@ -29,9 +29,6 @@
class SdXMLNotesContext : public SdXMLGenericPageContext
{
-private:
- OUString msPageMasterName;
-
public:
SdXMLNotesContext( SdXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLocalName,
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();
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index d70fc8cfca88..71237cbd41da 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -68,7 +68,6 @@ public:
class SdXMLPageMasterContext: public SvXMLStyleContext
{
- OUString msName;
rtl::Reference<SdXMLPageMasterStyleContext> mxPageMasterStyle;
const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); }
@@ -93,10 +92,8 @@ public:
class SdXMLMasterPageContext: public SdXMLGenericPageContext
{
- OUString msPageMasterName;
OUString msName;
OUString msDisplayName;
- OUString msStyleName;
public:
@@ -124,9 +121,6 @@ class SdXMLPresentationPlaceholderContext: public SvXMLImportContext
{
OUString msName;
sal_Int32 mnX;
- sal_Int32 mnY;
- sal_Int32 mnWidth;
- sal_Int32 mnHeight;
const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); }
SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 85b99ed0d7eb..bfa368bc4e72 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -179,7 +179,6 @@ class FilterPropertiesInfo_Impl
{
sal_uInt32 nCount;
FilterPropertyInfoList_Impl aPropInfos;
- FilterPropertyInfoList_Impl::iterator aLastItr;
std::unique_ptr<Sequence<OUString>> pApiNames;
@@ -201,7 +200,6 @@ FilterPropertiesInfo_Impl::FilterPropertiesInfo_Impl() :
aPropInfos(),
pApiNames( nullptr )
{
- aLastItr = aPropInfos.begin();
}
void FilterPropertiesInfo_Impl::AddProperty(
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index ad1a081a3957..f42f8cbb2bf3 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -88,8 +88,6 @@ public:
class SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl : public SvXMLImportContext
{
- SvxXMLListLevelStyleContext_Impl& rListLevel;
-
public:
SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl(
@@ -946,8 +944,7 @@ SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl::SvxXMLListLevelStyleLabelAli
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
SvxXMLListLevelStyleContext_Impl& rLLevel ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
- rListLevel( rLLevel )
+ SvXMLImportContext( rImport, nPrfx, rLName )
{
static const SvXMLTokenMap aTokenMap( lcl_getStyleAlignmentAttributesAttrTokenMap() );
SvXMLUnitConverter& rUnitConv = GetImport().GetMM100UnitConverter();
@@ -981,19 +978,19 @@ SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl::SvxXMLListLevelStyleLabelAli
break;
case XML_TOK_STYLE_ATTRIBUTES_ATTR_LISTTAB_STOP_POSITION:
if (rUnitConv.convertMeasureToCore(nVal, rValue, 0, SHRT_MAX))
- rListLevel.SetListtabStopPosition( nVal );
+ rLLevel.SetListtabStopPosition( nVal );
break;
case XML_TOK_STYLE_ATTRIBUTES_ATTR_FIRST_LINE_INDENT:
if (rUnitConv.convertMeasureToCore(nVal, rValue, SHRT_MIN, SHRT_MAX))
- rListLevel.SetFirstLineIndent( nVal );
+ rLLevel.SetFirstLineIndent( nVal );
break;
case XML_TOK_STYLE_ATTRIBUTES_ATTR_INDENT_AT:
if (rUnitConv.convertMeasureToCore(nVal, rValue, SHRT_MIN, SHRT_MAX))
- rListLevel.SetIndentAt( nVal );
+ rLLevel.SetIndentAt( nVal );
break;
}
}
- rListLevel.SetLabelFollowedBy( eLabelFollowedBy );
+ rLLevel.SetLabelFollowedBy( eLabelFollowedBy );
}
void SvxXMLListStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
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)) ||
More information about the Libreoffice-commits
mailing list