Skip to content

C
core
Kaydet (Commit) 55ee8a75 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

xmloff: sal_Bool->bool 

and remove some unused return values

Change-Id: I957b4befd2e2574a1d202edee440f65325d5388a
üst 3daa47e8
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 107 deletions
include/xmloff/DashStyle.hxx
Dosyayı görüntüle @ 55ee8a75
...@@ -41,7 +41,7 @@ public: ...@@ -41,7 +41,7 @@ public:
XMLDashStyleImport( SvXMLImport& rImport ); XMLDashStyleImport( SvXMLImport& rImport );
~XMLDashStyleImport(); ~XMLDashStyleImport();
sal_Bool importXML( void importXML(
const ::com::sun::star::uno::Reference< const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
::com::sun::star::uno::Any& rValue, ::com::sun::star::uno::Any& rValue,
...@@ -57,7 +57,7 @@ public: ...@@ -57,7 +57,7 @@ public:
XMLDashStyleExport( SvXMLExport& rExport ); XMLDashStyleExport( SvXMLExport& rExport );
~XMLDashStyleExport(); ~XMLDashStyleExport();
sal_Bool exportXML( const OUString& rStrName, bool exportXML( const OUString& rStrName,
const ::com::sun::star::uno::Any& rValue ); const ::com::sun::star::uno::Any& rValue );
}; };
......
include/xmloff/GradientStyle.hxx
Dosyayı görüntüle @ 55ee8a75
...@@ -42,7 +42,7 @@ public: ...@@ -42,7 +42,7 @@ public:
XMLGradientStyleImport( SvXMLImport& rImport ); XMLGradientStyleImport( SvXMLImport& rImport );
~XMLGradientStyleImport(); ~XMLGradientStyleImport();
sal_Bool importXML( bool importXML(
const ::com::sun::star::uno::Reference< const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
::com::sun::star::uno::Any& rValue, ::com::sun::star::uno::Any& rValue,
...@@ -58,7 +58,7 @@ public: ...@@ -58,7 +58,7 @@ public:
XMLGradientStyleExport( SvXMLExport& rExport ); XMLGradientStyleExport( SvXMLExport& rExport );
~XMLGradientStyleExport(); ~XMLGradientStyleExport();
sal_Bool exportXML( bool exportXML(
const OUString& rStrName, const OUString& rStrName,
const ::com::sun::star::uno::Any& rValue ); const ::com::sun::star::uno::Any& rValue );
}; };
......
include/xmloff/HatchStyle.hxx
Dosyayı görüntüle @ 55ee8a75
...@@ -42,7 +42,7 @@ public: ...@@ -42,7 +42,7 @@ public:
XMLHatchStyleImport( SvXMLImport& rImport ); XMLHatchStyleImport( SvXMLImport& rImport );
~XMLHatchStyleImport(); ~XMLHatchStyleImport();
sal_Bool importXML( bool importXML(
const ::com::sun::star::uno::Reference< const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList, ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
::com::sun::star::uno::Any& rValue, ::com::sun::star::uno::Any& rValue,
...@@ -57,7 +57,7 @@ public: ...@@ -57,7 +57,7 @@ public:
XMLHatchStyleExport( SvXMLExport& rExport ); XMLHatchStyleExport( SvXMLExport& rExport );
~XMLHatchStyleExport(); ~XMLHatchStyleExport();
sal_Bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
}; };
#endif // _XMLOFF_HATCHELEMENT_HXX #endif // _XMLOFF_HATCHELEMENT_HXX
......
include/xmloff/ImageStyle.hxx
Dosyayı görüntüle @ 55ee8a75
...@@ -37,14 +37,14 @@ public: ...@@ -37,14 +37,14 @@ public:
XMLImageStyle(); XMLImageStyle();
~XMLImageStyle(); ~XMLImageStyle();
sal_Bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue, SvXMLExport& rExport ); void exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue, SvXMLExport& rExport );
sal_Bool importXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport ); bool importXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport );
private: private:
SAL_DLLPRIVATE sal_Bool ImpExportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue, SAL_DLLPRIVATE void ImpExportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue,
SvXMLExport& rExport ); SvXMLExport& rExport );
SAL_DLLPRIVATE sal_Bool ImpImportXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, SAL_DLLPRIVATE bool ImpImportXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
::com::sun::star::uno::Any& rValue, OUString& rStrName, ::com::sun::star::uno::Any& rValue, OUString& rStrName,
SvXMLImport& rImport ); SvXMLImport& rImport );
}; };
......
include/xmloff/MarkerStyle.hxx
Dosyayı görüntüle @ 55ee8a75
...@@ -42,7 +42,7 @@ public: ...@@ -42,7 +42,7 @@ public:
XMLMarkerStyleImport( SvXMLImport& rImport ); XMLMarkerStyleImport( SvXMLImport& rImport );
~XMLMarkerStyleImport(); ~XMLMarkerStyleImport();
sal_Bool importXML( bool importXML(
const ::com::sun::star::uno::Reference< const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
::com::sun::star::uno::Any& rValue, ::com::sun::star::uno::Any& rValue,
...@@ -57,7 +57,7 @@ public: ...@@ -57,7 +57,7 @@ public:
XMLMarkerStyleExport( SvXMLExport& rExport ); XMLMarkerStyleExport( SvXMLExport& rExport );
~XMLMarkerStyleExport(); ~XMLMarkerStyleExport();
sal_Bool exportXML( void exportXML(
const OUString& rStrName, const OUString& rStrName,
const ::com::sun::star::uno::Any& rValue ); const ::com::sun::star::uno::Any& rValue );
}; };
......
xmloff/source/style/DashStyle.cxx
Dosyayı görüntüle @ 55ee8a75
...@@ -85,7 +85,7 @@ XMLDashStyleImport::~XMLDashStyleImport() ...@@ -85,7 +85,7 @@ XMLDashStyleImport::~XMLDashStyleImport()
{ {
} }
sal_Bool XMLDashStyleImport::importXML( void XMLDashStyleImport::importXML(
const uno::Reference< xml::sax::XAttributeList >& xAttrList, const uno::Reference< xml::sax::XAttributeList >& xAttrList,
uno::Any& rValue, uno::Any& rValue,
OUString& rStrName ) OUString& rStrName )
...@@ -203,8 +203,6 @@ sal_Bool XMLDashStyleImport::importXML( ...@@ -203,8 +203,6 @@ sal_Bool XMLDashStyleImport::importXML(
rStrName, aDisplayName ); rStrName, aDisplayName );
rStrName = aDisplayName; rStrName = aDisplayName;
} }
return sal_True;
} }
// Export // Export
...@@ -218,11 +216,11 @@ XMLDashStyleExport::~XMLDashStyleExport() ...@@ -218,11 +216,11 @@ XMLDashStyleExport::~XMLDashStyleExport()
{ {
} }
sal_Bool XMLDashStyleExport::exportXML( bool XMLDashStyleExport::exportXML(
const OUString& rStrName, const OUString& rStrName,
const uno::Any& rValue ) const uno::Any& rValue )
{ {
sal_Bool bRet = sal_False; bool bRet = false;
SvXMLUnitConverter & rUnitConverter = rExport.GetMM100UnitConverter(); SvXMLUnitConverter & rUnitConverter = rExport.GetMM100UnitConverter();
......
xmloff/source/style/GradientStyle.cxx
Dosyayı görüntüle @ 55ee8a75
...@@ -77,12 +77,27 @@ XMLGradientStyleImport::~XMLGradientStyleImport() ...@@ -77,12 +77,27 @@ XMLGradientStyleImport::~XMLGradientStyleImport()
{ {
} }
sal_Bool XMLGradientStyleImport::importXML( bool XMLGradientStyleImport::importXML(
const uno::Reference< xml::sax::XAttributeList >& xAttrList, const uno::Reference< xml::sax::XAttributeList >& xAttrList,
uno::Any& rValue, uno::Any& rValue,
OUString& rStrName ) OUString& rStrName )
{ {
sal_Bool bRet = sal_False; static const SvXMLTokenMapEntry aGradientAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_GRADIENT_NAME },
{ XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_GRADIENT_DISPLAY_NAME },
{ XML_NAMESPACE_DRAW, XML_STYLE, XML_TOK_GRADIENT_STYLE },
{ XML_NAMESPACE_DRAW, XML_CX, XML_TOK_GRADIENT_CX },
{ XML_NAMESPACE_DRAW, XML_CY, XML_TOK_GRADIENT_CY },
{ XML_NAMESPACE_DRAW, XML_START_COLOR, XML_TOK_GRADIENT_STARTCOLOR },
{ XML_NAMESPACE_DRAW, XML_END_COLOR, XML_TOK_GRADIENT_ENDCOLOR },
{ XML_NAMESPACE_DRAW, XML_START_INTENSITY, XML_TOK_GRADIENT_STARTINT },
{ XML_NAMESPACE_DRAW, XML_END_INTENSITY, XML_TOK_GRADIENT_ENDINT },
{ XML_NAMESPACE_DRAW, XML_GRADIENT_ANGLE, XML_TOK_GRADIENT_ANGLE },
{ XML_NAMESPACE_DRAW, XML_GRADIENT_BORDER, XML_TOK_GRADIENT_BORDER },
XML_TOKEN_MAP_END
};
sal_Bool bHasName = sal_False; sal_Bool bHasName = sal_False;
sal_Bool bHasStyle = sal_False; sal_Bool bHasStyle = sal_False;
sal_Bool bHasStartColor = sal_False; sal_Bool bHasStartColor = sal_False;
...@@ -97,23 +112,6 @@ sal_Bool XMLGradientStyleImport::importXML( ...@@ -97,23 +112,6 @@ sal_Bool XMLGradientStyleImport::importXML(
aGradient.Angle = 0; aGradient.Angle = 0;
aGradient.Border = 0; aGradient.Border = 0;
{
static const SvXMLTokenMapEntry aGradientAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_GRADIENT_NAME },
{ XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_GRADIENT_DISPLAY_NAME },
{ XML_NAMESPACE_DRAW, XML_STYLE, XML_TOK_GRADIENT_STYLE },
{ XML_NAMESPACE_DRAW, XML_CX, XML_TOK_GRADIENT_CX },
{ XML_NAMESPACE_DRAW, XML_CY, XML_TOK_GRADIENT_CY },
{ XML_NAMESPACE_DRAW, XML_START_COLOR, XML_TOK_GRADIENT_STARTCOLOR },
{ XML_NAMESPACE_DRAW, XML_END_COLOR, XML_TOK_GRADIENT_ENDCOLOR },
{ XML_NAMESPACE_DRAW, XML_START_INTENSITY, XML_TOK_GRADIENT_STARTINT },
{ XML_NAMESPACE_DRAW, XML_END_INTENSITY, XML_TOK_GRADIENT_ENDINT },
{ XML_NAMESPACE_DRAW, XML_GRADIENT_ANGLE, XML_TOK_GRADIENT_ANGLE },
{ XML_NAMESPACE_DRAW, XML_GRADIENT_BORDER, XML_TOK_GRADIENT_BORDER },
XML_TOKEN_MAP_END
};
SvXMLTokenMap aTokenMap( aGradientAttrTokenMap ); SvXMLTokenMap aTokenMap( aGradientAttrTokenMap );
SvXMLNamespaceMap& rNamespaceMap = rImport.GetNamespaceMap(); SvXMLNamespaceMap& rNamespaceMap = rImport.GetNamespaceMap();
...@@ -205,9 +203,7 @@ sal_Bool XMLGradientStyleImport::importXML( ...@@ -205,9 +203,7 @@ sal_Bool XMLGradientStyleImport::importXML(
rStrName = aDisplayName; rStrName = aDisplayName;
} }
bRet = bHasName && bHasStyle && bHasStartColor && bHasEndColor; bool bRet = bHasName && bHasStyle && bHasStartColor && bHasEndColor;
}
return bRet; return bRet;
} }
...@@ -224,11 +220,11 @@ XMLGradientStyleExport::~XMLGradientStyleExport() ...@@ -224,11 +220,11 @@ XMLGradientStyleExport::~XMLGradientStyleExport()
{ {
} }
sal_Bool XMLGradientStyleExport::exportXML( bool XMLGradientStyleExport::exportXML(
const OUString& rStrName, const OUString& rStrName,
const uno::Any& rValue ) const uno::Any& rValue )
{ {
sal_Bool bRet = sal_False; bool bRet = false;
awt::Gradient aGradient; awt::Gradient aGradient;
if( !rStrName.isEmpty() ) if( !rStrName.isEmpty() )
...@@ -241,7 +237,7 @@ sal_Bool XMLGradientStyleExport::exportXML( ...@@ -241,7 +237,7 @@ sal_Bool XMLGradientStyleExport::exportXML(
// Style // Style
if( !SvXMLUnitConverter::convertEnum( aOut, aGradient.Style, pXML_GradientStyle_Enum ) ) if( !SvXMLUnitConverter::convertEnum( aOut, aGradient.Style, pXML_GradientStyle_Enum ) )
{ {
bRet = sal_False; bRet = false;
} }
else else
{ {
......
xmloff/source/style/HatchStyle.cxx
Dosyayı görüntüle @ 55ee8a75
...@@ -68,17 +68,26 @@ XMLHatchStyleImport::~XMLHatchStyleImport() ...@@ -68,17 +68,26 @@ XMLHatchStyleImport::~XMLHatchStyleImport()
{ {
} }
sal_Bool XMLHatchStyleImport::importXML( bool XMLHatchStyleImport::importXML(
const uno::Reference< xml::sax::XAttributeList >& xAttrList, const uno::Reference< xml::sax::XAttributeList >& xAttrList,
uno::Any& rValue, uno::Any& rValue,
OUString& rStrName ) OUString& rStrName )
{ {
sal_Bool bRet = sal_False; static const SvXMLTokenMapEntry aHatchAttrTokenMap[] =
{
sal_Bool bHasName = sal_False; { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_HATCH_NAME },
sal_Bool bHasStyle = sal_False; { XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_HATCH_DISPLAY_NAME },
sal_Bool bHasColor = sal_False; { XML_NAMESPACE_DRAW, XML_STYLE, XML_TOK_HATCH_STYLE },
sal_Bool bHasDist = sal_False; { XML_NAMESPACE_DRAW, XML_COLOR, XML_TOK_HATCH_COLOR },
{ XML_NAMESPACE_DRAW, XML_HATCH_DISTANCE, XML_TOK_HATCH_DISTANCE },
{ XML_NAMESPACE_DRAW, XML_ROTATION, XML_TOK_HATCH_ROTATION },
XML_TOKEN_MAP_END
};
bool bHasName = false;
bool bHasStyle = false;
bool bHasColor = false;
bool bHasDist = false;
OUString aDisplayName; OUString aDisplayName;
drawing::Hatch aHatch; drawing::Hatch aHatch;
...@@ -87,18 +96,6 @@ sal_Bool XMLHatchStyleImport::importXML( ...@@ -87,18 +96,6 @@ sal_Bool XMLHatchStyleImport::importXML(
aHatch.Distance = 0; aHatch.Distance = 0;
aHatch.Angle = 0; aHatch.Angle = 0;
{
static const SvXMLTokenMapEntry aHatchAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_HATCH_NAME },
{ XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_HATCH_DISPLAY_NAME },
{ XML_NAMESPACE_DRAW, XML_STYLE, XML_TOK_HATCH_STYLE },
{ XML_NAMESPACE_DRAW, XML_COLOR, XML_TOK_HATCH_COLOR },
{ XML_NAMESPACE_DRAW, XML_HATCH_DISTANCE, XML_TOK_HATCH_DISTANCE },
{ XML_NAMESPACE_DRAW, XML_ROTATION, XML_TOK_HATCH_ROTATION },
XML_TOKEN_MAP_END
};
SvXMLTokenMap aTokenMap( aHatchAttrTokenMap ); SvXMLTokenMap aTokenMap( aHatchAttrTokenMap );
SvXMLNamespaceMap rNamespaceMap = rImport.GetNamespaceMap(); SvXMLNamespaceMap rNamespaceMap = rImport.GetNamespaceMap();
SvXMLUnitConverter& rUnitConverter = rImport.GetMM100UnitConverter(); SvXMLUnitConverter& rUnitConverter = rImport.GetMM100UnitConverter();
...@@ -116,7 +113,7 @@ sal_Bool XMLHatchStyleImport::importXML( ...@@ -116,7 +113,7 @@ sal_Bool XMLHatchStyleImport::importXML(
case XML_TOK_HATCH_NAME: case XML_TOK_HATCH_NAME:
{ {
rStrName = rStrValue; rStrName = rStrValue;
bHasName = sal_True; bHasName = true;
} }
break; break;
case XML_TOK_HATCH_DISPLAY_NAME: case XML_TOK_HATCH_DISPLAY_NAME:
...@@ -163,9 +160,7 @@ sal_Bool XMLHatchStyleImport::importXML( ...@@ -163,9 +160,7 @@ sal_Bool XMLHatchStyleImport::importXML(
rStrName = aDisplayName; rStrName = aDisplayName;
} }
bRet = bHasName && bHasStyle && bHasColor && bHasDist; bool bRet = bHasName && bHasStyle && bHasColor && bHasDist;
}
return bRet; return bRet;
} }
...@@ -181,11 +176,11 @@ XMLHatchStyleExport::~XMLHatchStyleExport() ...@@ -181,11 +176,11 @@ XMLHatchStyleExport::~XMLHatchStyleExport()
{ {
} }
sal_Bool XMLHatchStyleExport::exportXML( bool XMLHatchStyleExport::exportXML(
const OUString& rStrName, const OUString& rStrName,
const uno::Any& rValue ) const uno::Any& rValue )
{ {
sal_Bool bRet = sal_False; bool bRet = false;
drawing::Hatch aHatch; drawing::Hatch aHatch;
if( !rStrName.isEmpty() ) if( !rStrName.isEmpty() )
...@@ -201,7 +196,7 @@ sal_Bool XMLHatchStyleExport::exportXML( ...@@ -201,7 +196,7 @@ sal_Bool XMLHatchStyleExport::exportXML(
// Style // Style
if( !rUnitConverter.convertEnum( aOut, aHatch.Style, pXML_HatchStyle_Enum ) ) if( !rUnitConverter.convertEnum( aOut, aHatch.Style, pXML_HatchStyle_Enum ) )
{ {
bRet = sal_False; bRet = false;
} }
else else
{ {
......
xmloff/source/style/ImageStyle.cxx
Dosyayı görüntüle @ 55ee8a75
...@@ -55,15 +55,13 @@ XMLImageStyle::~XMLImageStyle() ...@@ -55,15 +55,13 @@ XMLImageStyle::~XMLImageStyle()
{ {
} }
sal_Bool XMLImageStyle::exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue, SvXMLExport& rExport ) void XMLImageStyle::exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue, SvXMLExport& rExport )
{ {
return ImpExportXML( rStrName, rValue, rExport ); ImpExportXML( rStrName, rValue, rExport );
} }
sal_Bool XMLImageStyle::ImpExportXML( const OUString& rStrName, const uno::Any& rValue, SvXMLExport& rExport ) void XMLImageStyle::ImpExportXML( const OUString& rStrName, const uno::Any& rValue, SvXMLExport& rExport )
{ {
sal_Bool bRet = sal_False;
OUString sImageURL; OUString sImageURL;
if( !rStrName.isEmpty() ) if( !rStrName.isEmpty() )
...@@ -99,37 +97,33 @@ sal_Bool XMLImageStyle::ImpExportXML( const OUString& rStrName, const uno::Any& ...@@ -99,37 +97,33 @@ sal_Bool XMLImageStyle::ImpExportXML( const OUString& rStrName, const uno::Any&
} }
} }
} }
return bRet;
} }
sal_Bool XMLImageStyle::importXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList, uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport ) bool XMLImageStyle::importXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList, uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport )
{ {
return ImpImportXML( xAttrList, rValue, rStrName, rImport ); return ImpImportXML( xAttrList, rValue, rStrName, rImport );
} }
sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList, bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList,
uno::Any& rValue, OUString& rStrName, uno::Any& rValue, OUString& rStrName,
SvXMLImport& rImport ) SvXMLImport& rImport )
{ {
sal_Bool bRet = sal_False; static const SvXMLTokenMapEntry aHatchAttrTokenMap[] =
sal_Bool bHasHRef = sal_False; {
sal_Bool bHasName = sal_False; { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_IMAGE_NAME },
{ XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_IMAGE_DISPLAY_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_IMAGE_URL },
{ XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_IMAGE_TYPE },
{ XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_IMAGE_SHOW },
{ XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_IMAGE_ACTUATE },
XML_TOKEN_MAP_END
};
bool bHasHRef = false;
bool bHasName = false;
OUString aStrURL; OUString aStrURL;
OUString aDisplayName; OUString aDisplayName;
{
static const SvXMLTokenMapEntry aHatchAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_IMAGE_NAME },
{ XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_IMAGE_DISPLAY_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_IMAGE_URL },
{ XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_IMAGE_TYPE },
{ XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_IMAGE_SHOW },
{ XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_IMAGE_ACTUATE },
XML_TOKEN_MAP_END
};
SvXMLTokenMap aTokenMap( aHatchAttrTokenMap ); SvXMLTokenMap aTokenMap( aHatchAttrTokenMap );
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
...@@ -145,7 +139,7 @@ sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttribute ...@@ -145,7 +139,7 @@ sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttribute
case XML_TOK_IMAGE_NAME: case XML_TOK_IMAGE_NAME:
{ {
rStrName = rStrValue; rStrName = rStrValue;
bHasName = sal_True; bHasName = true;
} }
break; break;
case XML_TOK_IMAGE_DISPLAY_NAME: case XML_TOK_IMAGE_DISPLAY_NAME:
...@@ -156,7 +150,7 @@ sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttribute ...@@ -156,7 +150,7 @@ sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttribute
case XML_TOK_IMAGE_URL: case XML_TOK_IMAGE_URL:
{ {
aStrURL = rImport.ResolveGraphicObjectURL( rStrValue, sal_False ); aStrURL = rImport.ResolveGraphicObjectURL( rStrValue, sal_False );
bHasHRef = sal_True; bHasHRef = true;
} }
break; break;
case XML_TOK_IMAGE_TYPE: case XML_TOK_IMAGE_TYPE:
...@@ -183,9 +177,7 @@ sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttribute ...@@ -183,9 +177,7 @@ sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttribute
rStrName = aDisplayName; rStrName = aDisplayName;
} }
bRet = bHasName && bHasHRef; bool bRet = bHasName && bHasHRef;
}
return bRet; return bRet;
} }
......
xmloff/source/style/MarkerStyle.cxx
Dosyayı görüntüle @ 55ee8a75
...@@ -48,13 +48,13 @@ XMLMarkerStyleImport::~XMLMarkerStyleImport() ...@@ -48,13 +48,13 @@ XMLMarkerStyleImport::~XMLMarkerStyleImport()
{ {
} }
sal_Bool XMLMarkerStyleImport::importXML( bool XMLMarkerStyleImport::importXML(
const uno::Reference< xml::sax::XAttributeList >& xAttrList, const uno::Reference< xml::sax::XAttributeList >& xAttrList,
uno::Any& rValue, uno::Any& rValue,
OUString& rStrName ) OUString& rStrName )
{ {
sal_Bool bHasViewBox = sal_False; bool bHasViewBox = false;
sal_Bool bHasPathData = sal_False; bool bHasPathData = false;
OUString aDisplayName; OUString aDisplayName;
SdXMLImExViewBox* pViewBox = NULL; SdXMLImExViewBox* pViewBox = NULL;
...@@ -83,13 +83,13 @@ sal_Bool XMLMarkerStyleImport::importXML( ...@@ -83,13 +83,13 @@ sal_Bool XMLMarkerStyleImport::importXML(
else if( IsXMLToken( aStrAttrName, XML_VIEWBOX ) ) else if( IsXMLToken( aStrAttrName, XML_VIEWBOX ) )
{ {
pViewBox = new SdXMLImExViewBox( aStrValue, rUnitConverter ); pViewBox = new SdXMLImExViewBox( aStrValue, rUnitConverter );
bHasViewBox = sal_True; bHasViewBox = true;
} }
else if( IsXMLToken( aStrAttrName, XML_D ) ) else if( IsXMLToken( aStrAttrName, XML_D ) )
{ {
strPathData = aStrValue; strPathData = aStrValue;
bHasPathData = sal_True; bHasPathData = true;
} }
} }
...@@ -153,12 +153,10 @@ XMLMarkerStyleExport::~XMLMarkerStyleExport() ...@@ -153,12 +153,10 @@ XMLMarkerStyleExport::~XMLMarkerStyleExport()
{ {
} }
sal_Bool XMLMarkerStyleExport::exportXML( void XMLMarkerStyleExport::exportXML(
const OUString& rStrName, const OUString& rStrName,
const uno::Any& rValue ) const uno::Any& rValue )
{ {
sal_Bool bRet(sal_False);
if(!rStrName.isEmpty()) if(!rStrName.isEmpty())
{ {
drawing::PolyPolygonBezierCoords aBezier; drawing::PolyPolygonBezierCoords aBezier;
...@@ -206,8 +204,6 @@ sal_Bool XMLMarkerStyleExport::exportXML( ...@@ -206,8 +204,6 @@ sal_Bool XMLMarkerStyleExport::exportXML(
SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_MARKER, sal_True, sal_False ); SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_MARKER, sal_True, sal_False );
} }
} }
return bRet;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment