summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-31 11:47:05 +0200
committerNoel Grandin <noel@peralex.com>2014-03-31 12:39:03 +0200
commit0f912872b661a6763dfd5789c0377ca453f7e260 (patch)
tree7a21e618293c5873ab3370ba7ffe8e0cb78fb838
parentxmloff: sal_Bool->bool (diff)
downloadcore-0f912872b661a6763dfd5789c0377ca453f7e260.tar.gz
core-0f912872b661a6763dfd5789c0377ca453f7e260.zip
xmloff: sal_Bool->bool
Change-Id: Id3d8f4f4ef32280a131907ffa32eb2ad5d6ea2e1
-rw-r--r--dbaccess/source/filter/xml/xmlStyleImport.cxx6
-rw-r--r--include/xmloff/xmlexp.hxx2
-rw-r--r--include/xmloff/xmlnumi.hxx14
-rw-r--r--include/xmloff/xmlprmap.hxx6
-rw-r--r--include/xmloff/xmlstyle.hxx53
-rw-r--r--include/xmloff/xmltoken.hxx2
-rw-r--r--include/xmloff/xmluconv.hxx30
-rw-r--r--reportdesign/source/filter/xml/xmlStyleImport.cxx6
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx5
-rw-r--r--sc/source/filter/xml/xmlstyli.cxx6
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx4
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx2
-rw-r--r--sw/source/filter/xml/xmltble.cxx2
-rw-r--r--xmloff/source/chart/XMLChartStyleContext.cxx2
-rw-r--r--xmloff/source/core/xmlexp.cxx2
-rw-r--r--xmloff/source/core/xmltoken.cxx2
-rw-r--r--xmloff/source/core/xmluconv.cxx84
-rw-r--r--xmloff/source/draw/sdxmlexp.cxx2
-rw-r--r--xmloff/source/draw/shapeexport.cxx2
-rw-r--r--xmloff/source/draw/ximppage.cxx2
-rw-r--r--xmloff/source/draw/ximpstyl.cxx6
-rw-r--r--xmloff/source/draw/ximpstyl.hxx2
-rw-r--r--xmloff/source/style/DashStyle.cxx2
-rw-r--r--xmloff/source/style/FillStyleContext.cxx24
-rw-r--r--xmloff/source/style/FillStyleContext.hxx12
-rw-r--r--xmloff/source/style/GradientStyle.cxx2
-rw-r--r--xmloff/source/style/HatchStyle.cxx2
-rw-r--r--xmloff/source/style/ImageStyle.cxx2
-rw-r--r--xmloff/source/style/MarkerStyle.cxx2
-rw-r--r--xmloff/source/style/TransGradientStyle.cxx2
-rw-r--r--xmloff/source/style/XMLFontStylesContext.cxx2
-rw-r--r--xmloff/source/style/XMLPageExport.cxx2
-rw-r--r--xmloff/source/style/prstylei.cxx2
-rw-r--r--xmloff/source/style/styleexp.cxx2
-rw-r--r--xmloff/source/style/xmlnume.cxx4
-rw-r--r--xmloff/source/style/xmlnumi.cxx18
-rw-r--r--xmloff/source/style/xmlprmap.cxx8
-rw-r--r--xmloff/source/style/xmlstyle.cxx37
-rw-r--r--xmloff/source/table/XMLTableImport.cxx2
-rw-r--r--xmloff/source/text/txtimp.cxx16
-rw-r--r--xmloff/source/text/txtlists.cxx2
41 files changed, 193 insertions, 192 deletions
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index 4c5337a07508..21906d279c73 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.cxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx
@@ -85,13 +85,13 @@ void OTableStyleContext::FillPropertySet(
if ((m_nNumberFormat == -1) && !m_sDataStyleName.isEmpty())
{
SvXMLNumFormatContext* pStyle = PTR_CAST(SvXMLNumFormatContext,pStyles->FindStyleChildContext(
- XML_STYLE_FAMILY_DATA_STYLE, m_sDataStyleName, sal_True));
+ XML_STYLE_FAMILY_DATA_STYLE, m_sDataStyleName, true));
if ( !pStyle )
{
OTableStylesContext* pMyStyles = PTR_CAST(OTableStylesContext,GetOwnImport().GetAutoStyles());
if ( pMyStyles )
pStyle = PTR_CAST(SvXMLNumFormatContext,pMyStyles->
- FindStyleChildContext(XML_STYLE_FAMILY_DATA_STYLE, m_sDataStyleName, sal_True));
+ FindStyleChildContext(XML_STYLE_FAMILY_DATA_STYLE, m_sDataStyleName, true));
else {
OSL_FAIL("not possible to get style");
}
@@ -167,7 +167,7 @@ void OTableStylesContext::EndElement()
if (bAutoStyles)
GetImport().GetTextImport()->SetAutoStyles( this );
else
- GetImport().GetStyles()->CopyStylesToDoc(sal_True);
+ GetImport().GetStyles()->CopyStylesToDoc(true);
}
UniReference < SvXMLImportPropertyMapper >
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 7c7eef29fe12..b45ed3993c4b 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -484,7 +484,7 @@ public:
const OUString& rEmbeddedObjectURL );
OUString EncodeStyleName( const OUString& rName,
- sal_Bool *pEncoded=0 ) const;
+ bool *pEncoded=0 ) const;
// save linked sections?
inline bool IsSaveLinkedSections() { return mbSaveLinkedSections; }
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index 58071ec281d3..86b97264237f 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -42,8 +42,8 @@ class SvxXMLListStyleContext : public SvXMLStyleContext
SvxXMLListStyle_Impl *pLevelStyles;
sal_Int32 nLevels;
- sal_Bool bConsecutive : 1;
- sal_Bool bOutline : 1;
+ bool bConsecutive : 1;
+ bool bOutline : 1;
protected:
@@ -60,7 +60,7 @@ public:
const OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList >& xAttrList,
- sal_Bool bOutl=sal_False );
+ bool bOutl = false );
virtual ~SvxXMLListStyleContext();
@@ -78,8 +78,8 @@ public:
const ::com::sun::star::uno::Reference <
::com::sun::star::container::XIndexReplace >& GetNumRules() const
{ return xNumRules; }
- sal_Bool IsOutline() const { return bOutline; }
- sal_Bool IsConsecutive() const { return bConsecutive; }
+ bool IsOutline() const { return bOutline; }
+ bool IsConsecutive() const { return bConsecutive; }
sal_Int32 GetLevels() const { return nLevels; }
static ::com::sun::star::uno::Reference <
@@ -92,9 +92,9 @@ public:
const ::com::sun::star::uno::Reference <
::com::sun::star::container::XIndexReplace > & rNumRule,
sal_Int16 nLevel,
- sal_Bool bOrdered );
+ bool bOrdered );
- virtual void CreateAndInsertLate( sal_Bool bOverwrite ) SAL_OVERRIDE;
+ virtual void CreateAndInsertLate( bool bOverwrite ) SAL_OVERRIDE;
void CreateAndInsertAuto() const;
};
diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx
index 8a6b27623fdd..5f6d52c497c6 100644
--- a/include/xmloff/xmlprmap.hxx
+++ b/include/xmloff/xmlprmap.hxx
@@ -105,7 +105,7 @@ public:
/** Returns the type of an entry */
sal_uInt32 GetEntryType( sal_Int32 nIndex,
- sal_Bool bWithFlags = sal_True ) const
+ bool bWithFlags = true ) const
{
DBG_ASSERT( (nIndex >= 0) && (nIndex < (sal_Int32)aMapEntries.size() ), "illegal access to invalid entry!" );
sal_uInt32 nType = aMapEntries[nIndex].nType;
@@ -165,10 +165,10 @@ public:
/** import/export
This methods calls the respective im/export-method of the respective PropertyHandler. */
- virtual sal_Bool exportXML( OUString& rStrExpValue,
+ virtual bool exportXML( OUString& rStrExpValue,
const XMLPropertyState& rProperty,
const SvXMLUnitConverter& rUnitConverter ) const;
- virtual sal_Bool importXML( const OUString& rStrImpValue,
+ virtual bool importXML( const OUString& rStrImpValue,
XMLPropertyState& rProperty,
const SvXMLUnitConverter& rUnitConverter ) const;
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 26f7ff8ac259..aaf6ce7f5c7e 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -64,20 +64,20 @@ class XMLOFF_DLLPUBLIC SvXMLStyleContext : public SvXMLImportContext
OUString maDisplayName;
OUString maAutoName;
OUString maParentName;// Will be moved to XMLPropStyle soon!!!!
- OUString maFollow; // Will be moved to XMLPropStyle soon!!!!
- sal_Bool mbHidden;
+ OUString maFollow; // Will be moved to XMLPropStyle soon!!!!
+ bool mbHidden;
- OUString maHelpFile; // Will be removed very soon!!!!
+ OUString maHelpFile; // Will be removed very soon!!!!
- sal_uInt32 mnHelpId; // Will be removed very soon!!!!
- sal_uInt16 mnFamily;
+ sal_uInt32 mnHelpId; // Will be removed very soon!!!!
+ sal_uInt16 mnFamily;
- sal_Bool mbValid : 1; // Set this to false in CreateAndInsert
- // if the style shouldn't be processed
- // by Finish() or si somehow invalid.
- sal_Bool mbNew : 1; // Set this to false in CreateAnsInsert
- // if the style is already existing.
- sal_Bool mbDefaultStyle : 1;
+ bool mbValid : 1; // Set this to false in CreateAndInsert
+ // if the style shouldn't be processed
+ // by Finish() or si somehow invalid.
+ bool mbNew : 1; // Set this to false in CreateAnsInsert
+ // if the style is already existing.
+ bool mbDefaultStyle : 1;
protected:
@@ -95,8 +95,9 @@ public:
SvXMLStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
- sal_uInt16 nFamily=0, sal_Bool bDefaultStyle = sal_False );
+ ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
+ sal_uInt16 nFamily=0,
+ bool bDefaultStyle = false );
virtual ~SvXMLStyleContext();
@@ -120,13 +121,13 @@ public:
sal_uInt16 GetFamily() const { return mnFamily; }
- sal_Bool IsValid() const { return mbValid; }
- void SetValid( sal_Bool b ) { mbValid = b; }
+ bool IsValid() const { return mbValid; }
+ void SetValid( bool b ) { mbValid = b; }
- sal_Bool IsNew() const { return mbNew; }
- void SetNew( sal_Bool b ) { mbNew = b; }
+ bool IsNew() const { return mbNew; }
+ void SetNew( bool b ) { mbNew = b; }
- sal_Bool IsHidden() const { return mbHidden; }
+ bool IsHidden() const { return mbHidden; }
// This method is called for every default style
virtual void SetDefaults();
@@ -137,13 +138,13 @@ public:
// This method is called for every style. It must create it and insert
// it into the document if this hasn't happened already in CreateAndInsert().
- virtual void CreateAndInsertLate( sal_Bool bOverwrite );
+ virtual void CreateAndInsertLate( bool bOverwrite );
// This method is called fpr every style after all styles have been
// inserted into the document.
virtual void Finish( bool bOverwrite );
- sal_Bool IsDefaultStyle() const { return mbDefaultStyle; }
+ bool IsDefaultStyle() const { return mbDefaultStyle; }
/** if this method returns true, its parent styles context
should not add it to its container.<br>
@@ -153,7 +154,7 @@ public:
and Finish() will not be called.
The default return value is false
*/
- virtual sal_Bool IsTransient() const;
+ virtual bool IsTransient() const;
};
class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext
@@ -219,7 +220,7 @@ public:
const OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
- sal_Bool bAutomatic = sal_False );
+ bool bAutomatic = false );
virtual ~SvXMLStylesContext();
@@ -238,7 +239,7 @@ public:
const SvXMLStyleContext *FindStyleChildContext(
sal_uInt16 nFamily,
const OUString& rName,
- sal_Bool bCreateIndex=sal_False ) const;
+ bool bCreateIndex = false ) const;
virtual sal_uInt16 GetFamily( const OUString& rFamily ) const;
virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper(
sal_uInt16 nFamily ) const;
@@ -251,13 +252,13 @@ public:
virtual ::com::sun::star::uno::Reference < ::com::sun::star::style::XAutoStyleFamily >
GetAutoStyles( sal_uInt16 nFamily ) const;
void CopyAutoStylesToDoc();
- void CopyStylesToDoc( sal_Bool bOverwrite, sal_Bool bFinish=sal_True );
- void FinishStyles( sal_Bool bOverwrite );
+ void CopyStylesToDoc( bool bOverwrite, bool bFinish = true );
+ void FinishStyles( bool bOverwrite );
// This method must be called to release the references to all styles
// that are stored in the context.
void Clear();
- sal_Bool IsAutomaticStyle() const;
+ bool IsAutomaticStyle() const;
};
#endif // INCLUDED_XMLOFF_XMLSTYLE_HXX
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 6f6ad44f762e..c934912203d5 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3247,7 +3247,7 @@ namespace xmloff { namespace token {
enum XMLTokenEnum eToken );
/// compare eToken to the string
- XMLOFF_DLLPUBLIC sal_Bool IsXMLToken(
+ XMLOFF_DLLPUBLIC bool IsXMLToken(
const OUString& rString,
enum XMLTokenEnum eToken );
} }
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index 1ea19a756f11..29a5e37b40c6 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -64,7 +64,7 @@ private:
public:
SvXMLTokenEnumerator( const OUString& rString, sal_Unicode cSeparator = sal_Unicode(' ') );
- sal_Bool getNextToken( OUString& rToken );
+ bool getNextToken( OUString& rToken );
};
/** the SvXMLTypeConverter converts values of various types from
@@ -124,13 +124,13 @@ public:
/** convert string to enum using given enum map, if the enum is
not found in the map, this method will return false */
- static sal_Bool convertEnum( sal_uInt16& rEnum,
+ static bool convertEnum( sal_uInt16& rEnum,
const OUString& rValue,
const SvXMLEnumMapEntry *pMap );
/** convert string to enum using given token map, if the enum is
not found in the map, this method will return false */
- static sal_Bool convertEnum( sal_uInt16& rEnum,
+ static bool convertEnum( sal_uInt16& rEnum,
const OUString& rValue,
const SvXMLEnumStringMapEntry *pMap );
@@ -138,7 +138,7 @@ public:
default token. If the enum is not found in the map,
this method will either use the given default or return
false if not default is set */
- static sal_Bool convertEnum( OUStringBuffer& rBuffer,
+ static bool convertEnum( OUStringBuffer& rBuffer,
unsigned int nValue,
const SvXMLEnumMapEntry *pMap,
enum ::xmloff::token::XMLTokenEnum eDefault =
@@ -147,13 +147,13 @@ public:
/** convert double number to string (using ::rtl::math) and DO
convert to export MapUnit using meCoreMeasureUnit/meXMLMeasureUnit */
void convertDouble(OUStringBuffer& rBuffer,
- double fNumber, sal_Bool bWriteUnits) const;
+ double fNumber, bool bWriteUnits) const;
/** convert string to double number (using ::rtl::math) and DO convert. */
- sal_Bool convertDouble(double& rValue, const OUString& rString, sal_Bool bLookForUnits) const;
+ bool convertDouble(double& rValue, const OUString& rString, bool bLookForUnits) const;
/** get the Null Date of the XModel and set it to the UnitConverter */
- sal_Bool setNullDate (
+ bool setNullDate (
const com::sun::star::uno::Reference <com::sun::star::frame::XModel>& xModel);
/** convert double to ISO Date Time String */
@@ -171,15 +171,15 @@ public:
static void convertDateTime( OUStringBuffer& rBuffer,
const double& fDateTime,
const com::sun::star::util::Date& aNullDate,
- sal_Bool bAddTimeIf0AM=sal_False);
+ bool bAddTimeIf0AM = false);
/** convert ISO Date Time String to double */
- static sal_Bool convertDateTime( double& fDateTime,
+ static bool convertDateTime( double& fDateTime,
const OUString& rString,
const com::sun::star::util::Date& aNullDate);
/** convert string to ::basegfx::B3DVector */
- static sal_Bool convertB3DVector( ::basegfx::B3DVector& rVector,
+ static bool convertB3DVector( ::basegfx::B3DVector& rVector,
const OUString& rValue );
/** convert B3DVector to string */
@@ -187,7 +187,7 @@ public:
const ::basegfx::B3DVector& rVector );
/** convert string to Position3D */
- sal_Bool convertPosition3D( com::sun::star::drawing::Position3D& rPosition,
+ bool convertPosition3D( com::sun::star::drawing::Position3D& rPosition,
const OUString& rValue );
/** convert Position3D to string */
@@ -196,10 +196,10 @@ public:
/** convert num-forat and num-letter-sync values to NumberingType */
- sal_Bool convertNumFormat( sal_Int16& rType,
+ bool convertNumFormat( sal_Int16& rType,
const OUString& rNumFormat,
const OUString& rNumLetterSync,
- sal_Bool bNumberNone = sal_False ) const;
+ bool bNumberNone = false ) const;
/** convert NumberingType to num-forat and num-letter-sync values */
void convertNumFormat( OUStringBuffer& rBuffer,
@@ -213,9 +213,9 @@ public:
const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps);
OUString encodeStyleName( const OUString& rName,
- sal_Bool *pEncoded=0 ) const;
+ bool *pEncoded=0 ) const;
/** convert string (hex) to number (sal_uInt32) */
- static sal_Bool convertHex( sal_uInt32& nVal,
+ static bool convertHex( sal_uInt32& nVal,
const OUString& rValue );
/** convert number (sal_uInt32) to string (hex) */
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 3af2d20e60d1..9138c7c73717 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -102,13 +102,13 @@ void OControlStyleContext::FillPropertySet(const Reference< XPropertySet > & rPr
if ((m_nNumberFormat == -1) && !m_sDataStyleName.isEmpty())
{
SvXMLNumFormatContext* pStyle = const_cast< SvXMLNumFormatContext*>(dynamic_cast<const SvXMLNumFormatContext*>(pStyles->FindStyleChildContext(
- XML_STYLE_FAMILY_DATA_STYLE, m_sDataStyleName, sal_False)));
+ XML_STYLE_FAMILY_DATA_STYLE, m_sDataStyleName, false)));
if ( !pStyle )
{
OReportStylesContext* pMyStyles = PTR_CAST(OReportStylesContext,GetOwnImport().GetAutoStyles());
if ( pMyStyles )
pStyle = PTR_CAST(SvXMLNumFormatContext,pMyStyles->
- FindStyleChildContext(XML_STYLE_FAMILY_DATA_STYLE, m_sDataStyleName, sal_True));
+ FindStyleChildContext(XML_STYLE_FAMILY_DATA_STYLE, m_sDataStyleName, true));
else {
OSL_FAIL("not possible to get style");
}
@@ -186,7 +186,7 @@ void OReportStylesContext::EndElement()
if (bAutoStyles)
GetImport().GetTextImport()->SetAutoStyles( this );
else
- GetImport().GetStyles()->CopyStylesToDoc(sal_True);
+ GetImport().GetStyles()->CopyStylesToDoc(true);
}
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 1f2a78ccc69d..4690abce0ed4 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -110,9 +110,10 @@ RptMLMasterStylesContext_Impl::~RptMLMasterStylesContext_Impl()
void RptMLMasterStylesContext_Impl::EndElement()
{
- FinishStyles( sal_True );
+ FinishStyles( true );
m_rImport.FinishStyles();
}
+
/// read a component (file + filter version)
sal_Int32 ReadThroughComponent(
const uno::Reference<XInputStream>& xInputStream,
@@ -973,7 +974,7 @@ XMLShapeImportHelper* ORptFilter::CreateShapeImport()
void ORptFilter::FinishStyles()
{
if( GetStyles() )
- GetStyles()->FinishStyles( sal_True );
+ GetStyles()->FinishStyles( true );
}
OUString ORptFilter::convertFormula(const OUString& _sFormula)
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 56047632c540..acf043d0cb24 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -627,14 +627,14 @@ sal_Int32 XMLTableStyleContext::GetNumberFormat()
if (nNumberFormat < 0 && !sDataStyleName.isEmpty())
{
const SvXMLNumFormatContext* pStyle = static_cast<const SvXMLNumFormatContext*>(
- pStyles->FindStyleChildContext(XML_STYLE_FAMILY_DATA_STYLE, sDataStyleName, sal_True));
+ pStyles->FindStyleChildContext(XML_STYLE_FAMILY_DATA_STYLE, sDataStyleName, true));
if (!pStyle)
{
XMLTableStylesContext* pMyStyles = static_cast<XMLTableStylesContext*>(GetScImport().GetStyles());
if (pMyStyles)
pStyle = static_cast<const SvXMLNumFormatContext*>(
- pMyStyles->FindStyleChildContext(XML_STYLE_FAMILY_DATA_STYLE, sDataStyleName, sal_True));
+ pMyStyles->FindStyleChildContext(XML_STYLE_FAMILY_DATA_STYLE, sDataStyleName, true));
else
{
OSL_FAIL("not possible to get style");
@@ -979,7 +979,7 @@ SvXMLStyleContext *ScXMLMasterStylesContext::CreateStyleStyleChildContext(
void ScXMLMasterStylesContext::EndElement()
{
- FinishStyles(sal_True);
+ FinishStyles(true);
}
TYPEINIT1( ScMasterPageContext, XMLTextMasterPageContext );
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index c1ff10f3fab2..c81f619c9d4e 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -1006,7 +1006,7 @@ void SwXMLImport::InsertStyles( sal_Bool bAuto )
if( bAuto && GetAutoStyles() )
GetAutoStyles()->CopyAutoStylesToDoc();
if( !bAuto && GetStyles() )
- GetStyles()->CopyStylesToDoc( !IsInsertMode(), sal_False );
+ GetStyles()->CopyStylesToDoc( !IsInsertMode(), false );
}
void SwXMLImport::FinishStyles()
@@ -1064,7 +1064,7 @@ bool SwXMLImport::FindAutomaticStyle(
pStyle = PTR_CAST( SwXMLItemSetStyleContext_Impl,
GetAutoStyles()->
FindStyleChildContext( nFamily, rName,
- sal_True ) );
+ true ) );
if( pStyle )
{
if( ppItemSet )
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index f2b9d9329ffa..d3f023785273 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -56,7 +56,7 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily )
return;
OSL_ENSURE( eFamily != XML_TOKEN_INVALID, "family must be specified" );
// style:name="..."
- sal_Bool bEncoded = sal_False;
+ bool bEncoded = false;
AddAttribute( XML_NAMESPACE_STYLE, XML_NAME, EncodeStyleName(
rFmt.GetName(), &bEncoded ) );
if( bEncoded )
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 1ce91e992b13..049950752c7f 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -507,7 +507,7 @@ void SwXMLExport::ExportTableColumnStyle( const SwXMLTableColumn_Impl& rCol )
CheckAttrList();
// style:name="..."
- sal_Bool bEncoded = sal_False;
+ bool bEncoded = false;
AddAttribute( XML_NAMESPACE_STYLE, XML_NAME,
EncodeStyleName( rCol.GetStyleName(), &bEncoded ) );
if( bEncoded )
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index bf1812fdd6d4..837d85298d43 100644
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -79,7 +79,7 @@ void lcl_NumberFormatStyleToProperty( const OUString& rStyleName, const OUString
if( !rStyleName.isEmpty())
{
SvXMLNumFormatContext* pStyle = (SvXMLNumFormatContext *)rStylesContext.FindStyleChildContext(
- XML_STYLE_FAMILY_DATA_STYLE, rStyleName, sal_True );
+ XML_STYLE_FAMILY_DATA_STYLE, rStyleName, true );
if( pStyle )
{
uno::Any aNumberFormat;
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 7f0491951ec0..9f82ac441980 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1996,7 +1996,7 @@ bool SvXMLExport::AddEmbeddedObjectAsBase64( const OUString& rEmbeddedObjectURL
OUString SvXMLExport::EncodeStyleName(
const OUString& rName,
- sal_Bool *pEncoded ) const
+ bool *pEncoded ) const
{
return GetMM100UnitConverter().encodeStyleName( rName, pEncoded );
}
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 4002ae046aa6..c28b8505e7c2 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3278,7 +3278,7 @@ namespace xmloff { namespace token {
}
// does rString represent eToken?
- sal_Bool IsXMLToken(
+ bool IsXMLToken(
const OUString& rString,
enum XMLTokenEnum eToken )
{
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index c1582be61f92..d271df307810 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -178,7 +178,7 @@ void SvXMLUnitConverter::convertMeasureToXML( OUStringBuffer& rString,
/** convert string to enum using given enum map, if the enum is
not found in the map, this method will return false
*/
-sal_Bool SvXMLUnitConverter::convertEnum( sal_uInt16& rEnum,
+bool SvXMLUnitConverter::convertEnum( sal_uInt16& rEnum,
const OUString& rValue,
const SvXMLEnumStringMapEntry *pMap )
{
@@ -187,17 +187,17 @@ sal_Bool SvXMLUnitConverter::convertEnum( sal_uInt16& rEnum,
if( rValue.equalsAsciiL( pMap->pName, pMap->nNameLength ) )
{
rEnum = pMap->nValue;
- return sal_True;
+ return true;
}
++pMap;
}
- return sal_False;
+ return false;
}
/** convert string to enum using given token map, if the enum is
not found in the map, this method will return false */
-sal_Bool SvXMLUnitConverter::convertEnum(
+bool SvXMLUnitConverter::convertEnum(
sal_uInt16& rEnum,
const OUString& rValue,
const SvXMLEnumMapEntry *pMap )
@@ -207,18 +207,18 @@ sal_Bool SvXMLUnitConverter::convertEnum(
if( IsXMLToken( rValue, pMap->eToken ) )
{
rEnum = pMap->nValue;
- return sal_True;
+ return true;
}
++pMap;
}
- return sal_False;
+ return false;
}
/** convert enum to string using given token map with an optional
default token. If the enum is not found in the map,
this method will either use the given default or return
false if no default is set */
-sal_Bool SvXMLUnitConverter::convertEnum(
+bool SvXMLUnitConverter::convertEnum(
OUStringBuffer& rBuffer,
unsigned int nValue,
const SvXMLEnumMapEntry *pMap,
@@ -263,15 +263,15 @@ static sal_Char aHexTab[] = "0123456789abcdef";
/** convert double number to string (using ::rtl::math) */
void SvXMLUnitConverter::convertDouble(OUStringBuffer& rBuffer,
- double fNumber, sal_Bool bWriteUnits) const
+ double fNumber, bool bWriteUnits) const
{
::sax::Converter::convertDouble(rBuffer, fNumber,
bWriteUnits, m_pImpl->m_eCoreMeasureUnit, m_pImpl->m_eXMLMeasureUnit);
}
/** convert string to double number (using ::rtl::math) */
-sal_Bool SvXMLUnitConverter::convertDouble(double& rValue,
- const OUString& rString, sal_Bool bLookForUnits) const
+bool SvXMLUnitConverter::convertDouble(double& rValue,
+ const OUString& rString, bool bLookForUnits) const
{
if(bLookForUnits)
{
@@ -288,7 +288,7 @@ sal_Bool SvXMLUnitConverter::convertDouble(double& rValue,
}
/** get the Null Date of the XModel and set it to the UnitConverter */
-sal_Bool SvXMLUnitConverter::setNullDate(const com::sun::star::uno::Reference <com::sun::star::frame::XModel>& xModel)
+bool SvXMLUnitConverter::setNullDate(const com::sun::star::uno::Reference <com::sun::star::frame::XModel>& xModel)
{
com::sun::star::uno::Reference <com::sun::star::util::XNumberFormatsSupplier> xNumberFormatsSupplier (xModel, com::sun::star::uno::UNO_QUERY);
if (xNumberFormatsSupplier.is())
@@ -296,7 +296,7 @@ sal_Bool SvXMLUnitConverter::setNullDate(const com::sun::star::uno::Reference <c
const com::sun::star::uno::Reference <com::sun::star::beans::XPropertySet> xPropertySet = xNumberFormatsSupplier->getNumberFormatSettings();
return xPropertySet.is() && (xPropertySet->getPropertyValue(OUString(XML_NULLDATE)) >>= m_pImpl->m_aNullDate);
}
- return sal_False;
+ return false;
}
/** convert double to ISO Date Time String */
@@ -317,7 +317,7 @@ bool SvXMLUnitConverter::convertDateTime(double& fDateTime,
void SvXMLUnitConverter::convertDateTime( OUStringBuffer& rBuffer,
const double& fDateTime,
const com::sun::star::util::Date& aTempNullDate,
- sal_Bool bAddTimeIf0AM )
+ bool bAddTimeIf0AM )
{
double fValue = fDateTime;
sal_Int32 nValue = static_cast <sal_Int32> (::rtl::math::approxFloor (fValue));
@@ -422,7 +422,7 @@ void SvXMLUnitConverter::convertDateTime( OUStringBuffer& rBuffer,
}
/** convert ISO Date Time String to double */
-sal_Bool SvXMLUnitConverter::convertDateTime( double& fDateTime,
+bool SvXMLUnitConverter::convertDateTime( double& fDateTime,
const OUString& rString, const com::sun::star::util::Date& aTempNullDate)
{
com::sun::star::util::DateTime aDateTime;
@@ -453,10 +453,10 @@ SvXMLTokenEnumerator::SvXMLTokenEnumerator( const OUString& rString, sal_Unicode
{
}
-sal_Bool SvXMLTokenEnumerator::getNextToken( OUString& rToken )
+bool SvXMLTokenEnumerator::getNextToken( OUString& rToken )
{
if( -1 == mnNextTokenPos )
- return sal_False;
+ return false;
int nTokenEndPos = maTokenString.indexOf( mcSeparator, mnNextTokenPos );
if( nTokenEndPos != -1 )
@@ -476,7 +476,7 @@ sal_Bool SvXMLTokenEnumerator::getNextToken( OUString& rToken )
mnNextTokenPos = -1;
}
- return sal_True;
+ return true;
}
static bool lcl_getPositions(const OUString& _sValue,OUString& _rContentX,OUString& _rContentY,OUString& _rContentZ)
@@ -511,11 +511,11 @@ static bool lcl_getPositions(const OUString& _sValue,OUString& _rContentX,OUStri
}
/** convert string to ::basegfx::B3DVector */
-sal_Bool SvXMLUnitConverter::convertB3DVector( ::basegfx::B3DVector& rVector, const OUString& rValue )
+bool SvXMLUnitConverter::convertB3DVector( ::basegfx::B3DVector& rVector, const OUString& rValue )
{
OUString aContentX,aContentY,aContentZ;
if ( !lcl_getPositions(rValue,aContentX,aContentY,aContentZ) )
- return sal_False;
+ return false;
rtl_math_ConversionStatus eStatus;
@@ -523,13 +523,13 @@ sal_Bool SvXMLUnitConverter::convertB3DVector( ::basegfx::B3DVector& rVector, co
',', &eStatus, NULL));
if( eStatus != rtl_math_ConversionStatus_Ok )
- return sal_False;
+ return false;
rVector.setY(::rtl::math::stringToDouble(aContentY, '.',
',', &eStatus, NULL));
if( eStatus != rtl_math_ConversionStatus_Ok )
- return sal_False;
+ return false;
rVector.setZ(::rtl::math::stringToDouble(aContentZ, '.',
',', &eStatus, NULL));
@@ -551,18 +551,18 @@ void SvXMLUnitConverter::convertB3DVector( OUStringBuffer &rBuffer, const ::base
}
/** convert string to Position3D */
-sal_Bool SvXMLUnitConverter::convertPosition3D( drawing::Position3D& rPosition,
+bool SvXMLUnitConverter::convertPosition3D( drawing::Position3D& rPosition,
const OUString& rValue )
{
OUString aContentX,aContentY,aContentZ;
if ( !lcl_getPositions(rValue,aContentX,aContentY,aContentZ) )
- return sal_False;
+ return false;
- if ( !convertDouble( rPosition.PositionX, aContentX, sal_True ) )
- return sal_False;
- if ( !convertDouble( rPosition.PositionY, aContentY, sal_True ) )
- return sal_False;
- return convertDouble( rPosition.PositionZ, aContentZ, sal_True );
+ if ( !convertDouble( rPosition.PositionX, aContentX, true ) )
+ return false;
+ if ( !convertDouble( rPosition.PositionY, aContentY, true ) )
+ return false;
+ return convertDouble( rPosition.PositionZ, aContentZ, true );
}
/** convert Position3D to string */
@@ -570,21 +570,21 @@ void SvXMLUnitConverter::convertPosition3D( OUStringBuffer &rBuffer,
const drawing::Position3D& rPosition )
{
rBuffer.append( '(' );
- convertDouble( rBuffer, rPosition.PositionX, sal_True );
+ convertDouble( rBuffer, rPosition.PositionX, true );
rBuffer.append( ' ' );
- convertDouble( rBuffer, rPosition.PositionY, sal_True );
+ convertDouble( rBuffer, rPosition.PositionY, true );
rBuffer.append( ' ' );
- convertDouble( rBuffer, rPosition.PositionZ, sal_True );
+ convertDouble( rBuffer, rPosition.PositionZ, true );
rBuffer.append( ')' );
}
-sal_Bool SvXMLUnitConverter::convertNumFormat(
+bool SvXMLUnitConverter::convertNumFormat(
sal_Int16& rType,
const OUString& rNumFmt,
const OUString& rNumLetterSync,
- sal_Bool bNumberNone ) const
+ bool bNumberNone ) const
{
- sal_Bool bRet = sal_True;
+ bool bRet = true;
bool bExt = false;
sal_Int32 nLen = rNumFmt.getLength();
@@ -593,7 +593,7 @@ sal_Bool SvXMLUnitConverter::convertNumFormat(
if( bNumberNone )
rType = NumberingType::NUMBER_NONE;
else
- bRet = sal_False;
+ bRet = false;
}
else if( 1 == nLen )
{
@@ -746,10 +746,10 @@ void SvXMLUnitConverter::convertPropertySet(uno::Reference<beans::XPropertySet>&
OUString SvXMLUnitConverter::encodeStyleName(
const OUString& rName,
- sal_Bool *pEncoded ) const
+ bool *pEncoded ) const
{
if( pEncoded )
- *pEncoded = sal_False;
+ *pEncoded = false;
sal_Int32 nLen = rName.getLength();
OUStringBuffer aBuffer( nLen );
@@ -832,7 +832,7 @@ OUString SvXMLUnitConverter::encodeStyleName(
aHexTab[ c & 0x0f ] ) );
aBuffer.append( '_' );
if( pEncoded )
- *pEncoded = sal_True;
+ *pEncoded = true;
}
}
@@ -841,7 +841,7 @@ OUString SvXMLUnitConverter::encodeStyleName(
{
aBuffer = rName;
if( pEncoded )
- *pEncoded = sal_False;
+ *pEncoded = false;
}
@@ -849,11 +849,11 @@ OUString SvXMLUnitConverter::encodeStyleName(
}
/** convert string (hex) to number (sal_uInt32) */
-sal_Bool SvXMLUnitConverter::convertHex( sal_uInt32& nVal,
+bool SvXMLUnitConverter::convertHex( sal_uInt32& nVal,
const OUString& rValue )
{
if( rValue.getLength() != 8 )
- return sal_False;
+ return false;
nVal = 0;
for ( int i = 0; i < 8; i++ )
@@ -862,7 +862,7 @@ sal_Bool SvXMLUnitConverter::convertHex( sal_uInt32& nVal,
| sal::static_int_cast< sal_uInt32 >( lcl_gethex( rValue[i] ) );
}
- return sal_True;
+ return true;
}
/** convert number (sal_uInt32) to string (hex) */
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index cd6b4581e246..80f35802ba39 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2426,7 +2426,7 @@ void SdXMLExport::_ExportMasterStyles()
Reference < container::XNamed > xNamed(xMasterPage, UNO_QUERY);
if(xNamed.is())
{
- sal_Bool bEncoded = sal_False;
+ bool bEncoded = false;
sMasterPageName = xNamed->getName();
AddAttribute(XML_NAMESPACE_STYLE, XML_NAME,
EncodeStyleName( sMasterPageName, &bEncoded ));
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 78666097ecf1..eaa06d390a7a 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -4137,7 +4137,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean
double fDepth = 0;
if ( aDepthParaPair.First.Value >>= fDepth )
{
- rExport.GetMM100UnitConverter().convertDouble( aStrBuffer, fDepth, sal_True );
+ rExport.GetMM100UnitConverter().convertDouble( aStrBuffer, fDepth, true );
ExportParameter( aStrBuffer, aDepthParaPair.Second );
aStr = aStrBuffer.makeStringAndClear();
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_DEPTH, aStr );
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index ab5cd243b96a..932b43e9c54b 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -323,7 +323,7 @@ void SdXMLGenericPageContext::EndElement()
if( pStyles )
{
const SdXMLNumberFormatImportContext* pSdNumStyle =
- dynamic_cast< const SdXMLNumberFormatImportContext* >( pStyles->FindStyleChildContext( XML_STYLE_FAMILY_DATA_STYLE, aDateTimeFormat, sal_True ) );
+ dynamic_cast< const SdXMLNumberFormatImportContext* >( pStyles->FindStyleChildContext( XML_STYLE_FAMILY_DATA_STYLE, aDateTimeFormat, true ) );
if( pSdNumStyle )
{
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 61b5cf83e2ab..47fd843fd62a 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -224,7 +224,7 @@ void SdXMLDrawingPageStyleContext::Finish( bool bOverwrite )
SdXMLNumberFormatImportContext* pSdNumStyle =
PTR_CAST( SdXMLNumberFormatImportContext,
- GetStyles()->FindStyleChildContext( XML_STYLE_FAMILY_DATA_STYLE, sStyleName, sal_True ) );
+ GetStyles()->FindStyleChildContext( XML_STYLE_FAMILY_DATA_STYLE, sStyleName, true ) );
if( pSdNumStyle )
nStyle = pSdNumStyle->GetDrawKey();
@@ -1601,9 +1601,9 @@ SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext(SvXMLImport& rImport,
}
}
-sal_Bool SdXMLHeaderFooterDeclContext::IsTransient() const
+bool SdXMLHeaderFooterDeclContext::IsTransient() const
{
- return sal_True;
+ return true;
}
void SdXMLHeaderFooterDeclContext::EndElement()
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index 85ea8e19f9a2..7ddd4ec0676c 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -272,7 +272,7 @@ public:
const OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
- virtual sal_Bool IsTransient() const SAL_OVERRIDE;
+ virtual bool IsTransient() const SAL_OVERRIDE;
virtual void EndElement() SAL_OVERRIDE;
virtual void Characters( const OUString& rChars ) SAL_OVERRIDE;
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index efd388fb062c..fa0471f6e4da 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -236,7 +236,7 @@ bool XMLDashStyleExport::exportXML(
OUStringBuffer aOut;
// Name
- sal_Bool bEncoded = sal_False;
+ bool bEncoded = false;
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME,
rExport.EncodeStyleName( rStrName,
&bEncoded ) );
diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx
index 72df20b90af1..de9fda1e593a 100644
--- a/xmloff/source/style/FillStyleContext.cxx
+++ b/xmloff/source/style/FillStyleContext.cxx
@@ -72,9 +72,9 @@ void XMLGradientStyleContext::EndElement()
{}
}
-sal_Bool XMLGradientStyleContext::IsTransient() const
+bool XMLGradientStyleContext::IsTransient() const
{
- return sal_True;
+ return true;
}
TYPEINIT1( XMLHatchStyleContext, SvXMLStyleContext );
@@ -115,9 +115,9 @@ void XMLHatchStyleContext::EndElement()
{}
}
-sal_Bool XMLHatchStyleContext::IsTransient() const
+bool XMLHatchStyleContext::IsTransient() const
{
- return sal_True;
+ return true;
}
TYPEINIT1( XMLBitmapStyleContext, SvXMLStyleContext );
@@ -192,9 +192,9 @@ void XMLBitmapStyleContext::EndElement()
{}
}
-sal_Bool XMLBitmapStyleContext::IsTransient() const
+bool XMLBitmapStyleContext::IsTransient() const
{
- return sal_True;
+ return true;
}
TYPEINIT1( XMLTransGradientStyleContext, SvXMLStyleContext );
@@ -235,9 +235,9 @@ void XMLTransGradientStyleContext::EndElement()
{}
}
-sal_Bool XMLTransGradientStyleContext::IsTransient() const
+bool XMLTransGradientStyleContext::IsTransient() const
{
- return sal_True;
+ return true;
}
TYPEINIT1( XMLMarkerStyleContext, SvXMLStyleContext );
@@ -278,9 +278,9 @@ void XMLMarkerStyleContext::EndElement()
{}
}
-sal_Bool XMLMarkerStyleContext::IsTransient() const
+bool XMLMarkerStyleContext::IsTransient() const
{
- return sal_True;
+ return true;
}
TYPEINIT1( XMLDashStyleContext, SvXMLStyleContext );
@@ -321,9 +321,9 @@ void XMLDashStyleContext::EndElement()
{}
}
-sal_Bool XMLDashStyleContext::IsTransient() const
+bool XMLDashStyleContext::IsTransient() const
{
- return sal_True;
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx
index fc8489a977f7..388561c13f0d 100644
--- a/xmloff/source/style/FillStyleContext.hxx
+++ b/xmloff/source/style/FillStyleContext.hxx
@@ -41,7 +41,7 @@ public:
virtual void EndElement() SAL_OVERRIDE;
- virtual sal_Bool IsTransient() const SAL_OVERRIDE;
+ virtual bool IsTransient() const SAL_OVERRIDE;
};
// draw:hatch context
@@ -61,7 +61,7 @@ public:
virtual void EndElement() SAL_OVERRIDE;
- virtual sal_Bool IsTransient() const SAL_OVERRIDE;
+ virtual bool IsTransient() const SAL_OVERRIDE;
};
// draw:fill-image context
@@ -87,7 +87,7 @@ public:
virtual void EndElement() SAL_OVERRIDE;
- virtual sal_Bool IsTransient() const SAL_OVERRIDE;
+ virtual bool IsTransient() const SAL_OVERRIDE;
};
// draw:transparency context
@@ -107,7 +107,7 @@ public:
virtual void EndElement() SAL_OVERRIDE;
- virtual sal_Bool IsTransient() const SAL_OVERRIDE;
+ virtual bool IsTransient() const SAL_OVERRIDE;
};
// draw:marker context
@@ -127,7 +127,7 @@ public:
virtual void EndElement() SAL_OVERRIDE;
- virtual sal_Bool IsTransient() const SAL_OVERRIDE;
+ virtual bool IsTransient() const SAL_OVERRIDE;
};
// draw:marker context
@@ -147,7 +147,7 @@ public:
virtual void EndElement() SAL_OVERRIDE;
- virtual sal_Bool IsTransient() const SAL_OVERRIDE;
+ virtual bool IsTransient() const SAL_OVERRIDE;
};
#endif // INCLUDED_XMLOFF_SOURCE_STYLE_FILLSTYLECONTEXT_HXX
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index 111b0dba135a..36f0351cedae 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -242,7 +242,7 @@ bool XMLGradientStyleExport::exportXML(
else
{
// Name
- sal_Bool bEncoded = sal_False;
+ bool bEncoded = false;
OUString aStrName( rStrName );
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME,
rExport.EncodeStyleName( aStrName,
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index 589c0e6e8b57..6d1db910ad4e 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -201,7 +201,7 @@ bool XMLHatchStyleExport::exportXML(
else
{
// Name
- sal_Bool bEncoded = sal_False;
+ bool bEncoded = false;
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME,
rExport.EncodeStyleName( rStrName,
&bEncoded ) );
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index 745dc277a2dc..64958bd0be44 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -69,7 +69,7 @@ void XMLImageStyle::ImpExportXML( const OUString& rStrName, const uno::Any& rVal
if( rValue >>= sImageURL )
{
// Name
- sal_Bool bEncoded = sal_False;
+ bool bEncoded = false;
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME,
rExport.EncodeStyleName( rStrName,
&bEncoded ) );
diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx
index acad58b5eb34..a2c138689009 100644
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -164,7 +164,7 @@ void XMLMarkerStyleExport::exportXML(
if(rValue >>= aBezier)
{
// Name
- sal_Bool bEncoded(sal_False);
+ bool bEncoded(false);
OUString aStrName( rStrName );
rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_NAME, rExport.EncodeStyleName( aStrName, &bEncoded ) );
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index 1c66c25824ac..29695320901c 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -243,7 +243,7 @@ sal_Bool XMLTransGradientStyleExport::exportXML(
else
{
// Name
- sal_Bool bEncoded = sal_False;
+ bool bEncoded = false;
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME,
rExport.EncodeStyleName( rStrName,
&bEncoded ) );
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index e19bb47b9b68..5f7dfa87855d 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -383,7 +383,7 @@ bool XMLFontStylesContext::FillProperties( const OUString& rName,
sal_Int32 nPitchIdx,
sal_Int32 nCharsetIdx ) const
{
- const SvXMLStyleContext* pStyle = FindStyleChildContext( XML_STYLE_FAMILY_FONT, rName, sal_True );
+ const SvXMLStyleContext* pStyle = FindStyleChildContext( XML_STYLE_FAMILY_FONT, rName, true );
const XMLFontStyleContextFontFace *pFontStyle = PTR_CAST( XMLFontStyleContextFontFace,pStyle);// use temp var, PTR_CAST is a bad macro, FindStyleChildContext will be called twice
if( pFontStyle )
pFontStyle->FillProperties( rProps, nFamilyNameIdx, nStyleNameIdx,
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index 973d648d9c73..a79f2b6f83a9 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -107,7 +107,7 @@ bool XMLPageExport::exportStyle(
else
{
OUString sName( rStyle->getName() );
- sal_Bool bEncoded = sal_False;
+ bool bEncoded = false;
GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NAME,
GetExport().EncodeStyleName( sName, &bEncoded ) );
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 3b0538de3421..1549564aec99 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -324,7 +324,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite )
}
else
{
- SetValid( sal_False );
+ SetValid( false );
}
}
}
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index e37ba3288c51..3f94f3d819ee 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -109,7 +109,7 @@ bool XMLStyleExport::exportStyle(
sName = *pPrefix;
sName += rStyle->getName();
- sal_Bool bEncoded = sal_False;
+ bool bEncoded = false;
const OUString sEncodedStyleName(GetExport().EncodeStyleName( sName, &bEncoded ));
GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NAME, sEncodedStyleName );
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index a5718fd5921a..cf9637be4c46 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -662,7 +662,7 @@ void SvxXMLNumRuleExport::exportNumberingRule(
// style:name="..."
if( !rName.isEmpty() )
{
- sal_Bool bEncoded = sal_False;
+ bool bEncoded = false;
GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NAME,
GetExport().EncodeStyleName( rName, &bEncoded ) );
if( bEncoded )
@@ -773,7 +773,7 @@ void SvxXMLNumRuleExport::exportOutline()
GetExport().CheckAttrList();
if ( !sOutlineStyleName.isEmpty() )
{
- sal_Bool bEncoded = sal_False;
+ bool bEncoded = false;
GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NAME,
GetExport().EncodeStyleName( sOutlineStyleName,
&bEncoded ) );
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index bdd57891bdb8..8b8e8e89658b 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -425,7 +425,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
{
eType = NumberingType::ARABIC;
GetImport().GetMM100UnitConverter().convertNumFormat(
- eType, sNumFormat, sNumLetterSync, sal_True );
+ eType, sNumFormat, sNumLetterSync, true );
nCount = 15;
}
@@ -1027,7 +1027,7 @@ SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
- sal_Bool bOutl )
+ bool bOutl )
: SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, bOutl ? XML_STYLE_FAMILY_TEXT_OUTLINE : XML_STYLE_FAMILY_TEXT_LIST )
, sIsPhysical( "IsPhysical" )
, sNumberingRules( "NumberingRules" )
@@ -1035,7 +1035,7 @@ SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport,
, sIsContinuousNumbering( "IsContinuousNumbering" )
, pLevelStyles( 0 )
, nLevels( 0 )
-, bConsecutive( sal_False )
+, bConsecutive( false )
, bOutline( bOutl )
{
}
@@ -1134,7 +1134,7 @@ void SvxXMLListStyleContext::FillUnoNumRule(
}
}
-void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite )
+void SvxXMLListStyleContext::CreateAndInsertLate( bool bOverwrite )
{
if( bOutline )
{
@@ -1154,7 +1154,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite )
const OUString& rName = GetDisplayName();
if( rName.isEmpty() )
{
- SetValid( sal_False );
+ SetValid( false );
return;
}
@@ -1162,7 +1162,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite )
GetImport().GetTextImport()->GetNumberingStyles();
if( !rNumStyles.is() )
{
- SetValid( sal_False );
+ SetValid( false );
return;
}
@@ -1221,7 +1221,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite )
}
else
{
- SetValid( sal_False );
+ SetValid( false );
}
SetNew( bNew );
@@ -1236,7 +1236,7 @@ void SvxXMLListStyleContext::CreateAndInsertAuto() const
const OUString& rName = GetName();
if( bOutline || xNumRules.is() || rName.isEmpty() )
{
- ((SvxXMLListStyleContext *)this)->SetValid( sal_False );
+ ((SvxXMLListStyleContext *)this)->SetValid( false );
return;
}
@@ -1270,7 +1270,7 @@ Reference < XIndexReplace > SvxXMLListStyleContext::CreateNumRule(
void SvxXMLListStyleContext::SetDefaultStyle(
const Reference < XIndexReplace > & rNumRule,
sal_Int16 nLevel,
- sal_Bool bOrdered )
+ bool bOrdered )
{
Sequence<beans::PropertyValue> aPropSeq( bOrdered ? 1 : 4 );
beans::PropertyValue *pProps = aPropSeq.getArray();
diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx
index b9478b2a9764..bf3f9f0358f2 100644
--- a/xmloff/source/style/xmlprmap.cxx
+++ b/xmloff/source/style/xmlprmap.cxx
@@ -125,12 +125,12 @@ void XMLPropertySetMapper::AddMapperEntry(
}
// Export a Property
-sal_Bool XMLPropertySetMapper::exportXML(
+bool XMLPropertySetMapper::exportXML(
OUString& rStrExpValue,
const XMLPropertyState& rProperty,
const SvXMLUnitConverter& rUnitConverter ) const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
const XMLPropertyHandler* pHdl = GetPropertyHandler( rProperty.mnIndex );
@@ -143,12 +143,12 @@ sal_Bool XMLPropertySetMapper::exportXML(
}
// Import a Property
-sal_Bool XMLPropertySetMapper::importXML(
+bool XMLPropertySetMapper::importXML(
const OUString& rStrImpValue,
XMLPropertyState& rProperty,
const SvXMLUnitConverter& rUnitConverter ) const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
const XMLPropertyHandler* pHdl = GetPropertyHandler( rProperty.mnIndex );
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 0ad232b35482..c08e744980f3 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -145,13 +145,13 @@ SvXMLStyleContext::SvXMLStyleContext(
SvXMLImport& rImp, sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >&,
- sal_uInt16 nFam, sal_Bool bDefault ) :
+ sal_uInt16 nFam, bool bDefault ) :
SvXMLImportContext( rImp, nPrfx, rLName ),
- mbHidden( sal_False ),
+ mbHidden( false ),
mnHelpId( UCHAR_MAX ),
mnFamily( nFam ),
- mbValid( sal_True ),
- mbNew( sal_True ),
+ mbValid( true ),
+ mbNew( true ),
mbDefaultStyle( bDefault )
{
}
@@ -189,7 +189,7 @@ void SvXMLStyleContext::CreateAndInsert( bool /*bOverwrite*/ )
{
}
-void SvXMLStyleContext::CreateAndInsertLate( sal_Bool /*bOverwrite*/ )
+void SvXMLStyleContext::CreateAndInsertLate( bool /*bOverwrite*/ )
{
}
@@ -197,9 +197,9 @@ void SvXMLStyleContext::Finish( bool /*bOverwrite*/ )
{
}
-sal_Bool SvXMLStyleContext::IsTransient() const
+bool SvXMLStyleContext::IsTransient() const
{
- return sal_False;
+ return false;
}
class SvXMLStyleIndex_Impl
@@ -282,8 +282,8 @@ public:
const SvXMLStyleContext *FindStyleChildContext( sal_uInt16 nFamily,
const OUString& rName,
- sal_Bool bCreateIndex ) const;
- sal_Bool IsAutomaticStyle() const { return bAutomaticStyle; }
+ bool bCreateIndex ) const;
+ bool IsAutomaticStyle() const { return bAutomaticStyle; }
};
SvXMLStylesContext_Impl::SvXMLStylesContext_Impl( bool bAuto ) :
@@ -328,7 +328,7 @@ void SvXMLStylesContext_Impl::Clear()
const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext( sal_uInt16 nFamily,
const OUString& rName,
- sal_Bool bCreateIndex ) const
+ bool bCreateIndex ) const
{
const SvXMLStyleContext *pStyle = 0;
@@ -382,7 +382,7 @@ const SvXMLStyleContext *SvXMLStylesContext::GetStyle( sal_uInt32 i ) const
return mpImpl->GetStyle( i );
}
-sal_Bool SvXMLStylesContext::IsAutomaticStyle() const
+bool SvXMLStylesContext::IsAutomaticStyle() const
{
return mpImpl->IsAutomaticStyle();
}
@@ -436,8 +436,7 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext( sal_uInt16 p_nPr
case XML_TOK_STYLE_DEFAULT_PAGE_LAYOUT:
{
//there is not page family in ODF now, so I specify one for it
- sal_Bool bDefaultStyle = XML_TOK_STYLE_DEFAULT_PAGE_LAYOUT == nToken
- ? sal_True: sal_False;
+ bool bDefaultStyle = XML_TOK_STYLE_DEFAULT_PAGE_LAYOUT == nToken;
pStyle = new PageStyleContext( GetImport(), p_nPrefix,
rLocalName, xAttrList, *this, bDefaultStyle );
}
@@ -448,7 +447,7 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext( sal_uInt16 p_nPr
break;
case XML_TOK_TEXT_OUTLINE:
pStyle = new SvxXMLListStyleContext( GetImport(), p_nPrefix,
- rLocalName, xAttrList, sal_True );
+ rLocalName, xAttrList, true );
break;
case XML_TOK_TEXT_NOTE_CONFIG:
pStyle = new XMLFootnoteConfigurationImportContext(GetImport(),
@@ -785,7 +784,7 @@ OUString SvXMLStylesContext::GetServiceName( sal_uInt16 nFamily ) const
SvXMLStylesContext::SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
- const uno::Reference< xml::sax::XAttributeList > &, sal_Bool bAuto ) :
+ const uno::Reference< xml::sax::XAttributeList > &, bool bAuto ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
msParaStyleServiceName( "com.sun.star.style.ParagraphStyle" ),
msTextStyleServiceName( "com.sun.star.style.CharacterStyle" ),
@@ -852,8 +851,8 @@ void SvXMLStylesContext::CopyAutoStylesToDoc()
}
}
-void SvXMLStylesContext::CopyStylesToDoc( sal_Bool bOverwrite,
- sal_Bool bFinish )
+void SvXMLStylesContext::CopyStylesToDoc( bool bOverwrite,
+ bool bFinish )
{
// pass 1: create text, paragraph and frame styles
sal_uInt32 nCount = GetStyleCount();
@@ -887,7 +886,7 @@ void SvXMLStylesContext::CopyStylesToDoc( sal_Bool bOverwrite,
FinishStyles( bOverwrite );
}
-void SvXMLStylesContext::FinishStyles( sal_Bool bOverwrite )
+void SvXMLStylesContext::FinishStyles( bool bOverwrite )
{
sal_uInt32 nCount = GetStyleCount();
for( sal_uInt32 i=0; i<nCount; i++ )
@@ -904,7 +903,7 @@ void SvXMLStylesContext::FinishStyles( sal_Bool bOverwrite )
const SvXMLStyleContext *SvXMLStylesContext::FindStyleChildContext(
sal_uInt16 nFamily,
const OUString& rName,
- sal_Bool bCreateIndex ) const
+ bool bCreateIndex ) const
{
return mpImpl->FindStyleChildContext( nFamily, rName, bCreateIndex );
}
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index 9cdac0dcd256..1f4f65ee52b0 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -677,7 +677,7 @@ void XMLCellImportContext::EndElement()
// class XMLTableTemplateContext
XMLTableTemplateContext::XMLTableTemplateContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList )
-: SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_TABLE_TEMPLATE_ID, sal_False )
+: SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_TABLE_TEMPLATE_ID, false )
{
}
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 5293dbb8154e..f2484a1fdf6f 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1221,7 +1221,7 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars,
const SvXMLStyleContext* pTempStyle =
((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)->
FindStyleChildContext( nFamily, rStyleName,
- sal_True );
+ true );
pStyle = PTR_CAST( XMLTextStyleContext,pTempStyle);
}
@@ -1430,7 +1430,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
{
const SvXMLStyleContext* pTempStyle =
((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)->
- FindStyleChildContext( nFamily, sStyleName, sal_True );
+ FindStyleChildContext( nFamily, sStyleName, true );
pStyle = PTR_CAST( XMLTextStyleContext,pTempStyle);
}
if( pStyle )
@@ -2117,7 +2117,7 @@ void XMLTextImportHelper::SetRuby(
const SvXMLStyleContext* pTempStyle =
((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)->
FindStyleChildContext( XML_STYLE_FAMILY_TEXT_RUBY,
- rStyleName, sal_True );
+ rStyleName, true );
pStyle = PTR_CAST(XMLPropStyleContext,pTempStyle);
if (NULL != pStyle)
@@ -2351,7 +2351,7 @@ sal_Int32 XMLTextImportHelper::GetDataStyleKey(const OUString& sStyleName,
const SvXMLStyleContext* pStyle =
((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)->
FindStyleChildContext( XML_STYLE_FAMILY_DATA_STYLE,
- sStyleName, sal_True );
+ sStyleName, true );
// get appropriate context
@@ -2387,7 +2387,7 @@ const SvxXMLListStyleContext *XMLTextImportHelper::FindAutoListStyle( const OUSt
const SvXMLStyleContext* pTempStyle =
((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)->
FindStyleChildContext( XML_STYLE_FAMILY_TEXT_LIST, rName,
- sal_True );
+ true );
pStyle = PTR_CAST( SvxXMLListStyleContext ,pTempStyle);
}
@@ -2402,7 +2402,7 @@ XMLPropStyleContext *XMLTextImportHelper::FindAutoFrameStyle( const OUString& rN
const SvXMLStyleContext* pTempStyle =
((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)->
FindStyleChildContext( XML_STYLE_FAMILY_SD_GRAPHICS_ID, rName,
- sal_True );
+ true );
pStyle = PTR_CAST( XMLPropStyleContext ,pTempStyle);
}
@@ -2419,7 +2419,7 @@ XMLPropStyleContext* XMLTextImportHelper::FindSectionStyle(
((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)->
FindStyleChildContext(
XML_STYLE_FAMILY_TEXT_SECTION,
- rName, sal_True );
+ rName, true );
pStyle = PTR_CAST( XMLPropStyleContext,pTempStyle);
}
@@ -2436,7 +2436,7 @@ XMLPropStyleContext* XMLTextImportHelper::FindPageMaster(
((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)->
FindStyleChildContext(
XML_STYLE_FAMILY_PAGE_MASTER,
- rName, sal_True );
+ rName, true );
pStyle = PTR_CAST( XMLPropStyleContext,pTempStyle);
}
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index f252b1e3a32c..7d10978e04c4 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
@@ -512,7 +512,7 @@ XMLTextListsHelper::MakeNumRule(
// Because there is no list style sheet for this style, a default
// format must be set for any level of this num rule.
SvxXMLListStyleContext::SetDefaultStyle( xNumRules, io_rLevel,
- sal_False );
+ false );
}
return xNumRules;