[Libreoffice-commits] core.git: 9 commits - dbaccess/source editeng/source filter/source include/xmloff linguistic/source reportdesign/source sc/source starmath/source svx/source sw/source xmloff/inc xmloff/source
Noel Grandin
noel at peralex.com
Mon Mar 31 03:39:35 PDT 2014
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 8
dbaccess/source/filter/xml/xmlExport.cxx | 62 +-
dbaccess/source/filter/xml/xmlStyleImport.cxx | 6
editeng/source/misc/SvXMLAutoCorrectExport.cxx | 8
filter/source/svg/svgexport.cxx | 64 +-
filter/source/svg/svgfontexport.cxx | 10
filter/source/svg/svgwriter.cxx | 80 +-
include/xmloff/DashStyle.hxx | 4
include/xmloff/GradientStyle.hxx | 4
include/xmloff/HatchStyle.hxx | 4
include/xmloff/ImageStyle.hxx | 8
include/xmloff/MarkerStyle.hxx | 4
include/xmloff/ProgressBarHelper.hxx | 12
include/xmloff/SettingsExportHelper.hxx | 4
include/xmloff/SinglePropertySetInfoCache.hxx | 6
include/xmloff/XMLCharContext.hxx | 2
include/xmloff/XMLEventExport.hxx | 18
include/xmloff/XMLEventsImportContext.hxx | 2
include/xmloff/XMLFontStylesContext.hxx | 2
include/xmloff/XMLPageExport.hxx | 12
include/xmloff/XMLSettingsExportContext.hxx | 4
include/xmloff/XMLShapeStyleContext.hxx | 2
include/xmloff/XMLTextMasterPageContext.hxx | 26
include/xmloff/XMLTextShapeStyleContext.hxx | 10
include/xmloff/formlayerexport.hxx | 2
include/xmloff/i18nmap.hxx | 4
include/xmloff/nmspmap.hxx | 20
include/xmloff/numehelp.hxx | 26
include/xmloff/prstylei.hxx | 4
include/xmloff/shapeexport.hxx | 16
include/xmloff/shapeimport.hxx | 26
include/xmloff/styleexp.hxx | 12
include/xmloff/txtimp.hxx | 42 -
include/xmloff/txtparae.hxx | 170 ++---
include/xmloff/txtstyli.hxx | 20
include/xmloff/uniref.hxx | 12
include/xmloff/xmlaustp.hxx | 8
include/xmloff/xmlcnimp.hxx | 12
include/xmloff/xmlevent.hxx | 2
include/xmloff/xmlexp.hxx | 58 -
include/xmloff/xmlexppr.hxx | 2
include/xmloff/xmlimp.hxx | 18
include/xmloff/xmlimppr.hxx | 8
include/xmloff/xmlnume.hxx | 12
include/xmloff/xmlnumfe.hxx | 36 -
include/xmloff/xmlnumfi.hxx | 42 -
include/xmloff/xmlnumi.hxx | 14
include/xmloff/xmlprmap.hxx | 6
include/xmloff/xmlstyle.hxx | 55 -
include/xmloff/xmltoken.hxx | 2
include/xmloff/xmluconv.hxx | 30 -
linguistic/source/convdicxml.cxx | 6
reportdesign/source/filter/xml/xmlExport.cxx | 78 +-
reportdesign/source/filter/xml/xmlStyleImport.cxx | 6
reportdesign/source/filter/xml/xmlfilter.cxx | 5
sc/source/filter/xml/XMLTableMasterPageExport.cxx | 8
sc/source/filter/xml/xmlexprt.cxx | 2
sc/source/filter/xml/xmlstyle.cxx | 6
sc/source/filter/xml/xmlstyli.cxx | 6
starmath/source/mathmlexport.cxx | 102 +--
svx/source/xml/xmlxtexp.cxx | 4
sw/source/core/swg/SwXMLBlockExport.cxx | 10
sw/source/filter/xml/xmlbrsh.cxx | 4
sw/source/filter/xml/xmlexp.cxx | 4
sw/source/filter/xml/xmlexpit.cxx | 2
sw/source/filter/xml/xmlfmt.cxx | 11
sw/source/filter/xml/xmlfmte.cxx | 12
sw/source/filter/xml/xmlimp.cxx | 4
sw/source/filter/xml/xmltble.cxx | 40 -
sw/source/filter/xml/xmltbli.cxx | 8
sw/source/filter/xml/xmltext.cxx | 2
sw/source/filter/xml/xmltexte.cxx | 14
sw/source/filter/xml/xmltexte.hxx | 2
sw/source/filter/xml/xmltexti.cxx | 16
sw/source/filter/xml/xmltexti.hxx | 17
xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx | 2
xmloff/inc/XMLLineNumberingImportContext.hxx | 2
xmloff/inc/XMLScriptExportHandler.hxx | 2
xmloff/inc/XMLStarBasicExportHandler.hxx | 2
xmloff/inc/txtfldi.hxx | 6
xmloff/inc/txtvfldi.hxx | 2
xmloff/source/chart/PropertyMaps.cxx | 6
xmloff/source/chart/SchXMLExport.cxx | 98 +--
xmloff/source/chart/SchXMLTools.cxx | 10
xmloff/source/chart/XMLChartStyleContext.cxx | 2
xmloff/source/chart/XMLSymbolImageContext.cxx | 2
xmloff/source/core/DomExport.cxx | 4
xmloff/source/core/ProgressBarHelper.cxx | 8
xmloff/source/core/SettingsExportHelper.cxx | 56 -
xmloff/source/core/XMLBase64Export.cxx | 3
xmloff/source/core/nmspmap.cxx | 48 -
xmloff/source/core/xmlcnimp.cxx | 12
xmloff/source/core/xmlexp.cxx | 146 ++--
xmloff/source/core/xmlimp.cxx | 40 -
xmloff/source/core/xmltoken.cxx | 2
xmloff/source/core/xmluconv.cxx | 84 +-
xmloff/source/draw/XMLGraphicsDefaultStyle.cxx | 2
xmloff/source/draw/XMLImageMapExport.cxx | 4
xmloff/source/draw/XMLNumberStyles.cxx | 4
xmloff/source/draw/XMLShapeStyleContext.cxx | 4
xmloff/source/draw/animationexport.cxx | 16
xmloff/source/draw/animexp.cxx | 10
xmloff/source/draw/layerexp.cxx | 8
xmloff/source/draw/sdpropls.cxx | 2
xmloff/source/draw/sdxmlexp.cxx | 42 -
xmloff/source/draw/sdxmlexp_impl.hxx | 4
xmloff/source/draw/shapeexport.cxx | 156 ++---
xmloff/source/draw/shapeimport.cxx | 20
xmloff/source/draw/ximp3dscene.cxx | 14
xmloff/source/draw/ximppage.cxx | 2
xmloff/source/draw/ximpshap.cxx | 6
xmloff/source/draw/ximpstyl.cxx | 6
xmloff/source/draw/ximpstyl.hxx | 2
xmloff/source/forms/elementexport.cxx | 14
xmloff/source/forms/elementimport.cxx | 2
xmloff/source/forms/formlayerexport.cxx | 2
xmloff/source/forms/layerexport.cxx | 2
xmloff/source/forms/officeforms.cxx | 2
xmloff/source/forms/propertyexport.cxx | 6
xmloff/source/meta/MetaExportComponent.cxx | 2
xmloff/source/meta/xmlmetae.cxx | 28
xmloff/source/meta/xmlversion.cxx | 4
xmloff/source/script/XMLEventExport.cxx | 24
xmloff/source/script/XMLEventsImportContext.cxx | 4
xmloff/source/script/XMLScriptExportHandler.cxx | 4
xmloff/source/script/XMLStarBasicExportHandler.cxx | 4
xmloff/source/style/DashStyle.cxx | 12
xmloff/source/style/FillStyleContext.cxx | 24
xmloff/source/style/FillStyleContext.hxx | 12
xmloff/source/style/GradientStyle.cxx | 50 -
xmloff/source/style/HatchStyle.cxx | 51 -
xmloff/source/style/ImageStyle.cxx | 56 -
xmloff/source/style/MarkerStyle.cxx | 20
xmloff/source/style/SinglePropertySetInfoCache.cxx | 2
xmloff/source/style/TransGradientStyle.cxx | 4
xmloff/source/style/XMLBackgroundImageContext.cxx | 2
xmloff/source/style/XMLBackgroundImageExport.cxx | 2
xmloff/source/style/XMLFontAutoStylePool.cxx | 4
xmloff/source/style/XMLFontStylesContext.cxx | 4
xmloff/source/style/XMLFootnoteSeparatorExport.cxx | 2
xmloff/source/style/XMLPageExport.cxx | 24
xmloff/source/style/impastpl.cxx | 2
xmloff/source/style/numehelp.cxx | 60 +-
xmloff/source/style/prstylei.cxx | 6
xmloff/source/style/styleexp.cxx | 20
xmloff/source/style/xmlaustp.cxx | 12
xmloff/source/style/xmlexppr.cxx | 10
xmloff/source/style/xmlimppr.cxx | 22
xmloff/source/style/xmlnume.cxx | 38 -
xmloff/source/style/xmlnumfe.cxx | 276 ++++-----
xmloff/source/style/xmlnumfi.cxx | 210 +++----
xmloff/source/style/xmlnumi.cxx | 21
xmloff/source/style/xmlprmap.cxx | 8
xmloff/source/style/xmlstyle.cxx | 41 -
xmloff/source/style/xmltabe.cxx | 4
xmloff/source/table/XMLTableExport.cxx | 14
xmloff/source/table/XMLTableImport.cxx | 2
xmloff/source/text/XMLAutoTextEventExport.cxx | 4
xmloff/source/text/XMLChangeImportContext.cxx | 4
xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx | 2
xmloff/source/text/XMLIndexMarkExport.cxx | 2
xmloff/source/text/XMLIndexTOCContext.cxx | 5
xmloff/source/text/XMLLineNumberingExport.cxx | 4
xmloff/source/text/XMLLineNumberingImportContext.cxx | 2
xmloff/source/text/XMLRedlineExport.cxx | 28
xmloff/source/text/XMLSectionExport.cxx | 36 -
xmloff/source/text/XMLSectionFootnoteConfigExport.cxx | 2
xmloff/source/text/XMLSectionImportContext.cxx | 6
xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx | 4
xmloff/source/text/XMLTextColumnsExport.cxx | 6
xmloff/source/text/XMLTextListAutoStylePool.cxx | 2
xmloff/source/text/XMLTextMasterPageContext.cxx | 36 -
xmloff/source/text/XMLTextMasterPageExport.cxx | 16
xmloff/source/text/XMLTextShapeStyleContext.cxx | 8
xmloff/source/text/txtdrope.cxx | 2
xmloff/source/text/txtflde.cxx | 60 +-
xmloff/source/text/txtfldi.cxx | 14
xmloff/source/text/txtftne.cxx | 42 -
xmloff/source/text/txtimp.cxx | 66 +-
xmloff/source/text/txtlists.cxx | 2
xmloff/source/text/txtparae.cxx | 298 +++++-----
xmloff/source/text/txtparai.cxx | 90 +--
xmloff/source/text/txtparai.hxx | 2
xmloff/source/text/txtsecte.cxx | 6
xmloff/source/text/txtstyle.cxx | 4
xmloff/source/text/txtstyli.cxx | 18
xmloff/source/text/txtvfldi.cxx | 6
xmloff/source/transform/TransformerBase.cxx | 4
xmloff/source/xforms/xformsexport.cxx | 16
189 files changed, 2056 insertions(+), 2083 deletions(-)
New commits:
commit 0f912872b661a6763dfd5789c0377ca453f7e260
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 31 11:47:05 2014 +0200
xmloff: sal_Bool->bool
Change-Id: Id3d8f4f4ef32280a131907ffa32eb2ad5d6ea2e1
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index 4c5337a..21906d2 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 7c7eef2..b45ed39 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 58071ec..86b9726 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 8a6b276..5f6d52c 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 26f7ff8..aaf6ce7 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 6f6ad44..c934912 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 1ea19a7..29a5e37 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 3af2d20..9138c7c 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 1f2a78c..4690abc 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 5604763..acf043d 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 c1ff10f..c81f619 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 f2b9d93..d3f0237 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 1ce91e9..0499507 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 bf1812f..837d852 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 7f04919..9f82ac4 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 4002ae0..c28b850 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 c1582be..d271df3 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 cd6b458..80f3580 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 7866609..eaa06d3 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 ab5cd24..932b43e 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 61b5cf8..47fd843 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 85ea8e1..7ddd4ec 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 efd388f..fa0471f 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 72df20b..de9fda1 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 fc8489a..388561c 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 111b0db..36f0351 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 589c0e6..6d1db91 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 745dc27..64958bd 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 acad58b..a2c1386 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 1c66c25..2969532 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 e19bb47..5f7dfa8 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 973d648..a79f2b6 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 3b0538d..1549564 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 e37ba32..3f94f3d 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 a5718fd..cf9637b 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 bdd5789..8b8e8e8 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 b9478b2..bf3f9f0 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 0ad232b..c08e744 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 9cdac0d..1f4f65e 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 5293dbb..f2484a1 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 f252b1e..7d10978 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;
commit 0e8ab0fa298ad5c801aa94fb3e3fd2daa93d634c
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 31 09:05:32 2014 +0200
xmloff: sal_Bool->bool
Change-Id: Ib4a73215187923dccd72fc7793ffd4bcbef24ab9
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 4368b5d..d4a7480 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -146,7 +146,7 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper6<
protected:
::com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > mxStatusIndicator;
- sal_Bool mbIsFormsSupported;
+ bool mbIsFormsSupported;
bool mbIsTableShapeSupported;
bool mbIsGraphicLoadOnDemandSupported;
@@ -159,7 +159,7 @@ protected:
virtual XMLTextImportHelper* CreateTextImport();
inline void ClearTextImport() { mxTextImport = 0; }
virtual XMLShapeImportHelper* CreateShapeImport();
- inline sal_Bool HasShapeImport() const { return mxShapeImport.is(); }
+ inline bool HasShapeImport() const { return mxShapeImport.is(); }
inline void ClearShapeImport() { mxShapeImport = 0; }
virtual SchXMLImportHelper* CreateChartImport();
@@ -170,7 +170,7 @@ protected:
void SetAutoStyles( SvXMLStylesContext *pAutoStyles );
void SetMasterStyles( SvXMLStylesContext *pMasterStyles );
- sal_Bool IsODFVersionConsistent( const OUString& aODFVersion );
+ bool IsODFVersionConsistent( const OUString& aODFVersion );
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedObjectResolver >& GetEmbeddedResolver() const { return mxEmbeddedResolver; }
inline void SetEmbeddedResolver( com::sun::star::uno::Reference< com::sun::star::document::XEmbeddedObjectResolver >& _xEmbeddedResolver );
@@ -257,7 +257,7 @@ public:
// get import helper for text
inline UniReference< XMLTextImportHelper > GetTextImport();
- sal_Bool HasTextImport() const { return mxTextImport.is(); }
+ bool HasTextImport() const { return mxTextImport.is(); }
inline SvXMLNumFmtHelper* GetDataStylesImport();
// get import helper for shapes
@@ -297,13 +297,13 @@ public:
// Convert a local packe URL into either a graphic manager or a
// internal package URL. The later one happens only if bLoadURL is true
- OUString ResolveGraphicObjectURL( const OUString& rURL, sal_Bool bLoadOnDemand );
+ OUString ResolveGraphicObjectURL( const OUString& rURL, bool bLoadOnDemand );
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
GetStreamForGraphicObjectURLFromBase64();
OUString ResolveGraphicObjectURLFromBase64(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOut );
- sal_Bool IsPackageURL( const OUString& rURL ) const;
+ bool IsPackageURL( const OUString& rURL ) const;
OUString ResolveEmbeddedObjectURL( const OUString& rURL,
const OUString& rClassId );
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
@@ -337,7 +337,7 @@ public:
const SvXMLStylesContext *GetAutoStyles() const;
sal_uInt16 getImportFlags() const { return mnImportFlags; }
- sal_Bool IsFormsSupported() const { return mbIsFormsSupported; }
+ bool IsFormsSupported() const { return mbIsFormsSupported; }
OUString GetAbsoluteReference(const OUString& rValue) const;
sal_Unicode ConvStarBatsCharToStarSymbol( sal_Unicode c );
@@ -384,9 +384,9 @@ public:
GetComponentContext() const;
// Convert drawing object positions from OOo file format to OASIS file format and vice versa (#i28749#)
- sal_Bool IsShapePositionInHoriL2R() const;
+ bool IsShapePositionInHoriL2R() const;
- sal_Bool IsTextDocInOOoFileFormat() const;
+ bool IsTextDocInOOoFileFormat() const;
OUString GetBaseURL() const;
OUString GetDocumentBase() const;
diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx
index 8a93281..bf493b2 100644
--- a/include/xmloff/xmlimppr.hxx
+++ b/include/xmloff/xmlimppr.hxx
@@ -110,7 +110,7 @@ public:
::com::sun::star::beans::XPropertySet > rPropSet,
_ContextID_Index_Pair* pSpecialContextIds ) const;
- sal_Bool FillPropertySet(
+ bool FillPropertySet(
const ::std::vector< XMLPropertyState >& aProperties,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > rPropSet,
@@ -128,7 +128,7 @@ public:
/** implementation helper for FillPropertySet: fill an XPropertySet.
* Exceptions will be asserted. */
- static sal_Bool _FillPropertySet(
+ static bool _FillPropertySet(
const ::std::vector<XMLPropertyState> & rProperties,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & rPropSet,
@@ -143,7 +143,7 @@ public:
/** implementation helper for FillPropertySet: fill an XMultiPropertySet.
* If unsuccessul, set return value. */
- static sal_Bool _FillMultiPropertySet(
+ static bool _FillMultiPropertySet(
const ::std::vector<XMLPropertyState> & rProperties,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XMultiPropertySet> & rMultiPropSet,
@@ -157,7 +157,7 @@ public:
/** implementation helper for FillPropertySet: fill an XTolerantMultiPropertySet.
* If unsuccessul, set return value. */
- static sal_Bool _FillTolerantMultiPropertySet(
+ static bool _FillTolerantMultiPropertySet(
const ::std::vector<XMLPropertyState> & rProperties,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XTolerantMultiPropertySet> & rTolPropSet,
diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx
index 31e858c..f98c7b9 100644
--- a/include/xmloff/xmlnume.hxx
+++ b/include/xmloff/xmlnume.hxx
@@ -54,13 +54,13 @@ class SvxXMLNumRuleExport
void exportLevelStyles(
const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexReplace > & xNumRule,
- sal_Bool bOutline=sal_False );
+ bool bOutline=false );
void exportLevelStyle(
sal_Int32 nLevel,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue>& rProps,
- sal_Bool bOutline=sal_False );
+ bool bOutline=false );
protected:
@@ -68,7 +68,7 @@ protected:
// element.
virtual void AddListStyleAttributes();
- sal_Bool exportStyle( const ::com::sun::star::uno::Reference<
+ bool exportStyle( const ::com::sun::star::uno::Reference<
::com::sun::star::style::XStyle >& rStyle );
void exportOutline();
@@ -79,11 +79,11 @@ public:
SvxXMLNumRuleExport( SvXMLExport& rExport );
virtual ~SvxXMLNumRuleExport();
- void exportStyles( sal_Bool bUsed,
+ void exportStyles( bool bUsed,
XMLTextListAutoStylePool *pPool,
- sal_Bool bExportChapterNumbering = sal_True );
+ bool bExportChapterNumbering = true );
void exportNumberingRule(
- const OUString& rName, sal_Bool bIsHidden,
+ const OUString& rName, bool bIsHidden,
const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexReplace > & xNumRule );
};
diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index e047de3..86f4351 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -52,8 +52,8 @@ private:
LocaleDataWrapper* pLocaleData;
SAL_DLLPRIVATE void AddCalendarAttr_Impl( const OUString& rCalendar );
- SAL_DLLPRIVATE void AddStyleAttr_Impl( sal_Bool bLong );
- SAL_DLLPRIVATE void AddTextualAttr_Impl( sal_Bool bText );
+ SAL_DLLPRIVATE void AddStyleAttr_Impl( bool bLong );
+ SAL_DLLPRIVATE void AddTextualAttr_Impl( bool bText );
SAL_DLLPRIVATE void AddLanguageAttr_Impl( sal_Int32 nLang );
SAL_DLLPRIVATE void AddToTextElement_Impl( const OUString& rString );
@@ -61,36 +61,36 @@ private:
SAL_DLLPRIVATE void WriteColorElement_Impl( const Color& rColor );
SAL_DLLPRIVATE void WriteNumberElement_Impl( sal_Int32 nDecimals, sal_Int32 nInteger,
- const OUString& rDashStr, sal_Bool bVarDecimals,
- sal_Bool bGrouping, sal_Int32 nTrailingThousands,
+ const OUString& rDashStr, bool bVarDecimals,
+ bool bGrouping, sal_Int32 nTrailingThousands,
const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries );
SAL_DLLPRIVATE void WriteScientificElement_Impl( sal_Int32 nDecimals, sal_Int32 nInteger,
- sal_Bool bGrouping, sal_Int32 nExp );
- SAL_DLLPRIVATE void WriteFractionElement_Impl( sal_Int32 nInteger, sal_Bool bGrouping,
+ bool bGrouping, sal_Int32 nExp );
+ SAL_DLLPRIVATE void WriteFractionElement_Impl( sal_Int32 nInteger, bool bGrouping,
sal_Int32 nNumeratorDigits, sal_Int32 nDenominatorDigits, sal_Int32 nDenominator );
SAL_DLLPRIVATE void WriteCurrencyElement_Impl( const OUString& rString,
const OUString& rExt );
SAL_DLLPRIVATE void WriteBooleanElement_Impl();
SAL_DLLPRIVATE void WriteTextContentElement_Impl();
- SAL_DLLPRIVATE void WriteDayElement_Impl( const OUString& rCalendar, sal_Bool bLong );
- SAL_DLLPRIVATE void WriteMonthElement_Impl( const OUString& rCalendar, sal_Bool bLong, sal_Bool bText );
- SAL_DLLPRIVATE void WriteYearElement_Impl( const OUString& rCalendar, sal_Bool bLong );
- SAL_DLLPRIVATE void WriteEraElement_Impl( const OUString& rCalendar, sal_Bool bLong );
- SAL_DLLPRIVATE void WriteDayOfWeekElement_Impl( const OUString& rCalendar, sal_Bool bLong );
+ SAL_DLLPRIVATE void WriteDayElement_Impl( const OUString& rCalendar, bool bLong );
+ SAL_DLLPRIVATE void WriteMonthElement_Impl( const OUString& rCalendar, bool bLong, bool bText );
+ SAL_DLLPRIVATE void WriteYearElement_Impl( const OUString& rCalendar, bool bLong );
+ SAL_DLLPRIVATE void WriteEraElement_Impl( const OUString& rCalendar, bool bLong );
+ SAL_DLLPRIVATE void WriteDayOfWeekElement_Impl( const OUString& rCalendar, bool bLong );
SAL_DLLPRIVATE void WriteWeekElement_Impl( const OUString& rCalendar );
- SAL_DLLPRIVATE void WriteQuarterElement_Impl( const OUString& rCalendar, sal_Bool bLong );
- SAL_DLLPRIVATE void WriteHoursElement_Impl( sal_Bool bLong );
- SAL_DLLPRIVATE void WriteMinutesElement_Impl( sal_Bool bLong );
- SAL_DLLPRIVATE void WriteSecondsElement_Impl( sal_Bool bLong, sal_uInt16 nDecimals );
+ SAL_DLLPRIVATE void WriteQuarterElement_Impl( const OUString& rCalendar, bool bLong );
+ SAL_DLLPRIVATE void WriteHoursElement_Impl( bool bLong );
+ SAL_DLLPRIVATE void WriteMinutesElement_Impl( bool bLong );
+ SAL_DLLPRIVATE void WriteSecondsElement_Impl( bool bLong, sal_uInt16 nDecimals );
SAL_DLLPRIVATE void WriteAMPMElement_Impl();
SAL_DLLPRIVATE void WriteMapElement_Impl( sal_Int32 nOp, double fLimit,
sal_Int32 nKey, sal_Int32 nPart );
SAL_DLLPRIVATE void WriteRepeatedElement_Impl( sal_Unicode ch );
- SAL_DLLPRIVATE sal_Bool WriteTextWithCurrency_Impl( const OUString& rString,
+ SAL_DLLPRIVATE bool WriteTextWithCurrency_Impl( const OUString& rString,
const ::com::sun::star::lang::Locale& rLocale );
SAL_DLLPRIVATE void ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt32 nKey,
- sal_uInt16 nPart, sal_Bool bDefPart );
+ sal_uInt16 nPart, bool bDefPart );
SAL_DLLPRIVATE void ExportFormat_Impl( const SvNumberformat& rFormat, sal_uInt32 nKey );
@@ -106,7 +106,7 @@ public:
virtual ~SvXMLNumFmtExport();
// core API
- void Export( sal_Bool bIsAutoStyle);
+ void Export( bool bIsAutoStyle);
// mark number format as used
void SetUsed( sal_uInt32 nKey );
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index aabba99..201c402 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -108,7 +108,7 @@ public:
SvXMLDateElementAttributes eDay, SvXMLDateElementAttributes eMonth,
SvXMLDateElementAttributes eYear, SvXMLDateElementAttributes eHours,
SvXMLDateElementAttributes eMins, SvXMLDateElementAttributes eSecs,
- sal_Bool bSystem );
+ bool bSystem );
};
struct MyCondition
@@ -129,20 +129,20 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext
// OUString sMapName;
OUString sCalendar;
OUString sFormatString;
- LanguageType nFormatLang;
+ LanguageType nFormatLang;
com::sun::star::lang::Locale aLocale;
- sal_Bool bAutoOrder;
- sal_Bool bFromSystem;
- sal_Bool bTruncate;
- sal_Bool bAutoDec; // set in AddNumber
- sal_Bool bAutoInt; // set in AddNumber
- sal_Bool bHasExtraText;
+ bool bAutoOrder;
+ bool bFromSystem;
+ bool bTruncate;
+ bool bAutoDec; // set in AddNumber
+ bool bAutoInt; // set in AddNumber
+ bool bHasExtraText;
OUStringBuffer aFormatCode;
OUStringBuffer aConditions;
- sal_Bool bHasLongDoW;
- sal_Bool bHasEra;
- sal_Bool bHasDateTime;
- sal_Bool bRemoveAfterUse;
+ bool bHasLongDoW;
+ bool bHasEra;
+ bool bHasDateTime;
+ bool bRemoveAfterUse;
// contained date elements, used to recognize default date formats
SvXMLDateElementAttributes eDateDOW;
@@ -152,7 +152,7 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext
SvXMLDateElementAttributes eDateHours;
SvXMLDateElementAttributes eDateMins;
SvXMLDateElementAttributes eDateSecs;
- sal_Bool bDateNoDefault;
+ bool bDateNoDefault;
SAL_DLLPRIVATE sal_Int32 PrivateGetKey();
@@ -184,11 +184,11 @@ public:
sal_Int32 CreateAndInsert( com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >& xFormatsSupplier );
sal_uInt16 GetType() const { return nType; } // SvXMLStylesTokens
- sal_Bool IsFromSystem() const { return bFromSystem; }
- sal_Bool HasLongDoW() const { return bHasLongDoW; }
- void SetHasLongDoW(sal_Bool bSet) { bHasLongDoW = bSet; }
- sal_Bool HasEra() const { return bHasEra; }
- void SetHasEra(sal_Bool bSet) { bHasEra = bSet; }
+ bool IsFromSystem() const { return bFromSystem; }
+ bool HasLongDoW() const { return bHasLongDoW; }
+ void SetHasLongDoW(bool bSet) { bHasLongDoW = bSet; }
+ bool HasEra() const { return bHasEra; }
+ void SetHasEra(bool bSet) { bHasEra = bSet; }
void UpdateCalendar( const OUString& rNewCalendar );
@@ -200,13 +200,13 @@ public:
void AddCurrency( const OUString& rContent, LanguageType nLang );
void AddNfKeyword( sal_uInt16 nIndex );
- sal_Bool ReplaceNfKeyword( sal_uInt16 nOld, sal_uInt16 nNew );
+ bool ReplaceNfKeyword( sal_uInt16 nOld, sal_uInt16 nNew );
void AddCondition( const sal_Int32 nIndex );
void AddCondition( const OUString& rCondition, const OUString& rApplyName );
void AddColor( sal_uInt32 const nColor );
/// determine whether number format uses the system language
- sal_Bool IsSystemLanguage();
+ bool IsSystemLanguage();
};
#endif
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index 11696dc..f161d366 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -87,7 +87,7 @@ void SwXMLBrushItemImportContext::ProcessAttrs(
{
case XML_TOK_BGIMG_HREF:
SvXMLImportItemMapper::PutXMLValue(
- *pItem, GetImport().ResolveGraphicObjectURL( rValue,sal_False),
+ *pItem, GetImport().ResolveGraphicObjectURL( rValue, false),
MID_GRAPHIC_LINK, rUnitConv );
break;
case XML_TOK_BGIMG_TYPE:
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index 4359a81..38f3126 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -628,7 +628,7 @@ bool XMLChartImportPropertyMapper::handleSpecialItem(
// deprecated from 6.0 beta on
case XML_SCH_CONTEXT_SPECIAL_SYMBOL_IMAGE_NAME:
- rProperty.maValue <<= mrImport.ResolveGraphicObjectURL( rValue, sal_False );
+ rProperty.maValue <<= mrImport.ResolveGraphicObjectURL( rValue, false );
break;
case XML_SCH_CONTEXT_SPECIAL_REGRESSION_TYPE:
diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx
index 4c7f792..a1feba2 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.cxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.cxx
@@ -121,7 +121,7 @@ void XMLSymbolImageContext::EndElement()
if( !msURL.isEmpty() )
{
- sResolvedURL = GetImport().ResolveGraphicObjectURL( msURL, sal_False );
+ sResolvedURL = GetImport().ResolveGraphicObjectURL( msURL, false );
}
else if( mxBase64Stream.is() )
{
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index da03b18..7f04919 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1882,13 +1882,13 @@ void SvXMLExport::addDataStyle(const sal_Int32 nNumberFormat, bool /*bTimeFormat
void SvXMLExport::exportDataStyles()
{
if(mpNumExport)
- mpNumExport->Export(sal_False);
+ mpNumExport->Export(false);
}
void SvXMLExport::exportAutoDataStyles()
{
if(mpNumExport)
- mpNumExport->Export(sal_True);
+ mpNumExport->Export(true);
if (mxFormExport.is())
mxFormExport->exportAutoControlNumberStyles();
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 95742c4..9116b34 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -288,8 +288,8 @@ public:
// Boolean, indicating that position attributes
// of shapes are given in horizontal left-to-right layout. This is the case
// for the OpenOffice.org file format. (#i28749#)
- sal_Bool mbShapePositionInHoriL2R;
- sal_Bool mbTextDocInOOoFileFormat;
+ bool mbShapePositionInHoriL2R;
+ bool mbTextDocInOOoFileFormat;
const uno::Reference< uno::XComponentContext > mxComponentContext;
OUString implementationName;
@@ -308,8 +308,8 @@ public:
, mbOwnEmbeddedResolver( false )
, mbIsOOoXML(false)
// Convert drawing object positions from OOo file format to OASIS (#i28749#)
- , mbShapePositionInHoriL2R( sal_False )
- , mbTextDocInOOoFileFormat( sal_False )
+ , mbShapePositionInHoriL2R( false )
+ , mbTextDocInOOoFileFormat( false )
, mxComponentContext( rxContext )
, implementationName(theImplementationName)
, mpRDFaHelper() // lazy
@@ -425,7 +425,7 @@ SvXMLImport::SvXMLImport(
mpStyleMap(0),
mnImportFlags( nImportFlags ),
mnErrorFlags(0),
- mbIsFormsSupported( sal_True ),
+ mbIsFormsSupported( true ),
mbIsTableShapeSupported( false ),
mbIsGraphicLoadOnDemandSupported( true )
{
@@ -1176,28 +1176,28 @@ const Reference< container::XNameContainer > & SvXMLImport::GetDashHelper()
return mxDashHelper;
}
-sal_Bool SvXMLImport::IsPackageURL( const OUString& rURL ) const
+bool SvXMLImport::IsPackageURL( const OUString& rURL ) const
{
// if, and only if, only parts are imported, then we're in a package
const sal_uInt32 nTest = IMPORT_META|IMPORT_STYLES|IMPORT_CONTENT|IMPORT_SETTINGS;
if( (mnImportFlags & nTest) == nTest )
- return sal_False;
+ return false;
// Some quick tests: Some may rely on the package structure!
sal_Int32 nLen = rURL.getLength();
if( (nLen > 0 && '/' == rURL[0]) )
// RFC2396 net_path or abs_path
- return sal_False;
+ return false;
else if( nLen > 1 && '.' == rURL[0] )
{
if( '.' == rURL[1] )
// ../: We are never going up one level, so we know
// it's not an external URI
- return sal_False;
+ return false;
else if( '/' == rURL[1] )
// we are remaining on a level, so it's an package URI
- return sal_True;
+ return true;
}
// Now check for a RFC2396 schema
@@ -1208,10 +1208,10 @@ sal_Bool SvXMLImport::IsPackageURL( const OUString& rURL ) const
{
case '/':
// a relative path segement
- return sal_True;
+ return true;
case ':':
// a schema
- return sal_False;
+ return false;
default:
break;
// we don't care about any other characters
@@ -1219,11 +1219,11 @@ sal_Bool SvXMLImport::IsPackageURL( const OUString& rURL ) const
++nPos;
}
- return sal_True;
+ return true;
}
OUString SvXMLImport::ResolveGraphicObjectURL( const OUString& rURL,
- sal_Bool bLoadOnDemand )
+ bool bLoadOnDemand )
{
OUString sRet;
@@ -1582,10 +1582,10 @@ OUString SvXMLImport::GetAbsoluteReference(const OUString& rValue) const
return rValue;
}
-sal_Bool SvXMLImport::IsODFVersionConsistent( const OUString& aODFVersion )
+bool SvXMLImport::IsODFVersionConsistent( const OUString& aODFVersion )
{
// the check returns sal_False only if the storage version could be retrieved
- sal_Bool bResult = sal_True;
+ bool bResult = true;
if ( !aODFVersion.isEmpty() && aODFVersion.compareTo( ODFVER_012_TEXT ) >= 0 )
{
@@ -1798,12 +1798,12 @@ OUString SvXMLImport::GetStreamName() const
}
// Convert drawing object positions from OOo file format to OASIS (#i28749#)
-sal_Bool SvXMLImport::IsShapePositionInHoriL2R() const
+bool SvXMLImport::IsShapePositionInHoriL2R() const
{
return mpImpl->mbShapePositionInHoriL2R;
}
-sal_Bool SvXMLImport::IsTextDocInOOoFileFormat() const
+bool SvXMLImport::IsTextDocInOOoFileFormat() const
{
return mpImpl->mbTextDocInOOoFileFormat;
}
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index a41a10c..df6b191 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -783,7 +783,7 @@ void SdXMLShapeContext::SetThumbnail()
// load the thumbnail graphic and export it to a wmf stream so we can set
// it at the api
- const OUString aInternalURL( GetImport().ResolveGraphicObjectURL( maThumbnailURL, sal_False ) );
+ const OUString aInternalURL( GetImport().ResolveGraphicObjectURL( maThumbnailURL, false ) );
xPropSet->setPropertyValue( sProperty, uno::makeAny( aInternalURL ) );
}
}
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 8cbfeae..dfc3195 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1301,7 +1301,7 @@ namespace xmloff
// we don't want say form url targets to be resolved
// using ResolveGraphicObjectURL
if ( _rLocalName.equalsAscii( s_pImageDataAttributeName ) )
- sAdjustedValue = m_rContext.getGlobalContext().ResolveGraphicObjectURL( _rValue, sal_False );
+ sAdjustedValue = m_rContext.getGlobalContext().ResolveGraphicObjectURL( _rValue, false );
else
sAdjustedValue = m_rContext.getGlobalContext().GetAbsoluteReference( _rValue );
return OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, sAdjustedValue );
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index 7e213f7..dce6f3d 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -252,7 +252,7 @@ namespace xmloff
void OFormLayerXMLExport_Impl::exportAutoControlNumberStyles()
{
if ( m_pControlNumberStyles )
- m_pControlNumberStyles->Export( sal_True );
+ m_pControlNumberStyles->Export( true );
}
void OFormLayerXMLExport_Impl::exportAutoStyles()
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index 5e355ff..745dc27 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -149,7 +149,7 @@ bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttributeList
break;
case XML_TOK_IMAGE_URL:
{
- aStrURL = rImport.ResolveGraphicObjectURL( rStrValue, sal_False );
+ aStrURL = rImport.ResolveGraphicObjectURL( rStrValue, false );
bHasHRef = true;
}
break;
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx
index eb511f2..daf86f1 100644
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -376,7 +376,7 @@ void XMLBackgroundImageContext::EndElement()
{
if( !sURL.isEmpty() )
{
- sURL = GetImport().ResolveGraphicObjectURL( sURL, sal_False );
+ sURL = GetImport().ResolveGraphicObjectURL( sURL, false );
}
else if( xBase64Stream.is() )
{
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 33ca7e3..6a284dc 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -407,12 +407,12 @@ void SvXMLImportPropertyMapper::CheckSpecialContext(
}
-sal_Bool SvXMLImportPropertyMapper::FillPropertySet(
+bool SvXMLImportPropertyMapper::FillPropertySet(
const vector< XMLPropertyState >& aProperties,
const Reference< XPropertySet > rPropSet,
_ContextID_Index_Pair* pSpecialContextIds ) const
{
- sal_Bool bSet = sal_False;
+ bool bSet = false;
Reference< XTolerantMultiPropertySet > xTolPropSet( rPropSet, UNO_QUERY );
if (xTolPropSet.is())
@@ -446,7 +446,7 @@ sal_Bool SvXMLImportPropertyMapper::FillPropertySet(
return bSet;
}
-sal_Bool SvXMLImportPropertyMapper::_FillPropertySet(
+bool SvXMLImportPropertyMapper::_FillPropertySet(
const vector<XMLPropertyState> & rProperties,
const Reference<XPropertySet> & rPropSet,
const Reference<XPropertySetInfo> & rPropSetInfo,
@@ -458,7 +458,7 @@ sal_Bool SvXMLImportPropertyMapper::_FillPropertySet(
OSL_ENSURE( rPropSetInfo.is(), "need an XPropertySetInfo" );
// preliminaries
- sal_Bool bSet = sal_False;
+ bool bSet = false;
sal_Int32 nCount = rProperties.size();
// iterate over property states that we want to set
@@ -482,7 +482,7 @@ sal_Bool SvXMLImportPropertyMapper::_FillPropertySet(
try
{
rPropSet->setPropertyValue( rPropName, rProp.maValue );
- bSet = sal_True;
+ bSet = true;
}
catch ( const IllegalArgumentException& e )
{
@@ -647,7 +647,7 @@ void SvXMLImportPropertyMapper::_PrepareForMultiPropertySet(
}
}
-sal_Bool SvXMLImportPropertyMapper::_FillMultiPropertySet(
+bool SvXMLImportPropertyMapper::_FillMultiPropertySet(
const vector<XMLPropertyState> & rProperties,
const Reference<XMultiPropertySet> & rMultiPropSet,
const Reference<XPropertySetInfo> & rPropSetInfo,
@@ -657,7 +657,7 @@ sal_Bool SvXMLImportPropertyMapper::_FillMultiPropertySet(
OSL_ENSURE( rMultiPropSet.is(), "Need multi property set. ");
OSL_ENSURE( rPropSetInfo.is(), "Need property set info." );
- sal_Bool bSuccessful = sal_False;
+ bool bSuccessful = false;
Sequence<OUString> aNames;
Sequence<Any> aValues;
@@ -669,7 +669,7 @@ sal_Bool SvXMLImportPropertyMapper::_FillMultiPropertySet(
try
{
rMultiPropSet->setPropertyValues( aNames, aValues );
- bSuccessful = sal_True;
+ bSuccessful = true;
}
catch ( ... )
{
@@ -679,7 +679,7 @@ sal_Bool SvXMLImportPropertyMapper::_FillMultiPropertySet(
return bSuccessful;
}
-sal_Bool SvXMLImportPropertyMapper::_FillTolerantMultiPropertySet(
+bool SvXMLImportPropertyMapper::_FillTolerantMultiPropertySet(
const vector<XMLPropertyState> & rProperties,
const Reference<XTolerantMultiPropertySet> & rTolMultiPropSet,
const UniReference<XMLPropertySetMapper> & rPropMapper,
@@ -688,7 +688,7 @@ sal_Bool SvXMLImportPropertyMapper::_FillTolerantMultiPropertySet(
{
OSL_ENSURE( rTolMultiPropSet.is(), "Need tolerant multi property set. ");
- sal_Bool bSuccessful = sal_False;
+ bool bSuccessful = false;
Sequence<OUString> aNames;
Sequence<Any> aValues;
@@ -701,7 +701,7 @@ sal_Bool SvXMLImportPropertyMapper::_FillTolerantMultiPropertySet(
{
Sequence< SetPropertyTolerantFailed > aResults(rTolMultiPropSet->setPropertyValuesTolerant( aNames, aValues ));
if (aResults.getLength() == 0)
- bSuccessful = sal_True;
+ bSuccessful = true;
else
{
sal_Int32 nCount(aResults.getLength());
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index b3f21ec..a5718fd 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -60,7 +60,7 @@ using namespace ::com::sun::star::beans;
using namespace ::xmloff::token;
void SvxXMLNumRuleExport::exportLevelStyles( const uno::Reference< ::com::sun::star::container::XIndexReplace > & xNumRule,
- sal_Bool bOutline )
+ bool bOutline )
{
sal_Int32 nCount = xNumRule ->getCount();
for( sal_Int32 i=0; i<nCount; i++ )
@@ -76,7 +76,7 @@ void SvxXMLNumRuleExport::exportLevelStyles( const uno::Reference< ::com::sun::s
void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel,
const uno::Sequence<beans::PropertyValue>& rProps,
- sal_Bool bOutline )
+ bool bOutline )
{
sal_Int16 eType = NumberingType::CHAR_SPECIAL;
@@ -649,7 +649,7 @@ SvxXMLNumRuleExport::~SvxXMLNumRuleExport()
}
void SvxXMLNumRuleExport::exportNumberingRule(
- const OUString& rName, sal_Bool bIsHidden,
+ const OUString& rName, bool bIsHidden,
const Reference< XIndexReplace >& rNumRule )
{
Reference< XPropertySet > xPropSet( rNumRule, UNO_QUERY );
@@ -696,7 +696,7 @@ void SvxXMLNumRuleExport::exportNumberingRule(
}
}
-sal_Bool SvxXMLNumRuleExport::exportStyle( const Reference< XStyle >& rStyle )
+bool SvxXMLNumRuleExport::exportStyle( const Reference< XStyle >& rStyle )
{
Reference< XPropertySet > xPropSet( rStyle, UNO_QUERY );
Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo();
@@ -709,7 +709,7 @@ sal_Bool SvxXMLNumRuleExport::exportStyle( const Reference< XStyle >& rStyle )
{
aAny = xPropSet->getPropertyValue( sIsPhysical );
if( !*(sal_Bool *)aAny.getValue() )
- return sal_False;
+ return false;
}
aAny = xPropSet->getPropertyValue( sNumberingRules );
@@ -727,7 +727,7 @@ sal_Bool SvxXMLNumRuleExport::exportStyle( const Reference< XStyle >& rStyle )
exportNumberingRule( sName, bHidden, xNumRule );
- return sal_True;
+ return true;
}
void SvxXMLNumRuleExport::exportOutline()
@@ -762,7 +762,7 @@ void SvxXMLNumRuleExport::exportOutline()
nODFVersion == SvtSaveOptions::ODFVER_011 ) &&
GetExport().writeOutlineStyleAsNormalListStyle() )
{
- exportNumberingRule( sOutlineStyleName, sal_False, xNumRule );
+ exportNumberingRule( sOutlineStyleName, false, xNumRule );
}
else
{
@@ -785,15 +785,15 @@ void SvxXMLNumRuleExport::exportOutline()
}
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
XML_OUTLINE_STYLE, true, true );
- exportLevelStyles( xNumRule, sal_True );
+ exportLevelStyles( xNumRule, true );
}
}
}
}
-void SvxXMLNumRuleExport::exportStyles( sal_Bool bUsed,
- XMLTextListAutoStylePool *pPool,
- sal_Bool bExportChapterNumbering )
+void SvxXMLNumRuleExport::exportStyles( bool bUsed,
+ XMLTextListAutoStylePool *pPool,
+ bool bExportChapterNumbering )
{
if( bExportChapterNumbering )
exportOutline();
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 7ea94fa..125035c 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -56,7 +56,7 @@ using namespace ::svt;
struct LessuInt32
{
- sal_Bool operator() (const sal_uInt32 rValue1, const sal_uInt32 rValue2) const
+ bool operator() (const sal_uInt32 rValue1, const sal_uInt32 rValue2) const
{
return rValue1 < rValue2;
}
@@ -76,13 +76,13 @@ public:
SvXMLNumUsedList_Impl();
~SvXMLNumUsedList_Impl();
- void SetUsed( sal_uInt32 nKey );
- sal_Bool IsUsed( sal_uInt32 nKey ) const;
- sal_Bool IsWasUsed( sal_uInt32 nKey ) const;
- void Export();
+ void SetUsed( sal_uInt32 nKey );
+ bool IsUsed( sal_uInt32 nKey ) const;
+ bool IsWasUsed( sal_uInt32 nKey ) const;
+ void Export();
- sal_Bool GetFirstUsed(sal_uInt32& nKey);
- sal_Bool GetNextUsed(sal_uInt32& nKey);
+ bool GetFirstUsed(sal_uInt32& nKey);
+ bool GetNextUsed(sal_uInt32& nKey);
void GetWasUsed(uno::Sequence<sal_Int32>& rWasUsed);
void SetWasUsed(const uno::Sequence<sal_Int32>& rWasUsed);
@@ -122,13 +122,13 @@ void SvXMLNumUsedList_Impl::SetUsed( sal_uInt32 nKey )
}
}
-sal_Bool SvXMLNumUsedList_Impl::IsUsed( sal_uInt32 nKey ) const
+bool SvXMLNumUsedList_Impl::IsUsed( sal_uInt32 nKey ) const
{
SvXMLuInt32Set::const_iterator aItr = aUsed.find(nKey);
return (aItr != aUsed.end());
}
-sal_Bool SvXMLNumUsedList_Impl::IsWasUsed( sal_uInt32 nKey ) const
+bool SvXMLNumUsedList_Impl::IsWasUsed( sal_uInt32 nKey ) const
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list