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 | |
| parent | avmedia: sal_Bool->bool (diff) | |
| download | core-8a81f542a6ca566661305c53899b7e422cbaa432.tar.gz core-8a81f542a6ca566661305c53899b7e422cbaa432.zip | |
xmloff: sal_Bool->bool
Change-Id: I873c80baec8e70e3e8f642644563b92137571a30
250 files changed, 2225 insertions, 2229 deletions
diff --git a/include/xmloff/xmlreg.hxx b/include/xmloff/xmlreg.hxx index 7fa911d8234b..73b97dad469f 100644 --- a/include/xmloff/xmlreg.hxx +++ b/include/xmloff/xmlreg.hxx @@ -27,9 +27,9 @@ * Register subset of UNO services from XML Office library. This is necessary when * linking against the static "xol.lib". * - * @return returns sal_False if at least one component could not be registered. + * @return returns false if at least one component could not be registered. */ -sal_Bool XMLRegisterServices( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > ); /// [all] ServiceProvider to register in. +bool XMLRegisterServices( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > ); /// [all] ServiceProvider to register in. #endif // INCLUDED_XMLOFF_XMLREG_HXX 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 ); diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx index 562a9a4615f6..6a119f3c2c5e 100644 --- a/xmloff/source/chart/MultiPropertySetHandler.hxx +++ b/xmloff/source/chart/MultiPropertySetHandler.hxx @@ -143,7 +143,7 @@ public: @return If none of the two interfaces is supported or using them both fails then sal_False is returned. Else True is returned. */ - inline sal_Bool GetProperties (void); + inline bool GetProperties (void); private: /** @descr Try to use the XMultiPropertySet interface to get the property @@ -152,7 +152,7 @@ private: containing the properties names. @return True if values could be derived. */ - inline sal_Bool MultiGet (const ::com::sun::star::uno::Sequence< + inline bool MultiGet (const ::com::sun::star::uno::Sequence< OUString> & rNameList); /** @descr Try to use the XPropertySet interface to get the property @@ -161,7 +161,7 @@ private: containing the properties names. @return True if values could be derived. */ - inline sal_Bool SingleGet (const ::com::sun::star::uno::Sequence< + inline bool SingleGet (const ::com::sun::star::uno::Sequence< OUString> & rNameList); /** @descr STL map that maps from property names to polymorphic instances of @@ -187,7 +187,7 @@ MultiPropertySetHandler::~MultiPropertySetHandler (void) delete I->second; } -sal_Bool MultiPropertySetHandler::GetProperties (void) +bool MultiPropertySetHandler::GetProperties (void) { ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; ::com::sun::star::uno::Sequence< OUString> aNameList (aPropertyList.size()); @@ -196,11 +196,11 @@ sal_Bool MultiPropertySetHandler::GetProperties (void) aNameList[i++] = I->second->msName; if ( ! MultiGet(aNameList)) if ( ! SingleGet(aNameList)) - return sal_False; - return sal_True; + return false; + return true; } -sal_Bool MultiPropertySetHandler::MultiGet (const ::com::sun::star::uno::Sequence< +bool MultiPropertySetHandler::MultiGet (const ::com::sun::star::uno::Sequence< OUString> & rNameList) { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet> xMultiSet ( @@ -217,15 +217,15 @@ sal_Bool MultiPropertySetHandler::MultiGet (const ::com::sun::star::uno::Se } catch (const ::com::sun::star::beans::UnknownPropertyException&) { - return sal_False; + return false; } else - return sal_False; + return false; - return sal_True; + return true; } -sal_Bool MultiPropertySetHandler::SingleGet (const ::com::sun::star::uno::Sequence< +bool MultiPropertySetHandler::SingleGet (const ::com::sun::star::uno::Sequence< OUString> & rNameList) { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xSingleSet ( @@ -240,12 +240,12 @@ sal_Bool MultiPropertySetHandler::SingleGet (const ::com::sun::star::uno::Se } catch (const ::com::sun::star::beans::UnknownPropertyException&) { - return sal_False; + return false; } else - return sal_False; + return false; - return sal_True; + return true; } #endif diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index 38f31263f505..42d0a73d8264 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -253,7 +253,7 @@ void XMLChartExportPropertyMapper::ContextFilter( { try { - sal_Bool bAuto = false; + bool bAuto = false; uno::Any aAny = rPropSet->getPropertyValue( aAutoPropName ); aAny >>= bAuto; if( bAuto ) diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 9014d5556bad..ca848149d33c 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -225,9 +225,9 @@ SchXMLChartContext::SchXMLChartContext( SchXMLImportHelper& rImpHelper, mrImportHelper( rImpHelper ), m_bHasRangeAtPlotArea( false ), m_bHasTableElement( false ), - mbAllRangeAddressesAvailable( sal_True ), - mbColHasLabels( sal_False ), - mbRowHasLabels( sal_False ), + mbAllRangeAddressesAvailable( true ), + mbColHasLabels( false ), + mbRowHasLabels( false ), meDataRowSource( chart::ChartDataRowSource_COLUMNS ), mbIsStockChart( false ) { @@ -594,9 +594,9 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( if( !xNewDia.is() || !xDataProvider.is() ) return; - sal_Bool bFirstCellAsLabel = + bool bFirstCellAsLabel = (eDataRowSource==chart::ChartDataRowSource_COLUMNS)? bRowHasLabels : bColHasLabels; - sal_Bool bHasCateories = + bool bHasCateories = (eDataRowSource==chart::ChartDataRowSource_COLUMNS)? bColHasLabels : bRowHasLabels; if( bSwitchOnLabelsAndCategoriesForOwnData ) @@ -992,9 +992,6 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { - static const sal_Bool bTrue = sal_True; - static const uno::Any aTrueBool( &bTrue, ::getBooleanCppuType()); - SvXMLImportContext* pContext = 0; const SvXMLTokenMap& rTokenMap = mrImportHelper.GetChartElemTokenMap(); uno::Reference< chart::XChartDocument > xDoc = mrImportHelper.GetChartDocument(); @@ -1019,7 +1016,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext( { if( xProp.is()) { - xProp->setPropertyValue("HasMainTitle", aTrueBool ); + xProp->setPropertyValue("HasMainTitle", uno::makeAny(true) ); } uno::Reference< drawing::XShape > xTitleShape( xDoc->getTitle(), uno::UNO_QUERY ); pContext = new SchXMLTitleContext( mrImportHelper, GetImport(), @@ -1032,7 +1029,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext( { if( xProp.is()) { - xProp->setPropertyValue("HasSubTitle", aTrueBool ); + xProp->setPropertyValue("HasSubTitle", uno::makeAny(true) ); } uno::Reference< drawing::XShape > xTitleShape( xDoc->getSubTitle(), uno::UNO_QUERY ); pContext = new SchXMLTitleContext( mrImportHelper, GetImport(), diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx index f2b7942e5218..3a4b075d9677 100644 --- a/xmloff/source/chart/SchXMLChartContext.hxx +++ b/xmloff/source/chart/SchXMLChartContext.hxx @@ -99,9 +99,9 @@ private: OUString m_aXLinkHRefAttributeToIndicateDataProvider; bool m_bHasRangeAtPlotArea; bool m_bHasTableElement; - sal_Bool mbAllRangeAddressesAvailable; - sal_Bool mbColHasLabels; - sal_Bool mbRowHasLabels; + bool mbAllRangeAddressesAvailable; + bool mbColHasLabels; + bool mbRowHasLabels; ::com::sun::star::chart::ChartDataRowSource meDataRowSource; bool mbIsStockChart; diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 3dfdeafee880..02e3d62d1ec3 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -153,7 +153,7 @@ public: */ void exportChart( com::sun::star::uno::Reference< com::sun::star::chart::XChartDocument > rChartDoc, - sal_Bool bIncludeTable ); + bool bIncludeTable ); UniReference< XMLPropertySetMapper > GetPropertySetMapper() const; @@ -185,19 +185,19 @@ public: /// if bExportContent is false the auto-styles are collected void parseDocument( com::sun::star::uno::Reference< com::sun::star::chart::XChartDocument >& rChartDoc, - sal_Bool bExportContent, - sal_Bool bIncludeTable = sal_False ); + bool bExportContent, + bool bIncludeTable = false ); void exportTable(); void exportPlotArea( com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > xDiagram, com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > xNewDiagram, const ::com::sun::star::awt::Size & rPageSize, - sal_Bool bExportContent, - sal_Bool bIncludeTable ); + bool bExportContent, + bool bIncludeTable ); void exportCoordinateRegion( const com::sun::star::uno::Reference< com::sun::star::chart::XDiagram >& xDiagram ); void exportAxes( const com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > & xDiagram, const com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > & xNewDiagram, - sal_Bool bExportContent ); + bool bExportContent ); void exportAxis( enum XMLTokenEnum eDimension, enum XMLTokenEnum eAxisName, const Reference< beans::XPropertySet > xAxisProps, const Reference< chart2::XAxis >& xChart2Axis, const OUString& rCategoriesRanges, @@ -209,8 +209,8 @@ public: void exportSeries( const com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > & xNewDiagram, const ::com::sun::star::awt::Size & rPageSize, - sal_Bool bExportContent, - sal_Bool bHasTwoYAxes ); + bool bExportContent, + bool bHasTwoYAxes ); void exportPropertyMapping( const com::sun::star::uno::Reference< com::sun::star::chart2::data::XDataSource > & xSource, @@ -222,20 +222,20 @@ public: ::com::sun::star::chart2::XDataSeries > > & aSeriesSeq, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram, - sal_Bool bJapaneseCandleSticks, - sal_Bool bExportContent ); + bool bJapaneseCandleSticks, + bool bExportContent ); void exportDataPoints( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xSeriesProperties, sal_Int32 nSeriesLength, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram, - sal_Bool bExportContent ); + bool bExportContent ); void exportRegressionCurve( const com::sun::star::uno::Reference<com::sun::star::chart2::XDataSeries>& xSeries, const com::sun::star::awt::Size& rPageSize, - sal_Bool bExportContent ); + bool bExportContent ); void exportErrorBar ( const ::com::sun::star::uno::Reference<beans::XPropertySet> &xSeriesProp, bool bYError, @@ -261,9 +261,9 @@ public: OUString msString; // members filled by InitRangeSegmentationProperties (retrieved from DataProvider) - sal_Bool mbHasSeriesLabels; - sal_Bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false - sal_Bool mbRowSourceColumns; + bool mbHasSeriesLabels; + bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false + bool mbRowSourceColumns; OUString msChartAddress; OUString msTableNumberList; ::com::sun::star::uno::Sequence< sal_Int32 > maSequenceMapping; @@ -415,7 +415,7 @@ Reference< chart2::data::XLabeledDataSequence > return aNoResult; } -Reference< chart2::data::XDataSource > lcl_pressUsedDataIntoRectangularFormat( const Reference< chart2::XChartDocument >& xChartDoc, sal_Bool& rOutSourceHasCategoryLabels ) +Reference< chart2::data::XDataSource > lcl_pressUsedDataIntoRectangularFormat( const Reference< chart2::XChartDocument >& xChartDoc, bool& rOutSourceHasCategoryLabels ) { ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aLabeledSeqVector; @@ -424,7 +424,7 @@ Reference< chart2::data::XDataSource > lcl_pressUsedDataIntoRectangularFormat( c Reference< chart2::data::XLabeledDataSequence > xCategories( lcl_getCategories( xDiagram ) ); if( xCategories.is() ) aLabeledSeqVector.push_back( xCategories ); - rOutSourceHasCategoryLabels = sal_Bool(xCategories.is()); + rOutSourceHasCategoryLabels = xCategories.is(); Sequence< Reference< chart2::data::XLabeledDataSequence > > aSeriesSeqVector( lcl_getAllSeriesSequences( xChartDoc ) ); @@ -1046,9 +1046,9 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl( SvXMLAutoStylePoolP& rASPool ) : mrExport( rExport ), mrAutoStylePool( rASPool ), - mbHasSeriesLabels( sal_False ), - mbHasCategoryLabels( sal_False ), - mbRowSourceColumns( sal_True ), + mbHasSeriesLabels( false ), + mbHasCategoryLabels( false ), + mbRowSourceColumns( true ), msCLSID( OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName())) { msTableName = "local-table"; @@ -1090,13 +1090,13 @@ SchXMLExportHelper_Impl::~SchXMLExportHelper_Impl() void SchXMLExportHelper_Impl::collectAutoStyles( Reference< chart::XChartDocument > rChartDoc ) { - parseDocument( rChartDoc, sal_False ); + parseDocument( rChartDoc, false ); } void SchXMLExportHelper_Impl::exportChart( Reference< chart::XChartDocument > rChartDoc, - sal_Bool bIncludeTable ) + bool bIncludeTable ) { - parseDocument( rChartDoc, sal_True, bIncludeTable ); + parseDocument( rChartDoc, true, bIncludeTable ); SAL_WARN_IF( !maAutoStyleNameQueue.empty(), "xmloff.chart", "There are still remaining autostyle names in the queue" ); } @@ -1125,8 +1125,8 @@ static OUString lcl_GetStringFromNumberSequence( const ::com::sun::star::uno::Se /// if bExportContent is false the auto-styles are collected void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& rChartDoc, - sal_Bool bExportContent, - sal_Bool bIncludeTable ) + bool bExportContent, + bool bIncludeTable ) { Reference< chart2::XChartDocument > xNewDoc( rChartDoc, uno::UNO_QUERY ); if( !rChartDoc.is() || !xNewDoc.is() ) @@ -1154,9 +1154,9 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& } // get Properties of ChartDocument - sal_Bool bHasMainTitle = sal_False; - sal_Bool bHasSubTitle = sal_False; - sal_Bool bHasLegend = sal_False; + bool bHasMainTitle = false; + bool bHasSubTitle = false; + bool bHasLegend = false; util::DateTime aNullDate(0,0,0,0,30,12,1899, false); std::vector< XMLPropertyState > aPropertyStates; @@ -1849,8 +1849,8 @@ void SchXMLExportHelper_Impl::exportPlotArea( Reference< chart::XDiagram > xDiagram, Reference< chart2::XDiagram > xNewDiagram, const awt::Size & rPageSize, - sal_Bool bExportContent, - sal_Bool bIncludeTable ) + bool bExportContent, + bool bIncludeTable ) { SAL_WARN_IF( !xDiagram.is(), "xmloff.chart", "Invalid XDiagram as parameter" ); if( ! xDiagram.is()) @@ -1860,7 +1860,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( Reference< beans::XPropertySet > xPropSet; std::vector< XMLPropertyState > aPropertyStates; - sal_Bool bIs3DChart = sal_False; + bool bIs3DChart = false; drawing::HomogenMatrix aTransMatrix; msStringBuffer.setLength( 0 ); @@ -1894,7 +1894,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( if( xDocProp.is()) { Any aAny; - sal_Bool bFirstCol = false, bFirstRow = false; + bool bFirstCol = false, bFirstRow = false; try { @@ -2354,29 +2354,29 @@ void SchXMLExportHelper_Impl::exportAxis( void SchXMLExportHelper_Impl::exportAxes( const Reference< chart::XDiagram > & xDiagram, const Reference< chart2::XDiagram > & xNewDiagram, - sal_Bool bExportContent ) + bool bExportContent ) { SAL_WARN_IF( !xDiagram.is(), "xmloff.chart", "Invalid XDiagram as parameter" ); if( ! xDiagram.is()) return; // get some properties from document first - sal_Bool bHasXAxis = sal_False, - bHasYAxis = sal_False, - bHasZAxis = sal_False, - bHasSecondaryXAxis = sal_False, - bHasSecondaryYAxis = sal_False; - sal_Bool bHasXAxisTitle = sal_False, - bHasYAxisTitle = sal_False, - bHasZAxisTitle = sal_False, - bHasSecondaryXAxisTitle = sal_False, - bHasSecondaryYAxisTitle = sal_False; - sal_Bool bHasXAxisMajorGrid = sal_False, - bHasXAxisMinorGrid = sal_False, - bHasYAxisMajorGrid = sal_False, - bHasYAxisMinorGrid = sal_False, - bHasZAxisMajorGrid = sal_False, - bHasZAxisMinorGrid = sal_False; + bool bHasXAxis = false, + bHasYAxis = false, + bHasZAxis = false, + bHasSecondaryXAxis = false, + bHasSecondaryYAxis = false; + bool bHasXAxisTitle = false, + bHasYAxisTitle = false, + bHasZAxisTitle = false, + bHasSecondaryXAxisTitle = false, + bHasSecondaryYAxisTitle = false; + bool bHasXAxisMajorGrid = false, + bHasXAxisMinorGrid = false, + bHasYAxisMajorGrid = false, + bHasYAxisMinorGrid = false, + bHasZAxisMajorGrid = false, + bHasZAxisMinorGrid = false; // get multiple properties using XMultiPropertySet MultiPropertySetHandler aDiagramProperties (xDiagram); @@ -2563,8 +2563,8 @@ namespace void SchXMLExportHelper_Impl::exportSeries( const Reference< chart2::XDiagram > & xNewDiagram, const awt::Size & rPageSize, - sal_Bool bExportContent, - sal_Bool bHasTwoYAxes ) + bool bExportContent, + bool bHasTwoYAxes ) { Reference< chart2::XCoordinateSystemContainer > xBCooSysCnt( xNewDiagram, uno::UNO_QUERY ); if( ! xBCooSysCnt.is()) @@ -2600,7 +2600,7 @@ void SchXMLExportHelper_Impl::exportSeries( // special export for stock charts if ( aChartType == "com.sun.star.chart2.CandleStickChartType" ) { - sal_Bool bJapaneseCandleSticks = sal_False; + bool bJapaneseCandleSticks = false; Reference< beans::XPropertySet > xCTProp( aCTSeq[nCTIdx], uno::UNO_QUERY ); if( xCTProp.is()) xCTProp->getPropertyValue("Japanese") >>= bJapaneseCandleSticks; @@ -2623,7 +2623,7 @@ void SchXMLExportHelper_Impl::exportSeries( sal_Int32 nMainSequenceIndex = -1; sal_Int32 nSeriesLength = 0; sal_Int32 nAttachedAxis = chart::ChartAxisAssign::PRIMARY_Y; - sal_Bool bHasMeanValueLine = false; + bool bHasMeanValueLine = false; Reference< beans::XPropertySet > xPropSet; tLabelValuesDataPair aSeriesLabelValuesPair; @@ -2919,7 +2919,7 @@ void SchXMLExportHelper_Impl::exportPropertyMapping( void SchXMLExportHelper_Impl::exportRegressionCurve( const Reference< chart2::XDataSeries >& xSeries, const awt::Size& rPageSize, - sal_Bool bExportContent ) + bool bExportContent ) { OSL_ASSERT( mxExpPropMapper.is()); @@ -3126,8 +3126,8 @@ void SchXMLExportHelper_Impl::exportErrorBar( const Reference<beans::XPropertySe void SchXMLExportHelper_Impl::exportCandleStickSeries( const Sequence< Reference< chart2::XDataSeries > > & aSeriesSeq, const Reference< chart2::XDiagram > & xDiagram, - sal_Bool bJapaneseCandleSticks, - sal_Bool bExportContent ) + bool bJapaneseCandleSticks, + bool bExportContent ) { for( sal_Int32 nSeriesIdx=0; nSeriesIdx<aSeriesSeq.getLength(); ++nSeriesIdx ) @@ -3237,7 +3237,7 @@ void SchXMLExportHelper_Impl::exportDataPoints( const uno::Reference< beans::XPropertySet > & xSeriesProperties, sal_Int32 nSeriesLength, const uno::Reference< chart2::XDiagram > & xDiagram, - sal_Bool bExportContent ) + bool bExportContent ) { // data-points @@ -3611,7 +3611,7 @@ void SchXMLExport::_ExportContent() if( xChartDoc.is()) { // determine if data comes from the outside - sal_Bool bIncludeTable = sal_True; + bool bIncludeTable = true; Reference< chart2::XChartDocument > xNewDoc( xChartDoc, uno::UNO_QUERY ); if( xNewDoc.is()) @@ -3622,7 +3622,7 @@ void SchXMLExport::_ExportContent() Reference< lang::XServiceInfo > xDPServiceInfo( xNewDoc->getDataProvider(), uno::UNO_QUERY ); if( ! (xDPServiceInfo.is() && xDPServiceInfo->getImplementationName() == "com.sun.star.comp.chart.InternalDataProvider" )) { - bIncludeTable = sal_False; + bIncludeTable = false; } } else diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 9f0c3e7dc9c2..ef6ef13b4b2d 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -133,10 +133,10 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext( const OUString& rXLinkHRefAttributeToIndicateDataProvider, OUString& rCategoriesAddress, OUString& rChartAddress, - bool& rbHasRangeAtPlotArea, - sal_Bool & rAllRangeAddressesAvailable, - sal_Bool & rColHasLabels, - sal_Bool & rRowHasLabels, + bool & rbHasRangeAtPlotArea, + bool & rAllRangeAddressesAvailable, + bool & rColHasLabels, + bool & rRowHasLabels, chart::ChartDataRowSource & rDataRowSource, SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles, const OUString& aChartTypeServiceName, @@ -147,7 +147,7 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext( mrCategoriesAddress( rCategoriesAddress ), mrSeriesDefaultsAndStyles( rSeriesDefaultsAndStyles ), mnNumOfLinesProp( 0 ), - mbStockHasVolume( sal_False ), + mbStockHasVolume( false ), mnSeries( 0 ), m_aGlobalSeriesImportInfo( rAllRangeAddressesAvailable ), maSceneImportHelper( rImport ), @@ -181,7 +181,7 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext( // turn off all axes initially uno::Any aFalseBool; - aFalseBool <<= (sal_Bool)(sal_False); + aFalseBool <<= false; uno::Reference< lang::XServiceInfo > xInfo( mxDiagram, uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xProp( mxDiagram, uno::UNO_QUERY ); @@ -265,11 +265,11 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri case XML_TOK_PA_DS_HAS_LABELS: { if( aValue.equals( ::xmloff::token::GetXMLToken( ::xmloff::token::XML_BOTH ))) - mrColHasLabels = mrRowHasLabels = sal_True; + mrColHasLabels = mrRowHasLabels = true; else if( aValue.equals( ::xmloff::token::GetXMLToken( ::xmloff::token::XML_ROW ))) - mrRowHasLabels = sal_True; + mrRowHasLabels = true; else if( aValue.equals( ::xmloff::token::GetXMLToken( ::xmloff::token::XML_COLUMN ))) - mrColHasLabels = sal_True; + mrColHasLabels = true; } break; case XML_TOK_PA_TRANSFORM: @@ -296,12 +296,12 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri try { uno::Any aAny; - aAny <<= (sal_Bool)(mrColHasLabels); + aAny <<= mrColHasLabels; xDocProp->setPropertyValue( OUString( "DataSourceLabelsInFirstColumn" ), aAny ); - aAny <<= (sal_Bool)(mrRowHasLabels); + aAny <<= mrRowHasLabels; xDocProp->setPropertyValue( OUString( "DataSourceLabelsInFirstRow" ), aAny ); @@ -558,7 +558,7 @@ void SchXMLPlotAreaContext::EndElement() uno::Reference< beans::XPropertySet > xDiaProp( mxDiagram, uno::UNO_QUERY ); if( xDiaProp.is()) { - sal_Bool bIsThreeDim = sal_False; + bool bIsThreeDim = false; uno::Any aAny = xDiaProp->getPropertyValue("Dim3D"); aAny >>= bIsThreeDim; diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx index 60a596f0e489..128e6364d2ab 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx @@ -80,8 +80,8 @@ private: bool m_bHasSizeHeight; bool m_bHasPositionX; bool m_bHasPositionY; - sal_Bool m_bAutoSize; - sal_Bool m_bAutoPosition; + bool m_bAutoSize; + bool m_bAutoPosition; }; class SchXMLPlotAreaContext : public SvXMLImportContext @@ -93,9 +93,9 @@ public: OUString& rCategoriesAddress, OUString& rChartAddress, bool& bHasRangeAtPlotArea, - sal_Bool & rAllRangeAddressesAvailable, - sal_Bool & rColHasLabels, - sal_Bool & rRowHasLabels, + bool & rAllRangeAddressesAvailable, + bool & rColHasLabels, + bool & rRowHasLabels, ::com::sun::star::chart::ChartDataRowSource & rDataRowSource, SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles, const OUString& aChartTypeServiceName, @@ -118,7 +118,7 @@ private: OUString& mrCategoriesAddress; SeriesDefaultsAndStyles& mrSeriesDefaultsAndStyles; sal_Int32 mnNumOfLinesProp; - sal_Bool mbStockHasVolume; + bool mbStockHasVolume; sal_Int32 mnSeries; GlobalSeriesImportInfo m_aGlobalSeriesImportInfo; @@ -131,8 +131,8 @@ private: const OUString& m_rXLinkHRefAttributeToIndicateDataProvider; OUString& mrChartAddress; bool& m_rbHasRangeAtPlotArea; - sal_Bool & mrColHasLabels; - sal_Bool & mrRowHasLabels; + bool & mrColHasLabels; + bool & mrRowHasLabels; ::com::sun::star::chart::ChartDataRowSource & mrDataRowSource; OUString maChartTypeServiceName; diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 54dcd57602b6..95e0a06ad15c 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -260,7 +260,7 @@ SchXMLSeries2Context::SchXMLSeries2Context( ::std::list< DataRowPointStyle >& rStyleList, ::std::list< RegressionStyle >& rRegressionStyleList, sal_Int32 nSeriesIndex, - sal_Bool bStockHasVolume, + bool bStockHasVolume, GlobalSeriesImportInfo& rGlobalSeriesImportInfo, const OUString & aGlobalChartTypeName, tSchXMLLSequencesPerIndex & rLSequencesPerIndex, @@ -374,7 +374,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib { SAL_WARN_IF( !mxNewDoc.is(), "xmloff.chart", "mxNewDoc is NULL"); if( m_rGlobalSeriesImportInfo.rbAllRangeAddressesAvailable && ! bHasRange ) - m_rGlobalSeriesImportInfo.rbAllRangeAddressesAvailable = sal_False; + m_rGlobalSeriesImportInfo.rbAllRangeAddressesAvailable = false; bool bIsCandleStick = maGlobalChartTypeName == "com.sun.star.chart2.CandleStickChartType"; if( !maSeriesChartTypeName.isEmpty() ) diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx index ee78f4ceede7..2da8543dbeb1 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.hxx +++ b/xmloff/source/chart/SchXMLSeries2Context.hxx @@ -53,7 +53,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > m_xSeries; sal_Int32 mnSeriesIndex; sal_Int32 mnDataPointIndex; - sal_Bool m_bStockHasVolume; + bool m_bStockHasVolume; GlobalSeriesImportInfo& m_rGlobalSeriesImportInfo; @@ -80,7 +80,7 @@ public: ::std::list< DataRowPointStyle >& rStyleList, ::std::list< RegressionStyle >& rRegressionStyleList, sal_Int32 nSeriesIndex, - sal_Bool bStockHasVolume, + bool bStockHasVolume, GlobalSeriesImportInfo& rGlobalSeriesImportInfo, const OUString & aGlobalChartTypeName, tSchXMLLSequencesPerIndex & rLSequencesPerIndex, diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx index 37ac8e69dafc..1326d300e90d 100644 --- a/xmloff/source/chart/SchXMLTableContext.hxx +++ b/xmloff/source/chart/SchXMLTableContext.hxx @@ -68,7 +68,7 @@ class SchXMLTableHelper { private: static void GetCellAddress( const OUString& rStr, sal_Int32& rCol, sal_Int32& rRow ); - static sal_Bool GetCellRangeAddress( const OUString& rStr, SchNumericCellRangeAddress& rResult ); + static bool GetCellRangeAddress( const OUString& rStr, SchNumericCellRangeAddress& rResult ); static void AdjustMax( const SchNumericCellRangeAddress& rAddr, sal_Int32& nRows, sal_Int32& nColumns ); diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index e37ed835295c..7595c3f3dfcd 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -382,7 +382,7 @@ Reference< chart2::data::XDataSequence > CreateDataSequence( { try { - sal_Bool bVal = sal_False; + bool bVal = false; uno::Any any = xPropSet->getPropertyValue("UseInternalDataProvider"); if (any >>= bVal) bUseInternal = static_cast<bool>(bVal); diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx index 21a4240d949c..bf7a9c3e043a 100644 --- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx +++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx @@ -70,7 +70,7 @@ void XMLLabelSeparatorContext::EndElement() { // aProp is a member of XMLElementPropertyContext aProp.maValue <<= m_aSeparator; - SetInsert( sal_True ); + SetInsert( true ); } XMLElementPropertyContext::EndElement(); diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx index a1feba24a2d9..b448b922ae4a 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.cxx +++ b/xmloff/source/chart/XMLSymbolImageContext.cxx @@ -133,7 +133,7 @@ void XMLSymbolImageContext::EndElement() { // aProp is a member of XMLElementPropertyContext aProp.maValue <<= sResolvedURL; - SetInsert( sal_True ); + SetInsert( true ); } XMLElementPropertyContext::EndElement(); diff --git a/xmloff/source/chart/XMLTextOrientationHdl.cxx b/xmloff/source/chart/XMLTextOrientationHdl.cxx index 4e7527f19eff..8acec97d5673 100644 --- a/xmloff/source/chart/XMLTextOrientationHdl.cxx +++ b/xmloff/source/chart/XMLTextOrientationHdl.cxx @@ -37,12 +37,12 @@ bool XMLTextOrientationHdl::importXML( if( IsXMLToken( rStrImpValue, XML_LTR )) { - rValue <<= static_cast< sal_Bool >( sal_False ); + rValue <<= false; bRetval = true; } else if( IsXMLToken( rStrImpValue, XML_TTB )) { - rValue <<= static_cast< sal_Bool >( sal_True ); + rValue <<= true; bRetval = true; } @@ -54,7 +54,7 @@ bool XMLTextOrientationHdl::exportXML( const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { - sal_Bool bVal (sal_False ); + bool bVal (false ); bool bRetval( false ); if( rValue >>= bVal ) diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx index ab1dde1aef1f..15831c02a480 100644 --- a/xmloff/source/chart/transporttypes.hxx +++ b/xmloff/source/chart/transporttypes.hxx @@ -127,14 +127,14 @@ struct SchXMLAxis struct GlobalSeriesImportInfo { - GlobalSeriesImportInfo( sal_Bool& rAllRangeAddressesAvailable ) + GlobalSeriesImportInfo( bool& rAllRangeAddressesAvailable ) : rbAllRangeAddressesAvailable( rAllRangeAddressesAvailable ) , nCurrentDataIndex( 0 ) , nFirstFirstDomainIndex( -1 ) , nFirstSecondDomainIndex( -1 ) {} - sal_Bool& rbAllRangeAddressesAvailable; + bool& rbAllRangeAddressesAvailable; sal_Int32 nCurrentDataIndex; diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index 981463439e06..b65266afb637 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -562,9 +562,9 @@ void XMLConfigItemContext::EndElement() { if (IsXMLToken(msType, XML_BOOLEAN)) { - sal_Bool bValue(sal_False); + bool bValue(false); if (IsXMLToken(msValue, XML_TRUE)) - bValue = sal_True; + bValue = true; mrAny <<= bValue; } else if (IsXMLToken(msType, XML_BYTE)) diff --git a/xmloff/source/core/SvXMLAttrCollection.cxx b/xmloff/source/core/SvXMLAttrCollection.cxx index c0aa7a0b1ac5..e5220ae875a4 100644 --- a/xmloff/source/core/SvXMLAttrCollection.cxx +++ b/xmloff/source/core/SvXMLAttrCollection.cxx @@ -16,75 +16,75 @@ bool SvXMLAttrCollection::operator ==( const SvXMLAttrCollection& rCmp ) const (rCmp.aAttrs == aAttrs); } -sal_Bool SvXMLAttrCollection::AddAttr( const OUString& rLName, +bool SvXMLAttrCollection::AddAttr( const OUString& rLName, const OUString& rValue ) { aAttrs.push_back( SvXMLAttr(rLName, rValue) ); - return sal_True; + return true; } -sal_Bool SvXMLAttrCollection::AddAttr( const OUString& rPrefix, +bool SvXMLAttrCollection::AddAttr( const OUString& rPrefix, const OUString& rNamespace, const OUString& rLName, const OUString& rValue ) { sal_uInt16 nPos = aNamespaceMap.Add( rPrefix, rNamespace ); aAttrs.push_back( SvXMLAttr(nPos, rLName, rValue) ); - return sal_True; + return true; } -sal_Bool SvXMLAttrCollection::AddAttr( const OUString& rPrefix, +bool SvXMLAttrCollection::AddAttr( const OUString& rPrefix, const OUString& rLName, const OUString& rValue ) { sal_uInt16 nPos = aNamespaceMap.GetIndexByPrefix( rPrefix ); if( USHRT_MAX == nPos ) - return sal_False; + return false; aAttrs.push_back( SvXMLAttr(nPos, rLName, rValue) ); - return sal_True; + return true; } -sal_Bool SvXMLAttrCollection::SetAt( size_t i, +bool SvXMLAttrCollection::SetAt( size_t i, const OUString& rLName, const OUString& rValue ) { if( i >= GetAttrCount() ) - return sal_False; + return false; aAttrs[i] = SvXMLAttr(rLName, rValue); - return sal_True; + return true; } -sal_Bool SvXMLAttrCollection::SetAt( size_t i, +bool SvXMLAttrCollection::SetAt( size_t i, const OUString& rPrefix, const OUString& rNamespace, const OUString& rLName, const OUString& rValue ) { if( i >= GetAttrCount() ) - return sal_False; + return false; sal_uInt16 nPos = aNamespaceMap.Add( rPrefix, rNamespace ); if( USHRT_MAX == nPos ) - return sal_False; + return false; aAttrs[i] = SvXMLAttr(nPos, rLName, rValue); - return sal_True; + return true; } -sal_Bool SvXMLAttrCollection::SetAt( size_t i, +bool SvXMLAttrCollection::SetAt( size_t i, const OUString& rPrefix, const OUString& rLName, const OUString& rValue ) { if( i >= GetAttrCount() ) - return sal_False; + return false; sal_uInt16 nPos = aNamespaceMap.GetIndexByPrefix( rPrefix ); if( USHRT_MAX == nPos ) - return sal_False; + return false; aAttrs[i] = SvXMLAttr(nPos, rLName, rValue); - return sal_True; + return true; } void SvXMLAttrCollection::Remove( size_t i ) diff --git a/xmloff/source/core/SvXMLAttrCollection.hxx b/xmloff/source/core/SvXMLAttrCollection.hxx index 5e4bcb171401..feed18820a26 100644 --- a/xmloff/source/core/SvXMLAttrCollection.hxx +++ b/xmloff/source/core/SvXMLAttrCollection.hxx @@ -24,25 +24,25 @@ public: std::vector<SvXMLAttr> aAttrs; bool operator==(const SvXMLAttrCollection &rCmp) const; - sal_Bool AddAttr( const OUString& rLName, + bool AddAttr( const OUString& rLName, const OUString& rValue ); - sal_Bool AddAttr( const OUString& rPrefix, + bool AddAttr( const OUString& rPrefix, const OUString& rNamespace, const OUString& rLName, const OUString& rValue ); - sal_Bool AddAttr( const OUString& rPrefix, + bool AddAttr( const OUString& rPrefix, const OUString& rLName, const OUString& rValue ); - sal_Bool SetAt( size_t i, + bool SetAt( size_t i, const OUString& rLName, const OUString& rValue ); - sal_Bool SetAt( size_t i, + bool SetAt( size_t i, const OUString& rPrefix, const OUString& rNamespace, const OUString& rLName, const OUString& rValue ); - sal_Bool SetAt( size_t i, + bool SetAt( size_t i, const OUString& rPrefix, const OUString& rLName, const OUString& rValue ); diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx index 3daf5efa29c3..c33eea156d72 100644 --- a/xmloff/source/core/XMLBase64Export.cxx +++ b/xmloff/source/core/XMLBase64Export.cxx @@ -38,9 +38,9 @@ XMLBase64Export::XMLBase64Export( SvXMLExport& rExp ) : rExport( rExp ){ } -sal_Bool XMLBase64Export::exportXML( const Reference < XInputStream> & rIn ) +bool XMLBase64Export::exportXML( const Reference < XInputStream> & rIn ) { - sal_Bool bRet = sal_True; + bool bRet = true; try { Sequence < sal_Int8 > aInBuff( INPUT_BUFFER_SIZE ); @@ -61,13 +61,13 @@ sal_Bool XMLBase64Export::exportXML( const Reference < XInputStream> & rIn ) } catch( ... ) { - bRet = sal_False; + bRet = false; } return bRet; } -sal_Bool XMLBase64Export::exportElement( +bool XMLBase64Export::exportElement( const Reference < XInputStream > & rIn, sal_uInt16 nNamespace, enum ::xmloff::token::XMLTokenEnum eName ) @@ -76,7 +76,7 @@ sal_Bool XMLBase64Export::exportElement( return exportXML( rIn ); } -sal_Bool XMLBase64Export::exportOfficeBinaryDataElement( +bool XMLBase64Export::exportOfficeBinaryDataElement( const Reference < XInputStream > & rIn ) { return exportElement( rIn, XML_NAMESPACE_OFFICE, diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index dae65fb7cb8a..92c97059ba28 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -136,11 +136,11 @@ void XMLEmbeddedObjectImportContext_Impl::Characters( const OUString& rChars ) TYPEINIT1( XMLEmbeddedObjectImportContext, SvXMLImportContext ); -sal_Bool XMLEmbeddedObjectImportContext::SetComponent( +bool XMLEmbeddedObjectImportContext::SetComponent( Reference< XComponent >& rComp ) { if( !rComp.is() || sFilterService.isEmpty() ) - return sal_False; + return false; Sequence<Any> aArgs( 0 ); @@ -151,7 +151,7 @@ sal_Bool XMLEmbeddedObjectImportContext::SetComponent( UNO_QUERY); if( !xHandler.is() ) - return sal_False; + return false; try { @@ -167,7 +167,7 @@ sal_Bool XMLEmbeddedObjectImportContext::SetComponent( xComp = rComp; // keep ref to component only if there is a handler - return sal_True; + return true; } XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext( diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 9116b34a966b..9b5354d2bfb9 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -1600,7 +1600,7 @@ bool SvXMLImport::IsODFVersionConsistent( const OUString& aODFVersion ) // the check should be done only for OASIS format if (!IsOOoXML()) { - sal_Bool bRepairPackage = sal_False; + bool bRepairPackage = false; try { xStorProps->getPropertyValue( "RepairPackage" ) @@ -1627,7 +1627,7 @@ bool SvXMLImport::IsODFVersionConsistent( const OUString& aODFVersion ) if ( bResult ) { - sal_Bool bInconsistent = sal_False; + bool bInconsistent = false; xStorProps->getPropertyValue( "IsInconsistent" ) >>= bInconsistent; bResult = !bInconsistent; diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index 88abaa8ca675..afbe5797bf7f 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -99,7 +99,7 @@ void XMLGraphicsDefaultStyle::SetDefaults() if( !xDefaults.is() ) return; // SJ: #i114750# - sal_Bool bWordWrapDefault = sal_True; // initializing with correct ODF fo:wrap-option default + bool bWordWrapDefault = true; // initializing with correct ODF fo:wrap-option default sal_Int32 nUPD( 0 ); sal_Int32 nBuild( 0 ); const bool bBuildIdFound = GetImport().getBuildIds( nUPD, nBuild ); @@ -110,7 +110,7 @@ void XMLGraphicsDefaultStyle::SetDefaults() || ((nUPD > 300) && (nUPD <= 330)) ) ) - bWordWrapDefault = sal_False; + bWordWrapDefault = false; const OUString sTextWordWrap( "TextWordWrap" ); Reference< XPropertySetInfo > xInfo( xDefaults->getPropertySetInfo() ); diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 79628fc8c5da..0562b98d6a16 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -120,9 +120,9 @@ protected: OUStringBuffer sDescriptionBuffer; OUStringBuffer sTitleBuffer; OUString sNam; - sal_Bool bIsActive; + bool bIsActive; - sal_Bool bValid; + bool bValid; public: TYPEINFO_OVERRIDE(); @@ -180,8 +180,8 @@ XMLImageMapObjectContext::XMLImageMapObjectContext( sTarget("Target"), sURL("URL"), xImageMap(xMap), - bIsActive(sal_True), - bValid(sal_False) + bIsActive(true), + bValid(false) { DBG_ASSERT(NULL != pServiceName, "Please supply the image map object service name"); @@ -313,10 +313,10 @@ class XMLImageMapRectangleContext : public XMLImageMapObjectContext { awt::Rectangle aRectangle; - sal_Bool bXOK; - sal_Bool bYOK; - sal_Bool bWidthOK; - sal_Bool bHeightOK; + bool bXOK; + bool bYOK; + bool bWidthOK; + bool bHeightOK; public: TYPEINFO_OVERRIDE(); @@ -351,10 +351,10 @@ XMLImageMapRectangleContext::XMLImageMapRectangleContext( Reference<XIndexContainer> xMap) : XMLImageMapObjectContext(rImport, nPrefix, rLocalName, xMap, "com.sun.star.image.ImageMapRectangleObject"), - bXOK(sal_False), - bYOK(sal_False), - bWidthOK(sal_False), - bHeightOK(sal_False) + bXOK(false), + bYOK(false), + bWidthOK(false), + bHeightOK(false) { } @@ -374,7 +374,7 @@ void XMLImageMapRectangleContext::ProcessAttribute( rValue)) { aRectangle.X = nTmp; - bXOK = sal_True; + bXOK = true; } break; case XML_TOK_IMAP_Y: @@ -382,7 +382,7 @@ void XMLImageMapRectangleContext::ProcessAttribute( rValue)) { aRectangle.Y = nTmp; - bYOK = sal_True; + bYOK = true; } break; case XML_TOK_IMAP_WIDTH: @@ -390,7 +390,7 @@ void XMLImageMapRectangleContext::ProcessAttribute( rValue)) { aRectangle.Width = nTmp; - bWidthOK = sal_True; + bWidthOK = true; } break; case XML_TOK_IMAP_HEIGHT: @@ -398,7 +398,7 @@ void XMLImageMapRectangleContext::ProcessAttribute( rValue)) { aRectangle.Height = nTmp; - bHeightOK = sal_True; + bHeightOK = true; } break; default: @@ -425,8 +425,8 @@ class XMLImageMapPolygonContext : public XMLImageMapObjectContext OUString sViewBoxString; OUString sPointsString; - sal_Bool bViewBoxOK; - sal_Bool bPointsOK; + bool bViewBoxOK; + bool bPointsOK; public: TYPEINFO_OVERRIDE(); @@ -461,8 +461,8 @@ XMLImageMapPolygonContext::XMLImageMapPolygonContext( Reference<XIndexContainer> xMap) : XMLImageMapObjectContext(rImport, nPrefix, rLocalName, xMap, "com.sun.star.image.ImageMapPolygonObject"), - bViewBoxOK(sal_False), - bPointsOK(sal_False) + bViewBoxOK(false), + bPointsOK(false) { } @@ -478,11 +478,11 @@ void XMLImageMapPolygonContext::ProcessAttribute( { case XML_TOK_IMAP_POINTS: sPointsString = rValue; - bPointsOK = sal_True; + bPointsOK = true; break; case XML_TOK_IMAP_VIEWBOX: sViewBoxString = rValue; - bViewBoxOK = sal_True; + bViewBoxOK = true; break; default: XMLImageMapObjectContext::ProcessAttribute(eToken, rValue); @@ -522,9 +522,9 @@ class XMLImageMapCircleContext : public XMLImageMapObjectContext awt::Point aCenter; sal_Int32 nRadius; - sal_Bool bXOK; - sal_Bool bYOK; - sal_Bool bRadiusOK; + bool bXOK; + bool bYOK; + bool bRadiusOK; public: TYPEINFO_OVERRIDE(); @@ -580,7 +580,7 @@ void XMLImageMapCircleContext::ProcessAttribute( rValue)) { aCenter.X = nTmp; - bXOK = sal_True; + bXOK = true; } break; case XML_TOK_IMAP_CENTER_Y: @@ -588,7 +588,7 @@ void XMLImageMapCircleContext::ProcessAttribute( rValue)) { aCenter.Y = nTmp; - bYOK = sal_True; + bYOK = true; } break; case XML_TOK_IMAP_RADIUS: @@ -596,7 +596,7 @@ void XMLImageMapCircleContext::ProcessAttribute( rValue)) { nRadius = nTmp; - bRadiusOK = sal_True; + bRadiusOK = true; } break; default: diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx index 73336d34fca5..b1f33257e350 100644 --- a/xmloff/source/draw/XMLImageMapExport.cxx +++ b/xmloff/source/draw/XMLImageMapExport.cxx @@ -71,7 +71,7 @@ XMLImageMapExport::XMLImageMapExport(SvXMLExport& rExp) : msURL("URL"), msTitle("Title"), mrExport(rExp), - mbWhiteSpace(sal_True) + mbWhiteSpace(true) { } diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index f88d09fa438c..fe039068a481 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -34,33 +34,33 @@ using namespace ::xmloff::token; struct SdXMLDataStyleNumber { enum XMLTokenEnum meNumberStyle; - sal_Bool mbLong; - sal_Bool mbTextual; - sal_Bool mbDecimal02; + bool mbLong; + bool mbTextual; + bool mbDecimal02; const char* mpText; } aSdXMLDataStyleNumbers[] = { - { XML_DAY, sal_False, sal_False, sal_False, NULL }, - { XML_DAY, sal_True, sal_False, sal_False, NULL }, - { XML_MONTH, sal_True, sal_False, sal_False, NULL }, - { XML_MONTH, sal_False, sal_True, sal_False, NULL }, - { XML_MONTH, sal_True, sal_True, sal_False, NULL }, - { XML_YEAR, sal_False, sal_False, sal_False, NULL }, - { XML_YEAR, sal_True, sal_False, sal_False, NULL }, - { XML_DAY_OF_WEEK, sal_False, sal_False, sal_False, NULL }, - { XML_DAY_OF_WEEK, sal_True, sal_False, sal_False, NULL }, - { XML_TEXT, sal_False, sal_False, sal_False, "." }, - { XML_TEXT, sal_False, sal_False, sal_False, " " }, - { XML_TEXT, sal_False, sal_False, sal_False, ", " }, - { XML_TEXT, sal_False, sal_False, sal_False, ". " }, - { XML_HOURS, sal_False, sal_False, sal_False, NULL }, - { XML_MINUTES, sal_False, sal_False, sal_False, NULL }, - { XML_TEXT, sal_False, sal_False, sal_False, ":" }, - { XML_AM_PM, sal_False, sal_False, sal_False, NULL }, - { XML_SECONDS, sal_False, sal_False, sal_False, NULL }, - { XML_SECONDS, sal_False, sal_False, sal_True, NULL }, - { XML_TOKEN_INVALID, 0, 0, 0, NULL } + { XML_DAY, false, false, false, NULL }, + { XML_DAY, true, false, false, NULL }, + { XML_MONTH, true, false, false, NULL }, + { XML_MONTH, false, true, false, NULL }, + { XML_MONTH, true, true, false, NULL }, + { XML_YEAR, false, false, false, NULL }, + { XML_YEAR, true, false, false, NULL }, + { XML_DAY_OF_WEEK, false, false, false, NULL }, + { XML_DAY_OF_WEEK, true, false, false, NULL }, + { XML_TEXT, false, false, false, "." }, + { XML_TEXT, false, false, false, " " }, + { XML_TEXT, false, false, false, ", " }, + { XML_TEXT, false, false, false, ". " }, + { XML_HOURS, false, false, false, NULL }, + { XML_MINUTES, false, false, false, NULL }, + { XML_TEXT, false, false, false, ":" }, + { XML_AM_PM, false, false, false, NULL }, + { XML_SECONDS, false, false, false, NULL }, + { XML_SECONDS, false, false, true, NULL }, + { XML_TOKEN_INVALID, false, false, false, NULL } }; // date @@ -88,14 +88,14 @@ struct SdXMLDataStyleNumber struct SdXMLFixedDataStyle { const char* mpName; - sal_Bool mbAutomatic; - sal_Bool mbDateStyle; + bool mbAutomatic; + bool mbDateStyle; sal_uInt8 mpFormat[8]; }; const SdXMLFixedDataStyle aSdXML_Standard_Short = { - "D1", sal_True, sal_True, + "D1", true, true, { DATA_STYLE_NUMBER_DAY_LONG, DATA_STYLE_NUMBER_TEXT_POINT, @@ -108,7 +108,7 @@ const SdXMLFixedDataStyle aSdXML_Standard_Short = const SdXMLFixedDataStyle aSdXML_Standard_Long = { - "D2", sal_True, sal_True, + "D2", true, true, { DATA_STYLE_NUMBER_DAYOFWEEK_LONG, DATA_STYLE_NUMBER_TEXT_COMMASPACE, @@ -123,7 +123,7 @@ const SdXMLFixedDataStyle aSdXML_Standard_Long = const SdXMLFixedDataStyle aSdXML_DateStyle_1 = { - "D3", sal_False, sal_True, + "D3", false, true, { DATA_STYLE_NUMBER_DAY_LONG, DATA_STYLE_NUMBER_TEXT_POINT, @@ -136,7 +136,7 @@ const SdXMLFixedDataStyle aSdXML_DateStyle_1 = const SdXMLFixedDataStyle aSdXML_DateStyle_2 = { - "D4", sal_False, sal_True, + "D4", false, true, { DATA_STYLE_NUMBER_DAY_LONG, DATA_STYLE_NUMBER_TEXT_POINT, @@ -149,7 +149,7 @@ const SdXMLFixedDataStyle aSdXML_DateStyle_2 = const SdXMLFixedDataStyle aSdXML_DateStyle_3 = { - "D5", sal_False, sal_True, + "D5", false, true, { DATA_STYLE_NUMBER_DAY, DATA_STYLE_NUMBER_TEXT_POINTSPACE, @@ -162,7 +162,7 @@ const SdXMLFixedDataStyle aSdXML_DateStyle_3 = const SdXMLFixedDataStyle aSdXML_DateStyle_4 = { - "D6", sal_False, sal_True, + "D6", false, true, { DATA_STYLE_NUMBER_DAY, DATA_STYLE_NUMBER_TEXT_POINTSPACE, @@ -175,7 +175,7 @@ const SdXMLFixedDataStyle aSdXML_DateStyle_4 = const SdXMLFixedDataStyle aSdXML_DateStyle_5 = { - "D7", sal_False, sal_True, + "D7", false, true, { DATA_STYLE_NUMBER_DAYOFWEEK, DATA_STYLE_NUMBER_TEXT_COMMASPACE, @@ -190,7 +190,7 @@ const SdXMLFixedDataStyle aSdXML_DateStyle_5 = const SdXMLFixedDataStyle aSdXML_DateStyle_6 = { - "D8", sal_False, sal_True, + "D8", false, true, { DATA_STYLE_NUMBER_DAYOFWEEK_LONG, DATA_STYLE_NUMBER_TEXT_COMMASPACE, @@ -204,7 +204,7 @@ const SdXMLFixedDataStyle aSdXML_DateStyle_6 = }; const SdXMLFixedDataStyle aSdXML_TimeStyle_1 = -{ "T1", sal_True, sal_False, +{ "T1", true, false, { DATA_STYLE_NUMBER_HOURS, DATA_STYLE_NUMBER_TEXT_COLON, @@ -217,7 +217,7 @@ const SdXMLFixedDataStyle aSdXML_TimeStyle_1 = }; const SdXMLFixedDataStyle aSdXML_TimeStyle_2 = -{ "T2", sal_False, sal_False, +{ "T2", false, false, { DATA_STYLE_NUMBER_HOURS, DATA_STYLE_NUMBER_TEXT_COLON, @@ -227,7 +227,7 @@ const SdXMLFixedDataStyle aSdXML_TimeStyle_2 = }; const SdXMLFixedDataStyle aSdXML_TimeStyle_3 = -{ "T3", sal_False, sal_False, +{ "T3", false, false, { DATA_STYLE_NUMBER_HOURS, DATA_STYLE_NUMBER_TEXT_COLON, @@ -239,7 +239,7 @@ const SdXMLFixedDataStyle aSdXML_TimeStyle_3 = }; const SdXMLFixedDataStyle aSdXML_TimeStyle_4 = -{ "T4", sal_False, sal_False, +{ "T4", false, false, { DATA_STYLE_NUMBER_HOURS, DATA_STYLE_NUMBER_TEXT_COLON, @@ -251,7 +251,7 @@ const SdXMLFixedDataStyle aSdXML_TimeStyle_4 = }; const SdXMLFixedDataStyle aSdXML_TimeStyle_5 = -{ "T5", sal_False, sal_False, +{ "T5", false, false, { DATA_STYLE_NUMBER_HOURS, DATA_STYLE_NUMBER_TEXT_COLON, @@ -262,7 +262,7 @@ const SdXMLFixedDataStyle aSdXML_TimeStyle_5 = }; const SdXMLFixedDataStyle aSdXML_TimeStyle_6 = -{ "T6", sal_False, sal_False, +{ "T6", false, false, { DATA_STYLE_NUMBER_HOURS, DATA_STYLE_NUMBER_TEXT_COLON, @@ -275,7 +275,7 @@ const SdXMLFixedDataStyle aSdXML_TimeStyle_6 = }; const SdXMLFixedDataStyle aSdXML_TimeStyle_7 = -{ "T7", sal_False, sal_False, +{ "T7", false, false, { DATA_STYLE_NUMBER_HOURS, DATA_STYLE_NUMBER_TEXT_COLON, @@ -482,9 +482,9 @@ private: SdXMLNumberFormatImportContext* mpParent; OUString maNumberStyle; - sal_Bool mbLong; - sal_Bool mbTextual; - sal_Bool mbDecimal02; + bool mbLong; + bool mbTextual; + bool mbDecimal02; OUString maText; boost::shared_ptr< SvXMLImportContext > mpSlaveContext; @@ -518,9 +518,9 @@ SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXM maNumberStyle( rLocalName ), mpSlaveContext( pSlaveContext ) { - mbLong = sal_False; - mbTextual = sal_False; - mbDecimal02 = sal_False; + mbLong = false; + mbTextual = false; + mbDecimal02 = false; const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for(sal_Int16 i=0; i < nAttrCount; i++) @@ -583,7 +583,7 @@ TYPEINIT1( SdXMLNumberFormatImportContext, SvXMLImportContext ); SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles) : SvXMLNumFormatContext(rImport, nPrfx, rLocalName, pNewData, nNewType, xAttrList, rStyles), - mbAutomatic( sal_False ), + mbAutomatic( false ), mnIndex(0), mnKey( -1 ) { @@ -611,7 +611,7 @@ SdXMLNumberFormatImportContext::~SdXMLNumberFormatImportContext() { } -void SdXMLNumberFormatImportContext::add( OUString& rNumberStyle, sal_Bool bLong, sal_Bool bTextual, sal_Bool bDecimal02, OUString& rText ) +void SdXMLNumberFormatImportContext::add( OUString& rNumberStyle, bool bLong, bool bTextual, bool bDecimal02, OUString& rText ) { if( mnIndex == -1 || mnIndex == 16 ) { diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx index dd92089234f4..8361fd2a76de 100644 --- a/xmloff/source/draw/XMLReplacementImageContext.cxx +++ b/xmloff/source/draw/XMLReplacementImageContext.cxx @@ -79,7 +79,7 @@ void XMLReplacementImageContext::EndElement() OUString sHRef; if( !m_sHRef.isEmpty() ) { - sal_Bool bForceLoad = xTxtImport->IsInsertMode() || + bool bForceLoad = xTxtImport->IsInsertMode() || xTxtImport->IsBlockMode() || xTxtImport->IsStylesOnlyMode() || xTxtImport->IsOrganizerMode(); diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index 4284637f58f5..60ad11a7355a 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -576,9 +576,9 @@ void AnimationsExporterImpl::exportTransitionNode() Any aSound( mxPageProps->getPropertyValue("Sound") ); OUString sSoundURL; aSound >>= sSoundURL; - sal_Bool bStopSound = sal_False; + bool bStopSound = false; if( !(aSound >>= bStopSound) ) - bStopSound = sal_False; + bStopSound = false; OUStringBuffer sTmp; @@ -598,7 +598,7 @@ void AnimationsExporterImpl::exportTransitionNode() if( nTransition != 0 ) { sal_Int16 nSubtype = 0; - sal_Bool bDirection = sal_False; + bool bDirection = false; sal_Int32 nFadeColor = 0; double fDuration = 0.0; mxPageProps->getPropertyValue("TransitionSubtype") >>= nSubtype; @@ -639,7 +639,7 @@ void AnimationsExporterImpl::exportTransitionNode() { mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, mrExport.GetRelativeReference( sSoundURL ) ); - sal_Bool bLoopSound = sal_False; + bool bLoopSound = false; mxPageProps->getPropertyValue("LoopSound") >>= bLoopSound; if( bLoopSound ) @@ -657,7 +657,7 @@ void AnimationsExporterImpl::prepareTransitionNode() sal_Int16 nTransition = 0; mxPageProps->getPropertyValue("TransitionType") >>= nTransition; - sal_Bool bStopSound = sal_False; + bool bStopSound = false; OUString sSoundURL; if( nTransition == 0 ) @@ -666,7 +666,7 @@ void AnimationsExporterImpl::prepareTransitionNode() aSound >>= sSoundURL; if( !(aSound >>= bStopSound) ) - bStopSound = sal_False; + bStopSound = false; } if( (nTransition != 0) || !sSoundURL.isEmpty() || bStopSound ) @@ -852,7 +852,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_DECELERATE, sTmp.makeStringAndClear() ); } - sal_Bool bTemp = xNode->getAutoReverse(); + bool bTemp = xNode->getAutoReverse(); if( bTemp ) { ::sax::Converter::convertBool( sTmp, bTemp ); @@ -1102,7 +1102,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat OUStringBuffer sTmp; sal_Int32 nTemp; - sal_Bool bTemp; + bool bTemp; Any aTemp( xAnimate->getTarget() ); if( aTemp.hasValue() ) diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index 14b50ad03b5e..0bc68d3ea400 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -197,7 +197,7 @@ enum XMLActionKind struct XMLEffectHint { XMLActionKind meKind; - sal_Bool mbTextEffect; + bool mbTextEffect; Reference<XShape> mxShape; XMLEffect meEffect; @@ -207,16 +207,16 @@ struct XMLEffectHint AnimationSpeed meSpeed; sal_Int32 maDimColor; OUString maSoundURL; - sal_Bool mbPlayFull; + bool mbPlayFull; sal_Int32 mnPresId; sal_Int32 mnPathShapeId; bool operator<(const XMLEffectHint& rComp) const { return mnPresId < rComp.mnPresId; } XMLEffectHint() - : meKind( XMLE_SHOW ), mbTextEffect( sal_False ), + : meKind( XMLE_SHOW ), mbTextEffect( false ), meEffect( EK_none ), meDirection( ED_none ), mnStartScale( -1 ), - meSpeed( AnimationSpeed_SLOW ), maDimColor(0), mbPlayFull( sal_False ), + meSpeed( AnimationSpeed_SLOW ), maDimColor(0), mbPlayFull( false ), mnPresId( 0 ), mnPathShapeId( -1 ) {} }; @@ -327,7 +327,7 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape, SvXMLExport& rE xProps->getPropertyValue( mpImpl->msSpeed ) >>= aEffect.meSpeed; - sal_Bool bIsAnimation = false; + bool bIsAnimation = false; xProps->getPropertyValue( mpImpl->msIsAnimation ) >>= bIsAnimation; if( bIsAnimation ) { @@ -380,7 +380,7 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape, SvXMLExport& rE bool bIn = true; SdXMLImplSetEffect( eEffect, aEffect.meEffect, aEffect.meDirection, aEffect.mnStartScale, bIn ); aEffect.meKind = bIn ? XMLE_SHOW : XMLE_HIDE; - aEffect.mbTextEffect = sal_True; + aEffect.mbTextEffect = true; if( !aEffect.mxShape.is() ) { @@ -389,12 +389,12 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape, SvXMLExport& rE } mpImpl->maEffects.push_back( aEffect ); - aEffect.mbTextEffect = sal_False; + aEffect.mbTextEffect = false; aEffect.maSoundURL = aEmptyStr; } - sal_Bool bDimPrev = false; - sal_Bool bDimHide = false; + bool bDimPrev = false; + bool bDimHide = false; xProps->getPropertyValue( mpImpl->msDimPrev ) >>= bDimPrev; xProps->getPropertyValue( mpImpl->msDimHide ) >>= bDimHide; if( bDimPrev || bDimHide ) diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index 72d27cea1198..00862123e194 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -365,7 +365,7 @@ public: AnimImpImpl* mpImpl; XMLActionKind meKind; - sal_Bool mbTextEffect; + bool mbTextEffect; OUString maShapeId; XMLEffect meEffect; @@ -375,7 +375,7 @@ public: AnimationSpeed meSpeed; sal_Int32 maDimColor; OUString maSoundURL; - sal_Bool mbPlayFull; + bool mbPlayFull; OUString maPathShapeId; public: @@ -447,9 +447,9 @@ TYPEINIT1( XMLAnimationsEffectContext, SvXMLImportContext ); XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, AnimImpImpl* pImpl ) : SvXMLImportContext(rImport, nPrfx, rLocalName), mpImpl( pImpl ), - meKind( XMLE_SHOW ), mbTextEffect( sal_False ), + meKind( XMLE_SHOW ), mbTextEffect( false ), meEffect( EK_none ), meDirection( ED_none ), mnStartScale( 100 ), - meSpeed( AnimationSpeed_MEDIUM ), maDimColor(0), mbPlayFull( sal_False ) + meSpeed( AnimationSpeed_MEDIUM ), maDimColor(0), mbPlayFull( false ) { if( IsXMLToken( rLocalName, XML_SHOW_SHAPE ) ) { @@ -458,7 +458,7 @@ XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, s else if( IsXMLToken( rLocalName, XML_SHOW_TEXT ) ) { meKind = XMLE_SHOW; - mbTextEffect = sal_True; + mbTextEffect = true; } else if( IsXMLToken( rLocalName, XML_HIDE_SHAPE ) ) { @@ -467,7 +467,7 @@ XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, s else if( IsXMLToken( rLocalName, XML_HIDE_TEXT ) ) { meKind = XMLE_HIDE; - mbTextEffect = sal_True; + mbTextEffect = true; } else if( IsXMLToken( rLocalName, XML_DIM ) ) { @@ -585,7 +585,7 @@ void XMLAnimationsEffectContext::EndElement() { if( meKind == XMLE_DIM ) { - aAny <<= (sal_Bool)sal_True; + aAny <<= true; xSet->setPropertyValue( mpImpl->msDimPrev, aAny ); aAny <<= maDimColor; @@ -593,7 +593,7 @@ void XMLAnimationsEffectContext::EndElement() } else if( meKind == XMLE_PLAY ) { - aAny <<= (sal_Bool)sal_True; + aAny <<= true; xSet->setPropertyValue( mpImpl->msIsAnimation, aAny ); // #i42894# speed is not supported for the old group animation fallback, so no need to set it diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index a99995a2eb92..0be658c134e8 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -83,8 +83,8 @@ public: virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList ) SAL_OVERRIDE; virtual void EndElement() SAL_OVERRIDE; - sal_Bool mbValid; - sal_Bool mbScript; + bool mbValid; + bool mbScript; ClickAction meClickAction; XMLEffect meEffect; XMLEffectDirection meDirection; @@ -92,7 +92,7 @@ public: AnimationSpeed meSpeed; sal_Int32 mnVerb; OUString msSoundURL; - sal_Bool mbPlayFull; + bool mbPlayFull; OUString msMacroName; OUString msBookmark; OUString msLanguage; @@ -150,21 +150,21 @@ TYPEINIT1( SdXMLEventContext, SvXMLImportContext ); SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XShape >& rxShape ) : SvXMLImportContext(rImp, nPrfx, rLocalName) - , mxShape(rxShape), mbValid(false), mbScript(sal_False) + , mxShape(rxShape), mbValid(false), mbScript(false) , meClickAction(ClickAction_NONE), meEffect(EK_none) , meDirection(ED_none), mnStartScale(100), meSpeed(AnimationSpeed_MEDIUM) - , mnVerb(0), mbPlayFull(sal_False) + , mnVerb(0), mbPlayFull(false) { static const OUString sXMLClickName( "click" ); if( nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_EVENT_LISTENER ) ) { - mbValid = sal_True; + mbValid = true; } else if( nPrfx == XML_NAMESPACE_SCRIPT && IsXMLToken( rLocalName, XML_EVENT_LISTENER ) ) { - mbScript = sal_True; - mbValid = sal_True; + mbScript = true; + mbValid = true; } else { diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 28fdee7dc4be..99841899651a 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -785,14 +785,14 @@ private: bool XMLMoveSizeProtectHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - const sal_Bool bValue = rStrImpValue.indexOf( GetXMLToken( mnType == XML_SD_TYPE_MOVE_PROTECT ? XML_POSITION : XML_SIZE ) ) != -1; + const bool bValue = rStrImpValue.indexOf( GetXMLToken( mnType == XML_SD_TYPE_MOVE_PROTECT ? XML_POSITION : XML_SIZE ) ) != -1; rValue <<= bValue; return true; } bool XMLMoveSizeProtectHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bValue = sal_Bool(); + bool bValue; if( !(rValue >>= bValue ) ) return false; @@ -828,7 +828,7 @@ bool XMLSdHeaderFooterVisibilityTypeHdl::importXML( // #i38644# // attributes with this type where saved with VISIBLE|HIDDEN prior // to src680m67. So we have to import that correctly - const sal_Bool bBool = IsXMLToken(rStrImpValue, XML_TRUE) || IsXMLToken(rStrImpValue, XML_VISIBLE); + const bool bBool = IsXMLToken(rStrImpValue, XML_TRUE) || IsXMLToken(rStrImpValue, XML_VISIBLE); rValue <<= bBool; return bBool || IsXMLToken(rStrImpValue, XML_FALSE) || IsXMLToken(rStrImpValue, XML_HIDDEN); } @@ -839,8 +839,8 @@ bool XMLSdHeaderFooterVisibilityTypeHdl::exportXML( const SvXMLUnitConverter& ) const { bool bRet = false; - OUStringBuffer aOut; - sal_Bool bValue = sal_Bool(); + OUStringBuffer aOut; + bool bValue; if (rValue >>= bValue) { @@ -1176,7 +1176,7 @@ XMLShapePropertySetMapper::~XMLShapePropertySetMapper() XMLShapeExportPropertyMapper::XMLShapeExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ) : SvXMLExportPropertyMapper( rMapper ) , maNumRuleExp( rExport ) -, mbIsInAutoStyles( sal_True ) +, mbIsInAutoStyles( true ) , msCDATA( GetXMLToken(XML_CDATA)) , msTrue( GetXMLToken(XML_TRUE)) , msFalse( GetXMLToken(XML_FALSE)) @@ -1345,14 +1345,14 @@ void XMLShapeExportPropertyMapper::ContextFilter( case CTF_SD_MOVE_PROTECT: { - sal_Bool bProtected = sal_Bool(); + bool bProtected; if( (property->maValue >>= bProtected) && !bProtected ) property->mnIndex = -1; } break; case CTF_SD_SIZE_PROTECT: { - sal_Bool bProtected = sal_Bool(); + bool bProtected; if( (property->maValue >>= bProtected) && !bProtected ) property->mnIndex = -1; } @@ -1381,7 +1381,7 @@ void XMLShapeExportPropertyMapper::ContextFilter( // do not export visual area for internal ole objects if( pOLEIsInternal ) { - sal_Bool bInternal = sal_Bool(); + bool bInternal; if( (pOLEIsInternal->maValue >>= bInternal) && !bInternal ) { try @@ -1489,7 +1489,7 @@ void XMLShapeExportPropertyMapper::ContextFilter( if( pCaptionIsEscRel ) { - sal_Bool bIsRel = false; + bool bIsRel = false; pCaptionIsEscRel->maValue >>= bIsRel; if( bIsRel ) @@ -1630,7 +1630,7 @@ void XMLPageExportPropertyMapper::ContextFilter( break; case CTF_PAGE_TRANSITION_DIRECTION: { - sal_Bool bDirection = sal_Bool(); + bool bDirection; if( ((mrExport.getExportFlags() & EXPORT_OASIS) == 0) || (((*property).maValue >>= bDirection) && bDirection) ) (*property).mnIndex = -1; @@ -1651,7 +1651,7 @@ void XMLPageExportPropertyMapper::ContextFilter( break; case CTF_PAGE_VISIBLE: { - sal_Bool bVisible = false; + bool bVisible = false; (*property).maValue >>= bVisible; if( bVisible ) (*property).mnIndex = -1; @@ -1686,7 +1686,7 @@ void XMLPageExportPropertyMapper::ContextFilter( if( pDateTimeFormat && pDateTimeUpdate ) { - sal_Bool bIsFixed = false; + bool bIsFixed = false; pDateTimeUpdate->maValue >>= bIsFixed; if( bIsFixed ) pDateTimeFormat->mnIndex = -1; diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index 2fc4dd72ad3b..7f0247f2d508 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -231,7 +231,7 @@ class XMLShapeExportPropertyMapper : public SvXMLExportPropertyMapper { private: SvxXMLNumRuleExport maNumRuleExp; - sal_Bool mbIsInAutoStyles; + bool mbIsInAutoStyles; const OUString msCDATA; const OUString msTrue; @@ -255,7 +255,7 @@ public: sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; - void SetAutoStyles( sal_Bool bIsInAutoStyles ) { mbIsInAutoStyles = bIsInAutoStyles; } + void SetAutoStyles( bool bIsInAutoStyles ) { mbIsInAutoStyles = bIsInAutoStyles; } virtual void handleSpecialItem( SvXMLAttributeList& rAttrList, diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 46b714f621c0..b0351db16ddf 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -103,7 +103,7 @@ class ImpXMLEXPPageMasterInfo public: ImpXMLEXPPageMasterInfo(const SdXMLExport& rExp, const Reference<XDrawPage>& xPage); - sal_Bool operator==(const ImpXMLEXPPageMasterInfo& rInfo) const; + bool operator==(const ImpXMLEXPPageMasterInfo& rInfo) const; void SetName(const OUString& rStr); const OUString& GetName() const { return msName; } @@ -173,7 +173,7 @@ ImpXMLEXPPageMasterInfo::ImpXMLEXPPageMasterInfo( } } -sal_Bool ImpXMLEXPPageMasterInfo::operator==(const ImpXMLEXPPageMasterInfo& rInfo) const +bool ImpXMLEXPPageMasterInfo::operator==(const ImpXMLEXPPageMasterInfo& rInfo) const { return ((mnBorderBottom == rInfo.mnBorderBottom) && (mnBorderLeft == rInfo.mnBorderLeft) @@ -204,7 +204,7 @@ class ImpXMLAutoLayoutInfo public: ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterInfo* pInf); - sal_Bool operator==(const ImpXMLAutoLayoutInfo& rInfo) const; + bool operator==(const ImpXMLAutoLayoutInfo& rInfo) const; sal_uInt16 GetLayoutType() const { return mnType; } sal_Int32 GetGapX() const { return mnGapX; } @@ -216,19 +216,19 @@ public: const Rectangle& GetTitleRectangle() const { return maTitleRect; } const Rectangle& GetPresRectangle() const { return maPresRect; } - static sal_Bool IsCreateNecessary(sal_uInt16 nTyp); + static bool IsCreateNecessary(sal_uInt16 nTyp); }; -sal_Bool ImpXMLAutoLayoutInfo::IsCreateNecessary(sal_uInt16 nTyp) +bool ImpXMLAutoLayoutInfo::IsCreateNecessary(sal_uInt16 nTyp) { if(nTyp == 5 /* AUTOLAYOUT_ORG */ || nTyp == 20 /* AUTOLAYOUT_NONE */ || nTyp >= IMP_AUTOLAYOUT_INFO_MAX) - return sal_False; - return sal_True; + return false; + return true; } -sal_Bool ImpXMLAutoLayoutInfo::operator==(const ImpXMLAutoLayoutInfo& rInfo) const +bool ImpXMLAutoLayoutInfo::operator==(const ImpXMLAutoLayoutInfo& rInfo) const { return ((mnType == rInfo.mnType && mpPageMasterInfo == rInfo.mpPageMasterInfo)); @@ -392,7 +392,7 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI SdXMLExport::SdXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, OUString const & implementationName, - sal_Bool bIsDraw, sal_uInt16 nExportFlags ) + bool bIsDraw, sal_uInt16 nExportFlags ) : SvXMLExport( util::MeasureUnit::CM, xContext, implementationName, (bIsDraw) ? XML_GRAPHICS : XML_PRESENTATION, nExportFlags ), mnDocMasterPageCount(0L), @@ -408,8 +408,8 @@ SdXMLExport::SdXMLExport( mpPropertySetMapper(0L), mpPresPagePropsMapper(0L), mbIsDraw(bIsDraw), - mbFamilyGraphicUsed(sal_False), - mbFamilyPresentationUsed(sal_False), + mbFamilyGraphicUsed(false), + mbFamilyPresentationUsed(false), msZIndex( GetXMLToken(XML_ZINDEX) ), msEmptyPres( "IsEmptyPresentationObject" ), msModel( "Model" ), @@ -752,10 +752,10 @@ void SdXMLExport::ImpPrepAutoLayoutInfos() } } -sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUString& rName) +bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUString& rName) { rName = ""; - sal_Bool bRetval(sal_False); + bool bRetval(false); Reference <beans::XPropertySet> xPropSet(xPage, UNO_QUERY); if(xPropSet.is()) @@ -788,7 +788,7 @@ sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, O // create entry and look for existance ImpXMLAutoLayoutInfo* pNew = new ImpXMLAutoLayoutInfo(nType, pInfo); - sal_Bool bDidExist(sal_False); + bool bDidExist(false); for( size_t nCnt = 0; !bDidExist && nCnt < mpAutoLayoutInfoList->size(); nCnt++) { @@ -796,7 +796,7 @@ sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, O { delete pNew; pNew = mpAutoLayoutInfoList->at( nCnt ); - bDidExist = sal_True; + bDidExist = true; } } @@ -811,7 +811,7 @@ sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, O } rName = pNew->GetLayoutName(); - bRetval = sal_True; + bRetval = true; } } } @@ -1458,7 +1458,7 @@ static OUString findOrAppendImpl( std::vector< OUString >& rVector, const OUStri return aStr; } -static OUString findOrAppendImpl( std::vector< DateTimeDeclImpl >& rVector, const OUString& rText, sal_Bool bFixed, sal_Int32 nFormat, const sal_Char* pPrefix ) +static OUString findOrAppendImpl( std::vector< DateTimeDeclImpl >& rVector, const OUString& rText, bool bFixed, sal_Int32 nFormat, const sal_Char* pPrefix ) { // search rVector if there is already a DateTimeDeclImpl with rText,bFixed and nFormat std::vector< DateTimeDeclImpl >::iterator aIter; @@ -1524,7 +1524,7 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons const OUString aStrDateTimeTextProp( "DateTimeText" ); if( xInfo->hasPropertyByName( aStrDateTimeTextProp ) ) { - sal_Bool bFixed = false; + bool bFixed = false; sal_Int32 nFormat = 0; xSet->getPropertyValue( aStrDateTimeTextProp ) >>= aStrText; xSet->getPropertyValue("IsDateTimeFixed") >>= bFixed; @@ -1967,9 +1967,9 @@ void SdXMLExport::exportPresentationSettings() if( !xPresProps.is() ) return; - sal_Bool bHasAttr = sal_False; + bool bHasAttr = false; - sal_Bool bTemp = false; + bool bTemp = false; // export range xPresProps->getPropertyValue("IsShowAll") >>= bTemp; @@ -1980,7 +1980,7 @@ void SdXMLExport::exportPresentationSettings() if( !aFirstPage.isEmpty() ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_START_PAGE, aFirstPage ); - bHasAttr = sal_True; + bHasAttr = true; } else { @@ -1989,7 +1989,7 @@ void SdXMLExport::exportPresentationSettings() if( !aCustomShow.isEmpty() ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_SHOW, aCustomShow ); - bHasAttr = sal_True; + bHasAttr = true; } } } @@ -1998,7 +1998,7 @@ void SdXMLExport::exportPresentationSettings() if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_ENDLESS, XML_TRUE ); - bHasAttr = sal_True; + bHasAttr = true; sal_Int32 nPause = 0; xPresProps->getPropertyValue("Pause") >>= nPause; @@ -2015,63 +2015,63 @@ void SdXMLExport::exportPresentationSettings() if( !bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_ANIMATIONS, XML_DISABLED ); - bHasAttr = sal_True; + bHasAttr = true; } xPresProps->getPropertyValue("IsAlwaysOnTop") >>= bTemp; if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_STAY_ON_TOP, XML_TRUE ); - bHasAttr = sal_True; + bHasAttr = true; } xPresProps->getPropertyValue("IsAutomatic") >>= bTemp; if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_FORCE_MANUAL, XML_TRUE ); - bHasAttr = sal_True; + bHasAttr = true; } xPresProps->getPropertyValue("IsFullScreen") >>= bTemp; if( !bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_FULL_SCREEN, XML_FALSE ); - bHasAttr = sal_True; + bHasAttr = true; } xPresProps->getPropertyValue("IsMouseVisible") >>= bTemp; if( !bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_MOUSE_VISIBLE, XML_FALSE ); - bHasAttr = sal_True; + bHasAttr = true; } xPresProps->getPropertyValue("StartWithNavigator") >>= bTemp; if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_START_WITH_NAVIGATOR, XML_TRUE ); - bHasAttr = sal_True; + bHasAttr = true; } xPresProps->getPropertyValue("UsePen") >>= bTemp; if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_MOUSE_AS_PEN, XML_TRUE ); - bHasAttr = sal_True; + bHasAttr = true; } xPresProps->getPropertyValue("IsTransitionOnClick") >>= bTemp; if( !bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_TRANSITION_ON_CLICK, XML_DISABLED ); - bHasAttr = sal_True; + bHasAttr = true; } xPresProps->getPropertyValue("IsShowLogo") >>= bTemp; if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_SHOW_LOGO, XML_TRUE ); - bHasAttr = sal_True; + bHasAttr = true; } Reference< container::XNameContainer > xShows; @@ -2141,7 +2141,7 @@ void SdXMLExport::exportPresentationSettings() void SdXMLExport::_ExportStyles(bool bUsed) { - GetPropertySetMapper()->SetAutoStyles( sal_False ); + GetPropertySetMapper()->SetAutoStyles( false ); // export fill styles SvXMLExport::_ExportStyles( bUsed ); @@ -2190,7 +2190,7 @@ void SdXMLExport::_ExportAutoStyles() } } - GetPropertySetMapper()->SetAutoStyles( sal_True ); + GetPropertySetMapper()->SetAutoStyles( true ); if( getExportFlags() & EXPORT_STYLES ) { @@ -2750,32 +2750,32 @@ uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno: return (cppu::OWeakObject*)new SdXMLExport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags ); \ } -SERVICE( XMLImpressExportOasis, "com.sun.star.comp.Impress.XMLOasisExporter", "XMLImpressExportOasis", sal_False, EXPORT_OASIS|EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); -SERVICE( XMLImpressStylesExportOasis, "com.sun.star.comp.Impress.XMLOasisStylesExporter", "XMLImpressStylesExportOasis", sal_False, EXPORT_OASIS|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS ); -SERVICE( XMLImpressContentExportOasis, "com.sun.star.comp.Impress.XMLOasisContentExporter", "XMLImpressContentExportOasis", sal_False, EXPORT_OASIS|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS ); -SERVICE( XMLImpressMetaExportOasis, "com.sun.star.comp.Impress.XMLOasisMetaExporter", "XMLImpressMetaExportOasis", sal_False, EXPORT_OASIS|EXPORT_META ); -SERVICE( XMLImpressSettingsExportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsExporter", "XMLImpressSettingsExportOasis", sal_False, EXPORT_OASIS|EXPORT_SETTINGS ); - -SERVICE( XMLImpressExportOOO, "com.sun.star.comp.Impress.XMLExporter", "XMLImpressExportOOO", sal_False, EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); -SERVICE( XMLImpressStylesExportOOO, "com.sun.star.comp.Impress.XMLStylesExporter", "XMLImpressStylesExportOOO", sal_False, EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS ); -SERVICE( XMLImpressContentExportOOO, "com.sun.star.comp.Impress.XMLContentExporter", "XMLImpressContentExportOOO", sal_False, EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS ); -SERVICE( XMLImpressMetaExportOOO, "com.sun.star.comp.Impress.XMLMetaExporter", "XMLImpressMetaExportOOO", sal_False, EXPORT_META ); -SERVICE( XMLImpressSettingsExportOOO, "com.sun.star.comp.Impress.XMLSettingsExporter", "XMLImpressSettingsExportOOO", sal_False, EXPORT_SETTINGS ); - -SERVICE( XMLDrawExportOasis, "com.sun.star.comp.Draw.XMLOasisExporter", "XMLDrawExportOasis", sal_True, EXPORT_OASIS|EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); -SERVICE( XMLDrawStylesExportOasis, "com.sun.star.comp.Draw.XMLOasisStylesExporter", "XMLDrawStylesExportOasis", sal_True, EXPORT_OASIS|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS ); -SERVICE( XMLDrawContentExportOasis, "com.sun.star.comp.Draw.XMLOasisContentExporter", "XMLDrawContentExportOasis", sal_True, EXPORT_OASIS|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS ); -SERVICE( XMLDrawMetaExportOasis, "com.sun.star.comp.Draw.XMLOasisMetaExporter", "XMLDrawMetaExportOasis", sal_True, EXPORT_OASIS|EXPORT_META ); -SERVICE( XMLDrawSettingsExportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsExporter", "XMLDrawSettingsExportOasis", sal_True, EXPORT_OASIS|EXPORT_SETTINGS ); - -SERVICE( XMLDrawExportOOO, "com.sun.star.comp.Draw.XMLExporter", "XMLDrawExportOOO", sal_True, EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); -SERVICE( XMLDrawStylesExportOOO, "com.sun.star.comp.Draw.XMLStylesExporter", "XMLDrawStylesExportOOO", sal_True, EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS ); -SERVICE( XMLDrawContentExportOOO, "com.sun.star.comp.Draw.XMLContentExporter", "XMLDrawContentExportOOO", sal_True, EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS ); -SERVICE( XMLDrawMetaExportOOO, "com.sun.star.comp.Draw.XMLMetaExporter", "XMLDrawMetaExportOOO", sal_True, EXPORT_META ); -SERVICE( XMLDrawSettingsExportOOO, "com.sun.star.comp.Draw.XMLSettingsExporter", "XMLDrawSettingsExportOOO", sal_True, EXPORT_SETTINGS ); - -SERVICE( XMLDrawingLayerExport, "com.sun.star.comp.DrawingLayer.XMLExporter", "XMLDrawingLayerExport", sal_True, EXPORT_OASIS|EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); -SERVICE( XMLImpressClipboardExport, "com.sun.star.comp.Impress.XMLClipboardExporter", "XMLImpressClipboardExport", sal_False, EXPORT_OASIS|EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); +SERVICE( XMLImpressExportOasis, "com.sun.star.comp.Impress.XMLOasisExporter", "XMLImpressExportOasis", false, EXPORT_OASIS|EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); +SERVICE( XMLImpressStylesExportOasis, "com.sun.star.comp.Impress.XMLOasisStylesExporter", "XMLImpressStylesExportOasis", false, EXPORT_OASIS|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS ); +SERVICE( XMLImpressContentExportOasis, "com.sun.star.comp.Impress.XMLOasisContentExporter", "XMLImpressContentExportOasis", false, EXPORT_OASIS|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS ); +SERVICE( XMLImpressMetaExportOasis, "com.sun.star.comp.Impress.XMLOasisMetaExporter", "XMLImpressMetaExportOasis", false, EXPORT_OASIS|EXPORT_META ); +SERVICE( XMLImpressSettingsExportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsExporter", "XMLImpressSettingsExportOasis", false, EXPORT_OASIS|EXPORT_SETTINGS ); + +SERVICE( XMLImpressExportOOO, "com.sun.star.comp.Impress.XMLExporter", "XMLImpressExportOOO", false, EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); +SERVICE( XMLImpressStylesExportOOO, "com.sun.star.comp.Impress.XMLStylesExporter", "XMLImpressStylesExportOOO", false, EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS ); +SERVICE( XMLImpressContentExportOOO, "com.sun.star.comp.Impress.XMLContentExporter", "XMLImpressContentExportOOO", false, EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS ); +SERVICE( XMLImpressMetaExportOOO, "com.sun.star.comp.Impress.XMLMetaExporter", "XMLImpressMetaExportOOO", false, EXPORT_META ); +SERVICE( XMLImpressSettingsExportOOO, "com.sun.star.comp.Impress.XMLSettingsExporter", "XMLImpressSettingsExportOOO", false, EXPORT_SETTINGS ); + +SERVICE( XMLDrawExportOasis, "com.sun.star.comp.Draw.XMLOasisExporter", "XMLDrawExportOasis", true, EXPORT_OASIS|EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); +SERVICE( XMLDrawStylesExportOasis, "com.sun.star.comp.Draw.XMLOasisStylesExporter", "XMLDrawStylesExportOasis", true, EXPORT_OASIS|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS ); +SERVICE( XMLDrawContentExportOasis, "com.sun.star.comp.Draw.XMLOasisContentExporter", "XMLDrawContentExportOasis", true, EXPORT_OASIS|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS ); +SERVICE( XMLDrawMetaExportOasis, "com.sun.star.comp.Draw.XMLOasisMetaExporter", "XMLDrawMetaExportOasis", true, EXPORT_OASIS|EXPORT_META ); +SERVICE( XMLDrawSettingsExportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsExporter", "XMLDrawSettingsExportOasis", true, EXPORT_OASIS|EXPORT_SETTINGS ); + +SERVICE( XMLDrawExportOOO, "com.sun.star.comp.Draw.XMLExporter", "XMLDrawExportOOO", true, EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); +SERVICE( XMLDrawStylesExportOOO, "com.sun.star.comp.Draw.XMLStylesExporter", "XMLDrawStylesExportOOO", true, EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS ); +SERVICE( XMLDrawContentExportOOO, "com.sun.star.comp.Draw.XMLContentExporter", "XMLDrawContentExportOOO", true, EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS ); +SERVICE( XMLDrawMetaExportOOO, "com.sun.star.comp.Draw.XMLMetaExporter", "XMLDrawMetaExportOOO", true, EXPORT_META ); +SERVICE( XMLDrawSettingsExportOOO, "com.sun.star.comp.Draw.XMLSettingsExporter", "XMLDrawSettingsExportOOO", true, EXPORT_SETTINGS ); + +SERVICE( XMLDrawingLayerExport, "com.sun.star.comp.DrawingLayer.XMLExporter", "XMLDrawingLayerExport", true, EXPORT_OASIS|EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); +SERVICE( XMLImpressClipboardExport, "com.sun.star.comp.Impress.XMLClipboardExporter", "XMLImpressClipboardExport", false, EXPORT_OASIS|EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); XMLFontAutoStylePool* SdXMLExport::CreateFontAutoStylePool() { diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx index 581fdcbd93bc..6b7dcd163c96 100644 --- a/xmloff/source/draw/sdxmlexp_impl.hxx +++ b/xmloff/source/draw/sdxmlexp_impl.hxx @@ -71,7 +71,7 @@ struct HeaderFooterPageSettingsImpl struct DateTimeDeclImpl { OUString maStrText; - sal_Bool mbFixed; + bool mbFixed; sal_Int32 mnFormat; }; @@ -114,9 +114,9 @@ class SdXMLExport : public SvXMLExport SdXMLFormatMap maUsedDateStyles; // this is a vector with the used formatings for date fields SdXMLFormatMap maUsedTimeStyles; // this is a vector with the used formatings for time fields - sal_Bool mbIsDraw; - sal_Bool mbFamilyGraphicUsed; - sal_Bool mbFamilyPresentationUsed; + bool mbIsDraw; + bool mbFamilyGraphicUsed; + bool mbFamilyPresentationUsed; const OUString msZIndex; const OUString msEmptyPres; @@ -146,7 +146,7 @@ class SdXMLExport : public SvXMLExport void ImpWritePresentationStyles(); OUString ImpCreatePresPageStyleName( com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> xDrawPage, bool bExportBackground = true ); - sal_Bool ImpPrepAutoLayoutInfo(const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xPage, OUString& rName); + bool ImpPrepAutoLayoutInfo(const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xPage, OUString& rName); void ImpWriteAutoLayoutInfos(); void ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectangle& rRect); void ImpWriteHeaderFooterDecls(); @@ -172,7 +172,7 @@ public: SdXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, OUString const & implementationName, - sal_Bool bIsDraw, sal_uInt16 nExportFlags = EXPORT_ALL ); + bool bIsDraw, sal_uInt16 nExportFlags = EXPORT_ALL ); virtual ~SdXMLExport(); void SetProgress(sal_Int32 nProg); @@ -185,13 +185,13 @@ public: XMLShapeExportPropertyMapper* GetPropertySetMapper() const { return mpPropertySetMapper; } XMLPageExportPropertyMapper* GetPresPagePropsMapper() const { return mpPresPagePropsMapper; } - sal_Bool IsDraw() const { return mbIsDraw; } - sal_Bool IsImpress() const { return !mbIsDraw; } + bool IsDraw() const { return mbIsDraw; } + bool IsImpress() const { return !mbIsDraw; } - sal_Bool IsFamilyGraphicUsed() const { return mbFamilyGraphicUsed; } - void SetFamilyGraphicUsed() { mbFamilyGraphicUsed = sal_True; } - sal_Bool IsFamilyPresentationUsed() const { return mbFamilyPresentationUsed; } - void SetFamilyPresentationUsed() { mbFamilyPresentationUsed = sal_True; } + bool IsFamilyGraphicUsed() const { return mbFamilyGraphicUsed; } + void SetFamilyGraphicUsed() { mbFamilyGraphicUsed = true; } + bool IsFamilyPresentationUsed() const { return mbFamilyPresentationUsed; } + void SetFamilyPresentationUsed() { mbFamilyPresentationUsed = true; } virtual void addDataStyle(const sal_Int32 nNumberFormat, bool bTimeFormat = false ) SAL_OVERRIDE; virtual void exportDataStyles() SAL_OVERRIDE; diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index dbd834787359..8fb0ea1fa586 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -267,26 +267,26 @@ uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno: return (cppu::OWeakObject*)new SdXMLImport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags ); \ } -SERVICE( XMLImpressImportOasis, "com.sun.star.comp.Impress.XMLOasisImporter", "XMLImpressImportOasis", sal_False, IMPORT_ALL ) -SERVICE( XMLDrawImportOasis, "com.sun.star.comp.Draw.XMLOasisImporter", "XMLDrawImportOasis", sal_True, IMPORT_ALL ) +SERVICE( XMLImpressImportOasis, "com.sun.star.comp.Impress.XMLOasisImporter", "XMLImpressImportOasis", false, IMPORT_ALL ) +SERVICE( XMLDrawImportOasis, "com.sun.star.comp.Draw.XMLOasisImporter", "XMLDrawImportOasis", true, IMPORT_ALL ) -SERVICE( XMLImpressStylesImportOasis, "com.sun.star.comp.Impress.XMLOasisStylesImporter", "XMLImpressStylesImportOasis", sal_False, IMPORT_STYLES|IMPORT_AUTOSTYLES|IMPORT_MASTERSTYLES ) -SERVICE( XMLDrawStylesImportOasis, "com.sun.star.comp.Draw.XMLOasisStylesImporter", "XMLImpressStylesImportOasis", sal_True, IMPORT_STYLES|IMPORT_AUTOSTYLES|IMPORT_MASTERSTYLES ) +SERVICE( XMLImpressStylesImportOasis, "com.sun.star.comp.Impress.XMLOasisStylesImporter", "XMLImpressStylesImportOasis", false, IMPORT_STYLES|IMPORT_AUTOSTYLES|IMPORT_MASTERSTYLES ) +SERVICE( XMLDrawStylesImportOasis, "com.sun.star.comp.Draw.XMLOasisStylesImporter", "XMLImpressStylesImportOasis", true, IMPORT_STYLES|IMPORT_AUTOSTYLES|IMPORT_MASTERSTYLES ) -SERVICE( XMLImpressContentImportOasis, "com.sun.star.comp.Impress.XMLOasisContentImporter", "XMLImpressContentImportOasis", sal_False, IMPORT_AUTOSTYLES|IMPORT_CONTENT|IMPORT_SCRIPTS|IMPORT_FONTDECLS ) -SERVICE( XMLDrawContentImportOasis, "com.sun.star.comp.Draw.XMLOasisContentImporter", "XMLImpressContentImportOasis", sal_True, IMPORT_AUTOSTYLES|IMPORT_CONTENT|IMPORT_SCRIPTS|IMPORT_FONTDECLS ) +SERVICE( XMLImpressContentImportOasis, "com.sun.star.comp.Impress.XMLOasisContentImporter", "XMLImpressContentImportOasis", false, IMPORT_AUTOSTYLES|IMPORT_CONTENT|IMPORT_SCRIPTS|IMPORT_FONTDECLS ) +SERVICE( XMLDrawContentImportOasis, "com.sun.star.comp.Draw.XMLOasisContentImporter", "XMLImpressContentImportOasis", true, IMPORT_AUTOSTYLES|IMPORT_CONTENT|IMPORT_SCRIPTS|IMPORT_FONTDECLS ) -SERVICE( XMLImpressMetaImportOasis, "com.sun.star.comp.Impress.XMLOasisMetaImporter", "XMLImpressMetaImportOasis", sal_False, IMPORT_META ) -SERVICE( XMLDrawMetaImportOasis, "com.sun.star.comp.Draw.XMLOasisMetaImporter", "XMLImpressMetaImportOasis", sal_True, IMPORT_META ) +SERVICE( XMLImpressMetaImportOasis, "com.sun.star.comp.Impress.XMLOasisMetaImporter", "XMLImpressMetaImportOasis", false, IMPORT_META ) +SERVICE( XMLDrawMetaImportOasis, "com.sun.star.comp.Draw.XMLOasisMetaImporter", "XMLImpressMetaImportOasis", true, IMPORT_META ) -SERVICE( XMLImpressSettingsImportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", sal_False, IMPORT_SETTINGS ) -SERVICE( XMLDrawSettingsImportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", sal_True, IMPORT_SETTINGS ) +SERVICE( XMLImpressSettingsImportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", false, IMPORT_SETTINGS ) +SERVICE( XMLDrawSettingsImportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", true, IMPORT_SETTINGS ) // #110680# SdXMLImport::SdXMLImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, OUString const & implementationName, - sal_Bool bIsDraw, sal_uInt16 nImportFlags ) + bool bIsDraw, sal_uInt16 nImportFlags ) : SvXMLImport( xContext, implementationName, nImportFlags ), mpMasterStylesContext(0L), mpDocElemTokenMap(0L), @@ -303,8 +303,8 @@ SdXMLImport::SdXMLImport( mnNewPageCount(0L), mnNewMasterPageCount(0L), mbIsDraw(bIsDraw), - mbLoadDoc(sal_True), - mbPreview(sal_False), + mbLoadDoc(true), + mbPreview(false), msPageLayouts( "PageLayouts" ), msPreview( "Preview" ) { @@ -405,7 +405,7 @@ void SAL_CALL SdXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen "OrganizerMode"); if (xInfoSetInfo->hasPropertyByName(sOrganizerMode)) { - sal_Bool bStyleOnly(sal_False); + bool bStyleOnly(false); if (xInfoSet->getPropertyValue(sOrganizerMode) >>= bStyleOnly) { mbLoadDoc = !bStyleOnly; @@ -715,7 +715,7 @@ SvXMLStylesContext *SdXMLImport::CreateStylesContext(const OUString& rLocalName, return GetShapeImport()->GetStylesContext(); GetShapeImport()->SetStylesContext(new SdXMLStylesContext( - *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, sal_False)); + *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, false)); return GetShapeImport()->GetStylesContext(); } @@ -727,7 +727,7 @@ SvXMLStylesContext *SdXMLImport::CreateAutoStylesContext(const OUString& rLocalN return GetShapeImport()->GetAutoStylesContext(); GetShapeImport()->SetAutoStylesContext(new SdXMLStylesContext( - *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, sal_True)); + *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, true)); return GetShapeImport()->GetAutoStylesContext(); } @@ -904,7 +904,7 @@ void SdXMLImport::AddFooterDecl( const OUString& rName, const OUString& rText ) maFooterDeclsMap[rName] = rText; } -void SdXMLImport::AddDateTimeDecl( const OUString& rName, const OUString& rText, sal_Bool bFixed, const OUString& rDateTimeFormat ) +void SdXMLImport::AddDateTimeDecl( const OUString& rName, const OUString& rText, bool bFixed, const OUString& rDateTimeFormat ) { if( !rName.isEmpty() && (!rText.isEmpty() || !bFixed) ) { @@ -936,7 +936,7 @@ OUString SdXMLImport::GetFooterDecl( const OUString& rName ) const return aRet; } -OUString SdXMLImport::GetDateTimeDecl( const OUString& rName, sal_Bool& rbFixed, OUString& rDateTimeFormat ) +OUString SdXMLImport::GetDateTimeDecl( const OUString& rName, bool& rbFixed, OUString& rDateTimeFormat ) { DateTimeDeclContextImpl aDecl; diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index 9870a48b2039..2f15ee467953 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -160,10 +160,10 @@ class SdXMLMasterStylesContext; struct DateTimeDeclContextImpl { OUString maStrText; - sal_Bool mbFixed; + bool mbFixed; OUString maStrDateTimeFormat; - DateTimeDeclContextImpl() : mbFixed(sal_True) {} + DateTimeDeclContextImpl() : mbFixed(true) {} }; typedef std::map<OUString, OUString> HeaderFooterDeclMap; @@ -196,9 +196,9 @@ class SdXMLImport: public SvXMLImport sal_Int32 mnNewPageCount; sal_Int32 mnNewMasterPageCount; - sal_Bool mbIsDraw; - sal_Bool mbLoadDoc; - sal_Bool mbPreview; + bool mbIsDraw; + bool mbLoadDoc; + bool mbPreview; DrawPageIdMap maDrawPageIds; @@ -221,7 +221,7 @@ public: SdXMLImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, OUString const & implementationName, - sal_Bool bIsDraw, sal_uInt16 nImportFlags ); + bool bIsDraw, sal_uInt16 nImportFlags ); virtual ~SdXMLImport() throw (); // XImporter @@ -254,7 +254,7 @@ public: const SdXMLMasterStylesContext* GetMasterStylesContext() const { return mpMasterStylesContext; } sal_uInt16 GetStyleFamilyMask() const { return mnStyleFamilyMask; } - sal_Bool IsStylesOnlyMode() const { return !mbLoadDoc; } + bool IsStylesOnlyMode() const { return !mbLoadDoc; } const SvXMLTokenMap& GetDocElemTokenMap(); const SvXMLTokenMap& GetBodyElemTokenMap(); @@ -282,22 +282,22 @@ public: com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getPageLayouts() const { return mxPageLayouts; } - sal_Bool IsDraw() const { return mbIsDraw; } - sal_Bool IsImpress() const { return !mbIsDraw; } + bool IsDraw() const { return mbIsDraw; } + bool IsImpress() const { return !mbIsDraw; } // #80365# virtual void SetStatistics( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) SAL_OVERRIDE; - sal_Bool IsPreview() const { return mbPreview; } + bool IsPreview() const { return mbPreview; } void AddHeaderDecl( const OUString& rName, const OUString& rText ); void AddFooterDecl( const OUString& rName, const OUString& rText ); - void AddDateTimeDecl( const OUString& rName, const OUString& rText, sal_Bool bFixed, const OUString& rDateTimeFormat ); + void AddDateTimeDecl( const OUString& rName, const OUString& rText, bool bFixed, const OUString& rDateTimeFormat ); OUString GetHeaderDecl( const OUString& rName ) const; OUString GetFooterDecl( const OUString& rName ) const; - OUString GetDateTimeDecl( const OUString& rName, sal_Bool& rbFixed, OUString& rDateTimeFormat ); + OUString GetDateTimeDecl( const OUString& rName, bool& rbFixed, OUString& rDateTimeFormat ); virtual void NotifyEmbeddedFontRead() SAL_OVERRIDE; }; diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 5b58920b8b49..e6492f25ca7c 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -211,7 +211,7 @@ uno::Reference< drawing::XShape > XMLShapeExport::checkForCustomShapeReplacement uno::Sequence< beans::PropertyValue > aPropValues( 2 ); aPropValues[ 0 ].Name = "CustomShape"; aPropValues[ 0 ].Value <<= xShape; - sal_Bool bForceGroupWithText = sal_True; + bool bForceGroupWithText = true; aPropValues[ 1 ].Name = "ForceGroupWithText"; aPropValues[ 1 ].Value <<= bForceGroupWithText; aArgument[ 0 ] <<= aPropValues; @@ -280,7 +280,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap const bool bObjSupportsStyle = aShapeInfo.meShapeType != XmlShapeTypeDrawGroupShape; - sal_Bool bIsEmptyPresObj = sal_False; + bool bIsEmptyPresObj = false; uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if ( aShapeInfo.xCustomShapeReplacement.is() ) @@ -709,8 +709,8 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape try { - sal_Bool bVisible = sal_True; - sal_Bool bPrintable = sal_True; + bool bVisible = true; + bool bPrintable = true; xSet->getPropertyValue(msVisible) >>= bVisible; xSet->getPropertyValue(msPrintable) >>= bPrintable; @@ -1228,7 +1228,7 @@ void XMLShapeExport::ExportGraphicDefaults() // construct PropertySetMapper UniReference< SvXMLExportPropertyMapper > xPropertySetMapper( CreateShapePropMapper( mrExport ) ); - ((XMLShapeExportPropertyMapper*)xPropertySetMapper.get())->SetAutoStyles( sal_False ); + ((XMLShapeExportPropertyMapper*)xPropertySetMapper.get())->SetAutoStyles( false ); // chain text attributes xPropertySetMapper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(mrExport)); @@ -1391,7 +1391,7 @@ void XMLShapeExport::ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTR mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_HEIGHT, aStr); // decide if transformation is necessary - sal_Bool bTransformationIsNecessary(fTRShear != 0.0 || fTRRotate != 0.0); + bool bTransformationIsNecessary(fTRShear != 0.0 || fTRRotate != 0.0); if(bTransformationIsNecessary) { @@ -1448,7 +1448,7 @@ bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< bean { uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() ); - sal_Bool bTemp = false; + bool bTemp = false; // is empty pes shape? if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName("IsEmptyPresentationObject")) @@ -1515,7 +1515,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x presentation::AnimationEffect eEffect = presentation::AnimationEffect_NONE; presentation::AnimationSpeed eSpeed = presentation::AnimationSpeed_SLOW; OUString aStrSoundURL; - sal_Bool bPlayFull = false; + bool bPlayFull = false; sal_Int32 nVerb = 0; OUString aStrMacro; OUString aStrLibrary; @@ -1818,8 +1818,8 @@ void XMLShapeExport::ImpExportTextBoxShape( uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() ); // presentation attribute (if presentation) - sal_Bool bIsPresShape(sal_False); - sal_Bool bIsEmptyPresObj(sal_False); + bool bIsPresShape(false); + bool bIsEmptyPresObj(false); OUString aStr; switch(eShapeType) @@ -1827,49 +1827,49 @@ void XMLShapeExport::ImpExportTextBoxShape( case XmlShapeTypePresSubtitleShape: { aStr = GetXMLToken(XML_PRESENTATION_SUBTITLE); - bIsPresShape = sal_True; + bIsPresShape = true; break; } case XmlShapeTypePresTitleTextShape: { aStr = GetXMLToken(XML_PRESENTATION_TITLE); - bIsPresShape = sal_True; + bIsPresShape = true; break; } case XmlShapeTypePresOutlinerShape: { aStr = GetXMLToken(XML_PRESENTATION_OUTLINE); - bIsPresShape = sal_True; + bIsPresShape = true; break; } case XmlShapeTypePresNotesShape: { aStr = GetXMLToken(XML_PRESENTATION_NOTES); - bIsPresShape = sal_True; + bIsPresShape = true; break; } case XmlShapeTypePresHeaderShape: { aStr = GetXMLToken(XML_HEADER); - bIsPresShape = sal_True; + bIsPresShape = true; break; } case XmlShapeTypePresFooterShape: { aStr = GetXMLToken(XML_FOOTER); - bIsPresShape = sal_True; + bIsPresShape = true; break; } case XmlShapeTypePresSlideNumberShape: { aStr = GetXMLToken(XML_PAGE_NUMBER); - bIsPresShape = sal_True; + bIsPresShape = true; break; } case XmlShapeTypePresDateTimeShape: { aStr = GetXMLToken(XML_DATE_TIME); - bIsPresShape = sal_True; + bIsPresShape = true; break; } default: @@ -2065,7 +2065,7 @@ void XMLShapeExport::ImpExportEllipseShape( awt::Size aSize = xShape->getSize(); sal_Int32 nRx((aSize.Width + 1) / 2); sal_Int32 nRy((aSize.Height + 1) / 2); - sal_Bool bCircle(nRx == nRy); + bool bCircle(nRx == nRy); // Transformation ImpExportNewTrans(xPropSet, nFeatures, pRefPoint); @@ -2118,7 +2118,7 @@ void XMLShapeExport::ImpExportPolygonShape( const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if(xPropSet.is()) { - sal_Bool bBezier(eShapeType == XmlShapeTypeDrawClosedBezierShape + bool bBezier(eShapeType == XmlShapeTypeDrawClosedBezierShape || eShapeType == XmlShapeTypeDrawOpenBezierShape); // get matrix @@ -2141,7 +2141,7 @@ void XMLShapeExport::ImpExportPolygonShape( SdXMLImExViewBox aViewBox(0, 0, aSize.Width, aSize.Height); mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString()); - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# // prepare name (with most used) enum ::xmloff::token::XMLTokenEnum eName(XML_PATH); @@ -2225,7 +2225,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape( const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if(xPropSet.is()) { - sal_Bool bIsEmptyPresObj = sal_False; + bool bIsEmptyPresObj = false; uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() ); // Transformation @@ -2718,7 +2718,7 @@ void XMLShapeExport::ImpExportOLE2Shape( // Transformation ImpExportNewTrans(xPropSet, nFeatures, pRefPoint); - sal_Bool bIsEmptyPresObj = sal_False; + bool bIsEmptyPresObj = false; // presentation settings if(eShapeType == XmlShapeTypePresOLE2Shape) @@ -2729,7 +2729,7 @@ void XMLShapeExport::ImpExportOLE2Shape( bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_TABLE) ); bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# - sal_Bool bExportEmbedded(0 != (mrExport.getExportFlags() & EXPORT_EMBEDDED)); + bool bExportEmbedded(0 != (mrExport.getExportFlags() & EXPORT_EMBEDDED)); OUString sPersistName; SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW, XML_FRAME, bCreateNewline, true ); @@ -2745,7 +2745,7 @@ void XMLShapeExport::ImpExportOLE2Shape( OUString sClassId; OUString sURL; - sal_Bool bInternal = false; + bool bInternal = false; xPropSet->getPropertyValue("IsInternal") >>= bInternal; if( !bIsEmptyPresObj ) @@ -2930,7 +2930,7 @@ void XMLShapeExport::ImpExportCaptionShape( // write Caption shape. Add export later. bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# - sal_Bool bAnnotation( (nFeatures & SEF_EXPORT_ANNOTATION) == SEF_EXPORT_ANNOTATION ); + bool bAnnotation( (nFeatures & SEF_EXPORT_ANNOTATION) == SEF_EXPORT_ANNOTATION ); SvXMLElementExport aObj( mrExport, (bAnnotation ? XML_NAMESPACE_OFFICE @@ -3013,7 +3013,7 @@ void XMLShapeExport::ImpExportAppletShape( mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CODE, aStr ); // export draw:may-script - sal_Bool bIsScript = false; + bool bIsScript = false; xPropSet->getPropertyValue("AppletIsScript") >>= bIsScript; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MAY_SCRIPT, bIsScript ? XML_TRUE : XML_FALSE ); @@ -3245,14 +3245,14 @@ void XMLShapeExport::ImpExportMediaShape( // export parameters const OUString aFalseStr( "false" ), aTrueStr( "true" ); - sal_Bool bLoop = false; + bool bLoop = false; const OUString aLoopStr( "Loop" ); xPropSet->getPropertyValue( aLoopStr ) >>= bLoop; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aLoopStr ); mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, bLoop ? aTrueStr : aFalseStr ); delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true ) ); - sal_Bool bMute = false; + bool bMute = false; const OUString aMuteStr( "Mute" ); xPropSet->getPropertyValue( aMuteStr ) >>= bMute; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aMuteStr ); @@ -3310,7 +3310,7 @@ void XMLShapeExport::ImpExport3DSceneShape( const uno::Reference< drawing::XShap export3DSceneAttributes( xPropSet ); // write 3DScene shape - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# SvXMLElementExport aOBJ( mrExport, XML_NAMESPACE_DR3D, XML_SCENE, bCreateNewline, true); ImpExportDescription( xShape ); // #i68101# @@ -3607,7 +3607,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen // lightingMode aAny = xPropSet->getPropertyValue("D3DSceneTwoSidedLighting"); - sal_Bool bTwoSidedLighting = false; + bool bTwoSidedLighting = false; aAny >>= bTwoSidedLighting; ::sax::Converter::convertBool(sStringBuffer, bTwoSidedLighting); aStr = sStringBuffer.makeStringAndClear(); @@ -3629,7 +3629,7 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s OUString aIndexStr; ::basegfx::B3DVector aLightDirection; drawing::Direction3D xLightDir; - sal_Bool bLightOnOff = false; + bool bLightOnOff = false; for(sal_Int32 nLamp = 1; nLamp <= 8; nLamp++) { aIndexStr = OUString::number( nLamp ); @@ -3772,7 +3772,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert for ( i = 0; i < nElements; i++ ) { - sal_Bool bPosition = sal_False; + bool bPosition = false; const uno::Sequence< beans::PropertyValue >& rPropSeq = rHandles[ i ]; for ( j = 0; j < (sal_uInt32)rPropSeq.getLength(); j++ ) { @@ -3788,13 +3788,13 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert ExportParameter( aStrBuffer, aPosition.Second ); aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_HANDLE_POSITION, aStr ); - bPosition = sal_True; + bPosition = true; } } break; case EAS_MirroredX : { - sal_Bool bMirroredX = sal_Bool(); + bool bMirroredX; if ( rPropVal.Value >>= bMirroredX ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_HANDLE_MIRROR_HORIZONTAL, bMirroredX ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -3802,7 +3802,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_MirroredY : { - sal_Bool bMirroredY = sal_Bool(); + bool bMirroredY; if ( rPropVal.Value >>= bMirroredY ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_HANDLE_MIRROR_VERTICAL, bMirroredY ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -3810,7 +3810,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_Switched : { - sal_Bool bSwitched = sal_Bool(); + bool bSwitched; if ( rPropVal.Value >>= bSwitched ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_HANDLE_SWITCHED, bSwitched ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -3920,7 +3920,7 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, sal_Int32 nCoords = rCoordinates.getLength(); sal_Int32 nSegments = rSegments.getLength(); - sal_Bool bSimpleSegments = nSegments == 0; + bool bSimpleSegments = nSegments == 0; if ( bSimpleSegments ) nSegments = 4; for ( j = i = 0; j < nSegments; j++ ) @@ -4068,13 +4068,13 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< beans::XPropertySet >& xPropSet ) { - sal_Bool bEquations = sal_False; + bool bEquations = false; uno::Sequence< OUString > aEquations; - sal_Bool bHandles = sal_False; + bool bHandles = false; uno::Sequence< beans::PropertyValues > aHandles; - sal_Bool bCoordinates = sal_False; + bool bCoordinates = false; uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > aSegments; uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aCoordinates; @@ -4111,7 +4111,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_MirroredX : { - sal_Bool bMirroredX = sal_Bool(); + bool bMirroredX; if ( rGeoProp.Value >>= bMirroredX ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIRROR_HORIZONTAL, bMirroredX ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4119,7 +4119,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_MirroredY : { - sal_Bool bMirroredY = sal_Bool(); + bool bMirroredY; if ( rGeoProp.Value >>= bMirroredY ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIRROR_VERTICAL, bMirroredY ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4160,7 +4160,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean { case EAS_Extrusion : { - sal_Bool bExtrusionOn = sal_Bool(); + bool bExtrusionOn; if ( rProp.Value >>= bExtrusionOn ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION, bExtrusionOn ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4225,7 +4225,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_LightFace : { - sal_Bool bExtrusionLightFace = sal_Bool(); + bool bExtrusionLightFace; if ( rProp.Value >>= bExtrusionLightFace ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_LIGHT_FACE, bExtrusionLightFace ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4233,7 +4233,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_FirstLightHarsh : { - sal_Bool bExtrusionFirstLightHarsh = sal_Bool(); + bool bExtrusionFirstLightHarsh; if ( rProp.Value >>= bExtrusionFirstLightHarsh ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_FIRST_LIGHT_HARSH, bExtrusionFirstLightHarsh ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4241,7 +4241,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_SecondLightHarsh : { - sal_Bool bExtrusionSecondLightHarsh = sal_Bool(); + bool bExtrusionSecondLightHarsh; if ( rProp.Value >>= bExtrusionSecondLightHarsh ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_SECOND_LIGHT_HARSH, bExtrusionSecondLightHarsh ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4309,7 +4309,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_Metal : { - sal_Bool bExtrusionMetal = sal_Bool(); + bool bExtrusionMetal; if ( rProp.Value >>= bExtrusionMetal ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_METAL, bExtrusionMetal ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4442,7 +4442,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_Color : { - sal_Bool bExtrusionColor = sal_Bool(); + bool bExtrusionColor; if ( rProp.Value >>= bExtrusionColor ) { rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_COLOR, @@ -4470,7 +4470,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean { case EAS_TextPath : { - sal_Bool bTextPathOn = sal_Bool(); + bool bTextPathOn; if ( rProp.Value >>= bTextPathOn ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_TEXT_PATH, bTextPathOn ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4496,7 +4496,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_ScaleX : { - sal_Bool bScaleX = sal_Bool(); + bool bScaleX; if ( rProp.Value >>= bScaleX ) { aStr = bScaleX ? GetXMLToken( XML_SHAPE ) : GetXMLToken( XML_PATH ); @@ -4506,7 +4506,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_SameLetterHeights : { - sal_Bool bSameLetterHeights = sal_Bool(); + bool bSameLetterHeights; if ( rProp.Value >>= bSameLetterHeights ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_TEXT_PATH_SAME_LETTER_HEIGHTS, bSameLetterHeights ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4550,7 +4550,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_ExtrusionAllowed : { - sal_Bool bExtrusionAllowed = sal_Bool(); + bool bExtrusionAllowed; if ( rProp.Value >>= bExtrusionAllowed ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_ALLOWED, bExtrusionAllowed ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4558,7 +4558,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_ConcentricGradientFillAllowed : { - sal_Bool bConcentricGradientFillAllowed = sal_Bool(); + bool bConcentricGradientFillAllowed; if ( rProp.Value >>= bConcentricGradientFillAllowed ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CONCENTRIC_GRADIENT_FILL_ALLOWED, bConcentricGradientFillAllowed ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4566,7 +4566,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_TextPathAllowed : { - sal_Bool bTextPathAllowed = sal_Bool(); + bool bTextPathAllowed; if ( rProp.Value >>= bTextPathAllowed ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_TEXT_PATH_ALLOWED, bTextPathAllowed ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4776,7 +4776,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape // Transformation ImpExportNewTrans(xPropSet, nFeatures, pRefPoint); - sal_Bool bIsEmptyPresObj = sal_False; + bool bIsEmptyPresObj = false; // presentation settings if(eShapeType == XmlShapeTypePresTableShape) @@ -4804,7 +4804,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape { try { - sal_Bool bBool = sal_False; + bool bBool = false; const OUString sAPIPropertyName( pEntry->msApiName, pEntry->nApiNameLength, RTL_TEXTENCODING_ASCII_US ); xPropSet->getPropertyValue( sAPIPropertyName ) >>= bBool; diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 5d5521c8a325..e31f8c33c2d2 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -418,31 +418,31 @@ SvXMLShapeContext* XMLShapeImportHelper::Create3DSceneChildContext( case XML_TOK_3DSCENE_3DSCENE: { // dr3d:3dscene inside dr3d:3dscene context - pContext = new SdXML3DSceneShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False); + pContext = new SdXML3DSceneShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false); break; } case XML_TOK_3DSCENE_3DCUBE: { // dr3d:3dcube inside dr3d:3dscene context - pContext = new SdXML3DCubeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False); + pContext = new SdXML3DCubeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false); break; } case XML_TOK_3DSCENE_3DSPHERE: { // dr3d:3dsphere inside dr3d:3dscene context - pContext = new SdXML3DSphereObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False); + pContext = new SdXML3DSphereObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false); break; } case XML_TOK_3DSCENE_3DLATHE: { // dr3d:3dlathe inside dr3d:3dscene context - pContext = new SdXML3DLatheObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False); + pContext = new SdXML3DLatheObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false); break; } case XML_TOK_3DSCENE_3DEXTRUDE: { // dr3d:3dextrude inside dr3d:3dscene context - pContext = new SdXML3DExtrudeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False); + pContext = new SdXML3DExtrudeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false); break; } } @@ -583,7 +583,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext( case XML_TOK_GROUP_CUSTOM_SHAPE: { // draw:customshape - pContext = new SdXMLCustomShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False ); + pContext = new SdXMLCustomShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false ); break; } case XML_TOK_GROUP_A: @@ -632,20 +632,20 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext( case XML_TOK_FRAME_TEXT_BOX: { // text:text-box inside group context - pContext = new SdXMLTextBoxShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False ); + pContext = new SdXMLTextBoxShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false ); break; } case XML_TOK_FRAME_IMAGE: { // office:image inside group context - pContext = new SdXMLGraphicObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False ); + pContext = new SdXMLGraphicObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false ); break; } case XML_TOK_FRAME_OBJECT: case XML_TOK_FRAME_OBJECT_OLE: { // draw:object or draw:object_ole - pContext = new SdXMLObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False ); + pContext = new SdXMLObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false ); break; } case XML_TOK_FRAME_TABLE: @@ -659,19 +659,19 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext( case XML_TOK_FRAME_PLUGIN: { // draw:plugin - pContext = new SdXMLPluginShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False ); + pContext = new SdXMLPluginShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false ); break; } case XML_TOK_FRAME_FLOATING_FRAME: { // draw:floating-frame - pContext = new SdXMLFloatingFrameShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False ); + pContext = new SdXMLFloatingFrameShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false ); break; } case XML_TOK_FRAME_APPLET: { // draw:applet - pContext = new SdXMLAppletShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False ); + pContext = new SdXMLAppletShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false ); break; } // add other shapes here... diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 4d7f7a1b35bb..e5d5d9ec4d6b 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -45,9 +45,9 @@ SdXML3DObjectContext::SdXML3DObjectContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), - mbSetTransform( sal_False ) + mbSetTransform( false ) { sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for(sal_Int16 i=0; i < nAttrCount; i++) @@ -112,12 +112,12 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), maMinEdge(-2500.0, -2500.0, -2500.0), maMaxEdge(2500.0, 2500.0, 2500.0), - mbMinEdgeUsed(sal_False), - mbMaxEdgeUsed(sal_False) + mbMinEdgeUsed(false), + mbMaxEdgeUsed(false) { sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for(sal_Int16 i=0; i < nAttrCount; i++) @@ -138,7 +138,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext( if(aNewVec != maMinEdge) { maMinEdge = aNewVec; - mbMinEdgeUsed = sal_True; + mbMinEdgeUsed = true; } break; } @@ -150,7 +150,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext( if(aNewVec != maMaxEdge) { maMaxEdge = aNewVec; - mbMaxEdgeUsed = sal_True; + mbMaxEdgeUsed = true; } break; } @@ -214,12 +214,12 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), maCenter(0.0, 0.0, 0.0), maSize(5000.0, 5000.0, 5000.0), - mbCenterUsed(sal_False), - mbSizeUsed(sal_False) + mbCenterUsed(false), + mbSizeUsed(false) { sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for(sal_Int16 i=0; i < nAttrCount; i++) @@ -240,7 +240,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext( if(aNewVec != maCenter) { maCenter = aNewVec; - mbCenterUsed = sal_True; + mbCenterUsed = true; } break; } @@ -252,7 +252,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext( if(aNewVec != maSize) { maSize = aNewVec; - mbSizeUsed = sal_True; + mbSizeUsed = true; } break; } @@ -313,7 +313,7 @@ SdXML3DPolygonBasedShapeContext::SdXML3DPolygonBasedShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; @@ -400,7 +400,7 @@ SdXML3DLatheObjectShapeContext::SdXML3DLatheObjectShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { } @@ -435,7 +435,7 @@ SdXML3DExtrudeObjectShapeContext::SdXML3DExtrudeObjectShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { } diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx index 6a25e553cb9c..b7cafd9602fa 100644 --- a/xmloff/source/draw/ximp3dobject.hxx +++ b/xmloff/source/draw/ximp3dobject.hxx @@ -38,7 +38,7 @@ protected: // the shape group this object should be created inside com::sun::star::drawing::HomogenMatrix mxHomMat; - sal_Bool mbSetTransform; + bool mbSetTransform; public: TYPEINFO_OVERRIDE(); @@ -48,7 +48,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXML3DObjectContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -61,8 +61,8 @@ class SdXML3DCubeObjectShapeContext : public SdXML3DObjectContext { ::basegfx::B3DVector maMinEdge; ::basegfx::B3DVector maMaxEdge; - sal_Bool mbMinEdgeUsed; - sal_Bool mbMaxEdgeUsed; + bool mbMinEdgeUsed; + bool mbMaxEdgeUsed; public: TYPEINFO_OVERRIDE(); @@ -71,7 +71,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXML3DCubeObjectShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -84,8 +84,8 @@ class SdXML3DSphereObjectShapeContext : public SdXML3DObjectContext { ::basegfx::B3DVector maCenter; ::basegfx::B3DVector maSize; - sal_Bool mbCenterUsed; - sal_Bool mbSizeUsed; + bool mbCenterUsed; + bool mbSizeUsed; public: TYPEINFO_OVERRIDE(); @@ -94,7 +94,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXML3DSphereObjectShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -115,7 +115,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXML3DPolygonBasedShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -133,7 +133,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXML3DLatheObjectShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -151,7 +151,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXML3DExtrudeObjectShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 7465fa308056..b3e5953a0cb8 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -93,7 +93,7 @@ SdXML3DSceneShapeContext::SdXML3DSceneShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShapes) + bool bTemporaryShapes) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShapes ), SdXML3DSceneAttributesHelper( rImport ) { } diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index aa5d3d1e36dd..bbdfac75c363 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -51,7 +51,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXML3DSceneShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index 825020050723..530fa8758203 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -150,7 +150,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, if(xDrawPage.is() && xMasterPages.is()) { - sal_Bool bDone(sal_False); + bool bDone(false); OUString sDisplayName( rImport.GetStyleDisplayName( XML_STYLE_FAMILY_MASTER_PAGE, maMasterPageName ) ); @@ -169,7 +169,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, if(!sMasterPageName.isEmpty() && sMasterPageName.equals(sDisplayName)) { xDrawPage->setMasterPage(xMasterPage); - bDone = sal_True; + bDone = true; } } } diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index dc4e2f7ca0db..c3938c0de476 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -171,7 +171,7 @@ void GetB3DVector( std::vector< com::sun::star::beans::PropertyValue >& rDest, } } -sal_Bool GetEquationName( const OUString& rEquation, const sal_Int32 nStart, OUString& rEquationName ) +bool GetEquationName( const OUString& rEquation, const sal_Int32 nStart, OUString& rEquationName ) { sal_Int32 nIndex = nStart; while( nIndex < rEquation.getLength() ) @@ -188,32 +188,32 @@ sal_Bool GetEquationName( const OUString& rEquation, const sal_Int32 nStart, OUS else break; } - sal_Bool bValid = ( nIndex - nStart ) != 0; + bool bValid = ( nIndex - nStart ) != 0; if ( bValid ) rEquationName = rEquation.copy( nStart, nIndex - nStart ); return bValid; } -sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, sal_Int32& nIndex, const OUString& rParaString ) +bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, sal_Int32& nIndex, const OUString& rParaString ) { if ( nIndex >= rParaString.getLength() ) - return sal_False; + return false; - sal_Bool bValid = sal_True; - sal_Bool bNumberRequired = sal_True; - sal_Bool bMustBePositiveWholeNumbered = sal_False; + bool bValid = true; + bool bNumberRequired = true; + bool bMustBePositiveWholeNumbered = false; rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL; if ( rParaString[ nIndex ] == '$' ) { rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT; - bMustBePositiveWholeNumbered = sal_True; + bMustBePositiveWholeNumbered = true; nIndex++; } else if ( rParaString[ nIndex ] == '?' ) { nIndex++; - bNumberRequired = sal_False; + bNumberRequired = false; OUString aEquationName; bValid = GetEquationName( rParaString, nIndex, aEquationName ); if ( bValid ) @@ -225,7 +225,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter } else if ( rParaString[ nIndex ] > '9' ) { - bNumberRequired = sal_False; + bNumberRequired = false; if ( rParaString.matchIgnoreAsciiCaseAsciiL( "left", 4, nIndex ) ) { rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::LEFT; @@ -287,7 +287,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter nIndex += 9; } else - bValid = sal_False; + bValid = false; } if ( bValid ) { @@ -296,10 +296,10 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter sal_Int32 nStartIndex = nIndex; sal_Int32 nEIndex = 0; // index of "E" in double - sal_Bool bE = sal_False; // set if a double is including a "E" statement - sal_Bool bENum = sal_False; // there is at least one number after "E" - sal_Bool bDot = sal_False; // set if there is a dot included - sal_Bool bEnd = sal_False; // set for each value that can not be part of a double/integer + bool bE = false; // set if a double is including a "E" statement + bool bENum = false; // there is at least one number after "E" + bool bDot = false; // set if there is a dot included + bool bEnd = false; // set for each value that can not be part of a double/integer while( ( nIndex < rParaString.getLength() ) && bValid ) { @@ -308,32 +308,32 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter case '.' : { if ( bMustBePositiveWholeNumbered ) - bValid = sal_False; + bValid = false; else { if ( bDot ) - bValid = sal_False; + bValid = false; else - bDot = sal_True; + bDot = true; } } break; case '-' : { if ( bMustBePositiveWholeNumbered ) - bValid = sal_False; + bValid = false; else { if ( nStartIndex == nIndex ) - bValid = sal_True; + bValid = true; else if ( bE ) { if ( nEIndex + 1 == nIndex ) - bValid = sal_True; + bValid = true; else if ( bENum ) - bEnd = sal_True; + bEnd = true; else - bValid = sal_False; + bValid = false; } } } @@ -343,16 +343,16 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter case 'E' : { if ( bMustBePositiveWholeNumbered ) - bEnd = sal_True; + bEnd = true; else { if ( !bE ) { - bE = sal_True; + bE = true; nEIndex = nIndex; } else - bEnd = sal_True; + bEnd = true; } } break; @@ -368,11 +368,11 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter case '9' : { if ( bE && ! bENum ) - bENum = sal_True; + bENum = true; } break; default: - bEnd = sal_True; + bEnd = true; } if ( !bEnd ) nIndex++; @@ -380,7 +380,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter break; } if ( nIndex == nStartIndex ) - bValid = sal_False; + bValid = false; if ( bValid ) { OUString aNumber( rParaString.copy( nStartIndex, nIndex - nStartIndex ) ); @@ -390,7 +390,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter if (::sax::Converter::convertDouble(fAttrDouble, aNumber)) rParameter.Value <<= fAttrDouble; else - bValid = sal_False; + bValid = false; } else { @@ -398,7 +398,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter if (::sax::Converter::convertNumber(nValue, aNumber)) rParameter.Value <<= nValue; else - bValid = sal_False; + bValid = false; } } } @@ -613,7 +613,7 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest sal_Int32 nParametersNeeded = 1; sal_Int16 nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::MOVETO; - sal_Bool bValid = sal_True; + bool bValid = true; while( bValid && ( nIndex < rValue.getLength() ) ) { @@ -795,7 +795,7 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest nParameterCount++; } else - bValid = sal_False; + bValid = false; } break; default: @@ -1171,7 +1171,7 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax break; case EAS_text_path_scale : { - sal_Bool bScaleX = IsXMLToken( rValue, XML_SHAPE ); + bool bScaleX = IsXMLToken( rValue, XML_SHAPE ); beans::PropertyValue aProp; aProp.Name = EASGet( EAS_ScaleX ); aProp.Value <<= bScaleX; diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx index 895a35d7abb5..d97d3499eed6 100644 --- a/xmloff/source/draw/ximpgrp.cxx +++ b/xmloff/source/draw/ximpgrp.cxx @@ -34,7 +34,7 @@ SdXMLGroupShapeContext::SdXMLGroupShapeContext( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { } diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx index 4456122eaa45..bf69293fec7f 100644 --- a/xmloff/source/draw/ximpgrp.hxx +++ b/xmloff/source/draw/ximpgrp.hxx @@ -44,7 +44,7 @@ public: SdXMLGroupShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLGroupShapeContext(); virtual SvXMLImportContext *CreateChildContext( diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 932b43e9c54b..c680f7aded6c 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -303,7 +303,7 @@ void SdXMLGenericPageContext::EndElement() const OUString aStrDateTimeTextProp( "DateTimeText" ); if( xInfo->hasPropertyByName( aStrDateTimeTextProp ) ) { - sal_Bool bFixed; + bool bFixed; OUString aDateTimeFormat; const OUString aText( GetSdImport().GetDateTimeDecl( maUseDateTimeDeclName, bFixed, aDateTimeFormat ) ); diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 902c1799ed43..ce27251c3429 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -139,16 +139,16 @@ SdXMLShapeContext::SdXMLShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SvXMLShapeContext( rImport, nPrfx, rLocalName, bTemporaryShape ) , mxShapes( rShapes ) , mxAttrList(xAttrList) , mbListContextPushed( false ) , mnStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_ID) , mnClass(0) - , mbIsPlaceholder(sal_False) + , mbIsPlaceholder(false) , mbClearDefaultAttributes( true ) - , mbIsUserTransformed(sal_False) + , mbIsUserTransformed(false) , mnZOrder(-1) , maSize(1, 1) , mnRelWidth(0) @@ -616,13 +616,13 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) break; const SvXMLStyleContext* pStyle = 0L; - sal_Bool bAutoStyle(sal_False); + bool bAutoStyle(false); if(GetImport().GetShapeImport()->GetAutoStylesContext()) pStyle = GetImport().GetShapeImport()->GetAutoStylesContext()->FindStyleChildContext(mnStyleFamily, maDrawStyleName); if(pStyle) - bAutoStyle = sal_True; + bAutoStyle = true; if(!pStyle && GetImport().GetShapeImport()->GetStylesContext()) pStyle = GetImport().GetShapeImport()->GetStylesContext()->FindStyleChildContext(mnStyleFamily, maDrawStyleName); @@ -924,23 +924,23 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rL } } -sal_Bool SdXMLShapeContext::isPresentationShape() const +bool SdXMLShapeContext::isPresentationShape() const { if( !maPresentationClass.isEmpty() && (const_cast<SdXMLShapeContext*>(this))->GetImport().GetShapeImport()->IsPresentationShapesSupported() ) { if(XML_STYLE_FAMILY_SD_PRESENTATION_ID == mnStyleFamily) { - return sal_True; + return true; } if( IsXMLToken( maPresentationClass, XML_HEADER ) || IsXMLToken( maPresentationClass, XML_FOOTER ) || IsXMLToken( maPresentationClass, XML_PAGE_NUMBER ) || IsXMLToken( maPresentationClass, XML_DATE_TIME ) ) { - return sal_True; + return true; } } - return sal_False; + return false; } void SdXMLShapeContext::onDemandRescueUsefulDataFromTemporary( const SvXMLImportContext& rCandidate ) @@ -1018,7 +1018,7 @@ SdXMLRectShapeContext::SdXMLRectShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mnRadius( 0L ) { @@ -1084,7 +1084,7 @@ SdXMLLineShapeContext::SdXMLLineShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mnX1( 0L ), mnY1( 0L ), @@ -1201,7 +1201,7 @@ SdXMLEllipseShapeContext::SdXMLEllipseShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mnCX( 0L ), mnCY( 0L ), @@ -1335,7 +1335,7 @@ SdXMLPolygonShapeContext::SdXMLPolygonShapeContext( sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - uno::Reference< drawing::XShapes >& rShapes, sal_Bool bClosed, sal_Bool bTemporaryShape) + uno::Reference< drawing::XShapes >& rShapes, bool bClosed, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mbClosed( bClosed ) { @@ -1445,7 +1445,7 @@ SdXMLPathShapeContext::SdXMLPathShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { } @@ -1595,7 +1595,7 @@ SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mnRadius(0) { @@ -1624,7 +1624,7 @@ void SdXMLTextBoxShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStr void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>&) { // create textbox shape - sal_Bool bIsPresShape = sal_False; + bool bIsPresShape = false; bool bClearText = false; OUString service; @@ -1678,7 +1678,7 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt // XmlShapeTypePresTitleTextShape service = "com.sun.star.presentation.TitleTextShape"; } - bIsPresShape = sal_True; + bIsPresShape = true; } } @@ -1761,7 +1761,7 @@ SdXMLControlShapeContext::SdXMLControlShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { } @@ -1826,7 +1826,7 @@ SdXMLConnectorShapeContext::SdXMLConnectorShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), maStart(0,0), maEnd(1,1), @@ -1975,7 +1975,7 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA // For security reasons, do not add empty connectors. There may have been an error in EA2 // that created empty, far set off connectors (e.g. 63 meters below top of document). This // is not guaranteed, but it's definitely safe to not add empty connectors. - sal_Bool bDoAdd(sal_True); + bool bDoAdd(true); if( maStartShapeId.isEmpty() && maEndShapeId.isEmpty() @@ -1986,7 +1986,7 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA && 0 == mnDelta3 ) { - bDoAdd = sal_False; + bDoAdd = false; } if(bDoAdd) @@ -2094,7 +2094,7 @@ SdXMLMeasureShapeContext::SdXMLMeasureShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), maStart(0,0), maEnd(1,1) @@ -2206,7 +2206,7 @@ SdXMLPageShapeContext::SdXMLPageShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mnPageNumber(0) { mbClearDefaultAttributes = false; @@ -2238,11 +2238,11 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib // #86163# take into account which type of PageShape needs to // be constructed. It's an pres shape if presentation:XML_CLASS == XML_PRESENTATION_PAGE. - sal_Bool bIsPresentation = !maPresentationClass.isEmpty() && + bool bIsPresentation = !maPresentationClass.isEmpty() && GetImport().GetShapeImport()->IsPresentationShapesSupported(); uno::Reference< lang::XServiceInfo > xInfo( mxShapes, uno::UNO_QUERY ); - const sal_Bool bIsOnHandoutPage = xInfo.is() && xInfo->supportsService("com.sun.star.presentation.HandoutMasterPage"); + const bool bIsOnHandoutPage = xInfo.is() && xInfo->supportsService("com.sun.star.presentation.HandoutMasterPage"); if( bIsOnHandoutPage ) { @@ -2252,7 +2252,7 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib { if(bIsPresentation && !IsXMLToken( maPresentationClass, XML_PRESENTATION_PAGE ) ) { - bIsPresentation = sal_False; + bIsPresentation = false; } if(bIsPresentation) @@ -2294,7 +2294,7 @@ SdXMLCaptionShapeContext::SdXMLCaptionShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), // #86616# for correct edge rounding import mnRadius needs to be initialized mnRadius( 0L ) @@ -2322,7 +2322,7 @@ void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAtt // is the default setting, so the top left reference point that is used by the caption point is // no longer correct) There are two ways to solve this problem, temporarily disabling the // autogrowwith as we are doing here or to apply the CaptionPoint after setting text - sal_Bool bIsAutoGrowWidth = sal_False; + bool bIsAutoGrowWidth = false; if ( xProps.is() ) { uno::Any aAny( xProps->getPropertyValue("TextAutoGrowWidth") ); @@ -2395,7 +2395,7 @@ SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), maURL() { @@ -2561,7 +2561,7 @@ SdXMLChartShapeContext::SdXMLChartShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mpChartContext( NULL ) { @@ -2575,7 +2575,7 @@ SdXMLChartShapeContext::~SdXMLChartShapeContext() void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { - const sal_Bool bIsPresentation = isPresentationShape(); + const bool bIsPresentation = isPresentationShape(); AddShape( bIsPresentation @@ -2665,7 +2665,7 @@ SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { } @@ -2692,7 +2692,7 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen OUString service("com.sun.star.drawing.OLE2Shape"); - sal_Bool bIsPresShape = !maPresentationClass.isEmpty() && GetImport().GetShapeImport()->IsPresentationShapesSupported(); + bool bIsPresShape = !maPresentationClass.isEmpty() && GetImport().GetShapeImport()->IsPresentationShapesSupported(); if( bIsPresShape ) { @@ -2880,9 +2880,9 @@ SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), - mbIsScript( sal_False ) + mbIsScript( false ) { } @@ -3042,7 +3042,7 @@ SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) : + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mbMedia( false ) { @@ -3073,7 +3073,7 @@ void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Referen OUString service; - sal_Bool bIsPresShape = sal_False; + bool bIsPresShape = false; if( mbMedia ) { @@ -3217,14 +3217,14 @@ void SdXMLPluginShapeContext::EndElement() OUString aValueStr; maParams[ nParam ].Value >>= aValueStr; xProps->setPropertyValue("Loop", - uno::makeAny( static_cast< sal_Bool >( aValueStr.equalsAscii( "true" ) ) ) ); + uno::makeAny( aValueStr.equalsAscii( "true" ) ) ); } else if( rName.equalsAscii( "Mute" ) ) { OUString aValueStr; maParams[ nParam ].Value >>= aValueStr; xProps->setPropertyValue("Mute", - uno::makeAny( static_cast< sal_Bool >( aValueStr.equalsAscii( "true" ) ) ) ); + uno::makeAny( aValueStr.equalsAscii( "true" ) ) ); } else if( rName.equalsAscii( "VolumeDB" ) ) { @@ -3319,7 +3319,7 @@ SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rIm const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { } @@ -3413,10 +3413,10 @@ SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), MultiImageImportHelper(), - mbSupportsReplacement( sal_False ), + mbSupportsReplacement( false ), mxImplContext(), mxReplImplContext() { @@ -3697,7 +3697,7 @@ SdXMLCustomShapeContext::SdXMLCustomShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { } @@ -3877,7 +3877,7 @@ SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext( TYPEINIT1( SdXMLTableShapeContext, SdXMLShapeContext ); SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ) -: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, sal_False ) +: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false ) { memset( &maTemplateStylesUsed, 0, sizeof( maTemplateStylesUsed ) ); } @@ -3890,7 +3890,7 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc { OUString service("com.sun.star.drawing.TableShape"); - sal_Bool bIsPresShape = !maPresentationClass.isEmpty() && GetImport().GetShapeImport()->IsPresentationShapesSupported(); + bool bIsPresShape = !maPresentationClass.isEmpty() && GetImport().GetShapeImport()->IsPresentationShapesSupported(); if( bIsPresShape ) { if( IsXMLToken( maPresentationClass, XML_PRESENTATION_TABLE ) ) diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index 37ab20703fda..f3d4f90e38b3 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -60,9 +60,9 @@ protected: sal_uInt16 mnStyleFamily; sal_uInt16 mnClass; - sal_Bool mbIsPlaceholder; + bool mbIsPlaceholder; bool mbClearDefaultAttributes; - sal_Bool mbIsUserTransformed; + bool mbIsUserTransformed; sal_Int32 mnZOrder; OUString maShapeId; OUString maLayerName; @@ -96,7 +96,7 @@ protected: void addGluePoint( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); - sal_Bool isPresentationShape() const; + bool isPresentationShape() const; public: TYPEINFO_OVERRIDE(); @@ -106,7 +106,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -136,7 +136,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLRectShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -160,7 +160,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLLineShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -187,7 +187,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLEllipseShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -201,7 +201,7 @@ class SdXMLPolygonShapeContext : public SdXMLShapeContext { OUString maPoints; OUString maViewBox; - sal_Bool mbClosed; + bool mbClosed; public: TYPEINFO_OVERRIDE(); @@ -209,7 +209,7 @@ public: SdXMLPolygonShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bClosed, sal_Bool bTemporaryShape); + com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, bool bClosed, bool bTemporaryShape); virtual ~SdXMLPolygonShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -231,7 +231,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLPathShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -252,7 +252,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLTextBoxShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -274,7 +274,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLControlShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -310,7 +310,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLConnectorShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -333,7 +333,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLMeasureShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; virtual void EndElement() SAL_OVERRIDE; @@ -355,7 +355,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLPageShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -378,7 +378,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLCaptionShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -401,7 +401,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLGraphicObjectShapeContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; @@ -426,7 +426,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLChartShapeContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; @@ -454,7 +454,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLObjectShapeContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; @@ -476,7 +476,7 @@ private: OUString maAppletName; OUString maAppletCode; OUString maHref; - sal_Bool mbIsScript; + bool mbIsScript; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; @@ -487,7 +487,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLAppletShapeContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; @@ -518,7 +518,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLPluginShapeContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; @@ -546,7 +546,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLFloatingFrameShapeContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; @@ -561,7 +561,7 @@ public: class SdXMLFrameShapeContext : public SdXMLShapeContext, public MultiImageImportHelper { private: - sal_Bool mbSupportsReplacement; + bool mbSupportsReplacement; SvXMLImportContextRef mxImplContext; SvXMLImportContextRef mxReplImplContext; @@ -577,7 +577,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLFrameShapeContext(); virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -606,7 +606,7 @@ public: SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLCustomShapeContext(); virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx index 055ccf3ef3f6..2cc993478da0 100644 --- a/xmloff/source/draw/ximpshow.cxx +++ b/xmloff/source/draw/ximpshow.cxx @@ -85,7 +85,7 @@ SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, c if( mpImpl->mxPresProps.is() ) { - sal_Bool bAll = sal_True; + bool bAll = true; uno::Any aAny; // read attributes @@ -104,12 +104,12 @@ SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, c { aAny <<= sValue; mpImpl->mxPresProps->setPropertyValue("FirstPage", aAny ); - bAll = sal_False; + bAll = false; } else if( IsXMLToken( aLocalName, XML_SHOW ) ) { mpImpl->maCustomShowName = sValue; - bAll = sal_False; + bAll = false; } else if( IsXMLToken( aLocalName, XML_PAUSE ) ) { diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 47fd843fd62a..5bb4e1dc27d3 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -790,7 +790,7 @@ SdXMLMasterPageContext::SdXMLMasterPageContext( uno::Reference< drawing::XShapes >& rShapes) : SdXMLGenericPageContext( rImport, nPrfx, rLName, xAttrList, rShapes ) { - const sal_Bool bHandoutMaster = IsXMLToken( rLName, XML_HANDOUT_MASTER ); + const bool bHandoutMaster = IsXMLToken( rLName, XML_HANDOUT_MASTER ); const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for(sal_Int16 i=0; i < nAttrCount; i++) @@ -959,7 +959,7 @@ SdXMLStylesContext::SdXMLStylesContext( sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< xml::sax::XAttributeList >& xAttrList, - sal_Bool bIsAutoStyle) + bool bIsAutoStyle) : SvXMLStylesContext(rImport, nPrfx, rLName, xAttrList), mbIsAutoStyle(bIsAutoStyle) { @@ -1273,7 +1273,7 @@ static bool canSkipReset(const OUString &rName, const XMLPropStyleContext* pProp bool bCanSkipReset = false; if (pPropStyle && rName == "TextAutoGrowHeight") { - sal_Bool bOldStyleTextAutoGrowHeight(sal_False); + bool bOldStyleTextAutoGrowHeight(false); rPropSet->getPropertyValue("TextAutoGrowHeight") >>= bOldStyleTextAutoGrowHeight; sal_Int32 nIndexStyle = rPrMap->GetEntryIndex(XML_NAMESPACE_DRAW, "auto-grow-height", 0); @@ -1286,7 +1286,7 @@ static bool canSkipReset(const OUString &rName, const XMLPropStyleContext* pProp sal_Int32 nIdx = property->mnIndex; if (nIdx == nIndexStyle) { - sal_Bool bNewStyleTextAutoGrowHeight(sal_False); + bool bNewStyleTextAutoGrowHeight(false); property->maValue >>= bNewStyleTextAutoGrowHeight; if (bNewStyleTextAutoGrowHeight == bOldStyleTextAutoGrowHeight) bCanSkipReset = true;; diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index 7ddd4ec0676c..2fcea98f1c64 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -188,7 +188,7 @@ public: class SdXMLStylesContext : public SvXMLStylesContext { UniReference< SvXMLImportPropertyMapper > xPresImpPropMapper; - sal_Bool mbIsAutoStyle; + bool mbIsAutoStyle; SvXMLNumFmtHelper* mpNumFmtHelper; SvNumberFormatter* mpNumFormatter; @@ -225,7 +225,7 @@ public: sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, - sal_Bool bIsAutoStyle); + bool bIsAutoStyle); virtual ~SdXMLStylesContext(); virtual sal_uInt16 GetFamily( const OUString& rFamily ) const SAL_OVERRIDE; @@ -280,7 +280,7 @@ private: OUString maStrName; OUString maStrText; OUString maStrDateTimeFormat; - sal_Bool mbFixed; + bool mbFixed; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSTYL_HXX diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx index dcb06fe51c54..a2f7b12768a4 100644 --- a/xmloff/source/forms/attriblistmerge.cxx +++ b/xmloff/source/forms/attriblistmerge.cxx @@ -33,7 +33,7 @@ namespace xmloff m_aLists.push_back(_rxList); } - sal_Bool OAttribListMerger::seekToIndex(sal_Int16 _nGlobalIndex, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) + bool OAttribListMerger::seekToIndex(sal_Int16 _nGlobalIndex, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) { sal_Int16 nLeftOver = _nGlobalIndex; AttributeListArray::const_iterator aLookupSublist = m_aLists.begin(); @@ -46,14 +46,14 @@ namespace xmloff if (aLookupSublist == m_aLists.end()) { OSL_FAIL("OAttribListMerger::seekToIndex: invalid index!"); - return sal_False; + return false; } _rSubList = *aLookupSublist; _rLocalIndex = nLeftOver; - return sal_True; + return true; } - sal_Bool OAttribListMerger::seekToName(const OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) + bool OAttribListMerger::seekToName(const OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) { for ( AttributeListArray::const_iterator aLookupSublist = m_aLists.begin(); aLookupSublist != m_aLists.end(); @@ -64,11 +64,11 @@ namespace xmloff { _rSubList = *aLookupSublist; _rLocalIndex = i; - return sal_True; + return true; } OSL_FAIL("OAttribListMerger::seekToName: did not find the name!"); - return sal_False; + return false; } sal_Int16 SAL_CALL OAttribListMerger::getLength( ) throw(RuntimeException, std::exception) diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx index 45b8c624dcb1..6d63d0180e69 100644 --- a/xmloff/source/forms/attriblistmerge.hxx +++ b/xmloff/source/forms/attriblistmerge.hxx @@ -63,8 +63,8 @@ namespace xmloff virtual OUString SAL_CALL getValueByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - sal_Bool seekToIndex(sal_Int16 _nGlobalIndex, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); - sal_Bool seekToName(const OUString& _rName, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); + bool seekToIndex(sal_Int16 _nGlobalIndex, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); + bool seekToName(const OUString& _rName, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); }; } // namespace xmloff diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx index 451ff4136294..66f690e8bf1b 100644 --- a/xmloff/source/forms/controlpropertymap.cxx +++ b/xmloff/source/forms/controlpropertymap.cxx @@ -87,7 +87,7 @@ namespace xmloff struct XMLPropertyMapEntryLess { - sal_Bool operator()(const XMLPropertyMapEntry& _rLeft, const XMLPropertyMapEntry& _rRight) + bool operator()(const XMLPropertyMapEntry& _rLeft, const XMLPropertyMapEntry& _rRight) { return strcmp(_rLeft.msApiName, _rRight.msApiName) < 0; } @@ -104,11 +104,11 @@ namespace xmloff void initializePropertyMaps() { - static sal_Bool bSorted = sal_False; + static bool bSorted = false; if (!bSorted) { implSortMap(getControlStylePropertyMap_Access()); - bSorted = sal_True; + bSorted = true; } } diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 3f5571344eeb..3db796ace565 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -429,7 +429,7 @@ namespace xmloff // if we act as rich text control, we need to export some text:p elements if ( xControlText.is() ) { - sal_Bool bActingAsRichText = sal_False; + bool bActingAsRichText = false; if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_RICH_TEXT ) ) { OSL_VERIFY(m_xProps->getPropertyValue( PROPERTY_RICH_TEXT ) >>= bActingAsRichText ); @@ -1501,7 +1501,7 @@ namespace xmloff else { // if the MultiLine property is sal_True, it is a TextArea - sal_Bool bMultiLine = sal_False; + bool bMultiLine = false; if (m_xPropertyInfo->hasPropertyByName(PROPERTY_MULTILINE)) // grid columns do not have this property .... bMultiLine = ::cppu::any2bool(m_xProps->getPropertyValue(PROPERTY_MULTILINE)); @@ -1613,7 +1613,7 @@ namespace xmloff // a sequence of pairs which is build from the StringItemList and the ValueList ListSourceType eListSourceType = ListSourceType_VALUELIST; #if OSL_DEBUG_LEVEL > 0 - sal_Bool bSuccess = + bool bSuccess = #endif m_xProps->getPropertyValue(PROPERTY_LISTSOURCETYPE) >>= eListSourceType; OSL_ENSURE(bSuccess, "OControlExport::examineControl: could not retrieve the ListSourceType!"); @@ -2043,7 +2043,7 @@ namespace xmloff OFormExport::OFormExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxForm, const Sequence< ScriptEventDescriptor >& _rEvents) :OElementExport(_rContext, _rxForm, _rEvents) - ,m_bCreateConnectionResourceElement(sal_False) + ,m_bCreateConnectionResourceElement(false) { OSL_ENSURE(m_xProps.is(), "OFormExport::OFormExport: invalid arguments!"); } diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx index ed0a89a5fae6..77294416e1d2 100644 --- a/xmloff/source/forms/elementexport.hxx +++ b/xmloff/source/forms/elementexport.hxx @@ -293,7 +293,7 @@ namespace xmloff :public OControlElement ,public OElementExport { - sal_Bool m_bCreateConnectionResourceElement; + bool m_bCreateConnectionResourceElement; public: /** constructs an object capable of exporting controls */ diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index e3ef0a0e87bc..5dfd390c2b8d 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -76,7 +76,7 @@ namespace xmloff struct PropertyValueLess { - sal_Bool operator()(const PropertyValue& _rLeft, const PropertyValue& _rRight) + bool operator()(const PropertyValue& _rLeft, const PropertyValue& _rRight) { return _rLeft.Name < _rRight.Name; } @@ -242,7 +242,7 @@ namespace xmloff // set the properties const Reference< XMultiPropertySet > xMultiProps(m_xElement, UNO_QUERY); - sal_Bool bSuccess = sal_False; + bool bSuccess = false; if (xMultiProps.is()) { // translate our properties so that the XMultiPropertySet can handle them @@ -271,7 +271,7 @@ namespace xmloff try { xMultiProps->setPropertyValues(aNames, aValues); - bSuccess = sal_True; + bSuccess = true; } catch(const Exception&) { @@ -350,7 +350,7 @@ namespace xmloff // determine the type of the value (source for the following conversion) TypeClass eValueTypeClass = aPropValues->Value.getValueTypeClass(); - const sal_Bool bValueIsSequence = TypeClass_SEQUENCE == eValueTypeClass; + const bool bValueIsSequence = TypeClass_SEQUENCE == eValueTypeClass; if ( bValueIsSequence ) { uno::Type aSimpleType( getSequenceElementType( aPropValues->Value.getValueType() ) ); @@ -360,7 +360,7 @@ namespace xmloff // determine the type of the property (target for the following conversion) const Property aProperty( m_xInfo->getPropertyByName( aPropValues->Name ) ); TypeClass ePropTypeClass = aProperty.Type.getTypeClass(); - const sal_Bool bPropIsSequence = TypeClass_SEQUENCE == ePropTypeClass; + const bool bPropIsSequence = TypeClass_SEQUENCE == ePropTypeClass; if( bPropIsSequence ) { uno::Type aSimpleType( ::comphelper::getSequenceElementType( aProperty.Type ) ); @@ -823,8 +823,8 @@ namespace xmloff const sal_Char* pMinValueProperty = NULL; const sal_Char* pMaxValueProperty = NULL; - sal_Bool bRetrievedValues = sal_False; - sal_Bool bRetrievedValueLimits = sal_False; + bool bRetrievedValues = false; + bool bRetrievedValueLimits = false; // get the class id of our element sal_Int16 nClassId = FormComponentType::CONTROL; @@ -853,7 +853,7 @@ namespace xmloff break; } - bRetrievedValues = sal_True; + bRetrievedValues = true; } if ( PROPID_VALUE == aValueProps->Handle && !pValueProperty ) { @@ -888,7 +888,7 @@ namespace xmloff break; } - bRetrievedValueLimits = sal_True; + bRetrievedValueLimits = true; } OSL_ENSURE((PROPID_MIN_VALUE != aValueProps->Handle) || pMinValueProperty, "OControlImport::StartElement: the control does not have a value property!"); @@ -927,7 +927,7 @@ namespace xmloff // the untranslated string value as read in handleAttribute OUString sValue; #if OSL_DEBUG_LEVEL > 0 - sal_Bool bSuccess = + bool bSuccess = #endif _rPropValue.Value >>= sValue; OSL_ENSURE(bSuccess, "OControlImport::implTranslateValueProperty: supposed to be called with non-translated string values!"); @@ -971,7 +971,7 @@ namespace xmloff // the DefaultText, which can happen for other value/default-value property names), // this means that the Text (the value property) is incorrectly imported. - sal_Bool bRestoreValuePropertyValue = sal_False; + bool bRestoreValuePropertyValue = false; Any aValuePropertyValue; sal_Int16 nClassId = FormComponentType::CONTROL; @@ -991,7 +991,7 @@ namespace xmloff getRuntimeValuePropertyNames(m_eElementType, nClassId, pValueProperty, pDefaultValueProperty); if ( pDefaultValueProperty && pValueProperty ) { - sal_Bool bNonDefaultValuePropertyValue = sal_False; + bool bNonDefaultValuePropertyValue = false; // is the "value property" part of the sequence? // look up this property in our sequence @@ -1002,10 +1002,10 @@ namespace xmloff ) { if ( aCheck->Name.equalsAscii( pDefaultValueProperty ) ) - bRestoreValuePropertyValue = sal_True; + bRestoreValuePropertyValue = true; else if ( aCheck->Name.equalsAscii( pValueProperty ) ) { - bNonDefaultValuePropertyValue = sal_True; + bNonDefaultValuePropertyValue = true; // we need to restore the value property we found here, nothing else aValuePropertyValue = aCheck->Value; } @@ -1115,7 +1115,7 @@ namespace xmloff :OControlImport( _rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType ) ,m_nImagePosition( -1 ) ,m_nImageAlign( 0 ) - ,m_bHaveImagePosition( sal_False ) + ,m_bHaveImagePosition( false ) { } @@ -1128,7 +1128,7 @@ namespace xmloff m_rContext.getGlobalContext(), ::getCppuType( &m_nImagePosition ), _rValue, OEnumMapper::getEnumMap( OEnumMapper::epImagePosition ) ) >>= m_nImagePosition ); - m_bHaveImagePosition = sal_True; + m_bHaveImagePosition = true; return true; } @@ -1273,7 +1273,7 @@ namespace xmloff // need to make the URL absolute if // * it's the image-data attribute // * it's the target-location attribute, and we're dealign with an object which has the respective property - sal_Bool bMakeAbsolute = + bool bMakeAbsolute = _rLocalName.equalsAscii( s_pImageDataAttributeName ) || ( _rLocalName.equalsAscii( s_pTargetLocationAttributeName ) && ( ( OControlElement::BUTTON == m_eElementType ) @@ -1451,12 +1451,12 @@ namespace xmloff // additionally, we need to set the "RichText" property of our element to sal_True // (the presence of the text:p is used as indicator for the value of the RichText property) - sal_Bool bHasRichTextProperty = sal_False; + bool bHasRichTextProperty = false; if ( m_xInfo.is() ) bHasRichTextProperty = m_xInfo->hasPropertyByName( PROPERTY_RICH_TEXT ); OSL_ENSURE( bHasRichTextProperty, "OTextLikeImport::EndElement: text:p, but no rich text control?" ); if ( bHasRichTextProperty ) - m_xElement->setPropertyValue( PROPERTY_RICH_TEXT, makeAny( (sal_Bool)sal_True ) ); + m_xElement->setPropertyValue( PROPERTY_RICH_TEXT, makeAny( true ) ); } // Note that we do *not* set the RichText property (in case our element has one) to sal_False here // since this is the default of this property, anyway. @@ -1535,8 +1535,8 @@ namespace xmloff :OControlImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) ,m_nEmptyListItems( 0 ) ,m_nEmptyValueItems( 0 ) - ,m_bEncounteredLSAttrib( sal_False ) - ,m_bLinkWithIndexes( sal_False ) + ,m_bEncounteredLSAttrib( false ) + ,m_bLinkWithIndexes( false ) { if (OControlElement::COMBOBOX == m_eElementType) enableTrackAttributes(); @@ -1561,7 +1561,7 @@ namespace xmloff void OListAndComboImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { - m_bLinkWithIndexes = sal_False; + m_bLinkWithIndexes = false; OControlImport::StartElement(_rxAttrList); @@ -1644,7 +1644,7 @@ namespace xmloff aListSource.Name = PROPERTY_LISTSOURCE; // it's the ListSource attribute - m_bEncounteredLSAttrib = sal_True; + m_bEncounteredLSAttrib = true; if ( OControlElement::COMBOBOX == m_eElementType ) { aListSource.Value <<= _rValue; @@ -1755,11 +1755,11 @@ namespace xmloff // the label attribute OUString sValue = _rxAttrList->getValueByName(sLabelAttribute); - sal_Bool bNonexistentAttribute = sal_False; + bool bNonexistentAttribute = false; if (sValue.isEmpty()) if (_rxAttrList->getTypeByName(sLabelAttribute).isEmpty()) // this attribute does not really exist - bNonexistentAttribute = sal_True; + bNonexistentAttribute = true; if (bNonexistentAttribute) m_xListBoxImport->implEmptyLabelFound(); @@ -1768,11 +1768,11 @@ namespace xmloff // the value attribute sValue = _rxAttrList->getValueByName(sValueAttribute); - bNonexistentAttribute = sal_False; + bNonexistentAttribute = false; if (sValue.isEmpty()) if (_rxAttrList->getTypeByName(sValueAttribute).isEmpty()) // this attribute does not really exist - bNonexistentAttribute = sal_True; + bNonexistentAttribute = true; if (bNonexistentAttribute) m_xListBoxImport->implEmptyValueFound(); diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index a1089083e37f..fa73f5a02304 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -282,7 +282,7 @@ namespace xmloff { sal_Int16 m_nImagePosition; sal_Int16 m_nImageAlign; - sal_Bool m_bHaveImagePosition; + bool m_bHaveImagePosition; public: OImagePositionImport( @@ -481,8 +481,8 @@ namespace xmloff sal_Int32 m_nEmptyListItems; /// number of empty list items encountered during reading sal_Int32 m_nEmptyValueItems; /// number of empty value items encountered during reading - sal_Bool m_bEncounteredLSAttrib; - sal_Bool m_bLinkWithIndexes; /** <TRUE/> if and only if we should use a cell value binding + bool m_bEncounteredLSAttrib; + bool m_bLinkWithIndexes; /** <TRUE/> if and only if we should use a cell value binding which exchanges the selection index (instead of the selection text */ diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index 78b7920d4132..40532b561d91 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -245,7 +245,7 @@ namespace xmloff void OAttribute2Property::addBooleanProperty( const sal_Char* _pAttributeName, const OUString& _rPropertyName, - const sal_Bool _bAttributeDefault, const sal_Bool _bInverseSemantics) + const bool _bAttributeDefault, const bool _bInverseSemantics) { OUStringBuffer aDefault; ::sax::Converter::convertBool(aDefault, _bAttributeDefault); diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx index a710ee0b889e..c5802a0ea5b2 100644 --- a/xmloff/source/forms/formattributes.hxx +++ b/xmloff/source/forms/formattributes.hxx @@ -241,9 +241,9 @@ namespace xmloff // entries which are special to some value types const SvXMLEnumMapEntry* pEnumMap; // the enum map, if appliable - sal_Bool bInverseSemantics; // for booleanss: attribute and property value have the same or an inverse semantics? + bool bInverseSemantics; // for booleanss: attribute and property value have the same or an inverse semantics? - AttributeAssignment() : pEnumMap(NULL), bInverseSemantics(sal_False) { } + AttributeAssignment() : pEnumMap(NULL), bInverseSemantics(false) { } }; protected: @@ -292,7 +292,7 @@ namespace xmloff */ void addBooleanProperty( const sal_Char* _pAttributeName, const OUString& _rPropertyName, - const sal_Bool _bAttributeDefault, const sal_Bool _bInverseSemantics = sal_False); + const bool _bAttributeDefault, const bool _bInverseSemantics = false); /** add a attribute assignment referring to an int16 property to the map diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx index 176aaaabddf2..0be43c8e00fb 100644 --- a/xmloff/source/forms/formcellbinding.cxx +++ b/xmloff/source/forms/formcellbinding.cxx @@ -107,7 +107,7 @@ FormCellBindingHelper::FormCellBindingHelper( const Reference< XPropertySet >& _ OSL_ENSURE( m_xDocument.is(), "FormCellBindingHelper::FormCellBindingHelper: Did not find the spreadsheet document!" ); } -sal_Bool FormCellBindingHelper::livesInSpreadsheetDocument( const Reference< XPropertySet >& _rxControlModel ) +bool FormCellBindingHelper::livesInSpreadsheetDocument( const Reference< XPropertySet >& _rxControlModel ) { Reference< XSpreadsheetDocument > xDocument( getDocument( _rxControlModel ), UNO_QUERY ); return xDocument.is(); diff --git a/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx index 71d1bba796dd..3a90df83623b 100644 --- a/xmloff/source/forms/formcellbinding.hxx +++ b/xmloff/source/forms/formcellbinding.hxx @@ -48,7 +48,7 @@ namespace xmloff <p>If this method returns <FALSE/>, you cannot instantiate a CellBindingHelper with this model, since then no of it's functionality will be available.</p> */ - static sal_Bool livesInSpreadsheetDocument( + static bool livesInSpreadsheetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel ); diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index dce6f3da7bbe..9ccccf6065b2 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -102,30 +102,30 @@ namespace xmloff { } - sal_Bool OFormLayerXMLExport_Impl::impl_isFormPageContainingForms(const Reference< XDrawPage >& _rxDrawPage, Reference< XIndexAccess >& _rxForms) + bool OFormLayerXMLExport_Impl::impl_isFormPageContainingForms(const Reference< XDrawPage >& _rxDrawPage, Reference< XIndexAccess >& _rxForms) { Reference< XFormsSupplier2 > xFormsSupp(_rxDrawPage, UNO_QUERY); OSL_ENSURE(xFormsSupp.is(), "OFormLayerXMLExport_Impl::impl_isFormPageContainingForms: invalid draw page (no XFormsSupplier)! Doin' nothing!"); if (!xFormsSupp.is()) - return sal_False; + return false; if ( !xFormsSupp->hasForms() ) // nothing to do at all - return sal_False; + return false; _rxForms = Reference< XIndexAccess >(xFormsSupp->getForms(), UNO_QUERY); Reference< XServiceInfo > xSI(_rxForms, UNO_QUERY); // order is important! OSL_ENSURE(xSI.is(), "OFormLayerXMLExport_Impl::impl_isFormPageContainingForms: invalid collection (must not be NULL and must have a ServiceInfo)!"); if (!xSI.is()) - return sal_False; + return false; if (!xSI->supportsService("com.sun.star.form.Forms")) { OSL_FAIL("OFormLayerXMLExport_Impl::impl_isFormPageContainingForms: invalid collection (is no com.sun.star.form.Forms)!"); // nothing to do - return sal_False; + return false; } - return sal_True; + return true; } void OFormLayerXMLExport_Impl::exportGridColumn(const Reference< XPropertySet >& _rxColumn, @@ -275,9 +275,9 @@ namespace xmloff } #if OSL_DEBUG_LEVEL > 0 - sal_Bool bPageIsKnown = + bool bPageIsKnown = #endif - implMoveIterators(_rxDrawPage, sal_False); + implMoveIterators(_rxDrawPage, false); OSL_ENSURE(bPageIsKnown, "OFormLayerXMLExport_Impl::exportForms: exporting a page which has not been examined!"); // export forms collection @@ -306,12 +306,12 @@ namespace xmloff return xForms.is() && xForms->hasElements(); } - sal_Bool OFormLayerXMLExport_Impl::implMoveIterators(const Reference< XDrawPage >& _rxDrawPage, sal_Bool _bClear) + bool OFormLayerXMLExport_Impl::implMoveIterators(const Reference< XDrawPage >& _rxDrawPage, bool _bClear) { if (!_rxDrawPage.is()) return false; - sal_Bool bKnownPage = sal_False; + bool bKnownPage = false; // the one for the ids m_aCurrentPageIds = m_aControlIds.find(_rxDrawPage); @@ -322,7 +322,7 @@ namespace xmloff } else { - bKnownPage = sal_True; + bKnownPage = true; if (_bClear && !m_aCurrentPageIds->second.empty() ) m_aCurrentPageIds->second.clear(); } @@ -336,18 +336,18 @@ namespace xmloff } else { - bKnownPage = sal_True; + bKnownPage = true; if (_bClear && !m_aCurrentPageReferring->second.empty() ) m_aCurrentPageReferring->second.clear(); } return bKnownPage; } - sal_Bool OFormLayerXMLExport_Impl::seekPage(const Reference< XDrawPage >& _rxDrawPage) + bool OFormLayerXMLExport_Impl::seekPage(const Reference< XDrawPage >& _rxDrawPage) { - sal_Bool bKnownPage = implMoveIterators( _rxDrawPage, sal_False ); + bool bKnownPage = implMoveIterators( _rxDrawPage, false ); if ( bKnownPage ) - return sal_True; + return true; // if the page is not yet known, this does not automatically mean that it has // not been examined. Instead, examineForms returns silently and successfully @@ -359,11 +359,11 @@ namespace xmloff // page was not yet known Reference< XFormsSupplier2 > xFormsSupp( _rxDrawPage, UNO_QUERY ); if ( xFormsSupp.is() && !xFormsSupp->hasForms() ) - return sal_True; + return true; // anything else means that the page has not been examined before, or it's no // valid form page. Both cases are Bad (TM). - return sal_False; + return false; } OUString OFormLayerXMLExport_Impl::getControlId(const Reference< XPropertySet >& _rxControl) @@ -414,9 +414,9 @@ namespace xmloff // move the iterator which specify the currently handled page #if OSL_DEBUG_LEVEL > 0 - sal_Bool bPageIsKnown = + bool bPageIsKnown = #endif - implMoveIterators(_rxDrawPage, sal_True); + implMoveIterators(_rxDrawPage, true); OSL_ENSURE(!bPageIsKnown, "OFormLayerXMLExport_Impl::examineForms: examining a page twice!"); ::std::stack< Reference< XIndexAccess > > aContainerHistory; @@ -507,12 +507,12 @@ namespace xmloff } } - sal_Bool OFormLayerXMLExport_Impl::checkExamineControl(const Reference< XPropertySet >& _rxObject) + bool OFormLayerXMLExport_Impl::checkExamineControl(const Reference< XPropertySet >& _rxObject) { Reference< XPropertySetInfo > xCurrentInfo = _rxObject->getPropertySetInfo(); OSL_ENSURE(xCurrentInfo.is(), "OFormLayerXMLExport_Impl::checkExamineControl: no property set info"); - sal_Bool bIsControl = xCurrentInfo->hasPropertyByName( PROPERTY_CLASSID ); + bool bIsControl = xCurrentInfo->hasPropertyByName( PROPERTY_CLASSID ); if (bIsControl) { // generate a new control id diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx index fad458fd1f56..f6851a24e9f3 100644 --- a/xmloff/source/forms/layerexport.hxx +++ b/xmloff/source/forms/layerexport.hxx @@ -151,7 +151,7 @@ namespace xmloff @see getControlId */ - sal_Bool seekPage( + bool seekPage( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage); /** get the id of the given control. @@ -232,7 +232,7 @@ namespace xmloff void exportAutoStyles(); protected: - sal_Bool impl_isFormPageContainingForms( + bool impl_isFormPageContainingForms( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage, ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxForms); @@ -240,14 +240,14 @@ namespace xmloff @return <TRUE/> if there already were structures for the given page */ - sal_Bool implMoveIterators( + bool implMoveIterators( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage, - sal_Bool _bClear); + bool _bClear); /** check the object given if it's a control, if so, examine it. @return <TRUE/> if the object has been handled */ - sal_Bool checkExamineControl(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject); + bool checkExamineControl(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject); /** examines the control's number format, so later the format style can be referred diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index 16666864933c..987543644432 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -116,51 +116,51 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter) // boolean properties which are exported as attributes m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getCommonControlAttributeName(CCA_CURRENT_SELECTED), PROPERTY_STATE, sal_False); + OAttributeMetaData::getCommonControlAttributeName(CCA_CURRENT_SELECTED), PROPERTY_STATE, false); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getCommonControlAttributeName(CCA_DISABLED), PROPERTY_ENABLED, sal_False, sal_True); + OAttributeMetaData::getCommonControlAttributeName(CCA_DISABLED), PROPERTY_ENABLED, false, true); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getCommonControlAttributeName(CCA_DROPDOWN), PROPERTY_DROPDOWN, sal_False); + OAttributeMetaData::getCommonControlAttributeName(CCA_DROPDOWN), PROPERTY_DROPDOWN, false); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getCommonControlAttributeName(CCA_PRINTABLE), PROPERTY_PRINTABLE, sal_True); + OAttributeMetaData::getCommonControlAttributeName(CCA_PRINTABLE), PROPERTY_PRINTABLE, true); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getCommonControlAttributeName(CCA_READONLY), PROPERTY_READONLY, sal_False); + OAttributeMetaData::getCommonControlAttributeName(CCA_READONLY), PROPERTY_READONLY, false); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getCommonControlAttributeName(CCA_SELECTED), PROPERTY_DEFAULT_STATE, sal_False); + OAttributeMetaData::getCommonControlAttributeName(CCA_SELECTED), PROPERTY_DEFAULT_STATE, false); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getCommonControlAttributeName(CCA_TAB_STOP), PROPERTY_TABSTOP, sal_True); + OAttributeMetaData::getCommonControlAttributeName(CCA_TAB_STOP), PROPERTY_TABSTOP, true); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getDatabaseAttributeName(DA_CONVERT_EMPTY), PROPERTY_EMPTY_IS_NULL, sal_False); + OAttributeMetaData::getDatabaseAttributeName(DA_CONVERT_EMPTY), PROPERTY_EMPTY_IS_NULL, false); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getSpecialAttributeName(SCA_VALIDATION), PROPERTY_STRICTFORMAT, sal_False); + OAttributeMetaData::getSpecialAttributeName(SCA_VALIDATION), PROPERTY_STRICTFORMAT, false); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getSpecialAttributeName(SCA_MULTI_LINE), PROPERTY_MULTILINE, sal_False); + OAttributeMetaData::getSpecialAttributeName(SCA_MULTI_LINE), PROPERTY_MULTILINE, false); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getSpecialAttributeName(SCA_AUTOMATIC_COMPLETION), PROPERTY_AUTOCOMPLETE, sal_False); + OAttributeMetaData::getSpecialAttributeName(SCA_AUTOMATIC_COMPLETION), PROPERTY_AUTOCOMPLETE, false); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getSpecialAttributeName(SCA_MULTIPLE), PROPERTY_MULTISELECTION, sal_False); + OAttributeMetaData::getSpecialAttributeName(SCA_MULTIPLE), PROPERTY_MULTISELECTION, false); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getSpecialAttributeName(SCA_DEFAULT_BUTTON), PROPERTY_DEFAULTBUTTON, sal_False); + OAttributeMetaData::getSpecialAttributeName(SCA_DEFAULT_BUTTON), PROPERTY_DEFAULTBUTTON, false); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getSpecialAttributeName(SCA_IS_TRISTATE), PROPERTY_TRISTATE, sal_False); + OAttributeMetaData::getSpecialAttributeName(SCA_IS_TRISTATE), PROPERTY_TRISTATE, false); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getFormAttributeName(faAllowDeletes), PROPERTY_ALLOWDELETES, sal_True); + OAttributeMetaData::getFormAttributeName(faAllowDeletes), PROPERTY_ALLOWDELETES, true); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getFormAttributeName(faAllowInserts), PROPERTY_ALLOWINSERTS, sal_True); + OAttributeMetaData::getFormAttributeName(faAllowInserts), PROPERTY_ALLOWINSERTS, true); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getFormAttributeName(faAllowUpdates), PROPERTY_ALLOWUPDATES, sal_True); + OAttributeMetaData::getFormAttributeName(faAllowUpdates), PROPERTY_ALLOWUPDATES, true); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getFormAttributeName(faApplyFilter), PROPERTY_APPLYFILTER, sal_False); + OAttributeMetaData::getFormAttributeName(faApplyFilter), PROPERTY_APPLYFILTER, false); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getFormAttributeName(faEscapeProcessing), PROPERTY_ESCAPEPROCESSING, sal_True); + OAttributeMetaData::getFormAttributeName(faEscapeProcessing), PROPERTY_ESCAPEPROCESSING, true); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getFormAttributeName(faIgnoreResult), PROPERTY_IGNORERESULT, sal_False); + OAttributeMetaData::getFormAttributeName(faIgnoreResult), PROPERTY_IGNORERESULT, false); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getSpecialAttributeName( SCA_TOGGLE ), PROPERTY_TOGGLE, sal_False ); + OAttributeMetaData::getSpecialAttributeName( SCA_TOGGLE ), PROPERTY_TOGGLE, false ); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getSpecialAttributeName( SCA_FOCUS_ON_CLICK ), PROPERTY_FOCUS_ON_CLICK, sal_True ); + OAttributeMetaData::getSpecialAttributeName( SCA_FOCUS_ON_CLICK ), PROPERTY_FOCUS_ON_CLICK, true ); m_aAttributeMetaData.addBooleanProperty( - OAttributeMetaData::getDatabaseAttributeName( DA_INPUT_REQUIRED ), PROPERTY_INPUT_REQUIRED, sal_False ); + OAttributeMetaData::getDatabaseAttributeName( DA_INPUT_REQUIRED ), PROPERTY_INPUT_REQUIRED, false ); // the int16 attributes m_aAttributeMetaData.addInt16Property( diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index b13528041d49..4daae0e049d4 100644 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -58,7 +58,7 @@ namespace xmloff void OFormsRootImport::implImportBool(const Reference< XAttributeList >& _rxAttributes, OfficeFormsAttributes _eAttribute, const Reference< XPropertySet >& _rxProps, const Reference< XPropertySetInfo >& _rxPropInfo, - const OUString& _rPropName, sal_Bool _bDefault) + const OUString& _rPropName, bool _bDefault) { // the complete attribute name to look for OUString sCompleteAttributeName = GetImport().GetNamespaceMap().GetQNameByIndex( @@ -92,8 +92,8 @@ namespace xmloff if (xDocProperties.is()) xDocPropInfo = xDocProperties->getPropertySetInfo(); - implImportBool(_rxAttrList, ofaAutomaticFocus, xDocProperties, xDocPropInfo, PROPERTY_AUTOCONTROLFOCUS, sal_False); - implImportBool(_rxAttrList, ofaApplyDesignMode, xDocProperties, xDocPropInfo, PROPERTY_APPLYDESIGNMODE, sal_True); + implImportBool(_rxAttrList, ofaAutomaticFocus, xDocProperties, xDocPropInfo, PROPERTY_AUTOCONTROLFOCUS, false); + implImportBool(_rxAttrList, ofaApplyDesignMode, xDocProperties, xDocPropInfo, PROPERTY_APPLYDESIGNMODE, true); } } catch(Exception&) @@ -124,10 +124,10 @@ namespace xmloff void OFormsRootExport::implExportBool(SvXMLExport& _rExp, OfficeFormsAttributes _eAttribute, const Reference< XPropertySet >& _rxProps, const Reference< XPropertySetInfo >& _rxPropInfo, - const OUString& _rPropName, sal_Bool _bDefault) + const OUString& _rPropName, bool _bDefault) { // retrieve the property value - sal_Bool bValue = _bDefault; + bool bValue = _bDefault; if (_rxPropInfo->hasPropertyByName(_rPropName)) bValue = ::cppu::any2bool(_rxProps->getPropertyValue(_rPropName)); @@ -154,8 +154,8 @@ namespace xmloff if (xDocProperties.is()) xDocPropInfo = xDocProperties->getPropertySetInfo(); - implExportBool(_rExp, ofaAutomaticFocus, xDocProperties, xDocPropInfo, PROPERTY_AUTOCONTROLFOCUS, sal_False); - implExportBool(_rExp, ofaApplyDesignMode, xDocProperties, xDocPropInfo, PROPERTY_APPLYDESIGNMODE, sal_True); + implExportBool(_rExp, ofaAutomaticFocus, xDocProperties, xDocPropInfo, PROPERTY_AUTOCONTROLFOCUS, false); + implExportBool(_rExp, ofaApplyDesignMode, xDocProperties, xDocPropInfo, PROPERTY_APPLYDESIGNMODE, true); } } catch(Exception&) diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx index bfe8b56d532f..90094b070bf6 100644 --- a/xmloff/source/forms/officeforms.hxx +++ b/xmloff/source/forms/officeforms.hxx @@ -54,7 +54,7 @@ namespace xmloff const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, const OUString& _rPropName, - sal_Bool _bDefault + bool _bDefault ); }; @@ -77,7 +77,7 @@ namespace xmloff const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, const OUString& _rPropName, - sal_Bool _bDefault + bool _bDefault ); }; diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index 79bacd97d796..e8c628198569 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -135,7 +135,7 @@ namespace xmloff Type aExportType; // is it a sequence - sal_Bool bIsSequence = TypeClass_SEQUENCE == aValue.getValueTypeClass(); + bool bIsSequence = TypeClass_SEQUENCE == aValue.getValueTypeClass(); // the type of the property, maybe reduced to the element type of a sequence if (bIsSequence) aExportType = getSequenceElementType( aValue.getValueType() ); @@ -275,11 +275,11 @@ namespace xmloff // no check of the property value type: this method is allowed to be called with any interger properties // (e.g. sal_Int32, sal_uInt16 etc) - sal_Bool bDefault = (BOOLATTR_DEFAULT_TRUE == (BOOLATTR_DEFAULT_MASK & _nBooleanAttributeFlags)); - sal_Bool bDefaultVoid = (BOOLATTR_DEFAULT_VOID == (BOOLATTR_DEFAULT_MASK & _nBooleanAttributeFlags)); + bool bDefault = (BOOLATTR_DEFAULT_TRUE == (BOOLATTR_DEFAULT_MASK & _nBooleanAttributeFlags)); + bool bDefaultVoid = (BOOLATTR_DEFAULT_VOID == (BOOLATTR_DEFAULT_MASK & _nBooleanAttributeFlags)); // get the value - sal_Bool bCurrentValue = bDefault; + bool bCurrentValue = bDefault; Any aCurrentValue = m_xProps->getPropertyValue( _rPropertyName ); if (aCurrentValue.hasValue()) { @@ -355,7 +355,7 @@ namespace xmloff void OPropertyExport::exportEnumPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, const OUString &rPropertyName, const SvXMLEnumMapEntry* _pValueMap, - const sal_Int32 _nDefault, const sal_Bool _bVoidDefault) + const sal_Int32 _nDefault, const bool _bVoidDefault) { // get the value sal_Int32 nCurrentValue(_nDefault); @@ -487,7 +487,7 @@ namespace xmloff // unfortunately the OUString can't append single sal_Unicode characters ... const OUString sQuote(&_aQuoteCharacter, 1); const OUString sSeparator(&_aListSeparator, 1); - const sal_Bool bQuote = !sQuote.isEmpty(); + const bool bQuote = !sQuote.isEmpty(); // concatenate the string items const OUString* pItems = aItems.getConstArray(); diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx index e212b5113dff..33b12c7f2574 100644 --- a/xmloff/source/forms/propertyexport.hxx +++ b/xmloff/source/forms/propertyexport.hxx @@ -213,7 +213,7 @@ namespace xmloff const OUString& _rPropertyName, const SvXMLEnumMapEntry* _pValueMap, const sal_Int32 _nDefault, - const sal_Bool _bVoidDefault = sal_False); + const bool _bVoidDefault = false); // some very special methods for some very special attribute/property pairs diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 128b90d32e6c..59bb88163d55 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -84,17 +84,17 @@ namespace } Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun::star::uno::Type& _rExpectedType, - const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap, const sal_Bool _bInvertBoolean ) + const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap, const bool _bInvertBoolean ) { Any aReturn; - sal_Bool bEnumAsInt = sal_False; + bool bEnumAsInt = false; switch (_rExpectedType.getTypeClass()) { case TypeClass_BOOLEAN: // sal_Bool { bool bValue; #if OSL_DEBUG_LEVEL > 0 - sal_Bool bSuccess = + bool bSuccess = #endif ::sax::Converter::convertBool(bValue, _rReadCharacters); OSL_ENSURE(bSuccess, @@ -110,7 +110,7 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun { // it's a real int32/16 property sal_Int32 nValue(0); #if OSL_DEBUG_LEVEL > 0 - sal_Bool bSuccess = + bool bSuccess = #endif ::sax::Converter::convertNumber(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, @@ -123,13 +123,13 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun aReturn <<= (sal_Int32)nValue; break; } - bEnumAsInt = sal_True; + bEnumAsInt = true; // NO BREAK! handle it as enum case TypeClass_ENUM: { sal_uInt16 nEnumValue(0); #if OSL_DEBUG_LEVEL > 0 - sal_Bool bSuccess = + bool bSuccess = #endif _rImporter.GetMM100UnitConverter().convertEnum(nEnumValue, _rReadCharacters, _pEnumMap); OSL_ENSURE(bSuccess, "PropertyConversion::convertString: could not convert to an enum value!"); @@ -151,7 +151,7 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun { double nValue; #if OSL_DEBUG_LEVEL > 0 - sal_Bool bSuccess = + bool bSuccess = #endif ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, @@ -179,7 +179,7 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun // first extract the double double nValue = 0; #if OSL_DEBUG_LEVEL > 0 - sal_Bool bSuccess = + bool bSuccess = #endif ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, @@ -258,7 +258,7 @@ Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType ) OPropertyImport::OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 _nPrefix, const OUString& _rName) :SvXMLImportContext(_rImport.getGlobalContext(), _nPrefix, _rName) ,m_rContext(_rImport) - ,m_bTrackAttributes(sal_False) + ,m_bTrackAttributes(false) { } @@ -305,7 +305,7 @@ void OPropertyImport::StartElement(const Reference< XAttributeList >& _rxAttrLis // default } -sal_Bool OPropertyImport::encounteredAttribute(const OUString& _rAttributeName) const +bool OPropertyImport::encounteredAttribute(const OUString& _rAttributeName) const { OSL_ENSURE(m_bTrackAttributes, "OPropertyImport::encounteredAttribute: attribute tracking not enabled!"); return m_aEncounteredAttributes.end() != m_aEncounteredAttributes.find(_rAttributeName); diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index d67474d6bd89..fc90556ad967 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -47,7 +47,7 @@ namespace xmloff const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap = NULL, - const sal_Bool _bInvertBoolean = sal_False + const bool _bInvertBoolean = false ); static ::com::sun::star::uno::Type xmlTypeToUnoType( const OUString& _rType ); @@ -76,7 +76,7 @@ namespace xmloff OFormLayerXMLImport_Impl& m_rContext; - sal_Bool m_bTrackAttributes; + bool m_bTrackAttributes; // TODO: think about the restriction that the class does not know anything about the object it is importing. // Perhaps this object should be known to the class, so setting the properties ('normal' ones as well as @@ -116,19 +116,19 @@ namespace xmloff <p>Please be aware of the fact that the name given must be a local name, i.e. not contain a namespace. All form relevant attributes are in the same namespace, so this would be an redundant information.</p> */ - sal_Bool encounteredAttribute(const OUString& _rAttributeName) const; + bool encounteredAttribute(const OUString& _rAttributeName) const; /** determine if the element imported by the object had an given attribute. <p>Please be aware of the fact that the name given must be a local name, i.e. not contain a namespace. All form relevant attributes are in the same namespace, so this would be an redundant information.</p> */ - sal_Bool encounteredAttribute(const sal_Char* _pAttributeName) const { return encounteredAttribute(OUString::createFromAscii(_pAttributeName)); } + bool encounteredAttribute(const sal_Char* _pAttributeName) const { return encounteredAttribute(OUString::createFromAscii(_pAttributeName)); } /** enables the tracking of the encountered attributes <p>The tracking will raise the import costs a little bit, but it's cheaper than derived classes tracking this themself.</p> */ - void enableTrackAttributes() { m_bTrackAttributes = sal_True; } + void enableTrackAttributes() { m_bTrackAttributes = true; } inline void implPushBackPropertyValue(const ::com::sun::star::beans::PropertyValue& _rProp) { diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index 53f5801a0c83..1bd1f19bf2a0 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -219,11 +219,11 @@ XMLVersionContext::XMLVersionContext( XMLVersionListImport& rImport, XMLVersionContext::~XMLVersionContext( void ) {} -sal_Bool XMLVersionContext::ParseISODateTimeString( +bool XMLVersionContext::ParseISODateTimeString( const OUString& rString, util::DateTime& rDateTime ) { - sal_Bool bSuccess = sal_True; + bool bSuccess = true; OUString aDateStr, aTimeStr; sal_Int32 nPos = rString.indexOf( (sal_Unicode) 'T' ); @@ -251,23 +251,23 @@ sal_Bool XMLVersionContext::ParseISODateTimeString( pStr++; } if ( nDateTokens > 3 || aDateStr.isEmpty() ) - bSuccess = sal_False; + bSuccess = false; else { sal_Int32 n = 0; nYear = aDateStr.getToken( 0, '-', n ).toInt32(); if ( nYear > 9999 ) - bSuccess = sal_False; + bSuccess = false; else if ( nDateTokens >= 2 ) { nMonth = aDateStr.getToken( 0, '-', n ).toInt32(); if ( nMonth > 12 ) - bSuccess = sal_False; + bSuccess = false; else if ( nDateTokens >= 3 ) { nDay = aDateStr.getToken( 0, '-', n ).toInt32(); if ( nDay > 31 ) - bSuccess = sal_False; + bSuccess = false; } } } @@ -283,23 +283,23 @@ sal_Bool XMLVersionContext::ParseISODateTimeString( pStr++; } if ( nTimeTokens > 3 ) - bSuccess = sal_False; + bSuccess = false; else { sal_Int32 n = 0; nHour = aTimeStr.getToken( 0, ':', n ).toInt32(); if ( nHour > 23 ) - bSuccess = sal_False; + bSuccess = false; else if ( nTimeTokens >= 2 ) { nMin = aTimeStr.getToken( 0, ':', n ).toInt32(); if ( nMin > 59 ) - bSuccess = sal_False; + bSuccess = false; else if ( nTimeTokens >= 3 ) { nSec = aTimeStr.getToken( 0, ':', n ).toInt32(); if ( nSec > 59 ) - bSuccess = sal_False; + bSuccess = false; } } } diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx index 11af6c377183..7b685f628520 100644 --- a/xmloff/source/script/xmlscripti.cxx +++ b/xmloff/source/script/xmlscripti.cxx @@ -135,7 +135,7 @@ SvXMLImportContext* XMLScriptContext::CreateChildContext( sal_Int32 nNewLen = aMedDescr.getLength() + 1; aMedDescr.realloc( nNewLen ); aMedDescr[nNewLen-1].Name = "BreakMacroSignature"; - aMedDescr[nNewLen-1].Value <<= (sal_Bool)sal_True; + aMedDescr[nNewLen-1].Value <<= true; m_xModel->attachResource( m_xModel->getURL(), aMedDescr ); pContext = new XMLScriptChildContext( GetImport(), nPrefix, rLName, m_xModel, aLanguage ); diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx index 36f0351cedae..6a3b7496981c 100644 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -98,10 +98,10 @@ bool XMLGradientStyleImport::importXML( XML_TOKEN_MAP_END }; - sal_Bool bHasName = sal_False; - sal_Bool bHasStyle = sal_False; - sal_Bool bHasStartColor = sal_False; - sal_Bool bHasEndColor = sal_False; + bool bHasName = false; + bool bHasStyle = false; + bool bHasStartColor = false; + bool bHasEndColor = false; OUString aDisplayName; awt::Gradient aGradient; @@ -130,7 +130,7 @@ bool XMLGradientStyleImport::importXML( case XML_TOK_GRADIENT_NAME: { rStrName = rStrValue; - bHasName = sal_True; + bHasName = true; } break; case XML_TOK_GRADIENT_DISPLAY_NAME: @@ -144,7 +144,7 @@ bool XMLGradientStyleImport::importXML( if( SvXMLUnitConverter::convertEnum( eValue, rStrValue, pXML_GradientStyle_Enum ) ) { aGradient.Style = (awt::GradientStyle) eValue; - bHasStyle = sal_True; + bHasStyle = true; } } break; diff --git a/xmloff/source/style/MultiPropertySetHelper.cxx b/xmloff/source/style/MultiPropertySetHelper.cxx index fc690bee8fb1..191a95426a19 100644 --- a/xmloff/source/style/MultiPropertySetHelper.cxx +++ b/xmloff/source/style/MultiPropertySetHelper.cxx @@ -84,7 +84,7 @@ void MultiPropertySetHelper::hasProperties( for( i = 0; i < nLength; i++ ) { // ask for property - sal_Bool bHasProperty = + bool bHasProperty = rInfo->hasPropertyByName( pPropertyNames[i] ); // set index and increment (if appropriate) diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx index f21718b29010..542cf91bd9df 100644 --- a/xmloff/source/style/PageHeaderFooterContext.cxx +++ b/xmloff/source/style/PageHeaderFooterContext.cxx @@ -34,7 +34,7 @@ PageHeaderFooterContext::PageHeaderFooterContext( SvXMLImport& rImport, ::std::vector< XMLPropertyState > & rTempProperties, const UniReference < SvXMLImportPropertyMapper > &rTempMap, sal_Int32 nStart, sal_Int32 nEnd, - const sal_Bool bTempHeader ) : + const bool bTempHeader ) : SvXMLImportContext( rImport, nPrfx, rLName ), rProperties(rTempProperties), nStartIndex(nStart), diff --git a/xmloff/source/style/PageHeaderFooterContext.hxx b/xmloff/source/style/PageHeaderFooterContext.hxx index 146cdbe4296b..d369b0433985 100644 --- a/xmloff/source/style/PageHeaderFooterContext.hxx +++ b/xmloff/source/style/PageHeaderFooterContext.hxx @@ -26,7 +26,7 @@ class PageHeaderFooterContext : public SvXMLImportContext ::std::vector< XMLPropertyState > & rProperties; sal_Int32 nStartIndex; sal_Int32 nEndIndex; - sal_Bool bHeader; + bool bHeader; const UniReference < SvXMLImportPropertyMapper > rMap; public: @@ -38,7 +38,7 @@ public: ::std::vector< XMLPropertyState > & rProperties, const UniReference < SvXMLImportPropertyMapper > &rMap, sal_Int32 nStartIndex, sal_Int32 nEndIndex, - const sal_Bool bHeader); + const bool bHeader); virtual ~PageHeaderFooterContext(); diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index 51fcf15e60cd..c2589eb07a5b 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -54,7 +54,7 @@ PageStyleContext::PageStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, - sal_Bool bDefaultStyle) : + bool bDefaultStyle) : XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, XML_STYLE_FAMILY_PAGE_MASTER, bDefaultStyle), sPageUsage() { @@ -75,7 +75,7 @@ SvXMLImportContext *PageStyleContext::CreateChildContext( ((IsXMLToken(rLocalName, XML_HEADER_STYLE )) || (IsXMLToken(rLocalName, XML_FOOTER_STYLE )) ) ) { - sal_Bool bHeader = IsXMLToken(rLocalName, XML_HEADER_STYLE); + bool bHeader = IsXMLToken(rLocalName, XML_HEADER_STYLE); UniReference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx index 8975307b98d7..3de0721da47b 100644 --- a/xmloff/source/style/PageMasterImportPropMapper.cxx +++ b/xmloff/source/style/PageMasterImportPropMapper.cxx @@ -55,7 +55,7 @@ bool PageMasterImportPropertyMapper::handleSpecialItem( const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int16 nContextID = getPropertySetMapper()->GetEntryContextId(rProperty.mnIndex); @@ -68,7 +68,7 @@ bool PageMasterImportPropertyMapper::handleSpecialItem( if( xParaStyles.is() && xParaStyles->hasByName( sDisplayName ) ) { rProperty.maValue <<= sDisplayName; - bRet = sal_True; + bRet = true; } } else diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx index 29695320901c..1442e5aa7858 100644 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -75,14 +75,14 @@ XMLTransGradientStyleImport::~XMLTransGradientStyleImport() { } -sal_Bool XMLTransGradientStyleImport::importXML( +bool XMLTransGradientStyleImport::importXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList, uno::Any& rValue, OUString& rStrName ) { - sal_Bool bRet = sal_False; - sal_Bool bHasName = sal_False; - sal_Bool bHasStyle = sal_False; + bool bRet = false; + bool bHasName = false; + bool bHasStyle = false; OUString aDisplayName; awt::Gradient aGradient; @@ -126,7 +126,7 @@ sal_Bool XMLTransGradientStyleImport::importXML( case XML_TOK_GRADIENT_NAME: { rStrName = rStrValue; - bHasName = sal_True; + bHasName = true; } break; case XML_TOK_GRADIENT_DISPLAY_NAME: @@ -140,7 +140,7 @@ sal_Bool XMLTransGradientStyleImport::importXML( if( SvXMLUnitConverter::convertEnum( eValue, rStrValue, pXML_GradientStyle_Enum ) ) { aGradient.Style = (awt::GradientStyle) eValue; - bHasStyle = sal_True; + bHasStyle = true; } } break; @@ -221,11 +221,11 @@ XMLTransGradientStyleExport::~XMLTransGradientStyleExport() { } -sal_Bool XMLTransGradientStyleExport::exportXML( +bool XMLTransGradientStyleExport::exportXML( const OUString& rStrName, const uno::Any& rValue ) { - sal_Bool bRet = sal_False; + bool bRet = false; awt::Gradient aGradient; if( !rStrName.isEmpty() ) @@ -238,7 +238,7 @@ sal_Bool XMLTransGradientStyleExport::exportXML( // Style if( !SvXMLUnitConverter::convertEnum( aOut, aGradient.Style, pXML_GradientStyle_Enum ) ) { - bRet = sal_False; + bRet = false; } else { diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx index 6bea28888751..6c68a766fb75 100644 --- a/xmloff/source/style/WordWrapPropertyHdl.cxx +++ b/xmloff/source/style/WordWrapPropertyHdl.cxx @@ -45,15 +45,15 @@ XMLWordWrapPropertyHdl::~XMLWordWrapPropertyHdl() bool XMLWordWrapPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { bool bRetValue = false; - sal_Bool bValue = sal_False; + bool bValue = false; if( rStrImpValue == GetXMLToken( xmloff::token::XML_WRAP ) ) { - bValue = sal_True; + bValue = true; bRetValue = true; } if( rStrImpValue == GetXMLToken( xmloff::token::XML_NO_WRAP ) ) { - bValue = sal_False; + bValue = false; bRetValue = true; } if ( bRetValue && mpImport ) diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index daf86f1a1885..18749d82f4a5 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -201,7 +201,7 @@ void XMLBackgroundImageContext::ProcessAttrs( sal_uInt16 nTmp; SvXMLTokenEnumerator aTokenEnum( rValue ); OUString aToken; - sal_Bool bHori = sal_False, bVert = sal_False; + bool bHori = false, bVert = false; bool bOK = true; while( bOK && aTokenEnum.getNextToken( aToken ) ) { @@ -220,7 +220,7 @@ void XMLBackgroundImageContext::ProcessAttrs( ? GraphicLocation_LEFT_TOP : (nPrc < 75 ? GraphicLocation_MIDDLE_MIDDLE : GraphicLocation_RIGHT_BOTTOM); - bHori = sal_True; + bHori = true; } else { @@ -229,7 +229,7 @@ void XMLBackgroundImageContext::ProcessAttrs( : (nPrc < 75 ? GraphicLocation_LEFT_MIDDLE : GraphicLocation_LEFT_BOTTOM); lcl_xmlbic_MergeVertPos( eNewPos, eTmp ); - bVert = sal_True; + bVert = true; } } else @@ -259,7 +259,7 @@ void XMLBackgroundImageContext::ProcessAttrs( eNewPos = (GraphicLocation)nTmp; else bOK = false; - bHori = sal_True; + bHori = true; } else if( SvXMLUnitConverter::convertEnum( nTmp, aToken, psXML_BrushVertPos ) ) @@ -271,7 +271,7 @@ void XMLBackgroundImageContext::ProcessAttrs( eNewPos = (GraphicLocation)nTmp; else bOK = false; - bVert = sal_True; + bVert = true; } else { @@ -394,7 +394,7 @@ void XMLBackgroundImageContext::EndElement() aFilterProp.maValue <<= sFilter; aTransparencyProp.maValue <<= nTransparency; - SetInsert( sal_True ); + SetInsert( true ); XMLElementPropertyContext::EndElement(); if( -1 != aPosProp.mnIndex ) diff --git a/xmloff/source/style/XMLElementPropertyContext.cxx b/xmloff/source/style/XMLElementPropertyContext.cxx index d4f9241c09b9..79198a74dbe2 100644 --- a/xmloff/source/style/XMLElementPropertyContext.cxx +++ b/xmloff/source/style/XMLElementPropertyContext.cxx @@ -28,7 +28,7 @@ XMLElementPropertyContext::XMLElementPropertyContext ( const XMLPropertyState& rProp, ::std::vector< XMLPropertyState > &rProps ) : SvXMLImportContext( rImport, nPrfx, rLName ), - bInsert( sal_False ), + bInsert( false ), rProperties( rProps ), aProp( rProp ) { diff --git a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx index c237d827986c..22dfb06ee2f0 100644 --- a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx +++ b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx @@ -34,7 +34,7 @@ bool XMLIsPercentagePropertyHandler::importXML( Any& rValue, const SvXMLUnitConverter& ) const { - rValue <<= (sal_Bool)(rStrImpValue.indexOf( '%' ) != -1); + rValue <<= rStrImpValue.indexOf( '%' ) != -1; return true; } diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index a79f2b6f83a9..4cc26f994ad2 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -114,7 +114,7 @@ bool XMLPageExport::exportStyle( if ( xPropSetInfo->hasPropertyByName( "Hidden" ) ) { uno::Any aValue = xPropSet->getPropertyValue( "Hidden" ); - sal_Bool bHidden = sal_False; + bool bHidden = false; if ( ( aValue >>= bHidden ) && bHidden && GetExport( ).getDefaultVersion( ) == SvtSaveOptions::ODFVER_LATEST ) GetExport( ).AddAttribute( XML_NAMESPACE_STYLE, XML_HIDDEN, "true" ); } @@ -231,7 +231,7 @@ void XMLPageExport::exportDefaultStyle() ::std::vector< XMLPropertyState > xPropStates = xPageMasterExportPropMapper->FilterDefaults( xPropSet ); - sal_Bool bExport = sal_False; + bool bExport = false; UniReference < XMLPropertySetMapper > aPropMapper(xPageMasterExportPropMapper->getPropertySetMapper()); for( ::std::vector< XMLPropertyState >::iterator aIter = xPropStates.begin(); aIter != xPropStates.end(); ++aIter ) { @@ -239,7 +239,7 @@ void XMLPageExport::exportDefaultStyle() sal_Int16 nContextId = aPropMapper->GetEntryContextId( pProp->mnIndex ); if( nContextId == CTF_PM_STANDARD_MODE ) { - bExport = sal_True; + bExport = true; break; } } diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx index 2d954aa048c7..eabd3f05917a 100644 --- a/xmloff/source/style/impastpl.cxx +++ b/xmloff/source/style/impastpl.cxx @@ -261,9 +261,9 @@ XMLAutoStylePoolParent::~XMLAutoStylePoolParent() // Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) to list // if not added, yet. -sal_Bool XMLAutoStylePoolParent::Add( XMLAutoStyleFamily& rFamilyData, const vector< XMLPropertyState >& rProperties, OUString& rName, bool bDontSeek ) +bool XMLAutoStylePoolParent::Add( XMLAutoStyleFamily& rFamilyData, const vector< XMLPropertyState >& rProperties, OUString& rName, bool bDontSeek ) { - sal_Bool bAdded = sal_False; + bool bAdded = false; XMLAutoStylePoolProperties *pProperties = 0; sal_Int32 nProperties = rProperties.size(); size_t i = 0; @@ -291,7 +291,7 @@ sal_Bool XMLAutoStylePoolParent::Add( XMLAutoStyleFamily& rFamilyData, const vec PropertiesListType::iterator it = maPropertiesList.begin(); ::std::advance( it, i ); maPropertiesList.insert( it, pProperties ); - bAdded = sal_True; + bAdded = true; } rName = pProperties->GetName(); @@ -305,9 +305,9 @@ sal_Bool XMLAutoStylePoolParent::Add( XMLAutoStyleFamily& rFamilyData, const vec // the same properties exists, a new one is added (like with bDontSeek). -sal_Bool XMLAutoStylePoolParent::AddNamed( XMLAutoStyleFamily& rFamilyData, const vector< XMLPropertyState >& rProperties, const OUString& rName ) +bool XMLAutoStylePoolParent::AddNamed( XMLAutoStyleFamily& rFamilyData, const vector< XMLPropertyState >& rProperties, const OUString& rName ) { - sal_Bool bAdded = sal_False; + bool bAdded = false; sal_Int32 nProperties = rProperties.size(); size_t i = 0; for (size_t n = maPropertiesList.size(); i < n; ++i) @@ -332,7 +332,7 @@ sal_Bool XMLAutoStylePoolParent::AddNamed( XMLAutoStyleFamily& rFamilyData, cons PropertiesListType::iterator it = maPropertiesList.begin(); ::std::advance( it, i ); maPropertiesList.insert( it, pProperties ); - bAdded = sal_True; + bAdded = true; } return bAdded; @@ -391,11 +391,11 @@ void SvXMLAutoStylePoolP_Impl::AddFamily( const OUString& rStrName, const UniReference < SvXMLExportPropertyMapper > & rMapper, const OUString& rStrPrefix, - sal_Bool bAsFamily ) + bool bAsFamily ) { // store family in a list if not already stored sal_uInt16 nExportFlags = GetExport().getExportFlags(); - sal_Bool bStylesOnly = (nExportFlags & EXPORT_STYLES) != 0 && (nExportFlags & EXPORT_CONTENT) == 0; + bool bStylesOnly = (nExportFlags & EXPORT_STYLES) != 0 && (nExportFlags & EXPORT_CONTENT) == 0; OUString aPrefix( rStrPrefix ); if( bStylesOnly ) diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index a2f06f2c6c64..a2d0ea28cf23 100644 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx @@ -111,9 +111,9 @@ public: ~XMLAutoStylePoolParent(); - sal_Bool Add( XMLAutoStyleFamily& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties, OUString& rName, bool bDontSeek = false ); + bool Add( XMLAutoStyleFamily& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties, OUString& rName, bool bDontSeek = false ); - sal_Bool AddNamed( XMLAutoStyleFamily& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties, const OUString& rName ); + bool AddNamed( XMLAutoStyleFamily& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties, const OUString& rName ); OUString Find( const XMLAutoStyleFamily& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties ) const; @@ -146,7 +146,7 @@ public: void AddFamily( sal_Int32 nFamily, const OUString& rStrName, const UniReference < SvXMLExportPropertyMapper > & rMapper, - const OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); + const OUString& rStrPrefix, bool bAsFamily = true ); void SetFamilyPropSetMapper( sal_Int32 nFamily, const UniReference < SvXMLExportPropertyMapper > & rMapper ); void RegisterName( sal_Int32 nFamily, const OUString& rName ); diff --git a/xmloff/source/style/opaquhdl.cxx b/xmloff/source/style/opaquhdl.cxx index 606fd48f3a80..375724b1af11 100644 --- a/xmloff/source/style/opaquhdl.cxx +++ b/xmloff/source/style/opaquhdl.cxx @@ -38,8 +38,8 @@ bool XMLOpaquePropHdl::importXML( const OUString& rStrImpValue, Any& rValue, con { bool bRet = true; - sal_Bool bValue = IsXMLToken( rStrImpValue, XML_OPAQUE_FOREGROUND ); - rValue <<= sal_Bool(bValue); + bool bValue = IsXMLToken( rStrImpValue, XML_OPAQUE_FOREGROUND ); + rValue <<= bValue; return bRet; } @@ -47,7 +47,7 @@ bool XMLOpaquePropHdl::importXML( const OUString& rStrImpValue, Any& rValue, con bool XMLOpaquePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { bool bRet = false; - sal_Bool bValue = sal_Bool(); + bool bValue; if (rValue >>= bValue) { diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index 1549564aec99..7b98643f5420 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -235,7 +235,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite ) if( !xFamilies.is() ) return; - sal_Bool bNew = sal_False; + bool bNew = false; if( xFamilies->hasByName( rName ) ) { Any aAny = xFamilies->getByName( rName ); @@ -250,7 +250,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite ) Any aAny; aAny <<= mxStyle; xFamilies->insertByName( rName, aAny ); - bNew = sal_True; + bNew = true; } Reference < XPropertySet > xPropSet( mxStyle, UNO_QUERY ); diff --git a/xmloff/source/style/shdwdhdl.cxx b/xmloff/source/style/shdwdhdl.cxx index a1a22f46551b..36e1a6eac1c0 100644 --- a/xmloff/source/style/shdwdhdl.cxx +++ b/xmloff/source/style/shdwdhdl.cxx @@ -38,8 +38,8 @@ XMLShadowedPropHdl::~XMLShadowedPropHdl() bool XMLShadowedPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bValue = ! IsXMLToken( rStrImpValue, XML_NONE ); - rValue <<= sal_Bool(bValue); + bool bValue = ! IsXMLToken( rStrImpValue, XML_NONE ); + rValue <<= bValue; return true; } @@ -47,7 +47,7 @@ bool XMLShadowedPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, c bool XMLShadowedPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { bool bRet = false; - sal_Bool bValue = sal_Bool(); + bool bValue; if (rValue >>= bValue) { diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index 3f94f3d819ee..a8166c58cbd8 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -124,7 +124,7 @@ bool XMLStyleExport::exportStyle( if ( xPropSetInfo->hasPropertyByName( "Hidden" ) ) { aAny = xPropSet->getPropertyValue( "Hidden" ); - sal_Bool bHidden = sal_False; + bool bHidden = false; if ( ( aAny >>= bHidden ) && bHidden && GetExport( ).getDefaultVersion( ) == SvtSaveOptions::ODFVER_LATEST ) GetExport( ).AddAttribute( XML_NAMESPACE_STYLE, XML_HIDDEN, "true" ); } @@ -396,7 +396,7 @@ void XMLStyleExport::exportStyleFamily( // the next style may be unused but has to be exported, too. In this case // the names of all exported styles are remembered. boost::scoped_ptr<std::set<OUString> > pExportedStyles(0); - sal_Bool bFirstStyle = sal_True; + bool bFirstStyle = true; const uno::Sequence< OUString> aSeq = xStyleCont->getElementNames(); const OUString* pIter = aSeq.getConstArray(); @@ -422,7 +422,7 @@ void XMLStyleExport::exportStyleFamily( { if( !bUsed || xStyle->isInUse() ) { - sal_Bool bExported = exportStyle( xStyle, rXMLFamily, rPropMapper, + bool bExported = exportStyle( xStyle, rXMLFamily, rPropMapper, xStyleCont,pPrefix ); if( bUsed && bFirstStyle && bExported ) { @@ -434,7 +434,7 @@ void XMLStyleExport::exportStyleFamily( if( xPropSetInfo->hasPropertyByName( sFollowStyle ) ) pExportedStyles.reset(new std::set<OUString>()); - bFirstStyle = sal_False; + bFirstStyle = false; } if( pExportedStyles && bExported ) diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index 667643a5312d..ec8e95a81166 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -89,8 +89,8 @@ void SvXMLAutoStylePoolP::exportStyleAttributes( UniReference< XMLPropertySetMapper > aPropertyMapper = rPropExp.getPropertySetMapper(); DBG_ASSERT(aPropertyMapper.is(), "SvXMLAutoStylePoolP::exportStyleAttributes: invalid property set mapper!"); - sal_Bool bFoundControlShapeDataStyle = sal_False; - sal_Bool bFoundNumberingRulesName = sal_False; + bool bFoundControlShapeDataStyle = false; + bool bFoundNumberingRulesName = false; for ( vector< XMLPropertyState >::const_iterator pProp = rProperties.begin(); pProp != rProperties.end(); @@ -114,7 +114,7 @@ void SvXMLAutoStylePoolP::exportStyleAttributes( lcl_exportDataStyle( GetExport(), aPropertyMapper, *pProp ); // check if there is another property with the special context id we're handling here - bFoundControlShapeDataStyle = sal_True; + bFoundControlShapeDataStyle = true; break; } case CTF_SD_NUMBERINGRULES_NAME: @@ -135,7 +135,7 @@ void SvXMLAutoStylePoolP::exportStyleAttributes( GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_LIST_STYLE_NAME, GetExport().EncodeStyleName( sName ) ); } - bFoundNumberingRulesName = sal_True; + bFoundNumberingRulesName = true; break; } } @@ -188,10 +188,10 @@ void SvXMLAutoStylePoolP::exportStyleContent( sal_Int32 nHeaderEndIndex(-1); sal_Int32 nFooterStartIndex(-1); sal_Int32 nFooterEndIndex(-1); - sal_Bool bHeaderStartIndex(sal_False); - sal_Bool bHeaderEndIndex(sal_False); - sal_Bool bFooterStartIndex(sal_False); - sal_Bool bFooterEndIndex(sal_False); + bool bHeaderStartIndex(false); + bool bHeaderEndIndex(false); + bool bFooterStartIndex(false); + bool bFooterEndIndex(false); UniReference< XMLPropertySetMapper > aPropMapper = rPropExp.getPropertySetMapper(); @@ -205,12 +205,12 @@ void SvXMLAutoStylePoolP::exportStyleContent( if (!bHeaderStartIndex) { nHeaderStartIndex = nIndex; - bHeaderStartIndex = sal_True; + bHeaderStartIndex = true; } if (bFooterStartIndex && !bFooterEndIndex) { nFooterEndIndex = nIndex; - bFooterEndIndex = sal_True; + bFooterEndIndex = true; } } break; @@ -219,12 +219,12 @@ void SvXMLAutoStylePoolP::exportStyleContent( if (!bFooterStartIndex) { nFooterStartIndex = nIndex; - bFooterStartIndex = sal_True; + bFooterStartIndex = true; } if (bHeaderStartIndex && !bHeaderEndIndex) { nHeaderEndIndex = nIndex; - bHeaderEndIndex = sal_True; + bHeaderEndIndex = true; } } break; diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx index 9d94f6a0e48c..0b4c0868c3ea 100644 --- a/xmloff/source/style/xmlbahdl.cxx +++ b/xmloff/source/style/xmlbahdl.cxx @@ -240,7 +240,7 @@ bool XMLBoolPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const { bool bValue(false); bool const bRet = ::sax::Converter::convertBool( bValue, rStrImpValue ); - rValue <<= sal_Bool(bValue); + rValue <<= bValue; return bRet; } @@ -248,11 +248,11 @@ bool XMLBoolPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const bool XMLBoolPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { bool bRet = false; - OUStringBuffer aOut; - sal_Bool bValue = sal_Bool(); + bool bValue; if (rValue >>= bValue) { + OUStringBuffer aOut; ::sax::Converter::convertBool( aOut, bValue ); rStrExpValue = aOut.makeStringAndClear(); @@ -273,7 +273,7 @@ bool XMLNBoolPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, cons { bool bValue(false); bool const bRet = ::sax::Converter::convertBool( bValue, rStrImpValue ); - rValue <<= sal_Bool(!bValue); + rValue <<= !bValue; return bRet; } @@ -281,11 +281,11 @@ bool XMLNBoolPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, cons bool XMLNBoolPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { bool bRet = false; - OUStringBuffer aOut; - sal_Bool bValue = sal_Bool(); + bool bValue; if (rValue >>= bValue) { + OUStringBuffer aOut; ::sax::Converter::convertBool( aOut, !bValue ); rStrExpValue = aOut.makeStringAndClear(); @@ -693,8 +693,8 @@ XMLIsTransparentPropHdl::~XMLIsTransparentPropHdl() bool XMLIsTransparentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bValue = (sal_Bool) ( (bool) (rStrImpValue == sTransparent) == bTransPropValue); - rValue.setValue( &bValue, ::getBooleanCppuType() ); + bool bValue = ( (bool) (rStrImpValue == sTransparent) == bTransPropValue); + rValue <<= bValue; return true; } @@ -706,7 +706,7 @@ bool XMLIsTransparentPropHdl::exportXML( OUString& rStrExpValue, const Any& rVal // MIB: This looks a bit strange, because bTransPropValue == bValue should // do the same, but this only applies if 'true' is represented by the same // 8 bit value in bValue and bTransPropValue. Who will ensure this? - sal_Bool bValue = *(sal_Bool *)rValue.getValue(); + bool bValue = *(sal_Bool *)rValue.getValue(); bool bIsTrans = bTransPropValue ? bValue : !bValue; if( bIsTrans ) diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index b1a62832e66c..797fbacb2f89 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -107,7 +107,7 @@ void XMLPropertyStates_Impl::AddPropertyState( const XMLPropertyState& rPropState) { XMLPropertyStateList_Impl::iterator aItr = aPropStates.begin(); - sal_Bool bInserted(sal_False); + bool bInserted(false); if (nCount) { if (aLastItr->mnIndex < rPropState.mnIndex) @@ -119,13 +119,13 @@ void XMLPropertyStates_Impl::AddPropertyState( if (aItr == aPropStates.end()) { aLastItr = aPropStates.insert(aPropStates.end(), rPropState); - bInserted = sal_True; + bInserted = true; nCount++; } else if (aItr->mnIndex > rPropState.mnIndex) { aLastItr = aPropStates.insert(aItr, rPropState); - bInserted = sal_True; + bInserted = true; nCount++; } } @@ -156,7 +156,7 @@ public: std::list<sal_uInt32>& GetIndexes() { return aIndexes; } // for sort - sal_Bool operator< ( const FilterPropertyInfo_Impl& rArg ) const + bool operator< ( const FilterPropertyInfo_Impl& rArg ) const { return (GetApiName() < rArg.GetApiName()); } @@ -190,7 +190,7 @@ public: vector< XMLPropertyState >& rPropStates, const Reference< XPropertySet >& xPropSet, const UniReference< XMLPropertySetMapper >& maPropMapper, - const sal_Bool bDefault = sal_False); + const bool bDefault = false); sal_uInt32 GetPropertyCount() const { return nCount; } }; @@ -278,7 +278,7 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray( vector< XMLPropertyState >& rPropStates, const Reference< XPropertySet >& rPropSet, const UniReference< XMLPropertySetMapper >& rPropMapper, - const sal_Bool bDefault ) + const bool bDefault ) { XMLPropertyStates_Impl aPropStates; @@ -458,12 +458,12 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray( FilterPropertyInfoList_Impl::iterator aItr = aPropInfos.begin(); for(sal_uInt32 i = 0; i < nCount; ++i) { - sal_Bool bDirectValue = + bool bDirectValue = !pStates || *pStates == PropertyState_DIRECT_VALUE; if( bDirectValue || bDefault ) { // The value is stored in the PropertySet itself, add to list. - sal_Bool bGotValue = sal_False; + bool bGotValue = false; XMLPropertyState aNewProperty( -1 ); for( std::list<sal_uInt32>::const_iterator aIndexItr = aItr->GetIndexes().begin(); @@ -480,7 +480,7 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray( { aNewProperty.maValue = rPropSet->getPropertyValue( aItr->GetApiName() ); - bGotValue = sal_True; + bGotValue = true; } aNewProperty.mnIndex = *aIndexItr; aPropStates.AddPropertyState( aNewProperty ); @@ -587,7 +587,7 @@ vector< XMLPropertyState > SvXMLExportPropertyMapper::_Filter( if (aIter != mpImpl->maCache.end()) pFilterInfo = (*aIter).second; - sal_Bool bDelInfo = sal_False; + bool bDelInfo = false; if( !pFilterInfo ) { pFilterInfo = new FilterPropertiesInfo_Impl; @@ -908,12 +908,12 @@ void SvXMLExportPropertyMapper::_exportXML( sal_uInt16 nKey = pNamespaceMap->GetKeyByPrefix( sPrefix ); if( USHRT_MAX == nKey || pNamespaceMap->GetNameByKey( nKey ) != sNamespace ) { - sal_Bool bAddNamespace = sal_False; + bool bAddNamespace = false; if( USHRT_MAX == nKey ) { // The prefix is unused, so it is sufficient // to add it to the namespace map. - bAddNamespace = sal_True; + bAddNamespace = true; } else { @@ -935,7 +935,7 @@ void SvXMLExportPropertyMapper::_exportXML( } while( nKey != USHRT_MAX ); - bAddNamespace = sal_True; + bAddNamespace = true; } else { @@ -984,11 +984,11 @@ void SvXMLExportPropertyMapper::_exportXML( mpImpl->mxPropMapper->GetEntryNameSpace(rProperty.mnIndex), mpImpl->mxPropMapper->GetEntryXMLName(rProperty.mnIndex)); - sal_Bool bRemove = sal_False; + bool bRemove = false; if ((mpImpl->mxPropMapper->GetEntryFlags( rProperty.mnIndex ) & MID_FLAG_MERGE_ATTRIBUTE) != 0) { aValue = rAttrList.getValueByName( sName ); - bRemove = sal_True; + bRemove = true; } if (mpImpl->mxPropMapper->exportXML(aValue, rProperty, rUnitConverter)) @@ -1008,7 +1008,7 @@ void SvXMLExportPropertyMapper::exportElementItems( { const sal_uInt16 nCount = rIndexArray.size(); - sal_Bool bItemsExported = sal_False; + bool bItemsExported = false; for( sal_uInt16 nIndex = 0; nIndex < nCount; nIndex++ ) { const sal_uInt16 nElement = rIndexArray[nIndex]; @@ -1020,7 +1020,7 @@ void SvXMLExportPropertyMapper::exportElementItems( rExport.IgnorableWhitespace(); handleElementItem( rExport, rProperties[nElement], nFlags, &rProperties, nElement ); - bItemsExported = sal_True; + bItemsExported = true; } if( bItemsExported ) diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 6a284dc068c3..7883c9a35270 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -136,7 +136,7 @@ void SvXMLImportPropertyMapper::importXML( // Otherwise GetEntryIndex will start with the next position specified. sal_Int32 nIndex = nStartIdx - 1; sal_uInt32 nFlags = 0; // flags of actual property map entry - sal_Bool bFound = sal_False; + bool bFound = false; // for better error reporting: this should be set true if no // warning is needed @@ -236,7 +236,7 @@ void SvXMLImportPropertyMapper::importXML( } } } - bFound = sal_True; + bFound = true; continue; } } diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index cf9637be4c46..db278ab3d6c6 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -83,7 +83,7 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel, sal_Int16 eAdjust = HoriOrientation::LEFT; OUString sPrefix, sSuffix; OUString sTextStyleName; - sal_Bool bHasColor = sal_False; + bool bHasColor = false; sal_Int32 nColor = 0; sal_Int32 nSpaceBefore = 0, nMinLabelWidth = 0, nMinLabelDist = 0; @@ -166,7 +166,7 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel, else if( rProp.Name == "BulletColor" ) { rProp.Value >>= nColor; - bHasColor = sal_True; + bHasColor = true; } else if( rProp.Name == "StartWith" ) { @@ -675,7 +675,7 @@ void SvxXMLNumRuleExport::exportNumberingRule( GetExport( ).AddAttribute( XML_NAMESPACE_STYLE, XML_HIDDEN, "true" ); // text:consecutive-numbering="..." - sal_Bool bContNumbering = sal_False; + bool bContNumbering = false; if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName( sIsContinuousNumbering ) ) { @@ -718,7 +718,7 @@ bool SvxXMLNumRuleExport::exportStyle( const Reference< XStyle >& rStyle ) OUString sName = rStyle->getName(); - sal_Bool bHidden = sal_False; + bool bHidden = false; if ( xPropSetInfo->hasPropertyByName( "Hidden" ) ) { aAny = xPropSet->getPropertyValue( "Hidden" ); diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 8b8e8e89658b..6649b29a9ca0 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -184,14 +184,14 @@ class SvxXMLListLevelStyleContext_Impl : public SvXMLImportContext sal_Int32 nFirstLineIndent; sal_Int32 nIndentAt; - sal_Bool bBullet : 1; - sal_Bool bImage : 1; - sal_Bool bNum : 1; - sal_Bool bHasColor : 1; + bool bBullet : 1; + bool bImage : 1; + bool bNum : 1; + bool bHasColor : 1; void SetRelSize( sal_Int16 nRel ) { nRelSize = nRel; } void SetColor( sal_Int32 nColor ) - { m_nColor = nColor; bHasColor = sal_True; } + { m_nColor = nColor; bHasColor = true; } void SetSpaceBefore( sal_Int32 nSet ) { nSpaceBefore = nSet; } void SetMinLabelWidth( sal_Int32 nSet ) { nMinLabelWidth = nSet; } void SetMinLabelDist( sal_Int32 nSet ) { nMinLabelDist = nSet; } @@ -278,18 +278,18 @@ SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl( , nListtabStopPosition( 0 ) , nFirstLineIndent( 0 ) , nIndentAt( 0 ) -, bBullet( sal_False ) -, bImage( sal_False ) -, bNum( sal_False ) -, bHasColor( sal_False ) +, bBullet( false ) +, bImage( false ) +, bNum( false ) +, bHasColor( false ) { if( IsXMLToken( rLName, XML_LIST_LEVEL_STYLE_NUMBER ) || IsXMLToken( rLName, XML_OUTLINE_LEVEL_STYLE ) ) - bNum = sal_True; + bNum = true; else if( IsXMLToken( rLName, XML_LIST_LEVEL_STYLE_BULLET ) ) - bBullet = sal_True; + bBullet = true; else if( IsXMLToken( rLName, XML_LIST_LEVEL_STYLE_IMAGE ) ) - bImage = sal_True; + bImage = true; SvXMLTokenMap aTokenMap( lcl_getLevelAttrTokenMap() ); sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; @@ -512,16 +512,16 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties( aFDesc.Pitch = eBulletFontPitch; aFDesc.CharSet = eBulletFontEncoding; aFDesc.Weight = WEIGHT_DONTKNOW; - sal_Bool bStarSymbol = sal_False; + bool bStarSymbol = false; if( aFDesc.Name.equalsIgnoreAsciiCase( sStarBats ) ) { cBullet = GetImport().ConvStarBatsCharToStarSymbol( cBullet ); - bStarSymbol = sal_True; + bStarSymbol = true; } else if( aFDesc.Name.equalsIgnoreAsciiCase( sStarMath ) ) { cBullet = GetImport().ConvStarMathCharToStarSymbol( cBullet ); - bStarSymbol = sal_True; + bStarSymbol = true; } if( bStarSymbol ) aFDesc.Name = "StarSymbol" ; @@ -1166,7 +1166,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( bool bOverwrite ) return; } - sal_Bool bNew = sal_False; + bool bNew = false; if( rNumStyles->hasByName( rName ) ) { Any aAny = rNumStyles->getByName( rName ); @@ -1191,7 +1191,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( bool bOverwrite ) Any aAny; aAny <<= xStyle; rNumStyles->insertByName( rName, aAny ); - bNew = sal_True; + bNew = true; } Reference < XPropertySet > xPropSet( xStyle, UNO_QUERY ); diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index 6732cb5f92fb..289f3fca4105 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -249,7 +249,7 @@ void SvxXMLTabStopImportContext::EndElement( ) { SvxXMLTabStopContext_Impl *pTabStopContext = (*mpTabStops)[i]; const style::TabStop& rTabStop = pTabStopContext->getTabStop(); - sal_Bool bDflt = style::TabAlign_DEFAULT == rTabStop.Alignment; + bool bDflt = style::TabAlign_DEFAULT == rTabStop.Alignment; if( !bDflt || 0==i ) { *pTabStops++ = pTabStopContext->getTabStop(); @@ -264,7 +264,7 @@ void SvxXMLTabStopImportContext::EndElement( ) } aProp.maValue <<= aSeq; - SetInsert( sal_True ); + SetInsert( true ); XMLElementPropertyContext::EndElement(); } diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index 1f4f65ee52b0..015f2b2d3479 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star::container; struct ColumnInfo { OUString msStyleName; - sal_Bool mbVisibility; + bool mbVisibility; OUString msDefaultCellStyleName; }; diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index 02b18fc33e9a..fd04f3eab92e 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -160,7 +160,7 @@ sal_uInt32 XMLAutoTextEventExport::exportDoc( enum XMLTokenEnum ) return 0; } -sal_Bool XMLAutoTextEventExport::hasEvents() +bool XMLAutoTextEventExport::hasEvents() { // TODO: provide full implementation that check for presence of events return xEvents.is(); diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx index 5685055a47ac..79d104da466b 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.hxx +++ b/xmloff/source/text/XMLAutoTextEventExport.hxx @@ -76,7 +76,7 @@ protected: enum ::xmloff::token::XMLTokenEnum eClass = xmloff::token::XML_TOKEN_INVALID ) SAL_OVERRIDE; /// does the document have any events ? - sal_Bool hasEvents(); + bool hasEvents(); /// export the events element void exportEvents(); diff --git a/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx index 3a72c0688143..08420ec92e90 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.cxx +++ b/xmloff/source/text/XMLChangeElementImportContext.cxx @@ -39,7 +39,7 @@ XMLChangeElementImportContext::XMLChangeElementImportContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - sal_Bool bAccContent, + bool bAccContent, XMLChangedRegionImportContext& rParent) : SvXMLImportContext(rImport, nPrefix, rLocalName), bAcceptContent(bAccContent), diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx index 89d24799c375..92e9209a0f29 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.hxx +++ b/xmloff/source/text/XMLChangeElementImportContext.hxx @@ -52,7 +52,7 @@ class XMLChangeElementImportContext : public SvXMLImportContext * * So if bAcceptContent is true, we are importing a <text:deletion> element */ - sal_Bool bAcceptContent; + bool bAcceptContent; /// context of enclosing <text:changed-region> element XMLChangedRegionImportContext& rChangedRegion; @@ -66,7 +66,7 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, /// accept text content (paragraphs) in element as redline content? - sal_Bool bAcceptContent, + bool bAcceptContent, /// context of enclosing <text:changed-region> element XMLChangedRegionImportContext& rParent); diff --git a/xmloff/source/text/XMLChangeImportContext.cxx b/xmloff/source/text/XMLChangeImportContext.cxx index f65697e832d5..a706ec20fb26 100644 --- a/xmloff/source/text/XMLChangeImportContext.cxx +++ b/xmloff/source/text/XMLChangeImportContext.cxx @@ -37,9 +37,9 @@ XMLChangeImportContext::XMLChangeImportContext( SvXMLImport& rImport, sal_Int16 nPrefix, const OUString& rLocalName, - sal_Bool bStart, - sal_Bool bEnd, - sal_Bool bOutsideOfParagraph) : + bool bStart, + bool bEnd, + bool bOutsideOfParagraph) : SvXMLImportContext(rImport, nPrefix, rLocalName), bIsStart(bStart), bIsEnd(bEnd), diff --git a/xmloff/source/text/XMLChangeImportContext.hxx b/xmloff/source/text/XMLChangeImportContext.hxx index 0bb5767db585..adada1e2c7a0 100644 --- a/xmloff/source/text/XMLChangeImportContext.hxx +++ b/xmloff/source/text/XMLChangeImportContext.hxx @@ -39,9 +39,9 @@ namespace com { namespace sun { namespace star { */ class XMLChangeImportContext : public SvXMLImportContext { - sal_Bool bIsStart; - sal_Bool bIsEnd; - sal_Bool bIsOutsideOfParagraph; + bool bIsStart; + bool bIsEnd; + bool bIsOutsideOfParagraph; public: @@ -58,11 +58,11 @@ public: SvXMLImport& rImport, sal_Int16 nPrefix, const OUString& rLocalName, - sal_Bool bIsStart, /// mark start of a change - sal_Bool bIsEnd, /// mark end of a change + bool bIsStart, /// mark start of a change + bool bIsEnd, /// mark end of a change /// true if change mark is encountered outside of a paragraph /// (usually before a section or table) - sal_Bool bIsOutsideOfParagraph = sal_False); + bool bIsOutsideOfParagraph = false); virtual ~XMLChangeImportContext(); diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx index d7b72c844482..856ee7f2a30c 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.cxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx @@ -47,7 +47,7 @@ XMLChangedRegionImportContext::XMLChangedRegionImportContext( sal_uInt16 nPrefix, const OUString& rLocalName) : SvXMLImportContext(rImport, nPrefix, rLocalName), - bMergeLastPara(sal_True) + bMergeLastPara(true) { } diff --git a/xmloff/source/text/XMLChangedRegionImportContext.hxx b/xmloff/source/text/XMLChangedRegionImportContext.hxx index 65df3ccced46..772720375c79 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.hxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.hxx @@ -51,7 +51,7 @@ class XMLChangedRegionImportContext : public SvXMLImportContext OUString sID; /// merge-last-paragraph flag - sal_Bool bMergeLastPara; + bool bMergeLastPara; public: diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index 7a632f328ad0..ef326bb22282 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -140,8 +140,8 @@ XMLFootnoteConfigurationImportContext::XMLFootnoteConfigurationImportContext( , pAttrTokenMap(NULL) , nOffset(0) , nNumbering(FootnoteNumbering::PER_PAGE) -, bPosition(sal_False) -, bIsEndnote(sal_False) +, bPosition(false) +, bIsEndnote(false) { sal_Int16 nLength = xAttrList->getLength(); for(sal_Int16 nAttr = 0; nAttr < nLength; nAttr++) @@ -156,7 +156,7 @@ XMLFootnoteConfigurationImportContext::XMLFootnoteConfigurationImportContext( const OUString& rValue = xAttrList->getValueByIndex( nAttr ); if( IsXMLToken( rValue, XML_ENDNOTE ) ) { - bIsEndnote = sal_True; + bIsEndnote = true; SetFamily( XML_STYLE_FAMILY_TEXT_FOOTNOTECONFIG ); } break; diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx index cc24f9c45a80..0fba2c187898 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx @@ -67,7 +67,7 @@ XMLIndexAlphabeticalSourceContext::XMLIndexAlphabeticalSourceContext( sal_uInt16 nPrfx, const OUString& rLocalName, Reference<XPropertySet> & rPropSet) -: XMLIndexSourceBaseContext(rImport, nPrfx, rLocalName, rPropSet, sal_False) +: XMLIndexSourceBaseContext(rImport, nPrfx, rLocalName, rPropSet, false) , sMainEntryCharacterStyleName(sAPI_MainEntryCharacterStyleName) , sUseAlphabeticalSeparators(sAPI_UseAlphabeticalSeparators) , sUseCombinedEntries(sAPI_UseCombinedEntries) @@ -79,15 +79,15 @@ XMLIndexAlphabeticalSourceContext::XMLIndexAlphabeticalSourceContext( , sIsCommaSeparated("IsCommaSeparated") , sSortAlgorithm(sAPI_SortAlgorithm) , sLocale(sAPI_Locale) -, bMainEntryStyleNameOK(sal_False) -, bSeparators(sal_False) -, bCombineEntries(sal_True) -, bCaseSensitive(sal_True) -, bEntry(sal_False) -, bUpperCase(sal_False) -, bCombineDash(sal_False) -, bCombinePP(sal_True) -, bCommaSeparated(sal_False) +, bMainEntryStyleNameOK(false) +, bSeparators(false) +, bCombineEntries(true) +, bCaseSensitive(true) +, bEntry(false) +, bUpperCase(false) +, bCombineDash(false) +, bCombinePP(true) +, bCommaSeparated(false) { } diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx index 7f84bd6696e5..44daad7aa1a2 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx @@ -53,16 +53,16 @@ class XMLIndexAlphabeticalSourceContext : public XMLIndexSourceBaseContext OUString sAlgorithm; OUString sMainEntryStyleName; - sal_Bool bMainEntryStyleNameOK; - - sal_Bool bSeparators; - sal_Bool bCombineEntries; - sal_Bool bCaseSensitive; - sal_Bool bEntry; - sal_Bool bUpperCase; - sal_Bool bCombineDash; - sal_Bool bCombinePP; - sal_Bool bCommaSeparated; + bool bMainEntryStyleNameOK; + + bool bSeparators; + bool bCombineEntries; + bool bCaseSensitive; + bool bEntry; + bool bUpperCase; + bool bCombineDash; + bool bCombinePP; + bool bCommaSeparated; public: diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx index f8c003991c73..cc816b594746 100644 --- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx @@ -67,8 +67,8 @@ XMLIndexBibliographyConfigurationContext::XMLIndexBibliographyConfigurationConte sPrefix(), sAlgorithm(), maLanguageTagODF(), - bNumberedEntries(sal_False), - bSortByPosition(sal_True) + bNumberedEntries(false), + bSortByPosition(true) { } @@ -233,7 +233,7 @@ void XMLIndexBibliographyConfigurationContext::CreateAndInsert(bool) if( xFactory.is() ) { Sequence<OUString> aServices = xFactory->getAvailableServiceNames(); - sal_Bool bFound(sal_False); + bool bFound(false); sal_Int32 i(0); sal_Int32 nServiceCount(aServices.getLength()); while (i < nServiceCount && !bFound) @@ -241,7 +241,7 @@ void XMLIndexBibliographyConfigurationContext::CreateAndInsert(bool) if (aServices[i].equals(sFieldMaster_Bibliography)) // here we should use a method which compares in reverse order if available // #85282# - bFound = sal_True; + bFound = true; else i++; } diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx index 316f375dd731..9ea51eec733f 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx @@ -51,7 +51,7 @@ XMLIndexBibliographyEntryContext::XMLIndexBibliographyEntryContext( rTemplate, nPrfx, rLocalName), nBibliographyInfo(BibliographyDataField::IDENTIFIER), - bBibliographyInfoOK(sal_False) + bBibliographyInfoOK(false) { } @@ -113,7 +113,7 @@ void XMLIndexBibliographyEntryContext::StartElement( if ( IsXMLToken( sLocalName, XML_STYLE_NAME ) ) { sCharStyleName = xAttrList->getValueByIndex(nAttr); - bCharStyleNameOK = sal_True; + bCharStyleNameOK = true; } else if ( IsXMLToken( sLocalName, XML_BIBLIOGRAPHY_DATA_FIELD ) ) { @@ -123,7 +123,7 @@ void XMLIndexBibliographyEntryContext::StartElement( aBibliographyDataFieldMap)) { nBibliographyInfo = nTmp; - bBibliographyInfoOK = sal_True; + bBibliographyInfoOK = true; } } } diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx index 9ecf6fd592d1..c3e80c0c4d01 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx @@ -41,7 +41,7 @@ class XMLIndexBibliographyEntryContext : public XMLIndexSimpleEntryContext { // bibliography info sal_Int16 nBibliographyInfo; - sal_Bool bBibliographyInfoOK; + bool bBibliographyInfoOK; public: diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx index 706ace999888..93461732086c 100644 --- a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx @@ -50,7 +50,7 @@ XMLIndexBibliographySourceContext::XMLIndexBibliographySourceContext( const OUString& rLocalName, Reference<XPropertySet> & rPropSet) : XMLIndexSourceBaseContext(rImport, nPrfx, rLocalName, - rPropSet, sal_False) + rPropSet, false) { } diff --git a/xmloff/source/text/XMLIndexBodyContext.cxx b/xmloff/source/text/XMLIndexBodyContext.cxx index 6ea03369103c..35e63a7dbfa2 100644 --- a/xmloff/source/text/XMLIndexBodyContext.cxx +++ b/xmloff/source/text/XMLIndexBodyContext.cxx @@ -34,7 +34,7 @@ XMLIndexBodyContext::XMLIndexBodyContext( sal_uInt16 nPrfx, const OUString& rLocalName ) : SvXMLImportContext(rImport, nPrfx, rLocalName), - bHasContent(sal_False) + bHasContent(false) { } @@ -57,7 +57,7 @@ SvXMLImportContext* XMLIndexBodyContext::CreateChildContext( pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } else - bHasContent = sal_True; + bHasContent = true; return pContext; } diff --git a/xmloff/source/text/XMLIndexBodyContext.hxx b/xmloff/source/text/XMLIndexBodyContext.hxx index 837fcf163b6f..a68ce06647f9 100644 --- a/xmloff/source/text/XMLIndexBodyContext.hxx +++ b/xmloff/source/text/XMLIndexBodyContext.hxx @@ -37,7 +37,7 @@ namespace com { namespace sun { namespace star { */ class XMLIndexBodyContext : public SvXMLImportContext { - sal_Bool bHasContent; + bool bHasContent; public: @@ -51,7 +51,7 @@ public: virtual ~XMLIndexBodyContext(); /// return whether any content elements were encountered - inline sal_Bool HasContent(); + inline bool HasContent(); protected: @@ -62,7 +62,7 @@ protected: ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE; }; -inline sal_Bool XMLIndexBodyContext::HasContent() +inline bool XMLIndexBodyContext::HasContent() { return bHasContent; } diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx index 14d88b3ae5cf..4ad77ccaf0a5 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx @@ -53,16 +53,16 @@ XMLIndexChapterInfoEntryContext::XMLIndexChapterInfoEntryContext( XMLIndexTemplateContext& rTemplate, sal_uInt16 nPrfx, const OUString& rLocalName, - sal_Bool bT ) : + bool bT ) : XMLIndexSimpleEntryContext(rImport, (bT ? rTemplate.sTokenEntryNumber : rTemplate.sTokenChapterInfo), rTemplate, nPrfx, rLocalName), nChapterInfo(ChapterFormat::NAME_NUMBER), - bChapterInfoOK(sal_False), + bChapterInfoOK(false), bTOC( bT ), nOutlineLevel( 0 ), - bOutlineLevelOK(sal_False) + bOutlineLevelOK(false) { } @@ -98,7 +98,7 @@ void XMLIndexChapterInfoEntryContext::StartElement( if ( IsXMLToken( sLocalName, XML_STYLE_NAME ) ) { sCharStyleName = xAttrList->getValueByIndex(nAttr); - bCharStyleNameOK = sal_True; + bCharStyleNameOK = true; } else if ( IsXMLToken( sLocalName, XML_DISPLAY ) )//i53420, always true, in TOC as well { @@ -108,7 +108,7 @@ void XMLIndexChapterInfoEntryContext::StartElement( aChapterDisplayMap)) { nChapterInfo = nTmp; - bChapterInfoOK = sal_True; + bChapterInfoOK = true; } } else if ( IsXMLToken( sLocalName, XML_OUTLINE_LEVEL ) ) @@ -119,7 +119,7 @@ void XMLIndexChapterInfoEntryContext::StartElement( { //control on range is carried out in the UNO level nOutlineLevel = static_cast<sal_uInt16>(nTmp); - bOutlineLevelOK = sal_True; + bOutlineLevelOK = true; } } } diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx index 19fd0106f01b..277103477aca 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx @@ -38,10 +38,10 @@ class XMLIndexChapterInfoEntryContext : public XMLIndexSimpleEntryContext { // chapter format sal_Int16 nChapterInfo; - sal_Bool bChapterInfoOK; - sal_Bool bTOC; + bool bChapterInfoOK; + bool bTOC; sal_Int16 nOutlineLevel; - sal_Bool bOutlineLevelOK; + bool bOutlineLevelOK; public: @@ -52,7 +52,7 @@ public: XMLIndexTemplateContext& rTemplate, sal_uInt16 nPrfx, const OUString& rLocalName, - sal_Bool bTOC ); + bool bTOC ); virtual ~XMLIndexChapterInfoEntryContext(); diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx index 620b1d731249..60b97be81ba9 100644 --- a/xmloff/source/text/XMLIndexMarkExport.cxx +++ b/xmloff/source/text/XMLIndexMarkExport.cxx @@ -73,7 +73,7 @@ XMLIndexMarkExport::~XMLIndexMarkExport() void XMLIndexMarkExport::ExportIndexMark( const Reference<XPropertySet> & rPropSet, - sal_Bool bAutoStyles) + bool bAutoStyles) { /// index marks have no styles! if (!bAutoStyles) @@ -205,7 +205,7 @@ static void lcl_ExportPropertyBool( SvXMLExport& rExport, { rAny = rPropSet->getPropertyValue( sProperty ); - sal_Bool bValue = sal_Bool(); + bool bValue; if( rAny >>= bValue ) { if( bValue ) diff --git a/xmloff/source/text/XMLIndexMarkExport.hxx b/xmloff/source/text/XMLIndexMarkExport.hxx index b4cd219de46c..a36b8cd24af4 100644 --- a/xmloff/source/text/XMLIndexMarkExport.hxx +++ b/xmloff/source/text/XMLIndexMarkExport.hxx @@ -71,7 +71,7 @@ public: void ExportIndexMark( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet, - sal_Bool bAutoStyles); + bool bAutoStyles); protected: diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx index 66b41c327a55..98451c681294 100644 --- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx +++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx @@ -61,17 +61,17 @@ XMLIndexObjectSourceContext::XMLIndexObjectSourceContext( const OUString& rLocalName, Reference<XPropertySet> & rPropSet) : XMLIndexSourceBaseContext(rImport, nPrfx, rLocalName, - rPropSet, sal_False), + rPropSet, false), sCreateFromStarCalc(sAPI_CreateFromStarCalc), sCreateFromStarChart(sAPI_CreateFromStarChart), sCreateFromStarDraw(sAPI_CreateFromStarDraw), sCreateFromStarMath(sAPI_CreateFromStarMath), sCreateFromOtherEmbeddedObjects(sAPI_CreateFromOtherEmbeddedObjects), - bUseCalc(sal_False), - bUseChart(sal_False), - bUseDraw(sal_False), - bUseMath(sal_False), - bUseOtherObjects(sal_False) + bUseCalc(false), + bUseChart(false), + bUseDraw(false), + bUseMath(false), + bUseOtherObjects(false) { } diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.hxx b/xmloff/source/text/XMLIndexObjectSourceContext.hxx index 17c0f49a9748..eefe763d4514 100644 --- a/xmloff/source/text/XMLIndexObjectSourceContext.hxx +++ b/xmloff/source/text/XMLIndexObjectSourceContext.hxx @@ -41,11 +41,11 @@ class XMLIndexObjectSourceContext : public XMLIndexSourceBaseContext const OUString sCreateFromStarMath; const OUString sCreateFromOtherEmbeddedObjects; - sal_Bool bUseCalc; - sal_Bool bUseChart; - sal_Bool bUseDraw; - sal_Bool bUseMath; - sal_Bool bUseOtherObjects; + bool bUseCalc; + bool bUseChart; + bool bUseDraw; + bool bUseMath; + bool bUseOtherObjects; public: diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx index fee2d60279a7..9d900de7067a 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx @@ -46,7 +46,7 @@ XMLIndexSimpleEntryContext::XMLIndexSimpleEntryContext( const OUString& rLocalName ) : SvXMLImportContext(rImport, nPrfx, rLocalName) , rEntryType(rEntry) -, bCharStyleNameOK(sal_False) +, bCharStyleNameOK(false) , rTemplateContext(rTemplate) , nValues(1) { @@ -77,9 +77,9 @@ void XMLIndexSimpleEntryContext::StartElement( const Reference < ::com::sun::star::container::XNameContainer > & rStyles = GetImport().GetTextImport()->GetTextStyles(); if( rStyles.is() && rStyles->hasByName( sDisplayStyleName ) ) - bCharStyleNameOK = sal_True; + bCharStyleNameOK = true; else - bCharStyleNameOK = sal_False; + bCharStyleNameOK = false; } } diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx index 453ff86446fe..bcbe0eaa2bd6 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx @@ -43,7 +43,7 @@ class XMLIndexSimpleEntryContext : public SvXMLImportContext protected: // character style OUString sCharStyleName; - sal_Bool bCharStyleNameOK; + bool bCharStyleNameOK; // surrounding template XMLIndexTemplateContext& rTemplateContext; diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx index caab1942f39a..f3019851d32d 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx @@ -152,13 +152,13 @@ XMLIndexSourceBaseContext::XMLIndexSourceBaseContext( sal_uInt16 nPrfx, const OUString& rLocalName, Reference<XPropertySet> & rPropSet, - sal_Bool bLevelFormats) + bool bLevelFormats) : SvXMLImportContext(rImport, nPrfx, rLocalName) , sCreateFromChapter(sAPI_CreateFromChapter) , sIsRelativeTabstops(sAPI_IsRelativeTabstops) , bUseLevelFormats(bLevelFormats) -, bChapterIndex(sal_False) -, bRelativeTabs(sal_True) +, bChapterIndex(false) +, bRelativeTabs(true) , rIndexPropertySet(rPropSet) { } @@ -197,7 +197,7 @@ void XMLIndexSourceBaseContext::ProcessAttribute( case XML_TOK_INDEXSOURCE_INDEX_SCOPE: if ( IsXMLToken( rValue, XML_CHAPTER ) ) { - bChapterIndex = sal_True; + bChapterIndex = true; } break; diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.hxx b/xmloff/source/text/XMLIndexSourceBaseContext.hxx index 8ae91aa97a68..a8edc2b61cfc 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.hxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.hxx @@ -78,10 +78,10 @@ class XMLIndexSourceBaseContext : public SvXMLImportContext const OUString sCreateFromChapter; const OUString sIsRelativeTabstops; - sal_Bool bUseLevelFormats; + bool bUseLevelFormats; - sal_Bool bChapterIndex; /// chapter-wise or document index? - sal_Bool bRelativeTabs; /// tab stops relative to margin or indent? + bool bChapterIndex; /// chapter-wise or document index? + bool bRelativeTabs; /// tab stops relative to margin or indent? protected: @@ -99,7 +99,7 @@ public: const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet, - sal_Bool bLevelFormats); + bool bLevelFormats); virtual ~XMLIndexSourceBaseContext(); diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index 65e9fd321059..b7a2c902e268 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -101,7 +101,7 @@ XMLIndexTOCContext::XMLIndexTOCContext(SvXMLImport& rImport, , sIsProtected("IsProtected") , sName("Name") , eIndexType(TEXT_INDEX_UNKNOWN) - , bValid(sal_False) + , bValid(false) { if (XML_NAMESPACE_TEXT == nPrfx) { @@ -115,7 +115,7 @@ XMLIndexTOCContext::XMLIndexTOCContext(SvXMLImport& rImport, "service and source element maps must be same size"); eIndexType = static_cast<IndexTypeEnum>(nTmp); - bValid = sal_True; + bValid = true; } } } diff --git a/xmloff/source/text/XMLIndexTOCContext.hxx b/xmloff/source/text/XMLIndexTOCContext.hxx index f8f32268b6d5..ad84618654dd 100644 --- a/xmloff/source/text/XMLIndexTOCContext.hxx +++ b/xmloff/source/text/XMLIndexTOCContext.hxx @@ -64,7 +64,7 @@ class XMLIndexTOCContext : public SvXMLImportContext enum IndexTypeEnum eIndexType; - sal_Bool bValid; + bool bValid; SvXMLImportContextRef xBodyContextRef; diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx index f77ea2df8a70..d1ec00d983a1 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx @@ -54,16 +54,16 @@ XMLIndexTOCSourceContext::XMLIndexTOCSourceContext( sal_uInt16 nPrfx, const OUString& rLocalName, Reference<XPropertySet> & rPropSet) -: XMLIndexSourceBaseContext(rImport, nPrfx, rLocalName, rPropSet, sal_True) +: XMLIndexSourceBaseContext(rImport, nPrfx, rLocalName, rPropSet, true) , sCreateFromMarks(sAPI_CreateFromMarks) , sLevel(sAPI_Level) , sCreateFromOutline(sAPI_CreateFromOutline) , sCreateFromLevelParagraphStyles(sAPI_CreateFromLevelParagraphStyles) // use all chapters by default , nOutlineLevel(rImport.GetTextImport()->GetChapterNumbering()->getCount()) -, bUseOutline(sal_True) -, bUseMarks(sal_True) -, bUseParagraphStyles(sal_False) +, bUseOutline(true) +, bUseMarks(true) +, bUseParagraphStyles(false) { } @@ -83,7 +83,7 @@ void XMLIndexTOCSourceContext::ProcessAttribute( // #104651# use OUTLINE_LEVEL and USE_OUTLINE_LEVEL instead of // OUTLINE_LEVEL with values none|1..10. For backwards // compatibility, 'none' must still be read. - bUseOutline = sal_False; + bUseOutline = false; } else { @@ -92,7 +92,7 @@ void XMLIndexTOCSourceContext::ProcessAttribute( nTmp, rValue, 1, GetImport().GetTextImport()-> GetChapterNumbering()->getCount())) { - bUseOutline = sal_True; + bUseOutline = true; nOutlineLevel = nTmp; } } @@ -170,7 +170,7 @@ SvXMLImportContext* XMLIndexTOCSourceContext::CreateChildContext( aSvLevelNameTOCMap, XML_OUTLINE_LEVEL, aLevelStylePropNameTOCMap, - aAllowedTokenTypesTOC, sal_True ); + aAllowedTokenTypesTOC, true ); } else { diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.hxx b/xmloff/source/text/XMLIndexTOCSourceContext.hxx index dede5ec58766..ab442f6025f0 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.hxx @@ -42,9 +42,9 @@ class XMLIndexTOCSourceContext : public XMLIndexSourceBaseContext const OUString sCreateFromLevelParagraphStyles; sal_Int32 nOutlineLevel; - sal_Bool bUseOutline; - sal_Bool bUseMarks; - sal_Bool bUseParagraphStyles; + bool bUseOutline; + bool bUseMarks; + bool bUseParagraphStyles; public: diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx index 6cacdc277e54..9fe6947dd14b 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx @@ -53,10 +53,10 @@ XMLIndexTabStopEntryContext::XMLIndexTabStopEntryContext( rTemplate, nPrfx, rLocalName), sLeaderChar(), nTabPosition(0), - bTabPositionOK(sal_False), - bTabRightAligned(sal_False), - bLeaderCharOK(sal_False), - bWithTab(sal_True) // #i21237# + bTabPositionOK(false), + bTabRightAligned(false), + bLeaderCharOK(false), + bWithTab(true) // #i21237# { } @@ -92,7 +92,7 @@ void XMLIndexTabStopEntryContext::StartElement( convertMeasureToCore(nTmp, sAttr)) { nTabPosition = nTmp; - bTabPositionOK = sal_True; + bTabPositionOK = true; } } else if ( IsXMLToken( sLocalName, XML_LEADER_CHAR ) ) diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx index 98dba3f6010d..c3c7ca98af15 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx @@ -39,10 +39,10 @@ class XMLIndexTabStopEntryContext : public XMLIndexSimpleEntryContext { OUString sLeaderChar; /// fill ("leader") character sal_Int32 nTabPosition; /// tab position - sal_Bool bTabPositionOK; /// is tab right aligned? - sal_Bool bTabRightAligned; /// is nTabPosition valid? - sal_Bool bLeaderCharOK; /// is sLeaderChar valid? - sal_Bool bWithTab; /// is tab char present? #i21237# + bool bTabPositionOK; /// is tab right aligned? + bool bTabRightAligned; /// is nTabPosition valid? + bool bLeaderCharOK; /// is sLeaderChar valid? + bool bWithTab; /// is tab char present? #i21237# public: diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx index ee4d198b891c..f1fa32e23abe 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx @@ -59,14 +59,14 @@ XMLIndexTableSourceContext::XMLIndexTableSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, Reference<XPropertySet> & rPropSet) : XMLIndexSourceBaseContext(rImport, nPrfx, rLocalName, - rPropSet, sal_False) + rPropSet, false) , sCreateFromLabels(sAPI_CreateFromLabels) , sLabelCategory(sAPI_LabelCategory) , sLabelDisplayType(sAPI_LabelDisplayType) , nDisplayFormat(0) - , bSequenceOK(sal_False) - , bDisplayFormatOK(sal_False) - , bUseCaption(sal_True) + , bSequenceOK(false) + , bDisplayFormatOK(false) + , bUseCaption(true) { } @@ -105,7 +105,7 @@ void XMLIndexTableSourceContext::ProcessAttribute( case XML_TOK_INDEXSOURCE_SEQUENCE_NAME: sSequence = rValue; - bSequenceOK = sal_True; + bSequenceOK = true; break; case XML_TOK_INDEXSOURCE_SEQUENCE_FORMAT: @@ -115,7 +115,7 @@ void XMLIndexTableSourceContext::ProcessAttribute( lcl_aReferenceTypeTokenMap)) { nDisplayFormat = nTmp; - bDisplayFormatOK = sal_True; + bDisplayFormatOK = true; } break; } diff --git a/xmloff/source/text/XMLIndexTableSourceContext.hxx b/xmloff/source/text/XMLIndexTableSourceContext.hxx index e11eb825ebcf..7e7f8a03b5c0 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.hxx @@ -42,9 +42,9 @@ class XMLIndexTableSourceContext : public XMLIndexSourceBaseContext OUString sSequence; sal_Int16 nDisplayFormat; - sal_Bool bSequenceOK; - sal_Bool bDisplayFormatOK; - sal_Bool bUseCaption; + bool bSequenceOK; + bool bDisplayFormatOK; + bool bUseCaption; public: diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index 95aab8a2b4b8..01c334faeb04 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -71,15 +71,15 @@ XMLIndexTemplateContext::XMLIndexTemplateContext( enum XMLTokenEnum eLevelAttrName, const sal_Char** pLevelStylePropMap, const sal_Bool* pAllowedTokenTypes, - sal_Bool bT ) + bool bT ) : SvXMLImportContext(rImport, nPrfx, rLocalName) , pOutlineLevelNameMap(pLevelNameMap) , eOutlineLevelAttrName(eLevelAttrName) , pOutlineLevelStylePropMap(pLevelStylePropMap) , pAllowedTokenTypesMap(pAllowedTokenTypes) , nOutlineLevel(1) // all indices have level 1 (0 is for header) -, bStyleNameOK(sal_False) -, bOutlineLevelOK(sal_False) +, bStyleNameOK(false) +, bOutlineLevelOK(false) , bTOC( bT ) , rPropertySet(rPropSet) , sTokenEntryNumber(sAPI_TokenEntryNumber) @@ -115,7 +115,7 @@ XMLIndexTemplateContext::XMLIndexTemplateContext( if (NULL == pLevelNameMap) { nOutlineLevel = 1; - bOutlineLevelOK = sal_True; + bOutlineLevelOK = true; } } @@ -148,7 +148,7 @@ void XMLIndexTemplateContext::StartElement( { // style name sStyleName = xAttrList->getValueByIndex(nAttr); - bStyleNameOK = sal_True; + bStyleNameOK = true; } else if (eOutlineLevelAttrName != XML_TOKEN_INVALID) { @@ -162,7 +162,7 @@ void XMLIndexTemplateContext::StartElement( pOutlineLevelNameMap)) { nOutlineLevel = nTmp; - bOutlineLevelOK = sal_True; + bOutlineLevelOK = true; } // else: illegal value -> ignore } diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx index 3e38923ced2e..954c6cc5be12 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTemplateContext.hxx @@ -76,9 +76,9 @@ class XMLIndexTemplateContext : public SvXMLImportContext const sal_Bool* pAllowedTokenTypesMap; sal_Int32 nOutlineLevel; - sal_Bool bStyleNameOK; - sal_Bool bOutlineLevelOK; - sal_Bool bTOC; + bool bStyleNameOK; + bool bOutlineLevelOK; + bool bTOC; // PropertySet of current index ::com::sun::star::uno::Reference< @@ -124,7 +124,7 @@ public: enum ::xmloff::token::XMLTokenEnum eLevelAttrName, const sal_Char** aLevelStylePropNameMap, const sal_Bool* aAllowedTokenTypes, - sal_Bool bTOC=sal_False); + bool bTOC=false); virtual ~XMLIndexTemplateContext(); diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx index c21b48da9a46..3a780ac2e692 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx @@ -43,7 +43,7 @@ XMLIndexTitleTemplateContext::XMLIndexTitleTemplateContext( : SvXMLImportContext(rImport, nPrfx, rLocalName) , sTitle("Title") , sParaStyleHeading("ParaStyleHeading") -, bStyleNameOK(sal_False) +, bStyleNameOK(false) , rTOCPropertySet(rPropSet) { } diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx index 46b93d7d56ef..82e5ae026a5a 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx @@ -43,7 +43,7 @@ class XMLIndexTitleTemplateContext : public SvXMLImportContext // paragraph style OUString sStyleName; - sal_Bool bStyleNameOK; + bool bStyleNameOK; // content OUStringBuffer sContent; diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx index 6c08bf595d03..f5772dcf5839 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.cxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx @@ -61,7 +61,7 @@ XMLIndexUserSourceContext::XMLIndexUserSourceContext( const OUString& rLocalName, Reference<XPropertySet> & rPropSet) : XMLIndexSourceBaseContext(rImport, nPrfx, rLocalName, - rPropSet, sal_True), + rPropSet, true), sCreateFromEmbeddedObjects(sAPI_CreateFromEmbeddedObjects), sCreateFromGraphicObjects(sAPI_CreateFromGraphicObjects), sCreateFromMarks(sAPI_CreateFromMarks), @@ -70,13 +70,13 @@ XMLIndexUserSourceContext::XMLIndexUserSourceContext( sUseLevelFromSource(sAPI_UseLevelFromSource), sCreateFromLevelParagraphStyles(sAPI_CreateFromLevelParagraphStyles), sUserIndexName(sAPI_UserIndexName), - bUseObjects(sal_False), - bUseGraphic(sal_False), - bUseMarks(sal_False), - bUseTables(sal_False), - bUseFrames(sal_False), - bUseLevelFromSource(sal_False), - bUseLevelParagraphStyles(sal_False) + bUseObjects(false), + bUseGraphic(false), + bUseMarks(false), + bUseTables(false), + bUseFrames(false), + bUseLevelFromSource(false), + bUseLevelParagraphStyles(false) { } diff --git a/xmloff/source/text/XMLIndexUserSourceContext.hxx b/xmloff/source/text/XMLIndexUserSourceContext.hxx index 5ac017fdf136..72bc536fe1eb 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.hxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.hxx @@ -44,13 +44,13 @@ class XMLIndexUserSourceContext : public XMLIndexSourceBaseContext const OUString sCreateFromLevelParagraphStyles; const OUString sUserIndexName; - sal_Bool bUseObjects; - sal_Bool bUseGraphic; - sal_Bool bUseMarks; - sal_Bool bUseTables; - sal_Bool bUseFrames; - sal_Bool bUseLevelFromSource; - sal_Bool bUseLevelParagraphStyles; + bool bUseObjects; + bool bUseGraphic; + bool bUseMarks; + bool bUseTables; + bool bUseFrames; + bool bUseLevelFromSource; + bool bUseLevelParagraphStyles; OUString sIndexName; public: diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx index 4c3ade8961e7..0a0244993d2a 100644 --- a/xmloff/source/text/XMLLineNumberingImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx @@ -67,10 +67,10 @@ XMLLineNumberingImportContext::XMLLineNumberingImportContext( , nNumberPosition(style::LineNumberPosition::LEFT) , nIncrement(-1) , nSeparatorIncrement(-1) -, bNumberLines(sal_True) -, bCountEmptyLines(sal_True) -, bCountInFloatingFrames(sal_False) -, bRestartNumbering(sal_False) +, bNumberLines(true) +, bCountEmptyLines(true) +, bCountInFloatingFrames(false) +, bRestartNumbering(false) { } diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx index 33d07dc3cabb..d0bd57045489 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.cxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx @@ -37,8 +37,8 @@ template<class A> XMLPropertyBackpatcher<A>::XMLPropertyBackpatcher( const OUString& sPropName) : sPropertyName(sPropName) -, bDefaultHandling(sal_False) -, bPreserveProperty(sal_False) +, bDefaultHandling(false) +, bPreserveProperty(false) , sPreservePropertyName() { } diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx index cd31bb73ad5d..d87c75e522f2 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.hxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx @@ -62,10 +62,10 @@ class XMLPropertyBackpatcher OUString sPropertyName; /// should a default value be set for unresolved properties - sal_Bool bDefaultHandling; + bool bDefaultHandling; /// should the sPreservePropertyName be preserved - sal_Bool bPreserveProperty; + bool bPreserveProperty; /// name of the property to preserve OUString sPreservePropertyName; diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx index 0c8f817ad80b..b220edfdcd47 100644 --- a/xmloff/source/text/XMLRedlineExport.cxx +++ b/xmloff/source/text/XMLRedlineExport.cxx @@ -105,7 +105,7 @@ XMLRedlineExport::~XMLRedlineExport() void XMLRedlineExport::ExportChange( const Reference<XPropertySet> & rPropSet, - sal_Bool bAutoStyle) + bool bAutoStyle) { if (bAutoStyle) { @@ -126,7 +126,7 @@ void XMLRedlineExport::ExportChange( } -void XMLRedlineExport::ExportChangesList(sal_Bool bAutoStyles) +void XMLRedlineExport::ExportChangesList(bool bAutoStyles) { if (bAutoStyles) { @@ -141,7 +141,7 @@ void XMLRedlineExport::ExportChangesList(sal_Bool bAutoStyles) void XMLRedlineExport::ExportChangesList( const Reference<XText> & rText, - sal_Bool bAutoStyles) + bool bAutoStyles) { // in the header/footer case, auto styles are collected from the // inline change elements. @@ -216,7 +216,7 @@ void XMLRedlineExport::ExportChangesListElements() Reference<XPropertySet> aDocPropertySet( rExport.GetModel(), uno::UNO_QUERY ); // redlining enabled? - sal_Bool bEnabled = *(sal_Bool*)aDocPropertySet->getPropertyValue( + bool bEnabled = *(sal_Bool*)aDocPropertySet->getPropertyValue( sRecordChanges ).getValue(); // only export if we have redlines or attributes @@ -334,8 +334,8 @@ void XMLRedlineExport::ExportChangeInline( // determine element name (depending on collapsed, start/end) enum XMLTokenEnum eElement = XML_TOKEN_INVALID; Any aAny = rPropSet->getPropertyValue(sIsCollapsed); - sal_Bool bCollapsed = *(sal_Bool *)aAny.getValue(); - sal_Bool bStart = sal_True; // ignored if bCollapsed = sal_True + bool bCollapsed = *(sal_Bool *)aAny.getValue(); + bool bStart = true; // ignored if bCollapsed = sal_True if (bCollapsed) { eElement = XML_CHANGE; @@ -549,7 +549,7 @@ void XMLRedlineExport::ExportChangeInfo( void XMLRedlineExport::ExportStartOrEndRedline( const Reference<XPropertySet> & rPropSet, - sal_Bool bStart) + bool bStart) { if( ! rPropSet.is() ) return; @@ -571,17 +571,17 @@ void XMLRedlineExport::ExportStartOrEndRedline( const PropertyValue* pValues = aValues.getConstArray(); // seek for redline properties - sal_Bool bIsCollapsed = sal_False; - sal_Bool bIsStart = sal_True; + bool bIsCollapsed = false; + bool bIsStart = true; OUString sId; - sal_Bool bIdOK = sal_False; // have we seen an ID? + bool bIdOK = false; // have we seen an ID? sal_Int32 nLength = aValues.getLength(); for(sal_Int32 i = 0; i < nLength; i++) { if (sRedlineIdentifier.equals(pValues[i].Name)) { pValues[i].Value >>= sId; - bIdOK = sal_True; + bIdOK = true; } else if (sIsCollapsed.equals(pValues[i].Name)) { @@ -616,7 +616,7 @@ void XMLRedlineExport::ExportStartOrEndRedline( void XMLRedlineExport::ExportStartOrEndRedline( const Reference<XTextContent> & rContent, - sal_Bool bStart) + bool bStart) { Reference<XPropertySet> xPropSet(rContent, uno::UNO_QUERY); if (xPropSet.is()) @@ -631,7 +631,7 @@ void XMLRedlineExport::ExportStartOrEndRedline( void XMLRedlineExport::ExportStartOrEndRedline( const Reference<XTextSection> & rSection, - sal_Bool bStart) + bool bStart) { Reference<XPropertySet> xPropSet(rSection, uno::UNO_QUERY); if (xPropSet.is()) diff --git a/xmloff/source/text/XMLRedlineExport.hxx b/xmloff/source/text/XMLRedlineExport.hxx index 59f21774b9a2..c62098a10b45 100644 --- a/xmloff/source/text/XMLRedlineExport.hxx +++ b/xmloff/source/text/XMLRedlineExport.hxx @@ -107,16 +107,16 @@ public: /// PropertySet of RedlinePortion const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet, - sal_Bool bAutoStyle); + bool bAutoStyle); /// export the list of changes (complete list minus recorded changed) - void ExportChangesList(sal_Bool bAutoStyles); + void ExportChangesList(bool bAutoStyles); /// export the list of changes (recorded changes for this XText only) void ExportChangesList( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText> & rText, - sal_Bool bAutoStyles); + bool bAutoStyles); /// set the current XText for which changes should be recorded. /// An empty XText means: don't record changes @@ -133,21 +133,21 @@ public: void ExportStartOrEndRedline( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet, - sal_Bool bStart); /// start or end of text entity (e.g. paragraph)? + bool bStart); /// start or end of text entity (e.g. paragraph)? /// convenience method, calls XPropertySet-version of this method void ExportStartOrEndRedline( /// XTextContent; must also be an XPropertySet const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent> & rContent, - sal_Bool bStart); + bool bStart); /// convenience method, calls XPropertySet-version of this method void ExportStartOrEndRedline( /// XTextSection; must also be an XPropertySet const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> & rSection, - sal_Bool bStart); + bool bStart); private: diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index 034e12eb5468..adff8dd46d5c 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -137,14 +137,14 @@ XMLSectionExport::XMLSectionExport( , rExport(rExp) , rParaExport(rParaExp) -, bHeadingDummiesExported( sal_False ) +, bHeadingDummiesExported( false ) { } void XMLSectionExport::ExportSectionStart( const Reference<XTextSection> & rSection, - sal_Bool bAutoStyles) + bool bAutoStyles) { Reference<XPropertySet> xPropertySet(rSection, UNO_QUERY); @@ -188,12 +188,12 @@ void XMLSectionExport::ExportSectionStart( } } -sal_Bool XMLSectionExport::GetIndex( +bool XMLSectionExport::GetIndex( const Reference<XTextSection> & rSection, Reference<XDocumentIndex> & rIndex) const { // first, reset result - sal_Bool bRet = sal_False; + bool bRet = false; rIndex = NULL; // get section Properties @@ -220,7 +220,7 @@ sal_Bool XMLSectionExport::GetIndex( if (rSection == xEnclosingSection) { rIndex = xDocumentIndex; - bRet = sal_True; + bRet = true; } // else: index header or regular section @@ -232,7 +232,7 @@ sal_Bool XMLSectionExport::GetIndex( // if the enclosing section is "our" section, then we are an index! if (rSection == xEnclosingSection) { - bRet = sal_True; + bRet = true; } // else: regular section } @@ -246,7 +246,7 @@ sal_Bool XMLSectionExport::GetIndex( void XMLSectionExport::ExportSectionEnd( const Reference<XTextSection> & rSection, - sal_Bool bAutoStyles) + bool bAutoStyles) { // no end section for styles if (!bAutoStyles) @@ -579,15 +579,15 @@ void XMLSectionExport::ExportTableOfContentStart( // use outline level ExportBoolean(rPropertySet, sCreateFromOutline, - XML_USE_OUTLINE_LEVEL, sal_True); + XML_USE_OUTLINE_LEVEL, true); // use index marks ExportBoolean(rPropertySet, sCreateFromMarks, - XML_USE_INDEX_MARKS, sal_True); + XML_USE_INDEX_MARKS, true); // use level styles ExportBoolean(rPropertySet, sCreateFromLevelParagraphStyles, - XML_USE_INDEX_SOURCE_STYLES, sal_False); + XML_USE_INDEX_SOURCE_STYLES, false); ExportBaseIndexSource(TEXT_SECTION_TYPE_TOC, rPropertySet); } @@ -604,15 +604,15 @@ void XMLSectionExport::ExportObjectIndexStart( // scope for index source element { ExportBoolean(rPropertySet, sCreateFromOtherEmbeddedObjects, - XML_USE_OTHER_OBJECTS, sal_False); + XML_USE_OTHER_OBJECTS, false); ExportBoolean(rPropertySet, sCreateFromStarCalc, - XML_USE_SPREADSHEET_OBJECTS, sal_False); + XML_USE_SPREADSHEET_OBJECTS, false); ExportBoolean(rPropertySet, sCreateFromStarChart, - XML_USE_CHART_OBJECTS, sal_False); + XML_USE_CHART_OBJECTS, false); ExportBoolean(rPropertySet, sCreateFromStarDraw, - XML_USE_DRAW_OBJECTS, sal_False); + XML_USE_DRAW_OBJECTS, false); ExportBoolean(rPropertySet, sCreateFromStarMath, - XML_USE_MATH_OBJECTS, sal_False); + XML_USE_MATH_OBJECTS, false); ExportBaseIndexSource(TEXT_SECTION_TYPE_OBJECT, rPropertySet); } @@ -677,21 +677,21 @@ void XMLSectionExport::ExportAlphabeticalIndexStart( // other (boolean) attributes ExportBoolean(rPropertySet, sIsCaseSensitive, XML_IGNORE_CASE, - sal_False, sal_True); + false, true); ExportBoolean(rPropertySet, sUseAlphabeticalSeparators, - XML_ALPHABETICAL_SEPARATORS, sal_False); + XML_ALPHABETICAL_SEPARATORS, false); ExportBoolean(rPropertySet, sUseCombinedEntries, XML_COMBINE_ENTRIES, - sal_True); + true); ExportBoolean(rPropertySet, sUseDash, XML_COMBINE_ENTRIES_WITH_DASH, - sal_False); + false); ExportBoolean(rPropertySet, sUseKeyAsEntry, XML_USE_KEYS_AS_ENTRIES, - sal_False); + false); ExportBoolean(rPropertySet, sUsePP, XML_COMBINE_ENTRIES_WITH_PP, - sal_True); + true); ExportBoolean(rPropertySet, sUseUpperCase, XML_CAPITALIZE_ENTRIES, - sal_False); + false); ExportBoolean(rPropertySet, sIsCommaSeparated, XML_COMMA_SEPARATED, - sal_False); + false); // sort algorithm aAny = rPropertySet->getPropertyValue(sSortAlgorithm); @@ -725,19 +725,19 @@ void XMLSectionExport::ExportUserIndexStart( { // bool attributes ExportBoolean(rPropertySet, sCreateFromEmbeddedObjects, - XML_USE_OBJECTS, sal_False); + XML_USE_OBJECTS, false); ExportBoolean(rPropertySet, sCreateFromGraphicObjects, - XML_USE_GRAPHICS, sal_False); + XML_USE_GRAPHICS, false); ExportBoolean(rPropertySet, sCreateFromMarks, - XML_USE_INDEX_MARKS, sal_False); + XML_USE_INDEX_MARKS, false); ExportBoolean(rPropertySet, sCreateFromTables, - XML_USE_TABLES, sal_False); + XML_USE_TABLES, false); ExportBoolean(rPropertySet, sCreateFromTextFrames, - XML_USE_FLOATING_FRAMES, sal_False); + XML_USE_FLOATING_FRAMES, false); ExportBoolean(rPropertySet, sUseLevelFromSource, - XML_COPY_OUTLINE_LEVELS, sal_False); + XML_COPY_OUTLINE_LEVELS, false); ExportBoolean(rPropertySet, sCreateFromLevelParagraphStyles, - XML_USE_INDEX_SOURCE_STYLES, sal_False); + XML_USE_INDEX_SOURCE_STYLES, false); Any aAny = rPropertySet->getPropertyValue( sUserIndexName ); OUString sIndexName; @@ -881,7 +881,7 @@ void XMLSectionExport::ExportBaseIndexSource( aAny >>= aTemplateSequence; // export the sequence (abort export if an error occurred; #91214#) - sal_Bool bResult = + bool bResult = ExportIndexTemplate(eType, i, rPropertySet, aTemplateSequence); if ( !bResult ) break; @@ -1036,7 +1036,7 @@ static const XMLTokenEnum aTypeElementNameMap[] = }; -sal_Bool XMLSectionExport::ExportIndexTemplate( +bool XMLSectionExport::ExportIndexTemplate( SectionTypeEnum eType, sal_Int32 nOutlineLevel, const Reference<XPropertySet> & rPropertySet, @@ -1065,7 +1065,7 @@ sal_Bool XMLSectionExport::ExportIndexTemplate( if ( XML_TOKEN_INVALID == eLevelName ) { // output level not found? Then end of templates! #91214# - return sal_False; + return false; } // output level name @@ -1111,7 +1111,7 @@ sal_Bool XMLSectionExport::ExportIndexTemplate( } } - return sal_True; + return true; } @@ -1217,38 +1217,38 @@ void XMLSectionExport::ExportIndexTemplateElement( // char style OUString sCharStyle; - sal_Bool bCharStyleOK = sal_False; + bool bCharStyleOK = false; // text OUString sText; - sal_Bool bTextOK = sal_False; + bool bTextOK = false; // tab position - sal_Bool bRightAligned = sal_False; + bool bRightAligned = false; // tab position sal_Int32 nTabPosition = 0; - sal_Bool bTabPositionOK = sal_False; + bool bTabPositionOK = false; // fill character OUString sFillChar; - sal_Bool bFillCharOK = sal_False; + bool bFillCharOK = false; // chapter format sal_Int16 nChapterFormat = 0; - sal_Bool bChapterFormatOK = sal_False; + bool bChapterFormatOK = false; // outline max level sal_Int16 nLevel = 0; - sal_Bool bLevelOK = sal_False; + bool bLevelOK = false; // Bibliography Data sal_Int16 nBibliographyData = 0; - sal_Bool bBibliographyDataOK = sal_False; + bool bBibliographyDataOK = false; // With Tab Stop #i21237# - sal_Bool bWithTabStop = sal_False; - sal_Bool bWithTabStopOK = sal_False; + bool bWithTabStop = false; + bool bWithTabStopOK = false; //i90246, the ODF version being written to is: const SvtSaveOptions::ODFDefaultVersion aODFVersion = rExport.getDefaultVersion(); @@ -1292,7 +1292,7 @@ void XMLSectionExport::ExportIndexTemplateElement( case TOK_TPARAM_TEXT: rValues[i].Value >>= sText; - bTextOK = sal_True; + bTextOK = true; break; case TOK_TPARAM_TAB_RIGHT_ALIGNED: @@ -1302,32 +1302,32 @@ void XMLSectionExport::ExportIndexTemplateElement( case TOK_TPARAM_TAB_POSITION: rValues[i].Value >>= nTabPosition; - bTabPositionOK = sal_True; + bTabPositionOK = true; break; // #i21237# case TOK_TPARAM_TAB_WITH_TAB: bWithTabStop = *(sal_Bool *)rValues[i].Value.getValue(); - bWithTabStopOK = sal_True; + bWithTabStopOK = true; break; case TOK_TPARAM_TAB_FILL_CHAR: rValues[i].Value >>= sFillChar; - bFillCharOK = sal_True; + bFillCharOK = true; break; case TOK_TPARAM_CHAPTER_FORMAT: rValues[i].Value >>= nChapterFormat; - bChapterFormatOK = sal_True; + bChapterFormatOK = true; break; //---> i53420 case TOK_TPARAM_CHAPTER_LEVEL: rValues[i].Value >>= nLevel; - bLevelOK = sal_True; + bLevelOK = true; break; case TOK_TPARAM_BIBLIOGRAPHY_DATA: rValues[i].Value >>= nBibliographyData; - bBibliographyDataOK = sal_True; + bBibliographyDataOK = true; break; } } @@ -1385,7 +1385,7 @@ void XMLSectionExport::ExportIndexTemplateElement( if( aODFVersion == SvtSaveOptions::ODFVER_011 || aODFVersion == SvtSaveOptions::ODFVER_010) { - bLevelOK = sal_False; + bLevelOK = false; if (TOK_TTYPE_CHAPTER_INFO == nTokenType) { //if we are emitting for ODF 1.1 or 1.0, this information can be used for alphabetical index only @@ -1429,7 +1429,7 @@ void XMLSectionExport::ExportIndexTemplateElement( // ' ChapterFormat::DIGIT', forced to 'none, since the // 'value allowed in ODF 1.1 and 1.0 is 'number' the default // this can be obtained by simply disabling the chapter format - bChapterFormatOK = sal_False; + bChapterFormatOK = false; } } @@ -1598,18 +1598,17 @@ void XMLSectionExport::ExportBoolean( const Reference<XPropertySet> & rPropSet, const OUString& sPropertyName, enum XMLTokenEnum eAttributeName, - sal_Bool bDefault, - sal_Bool bInvert) + bool bDefault, + bool bInvert) { OSL_ENSURE(eAttributeName != XML_TOKEN_INVALID, "Need attribute name"); Any aAny = rPropSet->getPropertyValue(sPropertyName); - sal_Bool bTmp = *(sal_Bool*)aAny.getValue(); + bool bTmp = *(sal_Bool*)aAny.getValue(); // value = value ^ bInvert // omit if value == default - // negate forces sal_Bool to 0/1, making them comparable - if ((!(bTmp ^ bInvert)) != (!bDefault)) + if ( (bTmp != bInvert) == bDefault ) { // export non-default value (since default is omitted) GetExport().AddAttribute(XML_NAMESPACE_TEXT, @@ -1727,7 +1726,7 @@ void XMLSectionExport::ExportBibliographyConfiguration(SvXMLExport& rExport) else if (rValue.Name.equalsAsciiL(sAPI_IsSortAscending, sizeof(sAPI_IsSortAscending)-1)) { - sal_Bool bTmp = *(sal_Bool*)rValue.Value.getValue(); + bool bTmp = *(sal_Bool*)rValue.Value.getValue(); rExport.AddAttribute(XML_NAMESPACE_TEXT, XML_SORT_ASCENDING, bTmp ? XML_TRUE : XML_FALSE); @@ -1743,10 +1742,10 @@ void XMLSectionExport::ExportBibliographyConfiguration(SvXMLExport& rExport) } -sal_Bool XMLSectionExport::IsMuteSection( +bool XMLSectionExport::IsMuteSection( const Reference<XTextSection> & rSection) const { - sal_Bool bRet = sal_False; + bool bRet = false; // a section is mute if // 1) it exists @@ -1772,7 +1771,7 @@ sal_Bool XMLSectionExport::IsMuteSection( Reference<XDocumentIndex> xIndex; if (! GetIndex(rSection, xIndex)) { - bRet = sal_True; + bRet = true; // early out if result is known break; @@ -1787,12 +1786,12 @@ sal_Bool XMLSectionExport::IsMuteSection( return bRet; } -sal_Bool XMLSectionExport::IsMuteSection( +bool XMLSectionExport::IsMuteSection( const Reference<XTextContent> & rSection, - sal_Bool bDefault) const + bool bDefault) const { // default: like default argument - sal_Bool bRet = bDefault; + bool bRet = bDefault; Reference<XPropertySet> xPropSet(rSection->getAnchor(), UNO_QUERY); if (xPropSet.is()) @@ -1812,13 +1811,13 @@ sal_Bool XMLSectionExport::IsMuteSection( return bRet; } -sal_Bool XMLSectionExport::IsInSection( +bool XMLSectionExport::IsInSection( const Reference<XTextSection> & rEnclosingSection, const Reference<XTextContent> & rContent, - sal_Bool bDefault) + bool bDefault) { // default: like default argument - sal_Bool bRet = bDefault; + bool bRet = bDefault; OSL_ENSURE(rEnclosingSection.is(), "enclosing section expected"); Reference<XPropertySet> xPropSet(rContent, UNO_QUERY); @@ -1841,7 +1840,7 @@ sal_Bool XMLSectionExport::IsInSection( while (!bRet && xSection.is()); } else - bRet = sal_False; // no section -> can't be inside + bRet = false; // no section -> can't be inside } // else: no TextSection property -> return default } @@ -1894,7 +1893,7 @@ void XMLSectionExport::ExportMasterDocHeadingDummies() } } - bHeadingDummiesExported = sal_True; + bHeadingDummiesExported = true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx index 503e36e6dfbc..91cb4cb74938 100644 --- a/xmloff/source/text/XMLSectionExport.hxx +++ b/xmloff/source/text/XMLSectionExport.hxx @@ -137,7 +137,7 @@ class XMLSectionExport SvXMLExport& rExport; XMLTextParagraphExport& rParaExport; - sal_Bool bHeadingDummiesExported; + bool bHeadingDummiesExported; public: XMLSectionExport(SvXMLExport& rExp, @@ -151,7 +151,7 @@ public: void ExportSectionStart( const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextSection > & rSection, - sal_Bool bAutoStyles); + bool bAutoStyles); /** * export section or index end elements @@ -159,13 +159,13 @@ public: void ExportSectionEnd( const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextSection > & rSection, - sal_Bool bAutoStyles); + bool bAutoStyles); /** * Should the content of this section be exported? * (E.g. linked sections in global documents are not always exported) */ - sal_Bool IsMuteSection( + bool IsMuteSection( const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextSection > & rSection) const; @@ -173,23 +173,23 @@ public: * XTextContent-version of IsMuteSection(Reference<XTextSection>&) * returns *true* for all non-section elements */ - sal_Bool IsMuteSection( + bool IsMuteSection( const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextContent > & rSection, /// return value if this content doesn't support the section property - sal_Bool bDefault) const; + bool bDefault) const; /** * Determine whether rContent is contained in rEnclosingSection. If the * current section of rContent can not be determined, return bDefault. */ - sal_Bool IsInSection( + bool IsInSection( const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextSection > & rEnclosingSection, const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextContent > & rContent, /// return value if this content doesn't support the section property - sal_Bool bDefault); + bool bDefault); /** * Export the configuration element for bibliography indices. @@ -275,7 +275,7 @@ protected: * return sal_False: regular section * return sal_True, xIndex is empty: index header section * return sal_True, xIndex is set: index section */ - sal_Bool GetIndex( + bool GetIndex( const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextSection > & rSection, ::com::sun::star::uno::Reference < @@ -324,7 +324,7 @@ protected: ::com::sun::star::beans::XPropertySet > & rSection); /// export one template for the specific index type - sal_Bool ExportIndexTemplate( + bool ExportIndexTemplate( SectionTypeEnum eType, /// index type sal_Int32 nLevel, /// outline level (if applicable) const ::com::sun::star::uno::Reference< @@ -351,8 +351,8 @@ protected: ::com::sun::star::beans::XPropertySet> & rPropSet, const OUString& sPropertyName, enum ::xmloff::token::XMLTokenEnum eAttributeName, - sal_Bool bDefault, - sal_Bool bInvert = sal_False); + bool bDefault, + bool bInvert = false); }; #endif diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx index b025115f58d8..16f0f7e37299 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx @@ -45,7 +45,7 @@ using ::com::sun::star::style::NumberingType::ARABIC; void XMLSectionFootnoteConfigExport::exportXML( SvXMLExport& rExport, - sal_Bool bEndnote, + bool bEndnote, const vector<XMLPropertyState> *pProperties, sal_uInt32 #ifdef DBG_UTIL @@ -55,13 +55,13 @@ void XMLSectionFootnoteConfigExport::exportXML( const UniReference<XMLPropertySetMapper> & rMapper) { // store and initialize the values - sal_Bool bNumOwn = sal_False; - sal_Bool bNumRestart = sal_False; + bool bNumOwn = false; + bool bNumRestart = false; sal_Int16 nNumRestartAt = 0; sal_Int16 nNumberingType = ARABIC; OUString sNumPrefix; OUString sNumSuffix; - sal_Bool bEnd = sal_False; + bool bEnd = false; // find entries in property states vector sal_uInt32 nCount = pProperties->size(); diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx index b899fc1b03b3..6935bcad4eff 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx @@ -42,7 +42,7 @@ class XMLSectionFootnoteConfigExport public: static void exportXML( SvXMLExport& rExport, - sal_Bool bEndnote, + bool bEndnote, const ::std::vector<XMLPropertyState> * pProperties, sal_uInt32 nIdx, const UniReference<XMLPropertySetMapper> & rMapper); /// used only for debugging diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx index a0bf9e99740d..a280dd9ab7a8 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx @@ -71,7 +71,7 @@ void XMLSectionFootnoteConfigImport::StartElement( sal_Bool bEnd = sal_True; // we're inside the element, so this is true sal_Bool bNumOwn = sal_False; sal_Bool bNumRestart = sal_False; - sal_Bool bEndnote = sal_False; + bool bEndnote = false; sal_Int16 nNumRestartAt = 0; OUString sNumPrefix; OUString sNumSuffix; @@ -102,7 +102,7 @@ void XMLSectionFootnoteConfigImport::StartElement( else if( IsXMLToken( sLocalName, XML_NOTE_CLASS ) ) { if( IsXMLToken( sAttrValue, XML_ENDNOTE ) ) - bEndnote = sal_True; + bEndnote = true; } } else if (XML_NAMESPACE_STYLE == nPrefix) diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx index 7aee65c44669..bec0c1be832e 100644 --- a/xmloff/source/text/XMLSectionImportContext.cxx +++ b/xmloff/source/text/XMLSectionImportContext.cxx @@ -102,14 +102,14 @@ XMLSectionImportContext::XMLSectionImportContext( , sProtectionKey(sAPI_ProtectionKey) , sIsProtected(sAPI_IsProtected) , sIsCurrentlyVisible(sAPI_IsCurrentlyVisible) -, bProtect(sal_False) -, bCondOK(sal_False) -, bIsVisible(sal_True) -, bValid(sal_False) -, bSequenceOK(sal_False) -, bIsCurrentlyVisible(sal_True) -, bIsCurrentlyVisibleOK(sal_False) -, bHasContent(sal_False) +, bProtect(false) +, bCondOK(false) +, bIsVisible(true) +, bValid(false) +, bSequenceOK(false) +, bIsCurrentlyVisible(true) +, bIsCurrentlyVisibleOK(false) +, bHasContent(false) { } @@ -124,10 +124,10 @@ void XMLSectionImportContext::StartElement( ProcessAttributes(xAttrList); // process index headers: - sal_Bool bIsIndexHeader = IsXMLToken( GetLocalName(), XML_INDEX_TITLE ); + bool bIsIndexHeader = IsXMLToken( GetLocalName(), XML_INDEX_TITLE ); if (bIsIndexHeader) { - bValid = sal_True; + bValid = true; } UniReference<XMLTextImportHelper> rHelper = GetImport().GetTextImport(); @@ -271,7 +271,7 @@ void XMLSectionImportContext::ProcessAttributes( break; case XML_TOK_SECTION_NAME: sName = sAttr; - bValid = sal_True; + bValid = true; break; case XML_TOK_SECTION_CONDITION: { @@ -281,7 +281,7 @@ void XMLSectionImportContext::ProcessAttributes( if( XML_NAMESPACE_OOOW == nPrefix ) { sCond = sTmp; - bCondOK = sal_True; + bCondOK = true; } else sCond = sAttr; @@ -290,12 +290,12 @@ void XMLSectionImportContext::ProcessAttributes( case XML_TOK_SECTION_DISPLAY: if (IsXMLToken(sAttr, XML_TRUE)) { - bIsVisible = sal_True; + bIsVisible = true; } else if ( IsXMLToken(sAttr, XML_NONE) || IsXMLToken(sAttr, XML_CONDITION) ) { - bIsVisible = sal_False; + bIsVisible = false; } // else: ignore break; @@ -305,13 +305,13 @@ void XMLSectionImportContext::ProcessAttributes( if (::sax::Converter::convertBool(bTmp, sAttr)) { bIsCurrentlyVisible = !bTmp; - bIsCurrentlyVisibleOK = sal_True; + bIsCurrentlyVisibleOK = true; } } break; case XML_TOK_SECTION_PROTECTION_KEY: ::sax::Converter::decodeBase64(aSequence, sAttr); - bSequenceOK = sal_True; + bSequenceOK = true; break; case XML_TOK_SECTION_PROTECT: { @@ -387,7 +387,7 @@ SvXMLImportContext* XMLSectionImportContext::CreateChildContext( nPrefix, rLocalName ); } else - bHasContent = sal_True; + bHasContent = true; } return pContext; diff --git a/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx index 6aae6c8b644d..6a40ae7be07c 100644 --- a/xmloff/source/text/XMLSectionImportContext.hxx +++ b/xmloff/source/text/XMLSectionImportContext.hxx @@ -65,15 +65,15 @@ class XMLSectionImportContext : public SvXMLImportContext OUString sName; OUString sCond; ::com::sun::star::uno::Sequence<sal_Int8> aSequence; - sal_Bool bProtect; - sal_Bool bCondOK; - sal_Bool bIsVisible; - sal_Bool bValid; - sal_Bool bSequenceOK; - sal_Bool bIsCurrentlyVisible; - sal_Bool bIsCurrentlyVisibleOK; - - sal_Bool bHasContent; + bool bProtect; + bool bCondOK; + bool bIsVisible; + bool bValid; + bool bSequenceOK; + bool bIsCurrentlyVisible; + bool bIsCurrentlyVisibleOK; + + bool bHasContent; public: diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx index 5792496b07de..39cf943b4e04 100644 --- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx +++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx @@ -32,8 +32,8 @@ using namespace ::xmloff::token; XMLTextCharStyleNamesElementExport::XMLTextCharStyleNamesElementExport( SvXMLExport& rExp, - sal_Bool bDoSth, - sal_Bool bAllStyles, + bool bDoSth, + bool bAllStyles, const Reference < XPropertySet > & rPropSet, const OUString& rPropName ) : rExport( rExp ), diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx index 9ceeb6ea8ded..96b9d3088b6d 100644 --- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx +++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx @@ -38,7 +38,7 @@ class XMLTextCharStyleNamesElementExport public: XMLTextCharStyleNamesElementExport( - SvXMLExport& rExp, sal_Bool bDoSomething, sal_Bool bAllStyles, + SvXMLExport& rExp, bool bDoSomething, bool bAllStyles, const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, const OUString& rPropName ); diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index aecbbc53827b..1e7f98bdd349 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -290,7 +290,7 @@ XMLTextColumnsContext::XMLTextColumnsContext( , pColumnAttrTokenMap( new SvXMLTokenMap(aColAttrTokenMap) ) , pColumnSepAttrTokenMap( new SvXMLTokenMap(aColSepAttrTokenMap) ) , nCount( 0 ) -, bAutomatic( sal_False ) +, bAutomatic( false ) , nAutomaticDistance( 0 ) { sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; @@ -494,7 +494,7 @@ void XMLTextColumnsContext::EndElement( ) aProp.maValue <<= xColumns; - SetInsert( sal_True ); + SetInsert( true ); XMLElementPropertyContext::EndElement(); } diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 9c8d504a2a02..c16c38b23b49 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -83,24 +83,24 @@ class XMLTextFrameContextHyperlink_Impl OUString sHRef; OUString sName; OUString sTargetFrameName; - sal_Bool bMap; + bool bMap; public: inline XMLTextFrameContextHyperlink_Impl( const OUString& rHRef, const OUString& rName, const OUString& rTargetFrameName, - sal_Bool bMap ); + bool bMap ); const OUString& GetHRef() const { return sHRef; } const OUString& GetName() const { return sName; } const OUString& GetTargetFrameName() const { return sTargetFrameName; } - sal_Bool GetMap() const { return bMap; } + bool GetMap() const { return bMap; } }; inline XMLTextFrameContextHyperlink_Impl::XMLTextFrameContextHyperlink_Impl( const OUString& rHRef, const OUString& rName, - const OUString& rTargetFrameName, sal_Bool bM ) : + const OUString& rTargetFrameName, bool bM ) : sHRef( rHRef ), sName( rName ), sTargetFrameName( rTargetFrameName ), @@ -178,7 +178,7 @@ XMLTextFrameParam_Impl::XMLTextFrameParam_Impl( SvXMLImportContext( rImport, nPrfx, rLName ) { OUString sName, sValue; - sal_Bool bFoundValue = sal_False; // to allow empty values + bool bFoundValue = false; // to allow empty values sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { @@ -192,7 +192,7 @@ XMLTextFrameParam_Impl::XMLTextFrameParam_Impl( if( IsXMLToken(aLocalName, XML_VALUE) ) { sValue = rValue; - bFoundValue=sal_True; + bFoundValue=true; } else if( IsXMLToken(aLocalName, XML_NAME) ) { @@ -216,7 +216,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const Reference < XPropertySet >& rPropSet, - sal_Bool bPath ); + bool bPath ); virtual ~XMLTextFrameContourContext_Impl(); }; @@ -227,12 +227,12 @@ XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl( sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList > & xAttrList, const Reference < XPropertySet >& rPropSet, - sal_Bool bPath ) : + bool bPath ) : SvXMLImportContext( rImport, nPrfx, rLName ), xPropSet( rPropSet ) { OUString sD, sPoints, sViewBox; - sal_Bool bPixelWidth = sal_False, bPixelHeight = sal_False; + bool bPixelWidth = false, bPixelHeight = false; sal_Bool bAuto = sal_False; sal_Int32 nWidth = 0; sal_Int32 nHeight = 0; @@ -265,14 +265,14 @@ XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl( break; case XML_TOK_TEXT_CONTOUR_WIDTH: if (::sax::Converter::convertMeasurePx(nWidth, rValue)) - bPixelWidth = sal_True; + bPixelWidth = true; else GetImport().GetMM100UnitConverter().convertMeasureToCore( nWidth, rValue); break; case XML_TOK_TEXT_CONTOUR_HEIGHT: if (::sax::Converter::convertMeasurePx(nHeight, rValue)) - bPixelHeight = sal_True; + bPixelHeight = true; else GetImport().GetMM100UnitConverter().convertMeasureToCore( nHeight, rValue); @@ -418,21 +418,21 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext sal_uInt16 nType; ::com::sun::star::text::TextContentAnchorType eAnchorType; - sal_Bool bMayScript : 1; - sal_Bool bMinWidth : 1; - sal_Bool bMinHeight : 1; - sal_Bool bSyncWidth : 1; - sal_Bool bSyncHeight : 1; - sal_Bool bCreateFailed : 1; - sal_Bool bOwnBase64Stream : 1; + bool bMayScript : 1; + bool bMinWidth : 1; + bool bMinHeight : 1; + bool bSyncWidth : 1; + bool bSyncHeight : 1; + bool bCreateFailed : 1; + bool bOwnBase64Stream : 1; - void Create( sal_Bool bHRefOrBase64 ); + void Create( bool bHRefOrBase64 ); public: TYPEINFO_OVERRIDE(); - sal_Bool CreateIfNotThere(); + bool CreateIfNotThere(); const OUString& GetHRef() const { return sHRef; } XMLTextFrameContext_Impl( SvXMLImport& rImport, @@ -458,7 +458,7 @@ public: void SetHyperlink( const OUString& rHRef, const OUString& rName, const OUString& rTargetFrameName, - sal_Bool bMap ); + bool bMap ); // Implement Title/Description Elements UI (#i73249#) void SetTitle( const OUString& rTitle ); @@ -475,7 +475,7 @@ public: TYPEINIT1( XMLTextFrameContext_Impl, SvXMLImportContext ); -void XMLTextFrameContext_Impl::Create( sal_Bool /*bHRefOrBase64*/ ) +void XMLTextFrameContext_Impl::Create( bool /*bHRefOrBase64*/ ) { UniReference < XMLTextImportHelper > xTextImportHelper = GetImport().GetTextImport(); @@ -578,7 +578,7 @@ void XMLTextFrameContext_Impl::Create( sal_Bool /*bHRefOrBase64*/ ) if( !xPropSet.is() ) { - bCreateFailed = sal_True; + bCreateFailed = true; return; } @@ -721,7 +721,7 @@ void XMLTextFrameContext_Impl::Create( sal_Bool /*bHRefOrBase64*/ ) GetImport().GetTextImport(); if( !sHRef.isEmpty() ) { - sal_Bool bForceLoad = xTxtImport->IsInsertMode() || + bool bForceLoad = xTxtImport->IsInsertMode() || xTxtImport->IsBlockMode() || xTxtImport->IsStylesOnlyMode() || xTxtImport->IsOrganizerMode(); @@ -827,7 +827,7 @@ OUString XMLTextFrameContext::getGraphicURLFromImportContext(const SvXMLImportCo return aRetval; } -sal_Bool XMLTextFrameContext_Impl::CreateIfNotThere() +bool XMLTextFrameContext_Impl::CreateIfNotThere() { if( !xPropSet.is() && ( XML_TEXT_FRAME_OBJECT_OLE == nType || @@ -836,7 +836,7 @@ sal_Bool XMLTextFrameContext_Impl::CreateIfNotThere() { if( bOwnBase64Stream ) xBase64Stream->closeOutput(); - Create( sal_True ); + Create( true ); } return xPropSet.is(); @@ -886,14 +886,14 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl( nRotation = 0; nRelWidth = 0; nRelHeight = 0; - bMayScript = sal_False; + bMayScript = false; - bMinHeight = sal_False; - bMinWidth = sal_False; - bSyncWidth = sal_False; - bSyncHeight = sal_False; - bCreateFailed = sal_False; - bOwnBase64Stream = sal_False; + bMinHeight = false; + bMinWidth = false; + bSyncWidth = false; + bSyncHeight = false; + bCreateFailed = false; + bOwnBase64Stream = false; UniReference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); @@ -975,7 +975,7 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl( case XML_TOK_TEXT_FRAME_REL_WIDTH: if( IsXMLToken(rValue, XML_SCALE) ) { - bSyncWidth = sal_True; + bSyncWidth = true; } else { @@ -996,7 +996,7 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl( GetImport().GetMM100UnitConverter().convertMeasureToCore( nWidth, rValue, 0 ); } - bMinWidth = sal_True; + bMinWidth = true; break; case XML_TOK_TEXT_FRAME_HEIGHT: // relative heights are obsolete since SRC617. Remove them some day! @@ -1015,12 +1015,12 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl( case XML_TOK_TEXT_FRAME_REL_HEIGHT: if( IsXMLToken( rValue, XML_SCALE ) ) { - bSyncHeight = sal_True; + bSyncHeight = true; } else if( IsXMLToken( rValue, XML_SCALE_MIN ) ) { - bSyncHeight = sal_True; - bMinHeight = sal_True; + bSyncHeight = true; + bMinHeight = true; } else { @@ -1041,7 +1041,7 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl( GetImport().GetMM100UnitConverter().convertMeasureToCore( nHeight, rValue, 0 ); } - bMinHeight = sal_True; + bMinHeight = true; break; case XML_TOK_TEXT_FRAME_Z_INDEX: ::sax::Converter::convertNumber( nZIndex, rValue, -1 ); @@ -1105,7 +1105,7 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl( sHRef.isEmpty() && sMimeType.isEmpty() ) ) return; // no URL: no image or OLE object - Create( sal_True ); + Create( true ); } XMLTextFrameContext_Impl::~XMLTextFrameContext_Impl() @@ -1188,7 +1188,7 @@ SvXMLImportContext *XMLTextFrameContext_Impl::CreateChildContext( sFilterService = pEContext->GetFilterServiceName(); if( !sFilterService.isEmpty() ) { - Create( sal_False ); + Create( false ); if( xPropSet.is() ) { Reference < XEmbeddedObjectSupplier > xEOS( xPropSet, @@ -1235,7 +1235,7 @@ void XMLTextFrameContext_Impl::Characters( const OUString& rChars ) GetImport().GetStreamForEmbeddedObjectURLFromBase64(); } if( xBase64Stream.is() ) - bOwnBase64Stream = sal_True; + bOwnBase64Stream = true; } if( bOwnBase64Stream && xBase64Stream.is() ) { @@ -1264,7 +1264,7 @@ void XMLTextFrameContext_Impl::Characters( const OUString& rChars ) void XMLTextFrameContext_Impl::SetHyperlink( const OUString& rHRef, const OUString& rName, const OUString& rTargetFrameName, - sal_Bool bMap ) + bool bMap ) { static OUString s_HyperLinkURL("HyperLinkURL"); static OUString s_HyperLinkName("HyperLinkName"); @@ -1351,7 +1351,7 @@ void XMLTextFrameContext_Impl::SetDesc( const OUString& rDesc ) TYPEINIT1( XMLTextFrameContext, SvXMLImportContext ); -sal_Bool XMLTextFrameContext::CreateIfNotThere( ::com::sun::star::uno::Reference < +bool XMLTextFrameContext::CreateIfNotThere( ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& rPropSet ) { SvXMLImportContext *pContext = &m_xImplContext; @@ -1379,8 +1379,8 @@ XMLTextFrameContext::XMLTextFrameContext( , m_sDesc() , m_eDefaultAnchorType( eATyp ) // Shapes in Writer cannot be named via context menu (#i51726#) -, m_HasAutomaticStyleWithoutParentStyle( sal_False ) -, m_bSupportsReplacement( sal_False ) +, m_HasAutomaticStyleWithoutParentStyle( false ) +, m_bSupportsReplacement( false ) { sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) @@ -1404,7 +1404,7 @@ XMLTextFrameContext::XMLTextFrameContext( pStyle = xTxtImport->FindAutoFrameStyle( aStyleName ); if ( pStyle && pStyle->GetParentName().isEmpty() ) { - m_HasAutomaticStyleWithoutParentStyle = sal_True; + m_HasAutomaticStyleWithoutParentStyle = true; } } } @@ -1537,7 +1537,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( else if( XML_TEXT_FRAME_OBJECT == nFrameType || XML_TEXT_FRAME_OBJECT_OLE == nFrameType ) { - m_bSupportsReplacement = sal_True; + m_bSupportsReplacement = true; } else if(XML_TEXT_FRAME_GRAPHIC == nFrameType) { @@ -1628,13 +1628,13 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( { if( CreateIfNotThere( xPropSet ) ) pContext = new XMLTextFrameContourContext_Impl( GetImport(), p_nPrefix, rLocalName, - xAttrList, xPropSet, sal_False ); + xAttrList, xPropSet, false ); } else if( IsXMLToken( rLocalName, XML_CONTOUR_PATH ) ) { if( CreateIfNotThere( xPropSet ) ) pContext = new XMLTextFrameContourContext_Impl( GetImport(), p_nPrefix, rLocalName, - xAttrList, xPropSet, sal_True ); + xAttrList, xPropSet, true ); } else if( IsXMLToken( rLocalName, XML_IMAGE_MAP ) ) { @@ -1680,7 +1680,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( void XMLTextFrameContext::SetHyperlink( const OUString& rHRef, const OUString& rName, const OUString& rTargetFrameName, - sal_Bool bMap ) + bool bMap ) { OSL_ENSURE( !m_pHyperlink, "recursive SetHyperlink call" ); delete m_pHyperlink; diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx index 712ae8f92df9..6eede3c8f9ef 100644 --- a/xmloff/source/text/XMLTextFrameContext.hxx +++ b/xmloff/source/text/XMLTextFrameContext.hxx @@ -51,10 +51,10 @@ class XMLTextFrameContext : public SvXMLImportContext, public MultiImageImportHe of the object. All Draw objects have an automatic style without a parent style. (#i51726#) */ - sal_Bool m_HasAutomaticStyleWithoutParentStyle; - sal_Bool m_bSupportsReplacement; + bool m_HasAutomaticStyleWithoutParentStyle; + bool m_bSupportsReplacement; - sal_Bool CreateIfNotThere( ::com::sun::star::uno::Reference < + bool CreateIfNotThere( ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& rPropSet ); protected: @@ -84,7 +84,7 @@ public: void SetHyperlink( const OUString& rHRef, const OUString& rName, const OUString& rTargetFrameName, - sal_Bool bMap ); + bool bMap ); ::com::sun::star::text::TextContentAnchorType GetAnchorType() const; diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx index deb93279f7f8..db577bf0b78c 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx @@ -46,7 +46,7 @@ XMLTextFrameHyperlinkContext::XMLTextFrameHyperlinkContext( TextContentAnchorType eATyp ) : SvXMLImportContext( rImport, nPrfx, rLName ), eDefaultAnchorType( eATyp ), - bMap( sal_False ) + bMap( false ) { OUString sShow; const SvXMLTokenMap& rTokenMap = diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx index f93cee8e52f7..8e3c07668288 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx @@ -36,7 +36,7 @@ class XMLTextFrameHyperlinkContext : public SvXMLImportContext OUString sTargetFrameName; ::com::sun::star::text::TextContentAnchorType eDefaultAnchorType; SvXMLImportContextRef xFrameContext; - sal_Bool bMap; + bool bMap; public: diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx index 2a711b02fa73..ca59d826c79a 100644 --- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx +++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx @@ -41,7 +41,7 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa const uno::Reference< xml::sax::XAttributeList > &, const Reference < XPropertySet > & rPageStylePropSet, - sal_Bool bFooter, sal_Bool bLft, sal_Bool bFrst ) : + bool bFooter, bool bLft, bool bFrst ) : SvXMLImportContext( rImport, nPrfx, rLName ), xPropSet( rPageStylePropSet ), sOn( bFooter ? OUString("FooterIsOn") : OUString("HeaderIsOn") ), @@ -50,7 +50,7 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa sText( bFooter ? OUString("FooterText") : OUString("HeaderText") ), sTextFirst(bFooter ? OUString("FooterTextFirst") : OUString("HeaderTextFirst")), sTextLeft( bFooter ? OUString("FooterTextLeft") : OUString("HeaderTextLeft") ), - bInsertContent( sal_True ), + bInsertContent( true ), bLeft( bLft ), bFirst( bFrst ) { @@ -60,7 +60,7 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa Any aAny; aAny = xPropSet->getPropertyValue( sOn ); - sal_Bool bOn = *(sal_Bool *)aAny.getValue(); + bool bOn = *(sal_Bool *)aAny.getValue(); if( bOn ) { @@ -93,7 +93,7 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa { // If headers or footers are switched off, no content must be // inserted. - bInsertContent = sal_False; + bInsertContent = false; } } } @@ -112,7 +112,7 @@ SvXMLImportContext *XMLTextHeaderFooterContext::CreateChildContext( { if( !xOldTextCursor.is() ) { - sal_Bool bRemoveContent = sal_True; + bool bRemoveContent = true; Any aAny; if( bLeft || bFirst ) { @@ -137,7 +137,7 @@ SvXMLImportContext *XMLTextHeaderFooterContext::CreateChildContext( // The content has not to be removed, because the header // or footer is empty already. - bRemoveContent = sal_False; + bRemoveContent = false; } // If a header or footer is not shared, share it now. diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx index c24d693568bc..6123054c3ff6 100644 --- a/xmloff/source/text/XMLTextListAutoStylePool.cxx +++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx @@ -41,7 +41,7 @@ class XMLTextListAutoStylePoolEntry_Impl OUString sInternalName; Reference < XIndexReplace > xNumRules; sal_uInt32 nPos; - sal_Bool bIsNamed; + bool bIsNamed; public: @@ -57,13 +57,13 @@ public: const Reference < XIndexReplace > & rNumRules ) : xNumRules( rNumRules ), nPos( 0 ), - bIsNamed( sal_False ) + bIsNamed( false ) { Reference < XNamed > xNamed( xNumRules, UNO_QUERY ); if( xNamed.is() ) { sInternalName = xNamed->getName(); - bIsNamed = sal_True; + bIsNamed = true; } } @@ -71,7 +71,7 @@ public: const OUString& rInternalName ) : sInternalName( rInternalName ), nPos( 0 ), - bIsNamed( sal_True ) + bIsNamed( true ) { } @@ -79,7 +79,7 @@ public: const OUString& GetInternalName() const { return sInternalName; } const Reference < XIndexReplace > & GetNumRules() const { return xNumRules; } sal_uInt32 GetPos() const { return nPos; } - sal_Bool IsNamed() const { return bIsNamed; } + bool IsNamed() const { return bIsNamed; } }; XMLTextListAutoStylePoolEntry_Impl::XMLTextListAutoStylePoolEntry_Impl( @@ -90,13 +90,13 @@ XMLTextListAutoStylePoolEntry_Impl::XMLTextListAutoStylePoolEntry_Impl( sal_uInt32& rName ) : xNumRules( rNumRules ), nPos( nP ), - bIsNamed( sal_False ) + bIsNamed( false ) { Reference < XNamed > xNamed( xNumRules, UNO_QUERY ); if( xNamed.is() ) { sInternalName = xNamed->getName(); - bIsNamed = sal_True; + bIsNamed = true; } // create a name that hasn't been used before. The created name has not @@ -146,7 +146,7 @@ XMLTextListAutoStylePool::XMLTextListAutoStylePool( SvXMLExport& rExp ) : if( xCompareFac.is() ) mxNumRuleCompare = xCompareFac->createAnyCompareByName( OUString( "NumberingRules" ) ); sal_uInt16 nExportFlags = rExport.getExportFlags(); - sal_Bool bStylesOnly = (nExportFlags & EXPORT_STYLES) != 0 && (nExportFlags & EXPORT_CONTENT) == 0; + bool bStylesOnly = (nExportFlags & EXPORT_STYLES) != 0 && (nExportFlags & EXPORT_CONTENT) == 0; if( bStylesOnly ) sPrefix = "ML"; diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx index 75c8602be2a9..9e6c716ff564 100644 --- a/xmloff/source/text/XMLTextListBlockContext.cxx +++ b/xmloff/source/text/XMLTextListBlockContext.cxx @@ -49,14 +49,14 @@ XMLTextListBlockContext::XMLTextListBlockContext( sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList, - const sal_Bool bRestartNumberingAtSubList ) + const bool bRestartNumberingAtSubList ) : SvXMLImportContext( rImport, nPrfx, rLName ) , mrTxtImport( rTxtImp ) , msListStyleName() , mxParentListBlock( ) , mnLevel( 0 ) -, mbRestartNumbering( sal_False ) -, mbSetDefaults( sal_False ) +, mbRestartNumbering( false ) +, mbSetDefaults( false ) , msListId() , msContinueListId() { @@ -174,7 +174,7 @@ XMLTextListBlockContext::XMLTextListBlockContext( !mbRestartNumbering && rTextListsHelper.IsListProcessed( msListId ) ) { - mbRestartNumbering = sal_True; + mbRestartNumbering = true; } } } @@ -263,11 +263,11 @@ SvXMLImportContext *XMLTextListBlockContext::CreateChildContext( const SvXMLTokenMap& rTokenMap = mrTxtImport.GetTextListBlockElemTokenMap(); - sal_Bool bHeader = sal_False; + bool bHeader = false; switch( rTokenMap.Get( nPrefix, rLocalName ) ) { case XML_TOK_TEXT_LIST_HEADER: - bHeader = sal_True; + bHeader = true; //fall-through case XML_TOK_TEXT_LIST_ITEM: pContext = new XMLTextListItemContext( GetImport(), mrTxtImport, diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx index 3cce135fd48c..21530e891698 100644 --- a/xmloff/source/text/XMLTextListBlockContext.hxx +++ b/xmloff/source/text/XMLTextListBlockContext.hxx @@ -39,8 +39,8 @@ class XMLTextListBlockContext : public SvXMLImportContext SvXMLImportContextRef mxParentListBlock; sal_Int16 mnLevel; - sal_Bool mbRestartNumbering; - sal_Bool mbSetDefaults; + bool mbRestartNumbering; + bool mbSetDefaults; // text:id property of <list> element, only valid for root <list> element OUString msListId; @@ -59,7 +59,7 @@ public: const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - const sal_Bool bRestartNumberingAtSubList = sal_False ); + const bool bRestartNumberingAtSubList = false ); virtual ~XMLTextListBlockContext(); virtual void EndElement() SAL_OVERRIDE; @@ -71,8 +71,8 @@ public: const OUString& GetListStyleName() const { return msListStyleName; } sal_Int16 GetLevel() const { return mnLevel; } - sal_Bool IsRestartNumbering() const { return mbRestartNumbering; } - void ResetRestartNumbering() { mbRestartNumbering = sal_False; } + bool IsRestartNumbering() const { return mbRestartNumbering; } + void ResetRestartNumbering() { mbRestartNumbering = false; } const ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexReplace >& GetNumRules() const diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx index 8761c0f975b9..26886337f318 100644 --- a/xmloff/source/text/XMLTextListItemContext.cxx +++ b/xmloff/source/text/XMLTextListItemContext.cxx @@ -43,7 +43,7 @@ XMLTextListItemContext::XMLTextListItemContext( const sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList, - const sal_Bool bIsHeader ) + const bool bIsHeader ) : SvXMLImportContext( rImport, nPrfx, rLName ), rTxtImport( rTxtImp ), nStartValue( -1 ), diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx index 3f6bf0182e65..069484aa8339 100644 --- a/xmloff/source/text/XMLTextListItemContext.hxx +++ b/xmloff/source/text/XMLTextListItemContext.hxx @@ -47,7 +47,7 @@ public: const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - const sal_Bool bIsHeader = sal_False ); + const bool bIsHeader = false ); virtual ~XMLTextListItemContext(); virtual void EndElement() SAL_OVERRIDE; @@ -57,10 +57,10 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - sal_Bool HasStartValue() const { return -1 != nStartValue; } + bool HasStartValue() const { return -1 != nStartValue; } sal_Int16 GetStartValue() const { return nStartValue; } - inline sal_Bool HasNumRulesOverride() const + inline bool HasNumRulesOverride() const { return mxNumRulesOverride.is(); } diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 73ee88dfdbcd..8aaa952bbba9 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -409,11 +409,11 @@ Reference<XTextContent> XMLTextMarkImportContext::CreateAndInsertMark( return 0; } -sal_Bool XMLTextMarkImportContext::FindName( +bool XMLTextMarkImportContext::FindName( SvXMLImport& rImport, const Reference<XAttributeList> & xAttrList) { - sal_Bool bNameOK = sal_False; + bool bNameOK = false; // find name attribute first const sal_Int16 nLength = xAttrList->getLength(); @@ -428,7 +428,7 @@ sal_Bool XMLTextMarkImportContext::FindName( IsXMLToken(sLocalName, XML_NAME) ) { m_sBookmarkName = xAttrList->getValueByIndex(nAttr); - bNameOK = sal_True; + bNameOK = true; } else if ( (XML_NAMESPACE_XML == nPrefix) && IsXMLToken(sLocalName, XML_ID) ) diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx index c476ce43e571..ae01b79b2a6b 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.hxx +++ b/xmloff/source/text/XMLTextMarkImportContext.hxx @@ -104,7 +104,7 @@ public: ::com::sun::star::text::XTextRange> & rRange, const OUString& i_rXmlId = OUString()); - sal_Bool FindName( + bool FindName( SvXMLImport& rImport, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList); diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index 7eeeeadfd083..28d0faf2b14f 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -127,7 +127,7 @@ XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport, return; Any aAny; - sal_Bool bNew = sal_False; + bool bNew = false; if( xPageStyles->hasByName( sDisplayName ) ) { aAny = xPageStyles->getByName( sDisplayName ); @@ -141,7 +141,7 @@ XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport, aAny <<= xStyle; xPageStyles->insertByName( sDisplayName, aAny ); - bNew = sal_True; + bNew = true; } Reference < XPropertySet > xPropSet( xStyle, UNO_QUERY ); @@ -183,38 +183,38 @@ SvXMLImportContext *XMLTextMasterPageContext::CreateChildContext( const SvXMLTokenMap& rTokenMap = GetImport().GetTextImport()->GetTextMasterPageElemTokenMap(); - sal_Bool bInsert = sal_False, bFooter = sal_False, bLeft = sal_False, bFirst = sal_False; + bool bInsert = false, bFooter = false, bLeft = false, bFirst = false; switch( rTokenMap.Get( nPrefix, rLocalName ) ) { case XML_TOK_TEXT_MP_HEADER: if( bInsertHeader && !bHeaderInserted ) { - bInsert = sal_True; + bInsert = true; bHeaderInserted = true; } break; case XML_TOK_TEXT_MP_FOOTER: if( bInsertFooter && !bFooterInserted ) { - bInsert = bFooter = sal_True; + bInsert = bFooter = true; bFooterInserted = true; } break; case XML_TOK_TEXT_MP_HEADER_LEFT: if( bInsertHeaderLeft && bHeaderInserted && !bHeaderLeftInserted ) - bInsert = bLeft = sal_True; + bInsert = bLeft = true; break; case XML_TOK_TEXT_MP_FOOTER_LEFT: if( bInsertFooterLeft && bFooterInserted && !bFooterLeftInserted ) - bInsert = bFooter = bLeft = sal_True; + bInsert = bFooter = bLeft = true; break; case XML_TOK_TEXT_MP_HEADER_FIRST: if( bInsertHeaderFirst && bHeaderInserted && !bHeaderFirstInserted ) - bInsert = bFirst = sal_True; + bInsert = bFirst = true; break; case XML_TOK_TEXT_MP_FOOTER_FIRST: if( bInsertFooterFirst && bFooterInserted && !bFooterFirstInserted ) - bInsert = bFooter = bFirst = sal_True; + bInsert = bFooter = bFirst = true; break; } diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx index 2fdec0c4aac9..5f49219339d9 100644 --- a/xmloff/source/text/XMLTextMasterPageExport.cxx +++ b/xmloff/source/text/XMLTextMasterPageExport.cxx @@ -125,17 +125,17 @@ void XMLTextMasterPageExport::exportMasterPageContent( else { aAny = rPropSet->getPropertyValue( sHeaderOn ); - sal_Bool bHeader = sal_False; + bool bHeader = false; aAny >>= bHeader; - sal_Bool bHeaderFirstShared = sal_False; + bool bHeaderFirstShared = false; if( bHeader ) { aAny = rPropSet->getPropertyValue( sFirstShareContent ); aAny >>= bHeaderFirstShared; } - sal_Bool bHeaderLeftShared = sal_False; + bool bHeaderLeftShared = false; if( bHeader ) { aAny = rPropSet->getPropertyValue( sHeaderShareContent ); @@ -173,17 +173,17 @@ void XMLTextMasterPageExport::exportMasterPageContent( } aAny = rPropSet->getPropertyValue( sFooterOn ); - sal_Bool bFooter = sal_False; + bool bFooter = false; aAny >>= bFooter; - sal_Bool bFooterFirstShared = sal_False; + bool bFooterFirstShared = false; if( bFooter ) { aAny = rPropSet->getPropertyValue( sFirstShareContent ); aAny >>= bFooterFirstShared; } - sal_Bool bFooterLeftShared = sal_False; + bool bFooterLeftShared = false; if( bFooter ) { aAny = rPropSet->getPropertyValue( sFooterShareContent ); diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx index 9d9069dd9a33..ca7d984c681a 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.cxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx @@ -50,10 +50,10 @@ XMLTextNumRuleInfo::XMLTextNumRuleInfo() , msListId() , mnListStartValue( -1 ) , mnListLevel( 0 ) - , mbIsNumbered( sal_False ) - , mbIsRestart( sal_False ) + , mbIsNumbered( false ) + , mbIsRestart( false ) , mnListLevelStartValue( -1 ) - , mbOutlineStyleAsNormalListStyle( sal_False ) + , mbOutlineStyleAsNormalListStyle( false ) { Reset(); } @@ -62,9 +62,9 @@ XMLTextNumRuleInfo::XMLTextNumRuleInfo() void XMLTextNumRuleInfo::Set( const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextContent > & xTextContent, - const sal_Bool bOutlineStyleAsNormalListStyle, + const bool bOutlineStyleAsNormalListStyle, const XMLTextListAutoStylePool& rListAutoPool, - const sal_Bool bExportTextNumberElement ) + const bool bExportTextNumberElement ) { Reset(); // Written OpenDocument file format doesn't fit to the created text document (#i69627#) @@ -114,7 +114,7 @@ void XMLTextNumRuleInfo::Set( { if ( !mbOutlineStyleAsNormalListStyle ) { - sal_Bool bIsOutline = sal_False; + bool bIsOutline = false; Reference<XPropertySet> xNumRulesProps(mxNumRules, UNO_QUERY); if ( xNumRulesProps.is() && xNumRulesProps->getPropertySetInfo()-> @@ -149,19 +149,19 @@ void XMLTextNumRuleInfo::Set( xPropSet->getPropertyValue( msPropNameListId ) >>= msListId; } - mbContinueingPreviousSubTree = sal_False; + mbContinueingPreviousSubTree = false; if( xPropSetInfo->hasPropertyByName( msContinueingPreviousSubTree ) ) { xPropSet->getPropertyValue( msContinueingPreviousSubTree ) >>= mbContinueingPreviousSubTree; } - mbIsNumbered = sal_True; + mbIsNumbered = true; if( xPropSetInfo->hasPropertyByName( msNumberingIsNumber ) ) { if( !(xPropSet->getPropertyValue( msNumberingIsNumber ) >>= mbIsNumbered ) ) { OSL_FAIL( "numbered paragraph without number info" ); - mbIsNumbered = sal_False; + mbIsNumbered = false; } } @@ -216,9 +216,9 @@ void XMLTextNumRuleInfo::Set( } } -sal_Bool XMLTextNumRuleInfo::BelongsToSameList( const XMLTextNumRuleInfo& rCmp ) const +bool XMLTextNumRuleInfo::BelongsToSameList( const XMLTextNumRuleInfo& rCmp ) const { - sal_Bool bRet( sal_True ); + bool bRet( true ); // Currently only the text documents support <ListId>. if ( !rCmp.msListId.isEmpty() || !msListId.isEmpty() ) { diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx index 7fe191098b24..bfe02f97d44c 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.hxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx @@ -58,16 +58,16 @@ class XMLTextNumRuleInfo OUString msListId; sal_Int16 mnListStartValue; sal_Int16 mnListLevel; - sal_Bool mbIsNumbered; - sal_Bool mbIsRestart; + bool mbIsNumbered; + bool mbIsRestart; // numbering rules' attributes sal_Int16 mnListLevelStartValue; // Written OpenDocument file format doesn't fit to the created text document (#i69627#) - sal_Bool mbOutlineStyleAsNormalListStyle; + bool mbOutlineStyleAsNormalListStyle; - sal_Bool mbContinueingPreviousSubTree; + bool mbContinueingPreviousSubTree; OUString msListLabelString; public: @@ -78,9 +78,9 @@ public: void Set( const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextContent > & rTextContnt, - const sal_Bool bOutlineStyleAsNormalListStyle, + const bool bOutlineStyleAsNormalListStyle, const XMLTextListAutoStylePool& rListAutoPool, - const sal_Bool bExportTextNumberElement ); + const bool bExportTextNumberElement ); inline void Reset(); inline const OUString& GetNumRulesName() const @@ -107,7 +107,7 @@ public: return mnListLevel; } - inline sal_Bool HasStartValue() const + inline bool HasStartValue() const { return mnListStartValue != -1; } @@ -116,23 +116,23 @@ public: return mnListStartValue; } - inline sal_Bool IsNumbered() const + inline bool IsNumbered() const { return mbIsNumbered; } - inline sal_Bool IsRestart() const + inline bool IsRestart() const { return mbIsRestart; } - sal_Bool BelongsToSameList( const XMLTextNumRuleInfo& rCmp ) const; + bool BelongsToSameList( const XMLTextNumRuleInfo& rCmp ) const; - inline sal_Bool HasSameNumRules( const XMLTextNumRuleInfo& rCmp ) const + inline bool HasSameNumRules( const XMLTextNumRuleInfo& rCmp ) const { return rCmp.msNumRulesName == msNumRulesName; } - inline sal_Bool IsContinueingPreviousSubTree() const + inline bool IsContinueingPreviousSubTree() const { return mbContinueingPreviousSubTree; } @@ -169,8 +169,8 @@ inline void XMLTextNumRuleInfo::Reset() mnListLevel = 0; // Written OpenDocument file format doesn't fit to the created text document (#i69627#) mbIsNumbered = mbIsRestart = - mbOutlineStyleAsNormalListStyle = sal_False; - mbContinueingPreviousSubTree = sal_False; + mbOutlineStyleAsNormalListStyle = false; + mbContinueingPreviousSubTree = false; msListLabelString = ""; } #endif // INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTNUMRULEINFO_HXX diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx index e688b8e3e701..aaa6f5f7e2fa 100644 --- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx +++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx @@ -52,7 +52,7 @@ XMLTrackedChangesImportContext::~XMLTrackedChangesImportContext() void XMLTrackedChangesImportContext::StartElement( const Reference<XAttributeList> & xAttrList ) { - sal_Bool bTrackChanges = sal_True; + bool bTrackChanges = true; // scan for text:track-changes and text:protection-key attributes sal_Int16 nLength = xAttrList->getLength(); diff --git a/xmloff/source/text/txtdrope.cxx b/xmloff/source/text/txtdrope.cxx index 48fbda969a3b..21ffb5130719 100644 --- a/xmloff/source/text/txtdrope.cxx +++ b/xmloff/source/text/txtdrope.cxx @@ -43,7 +43,7 @@ XMLTextDropCapExport::~XMLTextDropCapExport() } void XMLTextDropCapExport::exportXML( const Any& rAny, - sal_Bool bWholeWord, + bool bWholeWord, const OUString& rStyleName ) { DropCapFormat aFormat; diff --git a/xmloff/source/text/txtdrope.hxx b/xmloff/source/text/txtdrope.hxx index 85bff617bdac..e9c26bbe7db3 100644 --- a/xmloff/source/text/txtdrope.hxx +++ b/xmloff/source/text/txtdrope.hxx @@ -34,7 +34,7 @@ public: ~XMLTextDropCapExport(); void exportXML( const ::com::sun::star::uno::Any& rAny, - sal_Bool bWholeWord, + bool bWholeWord, const OUString& rStyleName ); }; diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx index 1da53281737d..690b789fb0e6 100644 --- a/xmloff/source/text/txtdropi.cxx +++ b/xmloff/source/text/txtdropi.cxx @@ -138,7 +138,7 @@ XMLTextDropCapImportContext::~XMLTextDropCapImportContext() void XMLTextDropCapImportContext::EndElement() { - SetInsert( sal_True ); + SetInsert( true ); XMLElementPropertyContext::EndElement(); if( -1 != aWholeWordProp.mnIndex ) diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 3cffbe180bb4..1c7ac7ef8248 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -55,7 +55,7 @@ void XMLTextExportPropertySetMapper::handleElementItem( case CTF_DROPCAPFORMAT: pThis->maDropCapExport.exportXML( rProperty.maValue, bDropWholeWord, sDropCharStyle ); - pThis->bDropWholeWord = sal_False; + pThis->bDropWholeWord = false; pThis->sDropCharStyle = OUString(); break; @@ -106,13 +106,13 @@ void XMLTextExportPropertySetMapper::handleElementItem( break; case CTF_SECTION_FOOTNOTE_END: - XMLSectionFootnoteConfigExport::exportXML(rExp, sal_False, + XMLSectionFootnoteConfigExport::exportXML(rExp, false, pProperties, nIdx, getPropertySetMapper()); break; case CTF_SECTION_ENDNOTE_END: - XMLSectionFootnoteConfigExport::exportXML(rExp, sal_True, + XMLSectionFootnoteConfigExport::exportXML(rExp, true, pProperties, nIdx, getPropertySetMapper()); break; @@ -177,7 +177,7 @@ XMLTextExportPropertySetMapper::XMLTextExportPropertySetMapper( SvXMLExport& rExp ) : SvXMLExportPropertyMapper( rMapper ), rExport( rExp ), - bDropWholeWord( sal_False ), + bDropWholeWord( false ), maDropCapExport( rExp ), maTabStopExport( rExp ), maTextColumnsExport( rExp ), @@ -657,7 +657,7 @@ void XMLTextExportPropertySetMapper::ContextFilter( XMLPropertyState* pRepeatOffsetX = NULL; XMLPropertyState* pRepeatOffsetY = NULL; - sal_Bool bNeedsAnchor = sal_False; + bool bNeedsAnchor = false; for( ::std::vector< XMLPropertyState >::iterator aIter = rProperties.begin(); aIter != rProperties.end(); @@ -739,31 +739,31 @@ void XMLTextExportPropertySetMapper::ContextFilter( case CTF_WRAP_PARAGRAPH_ONLY: pWrapParagraphOnlyState = propertie; break; case CTF_ANCHORTYPE: pAnchorTypeState = propertie; break; - case CTF_HORIZONTALPOS: pHoriOrientState = propertie; bNeedsAnchor = sal_True; break; - case CTF_HORIZONTALPOS_MIRRORED: pHoriOrientMirroredState = propertie; bNeedsAnchor = sal_True; break; - case CTF_HORIZONTALREL: pHoriOrientRelState = propertie; bNeedsAnchor = sal_True; break; - case CTF_HORIZONTALREL_FRAME: pHoriOrientRelFrameState = propertie; bNeedsAnchor = sal_True; break; - case CTF_HORIZONTALMIRROR: pHoriOrientMirrorState = propertie; bNeedsAnchor = sal_True; break; + case CTF_HORIZONTALPOS: pHoriOrientState = propertie; bNeedsAnchor = true; break; + case CTF_HORIZONTALPOS_MIRRORED: pHoriOrientMirroredState = propertie; bNeedsAnchor = true; break; + case CTF_HORIZONTALREL: pHoriOrientRelState = propertie; bNeedsAnchor = true; break; + case CTF_HORIZONTALREL_FRAME: pHoriOrientRelFrameState = propertie; bNeedsAnchor = true; break; + case CTF_HORIZONTALMIRROR: pHoriOrientMirrorState = propertie; bNeedsAnchor = true; break; case CTF_RELWIDTHREL: pRelWidthRel = propertie; break; - case CTF_VERTICALPOS: pVertOrientState = propertie; bNeedsAnchor = sal_True; break; - case CTF_VERTICALPOS_ATCHAR: pVertOrientAtCharState = propertie; bNeedsAnchor = sal_True; break; - case CTF_VERTICALREL: pVertOrientRelState = propertie; bNeedsAnchor = sal_True; break; - case CTF_VERTICALREL_PAGE: pVertOrientRelPageState = propertie; bNeedsAnchor = sal_True; break; - case CTF_VERTICALREL_FRAME: pVertOrientRelFrameState = propertie; bNeedsAnchor = sal_True; break; - case CTF_VERTICALREL_ASCHAR: pVertOrientRelAsCharState = propertie; bNeedsAnchor = sal_True; break; + case CTF_VERTICALPOS: pVertOrientState = propertie; bNeedsAnchor = true; break; + case CTF_VERTICALPOS_ATCHAR: pVertOrientAtCharState = propertie; bNeedsAnchor = true; break; + case CTF_VERTICALREL: pVertOrientRelState = propertie; bNeedsAnchor = true; break; + case CTF_VERTICALREL_PAGE: pVertOrientRelPageState = propertie; bNeedsAnchor = true; break; + case CTF_VERTICALREL_FRAME: pVertOrientRelFrameState = propertie; bNeedsAnchor = true; break; + case CTF_VERTICALREL_ASCHAR: pVertOrientRelAsCharState = propertie; bNeedsAnchor = true; break; case CTF_RELHEIGHTREL: pRelHeightRel = propertie; break; // Handle new CTFs for shape positioning properties (#i28749#) - case CTF_SHAPE_HORIZONTALPOS: pShapeHoriOrientState = propertie; bNeedsAnchor = sal_True; break; - case CTF_SHAPE_HORIZONTALPOS_MIRRORED: pShapeHoriOrientMirroredState = propertie; bNeedsAnchor = sal_True; break; - case CTF_SHAPE_HORIZONTALREL: pShapeHoriOrientRelState = propertie; bNeedsAnchor = sal_True; break; - case CTF_SHAPE_HORIZONTALREL_FRAME: pShapeHoriOrientRelFrameState = propertie; bNeedsAnchor = sal_True; break; - case CTF_SHAPE_HORIZONTALMIRROR: pShapeHoriOrientMirrorState = propertie; bNeedsAnchor = sal_True; break; - case CTF_SHAPE_VERTICALPOS: pShapeVertOrientState = propertie; bNeedsAnchor = sal_True; break; - case CTF_SHAPE_VERTICALPOS_ATCHAR: pShapeVertOrientAtCharState = propertie; bNeedsAnchor = sal_True; break; - case CTF_SHAPE_VERTICALREL: pShapeVertOrientRelState = propertie; bNeedsAnchor = sal_True; break; - case CTF_SHAPE_VERTICALREL_PAGE: pShapeVertOrientRelPageState = propertie; bNeedsAnchor = sal_True; break; - case CTF_SHAPE_VERTICALREL_FRAME: pShapeVertOrientRelFrameState = propertie; bNeedsAnchor = sal_True; break; + case CTF_SHAPE_HORIZONTALPOS: pShapeHoriOrientState = propertie; bNeedsAnchor = true; break; + case CTF_SHAPE_HORIZONTALPOS_MIRRORED: pShapeHoriOrientMirroredState = propertie; bNeedsAnchor = true; break; + case CTF_SHAPE_HORIZONTALREL: pShapeHoriOrientRelState = propertie; bNeedsAnchor = true; break; + case CTF_SHAPE_HORIZONTALREL_FRAME: pShapeHoriOrientRelFrameState = propertie; bNeedsAnchor = true; break; + case CTF_SHAPE_HORIZONTALMIRROR: pShapeHoriOrientMirrorState = propertie; bNeedsAnchor = true; break; + case CTF_SHAPE_VERTICALPOS: pShapeVertOrientState = propertie; bNeedsAnchor = true; break; + case CTF_SHAPE_VERTICALPOS_ATCHAR: pShapeVertOrientAtCharState = propertie; bNeedsAnchor = true; break; + case CTF_SHAPE_VERTICALREL: pShapeVertOrientRelState = propertie; bNeedsAnchor = true; break; + case CTF_SHAPE_VERTICALREL_PAGE: pShapeVertOrientRelPageState = propertie; bNeedsAnchor = true; break; + case CTF_SHAPE_VERTICALREL_FRAME: pShapeVertOrientRelFrameState = propertie; bNeedsAnchor = true; break; case CTF_FONTNAME: pFontNameState = propertie; break; case CTF_FONTFAMILYNAME: pFontFamilyNameState = propertie; break; case CTF_FONTSTYLENAME: pFontStyleNameState = propertie; break; @@ -854,7 +854,7 @@ void XMLTextExportPropertySetMapper::ContextFilter( pCharDiffHeightCTLState ); if( pUnderlineColorState || pUnderlineHasColorState ) { - sal_Bool bClear = !pUnderlineState; + bool bClear = !pUnderlineState; if( !bClear ) { sal_Int16 nUnderline = 0; diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx index d300de6099d5..008b169f3866 100644 --- a/xmloff/source/text/txtexppr.hxx +++ b/xmloff/source/text/txtexppr.hxx @@ -32,7 +32,7 @@ class XMLTextExportPropertySetMapper: public SvXMLExportPropertyMapper SvXMLExport& rExport; OUString sDropCharStyle; - sal_Bool bDropWholeWord; + bool bDropWholeWord; void ContextFontFilter( bool bEnableFoFontFamily, diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index e5c3505f4fc1..372999395b37 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -246,12 +246,12 @@ SvXMLEnumStringMapEntry const aFieldServiceNameMapping[] = // property accessor helper functions -inline sal_Bool GetBoolProperty(const OUString&, +inline bool GetBoolProperty(const OUString&, const Reference<XPropertySet> &); -inline sal_Bool GetOptionalBoolProperty(const OUString&, +inline bool GetOptionalBoolProperty(const OUString&, const Reference<XPropertySet> &, const Reference<XPropertySetInfo> &, - sal_Bool bDefault); + bool bDefault); inline double GetDoubleProperty(const OUString&, const Reference<XPropertySet> &); inline OUString const GetStringProperty(const OUString&, @@ -446,7 +446,7 @@ enum FieldIdEnum XMLTextFieldExport::MapFieldName( { // map name to prelim. ID sal_uInt16 nTmp; - sal_Bool bRet = GetExport().GetMM100UnitConverter().convertEnum( + bool bRet = GetExport().GetMM100UnitConverter().convertEnum( nTmp, sFieldName, aFieldServiceNameMapping); // check return @@ -632,7 +632,7 @@ enum FieldIdEnum XMLTextFieldExport::MapFieldName( } // is string or numeric field? -sal_Bool XMLTextFieldExport::IsStringField( +bool XMLTextFieldExport::IsStringField( FieldIdEnum nFieldType, const Reference<XPropertySet> & xPropSet) { @@ -652,7 +652,7 @@ sal_Bool XMLTextFieldExport::IsStringField( { Reference<XTextField> xTextField(xPropSet, UNO_QUERY); DBG_ASSERT(xTextField.is(), "field is no XTextField!"); - sal_Bool bRet = GetBoolProperty(sPropertyIsExpression, + bool bRet = GetBoolProperty(sPropertyIsExpression, GetMasterPropertySet(xTextField)); return !bRet; } @@ -668,7 +668,7 @@ sal_Bool XMLTextFieldExport::IsStringField( case FIELD_ID_TABLE_FORMULA: // legacy field: always a number field (because it always has // a number format) - return sal_False; + return false; case FIELD_ID_COUNT_PAGES: case FIELD_ID_COUNT_PARAGRAPHS: @@ -695,7 +695,7 @@ sal_Bool XMLTextFieldExport::IsStringField( case FIELD_ID_REFPAGE_GET: case FIELD_ID_DOCINFO_CUSTOM: // always number - return sal_False; + return false; case FIELD_ID_COMBINED_CHARACTERS: case FIELD_ID_BIBLIOGRAPHY: @@ -729,7 +729,7 @@ sal_Bool XMLTextFieldExport::IsStringField( case FIELD_ID_URL: case FIELD_ID_DROP_DOWN: // always string: - return sal_True; + return true; case FIELD_ID_SCRIPT: case FIELD_ID_ANNOTATION: @@ -745,15 +745,15 @@ sal_Bool XMLTextFieldExport::IsStringField( case FIELD_ID_DRAW_DATE_TIME: default: OSL_FAIL("unknown field type/field has no content"); - return sal_True; // invalid info; string in case of doubt + return true; // invalid info; string in case of doubt } } /// export the styles needed by the given field. Called on first pass /// through document void XMLTextFieldExport::ExportFieldAutoStyle( - const Reference<XTextField> & rTextField, const sal_Bool bProgress, - const sal_Bool bRecursive ) + const Reference<XTextField> & rTextField, const bool bProgress, + const bool bRecursive ) { // get property set Reference<XPropertySet> xPropSet(rTextField, UNO_QUERY); @@ -833,7 +833,7 @@ void XMLTextFieldExport::ExportFieldAutoStyle( { if( ! GetOptionalBoolProperty( sPropertyIsFixedLanguage, - xPropSet, xPropSetInfo, sal_False ) ) + xPropSet, xPropSetInfo, false ) ) { nFormat = GetExport().dataStyleForceSystemLanguage(nFormat); @@ -883,7 +883,7 @@ void XMLTextFieldExport::ExportFieldAutoStyle( ! GetOptionalBoolProperty( sPropertyIsFixedLanguage, xPropSet, xPropSet->getPropertySetInfo(), - sal_False ) ) + false ) ) { nFormat = GetExport().dataStyleForceSystemLanguage(nFormat); @@ -971,7 +971,7 @@ void XMLTextFieldExport::ExportFieldAutoStyle( /// export the given field to XML. Called on second pass through document void XMLTextFieldExport::ExportField( - const Reference<XTextField> & rTextField, sal_Bool bProgress ) + const Reference<XTextField> & rTextField, bool bProgress ) { // get property set Reference<XPropertySet> xPropSet(rTextField, UNO_QUERY); @@ -997,7 +997,7 @@ void XMLTextFieldExport::ExportField( OUString sStyle = GetExport().GetTextParagraphExport()-> FindTextStyleAndHyperlink( xRangePropSet, bHasHyperlink, bIsUICharStyle, bHasAutoStyle, pStates ); - sal_Bool bHasStyle = !sStyle.isEmpty(); + bool bHasStyle = !sStyle.isEmpty(); // export hyperlink (if we have one) Reference < XPropertySetInfo > xRangePropSetInfo; @@ -1059,7 +1059,7 @@ void XMLTextFieldExport::ExportFieldHelper( const Reference<XPropertySet> & rPropSet, const Reference<XPropertySet> &, enum FieldIdEnum nToken, - sal_Bool bProgress ) + bool bProgress ) { // get property set info (because some attributes are not support // in all implementations) @@ -1072,14 +1072,14 @@ void XMLTextFieldExport::ExportFieldHelper( case FIELD_ID_AUTHOR: // author field: fixed, field (sub-)type ProcessBoolean(XML_FIXED, - GetBoolProperty(sPropertyIsFixed, rPropSet), sal_True); + GetBoolProperty(sPropertyIsFixed, rPropSet), true); ExportElement(MapAuthorFieldName(rPropSet), sPresentation); break; case FIELD_ID_SENDER: // sender field: fixed, field (sub-)type ProcessBoolean(XML_FIXED, - GetBoolProperty(sPropertyIsFixed, rPropSet), sal_True); + GetBoolProperty(sPropertyIsFixed, rPropSet), true); ExportElement(MapSenderFieldName(rPropSet), sPresentation); break; @@ -1089,7 +1089,7 @@ void XMLTextFieldExport::ExportFieldHelper( MapPlaceholderType( GetInt16Property(sPropertyPlaceholderType, rPropSet))); ProcessString(XML_DESCRIPTION, - GetStringProperty(sPropertyHint,rPropSet), sal_True); + GetStringProperty(sPropertyHint,rPropSet), true); ExportElement(XML_PLACEHOLDER, sPresentation); break; @@ -1099,7 +1099,7 @@ void XMLTextFieldExport::ExportFieldHelper( ProcessString(XML_NAME, GetStringProperty(sPropertyVariableName, rPropSet)); ProcessDisplay(GetBoolProperty(sPropertyIsVisible, rPropSet), - sal_False); + false); ProcessString(XML_FORMULA, XML_NAMESPACE_OOOW, GetStringProperty(sPropertyContent, rPropSet), sPresentation); @@ -1108,10 +1108,10 @@ void XMLTextFieldExport::ExportFieldHelper( GetStringProperty(sPropertyContent, rPropSet), sPresentation, GetDoubleProperty(sPropertyValue, rPropSet), - sal_True, sal_True, sal_True, + true, true, true, ! GetOptionalBoolProperty( sPropertyIsFixedLanguage, - rPropSet, xPropSetInfo, sal_False ) ); + rPropSet, xPropSetInfo, false ) ); ExportElement(XML_VARIABLE_SET, sPresentation); break; } @@ -1120,20 +1120,20 @@ void XMLTextFieldExport::ExportFieldHelper( // variable get field: name, format&value ProcessString(XML_NAME, GetStringProperty(sPropertyContent, rPropSet)); - sal_Bool bCmd = GetBoolProperty(sPropertyIsShowFormula, rPropSet); - ProcessDisplay(sal_True, bCmd); + bool bCmd = GetBoolProperty(sPropertyIsShowFormula, rPropSet); + ProcessDisplay(true, bCmd); // #i81766# for older versions export of the value-type - sal_Bool bExportValueType = !bCmd && ( GetExport().getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE ); + bool bExportValueType = !bCmd && ( GetExport().getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE ); // show style, unless name will be shown ProcessValueAndType(IsStringField(nToken, rPropSet), GetIntProperty(sPropertyNumberFormat, rPropSet), sEmpty, sEmpty, 0.0, // values not used - sal_False, + false, bExportValueType, !bCmd, ! GetOptionalBoolProperty( sPropertyIsFixedLanguage, - rPropSet, xPropSetInfo, sal_False ) ); + rPropSet, xPropSetInfo, false ) ); ExportElement(XML_VARIABLE_GET, sPresentation); break; } @@ -1144,7 +1144,7 @@ void XMLTextFieldExport::ExportFieldHelper( ProcessString(XML_DESCRIPTION, GetStringProperty(sPropertyHint , rPropSet)); ProcessDisplay(GetBoolProperty(sPropertyIsVisible, rPropSet), - sal_False); + false); ProcessString(XML_FORMULA, XML_NAMESPACE_OOOW, GetStringProperty(sPropertyContent, rPropSet), sPresentation); @@ -1153,26 +1153,26 @@ void XMLTextFieldExport::ExportFieldHelper( GetStringProperty(sPropertyContent, rPropSet), sPresentation, GetDoubleProperty(sPropertyValue, rPropSet), - sal_True, sal_True, sal_True, + true, true, true, ! GetOptionalBoolProperty( sPropertyIsFixedLanguage, - rPropSet, xPropSetInfo, sal_False ) ); + rPropSet, xPropSetInfo, false ) ); ExportElement(XML_VARIABLE_INPUT, sPresentation); break; case FIELD_ID_USER_GET: // user field: name, hidden, style { - sal_Bool bCmd = GetBoolProperty(sPropertyIsShowFormula, rPropSet); + bool bCmd = GetBoolProperty(sPropertyIsShowFormula, rPropSet); ProcessDisplay(GetBoolProperty(sPropertyIsVisible, rPropSet), bCmd); ProcessValueAndType(IsStringField(nToken, rPropSet), GetIntProperty(sPropertyNumberFormat, rPropSet), sEmpty, sEmpty, 0.0, // values not used - sal_False, sal_False, !bCmd, + false, false, !bCmd, ! GetOptionalBoolProperty( sPropertyIsFixedLanguage, - rPropSet, xPropSetInfo, sal_False ) ); + rPropSet, xPropSetInfo, false ) ); // name from FieldMaster ProcessString(XML_NAME, @@ -1216,11 +1216,11 @@ void XMLTextFieldExport::ExportFieldHelper( case FIELD_ID_EXPRESSION: { // formula field: formula, format&value - sal_Bool bCmd = GetBoolProperty(sPropertyIsShowFormula, rPropSet); + bool bCmd = GetBoolProperty(sPropertyIsShowFormula, rPropSet); ProcessString(XML_FORMULA, XML_NAMESPACE_OOOW, GetStringProperty(sPropertyContent, rPropSet), sPresentation); - ProcessDisplay(sal_True, bCmd); + ProcessDisplay(true, bCmd); ProcessValueAndType(IsStringField(nToken, rPropSet), GetIntProperty(sPropertyNumberFormat, rPropSet), GetStringProperty(sPropertyContent, rPropSet), @@ -1229,7 +1229,7 @@ void XMLTextFieldExport::ExportFieldHelper( !bCmd, !bCmd, !bCmd, ! GetOptionalBoolProperty( sPropertyIsFixedLanguage, - rPropSet, xPropSetInfo, sal_False ) ); + rPropSet, xPropSetInfo, false ) ); ExportElement(XML_EXPRESSION, sPresentation); break; } @@ -1249,14 +1249,14 @@ void XMLTextFieldExport::ExportFieldHelper( // all properties (except IsDate) are optional! if (xPropSetInfo->hasPropertyByName(sPropertyNumberFormat)) { - ProcessValueAndType(sal_False, + ProcessValueAndType(false, GetIntProperty(sPropertyNumberFormat,rPropSet), sEmpty, sEmpty, 0.0, // not used - sal_False, sal_False, sal_True, + false, false, true, ! GetOptionalBoolProperty( sPropertyIsFixedLanguage, - rPropSet, xPropSetInfo, sal_False ), - sal_True); + rPropSet, xPropSetInfo, false ), + true); } if (xPropSetInfo->hasPropertyByName(sPropertyDateTimeValue)) { @@ -1277,14 +1277,14 @@ void XMLTextFieldExport::ExportFieldHelper( { ProcessBoolean(XML_FIXED, GetBoolProperty(sPropertyIsFixed, rPropSet), - sal_False); + false); } if (xPropSetInfo->hasPropertyByName(sPropertyAdjust)) { // adjust value given as integer in minutes ProcessDateTime(XML_TIME_ADJUST, GetIntProperty(sPropertyAdjust, rPropSet), - sal_False, sal_True, sal_True); + false, true, true); } ExportElement(XML_TIME, sPresentation); break; @@ -1293,13 +1293,13 @@ void XMLTextFieldExport::ExportFieldHelper( // all properties (except IsDate) are optional! if (xPropSetInfo->hasPropertyByName(sPropertyNumberFormat)) { - ProcessValueAndType(sal_False, + ProcessValueAndType(false, GetIntProperty(sPropertyNumberFormat,rPropSet), sEmpty, sEmpty, 0.0, // not used - sal_False, sal_False, sal_True, + false, false, true, ! GetOptionalBoolProperty( sPropertyIsFixedLanguage, - rPropSet, xPropSetInfo, sal_False ) ); + rPropSet, xPropSetInfo, false ) ); } if (xPropSetInfo->hasPropertyByName(sPropertyDateTimeValue)) { @@ -1308,7 +1308,7 @@ void XMLTextFieldExport::ExportFieldHelper( GetDateTimeProperty(sPropertyDateTimeValue, rPropSet), // #96457#: date fields should also save time - sal_False); + false); } // TODO: remove double-handling after SRC614 else if (xPropSetInfo->hasPropertyByName(sPropertyDateTime)) @@ -1316,20 +1316,20 @@ void XMLTextFieldExport::ExportFieldHelper( ProcessDateTime(XML_DATE_VALUE, GetDateTimeProperty(sPropertyDateTime,rPropSet), // #96457#: date fields should also save time - sal_False); + false); } if (xPropSetInfo->hasPropertyByName(sPropertyIsFixed)) { ProcessBoolean(XML_FIXED, GetBoolProperty(sPropertyIsFixed, rPropSet), - sal_False); + false); } if (xPropSetInfo->hasPropertyByName(sPropertyAdjust)) { // adjust value given as number of days ProcessDateTime(XML_DATE_ADJUST, GetIntProperty(sPropertyAdjust, rPropSet), - sal_True, sal_True, sal_True); + true, true, true); } ExportElement(XML_DATE, sPresentation); break; @@ -1375,7 +1375,7 @@ void XMLTextFieldExport::ExportFieldHelper( GetStringProperty(sPropertyDataTableName, rPropSet)); ProcessCommandType(GetIntProperty(sPropertyDataCommandType, rPropSet)); ProcessDisplay(GetBoolProperty(sPropertyIsVisible, rPropSet), - sal_False); + false); ExportDataBaseElement(XML_DATABASE_NAME, sPresentation, rPropSet, xPropSetInfo); break; @@ -1389,7 +1389,7 @@ void XMLTextFieldExport::ExportFieldHelper( ProcessInteger(XML_VALUE, GetIntProperty(sPropertySetNumber, rPropSet)); ProcessDisplay(GetBoolProperty(sPropertyIsVisible, rPropSet), - sal_False); + false); ExportDataBaseElement(XML_DATABASE_ROW_NUMBER, sPresentation, rPropSet, xPropSetInfo); break; @@ -1432,13 +1432,13 @@ void XMLTextFieldExport::ExportFieldHelper( // export number format if available (happens only for numbers!) if (!GetBoolProperty(sPropertyIsDataBaseFormat, rPropSet)) { - ProcessValueAndType(sal_False, // doesn't happen for text + ProcessValueAndType(false, // doesn't happen for text GetIntProperty(sPropertyNumberFormat,rPropSet), sEmpty, sEmpty, 0.0, // not used - sal_False, sal_False, sal_True, sal_False); + false, false, true, false); } ProcessDisplay(GetBoolProperty(sPropertyIsVisible, rPropSet), - sal_False); + false); ExportDataBaseElement(XML_DATABASE_DISPLAY, sPresentation, xMaster, xMaster->getPropertySetInfo()); break; @@ -1446,7 +1446,7 @@ void XMLTextFieldExport::ExportFieldHelper( case FIELD_ID_DOCINFO_REVISION: ProcessBoolean(XML_FIXED, - GetBoolProperty(sPropertyIsFixed, rPropSet), sal_False); + GetBoolProperty(sPropertyIsFixed, rPropSet), false); ExportElement(MapDocInfoFieldName(nToken), sPresentation); break; @@ -1457,17 +1457,17 @@ void XMLTextFieldExport::ExportFieldHelper( case FIELD_ID_DOCINFO_SAVE_DATE: case FIELD_ID_DOCINFO_CREATION_DATE: case FIELD_ID_DOCINFO_PRINT_DATE: - ProcessValueAndType(sal_False, + ProcessValueAndType(false, GetIntProperty(sPropertyNumberFormat, rPropSet), sEmpty, sEmpty, 0.0, - sal_False, sal_False, sal_True, + false, false, true, ! GetOptionalBoolProperty( sPropertyIsFixedLanguage, - rPropSet, xPropSetInfo, sal_False ) ); + rPropSet, xPropSetInfo, false ) ); // todo: export date/time value, but values not available -> core bug ProcessBoolean(XML_FIXED, - GetBoolProperty(sPropertyIsFixed, rPropSet), sal_False); + GetBoolProperty(sPropertyIsFixed, rPropSet), false); ExportElement(MapDocInfoFieldName(nToken), sPresentation); break; @@ -1481,25 +1481,25 @@ void XMLTextFieldExport::ExportFieldHelper( if (xPropSetInfo->hasPropertyByName(sPropertyIsFixed)) { ProcessBoolean(XML_FIXED, - GetBoolProperty(sPropertyIsFixed, rPropSet), sal_False); + GetBoolProperty(sPropertyIsFixed, rPropSet), false); } ExportElement(MapDocInfoFieldName(nToken), sPresentation); break; case FIELD_ID_DOCINFO_CUSTOM: { - ProcessValueAndType(sal_False, // doesn't happen for text + ProcessValueAndType(false, // doesn't happen for text GetIntProperty(sPropertyNumberFormat,rPropSet), sEmpty, sEmpty, 0.0, // not used - sal_False, sal_False, sal_True, + false, false, true, ! GetOptionalBoolProperty( sPropertyIsFixedLanguage, - rPropSet, xPropSetInfo, sal_False )); + rPropSet, xPropSetInfo, false )); uno::Any aAny = rPropSet->getPropertyValue( sPropertyName ); OUString sName; aAny >>= sName; ProcessString(XML_NAME, sName); - ProcessBoolean(XML_FIXED, GetBoolProperty(sPropertyIsFixed, rPropSet), sal_False); + ProcessBoolean(XML_FIXED, GetBoolProperty(sPropertyIsFixed, rPropSet), false); ExportElement(XML_USER_DEFINED, sPresentation); break; } @@ -1530,7 +1530,7 @@ void XMLTextFieldExport::ExportFieldHelper( GetStringProperty(sPropertyFalseContent, rPropSet)); ProcessBoolean(XML_CURRENT_VALUE, GetBoolProperty(sPropertyIsConditionTrue, rPropSet), - sal_False); + false); ExportElement(XML_CONDITIONAL_TEXT, sPresentation); break; @@ -1541,7 +1541,7 @@ void XMLTextFieldExport::ExportFieldHelper( GetStringProperty(sPropertyContent, rPropSet)); ProcessBoolean(XML_IS_HIDDEN, GetBoolProperty(sPropertyIsHidden, rPropSet), - sal_False); + false); ExportElement(XML_HIDDEN_TEXT, sPresentation); break; @@ -1550,7 +1550,7 @@ void XMLTextFieldExport::ExportFieldHelper( GetStringProperty(sPropertyCondition, rPropSet)); ProcessBoolean(XML_IS_HIDDEN, GetBoolProperty(sPropertyIsHidden, rPropSet), - sal_False); + false); DBG_ASSERT(sPresentation.equals(sEmpty), "Unexpected presentation for hidden paragraph field"); ExportElement(XML_HIDDEN_PARAGRAPH); @@ -1585,14 +1585,14 @@ void XMLTextFieldExport::ExportFieldHelper( { ProcessBoolean(XML_FIXED, GetBoolProperty(sPropertyIsFixed, rPropSet), - sal_False); + false); } ExportElement(XML_FILE_NAME, sPresentation); break; case FIELD_ID_REFPAGE_SET: ProcessBoolean(XML_ACTIVE, - GetBoolProperty(sPropertyOn, rPropSet), sal_True); + GetBoolProperty(sPropertyOn, rPropSet), true); ProcessIntegerDef(XML_PAGE_ADJUST, GetInt16Property(sPropertyOffset, rPropSet), 0); DBG_ASSERT(sPresentation.equals(sEmpty), @@ -1679,10 +1679,10 @@ void XMLTextFieldExport::ExportFieldHelper( // this field is a special case because it gets mapped onto a // hyperlink, rather than one of the regular text field. ProcessString(XML_HREF, GetExport().GetRelativeReference(GetStringProperty(sPropertyURL, rPropSet)), - sal_False, XML_NAMESPACE_XLINK); + false, XML_NAMESPACE_XLINK); ProcessString(XML_TARGET_FRAME_NAME, GetStringProperty(sPropertyTargetFrame,rPropSet), - sal_True, XML_NAMESPACE_OFFICE); + true, XML_NAMESPACE_OFFICE); GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); SvXMLElementExport aUrlField(rExport, XML_NAMESPACE_TEXT, XML_A, false, false); @@ -1700,14 +1700,14 @@ void XMLTextFieldExport::ExportFieldHelper( case FIELD_ID_SCRIPT: ProcessString(XML_LANGUAGE, GetStringProperty(sPropertyScriptType, rPropSet), - sal_True, XML_NAMESPACE_SCRIPT); + true, XML_NAMESPACE_SCRIPT); DBG_ASSERT(sPresentation.equals(sEmpty), "Unexpected presentation for script field"); if (GetBoolProperty(sPropertyURLContent, rPropSet)) { ProcessString(XML_HREF, GetExport().GetRelativeReference(GetStringProperty(sPropertyContent, rPropSet)), - sal_False, XML_NAMESPACE_XLINK); + false, XML_NAMESPACE_XLINK); ExportElement(XML_SCRIPT); } else @@ -1806,14 +1806,14 @@ void XMLTextFieldExport::ExportFieldHelper( case FIELD_ID_TABLE_FORMULA: ProcessString( XML_FORMULA, XML_NAMESPACE_OOOW, GetStringProperty(sPropertyContent, rPropSet) ); - ProcessDisplay( sal_True, + ProcessDisplay( true, GetBoolProperty(sPropertyIsShowFormula, rPropSet), - sal_True ); - ProcessValueAndType( sal_False, + true ); + ProcessValueAndType( false, GetIntProperty(sPropertyNumberFormat, rPropSet), sEmpty, sEmpty, 0.0f, - sal_False, sal_False, sal_True, - sal_False, sal_False ); + false, false, true, + false, false ); ExportElement( XML_TABLE_FORMULA, sPresentation ); break; @@ -2008,7 +2008,7 @@ void XMLTextFieldExport::ExportFieldDeclarations( ExplodeFieldMasterName(sName, sFieldMasterType, sVarName); // determine string/numeric field - sal_Bool bIsString = ( GetIntProperty(sPropertySubType, xPropSet) + bool bIsString = ( GetIntProperty(sPropertySubType, xPropSet) == SetVariableType::STRING ); // get dependent field property set @@ -2020,7 +2020,7 @@ void XMLTextFieldExport::ExportFieldDeclarations( bIsString, GetIntProperty(sPropertyNumberFormat, xFieldPropSet), sEmpty, sEmpty, 0.0, - sal_False, sal_True, sal_False, sal_False); + false, true, false, false); } else { @@ -2033,11 +2033,11 @@ void XMLTextFieldExport::ExportFieldDeclarations( ProcessValueAndType( bIsString, 0, sEmpty, sEmpty, 0.0, - sal_False, sal_True, sal_False, sal_False); + false, true, false, false); } ProcessString(XML_NAME, sVarName); - ExportElement(XML_VARIABLE_DECL, sal_True); + ExportElement(XML_VARIABLE_DECL, true); } } // else: no declarations element @@ -2079,7 +2079,7 @@ void XMLTextFieldExport::ExportFieldDeclarations( sPropertyNumberingSeparator, xPropSet)); } ProcessString(XML_NAME, sVarName); - ExportElement(XML_SEQUENCE_DECL, sal_True); + ExportElement(XML_SEQUENCE_DECL, true); } } // else: no declarations element @@ -2112,25 +2112,25 @@ void XMLTextFieldExport::ExportFieldDeclarations( { // expression: ProcessValueAndType( - sal_False, + false, 0, sEmpty, sEmpty, GetDoubleProperty(sPropertyValue, xPropSet), - sal_True, - sal_True, - sal_False, - sal_False); + true, + true, + false, + false); } else { // string: write regardless of default - ProcessString(XML_VALUE_TYPE, XML_STRING, sal_False, + ProcessString(XML_VALUE_TYPE, XML_STRING, false, XML_NAMESPACE_OFFICE); ProcessString(XML_STRING_VALUE, GetStringProperty(sPropertyContent, xPropSet), - sal_False, XML_NAMESPACE_OFFICE ); + false, XML_NAMESPACE_OFFICE ); } ProcessString(XML_NAME, sVarName); - ExportElement(XML_USER_FIELD_DECL, sal_True); + ExportElement(XML_USER_FIELD_DECL, true); } } // else: no declarations element @@ -2161,23 +2161,23 @@ void XMLTextFieldExport::ExportFieldDeclarations( ProcessString(XML_NAME, GetStringProperty(sPropertyName, xPropSet), - sal_False, XML_NAMESPACE_OFFICE); + false, XML_NAMESPACE_OFFICE); // export elements; can't use ProcessString because // elements are in office namespace ProcessString(XML_DDE_APPLICATION, GetStringProperty(sPropertyDDECommandType, xPropSet), - sal_False, XML_NAMESPACE_OFFICE); + false, XML_NAMESPACE_OFFICE); ProcessString(XML_DDE_TOPIC, GetStringProperty(sPropertyDDECommandFile, xPropSet), - sal_False, XML_NAMESPACE_OFFICE); + false, XML_NAMESPACE_OFFICE); ProcessString(XML_DDE_ITEM, GetStringProperty(sPropertyDDECommandElement, xPropSet), - sal_False, XML_NAMESPACE_OFFICE); - sal_Bool bIsAutomaticUpdate = GetBoolProperty( + false, XML_NAMESPACE_OFFICE); + bool bIsAutomaticUpdate = GetBoolProperty( sPropertyIsAutomaticUpdate, xPropSet); if (bIsAutomaticUpdate) { @@ -2186,7 +2186,7 @@ void XMLTextFieldExport::ExportFieldDeclarations( XML_TRUE); } - ExportElement(XML_DDE_CONNECTION_DECL, sal_True); + ExportElement(XML_DDE_CONNECTION_DECL, true); } // else: no dependent field -> no export of field declaration } @@ -2195,7 +2195,7 @@ void XMLTextFieldExport::ExportFieldDeclarations( } void XMLTextFieldExport::SetExportOnlyUsedFieldDeclarations( - sal_Bool bExportOnlyUsed) + bool bExportOnlyUsed) { delete pUsedMasters; pUsedMasters = NULL; @@ -2206,7 +2206,7 @@ void XMLTextFieldExport::SetExportOnlyUsedFieldDeclarations( } void XMLTextFieldExport::ExportElement(enum XMLTokenEnum eElementName, - sal_Bool bAddSpace) + bool bAddSpace) { // can't call ExportElement(eElementName, const OUString&) with empty // string because xmlprinter only uses empty tags if no content @@ -2223,7 +2223,7 @@ void XMLTextFieldExport::ExportElement(enum XMLTokenEnum eElementName, void XMLTextFieldExport::ExportElement(enum XMLTokenEnum eElementName, const OUString& sContent, - sal_Bool bAddSpace) + bool bAddSpace) { DBG_ASSERT(eElementName != XML_TOKEN_INVALID, "invalid element name!"); if (eElementName != XML_TOKEN_INVALID) @@ -2316,7 +2316,7 @@ void XMLTextFieldExport::ExportMacro( void XMLTextFieldExport::ExportMetaField( const Reference<XPropertySet> & i_xMeta, - bool i_bAutoStyles, sal_Bool i_bProgress ) + bool i_bAutoStyles, bool i_bProgress ) { bool doExport(!i_bAutoStyles); // do not export element if autostyles // check version >= 1.2 @@ -2334,10 +2334,10 @@ void XMLTextFieldExport::ExportMetaField( const Reference<rdf::XMetadatable> xMeta( i_xMeta, UNO_QUERY_THROW ); // style:data-style-name - ProcessValueAndType(sal_False, + ProcessValueAndType(false, GetIntProperty(sPropertyNumberFormat, i_xMeta), - sEmpty, sEmpty, 0.0, sal_False, sal_False, sal_True, - sal_False, sal_False /*, sal_False*/ ); + sEmpty, sEmpty, 0.0, false, false, true, + false, false /*, sal_False*/ ); // text:meta-field without xml:id is invalid xMeta->ensureMetadataReference(); @@ -2356,16 +2356,16 @@ void XMLTextFieldExport::ExportMetaField( /// export all data-style related attributes void XMLTextFieldExport::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; inv. if string 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, /// export language attributes? - sal_Bool bTimeStyle) // exporting a time style? + bool bExportValue, /// export value attribute? + bool bExportValueType, /// export value-type attribute? + bool bExportStyle, /// export style-sttribute? + bool bForceSystemLanguage, /// export language attributes? + bool bTimeStyle) // exporting a time style? { // String or number? if (bIsString) @@ -2421,9 +2421,9 @@ void XMLTextFieldExport::ProcessValueAndType( /// process display related properties -void XMLTextFieldExport::ProcessDisplay(sal_Bool bIsVisible, - sal_Bool bIsCommand, - sal_Bool bValueDefault) +void XMLTextFieldExport::ProcessDisplay(bool bIsVisible, + bool bIsCommand, + bool bValueDefault) { enum XMLTokenEnum eValue; @@ -2447,7 +2447,7 @@ void XMLTextFieldExport::ProcessDisplay(sal_Bool bIsVisible, /// export boolean property void XMLTextFieldExport::ProcessBoolean(enum XMLTokenEnum eName, - sal_Bool bBool, sal_Bool bDefault) + bool bBool, bool bDefault) { DBG_ASSERT( eName != XML_TOKEN_INVALID, "invalid element token"); if ( XML_TOKEN_INVALID == eName ) @@ -2467,7 +2467,7 @@ void XMLTextFieldExport::ProcessBoolean(enum XMLTokenEnum eName, /// export string attribute void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName, const OUString& sValue, - sal_Bool bOmitEmpty, + bool bOmitEmpty, sal_uInt16 nPrefix) { DBG_ASSERT( eName != XML_TOKEN_INVALID, "invalid element token"); @@ -2485,7 +2485,7 @@ void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName, void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName, sal_uInt16 nValuePrefix, const OUString& sValue, - sal_Bool bOmitEmpty, + bool bOmitEmpty, sal_uInt16 nPrefix) { OUString sQValue = @@ -2501,7 +2501,7 @@ void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName, { if (sValue != sDefault) { - ProcessString(eName, sValue, sal_False, nPrefix); + ProcessString(eName, sValue, false, nPrefix); } } @@ -2514,7 +2514,7 @@ void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName, { if (sValue != sDefault) { - ProcessString(eName, nValuePrefix, sValue, sal_False, nPrefix); + ProcessString(eName, nValuePrefix, sValue, false, nPrefix); } } @@ -2523,7 +2523,7 @@ void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName, void XMLTextFieldExport::ProcessString( enum XMLTokenEnum eName, enum XMLTokenEnum eValue, - sal_Bool bOmitEmpty, + bool bOmitEmpty, sal_uInt16 nPrefix) { DBG_ASSERT( eName != XML_TOKEN_INVALID, "invalid element token" ); @@ -2547,7 +2547,7 @@ void XMLTextFieldExport::ProcessString( sal_uInt16 nPrefix) { if ( eValue != eDefault ) - ProcessString( eName, eValue, sal_False, nPrefix); + ProcessString( eName, eValue, false, nPrefix); } @@ -2618,9 +2618,9 @@ void XMLTextFieldExport::ProcessNumberingType(sal_Int16 nNumberingType) /// export a date, time, or duration void XMLTextFieldExport::ProcessDateTime(enum XMLTokenEnum eName, double dValue, - sal_Bool bIsDate, - sal_Bool bIsDuration, - sal_Bool bOmitDurationIfZero, + bool bIsDate, + bool bIsDuration, + bool bOmitDurationIfZero, sal_uInt16 nPrefix) { // truncate for date granularity @@ -2645,13 +2645,13 @@ void XMLTextFieldExport::ProcessDateTime(enum XMLTokenEnum eName, } // output attribute - ProcessString(eName, aBuffer.makeStringAndClear(), sal_True, nPrefix); + ProcessString(eName, aBuffer.makeStringAndClear(), true, nPrefix); } /// export a date or time void XMLTextFieldExport::ProcessDateTime(enum XMLTokenEnum eName, const util::DateTime& rTime, - sal_Bool bIsDate, + bool bIsDate, sal_uInt16 nPrefix) { OUStringBuffer aBuffer; @@ -2671,15 +2671,15 @@ void XMLTextFieldExport::ProcessDateTime(enum XMLTokenEnum eName, ::sax::Converter::convertDateTime(aBuffer, aDateTime, 0); // output attribute - ProcessString(eName, aBuffer.makeStringAndClear(), sal_True, nPrefix); + ProcessString(eName, aBuffer.makeStringAndClear(), true, nPrefix); } /// export a date, time, or duration void XMLTextFieldExport::ProcessDateTime(enum XMLTokenEnum eName, sal_Int32 nMinutes, - sal_Bool bIsDate, - sal_Bool bIsDuration, - sal_Bool bOmitDurationIfZero, + bool bIsDate, + bool bIsDuration, + bool bOmitDurationIfZero, sal_uInt16 nPrefix) { // handle bOmitDurationIfZero here, because we can precisely compare ints @@ -2701,7 +2701,7 @@ void XMLTextFieldExport::ProcessTimeOrDateTime(enum XMLTokenEnum eName, ::sax::Converter::convertTimeOrDateTime(aBuffer, rTime, 0); // output attribute - ProcessString(eName, aBuffer.makeStringAndClear(), sal_True, nPrefix); + ProcessString(eName, aBuffer.makeStringAndClear(), true, nPrefix); } @@ -2878,7 +2878,7 @@ void XMLTextFieldExport::ExportDataBaseElement( // explode a field master name into field type and field name -sal_Bool XMLTextFieldExport::ExplodeFieldMasterName( +bool XMLTextFieldExport::ExplodeFieldMasterName( const OUString& sMasterName, OUString& sFieldType, OUString& sVarName) { sal_Int32 nLength = sFieldMasterPrefix.getLength(); @@ -2916,7 +2916,7 @@ Reference<XPropertySet> XMLTextFieldExport::GetMasterPropertySet( } // get PropertySet of (any; the first) dependent field -sal_Bool XMLTextFieldExport::GetDependentFieldPropertySet( +bool XMLTextFieldExport::GetDependentFieldPropertySet( const Reference<XPropertySet> & xMaster, Reference<XPropertySet> & xField) { @@ -2933,11 +2933,11 @@ sal_Bool XMLTextFieldExport::GetDependentFieldPropertySet( xField = Reference<XPropertySet>(xTField, UNO_QUERY); DBG_ASSERT(xField.is(), "Surprisinlgy, this TextField refuses to be a PropertySet!"); - return sal_True; + return true; } else { - return sal_False; + return false; } } @@ -3532,20 +3532,20 @@ OUString XMLTextFieldExport::MakeSequenceRefName( -inline sal_Bool GetBoolProperty( +inline bool GetBoolProperty( const OUString& sPropName, const Reference<XPropertySet> & xPropSet) { Any aAny = xPropSet->getPropertyValue(sPropName); - sal_Bool bBool = *(sal_Bool *)aAny.getValue(); + bool bBool = *(sal_Bool *)aAny.getValue(); return bBool; } -inline sal_Bool GetOptionalBoolProperty( +inline bool GetOptionalBoolProperty( const OUString& sPropName, const Reference<XPropertySet> & xPropSet, const Reference<XPropertySetInfo> & xPropSetInfo, - sal_Bool bDefault) + bool bDefault) { return xPropSetInfo->hasPropertyByName( sPropName ) ? GetBoolProperty( sPropName, xPropSet ) : bDefault; diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index e188f826755e..1c8e0146bb4e 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -201,7 +201,7 @@ XMLTextFieldImportContext::XMLTextFieldImportContext( , sIsFixed(sAPI_is_fixed) , rTextImportHelper(rHlp) , sServicePrefix(sAPI_textfield_prefix) -, bValid(sal_False) +, bValid(false) { DBG_ASSERT(NULL != pService, "Need service name!"); sServiceName = OUString::createFromAscii(pService); @@ -275,7 +275,7 @@ void XMLTextFieldImportContext::Characters(const OUString& rContent) sContentBuffer.append(rContent); } -sal_Bool XMLTextFieldImportContext::CreateField( +bool XMLTextFieldImportContext::CreateField( Reference<XPropertySet> & xField, const OUString& rServiceName) { @@ -292,13 +292,13 @@ sal_Bool XMLTextFieldImportContext::CreateField( xField = xTmp; } else { - return sal_False; // can't create instance + return false; // can't create instance } } else { - return sal_False; // can't get MultiServiceFactory + return false; // can't get MultiServiceFactory } - return sal_True; + return true; } /// create the appropriate field context from @@ -442,16 +442,16 @@ XMLTextFieldImportContext::CreateTextFieldImportContext( case XML_TOK_TEXT_DOCUMENT_KEYWORDS: pContext = new XMLSimpleDocInfoImportContext( rImport, rHlp, nPrefix, rName, - nToken, sal_True, - sal_False ); + nToken, true, + false ); break; case XML_TOK_TEXT_DOCUMENT_CREATION_AUTHOR: case XML_TOK_TEXT_DOCUMENT_PRINT_AUTHOR: case XML_TOK_TEXT_DOCUMENT_SAVE_AUTHOR: pContext = new XMLSimpleDocInfoImportContext( rImport, rHlp, nPrefix, rName, - nToken, sal_False, - sal_True ); + nToken, false, + true ); break; case XML_TOK_TEXT_DOCUMENT_CREATION_DATE: @@ -624,7 +624,7 @@ XMLSenderFieldImportContext::XMLSenderFieldImportContext( , sPropertyFixed(sAPI_is_fixed) , sPropertyFieldSubType(sAPI_user_data_type) , sPropertyContent(sAPI_content) - , bFixed(sal_True) + , bFixed(true) , nElementToken(nToken) { } @@ -632,7 +632,7 @@ XMLSenderFieldImportContext::XMLSenderFieldImportContext( void XMLSenderFieldImportContext::StartElement( const Reference<XAttributeList> & xAttrList) { - bValid = sal_True; + bValid = true; switch (nElementToken) { case XML_TOK_TEXT_SENDER_FIRSTNAME: nSubType = UserDataPart::FIRSTNAME; @@ -680,7 +680,7 @@ void XMLSenderFieldImportContext::StartElement( nSubType = UserDataPart::STATE; break; default: - bValid = sal_False; + bValid = false; break; } @@ -747,7 +747,7 @@ XMLAuthorFieldImportContext::XMLAuthorFieldImportContext( sal_uInt16 nPrfx, const OUString& sLocalName, sal_uInt16 nToken) : XMLSenderFieldImportContext(rImport, rHlp, nPrfx, sLocalName, nToken) -, bAuthorFullName(sal_True) +, bAuthorFullName(true) , sServiceAuthor(sAPI_author) , sPropertyAuthorFullName(sAPI_full_name) , sPropertyFixed(sAPI_is_fixed) @@ -761,7 +761,7 @@ void XMLAuthorFieldImportContext::StartElement( const Reference<XAttributeList> & xAttrList) { bAuthorFullName = (XML_TOK_TEXT_AUTHOR_INITIALS != nElementToken); - bValid = sal_True; + bValid = true; // process Attributes XMLTextFieldImportContext::StartElement(xAttrList); @@ -818,9 +818,9 @@ XMLPageContinuationImportContext::XMLPageContinuationImportContext( , sPropertyUserText(sAPI_user_text) , sPropertyNumberingType(sAPI_numbering_type) , eSelectPage(PageNumberType_CURRENT) -, sStringOK(sal_False) +, sStringOK(false) { - bValid = sal_True; + bValid = true; } void XMLPageContinuationImportContext::ProcessAttribute( @@ -841,7 +841,7 @@ void XMLPageContinuationImportContext::ProcessAttribute( } case XML_TOK_TEXTFIELD_STRING_VALUE: sString = sAttrValue; - sStringOK = sal_True; + sStringOK = true; break; } } @@ -879,9 +879,9 @@ XMLPageNumberImportContext::XMLPageNumberImportContext( , sNumberSync(GetXMLToken(XML_FALSE)) , nPageAdjust(0) , eSelectPage(PageNumberType_CURRENT) -, sNumberFormatOK(sal_False) +, sNumberFormatOK(false) { - bValid = sal_True; + bValid = true; } void XMLPageNumberImportContext::ProcessAttribute( @@ -892,7 +892,7 @@ void XMLPageNumberImportContext::ProcessAttribute( { case XML_TOK_TEXTFIELD_NUM_FORMAT: sNumberFormat = sAttrValue; - sNumberFormatOK = sal_True; + sNumberFormatOK = true; break; case XML_TOK_TEXTFIELD_NUM_LETTER_SYNC: sNumberSync = sAttrValue; @@ -1001,7 +1001,7 @@ void XMLPlaceholderFieldImportContext::ProcessAttribute( break; case XML_TOK_TEXTFIELD_PLACEHOLDER_TYPE: - bValid = sal_True; + bValid = true; if (IsXMLToken(sAttrValue, XML_TABLE)) { nPlaceholderType = PlaceholderType::TABLE; @@ -1024,7 +1024,7 @@ void XMLPlaceholderFieldImportContext::ProcessAttribute( } else { - bValid = sal_False; + bValid = false; } break; @@ -1080,13 +1080,13 @@ XMLTimeFieldImportContext::XMLTimeFieldImportContext( , sPropertyIsFixedLanguage(sAPI_is_fixed_language) , nAdjust(0) , nFormatKey(0) -, bTimeOK(sal_False) -, bFormatOK(sal_False) -, bFixed(sal_False) -, bIsDate(sal_False) +, bTimeOK(false) +, bFormatOK(false) +, bFixed(false) +, bIsDate(false) , bIsDefaultLanguage( true ) { - bValid = sal_True; // always valid! + bValid = true; // always valid! } void XMLTimeFieldImportContext::ProcessAttribute( @@ -1099,7 +1099,7 @@ void XMLTimeFieldImportContext::ProcessAttribute( if (::sax::Converter::parseTimeOrDateTime(aDateTimeValue, 0, sAttrValue)) { - bTimeOK = sal_True; + bTimeOK = true; } break; } @@ -1119,7 +1119,7 @@ void XMLTimeFieldImportContext::ProcessAttribute( if (-1 != nKey) { nFormatKey = nKey; - bFormatOK = sal_True; + bFormatOK = true; } break; } @@ -1217,7 +1217,7 @@ XMLDateFieldImportContext::XMLDateFieldImportContext( sal_uInt16 nPrfx, const OUString& sLocalName) : XMLTimeFieldImportContext(rImport, rHlp, nPrfx, sLocalName) { - bIsDate = sal_True; // always a date! + bIsDate = true; // always a date! } void XMLDateFieldImportContext::ProcessAttribute( @@ -1230,7 +1230,7 @@ void XMLDateFieldImportContext::ProcessAttribute( { if (::sax::Converter::parseDateTime(aDateTimeValue, 0, sAttrValue)) { - bTimeOK = sal_True; + bTimeOK = true; } break; } @@ -1272,14 +1272,14 @@ XMLDatabaseFieldImportContext::XMLDatabaseFieldImportContext( , sPropertyDataCommandType(sAPI_data_command_type) , sPropertyIsVisible(sAPI_is_visible) , nCommandType( sdb::CommandType::TABLE ) -, bCommandTypeOK(sal_False) -, bDisplay( sal_True ) +, bCommandTypeOK(false) +, bDisplay( true ) , bDisplayOK( false ) , bUseDisplay( bUseDisply ) -, bDatabaseOK(sal_False) -, bDatabaseNameOK(sal_False) -, bDatabaseURLOK(sal_False) -, bTableOK(sal_False) +, bDatabaseOK(false) +, bDatabaseNameOK(false) +, bDatabaseURLOK(false) +, bTableOK(false) { } @@ -1290,39 +1290,39 @@ void XMLDatabaseFieldImportContext::ProcessAttribute( { case XML_TOK_TEXTFIELD_DATABASE_NAME: sDatabaseName = sAttrValue; - bDatabaseOK = sal_True; - bDatabaseNameOK = sal_True; + bDatabaseOK = true; + bDatabaseNameOK = true; break; case XML_TOK_TEXTFIELD_TABLE_NAME: sTableName = sAttrValue; - bTableOK = sal_True; + bTableOK = true; break; case XML_TOK_TEXTFIELD_TABLE_TYPE: if( IsXMLToken( sAttrValue, XML_TABLE ) ) { nCommandType = sdb::CommandType::TABLE; - bCommandTypeOK = sal_True; + bCommandTypeOK = true; } else if( IsXMLToken( sAttrValue, XML_QUERY ) ) { nCommandType = sdb::CommandType::QUERY; - bCommandTypeOK = sal_True; + bCommandTypeOK = true; } else if( IsXMLToken( sAttrValue, XML_COMMAND ) ) { nCommandType = sdb::CommandType::COMMAND; - bCommandTypeOK = sal_True; + bCommandTypeOK = true; } break; case XML_TOK_TEXTFIELD_DISPLAY: if( IsXMLToken( sAttrValue, XML_NONE ) ) { - bDisplay = sal_False; + bDisplay = false; bDisplayOK = true; } else if( IsXMLToken( sAttrValue, XML_VALUE ) ) { - bDisplay = sal_True; + bDisplay = true; bDisplayOK = true; } break; @@ -1349,8 +1349,8 @@ SvXMLImportContext* XMLDatabaseFieldImportContext::CreateChildContext( IsXMLToken( sLocalName, XML_HREF ) ) { sDatabaseURL = xAttrList->getValueByIndex(n); - bDatabaseOK = sal_True; - bDatabaseURLOK = sal_True; + bDatabaseOK = true; + bDatabaseURLOK = true; } } @@ -1438,7 +1438,7 @@ XMLDatabaseNextImportContext::XMLDatabaseNextImportContext( sPropertyCondition(sAPI_condition), sTrue(sAPI_true), sCondition(), - bConditionOK(sal_False) + bConditionOK(false) { } @@ -1448,7 +1448,7 @@ XMLDatabaseNextImportContext::XMLDatabaseNextImportContext( : XMLDatabaseFieldImportContext(rImport, rHlp, sAPI_database_next, nPrfx, sLocalName, false) , sPropertyCondition(sAPI_condition) , sTrue(sAPI_true) -, bConditionOK(sal_False) +, bConditionOK(false) { } @@ -1463,7 +1463,7 @@ void XMLDatabaseNextImportContext::ProcessAttribute( if( XML_NAMESPACE_OOOW == nPrefix ) { sCondition = sTmp; - bConditionOK = sal_True; + bConditionOK = true; } else sCondition = sAttrValue; @@ -1503,7 +1503,7 @@ XMLDatabaseSelectImportContext::XMLDatabaseSelectImportContext( nPrfx, sLocalName), sPropertySetNumber(sAPI_set_number), nNumber(0), - bNumberOK(sal_False) + bNumberOK(false) { } @@ -1518,7 +1518,7 @@ void XMLDatabaseSelectImportContext::ProcessAttribute( /* , nMin, nMax ??? */ )) { nNumber = nTmp; - bNumberOK = sal_True; + bNumberOK = true; } } else @@ -1559,7 +1559,7 @@ XMLDatabaseNumberImportContext::XMLDatabaseNumberImportContext( sNumberFormat("1"), sNumberSync(GetXMLToken(XML_FALSE)), nValue(0), - bValueOK(sal_False) + bValueOK(false) { } @@ -1581,7 +1581,7 @@ void XMLDatabaseNumberImportContext::ProcessAttribute( if (::sax::Converter::convertNumber( nTmp, sAttrValue )) { nValue = nTmp; - bValueOK = sal_True; + bValueOK = true; } break; } @@ -1626,17 +1626,17 @@ TYPEINIT1( XMLSimpleDocInfoImportContext, XMLTextFieldImportContext ); XMLSimpleDocInfoImportContext::XMLSimpleDocInfoImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName, sal_uInt16 nToken, - sal_Bool bContent, sal_Bool bAuthor) + bool bContent, bool bAuthor) : XMLTextFieldImportContext(rImport, rHlp, MapTokenToServiceName(nToken),nPrfx, sLocalName) , sPropertyFixed(sAPI_is_fixed) , sPropertyContent(sAPI_content) , sPropertyAuthor(sAPI_author) , sPropertyCurrentPresentation(sAPI_current_presentation) -, bFixed(sal_False) +, bFixed(false) , bHasAuthor(bAuthor) , bHasContent(bContent) { - bValid = sal_True; + bValid = true; } void XMLSimpleDocInfoImportContext::ProcessAttribute( @@ -1771,10 +1771,10 @@ XMLRevisionDocInfoImportContext::XMLRevisionDocInfoImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName, sal_uInt16 nToken) : XMLSimpleDocInfoImportContext(rImport, rHlp, nPrfx, sLocalName, - nToken, sal_False, sal_False), + nToken, false, false), sPropertyRevision(sAPI_revision) { - bValid = sal_True; + bValid = true; } void XMLRevisionDocInfoImportContext::PrepareField( @@ -1815,12 +1815,12 @@ TYPEINIT1( XMLDateTimeDocInfoImportContext, XMLSimpleDocInfoImportContext ); XMLDateTimeDocInfoImportContext::XMLDateTimeDocInfoImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName, sal_uInt16 nToken) - : XMLSimpleDocInfoImportContext(rImport, rHlp, nPrfx, sLocalName,nToken, sal_False, sal_False) + : XMLSimpleDocInfoImportContext(rImport, rHlp, nPrfx, sLocalName,nToken, false, false) , sPropertyNumberFormat(sAPI_number_format) , sPropertyIsDate(sAPI_is_date) , sPropertyIsFixedLanguage(sAPI_is_fixed_language) , nFormat(0) - , bFormatOK(sal_False) + , bFormatOK(false) , bIsDate(false) , bHasDateTime(false) , bIsDefaultLanguage(true) @@ -1829,29 +1829,29 @@ XMLDateTimeDocInfoImportContext::XMLDateTimeDocInfoImportContext( // is not supported anyway. If it was, we'd need an extra import class // because times and time durations are presented differently! - bValid = sal_True; + bValid = true; switch (nToken) { case XML_TOK_TEXT_DOCUMENT_CREATION_DATE: case XML_TOK_TEXT_DOCUMENT_PRINT_DATE: case XML_TOK_TEXT_DOCUMENT_SAVE_DATE: - bIsDate = sal_True; - bHasDateTime = sal_True; + bIsDate = true; + bHasDateTime = true; break; case XML_TOK_TEXT_DOCUMENT_CREATION_TIME: case XML_TOK_TEXT_DOCUMENT_PRINT_TIME: case XML_TOK_TEXT_DOCUMENT_SAVE_TIME: - bIsDate = sal_False; - bHasDateTime = sal_True; + bIsDate = false; + bHasDateTime = true; break; case XML_TOK_TEXT_DOCUMENT_EDIT_DURATION: - bIsDate = sal_False; - bHasDateTime = sal_False; + bIsDate = false; + bHasDateTime = false; break; default: OSL_FAIL( "XMLDateTimeDocInfoImportContext needs date/time doc. fields"); - bValid = sal_False; + bValid = false; break; } } @@ -1869,7 +1869,7 @@ void XMLDateTimeDocInfoImportContext::ProcessAttribute( if (-1 != nKey) { nFormat = nKey; - bFormatOK = sal_True; + bFormatOK = true; } break; } @@ -1926,15 +1926,15 @@ XMLUserDocInfoImportContext::XMLUserDocInfoImportContext( sal_uInt16 nPrfx, const OUString& sLocalName, sal_uInt16 nToken) : XMLSimpleDocInfoImportContext(rImport, rHlp, nPrfx, sLocalName, nToken, - sal_False, sal_False) + false, false) , sPropertyName(sAPI_name) , sPropertyNumberFormat(sAPI_number_format) , sPropertyIsFixedLanguage(sAPI_is_fixed_language) , nFormat(0) - , bFormatOK(sal_False) + , bFormatOK(false) , bIsDefaultLanguage( true ) { - bValid = sal_False; + bValid = false; } void XMLUserDocInfoImportContext::ProcessAttribute( @@ -1950,7 +1950,7 @@ void XMLUserDocInfoImportContext::ProcessAttribute( if (-1 != nKey) { nFormat = nKey; - bFormatOK = sal_True; + bFormatOK = true; } break; } @@ -1960,7 +1960,7 @@ void XMLUserDocInfoImportContext::ProcessAttribute( { SetServiceName(OUString(sAPI_docinfo_custom ) ); aName = sAttrValue; - bValid = sal_True; + bValid = true; } break; } @@ -2017,7 +2017,7 @@ XMLHiddenParagraphImportContext::XMLHiddenParagraphImportContext( sPropertyCondition(sAPI_condition), sPropertyIsHidden(sAPI_is_hidden), sCondition(), - bIsHidden(sal_False) + bIsHidden(false) { } @@ -2033,7 +2033,7 @@ void XMLHiddenParagraphImportContext::ProcessAttribute( if( XML_NAMESPACE_OOOW == nPrefix ) { sCondition = sTmp; - bValid = sal_True; + bValid = true; } else sCondition = sAttrValue; @@ -2077,10 +2077,10 @@ XMLConditionalTextImportContext::XMLConditionalTextImportContext( sPropertyFalseContent(sAPI_false_content), sPropertyIsConditionTrue(sAPI_is_condition_true), sPropertyCurrentPresentation(sAPI_current_presentation), - bConditionOK(sal_False), - bTrueOK(sal_False), - bFalseOK(sal_False), - bCurrentValue(sal_False) + bConditionOK(false), + bTrueOK(false), + bFalseOK(false), + bCurrentValue(false) { } @@ -2098,7 +2098,7 @@ void XMLConditionalTextImportContext::ProcessAttribute( if( XML_NAMESPACE_OOOW == nPrefix ) { sCondition = sTmp; - bConditionOK = sal_True; + bConditionOK = true; } else sCondition = sAttrValue; @@ -2106,11 +2106,11 @@ void XMLConditionalTextImportContext::ProcessAttribute( break; case XML_TOK_TEXTFIELD_STRING_VALUE_IF_FALSE: sFalseContent = sAttrValue; - bFalseOK = sal_True; + bFalseOK = true; break; case XML_TOK_TEXTFIELD_STRING_VALUE_IF_TRUE: sTrueContent = sAttrValue; - bTrueOK = sal_True; + bTrueOK = true; break; case XML_TOK_TEXTFIELD_CURRENT_VALUE: { @@ -2163,9 +2163,9 @@ XMLHiddenTextImportContext::XMLHiddenTextImportContext( sPropertyCondition(sAPI_condition), sPropertyContent(sAPI_content), sPropertyIsHidden(sAPI_is_hidden), - bConditionOK(sal_False), - bStringOK(sal_False), - bIsHidden(sal_False) + bConditionOK(false), + bStringOK(false), + bIsHidden(false) { } @@ -2183,7 +2183,7 @@ void XMLHiddenTextImportContext::ProcessAttribute( if( XML_NAMESPACE_OOOW == nPrefix ) { sCondition = sTmp; - bConditionOK = sal_True; + bConditionOK = true; } else sCondition = sAttrValue; @@ -2191,7 +2191,7 @@ void XMLHiddenTextImportContext::ProcessAttribute( break; case XML_TOK_TEXTFIELD_STRING_VALUE: sString = sAttrValue; - bStringOK = sal_True; + bStringOK = true; break; case XML_TOK_TEXTFIELD_IS_HIDDEN: { @@ -2249,9 +2249,9 @@ XMLFileNameImportContext::XMLFileNameImportContext( sPropertyCurrentPresentation( sAPI_current_presentation), nFormat(FilenameDisplayFormat::FULL), - bFixed(sal_False) + bFixed(false) { - bValid = sal_True; + bValid = true; } void XMLFileNameImportContext::ProcessAttribute( @@ -2339,7 +2339,7 @@ XMLTemplateNameImportContext::XMLTemplateNameImportContext( sPropertyFileFormat(sAPI_file_format), nFormat(TemplateDisplayFormat::FULL) { - bValid = sal_True; + bValid = true; } void XMLTemplateNameImportContext::ProcessAttribute( @@ -2401,7 +2401,7 @@ XMLChapterImportContext::XMLChapterImportContext( nFormat(ChapterFormat::NAME_NUMBER), nLevel(0) { - bValid = sal_True; + bValid = true; } void XMLChapterImportContext::ProcessAttribute( @@ -2468,9 +2468,9 @@ XMLCountFieldImportContext::XMLCountFieldImportContext( sAPI_numbering_type), sNumberFormat(), sLetterSync(), - bNumberFormatOK(sal_False) + bNumberFormatOK(false) { - bValid = sal_True; + bValid = true; } void XMLCountFieldImportContext::ProcessAttribute( @@ -2481,7 +2481,7 @@ void XMLCountFieldImportContext::ProcessAttribute( { case XML_TOK_TEXTFIELD_NUM_FORMAT: sNumberFormat = sAttrValue; - bNumberFormatOK = sal_True; + bNumberFormatOK = true; break; case XML_TOK_TEXTFIELD_NUM_LETTER_SYNC: sLetterSync = sAttrValue; @@ -2569,9 +2569,9 @@ XMLPageVarGetFieldImportContext::XMLPageVarGetFieldImportContext( sAPI_numbering_type), sNumberFormat(), sLetterSync(), - bNumberFormatOK(sal_False) + bNumberFormatOK(false) { - bValid = sal_True; + bValid = true; } void XMLPageVarGetFieldImportContext::ProcessAttribute( @@ -2582,7 +2582,7 @@ void XMLPageVarGetFieldImportContext::ProcessAttribute( { case XML_TOK_TEXTFIELD_NUM_FORMAT: sNumberFormat = sAttrValue; - bNumberFormatOK = sal_True; + bNumberFormatOK = true; break; case XML_TOK_TEXTFIELD_NUM_LETTER_SYNC: sLetterSync = sAttrValue; @@ -2631,9 +2631,9 @@ XMLPageVarSetFieldImportContext::XMLPageVarSetFieldImportContext( sPropertyOn(sAPI_on), sPropertyOffset(sAPI_offset), nAdjust(0), - bActive(sal_True) + bActive(true) { - bValid = sal_True; + bValid = true; } void XMLPageVarSetFieldImportContext::ProcessAttribute( @@ -2693,7 +2693,7 @@ XMLMacroFieldImportContext::XMLMacroFieldImportContext( sPropertyHint(sAPI_hint), sPropertyMacroName("MacroName"), sPropertyScriptURL("ScriptURL"), - bDescriptionOK(sal_False) + bDescriptionOK(false) { } @@ -2711,7 +2711,7 @@ SvXMLImportContext* XMLMacroFieldImportContext::CreateChildContext( pContext = new XMLEventsImportContext( GetImport(), nPrefix, rLocalName ); xEventContext = pContext; - bValid = sal_True; + bValid = true; } else pContext = SvXMLImportContext::CreateChildContext( @@ -2729,11 +2729,11 @@ void XMLMacroFieldImportContext::ProcessAttribute( { case XML_TOK_TEXTFIELD_DESCRIPTION: sDescription = sAttrValue; - bDescriptionOK = sal_True; + bDescriptionOK = true; break; case XML_TOK_TEXTFIELD_NAME: sMacro = sAttrValue; - bValid = sal_True; + bValid = true; break; } } @@ -2836,8 +2836,8 @@ XMLReferenceFieldImportContext::XMLReferenceFieldImportContext( , nElementToken(nToken) , nSource(0) , nType(ReferenceFieldPart::PAGE_DESC) -, bNameOK(sal_False) -, bTypeOK(sal_False) +, bNameOK(false) +, bTypeOK(false) { } @@ -2860,7 +2860,7 @@ static SvXMLEnumMapEntry const lcl_aReferenceTypeTokenMap[] = void XMLReferenceFieldImportContext::StartElement( const Reference<XAttributeList> & xAttrList) { - bTypeOK = sal_True; + bTypeOK = true; switch (nElementToken) { case XML_TOK_TEXT_REFERENCE_REF: @@ -2876,7 +2876,7 @@ void XMLReferenceFieldImportContext::StartElement( nSource = ReferenceFieldSource::SEQUENCE_FIELD; break; default: - bTypeOK = sal_False; + bTypeOK = false; OSL_FAIL("unknown reference field"); break; } @@ -2897,7 +2897,7 @@ void XMLReferenceFieldImportContext::ProcessAttribute( break; case XML_TOK_TEXTFIELD_REF_NAME: sName = sAttrValue; - bNameOK = sal_True; + bNameOK = true; break; case XML_TOK_TEXTFIELD_REFERENCE_FORMAT: { @@ -3176,7 +3176,7 @@ void XMLDdeFieldImportContext::ProcessAttribute( if (XML_TOK_TEXTFIELD_CONNECTION_NAME == nAttrToken) { sName = sAttrValue; - bValid = sal_True; + bValid = true; } } @@ -3251,7 +3251,7 @@ XMLSheetNameImportContext::XMLSheetNameImportContext( XMLTextFieldImportContext(rImport, rHlp, sAPI_sheet_name, nPrfx, sLocalName) { - bValid = sal_True; // always valid! + bValid = true; // always valid! } void XMLSheetNameImportContext::ProcessAttribute( @@ -3285,7 +3285,7 @@ XMLUrlFieldImportContext::XMLUrlFieldImportContext( sPropertyTargetFrame(sAPI_target_frame), sPropertyRepresentation( sAPI_representation), - bFrameOK(sal_False) + bFrameOK(false) { } @@ -3297,11 +3297,11 @@ void XMLUrlFieldImportContext::ProcessAttribute( { case XML_TOK_TEXTFIELD_HREF: sURL = GetImport().GetAbsoluteReference( sAttrValue ); - bValid = sal_True; + bValid = true; break; case XML_TOK_TEXTFIELD_TARGET_FRAME: sFrame = sAttrValue; - bFrameOK = sal_True; + bFrameOK = true; break; default: // ignore @@ -3341,7 +3341,7 @@ XMLBibliographyFieldImportContext::XMLBibliographyFieldImportContext( sPropertyFields("Fields"), aValues() { - bValid = sal_True; + bValid = true; } // TODO: this is the same map as is used in the text field export @@ -3612,7 +3612,7 @@ XMLAnnotationImportContext::XMLAnnotationImportContext( sPropertyName(sAPI_name), m_nToken(nToken) { - bValid = sal_True; + bValid = true; // remember old list item and block (#91964#) and reset them // for the text frame @@ -3832,8 +3832,8 @@ XMLScriptImportContext::XMLScriptImportContext( , sPropertyScriptType(sAPI_script_type) , sPropertyURLContent(sAPI_url_content) , sPropertyContent(sAPI_content) -, bContentOK(sal_False) -, bScriptTypeOK(sal_False) +, bContentOK(false) +, bScriptTypeOK(false) { } @@ -3845,12 +3845,12 @@ void XMLScriptImportContext::ProcessAttribute( { case XML_TOK_TEXTFIELD_HREF: sContent = GetImport().GetAbsoluteReference( sAttrValue ); - bContentOK = sal_True; + bContentOK = true; break; case XML_TOK_TEXTFIELD_LANGUAGE: sScriptType = sAttrValue; - bScriptTypeOK = sal_True; + bScriptTypeOK = true; break; default: @@ -3859,7 +3859,7 @@ void XMLScriptImportContext::ProcessAttribute( } // always valid (even without ScriptType; cf- #96531#) - bValid = sal_True; + bValid = true; } void XMLScriptImportContext::PrepareField( @@ -3909,15 +3909,15 @@ void XMLMeasureFieldImportContext::ProcessAttribute( case XML_TOK_TEXTFIELD_MEASURE_KIND: if( IsXMLToken( sAttrValue, XML_VALUE ) ) { - mnKind = 0; bValid = sal_True; + mnKind = 0; bValid = true; } else if( IsXMLToken( sAttrValue, XML_UNIT ) ) { - mnKind = 1; bValid = sal_True; + mnKind = 1; bValid = true; } else if( IsXMLToken( sAttrValue, XML_GAP ) ) { - mnKind = 2; bValid = sal_True; + mnKind = 2; bValid = true; } break; } @@ -3959,7 +3959,7 @@ XMLDropDownFieldImportContext::XMLDropDownFieldImportContext( sPropertyHelp( "Help" ), sPropertyToolTip( "Tooltip" ) { - bValid = sal_True; + bValid = true; } static bool lcl_ProcessLabel( const SvXMLImport& rImport, @@ -4089,7 +4089,7 @@ XMLHeaderFieldImportContext::XMLHeaderFieldImportContext( : XMLTextFieldImportContext(rImport, rHlp, sAPI_header, nPrfx, sLocalName ) { sServicePrefix = OUString(sAPI_presentation_prefix ); - bValid = sal_True; + bValid = true; } /// process attribute values @@ -4113,7 +4113,7 @@ XMLFooterFieldImportContext::XMLFooterFieldImportContext( : XMLTextFieldImportContext(rImport, rHlp, sAPI_footer, nPrfx, sLocalName ) { sServicePrefix = OUString(sAPI_presentation_prefix ); - bValid = sal_True; + bValid = true; } /// process attribute values @@ -4138,7 +4138,7 @@ XMLDateTimeFieldImportContext::XMLDateTimeFieldImportContext( : XMLTextFieldImportContext(rImport, rHlp, sAPI_datetime, nPrfx, sLocalName ) { sServicePrefix = OUString(sAPI_presentation_prefix ); - bValid = sal_True; + bValid = true; } /// process attribute values diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx index 6637dd204702..4db45c9e2d7b 100644 --- a/xmloff/source/text/txtftne.cxx +++ b/xmloff/source/text/txtftne.cxx @@ -77,7 +77,7 @@ void XMLTextParagraphExport::exportTextFootnote( // are we an endnote? Reference<XServiceInfo> xServiceInfo( xFootnote, UNO_QUERY ); - sal_Bool bIsEndnote = xServiceInfo->supportsService(sTextEndnoteService); + bool bIsEndnote = xServiceInfo->supportsService(sTextEndnoteService); if (bAutoStyles) { diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index fa90b129c502..5c5e17e09026 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -1578,7 +1578,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( // TODO: property missing if (xPropSetInfo->hasPropertyByName(s_ParaIsNumberingRestart)) { - sal_Bool bTmp = sal_True; + bool bTmp = true; xPropSet->setPropertyValue(s_ParaIsNumberingRestart, makeAny(bTmp) ); } @@ -2287,7 +2287,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( rImport, nPrefix, rLocalName, (XML_TOK_TEXT_CHANGE_END != nToken), (XML_TOK_TEXT_CHANGE_START != nToken), - sal_True); + true); break; case XML_TOK_TEXT_FORMS: diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index 2fa6149fe450..7aee4303cc01 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -47,7 +47,7 @@ bool XMLTextImportPropertyMapper::handleSpecialItem( const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nIndex = rProperty.mnIndex; switch( getPropertySetMapper()->GetEntryContextId( nIndex ) ) { @@ -94,7 +94,7 @@ bool XMLTextImportPropertyMapper::handleSpecialItem( rProperty.mnIndex+1, rProperty.mnIndex+2, rProperty.mnIndex+3, rProperty.mnIndex+4, rProperty.mnIndex+5 ); - bRet = sal_False; // the property hasn't been filled + bRet = false; // the property hasn't been filled } break; @@ -115,7 +115,7 @@ bool XMLTextImportPropertyMapper::handleSpecialItem( rUnitConverter ); if( SvXMLImport::OOo_2x == GetImport().getGeneratorVersion() ) { - sal_Bool bHidden; + bool bHidden; rProperty.maValue >>= bHidden; bHidden = !bHidden; rProperty.maValue <<= bHidden; @@ -339,10 +339,10 @@ void XMLTextImportPropertyMapper::finished( ::std::vector< XMLPropertyState >& rProperties, sal_Int32 /*nStartIndex*/, sal_Int32 /*nEndIndex*/ ) const { - sal_Bool bHasAnyHeight = sal_False; - sal_Bool bHasAnyMinHeight = sal_False; - sal_Bool bHasAnyWidth = sal_False; - sal_Bool bHasAnyMinWidth = sal_False; + bool bHasAnyHeight = false; + bool bHasAnyMinHeight = false; + bool bHasAnyWidth = false; + bool bHasAnyMinWidth = false; XMLPropertyState* pFontFamilyName = 0; XMLPropertyState* pFontStyleName = 0; @@ -469,19 +469,19 @@ void XMLTextImportPropertyMapper::finished( case CTF_FRAMEHEIGHT_MIN_ABS: case CTF_FRAMEHEIGHT_MIN_REL: // case CTF_SYNCHEIGHT_MIN: - bHasAnyMinHeight = sal_True; + bHasAnyMinHeight = true; // no break here! case CTF_FRAMEHEIGHT_ABS: case CTF_FRAMEHEIGHT_REL: // case CTF_SYNCHEIGHT: - bHasAnyHeight = sal_True; break; + bHasAnyHeight = true; break; case CTF_FRAMEWIDTH_MIN_ABS: case CTF_FRAMEWIDTH_MIN_REL: - bHasAnyMinWidth = sal_True; + bHasAnyMinWidth = true; // no break here! case CTF_FRAMEWIDTH_ABS: case CTF_FRAMEWIDTH_REL: - bHasAnyWidth = sal_True; break; + bHasAnyWidth = true; break; case CTF_BACKGROUND_TRANSPARENCY: pBackTransparency = property; break; case CTF_BACKGROUND_TRANSPARENT: pBackTransparent = property; break; case CTF_PARAMARGINALL: diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx index 7d10978e04c4..5b882a6514cc 100644 --- a/xmloff/source/text/txtlists.cxx +++ b/xmloff/source/text/txtlists.cxx @@ -176,11 +176,11 @@ void XMLTextListsHelper::KeepListAsProcessed( const OUString& sListId, } } -sal_Bool XMLTextListsHelper::IsListProcessed( const OUString& sListId ) const +bool XMLTextListsHelper::IsListProcessed( const OUString& sListId ) const { if ( mpProcessedLists == 0 ) { - return sal_False; + return false; } return mpProcessedLists->find( sListId ) != mpProcessedLists->end(); @@ -339,7 +339,7 @@ void XMLTextListsHelper::PopListFromStack() } } -sal_Bool XMLTextListsHelper::EqualsToTopListStyleOnStack( const OUString& sListId ) const +bool XMLTextListsHelper::EqualsToTopListStyleOnStack( const OUString& sListId ) const { return mpListStack != 0 ? sListId == mpListStack->back().second @@ -447,8 +447,8 @@ XMLTextListsHelper::MakeNumRule( const OUString& i_ParentStyleName, const OUString& i_StyleName, sal_Int16 & io_rLevel, - sal_Bool* o_pRestartNumbering, - sal_Bool* io_pSetDefaults) + bool* o_pRestartNumbering, + bool* io_pSetDefaults) { static OUString s_NumberingRules( "NumberingRules"); uno::Reference<container::XIndexReplace> xNumRules(i_rNumRule); @@ -486,7 +486,7 @@ XMLTextListsHelper::MakeNumRule( } } - sal_Bool bSetDefaults(io_pSetDefaults ? *io_pSetDefaults : sal_False); + bool bSetDefaults(io_pSetDefaults ? *io_pSetDefaults : sal_False); if ( !xNumRules.is() ) { // If no style name has been specified for this style and for any @@ -500,8 +500,8 @@ XMLTextListsHelper::MakeNumRule( return xNumRules; // Because it is a new num rule, numbering must not be restarted. - if (o_pRestartNumbering) *o_pRestartNumbering = sal_False; - bSetDefaults = sal_True; + if (o_pRestartNumbering) *o_pRestartNumbering = false; + bSetDefaults = true; if (io_pSetDefaults) *io_pSetDefaults = bSetDefaults; } diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 0e717315e8a1..19c4fa826c0f 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -414,7 +414,7 @@ void FieldParamExporter::Export() } else if(aValueType == aBoolType) { - sal_Bool bValue = false; + bool bValue = false; aValue >>= bValue; ExportParameter(*pCurrent, (bValue ? OUString("true" ) : OUString("false")) ); } @@ -506,7 +506,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, OUString sName; if( xNamed.is() ) sName = xNamed->getName(); - sal_Bool bAdd = sName.isEmpty(); + bool bAdd = sName.isEmpty(); if( !bAdd ) { Reference < XPropertySet > xNumPropSet( xNumRule, @@ -528,7 +528,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, } else { - bAdd = sal_True; + bAdd = true; } } if( bAdd ) @@ -623,7 +623,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, OUString sName; if( xNamed.is() ) sName = xNamed->getName(); - sal_Bool bAdd = sName.isEmpty(); + bool bAdd = sName.isEmpty(); if( !bAdd ) { Reference < XPropertySet > xNumPropSet( xNumRule, @@ -645,7 +645,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, } else { - bAdd = sal_True; + bAdd = true; } } if( bAdd ) @@ -1625,7 +1625,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress ) OUString sName; if( xNamed.is() ) sName = xNamed->getName(); - sal_Bool bAdd = sName.isEmpty(); + bool bAdd = sName.isEmpty(); if( !bAdd ) { Reference < XPropertySet > xNumPropSet( xNumRule, @@ -1646,7 +1646,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress ) } else { - bAdd = sal_True; + bAdd = true; } } if( bAdd ) @@ -1711,11 +1711,11 @@ void XMLTextParagraphExport::exportText( // #96530# Export redlines at start & end of XText before & after // exporting the text content enumeration if( !bAutoStyles && (pRedlineExport != NULL) ) - pRedlineExport->ExportStartOrEndRedline( xPropertySet, sal_True ); + pRedlineExport->ExportStartOrEndRedline( xPropertySet, true ); exportTextContentEnumeration( xParaEnum, bAutoStyles, xBaseSection, bIsProgress, bExportParagraph, 0, bExportLevels ); if( !bAutoStyles && (pRedlineExport != NULL) ) - pRedlineExport->ExportStartOrEndRedline( xPropertySet, sal_False ); + pRedlineExport->ExportStartOrEndRedline( xPropertySet, false ); } void XMLTextParagraphExport::exportText( @@ -1741,12 +1741,12 @@ void XMLTextParagraphExport::exportText( if( !bAutoStyles && (pRedlineExport != NULL) ) { xPropertySet.set(rText, uno::UNO_QUERY ); - pRedlineExport->ExportStartOrEndRedline( xPropertySet, sal_True ); + pRedlineExport->ExportStartOrEndRedline( xPropertySet, true ); } exportTextContentEnumeration( xParaEnum, bAutoStyles, rBaseSection, bIsProgress, bExportParagraph ); if( !bAutoStyles && (pRedlineExport != NULL) ) - pRedlineExport->ExportStartOrEndRedline( xPropertySet, sal_False ); + pRedlineExport->ExportStartOrEndRedline( xPropertySet, false ); } bool XMLTextParagraphExport::exportTextContentEnumeration( @@ -1827,7 +1827,7 @@ bool XMLTextParagraphExport::exportTextContentEnumeration( while (rContEnum->hasMoreElements() && pSectionExport->IsInSection( xCurrentTextSection, - xTxtCntnt, sal_True )) + xTxtCntnt, true )) { xTxtCntnt.set(rContEnum->nextElement(), uno::UNO_QUERY); aPropSetHelper.resetValues(); @@ -1836,7 +1836,7 @@ bool XMLTextParagraphExport::exportTextContentEnumeration( // the first non-mute element still needs to be processed bHoldElement = ! pSectionExport->IsInSection( xCurrentTextSection, - xTxtCntnt, sal_False ); + xTxtCntnt, false ); } else exportParagraph( xTxtCntnt, bAutoStyles, bIsProgress, @@ -1858,12 +1858,12 @@ bool XMLTextParagraphExport::exportTextContentEnumeration( { // export start + end redlines (for wholly redlined tables) if ((! bAutoStyles) && (NULL != pRedlineExport)) - pRedlineExport->ExportStartOrEndRedline(xTxtCntnt, sal_True); + pRedlineExport->ExportStartOrEndRedline(xTxtCntnt, true); exportTable( xTxtCntnt, bAutoStyles, bIsProgress ); if ((! bAutoStyles) && (NULL != pRedlineExport)) - pRedlineExport->ExportStartOrEndRedline(xTxtCntnt, sal_False); + pRedlineExport->ExportStartOrEndRedline(xTxtCntnt, false); } else if( !bAutoStyles ) { @@ -2686,7 +2686,7 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes( GetExport().AddAttribute( XML_NAMESPACE_SVG, XML_WIDTH, sValue.makeStringAndClear() ); } - sal_Bool bSyncWidth = sal_False; + bool bSyncWidth = false; if( xPropSetInfo->hasPropertyByName( sIsSyncWidthToHeight ) ) { bSyncWidth = *(sal_Bool *)rPropSet->getPropertyValue( sIsSyncWidthToHeight ).getValue(); @@ -2714,7 +2714,7 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes( { rPropSet->getPropertyValue( sSizeType ) >>= nSizeType; } - sal_Bool bSyncHeight = sal_False; + bool bSyncHeight = false; if( xPropSetInfo->hasPropertyByName( sIsSyncHeightToWidth ) ) { bSyncHeight = *(sal_Bool *)rPropSet->getPropertyValue( sIsSyncHeightToWidth ).getValue(); @@ -2829,7 +2829,7 @@ void XMLTextParagraphExport::exportAnyTextFrame( Reference< XPropertySetInfo > xPropSetInfo(xPropSet->getPropertySetInfo()); Reference< XPropertyState > xPropState( xPropSet, UNO_QUERY ); { - sal_Bool bAddCharStyles = pRangePropSet && + bool bAddCharStyles = pRangePropSet && lcl_txtpara_isBoundAsChar( xPropSet, xPropSetInfo ); bool bIsUICharStyle; @@ -3043,7 +3043,7 @@ void XMLTextParagraphExport::exportContour( if( rPropSetInfo->hasPropertyByName( sIsAutomaticContour ) ) { - sal_Bool bTmp = *(sal_Bool *)rPropSet->getPropertyValue( + bool bTmp = *(sal_Bool *)rPropSet->getPropertyValue( sIsAutomaticContour ).getValue(); GetExport().AddAttribute( XML_NAMESPACE_DRAW, XML_RECREATE_ON_EDIT, bTmp ? XML_TRUE : XML_FALSE ); @@ -3229,9 +3229,9 @@ bool XMLTextParagraphExport::addHyperlinkAttributes( const Reference< XPropertyState > & rPropState, const Reference< XPropertySetInfo > & rPropSetInfo ) { - sal_Bool bExport = sal_False; + bool bExport = false; OUString sHRef, sName, sTargetFrame, sUStyleName, sVStyleName; - sal_Bool bServerMap = sal_False; + bool bServerMap = false; if( rPropSetInfo->hasPropertyByName( sHyperLinkURL ) && ( !rPropState.is() || PropertyState_DIRECT_VALUE == @@ -3240,7 +3240,7 @@ bool XMLTextParagraphExport::addHyperlinkAttributes( rPropSet->getPropertyValue( sHyperLinkURL ) >>= sHRef; if( !sHRef.isEmpty() ) - bExport = sal_True; + bExport = true; } if ( sHRef.isEmpty() ) @@ -3256,7 +3256,7 @@ bool XMLTextParagraphExport::addHyperlinkAttributes( { rPropSet->getPropertyValue( sHyperLinkName ) >>= sName; if( !sName.isEmpty() ) - bExport = sal_True; + bExport = true; } if ( rPropSetInfo->hasPropertyByName( sHyperLinkTarget ) @@ -3265,7 +3265,7 @@ bool XMLTextParagraphExport::addHyperlinkAttributes( { rPropSet->getPropertyValue( sHyperLinkTarget ) >>= sTargetFrame; if( !sTargetFrame.isEmpty() ) - bExport = sal_True; + bExport = true; } if ( rPropSetInfo->hasPropertyByName( sServerMap ) @@ -3274,7 +3274,7 @@ bool XMLTextParagraphExport::addHyperlinkAttributes( { bServerMap = *(sal_Bool *) rPropSet->getPropertyValue( sServerMap ).getValue(); if ( bServerMap ) - bExport = sal_True; + bExport = true; } if ( rPropSetInfo->hasPropertyByName( sUnvisitedCharStyleName ) @@ -3283,7 +3283,7 @@ bool XMLTextParagraphExport::addHyperlinkAttributes( { rPropSet->getPropertyValue( sUnvisitedCharStyleName ) >>= sUStyleName; if( !sUStyleName.isEmpty() ) - bExport = sal_True; + bExport = true; } if ( rPropSetInfo->hasPropertyByName( sVisitedCharStyleName ) @@ -3292,7 +3292,7 @@ bool XMLTextParagraphExport::addHyperlinkAttributes( { rPropSet->getPropertyValue( sVisitedCharStyleName ) >>= sVStyleName; if( !sVStyleName.isEmpty() ) - bExport = sal_True; + bExport = true; } if ( bExport ) @@ -3653,7 +3653,7 @@ void XMLTextParagraphExport::exportRuby( return; // start value ? - sal_Bool bStart = (*(sal_Bool*)rPropSet->getPropertyValue(sIsStart).getValue()); + bool bStart = (*(sal_Bool*)rPropSet->getPropertyValue(sIsStart).getValue()); if (bAutoStyles) { @@ -3797,7 +3797,7 @@ void XMLTextParagraphExport::PreventExportOfControlsInMuteSections( Reference<XTextContent> xTextContent( xControlShape, UNO_QUERY ); if( xTextContent.is() ) { - if( pSectionExport->IsMuteSection( xTextContent, sal_False ) ) + if( pSectionExport->IsMuteSection( xTextContent, false ) ) { // Ah, we've found a shape that // 1) is a control shape diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index caef6afda132..3386c344d68a 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -166,7 +166,7 @@ public: XMLHints_Impl& rHnts, const Reference<xml::sax::XAttributeList> & xAttrList); - static sal_Bool FindName( + static bool FindName( SvXMLImport& rImport, const Reference<xml::sax::XAttributeList> & xAttrList, OUString& rName); @@ -196,12 +196,12 @@ XMLStartReferenceContext_Impl::XMLStartReferenceContext_Impl( } } -sal_Bool XMLStartReferenceContext_Impl::FindName( +bool XMLStartReferenceContext_Impl::FindName( SvXMLImport& rImport, const Reference<xml::sax::XAttributeList> & xAttrList, OUString& rName) { - sal_Bool bNameOK( sal_False ); + bool bNameOK( false ); // find name attribute first const sal_Int16 nLength( xAttrList->getLength() ); @@ -216,7 +216,7 @@ sal_Bool XMLStartReferenceContext_Impl::FindName( IsXMLToken(sLocalName, XML_NAME) ) { rName = xAttrList->getValueByIndex(nAttr); - bNameOK = sal_True; + bNameOK = true; } } @@ -1044,7 +1044,7 @@ protected: static void GetServiceName(OUString& sServiceName, enum XMLTextPElemTokens nToken); - sal_Bool CreateMark(Reference<beans::XPropertySet>& rPropSet, + bool CreateMark(Reference<beans::XPropertySet>& rPropSet, const OUString& rServiceName); }; @@ -1261,7 +1261,7 @@ void XMLIndexMarkImportContext_Impl::GetServiceName( } } -sal_Bool XMLIndexMarkImportContext_Impl::CreateMark( +bool XMLIndexMarkImportContext_Impl::CreateMark( Reference<beans::XPropertySet>& rPropSet, const OUString& rServiceName) { @@ -1273,10 +1273,10 @@ sal_Bool XMLIndexMarkImportContext_Impl::CreateMark( Reference<beans::XPropertySet> xPropSet( xFactory->createInstance(rServiceName), UNO_QUERY ); if (xPropSet.is()) rPropSet = xPropSet; - return sal_True; + return true; } - return sal_False; + return false; } class XMLTOCMarkImportContext_Impl : public XMLIndexMarkImportContext_Impl @@ -1489,7 +1489,7 @@ void XMLAlphaIndexMarkImportContext_Impl::ProcessAttribute( } else if ( IsXMLToken( sLocalName, XML_MAIN_ENTRY ) ) { - sal_Bool bMainEntry = sal_False; + bool bMainEntry = false; bool bTmp(false); if (::sax::Converter::convertBool(bTmp, sValue)) @@ -1752,7 +1752,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext( rImport, nPrefix, rLocalName, (nToken != XML_TOK_TEXTP_CHANGE_END), (nToken != XML_TOK_TEXTP_CHANGE_START), - sal_False); + false); break; case XML_TOK_TEXT_META: @@ -1840,7 +1840,7 @@ XMLParaContext::XMLParaContext( nOutlineLevel( IsXMLToken( rLName, XML_H ) ? 1 : -1 ), pHints( 0 ), // Lost outline numbering in master document (#i73509#) - mbOutlineLevelAttrFound( sal_False ), + mbOutlineLevelAttrFound( false ), bIgnoreLeadingSpace( true ), bHeading( bHead ), bIsListHeader( false ), @@ -1905,7 +1905,7 @@ XMLParaContext::XMLParaContext( nOutlineLevel = (sal_Int8)nTmp; } // Lost outline numbering in master document (#i73509#) - mbOutlineLevelAttrFound = sal_True; + mbOutlineLevelAttrFound = true; } break; case XML_TOK_TEXT_P_IS_LIST_HEADER: diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx index a04d20a6bbcd..f8d11cb7ca37 100644 --- a/xmloff/source/text/txtparai.hxx +++ b/xmloff/source/text/txtparai.hxx @@ -47,11 +47,11 @@ class XMLParaContext : public SvXMLImportContext sal_Int8 nOutlineLevel; XMLHints_Impl *pHints; // Lost outline numbering in master document (#i73509#) - sal_Bool mbOutlineLevelAttrFound; + bool mbOutlineLevelAttrFound; bool bIgnoreLeadingSpace; bool bHeading; - sal_Bool bIsListHeader; - sal_Bool bIsRestart; + bool bIsListHeader; + bool bIsRestart; sal_Int16 nStartValue; sal_uInt8 nStarFontsConvFlags; diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx index dda882090a96..8c7d8d1c237c 100644 --- a/xmloff/source/text/txtparaimphint.hxx +++ b/xmloff/source/text/txtparaimphint.hxx @@ -67,10 +67,10 @@ public: // We don't use virtual methods to differ between the sub classes, // because this seems to be to expensive if compared to inline methods. sal_uInt8 GetType() const { return nType; } - sal_Bool IsStyle() { return XML_HINT_STYLE==nType; } - sal_Bool IsReference() { return XML_HINT_REFERENCE==nType; } - sal_Bool IsHyperlink() { return XML_HINT_HYPERLINK==nType; } - sal_Bool IsIndexMark() { return XML_HINT_INDEX_MARK==nType; } + bool IsStyle() { return XML_HINT_STYLE==nType; } + bool IsReference() { return XML_HINT_REFERENCE==nType; } + bool IsHyperlink() { return XML_HINT_HYPERLINK==nType; } + bool IsIndexMark() { return XML_HINT_INDEX_MARK==nType; } }; class XMLStyleHint_Impl : public XMLHint_Impl @@ -229,9 +229,9 @@ public: return xShape; } - sal_Bool IsBoundAtChar() const + bool IsBoundAtChar() const { - sal_Bool bRet = sal_False; + bool bRet = false; SvXMLImportContext *pContext = &xContext; if( pContext->ISA( XMLTextFrameContext ) ) bRet = css::text::TextContentAnchorType_AT_CHARACTER == diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx index 1dc5a1f6ce00..ec59681eca21 100644 --- a/xmloff/source/text/txtsecte.cxx +++ b/xmloff/source/text/txtsecte.cxx @@ -148,7 +148,7 @@ void XMLTextParagraphExport::exportListAndSectionChange( vector< Reference<XTextSection> > aNewStack; aCurrent.set(rNextSection); - sal_Bool bMute = sal_False; + bool bMute = false; while(aCurrent.is()) { // if we have a mute section, ignore all its children @@ -156,7 +156,7 @@ void XMLTextParagraphExport::exportListAndSectionChange( if (pSectionExport->IsMuteSection(aCurrent)) { aNewStack.clear(); - bMute = sal_True; + bMute = true; } aNewStack.push_back(aCurrent); @@ -188,7 +188,7 @@ void XMLTextParagraphExport::exportListAndSectionChange( { if ( !bAutoStyles && (NULL != pRedlineExport) ) pRedlineExport->ExportStartOrEndRedline(*aOldForward, - sal_False); + false); pSectionExport->ExportSectionEnd(*aOldForward, bAutoStyles); ++aOldForward; } @@ -196,7 +196,7 @@ void XMLTextParagraphExport::exportListAndSectionChange( { if ( !bAutoStyles && (NULL != pRedlineExport) ) pRedlineExport->ExportStartOrEndRedline(*aOldForward, - sal_False); + false); pSectionExport->ExportSectionEnd(*aOldForward, bAutoStyles); } } @@ -206,7 +206,7 @@ void XMLTextParagraphExport::exportListAndSectionChange( while (aNew != aNewStack.rend()) { if ( !bAutoStyles && (NULL != pRedlineExport) ) - pRedlineExport->ExportStartOrEndRedline(*aNew, sal_True); + pRedlineExport->ExportStartOrEndRedline(*aNew, true); pSectionExport->ExportSectionStart(*aNew, bAutoStyles); ++aNew; } diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx index 34c842c314a7..f5ce270ff163 100644 --- a/xmloff/source/text/txtstyle.cxx +++ b/xmloff/source/text/txtstyle.cxx @@ -110,7 +110,7 @@ void XMLTextParagraphExport::exportNumStyles( bool bUsed ) void XMLTextParagraphExport::exportTextStyles( bool bUsed, bool bProg ) { - sal_Bool bOldProg = bProgress; + bool bOldProg = bProgress; bProgress = bProg; Reference < lang::XMultiServiceFactory > xFactory (GetExport().GetModel(), UNO_QUERY); diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 13afc4c210e8..54e0f1a36659 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -464,7 +464,7 @@ void XMLTextStyleContext::FillPropertySet( if ( nIndex != -1 ) { Any& rAny = GetProperties()[nIndex].maValue; - sal_Bool bVal = *(sal_Bool*)rAny.getValue(); + bool bVal = *(sal_Bool*)rAny.getValue(); bHasCombinedCharactersLetter = bVal; } diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 96ae34819339..a5d34ec0b774 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -102,11 +102,11 @@ XMLVarFieldImportContext::XMLVarFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, const sal_Char* pServiceName, sal_uInt16 nPrfx, const OUString& rLocalName, - sal_Bool bFormula, sal_Bool bFormulaDefault, - sal_Bool bDescription, sal_Bool bHelp, sal_Bool bHint, sal_Bool bVisible, - sal_Bool bIsDisplayFormula, - sal_Bool bType, sal_Bool bStyle, sal_Bool bValue, - sal_Bool bPresentation) : + bool bFormula, bool bFormulaDefault, + bool bDescription, bool bHelp, bool bHint, bool bVisible, + bool bIsDisplayFormula, + bool bType, bool bStyle, bool bValue, + bool bPresentation) : XMLTextFieldImportContext(rImport, rHlp, pServiceName, nPrfx, rLocalName), sPropertyContent(sAPI_content), sPropertyHint(sAPI_hint), @@ -115,15 +115,15 @@ XMLVarFieldImportContext::XMLVarFieldImportContext( sPropertyIsVisible(sAPI_is_visible), sPropertyIsDisplayFormula(sAPI_is_show_formula), sPropertyCurrentPresentation(sAPI_current_presentation), - aValueHelper(rImport, rHlp, bType, bStyle, bValue, sal_False), - bDisplayFormula(sal_False), - bDisplayNone(sal_False), - bNameOK(sal_False), - bFormulaOK(sal_False), - bDescriptionOK(sal_False), - bHelpOK(sal_False), - bHintOK(sal_False), - bDisplayOK(sal_False), + aValueHelper(rImport, rHlp, bType, bStyle, bValue, false), + bDisplayFormula(false), + bDisplayNone(false), + bNameOK(false), + bFormulaOK(false), + bDescriptionOK(false), + bHelpOK(false), + bHintOK(false), + bDisplayOK(false), bSetFormula(bFormula), bSetFormulaDefault(bFormulaDefault), bSetDescription(bDescription), @@ -143,12 +143,12 @@ void XMLVarFieldImportContext::ProcessAttribute( { case XML_TOK_TEXTFIELD_NAME: sName = sAttrValue; - bNameOK = sal_True; - bValid = sal_True; // we assume: field with name is valid! + bNameOK = true; + bValid = true; // we assume: field with name is valid! break; case XML_TOK_TEXTFIELD_DESCRIPTION: sDescription = sAttrValue; - bDescriptionOK = sal_True; + bDescriptionOK = true; break; case XML_TOK_TEXTFIELD_HELP: sHelp = sAttrValue; @@ -166,7 +166,7 @@ void XMLVarFieldImportContext::ProcessAttribute( if( XML_NAMESPACE_OOOW == nPrefix ) { sFormula = sTmp; - bFormulaOK = sal_True; + bFormulaOK = true; } else sFormula = sAttrValue; @@ -175,21 +175,21 @@ void XMLVarFieldImportContext::ProcessAttribute( case XML_TOK_TEXTFIELD_DISPLAY: if (IsXMLToken(sAttrValue, XML_FORMULA)) { - bDisplayFormula = sal_True; - bDisplayNone = sal_False; - bDisplayOK = sal_True; + bDisplayFormula = true; + bDisplayNone = false; + bDisplayOK = true; } else if (IsXMLToken(sAttrValue, XML_VALUE)) { - bDisplayFormula = sal_False; - bDisplayNone = sal_False; - bDisplayOK = sal_True; + bDisplayFormula = false; + bDisplayNone = false; + bDisplayOK = true; } else if (IsXMLToken(sAttrValue, XML_NONE)) { - bDisplayFormula = sal_False; - bDisplayNone = sal_True; - bDisplayOK = sal_True; + bDisplayFormula = false; + bDisplayNone = true; + bDisplayOK = true; } // else: no change DBG_ASSERT(!(bDisplayFormula && bDisplayNone), "illegal display values"); @@ -211,7 +211,7 @@ void XMLVarFieldImportContext::PrepareField( if (!bFormulaOK && bSetFormulaDefault) { sFormula = GetContent(); - bFormulaOK = sal_True; + bFormulaOK = true; } if (bFormulaOK) @@ -256,8 +256,8 @@ void XMLVarFieldImportContext::PrepareField( hasPropertyByName(sPropertyIsDisplayFormula) && !bSetDisplayFormula) { - bDisplayFormula = sal_False; - bSetDisplayFormula = sal_True; + bDisplayFormula = false; + bSetDisplayFormula = true; } @@ -296,9 +296,9 @@ XMLSetVarFieldImportContext::XMLSetVarFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, const sal_Char* pServiceName, sal_uInt16 nPrfx, const OUString& rLocalName, VarType eVarType, - sal_Bool bFormula, sal_Bool bFormulaDefault, - sal_Bool bDescription, sal_Bool bHelp, sal_Bool bHint, sal_Bool bVisible, sal_Bool bIsDisplayFormula, - sal_Bool bType, sal_Bool bStyle, sal_Bool bValue, sal_Bool bPresentation) : + bool bFormula, bool bFormulaDefault, + bool bDescription, bool bHelp, bool bHint, bool bVisible, bool bIsDisplayFormula, + bool bType, bool bStyle, bool bValue, bool bPresentation) : XMLVarFieldImportContext(rImport, rHlp, pServiceName, nPrfx, rLocalName, bFormula, bFormulaDefault, @@ -360,7 +360,7 @@ void XMLSetVarFieldImportContext::EndElement() GetImportHelper().InsertString(GetContent()); } -sal_Bool XMLSetVarFieldImportContext::FindFieldMaster( +bool XMLSetVarFieldImportContext::FindFieldMaster( Reference<XPropertySet> & xMaster) { // currently: delegate to XMLVariableDeclImportContext; @@ -386,16 +386,16 @@ XMLSequenceFieldImportContext::XMLSequenceFieldImportContext( XMLSetVarFieldImportContext(rImport, rHlp, sAPI_set_expression, nPrfx, rLocalName, VarTypeSequence, // formula - sal_True, sal_True, - sal_False, sal_False, sal_False, sal_False, - sal_False, - sal_False, sal_False, sal_False, sal_True), + true, true, + false, false, false, false, + false, + false, false, false, true), sPropertyNumberFormat(sAPI_number_format), sPropertySequenceValue(sAPI_sequence_value), sNumFormat(OUString('1')), sNumFormatSync(GetXMLToken(XML_FALSE)), - bRefNameOK(sal_False) + bRefNameOK(false) { } @@ -412,7 +412,7 @@ void XMLSequenceFieldImportContext::ProcessAttribute( break; case XML_TOK_TEXTFIELD_REF_NAME: sRefName = sAttrValue; - bRefNameOK = sal_True; + bRefNameOK = true; break; default: // delegate to super class (name, formula) @@ -460,11 +460,11 @@ XMLVariableSetFieldImportContext::XMLVariableSetFieldImportContext( nPrfx, rLocalName, VarTypeSimple, // formula, value&type, style, // display none - sal_True, sal_True, - sal_False, sal_False, sal_False, - sal_True, sal_False, - sal_True, sal_True, sal_True, - sal_True), + true, true, + false, false, false, + true, false, + true, true, true, + true), sPropertySubType(sAPI_sub_type) { } @@ -496,11 +496,11 @@ XMLVariableInputFieldImportContext::XMLVariableInputFieldImportContext( nPrfx, rLocalName, VarTypeSimple, // description, display none/formula, // value&type, style, formula - sal_True, sal_True, - sal_True, sal_True, sal_True, - sal_True, sal_False, - sal_True, sal_True, sal_True, - sal_True), + true, true, + true, true, true, + true, false, + true, true, true, + true), sPropertySubType(sAPI_sub_type), sPropertyIsInput(sAPI_is_input) { @@ -537,11 +537,11 @@ XMLUserFieldImportContext::XMLUserFieldImportContext( XMLSetVarFieldImportContext(rImport, rHlp, sAPI_user, nPrfx, rLocalName, VarTypeUserField, // display none/formula, style - sal_False, sal_False, - sal_False, sal_False, sal_False, sal_True, - sal_True, - sal_False, sal_True, sal_False, - sal_False) + false, false, + false, false, false, true, + true, + false, true, false, + false) { } @@ -560,11 +560,11 @@ XMLUserFieldInputImportContext::XMLUserFieldInputImportContext( XMLVarFieldImportContext(rImport, rHlp, sAPI_input_user, nPrfx, rLocalName, // description, style - sal_False, sal_False, - sal_True, sal_False, sal_False, - sal_False, sal_False, - sal_False /*???*/, sal_True, sal_False, - sal_False) + false, false, + true, false, false, + false, false, + false /*???*/, true, false, + false) { } @@ -592,11 +592,11 @@ XMLVariableGetFieldImportContext::XMLVariableGetFieldImportContext( XMLVarFieldImportContext(rImport, rHlp, sAPI_get_expression, nPrfx, rLocalName, // style, display formula - sal_False, sal_False, - sal_False, sal_False, sal_False, - sal_False, sal_True, - sal_True, sal_True, sal_False, - sal_True), + false, false, + false, false, false, + false, true, + true, true, false, + true), sPropertySubType(sAPI_sub_type) { } @@ -627,14 +627,14 @@ XMLExpressionFieldImportContext::XMLExpressionFieldImportContext( XMLVarFieldImportContext(rImport, rHlp, sAPI_get_expression, nPrfx, rLocalName, // formula, type, style, display formula - sal_True, sal_True, - sal_False, sal_False, sal_False, - sal_False, sal_True, - sal_True, sal_True, sal_False, - sal_True), + true, true, + false, false, false, + false, true, + true, true, false, + true), sPropertySubType(sAPI_sub_type) { - bValid = sal_True; // always valid + bValid = true; // always valid } @@ -664,14 +664,14 @@ XMLTextInputFieldImportContext::XMLTextInputFieldImportContext( XMLVarFieldImportContext(rImport, rHlp, sAPI_input, nPrfx, sLocalName, // description - sal_False, sal_False, - sal_True, sal_True, sal_True, - sal_False, sal_False, - sal_False, sal_False, sal_False, - sal_False), + false, false, + true, true, true, + false, false, + false, false, false, + false), sPropertyContent(sAPI_content) { - bValid = sal_True; // always valid + bValid = true; // always valid } void XMLTextInputFieldImportContext::PrepareField( @@ -701,9 +701,9 @@ XMLTableFormulaImportContext::XMLTableFormulaImportContext( sPropertyIsShowFormula("IsShowFormula"), sPropertyCurrentPresentation( "CurrentPresentation"), - aValueHelper(rImport, rHlp, sal_False, sal_True, sal_False, sal_True), + aValueHelper(rImport, rHlp, false, true, false, true), sFormula(), - bIsShowFormula(sal_False) + bIsShowFormula(false) { } @@ -719,7 +719,7 @@ void XMLTableFormulaImportContext::ProcessAttribute( { case XML_TOK_TEXTFIELD_FORMULA: aValueHelper.ProcessAttribute( nAttrToken, sAttrValue ); - bValid = sal_True; // we need a formula! + bValid = true; // we need a formula! break; case XML_TOK_TEXTFIELD_DATA_STYLE_NAME: @@ -727,7 +727,7 @@ void XMLTableFormulaImportContext::ProcessAttribute( break; case XML_TOK_TEXTFIELD_DISPLAY: if ( sAttrValue == "formula" ) - bIsShowFormula = sal_True; + bIsShowFormula = true; break; default: // unknown attribute -> ignore @@ -840,7 +840,7 @@ XMLVariableDeclImportContext::XMLVariableDeclImportContext( sPropertyNumberingLevel(sAPI_chapter_numbering_level), sPropertyNumberingSeparator(sAPI_numbering_separator), sPropertyIsExpression(sAPI_is_expression), - aValueHelper(rImport, rHlp, sal_True, sal_False, sal_True, sal_False), + aValueHelper(rImport, rHlp, true, false, true, false), nNumLevel(-1), cSeparationChar('.') { if ( (XML_NAMESPACE_TEXT == nPrfx) && @@ -940,7 +940,7 @@ XMLVariableDeclImportContext::XMLVariableDeclImportContext( -sal_Bool XMLVariableDeclImportContext::FindFieldMaster( +bool XMLVariableDeclImportContext::FindFieldMaster( Reference<XPropertySet> & xMaster, SvXMLImport& rImport, XMLTextImportHelper& rImportHelper, const OUString& sVarName, enum VarType eVarType) @@ -1072,15 +1072,15 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster( } // else : user field: no subtype } else { - return sal_False; + return false; } } else { - return sal_False; + return false; } } DBG_ASSERT(xMaster.is(), "no field master found!?!"); - return sal_True; + return true; } @@ -1100,10 +1100,10 @@ XMLDatabaseDisplayImportContext::XMLDatabaseDisplayImportContext( sPropertyDatabaseFormat(sAPI_is_data_base_format), sPropertyCurrentPresentation(sAPI_current_presentation), sPropertyIsVisible(sAPI_is_visible), - aValueHelper(rImport, rHlp, sal_False, sal_True, sal_False, sal_False), - bColumnOK(sal_False), - bDisplay( sal_True ), - bDisplayOK( sal_False ) + aValueHelper(rImport, rHlp, false, true, false, false), + bColumnOK(false), + bDisplay( true ), + bDisplayOK( false ) { } @@ -1114,12 +1114,12 @@ void XMLDatabaseDisplayImportContext::ProcessAttribute( { case XML_TOK_TEXTFIELD_COLUMN_NAME: sColumnName = sAttrValue; - bColumnOK = sal_True; + bColumnOK = true; break; case XML_TOK_TEXTFIELD_DISPLAY: { - sal_Bool bNone = IsXMLToken( sAttrValue, XML_NONE ); - sal_Bool bValue = IsXMLToken( sAttrValue, XML_VALUE ); + bool bNone = IsXMLToken( sAttrValue, XML_NONE ); + bool bValue = IsXMLToken( sAttrValue, XML_VALUE ); bDisplay = bValue; bDisplayOK = bNone || bValue; } @@ -1249,7 +1249,7 @@ static SvXMLEnumMapEntry const aValueTypeMap[] = XMLValueImportHelper::XMLValueImportHelper( SvXMLImport& rImprt, XMLTextImportHelper& rHlp, - sal_Bool bType, sal_Bool bStyle, sal_Bool bValue, sal_Bool bFormula) : + bool bType, bool bStyle, bool bValue, bool bFormula) : sPropertyContent(sAPI_content), sPropertyValue(sAPI_value), sPropertyNumberFormat(sAPI_number_format), @@ -1262,20 +1262,20 @@ XMLValueImportHelper::XMLValueImportHelper( nFormatKey(0), bIsDefaultLanguage(true), - bStringType(sal_False), - bFormatOK(sal_False), - bTypeOK(sal_False), - bStringValueOK(sal_False), - bFloatValueOK(sal_False), - bFormulaOK(sal_False), + bStringType(false), + bFormatOK(false), + bTypeOK(false), + bStringValueOK(false), + bFloatValueOK(false), + bFormulaOK(false), bSetType(bType), bSetValue(bValue), bSetStyle(bStyle), bSetFormula(bFormula), - bStringDefault(sal_True), - bFormulaDefault(sal_True) + bStringDefault(true), + bFormulaDefault(true) { } @@ -1292,18 +1292,18 @@ void XMLValueImportHelper::ProcessAttribute( { // convert enum sal_uInt16 nTmp = 0; - sal_Bool bRet = SvXMLUnitConverter::convertEnum( + bool bRet = SvXMLUnitConverter::convertEnum( nTmp, sAttrValue, aValueTypeMap); if (bRet) { ValueType eValueType = (ValueType)nTmp; - bTypeOK = sal_True; + bTypeOK = true; switch (eValueType) { case XML_VALUE_TYPE_STRING: - bStringType = sal_True; + bStringType = true; break; case XML_VALUE_TYPE_FLOAT: case XML_VALUE_TYPE_CURRENCY: @@ -1311,12 +1311,12 @@ void XMLValueImportHelper::ProcessAttribute( case XML_VALUE_TYPE_DATE: case XML_VALUE_TYPE_TIME: case XML_VALUE_TYPE_BOOLEAN: - bStringType = sal_False; + bStringType = false; break; default: OSL_FAIL("unknown value type"); - bTypeOK = sal_False; + bTypeOK = false; } } break; @@ -1327,7 +1327,7 @@ void XMLValueImportHelper::ProcessAttribute( double fTmp; bool const bRet = ::sax::Converter::convertDouble(fTmp,sAttrValue); if (bRet) { - bFloatValueOK = sal_True; + bFloatValueOK = true; fValue = fTmp; } break; @@ -1339,7 +1339,7 @@ void XMLValueImportHelper::ProcessAttribute( bool const bRet = ::sax::Converter::convertDuration(fTmp, sAttrValue); if (bRet) { - bFloatValueOK = sal_True; + bFloatValueOK = true; fValue = fTmp; } break; @@ -1348,10 +1348,10 @@ void XMLValueImportHelper::ProcessAttribute( case XML_TOK_TEXTFIELD_DATE_VALUE: { double fTmp; - sal_Bool bRet = rImport.GetMM100UnitConverter(). + bool bRet = rImport.GetMM100UnitConverter(). convertDateTime(fTmp,sAttrValue); if (bRet) { - bFloatValueOK = sal_True; + bFloatValueOK = true; fValue = fTmp; } break; @@ -1362,7 +1362,7 @@ void XMLValueImportHelper::ProcessAttribute( bool bTmp(false); bool bRet = ::sax::Converter::convertBool(bTmp, sAttrValue); if (bRet) { - bFloatValueOK = sal_True; + bFloatValueOK = true; fValue = (bTmp ? 1.0 : 0.0); } else @@ -1370,7 +1370,7 @@ void XMLValueImportHelper::ProcessAttribute( double fTmp; bRet = ::sax::Converter::convertDouble(fTmp, sAttrValue); if (bRet) { - bFloatValueOK = sal_True; + bFloatValueOK = true; fValue = fTmp; } } @@ -1379,7 +1379,7 @@ void XMLValueImportHelper::ProcessAttribute( case XML_TOK_TEXTFIELD_STRING_VALUE: sValue = sAttrValue; - bStringValueOK = sal_True; + bStringValueOK = true; break; case XML_TOK_TEXTFIELD_FORMULA: @@ -1390,7 +1390,7 @@ void XMLValueImportHelper::ProcessAttribute( if( XML_NAMESPACE_OOOW == nPrefix ) { sFormula = sTmp; - bFormulaOK = sal_True; + bFormulaOK = true; } else sFormula = sAttrValue; @@ -1404,7 +1404,7 @@ void XMLValueImportHelper::ProcessAttribute( if (-1 != nKey) { nFormatKey = nKey; - bFormatOK = sal_True; + bFormatOK = true; } break; } diff --git a/xmloff/source/transform/ControlOASISTContext.cxx b/xmloff/source/transform/ControlOASISTContext.cxx index 5566d1e2e5a8..e04f3314fd7d 100644 --- a/xmloff/source/transform/ControlOASISTContext.cxx +++ b/xmloff/source/transform/ControlOASISTContext.cxx @@ -35,7 +35,7 @@ TYPEINIT1( XMLControlOASISTransformerContext, XMLTransformerContext ); XMLControlOASISTransformerContext::XMLControlOASISTransformerContext( XMLTransformerBase& rImp, const OUString& rQName, - sal_Bool bCreateControl ) : + bool bCreateControl ) : XMLTransformerContext( rImp, rQName ), m_aElemQName( rImp.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_FORM, ::xmloff::token::GetXMLToken( XML_CONTROL ) ) ), @@ -127,7 +127,7 @@ void XMLControlOASISTransformerContext::StartElement( { OUString aAttrValue( rAttrValue ); if( GetTransformer().ConvertURIToOOo( aAttrValue, - static_cast< sal_Bool >((*aIter).second.m_nParam1)) ) + static_cast< bool >((*aIter).second.m_nParam1)) ) pMutableAttrList->SetValueByIndex( i, aAttrValue ); } break; diff --git a/xmloff/source/transform/ControlOASISTContext.hxx b/xmloff/source/transform/ControlOASISTContext.hxx index 01bec991b67e..0031bec7ff99 100644 --- a/xmloff/source/transform/ControlOASISTContext.hxx +++ b/xmloff/source/transform/ControlOASISTContext.hxx @@ -25,14 +25,14 @@ class XMLControlOASISTransformerContext : public XMLTransformerContext { OUString m_aElemQName; - sal_Bool m_bCreateControl; + bool m_bCreateControl; public: TYPEINFO_OVERRIDE(); XMLControlOASISTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName, - sal_Bool bCreateControl ); + bool bCreateControl ); virtual ~XMLControlOASISTransformerContext(); diff --git a/xmloff/source/transform/ControlOOoTContext.cxx b/xmloff/source/transform/ControlOOoTContext.cxx index ce6c06bc6932..0debacb3ae16 100644 --- a/xmloff/source/transform/ControlOOoTContext.cxx +++ b/xmloff/source/transform/ControlOOoTContext.cxx @@ -47,7 +47,7 @@ XMLControlOOoTransformerContext::~XMLControlOOoTransformerContext() void XMLControlOOoTransformerContext::StartElement( const Reference< XAttributeList >& rAttrList ) { - m_xAttrList = new XMLMutableAttributeList( rAttrList, sal_True ); + m_xAttrList = new XMLMutableAttributeList( rAttrList, true ); } XMLTransformerContext *XMLControlOOoTransformerContext::CreateChildContext( @@ -62,13 +62,13 @@ XMLTransformerContext *XMLControlOOoTransformerContext::CreateChildContext( { pContext = new XMLIgnoreTransformerContext( GetTransformer(), rQName, - sal_False, sal_False ); + false, false ); m_aElemQName = rQName; static_cast< XMLMutableAttributeList * >( m_xAttrList.get() ) ->AppendAttributeList( rAttrList ); GetTransformer().ProcessAttrList( m_xAttrList, OOO_FORM_CONTROL_ACTIONS, - sal_False ); + false ); GetTransformer().GetDocHandler()->startElement( m_aElemQName, m_xAttrList ); } @@ -76,7 +76,7 @@ XMLTransformerContext *XMLControlOOoTransformerContext::CreateChildContext( { pContext = new XMLIgnoreTransformerContext( GetTransformer(), rQName, - sal_True, sal_True ); + true, true ); } return pContext; } diff --git a/xmloff/source/transform/DeepTContext.hxx b/xmloff/source/transform/DeepTContext.hxx index 099e95c6b971..da3fbc83d801 100644 --- a/xmloff/source/transform/DeepTContext.hxx +++ b/xmloff/source/transform/DeepTContext.hxx @@ -64,9 +64,9 @@ public: void AddContent( XMLTransformerContext *pContent ); - sal_Bool HasElementContent() const + bool HasElementContent() const { - return static_cast<sal_Bool>( !m_aChildContexts.empty() ); + return !m_aChildContexts.empty(); } virtual void ExportContent() SAL_OVERRIDE; diff --git a/xmloff/source/transform/DocumentTContext.cxx b/xmloff/source/transform/DocumentTContext.cxx index 8f9468623dba..ea4654245281 100644 --- a/xmloff/source/transform/DocumentTContext.cxx +++ b/xmloff/source/transform/DocumentTContext.cxx @@ -53,7 +53,7 @@ void XMLDocumentTransformerContext::StartElement( const Reference< XAttributeLis { Reference< XAttributeList > xAttrList( rAttrList ); - sal_Bool bMimeFound = sal_False; + bool bMimeFound = false; OUString aClass; OUString aClassQName( GetTransformer().GetNamespaceMap().GetQNameByKey( @@ -97,7 +97,7 @@ void XMLDocumentTransformerContext::StartElement( const Reference< XAttributeLis } pMutableAttrList->SetValueByIndex( i, aClass ); pMutableAttrList->RenameAttributeByIndex(i, aClassQName ); - bMimeFound = sal_True; + bMimeFound = true; break; } } diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index d83e02e91db8..784a28c17c26 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -246,7 +246,7 @@ void XMLEventOASISTransformerContext::StartElement( // <form:button><form:event-listeners><form:event-listener> const XMLTransformerContext *pObjContext = GetTransformer().GetAncestorContext( 1 ); - sal_Bool bForm = pObjContext && + bool bForm = pObjContext && pObjContext->HasNamespace(XML_NAMESPACE_FORM ); pMutableAttrList->SetValueByIndex( i, diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index 3c2a026252fe..e3107abc953d 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -88,7 +88,7 @@ TYPEINIT1( XMLEventOOoTransformerContext, XMLPersElemContentTContext ); XMLEventOOoTransformerContext::XMLEventOOoTransformerContext( XMLTransformerBase& rImp, const OUString& rQName, - sal_Bool bPersistent ) : + bool bPersistent ) : XMLPersElemContentTContext( rImp, rQName, rImp.GetNamespaceMap().GetKeyByAttrName( rQName ), XML_EVENT_LISTENER ), m_bPersistent( bPersistent ) @@ -239,7 +239,7 @@ XMLTransformerContext * XMLEventOOoTransformerContext::CreateChildContext( return XMLTransformerContext::CreateChildContext(nPrefix, rLocalName, rQName, xAttrList); } -sal_Bool XMLEventOOoTransformerContext::IsPersistent() const +bool XMLEventOOoTransformerContext::IsPersistent() const { return m_bPersistent; } diff --git a/xmloff/source/transform/EventOOoTContext.hxx b/xmloff/source/transform/EventOOoTContext.hxx index 4cbfb57b84ad..fcbca8ed68e2 100644 --- a/xmloff/source/transform/EventOOoTContext.hxx +++ b/xmloff/source/transform/EventOOoTContext.hxx @@ -26,14 +26,14 @@ class XMLTransformerOOoEventMap_Impl; class XMLEventOOoTransformerContext : public XMLPersElemContentTContext { - sal_Bool m_bPersistent; + bool m_bPersistent; public: TYPEINFO_OVERRIDE(); XMLEventOOoTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName, - sal_Bool bPersistent = sal_False ); + bool bPersistent = false ); virtual ~XMLEventOOoTransformerContext(); static XMLTransformerOOoEventMap_Impl *CreateEventMap(); @@ -49,7 +49,7 @@ public: const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual sal_Bool IsPersistent() const SAL_OVERRIDE; + virtual bool IsPersistent() const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_EVENTOOOTCONTEXT_HXX diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx index 8ab8ef791b71..50e61c759de6 100644 --- a/xmloff/source/transform/FormPropOASISTContext.cxx +++ b/xmloff/source/transform/FormPropOASISTContext.cxx @@ -37,7 +37,7 @@ XMLTokenEnum XMLFormPropOASISTransformerContext::GetValueType( const OUString& rValue ) { XMLTokenEnum eRet = XML_DOUBLE; - sal_Bool bNeg = sal_False; + bool bNeg = false; sal_uInt32 nVal = 0; sal_Int32 nPos = 0; @@ -49,7 +49,7 @@ XMLTokenEnum XMLFormPropOASISTransformerContext::GetValueType( if( nPos < nLen && '-' == rValue[nPos] ) { - bNeg = sal_True; + bNeg = true; nPos++; } @@ -112,7 +112,7 @@ void XMLFormPropOASISTransformerContext::StartElement( sal_Int16 nValueTypeAttr = -1; OUString aValue; - sal_Bool bIsVoid = sal_False; + bool bIsVoid = false; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { @@ -140,7 +140,7 @@ void XMLFormPropOASISTransformerContext::StartElement( { pMutableAttrList->SetValueByIndex( i, GetXMLToken( XML_SHORT ) ); - bIsVoid = sal_True; + bIsVoid = true; } } { diff --git a/xmloff/source/transform/FormPropOASISTContext.hxx b/xmloff/source/transform/FormPropOASISTContext.hxx index 38af865c7146..798be653f23f 100644 --- a/xmloff/source/transform/FormPropOASISTContext.hxx +++ b/xmloff/source/transform/FormPropOASISTContext.hxx @@ -25,8 +25,8 @@ class XMLFormPropOASISTransformerContext : public XMLRenameElemTransformerContext { - sal_Bool m_bIsList; - sal_Bool m_bIsListValue; + bool m_bIsList; + bool m_bIsListValue; ::xmloff::token::XMLTokenEnum GetValueType( const OUString& rValue ); diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx index b555eb809e77..83c1b8c53956 100644 --- a/xmloff/source/transform/FormPropOOoTContext.cxx +++ b/xmloff/source/transform/FormPropOOoTContext.cxx @@ -35,8 +35,8 @@ class XMLFormPropValueTContext_Impl : public XMLTransformerContext { OUString m_aAttrQName; OUString m_aCharacters; - sal_Bool m_bPersistent; - sal_Bool m_bIsVoid; + bool m_bPersistent; + bool m_bIsVoid; public: TYPEINFO_OVERRIDE(); @@ -57,9 +57,9 @@ public: virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; - virtual sal_Bool IsPersistent() const SAL_OVERRIDE; + virtual bool IsPersistent() const SAL_OVERRIDE; - sal_Bool IsVoid() const { return m_bIsVoid; } + bool IsVoid() const { return m_bIsVoid; } const OUString& GetTextContent() const { return m_aCharacters; } }; @@ -69,8 +69,8 @@ XMLFormPropValueTContext_Impl::XMLFormPropValueTContext_Impl( XMLTransformerBase& rTransformer, const OUString& rQName ) : XMLTransformerContext( rTransformer, rQName ), - m_bPersistent( sal_True ), - m_bIsVoid( sal_False ) + m_bPersistent( true ), + m_bIsVoid( false ) { } @@ -82,8 +82,8 @@ XMLFormPropValueTContext_Impl::XMLFormPropValueTContext_Impl( XMLTransformerContext( rTransformer, rQName ), m_aAttrQName( rTransformer.GetNamespaceMap().GetQNameByKey( nAttrPrefix, GetXMLToken(eAttrToken) ) ), - m_bPersistent( sal_True ), - m_bIsVoid( sal_False ) + m_bPersistent( true ), + m_bIsVoid( false ) { } @@ -105,7 +105,7 @@ void XMLFormPropValueTContext_Impl::StartElement( if( XML_NAMESPACE_FORM == nPrefix && IsXMLToken( aLocalName, XML_PROPERTY_IS_VOID ) && IsXMLToken( rAttrList->getValueByIndex( i ), XML_TRUE ) ) - m_bIsVoid = sal_True; + m_bIsVoid = true; } } @@ -132,7 +132,7 @@ void XMLFormPropValueTContext_Impl::Characters( const OUString& rChars ) m_aCharacters += rChars; } -sal_Bool XMLFormPropValueTContext_Impl::IsPersistent() const +bool XMLFormPropValueTContext_Impl::IsPersistent() const { return m_bPersistent; } @@ -147,7 +147,7 @@ XMLFormPropOOoTransformerContext::XMLFormPropOOoTransformerContext( m_nValueTypeAttr( -1 ), m_eValueToken( XML_VALUE ), m_eValueTypeToken( XML_TOKEN_END ), - m_bIsList( sal_False ) + m_bIsList( false ) { } @@ -184,7 +184,7 @@ XMLTransformerContext *XMLFormPropOOoTransformerContext::CreateChildContext( // default is ignore if( !pContext ) pContext = new XMLIgnoreTransformerContext( GetTransformer(), rQName, - sal_True, sal_True ); + true, true ); return pContext; } @@ -197,7 +197,7 @@ void XMLFormPropOOoTransformerContext::StartElement( OSL_ENSURE( pActions, "go no actions" ); XMLMutableAttributeList *pMutableAttrList = - new XMLMutableAttributeList( rAttrList, sal_True ); + new XMLMutableAttributeList( rAttrList, true ); m_xAttrList = pMutableAttrList; OUString aValueType; @@ -238,7 +238,7 @@ void XMLFormPropOOoTransformerContext::StartElement( m_aElemQName = GetTransformer().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_FORM, GetXMLToken( XML_LIST_PROPERTY ) ); - m_bIsList = sal_True; + m_bIsList = true; } pMutableAttrList->RemoveAttributeByIndex( i ); --i; diff --git a/xmloff/source/transform/FormPropOOoTContext.hxx b/xmloff/source/transform/FormPropOOoTContext.hxx index b72b53efca63..e1918424fd4f 100644 --- a/xmloff/source/transform/FormPropOOoTContext.hxx +++ b/xmloff/source/transform/FormPropOOoTContext.hxx @@ -39,7 +39,7 @@ class XMLFormPropOOoTransformerContext : public XMLTransformerContext ::xmloff::token::XMLTokenEnum m_eValueToken; ::xmloff::token::XMLTokenEnum m_eValueTypeToken; - sal_Bool m_bIsList; + bool m_bIsList; public: TYPEINFO_OVERRIDE(); diff --git a/xmloff/source/transform/FrameOASISTContext.cxx b/xmloff/source/transform/FrameOASISTContext.cxx index d729d1e045d5..7cffc2adce0b 100644 --- a/xmloff/source/transform/FrameOASISTContext.cxx +++ b/xmloff/source/transform/FrameOASISTContext.cxx @@ -33,13 +33,13 @@ using namespace ::xmloff::token; TYPEINIT1( XMLFrameOASISTransformerContext, XMLTransformerContext ); -sal_Bool XMLFrameOASISTransformerContext::IsLinkedEmbeddedObject( +bool XMLFrameOASISTransformerContext::IsLinkedEmbeddedObject( const OUString& rLocalName, const Reference< XAttributeList >& rAttrList ) { if( !(IsXMLToken( rLocalName, XML_OBJECT ) || IsXMLToken( rLocalName, XML_OBJECT_OLE) ) ) - return sal_False; + return false; sal_Int16 nAttrCount = rAttrList.is() ? rAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) @@ -57,14 +57,14 @@ sal_Bool XMLFrameOASISTransformerContext::IsLinkedEmbeddedObject( { // When the href is empty then the object is not linked but // a placeholder. - return sal_False; + return false; } - GetTransformer().ConvertURIToOOo( sHRef, sal_True ); + GetTransformer().ConvertURIToOOo( sHRef, true ); return !(!sHRef.isEmpty() && '#'==sHRef[0]); } } - return sal_False; + return false; } @@ -83,7 +83,7 @@ XMLFrameOASISTransformerContext::~XMLFrameOASISTransformerContext() void XMLFrameOASISTransformerContext::StartElement( const Reference< XAttributeList >& rAttrList ) { - m_xAttrList = new XMLMutableAttributeList( rAttrList, sal_True ); + m_xAttrList = new XMLMutableAttributeList( rAttrList, true ); sal_Int16 nAttrCount = rAttrList.is() ? rAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) @@ -119,7 +119,7 @@ XMLTransformerContext *XMLFrameOASISTransformerContext::CreateChildContext( // do not export the frame element and all of its children pContext = new XMLIgnoreTransformerContext( GetTransformer(), rQName, - sal_True, sal_True ); + true, true ); } else { @@ -139,13 +139,13 @@ XMLTransformerContext *XMLFrameOASISTransformerContext::CreateChildContext( { pContext = new XMLIgnoreTransformerContext( GetTransformer(), rQName, - sal_False, sal_False ); + false, false ); m_aElemQName = rQName; static_cast< XMLMutableAttributeList * >( m_xAttrList.get() ) ->AppendAttributeList( rAttrList ); GetTransformer().ProcessAttrList( m_xAttrList, OASIS_SHAPE_ACTIONS, - sal_False ); + false ); GetTransformer().GetDocHandler()->startElement( m_aElemQName, m_xAttrList ); } @@ -153,7 +153,7 @@ XMLTransformerContext *XMLFrameOASISTransformerContext::CreateChildContext( { pContext = new XMLIgnoreTransformerContext( GetTransformer(), rQName, - sal_True, sal_True ); + true, true ); } break; default: diff --git a/xmloff/source/transform/FrameOASISTContext.hxx b/xmloff/source/transform/FrameOASISTContext.hxx index 730ec59b5d8b..783242ceafdd 100644 --- a/xmloff/source/transform/FrameOASISTContext.hxx +++ b/xmloff/source/transform/FrameOASISTContext.hxx @@ -31,7 +31,7 @@ class XMLFrameOASISTransformerContext : public XMLTransformerContext bool m_bIgnoreElement; - sal_Bool IsLinkedEmbeddedObject( + bool IsLinkedEmbeddedObject( const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rAttrList ); diff --git a/xmloff/source/transform/FrameOOoTContext.cxx b/xmloff/source/transform/FrameOOoTContext.cxx index 378934812cb1..daaa221f5c33 100644 --- a/xmloff/source/transform/FrameOOoTContext.cxx +++ b/xmloff/source/transform/FrameOOoTContext.cxx @@ -58,7 +58,7 @@ void XMLFrameOOoTransformerContext::StartElement( Reference< XAttributeList > xAttrList( rAttrList ); XMLMutableAttributeList *pMutableAttrList = GetTransformer().ProcessAttrList( xAttrList, OOO_SHAPE_ACTIONS, - sal_True ); + true ); if( !pMutableAttrList ) pMutableAttrList = new XMLMutableAttributeList( rAttrList ); xAttrList = pMutableAttrList; @@ -153,11 +153,11 @@ void XMLFrameOOoTransformerContext::Characters( const OUString& rChars ) XMLTransformerContext::Characters( rChars ); } -sal_Bool XMLFrameOOoTransformerContext::IsPersistent() const +bool XMLFrameOOoTransformerContext::IsPersistent() const { // this context stores some of its child elements, but is not persistent // itself. - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/transform/FrameOOoTContext.hxx b/xmloff/source/transform/FrameOOoTContext.hxx index cdf79192b97b..0573f9cb7e19 100644 --- a/xmloff/source/transform/FrameOOoTContext.hxx +++ b/xmloff/source/transform/FrameOOoTContext.hxx @@ -45,7 +45,7 @@ public: virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; - virtual sal_Bool IsPersistent() const SAL_OVERRIDE; + virtual bool IsPersistent() const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_FRAMEOOOTCONTEXT_HXX diff --git a/xmloff/source/transform/IgnoreTContext.cxx b/xmloff/source/transform/IgnoreTContext.cxx index 654624c3a27e..4d541f7b52f3 100644 --- a/xmloff/source/transform/IgnoreTContext.cxx +++ b/xmloff/source/transform/IgnoreTContext.cxx @@ -29,25 +29,25 @@ TYPEINIT1( XMLIgnoreTransformerContext, XMLTransformerContext ); XMLIgnoreTransformerContext::XMLIgnoreTransformerContext( XMLTransformerBase& rImp, const OUString& rQName, - sal_Bool bIgnoreChars, - sal_Bool bIgnoreElems ) : + bool bIgnoreChars, + bool bIgnoreElems ) : XMLTransformerContext( rImp, rQName ), m_bIgnoreCharacters( bIgnoreChars ), m_bIgnoreElements( bIgnoreElems ), m_bAllowCharactersRecursive( false ), - m_bRecursiveUse( sal_False ) + m_bRecursiveUse( false ) { } XMLIgnoreTransformerContext::XMLIgnoreTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName, - sal_Bool bAllowCharactersRecursive ) : + bool bAllowCharactersRecursive ) : XMLTransformerContext( rTransformer, rQName ), - m_bIgnoreCharacters( sal_False ), - m_bIgnoreElements( sal_False ), + m_bIgnoreCharacters( false ), + m_bIgnoreElements( false ), m_bAllowCharactersRecursive( bAllowCharactersRecursive ), - m_bRecursiveUse( sal_True ) + m_bRecursiveUse( true ) { } @@ -64,8 +64,8 @@ XMLTransformerContext *XMLIgnoreTransformerContext::CreateChildContext( XMLTransformerContext *pContext = 0; if( m_bIgnoreElements ) pContext = new XMLIgnoreTransformerContext( GetTransformer(), - rQName, sal_True, - sal_True ); + rQName, true, + true ); else if (m_bRecursiveUse) pContext = new XMLIgnoreTransformerContext( GetTransformer(), rQName, m_bAllowCharactersRecursive ); diff --git a/xmloff/source/transform/IgnoreTContext.hxx b/xmloff/source/transform/IgnoreTContext.hxx index 7f39bc32d1e6..8eb9929bff4a 100644 --- a/xmloff/source/transform/IgnoreTContext.hxx +++ b/xmloff/source/transform/IgnoreTContext.hxx @@ -25,10 +25,10 @@ class XMLIgnoreTransformerContext : public XMLTransformerContext { - sal_Bool m_bIgnoreCharacters; - sal_Bool m_bIgnoreElements; - sal_Bool m_bAllowCharactersRecursive; - sal_Bool m_bRecursiveUse; + bool m_bIgnoreCharacters; + bool m_bIgnoreElements; + bool m_bAllowCharactersRecursive; + bool m_bRecursiveUse; public: TYPEINFO_OVERRIDE(); @@ -39,15 +39,15 @@ public: // StartElement instead if this is required. XMLIgnoreTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName, - sal_Bool bIgnoreCharacters, - sal_Bool bIgnoreElements ); + bool bIgnoreCharacters, + bool bIgnoreElements ); // A contexts constructor does anything that is required if an element // starts. Namespace processing has been done already. // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. XMLIgnoreTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName, - sal_Bool bAllowCharactersRecursive ); + bool bAllowCharactersRecursive ); // A contexts destructor does anything that is required if an element // ends. By default, nothing is done. diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx index 2f19b9352e20..404d25ffcccb 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -84,7 +84,7 @@ XMLTransformerContext *XMLParagraphTransformerContext::CreateChildContext( XMLTransformerContext *pContext = 0; pContext = new XMLIgnoreTransformerContext( GetTransformer(), - rQName, sal_True ); + rQName, true ); return pContext; } @@ -156,7 +156,7 @@ void XMLMergeElemTransformerContext::ExportStartElement() } XMLTransformerContext::StartElement( m_xAttrList ); - m_bStartElementExported = sal_True; + m_bStartElementExported = true; } XMLMergeElemTransformerContext::XMLMergeElemTransformerContext( @@ -165,7 +165,7 @@ XMLMergeElemTransformerContext::XMLMergeElemTransformerContext( sal_uInt16 nActionMap ) : XMLTransformerContext( rImp, rQName ), m_nActionMap( nActionMap ), - m_bStartElementExported( sal_False ) + m_bStartElementExported( false ) { } @@ -177,7 +177,7 @@ void XMLMergeElemTransformerContext::StartElement( const Reference< XAttributeList >& rAttrList ) { XMLMutableAttributeList *pMutableAttrList = - new XMLMutableAttributeList( rAttrList, sal_True ); + new XMLMutableAttributeList( rAttrList, true ); m_xAttrList = pMutableAttrList; sal_Int16 nAttrCount = m_xAttrList.is() ? m_xAttrList->getLength() : 0; @@ -188,17 +188,17 @@ void XMLMergeElemTransformerContext::StartElement( sal_uInt16 nPrefix = GetTransformer().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName ); - sal_Bool bRemove = sal_True; + bool bRemove = true; if( XML_NAMESPACE_OFFICE == nPrefix) { if (IsXMLToken( aLocalName, XML_DISPLAY ) ) - bRemove = sal_False; + bRemove = false; else if (IsXMLToken( aLocalName, XML_AUTHOR ) ) - bRemove = sal_False; + bRemove = false; else if (IsXMLToken( aLocalName, XML_CREATE_DATE ) ) - bRemove = sal_False; + bRemove = false; else if (IsXMLToken( aLocalName, XML_CREATE_DATE_STRING ) ) - bRemove = sal_False; + bRemove = false; } if (bRemove) { diff --git a/xmloff/source/transform/MergeElemTContext.hxx b/xmloff/source/transform/MergeElemTContext.hxx index 854cf9e37034..22c493bee9c5 100644 --- a/xmloff/source/transform/MergeElemTContext.hxx +++ b/xmloff/source/transform/MergeElemTContext.hxx @@ -33,7 +33,7 @@ class XMLMergeElemTransformerContext : public XMLTransformerContext ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; XMLPersTextContentTContextVector m_aChildContexts; sal_uInt16 m_nActionMap; - sal_Bool m_bStartElementExported; + bool m_bStartElementExported; void ExportStartElement(); diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx index e3fc5cdef820..dedb6edea8cf 100644 --- a/xmloff/source/transform/MutableAttrList.cxx +++ b/xmloff/source/transform/MutableAttrList.cxx @@ -49,7 +49,7 @@ XMLMutableAttributeList::XMLMutableAttributeList() : } XMLMutableAttributeList::XMLMutableAttributeList( const Reference< - XAttributeList> & rAttrList, sal_Bool bClone ) : + XAttributeList> & rAttrList, bool bClone ) : m_xAttrList( rAttrList.is() ? rAttrList : new SvXMLAttributeList ), m_pMutableAttrList( 0 ) { diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx index 18dc7111c8e2..5383f22dd342 100644 --- a/xmloff/source/transform/MutableAttrList.hxx +++ b/xmloff/source/transform/MutableAttrList.hxx @@ -44,7 +44,7 @@ public: XMLMutableAttributeList(); XMLMutableAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & rAttrList, - sal_Bool bClone=sal_False ); + bool bClone=false ); virtual ~XMLMutableAttributeList(); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); diff --git a/xmloff/source/transform/NotesTContext.cxx b/xmloff/source/transform/NotesTContext.cxx index e110d59d1dfb..121a63cb3402 100644 --- a/xmloff/source/transform/NotesTContext.cxx +++ b/xmloff/source/transform/NotesTContext.cxx @@ -44,9 +44,9 @@ TYPEINIT1( XMLNotesTransformerContext, XMLPersElemContentTContext ); XMLNotesTransformerContext::XMLNotesTransformerContext( XMLTransformerBase& rImp, const OUString& rQName, - XMLTokenEnum eToken, sal_Bool bPersistent ) : + XMLTokenEnum eToken, bool bPersistent ) : XMLPersElemContentTContext( rImp, rQName ), - m_bEndNote( sal_False ), + m_bEndNote( false ), m_bPersistent( bPersistent ), m_eTypeToken( eToken ) { @@ -95,7 +95,7 @@ void XMLNotesTransformerContext::StartElement( } else if( IsXMLToken( rAttrValue, XML_ENDNOTE ) ) { - m_bEndNote = sal_True; + m_bEndNote = true; } pMutableAttrList->RemoveAttributeByIndex( i ); --i; @@ -211,7 +211,7 @@ XMLTransformerContext *XMLNotesTransformerContext::CreateChildContext( return pContext; } -sal_Bool XMLNotesTransformerContext::IsPersistent() const +bool XMLNotesTransformerContext::IsPersistent() const { return m_bPersistent; } diff --git a/xmloff/source/transform/NotesTContext.hxx b/xmloff/source/transform/NotesTContext.hxx index 9b48f7d14be6..943b08cd98b6 100644 --- a/xmloff/source/transform/NotesTContext.hxx +++ b/xmloff/source/transform/NotesTContext.hxx @@ -24,8 +24,8 @@ class XMLNotesTransformerContext : public XMLPersElemContentTContext { - sal_Bool m_bEndNote; - sal_Bool m_bPersistent; + bool m_bEndNote; + bool m_bPersistent; ::xmloff::token::XMLTokenEnum m_eTypeToken; public: @@ -34,7 +34,7 @@ public: XMLNotesTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName, ::xmloff::token::XMLTokenEnum m_eToken, - sal_Bool bPersistent ); + bool bPersistent ); virtual ~XMLNotesTransformerContext(); @@ -46,7 +46,7 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; virtual void EndElement() SAL_OVERRIDE; - virtual sal_Bool IsPersistent() const SAL_OVERRIDE; + virtual bool IsPersistent() const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_NOTESTCONTEXT_HXX diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index dc97349a8518..3098480ee8cd 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1508,7 +1508,7 @@ void XMLTableOOoTransformerContext_Impl::StartElement( // Perform OOO_STYLE_REF_ACTIONS for all applications (#i50521#) Reference< XAttributeList > xAttrList( rAttrList ); XMLMutableAttributeList* pMutableAttrList = - GetTransformer().ProcessAttrList( xAttrList, OOO_STYLE_REF_ACTIONS, sal_False ); + GetTransformer().ProcessAttrList( xAttrList, OOO_STYLE_REF_ACTIONS, false ); if( rAttrList->getLength() && IsXMLToken( GetTransformer().GetClass(), XML_SPREADSHEET ) ) { bool bPrintRanges(false); diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index c340b19ed853..e6e8070c7430 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -1247,7 +1247,7 @@ void XMLTableTransformerContext_Impl::EndElement() class XMLBodyOASISTransformerContext_Impl : public XMLTransformerContext { - sal_Bool m_bFirstChild; + bool m_bFirstChild; public: TYPEINFO_OVERRIDE(); @@ -1272,7 +1272,7 @@ XMLBodyOASISTransformerContext_Impl::XMLBodyOASISTransformerContext_Impl( XMLTransformerBase& rImp, const OUString& rQName ) : XMLTransformerContext( rImp, rQName ), - m_bFirstChild( sal_False ) + m_bFirstChild( false ) { } @@ -1292,7 +1292,7 @@ XMLTransformerContext* XMLBodyOASISTransformerContext_Impl::CreateChildContext( { if (!m_bFirstChild) { - m_bFirstChild = sal_True; + m_bFirstChild = true; XMLTransformerContext::StartElement(xAttrList); } @@ -1439,9 +1439,9 @@ void XMLTabStopOASISTContext_Impl::StartElement( class XMLConfigItemTContext_Impl : public XMLTransformerContext { OUString m_aContent; - sal_Bool m_bIsRedlineProtectionKey; - sal_Bool m_bIsCursorX; - sal_Bool m_bIsCursorY; + bool m_bIsRedlineProtectionKey; + bool m_bIsCursorX; + bool m_bIsCursorY; public: @@ -1464,9 +1464,9 @@ XMLConfigItemTContext_Impl::XMLConfigItemTContext_Impl( XMLTransformerBase& rImp, const OUString& rQName ) : XMLTransformerContext( rImp, rQName ), - m_bIsRedlineProtectionKey( sal_False ), - m_bIsCursorX( sal_False ), - m_bIsCursorY( sal_False ) + m_bIsRedlineProtectionKey( false ), + m_bIsCursorX( false ), + m_bIsCursorY( false ) { } @@ -1496,11 +1496,11 @@ void XMLConfigItemTContext_Impl::StartElement( const sal_Char sCursorX[] = "CursorPositionX"; const sal_Char sCursorY[] = "CursorPositionY"; if( rValue.equalsAsciiL( sRedlineProtectionKey, sizeof(sRedlineProtectionKey)-1 ) ) - m_bIsRedlineProtectionKey = sal_True; + m_bIsRedlineProtectionKey = true; else if( rValue.equalsAsciiL( sCursorX, sizeof(sCursorX)-1 ) ) - m_bIsCursorX = sal_True; + m_bIsCursorX = true; else if( rValue.equalsAsciiL( sCursorY, sizeof(sCursorY)-1 ) ) - m_bIsCursorY = sal_True; + m_bIsCursorY = true; break; } diff --git a/xmloff/source/transform/PersAttrListTContext.cxx b/xmloff/source/transform/PersAttrListTContext.cxx index 14abd51cdc33..215500317da0 100644 --- a/xmloff/source/transform/PersAttrListTContext.cxx +++ b/xmloff/source/transform/PersAttrListTContext.cxx @@ -120,7 +120,7 @@ XMLTransformerContext *XMLPersAttrListTContext::CreateChildContext( { // ignore all child elements return new XMLIgnoreTransformerContext( GetTransformer(), - rQName, sal_True, sal_True ); + rQName, true, true ); } void XMLPersAttrListTContext::StartElement( @@ -133,7 +133,7 @@ void XMLPersAttrListTContext::StartElement( { pMutableAttrList = GetTransformer().ProcessAttrList( xAttrList, m_nActionMap, - sal_True ); + true ); } if( m_xAttrList.is() ) @@ -147,7 +147,7 @@ void XMLPersAttrListTContext::StartElement( } else { - m_xAttrList = new XMLMutableAttributeList( rAttrList, sal_True ); + m_xAttrList = new XMLMutableAttributeList( rAttrList, true ); } } @@ -160,9 +160,9 @@ void XMLPersAttrListTContext::Characters( const OUString& ) { } -sal_Bool XMLPersAttrListTContext::IsPersistent() const +bool XMLPersAttrListTContext::IsPersistent() const { - return sal_True; + return true; } void XMLPersAttrListTContext::Export() diff --git a/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx index b4fdbbadad12..43e8838f0875 100644 --- a/xmloff/source/transform/PersAttrListTContext.hxx +++ b/xmloff/source/transform/PersAttrListTContext.hxx @@ -91,7 +91,7 @@ public: // current element. virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; - virtual sal_Bool IsPersistent() const SAL_OVERRIDE; + virtual bool IsPersistent() const SAL_OVERRIDE; virtual void Export() SAL_OVERRIDE; virtual void ExportContent() SAL_OVERRIDE; diff --git a/xmloff/source/transform/PersMixedContentTContext.cxx b/xmloff/source/transform/PersMixedContentTContext.cxx index 160161678205..f2d42397b3c5 100644 --- a/xmloff/source/transform/PersMixedContentTContext.cxx +++ b/xmloff/source/transform/PersMixedContentTContext.cxx @@ -42,7 +42,7 @@ public: virtual void EndElement() SAL_OVERRIDE; virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; - virtual sal_Bool IsPersistent() const SAL_OVERRIDE; + virtual bool IsPersistent() const SAL_OVERRIDE; virtual void Export() SAL_OVERRIDE; }; @@ -81,9 +81,9 @@ void XMLPersTextTContext_Impl::EndElement() OSL_ENSURE( !this, "illegal call to EndElement" ); } -sal_Bool XMLPersTextTContext_Impl::IsPersistent() const +bool XMLPersTextTContext_Impl::IsPersistent() const { - return sal_True; + return true; } void XMLPersTextTContext_Impl::Characters( const OUString& rChars ) diff --git a/xmloff/source/transform/ProcAddAttrTContext.cxx b/xmloff/source/transform/ProcAddAttrTContext.cxx index 0c7f4fc70478..45036ab9321b 100644 --- a/xmloff/source/transform/ProcAddAttrTContext.cxx +++ b/xmloff/source/transform/ProcAddAttrTContext.cxx @@ -55,7 +55,7 @@ void XMLProcAddAttrTransformerContext::StartElement( Reference< XAttributeList > xAttrList( rAttrList ); XMLMutableAttributeList *pMutableAttrList = GetTransformer().ProcessAttrList( xAttrList, GetActionMap(), - sal_False ); + false ); if( !pMutableAttrList ) { pMutableAttrList = new XMLMutableAttributeList; diff --git a/xmloff/source/transform/ProcAttrTContext.cxx b/xmloff/source/transform/ProcAttrTContext.cxx index 4fc4de96f4b1..f48d48e7beb6 100644 --- a/xmloff/source/transform/ProcAttrTContext.cxx +++ b/xmloff/source/transform/ProcAttrTContext.cxx @@ -61,7 +61,7 @@ void XMLProcAttrTransformerContext::StartElement( const Reference< XAttributeList >& rAttrList ) { Reference< XAttributeList > xAttrList( rAttrList ); - GetTransformer().ProcessAttrList( xAttrList, m_nActionMap, sal_False ); + GetTransformer().ProcessAttrList( xAttrList, m_nActionMap, false ); GetTransformer().GetDocHandler()->startElement( m_aElemQName, xAttrList ); } diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index 0284e6d77a82..6ea187f936c1 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -244,7 +244,7 @@ void XMLPropertiesTContext_Impl::StartElement( break; case XML_OPTACTION_LINE_MODE: { - sal_Bool bWordMode = + bool bWordMode = IsXMLToken( rAttrValue, XML_SKIP_WHITE_SPACE ); OUString aAttrQName( GetTransformer().GetNamespaceMap().GetQNameByKey( @@ -607,7 +607,7 @@ void XMLPropertiesTContext_Impl::StartElement( { if( !m_xAttrList.is() ) { - m_xAttrList = new XMLMutableAttributeList( rAttrList, sal_True ); + m_xAttrList = new XMLMutableAttributeList( rAttrList, true ); } else { @@ -744,7 +744,7 @@ OUString XMLPropertiesTContext_Impl::MergeLineThrough( TYPEINIT1( XMLStyleOASISTContext, XMLPersElemContentTContext ); XMLStyleOASISTContext::XMLStyleOASISTContext(XMLTransformerBase& rImp, - const OUString& rQName, sal_Bool bPersistent) + const OUString& rQName, bool bPersistent) : XMLPersElemContentTContext(rImp, rQName) , m_bPersistent(bPersistent) , m_bControlStyle(false) @@ -754,7 +754,7 @@ XMLStyleOASISTContext::XMLStyleOASISTContext(XMLTransformerBase& rImp, XMLStyleOASISTContext::XMLStyleOASISTContext( XMLTransformerBase& rImp, const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, - sal_Bool bPersistent) + bool bPersistent) : XMLPersElemContentTContext(rImp, rQName, nPrefix, eToken) , m_bPersistent(bPersistent) , m_bControlStyle(false) @@ -890,7 +890,7 @@ void XMLStyleOASISTContext::StartElement( { OUString aAttrValue( rAttrValue ); if( GetTransformer().ConvertURIToOOo( aAttrValue, - static_cast< sal_Bool >((*aIter).second.m_nParam1))) + static_cast< bool >((*aIter).second.m_nParam1))) pMutableAttrList->SetValueByIndex( i, aAttrValue ); } break; @@ -941,7 +941,7 @@ void XMLStyleOASISTContext::ExportContent() XMLPersElemContentTContext::ExportContent(); } -sal_Bool XMLStyleOASISTContext::IsPersistent() const +bool XMLStyleOASISTContext::IsPersistent() const { return m_bPersistent; } diff --git a/xmloff/source/transform/StyleOASISTContext.hxx b/xmloff/source/transform/StyleOASISTContext.hxx index 90dcac1b1fe0..782c785348dd 100644 --- a/xmloff/source/transform/StyleOASISTContext.hxx +++ b/xmloff/source/transform/StyleOASISTContext.hxx @@ -30,7 +30,7 @@ class XMLStyleOASISTContext : public XMLPersElemContentTContext { ::rtl::Reference< XMLPropertiesTContext_Impl > m_xPropContext; - sal_Bool m_bPersistent; + bool m_bPersistent; bool m_bControlStyle; OUString m_aStyleFamily; @@ -39,12 +39,12 @@ public: XMLStyleOASISTContext( XMLTransformerBase& rTransformer, const OUString& rQName, - sal_Bool bPersistent=sal_False ); + bool bPersistent=false ); XMLStyleOASISTContext( XMLTransformerBase& rTransformer, const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, - sal_Bool bPersistent=sal_False ); + bool bPersistent=false ); virtual ~XMLStyleOASISTContext(); @@ -59,7 +59,7 @@ public: virtual void ExportContent() SAL_OVERRIDE; - virtual sal_Bool IsPersistent() const SAL_OVERRIDE; + virtual bool IsPersistent() const SAL_OVERRIDE; static XMLTransformerActions *CreateTransformerActions( sal_uInt16 nType ); }; diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index a909d1aca13f..62afb7c9ae31 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -224,12 +224,12 @@ class XMLPropertiesOOoTContext_Impl : public XMLTransformerContext XMLPropTypes m_aPropTypes; - sal_Bool m_bPersistent; + bool m_bPersistent; XMLTypedPropertiesOOoTContext_Impl *GetPropContextAndAction( TransformerAction_Impl& rAction, sal_uInt16 nPrefix, const OUString& rLocalName, - sal_Bool bElem ); + bool bElem ); XMLTypedPropertiesOOoTContext_Impl *GetPropContext( XMLPropType eType ); @@ -241,7 +241,7 @@ public: XMLPropertiesOOoTContext_Impl( XMLTransformerBase& rTransformer, const OUString& rQName, const XMLPropTypes& rTypes, - sal_Bool bPersistent ); + bool bPersistent ); virtual ~XMLPropertiesOOoTContext_Impl(); @@ -259,7 +259,7 @@ public: virtual void Export() SAL_OVERRIDE; - virtual sal_Bool IsPersistent() const SAL_OVERRIDE; + virtual bool IsPersistent() const SAL_OVERRIDE; }; TYPEINIT1( XMLPropertiesOOoTContext_Impl, XMLTransformerContext ); @@ -298,7 +298,7 @@ XMLTypedPropertiesOOoTContext_Impl *XMLPropertiesOOoTContext_Impl::GetPropContextAndAction( TransformerAction_Impl& rAction, sal_uInt16 nPrefix, const OUString& rLocalName, - sal_Bool bElem ) + bool bElem ) { rAction.m_nActionType = XML_ATACTION_COPY; sal_uInt16 nIndex = 0; @@ -373,7 +373,7 @@ XMLPropertiesOOoTContext_Impl::XMLPropertiesOOoTContext_Impl( XMLTransformerBase& rImp, const OUString& rQName, const XMLPropTypes& rTypes, - sal_Bool bPersistent ) : + bool bPersistent ) : XMLTransformerContext( rImp, rQName ), m_bPersistent( bPersistent ) { @@ -395,7 +395,7 @@ XMLTransformerContext *XMLPropertiesOOoTContext_Impl::CreateChildContext( const Reference< XAttributeList >& rAttrList ) { TransformerAction_Impl aAction; - return GetPropContextAndAction( aAction, nPrefix, rLocalName, sal_True ) + return GetPropContextAndAction( aAction, nPrefix, rLocalName, true ) ->CreateChildContext( nPrefix, rLocalName, rQName, rAttrList ); } @@ -407,8 +407,8 @@ void XMLPropertiesOOoTContext_Impl::StartElement( XMLTypedPropertiesOOoTContext_Impl * pIntervalMinorDivisorContext = 0; double fIntervalMajor = 0.0; double fIntervalMinor = 0.0; - sal_Bool bMoveProtect = sal_False; - sal_Bool bSizeProtect = sal_False; + bool bMoveProtect = false; + bool bSizeProtect = false; OUString aProtectAttrValue; XMLTypedPropertiesOOoTContext_Impl * pProtectContext = 0; @@ -416,9 +416,9 @@ void XMLPropertiesOOoTContext_Impl::StartElement( The filter from OpenDocument file format to OpenOffice.org file format produces styles with both attributes. (#i49139#) */ - sal_Bool bExistStyleMirror( sal_False ); + bool bExistStyleMirror( false ); OUString aStyleMirrorAttrValue; - sal_Bool bExistDrawMirror( sal_False ); + bool bExistDrawMirror( false ); OUString aDrawMirrorAttrValue; XMLTypedPropertiesOOoTContext_Impl* pMirrorContext( 0L ); @@ -433,7 +433,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( &aLocalName ); TransformerAction_Impl aAction; XMLTypedPropertiesOOoTContext_Impl *pContext = - GetPropContextAndAction( aAction, nPrefix, aLocalName, sal_False ); + GetPropContextAndAction( aAction, nPrefix, aLocalName, false ); switch( aAction.m_nActionType ) { case XML_ATACTION_REMOVE: @@ -545,7 +545,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( case XML_PTACTION_UNDERLINE: { XMLTokenEnum eToken = GetTransformer().GetToken( sAttrValue ); - sal_Bool bBold = sal_False, bDouble = sal_False; + bool bBold = false, bDouble = false; switch( eToken ) { case XML_SINGLE: @@ -553,43 +553,43 @@ void XMLPropertiesOOoTContext_Impl::StartElement( break; case XML_DOUBLE: eToken = XML_SOLID; - bDouble = sal_True; + bDouble = true; break; case XML_BOLD: eToken = XML_SOLID; - bBold = sal_True; + bBold = true; break; case XML_BOLD_DOTTED: eToken = XML_DOTTED; - bBold = sal_True; + bBold = true; break; case XML_BOLD_DASH: eToken = XML_DASH; - bBold = sal_True; + bBold = true; break; case XML_BOLD_LONG_DASH: eToken = XML_LONG_DASH; - bBold = sal_True; + bBold = true; break; case XML_BOLD_DOT_DASH: eToken = XML_DOT_DASH; - bBold = sal_True; + bBold = true; break; case XML_BOLD_DOT_DOT_DASH: eToken = XML_DOT_DOT_DASH; - bBold = sal_True; + bBold = true; break; case XML_BOLD_WAVE: eToken = XML_WAVE; - bBold = sal_True; + bBold = true; break; case XML_DOUBLE_WAVE: eToken = XML_WAVE; - bDouble = sal_True; + bDouble = true; break; case XML_NONE: eToken = XML_NONE; - bDouble = sal_False; + bDouble = false; break; default: OSL_FAIL( "xmloff::XMLPropertiesOOoTContext_Impl::StartElement(), unknown underline token!" ); @@ -618,7 +618,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( case XML_PTACTION_LINETHROUGH: { XMLTokenEnum eToken = GetTransformer().GetToken( sAttrValue ); - sal_Bool bBold = sal_False, bDouble = sal_False; + bool bBold = false, bDouble = false; sal_Unicode c = 0; switch( eToken ) { @@ -627,11 +627,11 @@ void XMLPropertiesOOoTContext_Impl::StartElement( break; case XML_DOUBLE_LINE: eToken = XML_SOLID; - bDouble = sal_True; + bDouble = true; break; case XML_THICK_LINE: eToken = XML_SOLID; - bBold = sal_True; + bBold = true; break; case XML_SLASH: eToken = XML_SOLID; @@ -824,7 +824,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( XML_NAMESPACE_CHART, GetXMLToken( XML_SYMBOL_IMAGE ))); OUString aAttrValue( sAttrValue ); - if( GetTransformer().ConvertURIToOASIS( aAttrValue, sal_True )) + if( GetTransformer().ConvertURIToOASIS( aAttrValue, true )) { pSymbolImageContext->AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aAttrValue ); pContext->AddContent( pSymbolImageContext ); @@ -897,7 +897,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( aDrawMirrorAttrValue = GetXMLToken( IsXMLToken( sAttrValue, XML_TRUE ) ? XML_HORIZONTAL : XML_NONE ); - bExistDrawMirror = sal_True; + bExistDrawMirror = true; pMirrorContext = pContext; } break; @@ -926,7 +926,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( aStyleMirrorAttrValue += aToken; } } - bExistStyleMirror = sal_True; + bExistStyleMirror = true; pMirrorContext = pContext; } break; @@ -1044,7 +1044,7 @@ void XMLPropertiesOOoTContext_Impl::Export() } } -sal_Bool XMLPropertiesOOoTContext_Impl::IsPersistent() const +bool XMLPropertiesOOoTContext_Impl::IsPersistent() const { return m_bPersistent; } @@ -1054,7 +1054,7 @@ TYPEINIT1( XMLStyleOOoTContext, XMLPersElemContentTContext ); XMLStyleOOoTContext::XMLStyleOOoTContext( XMLTransformerBase& rImp, const OUString& rQName, XMLFamilyType eT, - sal_Bool bPersistent ) : + bool bPersistent ) : XMLPersElemContentTContext( rImp, rQName ), m_eFamily( eT ), m_bPersistent( bPersistent ) @@ -1067,7 +1067,7 @@ XMLStyleOOoTContext::XMLStyleOOoTContext( XMLFamilyType eT, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, - sal_Bool bPersistent ) : + bool bPersistent ) : XMLPersElemContentTContext( rImp, rQName, nPrefix, eToken ), m_eFamily( eT ), m_bPersistent( bPersistent ) @@ -1177,7 +1177,7 @@ void XMLStyleOOoTContext::StartElement( { case XML_ATACTION_STYLE_FAMILY: { - sal_Bool bControl = sal_False; + bool bControl = false; if( XML_FAMILY_TYPE_END == m_eFamily ) { if( IsXMLToken( sAttrValue, XML_GRAPHICS ) ) @@ -1207,7 +1207,7 @@ void XMLStyleOOoTContext::StartElement( else if( IsXMLToken( sAttrValue, XML_CONTROL) ) { m_eFamily = XML_FAMILY_TYPE_PARAGRAPH; - bControl = sal_True; + bControl = true; } } if( XML_FAMILY_TYPE_GRAPHIC == m_eFamily ) @@ -1264,7 +1264,7 @@ void XMLStyleOOoTContext::StartElement( { OUString aAttrValue( sAttrValue ); if( GetTransformer().ConvertURIToOASIS( aAttrValue, - static_cast< sal_Bool >((*aIter).second.m_nParam1))) + static_cast< bool >((*aIter).second.m_nParam1))) pMutableAttrList->SetValueByIndex( i, aAttrValue ); } break; @@ -1296,7 +1296,7 @@ void XMLStyleOOoTContext::Characters( const OUString& ) // element content only: } -sal_Bool XMLStyleOOoTContext::IsPersistent() const +bool XMLStyleOOoTContext::IsPersistent() const { return m_bPersistent; } diff --git a/xmloff/source/transform/StyleOOoTContext.hxx b/xmloff/source/transform/StyleOOoTContext.hxx index 0495231a9692..1af1c8f62706 100644 --- a/xmloff/source/transform/StyleOOoTContext.hxx +++ b/xmloff/source/transform/StyleOOoTContext.hxx @@ -31,7 +31,7 @@ class XMLStyleOOoTContext : public XMLPersElemContentTContext { XMLFamilyType m_eFamily; - sal_Bool m_bPersistent; + bool m_bPersistent; public: TYPEINFO_OVERRIDE(); @@ -39,13 +39,13 @@ public: XMLStyleOOoTContext( XMLTransformerBase& rTransformer, const OUString& rQName, XMLFamilyType eType, - sal_Bool bPersistent ); + bool bPersistent ); XMLStyleOOoTContext( XMLTransformerBase& rTransformer, const OUString& rQName, XMLFamilyType eType, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, - sal_Bool bPersistent ); + bool bPersistent ); virtual ~XMLStyleOOoTContext(); @@ -57,7 +57,7 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; virtual void EndElement() SAL_OVERRIDE; virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; - virtual sal_Bool IsPersistent() const SAL_OVERRIDE; + virtual bool IsPersistent() const SAL_OVERRIDE; static XMLTransformerActions *CreateTransformerActions( sal_uInt16 nType ); diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 0ad4b9a0d82b..2433ca4f4ac2 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -92,8 +92,8 @@ XMLTransformerContext *XMLTransformerBase::CreateContext( sal_uInt16 nPrefix, switch( nActionType ) { case XML_ETACTION_COPY_CONTENT: - return new XMLIgnoreTransformerContext( *this, rQName, sal_False, - sal_False ); + return new XMLIgnoreTransformerContext( *this, rQName, false, + false ); case XML_ETACTION_COPY: return new XMLTransformerContext( *this, rQName ); case XML_ETACTION_RENAME_ELEM: @@ -503,7 +503,7 @@ static sal_Int16 lcl_getUnit( const OUString& rValue ) XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( Reference< XAttributeList >& rAttrList, sal_uInt16 nActionMap, - sal_Bool bClone ) + bool bClone ) { XMLMutableAttributeList *pMutableAttrList = 0; XMLTransformerActions *pActions = GetUserDefinedActions( nActionMap ); @@ -532,11 +532,11 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( } sal_uInt32 nAction = (*aIter).second.m_nActionType; - sal_Bool bRename = sal_False; + bool bRename = false; switch( nAction ) { case XML_ATACTION_RENAME: - bRename = sal_True; + bRename = true; break; case XML_ATACTION_COPY: break; @@ -547,7 +547,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( --nAttrCount; break; case XML_ATACTION_RENAME_IN2INCH: - bRename = sal_True; + bRename = true; case XML_ATACTION_IN2INCH: { OUString aAttrValue( rAttrValue ); @@ -563,7 +563,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( } break; case XML_ATACTION_RENAME_INCH2IN: - bRename = sal_True; + bRename = true; case XML_ATACTION_INCH2IN: { OUString aAttrValue( rAttrValue ); @@ -610,7 +610,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( } break; case XML_ATACTION_RENAME_DECODE_STYLE_NAME_REF: - bRename = sal_True; + bRename = true; case XML_ATACTION_DECODE_STYLE_NAME: case XML_ATACTION_DECODE_STYLE_NAME_REF: { @@ -636,7 +636,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( } break; case XML_ATACTION_RENAME_ENCODE_STYLE_NAME_REF: - bRename = sal_True; + bRename = true; case XML_ATACTION_ENCODE_STYLE_NAME_REF: { OUString aAttrValue( rAttrValue ); @@ -645,7 +645,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( } break; case XML_ATACTION_RENAME_NEG_PERCENT: - bRename = sal_True; + bRename = true; case XML_ATACTION_NEG_PERCENT: { OUString aAttrValue( rAttrValue ); @@ -654,7 +654,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( } break; case XML_ATACTION_RENAME_ADD_NAMESPACE_PREFIX: - bRename = sal_True; + bRename = true; case XML_ATACTION_ADD_NAMESPACE_PREFIX: { OUString aAttrValue( rAttrValue ); @@ -680,7 +680,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( } break; case XML_ATACTION_RENAME_REMOVE_NAMESPACE_PREFIX: - bRename = sal_True; + bRename = true; case XML_ATACTION_REMOVE_NAMESPACE_PREFIX: { OUString aAttrValue( rAttrValue ); @@ -703,7 +703,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( { OUString aAttrValue( rAttrValue ); if( ConvertURIToOASIS( aAttrValue, - static_cast< sal_Bool >((*aIter).second.m_nParam1))) + static_cast< bool >((*aIter).second.m_nParam1))) pMutableAttrList->SetValueByIndex( i, aAttrValue ); } break; @@ -711,7 +711,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( { OUString aAttrValue( rAttrValue ); if( ConvertURIToOOo( aAttrValue, - static_cast< sal_Bool >((*aIter).second.m_nParam1))) + static_cast< bool >((*aIter).second.m_nParam1))) pMutableAttrList->SetValueByIndex( i, aAttrValue ); } break; @@ -738,7 +738,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( OUString aAttrValue( rAttrValue ); if( ConvertRNGDateTimeToISO( aAttrValue )) pMutableAttrList->SetValueByIndex( i, aAttrValue ); - bRename = sal_True; + bRename = true; } break; case XML_ATACTION_IN2TWIPS: @@ -867,7 +867,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( NegPercent(aAttrValue); pMutableAttrList->SetValueByIndex( i, aAttrValue ); } - bRename = sal_True; + bRename = true; } break; case XML_ATACTION_SHAPEID: @@ -900,9 +900,9 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( return pMutableAttrList; } -sal_Bool XMLTransformerBase::ReplaceSingleInchWithIn( OUString& rValue ) +bool XMLTransformerBase::ReplaceSingleInchWithIn( OUString& rValue ) { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nPos = rValue.getLength(); while( nPos && rValue[nPos-1] <= ' ' ) --nPos; @@ -911,15 +911,15 @@ sal_Bool XMLTransformerBase::ReplaceSingleInchWithIn( OUString& rValue ) ('h'==rValue[nPos-1] || 'H'==rValue[nPos-1]) ) { rValue =rValue.copy( 0, nPos-2 ); - bRet = sal_True; + bRet = true; } return bRet; } -sal_Bool XMLTransformerBase::ReplaceInchWithIn( OUString& rValue ) +bool XMLTransformerBase::ReplaceInchWithIn( OUString& rValue ) { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nPos = 1; while( nPos < rValue.getLength()-3 ) { @@ -941,7 +941,7 @@ sal_Bool XMLTransformerBase::ReplaceInchWithIn( OUString& rValue ) rValue = rValue.replaceAt( nPos, 4, GetXMLToken(XML_UNIT_INCH) ); nPos += 2; - bRet = sal_True; + bRet = true; continue; } } @@ -954,9 +954,9 @@ sal_Bool XMLTransformerBase::ReplaceInchWithIn( OUString& rValue ) return bRet; } -sal_Bool XMLTransformerBase::ReplaceSingleInWithInch( OUString& rValue ) +bool XMLTransformerBase::ReplaceSingleInWithInch( OUString& rValue ) { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nPos = rValue.getLength(); while( nPos && rValue[nPos-1] <= ' ' ) @@ -970,15 +970,15 @@ sal_Bool XMLTransformerBase::ReplaceSingleInWithInch( OUString& rValue ) nPos -= 2; rValue = rValue.replaceAt( nPos, rValue.getLength() - nPos, GetXMLToken(XML_INCH) ); - bRet = sal_True; + bRet = true; } return bRet; } -sal_Bool XMLTransformerBase::ReplaceInWithInch( OUString& rValue ) +bool XMLTransformerBase::ReplaceInWithInch( OUString& rValue ) { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nPos = 1; while( nPos < rValue.getLength()-1 ) { @@ -994,7 +994,7 @@ sal_Bool XMLTransformerBase::ReplaceInWithInch( OUString& rValue ) rValue = rValue.replaceAt( nPos, 2, GetXMLToken(XML_INCH) ); nPos += 4; - bRet = sal_True; + bRet = true; continue; } } @@ -1005,11 +1005,11 @@ sal_Bool XMLTransformerBase::ReplaceInWithInch( OUString& rValue ) return bRet; } -sal_Bool XMLTransformerBase::EncodeStyleName( OUString& rName ) const +bool XMLTransformerBase::EncodeStyleName( OUString& rName ) const { static const sal_Char aHexTab[] = "0123456789abcdef"; - sal_Bool bEncoded = sal_False; + bool bEncoded = false; sal_Int32 nLen = rName.getLength(); OUStringBuffer aBuffer( nLen ); @@ -1017,7 +1017,7 @@ sal_Bool XMLTransformerBase::EncodeStyleName( OUString& rName ) const for( sal_Int32 i = 0; i < nLen; i++ ) { sal_Unicode c = rName[i]; - sal_Bool bValidChar = sal_False; + bool bValidChar = false; if( c < 0x00ffU ) { bValidChar = @@ -1034,12 +1034,12 @@ sal_Bool XMLTransformerBase::EncodeStyleName( OUString& rName ) const if( (c >= 0xf900U && c <= 0xfffeU) || (c >= 0x20ddU && c <= 0x20e0U)) { - bValidChar = sal_False; + bValidChar = false; } else if( (c >= 0x02bbU && c <= 0x02c1U) || c == 0x0559 || c == 0x06e5 || c == 0x06e6 ) { - bValidChar = sal_True; + bValidChar = true; } else if( c == 0x0387 ) { @@ -1061,7 +1061,7 @@ sal_Bool XMLTransformerBase::EncodeStyleName( OUString& rName ) const case UnicodeType::TITLECASE_LETTER: // Lt case UnicodeType::OTHER_LETTER: // Lo case UnicodeType::LETTER_NUMBER: // Nl - bValidChar = sal_True; + bValidChar = true; break; case UnicodeType::NON_SPACING_MARK: // Ms case UnicodeType::ENCLOSING_MARK: // Me @@ -1092,26 +1092,26 @@ sal_Bool XMLTransformerBase::EncodeStyleName( OUString& rName ) const aBuffer.append( static_cast< sal_Unicode >( aHexTab[ c & 0x0f ] ) ); aBuffer.append( '_' ); - bEncoded = sal_True; + bEncoded = true; } } if( aBuffer.getLength() > (1<<15)-1 ) - bEncoded = sal_False; + bEncoded = false; if( bEncoded ) rName = aBuffer.makeStringAndClear(); return bEncoded; } -sal_Bool XMLTransformerBase::DecodeStyleName( OUString& rName ) +bool XMLTransformerBase::DecodeStyleName( OUString& rName ) { - sal_Bool bEncoded = sal_False; + bool bEncoded = false; sal_Int32 nLen = rName.getLength(); OUStringBuffer aBuffer( nLen ); - sal_Bool bWithinHex = sal_False; + bool bWithinHex = false; sal_Unicode cEnc = 0; for( sal_Int32 i = 0; i < nLen; i++ ) { @@ -1125,7 +1125,7 @@ sal_Bool XMLTransformerBase::DecodeStyleName( OUString& rName ) } else { - bEncoded = sal_True; + bEncoded = true; } bWithinHex = !bWithinHex; } @@ -1147,7 +1147,7 @@ sal_Bool XMLTransformerBase::DecodeStyleName( OUString& rName ) else { // error - bEncoded = sal_False; + bEncoded = false; break; } cEnc = (cEnc << 4) + cDigit; @@ -1163,10 +1163,10 @@ sal_Bool XMLTransformerBase::DecodeStyleName( OUString& rName ) return bEncoded; } -sal_Bool XMLTransformerBase::NegPercent( OUString& rValue ) +bool XMLTransformerBase::NegPercent( OUString& rValue ) { - sal_Bool bRet = sal_False; - sal_Bool bNeg = sal_False; + bool bRet = false; + bool bNeg = false; double nVal = 0; sal_Int32 nPos = 0; @@ -1178,7 +1178,7 @@ sal_Bool XMLTransformerBase::NegPercent( OUString& rValue ) if( nPos < nLen && '-' == rValue[nPos] ) { - bNeg = sal_True; + bNeg = true; nPos++; } @@ -1222,26 +1222,26 @@ sal_Bool XMLTransformerBase::NegPercent( OUString& rValue ) rValue = OUString::number(nIntVal) + "%"; - bRet = sal_True; + bRet = true; } return bRet; } -sal_Bool XMLTransformerBase::AddNamespacePrefix( OUString& rName, +bool XMLTransformerBase::AddNamespacePrefix( OUString& rName, sal_uInt16 nPrefix ) const { rName = GetNamespaceMap().GetQNameByKey( nPrefix, rName, false ); - return sal_True; + return true; } -sal_Bool XMLTransformerBase::RemoveNamespacePrefix( OUString& rName, +bool XMLTransformerBase::RemoveNamespacePrefix( OUString& rName, sal_uInt16 nPrefixOnly ) const { OUString aLocalName; sal_uInt16 nPrefix = GetNamespaceMap()._GetKeyByAttrName( rName, &aLocalName, false ); - sal_Bool bRet = XML_NAMESPACE_UNKNOWN != nPrefix && + bool bRet = XML_NAMESPACE_UNKNOWN != nPrefix && (USHRT_MAX == nPrefixOnly || nPrefix == nPrefixOnly); if( bRet ) rName = aLocalName; @@ -1249,13 +1249,13 @@ sal_Bool XMLTransformerBase::RemoveNamespacePrefix( OUString& rName, return bRet; } -sal_Bool XMLTransformerBase::ConvertURIToOASIS( OUString& rURI, - sal_Bool bSupportPackage ) const +bool XMLTransformerBase::ConvertURIToOASIS( OUString& rURI, + bool bSupportPackage ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( !m_aExtPathPrefix.isEmpty() && !rURI.isEmpty() ) { - sal_Bool bRel = sal_False; + bool bRel = false; switch( rURI[0] ) { case '#': @@ -1264,7 +1264,7 @@ sal_Bool XMLTransformerBase::ConvertURIToOASIS( OUString& rURI, if( bSupportPackage ) { rURI = rURI.copy( 1 ); - bRet = sal_True; + bRet = true; } break; case '/': @@ -1272,17 +1272,17 @@ sal_Bool XMLTransformerBase::ConvertURIToOASIS( OUString& rURI, break; case '.': // a rel path; to keep URI simple, remove './', if there - bRel = sal_True; + bRel = true; if( rURI.getLength() > 1 && '/' == rURI[1] ) { rURI = rURI.copy( 2 ); - bRet = sal_True; + bRet = true; } break; default: // check for a RFC2396 schema { - bRel = sal_True; + bRel = true; sal_Int32 nPos = 1; sal_Int32 nLen = rURI.getLength(); while( nPos < nLen ) @@ -1295,7 +1295,7 @@ sal_Bool XMLTransformerBase::ConvertURIToOASIS( OUString& rURI, break; case ':': // a schema - bRel = sal_False; + bRel = false; nPos = nLen; // leave loop break; default: @@ -1312,20 +1312,20 @@ sal_Bool XMLTransformerBase::ConvertURIToOASIS( OUString& rURI, OUString sTmp( m_aExtPathPrefix ); sTmp += rURI; rURI = sTmp; - bRet = sal_True; + bRet = true; } } return bRet; } -sal_Bool XMLTransformerBase::ConvertURIToOOo( OUString& rURI, - sal_Bool bSupportPackage ) const +bool XMLTransformerBase::ConvertURIToOOo( OUString& rURI, + bool bSupportPackage ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( !rURI.isEmpty() ) { - sal_Bool bPackage = sal_False; + bool bPackage = false; switch( rURI[0] ) { case '/': @@ -1337,17 +1337,17 @@ sal_Bool XMLTransformerBase::ConvertURIToOOo( OUString& rURI, { // an external URI; remove '../' rURI = rURI.copy( m_aExtPathPrefix.getLength() ); - bRet = sal_True; + bRet = true; } else { - bPackage = sal_True; + bPackage = true; } break; default: // check for a RFC2396 schema { - bPackage = sal_True; + bPackage = true; sal_Int32 nPos = 1; sal_Int32 nLen = rURI.getLength(); while( nPos < nLen ) @@ -1360,7 +1360,7 @@ sal_Bool XMLTransformerBase::ConvertURIToOOo( OUString& rURI, break; case ':': // a schema - bPackage = sal_False; + bPackage = false; nPos = nLen; // leave loop break; default: @@ -1379,14 +1379,14 @@ sal_Bool XMLTransformerBase::ConvertURIToOOo( OUString& rURI, rURI = rURI.copy( 2 ); sTmp += rURI; rURI = sTmp; - bRet = sal_True; + bRet = true; } } return bRet; } -sal_Bool XMLTransformerBase::RenameAttributeValue( +bool XMLTransformerBase::RenameAttributeValue( OUString& rOutAttributeValue, sal_Int32 nParam1, sal_Int32 nParam2, diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx index 13638ce8376b..6d14b30fb3e4 100644 --- a/xmloff/source/transform/TransformerBase.hxx +++ b/xmloff/source/transform/TransformerBase.hxx @@ -141,32 +141,32 @@ public: XMLMutableAttributeList *ProcessAttrList( ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rAttrList, - sal_uInt16 nActionMap, sal_Bool bClone ); + sal_uInt16 nActionMap, bool bClone ); - static sal_Bool ReplaceSingleInchWithIn( OUString& rValue ); - static sal_Bool ReplaceSingleInWithInch( OUString& rValue ); - static sal_Bool ReplaceInchWithIn( OUString& rValue ); - static sal_Bool ReplaceInWithInch( OUString& rValue ); + static bool ReplaceSingleInchWithIn( OUString& rValue ); + static bool ReplaceSingleInWithInch( OUString& rValue ); + static bool ReplaceInchWithIn( OUString& rValue ); + static bool ReplaceInWithInch( OUString& rValue ); - sal_Bool EncodeStyleName( OUString& rName ) const; - static sal_Bool DecodeStyleName( OUString& rName ); - static sal_Bool NegPercent( OUString& rValue ); + bool EncodeStyleName( OUString& rName ) const; + static bool DecodeStyleName( OUString& rName ); + static bool NegPercent( OUString& rValue ); - sal_Bool AddNamespacePrefix( OUString& rName, + bool AddNamespacePrefix( OUString& rName, sal_uInt16 nPrefix ) const; - sal_Bool RemoveNamespacePrefix( OUString& rName, + bool RemoveNamespacePrefix( OUString& rName, sal_uInt16 nPrefixOnly=0xffffU ) const; - sal_Bool ConvertURIToOASIS( OUString& rURI, - sal_Bool bSupportPackage=sal_False ) const; - sal_Bool ConvertURIToOOo( OUString& rURI, - sal_Bool bSupportPackage=sal_False ) const; + bool ConvertURIToOASIS( OUString& rURI, + bool bSupportPackage=false ) const; + bool ConvertURIToOOo( OUString& rURI, + bool bSupportPackage=false ) const; /** renames the given rOutAttributeValue if one of the parameters contains a matching token in its lower 16 bits. The value is converted to the token that is given in the upper 16 bits of the matching parameter. */ - sal_Bool RenameAttributeValue( OUString& rOutAttributeValue, + bool RenameAttributeValue( OUString& rOutAttributeValue, sal_Int32 nParam1, sal_Int32 nParam2, sal_Int32 nParam3 ); diff --git a/xmloff/source/transform/TransformerContext.cxx b/xmloff/source/transform/TransformerContext.cxx index a193c65d500d..3cd09b34f3be 100644 --- a/xmloff/source/transform/TransformerContext.cxx +++ b/xmloff/source/transform/TransformerContext.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::xml::sax; TYPEINIT0( XMLTransformerContext ); -sal_Bool XMLTransformerContext::HasQName( sal_uInt16 nPrefix, +bool XMLTransformerContext::HasQName( sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ) const { OUString aLocalName; @@ -42,7 +42,7 @@ sal_Bool XMLTransformerContext::HasQName( sal_uInt16 nPrefix, ::xmloff::token::IsXMLToken( aLocalName, eToken ); } -sal_Bool XMLTransformerContext::HasNamespace( sal_uInt16 nPrefix ) const +bool XMLTransformerContext::HasNamespace( sal_uInt16 nPrefix ) const { return GetTransformer().GetNamespaceMap().GetKeyByAttrName( m_aQName ) == nPrefix; } @@ -82,9 +82,9 @@ void XMLTransformerContext::Characters( const OUString& rChars ) m_rTransformer.GetDocHandler()->characters( rChars ); } -sal_Bool XMLTransformerContext::IsPersistent() const +bool XMLTransformerContext::IsPersistent() const { - return sal_False; + return false; } void XMLTransformerContext::Export() diff --git a/xmloff/source/transform/TransformerContext.hxx b/xmloff/source/transform/TransformerContext.hxx index 4948876311a5..4bd1499a8af5 100644 --- a/xmloff/source/transform/TransformerContext.hxx +++ b/xmloff/source/transform/TransformerContext.hxx @@ -53,9 +53,9 @@ public: TYPEINFO(); const OUString& GetQName() const { return m_aQName; } - sal_Bool HasQName( sal_uInt16 nPrefix, + bool HasQName( sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ) const; - sal_Bool HasNamespace( sal_uInt16 nPrefix ) const; + bool HasNamespace( sal_uInt16 nPrefix ) const; // A contexts constructor does anything that is required if an element // starts. Namespace processing has been done already. @@ -93,7 +93,7 @@ public: // Is the current context a persistent one (i.e. one that saves is content // rather than exporting it directly? - virtual sal_Bool IsPersistent() const; + virtual bool IsPersistent() const; // Export the whole element. By default, nothing is done here virtual void Export(); |