diff options
| author | Eike Rathke <erack@redhat.com> | 2013-09-16 15:06:48 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-09-16 15:08:18 +0200 |
| commit | 0825d0cb76a84503d77d7e635947e1f4da7e299d (patch) | |
| tree | f034eb235914b6d600c07d9b9f98744515f66674 /xmloff | |
| parent | d6e9bb17675200e12777ed23d0c685fbd2bb4c59 (diff) | |
sal_Bool to bool
Change-Id: Id32780e5cb565e85f0366a91282ce085ed7d2f3c
Diffstat (limited to 'xmloff')
85 files changed, 886 insertions, 887 deletions
diff --git a/xmloff/inc/AttributeContainerHandler.hxx b/xmloff/inc/AttributeContainerHandler.hxx index f8aef32d5a79..2cd36e1e08ac 100644 --- a/xmloff/inc/AttributeContainerHandler.hxx +++ b/xmloff/inc/AttributeContainerHandler.hxx @@ -32,8 +32,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - 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_ATTRIBUTECONTAINERHANDLER_HXX diff --git a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx index 22d96e51e9f5..e6e591a7944e 100644 --- a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx +++ b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx @@ -38,13 +38,13 @@ public: virtual ~XMLBitmapLogicalSizePropertyHandler(); /// Imports the given value in cas of the given XML-data-type - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; /// Exports the given value in cas of the given XML-data-type - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; diff --git a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx index 54e28e180940..2429a9ce9b1a 100644 --- a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx +++ b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx @@ -29,24 +29,24 @@ struct SvXMLEnumMapEntry; */ class XMLBitmapRepeatOffsetPropertyHandler: public XMLPropertyHandler { - sal_Bool mbX; + bool mbX; OUString msVertical; OUString msHorizontal; public: - XMLBitmapRepeatOffsetPropertyHandler( sal_Bool bX ); + XMLBitmapRepeatOffsetPropertyHandler( bool bX ); // Just needed for virtual destruction virtual ~XMLBitmapRepeatOffsetPropertyHandler(); /// Imports the given value in cas of the given XML-data-type - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; /// Exports the given value in cas of the given XML-data-type - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; diff --git a/xmloff/inc/XMLClipPropertyHandler.hxx b/xmloff/inc/XMLClipPropertyHandler.hxx index 2df7f08bd596..c690218bd7b8 100644 --- a/xmloff/inc/XMLClipPropertyHandler.hxx +++ b/xmloff/inc/XMLClipPropertyHandler.hxx @@ -27,14 +27,14 @@ */ class XMLClipPropertyHandler : public XMLPropertyHandler { - sal_Bool m_bODF11; + bool m_bODF11; public: - XMLClipPropertyHandler( sal_Bool bODF11 ); + XMLClipPropertyHandler( bool bODF11 ); virtual ~XMLClipPropertyHandler(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - 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_BASICTYPES_HXX diff --git a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx index 3b57c55db3de..95dc21575573 100644 --- a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx +++ b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx @@ -38,13 +38,13 @@ public: virtual ~XMLFillBitmapSizePropertyHandler(); /// Imports the given value in cas of the given XML-data-type - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; /// Exports the given value in cas of the given XML-data-type - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; diff --git a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx index e2691960595b..b7d4e74bd21c 100644 --- a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx +++ b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx @@ -31,11 +31,11 @@ class XMLIsPercentagePropertyHandler : public XMLPropertyHandler public: virtual ~XMLIsPercentagePropertyHandler (); - 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; diff --git a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx index a7f94b43ac87..1b4e0e7735ba 100644 --- a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx +++ b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx @@ -28,16 +28,16 @@ class XMLPercentOrMeasurePropertyHandler : public XMLPropertyHandler { private: - sal_Bool mbPercent; + bool mbPercent; public: - XMLPercentOrMeasurePropertyHandler( sal_Bool bPercent ); + XMLPercentOrMeasurePropertyHandler( bool bPercent ); virtual ~XMLPercentOrMeasurePropertyHandler (); - 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; diff --git a/xmloff/inc/XMLRectangleMembersHandler.hxx b/xmloff/inc/XMLRectangleMembersHandler.hxx index 1f478af704b2..e216daf43a37 100644 --- a/xmloff/inc/XMLRectangleMembersHandler.hxx +++ b/xmloff/inc/XMLRectangleMembersHandler.hxx @@ -40,13 +40,13 @@ public: virtual ~XMLRectangleMembersHdl(); /// Imports the given value in cas of the given XML-data-type - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; /// Exports the given value in cas of the given XML-data-type - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; diff --git a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx index 6a533e7080fc..41dad369d525 100644 --- a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx +++ b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx @@ -35,11 +35,11 @@ public: const ::com::sun::star::uno::Any& r2 ) const; /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. - 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; diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx index 89e62cfc8184..3b82f7ace45a 100644 --- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx +++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx @@ -41,10 +41,10 @@ XMLAxisPositionPropertyHdl::XMLAxisPositionPropertyHdl( bool bCrossingValue ) XMLAxisPositionPropertyHdl::~XMLAxisPositionPropertyHdl() {} -sal_Bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, +bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { - sal_Bool bResult = false; + bool bResult = false; if( rStrImpValue.equals( GetXMLToken(XML_START) ) ) { @@ -80,10 +80,10 @@ sal_Bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue, return bResult; } -sal_Bool XMLAxisPositionPropertyHdl::exportXML( OUString& rStrExpValue, +bool XMLAxisPositionPropertyHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { - sal_Bool bResult = sal_False; + bool bResult = sal_False; OUStringBuffer sValueBuffer; if( m_bCrossingValue ) diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx index 01601fc00a85..95787da6627d 100644 --- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx +++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx @@ -27,8 +27,8 @@ public: XMLAxisPositionPropertyHdl( bool bCrossingValue ); virtual ~XMLAxisPositionPropertyHdl(); - 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; private: bool m_bCrossingValue; diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx index 3eee9e4e1e96..087ed323db0f 100644 --- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx +++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx @@ -34,7 +34,7 @@ XMLErrorBarStylePropertyHdl::~XMLErrorBarStylePropertyHdl() { } -sal_Bool XMLErrorBarStylePropertyHdl::exportXML( OUString& rStrExpValue, +bool XMLErrorBarStylePropertyHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { uno::Any aValue(rValue); diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx index 6cc4dfe70cf7..197bf9ac8e11 100644 --- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx +++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx @@ -27,7 +27,7 @@ public: XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ); virtual ~XMLErrorBarStylePropertyHdl(); - virtual sal_Bool exportXML( OUString& rStrExpValue, const ::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 // _XMLERRORBARSTYLEPROPERTYHDL_HXX_ diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx index d3f64b356965..7e89743b721d 100644 --- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx +++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star; XMLErrorIndicatorPropertyHdl::~XMLErrorIndicatorPropertyHdl() {} -sal_Bool XMLErrorIndicatorPropertyHdl::importXML( const OUString& rStrImpValue, +bool XMLErrorIndicatorPropertyHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { bool bValue(false); @@ -78,14 +78,14 @@ sal_Bool XMLErrorIndicatorPropertyHdl::importXML( const OUString& rStrImpValue, return sal_True; } -sal_Bool XMLErrorIndicatorPropertyHdl::exportXML( OUString& rStrExpValue, +bool XMLErrorIndicatorPropertyHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { OUStringBuffer aBuffer; chart::ChartErrorIndicatorType eType; rValue >>= eType; - sal_Bool bValue = ( eType == chart::ChartErrorIndicatorType_TOP_AND_BOTTOM || + bool bValue = ( eType == chart::ChartErrorIndicatorType_TOP_AND_BOTTOM || ( mbUpperIndicator ? ( eType == chart::ChartErrorIndicatorType_UPPER ) : ( eType == chart::ChartErrorIndicatorType_LOWER ))); diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx index 3b8ebcab1e2f..fb71f5d71b63 100644 --- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx +++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx @@ -24,15 +24,15 @@ class XMLErrorIndicatorPropertyHdl : public XMLPropertyHandler { private: - sal_Bool mbUpperIndicator; + bool mbUpperIndicator; public: - XMLErrorIndicatorPropertyHdl( sal_Bool bUpper ) : mbUpperIndicator( bUpper ) + XMLErrorIndicatorPropertyHdl( bool bUpper ) : mbUpperIndicator( bUpper ) {} virtual ~XMLErrorIndicatorPropertyHdl(); - 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 // _XMLERRORINDICATORPROPERTYHDL_HXX_ diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx index ac537488b4db..6d80ec85f552 100644 --- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx +++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx @@ -60,7 +60,7 @@ SvXMLSignedEnumMapEntry aXMLChartSymbolNameMap[] = { XML_TOKEN_INVALID, 0 } }; -sal_Bool lcl_convertEnum( +bool lcl_convertEnum( OUStringBuffer & rBuffer, sal_Int32 nValue, const SvXMLSignedEnumMapEntry *pMap ) @@ -83,7 +83,7 @@ sal_Bool lcl_convertEnum( return (eTok != XML_TOKEN_INVALID); } -sal_Bool lcl_convertEnum( +bool lcl_convertEnum( sal_Int32 & rEnum, const OUString & rValue, const SvXMLSignedEnumMapEntry *pMap ) @@ -111,10 +111,10 @@ XMLSymbolTypePropertyHdl::XMLSymbolTypePropertyHdl( bool bIsNamedSymbol ) XMLSymbolTypePropertyHdl::~XMLSymbolTypePropertyHdl() {} -sal_Bool XMLSymbolTypePropertyHdl::importXML( const OUString& rStrImpValue, +bool XMLSymbolTypePropertyHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { - sal_Bool bResult = sal_False; + bool bResult = false; if( m_bIsNamedSymbol ) { @@ -132,10 +132,10 @@ sal_Bool XMLSymbolTypePropertyHdl::importXML( const OUString& rStrImpValue, return bResult; } -sal_Bool XMLSymbolTypePropertyHdl::exportXML( OUString& rStrExpValue, +bool XMLSymbolTypePropertyHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { - sal_Bool bResult = sal_False; + bool bResult = false; sal_Int32 nType = -3; // NONE rValue >>= nType; diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx index f7b4c9cdb6ef..8fe5618b038b 100644 --- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx +++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx @@ -27,8 +27,8 @@ public: XMLSymbolTypePropertyHdl( bool bIsNamedSymbol ); virtual ~XMLSymbolTypePropertyHdl(); - 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; private: bool m_bIsNamedSymbol; diff --git a/xmloff/source/chart/XMLTextOrientationHdl.cxx b/xmloff/source/chart/XMLTextOrientationHdl.cxx index b206f45e6406..4e7527f19eff 100644 --- a/xmloff/source/chart/XMLTextOrientationHdl.cxx +++ b/xmloff/source/chart/XMLTextOrientationHdl.cxx @@ -28,34 +28,34 @@ XMLTextOrientationHdl::~XMLTextOrientationHdl() { } -sal_Bool XMLTextOrientationHdl::importXML( +bool XMLTextOrientationHdl::importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { - sal_Bool bRetval( sal_False ); + bool bRetval( false ); if( IsXMLToken( rStrImpValue, XML_LTR )) { rValue <<= static_cast< sal_Bool >( sal_False ); - bRetval = sal_True; + bRetval = true; } else if( IsXMLToken( rStrImpValue, XML_TTB )) { rValue <<= static_cast< sal_Bool >( sal_True ); - bRetval = sal_True; + bRetval = true; } return bRetval; } -sal_Bool XMLTextOrientationHdl::exportXML( +bool XMLTextOrientationHdl::exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { sal_Bool bVal (sal_False ); - sal_Bool bRetval( sal_False ); + bool bRetval( false ); if( rValue >>= bVal ) { @@ -63,7 +63,7 @@ sal_Bool XMLTextOrientationHdl::exportXML( rStrExpValue = GetXMLToken( XML_TTB ); else rStrExpValue = GetXMLToken( XML_LTR ); - bRetval = sal_True; + bRetval = true; } return bRetval; diff --git a/xmloff/source/chart/XMLTextOrientationHdl.hxx b/xmloff/source/chart/XMLTextOrientationHdl.hxx index 8c50a0757aea..1b21e8eb1dba 100644 --- a/xmloff/source/chart/XMLTextOrientationHdl.hxx +++ b/xmloff/source/chart/XMLTextOrientationHdl.hxx @@ -27,10 +27,10 @@ private: public: virtual ~XMLTextOrientationHdl(); - virtual sal_Bool importXML( const OUString& rStrImpValue, + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( OUString& rStrExpValue, + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; 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; diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx index cb190ef9a6f1..7590236225a5 100644 --- a/xmloff/source/forms/controlpropertyhdl.cxx +++ b/xmloff/source/forms/controlpropertyhdl.cxx @@ -132,17 +132,17 @@ namespace xmloff { } - sal_Bool OControlTextEmphasisHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + bool OControlTextEmphasisHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { OUStringBuffer aReturn; - sal_Bool bSuccess = sal_False; + bool bSuccess = false; sal_Int16 nFontEmphasis = sal_Int16(); if (_rValue >>= nFontEmphasis) { // the type sal_Int16 nType = nFontEmphasis & ~(awt::FontEmphasisMark::ABOVE | awt::FontEmphasisMark::BELOW); // the position of the mark - sal_Bool bBelow = 0 != (nFontEmphasis & awt::FontEmphasisMark::BELOW); + bool bBelow = 0 != (nFontEmphasis & awt::FontEmphasisMark::BELOW); // convert bSuccess = SvXMLUnitConverter::convertEnum(aReturn, nType, OEnumMapper::getEnumMap(OEnumMapper::epFontEmphasis), XML_NONE); @@ -158,13 +158,13 @@ namespace xmloff return bSuccess; } - sal_Bool OControlTextEmphasisHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + bool OControlTextEmphasisHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { - sal_Bool bSuccess = sal_True; + bool bSuccess = true; sal_uInt16 nEmphasis = awt::FontEmphasisMark::NONE; - sal_Bool bBelow = sal_False; - sal_Bool bHasPos = sal_False, bHasType = sal_False; + bool bBelow = false; + bool bHasPos = false, bHasType = false; OUString sToken; SvXMLTokenEnumerator aTokenEnum(_rStrImpValue); @@ -174,24 +174,24 @@ namespace xmloff { if (IsXMLToken(sToken, XML_ABOVE)) { - bBelow = sal_False; - bHasPos = sal_True; + bBelow = false; + bHasPos = true; } else if (IsXMLToken(sToken, XML_BELOW)) { - bBelow = sal_True; - bHasPos = sal_True; + bBelow = true; + bHasPos = true; } } if (!bHasType) { if (SvXMLUnitConverter::convertEnum(nEmphasis, sToken, OEnumMapper::getEnumMap(OEnumMapper::epFontEmphasis))) { - bHasType = sal_True; + bHasType = true; } else { - bSuccess = sal_False; + bSuccess = false; break; } } @@ -212,7 +212,7 @@ namespace xmloff { } - sal_Bool OControlBorderHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + bool OControlBorderHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { OUString sToken; SvXMLTokenEnumerator aTokens(_rStrImpValue); @@ -230,7 +230,7 @@ namespace xmloff if ( SvXMLUnitConverter::convertEnum( nStyle, sToken, OEnumMapper::getEnumMap( OEnumMapper::epBorderWidth ) ) ) { _rValue <<= nStyle; - return sal_True; + return true; } } @@ -241,17 +241,17 @@ namespace xmloff if (::sax::Converter::convertColor( nColor, sToken )) { _rValue <<= nColor; - return sal_True; + return true; } } } - return sal_False; + return false; } - sal_Bool OControlBorderHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + bool OControlBorderHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { - sal_Bool bSuccess = sal_False; + bool bSuccess = false; OUStringBuffer aOut; switch ( m_eFacet ) @@ -269,20 +269,20 @@ namespace xmloff if ( _rValue >>= nBorderColor ) { ::sax::Converter::convertColor(aOut, nBorderColor); - bSuccess = sal_True; + bSuccess = true; } } break; } // switch ( m_eFacet ) if ( !bSuccess ) - return sal_False; + return false; if ( !_rStrExpValue.isEmpty() ) _rStrExpValue += " "; _rStrExpValue += aOut.makeStringAndClear(); - return sal_True; + return true; } //= OFontWidthHandler @@ -290,7 +290,7 @@ namespace xmloff { } - sal_Bool OFontWidthHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + bool OFontWidthHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { sal_Int32 nWidth = 0; bool const bSuccess = ::sax::Converter::convertMeasure( @@ -301,7 +301,7 @@ namespace xmloff return bSuccess; } - sal_Bool OFontWidthHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + bool OFontWidthHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { sal_Int16 nWidth = 0; OUStringBuffer aResult; @@ -320,7 +320,7 @@ namespace xmloff { } - sal_Bool ORotationAngleHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + bool ORotationAngleHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { double fValue; bool const bSucces = @@ -334,10 +334,10 @@ namespace xmloff return bSucces; } - sal_Bool ORotationAngleHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + bool ORotationAngleHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { float fAngle = 0; - sal_Bool bSuccess = (_rValue >>= fAngle); + bool bSuccess = (_rValue >>= fAngle); if (bSuccess) { diff --git a/xmloff/source/style/AttributeContainerHandler.cxx b/xmloff/source/style/AttributeContainerHandler.cxx index d09f0ddb36e0..4cd5ac03fdcd 100644 --- a/xmloff/source/style/AttributeContainerHandler.cxx +++ b/xmloff/source/style/AttributeContainerHandler.cxx @@ -61,7 +61,7 @@ bool XMLAttributeContainerHandler::equals( for( sal_Int32 i=0; i < nCount; i++, pAttribName++ ) { if( !xContainer2->hasByName( *pAttribName ) ) - return sal_False; + return false; xContainer1->getByName( *pAttribName ) >>= aData1; xContainer2->getByName( *pAttribName ) >>= aData2; @@ -69,24 +69,24 @@ bool XMLAttributeContainerHandler::equals( if( ( aData1.Namespace != aData2.Namespace ) || ( aData1.Type != aData2.Type ) || ( aData1.Value != aData2.Value ) ) - return sal_False; + return false; } - return sal_True; + return true; } } - return sal_False; + return false; } -sal_Bool XMLAttributeContainerHandler::importXML( const OUString& /*rStrImpValue*/, Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const +bool XMLAttributeContainerHandler::importXML( const OUString& /*rStrImpValue*/, Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { - return sal_True; + return true; } -sal_Bool XMLAttributeContainerHandler::exportXML( OUString& /*rStrExpValue*/, const Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const +bool XMLAttributeContainerHandler::exportXML( OUString& /*rStrExpValue*/, const Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/DrawAspectHdl.cxx b/xmloff/source/style/DrawAspectHdl.cxx index 14ff712f3508..b25f37f8c1a9 100644 --- a/xmloff/source/style/DrawAspectHdl.cxx +++ b/xmloff/source/style/DrawAspectHdl.cxx @@ -51,7 +51,7 @@ DrawAspectHdl::~DrawAspectHdl() // nothing to do } -sal_Bool DrawAspectHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool DrawAspectHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_Int64 nAspect = 0; @@ -61,9 +61,9 @@ sal_Bool DrawAspectHdl::importXML( const OUString& rStrImpValue, uno::Any& rValu return nAspect > 0; } -sal_Bool DrawAspectHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool DrawAspectHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; OUStringBuffer aOut; sal_Int64 nAspect = 0; @@ -74,7 +74,7 @@ sal_Bool DrawAspectHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValu rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; diff --git a/xmloff/source/style/DrawAspectHdl.hxx b/xmloff/source/style/DrawAspectHdl.hxx index 786fc2fdad29..e73242a0855f 100644 --- a/xmloff/source/style/DrawAspectHdl.hxx +++ b/xmloff/source/style/DrawAspectHdl.hxx @@ -30,8 +30,8 @@ class DrawAspectHdl : public XMLPropertyHandler public: virtual ~DrawAspectHdl(); - 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_DRAWASPECTHDL_HXX diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx index 6ab210a6c1da..56bda1afa2cf 100644 --- a/xmloff/source/style/EnumPropertyHdl.cxx +++ b/xmloff/source/style/EnumPropertyHdl.cxx @@ -35,7 +35,7 @@ XMLEnumPropertyHdl::~XMLEnumPropertyHdl() // Nothing to do } -sal_Bool XMLEnumPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLEnumPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 nValue = 0; @@ -57,28 +57,28 @@ sal_Bool XMLEnumPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValu break; default: OSL_FAIL( "Wrong type for enum property handler!" ); - return sal_False; + return false; } - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool XMLEnumPropertyHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLEnumPropertyHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { sal_Int32 nValue = 0; if(!(rValue >>= nValue )) if(!::cppu::enum2int(nValue, rValue) ) - return sal_False; + return false; OUStringBuffer aOut; if(!SvXMLUnitConverter::convertEnum( aOut, nValue, mpEnumMap )) - return sal_False; + return false; rStrExpValue = aOut.makeStringAndClear(); - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/NamedBoolPropertyHdl.cxx b/xmloff/source/style/NamedBoolPropertyHdl.cxx index 871e8003d698..4a26274a13d2 100644 --- a/xmloff/source/style/NamedBoolPropertyHdl.cxx +++ b/xmloff/source/style/NamedBoolPropertyHdl.cxx @@ -35,24 +35,24 @@ XMLNamedBoolPropertyHdl::~XMLNamedBoolPropertyHdl() // Nothing to do } -sal_Bool XMLNamedBoolPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLNamedBoolPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { if( rStrImpValue == maTrueStr ) { rValue = ::cppu::bool2any( sal_True ); - return sal_True; + return true; } if( rStrImpValue == maFalseStr ) { rValue = ::cppu::bool2any( sal_False ); - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool XMLNamedBoolPropertyHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLNamedBoolPropertyHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { if( ::cppu::any2bool( rValue ) ) { @@ -63,7 +63,7 @@ sal_Bool XMLNamedBoolPropertyHdl::exportXML( OUString& rStrExpValue, const Any& rStrExpValue = maFalseStr; } - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/PageMasterPropHdl.cxx b/xmloff/source/style/PageMasterPropHdl.cxx index cd1212a6a984..cb5d2902617a 100644 --- a/xmloff/source/style/PageMasterPropHdl.cxx +++ b/xmloff/source/style/PageMasterPropHdl.cxx @@ -48,15 +48,15 @@ XMLPMPropHdl_PageStyleLayout::~XMLPMPropHdl_PageStyleLayout() bool XMLPMPropHdl_PageStyleLayout::equals( const Any& rAny1, const Any& rAny2 ) const { style::PageStyleLayout eLayout1, eLayout2; - return ((rAny1 >>= eLayout1) && (rAny2 >>= eLayout2)) ? (eLayout1 == eLayout2) : sal_False; + return ((rAny1 >>= eLayout1) && (rAny2 >>= eLayout2)) ? (eLayout1 == eLayout2) : false; } -sal_Bool XMLPMPropHdl_PageStyleLayout::importXML( +bool XMLPMPropHdl_PageStyleLayout::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_True; + bool bRet = true; if( IsXMLToken( rStrImpValue, XML_ALL ) ) rValue <<= PageStyleLayout_ALL; @@ -67,22 +67,22 @@ sal_Bool XMLPMPropHdl_PageStyleLayout::importXML( else if( IsXMLToken( rStrImpValue, XML_MIRRORED ) ) rValue <<= PageStyleLayout_MIRRORED; else - bRet = sal_False; + bRet = false; return bRet; } -sal_Bool XMLPMPropHdl_PageStyleLayout::exportXML( +bool XMLPMPropHdl_PageStyleLayout::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; PageStyleLayout eLayout; if( rValue >>= eLayout ) { - bRet = sal_True; + bRet = true; switch( eLayout ) { case PageStyleLayout_ALL: @@ -98,7 +98,7 @@ sal_Bool XMLPMPropHdl_PageStyleLayout::exportXML( rStrExpValue = GetXMLToken( XML_MIRRORED ); break; default: - bRet = sal_False; + bRet = false; } } @@ -111,15 +111,14 @@ XMLPMPropHdl_NumFormat::~XMLPMPropHdl_NumFormat() { } -sal_Bool XMLPMPropHdl_NumFormat::importXML( +bool XMLPMPropHdl_NumFormat::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { sal_Int16 nSync = sal_Int16(); sal_Int16 nNumType = NumberingType::NUMBER_NONE; - rUnitConverter.convertNumFormat( nNumType, rStrImpValue, OUString(), - sal_True ); + rUnitConverter.convertNumFormat( nNumType, rStrImpValue, OUString(), true ); if( !(rValue >>= nSync) ) nSync = NumberingType::NUMBER_NONE; @@ -141,15 +140,15 @@ sal_Bool XMLPMPropHdl_NumFormat::importXML( } rValue <<= nNumType; - return sal_True; + return true; } -sal_Bool XMLPMPropHdl_NumFormat::exportXML( +bool XMLPMPropHdl_NumFormat::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int16 nNumType = sal_Int16(); if( rValue >>= nNumType ) @@ -157,7 +156,7 @@ sal_Bool XMLPMPropHdl_NumFormat::exportXML( OUStringBuffer aBuffer( 10 ); rUnitConverter.convertNumFormat( aBuffer, nNumType ); rStrExpValue = aBuffer.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; } @@ -168,7 +167,7 @@ XMLPMPropHdl_NumLetterSync::~XMLPMPropHdl_NumLetterSync() { } -sal_Bool XMLPMPropHdl_NumLetterSync::importXML( +bool XMLPMPropHdl_NumLetterSync::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const @@ -176,7 +175,7 @@ sal_Bool XMLPMPropHdl_NumLetterSync::importXML( sal_Int16 nNumType; sal_Int16 nSync = NumberingType::NUMBER_NONE; rUnitConverter.convertNumFormat( nSync, rStrImpValue, - GetXMLToken( XML_A ), sal_True ); + GetXMLToken( XML_A ), true ); if( !(rValue >>= nNumType) ) nNumType = NumberingType::NUMBER_NONE; @@ -195,15 +194,15 @@ sal_Bool XMLPMPropHdl_NumLetterSync::importXML( } rValue <<= nNumType; - return sal_True; + return true; } -sal_Bool XMLPMPropHdl_NumLetterSync::exportXML( +bool XMLPMPropHdl_NumLetterSync::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int16 nNumType = sal_Int16(); if( rValue >>= nNumType ) @@ -222,17 +221,17 @@ XMLPMPropHdl_PaperTrayNumber::~XMLPMPropHdl_PaperTrayNumber() { } -sal_Bool XMLPMPropHdl_PaperTrayNumber::importXML( +bool XMLPMPropHdl_PaperTrayNumber::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( IsXMLToken( rStrImpValue, XML_DEFAULT ) ) { rValue <<= DEFAULT_PAPERTRAY; - bRet = sal_True; + bRet = true; } else { @@ -240,19 +239,19 @@ sal_Bool XMLPMPropHdl_PaperTrayNumber::importXML( if (::sax::Converter::convertNumber( nPaperTray, rStrImpValue, 0 )) { rValue <<= nPaperTray; - bRet = sal_True; + bRet = true; } } return bRet; } -sal_Bool XMLPMPropHdl_PaperTrayNumber::exportXML( +bool XMLPMPropHdl_PaperTrayNumber::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nPaperTray = 0; if( rValue >>= nPaperTray ) @@ -265,7 +264,7 @@ sal_Bool XMLPMPropHdl_PaperTrayNumber::exportXML( ::sax::Converter::convertNumber( aBuffer, nPaperTray ); rStrExpValue = aBuffer.makeStringAndClear(); } - bRet = sal_True; + bRet = true; } return bRet; } @@ -281,14 +280,14 @@ XMLPMPropHdl_Print::~XMLPMPropHdl_Print() { } -sal_Bool XMLPMPropHdl_Print::importXML( +bool XMLPMPropHdl_Print::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { sal_Unicode cToken = ' '; sal_Int32 nTokenIndex = 0; - sal_Bool bFound = sal_False; + bool bFound = false; do { @@ -297,10 +296,10 @@ sal_Bool XMLPMPropHdl_Print::importXML( while ( (nTokenIndex >= 0) && !bFound ); setBOOL( rValue, bFound ); - return sal_True; + return true; } -sal_Bool XMLPMPropHdl_Print::exportXML( +bool XMLPMPropHdl_Print::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const @@ -312,7 +311,7 @@ sal_Bool XMLPMPropHdl_Print::exportXML( rStrExpValue += sAttrValue; } - return sal_True; + return true; } // property handler for style:table-centering @@ -321,34 +320,34 @@ XMLPMPropHdl_CenterHorizontal::~XMLPMPropHdl_CenterHorizontal() { } -sal_Bool XMLPMPropHdl_CenterHorizontal::importXML( +bool XMLPMPropHdl_CenterHorizontal::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if (!rStrImpValue.isEmpty()) if (IsXMLToken( rStrImpValue, XML_BOTH) || IsXMLToken( rStrImpValue, XML_HORIZONTAL)) { rValue = ::cppu::bool2any(sal_True); - bRet = sal_True; + bRet = true; } return bRet; } -sal_Bool XMLPMPropHdl_CenterHorizontal::exportXML( +bool XMLPMPropHdl_CenterHorizontal::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if ( ::cppu::any2bool( rValue ) ) { - bRet = sal_True; + bRet = true; if (!rStrExpValue.isEmpty()) rStrExpValue = GetXMLToken(XML_BOTH); else @@ -362,34 +361,34 @@ XMLPMPropHdl_CenterVertical::~XMLPMPropHdl_CenterVertical() { } -sal_Bool XMLPMPropHdl_CenterVertical::importXML( +bool XMLPMPropHdl_CenterVertical::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if (!rStrImpValue.isEmpty()) if (IsXMLToken(rStrImpValue, XML_BOTH) || IsXMLToken(rStrImpValue, XML_VERTICAL) ) { rValue = ::cppu::bool2any(sal_True); - bRet = sal_True; + bRet = true; } return bRet; } -sal_Bool XMLPMPropHdl_CenterVertical::exportXML( +bool XMLPMPropHdl_CenterVertical::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if ( ::cppu::any2bool( rValue ) ) { - bRet = sal_True; + bRet = true; if (!rStrExpValue.isEmpty()) rStrExpValue = GetXMLToken(XML_BOTH); else diff --git a/xmloff/source/style/PageMasterPropHdl.hxx b/xmloff/source/style/PageMasterPropHdl.hxx index 7bfdedbd017e..f12389cfce82 100644 --- a/xmloff/source/style/PageMasterPropHdl.hxx +++ b/xmloff/source/style/PageMasterPropHdl.hxx @@ -34,12 +34,12 @@ public: const ::com::sun::star::uno::Any& rAny1, const ::com::sun::star::uno::Any& rAny2 ) const; - 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 @@ -52,12 +52,12 @@ class XMLPMPropHdl_NumFormat : public XMLPropertyHandler { public: virtual ~XMLPMPropHdl_NumFormat(); - 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 @@ -70,12 +70,12 @@ class XMLPMPropHdl_NumLetterSync : public XMLPropertyHandler { public: virtual ~XMLPMPropHdl_NumLetterSync(); - 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 @@ -88,12 +88,12 @@ class XMLPMPropHdl_PaperTrayNumber : public XMLPropertyHandler { public: virtual ~XMLPMPropHdl_PaperTrayNumber(); - 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 @@ -111,12 +111,12 @@ public: XMLPMPropHdl_Print( enum ::xmloff::token::XMLTokenEnum eValue ); virtual ~XMLPMPropHdl_Print(); - 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 @@ -129,12 +129,12 @@ class XMLPMPropHdl_CenterHorizontal : public XMLPropertyHandler { public: virtual ~XMLPMPropHdl_CenterHorizontal(); - 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 @@ -145,12 +145,12 @@ class XMLPMPropHdl_CenterVertical : public XMLPropertyHandler { public: virtual ~XMLPMPropHdl_CenterVertical(); - 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 diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx index 5c3f02f99ea6..19754849c487 100644 --- a/xmloff/source/style/WordWrapPropertyHdl.cxx +++ b/xmloff/source/style/WordWrapPropertyHdl.cxx @@ -42,18 +42,19 @@ XMLWordWrapPropertyHdl::~XMLWordWrapPropertyHdl() // Nothing to do } -sal_Bool XMLWordWrapPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLWordWrapPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bValue = sal_False, bRetValue = sal_False; + bool bRetValue = false; + sal_Bool bValue = sal_False; if( rStrImpValue == GetXMLToken( xmloff::token::XML_WRAP ) ) { bValue = sal_True; - bRetValue = sal_True; + bRetValue = true; } if( rStrImpValue == GetXMLToken( xmloff::token::XML_NO_WRAP ) ) { bValue = sal_False; - bRetValue = sal_True; + bRetValue = true; } if ( bRetValue && mpImport ) { @@ -73,7 +74,7 @@ sal_Bool XMLWordWrapPropertyHdl::importXML( const OUString& rStrImpValue, Any& r return bRetValue; } -sal_Bool XMLWordWrapPropertyHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLWordWrapPropertyHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { if( ::cppu::any2bool( rValue ) ) { @@ -83,7 +84,7 @@ sal_Bool XMLWordWrapPropertyHdl::exportXML( OUString& rStrExpValue, const Any& r { rStrExpValue = GetXMLToken( xmloff::token::XML_NO_WRAP ); } - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx index 8e926ff2f0a6..b611c5d25763 100644 --- a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx +++ b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx @@ -35,21 +35,21 @@ XMLBitmapLogicalSizePropertyHandler::~XMLBitmapLogicalSizePropertyHandler() { } -sal_Bool XMLBitmapLogicalSizePropertyHandler::importXML( +bool XMLBitmapLogicalSizePropertyHandler::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { rValue = ::cppu::bool2any( rStrImpValue.indexOf( sal_Unicode('%') ) == -1 ); - return sal_True; + return true; } -sal_Bool XMLBitmapLogicalSizePropertyHandler::exportXML( +bool XMLBitmapLogicalSizePropertyHandler::exportXML( OUString&, const Any&, const SvXMLUnitConverter& ) const { - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx b/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx index 5dd665793559..0855c8a78a37 100644 --- a/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx +++ b/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx @@ -33,7 +33,7 @@ using ::xmloff::token::XML_VERTICAL; using ::xmloff::token::XML_HORIZONTAL; -XMLBitmapRepeatOffsetPropertyHandler::XMLBitmapRepeatOffsetPropertyHandler( sal_Bool bX ) +XMLBitmapRepeatOffsetPropertyHandler::XMLBitmapRepeatOffsetPropertyHandler( bool bX ) : mbX( bX ), msVertical( GetXMLToken(XML_VERTICAL) ), msHorizontal( GetXMLToken(XML_HORIZONTAL) ) @@ -44,7 +44,7 @@ XMLBitmapRepeatOffsetPropertyHandler::~XMLBitmapRepeatOffsetPropertyHandler() { } -sal_Bool XMLBitmapRepeatOffsetPropertyHandler::importXML( +bool XMLBitmapRepeatOffsetPropertyHandler::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const @@ -61,17 +61,17 @@ sal_Bool XMLBitmapRepeatOffsetPropertyHandler::importXML( if( ( mbX && ( aToken == msHorizontal ) ) || ( !mbX && ( aToken == msVertical ) ) ) { rValue <<= nValue; - return sal_True; + return true; } } } } - return sal_False; + return false; } -sal_Bool XMLBitmapRepeatOffsetPropertyHandler::exportXML( +bool XMLBitmapRepeatOffsetPropertyHandler::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const @@ -86,10 +86,10 @@ sal_Bool XMLBitmapRepeatOffsetPropertyHandler::exportXML( aOut.append( mbX ? msHorizontal : msVertical ); rStrExpValue = aOut.makeStringAndClear(); - return sal_True; + return true; } - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx index ff3964e4dec7..92f145fc69f7 100644 --- a/xmloff/source/style/XMLClipPropertyHandler.cxx +++ b/xmloff/source/style/XMLClipPropertyHandler.cxx @@ -33,7 +33,7 @@ using namespace ::xmloff::token; // class XMLMeasurePropHdl // -XMLClipPropertyHandler::XMLClipPropertyHandler( sal_Bool bODF11 ) : +XMLClipPropertyHandler::XMLClipPropertyHandler( bool bODF11 ) : m_bODF11( bODF11 ) { } @@ -57,9 +57,9 @@ bool XMLClipPropertyHandler::equals( aCrop1.Right == aCrop2.Right; } -sal_Bool XMLClipPropertyHandler::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLClipPropertyHandler::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nLen = rStrImpValue.getLength(); if( nLen > 6 && rStrImpValue.startsWith( GetXMLToken(XML_RECT)) && @@ -69,7 +69,7 @@ sal_Bool XMLClipPropertyHandler::importXML( const OUString& rStrImpValue, uno::A GraphicCrop aCrop; OUString sTmp( rStrImpValue.copy( 5, nLen-6 ) ); - sal_Bool bHasComma = sTmp.indexOf( ',' ) != -1; + bool bHasComma = sTmp.indexOf( ',' ) != -1; SvXMLTokenEnumerator aTokenEnum( sTmp, bHasComma ? ',' : ' ' ); sal_uInt16 nPos = 0; @@ -99,9 +99,9 @@ sal_Bool XMLClipPropertyHandler::importXML( const OUString& rStrImpValue, uno::A return bRet; } -sal_Bool XMLClipPropertyHandler::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLClipPropertyHandler::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Bool bRet = sal_False; + bool bRet = false; OUStringBuffer aOut(30); GraphicCrop aCrop; @@ -125,7 +125,7 @@ sal_Bool XMLClipPropertyHandler::exportXML( OUString& rStrExpValue, const uno::A aOut.append( (sal_Unicode)')' ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; diff --git a/xmloff/source/style/XMLConstantsPropertyHandler.cxx b/xmloff/source/style/XMLConstantsPropertyHandler.cxx index 096891164b17..d18a73627655 100644 --- a/xmloff/source/style/XMLConstantsPropertyHandler.cxx +++ b/xmloff/source/style/XMLConstantsPropertyHandler.cxx @@ -38,13 +38,13 @@ XMLConstantsPropertyHandler::~XMLConstantsPropertyHandler() { } -sal_Bool XMLConstantsPropertyHandler::importXML( +bool XMLConstantsPropertyHandler::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 nEnum; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( + bool bRet = SvXMLUnitConverter::convertEnum( nEnum, rStrImpValue, pMap ); if( bRet ) @@ -53,14 +53,14 @@ sal_Bool XMLConstantsPropertyHandler::importXML( return bRet; } -sal_Bool XMLConstantsPropertyHandler::exportXML( +bool XMLConstantsPropertyHandler::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { OUStringBuffer aOut; - sal_Bool bRet = false; + bool bRet = false; sal_Int32 nEnum = 0; diff --git a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx index 61269a6f805d..7e9ebb569c6c 100644 --- a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx +++ b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx @@ -37,13 +37,13 @@ XMLFillBitmapSizePropertyHandler::~XMLFillBitmapSizePropertyHandler() { } -sal_Bool XMLFillBitmapSizePropertyHandler::importXML( +bool XMLFillBitmapSizePropertyHandler::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { sal_Int32 nValue; - sal_Bool bRet; + bool bRet; if( rStrImpValue.indexOf( sal_Unicode('%') ) != -1 ) { @@ -61,7 +61,7 @@ sal_Bool XMLFillBitmapSizePropertyHandler::importXML( return bRet; } -sal_Bool XMLFillBitmapSizePropertyHandler::exportXML( +bool XMLFillBitmapSizePropertyHandler::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const @@ -81,10 +81,10 @@ sal_Bool XMLFillBitmapSizePropertyHandler::exportXML( } rStrExpValue = aOut.makeStringAndClear(); - return sal_True; + return true; } - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx index 628805ee9069..1fb975405367 100644 --- a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx +++ b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx @@ -29,22 +29,22 @@ XMLIsPercentagePropertyHandler::~XMLIsPercentagePropertyHandler() { } -sal_Bool XMLIsPercentagePropertyHandler::importXML( +bool XMLIsPercentagePropertyHandler::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { rValue <<= (sal_Bool)(rStrImpValue.indexOf( sal_Unicode('%') ) != -1); - return sal_True; + return true; } -sal_Bool XMLIsPercentagePropertyHandler::exportXML( +bool XMLIsPercentagePropertyHandler::exportXML( OUString&, const Any&, const SvXMLUnitConverter& ) const { OSL_FAIL( "XMLIsPercentagePropertyHandler is not for export!" ); - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx index fc13561ed928..081639b79252 100644 --- a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx +++ b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -XMLPercentOrMeasurePropertyHandler::XMLPercentOrMeasurePropertyHandler( sal_Bool bPercent ) +XMLPercentOrMeasurePropertyHandler::XMLPercentOrMeasurePropertyHandler( bool bPercent ) : mbPercent( bPercent ) { } @@ -41,32 +41,32 @@ XMLPercentOrMeasurePropertyHandler::~XMLPercentOrMeasurePropertyHandler() { } -sal_Bool XMLPercentOrMeasurePropertyHandler::importXML( +bool XMLPercentOrMeasurePropertyHandler::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { if( (rStrImpValue.indexOf( sal_Unicode('%') ) != -1) != mbPercent ) - return sal_False; + return false; sal_Int32 nValue; if( mbPercent ) { if (!::sax::Converter::convertPercent( nValue, rStrImpValue )) - return sal_False; + return false; } else { if (!rUnitConverter.convertMeasureToCore( nValue, rStrImpValue )) - return sal_False; + return false; } rValue <<= nValue; - return sal_True; + return true; } -sal_Bool XMLPercentOrMeasurePropertyHandler::exportXML( +bool XMLPercentOrMeasurePropertyHandler::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const @@ -75,7 +75,7 @@ sal_Bool XMLPercentOrMeasurePropertyHandler::exportXML( sal_Int32 nValue = 0; if( !(rValue >>= nValue ) ) - return sal_False; + return false; if( mbPercent ) { @@ -87,7 +87,7 @@ sal_Bool XMLPercentOrMeasurePropertyHandler::exportXML( } rStrExpValue = aOut.makeStringAndClear(); - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/XMLRectangleMembersHandler.cxx b/xmloff/source/style/XMLRectangleMembersHandler.cxx index 5233ef6fb25a..63637fe3acb7 100644 --- a/xmloff/source/style/XMLRectangleMembersHandler.cxx +++ b/xmloff/source/style/XMLRectangleMembersHandler.cxx @@ -38,7 +38,7 @@ XMLRectangleMembersHdl::~XMLRectangleMembersHdl() { } -sal_Bool XMLRectangleMembersHdl::importXML( +bool XMLRectangleMembersHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const @@ -68,13 +68,13 @@ sal_Bool XMLRectangleMembersHdl::importXML( } rValue <<= aRect; - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool XMLRectangleMembersHdl::exportXML( +bool XMLRectangleMembersHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const @@ -106,7 +106,7 @@ sal_Bool XMLRectangleMembersHdl::exportXML( OUStringBuffer sBuffer; rUnitConverter.convertMeasureToXML( sBuffer, nValue ); rStrExpValue = sBuffer.makeStringAndClear(); - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/adjushdl.cxx b/xmloff/source/style/adjushdl.cxx index b473ac6f338e..7f431b4f8e80 100644 --- a/xmloff/source/style/adjushdl.cxx +++ b/xmloff/source/style/adjushdl.cxx @@ -59,26 +59,26 @@ XMLParaAdjustPropHdl::~XMLParaAdjustPropHdl() // nothing to do } -sal_Bool XMLParaAdjustPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLParaAdjustPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 eAdjust; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( eAdjust, rStrImpValue, pXML_Para_Adjust_Enum ); + bool bRet = SvXMLUnitConverter::convertEnum( eAdjust, rStrImpValue, pXML_Para_Adjust_Enum ); if( bRet ) rValue <<= (sal_Int16)eAdjust; return bRet; } -sal_Bool XMLParaAdjustPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLParaAdjustPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { if(!rValue.hasValue()) - return sal_False; + return false; OUStringBuffer aOut; sal_Int16 nVal = 0; rValue >>= nVal; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( aOut, nVal, pXML_Para_Adjust_Enum, XML_START ); + bool bRet = SvXMLUnitConverter::convertEnum( aOut, nVal, pXML_Para_Adjust_Enum, XML_START ); rStrExpValue = aOut.makeStringAndClear(); @@ -94,21 +94,21 @@ XMLLastLineAdjustPropHdl::~XMLLastLineAdjustPropHdl() // nothing to do } -sal_Bool XMLLastLineAdjustPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLLastLineAdjustPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 eAdjust; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( eAdjust, rStrImpValue, pXML_Para_Align_Last_Enum ); + bool bRet = SvXMLUnitConverter::convertEnum( eAdjust, rStrImpValue, pXML_Para_Align_Last_Enum ); if( bRet ) rValue <<= (sal_Int16)eAdjust; return bRet; } -sal_Bool XMLLastLineAdjustPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLLastLineAdjustPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { OUStringBuffer aOut; sal_Int16 nVal = 0; - sal_Bool bRet = sal_False; + bool bRet = false; rValue >>= nVal; diff --git a/xmloff/source/style/adjushdl.hxx b/xmloff/source/style/adjushdl.hxx index 634b5cfa2404..00d53d91c8cf 100644 --- a/xmloff/source/style/adjushdl.hxx +++ b/xmloff/source/style/adjushdl.hxx @@ -30,8 +30,8 @@ class XMLParaAdjustPropHdl : public XMLPropertyHandler public: virtual ~XMLParaAdjustPropHdl(); - 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; }; /** @@ -42,8 +42,8 @@ class XMLLastLineAdjustPropHdl : public XMLPropertyHandler public: virtual ~XMLLastLineAdjustPropHdl(); - 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_ADJUSTTYPES_HXX diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx index b0ec3e7deb59..fe48bf3d9ff6 100644 --- a/xmloff/source/style/backhdl.cxx +++ b/xmloff/source/style/backhdl.cxx @@ -51,20 +51,20 @@ XMLBackGraphicPositionPropHdl::~XMLBackGraphicPositionPropHdl() // Nothing to do } -sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_True; + bool bRet = true; style::GraphicLocation ePos = style::GraphicLocation_NONE, eTmp; sal_uInt16 nTmp; SvXMLTokenEnumerator aTokenEnum( rStrImpValue ); OUString aToken; - sal_Bool bHori = sal_False, bVert = sal_False; + bool bHori = false, bVert = false; while( bRet && aTokenEnum.getNextToken( aToken ) ) { if( bHori && bVert ) { - bRet = sal_False; + bRet = false; } else if( -1 != aToken.indexOf( sal_Unicode('%') ) ) { @@ -76,7 +76,7 @@ sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue, ePos = nPrc < 25 ? style::GraphicLocation_LEFT_TOP : (nPrc < 75 ? style::GraphicLocation_MIDDLE_MIDDLE : style::GraphicLocation_RIGHT_BOTTOM); - bHori = sal_True; + bHori = true; } else { @@ -84,13 +84,13 @@ sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue, (nPrc < 75 ? style::GraphicLocation_LEFT_MIDDLE : style::GraphicLocation_LEFT_BOTTOM); MergeXMLVertPos( ePos, eTmp ); - bVert = sal_True; + bVert = true; } } else { // wrong percentage - bRet = sal_False; + bRet = false; } } else if( IsXMLToken( aToken, XML_CENTER ) ) @@ -109,9 +109,9 @@ sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue, else if( !bHori ) ePos = (style::GraphicLocation)nTmp; else - bRet = sal_False; + bRet = false; - bHori = sal_True; + bHori = true; } else if( SvXMLUnitConverter::convertEnum( nTmp, aToken, pXML_BrushVerticalPos ) ) { @@ -120,12 +120,12 @@ sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue, else if( !bVert ) ePos = (style::GraphicLocation)nTmp; else - bRet = sal_False; - bVert = sal_True; + bRet = false; + bVert = true; } else { - bRet = sal_False; + bRet = false; } } @@ -136,9 +136,9 @@ sal_Bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue, return bRet; } -sal_Bool XMLBackGraphicPositionPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLBackGraphicPositionPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_True; + bool bRet = true; OUStringBuffer aOut; style::GraphicLocation eLocation; @@ -148,12 +148,12 @@ sal_Bool XMLBackGraphicPositionPropHdl::exportXML( OUString& rStrExpValue, const if( rValue >>= nValue ) eLocation = (style::GraphicLocation)nValue; else - bRet = sal_False; + bRet = false; } if( bRet ) { - bRet = sal_False; + bRet = false; switch( eLocation ) { @@ -161,19 +161,19 @@ sal_Bool XMLBackGraphicPositionPropHdl::exportXML( OUString& rStrExpValue, const case style::GraphicLocation_MIDDLE_TOP: case style::GraphicLocation_RIGHT_TOP: aOut.append( GetXMLToken(XML_TOP) ); - bRet = sal_True; + bRet = true; break; case style::GraphicLocation_LEFT_MIDDLE: case style::GraphicLocation_MIDDLE_MIDDLE: case style::GraphicLocation_RIGHT_MIDDLE: aOut.append( GetXMLToken(XML_CENTER) ); - bRet = sal_True; + bRet = true; break; case style::GraphicLocation_LEFT_BOTTOM: case style::GraphicLocation_MIDDLE_BOTTOM: case style::GraphicLocation_RIGHT_BOTTOM: aOut.append( GetXMLToken(XML_BOTTOM) ); - bRet = sal_True; + bRet = true; break; default: break; diff --git a/xmloff/source/style/backhdl.hxx b/xmloff/source/style/backhdl.hxx index 13e0df9aaec2..29343ce143e9 100644 --- a/xmloff/source/style/backhdl.hxx +++ b/xmloff/source/style/backhdl.hxx @@ -33,8 +33,8 @@ public: /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. using XMLPropertyHandler::importXML; - 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; private: void MergeXMLHoriPos( ::com::sun::star::style::GraphicLocation& ePos, ::com::sun::star::style::GraphicLocation eHori ) const; diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx index 4e96eb09807e..b211cef5fd2d 100644 --- a/xmloff/source/style/bordrhdl.cxx +++ b/xmloff/source/style/bordrhdl.cxx @@ -103,7 +103,7 @@ XMLBorderWidthHdl::~XMLBorderWidthHdl() // nothing to do } -sal_Bool XMLBorderWidthHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLBorderWidthHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { SvXMLTokenEnumerator aTokenEnum( rStrImpValue ); @@ -111,22 +111,22 @@ sal_Bool XMLBorderWidthHdl::importXML( const OUString& rStrImpValue, uno::Any& r OUString aToken; if( !aTokenEnum.getNextToken( aToken ) ) - return sal_False; + return false; if (!rUnitConverter.convertMeasureToCore( nInWidth, aToken, 0, 500 )) - return sal_False; + return false; if( !aTokenEnum.getNextToken( aToken ) ) - return sal_False; + return false; if (!rUnitConverter.convertMeasureToCore( nDistance, aToken, 0, 500 )) - return sal_False; + return false; if( !aTokenEnum.getNextToken( aToken ) ) - return sal_False; + return false; if (!rUnitConverter.convertMeasureToCore( nOutWidth, aToken, 0, 500 )) - return sal_False; + return false; table::BorderLine2 aBorderLine; if(!(rValue >>= aBorderLine)) @@ -137,16 +137,16 @@ sal_Bool XMLBorderWidthHdl::importXML( const OUString& rStrImpValue, uno::Any& r aBorderLine.LineDistance = sal::static_int_cast< sal_Int16 >(nDistance); rValue <<= aBorderLine; - return sal_True; + return true; } -sal_Bool XMLBorderWidthHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLBorderWidthHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { OUStringBuffer aOut; table::BorderLine2 aBorderLine; if(!(rValue >>= aBorderLine)) - return sal_False; + return false; bool bDouble = false; switch ( aBorderLine.LineStyle ) @@ -165,7 +165,7 @@ sal_Bool XMLBorderWidthHdl::exportXML( OUString& rStrExpValue, const uno::Any& r } if( ( aBorderLine.LineDistance == 0 && aBorderLine.InnerLineWidth == 0 ) || !bDouble ) - return sal_False; + return false; rUnitConverter.convertMeasureToXML( aOut, aBorderLine.InnerLineWidth ); aOut.append( sal_Unicode( ' ' ) ); @@ -174,7 +174,7 @@ sal_Bool XMLBorderWidthHdl::exportXML( OUString& rStrExpValue, const uno::Any& r rUnitConverter.convertMeasureToXML( aOut, aBorderLine.OuterLineWidth ); rStrExpValue = aOut.makeStringAndClear(); - return sal_True; + return true; } // @@ -186,14 +186,14 @@ XMLBorderHdl::~XMLBorderHdl() // nothing to do } -sal_Bool XMLBorderHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLBorderHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { OUString aToken; SvXMLTokenEnumerator aTokens( rStrImpValue ); - sal_Bool bHasStyle = sal_False; - sal_Bool bHasWidth = sal_False; - sal_Bool bHasColor = sal_False; + bool bHasStyle = false; + bool bHasWidth = false; + bool bHasColor = false; sal_uInt16 nStyle = USHRT_MAX; sal_uInt16 nWidth = 0; @@ -207,36 +207,36 @@ sal_Bool XMLBorderHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue rUnitConverter.convertEnum( nNamedWidth, aToken, pXML_NamedBorderWidths ) ) { - bHasWidth = sal_True; + bHasWidth = true; } else if( !bHasStyle && rUnitConverter.convertEnum( nStyle, aToken, pXML_BorderStyles ) ) { - bHasStyle = sal_True; + bHasStyle = true; } else if (!bHasColor && ::sax::Converter::convertColor(nColor, aToken)) { - bHasColor = sal_True; + bHasColor = true; } else if( !bHasWidth && rUnitConverter.convertMeasureToCore( nTemp, aToken, 0, USHRT_MAX ) ) { nWidth = (sal_uInt16)nTemp; - bHasWidth = sal_True; + bHasWidth = true; } else { // missformed - return sal_False; + return false; } } // if there is no style or a different style than none but no width, // then the declaration is not valid. if( !bHasStyle || (API_LINE_NONE != nStyle && !bHasWidth) ) - return sal_False; + return false; table::BorderLine2 aBorderLine; if(!(rValue >>= aBorderLine)) @@ -282,16 +282,16 @@ sal_Bool XMLBorderHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue } rValue <<= aBorderLine; - return sal_True; + return true; } -sal_Bool XMLBorderHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const +bool XMLBorderHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { OUStringBuffer aOut; table::BorderLine2 aBorderLine; if(!(rValue >>= aBorderLine)) - return sal_False; + return false; sal_Int32 nWidth = aBorderLine.LineWidth; @@ -352,7 +352,7 @@ sal_Bool XMLBorderHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue rStrExpValue = aOut.makeStringAndClear(); - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/bordrhdl.hxx b/xmloff/source/style/bordrhdl.hxx index 95c4ed203e96..6485ba2f25f9 100644 --- a/xmloff/source/style/bordrhdl.hxx +++ b/xmloff/source/style/bordrhdl.hxx @@ -30,8 +30,8 @@ class XMLBorderWidthHdl : public XMLPropertyHandler public: virtual ~XMLBorderWidthHdl(); - 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 XMLBorderHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLBorderHdl : public XMLPropertyHandler public: virtual ~XMLBorderHdl(); - 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_CHARLOCALETYPES_HXX diff --git a/xmloff/source/style/breakhdl.cxx b/xmloff/source/style/breakhdl.cxx index 8b0b642f3d5d..88b34d679176 100644 --- a/xmloff/source/style/breakhdl.cxx +++ b/xmloff/source/style/breakhdl.cxx @@ -46,10 +46,10 @@ XMLFmtBreakBeforePropHdl::~XMLFmtBreakBeforePropHdl() // Nothing to do } -sal_Bool XMLFmtBreakBeforePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLFmtBreakBeforePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 nEnum; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( nEnum, rStrImpValue, pXML_BreakTypes ); + bool bRet = SvXMLUnitConverter::convertEnum( nEnum, rStrImpValue, pXML_BreakTypes ); if( bRet ) { style::BreakType eBreak; @@ -71,7 +71,7 @@ sal_Bool XMLFmtBreakBeforePropHdl::importXML( const OUString& rStrImpValue, uno: return bRet; } -sal_Bool XMLFmtBreakBeforePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLFmtBreakBeforePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { style::BreakType eBreak; @@ -79,7 +79,7 @@ sal_Bool XMLFmtBreakBeforePropHdl::exportXML( OUString& rStrExpValue, const uno: { sal_Int32 nValue = 0; if( !( rValue >>= nValue ) ) - return sal_False; + return false; eBreak = (style::BreakType) nValue; } @@ -97,14 +97,14 @@ sal_Bool XMLFmtBreakBeforePropHdl::exportXML( OUString& rStrExpValue, const uno: nEnum = 0; break; default: - return sal_False; + return false; } OUStringBuffer aOut; - /* sal_Bool bOk = */ SvXMLUnitConverter::convertEnum( aOut, nEnum, pXML_BreakTypes ); + /* bool bOk = */ SvXMLUnitConverter::convertEnum( aOut, nEnum, pXML_BreakTypes ); rStrExpValue = aOut.makeStringAndClear(); - return sal_True; + return true; } // @@ -116,10 +116,10 @@ XMLFmtBreakAfterPropHdl::~XMLFmtBreakAfterPropHdl() // Nothing to do } -sal_Bool XMLFmtBreakAfterPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLFmtBreakAfterPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 nEnum; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( nEnum, rStrImpValue, pXML_BreakTypes ); + bool bRet = SvXMLUnitConverter::convertEnum( nEnum, rStrImpValue, pXML_BreakTypes ); if( bRet ) { style::BreakType eBreak; @@ -141,7 +141,7 @@ sal_Bool XMLFmtBreakAfterPropHdl::importXML( const OUString& rStrImpValue, uno:: return bRet; } -sal_Bool XMLFmtBreakAfterPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLFmtBreakAfterPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { style::BreakType eBreak; @@ -149,7 +149,7 @@ sal_Bool XMLFmtBreakAfterPropHdl::exportXML( OUString& rStrExpValue, const uno:: { sal_Int32 nValue = 0; if( !( rValue >>= nValue ) ) - return sal_False; + return false; eBreak = (style::BreakType) nValue; } @@ -167,14 +167,14 @@ sal_Bool XMLFmtBreakAfterPropHdl::exportXML( OUString& rStrExpValue, const uno:: nEnum = 0; break; default: - return sal_False; + return false; } OUStringBuffer aOut; - /* sal_Bool bOk = */ SvXMLUnitConverter::convertEnum( aOut, nEnum, pXML_BreakTypes ); + /* bool bOk = */ SvXMLUnitConverter::convertEnum( aOut, nEnum, pXML_BreakTypes ); rStrExpValue = aOut.makeStringAndClear(); - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/breakhdl.hxx b/xmloff/source/style/breakhdl.hxx index 51d2c9959fe1..2faf4c84c1a6 100644 --- a/xmloff/source/style/breakhdl.hxx +++ b/xmloff/source/style/breakhdl.hxx @@ -30,8 +30,8 @@ class XMLFmtBreakBeforePropHdl : public XMLPropertyHandler public: virtual ~XMLFmtBreakBeforePropHdl(); - 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; }; /** @@ -42,8 +42,8 @@ class XMLFmtBreakAfterPropHdl : public XMLPropertyHandler public: virtual ~XMLFmtBreakAfterPropHdl(); - 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_BREAKTYPES_HXX diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx index 154505af43fb..e2bf0e29e3ab 100644 --- a/xmloff/source/style/cdouthdl.cxx +++ b/xmloff/source/style/cdouthdl.cxx @@ -78,10 +78,10 @@ XMLCrossedOutTypePropHdl::~XMLCrossedOutTypePropHdl() // nothing to do } -sal_Bool XMLCrossedOutTypePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCrossedOutTypePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 eNewStrikeout; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( + bool bRet = SvXMLUnitConverter::convertEnum( eNewStrikeout, rStrImpValue, pXML_CrossedoutType_Enum ); if( bRet ) { @@ -129,9 +129,9 @@ sal_Bool XMLCrossedOutTypePropHdl::importXML( const OUString& rStrImpValue, uno: return bRet; } -sal_Bool XMLCrossedOutTypePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCrossedOutTypePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int16 nValue = sal_Int16(); OUStringBuffer aOut; @@ -153,10 +153,10 @@ XMLCrossedOutStylePropHdl::~XMLCrossedOutStylePropHdl() // nothing to do } -sal_Bool XMLCrossedOutStylePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCrossedOutStylePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 eNewStrikeout; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( + bool bRet = SvXMLUnitConverter::convertEnum( eNewStrikeout, rStrImpValue, pXML_CrossedoutStyle_Enum ); if( bRet ) { @@ -177,9 +177,9 @@ sal_Bool XMLCrossedOutStylePropHdl::importXML( const OUString& rStrImpValue, uno return bRet; } -sal_Bool XMLCrossedOutStylePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCrossedOutStylePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int16 nValue = sal_Int16(); OUStringBuffer aOut; @@ -201,10 +201,10 @@ XMLCrossedOutWidthPropHdl::~XMLCrossedOutWidthPropHdl() // nothing to do } -sal_Bool XMLCrossedOutWidthPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCrossedOutWidthPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 eNewStrikeout; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( + bool bRet = SvXMLUnitConverter::convertEnum( eNewStrikeout, rStrImpValue, pXML_CrossedoutWidth_Enum ); if( bRet ) { @@ -246,9 +246,9 @@ sal_Bool XMLCrossedOutWidthPropHdl::importXML( const OUString& rStrImpValue, uno return bRet; } -sal_Bool XMLCrossedOutWidthPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCrossedOutWidthPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int16 nValue = sal_Int16(); OUStringBuffer aOut; @@ -270,9 +270,9 @@ XMLCrossedOutTextPropHdl::~XMLCrossedOutTextPropHdl() // nothing to do } -sal_Bool XMLCrossedOutTextPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCrossedOutTextPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( !rStrImpValue.isEmpty() ) { @@ -280,15 +280,15 @@ sal_Bool XMLCrossedOutTextPropHdl::importXML( const OUString& rStrImpValue, uno: ? awt::FontStrikeout::SLASH : awt::FontStrikeout::X); rValue <<= (sal_Int16)eStrikeout; - bRet = sal_True; + bRet = true; } return bRet; } -sal_Bool XMLCrossedOutTextPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCrossedOutTextPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int16 nValue = sal_Int16(); if( (rValue >>= nValue) && @@ -297,7 +297,7 @@ sal_Bool XMLCrossedOutTextPropHdl::exportXML( OUString& rStrExpValue, const uno: rStrExpValue = OUString( static_cast< sal_Unicode>( awt::FontStrikeout::SLASH == nValue ? '/' : 'X' ) ); - bRet = sal_True; + bRet = true; } return bRet; diff --git a/xmloff/source/style/cdouthdl.hxx b/xmloff/source/style/cdouthdl.hxx index bcb636965141..d738df67dae6 100644 --- a/xmloff/source/style/cdouthdl.hxx +++ b/xmloff/source/style/cdouthdl.hxx @@ -30,8 +30,8 @@ class XMLCrossedOutTypePropHdl : public XMLPropertyHandler public: virtual ~XMLCrossedOutTypePropHdl(); - 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 XMLCrossedOutStylePropHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLCrossedOutStylePropHdl : public XMLPropertyHandler public: virtual ~XMLCrossedOutStylePropHdl(); - 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 XMLCrossedOutWidthPropHdl : public XMLPropertyHandler @@ -48,8 +48,8 @@ class XMLCrossedOutWidthPropHdl : public XMLPropertyHandler public: virtual ~XMLCrossedOutWidthPropHdl(); - 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 XMLCrossedOutTextPropHdl : public XMLPropertyHandler @@ -57,8 +57,8 @@ class XMLCrossedOutTextPropHdl : public XMLPropertyHandler public: virtual ~XMLCrossedOutTextPropHdl(); - 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_CROSSEDOUTTYPES_HXX diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx index 7363cc024840..ab6bc3ccabe1 100644 --- a/xmloff/source/style/chrhghdl.cxx +++ b/xmloff/source/style/chrhghdl.cxx @@ -38,7 +38,7 @@ XMLCharHeightHdl::~XMLCharHeightHdl() // nothing to do } -sal_Bool XMLCharHeightHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCharHeightHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { if( rStrImpValue.indexOf( sal_Unicode('%') ) == -1 ) { @@ -50,14 +50,14 @@ sal_Bool XMLCharHeightHdl::importXML( const OUString& rStrImpValue, uno::Any& rV { fSize = ::std::max<double>(fSize, 1.0); // fdo#49876: 0pt is invalid rValue <<= (float)fSize; - return sal_True; + return true; } } - return sal_False; + return false; } -sal_Bool XMLCharHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCharHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { OUStringBuffer aOut; @@ -84,7 +84,7 @@ XMLCharHeightPropHdl::~XMLCharHeightPropHdl() // nothing to do } -sal_Bool XMLCharHeightPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCharHeightPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { if( rStrImpValue.indexOf( sal_Unicode('%') ) != -1 ) { @@ -92,14 +92,14 @@ sal_Bool XMLCharHeightPropHdl::importXML( const OUString& rStrImpValue, uno::Any if (::sax::Converter::convertPercent( nPrc, rStrImpValue )) { rValue <<= (sal_Int16)nPrc; - return sal_True; + return true; } } - return sal_False; + return false; } -sal_Bool XMLCharHeightPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCharHeightPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { OUStringBuffer aOut( rStrExpValue ); @@ -122,7 +122,7 @@ XMLCharHeightDiffHdl::~XMLCharHeightDiffHdl() // nothing to do } -sal_Bool XMLCharHeightDiffHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCharHeightDiffHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_Int32 nRel = 0; @@ -130,13 +130,13 @@ sal_Bool XMLCharHeightDiffHdl::importXML( const OUString& rStrImpValue, uno::Any util::MeasureUnit::POINT )) { rValue <<= (float)nRel; - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool XMLCharHeightDiffHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCharHeightDiffHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { OUStringBuffer aOut; diff --git a/xmloff/source/style/chrhghdl.hxx b/xmloff/source/style/chrhghdl.hxx index 80b6517d27dc..7703b6fe681a 100644 --- a/xmloff/source/style/chrhghdl.hxx +++ b/xmloff/source/style/chrhghdl.hxx @@ -30,8 +30,8 @@ class XMLCharHeightHdl : public XMLPropertyHandler public: virtual ~XMLCharHeightHdl(); - 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 XMLCharHeightPropHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLCharHeightPropHdl : public XMLPropertyHandler public: virtual ~XMLCharHeightPropHdl(); - 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 XMLCharHeightDiffHdl : public XMLPropertyHandler @@ -48,8 +48,8 @@ class XMLCharHeightDiffHdl : public XMLPropertyHandler public: virtual ~XMLCharHeightDiffHdl(); - 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_CHARHEIGHTTYPES_HXX diff --git a/xmloff/source/style/chrlohdl.cxx b/xmloff/source/style/chrlohdl.cxx index e75ff7b424bc..b580a2a20226 100644 --- a/xmloff/source/style/chrlohdl.cxx +++ b/xmloff/source/style/chrlohdl.cxx @@ -47,7 +47,7 @@ XMLCharLanguageHdl::~XMLCharLanguageHdl() bool XMLCharLanguageHdl::equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const { - sal_Bool bRet = sal_False; + bool bRet = false; lang::Locale aLocale1, aLocale2; if( ( r1 >>= aLocale1 ) && ( r2 >>= aLocale2 ) ) @@ -74,7 +74,7 @@ bool XMLCharLanguageHdl::equals( const ::com::sun::star::uno::Any& r1, const ::c return bRet; } -sal_Bool XMLCharLanguageHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCharLanguageHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { lang::Locale aLocale; rValue >>= aLocale; @@ -101,14 +101,14 @@ sal_Bool XMLCharLanguageHdl::importXML( const OUString& rStrImpValue, uno::Any& } rValue <<= aLocale; - return sal_True; + return true; } -sal_Bool XMLCharLanguageHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCharLanguageHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { lang::Locale aLocale; if(!(rValue >>= aLocale)) - return sal_False; + return false; if (aLocale.Variant.isEmpty()) rStrExpValue = aLocale.Language; @@ -121,13 +121,13 @@ sal_Bool XMLCharLanguageHdl::exportXML( OUString& rStrExpValue, const uno::Any& // *:rfc-language-tag that is written if Variant is not empty. If there // is no match do not write this attribute at all. if (rStrExpValue.isEmpty()) - return sal_False; + return false; } if( rStrExpValue.isEmpty() ) rStrExpValue = GetXMLToken( XML_NONE ); - return sal_True; + return true; } XMLCharScriptHdl::~XMLCharScriptHdl() @@ -137,7 +137,7 @@ XMLCharScriptHdl::~XMLCharScriptHdl() bool XMLCharScriptHdl::equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const { - sal_Bool bRet = sal_False; + bool bRet = false; lang::Locale aLocale1, aLocale2; if( ( r1 >>= aLocale1 ) && ( r2 >>= aLocale2 ) ) @@ -145,7 +145,7 @@ bool XMLCharScriptHdl::equals( const ::com::sun::star::uno::Any& r1, const ::com bool bEmptyVariant1 = aLocale1.Variant.isEmpty(); bool bEmptyVariant2 = aLocale2.Variant.isEmpty(); if (bEmptyVariant1 && bEmptyVariant2) - bRet = sal_True; + bRet = true; else if ((bEmptyVariant1 && !bEmptyVariant2) || (!bEmptyVariant1 && bEmptyVariant2)) ; // stays false else @@ -166,7 +166,7 @@ bool XMLCharScriptHdl::equals( const ::com::sun::star::uno::Any& r1, const ::com return bRet; } -sal_Bool XMLCharScriptHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCharScriptHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { lang::Locale aLocale; rValue >>= aLocale; @@ -215,26 +215,26 @@ sal_Bool XMLCharScriptHdl::importXML( const OUString& rStrImpValue, uno::Any& rV } rValue <<= aLocale; - return sal_True; + return true; } -sal_Bool XMLCharScriptHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCharScriptHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { lang::Locale aLocale; if(!(rValue >>= aLocale)) - return sal_False; + return false; // Do not write script='none' for default script. if (aLocale.Variant.isEmpty()) - return sal_False; + return false; LanguageTag aLanguageTag( aLocale); if (!aLanguageTag.hasScript()) - return sal_False; + return false; if (SvtSaveOptions().GetODFDefaultVersion() < SvtSaveOptions::ODFVER_012) - return sal_False; + return false; OUString aLanguage, aCountry; aLanguageTag.getIsoLanguageScriptCountry( aLanguage, rStrExpValue, aCountry); @@ -242,9 +242,9 @@ sal_Bool XMLCharScriptHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV // *:language is not written either, does it? It's all in // *:rfc-language-tag if (aLanguage.isEmpty() || rStrExpValue.isEmpty()) - return sal_False; + return false; - return sal_True; + return true; } XMLCharCountryHdl::~XMLCharCountryHdl() @@ -254,7 +254,7 @@ XMLCharCountryHdl::~XMLCharCountryHdl() bool XMLCharCountryHdl::equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const { - sal_Bool bRet = sal_False; + bool bRet = false; lang::Locale aLocale1, aLocale2; if( ( r1 >>= aLocale1 ) && ( r2 >>= aLocale2 ) ) @@ -263,7 +263,7 @@ bool XMLCharCountryHdl::equals( const ::com::sun::star::uno::Any& r1, const ::co return bRet; } -sal_Bool XMLCharCountryHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCharCountryHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { lang::Locale aLocale; rValue >>= aLocale; @@ -289,14 +289,14 @@ sal_Bool XMLCharCountryHdl::importXML( const OUString& rStrImpValue, uno::Any& r } rValue <<= aLocale; - return sal_True; + return true; } -sal_Bool XMLCharCountryHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCharCountryHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { lang::Locale aLocale; if(!(rValue >>= aLocale)) - return sal_False; + return false; if (aLocale.Variant.isEmpty()) rStrExpValue = aLocale.Country; @@ -309,13 +309,13 @@ sal_Bool XMLCharCountryHdl::exportXML( OUString& rStrExpValue, const uno::Any& r // *:rfc-language-tag that is written if Variant is not empty. If there // is no match do not write this attribute at all. if (rStrExpValue.isEmpty()) - return sal_False; + return false; } if( rStrExpValue.isEmpty() ) rStrExpValue = GetXMLToken( XML_NONE ); - return sal_True; + return true; } XMLCharRfcLanguageTagHdl::~XMLCharRfcLanguageTagHdl() @@ -325,7 +325,7 @@ XMLCharRfcLanguageTagHdl::~XMLCharRfcLanguageTagHdl() bool XMLCharRfcLanguageTagHdl::equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const { - sal_Bool bRet = sal_False; + bool bRet = false; lang::Locale aLocale1, aLocale2; if( ( r1 >>= aLocale1 ) && ( r2 >>= aLocale2 ) ) @@ -334,7 +334,7 @@ bool XMLCharRfcLanguageTagHdl::equals( const ::com::sun::star::uno::Any& r1, con return bRet; } -sal_Bool XMLCharRfcLanguageTagHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCharRfcLanguageTagHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { lang::Locale aLocale; rValue >>= aLocale; @@ -346,25 +346,25 @@ sal_Bool XMLCharRfcLanguageTagHdl::importXML( const OUString& rStrImpValue, uno: } rValue <<= aLocale; - return sal_True; + return true; } -sal_Bool XMLCharRfcLanguageTagHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCharRfcLanguageTagHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { lang::Locale aLocale; if(!(rValue >>= aLocale)) - return sal_False; + return false; // Do not write rfc-language-tag='none' if BCP 47 is not needed. if (aLocale.Variant.isEmpty()) - return sal_False; + return false; if (SvtSaveOptions().GetODFDefaultVersion() < SvtSaveOptions::ODFVER_012) - return sal_False; + return false; rStrExpValue = aLocale.Variant; - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/chrlohdl.hxx b/xmloff/source/style/chrlohdl.hxx index 258876989b42..49a8d1f63e52 100644 --- a/xmloff/source/style/chrlohdl.hxx +++ b/xmloff/source/style/chrlohdl.hxx @@ -32,8 +32,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - 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 XMLCharScriptHdl : public XMLPropertyHandler @@ -43,8 +43,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - 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 XMLCharCountryHdl : public XMLPropertyHandler @@ -54,8 +54,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - 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 XMLCharRfcLanguageTagHdl : public XMLPropertyHandler @@ -65,8 +65,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - 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_CHARLOCALETYPES_HXX diff --git a/xmloff/source/style/csmaphdl.cxx b/xmloff/source/style/csmaphdl.cxx index ba16e857f0f4..b701f68714c7 100644 --- a/xmloff/source/style/csmaphdl.cxx +++ b/xmloff/source/style/csmaphdl.cxx @@ -43,10 +43,10 @@ XMLCaseMapPropHdl::~XMLCaseMapPropHdl() // nothing to do } -sal_Bool XMLCaseMapPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCaseMapPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 nVal; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( + bool bRet = SvXMLUnitConverter::convertEnum( nVal, rStrImpValue, pXML_Casemap_Enum ); if( ( bRet ) ) rValue <<= nVal; @@ -54,9 +54,9 @@ sal_Bool XMLCaseMapPropHdl::importXML( const OUString& rStrImpValue, uno::Any& r return bRet; } -sal_Bool XMLCaseMapPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCaseMapPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_uInt16 nValue = sal_uInt16(); OUStringBuffer aOut; @@ -78,25 +78,25 @@ XMLCaseMapVariantHdl::~XMLCaseMapVariantHdl() // nothing to do } -sal_Bool XMLCaseMapVariantHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCaseMapVariantHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( IsXMLToken( rStrImpValue, XML_CASEMAP_SMALL_CAPS ) ) { rValue <<= (sal_Int16)style::CaseMap::SMALLCAPS; - bRet = sal_True; + bRet = true; } else if( IsXMLToken( rStrImpValue, XML_CASEMAP_NORMAL ) ) { rValue <<= (sal_Int16)style::CaseMap::NONE; - bRet = sal_True; + bRet = true; } return bRet; } -sal_Bool XMLCaseMapVariantHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLCaseMapVariantHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 nValue = sal_uInt16(); OUStringBuffer aOut; diff --git a/xmloff/source/style/csmaphdl.hxx b/xmloff/source/style/csmaphdl.hxx index e098cc38cf62..3258ff7ca03c 100644 --- a/xmloff/source/style/csmaphdl.hxx +++ b/xmloff/source/style/csmaphdl.hxx @@ -30,8 +30,8 @@ class XMLCaseMapPropHdl : public XMLPropertyHandler public: virtual ~XMLCaseMapPropHdl(); - 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 XMLCaseMapVariantHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLCaseMapVariantHdl : public XMLPropertyHandler public: virtual ~XMLCaseMapVariantHdl(); - 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_CASEMAPTYPES_HXX diff --git a/xmloff/source/style/durationhdl.cxx b/xmloff/source/style/durationhdl.cxx index fcfd3bb5e3f4..a58181027e20 100644 --- a/xmloff/source/style/durationhdl.cxx +++ b/xmloff/source/style/durationhdl.cxx @@ -26,7 +26,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -sal_Bool XMLDurationMS16PropHdl_Impl::importXML( +bool XMLDurationMS16PropHdl_Impl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const @@ -42,10 +42,10 @@ sal_Bool XMLDurationMS16PropHdl_Impl::importXML( + aDuration.Seconds) * 100 + (aDuration.NanoSeconds / (10*1000*1000)); rValue <<= nMS; - return sal_True; + return true; } -sal_Bool XMLDurationMS16PropHdl_Impl::exportXML( +bool XMLDurationMS16PropHdl_Impl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const @@ -58,10 +58,10 @@ sal_Bool XMLDurationMS16PropHdl_Impl::exportXML( Duration aDuration(false, 0, 0, 0, 0, 0, 0, nMS * 10); ::sax::Converter::convertDuration(aOut, aDuration); rStrExpValue = aOut.makeStringAndClear(); - return sal_True; + return true; } - return sal_False; + return false; } XMLDurationMS16PropHdl_Impl::~XMLDurationMS16PropHdl_Impl() diff --git a/xmloff/source/style/durationhdl.hxx b/xmloff/source/style/durationhdl.hxx index 70bc47f14579..8888674a21fb 100644 --- a/xmloff/source/style/durationhdl.hxx +++ b/xmloff/source/style/durationhdl.hxx @@ -30,8 +30,8 @@ class XMLDurationMS16PropHdl_Impl : public XMLPropertyHandler public: virtual ~XMLDurationMS16PropHdl_Impl(); - 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_FMTSPLITTYPES_HXX diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx index 8d395b325d20..860774a66993 100644 --- a/xmloff/source/style/escphdl.cxx +++ b/xmloff/source/style/escphdl.cxx @@ -42,7 +42,7 @@ XMLEscapementPropHdl::~XMLEscapementPropHdl() // nothing to do } -sal_Bool XMLEscapementPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLEscapementPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_Int16 nVal; @@ -50,7 +50,7 @@ sal_Bool XMLEscapementPropHdl::importXML( const OUString& rStrImpValue, uno::Any OUString aToken; if( ! aTokens.getNextToken( aToken ) ) - return sal_False; + return false; if( IsXMLToken( aToken, XML_ESCAPEMENT_SUB ) ) { @@ -64,16 +64,16 @@ sal_Bool XMLEscapementPropHdl::importXML( const OUString& rStrImpValue, uno::Any { sal_Int32 nNewEsc; if (!::sax::Converter::convertPercent( nNewEsc, aToken )) - return sal_False; + return false; nVal = (sal_Int16) nNewEsc; } rValue <<= nVal; - return sal_True; + return true; } -sal_Bool XMLEscapementPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLEscapementPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_Int32 nValue = 0; OUStringBuffer aOut; @@ -95,7 +95,7 @@ sal_Bool XMLEscapementPropHdl::exportXML( OUString& rStrExpValue, const uno::Any } rStrExpValue = aOut.makeStringAndClear(); - return sal_True; + return true; } // @@ -107,23 +107,23 @@ XMLEscapementHeightPropHdl::~XMLEscapementHeightPropHdl() // nothing to do } -sal_Bool XMLEscapementHeightPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLEscapementHeightPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { if( IsXMLToken( rStrImpValue, XML_CASEMAP_SMALL_CAPS ) ) - return sal_False; + return false; SvXMLTokenEnumerator aTokens( rStrImpValue ); OUString aToken; if( ! aTokens.getNextToken( aToken ) ) - return sal_False; + return false; sal_Int8 nProp; if( aTokens.getNextToken( aToken ) ) { sal_Int32 nNewProp; if (!::sax::Converter::convertPercent( nNewProp, aToken )) - return sal_False; + return false; nProp = (sal_Int8)nNewProp; } else @@ -139,10 +139,10 @@ sal_Bool XMLEscapementHeightPropHdl::importXML( const OUString& rStrImpValue, un } rValue <<= nProp; - return sal_True; + return true; } -sal_Bool XMLEscapementHeightPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLEscapementHeightPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { OUStringBuffer aOut( rStrExpValue ); diff --git a/xmloff/source/style/escphdl.hxx b/xmloff/source/style/escphdl.hxx index a5b1d932fc8d..901166f04496 100644 --- a/xmloff/source/style/escphdl.hxx +++ b/xmloff/source/style/escphdl.hxx @@ -30,8 +30,8 @@ class XMLEscapementPropHdl : public XMLPropertyHandler public: virtual ~XMLEscapementPropHdl(); - 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 XMLEscapementHeightPropHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLEscapementHeightPropHdl : public XMLPropertyHandler public: virtual ~XMLEscapementHeightPropHdl(); - 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_ESCAPETYPES_HXX diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx index 50543844a9e1..a2768e565639 100644 --- a/xmloff/source/style/fonthdl.cxx +++ b/xmloff/source/style/fonthdl.cxx @@ -60,9 +60,9 @@ XMLFontFamilyNamePropHdl::~XMLFontFamilyNamePropHdl() // Nothing to do } -sal_Bool XMLFontFamilyNamePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLFontFamilyNamePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; OUStringBuffer sValue; sal_Int32 nPos = 0; @@ -104,15 +104,15 @@ sal_Bool XMLFontFamilyNamePropHdl::importXML( const OUString& rStrImpValue, uno: if (!sValue.isEmpty()) { rValue <<= sValue.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; } -sal_Bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; OUString aStrFamilyName; if( rValue >>= aStrFamilyName ) @@ -157,13 +157,13 @@ sal_Bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno: } sal_Int32 nLen = nLast-nFirst+1; OUString sFamily( aStrFamilyName.copy( nFirst, nLen ) ); - sal_Bool bQuote = sal_False; + bool bQuote = false; for( sal_Int32 i=0; i < nLen; i++ ) { sal_Unicode c = sFamily[i]; if( sal_Unicode(' ') == c || sal_Unicode(',') == c ) { - bQuote = sal_True; + bQuote = true; break; } } @@ -178,7 +178,7 @@ sal_Bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno: rStrExpValue = sValue.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; @@ -191,19 +191,19 @@ XMLFontFamilyPropHdl::~XMLFontFamilyPropHdl() // Nothing to do } -sal_Bool XMLFontFamilyPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLFontFamilyPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 eNewFamily; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( eNewFamily, rStrImpValue, lcl_getFontFamilyGenericMapping() ); + bool bRet = SvXMLUnitConverter::convertEnum( eNewFamily, rStrImpValue, lcl_getFontFamilyGenericMapping() ); if( bRet ) rValue <<= (sal_Int16)eNewFamily; return bRet; } -sal_Bool XMLFontFamilyPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLFontFamilyPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; OUStringBuffer aOut; sal_Int16 nFamily = sal_Int16(); @@ -226,9 +226,9 @@ XMLFontEncodingPropHdl::~XMLFontEncodingPropHdl() // Nothing to do } -sal_Bool XMLFontEncodingPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLFontEncodingPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_True; + bool bRet = true; if( IsXMLToken( rStrImpValue, XML_X_SYMBOL ) ) rValue <<= (sal_Int16) RTL_TEXTENCODING_SYMBOL; @@ -236,9 +236,9 @@ sal_Bool XMLFontEncodingPropHdl::importXML( const OUString& rStrImpValue, uno::A return bRet; } -sal_Bool XMLFontEncodingPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLFontEncodingPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; OUStringBuffer aOut; sal_Int16 nSet = sal_Int16(); @@ -248,7 +248,7 @@ sal_Bool XMLFontEncodingPropHdl::exportXML( OUString& rStrExpValue, const uno::A { aOut.append( GetXMLToken(XML_X_SYMBOL) ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } } @@ -262,19 +262,19 @@ XMLFontPitchPropHdl::~XMLFontPitchPropHdl() // Nothing to do } -sal_Bool XMLFontPitchPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLFontPitchPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 eNewPitch; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( eNewPitch, rStrImpValue, aFontPitchMapping ); + bool bRet = SvXMLUnitConverter::convertEnum( eNewPitch, rStrImpValue, aFontPitchMapping ); if( bRet ) rValue <<= (sal_Int16)eNewPitch; return bRet; } -sal_Bool XMLFontPitchPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLFontPitchPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int16 nPitch = sal_Int16(); OUStringBuffer aOut; diff --git a/xmloff/source/style/fonthdl.hxx b/xmloff/source/style/fonthdl.hxx index 10a89234c31e..d1bb67f0ae3e 100644 --- a/xmloff/source/style/fonthdl.hxx +++ b/xmloff/source/style/fonthdl.hxx @@ -30,8 +30,8 @@ class XMLFontFamilyNamePropHdl : public XMLPropertyHandler public: virtual ~XMLFontFamilyNamePropHdl(); - 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; }; /** @@ -42,8 +42,8 @@ class XMLFontFamilyPropHdl : public XMLPropertyHandler public: virtual ~XMLFontFamilyPropHdl(); - 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; }; /** @@ -54,8 +54,8 @@ class XMLFontEncodingPropHdl : public XMLPropertyHandler public: virtual ~XMLFontEncodingPropHdl(); - 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; }; /** @@ -66,8 +66,8 @@ class XMLFontPitchPropHdl : public XMLPropertyHandler public: virtual ~XMLFontPitchPropHdl(); - 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; }; diff --git a/xmloff/source/style/kernihdl.cxx b/xmloff/source/style/kernihdl.cxx index 8f9734ec09aa..34307ae13c1c 100644 --- a/xmloff/source/style/kernihdl.cxx +++ b/xmloff/source/style/kernihdl.cxx @@ -37,9 +37,9 @@ XMLKerningPropHdl::~XMLKerningPropHdl() // nothing to do } -sal_Bool XMLKerningPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLKerningPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Bool bRet = sal_True; + bool bRet = true; sal_Int32 nKerning = 0; if( ! IsXMLToken( rStrImpValue, XML_KERNING_NORMAL ) ) @@ -52,9 +52,9 @@ sal_Bool XMLKerningPropHdl::importXML( const OUString& rStrImpValue, Any& rValue return bRet; } -sal_Bool XMLKerningPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLKerningPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int16 nValue = sal_Int16(); if( rValue >>= nValue ) @@ -70,7 +70,7 @@ sal_Bool XMLKerningPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; diff --git a/xmloff/source/style/kernihdl.hxx b/xmloff/source/style/kernihdl.hxx index c7989629724f..e640dedc71aa 100644 --- a/xmloff/source/style/kernihdl.hxx +++ b/xmloff/source/style/kernihdl.hxx @@ -30,8 +30,8 @@ class XMLKerningPropHdl : public XMLPropertyHandler public: virtual ~XMLKerningPropHdl(); - 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_KERNINGTYPES_HXX diff --git a/xmloff/source/style/lspachdl.cxx b/xmloff/source/style/lspachdl.cxx index 7d6fdfb80534..d6efc21ddfd2 100644 --- a/xmloff/source/style/lspachdl.cxx +++ b/xmloff/source/style/lspachdl.cxx @@ -39,7 +39,7 @@ XMLLineHeightHdl::~XMLLineHeightHdl() // nothing to do } -sal_Bool XMLLineHeightHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLLineHeightHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { style::LineSpacing aLSp; sal_Int32 nTemp = 0; @@ -48,7 +48,7 @@ sal_Bool XMLLineHeightHdl::importXML( const OUString& rStrImpValue, uno::Any& rV { aLSp.Mode = style::LineSpacingMode::PROP; if (!::sax::Converter::convertPercent( nTemp, rStrImpValue )) - return sal_False; + return false; aLSp.Height = sal::static_int_cast< sal_Int16 >(nTemp); } else if( IsXMLToken( rStrImpValue, XML_CASEMAP_NORMAL) ) @@ -61,24 +61,24 @@ sal_Bool XMLLineHeightHdl::importXML( const OUString& rStrImpValue, uno::Any& rV aLSp.Mode = style::LineSpacingMode::FIX; if (!rUnitConverter.convertMeasureToCore( nTemp, rStrImpValue, 0x0000, 0xffff)) - return sal_False; + return false; aLSp.Height = sal::static_int_cast< sal_Int16 >(nTemp); } rValue <<= aLSp; - return sal_True; + return true; } -sal_Bool XMLLineHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLLineHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { OUStringBuffer aOut; style::LineSpacing aLSp; if(!(rValue >>= aLSp)) - return sal_False; + return false; if( style::LineSpacingMode::PROP != aLSp.Mode && style::LineSpacingMode::FIX != aLSp.Mode ) - return sal_False; + return false; if( style::LineSpacingMode::PROP == aLSp.Mode ) { @@ -102,30 +102,30 @@ XMLLineHeightAtLeastHdl::~XMLLineHeightAtLeastHdl() // nothing to do } -sal_Bool XMLLineHeightAtLeastHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLLineHeightAtLeastHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { style::LineSpacing aLSp; sal_Int32 nTemp; aLSp.Mode = style::LineSpacingMode::MINIMUM; if (!rUnitConverter.convertMeasureToCore( nTemp, rStrImpValue, 0, 0xffff)) - return sal_False; + return false; aLSp.Height = sal::static_int_cast< sal_Int16 >(nTemp); rValue <<= aLSp; - return sal_True; + return true; } -sal_Bool XMLLineHeightAtLeastHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLLineHeightAtLeastHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { OUStringBuffer aOut; style::LineSpacing aLSp; if(!(rValue >>= aLSp)) - return sal_False; + return false; if( style::LineSpacingMode::MINIMUM != aLSp.Mode ) - return sal_False; + return false; rUnitConverter.convertMeasureToXML( aOut, aLSp.Height ); @@ -142,30 +142,30 @@ XMLLineSpacingHdl::~XMLLineSpacingHdl() // nothing to do } -sal_Bool XMLLineSpacingHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLLineSpacingHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { style::LineSpacing aLSp; sal_Int32 nTemp; aLSp.Mode = style::LineSpacingMode::LEADING; if (!rUnitConverter.convertMeasureToCore( nTemp, rStrImpValue, 0, 0xffff)) - return sal_False; + return false; aLSp.Height = sal::static_int_cast< sal_Int16 >(nTemp); rValue <<= aLSp; - return sal_True; + return true; } -sal_Bool XMLLineSpacingHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLLineSpacingHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { OUStringBuffer aOut; style::LineSpacing aLSp; if(!(rValue >>= aLSp)) - return sal_False; + return false; if( style::LineSpacingMode::LEADING != aLSp.Mode ) - return sal_False; + return false; rUnitConverter.convertMeasureToXML( aOut, aLSp.Height ); diff --git a/xmloff/source/style/lspachdl.hxx b/xmloff/source/style/lspachdl.hxx index 2de45b94011f..bf522396c50b 100644 --- a/xmloff/source/style/lspachdl.hxx +++ b/xmloff/source/style/lspachdl.hxx @@ -30,8 +30,8 @@ class XMLLineHeightHdl : public XMLPropertyHandler public: virtual ~XMLLineHeightHdl(); - 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 XMLLineHeightAtLeastHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLLineHeightAtLeastHdl : public XMLPropertyHandler public: virtual ~XMLLineHeightAtLeastHdl(); - 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 XMLLineSpacingHdl : public XMLPropertyHandler @@ -48,8 +48,8 @@ class XMLLineSpacingHdl : public XMLPropertyHandler public: virtual ~XMLLineSpacingHdl(); - 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_CHARHEIGHTTYPES_HXX diff --git a/xmloff/source/style/opaquhdl.cxx b/xmloff/source/style/opaquhdl.cxx index 88f6ed5af465..606fd48f3a80 100644 --- a/xmloff/source/style/opaquhdl.cxx +++ b/xmloff/source/style/opaquhdl.cxx @@ -34,20 +34,19 @@ XMLOpaquePropHdl::~XMLOpaquePropHdl() // nothing to do } -sal_Bool XMLOpaquePropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLOpaquePropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_True; + bool bRet = true; sal_Bool bValue = IsXMLToken( rStrImpValue, XML_OPAQUE_FOREGROUND ); rValue <<= sal_Bool(bValue); - bRet = sal_True; return bRet; } -sal_Bool XMLOpaquePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLOpaquePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Bool bValue = sal_Bool(); if (rValue >>= bValue) @@ -57,7 +56,7 @@ sal_Bool XMLOpaquePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, else rStrExpValue = GetXMLToken( XML_OPAQUE_BACKGROUND ); - bRet = sal_True; + bRet = true; } return bRet; diff --git a/xmloff/source/style/opaquhdl.hxx b/xmloff/source/style/opaquhdl.hxx index c73abd18f099..0093e1f32c94 100644 --- a/xmloff/source/style/opaquhdl.hxx +++ b/xmloff/source/style/opaquhdl.hxx @@ -30,8 +30,8 @@ class XMLOpaquePropHdl : public XMLPropertyHandler public: virtual ~XMLOpaquePropHdl(); - 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_OPAQUETYPES_HXX diff --git a/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx index ced4e82a818a..bb2a80be8590 100644 --- a/xmloff/source/style/postuhdl.cxx +++ b/xmloff/source/style/postuhdl.cxx @@ -45,17 +45,17 @@ XMLPosturePropHdl::~XMLPosturePropHdl() // nothing to do } -sal_Bool XMLPosturePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLPosturePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 ePosture; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( ePosture, rStrImpValue, aPostureGenericMapping ); + bool bRet = SvXMLUnitConverter::convertEnum( ePosture, rStrImpValue, aPostureGenericMapping ); if( bRet ) rValue <<= (awt::FontSlant)ePosture; return bRet; } -sal_Bool XMLPosturePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLPosturePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { awt::FontSlant eSlant; @@ -64,13 +64,13 @@ sal_Bool XMLPosturePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& r sal_Int32 nValue = 0; if( !( rValue >>= nValue ) ) - return sal_False; + return false; eSlant = (awt::FontSlant)nValue; } OUStringBuffer aOut; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( aOut, (sal_Int32)eSlant, aPostureGenericMapping ); + bool bRet = SvXMLUnitConverter::convertEnum( aOut, (sal_Int32)eSlant, aPostureGenericMapping ); if( bRet ) rStrExpValue = aOut.makeStringAndClear(); diff --git a/xmloff/source/style/postuhdl.hxx b/xmloff/source/style/postuhdl.hxx index 8bf2c2079927..05e03761c116 100644 --- a/xmloff/source/style/postuhdl.hxx +++ b/xmloff/source/style/postuhdl.hxx @@ -30,8 +30,8 @@ class XMLPosturePropHdl : public XMLPropertyHandler public: virtual ~XMLPosturePropHdl(); - 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_POSTURETYPES_HXX diff --git a/xmloff/source/style/shadwhdl.cxx b/xmloff/source/style/shadwhdl.cxx index b991baab9d49..ff63bd11e0f8 100644 --- a/xmloff/source/style/shadwhdl.cxx +++ b/xmloff/source/style/shadwhdl.cxx @@ -40,14 +40,14 @@ XMLShadowPropHdl::~XMLShadowPropHdl() // nothing to do } -sal_Bool XMLShadowPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLShadowPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Bool bRet = sal_False; + bool bRet = false; table::ShadowFormat aShadow; aShadow.Location = table::ShadowLocation_BOTTOM_RIGHT; - sal_Bool bColorFound = sal_False; - sal_Bool bOffsetFound = sal_False; + bool bColorFound = false; + bool bOffsetFound = false; SvXMLTokenEnumerator aTokenEnum( rStrImpValue ); Color aColor( 128,128, 128 ); OUString aToken; @@ -57,7 +57,7 @@ sal_Bool XMLShadowPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rV if( IsXMLToken( aToken, XML_NONE ) ) { aShadow.Location = table::ShadowLocation_NONE; - bRet = sal_True; + bRet = true; break; } else if( !bColorFound && aToken.startsWith("#") ) @@ -65,10 +65,10 @@ sal_Bool XMLShadowPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rV sal_Int32 nColor(0); bRet = ::sax::Converter::convertColor( nColor, aToken ); if( !bRet ) - return sal_False; + return false; aColor.SetColor(nColor); - bColorFound = sal_True; + bColorFound = true; } else if( !bOffsetFound ) { @@ -108,7 +108,7 @@ sal_Bool XMLShadowPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rV { aShadow.IsTransparent = aColor.GetTransparency() > 0; aShadow.Color = aColor.GetColor(); - bRet = sal_True; + bRet = true; } rValue <<= aShadow; @@ -116,9 +116,9 @@ sal_Bool XMLShadowPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rV return bRet; } -sal_Bool XMLShadowPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLShadowPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Bool bRet = sal_False; + bool bRet = false; OUStringBuffer aOut; table::ShadowFormat aShadow; @@ -143,7 +143,7 @@ sal_Bool XMLShadowPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV case table::ShadowLocation_NONE: default: rStrExpValue = GetXMLToken(XML_NONE); - return sal_True; + return true; } nX *= aShadow.ShadowWidth; @@ -158,7 +158,7 @@ sal_Bool XMLShadowPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; diff --git a/xmloff/source/style/shadwhdl.hxx b/xmloff/source/style/shadwhdl.hxx index f49e0b56f6db..e9718b210834 100644 --- a/xmloff/source/style/shadwhdl.hxx +++ b/xmloff/source/style/shadwhdl.hxx @@ -30,8 +30,8 @@ class XMLShadowPropHdl : public XMLPropertyHandler public: virtual ~XMLShadowPropHdl(); - 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_BASICTYPES_HXX diff --git a/xmloff/source/style/shdwdhdl.cxx b/xmloff/source/style/shdwdhdl.cxx index ddb2457fdfb0..69884c83de8a 100644 --- a/xmloff/source/style/shdwdhdl.cxx +++ b/xmloff/source/style/shdwdhdl.cxx @@ -36,17 +36,17 @@ XMLShadowedPropHdl::~XMLShadowedPropHdl() // nothing to do } -sal_Bool XMLShadowedPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLShadowedPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { sal_Bool bValue = ! IsXMLToken( rStrImpValue, XML_NONE ); rValue <<= sal_Bool(bValue); - return sal_True; + return true; } -sal_Bool XMLShadowedPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLShadowedPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Bool bValue = sal_Bool(); if (rValue >>= bValue) @@ -60,7 +60,7 @@ sal_Bool XMLShadowedPropHdl::exportXML( OUString& rStrExpValue, const Any& rValu rStrExpValue = GetXMLToken( XML_NONE ); } - bRet = sal_True; + bRet = true; } return bRet; diff --git a/xmloff/source/style/shdwdhdl.hxx b/xmloff/source/style/shdwdhdl.hxx index 265ace288f95..d056b64e54db 100644 --- a/xmloff/source/style/shdwdhdl.hxx +++ b/xmloff/source/style/shdwdhdl.hxx @@ -30,8 +30,8 @@ class XMLShadowedPropHdl : public XMLPropertyHandler public: virtual ~XMLShadowedPropHdl(); - 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_SHADOWEDTYPES_HXX diff --git a/xmloff/source/style/tabsthdl.cxx b/xmloff/source/style/tabsthdl.cxx index 45e0c42d6253..0aa8d9823aa0 100644 --- a/xmloff/source/style/tabsthdl.cxx +++ b/xmloff/source/style/tabsthdl.cxx @@ -34,7 +34,7 @@ XMLTabStopPropHdl::~XMLTabStopPropHdl() bool XMLTabStopPropHdl::equals( const uno::Any& r1, const uno::Any& r2 ) const { - sal_Bool bEqual = sal_False; + bool bEqual = false; uno::Sequence< style::TabStop> aSeq1; if( r1 >>= aSeq1 ) @@ -44,7 +44,7 @@ bool XMLTabStopPropHdl::equals( const uno::Any& r1, const uno::Any& r2 ) const { if( aSeq1.getLength() == aSeq2.getLength() ) { - bEqual = sal_True; + bEqual = true; if( aSeq1.getLength() > 0 ) { const style::TabStop* pTabs1 = aSeq1.getConstArray(); @@ -69,14 +69,14 @@ bool XMLTabStopPropHdl::equals( const uno::Any& r1, const uno::Any& r2 ) const return bEqual; } -sal_Bool XMLTabStopPropHdl::importXML( const OUString&, ::com::sun::star::uno::Any&, const SvXMLUnitConverter& ) const +bool XMLTabStopPropHdl::importXML( const OUString&, ::com::sun::star::uno::Any&, const SvXMLUnitConverter& ) const { - return sal_False; + return false; } -sal_Bool XMLTabStopPropHdl::exportXML( OUString&, const ::com::sun::star::uno::Any&, const SvXMLUnitConverter& ) const +bool XMLTabStopPropHdl::exportXML( OUString&, const ::com::sun::star::uno::Any&, const SvXMLUnitConverter& ) const { - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/tabsthdl.hxx b/xmloff/source/style/tabsthdl.hxx index fb44c93ee405..f498c7c81757 100644 --- a/xmloff/source/style/tabsthdl.hxx +++ b/xmloff/source/style/tabsthdl.hxx @@ -33,8 +33,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; /// TabStops 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_TABSTOPTYPES_HXX diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx index 61e9db4acaec..0cc662a28c7a 100644 --- a/xmloff/source/style/undlihdl.cxx +++ b/xmloff/source/style/undlihdl.cxx @@ -109,10 +109,10 @@ XMLUnderlineTypePropHdl::~XMLUnderlineTypePropHdl() // nothing to do } -sal_Bool XMLUnderlineTypePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLUnderlineTypePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 eNewUnderline; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( + bool bRet = SvXMLUnitConverter::convertEnum( eNewUnderline, rStrImpValue, pXML_UnderlineType_Enum ); if( bRet ) { @@ -163,9 +163,9 @@ sal_Bool XMLUnderlineTypePropHdl::importXML( const OUString& rStrImpValue, uno:: return bRet; } -sal_Bool XMLUnderlineTypePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLUnderlineTypePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int16 nValue = sal_Int16(); OUStringBuffer aOut; @@ -191,10 +191,10 @@ XMLUnderlineStylePropHdl::~XMLUnderlineStylePropHdl() // nothing to do } -sal_Bool XMLUnderlineStylePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLUnderlineStylePropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 eNewUnderline; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( + bool bRet = SvXMLUnitConverter::convertEnum( eNewUnderline, rStrImpValue, pXML_UnderlineStyle_Enum ); if( bRet ) { @@ -252,9 +252,9 @@ sal_Bool XMLUnderlineStylePropHdl::importXML( const OUString& rStrImpValue, uno: return bRet; } -sal_Bool XMLUnderlineStylePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLUnderlineStylePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int16 nValue = sal_Int16(); OUStringBuffer aOut; @@ -278,10 +278,10 @@ XMLUnderlineWidthPropHdl::~XMLUnderlineWidthPropHdl() // nothing to do } -sal_Bool XMLUnderlineWidthPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLUnderlineWidthPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 eNewUnderline; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( + bool bRet = SvXMLUnitConverter::convertEnum( eNewUnderline, rStrImpValue, pXML_UnderlineWidth_Enum ); if( bRet ) { @@ -343,9 +343,9 @@ sal_Bool XMLUnderlineWidthPropHdl::importXML( const OUString& rStrImpValue, uno: return bRet; } -sal_Bool XMLUnderlineWidthPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLUnderlineWidthPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int16 nValue = sal_Int16(); OUStringBuffer aOut; diff --git a/xmloff/source/style/undlihdl.hxx b/xmloff/source/style/undlihdl.hxx index 53308a135a1a..399376c936ae 100644 --- a/xmloff/source/style/undlihdl.hxx +++ b/xmloff/source/style/undlihdl.hxx @@ -30,8 +30,8 @@ class XMLUnderlineTypePropHdl : public XMLPropertyHandler public: virtual ~XMLUnderlineTypePropHdl(); - 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 XMLUnderlineStylePropHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLUnderlineStylePropHdl : public XMLPropertyHandler public: virtual ~XMLUnderlineStylePropHdl(); - 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 XMLUnderlineWidthPropHdl : public XMLPropertyHandler @@ -48,8 +48,8 @@ class XMLUnderlineWidthPropHdl : public XMLPropertyHandler public: virtual ~XMLUnderlineWidthPropHdl(); - 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_UNDERLINETYPES_HXX diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx index 5fd5db811a95..d0a89a96ca56 100644 --- a/xmloff/source/style/weighhdl.cxx +++ b/xmloff/source/style/weighhdl.cxx @@ -64,20 +64,20 @@ XMLFontWeightPropHdl::~XMLFontWeightPropHdl() // Nothing to do } -sal_Bool XMLFontWeightPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLFontWeightPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_uInt16 nWeight = 0; if( IsXMLToken( rStrImpValue, XML_WEIGHT_NORMAL ) ) { nWeight = 400; - bRet = sal_True; + bRet = true; } else if( IsXMLToken( rStrImpValue, XML_WEIGHT_BOLD ) ) { nWeight = 700; - bRet = sal_True; + bRet = true; } else { @@ -89,7 +89,7 @@ sal_Bool XMLFontWeightPropHdl::importXML( const OUString& rStrImpValue, Any& rVa if( bRet ) { - bRet = sal_False; + bRet = false; static int nCount = sizeof(aFontWeightMap)/sizeof(FontWeightMapper); for (int i = 0; i < (nCount-1); ++i) { @@ -103,7 +103,7 @@ sal_Bool XMLFontWeightPropHdl::importXML( const OUString& rStrImpValue, Any& rVa else rValue <<= aFontWeightMap[i+1].fWeight; - bRet = sal_True; + bRet = true; break; } } @@ -112,9 +112,9 @@ sal_Bool XMLFontWeightPropHdl::importXML( const OUString& rStrImpValue, Any& rVa return bRet; } -sal_Bool XMLFontWeightPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLFontWeightPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; float fValue = float(); if( !( rValue >>= fValue ) ) @@ -123,11 +123,11 @@ sal_Bool XMLFontWeightPropHdl::exportXML( OUString& rStrExpValue, const Any& rVa if( rValue >>= nValue ) { fValue = (float)nValue; - bRet = sal_True; + bRet = true; } } else - bRet = sal_True; + bRet = true; if( bRet ) { diff --git a/xmloff/source/style/weighhdl.hxx b/xmloff/source/style/weighhdl.hxx index 54f47d29e8c5..3bea25bab9e5 100644 --- a/xmloff/source/style/weighhdl.hxx +++ b/xmloff/source/style/weighhdl.hxx @@ -30,8 +30,8 @@ class XMLFontWeightPropHdl : public XMLPropertyHandler public: virtual ~XMLFontWeightPropHdl(); - 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; }; diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx index 364121b12e9b..0dbe5142bfc3 100644 --- a/xmloff/source/style/xmlbahdl.cxx +++ b/xmloff/source/style/xmlbahdl.cxx @@ -52,10 +52,10 @@ static void lcl_xmloff_setAny( Any& rValue, sal_Int32 nValue, sal_Int8 nBytes ) } } -static sal_Bool lcl_xmloff_getAny( const Any& rValue, sal_Int32& nValue, +static bool lcl_xmloff_getAny( const Any& rValue, sal_Int32& nValue, sal_Int8 nBytes ) { - sal_Bool bRet = sal_False; + bool bRet = false; switch( nBytes ) { @@ -88,7 +88,7 @@ XMLNumberPropHdl::~XMLNumberPropHdl() // nothing to do } -sal_Bool XMLNumberPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLNumberPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { sal_Int32 nValue = 0; bool bRet = ::sax::Converter::convertNumber( nValue, rStrImpValue ); @@ -97,9 +97,9 @@ sal_Bool XMLNumberPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, return bRet; } -sal_Bool XMLNumberPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLNumberPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nValue; OUStringBuffer aOut; @@ -108,7 +108,7 @@ sal_Bool XMLNumberPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, ::sax::Converter::convertNumber( aOut, nValue ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; @@ -133,14 +133,14 @@ XMLNumberNonePropHdl::~XMLNumberNonePropHdl() // nothing to do } -sal_Bool XMLNumberNonePropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLNumberNonePropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nValue = 0; if( rStrImpValue == sZeroStr ) { - bRet = sal_True; + bRet = true; } else { @@ -151,9 +151,9 @@ sal_Bool XMLNumberNonePropHdl::importXML( const OUString& rStrImpValue, Any& rVa return bRet; } -sal_Bool XMLNumberNonePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLNumberNonePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nValue; if( lcl_xmloff_getAny( rValue, nValue, nBytes ) ) @@ -171,7 +171,7 @@ sal_Bool XMLNumberNonePropHdl::exportXML( OUString& rStrExpValue, const Any& rVa rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; @@ -184,9 +184,9 @@ XMLMeasurePropHdl::~XMLMeasurePropHdl() // nothing to do } -sal_Bool XMLMeasurePropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLMeasurePropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nValue = 0; bRet = rUnitConverter.convertMeasureToCore( nValue, rStrImpValue ); @@ -195,9 +195,9 @@ sal_Bool XMLMeasurePropHdl::importXML( const OUString& rStrImpValue, Any& rValue return bRet; } -sal_Bool XMLMeasurePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLMeasurePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nValue; OUStringBuffer aOut; @@ -206,7 +206,7 @@ sal_Bool XMLMeasurePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue rUnitConverter.convertMeasureToXML( aOut, nValue ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; @@ -219,12 +219,12 @@ XMLBoolFalsePropHdl::~XMLBoolFalsePropHdl() // nothing to do } -sal_Bool XMLBoolFalsePropHdl::importXML( const OUString&, Any&, const SvXMLUnitConverter& ) const +bool XMLBoolFalsePropHdl::importXML( const OUString&, Any&, const SvXMLUnitConverter& ) const { - return sal_False; + return false; } -sal_Bool XMLBoolFalsePropHdl::exportXML( OUString& rStrExpValue, const Any& /*rValue*/, const SvXMLUnitConverter& rCnv) const +bool XMLBoolFalsePropHdl::exportXML( OUString& rStrExpValue, const Any& /*rValue*/, const SvXMLUnitConverter& rCnv) const { return XMLBoolPropHdl::exportXML( rStrExpValue, makeAny( sal_False ), rCnv ); } @@ -236,7 +236,7 @@ XMLBoolPropHdl::~XMLBoolPropHdl() // nothing to do } -sal_Bool XMLBoolPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLBoolPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { bool bValue(false); bool const bRet = ::sax::Converter::convertBool( bValue, rStrImpValue ); @@ -245,9 +245,9 @@ sal_Bool XMLBoolPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, c return bRet; } -sal_Bool XMLBoolPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLBoolPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; OUStringBuffer aOut; sal_Bool bValue = sal_Bool(); @@ -256,7 +256,7 @@ sal_Bool XMLBoolPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, c ::sax::Converter::convertBool( aOut, bValue ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; @@ -269,7 +269,7 @@ XMLNBoolPropHdl::~XMLNBoolPropHdl() // nothing to do } -sal_Bool XMLNBoolPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLNBoolPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { bool bValue(false); bool const bRet = ::sax::Converter::convertBool( bValue, rStrImpValue ); @@ -278,9 +278,9 @@ sal_Bool XMLNBoolPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, return bRet; } -sal_Bool XMLNBoolPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLNBoolPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; OUStringBuffer aOut; sal_Bool bValue = sal_Bool(); @@ -289,7 +289,7 @@ sal_Bool XMLNBoolPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, ::sax::Converter::convertBool( aOut, !bValue ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; @@ -302,7 +302,7 @@ XMLPercentPropHdl::~XMLPercentPropHdl() // nothing to do } -sal_Bool XMLPercentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLPercentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { sal_Int32 nValue = 0; bool const bRet = ::sax::Converter::convertPercent( nValue, rStrImpValue ); @@ -311,9 +311,9 @@ sal_Bool XMLPercentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue return bRet; } -sal_Bool XMLPercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLPercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nValue; OUStringBuffer aOut; @@ -322,7 +322,7 @@ sal_Bool XMLPercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue ::sax::Converter::convertPercent( aOut, nValue ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; @@ -330,9 +330,9 @@ sal_Bool XMLPercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue // class XMLDoublePercentPropHdl -sal_Bool XMLDoublePercentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLDoublePercentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; double fValue = 1.0; @@ -351,9 +351,9 @@ sal_Bool XMLDoublePercentPropHdl::importXML( const OUString& rStrImpValue, Any& return bRet; } -sal_Bool XMLDoublePercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLDoublePercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; double fValue = 0; if( rValue >>= fValue ) @@ -367,7 +367,7 @@ sal_Bool XMLDoublePercentPropHdl::exportXML( OUString& rStrExpValue, const Any& ::sax::Converter::convertPercent( aOut, nValue ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; @@ -380,7 +380,7 @@ XMLNegPercentPropHdl::~XMLNegPercentPropHdl() // nothing to do } -sal_Bool XMLNegPercentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLNegPercentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { sal_Int32 nValue = 0; bool const bRet = ::sax::Converter::convertPercent( nValue, rStrImpValue ); @@ -389,9 +389,9 @@ sal_Bool XMLNegPercentPropHdl::importXML( const OUString& rStrImpValue, Any& rVa return bRet; } -sal_Bool XMLNegPercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLNegPercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nValue; OUStringBuffer aOut; @@ -400,7 +400,7 @@ sal_Bool XMLNegPercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rVa ::sax::Converter::convertPercent( aOut, 100-nValue ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; @@ -413,9 +413,9 @@ XMLMeasurePxPropHdl::~XMLMeasurePxPropHdl() // nothing to do } -sal_Bool XMLMeasurePxPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLMeasurePxPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nValue = 0; bRet = ::sax::Converter::convertMeasurePx( nValue, rStrImpValue ); @@ -424,9 +424,9 @@ sal_Bool XMLMeasurePxPropHdl::importXML( const OUString& rStrImpValue, Any& rVal return bRet; } -sal_Bool XMLMeasurePxPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLMeasurePxPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nValue; OUStringBuffer aOut; @@ -435,7 +435,7 @@ sal_Bool XMLMeasurePxPropHdl::exportXML( OUString& rStrExpValue, const Any& rVal ::sax::Converter::convertMeasurePx( aOut, nValue ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; @@ -448,9 +448,9 @@ XMLColorPropHdl::~XMLColorPropHdl() // Nothing to do } -sal_Bool XMLColorPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLColorPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; const OUString astrHSL( "hsl" ); if( rStrImpValue.matchIgnoreAsciiCase( astrHSL ) ) @@ -482,9 +482,9 @@ sal_Bool XMLColorPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, return bRet; } -sal_Bool XMLColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nColor = 0; OUStringBuffer aOut; @@ -493,7 +493,7 @@ sal_Bool XMLColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, ::sax::Converter::convertColor( aOut, nColor ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } else { @@ -503,7 +503,7 @@ sal_Bool XMLColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, aOut.append( "hsl(" + OUString::number(aHSL[0]) + "," + OUString::number(aHSL[1] * 100.0) + "%," + OUString::number(aHSL[2] * 100.0) + "%)" ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } } @@ -517,9 +517,9 @@ XMLHexPropHdl::~XMLHexPropHdl() // Nothing to do } -sal_Bool XMLHexPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLHexPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_uInt32 nRsid; bRet = SvXMLUnitConverter::convertHex( nRsid, rStrImpValue ); @@ -528,9 +528,9 @@ sal_Bool XMLHexPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, co return bRet; } -sal_Bool XMLHexPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLHexPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_uInt32 nRsid = 0; OUStringBuffer aOut; @@ -539,11 +539,11 @@ sal_Bool XMLHexPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, co SvXMLUnitConverter::convertHex( aOut, nRsid ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } else { - bRet = sal_False; + bRet = false; } return bRet; @@ -556,22 +556,22 @@ XMLStringPropHdl::~XMLStringPropHdl() // Nothing to do } -sal_Bool XMLStringPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLStringPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; rValue <<= rStrImpValue; - bRet = sal_True; + bRet = true; return bRet; } -sal_Bool XMLStringPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLStringPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( rValue >>= rStrExpValue ) - bRet = sal_True; + bRet = true; return bRet; } @@ -583,14 +583,14 @@ XMLStyleNamePropHdl::~XMLStyleNamePropHdl() // Nothing to do } -sal_Bool XMLStyleNamePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const +bool XMLStyleNamePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( rValue >>= rStrExpValue ) { rStrExpValue = rUnitConverter.encodeStyleName( rStrExpValue ); - bRet = sal_True; + bRet = true; } return bRet; @@ -603,7 +603,7 @@ XMLDoublePropHdl::~XMLDoublePropHdl() // Nothing to do } -sal_Bool XMLDoublePropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLDoublePropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { double fDblValue(0.0); bool const bRet = ::sax::Converter::convertDouble(fDblValue, rStrImpValue); @@ -611,9 +611,9 @@ sal_Bool XMLDoublePropHdl::importXML( const OUString& rStrImpValue, Any& rValue, return bRet; } -sal_Bool XMLDoublePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLDoublePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; double fValue = 0; @@ -622,7 +622,7 @@ sal_Bool XMLDoublePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, OUStringBuffer aOut; ::sax::Converter::convertDouble( aOut, fValue ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; @@ -643,9 +643,9 @@ XMLColorTransparentPropHdl::~XMLColorTransparentPropHdl() // Nothing to do } -sal_Bool XMLColorTransparentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLColorTransparentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( rStrImpValue != sTransparent ) { @@ -657,20 +657,20 @@ sal_Bool XMLColorTransparentPropHdl::importXML( const OUString& rStrImpValue, An return bRet; } -sal_Bool XMLColorTransparentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLColorTransparentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nColor = 0; if( rStrExpValue == sTransparent ) - bRet = sal_False; + bRet = false; else if( rValue >>= nColor ) { OUStringBuffer aOut; ::sax::Converter::convertColor( aOut, nColor ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; @@ -679,7 +679,7 @@ sal_Bool XMLColorTransparentPropHdl::exportXML( OUString& rStrExpValue, const An // class XMLIsTransparentPropHdl XMLIsTransparentPropHdl::XMLIsTransparentPropHdl( - enum XMLTokenEnum eTransparent, sal_Bool bTransPropVal ) : + enum XMLTokenEnum eTransparent, bool bTransPropVal ) : sTransparent( GetXMLToken( eTransparent != XML_TOKEN_INVALID ? eTransparent : XML_TRANSPARENT ) ), bTransPropValue( bTransPropVal ) @@ -691,28 +691,28 @@ XMLIsTransparentPropHdl::~XMLIsTransparentPropHdl() // Nothing to do } -sal_Bool XMLIsTransparentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLIsTransparentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { sal_Bool bValue = ( (rStrImpValue == sTransparent) == bTransPropValue); rValue.setValue( &bValue, ::getBooleanCppuType() ); - return sal_True; + return true; } -sal_Bool XMLIsTransparentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLIsTransparentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; // MIB: This looks a bit strange, because bTransPropValue == bValue should // do the same, but this only applies if 'true' is represented by the same // 8 bit value in bValue and bTransPropValue. Who will ensure this? sal_Bool bValue = *(sal_Bool *)rValue.getValue(); - sal_Bool bIsTrans = bTransPropValue ? bValue : !bValue; + bool bIsTrans = bTransPropValue ? bValue : !bValue; if( bIsTrans ) { rStrExpValue = sTransparent; - bRet = sal_True; + bRet = true; } return bRet; @@ -730,9 +730,9 @@ XMLColorAutoPropHdl::~XMLColorAutoPropHdl() // Nothing to do } -sal_Bool XMLColorAutoPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLColorAutoPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; // This is a multi property: the value might be set to AUTO_COLOR // already by the XMLIsAutoColorPropHdl! @@ -747,9 +747,9 @@ sal_Bool XMLColorAutoPropHdl::importXML( const OUString& rStrImpValue, Any& rVal return bRet; } -sal_Bool XMLColorAutoPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLColorAutoPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nColor = 0; if( (rValue >>= nColor) && -1 != nColor ) @@ -758,7 +758,7 @@ sal_Bool XMLColorAutoPropHdl::exportXML( OUString& rStrExpValue, const Any& rVal ::sax::Converter::convertColor( aOut, nColor ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; @@ -775,7 +775,7 @@ XMLIsAutoColorPropHdl::~XMLIsAutoColorPropHdl() // Nothing to do } -sal_Bool XMLIsAutoColorPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const +bool XMLIsAutoColorPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { // An auto color overrides any other color set! bool bValue; @@ -783,12 +783,12 @@ sal_Bool XMLIsAutoColorPropHdl::importXML( const OUString& rStrImpValue, Any& rV if( bRet && bValue ) rValue <<= (sal_Int32)-1; - return sal_True; + return true; } -sal_Bool XMLIsAutoColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLIsAutoColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nColor = 0; if( (rValue >>= nColor) && -1 == nColor ) @@ -797,7 +797,7 @@ sal_Bool XMLIsAutoColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rV ::sax::Converter::convertBool( aOut, true ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; @@ -810,16 +810,16 @@ XMLCompareOnlyPropHdl::~XMLCompareOnlyPropHdl() // Nothing to do } -sal_Bool XMLCompareOnlyPropHdl::importXML( const OUString&, Any&, const SvXMLUnitConverter& ) const +bool XMLCompareOnlyPropHdl::importXML( const OUString&, Any&, const SvXMLUnitConverter& ) const { DBG_ASSERT( !this, "importXML called for compare-only-property" ); - return sal_False; + return false; } -sal_Bool XMLCompareOnlyPropHdl::exportXML( OUString&, const Any&, const SvXMLUnitConverter& ) const +bool XMLCompareOnlyPropHdl::exportXML( OUString&, const Any&, const SvXMLUnitConverter& ) const { DBG_ASSERT( !this, "exportXML called for compare-only-property" ); - return sal_False; + return false; } // class XMLNumberWithoutZeroPropHdl @@ -833,7 +833,7 @@ XMLNumberWithoutZeroPropHdl::~XMLNumberWithoutZeroPropHdl() { } -sal_Bool XMLNumberWithoutZeroPropHdl::importXML( +bool XMLNumberWithoutZeroPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const @@ -845,11 +845,11 @@ sal_Bool XMLNumberWithoutZeroPropHdl::importXML( return bRet; } -sal_Bool XMLNumberWithoutZeroPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLNumberWithoutZeroPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { sal_Int32 nValue = 0; - sal_Bool bRet = lcl_xmloff_getAny( rValue, nValue, nBytes ); + bool bRet = lcl_xmloff_getAny( rValue, nValue, nBytes ); bRet &= nValue != 0; if( bRet ) @@ -868,7 +868,7 @@ XMLNumberWithAutoInsteadZeroPropHdl::~XMLNumberWithAutoInsteadZeroPropHdl() { } -sal_Bool XMLNumberWithAutoInsteadZeroPropHdl::importXML( +bool XMLNumberWithAutoInsteadZeroPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const @@ -880,12 +880,12 @@ sal_Bool XMLNumberWithAutoInsteadZeroPropHdl::importXML( else if( rStrImpValue == GetXMLToken( XML_AUTO ) ) { rValue <<= (sal_Int16)nValue; - bRet = sal_True; + bRet = true; } return bRet; } -sal_Bool XMLNumberWithAutoInsteadZeroPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const +bool XMLNumberWithAutoInsteadZeroPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { sal_Int32 nValue = 0; @@ -900,7 +900,7 @@ sal_Bool XMLNumberWithAutoInsteadZeroPropHdl::exportXML( OUString& rStrExpValue, rStrExpValue = aBuffer.makeStringAndClear(); } - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/xmlbahdl.hxx b/xmloff/source/style/xmlbahdl.hxx index 3f32dc5b607a..e4526e6c00a1 100644 --- a/xmloff/source/style/xmlbahdl.hxx +++ b/xmloff/source/style/xmlbahdl.hxx @@ -36,8 +36,8 @@ public: XMLNumberPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLNumberPropHdl(); - 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; }; /** @@ -52,8 +52,8 @@ public: XMLNumberNonePropHdl( enum ::xmloff::token::XMLTokenEnum eZeroString, sal_Int8 nB = 4 ); virtual ~XMLNumberNonePropHdl(); - 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; }; /** @@ -66,8 +66,8 @@ public: XMLMeasurePropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLMeasurePropHdl(); - 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; }; /** @@ -80,8 +80,8 @@ public: XMLPercentPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLPercentPropHdl(); - 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; }; /** @@ -90,8 +90,8 @@ public: */ class XMLDoublePercentPropHdl : public XMLPropertyHandler { - 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; }; /** @@ -104,8 +104,8 @@ public: XMLNegPercentPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLNegPercentPropHdl(); - 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; }; /** @@ -118,8 +118,8 @@ public: XMLMeasurePxPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLMeasurePxPropHdl(); - 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; }; /** @@ -130,8 +130,8 @@ class XMLBoolPropHdl : public XMLPropertyHandler public: virtual ~XMLBoolPropHdl(); - 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 XMLBoolFalsePropHdl : public XMLBoolPropHdl @@ -139,8 +139,8 @@ class XMLBoolFalsePropHdl : public XMLBoolPropHdl public: virtual ~XMLBoolFalsePropHdl(); - 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; }; @@ -152,8 +152,8 @@ class XMLColorPropHdl : public XMLPropertyHandler public: virtual ~XMLColorPropHdl(); - 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; }; /** @@ -164,8 +164,8 @@ class XMLHexPropHdl : public XMLPropertyHandler public: virtual ~XMLHexPropHdl(); - 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; }; /** @@ -176,8 +176,8 @@ class XMLStringPropHdl : public XMLPropertyHandler public: virtual ~XMLStringPropHdl(); - 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; }; /** @@ -188,7 +188,7 @@ class XMLStyleNamePropHdl : public XMLStringPropHdl public: virtual ~XMLStyleNamePropHdl(); - virtual sal_Bool exportXML( OUString& rStrExpValue, const ::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; }; @@ -200,8 +200,8 @@ class XMLDoublePropHdl : public XMLPropertyHandler public: virtual ~XMLDoublePropHdl(); - 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; }; /** @@ -212,8 +212,8 @@ class XMLNBoolPropHdl : public XMLPropertyHandler public: virtual ~XMLNBoolPropHdl(); - 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; }; /** @@ -227,8 +227,8 @@ public: XMLColorTransparentPropHdl( enum ::xmloff::token::XMLTokenEnum eTransparent = xmloff::token::XML_TOKEN_INVALID ); virtual ~XMLColorTransparentPropHdl(); - 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; }; /** @@ -237,15 +237,15 @@ public: class XMLIsTransparentPropHdl : public XMLPropertyHandler { const OUString sTransparent; - sal_Bool bTransPropValue; + bool bTransPropValue; public: XMLIsTransparentPropHdl( enum ::xmloff::token::XMLTokenEnum eTransparent = xmloff::token::XML_TOKEN_INVALID, - sal_Bool bTransPropValue = sal_True ); + bool bTransPropValue = true ); virtual ~XMLIsTransparentPropHdl(); - 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; }; /** @@ -257,8 +257,8 @@ public: XMLColorAutoPropHdl(); virtual ~XMLColorAutoPropHdl(); - 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; }; /** @@ -270,8 +270,8 @@ public: XMLIsAutoColorPropHdl(); virtual ~XMLIsAutoColorPropHdl(); - 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; }; @@ -284,8 +284,8 @@ class XMLCompareOnlyPropHdl : public XMLPropertyHandler public: virtual ~XMLCompareOnlyPropHdl(); - 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; }; /** @@ -300,8 +300,8 @@ public: XMLNumberWithoutZeroPropHdl( sal_Int8 nB = 4 ); virtual ~XMLNumberWithoutZeroPropHdl(); - 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; }; /** @@ -314,8 +314,8 @@ class XMLNumberWithAutoInsteadZeroPropHdl : public XMLNumberWithoutZeroPropHdl public: virtual ~XMLNumberWithAutoInsteadZeroPropHdl(); - 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_BASICTYPES_HXX diff --git a/xmloff/source/text/XMLAnchorTypePropHdl.hxx b/xmloff/source/text/XMLAnchorTypePropHdl.hxx index 01049e5dc01e..6b3934e9db5d 100644 --- a/xmloff/source/text/XMLAnchorTypePropHdl.hxx +++ b/xmloff/source/text/XMLAnchorTypePropHdl.hxx @@ -29,15 +29,15 @@ class XMLAnchorTypePropHdl : public XMLPropertyHandler public: virtual ~XMLAnchorTypePropHdl (); - 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; - static sal_Bool convert( const OUString& rStrImpValue, + static bool convert( const OUString& rStrImpValue, ::com::sun::star::text::TextContentAnchorType& rType ); }; diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index 07157c89d159..26276357a868 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -251,11 +251,11 @@ public: const ::com::sun::star::uno::Any& r2 ) const; /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; @@ -279,22 +279,22 @@ bool XMLDropCapPropHdl_Impl::equals( aFormat1.Distance == aFormat2.Distance); } -sal_Bool XMLDropCapPropHdl_Impl::importXML( +bool XMLDropCapPropHdl_Impl::importXML( const OUString&, Any&, const SvXMLUnitConverter& ) const { DBG_ASSERT( !this, "drop caps are an element import property" ); - return sal_False; + return false; } -sal_Bool XMLDropCapPropHdl_Impl::exportXML( +bool XMLDropCapPropHdl_Impl::exportXML( OUString&, const Any&, const SvXMLUnitConverter& ) const { DBG_ASSERT( !this, "drop caps are an element export property" ); - return sal_False; + return false; } class XMLOpaquePropHdl_Impl : public XMLPropertyHandler @@ -302,22 +302,22 @@ class XMLOpaquePropHdl_Impl : public XMLPropertyHandler public: virtual ~XMLOpaquePropHdl_Impl (); - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; -sal_Bool XMLOpaquePropHdl_Impl::importXML( +bool XMLOpaquePropHdl_Impl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_True; + bool bRet = true; sal_Bool bVal = sal_False; if( IsXMLToken( rStrImpValue, XML_FOREGROUND ) ) bVal = sal_True; @@ -330,7 +330,7 @@ sal_Bool XMLOpaquePropHdl_Impl::importXML( return bRet; } -sal_Bool XMLOpaquePropHdl_Impl::exportXML( +bool XMLOpaquePropHdl_Impl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const @@ -340,7 +340,7 @@ sal_Bool XMLOpaquePropHdl_Impl::exportXML( else rStrExpValue = GetXMLToken( XML_BACKGROUND ); - return sal_True; + return true; } XMLOpaquePropHdl_Impl::~XMLOpaquePropHdl_Impl () @@ -352,22 +352,22 @@ class XMLContourModePropHdl_Impl : public XMLPropertyHandler public: virtual ~XMLContourModePropHdl_Impl (); - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; -sal_Bool XMLContourModePropHdl_Impl::importXML( +bool XMLContourModePropHdl_Impl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_True; + bool bRet = true; sal_Bool bVal = sal_False; if( IsXMLToken( rStrImpValue, XML_OUTSIDE ) ) bVal = sal_True; @@ -380,7 +380,7 @@ sal_Bool XMLContourModePropHdl_Impl::importXML( return bRet; } -sal_Bool XMLContourModePropHdl_Impl::exportXML( +bool XMLContourModePropHdl_Impl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const @@ -390,7 +390,7 @@ sal_Bool XMLContourModePropHdl_Impl::exportXML( else rStrExpValue = GetXMLToken( XML_FULL ); - return sal_True; + return true; } XMLContourModePropHdl_Impl::~XMLContourModePropHdl_Impl() @@ -402,22 +402,22 @@ class XMLParagraphOnlyPropHdl_Impl : public XMLPropertyHandler public: virtual ~XMLParagraphOnlyPropHdl_Impl (); - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; -sal_Bool XMLParagraphOnlyPropHdl_Impl::importXML( +bool XMLParagraphOnlyPropHdl_Impl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_True; + bool bRet = true; sal_Bool bVal = sal_False; if( ! IsXMLToken( rStrImpValue, XML_NO_LIMIT ) ) @@ -433,7 +433,7 @@ sal_Bool XMLParagraphOnlyPropHdl_Impl::importXML( return bRet; } -sal_Bool XMLParagraphOnlyPropHdl_Impl::exportXML( +bool XMLParagraphOnlyPropHdl_Impl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const @@ -443,7 +443,7 @@ sal_Bool XMLParagraphOnlyPropHdl_Impl::exportXML( else rStrExpValue = GetXMLToken( XML_NO_LIMIT ); - return sal_True; + return true; } XMLParagraphOnlyPropHdl_Impl::~XMLParagraphOnlyPropHdl_Impl() @@ -466,23 +466,23 @@ class XMLWrapPropHdl_Impl : public XMLPropertyHandler public: virtual ~XMLWrapPropHdl_Impl (); - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; -sal_Bool XMLWrapPropHdl_Impl::importXML( +bool XMLWrapPropHdl_Impl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 nWrap; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( nWrap, rStrImpValue, + bool bRet = SvXMLUnitConverter::convertEnum( nWrap, rStrImpValue, pXML_Wrap_Enum ); if( bRet ) @@ -491,7 +491,7 @@ sal_Bool XMLWrapPropHdl_Impl::importXML( return bRet; } -sal_Bool XMLWrapPropHdl_Impl::exportXML( +bool XMLWrapPropHdl_Impl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const @@ -501,7 +501,7 @@ sal_Bool XMLWrapPropHdl_Impl::exportXML( rValue >>= eVal; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( aOut, eVal, pXML_Wrap_Enum, XML_NONE ); + bool bRet = SvXMLUnitConverter::convertEnum( aOut, eVal, pXML_Wrap_Enum, XML_NONE ); rStrExpValue = aOut.makeStringAndClear(); @@ -520,31 +520,31 @@ public: sVal( GetXMLToken(eVal) ) {} virtual ~XMLFrameProtectPropHdl_Impl (); - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; -sal_Bool XMLFrameProtectPropHdl_Impl::importXML( +bool XMLFrameProtectPropHdl_Impl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_True; + bool bRet = true; sal_Bool bVal = sal_False; if( ! IsXMLToken( rStrImpValue, XML_NONE ) ) { - bRet = sal_False; + bRet = false; SvXMLTokenEnumerator aTokenEnum( rStrImpValue ); OUString aToken; while( aTokenEnum.getNextToken( aToken ) ) { - bRet = sal_True; + bRet = true; if( aToken == sVal ) { bVal = sal_True; @@ -559,7 +559,7 @@ sal_Bool XMLFrameProtectPropHdl_Impl::importXML( return bRet; } -sal_Bool XMLFrameProtectPropHdl_Impl::exportXML( +bool XMLFrameProtectPropHdl_Impl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const @@ -581,7 +581,7 @@ sal_Bool XMLFrameProtectPropHdl_Impl::exportXML( rStrExpValue = GetXMLToken( XML_NONE ); } - return sal_True; + return true; } XMLFrameProtectPropHdl_Impl::~XMLFrameProtectPropHdl_Impl() @@ -598,13 +598,13 @@ SvXMLEnumMapEntry const pXML_Anchor_Enum[] = { XML_TOKEN_INVALID, 0 } }; -sal_Bool XMLAnchorTypePropHdl::importXML( +bool XMLAnchorTypePropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 nAnchor; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( nAnchor, rStrImpValue, + bool bRet = SvXMLUnitConverter::convertEnum( nAnchor, rStrImpValue, pXML_Anchor_Enum ); if( bRet ) @@ -613,7 +613,7 @@ sal_Bool XMLAnchorTypePropHdl::importXML( return bRet; } -sal_Bool XMLAnchorTypePropHdl::exportXML( +bool XMLAnchorTypePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const @@ -623,7 +623,7 @@ sal_Bool XMLAnchorTypePropHdl::exportXML( rValue >>= eVal; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( aOut, eVal, pXML_Anchor_Enum, XML_PARAGRAPH ); + bool bRet = SvXMLUnitConverter::convertEnum( aOut, eVal, pXML_Anchor_Enum, XML_PARAGRAPH ); rStrExpValue = aOut.makeStringAndClear(); @@ -634,11 +634,11 @@ XMLAnchorTypePropHdl::~XMLAnchorTypePropHdl() { } -sal_Bool XMLAnchorTypePropHdl::convert( const OUString& rStrImpValue, +bool XMLAnchorTypePropHdl::convert( const OUString& rStrImpValue, TextContentAnchorType& rType ) { sal_uInt16 nAnchor; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( nAnchor, rStrImpValue, + bool bRet = SvXMLUnitConverter::convertEnum( nAnchor, rStrImpValue, pXML_Anchor_Enum ); if( bRet ) rType = (TextContentAnchorType)nAnchor; @@ -661,13 +661,13 @@ bool XMLTextColumnsPropertyHandler::equals( if( xColumns1->getColumnCount() != xColumns2->getColumnCount() || xColumns1->getReferenceValue() != xColumns2->getReferenceValue() ) - return sal_False; + return false; Sequence < TextColumn > aColumns1 = xColumns1->getColumns(); Sequence < TextColumn > aColumns2 = xColumns2->getColumns(); sal_Int32 nCount = aColumns1.getLength(); if( aColumns2.getLength() != nCount ) - return sal_False; + return false; const TextColumn *pColumns1 = aColumns1.getArray(); const TextColumn *pColumns2 = aColumns2.getArray(); @@ -677,31 +677,31 @@ bool XMLTextColumnsPropertyHandler::equals( if( pColumns1->Width != pColumns2->Width || pColumns1->LeftMargin != pColumns2->LeftMargin || pColumns1->RightMargin != pColumns2->RightMargin ) - return sal_False; + return false; pColumns1++; pColumns2++; } - return sal_True; + return true; } -sal_Bool XMLTextColumnsPropertyHandler::importXML( +bool XMLTextColumnsPropertyHandler::importXML( const OUString&, Any&, const SvXMLUnitConverter& ) const { DBG_ASSERT( !this, "columns are an element import property" ); - return sal_False; + return false; } -sal_Bool XMLTextColumnsPropertyHandler::exportXML( +bool XMLTextColumnsPropertyHandler::exportXML( OUString&, const Any&, const SvXMLUnitConverter& ) const { DBG_ASSERT( !this, "columns are an element export property" ); - return sal_False; + return false; } class XMLHoriMirrorPropHdl_Impl : public XMLPropertyHandler @@ -709,23 +709,23 @@ class XMLHoriMirrorPropHdl_Impl : public XMLPropertyHandler public: virtual ~XMLHoriMirrorPropHdl_Impl (); - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; -sal_Bool XMLHoriMirrorPropHdl_Impl::importXML( +bool XMLHoriMirrorPropHdl_Impl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { sal_uInt16 nHoriMirror; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( nHoriMirror, rStrImpValue, + bool bRet = SvXMLUnitConverter::convertEnum( nHoriMirror, rStrImpValue, pXML_HoriMirror_Enum ); if( bRet ) @@ -737,14 +737,14 @@ sal_Bool XMLHoriMirrorPropHdl_Impl::importXML( return bRet; } -sal_Bool XMLHoriMirrorPropHdl_Impl::exportXML( +bool XMLHoriMirrorPropHdl_Impl::exportXML( OUString&, const Any&, const SvXMLUnitConverter& ) const { DBG_ASSERT( !this, "HorMirror properyt shouldn't be exported" ); - return sal_False; + return false; } XMLHoriMirrorPropHdl_Impl::~XMLHoriMirrorPropHdl_Impl () @@ -754,39 +754,39 @@ XMLHoriMirrorPropHdl_Impl::~XMLHoriMirrorPropHdl_Impl () class XMLGrfMirrorPropHdl_Impl : public XMLPropertyHandler { const OUString sVal; - sal_Bool bHori; + bool bHori; public: - XMLGrfMirrorPropHdl_Impl( enum XMLTokenEnum eVal, sal_Bool bH ) : + XMLGrfMirrorPropHdl_Impl( enum XMLTokenEnum eVal, bool bH ) : sVal( GetXMLToken( eVal ) ), bHori( bH ) {} virtual ~XMLGrfMirrorPropHdl_Impl (); - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; -sal_Bool XMLGrfMirrorPropHdl_Impl::importXML( +bool XMLGrfMirrorPropHdl_Impl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_True; + bool bRet = true; sal_Bool bVal = sal_False; if( ! IsXMLToken( rStrImpValue, XML_NONE ) ) { - bRet = sal_False; + bRet = false; SvXMLTokenEnumerator aTokenEnum( rStrImpValue ); OUString aToken; while( aTokenEnum.getNextToken( aToken ) ) { - bRet = sal_True; + bRet = true; if( aToken == sVal || (bHori && IsXMLToken( aToken, XML_HORIZONTAL ) ) ) { @@ -802,7 +802,7 @@ sal_Bool XMLGrfMirrorPropHdl_Impl::importXML( return bRet; } -sal_Bool XMLGrfMirrorPropHdl_Impl::exportXML( +bool XMLGrfMirrorPropHdl_Impl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const @@ -834,7 +834,7 @@ sal_Bool XMLGrfMirrorPropHdl_Impl::exportXML( rStrExpValue = GetXMLToken( XML_NONE ); } - return sal_True; + return true; } XMLGrfMirrorPropHdl_Impl::~XMLGrfMirrorPropHdl_Impl() @@ -856,25 +856,25 @@ public: XMLTextEmphasizePropHdl_Impl() {} virtual ~XMLTextEmphasizePropHdl_Impl(); - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; -sal_Bool XMLTextEmphasizePropHdl_Impl::importXML( +bool XMLTextEmphasizePropHdl_Impl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_True; + bool bRet = true; sal_uInt16 nVal = FontEmphasis::NONE; - sal_Bool bBelow = sal_False; - sal_Bool bHasPos = sal_False, bHasType = sal_False; + bool bBelow = false; + bool bHasPos = false, bHasType = false; OUString aToken; SvXMLTokenEnumerator aTokenEnum( rStrImpValue ); @@ -882,23 +882,23 @@ sal_Bool XMLTextEmphasizePropHdl_Impl::importXML( { if( !bHasPos && IsXMLToken( aToken, XML_ABOVE ) ) { - bBelow = sal_False; - bHasPos = sal_True; + bBelow = false; + bHasPos = true; } else if( !bHasPos && IsXMLToken( aToken, XML_BELOW ) ) { - bBelow = sal_True; - bHasPos = sal_True; + bBelow = true; + bHasPos = true; } else if( !bHasType && SvXMLUnitConverter::convertEnum( nVal, aToken, pXML_Emphasize_Enum )) { - bHasType = sal_True; + bHasType = true; } else { - bRet = sal_False; + bRet = false; break; } } @@ -913,20 +913,20 @@ sal_Bool XMLTextEmphasizePropHdl_Impl::importXML( return bRet; } -sal_Bool XMLTextEmphasizePropHdl_Impl::exportXML( +bool XMLTextEmphasizePropHdl_Impl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { OUStringBuffer aOut( 15 ); - sal_Bool bRet = sal_True; + bool bRet = true; sal_Int16 nType = sal_Int16(); if( rValue >>= nType ) { - sal_Bool bBelow = sal_False; + bool bBelow = false; if( nType > 10 ) { - bBelow = sal_True; + bBelow = true; nType -= 10; } bRet = SvXMLUnitConverter::convertEnum( aOut, nType, @@ -957,17 +957,17 @@ public: XMLTextCombineCharPropHdl_Impl() {} virtual ~XMLTextCombineCharPropHdl_Impl(); - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; -sal_Bool XMLTextCombineCharPropHdl_Impl::importXML( +bool XMLTextCombineCharPropHdl_Impl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const @@ -977,10 +977,10 @@ sal_Bool XMLTextCombineCharPropHdl_Impl::importXML( else rValue <<= rStrImpValue; - return sal_True; + return true; } -sal_Bool XMLTextCombineCharPropHdl_Impl::exportXML( +bool XMLTextCombineCharPropHdl_Impl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const @@ -988,7 +988,7 @@ sal_Bool XMLTextCombineCharPropHdl_Impl::exportXML( rValue >>= rStrExpValue; // #i114107# attribute of type "character": export only if length is 1 - return (1 == rStrExpValue.getLength()) ? sal_True : sal_False; + return (1 == rStrExpValue.getLength()); } XMLTextCombineCharPropHdl_Impl::~XMLTextCombineCharPropHdl_Impl() @@ -1001,17 +1001,17 @@ public: XMLTextRelWidthHeightPropHdl_Impl() {} virtual ~XMLTextRelWidthHeightPropHdl_Impl(); - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; -sal_Bool XMLTextRelWidthHeightPropHdl_Impl::importXML( +bool XMLTextRelWidthHeightPropHdl_Impl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const @@ -1024,12 +1024,12 @@ sal_Bool XMLTextRelWidthHeightPropHdl_Impl::importXML( return bRet; } -sal_Bool XMLTextRelWidthHeightPropHdl_Impl::exportXML( +bool XMLTextRelWidthHeightPropHdl_Impl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int16 nValue = sal_Int16(); if( (rValue >>= nValue) && nValue > 0 ) { @@ -1037,7 +1037,7 @@ sal_Bool XMLTextRelWidthHeightPropHdl_Impl::exportXML( ::sax::Converter::convertPercent( aOut, nValue ); rStrExpValue = aOut.makeStringAndClear(); - bRet = sal_True; + bRet = true; } return bRet; @@ -1056,17 +1056,17 @@ public: sValue( GetXMLToken(eValue) ) {} virtual ~XMLTextSyncWidthHeightPropHdl_Impl(); - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; -sal_Bool XMLTextSyncWidthHeightPropHdl_Impl::importXML( +bool XMLTextSyncWidthHeightPropHdl_Impl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const @@ -1074,19 +1074,19 @@ sal_Bool XMLTextSyncWidthHeightPropHdl_Impl::importXML( sal_Bool bValue = (rStrImpValue == sValue ); rValue.setValue( &bValue, ::getBooleanCppuType() ); - return sal_True; + return true; } -sal_Bool XMLTextSyncWidthHeightPropHdl_Impl::exportXML( +bool XMLTextSyncWidthHeightPropHdl_Impl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( *(sal_Bool *)rValue.getValue() ) { rStrExpValue = sValue; - bRet = sal_True; + bRet = true; } return bRet; @@ -1103,17 +1103,17 @@ public: XMLTextRotationAnglePropHdl_Impl() {} virtual ~XMLTextRotationAnglePropHdl_Impl(); - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; -sal_Bool XMLTextRotationAnglePropHdl_Impl::importXML( +bool XMLTextRotationAnglePropHdl_Impl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const @@ -1138,13 +1138,13 @@ sal_Bool XMLTextRotationAnglePropHdl_Impl::importXML( return bRet; } -sal_Bool XMLTextRotationAnglePropHdl_Impl::exportXML( +bool XMLTextRotationAnglePropHdl_Impl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { sal_Int16 nAngle = sal_Int16(); - sal_Bool bRet = ( rValue >>= nAngle ); + bool bRet = ( rValue >>= nAngle ); if( bRet ) { OUStringBuffer aOut; @@ -1166,17 +1166,17 @@ public: XMLNumber8OneBasedHdl() {} virtual ~XMLNumber8OneBasedHdl() {}; - virtual sal_Bool importXML( + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; - virtual sal_Bool exportXML( + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; -sal_Bool XMLNumber8OneBasedHdl::importXML( +bool XMLNumber8OneBasedHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const @@ -1188,13 +1188,13 @@ sal_Bool XMLNumber8OneBasedHdl::importXML( return bRet; } -sal_Bool XMLNumber8OneBasedHdl::exportXML( +bool XMLNumber8OneBasedHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { sal_Int8 nValue = sal_Int8(); - sal_Bool bRet = ( rValue >>= nValue ); + bool bRet = ( rValue >>= nValue ); if( bRet ) { OUStringBuffer aOut; @@ -1282,21 +1282,21 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler pHdl = new XMLConstantsPropertyHandler( pXML_VertRelAsChar_Enum, XML_TOKEN_INVALID ); break; case XML_TYPE_TEXT_MIRROR_VERTICAL: - pHdl = new XMLGrfMirrorPropHdl_Impl( XML_VERTICAL, sal_False ); + pHdl = new XMLGrfMirrorPropHdl_Impl( XML_VERTICAL, false ); break; case XML_TYPE_TEXT_MIRROR_HORIZONTAL_LEFT: // XML_HORIZONTAL_ON_LEFT_PAGES is replaced by XML_HORIZONTAL_ON_EVEN. (#i49139#) - pHdl = new XMLGrfMirrorPropHdl_Impl( XML_HORIZONTAL_ON_EVEN, sal_True ); + pHdl = new XMLGrfMirrorPropHdl_Impl( XML_HORIZONTAL_ON_EVEN, true ); break; case XML_TYPE_TEXT_MIRROR_HORIZONTAL_RIGHT: // XML_HORIZONTAL_ON_RIGHT_PAGES is replaced by XML_HORIZONTAL_ON_ODD. (#i49139#) - pHdl = new XMLGrfMirrorPropHdl_Impl( XML_HORIZONTAL_ON_ODD, sal_True ); + pHdl = new XMLGrfMirrorPropHdl_Impl( XML_HORIZONTAL_ON_ODD, true ); break; case XML_TYPE_TEXT_CLIP: - pHdl = new XMLClipPropertyHandler( sal_False ); + pHdl = new XMLClipPropertyHandler( false ); break; case XML_TYPE_TEXT_CLIP11: - pHdl = new XMLClipPropertyHandler( sal_True ); + pHdl = new XMLClipPropertyHandler( true ); break; case XML_TYPE_TEXT_EMPHASIZE: pHdl = new XMLTextEmphasizePropHdl_Impl; |