[Libreoffice-commits] .: 2 commits - binfilter/bf_xmloff
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Dec 29 12:57:45 PST 2010
binfilter/bf_xmloff/source/core/makefile.mk | 2
binfilter/bf_xmloff/source/core/xmloff_DocumentSettingsContext.cxx | 134 ++++-----
binfilter/bf_xmloff/source/core/xmloff_ProgressBarHelper.cxx | 18 -
binfilter/bf_xmloff/source/core/xmloff_PropertySetMerger.cxx | 17 -
binfilter/bf_xmloff/source/core/xmloff_SettingsExportHelper.cxx | 2
binfilter/bf_xmloff/source/core/xmloff_XMLBase64ImportContext.cxx | 6
binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectExportFilter.cxx | 2
binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx | 30 +-
binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx | 8
binfilter/bf_xmloff/source/core/xmloff_facreg.cxx | 6
binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx | 14 -
binfilter/bf_xmloff/source/core/xmloff_xmlerror.cxx | 4
binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx | 39 +-
binfilter/bf_xmloff/source/core/xmloff_xmlictxt.cxx | 6
binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx | 54 +--
binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx | 15 -
binfilter/bf_xmloff/source/draw/xmloff_XMLGraphicsDefaultStyle.cxx | 8
binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx | 70 ++---
binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapExport.cxx | 17 -
binfilter/bf_xmloff/source/draw/xmloff_XMLShapePropertySetContext.cxx | 18 -
binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx | 16 -
binfilter/bf_xmloff/source/draw/xmloff_numithdl.cxx | 4
binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx | 22 -
binfilter/bf_xmloff/source/draw/xmloff_shapeexport3.cxx | 22 -
binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx | 138 ++++------
binfilter/bf_xmloff/source/draw/xmloff_ximppage.cxx | 22 -
26 files changed, 338 insertions(+), 356 deletions(-)
New commits:
commit ce423c66245c19d76e056f8347d17fbffa5ce030
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 29 20:17:02 2010 +0000
throw out some more warnings
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_XMLGraphicsDefaultStyle.cxx b/binfilter/bf_xmloff/source/draw/xmloff_XMLGraphicsDefaultStyle.cxx
index 61d98fe..8376584 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_XMLGraphicsDefaultStyle.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_XMLGraphicsDefaultStyle.cxx
@@ -64,19 +64,19 @@ XMLGraphicsDefaultStyle::~XMLGraphicsDefaultStyle()
{
}
-SvXMLImportContext *XMLGraphicsDefaultStyle::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList > & xAttrList )
+SvXMLImportContext *XMLGraphicsDefaultStyle::CreateChildContext( sal_uInt16 nInPrefix, const OUString& rLocalName, const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_STYLE == nPrefix && IsXMLToken( rLocalName, XML_PROPERTIES ) )
+ if( XML_NAMESPACE_STYLE == nInPrefix && IsXMLToken( rLocalName, XML_PROPERTIES ) )
{
UniReference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() );
if( xImpPrMap.is() )
- pContext = new XMLShapePropertySetContext( GetImport(), nPrefix, rLocalName, xAttrList, GetProperties(), xImpPrMap );
+ pContext = new XMLShapePropertySetContext( GetImport(), nInPrefix, rLocalName, xAttrList, GetProperties(), xImpPrMap );
}
if( !pContext )
- pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
+ pContext = XMLPropStyleContext::CreateChildContext( nInPrefix, rLocalName, xAttrList );
return pContext;
}
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx b/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx
index 68134f5..a141bbc 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx
@@ -184,15 +184,12 @@ protected:
TYPEINIT1( XMLImageMapObjectContext, SvXMLImportContext );
XMLImageMapObjectContext::XMLImageMapObjectContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
Reference<XIndexContainer> xMap,
const sal_Char* pServiceName) :
- SvXMLImportContext(rImport, nPrefix, rLocalName),
- xImageMap(xMap),
- bIsActive(sal_True),
- bValid(sal_False),
+ SvXMLImportContext(rInImport, nInPrefix, rLocalName),
sBoundary(RTL_CONSTASCII_USTRINGPARAM("Boundary")),
sCenter(RTL_CONSTASCII_USTRINGPARAM("Center")),
sDescription(RTL_CONSTASCII_USTRINGPARAM("Description")),
@@ -202,7 +199,10 @@ XMLImageMapObjectContext::XMLImageMapObjectContext(
sPolygon(RTL_CONSTASCII_USTRINGPARAM("Polygon")),
sRadius(RTL_CONSTASCII_USTRINGPARAM("Radius")),
sTarget(RTL_CONSTASCII_USTRINGPARAM("Target")),
- sURL(RTL_CONSTASCII_USTRINGPARAM("URL"))
+ sURL(RTL_CONSTASCII_USTRINGPARAM("URL")),
+ xImageMap(xMap),
+ bIsActive(sal_True),
+ bValid(sal_False)
{
DBG_ASSERT(NULL != pServiceName,
"Please supply the image map object service name");
@@ -233,13 +233,13 @@ void XMLImageMapObjectContext::StartElement(
for(sal_Int16 nAttr = 0; nAttr < nLength; nAttr++)
{
OUString sLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().
GetKeyByAttrName( xAttrList->getNameByIndex(nAttr),
&sLocalName );
OUString sValue = xAttrList->getValueByIndex(nAttr);
ProcessAttribute(
- (enum XMLImageMapToken)aMap.Get(nPrefix, sLocalName), sValue);
+ (enum XMLImageMapToken)aMap.Get(nLclPrefix, sLocalName), sValue);
}
}
@@ -261,25 +261,25 @@ void XMLImageMapObjectContext::EndElement()
}
SvXMLImportContext* XMLImageMapObjectContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList )
{
- if ( (XML_NAMESPACE_OFFICE == nPrefix) &&
+ if ( (XML_NAMESPACE_OFFICE == nInPrefix) &&
IsXMLToken(rLocalName, XML_EVENTS) )
{
Reference<XEventsSupplier> xEvents( xMapEntry, UNO_QUERY );
return new XMLEventsImportContext(
- GetImport(), nPrefix, rLocalName, xEvents);
+ GetImport(), nInPrefix, rLocalName, xEvents);
}
- else if ( (XML_NAMESPACE_SVG == nPrefix) &&
+ else if ( (XML_NAMESPACE_SVG == nInPrefix) &&
IsXMLToken(rLocalName, XML_DESC) )
{
return new XMLStringBufferImportContext(
- GetImport(), nPrefix, rLocalName, sDescriptionBuffer);
+ GetImport(), nInPrefix, rLocalName, sDescriptionBuffer);
}
else
- return SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
+ return SvXMLImportContext::CreateChildContext(nInPrefix, rLocalName,
xAttrList);
}
@@ -305,6 +305,8 @@ void XMLImageMapObjectContext::ProcessAttribute(
case XML_TOK_IMAP_NAME:
sNam = rValue;
break;
+ default:
+ break;
}
}
@@ -367,11 +369,11 @@ protected:
TYPEINIT1(XMLImageMapRectangleContext, XMLImageMapObjectContext);
XMLImageMapRectangleContext::XMLImageMapRectangleContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
Reference<XIndexContainer> xMap) :
- XMLImageMapObjectContext(rImport, nPrefix, rLocalName, xMap,
+ XMLImageMapObjectContext(rInImport, nInPrefix, rLocalName, xMap,
"com.sun.star.image.ImageMapRectangleObject"),
bXOK(sal_False),
bYOK(sal_False),
@@ -477,11 +479,11 @@ protected:
TYPEINIT1(XMLImageMapPolygonContext, XMLImageMapObjectContext);
XMLImageMapPolygonContext::XMLImageMapPolygonContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
Reference<XIndexContainer> xMap) :
- XMLImageMapObjectContext(rImport, nPrefix, rLocalName, xMap,
+ XMLImageMapObjectContext(rInImport, nInPrefix, rLocalName, xMap,
"com.sun.star.image.ImageMapPolygonObject"),
bViewBoxOK(sal_False),
bPointsOK(sal_False)
@@ -576,11 +578,11 @@ protected:
TYPEINIT1(XMLImageMapCircleContext, XMLImageMapObjectContext);
XMLImageMapCircleContext::XMLImageMapCircleContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
Reference<XIndexContainer> xMap) :
- XMLImageMapObjectContext(rImport, nPrefix, rLocalName, xMap,
+ XMLImageMapObjectContext(rInImport, nInPrefix, rLocalName, xMap,
"com.sun.star.image.ImageMapCircleObject"),
bXOK(sal_False),
bYOK(sal_False),
@@ -658,11 +660,11 @@ void XMLImageMapCircleContext::Prepare(
TYPEINIT1(XMLImageMapContext, SvXMLImportContext);
XMLImageMapContext::XMLImageMapContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
Reference<XPropertySet> & rPropertySet) :
- SvXMLImportContext(rImport, nPrefix, rLocalName),
+ SvXMLImportContext(rInImport, nInPrefix, rLocalName),
sImageMap(RTL_CONSTASCII_USTRINGPARAM("ImageMap")),
xPropertySet(rPropertySet)
@@ -674,7 +676,7 @@ XMLImageMapContext::XMLImageMapContext(
catch( ::com::sun::star::uno::Exception e )
{
uno::Sequence<OUString> aSeq(0);
- rImport.SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, NULL );
+ rInImport.SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, NULL );
}
}
@@ -683,32 +685,32 @@ XMLImageMapContext::~XMLImageMapContext()
}
SvXMLImportContext *XMLImageMapContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLocalName,
const Reference<XAttributeList> & xAttrList )
{
SvXMLImportContext* pContext = NULL;
- if ( XML_NAMESPACE_DRAW == nPrefix )
+ if ( XML_NAMESPACE_DRAW == nInPrefix )
{
if ( IsXMLToken(rLocalName, XML_AREA_RECTANGLE) )
{
pContext = new XMLImageMapRectangleContext(
- GetImport(), nPrefix, rLocalName, xImageMap);
+ GetImport(), nInPrefix, rLocalName, xImageMap);
}
else if ( IsXMLToken(rLocalName, XML_AREA_POLYGON) )
{
pContext = new XMLImageMapPolygonContext(
- GetImport(), nPrefix, rLocalName, xImageMap);
+ GetImport(), nInPrefix, rLocalName, xImageMap);
}
else if ( IsXMLToken(rLocalName, XML_AREA_CIRCLE) )
{
pContext = new XMLImageMapCircleContext(
- GetImport(), nPrefix, rLocalName, xImageMap);
+ GetImport(), nInPrefix, rLocalName, xImageMap);
}
}
else
- pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName,
+ pContext = SvXMLImportContext::CreateChildContext(nInPrefix, rLocalName,
xAttrList);
return pContext;
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapExport.cxx b/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapExport.cxx
index 67a911c..c8e46b8 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapExport.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapExport.cxx
@@ -81,8 +81,6 @@ const sal_Char sAPI_ImageMapCircleObject[] = "com.sun.star.image.ImageMapCircleO
const sal_Char sAPI_ImageMapPolygonObject[] = "com.sun.star.image.ImageMapPolygonObject";
XMLImageMapExport::XMLImageMapExport(SvXMLExport& rExp) :
- rExport(rExp),
- bWhiteSpace(sal_True),
sBoundary(RTL_CONSTASCII_USTRINGPARAM("Boundary")),
sCenter(RTL_CONSTASCII_USTRINGPARAM("Center")),
sDescription(RTL_CONSTASCII_USTRINGPARAM("Description")),
@@ -92,7 +90,9 @@ XMLImageMapExport::XMLImageMapExport(SvXMLExport& rExp) :
sPolygon(RTL_CONSTASCII_USTRINGPARAM("Polygon")),
sRadius(RTL_CONSTASCII_USTRINGPARAM("Radius")),
sTarget(RTL_CONSTASCII_USTRINGPARAM("Target")),
- sURL(RTL_CONSTASCII_USTRINGPARAM("URL"))
+ sURL(RTL_CONSTASCII_USTRINGPARAM("URL")),
+ rExport(rExp),
+ bWhiteSpace(sal_True)
{
}
@@ -161,7 +161,6 @@ void XMLImageMapExport::ExportMapEntry(
Sequence<OUString> sServiceNames =
xServiceInfo->getSupportedServiceNames();
sal_Int32 nLength = sServiceNames.getLength();
- sal_Bool bFound = sal_False;
for( sal_Int32 i=0; i<nLength; i++ )
{
OUString& rName = sServiceNames[i];
@@ -260,13 +259,13 @@ void XMLImageMapExport::ExportMapEntry(
// description property (as <svg:desc> element)
aAny = rPropertySet->getPropertyValue(sDescription);
- OUString sDescription;
- aAny >>= sDescription;
- if (sDescription.getLength() > 0)
+ OUString sLclDescription;
+ aAny >>= sLclDescription;
+ if (sLclDescription.getLength() > 0)
{
SvXMLElementExport aDesc(rExport, XML_NAMESPACE_SVG, XML_DESC,
bWhiteSpace, sal_False);
- rExport.GetDocHandler()->characters(sDescription);
+ rExport.GetDocHandler()->characters(sLclDescription);
}
// export events attached to this
@@ -319,7 +318,7 @@ void XMLImageMapExport::ExportCircle(
// radius
aAny = rPropertySet->getPropertyValue(sRadius);
- sal_Int32 nRadius;
+ sal_Int32 nRadius(0);
aAny >>= nRadius;
rExport.GetMM100UnitConverter().convertMeasure(aBuffer, nRadius);
rExport.AddAttribute( XML_NAMESPACE_SVG, XML_R,
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_XMLShapePropertySetContext.cxx b/binfilter/bf_xmloff/source/draw/xmloff_XMLShapePropertySetContext.cxx
index de374eb..324a7d9 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_XMLShapePropertySetContext.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_XMLShapePropertySetContext.cxx
@@ -49,12 +49,12 @@ using rtl::OUString;
TYPEINIT1( XMLShapePropertySetContext, SvXMLPropertySetContext );
XMLShapePropertySetContext::XMLShapePropertySetContext(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
::std::vector< XMLPropertyState > &rProps,
const UniReference < SvXMLImportPropertyMapper > &rMap ) :
- SvXMLPropertySetContext( rImport, nPrfx, rLName, xAttrList, rProps, rMap ),
+ SvXMLPropertySetContext( rInImport, nPrfx, rLName, xAttrList, rProps, rMap ),
mnBulletIndex(-1)
{
}
@@ -83,10 +83,10 @@ void XMLShapePropertySetContext::EndElement()
}
SvXMLImportContext *XMLShapePropertySetContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList,
- ::std::vector< XMLPropertyState > &rProperties,
+ ::std::vector< XMLPropertyState > &rInProperties,
const XMLPropertyState& rProp )
{
SvXMLImportContext *pContext = 0;
@@ -95,19 +95,19 @@ SvXMLImportContext *XMLShapePropertySetContext::CreateChildContext(
{
case CTF_NUMBERINGRULES:
mnBulletIndex = rProp.mnIndex;
- mxBulletStyle = pContext = new SvxXMLListStyleContext( GetImport(), nPrefix, rLocalName, xAttrList );
+ mxBulletStyle = pContext = new SvxXMLListStyleContext( GetImport(), nInPrefix, rLocalName, xAttrList );
break;
case CTF_TABSTOP:
- pContext = new SvxXMLTabStopImportContext( GetImport(), nPrefix,
+ pContext = new SvxXMLTabStopImportContext( GetImport(), nInPrefix,
rLocalName, rProp,
- rProperties );
+ rInProperties );
break;
}
if( !pContext )
- pContext = SvXMLPropertySetContext::CreateChildContext( nPrefix, rLocalName,
+ pContext = SvXMLPropertySetContext::CreateChildContext( nInPrefix, rLocalName,
xAttrList,
- rProperties, rProp );
+ rInProperties, rProp );
return pContext;
}
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx b/binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx
index 7c214a0..c2a7e5d 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx
@@ -57,13 +57,13 @@ using rtl::OUString;
TYPEINIT1( XMLShapeStyleContext, XMLPropStyleContext );
XMLShapeStyleContext::XMLShapeStyleContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
SvXMLStylesContext& rStyles,
- sal_uInt16 nFamily)
-: XMLPropStyleContext(rImport, nPrfx, rLName, xAttrList, rStyles, nFamily ),
+ sal_uInt16 nInFamily)
+: XMLPropStyleContext(rInImport, nPrfx, rLName, xAttrList, rStyles, nInFamily ),
m_bIsNumRuleAlreadyConverted( sal_False )
{
}
@@ -89,26 +89,26 @@ void XMLShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey, const ::rtl::OUS
}
SvXMLImportContext *XMLShapeStyleContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- if( XML_NAMESPACE_STYLE == nPrefix &&
+ if( XML_NAMESPACE_STYLE == nInPrefix &&
IsXMLToken( rLocalName, XML_PROPERTIES ) )
{
UniReference < SvXMLImportPropertyMapper > xImpPrMap =
GetStyles()->GetImportPropertyMapper( GetFamily() );
if( xImpPrMap.is() )
- pContext = new XMLShapePropertySetContext( GetImport(), nPrefix,
+ pContext = new XMLShapePropertySetContext( GetImport(), nInPrefix,
rLocalName, xAttrList,
GetProperties(),
xImpPrMap );
}
if( !pContext )
- pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName,
+ pContext = XMLPropStyleContext::CreateChildContext( nInPrefix, rLocalName,
xAttrList );
return pContext;
@@ -196,7 +196,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet
}
}
-void XMLShapeStyleContext::Finish( sal_Bool bOverwrite )
+void XMLShapeStyleContext::Finish( sal_Bool /*bOverwrite*/ )
{
}
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_numithdl.cxx b/binfilter/bf_xmloff/source/draw/xmloff_numithdl.cxx
index 719521d..b970e44 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_numithdl.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_numithdl.cxx
@@ -51,12 +51,12 @@ sal_Bool XMLNumRulePropHdl::equals( const uno::Any& r1, const uno::Any& r2 ) con
return mxNumRuleCompare.is() && mxNumRuleCompare->compare( r1, r2 ) == 0;
}
-sal_Bool XMLNumRulePropHdl::importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLNumRulePropHdl::importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
return sal_False;
}
-sal_Bool XMLNumRulePropHdl::exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLNumRulePropHdl::exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
return sal_False;
}
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx b/binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx
index 3255524..999edbf 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx
@@ -190,7 +190,7 @@ sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference<
{
uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() );
- sal_Bool bTemp;
+ sal_Bool bTemp(sal_False);
// is empty pes shape?
if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject"))))
@@ -265,8 +265,8 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
presentation::AnimationEffect eEffect;
presentation::AnimationSpeed eSpeed;
OUString aStrSoundURL;
- sal_Bool bPlayFull;
- sal_Int32 nVerb;
+ sal_Bool bPlayFull(sal_False);
+ sal_Int32 nVerb(0);
OUString aStrMacro;
OUString aStrLibrary;
OUString aStrBookmark;
@@ -465,7 +465,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
//////////////////////////////////////////////////////////////////////////////
-void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
+void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType /*eShapeType*/, sal_Int32 nFeatures, awt::Point* pRefPoint)
{
uno::Reference< drawing::XShapes > xShapes(xShape, uno::UNO_QUERY);
if(xShapes.is() && xShapes->getCount())
@@ -570,7 +570,7 @@ void XMLShapeExport::ImpExportTextBoxShape(
void XMLShapeExport::ImpExportRectangleShape(
const uno::Reference< drawing::XShape >& xShape,
- XmlShapeType eShapeType, sal_Int32 nFeatures, ::com::sun::star::awt::Point* pRefPoint)
+ XmlShapeType /*eShapeType*/, sal_Int32 nFeatures, ::com::sun::star::awt::Point* pRefPoint)
{
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
if(xPropSet.is())
@@ -602,7 +602,7 @@ void XMLShapeExport::ImpExportRectangleShape(
void XMLShapeExport::ImpExportLineShape(
const uno::Reference< drawing::XShape >& xShape,
- XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
+ XmlShapeType /*eShapeType*/, sal_Int32 nFeatures, awt::Point* pRefPoint)
{
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
if(xPropSet.is())
@@ -711,7 +711,7 @@ void XMLShapeExport::ImpExportLineShape(
void XMLShapeExport::ImpExportEllipseShape(
const uno::Reference< drawing::XShape >& xShape,
- XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
+ XmlShapeType /*eShapeType*/, sal_Int32 nFeatures, awt::Point* pRefPoint)
{
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
if(xPropSet.is())
@@ -730,8 +730,8 @@ void XMLShapeExport::ImpExportEllipseShape(
if( eKind != drawing::CircleKind_FULL )
{
OUStringBuffer sStringBuffer;
- sal_Int32 nStartAngle;
- sal_Int32 nEndAngle;
+ sal_Int32 nStartAngle(0);
+ sal_Int32 nEndAngle(0);
xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CircleStartAngle")) ) >>= nStartAngle;
xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CircleEndAngle")) ) >>= nEndAngle;
@@ -1306,7 +1306,7 @@ void XMLShapeExport::ImpExportOLE2Shape(
bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_TABLE) );
OUString sClassId;
- sal_Bool bInternal;
+ sal_Bool bInternal(sal_False);
xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("IsInternal"))) >>= bInternal;
sal_Bool bExportEmbedded(0 != (rExport.getExportFlags() & EXPORT_EMBEDDED));
@@ -1515,7 +1515,7 @@ void XMLShapeExport::ImpExportAppletShape(
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CODE, aStr );
// export draw:may-script
- sal_Bool bIsScript;
+ sal_Bool bIsScript(sal_False);
xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AppletIsScript" ) ) ) >>= bIsScript;
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MAY_SCRIPT, bIsScript ? XML_TRUE : XML_FALSE );
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_shapeexport3.cxx b/binfilter/bf_xmloff/source/draw/xmloff_shapeexport3.cxx
index d0f2d1b..7b9f2d9 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_shapeexport3.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_shapeexport3.cxx
@@ -69,7 +69,7 @@ inline sal_Int32 FRound( double fVal )
//////////////////////////////////////////////////////////////////////////////
-void XMLShapeExport::ImpExport3DSceneShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
+void XMLShapeExport::ImpExport3DSceneShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType /*eShapeType*/, sal_Int32 nFeatures, awt::Point* pRefPoint)
{
uno::Reference< drawing::XShapes > xShapes(xShape, uno::UNO_QUERY);
if(xShapes.is() && xShapes->getCount())
@@ -211,12 +211,12 @@ void XMLShapeExport::ImpExport3DShape(
case XmlShapeTypeDraw3DExtrudeObject:
{
// write special 3DLathe/3DExtrude attributes
- uno::Any aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DPolyPolygon3D")));
+ uno::Any aLclAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DPolyPolygon3D")));
drawing::PolyPolygonShape3D xPolyPolygon3D;
- aAny >>= xPolyPolygon3D;
+ aLclAny >>= xPolyPolygon3D;
// look for maximal values
- double fXMin, fXMax, fYMin, fYMax;
+ double fXMin(0.0), fXMax(0.0), fYMin(0.0), fYMax(0.0);
BOOL bInit(FALSE);
sal_Int32 nOuterSequenceCount(xPolyPolygon3D.SequenceX.getLength());
drawing::DoubleSequence* pInnerSequenceX = xPolyPolygon3D.SequenceX.getArray();
@@ -382,7 +382,7 @@ void XMLShapeExport::export3DSceneAttributes( const ::com::sun::star::uno::Refer
// distance
aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneDistance")));
- sal_Int32 nDistance;
+ sal_Int32 nDistance(0);
aAny >>= nDistance;
rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, nDistance);
aStr = sStringBuffer.makeStringAndClear();
@@ -390,7 +390,7 @@ void XMLShapeExport::export3DSceneAttributes( const ::com::sun::star::uno::Refer
// focalLength
aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneFocalLength")));
- sal_Int32 nFocalLength;
+ sal_Int32 nFocalLength(0);
aAny >>= nFocalLength;
rExport.GetMM100UnitConverter().convertMeasure(sStringBuffer, nFocalLength);
aStr = sStringBuffer.makeStringAndClear();
@@ -398,7 +398,7 @@ void XMLShapeExport::export3DSceneAttributes( const ::com::sun::star::uno::Refer
// shadowSlant
aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneShadowSlant")));
- sal_Int16 nShadowSlant;
+ sal_Int16 nShadowSlant(0);
aAny >>= nShadowSlant;
rExport.GetMM100UnitConverter().convertNumber(sStringBuffer, (sal_Int32)nShadowSlant);
aStr = sStringBuffer.makeStringAndClear();
@@ -427,7 +427,7 @@ void XMLShapeExport::export3DSceneAttributes( const ::com::sun::star::uno::Refer
// ambientColor
aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneAmbientColor")));
- sal_Int32 aColTemp;
+ sal_Int32 aColTemp(0);
Color aAmbientColor;
aAny >>= aColTemp; aAmbientColor.SetColor(aColTemp);
rExport.GetMM100UnitConverter().convertColor(sStringBuffer, aAmbientColor);
@@ -436,7 +436,7 @@ void XMLShapeExport::export3DSceneAttributes( const ::com::sun::star::uno::Refer
// lightingMode
aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneTwoSidedLighting")));
- sal_Bool bTwoSidedLighting;
+ sal_Bool bTwoSidedLighting(sal_False);
aAny >>= bTwoSidedLighting;
rExport.GetMM100UnitConverter().convertBool(sStringBuffer, bTwoSidedLighting);
aStr = sStringBuffer.makeStringAndClear();
@@ -456,11 +456,11 @@ void XMLShapeExport::export3DLamps( const ::com::sun::star::uno::Reference< ::co
OUString aPropName;
OUString aIndexStr;
- sal_Int32 aColTemp;
+ sal_Int32 aColTemp(0);
Color aLightColor;
Vector3D aLightDirection;
drawing::Direction3D xLightDir;
- sal_Bool bLightOnOff;
+ sal_Bool bLightOnOff(sal_False);
for(sal_Int32 nLamp = 1; nLamp <= 8; nLamp++)
{
aIndexStr = OUString::valueOf( nLamp );
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx b/binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx
index 4362390..909f594 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx
@@ -126,38 +126,27 @@ XMLShapeImportHelper::XMLShapeImportHelper(
SvXMLImport& rImporter,
const uno::Reference< frame::XModel>& rModel,
SvXMLImportPropertyMapper *pExtMapper )
-: mxModel(rModel),
- mrImporter( rImporter ),
- mpPageContext(NULL),
-
- mpPropertySetMapper(0L),
- mpPresPagePropsMapper(0L),
- mpStylesContext(0L),
- mpAutoStylesContext(0L),
- mpGroupShapeElemTokenMap(0L),
- mp3DSceneShapeElemTokenMap(0L),
- mp3DObjectAttrTokenMap(0L),
- mp3DPolygonBasedAttrTokenMap(0L),
- mp3DCubeObjectAttrTokenMap(0L),
- mp3DSphereObjectAttrTokenMap(0L),
- mp3DSceneShapeAttrTokenMap(0L),
- mp3DLightAttrTokenMap(0L),
- mpPathShapeAttrTokenMap(0L),
- mpPolygonShapeAttrTokenMap(0L),
-/*
- mpShapeAttrTokenMap(0L),
- mpRectShapeAttrTokenMap(0L),
- mpLineShapeAttrTokenMap(0L),
- mpEllipseShapeAttrTokenMap(0L),
- mpTextBoxShapeAttrTokenMap(0L),
- mpControlShapeAttrTokenMap(0L),
- mpPageShapeAttrTokenMap(0L),
- mpGraphicObjectShapeAttrTokenMap(0L),
-*/
- msStartShape(RTL_CONSTASCII_USTRINGPARAM("StartShape")),
- msEndShape(RTL_CONSTASCII_USTRINGPARAM("EndShape")),
- msStartGluePointIndex(RTL_CONSTASCII_USTRINGPARAM("StartGluePointIndex")),
- msEndGluePointIndex(RTL_CONSTASCII_USTRINGPARAM("EndGluePointIndex"))
+ : mpPageContext(NULL)
+ , mxModel(rModel)
+ , mpPropertySetMapper(0L)
+ , mpPresPagePropsMapper(0L)
+ , mpStylesContext(0L)
+ , mpAutoStylesContext(0L)
+ , mpGroupShapeElemTokenMap(0L)
+ , mp3DSceneShapeElemTokenMap(0L)
+ , mp3DObjectAttrTokenMap(0L)
+ , mp3DPolygonBasedAttrTokenMap(0L)
+ , mp3DCubeObjectAttrTokenMap(0L)
+ , mp3DSphereObjectAttrTokenMap(0L)
+ , mp3DSceneShapeAttrTokenMap(0L)
+ , mp3DLightAttrTokenMap(0L)
+ , mpPathShapeAttrTokenMap(0L)
+ , mpPolygonShapeAttrTokenMap(0L)
+ , msStartShape(RTL_CONSTASCII_USTRINGPARAM("StartShape"))
+ , msEndShape(RTL_CONSTASCII_USTRINGPARAM("EndShape"))
+ , msStartGluePointIndex(RTL_CONSTASCII_USTRINGPARAM("StartGluePointIndex"))
+ , msEndGluePointIndex(RTL_CONSTASCII_USTRINGPARAM("EndGluePointIndex"))
+ , mrImporter( rImporter )
{
mpImpl = new XMLShapeImportHelperImpl();
mpImpl->mpSortContext = 0;
@@ -472,7 +461,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetGraphicObjectShapeAttrTokenMap()
SvXMLImportContext* XMLShapeImportHelper::Create3DSceneChildContext(
SvXMLImport& rImport,
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
@@ -488,39 +477,39 @@ SvXMLImportContext* XMLShapeImportHelper::Create3DSceneChildContext(
{
const OUString& rAttrName = xAttrList->getNameByIndex(a);
OUString aLocalName;
- sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName(rAttrName, &aLocalName);
+ rImport.GetNamespaceMap().GetKeyByAttrName(rAttrName, &aLocalName);
}
- switch(rTokenMap.Get(nPrefix, rLocalName))
+ switch(rTokenMap.Get(nInPrefix, rLocalName))
{
case XML_TOK_3DSCENE_3DSCENE:
{
// dr3d:3dscene inside dr3d:3dscene context
- pContext = new SdXML3DSceneShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes);
+ pContext = new SdXML3DSceneShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes);
break;
}
case XML_TOK_3DSCENE_3DCUBE:
{
// dr3d:3dcube inside dr3d:3dscene context
- pContext = new SdXML3DCubeObjectShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes);
+ pContext = new SdXML3DCubeObjectShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes);
break;
}
case XML_TOK_3DSCENE_3DSPHERE:
{
// dr3d:3dsphere inside dr3d:3dscene context
- pContext = new SdXML3DSphereObjectShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes);
+ pContext = new SdXML3DSphereObjectShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes);
break;
}
case XML_TOK_3DSCENE_3DLATHE:
{
// dr3d:3dlathe inside dr3d:3dscene context
- pContext = new SdXML3DLatheObjectShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes);
+ pContext = new SdXML3DLatheObjectShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes);
break;
}
case XML_TOK_3DSCENE_3DEXTRUDE:
{
// dr3d:3dextrude inside dr3d:3dscene context
- pContext = new SdXML3DExtrudeObjectShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes);
+ pContext = new SdXML3DExtrudeObjectShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes);
break;
}
}
@@ -532,10 +521,10 @@ SvXMLImportContext* XMLShapeImportHelper::Create3DSceneChildContext(
{
const OUString& rAttrName = xAttrList->getNameByIndex(a);
OUString aLocalName;
- sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName(rAttrName, &aLocalName);
+ sal_uInt16 nLclPrefix = rImport.GetNamespaceMap().GetKeyByAttrName(rAttrName, &aLocalName);
const OUString aValue( xAttrList->getValueByIndex(a) );
- pContext->processAttribute( nPrefix, aLocalName, aValue );
+ pContext->processAttribute( nLclPrefix, aLocalName, aValue );
}
return pContext;
@@ -561,7 +550,7 @@ void XMLShapeImportHelper::SetAutoStylesContext(SvXMLStylesContext* pNew)
SvXMLImportContext* XMLShapeImportHelper::CreateGroupChildContext(
SvXMLImport& rImport,
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes)
@@ -571,129 +560,129 @@ SvXMLImportContext* XMLShapeImportHelper::CreateGroupChildContext(
const SvXMLTokenMap& rTokenMap = GetGroupShapeElemTokenMap();
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
- switch(rTokenMap.Get(nPrefix, rLocalName))
+ switch(rTokenMap.Get(nInPrefix, rLocalName))
{
case XML_TOK_GROUP_GROUP:
{
// draw:g inside group context (RECURSIVE)
- pContext = new SdXMLGroupShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes);
+ pContext = new SdXMLGroupShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes);
break;
}
case XML_TOK_GROUP_3DSCENE:
{
// dr3d:3dscene inside group context
- pContext = new SdXML3DSceneShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes);
+ pContext = new SdXML3DSceneShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes);
break;
}
case XML_TOK_GROUP_RECT:
{
// draw:rect inside group context
- pContext = new SdXMLRectShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLRectShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_GROUP_LINE:
{
// draw:line inside group context
- pContext = new SdXMLLineShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLLineShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_GROUP_CIRCLE:
case XML_TOK_GROUP_ELLIPSE:
{
// draw:circle or draw:ellipse inside group context
- pContext = new SdXMLEllipseShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLEllipseShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_GROUP_POLYGON:
case XML_TOK_GROUP_POLYLINE:
{
// draw:polygon or draw:polyline inside group context
- pContext = new SdXMLPolygonShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes,
- rTokenMap.Get(nPrefix, rLocalName) == XML_TOK_GROUP_POLYGON ? TRUE : FALSE );
+ pContext = new SdXMLPolygonShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes,
+ rTokenMap.Get(nInPrefix, rLocalName) == XML_TOK_GROUP_POLYGON ? TRUE : FALSE );
break;
}
case XML_TOK_GROUP_PATH:
{
// draw:path inside group context
- pContext = new SdXMLPathShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes);
+ pContext = new SdXMLPathShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes);
break;
}
case XML_TOK_GROUP_TEXT_BOX:
{
// text:text-box inside group context
- pContext = new SdXMLTextBoxShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLTextBoxShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_GROUP_CONTROL:
{
// draw:control inside group context
- pContext = new SdXMLControlShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLControlShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_GROUP_CONNECTOR:
{
// draw:connector inside group context
- pContext = new SdXMLConnectorShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLConnectorShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_GROUP_MEASURE:
{
// draw:measure inside group context
- pContext = new SdXMLMeasureShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLMeasureShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_GROUP_PAGE:
{
// draw:page inside group context
- pContext = new SdXMLPageShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLPageShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_GROUP_CAPTION:
{
// draw:caption inside group context
- pContext = new SdXMLCaptionShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLCaptionShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_GROUP_CHART:
{
// chart:chart inside group context
- pContext = new SdXMLChartShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLChartShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_GROUP_IMAGE:
{
// office:image inside group context
- pContext = new SdXMLGraphicObjectShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLGraphicObjectShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_GROUP_OBJECT:
case XML_TOK_GROUP_OBJECT_OLE:
{
// draw:object or draw:object_ole
- pContext = new SdXMLObjectShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLObjectShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_GROUP_PLUGIN:
{
// draw:plugin
- pContext = new SdXMLPluginShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLPluginShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_GROUP_FRAME:
{
// draw:frame
- pContext = new SdXMLFrameShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLFrameShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes );
break;
}
case XML_TOK_GROUP_APPLET:
{
// draw:applet
- pContext = new SdXMLAppletShapeContext( rImport, nPrefix, rLocalName, xAttrList, rShapes );
+ pContext = new SdXMLAppletShapeContext( rImport, nInPrefix, rLocalName, xAttrList, rShapes );
break;
}
// add other shapes here...
default:
- return new SvXMLImportContext( rImport, nPrefix, rLocalName );
+ return new SvXMLImportContext( rImport, nInPrefix, rLocalName );
}
// now parse the attribute list and call the child context for each unknown attribute
@@ -701,10 +690,10 @@ SvXMLImportContext* XMLShapeImportHelper::CreateGroupChildContext(
{
const OUString& rAttrName = xAttrList->getNameByIndex(a);
OUString aLocalName;
- sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName(rAttrName, &aLocalName);
+ sal_uInt16 nLclPrefix = rImport.GetNamespaceMap().GetKeyByAttrName(rAttrName, &aLocalName);
const OUString aValue( xAttrList->getValueByIndex(a) );
- pContext->processAttribute( nPrefix, aLocalName, aValue );
+ pContext->processAttribute( nLclPrefix, aLocalName, aValue );
}
return pContext;
@@ -715,7 +704,7 @@ SvXMLImportContext* XMLShapeImportHelper::CreateGroupChildContext(
shape to the given XShapes.
*/
void XMLShapeImportHelper::addShape( uno::Reference< drawing::XShape >& rShape,
- const uno::Reference< xml::sax::XAttributeList >& xAttrList,
+ const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/,
uno::Reference< drawing::XShapes >& rShapes)
{
if( rShape.is() && rShapes.is() )
@@ -730,9 +719,9 @@ void XMLShapeImportHelper::addShape( uno::Reference< drawing::XShape >& rShape,
all properties and styles are set.
*/
void XMLShapeImportHelper::finishShape(
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rShape,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rShapes)
+ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& /*rShape*/,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& /*xAttrList*/,
+ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& /*rShapes*/)
{
}
@@ -902,7 +891,7 @@ void XMLShapeImportHelper::popGroupAndSort()
delete pContext;
}
-void XMLShapeImportHelper::shapeWithZIndexAdded( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rShape, sal_Int32 nZIndex )
+void XMLShapeImportHelper::shapeWithZIndexAdded( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& /*rShape*/, sal_Int32 nZIndex )
{
if( mpImpl->mpSortContext )
{
@@ -910,8 +899,6 @@ void XMLShapeImportHelper::shapeWithZIndexAdded( ::com::sun::star::uno::Referenc
aNewHint.nIs = mpImpl->mpSortContext->mnCurrentZ++;
aNewHint.nShould = nZIndex;
- sal_Int32 nInsertIndex = 0;
-
if( nZIndex == -1 )
{
// don't care, so add to unsorted list
@@ -1056,9 +1043,8 @@ void XMLShapeImportHelper::startPage( ::com::sun::star::uno::Reference< ::com::s
}
/** this method must be calling after the last shape is imported for the given page */
-void XMLShapeImportHelper::endPage( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rShapes )
+void XMLShapeImportHelper::endPage( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& /*rShapes*/ )
{
- DBG_ASSERT( mpPageContext && (mpPageContext->mxShapes == rShapes), "wrong call to endPage(), no startPage called or wrong page" );
if( NULL == mpPageContext )
return;
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_ximppage.cxx b/binfilter/bf_xmloff/source/draw/xmloff_ximppage.cxx
index 78f99a1..5894b1c 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_ximppage.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_ximppage.cxx
@@ -52,11 +52,11 @@ using namespace ::binfilter::xmloff::token;
TYPEINIT1( SdXMLGenericPageContext, SvXMLImportContext );
SdXMLGenericPageContext::SdXMLGenericPageContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
USHORT nPrfx, const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList>& xAttrList,
+ const uno::Reference< xml::sax::XAttributeList>& /*xAttrList*/,
uno::Reference< drawing::XShapes >& rShapes)
-: SvXMLImportContext( rImport, nPrfx, rLocalName ),
+: SvXMLImportContext( rInImport, nPrfx, rLocalName ),
mxShapes( rShapes )
{
}
@@ -69,7 +69,7 @@ SdXMLGenericPageContext::~SdXMLGenericPageContext()
//////////////////////////////////////////////////////////////////////////////
-void SdXMLGenericPageContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
+void SdXMLGenericPageContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& /*xAttrList*/ )
{
GetImport().GetShapeImport()->pushGroupForSorting( mxShapes );
@@ -81,33 +81,33 @@ void SdXMLGenericPageContext::StartElement( const ::com::sun::star::uno::Referen
//////////////////////////////////////////////////////////////////////////////
-SvXMLImportContext* SdXMLGenericPageContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext* SdXMLGenericPageContext::CreateChildContext( USHORT nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext* pContext = 0L;
- if( nPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_ANIMATIONS ) )
+ if( nInPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_ANIMATIONS ) )
{
- pContext = new XMLAnimationsContext( GetImport(), nPrefix, rLocalName, xAttrList );
+ pContext = new XMLAnimationsContext( GetImport(), nInPrefix, rLocalName, xAttrList );
}
- else if( nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_FORMS ) )
+ else if( nInPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_FORMS ) )
{
#ifndef SVX_LIGHT
if( GetImport().IsFormsSupported() )
- pContext = GetImport().GetFormImport()->createOfficeFormsContext( GetImport(), nPrefix, rLocalName );
+ pContext = GetImport().GetFormImport()->createOfficeFormsContext( GetImport(), nInPrefix, rLocalName );
#endif
}
else
{
// call GroupChildContext function at common ShapeImport
pContext = GetImport().GetShapeImport()->CreateGroupChildContext(
- GetImport(), nPrefix, rLocalName, xAttrList, mxShapes);
+ GetImport(), nInPrefix, rLocalName, xAttrList, mxShapes);
}
// call parent when no own context was created
if(!pContext)
- pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
+ pContext = SvXMLImportContext::CreateChildContext(nInPrefix, rLocalName, xAttrList);
return pContext;
}
commit 68c521d7764376afa287a77027b22702158d1c34
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 24 16:39:07 2010 +0000
WaE: throw out some more warnings
diff --git a/binfilter/bf_xmloff/source/core/makefile.mk b/binfilter/bf_xmloff/source/core/makefile.mk
index ba8abdd..65e1ca7 100644
--- a/binfilter/bf_xmloff/source/core/makefile.mk
+++ b/binfilter/bf_xmloff/source/core/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
PRJNAME=binfilter
diff --git a/binfilter/bf_xmloff/source/core/xmloff_DocumentSettingsContext.cxx b/binfilter/bf_xmloff/source/core/xmloff_DocumentSettingsContext.cxx
index 2c8a70d..0bb8d54 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_DocumentSettingsContext.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_DocumentSettingsContext.cxx
@@ -288,11 +288,11 @@ SvXMLImportContext *CreateSettingsContext(SvXMLImport& rImport, USHORT nPrefix,
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
::rtl::OUString aLocalName;
- USHORT nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName(
+ USHORT nLclPrefix = rImport.GetNamespaceMap().GetKeyByAttrName(
sAttrName, &aLocalName );
::rtl::OUString sValue = xAttrList->getValueByIndex( i );
- if (nPrefix == XML_NAMESPACE_CONFIG)
+ if (nLclPrefix == XML_NAMESPACE_CONFIG)
{
if (IsXMLToken(aLocalName, XML_NAME))
rProp.Name = sValue;
@@ -320,9 +320,9 @@ SvXMLImportContext *CreateSettingsContext(SvXMLImport& rImport, USHORT nPrefix,
//=============================================================================
-XMLDocumentSettingsContext::XMLDocumentSettingsContext(SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
- const uno::Reference<xml::sax::XAttributeList>& xAttrList )
- : SvXMLImportContext( rImport, nPrfx, rLName )
+XMLDocumentSettingsContext::XMLDocumentSettingsContext(SvXMLImport& rInImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+ const uno::Reference<xml::sax::XAttributeList>& /*xAttrList*/ )
+ : SvXMLImportContext( rInImport, nPrfx, rLName )
{
// here are no attributes
}
@@ -331,7 +331,7 @@ XMLDocumentSettingsContext::~XMLDocumentSettingsContext()
{
}
-SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -343,31 +343,31 @@ SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( USHORT nPref
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- ::rtl::OUString aLocalName;
- USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
- sAttrName, &aLocalName );
+ ::rtl::OUString aLclLocalName;
+ USHORT nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
+ sAttrName, &aLclLocalName );
::rtl::OUString sValue = xAttrList->getValueByIndex( i );
- if (nPrefix == XML_NAMESPACE_CONFIG)
+ if (nLclPrefix == XML_NAMESPACE_CONFIG)
{
- if (IsXMLToken(aLocalName, XML_NAME))
+ if (IsXMLToken(aLclLocalName, XML_NAME))
sName = sValue;
}
}
- if (nPrefix == XML_NAMESPACE_CONFIG)
+ if (nInPrefix == XML_NAMESPACE_CONFIG)
{
if (IsXMLToken(rLocalName, XML_CONFIG_ITEM_SET))
{
if (IsXMLToken(sName, XML_VIEW_SETTINGS))
- pContext = new XMLConfigItemSetContext(GetImport(), nPrefix, rLocalName, xAttrList, aViewProps, NULL);
+ pContext = new XMLConfigItemSetContext(GetImport(), nInPrefix, rLocalName, xAttrList, aViewProps, NULL);
else if (IsXMLToken(sName, XML_CONFIGURATION_SETTINGS))
- pContext = new XMLConfigItemSetContext(GetImport(), nPrefix, rLocalName, xAttrList, aConfigProps, NULL);
+ pContext = new XMLConfigItemSetContext(GetImport(), nInPrefix, rLocalName, xAttrList, aConfigProps, NULL);
}
}
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
@@ -404,15 +404,13 @@ void XMLDocumentSettingsContext::EndElement()
//=============================================================================
-XMLConfigBaseContext::XMLConfigBaseContext(SvXMLImport& rImport, USHORT nPrfx,
+XMLConfigBaseContext::XMLConfigBaseContext(SvXMLImport& rInImport, USHORT nPrfx,
const ::rtl::OUString& rLName, ::com::sun::star::uno::Any& rTempAny,
XMLConfigBaseContext* pTempBaseContext)
- : SvXMLImportContext( rImport, nPrfx, rLName ),
- rAny(rTempAny),
- // #110680#
- //aProps(),
- aProps(rImport.getServiceFactory()),
+ : SvXMLImportContext( rInImport, nPrfx, rLName ),
+ aProps(rInImport.getServiceFactory()),
aProp(),
+ rAny(rTempAny),
pBaseContext(pTempBaseContext)
{
}
@@ -423,13 +421,13 @@ XMLConfigBaseContext::~XMLConfigBaseContext()
//=============================================================================
-XMLConfigItemSetContext::XMLConfigItemSetContext(SvXMLImport& rImport, USHORT nPrfx,
+XMLConfigItemSetContext::XMLConfigItemSetContext(SvXMLImport& rInImport, USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
- ::com::sun::star::uno::Any& rAny,
- XMLConfigBaseContext* pBaseContext)
- : XMLConfigBaseContext( rImport, nPrfx, rLName, rAny, pBaseContext )
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/,
+ ::com::sun::star::uno::Any& rInAny,
+ XMLConfigBaseContext* pInBaseContext)
+ : XMLConfigBaseContext( rInImport, nPrfx, rLName, rInAny, pInBaseContext )
{
// here are no attributes
}
@@ -438,12 +436,12 @@ XMLConfigItemSetContext::~XMLConfigItemSetContext()
{
}
-SvXMLImportContext *XMLConfigItemSetContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLConfigItemSetContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
- return CreateSettingsContext(GetImport(), nPrefix, rLocalName, xAttrList, aProp, this);
+ return CreateSettingsContext(GetImport(), nInPrefix, rLocalName, xAttrList, aProp, this);
}
void XMLConfigItemSetContext::EndElement()
@@ -455,32 +453,32 @@ void XMLConfigItemSetContext::EndElement()
//=============================================================================
-XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rInImport, USHORT nPrfx, const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList,
::com::sun::star::uno::Any& rTempAny,
const ::rtl::OUString& rTempItemName,
XMLConfigBaseContext* pTempBaseContext)
- : SvXMLImportContext(rImport, nPrfx, rLName),
- rAny(rTempAny),
- pBaseContext(pTempBaseContext),
+ : SvXMLImportContext(rInImport, nPrfx, rLName),
sType(),
sValue(),
- rItemName(rTempItemName)
+ rAny(rTempAny),
+ rItemName(rTempItemName),
+ pBaseContext(pTempBaseContext)
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- ::rtl::OUString aLocalName;
- USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
- sAttrName, &aLocalName );
- ::rtl::OUString sValue = xAttrList->getValueByIndex( i );
+ ::rtl::OUString aLclLocalName;
+ USHORT nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
+ sAttrName, &aLclLocalName );
+ ::rtl::OUString sLclValue = xAttrList->getValueByIndex( i );
- if (nPrefix == XML_NAMESPACE_CONFIG)
+ if (nLclPrefix == XML_NAMESPACE_CONFIG)
{
- if (IsXMLToken(aLocalName, XML_TYPE))
- sType = sValue;
+ if (IsXMLToken(aLclLocalName, XML_TYPE))
+ sType = sLclValue;
}
}
}
@@ -489,12 +487,12 @@ XMLConfigItemContext::~XMLConfigItemContext()
{
}
-SvXMLImportContext *XMLConfigItemContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLConfigItemContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/ )
{
- SvXMLImportContext* pContext = new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
+ SvXMLImportContext* pContext = new SvXMLImportContext(GetImport(), nInPrefix, rLocalName);
return pContext;
}
@@ -609,17 +607,17 @@ void XMLConfigItemContext::ManipulateConfigItem()
if( rItemName.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( "PrinterIndependentLayout" ) ) )
{
- ::rtl::OUString sValue;
- rAny >>= sValue;
+ ::rtl::OUString sLclValue;
+ rAny >>= sLclValue;
sal_Int16 nTmp = document::PrinterIndependentLayout::HIGH_RESOLUTION;
- if( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("enabled")) ||
- sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("low-resolution")) )
+ if( sLclValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("enabled")) ||
+ sLclValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("low-resolution")) )
{
nTmp = document::PrinterIndependentLayout::LOW_RESOLUTION;
}
- else if( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("disabled")) )
+ else if( sLclValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("disabled")) )
{
nTmp = document::PrinterIndependentLayout::DISABLED;
}
@@ -632,12 +630,12 @@ void XMLConfigItemContext::ManipulateConfigItem()
//=============================================================================
-XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rInImport, USHORT nPrfx, const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
- ::com::sun::star::uno::Any& rAny,
- XMLConfigBaseContext* pBaseContext)
- : XMLConfigBaseContext(rImport, nPrfx, rLName, rAny, pBaseContext)
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/,
+ ::com::sun::star::uno::Any& rInAny,
+ XMLConfigBaseContext* pInBaseContext)
+ : XMLConfigBaseContext(rInImport, nPrfx, rLName, rInAny, pInBaseContext)
{
}
@@ -645,12 +643,12 @@ XMLConfigItemMapNamedContext::~XMLConfigItemMapNamedContext()
{
}
-SvXMLImportContext *XMLConfigItemMapNamedContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLConfigItemMapNamedContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
- return CreateSettingsContext(GetImport(), nPrefix, rLocalName, xAttrList, aProp, this);
+ return CreateSettingsContext(GetImport(), nInPrefix, rLocalName, xAttrList, aProp, this);
}
void XMLConfigItemMapNamedContext::EndElement()
@@ -666,14 +664,14 @@ void XMLConfigItemMapNamedContext::EndElement()
//=============================================================================
-XMLConfigItemMapIndexedContext::XMLConfigItemMapIndexedContext(SvXMLImport& rImport, USHORT nPrfx,
+XMLConfigItemMapIndexedContext::XMLConfigItemMapIndexedContext(SvXMLImport& rInImport, USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
- ::com::sun::star::uno::Any& rAny,
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/,
+ ::com::sun::star::uno::Any& rInAny,
const ::rtl::OUString& rConfigItemName,
- XMLConfigBaseContext* pBaseContext)
- : XMLConfigBaseContext(rImport, nPrfx, rLName, rAny, pBaseContext),
+ XMLConfigBaseContext* pInBaseContext)
+ : XMLConfigBaseContext(rInImport, nPrfx, rLName, rInAny, pInBaseContext),
maConfigItemName( rConfigItemName )
{
}
@@ -682,12 +680,12 @@ XMLConfigItemMapIndexedContext::~XMLConfigItemMapIndexedContext()
{
}
-SvXMLImportContext *XMLConfigItemMapIndexedContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLConfigItemMapIndexedContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
- return CreateSettingsContext(GetImport(), nPrefix, rLocalName, xAttrList, aProp, this);
+ return CreateSettingsContext(GetImport(), nInPrefix, rLocalName, xAttrList, aProp, this);
}
void XMLConfigItemMapIndexedContext::EndElement()
@@ -715,12 +713,12 @@ void XMLConfigItemMapIndexedContext::EndElement()
uno::Reference< container::XIndexAccess > xIndex( aProps.GetIndexContainer(), uno::UNO_QUERY );
const sal_Int32 nCount = xIndex->getCount();
- uno::Sequence < beans::PropertyValue > aProps;
+ uno::Sequence < beans::PropertyValue > aLclProps;
for (sal_Int32 i = 0; i < nCount; i++)
{
- if ((xIndex->getByIndex( i ) >>= aProps) && (aProps.getLength() == XML_FORBIDDEN_CHARACTER_MAX ) )
+ if ((xIndex->getByIndex( i ) >>= aLclProps) && (aLclProps.getLength() == XML_FORBIDDEN_CHARACTER_MAX ) )
{
- beans::PropertyValue *pForChar = aProps.getArray();
+ beans::PropertyValue *pForChar = aLclProps.getArray();
i18n::ForbiddenCharacters aForbid;
lang::Locale aLocale;
const ::rtl::OUString sLanguage ( RTL_CONSTASCII_USTRINGPARAM ( "Language" ) );
@@ -786,7 +784,7 @@ void XMLConfigItemMapIndexedContext::EndElement()
uno::Reference< container::XIndexAccess > xIndex( aProps.GetIndexContainer(), uno::UNO_QUERY );
const sal_Int32 nCount = xIndex->getCount();
- uno::Sequence < beans::PropertyValue > aProps;
+ uno::Sequence < beans::PropertyValue > aLclProps;
uno::Sequence < formula::SymbolDescriptor > aSymbolList ( nCount );
formula::SymbolDescriptor *pDescriptor = aSymbolList.getArray();
@@ -805,13 +803,13 @@ void XMLConfigItemMapIndexedContext::EndElement()
for ( sal_Int32 i = 0; i < nCount; i++ )
{
- if ((xIndex->getByIndex( i ) >>= aProps) && (aProps.getLength() == XML_SYMBOL_DESCRIPTOR_MAX ) )
+ if ((xIndex->getByIndex( i ) >>= aLclProps) && (aLclProps.getLength() == XML_SYMBOL_DESCRIPTOR_MAX ) )
{
sal_Bool bHaveName = sal_False, bHaveExportName = sal_False, bHaveCharSet = sal_False,
bHaveFontName = sal_False, bHaveFamily = sal_False, bHavePitch = sal_False,
bHaveWeight = sal_False, bHaveItalic = sal_False, bHaveSymbolSet = sal_False,
bHaveCharacter = sal_False;
- beans::PropertyValue *pSymbol = aProps.getArray();
+ beans::PropertyValue *pSymbol = aLclProps.getArray();
for ( sal_Int32 j = 0 ; j < XML_SYMBOL_DESCRIPTOR_MAX ; j++ )
{
diff --git a/binfilter/bf_xmloff/source/core/xmloff_ProgressBarHelper.cxx b/binfilter/bf_xmloff/source/core/xmloff_ProgressBarHelper.cxx
index bce1bc5..5cd514c 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_ProgressBarHelper.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_ProgressBarHelper.cxx
@@ -45,16 +45,16 @@ const float fProgressStep = 0.5;
ProgressBarHelper::ProgressBarHelper(const ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator>& xTempStatusIndicator,
const sal_Bool bTempStrict)
- : fOldPercent(0.0),
- nRange(nDefaultProgressBarRange),
- xStatusIndicator(xTempStatusIndicator),
- nReference(100),
- nValue(0),
+ : xStatusIndicator(xTempStatusIndicator)
+ , nRange(nDefaultProgressBarRange)
+ , nReference(100)
+ , nValue(0)
+ , fOldPercent(0.0)
+ , bStrict(bTempStrict)
+ , bRepeat(sal_True)
#ifdef DBG_UTIL
- bFailure(sal_False),
+ , bFailure(sal_False)
#endif
- bStrict(bTempStrict),
- bRepeat(sal_True)
{
}
@@ -68,8 +68,6 @@ sal_Int32 ProgressBarHelper::ChangeReference(sal_Int32 nNewReference)
{
if (nReference)
{
- double fPercent(nNewReference / nReference);
- double fValue(nValue * fPercent);
nValue = sal_Int32(nValue);
nReference = nNewReference;
}
diff --git a/binfilter/bf_xmloff/source/core/xmloff_PropertySetMerger.cxx b/binfilter/bf_xmloff/source/core/xmloff_PropertySetMerger.cxx
index cfc42bf..d0537e1 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_PropertySetMerger.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_PropertySetMerger.cxx
@@ -82,9 +82,12 @@ public:
// --------------------------------------------------------------------
PropertySetMergerImpl::PropertySetMergerImpl( Reference< XPropertySet > rPropSet1, Reference< XPropertySet > rPropSet2 )
-: mxPropSet1( rPropSet1 ), mxPropSet2( rPropSet2 ),
- mxPropSet1State( rPropSet1, UNO_QUERY ), mxPropSet2State( rPropSet2, UNO_QUERY ),
- mxPropSet1Info( rPropSet1->getPropertySetInfo() ), mxPropSet2Info( rPropSet2->getPropertySetInfo() )
+ : mxPropSet1( rPropSet1 )
+ , mxPropSet1State( rPropSet1, UNO_QUERY )
+ , mxPropSet1Info( rPropSet1->getPropertySetInfo() )
+ , mxPropSet2( rPropSet2 )
+ , mxPropSet2State( rPropSet2, UNO_QUERY )
+ , mxPropSet2Info( rPropSet2->getPropertySetInfo() )
{
}
@@ -122,19 +125,19 @@ Any SAL_CALL PropertySetMergerImpl::getPropertyValue( const OUString& PropertyNa
}
}
-void SAL_CALL PropertySetMergerImpl::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+void SAL_CALL PropertySetMergerImpl::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
}
-void SAL_CALL PropertySetMergerImpl::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+void SAL_CALL PropertySetMergerImpl::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
}
-void SAL_CALL PropertySetMergerImpl::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+void SAL_CALL PropertySetMergerImpl::addVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
}
-void SAL_CALL PropertySetMergerImpl::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+void SAL_CALL PropertySetMergerImpl::removeVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
}
diff --git a/binfilter/bf_xmloff/source/core/xmloff_SettingsExportHelper.cxx b/binfilter/bf_xmloff/source/core/xmloff_SettingsExportHelper.cxx
index 5f1affb..2ff9d65 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_SettingsExportHelper.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_SettingsExportHelper.cxx
@@ -86,7 +86,7 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny,
break;
case uno::TypeClass_BYTE:
{
- sal_Int8 nInt8;
+ sal_Int8 nInt8(0);
aAny >>= nInt8;
exportByte(nInt8, rName);
}
diff --git a/binfilter/bf_xmloff/source/core/xmloff_XMLBase64ImportContext.cxx b/binfilter/bf_xmloff/source/core/xmloff_XMLBase64ImportContext.cxx
index dfc3187..172ffba 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_XMLBase64ImportContext.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_XMLBase64ImportContext.cxx
@@ -46,10 +46,10 @@ TYPEINIT1( XMLBase64ImportContext, SvXMLImportContext );
XMLBase64ImportContext::XMLBase64ImportContext(
- SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName,
- const Reference< XAttributeList >& xAttrList,
+ SvXMLImport& rInImport, USHORT nPrfx, const OUString& rLName,
+ const Reference< XAttributeList >& /*xAttrList*/,
const Reference< XOutputStream >& rOut ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
xOut( rOut )
{
}
diff --git a/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectExportFilter.cxx b/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectExportFilter.cxx
index d7f894a..116ddac 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectExportFilter.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectExportFilter.cxx
@@ -163,7 +163,7 @@ OUString SAL_CALL XMLEmbeddedObjectExportFilter::getImplementationName()
return aStr;
}
-sal_Bool SAL_CALL XMLEmbeddedObjectExportFilter::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL XMLEmbeddedObjectExportFilter::supportsService( const OUString& /*ServiceName*/ )
throw(RuntimeException)
{
return sal_False;
diff --git a/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx b/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx
index 4a17c1c..657a164 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx
@@ -102,10 +102,10 @@ public:
TYPEINIT1( XMLEmbeddedObjectImportContext_Impl, SvXMLImportContext );
XMLEmbeddedObjectImportContext_Impl::XMLEmbeddedObjectImportContext_Impl(
- SvXMLImport& rImport, USHORT nPrfx,
+ SvXMLImport& rInImport, USHORT nPrfx,
const OUString& rLName,
const Reference< XDocumentHandler >& rHandler ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
xHandler( rHandler )
{
}
@@ -115,12 +115,12 @@ XMLEmbeddedObjectImportContext_Impl::~XMLEmbeddedObjectImportContext_Impl()
}
SvXMLImportContext *XMLEmbeddedObjectImportContext_Impl::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLocalName,
- const Reference< XAttributeList >& xAttrList )
+ const Reference< XAttributeList >& /*xAttrList*/ )
{
return new XMLEmbeddedObjectImportContext_Impl( GetImport(),
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
xHandler );
}
@@ -175,9 +175,9 @@ sal_Bool XMLEmbeddedObjectImportContext::SetComponent(
}
XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
- SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName,
+ SvXMLImport& rInImport, USHORT nPrfx, const OUString& rLName,
const Reference< XAttributeList >& xAttrList ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
// #i55761#
bNeedToUnlockControllers(false)
{
@@ -198,10 +198,10 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName );
- if( nPrefix == XML_NAMESPACE_OFFICE &&
- IsXMLToken( aLocalName, XML_CLASS ) )
+ OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLclLocalName );
+ if( nLclPrefix == XML_NAMESPACE_OFFICE &&
+ IsXMLToken( aLclLocalName, XML_CLASS ) )
{
sClass = xAttrList->getValueByIndex( i );
break;
@@ -245,15 +245,15 @@ XMLEmbeddedObjectImportContext::~XMLEmbeddedObjectImportContext()
}
SvXMLImportContext *XMLEmbeddedObjectImportContext::CreateChildContext(
- USHORT nPrefix, const OUString& rLocalName,
- const Reference< XAttributeList >& xAttrList )
+ USHORT nInPrefix, const OUString& rLocalName,
+ const Reference< XAttributeList >& /*xAttrList*/ )
{
if( xHandler.is() )
return new XMLEmbeddedObjectImportContext_Impl( GetImport(),
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
xHandler );
else
- return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ return new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
void XMLEmbeddedObjectImportContext::StartElement(
diff --git a/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx b/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx
index 0951103..5561781 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx
@@ -95,28 +95,28 @@ SvXMLAttributeList::SvXMLAttributeList( const uno::Reference<
OUString SAL_CALL SvXMLAttributeList::getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException )
{
- if( i < m_pImpl->vecAttribute.size() ) {
+ if( i < static_cast<sal_Int16>(m_pImpl->vecAttribute.size()) ) {
return m_pImpl->vecAttribute[i].sName;
}
return OUString();
}
-OUString SAL_CALL SvXMLAttributeList::getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException )
+OUString SAL_CALL SvXMLAttributeList::getTypeByIndex(sal_Int16 /*i*/) throw( ::com::sun::star::uno::RuntimeException )
{
return sType;
}
OUString SAL_CALL SvXMLAttributeList::getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException )
{
- if( i < m_pImpl->vecAttribute.size() ) {
+ if( i < static_cast<sal_Int16>(m_pImpl->vecAttribute.size()) ) {
return m_pImpl->vecAttribute[i].sValue;
}
return OUString();
}
-OUString SAL_CALL SvXMLAttributeList::getTypeByName( const OUString& sName ) throw( ::com::sun::star::uno::RuntimeException )
+OUString SAL_CALL SvXMLAttributeList::getTypeByName( const OUString& /*sName*/ ) throw( ::com::sun::star::uno::RuntimeException )
{
return sType;
}
diff --git a/binfilter/bf_xmloff/source/core/xmloff_facreg.cxx b/binfilter/bf_xmloff/source/core/xmloff_facreg.cxx
index 1a0e63d..9f7eba9 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_facreg.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_facreg.cxx
@@ -212,7 +212,7 @@ extern "C"
{
#endif
-void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
+void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -227,7 +227,7 @@ void SAL_CALL writeInfo( registry::XRegistryKey * pRegistryKey, const OUString&
xNewKey->createKey( rServices.getConstArray()[i]);
}
-sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey )
+sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey )
{
if( pRegistryKey )
{
@@ -307,7 +307,7 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK
return sal_True;
}
-void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
if( pServiceManager )
diff --git a/binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx b/binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx
index 8789bdc..93423a8 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx
@@ -278,13 +278,13 @@ sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName,
if( pLocalName )
*pLocalName = pEntry->sName;
- NameSpaceHash::const_iterator aIter = aNameHash.find( pEntry->sPrefix );
- if ( aIter != aNameHash.end() )
+ NameSpaceHash::const_iterator aLclIter = aNameHash.find( pEntry->sPrefix );
+ if ( aLclIter != aNameHash.end() )
{
// found: retrieve namespace key
- nKey = pEntry->nKey = (*aIter).second->nKey;
+ nKey = pEntry->nKey = (*aLclIter).second->nKey;
if ( pNamespace )
- *pNamespace = (*aIter).second->sName;
+ *pNamespace = (*aLclIter).second->sName;
}
else if ( pEntry->sPrefix == sXMLNS )
// not found, but xmlns prefix: return xmlns 'namespace'
@@ -313,7 +313,7 @@ sal_uInt16 SvXMLNamespaceMap::GetNextKey( sal_uInt16 nLastKey ) const
// All methods after this are deprecated...
-sal_Bool SvXMLNamespaceMap::AddAtIndex( sal_uInt16 nIdx, const OUString& rPrefix,
+sal_Bool SvXMLNamespaceMap::AddAtIndex( sal_uInt16 /*nIdx*/, const OUString& rPrefix,
const OUString& rName, sal_uInt16 nKey )
{
sal_Bool bRet = sal_False;
@@ -366,7 +366,7 @@ sal_uInt16 SvXMLNamespaceMap::GetIndexByPrefix( const OUString& rPrefix ) const
sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName(
const OUString& rAttrName,
OUString *pLocalName,
- sal_uInt16 nIdxGuess) const
+ sal_uInt16 /*nIdxGuess*/) const
{
return _GetKeyByAttrName( rAttrName, 0, pLocalName, 0 );
}
@@ -375,7 +375,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName( const OUString& rAttrName,
OUString *pPrefix,
OUString *pLocalName,
OUString *pNamespace,
- USHORT nIdxGuess ) const
+ USHORT /*nIdxGuess*/ ) const
{
return _GetKeyByAttrName ( rAttrName, pPrefix, pLocalName, pNamespace );
}
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmlerror.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmlerror.cxx
index 17766e3..2987df1 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmlerror.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmlerror.cxx
@@ -91,12 +91,12 @@ ErrorRecord::ErrorRecord( sal_Int32 nID, const Sequence<OUString>& rParams,
const OUString& rExceptionMessage, sal_Int32 nRowNumber, sal_Int32 nCol,
const OUString& rPublicId, const OUString& rSystemId) :
nId(nID),
- aParams(rParams),
sExceptionMessage(rExceptionMessage),
nRow(nRowNumber),
nColumn(nCol),
sPublicId(rPublicId),
- sSystemId(rSystemId)
+ sSystemId(rSystemId),
+ aParams(rParams)
{
}
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx
index eda9326..6bdc865 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx
@@ -153,7 +153,7 @@ SvXMLExportEventListener::~SvXMLExportEventListener()
}
// XEventListener
-void SAL_CALL SvXMLExportEventListener::disposing( const lang::EventObject& rEventObject )
+void SAL_CALL SvXMLExportEventListener::disposing( const lang::EventObject& /*rEventObject*/ )
throw(uno::RuntimeException)
{
if (pExport)
@@ -231,25 +231,25 @@ SvXMLExport::SvXMLExport(
: pImpl( 0 ),
// #110680#
mxServiceFactory(xServiceFactory),
- meClass( eClass ),
- sWS( GetXMLToken(XML_WS) ),
+ pAttrList( new SvXMLAttributeList ),
pNamespaceMap( new SvXMLNamespaceMap ),
// #110680#
// pUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, eDfltUnit ) ),
pUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, eDfltUnit, getServiceFactory() ) ),
- pAttrList( new SvXMLAttributeList ),
- bExtended( sal_False ),
pNumExport(0L),
pProgressBarHelper( NULL ),
pEventExport( NULL ),
pImageMapExport( NULL ),
- pEventListener( NULL ),
pXMLErrors( NULL ),
- bSaveLinkedSections(sal_True),
+ pEventListener( NULL ),
+ bExtended( sal_False ),
+ meClass( eClass ),
mnExportFlags( nExportFlags ),
- mnErrorFlags( ERROR_NO )
+ mnErrorFlags( ERROR_NO ),
+ sWS( GetXMLToken(XML_WS) ),
+ bSaveLinkedSections(sal_True)
{
DBG_ASSERT( mxServiceFactory.is(), "got no service manager" );
_InitCtor();
@@ -382,7 +382,7 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo
sal_Int32 nIndex;
OUString aURL;
- for( nIndex = 0; nIndex < nCount; nIndex++, *pPrefix++ )
+ for( nIndex = 0; nIndex < nCount; nIndex++, pPrefix++ )
{
if( xNamespaceMap->getByName( *pPrefix ) >>= aURL )
_GetNamespaceMap().Add( *pPrefix, aURL, XML_NAMESPACE_UNKNOWN );
@@ -520,7 +520,7 @@ void SAL_CALL SvXMLExport::cancel() throw(uno::RuntimeException)
return sFilterName;
}
-void SAL_CALL SvXMLExport::setName( const ::rtl::OUString& aName )
+void SAL_CALL SvXMLExport::setName( const ::rtl::OUString& /*aName*/ )
throw (::com::sun::star::uno::RuntimeException)
{
// do nothing, because it is not possible to set the FilterName
@@ -549,7 +549,6 @@ uno::Sequence< OUString > SAL_CALL SvXMLExport::getSupportedServiceNames( )
throw(uno::RuntimeException)
{
uno::Sequence<OUString> aSeq(2);
- OUString* pSeq = aSeq.getArray();
aSeq[0] = OUString(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter"));
aSeq[1] = OUString(
@@ -661,7 +660,7 @@ void SvXMLExport::ImplExportSettings()
}
}
-void SvXMLExport::ImplExportStyles( sal_Bool bUsed )
+void SvXMLExport::ImplExportStyles( sal_Bool /*bUsed*/ )
{
CheckAttrList();
@@ -675,7 +674,7 @@ void SvXMLExport::ImplExportStyles( sal_Bool bUsed )
}
}
-void SvXMLExport::ImplExportAutoStyles( sal_Bool bUsed )
+void SvXMLExport::ImplExportAutoStyles( sal_Bool /*bUsed*/ )
{
// <style:automatic-styles>
SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES,
@@ -684,7 +683,7 @@ void SvXMLExport::ImplExportAutoStyles( sal_Bool bUsed )
_ExportAutoStyles();
}
-void SvXMLExport::ImplExportMasterStyles( sal_Bool bUsed )
+void SvXMLExport::ImplExportMasterStyles( sal_Bool /*bUsed*/ )
{
// <style:master-styles>
SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_MASTER_STYLES,
@@ -922,7 +921,7 @@ void SvXMLExport::_ExportScripts()
{
::rtl::OUString aValue( RTL_CONSTASCII_USTRINGPARAM( "Basic" ) );
AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, aValue );
- SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_SCRIPT_DATA, sal_True, sal_True );
+ SvXMLElementExport aLclElem( *this, XML_NAMESPACE_OFFICE, XML_SCRIPT_DATA, sal_True, sal_True );
Reference< document::XExporter > xExporter;
Reference< lang::XMultiServiceFactory > xMSF( getServiceFactory() );
@@ -963,7 +962,7 @@ void SvXMLExport::_ExportFontDecls()
mxFontAutoStylePool->exportXML();
}
-void SvXMLExport::_ExportStyles( sal_Bool bUsed )
+void SvXMLExport::_ExportStyles( sal_Bool /*bUsed*/ )
{
uno::Reference< lang::XMultiServiceFactory > xFact( GetModel(), uno::UNO_QUERY );
if( xFact.is())
@@ -1191,15 +1190,15 @@ xmloff::OFormLayerXMLExport* SvXMLExport::CreateFormExport()
return new xmloff::OFormLayerXMLExport(*this);
}
-void SvXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& aProps)
+void SvXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& /*aProps*/)
{
}
-void SvXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& aProps)
+void SvXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& /*aProps*/)
{
}
-void SvXMLExport::addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat )
+void SvXMLExport::addDataStyle(const sal_Int32 nNumberFormat, sal_Bool /*bTimeFormat*/ )
{
if(pNumExport)
pNumExport->SetUsed(nNumberFormat);
@@ -1220,7 +1219,7 @@ void SvXMLExport::exportAutoDataStyles()
mxFormExport->exportAutoControlNumberStyles();
}
-OUString SvXMLExport::getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat ) const
+OUString SvXMLExport::getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool /*bTimeFormat*/ ) const
{
OUString sTemp;
if(pNumExport)
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmlictxt.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmlictxt.cxx
index 4c4a1ac..0a5875f 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmlictxt.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmlictxt.cxx
@@ -50,11 +50,11 @@ SvXMLImportContext::~SvXMLImportContext()
{
}
-SvXMLImportContext *SvXMLImportContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SvXMLImportContext::CreateChildContext( USHORT nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
- return rImport.CreateContext( nPrefix, rLocalName, xAttrList );
+ return rImport.CreateContext( nInPrefix, rLocalName, xAttrList );
}
void SvXMLImportContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& )
@@ -65,7 +65,7 @@ void SvXMLImportContext::EndElement()
{
}
-void SvXMLImportContext::Characters( const OUString& rChars )
+void SvXMLImportContext::Characters( const OUString& /*rChars*/ )
{
}
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx
index bfe8193..b418a35 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx
@@ -131,7 +131,7 @@ SvXMLImportEventListener::~SvXMLImportEventListener()
}
// XEventListener
-void SAL_CALL SvXMLImportEventListener::disposing( const lang::EventObject& rEventObject )
+void SAL_CALL SvXMLImportEventListener::disposing( const lang::EventObject& /*rEventObject*/ )
throw(uno::RuntimeException)
{
if (pImport)
@@ -166,7 +166,7 @@ SV_IMPL_PTRARR( SvXMLImportContexts_Impl, SvXMLImportContextPtr )
SvXMLImportContext *SvXMLImport::CreateContext( USHORT nPrefix,
const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList >& xAttrList )
+ const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/ )
{
return new SvXMLImportContext( *this, nPrefix, rLocalName );
}
@@ -263,23 +263,18 @@ void SvXMLImport::_InitCtor()
SvXMLImport::SvXMLImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
sal_uInt16 nImportFlags ) throw ()
-: pImpl( new SvXMLImport_Impl() ),
- // #110680#
- mxServiceFactory(xServiceFactory),
- pNamespaceMap( new SvXMLNamespaceMap ),
-
- // #110680#
- // pUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, MAP_100TH_MM ) ),
- pUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, MAP_100TH_MM, getServiceFactory() ) ),
-
- pContexts( new SvXMLImportContexts_Impl ),
- pNumImport( NULL ),
- pProgressBarHelper( NULL ),
- pEventImportHelper( NULL ),
- pEventListener( NULL ),
- pXMLErrors( NULL ),
- mnImportFlags( nImportFlags ),
- mbIsFormsSupported( sal_True )
+ : pImpl( new SvXMLImport_Impl() )
+ , mxServiceFactory(xServiceFactory)
+ , pNamespaceMap( new SvXMLNamespaceMap )
+ , pUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, MAP_100TH_MM, getServiceFactory() ) )
+ , pContexts( new SvXMLImportContexts_Impl )
+ , pNumImport( NULL )
+ , pProgressBarHelper( NULL )
+ , pEventImportHelper( NULL )
+ , pXMLErrors( NULL )
+ , pEventListener( NULL )
+ , mnImportFlags( nImportFlags )
+ , mbIsFormsSupported( sal_True )
{
DBG_ASSERT( mxServiceFactory.is(), "got no service manager" );
_InitCtor();
@@ -568,6 +563,8 @@ void SAL_CALL SvXMLImport::endElement( const OUString& rName )
"SvXMLImport::endElement: popped context has wrong prefix" );
DBG_ASSERT( pContext->GetLocalName() == aLocalName,
"SvXMLImport::endElement: popped context has wrong lname" );
+#else
+ (void)rName;
#endif
// Call a EndElement at the current context.
@@ -599,13 +596,13 @@ void SAL_CALL SvXMLImport::characters( const OUString& rChars )
}
}
-void SAL_CALL SvXMLImport::ignorableWhitespace( const OUString& rWhitespaces )
+void SAL_CALL SvXMLImport::ignorableWhitespace( const OUString& /*rWhitespaces*/ )
throw(xml::sax::SAXException, uno::RuntimeException)
{
}
-void SAL_CALL SvXMLImport::processingInstruction( const OUString& rTarget,
- const OUString& rData )
+void SAL_CALL SvXMLImport::processingInstruction( const OUString& /*rTarget*/,
+ const OUString& /*rData*/ )
throw(xml::sax::SAXException, uno::RuntimeException)
{
}
@@ -625,7 +622,7 @@ void SAL_CALL SvXMLImport::endCDATA( void ) throw(uno::RuntimeException)
{
}
-void SAL_CALL SvXMLImport::comment( const OUString& rComment )
+void SAL_CALL SvXMLImport::comment( const OUString& /*rComment*/ )
throw(xml::sax::SAXException, uno::RuntimeException)
{
}
@@ -635,12 +632,12 @@ void SAL_CALL SvXMLImport::allowLineBreak( void )
{
}
-void SAL_CALL SvXMLImport::unknown( const OUString& sString )
+void SAL_CALL SvXMLImport::unknown( const OUString& /*sString*/ )
throw(xml::sax::SAXException, uno::RuntimeException)
{
}
-void SvXMLImport::SetStatisticAttributes(const uno::Reference< xml::sax::XAttributeList > & xAttribs)
+void SvXMLImport::SetStatisticAttributes(const uno::Reference< xml::sax::XAttributeList > & /*xAttribs*/)
{
GetProgressBarHelper()->SetRepeat(sal_False);
GetProgressBarHelper()->SetReference(0);
@@ -670,7 +667,7 @@ void SAL_CALL SvXMLImport::setTargetDocument( const uno::Reference< lang::XCompo
}
// XFilter
-sal_Bool SAL_CALL SvXMLImport::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor )
+sal_Bool SAL_CALL SvXMLImport::filter( const uno::Sequence< beans::PropertyValue >& /*aDescriptor*/ )
throw (uno::RuntimeException)
{
return sal_False;
@@ -750,7 +747,6 @@ uno::Sequence< OUString > SAL_CALL SvXMLImport::getSupportedServiceNames( )
throw(uno::RuntimeException)
{
uno::Sequence<OUString> aSeq(2);
- OUString* pSeq = aSeq.getArray();
aSeq[0] = OUString(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportFilter"));
aSeq[1] = OUString(
@@ -1017,11 +1013,11 @@ Reference < XOutputStream > SvXMLImport::ResolveEmbeddedObjectURLFromBase64(
return xOLEStream;
}
-void SvXMLImport::SetViewSettings(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aViewProps)
+void SvXMLImport::SetViewSettings(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& /*aViewProps*/)
{
}
-void SvXMLImport::SetConfigurationSettings(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aConfigProps)
+void SvXMLImport::SetConfigurationSettings(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& /*aConfigProps*/)
{
}
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
index af29a7a..044fc63 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
@@ -593,7 +593,7 @@ void SvXMLUnitConverter::convertNumber( OUStringBuffer& rBuffer,
/** convert string to number with optional min and max values */
sal_Bool SvXMLUnitConverter::convertNumber( sal_Int32& rValue,
const OUString& rString,
- sal_Int32 nMin, sal_Int32 nMax )
+ sal_Int32 /*nMin*/, sal_Int32 /*nMax*/ )
{
sal_Bool bNeg = sal_False;
rValue = 0;
@@ -999,10 +999,10 @@ void SvXMLUnitConverter::convertDateTime( ::rtl::OUStringBuffer& rBuffer,
fCount = 0.0;
sal_Int16 nCount = sal_Int16(fCount);
sal_Bool bHasTime(sal_False);
- double fHoursValue;
- double fMinsValue;
- double fSecsValue;
- double f100SecsValue;
+ double fHoursValue(0.0);
+ double fMinsValue(0.0);
+ double fSecsValue(0.0);
+ double f100SecsValue(0.0);
if (fValue > 0.0)
{
bHasTime = sal_True;
@@ -1558,7 +1558,10 @@ void SvXMLUnitConverter::encodeBase64( ::rtl::OUStringBuffer& aStrBuffer, const
void SvXMLUnitConverter::decodeBase64(uno::Sequence<sal_Int8>& aBuffer, const ::rtl::OUString& sBuffer)
{
- sal_Int32 nCharsDecoded = decodeBase64SomeChars( aBuffer, sBuffer );
+#if OSL_DEBUG_LEVEL > 0
+ sal_Int32 nCharsDecoded =
+#endif
+ decodeBase64SomeChars( aBuffer, sBuffer );
OSL_ENSURE( nCharsDecoded == sBuffer.getLength(),
"some bytes left in base64 decoding!" );
}
More information about the Libreoffice-commits
mailing list