diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-07 16:42:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-15 09:02:31 +0200 |
| commit | 8a81f542a6ca566661305c53899b7e422cbaa432 (patch) | |
| tree | b70ce405aab1c29856fa824493a664ba8ba27596 /xmloff/source/transform | |
| parent | avmedia: sal_Bool->bool (diff) | |
| download | core-8a81f542a6ca566661305c53899b7e422cbaa432.tar.gz core-8a81f542a6ca566661305c53899b7e422cbaa432.zip | |
xmloff: sal_Bool->bool
Change-Id: I873c80baec8e70e3e8f642644563b92137571a30
Diffstat (limited to 'xmloff/source/transform')
39 files changed, 256 insertions, 256 deletions
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(); |