summaryrefslogtreecommitdiff
path: root/include/xmloff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-31 09:05:32 +0200
committerNoel Grandin <noel@peralex.com>2014-03-31 12:39:02 +0200
commit0e8ab0fa298ad5c801aa94fb3e3fd2daa93d634c (patch)
treeb5cc18a766a3377df1210adb8bbb7db7aff4ef8c /include/xmloff
parent6ac6fb820f9e12649507cb5233c3b1727d67f2fd (diff)
xmloff: sal_Bool->bool
Change-Id: Ib4a73215187923dccd72fc7793ffd4bcbef24ab9
Diffstat (limited to 'include/xmloff')
-rw-r--r--include/xmloff/xmlimp.hxx18
-rw-r--r--include/xmloff/xmlimppr.hxx8
-rw-r--r--include/xmloff/xmlnume.hxx12
-rw-r--r--include/xmloff/xmlnumfe.hxx36
-rw-r--r--include/xmloff/xmlnumfi.hxx40
5 files changed, 57 insertions, 57 deletions
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 4368b5df15eb..d4a748047b00 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 8a932816ff6a..bf493b201209 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 31e858c83704..f98c7b92f11a 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 e047de32b623..86f43516dbc3 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 aabba99d17e4..201c4022cc28 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