[ooo-build-commit] .: 4 commits - avmedia/inc avmedia/source editeng/inc editeng/source linguistic/source sfx2/inc sfx2/source svx/inc svx/source xmloff/inc xmloff/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Mon Oct 4 09:05:57 PDT 2010
avmedia/inc/avmedia/mediaitem.hxx | 4
avmedia/source/framework/mediaitem.cxx | 18
editeng/inc/editeng/adjitem.hxx | 4
editeng/inc/editeng/bolnitem.hxx | 4
editeng/inc/editeng/boxitem.hxx | 8
editeng/inc/editeng/brkitem.hxx | 4
editeng/inc/editeng/brshitem.hxx | 4
editeng/inc/editeng/charreliefitem.hxx | 4
editeng/inc/editeng/charrotateitem.hxx | 4
editeng/inc/editeng/charscaleitem.hxx | 4
editeng/inc/editeng/cmapitem.hxx | 4
editeng/inc/editeng/colritem.hxx | 4
editeng/inc/editeng/crsditem.hxx | 4
editeng/inc/editeng/emphitem.hxx | 4
editeng/inc/editeng/escpitem.hxx | 4
editeng/inc/editeng/fhgtitem.hxx | 4
editeng/inc/editeng/flstitem.hxx | 2
editeng/inc/editeng/fontitem.hxx | 4
editeng/inc/editeng/frmdiritem.hxx | 4
editeng/inc/editeng/fwdtitem.hxx | 4
editeng/inc/editeng/hyznitem.hxx | 4
editeng/inc/editeng/kernitem.hxx | 4
editeng/inc/editeng/langitem.hxx | 5
editeng/inc/editeng/lrspitem.hxx | 4
editeng/inc/editeng/lspcitem.hxx | 4
editeng/inc/editeng/numitem.hxx | 4
editeng/inc/editeng/paravertalignitem.hxx | 4
editeng/inc/editeng/pmdlitem.hxx | 4
editeng/inc/editeng/postitem.hxx | 4
editeng/inc/editeng/protitem.hxx | 4
editeng/inc/editeng/shaditem.hxx | 4
editeng/inc/editeng/sizeitem.hxx | 4
editeng/inc/editeng/tstpitem.hxx | 4
editeng/inc/editeng/twolinesitem.hxx | 4
editeng/inc/editeng/udlnitem.hxx | 4
editeng/inc/editeng/ulspitem.hxx | 4
editeng/inc/editeng/wghtitem.hxx | 4
editeng/inc/editeng/writingmodeitem.hxx | 4
editeng/inc/editeng/xmlcnitm.hxx | 4
editeng/source/items/frmitems.cxx | 132 ++--
editeng/source/items/numitem.cxx | 10
editeng/source/items/paraitem.cxx | 36 -
editeng/source/items/textitem.cxx | 154 ++--
editeng/source/items/writingmodeitem.cxx | 6
editeng/source/items/xmlcnitm.cxx | 13
linguistic/source/hyphdsp.cxx | 2
sfx2/inc/sfx2/dinfdlg.hxx | 4
sfx2/inc/sfx2/frame.hxx | 12
sfx2/inc/sfx2/objsh.hxx | 4
sfx2/inc/sfx2/viewfrm.hxx | 2
sfx2/inc/sorgitm.hxx | 4
sfx2/inc/tplpitem.hxx | 4
sfx2/source/control/sorgitm.cxx | 12
sfx2/source/dialog/dinfdlg.cxx | 10
sfx2/source/dialog/tplpitem.cxx | 14
sfx2/source/doc/objitem.cxx | 16
sfx2/source/view/frame.cxx | 12
svx/inc/chrtitem.hxx | 11
svx/inc/clipfmtitem.hxx | 6
svx/inc/drawitem.hxx | 24
svx/inc/hlnkitem.hxx | 4
svx/inc/rotmodit.hxx | 4
svx/inc/rulritem.hxx | 20
svx/inc/svx/SmartTagItem.hxx | 4
svx/inc/svx/algitem.hxx | 16
svx/inc/svx/e3ditem.hxx | 4
svx/inc/svx/grfcrop.hxx | 8
svx/inc/svx/pageitem.hxx | 4
svx/inc/svx/sdasaitm.hxx | 4
svx/inc/svx/sdasitm.hxx | 4
svx/inc/svx/sdggaitm.hxx | 4
svx/inc/svx/sdtaditm.hxx | 4
svx/inc/svx/sdtaitm.hxx | 8
svx/inc/svx/sdtakitm.hxx | 4
svx/inc/svx/sdtfchim.hxx | 4
svx/inc/svx/sdtfsitm.hxx | 4
svx/inc/svx/svx3ditems.hxx | 28
svx/inc/svx/sxcikitm.hxx | 4
svx/inc/svx/sxekitm.hxx | 4
svx/inc/svx/sxelditm.hxx | 12
svx/inc/svx/sxenditm.hxx | 16
svx/inc/svx/sxmkitm.hxx | 4
svx/inc/svx/sxmtpitm.hxx | 8
svx/inc/svx/sxmuitm.hxx | 4
svx/inc/svx/viewlayoutitem.hxx | 4
svx/inc/svx/xbtmpit.hxx | 4
svx/inc/svx/xcolit.hxx | 4
svx/inc/svx/xfillit0.hxx | 4
svx/inc/svx/xflclit.hxx | 4
svx/inc/svx/xflftrit.hxx | 4
svx/inc/svx/xflgrit.hxx | 4
svx/inc/svx/xflhtit.hxx | 4
svx/inc/svx/xftadit.hxx | 4
svx/inc/svx/xftsfit.hxx | 4
svx/inc/svx/xftshit.hxx | 4
svx/inc/svx/xlineit0.hxx | 4
svx/inc/svx/xlinjoit.hxx | 4
svx/inc/svx/xlnclit.hxx | 4
svx/inc/svx/xlndsit.hxx | 4
svx/inc/svx/xlnedcit.hxx | 4
svx/inc/svx/xlnedit.hxx | 4
svx/inc/svx/xlnedwit.hxx | 4
svx/inc/svx/xlnstcit.hxx | 4
svx/inc/svx/xlnstit.hxx | 4
svx/inc/svx/xlnstwit.hxx | 4
svx/inc/svx/xlnwtit.hxx | 4
svx/inc/svx/xtextit0.hxx | 4
svx/inc/svx/zoomitem.hxx | 4
svx/inc/svx/zoomslideritem.hxx | 6
svx/source/dialog/rulritem.cxx | 72 +-
svx/source/engine3d/svx3ditems.cxx | 322 +++++-----
svx/source/items/SmartTagItem.cxx | 8
svx/source/items/algitem.cxx | 36 -
svx/source/items/chrtitem.cxx | 18
svx/source/items/clipfmtitem.cxx | 10
svx/source/items/customshapeitem.cxx | 10
svx/source/items/drawitem.cxx | 60 -
svx/source/items/e3ditem.cxx | 10
svx/source/items/grfitem.cxx | 10
svx/source/items/hlnkitem.cxx | 12
svx/source/items/pageitem.cxx | 10
svx/source/items/rotmodit.cxx | 8
svx/source/items/viewlayoutitem.cxx | 26
svx/source/items/zoomitem.cxx | 24
svx/source/items/zoomslideritem.cxx | 36 -
svx/source/svdraw/svdattr.cxx | 210 +++---
svx/source/xoutdev/xattr.cxx | 244 +++----
svx/source/xoutdev/xattr2.cxx | 10
svx/source/xoutdev/xattrbmp.cxx | 6
xmloff/inc/XMLChartPropertySetMapper.hxx | 2
xmloff/inc/txtimppr.hxx | 2
xmloff/inc/xmlcnitm.hxx | 4
xmloff/inc/xmloff/shapeimport.hxx | 6
xmloff/inc/xmloff/xmlimppr.hxx | 2
xmloff/inc/xmloff/xmlstyle.hxx | 2
xmloff/inc/xmloff/xmluconv.hxx | 2
xmloff/source/chart/PropertyMaps.cxx | 4
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 4
xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx | 2
xmloff/source/core/xmluconv.cxx | 4
xmloff/source/draw/animationimport.cxx | 4
xmloff/source/draw/ximp3dscene.cxx | 6
xmloff/source/draw/ximpcustomshape.cxx | 2
xmloff/source/forms/elementimport.cxx | 4
xmloff/source/forms/officeforms.cxx | 2
xmloff/source/forms/propertyimport.cxx | 2
xmloff/source/style/PageMasterImportPropMapper.cxx | 2
xmloff/source/style/PageMasterImportPropMapper.hxx | 2
xmloff/source/style/xmlbahdl.cxx | 6
xmloff/source/style/xmlimppr.cxx | 2
xmloff/source/style/xmlnume.cxx | 2
xmloff/source/style/xmlnumfe.cxx | 2
xmloff/source/style/xmlnumfi.cxx | 4
xmloff/source/text/XMLChangedRegionImportContext.cxx | 2
xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx | 2
xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx | 6
xmloff/source/text/XMLIndexObjectSourceContext.cxx | 2
xmloff/source/text/XMLIndexSourceBaseContext.cxx | 2
xmloff/source/text/XMLIndexTOCContext.cxx | 2
xmloff/source/text/XMLIndexTOCSourceContext.cxx | 6
xmloff/source/text/XMLIndexTabStopEntryContext.cxx | 2
xmloff/source/text/XMLIndexTableSourceContext.cxx | 2
xmloff/source/text/XMLIndexUserSourceContext.cxx | 2
xmloff/source/text/XMLLineNumberingImportContext.cxx | 2
xmloff/source/text/XMLSectionImportContext.cxx | 4
xmloff/source/text/XMLSectionSourceDDEImportContext.cxx | 2
xmloff/source/text/XMLTextFrameHyperlinkContext.cxx | 2
xmloff/source/text/XMLTrackedChangesImportContext.cxx | 2
xmloff/source/text/txtfldi.cxx | 22
xmloff/source/text/txtimppr.cxx | 2
xmloff/source/text/txtparai.cxx | 7
xmloff/source/text/txtvfldi.cxx | 2
xmloff/source/xforms/XFormsSubmissionContext.cxx | 2
173 files changed, 1116 insertions(+), 1118 deletions(-)
New commits:
commit 99b6dbd3fb2ea650cc06d24f3cd8737d933c3df4
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Oct 4 16:56:46 2010 +0100
tweak missing bool
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index 8beb603..86c1aa2 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -123,7 +123,7 @@ void XMLIndexBibliographyConfigurationContext::ProcessAttribute(
}
else if( IsXMLToken(sLocalName, XML_NUMBERED_ENTRIES) )
{
- sal_Bool bTmp;
+ bool bTmp;
if( SvXMLUnitConverter::convertBool(bTmp, sValue) )
{
bNumberedEntries = bTmp;
commit 37dd58982b2ef885a6815c423bd26cf76a5f22a2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Oct 4 15:43:59 2010 +0100
harmonized BOOL vs sal_Bool usage
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index e617231..436335a 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -245,7 +245,7 @@ Sequence< Locale > SAL_CALL HyphenatorDispatcher::getLocales()
}
-BOOL SAL_CALL HyphenatorDispatcher::hasLocale(const Locale& rLocale)
+sal_Bool SAL_CALL HyphenatorDispatcher::hasLocale(const Locale& rLocale)
throw(RuntimeException)
{
MutexGuard aGuard( GetLinguMutex() );
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index ad3f5ab..684a466 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -976,7 +976,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
NfIndexTableOffset eBuiltIn = pFormatter->GetIndexTableOffset( nKey );
short nFmtType = 0;
- sal_Bool bThousand = sal_False;
+ BOOL bThousand = sal_False;
sal_uInt16 nPrecision = 0;
sal_uInt16 nLeading = 0;
rFormat.GetNumForInfo( nPart, nFmtType, bThousand, nPrecision, nLeading);
commit 16844d15c1a00418b2acb9c8e85d5cd3e96e59a9
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Oct 4 15:36:52 2010 +0100
native bool support in SvXMLUnitConverter
diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx
index 93aa8dd..359eb88 100644
--- a/xmloff/inc/XMLChartPropertySetMapper.hxx
+++ b/xmloff/inc/XMLChartPropertySetMapper.hxx
@@ -112,7 +112,7 @@ public:
const SvXMLImport& rImport );
virtual ~XMLChartImportPropertyMapper();
- virtual sal_Bool handleSpecialItem(
+ virtual bool handleSpecialItem(
XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
diff --git a/xmloff/inc/txtimppr.hxx b/xmloff/inc/txtimppr.hxx
index 1277bcf..dfe249b 100644
--- a/xmloff/inc/txtimppr.hxx
+++ b/xmloff/inc/txtimppr.hxx
@@ -57,7 +57,7 @@ class XMLOFF_DLLPUBLIC XMLTextImportPropertyMapper : public SvXMLImportPropertyM
XMLPropertyState** ppNewFontCharSet ) const;
protected:
- virtual sal_Bool handleSpecialItem(
+ virtual bool handleSpecialItem(
XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
diff --git a/xmloff/inc/xmloff/shapeimport.hxx b/xmloff/inc/xmloff/shapeimport.hxx
index ae72a20..ae0cd7d 100644
--- a/xmloff/inc/xmloff/shapeimport.hxx
+++ b/xmloff/inc/xmloff/shapeimport.hxx
@@ -189,8 +189,8 @@ class SdXML3DLightContext: public SvXMLImportContext
// local parameters which need to be read
Color maDiffuseColor;
::basegfx::B3DVector maDirection;
- BOOL mbEnabled;
- BOOL mbSpecular;
+ bool mbEnabled;
+ bool mbSpecular;
public:
SdXML3DLightContext(
@@ -228,7 +228,7 @@ protected:
sal_Int32 mnShadowSlant;
com::sun::star::drawing::ShadeMode mxShadeMode;
Color maAmbientColor;
- BOOL mbLightingMode;
+ bool mbLightingMode;
::basegfx::B3DVector maVRP;
::basegfx::B3DVector maVPN;
diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/xmloff/inc/xmloff/xmlimppr.hxx
index 960c01b..cbc4560 100644
--- a/xmloff/inc/xmloff/xmlimppr.hxx
+++ b/xmloff/inc/xmloff/xmlimppr.hxx
@@ -114,7 +114,7 @@ public:
sal_Int32 nStartIdx, sal_Int32 nEndIdx ) const;
/** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_IMPORT flag set */
- virtual sal_Bool handleSpecialItem(
+ virtual bool handleSpecialItem(
XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
diff --git a/xmloff/inc/xmloff/xmlstyle.hxx b/xmloff/inc/xmloff/xmlstyle.hxx
index 5f721a6..a999a63 100644
--- a/xmloff/inc/xmloff/xmlstyle.hxx
+++ b/xmloff/inc/xmloff/xmlstyle.hxx
@@ -243,7 +243,7 @@ public:
const SvXMLStyleContext *FindStyleChildContext(
sal_uInt16 nFamily,
const ::rtl::OUString& rName,
- BOOL bCreateIndex=sal_False ) const;
+ sal_Bool bCreateIndex=sal_False ) const;
virtual sal_uInt16 GetFamily( const ::rtl::OUString& rFamily ) const;
virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper(
sal_uInt16 nFamily ) const;
diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx
index ca22ef8..fb5c971 100644
--- a/xmloff/inc/xmloff/xmluconv.hxx
+++ b/xmloff/inc/xmloff/xmluconv.hxx
@@ -173,7 +173,7 @@ public:
MapUnit eDstUnit );
/** convert string to boolean */
- static sal_Bool convertBool( sal_Bool& rBool,
+ static sal_Bool convertBool( bool& rBool,
const ::rtl::OUString& rString );
/** convert boolean to string */
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index 0514d4b..0a987d9 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -496,7 +496,7 @@ XMLChartImportPropertyMapper::~XMLChartImportPropertyMapper()
{
}
-sal_Bool XMLChartImportPropertyMapper::handleSpecialItem(
+bool XMLChartImportPropertyMapper::handleSpecialItem(
XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
@@ -510,7 +510,7 @@ sal_Bool XMLChartImportPropertyMapper::handleSpecialItem(
if( nContextId )
{
sal_Int32 nValue = 0;
- sal_Bool bValue = sal_False;
+ bool bValue = false;
switch( nContextId )
{
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index c6722cf..1c312a5 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -2053,8 +2053,8 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri
const SvXMLTokenMap& rAttrTokenMap = mrImportHelper.GetRegEquationAttrTokenMap();
OUString sAutoStyleName;
- sal_Bool bShowEquation = sal_True;
- sal_Bool bShowRSquare = sal_False;
+ bool bShowEquation = true;
+ bool bShowRSquare = false;
awt::Point aPosition;
bool bHasXPos = false;
bool bHasYPos = false;
diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
index 1fb3899..9af4040 100644
--- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
+++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
@@ -40,7 +40,7 @@ XMLErrorIndicatorPropertyHdl::~XMLErrorIndicatorPropertyHdl()
sal_Bool XMLErrorIndicatorPropertyHdl::importXML( const ::rtl::OUString& rStrImpValue,
uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
- sal_Bool bValue;
+ bool bValue;
SvXMLUnitConverter::convertBool( bValue, rStrImpValue );
// modify existing value
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 0346aff..bbbcac9 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -441,7 +441,7 @@ void SvXMLUnitConverter::convertMeasure( OUStringBuffer& rBuffer,
}
/** convert string to boolean */
-sal_Bool SvXMLUnitConverter::convertBool( sal_Bool& rBool,
+sal_Bool SvXMLUnitConverter::convertBool( bool& rBool,
const OUString& rString )
{
rBool = IsXMLToken(rString, XML_TRUE);
@@ -2253,7 +2253,7 @@ sal_Bool SvXMLUnitConverter::convertAny( com::sun::star::uno::Any& aValue,
if (sType.equalsAscii("boolean"))
{
- sal_Bool bTempValue = sal_False;
+ bool bTempValue = false;
SvXMLUnitConverter::convertBool(bTempValue, sValue);
aValue <<= bTempValue;
bConverted = sal_True;
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 38cccc9..c9afbf8 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -873,7 +873,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
break;
case ANA_AutoReverse:
{
- sal_Bool bTemp;
+ bool bTemp;
if( SvXMLUnitConverter::convertBool( bTemp, rValue ) )
mxNode->setAutoReverse( bTemp );
}
@@ -918,7 +918,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
break;
case ANA_After_Effect:
{
- sal_Bool bTemp;
+ bool bTemp;
if( SvXMLUnitConverter::convertBool( bTemp, rValue ) )
aUserData.push_back( NamedValue( GetXMLToken( XML_AFTER_EFFECT ), makeAny( bTemp ) ) );
}
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index a691c47..9a5959e 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -54,8 +54,8 @@ SdXML3DLightContext::SdXML3DLightContext(
: SvXMLImportContext( rImport, nPrfx, rLName),
maDiffuseColor(0x00000000),
maDirection(0.0, 0.0, 1.0),
- mbEnabled(FALSE),
- mbSpecular(FALSE)
+ mbEnabled(false),
+ mbSpecular(false)
{
// read attributes for the 3DScene
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -231,7 +231,7 @@ SdXML3DSceneAttributesHelper::SdXML3DSceneAttributesHelper( SvXMLImport& rImport
mnShadowSlant(0),
mxShadeMode(drawing::ShadeMode_SMOOTH),
maAmbientColor(0x00666666),
- mbLightingMode(FALSE),
+ mbLightingMode(false),
maVRP(0.0, 0.0, 1.0),
maVPN(0.0, 0.0, 1.0),
maVUP(0.0, 1.0, 0.0),
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 4462553..75d1985 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -86,7 +86,7 @@ const SvXMLEnumMapEntry aXML_GluePointEnumMap[] =
void GetBool( std::vector< com::sun::star::beans::PropertyValue >& rDest,
const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
{
- sal_Bool bAttrBool;
+ bool bAttrBool;
if ( SvXMLUnitConverter::convertBool( bAttrBool, rValue ) )
{
beans::PropertyValue aProp;
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 036d803..bbe0376 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1693,13 +1693,13 @@ namespace xmloff
GetPrefix(), ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_SELECTED)));
// propagate the selected flag
- sal_Bool bSelected;
+ bool bSelected;
GetImport().GetMM100UnitConverter().convertBool(bSelected, _rxAttrList->getValueByName(sSelectedAttribute));
if (bSelected)
m_xListBoxImport->implSelectCurrentItem();
// same for the default selected
- sal_Bool bDefaultSelected;
+ bool bDefaultSelected;
GetImport().GetMM100UnitConverter().convertBool(bDefaultSelected, _rxAttrList->getValueByName(sDefaultSelectedAttribute));
if (bDefaultSelected)
m_xListBoxImport->implDefaultSelectCurrentItem();
diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx
index 69bc154..204d619 100644
--- a/xmloff/source/forms/officeforms.cxx
+++ b/xmloff/source/forms/officeforms.cxx
@@ -83,7 +83,7 @@ namespace xmloff
// get and convert the value
::rtl::OUString sAttributeValue = _rxAttributes->getValueByName(sCompleteAttributeName);
- sal_Bool bValue = _bDefault;
+ bool bValue = _bDefault;
GetImport().GetMM100UnitConverter().convertBool(bValue, sAttributeValue);
// set the property
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index 9cf2bea..6b01f93 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -109,7 +109,7 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun
{
case TypeClass_BOOLEAN: // sal_Bool
{
- sal_Bool bValue;
+ bool bValue;
#if OSL_DEBUG_LEVEL > 0
sal_Bool bSuccess =
#endif
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx
index 76eab35..fc3cfcc 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -62,7 +62,7 @@ PageMasterImportPropertyMapper::~PageMasterImportPropertyMapper()
{
}
-sal_Bool PageMasterImportPropertyMapper::handleSpecialItem(
+bool PageMasterImportPropertyMapper::handleSpecialItem(
XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
diff --git a/xmloff/source/style/PageMasterImportPropMapper.hxx b/xmloff/source/style/PageMasterImportPropMapper.hxx
index f64a91a..b3991c4 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.hxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.hxx
@@ -46,7 +46,7 @@ public:
virtual ~PageMasterImportPropertyMapper();
/** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_IMPORT flag set */
- virtual sal_Bool handleSpecialItem(
+ virtual bool handleSpecialItem(
XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index 7dc81eb..caf73f1 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -247,7 +247,7 @@ sal_Bool XMLBoolPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, c
{
sal_Bool bRet = sal_False;
- sal_Bool bValue;
+ bool bValue;
bRet = SvXMLUnitConverter::convertBool( bValue, rStrImpValue );
rValue <<= sal_Bool(bValue);
@@ -285,7 +285,7 @@ sal_Bool XMLNBoolPropHdl::importXML( const OUString& rStrImpValue, Any& rValue,
{
sal_Bool bRet = sal_False;
- sal_Bool bValue;
+ bool bValue;
bRet = SvXMLUnitConverter::convertBool( bValue, rStrImpValue );
rValue <<= sal_Bool(!bValue);
@@ -808,7 +808,7 @@ XMLIsAutoColorPropHdl::~XMLIsAutoColorPropHdl()
sal_Bool XMLIsAutoColorPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const
{
- sal_Bool bValue;
+ bool bValue;
// An auto color overrides any other color set!
sal_Bool bRet = SvXMLUnitConverter::convertBool( bValue, rStrImpValue );
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 1c5ddc7..fbb8327 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -354,7 +354,7 @@ void SvXMLImportPropertyMapper::importXML(
}
/** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_IMPORT flag set */
-BOOL SvXMLImportPropertyMapper::handleSpecialItem(
+bool SvXMLImportPropertyMapper::handleSpecialItem(
XMLPropertyState& rProperty,
vector< XMLPropertyState >& rProperties,
const OUString& rValue,
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 39614be..4790a48 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -115,7 +115,7 @@ void SvxXMLNumRuleExport::exportLevelStyles( const uno::Reference< ::com::sun::s
void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel,
const uno::Sequence<beans::PropertyValue>& rProps,
- BOOL bOutline )
+ sal_Bool bOutline )
{
sal_Int16 eType = NumberingType::CHAR_SPECIAL;
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 01d684c..f1274bb 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -950,7 +950,7 @@ SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rImport,
{
OUString sLanguage, sCountry;
sal_Int32 nAttrVal;
- sal_Bool bAttrBool;
+ bool bAttrBool;
sal_uInt16 nAttrEnum;
double fAttrDouble;
@@ -1399,7 +1399,7 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
{
OUString sLanguage, sCountry;
::com::sun::star::i18n::NativeNumberXmlAttributes aNatNumAttr;
- sal_Bool bAttrBool;
+ bool bAttrBool;
sal_uInt16 nAttrEnum;
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx
index 6b34d1a..bce7205 100644
--- a/xmloff/source/text/XMLChangedRegionImportContext.cxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx
@@ -94,7 +94,7 @@ void XMLChangedRegionImportContext::StartElement(
}
else if( IsXMLToken( sLocalName, XML_MERGE_LAST_PARAGRAPH ) )
{
- sal_Bool bTmp;
+ bool bTmp;
if( SvXMLUnitConverter::convertBool(bTmp, sValue) )
{
bMergeLastPara = bTmp;
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
index 93b9021..8a080a2 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
@@ -108,7 +108,7 @@ void XMLIndexAlphabeticalSourceContext::ProcessAttribute(
enum IndexSourceParamEnum eParam,
const OUString& rValue)
{
- sal_Bool bTmp;
+ bool bTmp;
switch (eParam)
{
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index 72054bf..8beb603 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -131,7 +131,7 @@ void XMLIndexBibliographyConfigurationContext::ProcessAttribute(
}
else if( IsXMLToken(sLocalName, XML_SORT_BY_POSITION) )
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sValue))
{
bSortByPosition = bTmp;
@@ -184,7 +184,7 @@ SvXMLImportContext *XMLIndexBibliographyConfigurationContext::CreateChildContext
}
else if ( IsXMLToken( sLocalName, XML_SORT_ASCENDING ) )
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(
bTmp, xAttrList->getValueByIndex(nAttr)))
{
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
index f492531..e905d38 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
@@ -100,7 +100,7 @@ void XMLIndexObjectSourceContext::ProcessAttribute(
{
switch (eParam)
{
- sal_Bool bTmp;
+ bool bTmp;
case XML_TOK_INDEXSOURCE_USE_OTHER_OBJECTS:
if (SvXMLUnitConverter::convertBool(bTmp, rValue))
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
index f206f8b..0a07463 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
@@ -215,7 +215,7 @@ void XMLIndexSourceBaseContext::ProcessAttribute(
case XML_TOK_INDEXSOURCE_RELATIVE_TABS:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, rValue))
{
bRelativeTabs = bTmp;
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index 092af4f..b84ef49 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -165,7 +165,7 @@ void XMLIndexTOCContext::StartElement(
}
else if ( IsXMLToken( sLocalName, XML_PROTECTED ) )
{
- sal_Bool bTmp;
+ bool bTmp;
if ( SvXMLUnitConverter::convertBool(
bTmp, xAttrList->getValueByIndex(nAttr) ) )
{
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
index 0aaefc8..4783404 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
@@ -115,7 +115,7 @@ void XMLIndexTOCSourceContext::ProcessAttribute(
case XML_TOK_INDEXSOURCE_USE_OUTLINE_LEVEL:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, rValue))
{
bUseOutline = bTmp;
@@ -126,7 +126,7 @@ void XMLIndexTOCSourceContext::ProcessAttribute(
case XML_TOK_INDEXSOURCE_USE_INDEX_MARKS:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, rValue))
{
bUseMarks = bTmp;
@@ -136,7 +136,7 @@ void XMLIndexTOCSourceContext::ProcessAttribute(
case XML_TOK_INDEXSOURCE_USE_INDEX_SOURCE_STYLES:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, rValue))
{
bUseParagraphStyles = bTmp;
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
index 35551f4..620f646 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
@@ -113,7 +113,7 @@ void XMLIndexTabStopEntryContext::StartElement(
// #i21237#
else if ( IsXMLToken( sLocalName, XML_WITH_TAB ) )
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttr))
bWithTab = bTmp;
}
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx
index 03b57a5..021f4dd 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx
@@ -105,7 +105,7 @@ void XMLIndexTableSourceContext::ProcessAttribute(
enum IndexSourceParamEnum eParam,
const OUString& rValue)
{
- sal_Bool bTmp;
+ bool bTmp;
switch (eParam)
{
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx
index e84123b..782a887 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx
@@ -107,7 +107,7 @@ void XMLIndexUserSourceContext::ProcessAttribute(
enum IndexSourceParamEnum eParam,
const OUString& rValue)
{
- sal_Bool bTmp;
+ bool bTmp;
switch (eParam)
{
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index a355373..78fce8d 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -138,7 +138,7 @@ void XMLLineNumberingImportContext::ProcessAttribute(
enum LineNumberingToken eToken,
OUString sValue)
{
- sal_Bool bTmp;
+ bool bTmp;
sal_Int32 nTmp;
switch (eToken)
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index f95557f..f481ea2 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -312,7 +312,7 @@ void XMLSectionImportContext::ProcessAttributes(
break;
case XML_TOK_SECTION_IS_HIDDEN:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttr))
{
bIsCurrentlyVisible = !bTmp;
@@ -326,7 +326,7 @@ void XMLSectionImportContext::ProcessAttributes(
break;
case XML_TOK_SECTION_PROTECT:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttr))
{
bProtect = bTmp;
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
index 0ae1541..acc0fc7 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
@@ -128,7 +128,7 @@ void XMLSectionSourceDDEImportContext::StartElement(
break;
case XML_TOK_SECTION_IS_AUTOMATIC_UPDATE:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(
bTmp, xAttrList->getValueByIndex(nAttr)))
{
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
index 05e9cd3..9958892 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
@@ -88,7 +88,7 @@ XMLTextFrameHyperlinkContext::XMLTextFrameHyperlinkContext(
break;
case XML_TOK_TEXT_HYPERLINK_SERVER_MAP:
{
- sal_Bool bTmp;
+ bool bTmp;
if( rImport.GetMM100UnitConverter().convertBool( bTmp,
rValue ) )
{
diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
index 8a3bbad..5def476 100644
--- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
@@ -77,7 +77,7 @@ void XMLTrackedChangesImportContext::StartElement(
{
if ( IsXMLToken( sLocalName, XML_TRACK_CHANGES ) )
{
- sal_Bool bTmp;
+ bool bTmp;
if( SvXMLUnitConverter::convertBool(
bTmp, xAttrList->getValueByIndex(i)) )
{
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 7087f7e..09b34c4 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -713,8 +713,8 @@ void XMLSenderFieldImportContext::ProcessAttribute(
if (XML_TOK_TEXTFIELD_FIXED == nAttrToken) {
// set bVal
- sal_Bool bVal;
- sal_Bool bRet = GetImport().GetMM100UnitConverter().
+ bool bVal;
+ bool bRet = GetImport().GetMM100UnitConverter().
convertBool(bVal, sAttrValue);
// set bFixed if successfull
@@ -1132,7 +1132,7 @@ void XMLTimeFieldImportContext::ProcessAttribute(
}
case XML_TOK_TEXTFIELD_FIXED:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
{
bFixed = bTmp;
@@ -1683,7 +1683,7 @@ void XMLSimpleDocInfoImportContext::ProcessAttribute(
{
if (XML_TOK_TEXTFIELD_FIXED == nAttrToken)
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
{
bFixed = bTmp;
@@ -2076,7 +2076,7 @@ void XMLHiddenParagraphImportContext::ProcessAttribute(
}
else if (XML_TOK_TEXTFIELD_IS_HIDDEN == nAttrToken)
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
{
bIsHidden = bTmp;
@@ -2150,7 +2150,7 @@ void XMLConditionalTextImportContext::ProcessAttribute(
break;
case XML_TOK_TEXTFIELD_CURRENT_VALUE:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
{
bCurrentValue = bTmp;
@@ -2231,7 +2231,7 @@ void XMLHiddenTextImportContext::ProcessAttribute(
break;
case XML_TOK_TEXTFIELD_IS_HIDDEN:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
{
bIsHidden = bTmp;
@@ -2298,7 +2298,7 @@ void XMLFileNameImportContext::ProcessAttribute(
{
case XML_TOK_TEXTFIELD_FIXED:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
{
bFixed = bTmp;
@@ -2680,7 +2680,7 @@ void XMLPageVarSetFieldImportContext::ProcessAttribute(
{
case XML_TOK_TEXTFIELD_ACTIVE:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
{
bActive = bTmp;
@@ -3113,7 +3113,7 @@ void XMLDdeFieldDeclImportContext::StartElement(
break;
case XML_TOK_DDEFIELD_UPDATE:
{
- sal_Bool bTmp;
+ bool bTmp;
if ( SvXMLUnitConverter::convertBool(
bTmp, xAttrList->getValueByIndex(i)) )
{
@@ -3959,7 +3959,7 @@ bool lcl_ProcessLabel( const SvXMLImport& rImport,
}
else if( IsXMLToken( sLocalName, XML_CURRENT_SELECTED ) )
{
- sal_Bool bTmp;
+ bool bTmp;
if( SvXMLUnitConverter::convertBool( bTmp, sValue ) )
rIsSelected = bTmp;
}
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index b6045f5..1b8f10c 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::table;
using namespace ::com::sun::star::text;
-sal_Bool XMLTextImportPropertyMapper::handleSpecialItem(
+bool XMLTextImportPropertyMapper::handleSpecialItem(
XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 9277b6a..35be728 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -1540,7 +1540,8 @@ void XMLAlphaIndexMarkImportContext_Impl::ProcessAttribute(
}
else if ( IsXMLToken( sLocalName, XML_MAIN_ENTRY ) )
{
- sal_Bool bMainEntry = sal_False, bTmp;
+ sal_Bool bMainEntry = sal_False;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sValue))
bMainEntry = bTmp;
@@ -1977,7 +1978,7 @@ XMLParaContext::XMLParaContext(
break;
case XML_TOK_TEXT_P_IS_LIST_HEADER:
{
- sal_Bool bBool;
+ bool bBool;
if( SvXMLUnitConverter::convertBool( bBool, rValue ) )
{
bIsListHeader = bBool;
@@ -1986,7 +1987,7 @@ XMLParaContext::XMLParaContext(
break;
case XML_TOK_TEXT_P_RESTART_NUMBERING:
{
- sal_Bool bBool;
+ bool bBool;
if (SvXMLUnitConverter::convertBool(bBool, rValue))
{
bIsRestart = bBool;
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 00aa5cc..c038638 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -1373,7 +1373,7 @@ void XMLValueImportHelper::ProcessAttribute(
case XML_TOK_TEXTFIELD_BOOL_VALUE:
{
- sal_Bool bTmp;
+ bool bTmp;
sal_Bool bRet = SvXMLUnitConverter::convertBool(bTmp,sAttrValue);
if (bRet) {
bFloatValueOK = sal_True;
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx
index 2b28a06..252d078 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
@@ -105,7 +105,7 @@ XFormsSubmissionContext::~XFormsSubmissionContext()
Any toBool( const OUString& rValue )
{
Any aValue;
- sal_Bool bValue;
+ bool bValue;
if( SvXMLUnitConverter::convertBool( bValue, rValue ) )
{
aValue <<= ( bValue ? true : false );
commit 26692bdc4f293ade352ecd5448d9dec130b9003d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Oct 4 15:23:49 2010 +0100
Convert all Query/Put Value() to bool
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index c9f11ac..ee1ffb8 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -82,8 +82,8 @@ public:
SfxMapUnit ePresUnit,
XubString& rText,
const IntlWrapper *pIntl ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
void merge( const MediaItem& rMediaItem );
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 9d53c0d..0b78345 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -122,7 +122,7 @@ SfxItemPresentation MediaItem::GetPresentation( SfxItemPresentation,
//------------------------------------------------------------------------
-BOOL MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
+bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
{
uno::Sequence< uno::Any > aSeq( 9 );
@@ -135,23 +135,23 @@ BOOL MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
aSeq[ 6 ] <<= mbLoop;
aSeq[ 7 ] <<= mbMute;
aSeq[ 8 ] <<= meZoom;
-
+
rVal <<= aSeq;
-
+
return true;
}
//------------------------------------------------------------------------
-BOOL MediaItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
+bool MediaItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
{
uno::Sequence< uno::Any > aSeq;
- BOOL bRet = false;
-
+ bool bRet = false;
+
if( ( rVal >>= aSeq ) && ( aSeq.getLength() == 9 ) )
{
sal_Int32 nInt32 = 0;
-
+
aSeq[ 0 ] >>= maURL;
aSeq[ 1 ] >>= mnMaskSet;
aSeq[ 2 ] >>= nInt32; meState = static_cast< MediaState >( nInt32 );
@@ -161,10 +161,10 @@ BOOL MediaItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
aSeq[ 6 ] >>= mbLoop;
aSeq[ 7 ] >>= mbMute;
aSeq[ 8 ] >>= meZoom;
-
+
bRet = true;
}
-
+
return bRet;
}
diff --git a/editeng/inc/editeng/adjitem.hxx b/editeng/inc/editeng/adjitem.hxx
index f72c8eb..e99ee0c 100644
--- a/editeng/inc/editeng/adjitem.hxx
+++ b/editeng/inc/editeng/adjitem.hxx
@@ -70,8 +70,8 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/bolnitem.hxx b/editeng/inc/editeng/bolnitem.hxx
index 4e21750..4718ef1 100644
--- a/editeng/inc/editeng/bolnitem.hxx
+++ b/editeng/inc/editeng/bolnitem.hxx
@@ -56,8 +56,8 @@ public:
~SvxLineItem();
SvxLineItem &operator=( const SvxLineItem& rLine );
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/boxitem.hxx b/editeng/inc/editeng/boxitem.hxx
index d85f7c2..f1ddc6d 100644
--- a/editeng/inc/editeng/boxitem.hxx
+++ b/editeng/inc/editeng/boxitem.hxx
@@ -70,8 +70,8 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
@@ -185,8 +185,8 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
diff --git a/editeng/inc/editeng/brkitem.hxx b/editeng/inc/editeng/brkitem.hxx
index 206f459..e3c7e2a 100644
--- a/editeng/inc/editeng/brkitem.hxx
+++ b/editeng/inc/editeng/brkitem.hxx
@@ -59,8 +59,8 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/brshitem.hxx b/editeng/inc/editeng/brshitem.hxx
index 837dd87..f33b232 100644
--- a/editeng/inc/editeng/brshitem.hxx
+++ b/editeng/inc/editeng/brshitem.hxx
@@ -99,8 +99,8 @@ public:
String &rText, const IntlWrapper * = 0 ) const;
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create( SvStream&, USHORT nVersion ) const;
diff --git a/editeng/inc/editeng/charreliefitem.hxx b/editeng/inc/editeng/charreliefitem.hxx
index 3d5b36f..704a757 100644
--- a/editeng/inc/editeng/charreliefitem.hxx
+++ b/editeng/inc/editeng/charreliefitem.hxx
@@ -64,9 +64,9 @@ public:
String &rText,
const IntlWrapper * = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId );
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId ) const;
inline SvxCharReliefItem& operator=( const SvxCharReliefItem& rItem )
diff --git a/editeng/inc/editeng/charrotateitem.hxx b/editeng/inc/editeng/charrotateitem.hxx
index a8eaca8..f2b38de 100644
--- a/editeng/inc/editeng/charrotateitem.hxx
+++ b/editeng/inc/editeng/charrotateitem.hxx
@@ -64,9 +64,9 @@ public:
String &rText,
const IntlWrapper * = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId );
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId ) const;
inline SvxCharRotateItem& operator=( const SvxCharRotateItem& rItem )
diff --git a/editeng/inc/editeng/charscaleitem.hxx b/editeng/inc/editeng/charscaleitem.hxx
index 925e84a..91d9169 100644
--- a/editeng/inc/editeng/charscaleitem.hxx
+++ b/editeng/inc/editeng/charscaleitem.hxx
@@ -61,9 +61,9 @@ public:
String &rText,
const IntlWrapper * = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId );
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId ) const;
inline SvxCharScaleWidthItem& operator=(const SvxCharScaleWidthItem& rItem )
diff --git a/editeng/inc/editeng/cmapitem.hxx b/editeng/inc/editeng/cmapitem.hxx
index 94fb80a..b6b2fe0 100644
--- a/editeng/inc/editeng/cmapitem.hxx
+++ b/editeng/inc/editeng/cmapitem.hxx
@@ -81,8 +81,8 @@ public:
{ return (SvxCaseMap)GetValue(); }
void SetCaseMap( SvxCaseMap eNew )
{ SetValue( (USHORT)eNew ); }
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
};
#endif
diff --git a/editeng/inc/editeng/colritem.hxx b/editeng/inc/editeng/colritem.hxx
index 6c73008..5768a98 100644
--- a/editeng/inc/editeng/colritem.hxx
+++ b/editeng/inc/editeng/colritem.hxx
@@ -64,8 +64,8 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual USHORT GetVersion( USHORT nFileVersion ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
diff --git a/editeng/inc/editeng/crsditem.hxx b/editeng/inc/editeng/crsditem.hxx
index c62f5bd..c1d3711 100644
--- a/editeng/inc/editeng/crsditem.hxx
+++ b/editeng/inc/editeng/crsditem.hxx
@@ -65,8 +65,8 @@ public:
virtual SvStream& Store(SvStream &, USHORT nItemVersion) const;
virtual String GetValueTextByPos( USHORT nPos ) const;
virtual USHORT GetValueCount() const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
// MS VC4.0 kommt durcheinander
void SetValue( USHORT nNewVal )
diff --git a/editeng/inc/editeng/emphitem.hxx b/editeng/inc/editeng/emphitem.hxx
index 915320d..de0d8b4 100644
--- a/editeng/inc/editeng/emphitem.hxx
+++ b/editeng/inc/editeng/emphitem.hxx
@@ -66,9 +66,9 @@ public:
virtual SvStream& Store(SvStream &, USHORT nItemVersion) const;
virtual USHORT GetVersion( USHORT nFileVersion ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
inline SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem )
diff --git a/editeng/inc/editeng/escpitem.hxx b/editeng/inc/editeng/escpitem.hxx
index ecdc6e3..599f5ae 100644
--- a/editeng/inc/editeng/escpitem.hxx
+++ b/editeng/inc/editeng/escpitem.hxx
@@ -72,8 +72,8 @@ public:
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
diff --git a/editeng/inc/editeng/fhgtitem.hxx b/editeng/inc/editeng/fhgtitem.hxx
index e4cbb86..7b8b45f 100644
--- a/editeng/inc/editeng/fhgtitem.hxx
+++ b/editeng/inc/editeng/fhgtitem.hxx
@@ -63,8 +63,8 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/flstitem.hxx b/editeng/inc/editeng/flstitem.hxx
index c16b812..acd20d1 100644
--- a/editeng/inc/editeng/flstitem.hxx
+++ b/editeng/inc/editeng/flstitem.hxx
@@ -61,7 +61,7 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/fontitem.hxx b/editeng/inc/editeng/fontitem.hxx
index ed251fd..06efb23 100644
--- a/editeng/inc/editeng/fontitem.hxx
+++ b/editeng/inc/editeng/fontitem.hxx
@@ -72,8 +72,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
virtual SvStream& Store(SvStream &, USHORT nItemVersion) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/frmdiritem.hxx b/editeng/inc/editeng/frmdiritem.hxx
index fe46b5c..84c9abf 100644
--- a/editeng/inc/editeng/frmdiritem.hxx
+++ b/editeng/inc/editeng/frmdiritem.hxx
@@ -64,9 +64,9 @@ public:
String &rText,
const IntlWrapper * = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId );
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId ) const;
inline SvxFrameDirectionItem& operator=( const SvxFrameDirectionItem& rItem )
diff --git a/editeng/inc/editeng/fwdtitem.hxx b/editeng/inc/editeng/fwdtitem.hxx
index d8dfeca..1328dc6 100644
--- a/editeng/inc/editeng/fwdtitem.hxx
+++ b/editeng/inc/editeng/fwdtitem.hxx
@@ -54,8 +54,8 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/hyznitem.hxx b/editeng/inc/editeng/hyznitem.hxx
index 2ae3ffc..666b8a5 100644
--- a/editeng/inc/editeng/hyznitem.hxx
+++ b/editeng/inc/editeng/hyznitem.hxx
@@ -64,8 +64,8 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/kernitem.hxx b/editeng/inc/editeng/kernitem.hxx
index 1766c7b..9a60b51 100644
--- a/editeng/inc/editeng/kernitem.hxx
+++ b/editeng/inc/editeng/kernitem.hxx
@@ -72,8 +72,8 @@ public:
return *this;
}
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
};
#endif
diff --git a/editeng/inc/editeng/langitem.hxx b/editeng/inc/editeng/langitem.hxx
index da70a1d..31ca110 100644
--- a/editeng/inc/editeng/langitem.hxx
+++ b/editeng/inc/editeng/langitem.hxx
@@ -76,9 +76,8 @@ public:
{ return (LanguageType)GetValue(); }
void SetLanguage( const LanguageType eLang )
{ SetValue( (USHORT)eLang ); }
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
};
#endif
-
diff --git a/editeng/inc/editeng/lrspitem.hxx b/editeng/inc/editeng/lrspitem.hxx
index 7f5dbfc..6860fe2 100644
--- a/editeng/inc/editeng/lrspitem.hxx
+++ b/editeng/inc/editeng/lrspitem.hxx
@@ -87,8 +87,8 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/lspcitem.hxx b/editeng/inc/editeng/lspcitem.hxx
index 659e618..542a16b 100644
--- a/editeng/inc/editeng/lspcitem.hxx
+++ b/editeng/inc/editeng/lspcitem.hxx
@@ -70,8 +70,8 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index 54cfe35..c894599 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -319,8 +319,8 @@ public:
SvxNumRule* GetNumRule() const {return pNumRule;}
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
};
/* -----------------28.10.98 15:21-------------------
*
diff --git a/editeng/inc/editeng/paravertalignitem.hxx b/editeng/inc/editeng/paravertalignitem.hxx
index 119532f..291f02a 100644
--- a/editeng/inc/editeng/paravertalignitem.hxx
+++ b/editeng/inc/editeng/paravertalignitem.hxx
@@ -61,9 +61,9 @@ public:
String &rText,
const IntlWrapper * = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId );
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId ) const;
inline SvxParaVertAlignItem& operator=( const SvxParaVertAlignItem& rItem )
diff --git a/editeng/inc/editeng/pmdlitem.hxx b/editeng/inc/editeng/pmdlitem.hxx
index 1bcc2b5..1431ae6 100644
--- a/editeng/inc/editeng/pmdlitem.hxx
+++ b/editeng/inc/editeng/pmdlitem.hxx
@@ -59,8 +59,8 @@ public:
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
BOOL IsAuto() const { return bAuto; }
};
diff --git a/editeng/inc/editeng/postitem.hxx b/editeng/inc/editeng/postitem.hxx
index 03fe015..ebc1395 100644
--- a/editeng/inc/editeng/postitem.hxx
+++ b/editeng/inc/editeng/postitem.hxx
@@ -66,8 +66,8 @@ public:
virtual String GetValueTextByPos( USHORT nPos ) const;
virtual USHORT GetValueCount() const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual int HasBoolValue() const;
virtual BOOL GetBoolValue() const;
diff --git a/editeng/inc/editeng/protitem.hxx b/editeng/inc/editeng/protitem.hxx
index a69643a..f752579 100644
--- a/editeng/inc/editeng/protitem.hxx
+++ b/editeng/inc/editeng/protitem.hxx
@@ -80,8 +80,8 @@ public:
void SetSizeProtect ( BOOL bNew ) { bSize = bNew; }
void SetPosProtect ( BOOL bNew ) { bPos = bNew; }
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
};
inline SvxProtectItem::SvxProtectItem( const USHORT nId )
diff --git a/editeng/inc/editeng/shaditem.hxx b/editeng/inc/editeng/shaditem.hxx
index 0f231ac..1664d11 100644
--- a/editeng/inc/editeng/shaditem.hxx
+++ b/editeng/inc/editeng/shaditem.hxx
@@ -67,8 +67,8 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/sizeitem.hxx b/editeng/inc/editeng/sizeitem.hxx
index ef2b00b..2de7ff0 100644
--- a/editeng/inc/editeng/sizeitem.hxx
+++ b/editeng/inc/editeng/sizeitem.hxx
@@ -55,8 +55,8 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/tstpitem.hxx b/editeng/inc/editeng/tstpitem.hxx
index 6ed88c9..9590639 100644
--- a/editeng/inc/editeng/tstpitem.hxx
+++ b/editeng/inc/editeng/tstpitem.hxx
@@ -165,8 +165,8 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/twolinesitem.hxx b/editeng/inc/editeng/twolinesitem.hxx
index aede998..c3ecee2 100644
--- a/editeng/inc/editeng/twolinesitem.hxx
+++ b/editeng/inc/editeng/twolinesitem.hxx
@@ -61,9 +61,9 @@ public:
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
virtual USHORT GetVersion( USHORT nFFVer ) const;
diff --git a/editeng/inc/editeng/udlnitem.hxx b/editeng/inc/editeng/udlnitem.hxx
index c4307ac..d8ab950 100644
--- a/editeng/inc/editeng/udlnitem.hxx
+++ b/editeng/inc/editeng/udlnitem.hxx
@@ -65,9 +65,9 @@ public:
virtual String GetValueTextByPos( USHORT nPos ) const;
virtual USHORT GetValueCount() const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
// MS VC4.0 kommt durcheinander
diff --git a/editeng/inc/editeng/ulspitem.hxx b/editeng/inc/editeng/ulspitem.hxx
index 209cb92..790cb1c 100644
--- a/editeng/inc/editeng/ulspitem.hxx
+++ b/editeng/inc/editeng/ulspitem.hxx
@@ -62,8 +62,8 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/wghtitem.hxx b/editeng/inc/editeng/wghtitem.hxx
index ef18c3a..4c68565 100644
--- a/editeng/inc/editeng/wghtitem.hxx
+++ b/editeng/inc/editeng/wghtitem.hxx
@@ -66,8 +66,8 @@ public:
virtual String GetValueTextByPos( USHORT nPos ) const;
virtual USHORT GetValueCount() const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual int HasBoolValue() const;
virtual BOOL GetBoolValue() const;
diff --git a/editeng/inc/editeng/writingmodeitem.hxx b/editeng/inc/editeng/writingmodeitem.hxx
index 7c33fc7..2f6bcf2 100644
--- a/editeng/inc/editeng/writingmodeitem.hxx
+++ b/editeng/inc/editeng/writingmodeitem.hxx
@@ -58,9 +58,9 @@ public:
String &rText,
const IntlWrapper * = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId );
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId ) const;
};
diff --git a/editeng/inc/editeng/xmlcnitm.hxx b/editeng/inc/editeng/xmlcnitm.hxx
index 2e283e5..cfcfce0 100644
--- a/editeng/inc/editeng/xmlcnitm.hxx
+++ b/editeng/inc/editeng/xmlcnitm.hxx
@@ -62,8 +62,8 @@ public:
virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxPoolItem *Clone( SfxItemPool * = 0) const
{ return new SvXMLAttrContainerItem( *this ); }
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index a7cc6bd..59fa631 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -218,7 +218,7 @@ SvxSizeItem::SvxSizeItem( const sal_uInt16 nId, const Size& rSize ) :
}
// -----------------------------------------------------------------------
-sal_Bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -235,13 +235,13 @@ sal_Bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
case MID_SIZE_SIZE: rVal <<= aTmp; break;
case MID_SIZE_WIDTH: rVal <<= aTmp.Width; break;
case MID_SIZE_HEIGHT: rVal <<= aTmp.Height; break;
- default: DBG_ERROR("Wrong MemberId!"); return sal_False;
+ default: DBG_ERROR("Wrong MemberId!"); return false;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -262,7 +262,7 @@ sal_Bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
}
else
{
- return sal_False;
+ return false;
}
}
break;
@@ -270,7 +270,7 @@ sal_Bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
sal_Int32 nVal = 0;
if(!(rVal >>= nVal ))
- return sal_False;
+ return false;
aSize.Width() = bConvert ? MM100_TO_TWIP(nVal) : nVal;
}
@@ -279,15 +279,15 @@ sal_Bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
sal_Int32 nVal = 0;
if(!(rVal >>= nVal))
- return sal_True;
+ return true;
aSize.Height() = bConvert ? MM100_TO_TWIP(nVal) : nVal;
}
break;
default: DBG_ERROR("Wrong MemberId!");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
@@ -430,9 +430,9 @@ SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const long nRight,
}
// -----------------------------------------------------------------------
-sal_Bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
- sal_Bool bRet = sal_True;
+ bool bRet = true;
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
switch( nMemberId )
@@ -468,14 +468,14 @@ sal_Bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
break;
default:
- bRet = sal_False;
+ bRet = false;
DBG_ERROR("unknown MemberId");
}
return bRet;
}
// -----------------------------------------------------------------------
-sal_Bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -510,7 +510,7 @@ sal_Bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
nPropRightMargin = (USHORT)nRel;
}
else
- return FALSE;
+ return false;
}
break;
case MID_FIRST_LINE_INDENT :
@@ -527,9 +527,9 @@ sal_Bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
default:
DBG_ERROR("unknown MemberId");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
@@ -824,9 +824,9 @@ SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
}
// -----------------------------------------------------------------------
-sal_Bool SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
- sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+ bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
switch( nMemberId )
{
@@ -846,11 +846,11 @@ sal_Bool SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
case MID_UP_REL_MARGIN: rVal <<= (sal_Int16) nPropUpper; break;
case MID_LO_REL_MARGIN: rVal <<= (sal_Int16) nPropLower; break;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -861,7 +861,7 @@ sal_Bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
::com::sun::star::frame::status::UpperLowerMarginScale aUpperLowerMarginScale;
if ( !(rVal >>= aUpperLowerMarginScale ))
- return sal_False;
+ return false;
{
SetUpper((sal_uInt16)(bConvert ? MM100_TO_TWIP( aUpperLowerMarginScale.Upper ) : aUpperLowerMarginScale.Upper));
SetLower((sal_uInt16)(bConvert ? MM100_TO_TWIP( aUpperLowerMarginScale.Lower ) : aUpperLowerMarginScale.Lower));
@@ -874,12 +874,12 @@ sal_Bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
case MID_UP_MARGIN :
if(!(rVal >>= nVal) || nVal < 0)
- return sal_False;
+ return false;
SetUpper((USHORT)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
break;
case MID_LO_MARGIN :
if(!(rVal >>= nVal) || nVal < 0)
- return sal_False;
+ return false;
SetLower((USHORT)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
break;
case MID_UP_REL_MARGIN:
@@ -894,16 +894,16 @@ sal_Bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
nPropLower = (USHORT)nRel;
}
else
- return FALSE;
+ return false;
}
break;
default:
DBG_ERROR("unknown MemberId");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
@@ -1167,7 +1167,7 @@ int SvxProtectItem::operator==( const SfxPoolItem& rAttr ) const
/*-----------------16.03.98 12:42-------------------
--------------------------------------------------*/
-sal_Bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1179,16 +1179,16 @@ sal_Bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
case MID_PROTECT_POSITION: bValue = bPos; break;
default:
DBG_ERROR("falsche MemberId");
- return sal_False;
+ return false;
}
rVal = Bool2Any( bValue );
- return sal_True;
+ return true;
}
/*-----------------16.03.98 12:42-------------------
--------------------------------------------------*/
-sal_Bool SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1200,9 +1200,9 @@ sal_Bool SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
case MID_PROTECT_POSITION: bPos = bVal; break;
default:
DBG_ERROR("falsche MemberId");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
@@ -1297,7 +1297,7 @@ SvxShadowItem::SvxShadowItem( const USHORT nId,
}
// -----------------------------------------------------------------------
-sal_Bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1324,20 +1324,20 @@ sal_Bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
case MID_TRANSPARENT: rVal <<= aShadow.IsTransparent; break;
case MID_BG_COLOR: rVal <<= aShadow.Color; break;
case 0: rVal <<= aShadow; break;
- default: DBG_ERROR("Wrong MemberId!"); return sal_False;
+ default: DBG_ERROR("Wrong MemberId!"); return false;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxShadowItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxShadowItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
table::ShadowFormat aShadow;
uno::Any aAny;
- sal_Bool bRet = QueryValue( aAny, bConvert ? CONVERT_TWIPS : 0 ) && ( aAny >>= aShadow );
+ bool bRet = QueryValue( aAny, bConvert ? CONVERT_TWIPS : 0 ) && ( aAny >>= aShadow );
switch ( nMemberId )
{
case MID_LOCATION:
@@ -1842,7 +1842,7 @@ table::BorderLine SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, sal_Bool
return aLine;
}
// -----------------------------------------------------------------------
-sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
table::BorderLine aRetLine;
@@ -1929,7 +1929,7 @@ sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
rVal <<= aRetLine;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
@@ -1945,7 +1945,7 @@ sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rL
// -----------------------------------------------------------------------
-sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
sal_uInt16 nLine = BOX_LINE_TOP;
@@ -2779,7 +2779,7 @@ void SvxBoxInfoItem::ResetFlags()
nValidFlags = 0x7F; // alles g"ultig au/ser Disable
}
-sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
table::BorderLine aRetLine;
@@ -2836,7 +2836,7 @@ sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
bIntMember = sal_True;
rVal <<= (sal_Int32)(bConvert ? TWIP_TO_MM100_UNSIGNED(GetDefDist()) : GetDefDist());
break;
- default: DBG_ERROR("Wrong MemberId!"); return sal_False;
+ default: DBG_ERROR("Wrong MemberId!"); return false;
}
if( !bIntMember )
@@ -2856,12 +2856,12 @@ sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
rVal <<= aRetLine;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
// sal_uInt16 nLine = BOX_LINE_TOP;
@@ -3064,7 +3064,7 @@ XubString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
}
// -----------------------------------------------------------------------
-sal_Bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
style::BreakType eBreak = style::BreakType_NONE;
switch ( (SvxBreak)GetValue() )
@@ -3078,10 +3078,10 @@ sal_Bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
default: ;//prevent warning
}
rVal <<= eBreak;
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
style::BreakType nBreak;
@@ -3107,7 +3107,7 @@ sal_Bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
}
SetValue((sal_uInt16) eBreak);
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
@@ -3266,14 +3266,14 @@ SfxPoolItem* SvxLineItem::Clone( SfxItemPool* ) const
return new SvxLineItem( *this );
}
-sal_Bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
+bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
{
sal_Bool bConvert = 0!=(nMemId&CONVERT_TWIPS);
nMemId &= ~CONVERT_TWIPS;
if ( nMemId == 0 )
{
rVal <<= uno::makeAny( SvxBoxItem::SvxLineToLine(pLine, bConvert) );
- return sal_True;
+ return true;
}
else if ( pLine )
{
@@ -3285,16 +3285,16 @@ sal_Bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
case MID_DISTANCE: rVal <<= sal_Int32(pLine->GetDistance()); break;
default:
DBG_ERROR( "Wrong MemberId" );
- return sal_False;
+ return false;
}
}
- return TRUE;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
+bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
{
sal_Bool bConvert = 0!=(nMemId&CONVERT_TWIPS);
nMemId &= ~CONVERT_TWIPS;
@@ -3308,9 +3308,9 @@ sal_Bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
pLine = new SvxBorderLine;
if( !SvxBoxItem::LineToSvxLine(aLine, *pLine, bConvert) )
DELETEZ( pLine );
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
else if ( rVal >>= nVal )
{
@@ -3328,10 +3328,10 @@ sal_Bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
return sal_False;
}
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
//------------------------------------------------------------------------
@@ -3701,7 +3701,7 @@ inline sal_Int8 lcl_TransparencyToPercent(sal_Int32 nTrans)
return (sal_Int8)((nTrans * 100 + 127) / 254);
}
-sal_Bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -3758,12 +3758,12 @@ sal_Bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
break;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxBrushItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxBrushItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -3874,7 +3874,7 @@ sal_Bool SvxBrushItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
break;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
@@ -4394,7 +4394,7 @@ SfxItemPresentation SvxFrameDirectionItem::GetPresentation(
return eRet;
}
-sal_Bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal,
+bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal,
BYTE )
{
sal_Int16 nVal = sal_Int16();
@@ -4420,7 +4420,7 @@ sal_Bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal,
SetValue( FRMDIR_ENVIRONMENT );
break;
default:
- bRet = sal_False;
+ bRet = false;
break;
}
}
@@ -4428,12 +4428,12 @@ sal_Bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal,
return bRet;
}
-sal_Bool SvxFrameDirectionItem::QueryValue( com::sun::star::uno::Any& rVal,
+bool SvxFrameDirectionItem::QueryValue( com::sun::star::uno::Any& rVal,
BYTE ) const
{
// translate SvxFrameDirection into WritingDirection2
sal_Int16 nVal;
- sal_Bool bRet = sal_True;
+ bool bRet = true;
switch( GetValue() )
{
case FRMDIR_HORI_LEFT_TOP:
@@ -4453,7 +4453,7 @@ sal_Bool SvxFrameDirectionItem::QueryValue( com::sun::star::uno::Any& rVal,
break;
default:
DBG_ERROR("Unknown SvxFrameDirection value!");
- bRet = sal_False;
+ bRet = false;
break;
}
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index cb872a2..1cd480a 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -1090,13 +1090,13 @@ SvStream& SvxNumBulletItem::Store(SvStream &rStream, USHORT /*nItemVersion*/ )
return rStream;
}
-sal_Bool SvxNumBulletItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxNumBulletItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
rVal <<= SvxCreateNumRule( pNumRule );
- return sal_True;
+ return true;
}
-sal_Bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
uno::Reference< container::XIndexReplace > xRule;
if( rVal >>= xRule )
@@ -1113,13 +1113,13 @@ sal_Bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
}
delete pNumRule;
pNumRule = pNewRule;
- return sal_True;
+ return true;
}
catch(lang::IllegalArgumentException&)
{
}
}
- return sal_False;
+ return false;
}
SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, USHORT nLevels, SvxNumRuleType eType )
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 217bdf3..9c7d67c 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -148,7 +148,7 @@ int SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const
- ein sal_uInt32 fuer alle Werte (Abstand, Hoehe, rel. Angaben)
--------------------------------------------------*/
-sal_Bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -190,12 +190,12 @@ sal_Bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
default: DBG_ERROR("Wrong MemberId!"); break;
}
- return sal_True;
+ return true;
}
/*-----------------18.03.98 16:32-------------------
--------------------------------------------------*/
-sal_Bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -390,7 +390,7 @@ int SvxAdjustItem::operator==( const SfxPoolItem& rAttr ) const
/*-----------------18.03.98 16:15-------------------
--------------------------------------------------*/
-sal_Bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -406,13 +406,13 @@ sal_Bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
}
default: ;//prevent warning
}
- return sal_True;
+ return true;
}
/*-----------------18.03.98 16:15-------------------
--------------------------------------------------*/
-sal_Bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -445,7 +445,7 @@ sal_Bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
bOneBlock = Any2Bool(rVal);
break;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
@@ -709,7 +709,7 @@ SvxHyphenZoneItem::SvxHyphenZoneItem( const sal_Bool bHyph, const sal_uInt16 nId
}
// -----------------------------------------------------------------------
-sal_Bool SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -728,10 +728,10 @@ sal_Bool SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
rVal <<= (sal_Int16)nMaxHyphens;
break;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -739,7 +739,7 @@ sal_Bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
if( nMemberId != MID_IS_HYPHEN )
if(!(rVal >>= nNewVal))
- return sal_False;
+ return false;
switch(nMemberId)
{
@@ -756,7 +756,7 @@ sal_Bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
nMaxHyphens = (BYTE)nNewVal;
break;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
@@ -1015,7 +1015,7 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
--------------------------------------------------*/
-sal_Bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1059,7 +1059,7 @@ sal_Bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
--------------------------------------------------*/
-sal_Bool SvxTabStopItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxTabStopItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1380,7 +1380,7 @@ SfxPoolItem* SvxPageModelItem::Clone( SfxItemPool* ) const
//------------------------------------------------------------------------
-sal_Bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1395,7 +1395,7 @@ sal_Bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMem
return sal_True;
}
-sal_Bool SvxPageModelItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxPageModelItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1675,14 +1675,14 @@ SfxItemPresentation SvxParaVertAlignItem::GetPresentation(
return SFX_ITEM_PRESENTATION_NONE;
}
-sal_Bool SvxParaVertAlignItem::QueryValue( com::sun::star::uno::Any& rVal,
+bool SvxParaVertAlignItem::QueryValue( com::sun::star::uno::Any& rVal,
BYTE /*nMemberId*/ ) const
{
rVal <<= (sal_Int16)GetValue();
return sal_True;
}
-sal_Bool SvxParaVertAlignItem::PutValue( const com::sun::star::uno::Any& rVal,
+bool SvxParaVertAlignItem::PutValue( const com::sun::star::uno::Any& rVal,
BYTE /*nMemberId*/ )
{
sal_Int16 nVal = sal_Int16();
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 6b21048..6d749b3 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -209,10 +209,10 @@ int SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const
return( pFontList == ((SvxFontListItem&)rAttr).pFontList );
}
-sal_Bool SvxFontListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxFontListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
rVal <<= aFontNameSeq;
- return sal_True;
+ return true;
}
//------------------------------------------------------------------------
@@ -257,7 +257,7 @@ SvxFontItem::SvxFontItem( const FontFamily eFam, const XubString& aName,
// -----------------------------------------------------------------------
-sal_Bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -284,10 +284,10 @@ sal_Bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
case MID_FONT_CHAR_SET : rVal <<= (sal_Int16)(eTextEncoding); break;
case MID_FONT_PITCH : rVal <<= (sal_Int16)(ePitch); break;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxFontItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
+bool SvxFontItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -347,7 +347,7 @@ sal_Bool SvxFontItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
}
break;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
@@ -575,7 +575,7 @@ XubString SvxPostureItem::GetValueTextByPos( USHORT nPos ) const
/*-----------------13.03.98 14:28-------------------
--------------------------------------------------*/
-sal_Bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -588,12 +588,12 @@ sal_Bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
rVal <<= (awt::FontSlant)GetValue(); // Werte von awt::FontSlant und FontItalic sind gleich
break;
}
- return sal_True;
+ return true;
}
/*-----------------13.03.98 14:28-------------------
--------------------------------------------------*/
-sal_Bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -616,7 +616,7 @@ sal_Bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
SetValue((USHORT)eSlant);
}
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
@@ -627,7 +627,7 @@ int SvxPostureItem::HasBoolValue() const
// -----------------------------------------------------------------------
-sal_Bool SvxPostureItem::GetBoolValue() const
+BOOL SvxPostureItem::GetBoolValue() const
{
return ( (FontItalic)GetValue() >= ITALIC_OBLIQUE );
}
@@ -735,7 +735,7 @@ XubString SvxWeightItem::GetValueTextByPos( USHORT nPos ) const
/*-----------------13.03.98 14:18-------------------
--------------------------------------------------*/
-sal_Bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -750,12 +750,12 @@ sal_Bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
}
break;
}
- return sal_True;
+ return true;
}
/*-----------------13.03.98 14:18-------------------
--------------------------------------------------*/
-sal_Bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -778,7 +778,7 @@ sal_Bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
}
break;
}
- return sal_True;
+ return true;
}
// class SvxFontHeightItem -----------------------------------------------
@@ -857,7 +857,7 @@ int SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const
/*-----------------13.03.98 14:53-------------------
--------------------------------------------------*/
-sal_Bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
// In StarOne sind im uno::Any immer 1/100mm. Ueber die MemberId wird
// gesteuert, ob der Wert im Item 1/100mm oder Twips sind.
@@ -995,7 +995,7 @@ sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, SfxMapUn
/*-----------------13.03.98 14:53-------------------
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list