diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-27 17:24:01 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-31 12:36:54 +0200 |
commit | ddb07081da099a392b1cdcbb8716afb6af43e006 (patch) | |
tree | be0017dab7a3996402c33bad613dd601e22c27b5 /include/xmloff | |
parent | 3f60a32aa2413ca67eb243a3ba91abd3327a07b3 (diff) |
xmloff: sal_Bool->bool
Change-Id: I1deb10cb1581137ab92e73367e63339822a9a094
Diffstat (limited to 'include/xmloff')
-rw-r--r-- | include/xmloff/XMLCharContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLEventExport.hxx | 18 | ||||
-rw-r--r-- | include/xmloff/XMLEventsImportContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLFontStylesContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLPageExport.hxx | 12 | ||||
-rw-r--r-- | include/xmloff/XMLSettingsExportContext.hxx | 4 | ||||
-rw-r--r-- | include/xmloff/XMLShapeStyleContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLTextMasterPageContext.hxx | 26 | ||||
-rw-r--r-- | include/xmloff/XMLTextShapeStyleContext.hxx | 8 |
9 files changed, 38 insertions, 38 deletions
diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx index 99a7e055422b..d92193c028d1 100644 --- a/include/xmloff/XMLCharContext.hxx +++ b/include/xmloff/XMLCharContext.hxx @@ -41,7 +41,7 @@ public: const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_Unicode c, - sal_Bool bCount ); + bool bCount ); XMLCharContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/include/xmloff/XMLEventExport.hxx b/include/xmloff/XMLEventExport.hxx index e9e67427b764..a65aa5d60a87 100644 --- a/include/xmloff/XMLEventExport.hxx +++ b/include/xmloff/XMLEventExport.hxx @@ -86,30 +86,30 @@ public: /// export the events (calls EventExport::Export(Reference<XNameAcess>) ) void Export( ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventsSupplier> & xAccess, - sal_Bool bUseWhitespace = sal_True); + bool bUseWhitespace = true); /// export the events (calls EventExport::Export(Reference<XNameAcess>) ) void Export( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace> & xAccess, - sal_Bool bUseWhitespace = sal_True); + bool bUseWhitespace = true); /// export the events (writes <office:events> element) void Export( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> & xAccess, - sal_Bool bUseWhitespace = sal_True); + bool bUseWhitespace = true); /// export the events, but write <officeooo:events> element /// (for new file format additions) void ExportExt( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> & xAccess, - sal_Bool bUseWhitespace = sal_True); + bool bUseWhitespace = true); /// export a single event (writes <office:events> element) void ExportSingleEvent( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rEventValues, const OUString& rApiEventName, - sal_Bool bUseWhitespace = sal_True ); + bool bUseWhitespace = true ); private: @@ -118,14 +118,14 @@ private: ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rEventValues, const XMLEventName& rXmlEventName, - sal_Bool bUseWhitespace, - sal_Bool& rExported); + bool bUseWhitespace, + bool& rExported); /// export the start element - SAL_DLLPRIVATE void StartElement(sal_Bool bUseWhitespace); + SAL_DLLPRIVATE void StartElement(bool bUseWhitespace); /// export the end element - SAL_DLLPRIVATE void EndElement(sal_Bool bUseWhitespace); + SAL_DLLPRIVATE void EndElement(bool bUseWhitespace); }; #endif diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx index 153b68097b1c..278c5cc6c658 100644 --- a/include/xmloff/XMLEventsImportContext.hxx +++ b/include/xmloff/XMLEventsImportContext.hxx @@ -106,7 +106,7 @@ public: /// if the import operates indelayed mode, you can use this method /// to obtain the value sequence for a specific event - sal_Bool GetEventSequence( + bool GetEventSequence( const OUString& rName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rSequence ); diff --git a/include/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx index b3ddeda9fdd4..f3b8ff2ad8c3 100644 --- a/include/xmloff/XMLFontStylesContext.hxx +++ b/include/xmloff/XMLFontStylesContext.hxx @@ -67,7 +67,7 @@ public: return *pFontStyleAttrTokenMap; } - sal_Bool FillProperties( const OUString& rName, + bool FillProperties( const OUString& rName, ::std::vector< XMLPropertyState > &rProps, sal_Int32 nFamilyNameIdx, sal_Int32 nStyleNameIdx, diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx index 7abb531579e0..0a5053960040 100644 --- a/include/xmloff/XMLPageExport.hxx +++ b/include/xmloff/XMLPageExport.hxx @@ -61,7 +61,7 @@ class XMLOFF_DLLPUBLIC XMLPageExport : public UniRefBase ::com::sun::star::container::XNameAccess > xPageStyles; ::std::vector< XMLPageExportNameEntry > aNameVector; - SAL_DLLPRIVATE sal_Bool findPageMasterName( const OUString& rStyleName, OUString& rPMName ) const; + SAL_DLLPRIVATE bool findPageMasterName( const OUString& rStyleName, OUString& rPMName ) const; UniReference < XMLPropertyHandlerFactory > xPageMasterPropHdlFactory; UniReference < XMLPropertySetMapper > xPageMasterPropSetMapper; @@ -81,20 +81,20 @@ protected: ::com::sun::star::beans::XPropertySet > & rPropSet, bool bAutoStyles ); - sal_Bool exportStyle( + bool exportStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& rStyle, - sal_Bool bAutoStyles ); + bool bAutoStyles ); - void exportStyles( sal_Bool bUsed, sal_Bool bAutoStyles ); + void exportStyles( bool bUsed, bool bAutoStyles ); public: XMLPageExport( SvXMLExport& rExp ); ~XMLPageExport(); - void collectAutoStyles( sal_Bool bUsed ) { exportStyles( bUsed, sal_True ); } + void collectAutoStyles( bool bUsed ) { exportStyles( bUsed, true ); } void exportAutoStyles(); - void exportMasterStyles( sal_Bool bUsed ) { exportStyles( bUsed, sal_False ); } + void exportMasterStyles( bool bUsed ) { exportStyles( bUsed, false ); } //text grid enhancement for better CJK support void exportDefaultStyle(); diff --git a/include/xmloff/XMLSettingsExportContext.hxx b/include/xmloff/XMLSettingsExportContext.hxx index f8eeab2fa244..b79104a29dff 100644 --- a/include/xmloff/XMLSettingsExportContext.hxx +++ b/include/xmloff/XMLSettingsExportContext.hxx @@ -41,8 +41,8 @@ namespace xmloff enum ::xmloff::token::XMLTokenEnum i_eValue ) = 0; virtual void StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, - const sal_Bool i_bIgnoreWhitespace ) = 0; - virtual void EndElement( const sal_Bool i_bIgnoreWhitespace ) = 0; + const bool i_bIgnoreWhitespace ) = 0; + virtual void EndElement( const bool i_bIgnoreWhitespace ) = 0; virtual void Characters( const OUString& i_rCharacters ) = 0; diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx index ab3da6dc2296..89662c09be30 100644 --- a/include/xmloff/XMLShapeStyleContext.hxx +++ b/include/xmloff/XMLShapeStyleContext.hxx @@ -35,7 +35,7 @@ class XMLOFF_DLLPUBLIC XMLShapeStyleContext: public XMLPropStyleContext protected: OUString m_sControlDataStyleName; OUString m_sListStyleName; - sal_Bool m_bIsNumRuleAlreadyConverted; + bool m_bIsNumRuleAlreadyConverted; protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, diff --git a/include/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx index cfe9664351b7..929873b2d9d0 100644 --- a/include/xmloff/XMLTextMasterPageContext.hxx +++ b/include/xmloff/XMLTextMasterPageContext.hxx @@ -39,18 +39,18 @@ class XMLOFF_DLLPUBLIC XMLTextMasterPageContext : public SvXMLStyleContext ::com::sun::star::uno::Reference < ::com::sun::star::style::XStyle > xStyle; - sal_Bool bInsertHeader; - sal_Bool bInsertFooter; - sal_Bool bInsertHeaderLeft; - sal_Bool bInsertFooterLeft; - sal_Bool bInsertHeaderFirst; - sal_Bool bInsertFooterFirst; - sal_Bool bHeaderInserted; - sal_Bool bFooterInserted; - sal_Bool bHeaderLeftInserted; - sal_Bool bFooterLeftInserted; - sal_Bool bHeaderFirstInserted; - sal_Bool bFooterFirstInserted; + bool bInsertHeader; + bool bInsertFooter; + bool bInsertHeaderLeft; + bool bInsertFooterLeft; + bool bInsertHeaderFirst; + bool bInsertFooterFirst; + bool bHeaderInserted; + bool bFooterInserted; + bool bHeaderLeftInserted; + bool bFooterLeftInserted; + bool bHeaderFirstInserted; + bool bFooterFirstInserted; SAL_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::style::XStyle > Create(); @@ -65,7 +65,7 @@ public: const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - sal_Bool bOverwrite ); + bool bOverwrite ); virtual ~XMLTextMasterPageContext(); virtual SvXMLImportContext *CreateChildContext( diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx index 0466914b7ea3..f33129787371 100644 --- a/include/xmloff/XMLTextShapeStyleContext.hxx +++ b/include/xmloff/XMLTextShapeStyleContext.hxx @@ -25,9 +25,9 @@ class XMLOFF_DLLPUBLIC XMLTextShapeStyleContext : public XMLShapeStyleContext { - const OUString sIsAutoUpdate; + const OUString sIsAutoUpdate; - sal_Bool bAutoUpdate : 1; + bool bAutoUpdate : 1; SvXMLImportContextRef xEventContext; @@ -46,7 +46,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, - sal_Bool bDefaultStyle = sal_False ); + bool bDefaultStyle = false ); virtual ~XMLTextShapeStyleContext(); virtual SvXMLImportContext *CreateChildContext( @@ -54,7 +54,7 @@ public: const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - sal_Bool IsAutoUpdate() const { return bAutoUpdate; } + bool IsAutoUpdate() const { return bAutoUpdate; } virtual void CreateAndInsert( sal_Bool bOverwrite ) SAL_OVERRIDE; |