mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Werror=unused-but-set-variable

Browse Source 
Change-Id: I981e1b660dc94333935b3a451847198940e47e99
This commit is contained in:
Noel Grandin 2016-01-15 10:42:04 +02:00
parent 51b71a7be1
commit f0920199f2
2 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xmloff/source/style/GradientStyle.cxx
View File

@ -98,9 +98,6 @@ void XMLGradientStyleImport::importXML(
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
bool bHasName = false;
bool bHasStyle = false;
bool bHasStartColor = false;
OUString aDisplayName; OUString aDisplayName;
awt::Gradient aGradient; awt::Gradient aGradient;
@ -127,15 +124,10 @@ void XMLGradientStyleImport::importXML(
switch( aTokenMap.Get( nPrefix, aStrAttrName ) ) switch( aTokenMap.Get( nPrefix, aStrAttrName ) )
{ {
case XML_TOK_GRADIENT_NAME: case XML_TOK_GRADIENT_NAME:
{
rStrName = rStrValue; rStrName = rStrValue;
bHasName = true;
}
break; break;
case XML_TOK_GRADIENT_DISPLAY_NAME: case XML_TOK_GRADIENT_DISPLAY_NAME:
{
aDisplayName = rStrValue; aDisplayName = rStrValue;
}
break; break;
case XML_TOK_GRADIENT_STYLE: case XML_TOK_GRADIENT_STYLE:
{ {
@ -143,7 +135,6 @@ void XMLGradientStyleImport::importXML(
if( SvXMLUnitConverter::convertEnum( eValue, rStrValue, pXML_GradientStyle_Enum ) ) if( SvXMLUnitConverter::convertEnum( eValue, rStrValue, pXML_GradientStyle_Enum ) )
{ {
aGradient.Style = (awt::GradientStyle) eValue; aGradient.Style = (awt::GradientStyle) eValue;
bHasStyle = true;
} }
} }
break; break;
@ -156,16 +147,10 @@ void XMLGradientStyleImport::importXML(
aGradient.YOffset = static_cast< sal_Int16 >( nTmpValue ); aGradient.YOffset = static_cast< sal_Int16 >( nTmpValue );
break; break;
case XML_TOK_GRADIENT_STARTCOLOR: case XML_TOK_GRADIENT_STARTCOLOR:
{ ::sax::Converter::convertColor(aGradient.StartColor, rStrValue);
bHasStartColor = ::sax::Converter::convertColor(
aGradient.StartColor, rStrValue);
}
break; break;
case XML_TOK_GRADIENT_ENDCOLOR: case XML_TOK_GRADIENT_ENDCOLOR:
{ ::sax::Converter::convertColor(aGradient.EndColor, rStrValue);
bHasStartColor = ::sax::Converter::convertColor(
aGradient.EndColor, rStrValue);
}
break; break;
case XML_TOK_GRADIENT_STARTINT: case XML_TOK_GRADIENT_STARTINT:
::sax::Converter::convertPercent( nTmpValue, rStrValue ); ::sax::Converter::convertPercent( nTmpValue, rStrValue );

13
xmloff/source/style/HatchStyle.cxx
View File

@ -84,10 +84,7 @@ void XMLHatchStyleImport::importXML(
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
bool bHasName = false;
bool bHasStyle = false; bool bHasStyle = false;
bool bHasColor = false;
bool bHasDist = false;
OUString aDisplayName; OUString aDisplayName;
drawing::Hatch aHatch; drawing::Hatch aHatch;
@ -111,10 +108,7 @@ void XMLHatchStyleImport::importXML(
switch( aTokenMap.Get( nPrefix, aStrAttrName ) ) switch( aTokenMap.Get( nPrefix, aStrAttrName ) )
{ {
case XML_TOK_HATCH_NAME: case XML_TOK_HATCH_NAME:
{
rStrName = rStrValue; rStrName = rStrValue;
bHasName = true;
}
break; break;
case XML_TOK_HATCH_DISPLAY_NAME: case XML_TOK_HATCH_DISPLAY_NAME:
aDisplayName = rStrValue; aDisplayName = rStrValue;
@ -128,13 +122,10 @@ void XMLHatchStyleImport::importXML(
} }
break; break;
case XML_TOK_HATCH_COLOR: case XML_TOK_HATCH_COLOR:
{ ::sax::Converter::convertColor(aHatch.Color, rStrValue);
bHasColor = ::sax::Converter::convertColor(
aHatch.Color, rStrValue);
}
break; break;
case XML_TOK_HATCH_DISTANCE: case XML_TOK_HATCH_DISTANCE:
bHasDist = rUnitConverter.convertMeasureToCore( rUnitConverter.convertMeasureToCore(
(sal_Int32&)aHatch.Distance, rStrValue ); (sal_Int32&)aHatch.Distance, rStrValue );
break; break;
case XML_TOK_HATCH_ROTATION: case XML_TOK_HATCH_ROTATION: