diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-07 16:42:18 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-15 09:02:31 +0200 |
commit | 8a81f542a6ca566661305c53899b7e422cbaa432 (patch) | |
tree | b70ce405aab1c29856fa824493a664ba8ba27596 /xmloff/inc | |
parent | 42bfd486a457d327f640263ccc3ee02a380f3566 (diff) |
xmloff: sal_Bool->bool
Change-Id: I873c80baec8e70e3e8f642644563b92137571a30
Diffstat (limited to 'xmloff/inc')
-rw-r--r-- | xmloff/inc/MultiPropertySetHelper.hxx | 4 | ||||
-rw-r--r-- | xmloff/inc/PageMasterImportContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/inc/TransGradientStyle.hxx | 4 | ||||
-rw-r--r-- | xmloff/inc/XMLBase64Export.hxx | 6 | ||||
-rw-r--r-- | xmloff/inc/XMLElementPropertyContext.hxx | 6 | ||||
-rw-r--r-- | xmloff/inc/XMLEmbeddedObjectImportContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/inc/XMLFootnoteConfigurationImportContext.hxx | 4 | ||||
-rw-r--r-- | xmloff/inc/XMLImageMapExport.hxx | 2 | ||||
-rw-r--r-- | xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx | 4 | ||||
-rw-r--r-- | xmloff/inc/XMLLineNumberingImportContext.hxx | 8 | ||||
-rw-r--r-- | xmloff/inc/XMLNumberStylesImport.hxx | 6 | ||||
-rw-r--r-- | xmloff/inc/XMLTextColumnsContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/inc/XMLTextHeaderFooterContext.hxx | 8 | ||||
-rw-r--r-- | xmloff/inc/txtflde.hxx | 62 | ||||
-rw-r--r-- | xmloff/inc/txtfldi.hxx | 92 | ||||
-rw-r--r-- | xmloff/inc/txtlists.hxx | 8 | ||||
-rw-r--r-- | xmloff/inc/txtvfldi.hxx | 140 | ||||
-rw-r--r-- | xmloff/inc/xmlversion.hxx | 2 |
18 files changed, 181 insertions, 181 deletions
diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx index a6d6da846069..c467bba85097 100644 --- a/xmloff/inc/MultiPropertySetHelper.hxx +++ b/xmloff/inc/MultiPropertySetHelper.hxx @@ -132,7 +132,7 @@ public: * * May only be called after hasProperties() was called. */ - inline sal_Bool hasProperty( sal_Int16 nIndex ); + inline bool hasProperty( sal_Int16 nIndex ); /** * Get a value from the XPropertySet on demand. @@ -182,7 +182,7 @@ const ::com::sun::star::uno::Any& MultiPropertySetHelper::getValue( return ( nIndex != -1 ) ? pValues[ nIndex ] : aEmptyAny; } -sal_Bool MultiPropertySetHelper::hasProperty( sal_Int16 nValueNo ) +bool MultiPropertySetHelper::hasProperty( sal_Int16 nValueNo ) { DBG_ASSERT( pSequenceIndex != NULL, "called getValue() without calling hasProperties() before" ); diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx index 1cea7db10a2e..bf9306d27110 100644 --- a/xmloff/inc/PageMasterImportContext.hxx +++ b/xmloff/inc/PageMasterImportContext.hxx @@ -40,7 +40,7 @@ public: const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, - sal_Bool bDefaultStyle=sal_False); + bool bDefaultStyle=false); virtual ~PageStyleContext(); virtual SvXMLImportContext *CreateChildContext( diff --git a/xmloff/inc/TransGradientStyle.hxx b/xmloff/inc/TransGradientStyle.hxx index 5acdceeab1b8..b65f05e0c8a2 100644 --- a/xmloff/inc/TransGradientStyle.hxx +++ b/xmloff/inc/TransGradientStyle.hxx @@ -41,7 +41,7 @@ public: XMLTransGradientStyleImport( SvXMLImport& rImport ); ~XMLTransGradientStyleImport(); - sal_Bool importXML( + bool importXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, @@ -56,7 +56,7 @@ public: XMLTransGradientStyleExport( SvXMLExport& rExport ); ~XMLTransGradientStyleExport(); - sal_Bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); + bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); }; #endif // INCLUDED_XMLOFF_INC_TRANSGRADIENTSTYLE_HXX diff --git a/xmloff/inc/XMLBase64Export.hxx b/xmloff/inc/XMLBase64Export.hxx index d73df0ab3810..1a2cf4d48391 100644 --- a/xmloff/inc/XMLBase64Export.hxx +++ b/xmloff/inc/XMLBase64Export.hxx @@ -37,13 +37,13 @@ public: XMLBase64Export( SvXMLExport& rExport ); - sal_Bool exportXML( const ::com::sun::star::uno::Reference < + bool exportXML( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > & rIn ); - sal_Bool exportElement( const ::com::sun::star::uno::Reference < + bool exportElement( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > & rIn, sal_uInt16 nNamespace, enum ::xmloff::token::XMLTokenEnum eName ); - sal_Bool exportOfficeBinaryDataElement( + bool exportOfficeBinaryDataElement( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > & rIn ); }; diff --git a/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx index 95b60dc6c4fb..00771eaa3a74 100644 --- a/xmloff/inc/XMLElementPropertyContext.hxx +++ b/xmloff/inc/XMLElementPropertyContext.hxx @@ -28,15 +28,15 @@ class SvXMLImport; class XMLElementPropertyContext : public SvXMLImportContext { - sal_Bool bInsert; + bool bInsert; protected: ::std::vector< XMLPropertyState > &rProperties; XMLPropertyState aProp; - sal_Bool IsInsert() const { return bInsert; } - void SetInsert( sal_Bool bIns ) { bInsert = bIns; } + bool IsInsert() const { return bInsert; } + void SetInsert( bool bIns ) { bInsert = bIns; } public: TYPEINFO_OVERRIDE(); diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx index 61f22c250221..046df42ff448 100644 --- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx +++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx @@ -61,7 +61,7 @@ public: virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; - sal_Bool SetComponent( + bool SetComponent( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rComp ); diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx index d3be3f77f19a..2efee5736ddc 100644 --- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx +++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx @@ -60,8 +60,8 @@ class XMLFootnoteConfigurationImportContext : public SvXMLStyleContext sal_Int16 nOffset; sal_Int16 nNumbering; - sal_Bool bPosition; - sal_Bool bIsEndnote; + bool bPosition; + bool bIsEndnote; public: diff --git a/xmloff/inc/XMLImageMapExport.hxx b/xmloff/inc/XMLImageMapExport.hxx index 3cdcef2837cb..84de7356287f 100644 --- a/xmloff/inc/XMLImageMapExport.hxx +++ b/xmloff/inc/XMLImageMapExport.hxx @@ -49,7 +49,7 @@ class XMLImageMapExport SvXMLExport& mrExport; - sal_Bool mbWhiteSpace; /// use whitespace between image map elements? + bool mbWhiteSpace; /// use whitespace between image map elements? public: XMLImageMapExport(SvXMLExport& rExport); diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx index f3dff8088491..a1cc601e0c1e 100644 --- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx +++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx @@ -58,8 +58,8 @@ class XMLIndexBibliographyConfigurationContext : public SvXMLStyleContext OUString sPrefix; OUString sAlgorithm; LanguageTagODF maLanguageTagODF; - sal_Bool bNumberedEntries; - sal_Bool bSortByPosition; + bool bNumberedEntries; + bool bSortByPosition; ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> > aSortKeys; diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx index 8cc440cbcce8..3dd9aee2b972 100644 --- a/xmloff/inc/XMLLineNumberingImportContext.hxx +++ b/xmloff/inc/XMLLineNumberingImportContext.hxx @@ -70,10 +70,10 @@ class XMLLineNumberingImportContext : public SvXMLStyleContext sal_Int16 nNumberPosition; sal_Int16 nIncrement; sal_Int16 nSeparatorIncrement; - sal_Bool bNumberLines; - sal_Bool bCountEmptyLines; - sal_Bool bCountInFloatingFrames; - sal_Bool bRestartNumbering; + bool bNumberLines; + bool bCountEmptyLines; + bool bCountInFloatingFrames; + bool bRestartNumbering; public: diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx index 1a13fc0201be..95036757bd6c 100644 --- a/xmloff/inc/XMLNumberStylesImport.hxx +++ b/xmloff/inc/XMLNumberStylesImport.hxx @@ -33,8 +33,8 @@ class SdXMLNumberFormatImportContext : public SvXMLNumFormatContext private: friend class SdXMLNumberFormatMemberImportContext; - sal_Bool mbTimeStyle; - sal_Bool mbAutomatic; + bool mbTimeStyle; + bool mbAutomatic; sal_uInt8 mnElements[16]; sal_Int16 mnIndex; @@ -43,7 +43,7 @@ private: bool compareStyle( const SdXMLFixedDataStyle* pStyle, sal_Int16& nIndex ) const; protected: - void add( OUString& rNumberStyle, sal_Bool bLong, sal_Bool bTextual, sal_Bool bDecimal02, OUString& rText ); + void add( OUString& rNumberStyle, bool bLong, bool bTextual, bool bDecimal02, OUString& rText ); public: TYPEINFO_OVERRIDE(); diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx index 55221a786a76..a1fe4e029352 100644 --- a/xmloff/inc/XMLTextColumnsContext.hxx +++ b/xmloff/inc/XMLTextColumnsContext.hxx @@ -44,7 +44,7 @@ class XMLTextColumnsContext :public XMLElementPropertyContext SvXMLTokenMap *pColumnAttrTokenMap; SvXMLTokenMap *pColumnSepAttrTokenMap; sal_Int16 nCount; - sal_Bool bAutomatic; + bool bAutomatic; sal_Int32 nAutomaticDistance; public: diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx index 494388c69e0f..c9052ded9c30 100644 --- a/xmloff/inc/XMLTextHeaderFooterContext.hxx +++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx @@ -41,9 +41,9 @@ class XMLTextHeaderFooterContext: public SvXMLImportContext const OUString sTextFirst; const OUString sTextLeft; - sal_Bool bInsertContent : 1; - sal_Bool bLeft : 1; - sal_Bool bFirst : 1; + bool bInsertContent : 1; + bool bLeft : 1; + bool bFirst : 1; public: TYPEINFO_OVERRIDE(); @@ -54,7 +54,7 @@ public: ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPageStylePropSet, - sal_Bool bFooter, sal_Bool bLft, sal_Bool bFrst ); + bool bFooter, bool bLft, bool bFrst ); virtual ~XMLTextHeaderFooterContext(); diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx index d9805b6c342f..7dc0a1b8dde0 100644 --- a/xmloff/inc/txtflde.hxx +++ b/xmloff/inc/txtflde.hxx @@ -170,7 +170,7 @@ public: /// To be called for every field in the document body. void ExportField(const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextField > & rTextField, - sal_Bool bProgress ); + bool bProgress ); /// collect styles (character styles, data styles, ...) for this field /// (if appropriate). @@ -178,7 +178,7 @@ public: /// to be called for every field during style export. void ExportFieldAutoStyle(const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextField > & rTextField, - const sal_Bool bProgress, const sal_Bool bRecursive ); + const bool bProgress, const bool bRecursive ); /// export field declarations. /// to be called once at beginning of document body. @@ -194,7 +194,7 @@ public: /// export all field declarations, or only those that have been used? /// Calling this method will reset the list of used field declataions. void SetExportOnlyUsedFieldDeclarations( - sal_Bool bExportOnlyUsed = sal_True); + bool bExportOnlyUsed = true); // determine element or attribute names // (public, because they may be useful in related XML export classes) @@ -229,17 +229,17 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rRangePropSet, enum FieldIdEnum nToken, - sal_Bool bProgress ); + bool bProgress ); /// export an empty element void ExportElement(enum ::xmloff::token::XMLTokenEnum eElement, /// element token - sal_Bool bAddSpace = sal_False); /// add blanks around + bool bAddSpace = false); /// add blanks around /// element? /// export an element with string content void ExportElement(enum ::xmloff::token::XMLTokenEnum eElement, /// element token const OUString& sContent, /// element content - sal_Bool bAddSpace = sal_False); /// add blanks around + bool bAddSpace = false); /// add blanks around /// element? /// export a macro (as used in the macro field) @@ -250,13 +250,13 @@ protected: /// export text:meta-field (RDF metadata) void ExportMetaField( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & i_xMeta, - bool i_bAutoStyles, sal_Bool i_bProgress ); + bool i_bAutoStyles, bool i_bProgress ); /// export a boolean attribute void ProcessBoolean( enum ::xmloff::token::XMLTokenEnum eXmlName, /// attribute token (namespace text) - sal_Bool bBool, /// attribute value - sal_Bool bDefault); /// attribute default; omit, if attribute differs + bool bBool, /// attribute value + bool bDefault); /// attribute default; omit, if attribute differs /// export an integer attribute void ProcessInteger( @@ -273,7 +273,7 @@ protected: void ProcessString( enum ::xmloff::token::XMLTokenEnum eXmlName, /// attribute token (namespace text) const OUString& sValue, /// attribute value - sal_Bool bOmitEmpty = sal_False, /// omit attribute, if value is empty + bool bOmitEmpty = false, /// omit attribute, if value is empty sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix /// export a string attribute that gets a QName value @@ -281,7 +281,7 @@ protected: enum ::xmloff::token::XMLTokenEnum eXmlName, /// attribute token (namespace text) sal_uInt16 nValuePrefix, const OUString& sValue, /// attribute value - sal_Bool bOmitEmpty = sal_False, /// omit attribute, if value is empty + bool bOmitEmpty = false, /// omit attribute, if value is empty sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix @@ -304,7 +304,7 @@ protected: void ProcessString( enum ::xmloff::token::XMLTokenEnum eXmlName, /// attribute token (namespace text) enum ::xmloff::token::XMLTokenEnum eValue, /// attribute token - sal_Bool bOmitEmpty = sal_False, /// omit attribute, if value is empty + bool bOmitEmpty = false, /// omit attribute, if value is empty sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix /// export a string attribute, omit if default @@ -324,46 +324,46 @@ protected: sal_Int16 nNumberingType); /// numbering type key /// export display attribute (value, formula, none) - void ProcessDisplay(sal_Bool bIsVisible, /// is visible? - sal_Bool bIsCommand, /// is show command/show name? - sal_Bool bDefault = sal_True); /// omit, if default + void ProcessDisplay(bool bIsVisible, /// is visible? + bool bIsCommand, /// is show command/show name? + bool bDefault = true); /// omit, if default /// export all data-style related attributes void ProcessValueAndType( - sal_Bool bIsString, /// do we process a string or a number? + bool bIsString, /// do we process a string or a number? sal_Int32 nFormatKey, /// format key for NumberFormatter; possibly -1 const OUString& sContent, /// string content; possibly invalid const OUString& sDefault, /// default string double fValue, /// float content; possibly invalid - sal_Bool bExportValue, /// export value attribute? - sal_Bool bExportValueType, /// export value-type attribute? - sal_Bool bExportStyle, /// export style-sttribute? - sal_Bool bForceSystemLanguage, /// no style language export - sal_Bool bTimeStyle = sal_False); /// exporting a time style? + bool bExportValue, /// export value attribute? + bool bExportValueType, /// export value-type attribute? + bool bExportStyle, /// export style-sttribute? + bool bForceSystemLanguage, /// no style language export + bool bTimeStyle = false); /// exporting a time style? /// export times, dates and durations according to ISO 8601 void ProcessDateTime( enum ::xmloff::token::XMLTokenEnum eXMLName, /// attribute token double dValue, /// date/time value - sal_Bool bIsDate, /// export as date (rather than date/time)? - sal_Bool bIsDuration = sal_False, /// export as duration - sal_Bool bOmitDurationIfZero = sal_True, /// omit zero-length durat. + bool bIsDate, /// export as date (rather than date/time)? + bool bIsDuration = false, /// export as duration + bool bOmitDurationIfZero = true, /// omit zero-length durat. sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix /// export a date, time, or duration void ProcessDateTime( enum ::xmloff::token::XMLTokenEnum eXMLName, /// attribute token sal_Int32 nMinutes, /// date/time value in minutes - sal_Bool bIsDate, /// export as date? - sal_Bool bIsDuration, /// export as duration? - sal_Bool bOmitDurationIfZero, /// omit zero-length durations + bool bIsDate, /// export as date? + bool bIsDuration, /// export as duration? + bool bOmitDurationIfZero, /// omit zero-length durations sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix /// export times, dates and durations according to ISO 8601 void ProcessDateTime( enum ::xmloff::token::XMLTokenEnum eXMLName, /// attribute token const ::com::sun::star::util::DateTime& rTime, /// date/time value - sal_Bool bIsDate, /// export as date (rather than date/time)? + bool bIsDate, /// export as date (rather than date/time)? sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix /// export time or dateTime @@ -404,7 +404,7 @@ protected: ::com::sun::star::text::XTextField > & rTextField); /// get PropertySet of (any) DependentTextField for this FieldMaster - sal_Bool GetDependentFieldPropertySet( + bool GetDependentFieldPropertySet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xmaster, ::com::sun::star::uno::Reference< @@ -423,13 +423,13 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropSet); /// determine, whether field has string or numeric content - sal_Bool IsStringField(FieldIdEnum nFieldType, /// field ID + bool IsStringField(FieldIdEnum nFieldType, /// field ID const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet); /// explode a field master name into field type and field name - sal_Bool ExplodeFieldMasterName( + bool ExplodeFieldMasterName( const OUString& sMasterName, /// name as returned by SO API OUString& sFieldType, /// out: field type OUString& sVarName); /// out: variable name diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 2ef1eef7188e..66c2a1d25344 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -122,7 +122,7 @@ protected: OUString sServicePrefix; // data members for use in subclasses - sal_Bool bValid; /// whether this field is valid ? + bool bValid; /// whether this field is valid ? public: TYPEINFO_OVERRIDE(); @@ -175,7 +175,7 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet) = 0; /// create field from ServiceName - sal_Bool CreateField(::com::sun::star::uno::Reference< + bool CreateField(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xField, const OUString& sServiceName); @@ -198,7 +198,7 @@ class XMLSenderFieldImportContext : public XMLTextFieldImportContext protected: // variables for access in subclass - sal_Bool bFixed; + bool bFixed; sal_uInt16 nElementToken; /// token for this elment field public: @@ -230,7 +230,7 @@ protected: /** inherit sender field because of fixed attribute in ProcessAttributes */ class XMLAuthorFieldImportContext : public XMLSenderFieldImportContext { - sal_Bool bAuthorFullName; + bool bAuthorFullName; const OUString sServiceAuthor; const OUString sPropertyAuthorFullName; const OUString sPropertyFixed; @@ -304,10 +304,10 @@ protected: ::com::sun::star::util::DateTime aDateTimeValue; sal_Int32 nAdjust; sal_Int32 nFormatKey; - sal_Bool bTimeOK; - sal_Bool bFormatOK; - sal_Bool bFixed; - sal_Bool bIsDate; // is this a date? + bool bTimeOK; + bool bFormatOK; + bool bFixed; + bool bIsDate; // is this a date? // (for XMLDateFieldImportContext, really) bool bIsDefaultLanguage; @@ -358,7 +358,7 @@ class XMLPageContinuationImportContext : public XMLTextFieldImportContext OUString sString; /// continuation string com::sun::star::text::PageNumberType eSelectPage; /// previous, current /// or next page - sal_Bool sStringOK; /// continuation string encountered? + bool sStringOK; /// continuation string encountered? public: TYPEINFO_OVERRIDE(); @@ -391,7 +391,7 @@ class XMLPageNumberImportContext : public XMLTextFieldImportContext sal_Int16 nPageAdjust; com::sun::star::text::PageNumberType eSelectPage; /// previous, current /// or next page - sal_Bool sNumberFormatOK; + bool sNumberFormatOK; public: TYPEINFO_OVERRIDE(); @@ -427,17 +427,17 @@ class XMLDatabaseFieldImportContext : public XMLTextFieldImportContext OUString sTableName; sal_Int32 nCommandType; - sal_Bool bCommandTypeOK; + bool bCommandTypeOK; - sal_Bool bDisplay; + bool bDisplay; bool bDisplayOK; bool bUseDisplay; protected: - sal_Bool bDatabaseOK; - sal_Bool bDatabaseNameOK; - sal_Bool bDatabaseURLOK; - sal_Bool bTableOK; + bool bDatabaseOK; + bool bDatabaseNameOK; + bool bDatabaseURLOK; + bool bTableOK; /// protected constructor: only for subclasses XMLDatabaseFieldImportContext(SvXMLImport& rImport, @@ -489,7 +489,7 @@ class XMLDatabaseNextImportContext : public XMLDatabaseFieldImportContext const OUString sPropertyCondition; const OUString sTrue; OUString sCondition; - sal_Bool bConditionOK; + bool bConditionOK; protected: // for use in child classes @@ -522,7 +522,7 @@ class XMLDatabaseSelectImportContext : public XMLDatabaseNextImportContext { const OUString sPropertySetNumber; sal_Int32 nNumber; - sal_Bool bNumberOK; + bool bNumberOK; public: TYPEINFO_OVERRIDE(); @@ -550,7 +550,7 @@ class XMLDatabaseNumberImportContext : public XMLDatabaseFieldImportContext OUString sNumberFormat; OUString sNumberSync; sal_Int32 nValue; - sal_Bool bValueOK; + bool bValueOK; public: TYPEINFO_OVERRIDE(); @@ -579,9 +579,9 @@ class XMLSimpleDocInfoImportContext : public XMLTextFieldImportContext const OUString sPropertyCurrentPresentation; protected: - sal_Bool bFixed; - sal_Bool bHasAuthor; - sal_Bool bHasContent; + bool bFixed; + bool bHasAuthor; + bool bHasContent; public: TYPEINFO_OVERRIDE(); @@ -591,8 +591,8 @@ public: sal_uInt16 nPrfx, const OUString& sLocalName, sal_uInt16 nToken, - sal_Bool bContent, - sal_Bool bAuthor); + bool bContent, + bool bAuthor); protected: /// process attribute values @@ -615,9 +615,9 @@ class XMLDateTimeDocInfoImportContext : public XMLSimpleDocInfoImportContext const OUString sPropertyIsFixedLanguage; sal_Int32 nFormat; - sal_Bool bFormatOK; - sal_Bool bIsDate; - sal_Bool bHasDateTime; + bool bFormatOK; + bool bIsDate; + bool bHasDateTime; bool bIsDefaultLanguage; public: @@ -669,7 +669,7 @@ class XMLUserDocInfoImportContext : public XMLSimpleDocInfoImportContext const OUString sPropertyNumberFormat; const OUString sPropertyIsFixedLanguage; sal_Int32 nFormat; - sal_Bool bFormatOK; + bool bFormatOK; bool bIsDefaultLanguage; public: @@ -697,7 +697,7 @@ class XMLHiddenParagraphImportContext : public XMLTextFieldImportContext const OUString sPropertyIsHidden; OUString sCondition; - sal_Bool bIsHidden; + bool bIsHidden; public: TYPEINFO_OVERRIDE(); @@ -731,10 +731,10 @@ class XMLConditionalTextImportContext : public XMLTextFieldImportContext OUString sTrueContent; OUString sFalseContent; - sal_Bool bConditionOK; - sal_Bool bTrueOK; - sal_Bool bFalseOK; - sal_Bool bCurrentValue; + bool bConditionOK; + bool bTrueOK; + bool bFalseOK; + bool bCurrentValue; public: TYPEINFO_OVERRIDE(); @@ -765,9 +765,9 @@ class XMLHiddenTextImportContext : public XMLTextFieldImportContext OUString sCondition; OUString sString; - sal_Bool bConditionOK; - sal_Bool bStringOK; - sal_Bool bIsHidden; + bool bConditionOK; + bool bStringOK; + bool bIsHidden; public: TYPEINFO_OVERRIDE(); @@ -796,7 +796,7 @@ class XMLFileNameImportContext : public XMLTextFieldImportContext const OUString sPropertyCurrentPresentation; sal_Int16 nFormat; - sal_Bool bFixed; + bool bFixed; public: TYPEINFO_OVERRIDE(); @@ -879,7 +879,7 @@ class XMLCountFieldImportContext : public XMLTextFieldImportContext OUString sNumberFormat; OUString sLetterSync; - sal_Bool bNumberFormatOK; + bool bNumberFormatOK; public: TYPEINFO_OVERRIDE(); @@ -911,7 +911,7 @@ class XMLPageVarGetFieldImportContext : public XMLTextFieldImportContext OUString sNumberFormat; OUString sLetterSync; - sal_Bool bNumberFormatOK; + bool bNumberFormatOK; public: TYPEINFO_OVERRIDE(); @@ -939,7 +939,7 @@ class XMLPageVarSetFieldImportContext : public XMLTextFieldImportContext const OUString sPropertyOffset; sal_Int16 nAdjust; - sal_Bool bActive; + bool bActive; public: TYPEINFO_OVERRIDE(); @@ -973,7 +973,7 @@ class XMLMacroFieldImportContext : public XMLTextFieldImportContext OUString sMacro; // macro for old documents (pre 638i) - sal_Bool bDescriptionOK; + bool bDescriptionOK; public: TYPEINFO_OVERRIDE(); @@ -1014,8 +1014,8 @@ class XMLReferenceFieldImportContext : public XMLTextFieldImportContext sal_Int16 nSource; sal_Int16 nType; - sal_Bool bNameOK; - sal_Bool bTypeOK; + bool bNameOK; + bool bTypeOK; public: TYPEINFO_OVERRIDE(); @@ -1146,7 +1146,7 @@ class XMLUrlFieldImportContext : public XMLTextFieldImportContext OUString sURL; OUString sFrame; - sal_Bool bFrameOK; + bool bFrameOK; public: TYPEINFO_OVERRIDE(); @@ -1258,8 +1258,8 @@ class XMLScriptImportContext : public XMLTextFieldImportContext OUString sContent; OUString sScriptType; - sal_Bool bContentOK; - sal_Bool bScriptTypeOK; + bool bContentOK; + bool bScriptTypeOK; public: TYPEINFO_OVERRIDE(); diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx index 83bdad450ca7..c5a9a4452f8b 100644 --- a/xmloff/inc/txtlists.hxx +++ b/xmloff/inc/txtlists.hxx @@ -62,7 +62,7 @@ class XMLTextListsHelper : private boost::noncopyable const OUString& sContinueListId, const OUString& sListStyleDefaultListId = OUString() ); - sal_Bool IsListProcessed( const OUString& sListId ) const; + bool IsListProcessed( const OUString& sListId ) const; OUString GetListStyleOfProcessedList( const OUString& sListId ) const; OUString GetContinueListIdOfProcessedList( @@ -85,7 +85,7 @@ class XMLTextListsHelper : private boost::noncopyable void PushListOnStack( const OUString& sListId, const OUString& sListStyleName ); void PopListFromStack(); - sal_Bool EqualsToTopListStyleOnStack( const OUString& sListId ) const; + bool EqualsToTopListStyleOnStack( const OUString& sListId ) const; /** for importing numbered-paragraph note that the ID namespace for numbered-paragraph and regular list @@ -120,8 +120,8 @@ class XMLTextListsHelper : private boost::noncopyable const OUString& i_ParentStyleName, const OUString& i_StyleName, sal_Int16 & io_rLevel, - sal_Bool* o_pRestartNumbering = 0, - sal_Bool* io_pSetDefaults = 0); + bool* o_pRestartNumbering = 0, + bool* io_pSetDefaults = 0); private: diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx index 4806349a7fd1..c3bf5d14eb2f 100644 --- a/xmloff/inc/txtvfldi.hxx +++ b/xmloff/inc/txtvfldi.hxx @@ -62,29 +62,29 @@ class XMLValueImportHelper OUString sDefault; /// default (see bStringDefault/bFormulaDef.) bool bIsDefaultLanguage;/// format (of nFormatKey) has system language? - sal_Bool bStringType; /// is this a string (or a float) type? - sal_Bool bFormatOK; /// have we read a style:data-style-name attr.? - sal_Bool bTypeOK; /// have we read a value-type attribute? - sal_Bool bStringValueOK; /// have we read a string-value attr.? - sal_Bool bFloatValueOK; /// have we read any of the float attr.s? - sal_Bool bFormulaOK; /// have we read the formula attribute? + bool bStringType; /// is this a string (or a float) type? + bool bFormatOK; /// have we read a style:data-style-name attr.? + bool bTypeOK; /// have we read a value-type attribute? + bool bStringValueOK; /// have we read a string-value attr.? + bool bFloatValueOK; /// have we read any of the float attr.s? + bool bFormulaOK; /// have we read the formula attribute? - const sal_Bool bSetType; /// should PrepareField set the SetExp subtype? - const sal_Bool bSetValue; /// should PrepareField set content/value? - const sal_Bool bSetStyle; /// should PrepareField set NumberFormat? - const sal_Bool bSetFormula; /// should PrepareField set Formula? + const bool bSetType; /// should PrepareField set the SetExp subtype? + const bool bSetValue; /// should PrepareField set content/value? + const bool bSetStyle; /// should PrepareField set NumberFormat? + const bool bSetFormula; /// should PrepareField set Formula? - const sal_Bool bStringDefault; /// default: string-value = content - const sal_Bool bFormulaDefault; /// default: formula = content + const bool bStringDefault; /// default: string-value = content + const bool bFormulaDefault; /// default: formula = content public: XMLValueImportHelper( SvXMLImport& rImprt, /// XML Import XMLTextImportHelper& rHlp, /// text import helper - sal_Bool bType, /// process type (PrepareField) - sal_Bool bStyle, /// process data style (P.F.) - sal_Bool bValue, /// process value (Prep.Field) - sal_Bool bFormula); /// process formula (Prep.F.) + bool bType, /// process type (PrepareField) + bool bStyle, /// process data style (P.F.) + bool bValue, /// process value (Prep.Field) + bool bFormula); /// process formula (Prep.F.) virtual ~XMLValueImportHelper(); @@ -98,10 +98,10 @@ public: ::com::sun::star::beans::XPropertySet> & xPropertySet); /// is value a string (rather than double)? - inline sal_Bool IsStringValue() { return bStringType; } + inline bool IsStringValue() { return bStringType; } /// has format been read? - inline sal_Bool IsFormatOK() { return bFormatOK; } + inline bool IsFormatOK() { return bFormatOK; } inline void SetDefault(const OUString& sStr) { sDefault = sStr; } }; @@ -150,24 +150,24 @@ private: OUString sHelp; /// help text OUString sHint; /// hint XMLValueImportHelper aValueHelper; /// value, value-type, and style - sal_Bool bDisplayFormula; /// display formula?(rather than value) - sal_Bool bDisplayNone; /// hide field? - - sal_Bool bNameOK; /// sName was set - sal_Bool bFormulaOK; /// sFormula was set - sal_Bool bDescriptionOK; /// sDescription was set - sal_Bool bHelpOK; /// sHelp was set - sal_Bool bHintOK; /// sHint was set - sal_Bool bDisplayOK; /// sDisplayFormula/-None were set - - sal_Bool bSetFormula; /// set Formula property - sal_Bool bSetFormulaDefault; /// use content as default for formula - sal_Bool bSetDescription; /// set sDescription with Hint-property - sal_Bool bSetHelp; - sal_Bool bSetHint; - sal_Bool bSetVisible; /// set IsVisible - sal_Bool bSetDisplayFormula; /// set DisplayFormula (sub type???) - sal_Bool bSetPresentation; /// set presentation frm elem. content? + bool bDisplayFormula; /// display formula?(rather than value) + bool bDisplayNone; /// hide field? + + bool bNameOK; /// sName was set + bool bFormulaOK; /// sFormula was set + bool bDescriptionOK; /// sDescription was set + bool bHelpOK; /// sHelp was set + bool bHintOK; /// sHint was set + bool bDisplayOK; /// sDisplayFormula/-None were set + + bool bSetFormula; /// set Formula property + bool bSetFormulaDefault; /// use content as default for formula + bool bSetDescription; /// set sDescription with Hint-property + bool bSetHelp; + bool bSetHint; + bool bSetVisible; /// set IsVisible + bool bSetDisplayFormula; /// set DisplayFormula (sub type???) + bool bSetPresentation; /// set presentation frm elem. content? public: @@ -181,17 +181,17 @@ public: sal_uInt16 nPrfx, /// namespace prefix const OUString& rLocalName, /// element name w/o prefix // config variables for PrepareField behavior: - sal_Bool bFormula, /// set Formula property - sal_Bool bFormulaDefault, /// use content as default for formula - sal_Bool bDescription, /// set sDescription with Hint-property - sal_Bool bHelp, - sal_Bool bHint, - sal_Bool bVisible, /// set IsVisible (display attr) - sal_Bool bDisplayFormula, /// set ??? (display attr.) - sal_Bool bType, /// set value type with ???-property - sal_Bool bStyle, /// set data style (NumberFormat-Prop.) - sal_Bool bValue, /// set value with Content/Value-Prop. - sal_Bool bPresentation); /// set presentation from elem. content + bool bFormula, /// set Formula property + bool bFormulaDefault, /// use content as default for formula + bool bDescription, /// set sDescription with Hint-property + bool bHelp, + bool bHint, + bool bVisible, /// set IsVisible (display attr) + bool bDisplayFormula, /// set ??? (display attr.) + bool bType, /// set value type with ???-property + bool bStyle, /// set data style (NumberFormat-Prop.) + bool bValue, /// set value with Content/Value-Prop. + bool bPresentation); /// set presentation from elem. content protected: /// process attribute values @@ -205,11 +205,11 @@ protected: // various accessor methods: inline OUString GetName() { return sName; } - inline sal_Bool IsStringValue() { return aValueHelper.IsStringValue();} - inline sal_Bool IsNameOK() { return bNameOK; } - inline sal_Bool IsFormulaOK() { return bFormulaOK; } - inline sal_Bool IsDescriptionOK() { return bDescriptionOK; } - inline sal_Bool IsDisplayOK() { return bDisplayOK; } + inline bool IsStringValue() { return aValueHelper.IsStringValue();} + inline bool IsNameOK() { return bNameOK; } + inline bool IsFormulaOK() { return bFormulaOK; } + inline bool IsDescriptionOK() { return bDescriptionOK; } + inline bool IsDisplayOK() { return bDisplayOK; } }; @@ -308,17 +308,17 @@ public: // for finding appropriate field master (see EndElement()) VarType eVarType, /// variable type // config variables: - sal_Bool bFormula, /// see XMLTextFieldImportContext - sal_Bool bFormulaDefault, /// see XMLTextFieldImportContext - sal_Bool bDescription, /// see XMLTextFieldImportContext - sal_Bool bHelp, /// see XMLTextFieldImportContext - sal_Bool bHint, /// see XMLTextFieldImportContext - sal_Bool bVisible, /// see XMLTextFieldImportContext - sal_Bool bDisplayFormula, /// see XMLTextFieldImportContext - sal_Bool bType, /// see XMLTextFieldImportContext - sal_Bool bStyle, /// see XMLTextFieldImportContext - sal_Bool bValue, /// see XMLTextFieldImportContext - sal_Bool bPresentation); /// see XMLTextFieldImportContext + bool bFormula, /// see XMLTextFieldImportContext + bool bFormulaDefault, /// see XMLTextFieldImportContext + bool bDescription, /// see XMLTextFieldImportContext + bool bHelp, /// see XMLTextFieldImportContext + bool bHint, /// see XMLTextFieldImportContext + bool bVisible, /// see XMLTextFieldImportContext + bool bDisplayFormula, /// see XMLTextFieldImportContext + bool bType, /// see XMLTextFieldImportContext + bool bStyle, /// see XMLTextFieldImportContext + bool bValue, /// see XMLTextFieldImportContext + bool bPresentation); /// see XMLTextFieldImportContext protected: @@ -327,7 +327,7 @@ protected: virtual void EndElement() SAL_OVERRIDE; /// find appropriate field master - sal_Bool FindFieldMaster( + bool FindFieldMaster( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xMaster); }; @@ -431,7 +431,7 @@ class XMLSequenceFieldImportContext : public XMLSetVarFieldImportContext OUString sNumFormatSync; OUString sRefName; - sal_Bool bRefNameOK; + bool bRefNameOK; public: @@ -518,7 +518,7 @@ public: enum VarType eVarType); /// variable type /// get field master for name and rename if appropriate - static sal_Bool FindFieldMaster(::com::sun::star::uno::Reference< + static bool FindFieldMaster(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xMaster, SvXMLImport& rImport, XMLTextImportHelper& rHelper, @@ -540,7 +540,7 @@ class XMLTableFormulaImportContext : public XMLTextFieldImportContext OUString sFormula; - sal_Bool bIsShowFormula; + bool bIsShowFormula; public: @@ -578,10 +578,10 @@ class XMLDatabaseDisplayImportContext : public XMLDatabaseFieldImportContext XMLValueImportHelper aValueHelper; OUString sColumnName; - sal_Bool bColumnOK; + bool bColumnOK; - sal_Bool bDisplay; - sal_Bool bDisplayOK; + bool bDisplay; + bool bDisplayOK; public: diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx index cc23e9bea8aa..c1b3e17e3446 100644 --- a/xmloff/inc/xmlversion.hxx +++ b/xmloff/inc/xmlversion.hxx @@ -102,7 +102,7 @@ class XMLVersionContext: public SvXMLImportContext private: XMLVersionListImport& rLocalRef; - static sal_Bool ParseISODateTimeString( + static bool ParseISODateTimeString( const OUString& rString, com::sun::star::util::DateTime& rDateTime ); |