summaryrefslogtreecommitdiff
path: root/xmloff/source/style
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source/style')
-rw-r--r--xmloff/source/style/GradientStyle.cxx18
-rw-r--r--xmloff/source/style/HatchStyle.cxx17
-rw-r--r--xmloff/source/style/ImageStyle.cxx4
-rw-r--r--xmloff/source/style/MarkerStyle.cxx4
-rw-r--r--xmloff/source/style/prstylei.cxx14
-rw-r--r--xmloff/source/style/xmlnume.cxx6
6 files changed, 13 insertions, 50 deletions
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index 0ad8c74c9044..3c33b463f83b 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -77,7 +77,7 @@ XMLGradientStyleImport::~XMLGradientStyleImport()
{
}
-bool XMLGradientStyleImport::importXML(
+void XMLGradientStyleImport::importXML(
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
uno::Any& rValue,
OUString& rStrName )
@@ -101,7 +101,6 @@ bool XMLGradientStyleImport::importXML(
bool bHasName = false;
bool bHasStyle = false;
bool bHasStartColor = false;
- bool bHasEndColor = false;
OUString aDisplayName;
awt::Gradient aGradient;
@@ -201,10 +200,6 @@ bool XMLGradientStyleImport::importXML(
aDisplayName );
rStrName = aDisplayName;
}
-
- bool bRet = bHasName && bHasStyle && bHasStartColor && bHasEndColor;
-
- return bRet;
}
// Export
@@ -219,11 +214,10 @@ XMLGradientStyleExport::~XMLGradientStyleExport()
{
}
-bool XMLGradientStyleExport::exportXML(
+void XMLGradientStyleExport::exportXML(
const OUString& rStrName,
const uno::Any& rValue )
{
- bool bRet = false;
awt::Gradient aGradient;
if( !rStrName.isEmpty() )
@@ -234,11 +228,7 @@ bool XMLGradientStyleExport::exportXML(
OUStringBuffer aOut;
// Style
- if( !SvXMLUnitConverter::convertEnum( aOut, aGradient.Style, pXML_GradientStyle_Enum ) )
- {
- bRet = false;
- }
- else
+ if( SvXMLUnitConverter::convertEnum( aOut, aGradient.Style, pXML_GradientStyle_Enum ) )
{
// Name
bool bEncoded = false;
@@ -304,8 +294,6 @@ bool XMLGradientStyleExport::exportXML(
}
}
}
-
- return bRet;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index 3dbbb45467a1..9b76e19fe25f 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -68,7 +68,7 @@ XMLHatchStyleImport::~XMLHatchStyleImport()
{
}
-bool XMLHatchStyleImport::importXML(
+void XMLHatchStyleImport::importXML(
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
uno::Any& rValue,
OUString& rStrName )
@@ -158,10 +158,6 @@ bool XMLHatchStyleImport::importXML(
aDisplayName );
rStrName = aDisplayName;
}
-
- bool bRet = bHasName && bHasStyle && bHasColor && bHasDist;
-
- return bRet;
}
// Export
@@ -175,11 +171,10 @@ XMLHatchStyleExport::~XMLHatchStyleExport()
{
}
-bool XMLHatchStyleExport::exportXML(
+void XMLHatchStyleExport::exportXML(
const OUString& rStrName,
const uno::Any& rValue )
{
- bool bRet = false;
drawing::Hatch aHatch;
if( !rStrName.isEmpty() )
@@ -193,11 +188,7 @@ bool XMLHatchStyleExport::exportXML(
rExport.GetMM100UnitConverter();
// Style
- if( !SvXMLUnitConverter::convertEnum( aOut, aHatch.Style, pXML_HatchStyle_Enum ) )
- {
- bRet = false;
- }
- else
+ if( SvXMLUnitConverter::convertEnum( aOut, aHatch.Style, pXML_HatchStyle_Enum ) )
{
// Name
bool bEncoded = false;
@@ -232,8 +223,6 @@ bool XMLHatchStyleExport::exportXML(
}
}
}
-
- return bRet;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index 4be9fa06d041..64c76f2a08fa 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -99,9 +99,9 @@ void XMLImageStyle::ImpExportXML( const OUString& rStrName, const uno::Any& rVal
}
}
-bool XMLImageStyle::importXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList, uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport )
+void XMLImageStyle::importXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList, uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport )
{
- return ImpImportXML( xAttrList, rValue, rStrName, rImport );
+ ImpImportXML( xAttrList, rValue, rStrName, rImport );
}
bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList,
diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx
index ba2a7f4f71b7..bd0f35b59b29 100644
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -48,7 +48,7 @@ XMLMarkerStyleImport::~XMLMarkerStyleImport()
{
}
-bool XMLMarkerStyleImport::importXML(
+void XMLMarkerStyleImport::importXML(
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
uno::Any& rValue,
OUString& rStrName )
@@ -137,8 +137,6 @@ bool XMLMarkerStyleImport::importXML(
}
delete pViewBox;
-
- return bHasViewBox && bHasPathData;
}
// Export
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 44229af18de7..f80f4e01f124 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -553,11 +553,9 @@ bool XMLPropStyleContext::doNewDrawingLayerFillStyleDefinitionsExist(
}
//UUUU
-bool XMLPropStyleContext::deactivateOldFillStyleDefinitions(
+void XMLPropStyleContext::deactivateOldFillStyleDefinitions(
const OldFillStyleDefinitionSet& rHashSetOfTags)
{
- bool bRetval(false);
-
if(!rHashSetOfTags.empty() && maProperties.size())
{
const rtl::Reference< XMLPropertySetMapper >& rMapper = GetStyles()->GetImportPropertyMapper(GetFamily())->getPropertySetMapper();
@@ -574,21 +572,16 @@ bool XMLPropStyleContext::deactivateOldFillStyleDefinitions(
{
// mark entry as inactive
a->mnIndex = -1;
- bRetval = true;
}
}
}
}
}
-
- return bRetval;
}
//UUUU
-bool XMLPropStyleContext::translateNameBasedDrawingLayerFillStyleDefinitionsToStyleDisplayNames()
+void XMLPropStyleContext::translateNameBasedDrawingLayerFillStyleDefinitionsToStyleDisplayNames()
{
- bool bRetval(false);
-
if(maProperties.size())
{
const rtl::Reference< XMLPropertySetMapper >& rMapper = GetStyles()->GetImportPropertyMapper(GetFamily())->getPropertySetMapper();
@@ -627,14 +620,11 @@ bool XMLPropStyleContext::translateNameBasedDrawingLayerFillStyleDefinitionsToSt
a->maValue >>= sStyleName;
sStyleName = GetImport().GetStyleDisplayName( aStyleFamily, sStyleName );
a->maValue <<= sStyleName;
- bRetval = true;
}
}
}
}
}
-
- return bRetval;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 54ab42c079b5..5293539cd486 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -696,7 +696,7 @@ void SvxXMLNumRuleExport::exportNumberingRule(
}
}
-bool SvxXMLNumRuleExport::exportStyle( const Reference< XStyle >& rStyle )
+void SvxXMLNumRuleExport::exportStyle( const Reference< XStyle >& rStyle )
{
Reference< XPropertySet > xPropSet( rStyle, UNO_QUERY );
Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo();
@@ -709,7 +709,7 @@ bool SvxXMLNumRuleExport::exportStyle( const Reference< XStyle >& rStyle )
{
aAny = xPropSet->getPropertyValue( sIsPhysical );
if( !*static_cast<sal_Bool const *>(aAny.getValue()) )
- return false;
+ return;
}
aAny = xPropSet->getPropertyValue( sNumberingRules );
@@ -726,8 +726,6 @@ bool SvxXMLNumRuleExport::exportStyle( const Reference< XStyle >& rStyle )
}
exportNumberingRule( sName, bHidden, xNumRule );
-
- return true;
}
void SvxXMLNumRuleExport::exportOutline()
generated by cgit (git 2.34.1) at 2024-08-07 10:42:42 +0000