summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/inc/txtvfldi.hxx3
-rw-r--r--xmloff/source/draw/animationimport.cxx3
-rw-r--r--xmloff/source/draw/sdxmlimp_impl.hxx2
-rw-r--r--xmloff/source/draw/ximpbody.cxx26
-rw-r--r--xmloff/source/draw/ximpbody.hxx3
-rw-r--r--xmloff/source/text/txtvfldi.cxx9
6 files changed, 18 insertions, 28 deletions
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index 4a68674a7dfd..cce0447fe3e5 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -402,9 +402,6 @@ public:
*/
class XMLVariableDeclImportContext final : public SvXMLImportContext
{
- XMLValueImportHelper aValueHelper;
- sal_Unicode cSeparationChar;
-
public:
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 7cb48ab3049f..c3bfc3486743 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -106,9 +106,6 @@ class AnimationsImportHelperImpl
private:
SvXMLImport& mrImport;
- std::unique_ptr<SvXMLTokenMap> mpAnimationNodeTokenMap;
- std::unique_ptr<SvXMLTokenMap> mpAnimationNodeAttributeTokenMap;
-
public:
explicit AnimationsImportHelperImpl( SvXMLImport& rImport );
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 51b6573863ef..6f6d4bb68b6b 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -156,8 +156,6 @@ class SdXMLImport: public SvXMLImport
std::unique_ptr<SvXMLTokenMap> mpMasterPageAttrTokenMap;
std::unique_ptr<SvXMLTokenMap> mpPageMasterAttrTokenMap;
std::unique_ptr<SvXMLTokenMap> mpPageMasterStyleAttrTokenMap;
- std::unique_ptr<SvXMLTokenMap> mpDrawPageAttrTokenMap;
- std::unique_ptr<SvXMLTokenMap> mpDrawPageElemTokenMap;
std::unique_ptr<SvXMLTokenMap> mpPresentationPlaceholderAttrTokenMap;
sal_Int32 mnNewPageCount;
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index 147902785c57..7f73a203124f 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -46,7 +46,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
, mbHadSMILNodes( false )
{
bool bHaveXmlId( false );
- OUString sXmlId, sStyleName, sContextName;
+ OUString sXmlId, sStyleName, sContextName, sMasterPageName, sHREF;
sax_fastparser::FastAttributeList *pAttribList =
sax_fastparser::FastAttributeList::castToFastAttributeList( xAttrList );
@@ -67,7 +67,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
}
case XML_ELEMENT(DRAW, XML_MASTER_PAGE_NAME):
{
- maMasterPageName = sValue;
+ sMasterPageName = sValue;
break;
}
case XML_ELEMENT(PRESENTATION, XML_PRESENTATION_PAGE_LAYOUT_NAME):
@@ -111,7 +111,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
break;
case XML_ELEMENT(XLINK, XML_HREF):
{
- maHREF = sValue;
+ sHREF = sValue;
break;
}
}
@@ -139,7 +139,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
}
// set MasterPage?
- if(!maMasterPageName.isEmpty())
+ if(!sMasterPageName.isEmpty())
{
// #85906# Code for setting masterpage needs complete rework
// since GetSdImport().GetMasterStylesContext() gives always ZERO
@@ -154,7 +154,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
{
bool bDone(false);
OUString sDisplayName( rImport.GetStyleDisplayName(
- XmlStyleFamily::MASTER_PAGE, maMasterPageName ) );
+ XmlStyleFamily::MASTER_PAGE, sMasterPageName ) );
for(sal_Int32 a = 0; !bDone && a < xMasterPages->getCount(); a++)
{
@@ -166,9 +166,9 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
uno::Reference < container::XNamed > xMasterNamed(xMasterPage, uno::UNO_QUERY);
if(xMasterNamed.is())
{
- OUString sMasterPageName = xMasterNamed->getName();
+ OUString sLoopMasterPageName = xMasterNamed->getName();
- if(!sMasterPageName.isEmpty() && sMasterPageName == sDisplayName)
+ if(!sLoopMasterPageName.isEmpty() && sLoopMasterPageName == sDisplayName)
{
xDrawPage->setMasterPage(xMasterPage);
bDone = true;
@@ -183,22 +183,22 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
SetStyle( sStyleName );
- if( !maHREF.isEmpty() )
+ if( !sHREF.isEmpty() )
{
uno::Reference< beans::XPropertySet > xProps( xShapeDrawPage, uno::UNO_QUERY );
if( xProps.is() )
{
- sal_Int32 nIndex = maHREF.lastIndexOf( '#' );
+ sal_Int32 nIndex = sHREF.lastIndexOf( '#' );
if( nIndex != -1 )
{
- OUString aFileName( maHREF.copy( 0, nIndex ) );
- OUString aBookmarkName( maHREF.copy( nIndex+1 ) );
+ OUString aFileName( sHREF.copy( 0, nIndex ) );
+ OUString aBookmarkName( sHREF.copy( nIndex+1 ) );
- maHREF = GetImport().GetAbsoluteReference( aFileName ) + "#"
+ sHREF = GetImport().GetAbsoluteReference( aFileName ) + "#"
+ aBookmarkName;
}
- xProps->setPropertyValue("BookmarkURL", uno::makeAny( maHREF ) );
+ xProps->setPropertyValue("BookmarkURL", uno::makeAny( sHREF ) );
}
}
diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx
index 1cee8fe94422..ac77bf5479aa 100644
--- a/xmloff/source/draw/ximpbody.hxx
+++ b/xmloff/source/draw/ximpbody.hxx
@@ -28,9 +28,6 @@
class SdXMLDrawPageContext : public SdXMLGenericPageContext
{
- OUString maMasterPageName;
- OUString maHREF;
-
bool mbHadSMILNodes;
public:
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 573d0ab9ae9d..24d5d8dfebc9 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -702,11 +702,12 @@ XMLVariableDeclImportContext::XMLVariableDeclImportContext(
sal_uInt16 nPrfx, const OUString& rLocalName,
const Reference<xml::sax::XAttributeList> & xAttrList,
enum VarType eVarType) :
- SvXMLImportContext(rImport, nPrfx, rLocalName),
- // bug?? which properties for userfield/userfieldmaster
- aValueHelper(rImport, rHlp, true, false, true, false),
- cSeparationChar('.')
+ SvXMLImportContext(rImport, nPrfx, rLocalName)
{
+ // bug?? which properties for userfield/userfieldmaster
+ XMLValueImportHelper aValueHelper(rImport, rHlp, true, false, true, false);
+ sal_Unicode cSeparationChar('.');
+
sal_Int8 nNumLevel(-1);
OUString sName;
generated by cgit (git 2.34.1) at 2025-01-25 20:41:52 +0000