loplugin:unusedfields in xmloff

Change-Id: I96de7fa324e3d2e3f0f133c93cf73776f4615ed3
Reviewed-on: https://gerrit.libreoffice.org/68134
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

13 files changed, 93 insertions, 151 deletions

diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 4c267354a693..fb22ca058d95 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -161,8 +161,6 @@ public:
 
     void SetChartRangeAddress( const OUString& rAddress )
         { msChartAddress = rAddress; }
-    void SetTableNumberList( const OUString& rList )
-        { msTableNumberList = rList; }
 
     void InitRangeSegmentationProperties(
         const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc );
@@ -259,7 +257,6 @@ public:
     bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false
     bool mbRowSourceColumns;
     OUString msChartAddress;
-    OUString msTableNumberList;
     css::uno::Sequence< sal_Int32 > maSequenceMapping;
 
     OUString const msCLSID;
@@ -3610,11 +3607,6 @@ void SchXMLExport::ExportContent_()
                             aAny >>= sChartAddress;
                             maExportHelper->m_pImpl->SetChartRangeAddress( sChartAddress );
 
-                            OUString sTableNumberList;
-                            aAny = xProp->getPropertyValue( "TableNumberList" );
-                            aAny >>= sTableNumberList;
-                            maExportHelper->m_pImpl->SetTableNumberList( sTableNumberList );
-
                             // do not include own table if there are external addresses
                             bIncludeTable = sChartAddress.isEmpty();
                         }
@@ -3669,8 +3661,6 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference<
                     }
                     else if ( aArgs[i].Name == "SequenceMapping" )
                         aArgs[i].Value >>= maSequenceMapping;
-                    else if ( aArgs[i].Name == "TableNumberList" )
-                        aArgs[i].Value >>= msTableNumberList;
                 }
 
                 // #i79009# For Writer we have to export a broken version of the
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 561e3d5aa3c3..653f3d5fc017 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -377,8 +377,6 @@ void SvXMLImport::InitCtor_()
                              GetXMLToken(XML_N_LO_EXT), XML_NAMESPACE_LO_EXT);
     }
 
-    msPackageProtocol = "vnd.sun.star.Package:";
-
     if (mxNumberFormatsSupplier.is())
         mpNumImport = std::make_unique<SvXMLNumFmtHelper>(mxNumberFormatsSupplier, GetComponentContext());
 
@@ -399,7 +397,6 @@ SvXMLImport::SvXMLImport(
                 util::MeasureUnit::MM_100TH, util::MeasureUnit::MM_100TH) ),
 
     mnImportFlags( nImportFlags ),
-    mnErrorFlags(SvXMLErrorFlags::NO),
     isFastContext( false ),
     maNamespaceHandler( new SvXMLImportFastNamespaceHandler() ),
     mbIsFormsSupported( true ),
@@ -1817,14 +1814,6 @@ void SvXMLImport::SetError(
     const OUString& rExceptionMessage,
     const Reference<xml::sax::XLocator>& rLocator )
 {
-    // maintain error flags
-    if ( ( nId & XMLERROR_FLAG_ERROR ) != 0 )
-        mnErrorFlags |= SvXMLErrorFlags::ERROR_OCCURRED;
-    if ( ( nId & XMLERROR_FLAG_WARNING ) != 0 )
-        mnErrorFlags |= SvXMLErrorFlags::WARNING_OCCURRED;
-    if ( ( nId & XMLERROR_FLAG_SEVERE ) != 0 )
-        mnErrorFlags |= SvXMLErrorFlags::DO_NOTHING;
-
     // create error list on demand
     if ( !mpXMLErrors )
         mpXMLErrors = std::make_unique<XMLErrors>();
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index fddcd99da0b3..84387f7624da 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -455,27 +455,17 @@ public:
 
     bool mbHasTransition;
 private:
-    SvXMLExport& mrExport;
-    Reference< XInterface > mxExport;
+    rtl::Reference<SvXMLExport> mxExport;
     Reference< XPropertySet > mxPageProps;
     rtl::Reference<XMLSdPropHdlFactory> mxSdPropHdlFactory;
 };
 
 AnimationsExporterImpl::AnimationsExporterImpl( SvXMLExport& rExport, const Reference< XPropertySet >& xPageProps )
 : mbHasTransition(false)
-, mrExport( rExport )
+, mxExport( &rExport )
 , mxPageProps( xPageProps )
 {
-    try
-    {
-        mxExport = static_cast< css::document::XFilter *>(&rExport);
-    }
-    catch (const RuntimeException&)
-    {
-        OSL_FAIL( "xmloff::AnimationsExporterImpl::AnimationsExporterImpl(), RuntimeException caught!" );
-    }
-
-    mxSdPropHdlFactory = new XMLSdPropHdlFactory( mrExport.GetModel(), mrExport );
+    mxSdPropHdlFactory = new XMLSdPropHdlFactory( rExport.GetModel(), rExport );
 }
 
 
@@ -584,9 +574,9 @@ void AnimationsExporterImpl::exportTransitionNode()
             aEvent.Repeat = 0;
 
             convertTiming( sTmp, Any( aEvent ) );
-            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_BEGIN, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_BEGIN, sTmp.makeStringAndClear() );
 
-            SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_PAR, true, true );
+            SvXMLElementExport aElement( *mxExport, XML_NAMESPACE_ANIMATION, XML_PAR, true, true );
 
             if( nTransition != 0 )
             {
@@ -601,44 +591,44 @@ void AnimationsExporterImpl::exportTransitionNode()
 
                 ::sax::Converter::convertDouble( sTmp, fDuration );
                 sTmp.append( 's');
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_DUR, sTmp.makeStringAndClear() );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_DUR, sTmp.makeStringAndClear() );
 
                 SvXMLUnitConverter::convertEnum( sTmp, nTransition, aAnimations_EnumMap_TransitionType );
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_TYPE, sTmp.makeStringAndClear() );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_TYPE, sTmp.makeStringAndClear() );
 
                 if( nSubtype != TransitionSubType::DEFAULT )
                 {
                     SvXMLUnitConverter::convertEnum( sTmp, nSubtype, aAnimations_EnumMap_TransitionSubType );
-                    mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_SUBTYPE, sTmp.makeStringAndClear() );
+                    mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_SUBTYPE, sTmp.makeStringAndClear() );
                 }
 
                 if( !bDirection )
-                    mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_DIRECTION, XML_REVERSE );
+                    mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_DIRECTION, XML_REVERSE );
 
                 if( (nTransition == TransitionType::FADE) && ((nSubtype == TransitionSubType::FADETOCOLOR) || (nSubtype == TransitionSubType::FADEFROMCOLOR) ))
                 {
                     ::sax::Converter::convertColor( sTmp, nFadeColor );
-                    mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_FADECOLOR, sTmp.makeStringAndClear() );
+                    mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_FADECOLOR, sTmp.makeStringAndClear() );
                 }
-                SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_TRANSITIONFILTER, true, true );
+                SvXMLElementExport aElement2( *mxExport, XML_NAMESPACE_ANIMATION, XML_TRANSITIONFILTER, true, true );
             }
 
             if( bStopSound )
             {
-                mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_COMMAND, XML_STOP_AUDIO );
-                SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, true, true );
+                mxExport->AddAttribute( XML_NAMESPACE_ANIMATION, XML_COMMAND, XML_STOP_AUDIO );
+                SvXMLElementExport aElement2( *mxExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, true, true );
             }
             else if( !sSoundURL.isEmpty())
             {
-                sSoundURL = lcl_StoreMediaAndGetURL(mrExport, sSoundURL);
-                mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sSoundURL );
+                sSoundURL = lcl_StoreMediaAndGetURL(*mxExport, sSoundURL);
+                mxExport->AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sSoundURL );
 
                 bool bLoopSound = false;
                 mxPageProps->getPropertyValue("LoopSound") >>= bLoopSound;
 
                 if( bLoopSound )
-                    mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_REPEATCOUNT, XML_INDEFINITE );
-                SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_AUDIO, true, true );
+                    mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_REPEATCOUNT, XML_INDEFINITE );
+                SvXMLElementExport aElement2( *mxExport, XML_NAMESPACE_ANIMATION, XML_AUDIO, true, true );
             }
         }
     }
@@ -667,7 +657,7 @@ void AnimationsExporterImpl::prepareTransitionNode()
         {
             mbHasTransition = true;
             Reference< XInterface > xInt( mxPageProps.get() );
-            mrExport.getInterfaceToIdentifierMapper().registerReference( xInt );
+            mxExport->getInterfaceToIdentifierMapper().registerReference( xInt );
         }
     }
     catch (const Exception&)
@@ -746,7 +736,7 @@ void AnimationsExporterImpl::prepareNode( const Reference< XAnimationNode >& xNo
                     Reference< XInterface > xMaster;
                     pValue->Value >>= xMaster;
                     if( xMaster.is() )
-                        mrExport.getInterfaceToIdentifierMapper().registerReference( xMaster );
+                        mxExport->getInterfaceToIdentifierMapper().registerReference( xMaster );
                 }
             }
         }
@@ -763,10 +753,10 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
     {
         OUStringBuffer sTmp;
 
-        const OUString& rExportIdentifier = mrExport.getInterfaceToIdentifierMapper().getIdentifier( xNode );
+        const OUString& rExportIdentifier = mxExport->getInterfaceToIdentifierMapper().getIdentifier( xNode );
         if( !rExportIdentifier.isEmpty() )
         {
-            mrExport.AddAttributeIdLegacy(
+            mxExport->AddAttributeIdLegacy(
                 XML_NAMESPACE_ANIMATION, rExportIdentifier);
         }
 
@@ -774,7 +764,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
         if( aTemp.hasValue() )
         {
             convertTiming( sTmp, aTemp );
-            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_BEGIN, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_BEGIN, sTmp.makeStringAndClear() );
         }
 
         double fTemp = 0;
@@ -787,13 +777,13 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
             {
                 ::sax::Converter::convertDouble( sTmp, fTemp );
                 sTmp.append( 's');
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_DUR, sTmp.makeStringAndClear() );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_DUR, sTmp.makeStringAndClear() );
             }
             else
             {
                 Timing eTiming;
                 if( aTemp >>= eTiming )
-                    mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_DUR, eTiming == Timing_INDEFINITE ? XML_INDEFINITE : XML_MEDIA );
+                    mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_DUR, eTiming == Timing_INDEFINITE ? XML_INDEFINITE : XML_MEDIA );
             }
         }
 
