xmloff: sal_Bool->bool

and remove some unused return values

Change-Id: I957b4befd2e2574a1d202edee440f65325d5388a

5 files changed, 72 insertions, 95 deletions

diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index 6743026482dd..3ba46fe8842d 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -85,7 +85,7 @@ XMLDashStyleImport::~XMLDashStyleImport()
 {
 }
 
-sal_Bool XMLDashStyleImport::importXML(
+void XMLDashStyleImport::importXML(
     const uno::Reference< xml::sax::XAttributeList >& xAttrList,
     uno::Any& rValue,
     OUString& rStrName )
@@ -203,8 +203,6 @@ sal_Bool XMLDashStyleImport::importXML(
                                      rStrName, aDisplayName );
         rStrName = aDisplayName;
     }
-
-    return sal_True;
 }
 
 // Export
@@ -218,11 +216,11 @@ XMLDashStyleExport::~XMLDashStyleExport()
 {
 }
 
-sal_Bool XMLDashStyleExport::exportXML(
+bool XMLDashStyleExport::exportXML(
     const OUString& rStrName,
     const uno::Any& rValue )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     SvXMLUnitConverter & rUnitConverter = rExport.GetMM100UnitConverter();
 
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index 3dc616321d6c..2fed5d68c725 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -77,12 +77,27 @@ XMLGradientStyleImport::~XMLGradientStyleImport()
 {
 }
 
-sal_Bool XMLGradientStyleImport::importXML(
+bool XMLGradientStyleImport::importXML(
     const uno::Reference< xml::sax::XAttributeList >& xAttrList,
     uno::Any& rValue,
     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 bHasStyle      = sal_False;
     sal_Bool bHasStartColor = sal_False;
@@ -97,23 +112,6 @@ sal_Bool XMLGradientStyleImport::importXML(
     aGradient.Angle = 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 );
     SvXMLNamespaceMap& rNamespaceMap = rImport.GetNamespaceMap();
 
@@ -205,9 +203,7 @@ sal_Bool XMLGradientStyleImport::importXML(
         rStrName = aDisplayName;
     }
 
-    bRet = bHasName && bHasStyle && bHasStartColor && bHasEndColor;
-
-    }
+    bool bRet = bHasName && bHasStyle && bHasStartColor && bHasEndColor;
 
     return bRet;
 }
@@ -224,11 +220,11 @@ XMLGradientStyleExport::~XMLGradientStyleExport()
 {
 }
 
-sal_Bool XMLGradientStyleExport::exportXML(
+bool XMLGradientStyleExport::exportXML(
     const OUString& rStrName,
     const uno::Any& rValue )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     awt::Gradient aGradient;
 
     if( !rStrName.isEmpty() )
@@ -241,7 +237,7 @@ sal_Bool XMLGradientStyleExport::exportXML(
             // Style
             if( !SvXMLUnitConverter::convertEnum( aOut, aGradient.Style, pXML_GradientStyle_Enum ) )
             {
-                bRet = sal_False;
+                bRet = false;
             }
             else
             {
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index e3406f823797..832d19774054 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -68,17 +68,26 @@ XMLHatchStyleImport::~XMLHatchStyleImport()
 {
 }
 
-sal_Bool XMLHatchStyleImport::importXML(
+bool XMLHatchStyleImport::importXML(
     const uno::Reference< xml::sax::XAttributeList >& xAttrList,
     uno::Any& rValue,
     OUString& rStrName )
 {
-    sal_Bool bRet = sal_False;
-
-    sal_Bool bHasName  = sal_False;
-    sal_Bool bHasStyle = sal_False;
-    sal_Bool bHasColor = sal_False;
-    sal_Bool bHasDist  = sal_False;
+    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
+    };
+
+    bool bHasName  = false;
+    bool bHasStyle = false;
+    bool bHasColor = false;
+    bool bHasDist  = false;
     OUString aDisplayName;
 
     drawing::Hatch aHatch;
@@ -87,18 +96,6 @@ sal_Bool XMLHatchStyleImport::importXML(
     aHatch.Distance = 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 );
     SvXMLNamespaceMap rNamespaceMap = rImport.GetNamespaceMap();
     SvXMLUnitConverter& rUnitConverter = rImport.GetMM100UnitConverter();
@@ -116,7 +113,7 @@ sal_Bool XMLHatchStyleImport::importXML(
             case XML_TOK_HATCH_NAME:
                 {
                     rStrName = rStrValue;
-                    bHasName = sal_True;
+                    bHasName = true;
                 }
                 break;
             case XML_TOK_HATCH_DISPLAY_NAME:
@@ -163,9 +160,7 @@ sal_Bool XMLHatchStyleImport::importXML(
         rStrName = aDisplayName;
     }
 
-    bRet = bHasName && bHasStyle && bHasColor && bHasDist;
-
-    }
+    bool bRet = bHasName && bHasStyle && bHasColor && bHasDist;
 
     return bRet;
 }
@@ -181,11 +176,11 @@ XMLHatchStyleExport::~XMLHatchStyleExport()
 {
 }
 
-sal_Bool XMLHatchStyleExport::exportXML(
+bool XMLHatchStyleExport::exportXML(
     const OUString& rStrName,
     const uno::Any& rValue )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     drawing::Hatch aHatch;
 
     if( !rStrName.isEmpty() )
@@ -201,7 +196,7 @@ sal_Bool XMLHatchStyleExport::exportXML(
             // Style
             if( !rUnitConverter.convertEnum( aOut, aHatch.Style, pXML_HatchStyle_Enum ) )
             {
-                bRet = sal_False;
+                bRet = false;
             }
             else
             {
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index 791611b37994..0577fc922d86 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -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;
 
     if( !rStrName.isEmpty() )
@@ -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 );
 }
 
-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,
                                       SvXMLImport& rImport )
 {
-    sal_Bool bRet     = sal_False;
-    sal_Bool bHasHRef = sal_False;
-    sal_Bool bHasName = sal_False;
+    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
+    };
+
+    bool bHasHRef = false;
+    bool bHasName = false;
     OUString aStrURL;
     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 );
 
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -145,7 +139,7 @@ sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttribute
             case XML_TOK_IMAGE_NAME:
                 {
                     rStrName = rStrValue;
-                    bHasName = sal_True;
+                    bHasName = true;
                 }
                 break;
             case XML_TOK_IMAGE_DISPLAY_NAME:
@@ -156,7 +150,7 @@ sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttribute
             case XML_TOK_IMAGE_URL:
                 {
                     aStrURL = rImport.ResolveGraphicObjectURL( rStrValue, sal_False );
-                    bHasHRef = sal_True;
+                    bHasHRef = true;
                 }
                 break;
             case XML_TOK_IMAGE_TYPE:
@@ -183,9 +177,7 @@ sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttribute
         rStrName = aDisplayName;
     }
 
-    bRet = bHasName && bHasHRef;
-
-    }
+    bool bRet = bHasName && bHasHRef;
 
     return bRet;
 }
diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx
index 8c44c99e6797..b07eb1067b35 100644
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -48,13 +48,13 @@ XMLMarkerStyleImport::~XMLMarkerStyleImport()
 {
 }
 
-sal_Bool XMLMarkerStyleImport::importXML(
+bool XMLMarkerStyleImport::importXML(
     const uno::Reference< xml::sax::XAttributeList >& xAttrList,
     uno::Any& rValue,
     OUString& rStrName )
 {
-    sal_Bool bHasViewBox    = sal_False;
-    sal_Bool bHasPathData   = sal_False;
+    bool bHasViewBox    = false;
+    bool bHasPathData   = false;
     OUString aDisplayName;
 
     SdXMLImExViewBox* pViewBox = NULL;
@@ -83,13 +83,13 @@ sal_Bool XMLMarkerStyleImport::importXML(
         else if( IsXMLToken( aStrAttrName, XML_VIEWBOX ) )
         {
             pViewBox = new SdXMLImExViewBox( aStrValue, rUnitConverter );
-            bHasViewBox = sal_True;
+            bHasViewBox = true;
 
         }
         else if( IsXMLToken( aStrAttrName, XML_D ) )
         {
             strPathData = aStrValue;
-            bHasPathData = sal_True;
+            bHasPathData = true;
         }
     }
 
@@ -153,12 +153,10 @@ XMLMarkerStyleExport::~XMLMarkerStyleExport()
 {
 }
 
-sal_Bool XMLMarkerStyleExport::exportXML(
+void XMLMarkerStyleExport::exportXML(
     const OUString& rStrName,
     const uno::Any& rValue )
 {
-    sal_Bool bRet(sal_False);
-
     if(!rStrName.isEmpty())
     {
         drawing::PolyPolygonBezierCoords aBezier;
@@ -206,8 +204,6 @@ sal_Bool XMLMarkerStyleExport::exportXML(
             SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_MARKER, sal_True, sal_False );
         }
     }
-
-    return bRet;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */