diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-10-13 22:35:08 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2012-10-13 22:35:23 +0200 |
commit | 7518af82eb4b46355ba9a4f7278bac206e3fb360 (patch) | |
tree | dc5381e860d41af75551da262dd2167bcf51bc51 /oox | |
parent | cppuhelper: remove obsolete comment (diff) | |
download | core-7518af82eb4b46355ba9a4f7278bac206e3fb360.tar.gz core-7518af82eb4b46355ba9a4f7278bac206e3fb360.zip |
oox: fix loplugin warnings
Change-Id: I73375f46d31ef7446b7c059aa2a23024e677021c
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/drawingml/fillpropertiesgroupcontext.cxx | 4 | ||||
-rw-r--r-- | oox/source/export/chartexport.cxx | 2 | ||||
-rw-r--r-- | oox/source/export/drawingml.cxx | 4 | ||||
-rw-r--r-- | oox/source/ole/axcontrol.cxx | 4 | ||||
-rw-r--r-- | oox/source/ppt/buildlistcontext.cxx | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx b/oox/source/drawingml/fillpropertiesgroupcontext.cxx index 5136d9efd054..ad928cd5980f 100644 --- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx +++ b/oox/source/drawingml/fillpropertiesgroupcontext.cxx @@ -167,8 +167,8 @@ BlipContext::BlipContext( ContextHandler& rParent, else if( aAttribs.hasAttribute( R_TOKEN( link ) ) ) { // external URL - OUString aRelId = aAttribs.getString( R_TOKEN( link ), OUString() ); - OUString aTargetLink = getFilter().getAbsoluteUrl( getRelations().getExternalTargetFromRelId( aRelId ) ); + // OUString aRelId = aAttribs.getString( R_TOKEN( link ), OUString() ); + // OUString aTargetLink = getFilter().getAbsoluteUrl( getRelations().getExternalTargetFromRelId( aRelId ) ); // TODO: load external picture } } diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 08cc68c29f9e..37abe5d0a04b 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -731,7 +731,7 @@ void ChartExport::_ExportContent() aAny >>= msChartAddress; //maExportHelper.SetChartRangeAddress( sChartAddress ); - OUString sTableNumberList; + // OUString sTableNumberList; aAny = xProp->getPropertyValue( OUString("TableNumberList")); aAny >>= msTableNumberList; diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index db61ef990d06..6cf226410c80 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -761,7 +761,7 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, sal_Bool bIs const char* typeface = NULL; const char* pitch = NULL; const char* charset = NULL; - OUString usTypeface, usPitch, usCharset; + OUString usTypeface; mAny >>= usTypeface; String aSubstName( GetSubsFontName( usTypeface, SUBSFONT_ONLYONE | SUBSFONT_MS ) ); @@ -781,7 +781,7 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, sal_Bool bIs const char* typeface = NULL; const char* pitch = NULL; const char* charset = NULL; - OUString usTypeface, usPitch, usCharset; + OUString usTypeface; mAny >>= usTypeface; String aSubstName( GetSubsFontName( usTypeface, SUBSFONT_ONLYONE | SUBSFONT_MS ) ); diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 9e70cfd5a38f..28b49bef5c07 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -1856,7 +1856,7 @@ void AxListBoxModel::convertFromProperties( PropertySet& rPropSet, const Control bool bRes = false; if ( rPropSet.getProperty( bRes, PROP_MultiSelection ) ) - rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); + rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); rConv.convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, mnSpecialEffect ); AxMorphDataModelBase::convertFromProperties( rPropSet, rConv ); @@ -2493,8 +2493,8 @@ HtmlTextBoxModel::HtmlTextBoxModel() bool HtmlTextBoxModel::importBinaryModel( BinaryInputStream& rInStrm ) { - OUString sStringContents = rInStrm.readUnicodeArray( rInStrm.size() ); #ifdef DEBUG + OUString sStringContents = rInStrm.readUnicodeArray( rInStrm.size() ); // in msocximex ( where this is ported from, it appears *nothing* is read // from the control stream ), surely there is some useful info there ? OSL_TRACE("HtmlTextBoxModel::importBinaryModel - string contents of stream :"); diff --git a/oox/source/ppt/buildlistcontext.cxx b/oox/source/ppt/buildlistcontext.cxx index fe8516259323..b716ebd5c401 100644 --- a/oox/source/ppt/buildlistcontext.cxx +++ b/oox/source/ppt/buildlistcontext.cxx @@ -46,7 +46,7 @@ namespace oox { namespace ppt { } } - ::oox::core::ContextHandlerRef BuildListContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) + ::oox::core::ContextHandlerRef BuildListContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& /*rAttribs*/ ) { switch( aElementToken ) { @@ -64,7 +64,7 @@ namespace oox { namespace ppt { case PPT_TOKEN( bldGraphic ): { mbInBldGraphic = true; - OUString sShapeId = rAttribs.getString( XML_spid, OUString() ); +// OUString sShapeId = rAttribs.getString( XML_spid, OUString() ); // TODO // bool uiExpand = rAttribs.getBool( XML_uiExpand, true ); /* this is unsigned */ |