summaryrefslogtreecommitdiffstats
path: root/xmloff/source/draw
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source/draw')
-rw-r--r--xmloff/source/draw/numithdl.cxx8
-rw-r--r--xmloff/source/draw/numithdl.hxx4
-rw-r--r--xmloff/source/draw/propimp0.cxx46
-rw-r--r--xmloff/source/draw/propimp0.hxx16
-rw-r--r--xmloff/source/draw/sdpropls.cxx42
5 files changed, 58 insertions, 58 deletions
diff --git a/xmloff/source/draw/numithdl.cxx b/xmloff/source/draw/numithdl.cxx
index 75241da9e489..8f813645b279 100644
--- a/xmloff/source/draw/numithdl.cxx
+++ b/xmloff/source/draw/numithdl.cxx
@@ -40,14 +40,14 @@ bool XMLNumRulePropHdl::equals( const uno::Any& r1, const uno::Any& r2 ) const
return mxNumRuleCompare.is() && mxNumRuleCompare->compare( r1, r2 ) == 0;
}
-sal_Bool XMLNumRulePropHdl::importXML( const OUString& /*rStrImpValue*/, ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
+bool XMLNumRulePropHdl::importXML( const OUString& /*rStrImpValue*/, ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
- return sal_False;
+ return false;
}
-sal_Bool XMLNumRulePropHdl::exportXML( OUString& /*rStrExpValue*/, const ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
+bool XMLNumRulePropHdl::exportXML( OUString& /*rStrExpValue*/, const ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
- return sal_False;
+ return false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/numithdl.hxx b/xmloff/source/draw/numithdl.hxx
index 2acaa39bad78..70d691d26fef 100644
--- a/xmloff/source/draw/numithdl.hxx
+++ b/xmloff/source/draw/numithdl.hxx
@@ -37,8 +37,8 @@ public:
virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const;
/// NumRules will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place.
- virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
- virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+ virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+ virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
};
#endif // _XMLOFF_PROPERTYHANDLER_NUMRULE_HXX
diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx
index b9b55b316bb8..826c09a1271a 100644
--- a/xmloff/source/draw/propimp0.cxx
+++ b/xmloff/source/draw/propimp0.cxx
@@ -42,7 +42,7 @@ XMLDurationPropertyHdl::~XMLDurationPropertyHdl()
{
}
-sal_Bool XMLDurationPropertyHdl::importXML(
+bool XMLDurationPropertyHdl::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& ) const
@@ -54,10 +54,10 @@ sal_Bool XMLDurationPropertyHdl::importXML(
+ aDuration.Minutes) * 60 + aDuration.Seconds + aDuration.NanoSeconds / static_cast<double>(::Time::nanoSecPerSec);
rValue <<= fSeconds;
- return sal_True;
+ return true;
}
-sal_Bool XMLDurationPropertyHdl::exportXML(
+bool XMLDurationPropertyHdl::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& ) const
@@ -73,10 +73,10 @@ sal_Bool XMLDurationPropertyHdl::exportXML(
OUStringBuffer aOut;
::sax::Converter::convertDuration(aOut, aDuration);
rStrExpValue = aOut.makeStringAndClear();
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
// implementation of an opacity property handler
@@ -90,23 +90,23 @@ XMLOpacityPropertyHdl::~XMLOpacityPropertyHdl()
{
}
-sal_Bool XMLOpacityPropertyHdl::importXML(
+bool XMLOpacityPropertyHdl::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& ) const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
sal_Int32 nValue = 0;
if( rStrImpValue.indexOf( sal_Unicode('%') ) != -1 )
{
if (::sax::Converter::convertPercent( nValue, rStrImpValue ))
- bRet = sal_True;
+ bRet = true;
}
else
{
nValue = sal_Int32( rStrImpValue.toDouble() * 100.0 );
- bRet = sal_True;
+ bRet = true;
}
if( bRet )
@@ -138,12 +138,12 @@ sal_Bool XMLOpacityPropertyHdl::importXML(
return bRet;
}
-sal_Bool XMLOpacityPropertyHdl::exportXML(
+bool XMLOpacityPropertyHdl::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& ) const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
sal_uInt16 nVal = sal_uInt16();
if( rValue >>= nVal )
@@ -153,7 +153,7 @@ sal_Bool XMLOpacityPropertyHdl::exportXML(
nVal = 100 - nVal;
::sax::Converter::convertPercent( aOut, nVal );
rStrExpValue = aOut.makeStringAndClear();
- bRet = sal_True;
+ bRet = true;
}
return bRet;
@@ -165,12 +165,12 @@ XMLTextAnimationStepPropertyHdl::~XMLTextAnimationStepPropertyHdl()
{
}
-sal_Bool XMLTextAnimationStepPropertyHdl::importXML(
+bool XMLTextAnimationStepPropertyHdl::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
sal_Int32 nValue = 0;
const OUString aPX( "px" );
@@ -180,7 +180,7 @@ sal_Bool XMLTextAnimationStepPropertyHdl::importXML(
if (::sax::Converter::convertNumber(nValue, rStrImpValue.copy(0, nPos)))
{
rValue <<= sal_Int16( -nValue );
- bRet = sal_True;
+ bRet = true;
}
}
else
@@ -188,19 +188,19 @@ sal_Bool XMLTextAnimationStepPropertyHdl::importXML(
if (rUnitConverter.convertMeasureToCore( nValue, rStrImpValue ))
{
rValue <<= sal_Int16( nValue );
- bRet = sal_True;
+ bRet = true;
}
}
return bRet;
}
-sal_Bool XMLTextAnimationStepPropertyHdl::exportXML(
+bool XMLTextAnimationStepPropertyHdl::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
sal_Int16 nVal = sal_Int16();
if( rValue >>= nVal )
@@ -219,7 +219,7 @@ sal_Bool XMLTextAnimationStepPropertyHdl::exportXML(
}
rStrExpValue = aOut.makeStringAndClear();
- bRet = sal_True;
+ bRet = true;
}
return bRet;
@@ -236,23 +236,23 @@ XMLDateTimeFormatHdl::~XMLDateTimeFormatHdl()
{
}
-sal_Bool XMLDateTimeFormatHdl::importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const
+bool XMLDateTimeFormatHdl::importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const
{
rValue <<= rStrImpValue;
return true;
}
-sal_Bool XMLDateTimeFormatHdl::exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const
+bool XMLDateTimeFormatHdl::exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const
{
sal_Int32 nNumberFormat = 0;
if( mpExport && (rValue >>= nNumberFormat) )
{
mpExport->addDataStyle( nNumberFormat );
rStrExpValue = mpExport->getDataStyleName( nNumberFormat );
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/propimp0.hxx b/xmloff/source/draw/propimp0.hxx
index e20add963997..1c1a144a4be7 100644
--- a/xmloff/source/draw/propimp0.hxx
+++ b/xmloff/source/draw/propimp0.hxx
@@ -28,8 +28,8 @@ class XMLDurationPropertyHdl : public XMLPropertyHandler
{
public:
virtual ~XMLDurationPropertyHdl();
- virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
- virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+ virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+ virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
};
class SvXMLImport;
@@ -40,16 +40,16 @@ private:
public:
XMLOpacityPropertyHdl( SvXMLImport* pImport );
virtual ~XMLOpacityPropertyHdl();
- virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
- virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+ virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+ virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
};
class XMLTextAnimationStepPropertyHdl : public XMLPropertyHandler
{
public:
virtual ~XMLTextAnimationStepPropertyHdl();
- virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
- virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+ virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+ virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
};
class SvXMLExport;
@@ -61,8 +61,8 @@ private:
public:
XMLDateTimeFormatHdl( SvXMLExport* pExport );
virtual ~XMLDateTimeFormatHdl();
- virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
- virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+ virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+ virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
};
#endif // _PROPIMP0_HXX
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 2c5e2fd2e759..828b2c6561d6 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -730,39 +730,39 @@ SvXMLEnumMapEntry const pXML_Caption_Type_Enum[] =
class XMLCaptionEscapeRelative : public XMLPropertyHandler
{
public:
- virtual sal_Bool importXML(
+ virtual bool importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const;
- virtual sal_Bool exportXML(
+ virtual bool exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const;
};
-sal_Bool XMLCaptionEscapeRelative::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const
+bool XMLCaptionEscapeRelative::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const
{
sal_Int32 nValue;
if (!::sax::Converter::convertPercent( nValue, rStrImpValue ))
- return sal_False;
+ return false;
nValue *= 100;
rValue <<= nValue;
- return sal_True;
+ return true;
}
-sal_Bool XMLCaptionEscapeRelative::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const
+bool XMLCaptionEscapeRelative::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const
{
sal_Int32 nValue = 0;
if( !(rValue >>= nValue ) )
- return sal_False;
+ return false;
nValue /= 100;
OUStringBuffer aOut;
::sax::Converter::convertPercent( aOut, nValue );
rStrExpValue = aOut.makeStringAndClear();
- return sal_True;
+ return true;
}
class XMLMoveSizeProtectHdl : public XMLPropertyHandler
@@ -770,11 +770,11 @@ class XMLMoveSizeProtectHdl : public XMLPropertyHandler
public:
XMLMoveSizeProtectHdl( sal_Int32 nType ) : mnType( nType ) {}
- virtual sal_Bool importXML(
+ virtual bool importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const;
- virtual sal_Bool exportXML(
+ virtual bool exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const;
@@ -782,18 +782,18 @@ private:
const sal_Int32 mnType;
};
-sal_Bool XMLMoveSizeProtectHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const
+bool XMLMoveSizeProtectHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const
{
const sal_Bool bValue = rStrImpValue.indexOf( GetXMLToken( mnType == XML_SD_TYPE_MOVE_PROTECT ? XML_POSITION : XML_SIZE ) ) != -1;
rValue <<= bValue;
- return sal_True;
+ return true;
}
-sal_Bool XMLMoveSizeProtectHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const
+bool XMLMoveSizeProtectHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const
{
sal_Bool bValue = sal_Bool();
if( !(rValue >>= bValue ) )
- return sal_False;
+ return false;
if( bValue )
{
@@ -803,7 +803,7 @@ sal_Bool XMLMoveSizeProtectHdl::exportXML( OUString& rStrExpValue, const Any& rV
rStrExpValue += GetXMLToken( mnType == XML_SD_TYPE_MOVE_PROTECT ? XML_POSITION : XML_SIZE );
}
- return sal_True;
+ return true;
}
class XMLSdHeaderFooterVisibilityTypeHdl : public XMLPropertyHandler
@@ -811,15 +811,15 @@ class XMLSdHeaderFooterVisibilityTypeHdl : public XMLPropertyHandler
public:
virtual ~XMLSdHeaderFooterVisibilityTypeHdl();
- virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
- virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+ virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+ virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
};
XMLSdHeaderFooterVisibilityTypeHdl::~XMLSdHeaderFooterVisibilityTypeHdl()
{
}
-sal_Bool XMLSdHeaderFooterVisibilityTypeHdl::importXML(
+bool XMLSdHeaderFooterVisibilityTypeHdl::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& ) const
@@ -832,12 +832,12 @@ sal_Bool XMLSdHeaderFooterVisibilityTypeHdl::importXML(
return bBool || IsXMLToken(rStrImpValue, XML_FALSE) || IsXMLToken(rStrImpValue, XML_HIDDEN);
}
-sal_Bool XMLSdHeaderFooterVisibilityTypeHdl::exportXML(
+bool XMLSdHeaderFooterVisibilityTypeHdl::exportXML(
OUString& rStrExpValue,
const Any& rValue,
const SvXMLUnitConverter& ) const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
OUStringBuffer aOut;
sal_Bool bValue = sal_Bool();
@@ -846,7 +846,7 @@ sal_Bool XMLSdHeaderFooterVisibilityTypeHdl::exportXML(
::sax::Converter::convertBool( aOut, bValue );
rStrExpValue = aOut.makeStringAndClear();
- bRet = sal_True;
+ bRet = true;
}
return bRet;