@@ -801,56 +791,56 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
         if( aTemp.hasValue() )
         {
             convertTiming( sTmp, aTemp );
-            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_END, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_END, sTmp.makeStringAndClear() );
         }
 
         nTemp = xNode->getFill();
         if( nTemp != AnimationFill::DEFAULT )
         {
             SvXMLUnitConverter::convertEnum( sTmp, nTemp, aAnimations_EnumMap_Fill );
-            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_FILL, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_FILL, sTmp.makeStringAndClear() );
         }
 
         nTemp = xNode->getFillDefault();
         if( nTemp != AnimationFill::INHERIT )
         {
             SvXMLUnitConverter::convertEnum( sTmp, nTemp, aAnimations_EnumMap_FillDefault );
-            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_FILLDEFAULT, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_FILLDEFAULT, sTmp.makeStringAndClear() );
         }
 
         nTemp = xNode->getRestart();
         if( nTemp != AnimationRestart::DEFAULT )
         {
             SvXMLUnitConverter::convertEnum( sTmp, nTemp, aAnimations_EnumMap_Restart );
-            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_RESTART, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_RESTART, sTmp.makeStringAndClear() );
         }
 
         nTemp = xNode->getRestartDefault();
         if( nTemp != AnimationRestart::INHERIT )
         {
             SvXMLUnitConverter::convertEnum( sTmp, nTemp, aAnimations_EnumMap_RestartDefault );
-            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_RESTARTDEFAULT, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_RESTARTDEFAULT, sTmp.makeStringAndClear() );
         }
 
         fTemp = xNode->getAcceleration();
         if( fTemp != 0.0 )
         {
             ::sax::Converter::convertDouble( sTmp, fTemp );
-            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_ACCELERATE, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_ACCELERATE, sTmp.makeStringAndClear() );
         }
 
         fTemp = xNode->getDecelerate();
         if( fTemp != 0.0 )
         {
             ::sax::Converter::convertDouble( sTmp, fTemp );
-            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_DECELERATE, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_DECELERATE, sTmp.makeStringAndClear() );
         }
 
         bool bTemp = xNode->getAutoReverse();
         if( bTemp )
         {
             ::sax::Converter::convertBool( sTmp, bTemp );
-            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_AUTOREVERSE, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_AUTOREVERSE, sTmp.makeStringAndClear() );
         }
 
         aTemp = xNode->getRepeatCount();
@@ -858,11 +848,11 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
         {
             Timing eTiming;
             if( (aTemp >>= eTiming ) && (eTiming == Timing_INDEFINITE ) )
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_REPEATCOUNT, XML_INDEFINITE );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_REPEATCOUNT, XML_INDEFINITE );
             else if( aTemp >>= fTemp )
             {
                 ::sax::Converter::convertDouble( sTmp, fTemp );
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_REPEATCOUNT, sTmp.makeStringAndClear() );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_REPEATCOUNT, sTmp.makeStringAndClear() );
             }
         }
 
@@ -872,12 +862,12 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
             Timing eTiming;
             if( ( aTemp >>= eTiming ) && (eTiming == Timing_INDEFINITE) )
             {
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_REPEATDUR, XML_INDEFINITE );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_REPEATDUR, XML_INDEFINITE );
             }
             else if( aTemp >>= fTemp )
             {
                 ::sax::Converter::convertDouble( sTmp, fTemp );
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_REPEATDUR, sTmp.makeStringAndClear() );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_REPEATDUR, sTmp.makeStringAndClear() );
             }
         }
 
@@ -885,7 +875,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
         if( aTemp.hasValue() && (aTemp >>= nTemp) )
         {
             SvXMLUnitConverter::convertEnum( sTmp, nTemp, aAnimations_EnumMap_Endsync );
-            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_ENDSYNC, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_ENDSYNC, sTmp.makeStringAndClear() );
         }
 
         sal_Int16 nContainerNodeType = EffectNodeType::DEFAULT;
@@ -903,14 +893,14 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
                     if( (pValue->Value >>= nContainerNodeType) && (nContainerNodeType != EffectNodeType::DEFAULT) )
                     {
                         SvXMLUnitConverter::convertEnum( sTmp, nContainerNodeType, aAnimations_EnumMap_EffectNodeType );
-                        mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_NODE_TYPE, sTmp.makeStringAndClear() );
+                        mxExport->AddAttribute( XML_NAMESPACE_PRESENTATION, XML_NODE_TYPE, sTmp.makeStringAndClear() );
                     }
                 }
                 else if( IsXMLToken( pValue->Name, XML_PRESET_ID ) )
                 {
                     if( pValue->Value >>= aPresetId )
                     {
-                        mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PRESET_ID, aPresetId );
+                        mxExport->AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PRESET_ID, aPresetId );
                     }
                 }
                 else if( IsXMLToken( pValue->Name, XML_PRESET_SUB_TYPE ) )
@@ -918,7 +908,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
                     OUString aPresetSubType;
                     if( pValue->Value >>= aPresetSubType )
                     {
-                        mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PRESET_SUB_TYPE, aPresetSubType );
+                        mxExport->AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PRESET_SUB_TYPE, aPresetSubType );
                     }
                 }
                 else if( IsXMLToken( pValue->Name, XML_PRESET_CLASS ) )
@@ -927,7 +917,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
                     if( pValue->Value >>= nEffectPresetClass )
                     {
                         SvXMLUnitConverter::convertEnum( sTmp, nEffectPresetClass, aAnimations_EnumMap_EffectPresetClass );
-                        mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PRESET_CLASS, sTmp.makeStringAndClear() );
+                        mxExport->AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PRESET_CLASS, sTmp.makeStringAndClear() );
                     }
                 }
                 else if( IsXMLToken( pValue->Name, XML_MASTER_ELEMENT ) )
@@ -936,22 +926,22 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
                     pValue->Value >>= xMaster;
                     if( xMaster.is() )
                     {
-                        const OUString& rIdentifier = mrExport.getInterfaceToIdentifierMapper().getIdentifier(xMaster);
+                        const OUString& rIdentifier = mxExport->getInterfaceToIdentifierMapper().getIdentifier(xMaster);
                         if( !rIdentifier.isEmpty() )
-                            mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_MASTER_ELEMENT, rIdentifier );
+                            mxExport->AddAttribute( XML_NAMESPACE_PRESENTATION, XML_MASTER_ELEMENT, rIdentifier );
                     }
                 }
                 else if( IsXMLToken( pValue->Name, XML_GROUP_ID ) )
                 {
                     sal_Int32 nGroupId = 0;
                     if( pValue->Value >>= nGroupId )
-                        mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_GROUP_ID, OUString::number( nGroupId ) );
+                        mxExport->AddAttribute( XML_NAMESPACE_PRESENTATION, XML_GROUP_ID, OUString::number( nGroupId ) );
                 }
                 else
                 {
                     OUString aTmp;
                     if( pValue->Value >>= aTmp )
-                        mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, pValue->Name, aTmp );
+                        mxExport->AddAttribute( XML_NAMESPACE_PRESENTATION, pValue->Name, aTmp );
                 }
             }
         }
@@ -1001,7 +991,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
     }
 
     // if something goes wrong, its always a good idea to clear the attribute list
-    mrExport.ClearAttrList();
+    mxExport->ClearAttrList();
 }
 
 void AnimationsExporterImpl::exportContainer( const Reference< XTimeContainer >& xContainer, sal_Int16 nContainerNodeType )
@@ -1019,39 +1009,39 @@ void AnimationsExporterImpl::exportContainer( const Reference< XTimeContainer >&
             if( aTemp.hasValue() )
             {
                 convertTarget( sTmp, aTemp );
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_TARGETELEMENT, sTmp.makeStringAndClear() );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_TARGETELEMENT, sTmp.makeStringAndClear() );
             }
 
             sal_Int16 nTemp = xIter->getSubItem();
             if( nTemp )
             {
                 SvXMLUnitConverter::convertEnum( sTmp, nTemp, aAnimations_EnumMap_SubItem );
-                mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_SUB_ITEM, sTmp.makeStringAndClear() );
+                mxExport->AddAttribute( XML_NAMESPACE_ANIMATION, XML_SUB_ITEM, sTmp.makeStringAndClear() );
             }
 
             nTemp = xIter->getIterateType();
             if( nTemp )
             {
                 SvXMLUnitConverter::convertEnum( sTmp, nTemp, aAnimations_EnumMap_IterateType );
-                mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_ITERATE_TYPE, sTmp.makeStringAndClear() );
+                mxExport->AddAttribute( XML_NAMESPACE_ANIMATION, XML_ITERATE_TYPE, sTmp.makeStringAndClear() );
             }
 
             double fTemp = xIter->getIterateInterval();
             if( fTemp )
             {
-                if( !( mrExport.getExportFlags() & SvXMLExportFlags::SAVEBACKWARDCOMPATIBLE ) )
+                if( !( mxExport->getExportFlags() & SvXMLExportFlags::SAVEBACKWARDCOMPATIBLE ) )
                 {
                     // issue 146582
                     OUStringBuffer buf;
                     ::sax::Converter::convertDuration(buf, fTemp / (24*60*60));
-                    mrExport.AddAttribute( XML_NAMESPACE_ANIMATION,
+                    mxExport->AddAttribute( XML_NAMESPACE_ANIMATION,
                             XML_ITERATE_INTERVAL, buf.makeStringAndClear());
                 }
                 else
                 {
                     sTmp.append( fTemp );
                     sTmp.append( 's' );
-                    mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_ITERATE_INTERVAL, sTmp.makeStringAndClear() );
+                    mxExport->AddAttribute( XML_NAMESPACE_ANIMATION, XML_ITERATE_INTERVAL, sTmp.makeStringAndClear() );
                 }
             }
         }
@@ -1066,7 +1056,7 @@ void AnimationsExporterImpl::exportContainer( const Reference< XTimeContainer >&
             OSL_FAIL( "xmloff::AnimationsExporterImpl::exportContainer(), invalid TimeContainerType!" );
             return;
         }
-        SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, eElementToken, true, true );
+        SvXMLElementExport aElement( *mxExport, XML_NAMESPACE_ANIMATION, eElementToken, true, true );
 
         if( nContainerNodeType == EffectNodeType::TIMING_ROOT )
             exportTransitionNode();
@@ -1099,14 +1089,14 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
         if( aTemp.hasValue() )
         {
             convertTarget( sTmp, aTemp );
-            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_TARGETELEMENT, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_TARGETELEMENT, sTmp.makeStringAndClear() );
         }
 
         nTemp = xAnimate->getSubItem();
         if( nTemp )
         {
             SvXMLUnitConverter::convertEnum( sTmp, nTemp, aAnimations_EnumMap_SubItem );
-            mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_SUB_ITEM, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_ANIMATION, XML_SUB_ITEM, sTmp.makeStringAndClear() );
         }
 
         XMLTokenEnum eAttributeName = XML_TOKEN_INVALID;
@@ -1141,11 +1131,11 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
                     p++;
                 }
 
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_ATTRIBUTENAME, sTemp );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_ATTRIBUTENAME, sTemp );
             }
             else
             {
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_ATTRIBUTENAME, "invalid" );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_ATTRIBUTENAME, "invalid" );
             }
         }
 
@@ -1154,7 +1144,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
         {
             aTemp <<= aValues;
             convertValue( eAttributeName, sTmp, aTemp );
-            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_VALUES, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_VALUES, sTmp.makeStringAndClear() );
         }
         else
         {
@@ -1162,21 +1152,21 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
             if( aTemp.hasValue() )
             {
                 convertValue( eAttributeName, sTmp, aTemp );
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_FROM, sTmp.makeStringAndClear() );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_FROM, sTmp.makeStringAndClear() );
             }
 
             aTemp = xAnimate->getBy();
             if( aTemp.hasValue() )
             {
                 convertValue( eAttributeName, sTmp, aTemp );
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_BY, sTmp.makeStringAndClear() );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_BY, sTmp.makeStringAndClear() );
             }
 
             aTemp = xAnimate->getTo();
             if( aTemp.hasValue() )
             {
                 convertValue( eAttributeName, sTmp, aTemp );
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_TO, sTmp.makeStringAndClear() );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_TO, sTmp.makeStringAndClear() );
             }
         }
 
@@ -1195,12 +1185,12 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
 
                     sTmp.append( *p++ );
                 }
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_KEYTIMES, sTmp.makeStringAndClear() );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_KEYTIMES, sTmp.makeStringAndClear() );
             }
 
             OUString sTemp( xAnimate->getFormula() );
             if( !sTemp.isEmpty() )
-                mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_FORMULA, sTemp );
+                mxExport->AddAttribute( XML_NAMESPACE_ANIMATION, XML_FORMULA, sTemp );
 
             if( (nNodeType != AnimationNodeType::TRANSITIONFILTER) &&
                 (nNodeType != AnimationNodeType::AUDIO ) )
@@ -1211,18 +1201,18 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
                     ((nNodeType != AnimationNodeType::ANIMATEMOTION ) && (nTemp != AnimationCalcMode::LINEAR)) )
                 {
                     SvXMLUnitConverter::convertEnum( sTmp, nTemp, aAnimations_EnumMap_CalcMode );
-                    mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_CALCMODE, sTmp.makeStringAndClear() );
+                    mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_CALCMODE, sTmp.makeStringAndClear() );
                 }
 
                 bTemp = xAnimate->getAccumulate();
                 if( bTemp )
-                    mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_ACCUMULATE, XML_SUM );
+                    mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_ACCUMULATE, XML_SUM );
 
                 nTemp = xAnimate->getAdditive();
                 if( nTemp != AnimationAdditiveMode::REPLACE )
                 {
                     SvXMLUnitConverter::convertEnum( sTmp, nTemp, aAnimations_EnumMap_AdditiveMode );
-                    mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_ADDITIVE, sTmp.makeStringAndClear() );
+                    mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_ADDITIVE, sTmp.makeStringAndClear() );
                 }
             }
 
@@ -1242,7 +1232,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
                     p++;
                 }
 
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_KEYSPLINES, sTmp.makeStringAndClear() );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_KEYSPLINES, sTmp.makeStringAndClear() );
             }
         }
 
@@ -1268,7 +1258,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
             if( aTemp.hasValue() )
             {
                 convertPath( sTmp, aTemp );
-                mrExport.AddAttribute( XML_NAMESPACE_SVG, XML_PATH, sTmp.makeStringAndClear() );
+                mxExport->AddAttribute( XML_NAMESPACE_SVG, XML_PATH, sTmp.makeStringAndClear() );
             }
 
             // TODO: origin = ( parent | layout )
@@ -1283,10 +1273,10 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
             Reference< XAnimateColor > xAnimateColor( xAnimate, UNO_QUERY_THROW );
 
             nTemp = xAnimateColor->getColorInterpolation();
-            mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_COLOR_INTERPOLATION, (nTemp == AnimationColorSpace::RGB) ? XML_RGB : XML_HSL );
+            mxExport->AddAttribute( XML_NAMESPACE_ANIMATION, XML_COLOR_INTERPOLATION, (nTemp == AnimationColorSpace::RGB) ? XML_RGB : XML_HSL );
 
             bTemp = xAnimateColor->getDirection();
-            mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_COLOR_INTERPOLATION_DIRECTION, bTemp ? XML_CLOCKWISE : XML_COUNTER_CLOCKWISE );
+            mxExport->AddAttribute( XML_NAMESPACE_ANIMATION, XML_COLOR_INTERPOLATION_DIRECTION, bTemp ? XML_CLOCKWISE : XML_COUNTER_CLOCKWISE );
         }
         break;
 
@@ -1294,12 +1284,12 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
         {
             eElementToken = XML_ANIMATETRANSFORM;
 
-            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_ATTRIBUTENAME, XML_TRANSFORM );
+            mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_ATTRIBUTENAME, XML_TRANSFORM );
 
             Reference< XAnimateTransform > xTransform( xAnimate, UNO_QUERY_THROW );
             nTemp = xTransform->getTransformType();
             SvXMLUnitConverter::convertEnum( sTmp, nTemp, aAnimations_EnumMap_TransformType );
-            mrExport.AddAttribute( XML_NAMESPACE_SVG, XML_TYPE, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_SVG, XML_TYPE, sTmp.makeStringAndClear() );
         }
         break;
 
@@ -1310,34 +1300,34 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
 
             sal_Int16 nTransition = xTransitionFilter->getTransition();
             SvXMLUnitConverter::convertEnum( sTmp, nTransition, aAnimations_EnumMap_TransitionType );
-            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_TYPE, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_TYPE, sTmp.makeStringAndClear() );
 
             sal_Int16 nSubtype = xTransitionFilter->getSubtype();
             if( nSubtype != TransitionSubType::DEFAULT )
             {
                 SvXMLUnitConverter::convertEnum( sTmp, nSubtype, aAnimations_EnumMap_TransitionSubType );
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_SUBTYPE, sTmp.makeStringAndClear() );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_SUBTYPE, sTmp.makeStringAndClear() );
             }
 
             bTemp = xTransitionFilter->getMode();
             if( !bTemp )
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_MODE, XML_OUT );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_MODE, XML_OUT );
 
             bTemp = xTransitionFilter->getDirection();
             if( !bTemp )
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_DIRECTION, XML_REVERSE );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_DIRECTION, XML_REVERSE );
 
             if( (nTransition == TransitionType::FADE) && ((nSubtype == TransitionSubType::FADETOCOLOR) || (nSubtype == TransitionSubType::FADEFROMCOLOR) ))
             {
                 nTemp = xTransitionFilter->getFadeColor();
                 ::sax::Converter::convertColor( sTmp, nTemp );
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_FADECOLOR, sTmp.makeStringAndClear() );
+                mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_FADECOLOR, sTmp.makeStringAndClear() );
             }
         }
         break;
         }
 
-        SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, eElementToken, true, true );
+        SvXMLElementExport aElement( *mxExport, XML_NAMESPACE_ANIMATION, eElementToken, true, true );
 
     }
     catch (const Exception&)
@@ -1353,23 +1343,23 @@ void AnimationsExporterImpl::exportAudio( const Reference< XAudio >& xAudio )
         OUString aSourceURL;
         xAudio->getSource() >>= aSourceURL;
         if( !aSourceURL.isEmpty() )
-            mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, mrExport.GetRelativeReference( aSourceURL ) );
+            mxExport->AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, mxExport->GetRelativeReference( aSourceURL ) );
 
         const double fVolume = xAudio->getVolume();
         if( fVolume != 1.0 )
         {
             OUStringBuffer sTmp;
             ::sax::Converter::convertDouble( sTmp, fVolume );
-            mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_AUDIO_LEVEL, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_ANIMATION, XML_AUDIO_LEVEL, sTmp.makeStringAndClear() );
         }
 
 /* todo?
         sal_Int32 nEndAfterSlide = 0;
         xAudio->getEndAfterSlide() >>= nEndAfterSlide;
         if( nEndAfterSlide != 0 )
-            mrExport.AddAttribute( );
+            mxExport->AddAttribute( );
 */
-        SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_AUDIO, true, true );
+        SvXMLElementExport aElement( *mxExport, XML_NAMESPACE_ANIMATION, XML_AUDIO, true, true );
 
     }
     catch (const Exception&)
@@ -1387,16 +1377,16 @@ void AnimationsExporterImpl::exportCommand( const Reference< XCommand >& xComman
         if( aTemp.hasValue() )
         {
             convertTarget( sTmp, aTemp );
-            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_TARGETELEMENT, sTmp.makeStringAndClear() );
+            mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_TARGETELEMENT, sTmp.makeStringAndClear() );
         }
 
         sal_Int16 nCommand = xCommand->getCommand();
         SvXMLUnitConverter::convertEnum( sTmp, nCommand, aAnimations_EnumMap_Command );
-        mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_COMMAND, sTmp.makeStringAndClear() );
+        mxExport->AddAttribute( XML_NAMESPACE_ANIMATION, XML_COMMAND, sTmp.makeStringAndClear() );
 
 // todo virtual css::uno::Any SAL_CALL getParameter() throw (css::uno::RuntimeException) = 0;
 
-        SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, true, true );
+        SvXMLElementExport aElement( *mxExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, true, true );
 
     }
     catch (const Exception&)
@@ -1521,7 +1511,7 @@ void AnimationsExporterImpl::convertValue( XMLTokenEnum eAttributeName, OUString
         if( pHandler )
         {
             OUString aString;
-            pHandler->exportXML( aString, rValue, mrExport.GetMM100UnitConverter() );
+            pHandler->exportXML( aString, rValue, mxExport->GetMM100UnitConverter() );
             sTmp.append( aString );
         }
     }
@@ -1608,7 +1598,7 @@ void AnimationsExporterImpl::convertTarget( OUStringBuffer& sTmp, const Any& rTa
     SAL_WARN_IF( !xRef.is(), "xmloff", "xmloff::AnimationsExporterImpl::convertTarget(), invalid target type!" );
     if( xRef.is() )
     {
-        const OUString& rIdentifier = mrExport.getInterfaceToIdentifierMapper().getIdentifier(xRef);
+        const OUString& rIdentifier = mxExport->getInterfaceToIdentifierMapper().getIdentifier(xRef);
         if( !rIdentifier.isEmpty() )
             sTmp.append( rIdentifier );
     }
@@ -1637,13 +1627,13 @@ void AnimationsExporterImpl::prepareValue( const Any& rValue )
     {
         Reference< XInterface> xRef( rValue, UNO_QUERY );
         if( xRef.is() )
-            mrExport.getInterfaceToIdentifierMapper().registerReference( xRef );
+            mxExport->getInterfaceToIdentifierMapper().registerReference( xRef );
     }
     else if( auto pt = o3tl::tryAccess<ParagraphTarget>(rValue) )
     {
         Reference< XInterface> xRef( getParagraphTarget( *pt ) );
         if( xRef.is() )
-            mrExport.getInterfaceToIdentifierMapper().registerReference( xRef );
+            mxExport->getInterfaceToIdentifierMapper().registerReference( xRef );
     }
     else if( auto pEvent = o3tl::tryAccess<Event>(rValue) )
     {
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index d96ad6cf3d05..02a4a071a37e 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -226,7 +226,6 @@ class AnimExpImpl
 {
 public:
     list<XMLEffectHint> maEffects;
-    rtl::Reference< XMLShapeExport > mxShapeExp;
 
     static constexpr OUStringLiteral gsDimColor = "DimColor";
     static constexpr OUStringLiteral gsDimHide = "DimHide";
@@ -242,10 +241,9 @@ public:
     static constexpr OUStringLiteral gsAnimPath = "AnimationPath";
 };
 
-XMLAnimationsExporter::XMLAnimationsExporter( XMLShapeExport* pShapeExp )
+XMLAnimationsExporter::XMLAnimationsExporter()
     : mpImpl( new AnimExpImpl )
 {
-    mpImpl->mxShapeExp = pShapeExp;
 }
 
 XMLAnimationsExporter::~XMLAnimationsExporter()
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index afd398a0eda5..7075dc273eec 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1770,7 +1770,7 @@ void SdXMLExport::ExportContent_()
                 else
                 {
                     // export old animations for ooo format
-                    rtl::Reference< XMLAnimationsExporter > xAnimExport = new XMLAnimationsExporter( GetShapeExport().get() );
+                    rtl::Reference< XMLAnimationsExporter > xAnimExport = new XMLAnimationsExporter();
                     GetShapeExport()->setAnimationsExporter( xAnimExport );
                 }
             }
@@ -2171,7 +2171,7 @@ void SdXMLExport::collectAutoStyles()
         // prepare animations exporter if impress
         if(IsImpress() && (!(getExportFlags() & SvXMLExportFlags::OASIS)) )
         {
-            rtl::Reference< XMLAnimationsExporter > xAnimExport = new XMLAnimationsExporter( GetShapeExport().get() );
+            rtl::Reference< XMLAnimationsExporter > xAnimExport = new XMLAnimationsExporter();
             GetShapeExport()->setAnimationsExporter( xAnimExport );
         }
 
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 04d4f2813aa0..2562d125b966 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -183,8 +183,6 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp,
     // #88546# init to sal_False
     mbHandleProgressBar( false )
 {
-    // construct PropertyHandlerFactory
-    mxSdPropHdlFactory = new XMLSdPropHdlFactory( mrExport.GetModel(), rExp );
     // construct PropertySetMapper
     mxPropertySetMapper = CreateShapePropMapper( mrExport );
     if( pExtMapper )
@@ -209,8 +207,6 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp,
         GetPropertySetMapper(),
         XML_STYLE_FAMILY_SD_PRESENTATION_PREFIX);
 
-    maCurrentInfo = maShapeInfos.end();
-
     // create table export helper and let him add his families in time
     GetShapeTableExport();
 }
@@ -552,7 +548,6 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
     }
 
     maShapeInfos.push_back( aShapeInfo );
-    maCurrentInfo = maShapeInfos.begin();
 
     // check for shape collections (group shape or 3d scene)
     // and collect contained shapes style infos
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 018e3f704452..29fd6f35c621 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -887,16 +887,6 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rL
             // draw:transform for compatibility
             mnTransform.SetString(rValue, GetImport().GetMM100UnitConverter());
         }
-
-        // #i68101#
-        else if( IsXMLToken( rLocalName, XML_TITLE ) )
-        {
-            maShapeTitle = rValue;
-        }
-        else if( IsXMLToken( rLocalName, XML_DESC ) )
-        {
-            maShapeDescription = rValue;
-        }
     }
     else if (nPrefix == XML_NAMESPACE_STYLE)
     {
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index 6066a72f7889..c1e34a138093 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -73,10 +73,6 @@ protected:
     OUString               maShapeId;
     OUString               maLayerName;
 
-    // #i68101#
-    OUString               maShapeTitle;
-    OUString               maShapeDescription;
-
     SdXMLImExTransform2D        mnTransform;
     css::awt::Size              maSize;
     sal_Int16                   mnRelWidth;
diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx
index 8ac87d169a94..7020d91809e3 100644
--- a/xmloff/source/forms/formattributes.cxx
+++ b/xmloff/source/forms/formattributes.cxx
@@ -261,7 +261,6 @@ namespace xmloff
         OUString sAttributeName = OUString::createFromAscii(_pAttributeName);
 
         AttributeAssignment aAssignment;
-        aAssignment.sAttributeName = sAttributeName;
         aAssignment.sPropertyName = _rPropertyName;
         aAssignment.aPropertyType = _rType;
 
diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx
index 898fe669730e..343936ead77d 100644
--- a/xmloff/source/forms/formattributes.hxx
+++ b/xmloff/source/forms/formattributes.hxx
@@ -276,7 +276,6 @@ namespace xmloff
         // store it's instances in a map, but in a vector for faster access.
         struct AttributeAssignment
         {
-            OUString                 sAttributeName;         // the attribute name
             OUString                 sPropertyName;          // the property name
             css::uno::Type           aPropertyType;          // the property type
 
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index 5ae6085fec2f..191f178635ea 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -604,8 +604,6 @@ std::vector<xmloff::AutoStyleEntry> SvXMLAutoStylePoolP_Impl::GetAutoStyleEntrie
             {
                 rReturnVector.emplace_back();
                 xmloff::AutoStyleEntry & rEntry = rReturnVector.back();
-                rEntry.m_aParentName = rParent->GetParent();
-                rEntry.m_aName = rProperty->GetName();
                 for (XMLPropertyState const & rPropertyState : rProperty->GetProperties())
                 {
                     if (rPropertyState.mnIndex >= 0)
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 08be604575ab..249f06752fa3 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -346,9 +346,8 @@ void SAL_CALL XMLTransformerBase::processingInstruction( const OUString& rTarget
     m_xHandler->processingInstruction( rTarget, rData );
 }
 
-void SAL_CALL XMLTransformerBase::setDocumentLocator( const Reference< XLocator >& rLocator )
+void SAL_CALL XMLTransformerBase::setDocumentLocator( const Reference< XLocator >& )
 {
-    m_xLocator = rLocator;
 }
 
 // XExtendedDocumentHandler
diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx
index c11e6f6f4477..34486e6d9275 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -56,7 +56,6 @@ class XMLTransformerBase : public XMLTransformer
 {
     friend class XMLTransformerContext;
 
-    css::uno::Reference< css::xml::sax::XLocator >                    m_xLocator;
     css::uno::Reference< css::xml::sax::XDocumentHandler >            m_xHandler;     // the handlers
     css::uno::Reference< css::beans::XPropertySet >                   m_xPropSet;
     css::uno::Reference< css::i18n::XCharacterClassification >        xCharClass;