Kaydet (Commit) 21dcef53 authored tarafından Noel Grandin's avatar Noel Grandin

xmlscript: sal_Bool->bool

Change-Id: I5d0041283637dddeac86c50917d77c7e3d005b20
üst 65c3e11e
...@@ -37,11 +37,11 @@ struct XMLSCRIPT_DLLPUBLIC LibDescriptor ...@@ -37,11 +37,11 @@ struct XMLSCRIPT_DLLPUBLIC LibDescriptor
{ {
OUString aName; OUString aName;
OUString aStorageURL; OUString aStorageURL;
sal_Bool bLink; bool bLink;
sal_Bool bReadOnly; bool bReadOnly;
sal_Bool bPasswordProtected; bool bPasswordProtected;
::com::sun::star::uno::Sequence< OUString > aElementNames; ::com::sun::star::uno::Sequence< OUString > aElementNames;
sal_Bool bPreload; bool bPreload;
}; };
struct XMLSCRIPT_DLLPUBLIC LibDescriptorArray struct XMLSCRIPT_DLLPUBLIC LibDescriptorArray
......
...@@ -53,7 +53,7 @@ inline sal_Int32 toInt32( OUString const & rStr ) SAL_THROW(()) ...@@ -53,7 +53,7 @@ inline sal_Int32 toInt32( OUString const & rStr ) SAL_THROW(())
return nVal; return nVal;
} }
inline bool getBoolAttr( inline bool getBoolAttr(
sal_Bool * pRet, OUString const & rAttrName, bool * pRet, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes, sal_Int32 uid ) Reference< xml::input::XAttributes > const & xAttributes, sal_Int32 uid )
{ {
OUString aValue( OUString aValue(
...@@ -62,12 +62,12 @@ inline bool getBoolAttr( ...@@ -62,12 +62,12 @@ inline bool getBoolAttr(
{ {
if ( aValue == "true" ) if ( aValue == "true" )
{ {
*pRet = sal_True; *pRet = true;
return true; return true;
} }
else if ( aValue == "false" ) else if ( aValue == "false" )
{ {
*pRet = sal_False; *pRet = false;
return true; return true;
} }
else else
......
...@@ -154,7 +154,7 @@ Reference< xml::input::XElement > LibraryImport::startRootElement( ...@@ -154,7 +154,7 @@ Reference< xml::input::XElement > LibraryImport::startRootElement(
else if ( mpLibDesc && rLocalName == "library" ) else if ( mpLibDesc && rLocalName == "library" )
{ {
LibDescriptor& aDesc = *mpLibDesc; LibDescriptor& aDesc = *mpLibDesc;
aDesc.bLink = aDesc.bReadOnly = aDesc.bPasswordProtected = aDesc.bPreload = sal_False; aDesc.bLink = aDesc.bReadOnly = aDesc.bPasswordProtected = aDesc.bPreload = false;
aDesc.aName = xAttributes->getValueByUidName(XMLNS_LIBRARY_UID, "name" ); aDesc.aName = xAttributes->getValueByUidName(XMLNS_LIBRARY_UID, "name" );
getBoolAttr( &aDesc.bReadOnly, "readonly", xAttributes, XMLNS_LIBRARY_UID ); getBoolAttr( &aDesc.bReadOnly, "readonly", xAttributes, XMLNS_LIBRARY_UID );
...@@ -191,7 +191,7 @@ Reference< xml::input::XElement > LibrariesElement::startChildElement( ...@@ -191,7 +191,7 @@ Reference< xml::input::XElement > LibrariesElement::startChildElement(
else if ( rLocalName == "library" ) else if ( rLocalName == "library" )
{ {
LibDescriptor aDesc; LibDescriptor aDesc;
aDesc.bLink = aDesc.bReadOnly = aDesc.bPasswordProtected = aDesc.bPreload = sal_False; aDesc.bLink = aDesc.bReadOnly = aDesc.bPasswordProtected = aDesc.bPreload = false;
aDesc.aName = xAttributes->getValueByUidName(_pImport->XMLNS_LIBRARY_UID, "name" ); aDesc.aName = xAttributes->getValueByUidName(_pImport->XMLNS_LIBRARY_UID, "name" );
aDesc.aStorageURL = xAttributes->getValueByUidName( _pImport->XMLNS_XLINK_UID, "href" ); aDesc.aStorageURL = xAttributes->getValueByUidName( _pImport->XMLNS_XLINK_UID, "href" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment