[Libreoffice-commits] core.git: include/xmloff sc/source xmloff/inc xmloff/source
Eike Rathke
erack at redhat.com
Mon Sep 16 06:08:52 PDT 2013
include/xmloff/EnumPropertyHdl.hxx | 4
include/xmloff/NamedBoolPropertyHdl.hxx | 4
include/xmloff/WordWrapPropertyHdl.hxx | 4
include/xmloff/XMLConstantsPropertyHandler.hxx | 4
include/xmloff/controlpropertyhdl.hxx | 16
include/xmloff/xmlprhdl.hxx | 4
sc/source/filter/xml/xmlstyle.cxx | 252 +++++------
sc/source/filter/xml/xmlstyle.hxx | 58 +-
xmloff/inc/AttributeContainerHandler.hxx | 4
xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx | 4
xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx | 8
xmloff/inc/XMLClipPropertyHandler.hxx | 8
xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx | 4
xmloff/inc/XMLIsPercentagePropertyHandler.hxx | 4
xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx | 8
xmloff/inc/XMLRectangleMembersHandler.hxx | 4
xmloff/inc/XMLTextColumnsPropertyHandler.hxx | 4
xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx | 8
xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx | 4
xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx | 2
xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx | 2
xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx | 6
xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx | 8
xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx | 12
xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx | 4
xmloff/source/chart/XMLTextOrientationHdl.cxx | 14
xmloff/source/chart/XMLTextOrientationHdl.hxx | 4
xmloff/source/draw/numithdl.cxx | 8
xmloff/source/draw/numithdl.hxx | 4
xmloff/source/draw/propimp0.cxx | 46 +-
xmloff/source/draw/propimp0.hxx | 16
xmloff/source/draw/sdpropls.cxx | 42 -
xmloff/source/forms/controlpropertyhdl.cxx | 54 +-
xmloff/source/style/AttributeContainerHandler.cxx | 16
xmloff/source/style/DrawAspectHdl.cxx | 8
xmloff/source/style/DrawAspectHdl.hxx | 4
xmloff/source/style/EnumPropertyHdl.cxx | 16
xmloff/source/style/NamedBoolPropertyHdl.cxx | 12
xmloff/source/style/PageMasterPropHdl.cxx | 87 +--
xmloff/source/style/PageMasterPropHdl.hxx | 28 -
xmloff/source/style/WordWrapPropertyHdl.cxx | 13
xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx | 8
xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx | 14
xmloff/source/style/XMLClipPropertyHandler.cxx | 14
xmloff/source/style/XMLConstantsPropertyHandler.cxx | 8
xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx | 10
xmloff/source/style/XMLIsPercentagePropertyHandler.cxx | 8
xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx | 18
xmloff/source/style/XMLRectangleMembersHandler.cxx | 10
xmloff/source/style/adjushdl.cxx | 18
xmloff/source/style/adjushdl.hxx | 8
xmloff/source/style/backhdl.cxx | 38 -
xmloff/source/style/backhdl.hxx | 4
xmloff/source/style/bordrhdl.cxx | 52 +-
xmloff/source/style/bordrhdl.hxx | 8
xmloff/source/style/breakhdl.cxx | 28 -
xmloff/source/style/breakhdl.hxx | 8
xmloff/source/style/cdouthdl.cxx | 36 -
xmloff/source/style/cdouthdl.hxx | 16
xmloff/source/style/chrhghdl.cxx | 24 -
xmloff/source/style/chrhghdl.hxx | 12
xmloff/source/style/chrlohdl.cxx | 66 +-
xmloff/source/style/chrlohdl.hxx | 16
xmloff/source/style/csmaphdl.cxx | 18
xmloff/source/style/csmaphdl.hxx | 8
xmloff/source/style/durationhdl.cxx | 10
xmloff/source/style/durationhdl.hxx | 4
xmloff/source/style/escphdl.cxx | 24 -
xmloff/source/style/escphdl.hxx | 8
xmloff/source/style/fonthdl.cxx | 42 -
xmloff/source/style/fonthdl.hxx | 16
xmloff/source/style/kernihdl.cxx | 10
xmloff/source/style/kernihdl.hxx | 4
xmloff/source/style/lspachdl.cxx | 38 -
xmloff/source/style/lspachdl.hxx | 12
xmloff/source/style/opaquhdl.cxx | 11
xmloff/source/style/opaquhdl.hxx | 4
xmloff/source/style/postuhdl.cxx | 10
xmloff/source/style/postuhdl.hxx | 4
xmloff/source/style/shadwhdl.cxx | 24 -
xmloff/source/style/shadwhdl.hxx | 4
xmloff/source/style/shdwdhdl.cxx | 10
xmloff/source/style/shdwdhdl.hxx | 4
xmloff/source/style/tabsthdl.cxx | 12
xmloff/source/style/tabsthdl.hxx | 4
xmloff/source/style/undlihdl.cxx | 24 -
xmloff/source/style/undlihdl.hxx | 12
xmloff/source/style/weighhdl.cxx | 20
xmloff/source/style/weighhdl.hxx | 4
xmloff/source/style/xmlbahdl.cxx | 210 ++++-----
xmloff/source/style/xmlbahdl.hxx | 90 +--
xmloff/source/text/XMLAnchorTypePropHdl.hxx | 6
xmloff/source/text/txtprhdl.cxx | 236 +++++-----
93 files changed, 1059 insertions(+), 1060 deletions(-)
New commits:
commit 0825d0cb76a84503d77d7e635947e1f4da7e299d
Author: Eike Rathke <erack at redhat.com>
Date: Mon Sep 16 15:06:48 2013 +0200
sal_Bool to bool
Change-Id: Id32780e5cb565e85f0366a91282ce085ed7d2f3c
diff --git a/include/xmloff/EnumPropertyHdl.hxx b/include/xmloff/EnumPropertyHdl.hxx
index f2ef26d..d9f757b 100644
--- a/include/xmloff/EnumPropertyHdl.hxx
+++ b/include/xmloff/EnumPropertyHdl.hxx
@@ -37,8 +37,8 @@ public:
XMLEnumPropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ) : mpEnumMap( pEnumMap ), mrType( rType ) {}
virtual ~XMLEnumPropertyHdl();
- 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_ENUMPROPERTYHANDLER_HXX
diff --git a/include/xmloff/NamedBoolPropertyHdl.hxx b/include/xmloff/NamedBoolPropertyHdl.hxx
index e6dc49c..16a4462 100644
--- a/include/xmloff/NamedBoolPropertyHdl.hxx
+++ b/include/xmloff/NamedBoolPropertyHdl.hxx
@@ -47,8 +47,8 @@ public:
virtual ~XMLNamedBoolPropertyHdl();
- 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_NAMEDBOOLPROPERTYHANDLER_HXX
diff --git a/include/xmloff/WordWrapPropertyHdl.hxx b/include/xmloff/WordWrapPropertyHdl.hxx
index 6430b82..845c1cc 100644
--- a/include/xmloff/WordWrapPropertyHdl.hxx
+++ b/include/xmloff/WordWrapPropertyHdl.hxx
@@ -38,8 +38,8 @@ public:
XMLWordWrapPropertyHdl( SvXMLImport* pImport );
virtual ~XMLWordWrapPropertyHdl();
- 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_NAMEDBOOLPROPERTYHANDLER_HXX
diff --git a/include/xmloff/XMLConstantsPropertyHandler.hxx b/include/xmloff/XMLConstantsPropertyHandler.hxx
index cad1251..ef3c305 100644
--- a/include/xmloff/XMLConstantsPropertyHandler.hxx
+++ b/include/xmloff/XMLConstantsPropertyHandler.hxx
@@ -46,13 +46,13 @@ public:
virtual ~XMLConstantsPropertyHandler();
/// 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/include/xmloff/controlpropertyhdl.hxx b/include/xmloff/controlpropertyhdl.hxx
index 3e2cbfd5..0890d00 100644
--- a/include/xmloff/controlpropertyhdl.hxx
+++ b/include/xmloff/controlpropertyhdl.hxx
@@ -46,8 +46,8 @@ namespace xmloff
public:
ORotationAngleHandler();
- 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;
};
//=====================================================================
@@ -58,8 +58,8 @@ namespace xmloff
public:
OFontWidthHandler();
- 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;
};
//=====================================================================
@@ -76,8 +76,8 @@ namespace xmloff
OControlBorderHandler( const BorderFacet _eFacet );
- 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:
BorderFacet m_eFacet;
@@ -91,8 +91,8 @@ namespace xmloff
public:
OControlTextEmphasisHandler();
- 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/include/xmloff/xmlprhdl.hxx b/include/xmloff/xmlprhdl.hxx
index 746e9e3..c2d37b7 100644
--- a/include/xmloff/xmlprhdl.hxx
+++ b/include/xmloff/xmlprhdl.hxx
@@ -48,9 +48,9 @@ public:
virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const;
/// Imports the given value in cas of the given XML-data-type
- virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0;
+ virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0;
/// Exports the given value in cas of the given XML-data-type
- virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0;
+ virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0;
};
#endif // _XMLOFF_PROPERTYHANDLERBASE_HXX
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index 6b4d8a1..e43ca7f 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -683,7 +683,7 @@ void ScXMLAutoStylePoolP::exportStyleContent(
SvXMLAutoStylePoolP::exportStyleContent( rHandler, nFamily, rProperties, rPropExp, rUnitConverter, rNamespaceMap );
if (nFamily == XML_STYLE_FAMILY_TABLE_CELL)
{
- sal_Bool bNotFound = sal_True;
+ bool bNotFound = true;
::std::vector< XMLPropertyState >::const_iterator i(rProperties.begin());
::std::vector< XMLPropertyState >::const_iterator endi(rProperties.end());
while ((i != endi) && bNotFound)
@@ -962,22 +962,22 @@ bool XmlScPropHdl_CellProtection::equals(
return false;
}
-sal_Bool XmlScPropHdl_CellProtection::importXML(
+bool XmlScPropHdl_CellProtection::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
util::CellProtection aCellProtection;
- sal_Bool bDefault(false);
+ bool bDefault(false);
if (!rValue.hasValue())
{
aCellProtection.IsHidden = false;
aCellProtection.IsLocked = sal_True;
aCellProtection.IsFormulaHidden = false;
aCellProtection.IsPrintHidden = false;
- bDefault = sal_True;
+ bDefault = true;
}
if ((rValue >>= aCellProtection) || bDefault)
{
@@ -1002,7 +1002,7 @@ sal_Bool XmlScPropHdl_CellProtection::importXML(
if ((IsXMLToken(sFirst, XML_FORMULA_HIDDEN)) || (IsXMLToken(sSecond, XML_FORMULA_HIDDEN)))
aCellProtection.IsFormulaHidden = sal_True;
rValue <<= aCellProtection;
- bRetval = sal_True;
+ bRetval = true;
}
else
{
@@ -1010,7 +1010,7 @@ sal_Bool XmlScPropHdl_CellProtection::importXML(
aCellProtection.IsHidden = false;
aCellProtection.IsLocked = false;
rValue <<= aCellProtection;
- bRetval = sal_True;
+ bRetval = true;
}
}
else
@@ -1019,7 +1019,7 @@ sal_Bool XmlScPropHdl_CellProtection::importXML(
aCellProtection.IsHidden = false;
aCellProtection.IsLocked = sal_True;
rValue <<= aCellProtection;
- bRetval = sal_True;
+ bRetval = true;
}
}
else
@@ -1028,7 +1028,7 @@ sal_Bool XmlScPropHdl_CellProtection::importXML(
aCellProtection.IsHidden = sal_True;
aCellProtection.IsLocked = sal_True;
rValue <<= aCellProtection;
- bRetval = sal_True;
+ bRetval = true;
}
}
else
@@ -1037,19 +1037,19 @@ sal_Bool XmlScPropHdl_CellProtection::importXML(
aCellProtection.IsHidden = false;
aCellProtection.IsLocked = false;
rValue <<= aCellProtection;
- bRetval = sal_True;
+ bRetval = true;
}
}
return bRetval;
}
-sal_Bool XmlScPropHdl_CellProtection::exportXML(
+bool XmlScPropHdl_CellProtection::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
util::CellProtection aCellProtection;
if(rValue >>= aCellProtection)
@@ -1057,31 +1057,31 @@ sal_Bool XmlScPropHdl_CellProtection::exportXML(
if (!(aCellProtection.IsFormulaHidden || aCellProtection.IsHidden || aCellProtection.IsLocked))
{
rStrExpValue = GetXMLToken(XML_NONE);
- bRetval = sal_True;
+ bRetval = true;
}
else if (aCellProtection.IsHidden)
{
// #i105964# "Hide all" implies "Protected" in the UI, so it must be saved as "hidden-and-protected"
// even if "IsLocked" is not set in the CellProtection struct.
rStrExpValue = GetXMLToken(XML_HIDDEN_AND_PROTECTED);
- bRetval = sal_True;
+ bRetval = true;
}
else if (aCellProtection.IsLocked && !(aCellProtection.IsFormulaHidden || aCellProtection.IsHidden))
{
rStrExpValue = GetXMLToken(XML_PROTECTED);
- bRetval = sal_True;
+ bRetval = true;
}
else if (aCellProtection.IsFormulaHidden && !(aCellProtection.IsLocked || aCellProtection.IsHidden))
{
rStrExpValue = GetXMLToken(XML_FORMULA_HIDDEN);
- bRetval = sal_True;
+ bRetval = true;
}
else if (aCellProtection.IsFormulaHidden && aCellProtection.IsLocked)
{
rStrExpValue = GetXMLToken(XML_PROTECTED);
rStrExpValue += OUString(" ");
rStrExpValue += GetXMLToken(XML_FORMULA_HIDDEN);
- bRetval = sal_True;
+ bRetval = true;
}
}
@@ -1105,21 +1105,21 @@ bool XmlScPropHdl_PrintContent::equals(
return false;
}
-sal_Bool XmlScPropHdl_PrintContent::importXML(
+bool XmlScPropHdl_PrintContent::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
util::CellProtection aCellProtection;
- sal_Bool bDefault(false);
+ bool bDefault(false);
if (!rValue.hasValue())
{
aCellProtection.IsHidden = false;
aCellProtection.IsLocked = sal_True;
aCellProtection.IsFormulaHidden = false;
aCellProtection.IsPrintHidden = false;
- bDefault = sal_True;
+ bDefault = true;
}
if ((rValue >>= aCellProtection) || bDefault)
{
@@ -1128,19 +1128,19 @@ sal_Bool XmlScPropHdl_PrintContent::importXML(
{
aCellProtection.IsPrintHidden = !bValue;
rValue <<= aCellProtection;
- bRetval = sal_True;
+ bRetval = true;
}
}
return bRetval;
}
-sal_Bool XmlScPropHdl_PrintContent::exportXML(
+bool XmlScPropHdl_PrintContent::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
util::CellProtection aCellProtection;
if(rValue >>= aCellProtection)
@@ -1148,7 +1148,7 @@ sal_Bool XmlScPropHdl_PrintContent::exportXML(
OUStringBuffer sValue;
::sax::Converter::convertBool(sValue, !aCellProtection.IsPrintHidden);
rStrExpValue = sValue.makeStringAndClear();
- bRetval = sal_True;
+ bRetval = true;
}
return bRetval;
@@ -1170,7 +1170,7 @@ bool XmlScPropHdl_JustifyMethod::equals(
return false;
}
-sal_Bool XmlScPropHdl_JustifyMethod::importXML(
+bool XmlScPropHdl_JustifyMethod::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
@@ -1196,7 +1196,7 @@ sal_Bool XmlScPropHdl_JustifyMethod::importXML(
return bRetval;
}
-sal_Bool XmlScPropHdl_JustifyMethod::exportXML(
+bool XmlScPropHdl_JustifyMethod::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
@@ -1244,12 +1244,12 @@ bool XmlScPropHdl_HoriJustify::equals(
return false;
}
-sal_Bool XmlScPropHdl_HoriJustify::importXML(
+bool XmlScPropHdl_HoriJustify::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
table::CellHoriJustify nValue = table::CellHoriJustify_LEFT;
rValue >>= nValue;
@@ -1259,40 +1259,40 @@ sal_Bool XmlScPropHdl_HoriJustify::importXML(
{
nValue = table::CellHoriJustify_LEFT;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
else if (IsXMLToken(rStrImpValue, XML_END))
{
nValue = table::CellHoriJustify_RIGHT;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
else if (IsXMLToken(rStrImpValue, XML_CENTER))
{
nValue = table::CellHoriJustify_CENTER;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
else if (IsXMLToken(rStrImpValue, XML_JUSTIFY))
{
nValue = table::CellHoriJustify_BLOCK;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
}
else
- bRetval = sal_True;
+ bRetval = true;
return bRetval;
}
-sal_Bool XmlScPropHdl_HoriJustify::exportXML(
+bool XmlScPropHdl_HoriJustify::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
table::CellHoriJustify nVal;
- sal_Bool bRetval(false);
+ bool bRetval(false);
if(rValue >>= nVal)
{
@@ -1302,25 +1302,25 @@ sal_Bool XmlScPropHdl_HoriJustify::exportXML(
case table::CellHoriJustify_LEFT:
{
rStrExpValue = GetXMLToken(XML_START);
- bRetval = sal_True;
+ bRetval = true;
}
break;
case table::CellHoriJustify_RIGHT:
{
rStrExpValue = GetXMLToken(XML_END);
- bRetval = sal_True;
+ bRetval = true;
}
break;
case table::CellHoriJustify_CENTER:
{
rStrExpValue = GetXMLToken(XML_CENTER);
- bRetval = sal_True;
+ bRetval = true;
}
break;
case table::CellHoriJustify_BLOCK:
{
rStrExpValue = GetXMLToken(XML_JUSTIFY);
- bRetval = sal_True;
+ bRetval = true;
}
break;
default:
@@ -1348,46 +1348,46 @@ bool XmlScPropHdl_HoriJustifySource::equals(
return false;
}
-sal_Bool XmlScPropHdl_HoriJustifySource::importXML(
+bool XmlScPropHdl_HoriJustifySource::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
if (IsXMLToken(rStrImpValue, XML_FIX))
{
- bRetval = sal_True;
+ bRetval = true;
}
else if (IsXMLToken(rStrImpValue, XML_VALUE_TYPE))
{
table::CellHoriJustify nValue(table::CellHoriJustify_STANDARD);
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
return bRetval;
}
-sal_Bool XmlScPropHdl_HoriJustifySource::exportXML(
+bool XmlScPropHdl_HoriJustifySource::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
table::CellHoriJustify nVal;
- sal_Bool bRetval(false);
+ bool bRetval(false);
if(rValue >>= nVal)
{
if (nVal == table::CellHoriJustify_STANDARD)
{
rStrExpValue = GetXMLToken(XML_VALUE_TYPE);
- bRetval = sal_True;
+ bRetval = true;
}
else
{
rStrExpValue = GetXMLToken(XML_FIX);
- bRetval = sal_True;
+ bRetval = true;
}
}
@@ -1409,46 +1409,46 @@ bool XmlScPropHdl_HoriJustifyRepeat::equals(
return false;
}
-sal_Bool XmlScPropHdl_HoriJustifyRepeat::importXML(
+bool XmlScPropHdl_HoriJustifyRepeat::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
if (IsXMLToken(rStrImpValue, XML_FALSE))
{
- bRetval = sal_True;
+ bRetval = true;
}
else if (IsXMLToken(rStrImpValue, XML_TRUE))
{
table::CellHoriJustify nValue = table::CellHoriJustify_REPEAT;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
return bRetval;
}
-sal_Bool XmlScPropHdl_HoriJustifyRepeat::exportXML(
+bool XmlScPropHdl_HoriJustifyRepeat::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
table::CellHoriJustify nVal;
- sal_Bool bRetval(false);
+ bool bRetval(false);
if(rValue >>= nVal)
{
if (nVal == table::CellHoriJustify_REPEAT)
{
rStrExpValue = GetXMLToken(XML_TRUE);
- bRetval = sal_True;
+ bRetval = true;
}
else
{
rStrExpValue = GetXMLToken(XML_FALSE);
- bRetval = sal_True;
+ bRetval = true;
}
}
@@ -1470,37 +1470,37 @@ bool XmlScPropHdl_Orientation::equals(
return false;
}
-sal_Bool XmlScPropHdl_Orientation::importXML(
+bool XmlScPropHdl_Orientation::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
table::CellOrientation nValue;
if (IsXMLToken(rStrImpValue, XML_LTR))
{
nValue = table::CellOrientation_STANDARD;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
else if (IsXMLToken(rStrImpValue, XML_TTB))
{
nValue = table::CellOrientation_STACKED;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
return bRetval;
}
-sal_Bool XmlScPropHdl_Orientation::exportXML(
+bool XmlScPropHdl_Orientation::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
table::CellOrientation nVal;
- sal_Bool bRetval(false);
+ bool bRetval(false);
if(rValue >>= nVal)
{
@@ -1509,13 +1509,13 @@ sal_Bool XmlScPropHdl_Orientation::exportXML(
case table::CellOrientation_STACKED :
{
rStrExpValue = GetXMLToken(XML_TTB);
- bRetval = sal_True;
+ bRetval = true;
}
break;
default:
{
rStrExpValue = GetXMLToken(XML_LTR);
- bRetval = sal_True;
+ bRetval = true;
}
break;
}
@@ -1539,38 +1539,38 @@ bool XmlScPropHdl_RotateAngle::equals(
return false;
}
-sal_Bool XmlScPropHdl_RotateAngle::importXML(
+bool XmlScPropHdl_RotateAngle::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
sal_Int32 nValue;
if (::sax::Converter::convertNumber(nValue, rStrImpValue))
{
nValue *= 100;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
return bRetval;
}
-sal_Bool XmlScPropHdl_RotateAngle::exportXML(
+bool XmlScPropHdl_RotateAngle::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
sal_Int32 nVal = 0;
- sal_Bool bRetval(false);
+ bool bRetval(false);
if(rValue >>= nVal)
{
OUStringBuffer sValue;
::sax::Converter::convertNumber(sValue, sal_Int32(nVal / 100));
rStrExpValue = sValue.makeStringAndClear();
- bRetval = sal_True;
+ bRetval = true;
}
return bRetval;
@@ -1591,49 +1591,49 @@ bool XmlScPropHdl_RotateReference::equals(
return false;
}
-sal_Bool XmlScPropHdl_RotateReference::importXML(
+bool XmlScPropHdl_RotateReference::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
sal_Int32 nValue;
if (IsXMLToken(rStrImpValue, XML_NONE))
{
nValue = table::CellVertJustify2::STANDARD;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
else if (IsXMLToken(rStrImpValue, XML_BOTTOM))
{
nValue = table::CellVertJustify2::BOTTOM;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
else if (IsXMLToken(rStrImpValue, XML_TOP))
{
nValue = table::CellVertJustify2::TOP;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
else if (IsXMLToken(rStrImpValue, XML_CENTER))
{
nValue = table::CellVertJustify2::CENTER;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
return bRetval;
}
-sal_Bool XmlScPropHdl_RotateReference::exportXML(
+bool XmlScPropHdl_RotateReference::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
sal_Int32 nVal(0);
- sal_Bool bRetval(false);
+ bool bRetval(false);
if(rValue >>= nVal)
{
@@ -1642,25 +1642,25 @@ sal_Bool XmlScPropHdl_RotateReference::exportXML(
case table::CellVertJustify2::BOTTOM :
{
rStrExpValue = GetXMLToken(XML_BOTTOM);
- bRetval = sal_True;
+ bRetval = true;
}
break;
case table::CellVertJustify2::CENTER :
{
rStrExpValue = GetXMLToken(XML_CENTER);
- bRetval = sal_True;
+ bRetval = true;
}
break;
case table::CellVertJustify2::STANDARD :
{
rStrExpValue = GetXMLToken(XML_NONE);
- bRetval = sal_True;
+ bRetval = true;
}
break;
case table::CellVertJustify2::TOP :
{
rStrExpValue = GetXMLToken(XML_TOP);
- bRetval = sal_True;
+ bRetval = true;
}
break;
default:
@@ -1688,55 +1688,55 @@ bool XmlScPropHdl_VertJustify::equals(
return false;
}
-sal_Bool XmlScPropHdl_VertJustify::importXML(
+bool XmlScPropHdl_VertJustify::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
sal_Int32 nValue;
if (IsXMLToken(rStrImpValue, XML_AUTOMATIC))
{
nValue = table::CellVertJustify2::STANDARD;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
else if (IsXMLToken(rStrImpValue, XML_BOTTOM))
{
nValue = table::CellVertJustify2::BOTTOM;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
else if (IsXMLToken(rStrImpValue, XML_TOP))
{
nValue = table::CellVertJustify2::TOP;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
else if (IsXMLToken(rStrImpValue, XML_MIDDLE))
{
nValue = table::CellVertJustify2::CENTER;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
else if (IsXMLToken(rStrImpValue, XML_JUSTIFY))
{
nValue = table::CellVertJustify2::BLOCK;
rValue <<= nValue;
- bRetval = sal_True;
+ bRetval = true;
}
return bRetval;
}
-sal_Bool XmlScPropHdl_VertJustify::exportXML(
+bool XmlScPropHdl_VertJustify::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
sal_Int32 nVal(0);
- sal_Bool bRetval(false);
+ bool bRetval(false);
if(rValue >>= nVal)
{
@@ -1745,31 +1745,31 @@ sal_Bool XmlScPropHdl_VertJustify::exportXML(
case table::CellVertJustify2::BOTTOM :
{
rStrExpValue = GetXMLToken(XML_BOTTOM);
- bRetval = sal_True;
+ bRetval = true;
}
break;
case table::CellVertJustify2::CENTER :
{
rStrExpValue = GetXMLToken(XML_MIDDLE);
- bRetval = sal_True;
+ bRetval = true;
}
break;
case table::CellVertJustify2::STANDARD :
{
rStrExpValue = GetXMLToken(XML_AUTOMATIC);
- bRetval = sal_True;
+ bRetval = true;
}
break;
case table::CellVertJustify2::TOP :
{
rStrExpValue = GetXMLToken(XML_TOP);
- bRetval = sal_True;
+ bRetval = true;
}
break;
case table::CellVertJustify2::BLOCK :
{
rStrExpValue = GetXMLToken(XML_JUSTIFY);
- bRetval = sal_True;
+ bRetval = true;
}
break;
default:
@@ -1797,46 +1797,46 @@ bool XmlScPropHdl_BreakBefore::equals(
return false;
}
-sal_Bool XmlScPropHdl_BreakBefore::importXML(
+bool XmlScPropHdl_BreakBefore::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
- sal_Bool bValue;
+ bool bValue;
if (IsXMLToken(rStrImpValue, XML_AUTO))
{
bValue = false;
rValue = ::cppu::bool2any(bValue);
- bRetval = sal_True;
+ bRetval = true;
}
else if (IsXMLToken(rStrImpValue, XML_PAGE))
{
- bValue = sal_True;
+ bValue = true;
rValue = ::cppu::bool2any(bValue);
- bRetval = sal_True;
+ bRetval = true;
}
return bRetval;
}
-sal_Bool XmlScPropHdl_BreakBefore::exportXML(
+bool XmlScPropHdl_BreakBefore::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
if(::cppu::any2bool(rValue))
{
rStrExpValue = GetXMLToken(XML_PAGE);
- bRetval = sal_True;
+ bRetval = true;
}
else
{
rStrExpValue = GetXMLToken(XML_AUTO);
- bRetval = sal_True;
+ bRetval = true;
}
return bRetval;
@@ -1853,49 +1853,49 @@ bool XmlScPropHdl_IsTextWrapped::equals(
return (::cppu::any2bool(r1) == ::cppu::any2bool(r2));
}
-sal_Bool XmlScPropHdl_IsTextWrapped::importXML(
+bool XmlScPropHdl_IsTextWrapped::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
if (IsXMLToken(rStrImpValue, XML_WRAP))
{
- rValue = ::cppu::bool2any(sal_True);
- bRetval = sal_True;
+ rValue = ::cppu::bool2any(true);
+ bRetval = true;
}
else if (IsXMLToken(rStrImpValue, XML_NO_WRAP))
{
rValue = ::cppu::bool2any(false);
- bRetval = sal_True;
+ bRetval = true;
}
return bRetval;
}
-sal_Bool XmlScPropHdl_IsTextWrapped::exportXML(
+bool XmlScPropHdl_IsTextWrapped::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
if (::cppu::any2bool(rValue))
{
rStrExpValue = GetXMLToken(XML_WRAP);
- bRetval = sal_True;
+ bRetval = true;
}
else
{
rStrExpValue = GetXMLToken(XML_NO_WRAP);
- bRetval = sal_True;
+ bRetval = true;
}
return bRetval;
}
-sal_Bool XmlScPropHdl_IsEqual::importXML( const OUString& /* rStrImpValue */,
+bool XmlScPropHdl_IsEqual::importXML( const OUString& /* rStrImpValue */,
::com::sun::star::uno::Any& /* rValue */,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
@@ -1903,7 +1903,7 @@ sal_Bool XmlScPropHdl_IsEqual::importXML( const OUString& /* rStrImpValue */,
return false;
}
-sal_Bool XmlScPropHdl_IsEqual::exportXML( OUString& /* rStrExpValue */,
+bool XmlScPropHdl_IsEqual::exportXML( OUString& /* rStrExpValue */,
const ::com::sun::star::uno::Any& /* rValue */,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
@@ -1922,43 +1922,43 @@ bool XmlScPropHdl_Vertical::equals(
return (::cppu::any2bool(r1) == ::cppu::any2bool(r2));
}
-sal_Bool XmlScPropHdl_Vertical::importXML(
+bool XmlScPropHdl_Vertical::importXML(
const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
if (IsXMLToken(rStrImpValue, XML_AUTO))
{
- rValue = ::cppu::bool2any(sal_True);
- bRetval = sal_True;
+ rValue = ::cppu::bool2any(true);
+ bRetval = true;
}
else if (IsXMLToken(rStrImpValue, XML_0))
{
rValue = ::cppu::bool2any(false);
- bRetval = sal_True;
+ bRetval = true;
}
return bRetval;
}
-sal_Bool XmlScPropHdl_Vertical::exportXML(
+bool XmlScPropHdl_Vertical::exportXML(
OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
const SvXMLUnitConverter& /* rUnitConverter */ ) const
{
- sal_Bool bRetval(false);
+ bool bRetval(false);
if (::cppu::any2bool(rValue))
{
rStrExpValue = GetXMLToken(XML_AUTO);
- bRetval = sal_True;
+ bRetval = true;
}
else
{
rStrExpValue = GetXMLToken(XML_0);
- bRetval = sal_True;
+ bRetval = true;
}
return bRetval;
diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx
index e879ddf..344bed8 100644
--- a/sc/source/filter/xml/xmlstyle.hxx
+++ b/sc/source/filter/xml/xmlstyle.hxx
@@ -235,8 +235,8 @@ class XmlScPropHdl_CellProtection : public XMLPropertyHandler
public:
virtual ~XmlScPropHdl_CellProtection();
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 XmlScPropHdl_PrintContent : public XMLPropertyHandler
@@ -244,8 +244,8 @@ class XmlScPropHdl_PrintContent : public XMLPropertyHandler
public:
virtual ~XmlScPropHdl_PrintContent();
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 XmlScPropHdl_JustifyMethod : public XMLPropertyHandler
@@ -253,8 +253,8 @@ class XmlScPropHdl_JustifyMethod : public XMLPropertyHandler
public:
virtual ~XmlScPropHdl_JustifyMethod();
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 XmlScPropHdl_HoriJustify : public XMLPropertyHandler
@@ -262,8 +262,8 @@ class XmlScPropHdl_HoriJustify : public XMLPropertyHandler
public:
virtual ~XmlScPropHdl_HoriJustify();
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 XmlScPropHdl_HoriJustifySource : public XMLPropertyHandler
@@ -271,8 +271,8 @@ class XmlScPropHdl_HoriJustifySource : public XMLPropertyHandler
public:
virtual ~XmlScPropHdl_HoriJustifySource();
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 XmlScPropHdl_HoriJustifyRepeat : public XMLPropertyHandler
@@ -280,8 +280,8 @@ class XmlScPropHdl_HoriJustifyRepeat : public XMLPropertyHandler
public:
virtual ~XmlScPropHdl_HoriJustifyRepeat();
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 XmlScPropHdl_Orientation : public XMLPropertyHandler
@@ -289,8 +289,8 @@ class XmlScPropHdl_Orientation : public XMLPropertyHandler
public:
virtual ~XmlScPropHdl_Orientation();
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 XmlScPropHdl_RotateAngle : public XMLPropertyHandler
@@ -298,8 +298,8 @@ class XmlScPropHdl_RotateAngle : public XMLPropertyHandler
public:
virtual ~XmlScPropHdl_RotateAngle();
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 XmlScPropHdl_RotateReference : public XMLPropertyHandler
@@ -307,8 +307,8 @@ class XmlScPropHdl_RotateReference : public XMLPropertyHandler
public:
virtual ~XmlScPropHdl_RotateReference();
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 XmlScPropHdl_VertJustify : public XMLPropertyHandler
@@ -316,8 +316,8 @@ class XmlScPropHdl_VertJustify : public XMLPropertyHandler
public:
virtual ~XmlScPropHdl_VertJustify();
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 XmlScPropHdl_BreakBefore : public XMLPropertyHandler
@@ -325,8 +325,8 @@ class XmlScPropHdl_BreakBefore : public XMLPropertyHandler
public:
virtual ~XmlScPropHdl_BreakBefore();
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 XmlScPropHdl_IsTextWrapped : public XMLPropertyHandler
@@ -334,17 +334,17 @@ class XmlScPropHdl_IsTextWrapped : public XMLPropertyHandler
public:
virtual ~XmlScPropHdl_IsTextWrapped();
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 XmlScPropHdl_IsEqual : public XMLPropertyHandler
{
public:
virtual ~XmlScPropHdl_IsEqual() {}
- virtual bool equals( const ::com::sun::star::uno::Any& /* r1 */, const ::com::sun::star::uno::Any& /* r2 */ ) const { return sal_True; }
- 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 equals( const ::com::sun::star::uno::Any& /* r1 */, const ::com::sun::star::uno::Any& /* r2 */ ) const { return true; }
+ 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 XmlScPropHdl_Vertical : public XMLPropertyHandler
@@ -352,8 +352,8 @@ class XmlScPropHdl_Vertical : public XMLPropertyHandler
public:
virtual ~XmlScPropHdl_Vertical();
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
diff --git a/xmloff/inc/AttributeContainerHandler.hxx b/xmloff/inc/AttributeContainerHandler.hxx
index f8aef32..2cd36e1 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 22d96e5..e6e591a 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 54e28e1..2429a9c 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 2df7f08..c690218 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 3b57c55..95dc215 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 e269196..b7d4e74 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 a7f94b4..1b4e0e7 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 1f478af..e216daf 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 6a533e7..41dad36 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 89e62cf..3b82f7a 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 01601fc..95787da 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 3eee9e4..087ed32 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 6cc4dfe..197bf9a 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 d3f64b3..7e89743 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 3b8ebca..fb71f5d 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 ac53748..6d80ec8 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 f7b4c9c..8fe5618 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 b206f45..4e7527f 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 8c50a07..1b21e8e 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 75241da..8f81364 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 2acaa39..70d691d 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 b9b55b3..826c09a 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 e20add9..1c1a144 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 2c5e2fd..828b2c6 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 cb190ef..7590236 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 d09f0dd..4cd5ac0 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 14ff712..b25f37f 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 786fc2f..e73242a 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 6ab210a..56bda1a 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 871e800..4a26274 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 cd1212a..cb5d290 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(
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list