summaryrefslogtreecommitdiff
path: root/xmloff/source/draw
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source/draw')
-rw-r--r--xmloff/source/draw/XMLImageMapContext.cxx12
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx4
-rw-r--r--xmloff/source/draw/ximp3dscene.cxx7
-rw-r--r--xmloff/source/draw/ximpbody.cxx4
-rw-r--r--xmloff/source/draw/ximpcustomshape.cxx4
-rw-r--r--xmloff/source/draw/ximpgrp.cxx5
-rw-r--r--xmloff/source/draw/ximplink.cxx3
-rw-r--r--xmloff/source/draw/ximppage.cxx8
-rw-r--r--xmloff/source/draw/ximpshap.cxx7
-rw-r--r--xmloff/source/draw/ximpstyl.cxx4
10 files changed, 6 insertions, 52 deletions
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index d44a90832161..ea802af8a915 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -212,7 +212,7 @@ void XMLImageMapObjectContext::EndElement()
SvXMLImportContextRef XMLImageMapObjectContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference<XAttributeList> & xAttrList )
+ const Reference<XAttributeList> & /*xAttrList*/ )
{
if ( (XML_NAMESPACE_OFFICE == nPrefix) &&
IsXMLToken(rLocalName, XML_EVENT_LISTENERS) )
@@ -233,10 +233,7 @@ SvXMLImportContextRef XMLImageMapObjectContext::CreateChildContext(
return new XMLStringBufferImportContext(
GetImport(), nPrefix, rLocalName, sDescriptionBuffer);
}
- else
- return SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
- xAttrList);
-
+ return nullptr;
}
void XMLImageMapObjectContext::ProcessAttribute(
@@ -587,7 +584,7 @@ XMLImageMapContext::~XMLImageMapContext()
SvXMLImportContextRef XMLImageMapContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference<XAttributeList> & xAttrList )
+ const Reference<XAttributeList> & /*xAttrList*/ )
{
SvXMLImportContextRef xContext;
@@ -609,9 +606,6 @@ SvXMLImportContextRef XMLImageMapContext::CreateChildContext(
GetImport(), nPrefix, rLocalName, xImageMap);
}
}
- else
- xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
- xAttrList);
return xContext;
}
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 10606f5c564e..66f6643d6215 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -194,10 +194,6 @@ SvXMLImportContextRef SdXMLDocContext_Impl::CreateChildContext(
}
}
- // call parent when no own context was created
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
-
return xContext;
}
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index 9a2843dcc37e..2d9c1b479d38 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -199,13 +199,6 @@ SvXMLImportContextRef SdXML3DSceneShapeContext::CreateChildContext( sal_uInt16 n
GetImport(), nPrefix, rLocalName, xAttrList, mxChildren);
}
- // call parent when no own context was created
- if (!xContext)
- {
- xContext = SvXMLImportContext::CreateChildContext(
- nPrefix, rLocalName, xAttrList);
- }
-
return xContext;
}
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index e2015aedf1e6..d6ff5ee2033e 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -346,10 +346,6 @@ SvXMLImportContextRef SdXMLBodyContext::CreateChildContext(
}
}
- // call parent when no own context was created
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
-
return xContext;
}
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 80955168676d..e7b1ba31211e 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -1298,7 +1298,7 @@ void XMLEnhancedCustomShapeContext::EndElement()
SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maHandles, EASGet( EAS_Handles ) );
}
-SvXMLImportContextRef XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt16 nPrefix,const OUString& rLocalName,
+SvXMLImportContextRef XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt16 /*nPrefix*/,const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList> & xAttrList )
{
EnhancedCustomShapeTokenEnum aTokenEnum = EASGet( rLocalName );
@@ -1384,7 +1384,7 @@ SvXMLImportContextRef XMLEnhancedCustomShapeContext::CreateChildContext( sal_uIn
}
maHandles.push_back( comphelper::containerToSequence(aHandle) );
}
- return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
+ return nullptr;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx
index 549782fa41c0..9cc2aff111e8 100644
--- a/xmloff/source/draw/ximpgrp.cxx
+++ b/xmloff/source/draw/ximpgrp.cxx
@@ -69,11 +69,6 @@ SvXMLImportContextRef SdXMLGroupShapeContext::CreateChildContext( sal_uInt16 nPr
GetImport(), nPrefix, rLocalName, xAttrList, mxChildren);
}
- // call parent when no own context was created
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext(
- nPrefix, rLocalName, xAttrList);
-
return xContext;
}
diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx
index 9de9cb753cca..db28b619e026 100644
--- a/xmloff/source/draw/ximplink.cxx
+++ b/xmloff/source/draw/ximplink.cxx
@@ -62,8 +62,7 @@ SvXMLImportContextRef SdXMLShapeLinkContext::CreateChildContext( sal_uInt16 nPre
return pContext;
}
- // call parent when no own context was created
- return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList);
+ return nullptr;
}
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index cd8d2b2a36de..4eff47a38f9c 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -176,10 +176,6 @@ SvXMLImportContextRef DrawAnnotationContext::CreateChildContext( sal_uInt16 nPre
}
}
- // call parent for content
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
-
return xContext;
}
@@ -274,10 +270,6 @@ SvXMLImportContextRef SdXMLGenericPageContext::CreateChildContext( sal_uInt16 nP
GetImport(), nPrefix, rLocalName, xAttrList, mxShapes);
}
- // call parent when no own context was created
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
-
return xContext;
}
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 3594d1605363..76f534a9819b 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -251,10 +251,6 @@ SvXMLImportContextRef SdXMLShapeContext::CreateChildContext( sal_uInt16 p_nPrefi
}
}
- // call parent for content
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext( p_nPrefix, rLocalName, xAttrList );
-
return xContext;
}
@@ -3559,9 +3555,6 @@ SvXMLImportContextRef SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPr
}
}
}
- // call parent for content
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
return xContext;
}
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 070b9ecad1e3..1d05a80fbfad 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -1450,10 +1450,6 @@ SvXMLImportContextRef SdXMLMasterStylesContext::CreateChildContext(
xContext = new SdXMLLayerSetContext( GetImport(), nPrefix, rLocalName, xAttrList );
}
- // call base class
- if (!xContext)
- xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
-
return xContext;
}
generated by cgit (git 2.34.1) at 2024-08-13 16:24:00 +0000