diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-22 14:58:57 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-22 15:00:54 +0100 |
| commit | bbd9668d5f70d8ff00a7b10915e7a16ceadb8443 (patch) | |
| tree | 4e65b4d58e6a4298219b1909f524b710677606d9 /xmloff | |
| parent | 4eda1a0293a869bf804056f1e9e04c984c69454d (diff) | |
bool improvements (related to mixing bool/sal_Bool in &=, |=, ^=)
Change-Id: I9869d9709f28b68ef7b518527175589d80644668
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/style/XMLBackgroundImageContext.cxx | 12 | ||||
| -rw-r--r-- | xmloff/source/style/xmlimppr.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/text/txtflde.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/transform/FormPropOASISTContext.cxx | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index 814243d9ba7b..eb511f22af5a 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -202,12 +202,12 @@ void XMLBackgroundImageContext::ProcessAttrs( SvXMLTokenEnumerator aTokenEnum( rValue ); OUString aToken; sal_Bool bHori = sal_False, bVert = sal_False; - sal_Bool bOK = sal_True; + bool bOK = true; while( bOK && aTokenEnum.getNextToken( aToken ) ) { if( bHori && bVert ) { - bOK = sal_False; + bOK = false; } else if( -1 != aToken.indexOf( '%' ) ) { @@ -235,7 +235,7 @@ void XMLBackgroundImageContext::ProcessAttrs( else { // wrong percentage - bOK = sal_False; + bOK = false; } } else if( IsXMLToken( aToken, XML_CENTER ) ) @@ -258,7 +258,7 @@ void XMLBackgroundImageContext::ProcessAttrs( else if( !bHori ) eNewPos = (GraphicLocation)nTmp; else - bOK = sal_False; + bOK = false; bHori = sal_True; } else if( SvXMLUnitConverter::convertEnum( nTmp, aToken, @@ -270,12 +270,12 @@ void XMLBackgroundImageContext::ProcessAttrs( else if( !bVert ) eNewPos = (GraphicLocation)nTmp; else - bOK = sal_False; + bOK = false; bVert = sal_True; } else { - bOK = sal_False; + bOK = false; } } diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 79e712fa3054..4ffac034a686 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -140,7 +140,7 @@ void SvXMLImportPropertyMapper::importXML( // for better error reporting: this should be set true if no // warning is needed - sal_Bool bNoWarning = sal_False; + bool bNoWarning = false; bool bAlienImport = false; do diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 6f476c47e593..643354d5da48 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -2883,7 +2883,7 @@ sal_Bool XMLTextFieldExport::ExplodeFieldMasterName( { sal_Int32 nLength = sFieldMasterPrefix.getLength(); sal_Int32 nSeparator = sMasterName.indexOf('.', nLength); - sal_Bool bReturn = sal_True; + bool bReturn = true; #ifdef DBG_UTIL // check for service name @@ -2894,7 +2894,7 @@ sal_Bool XMLTextFieldExport::ExplodeFieldMasterName( if (nSeparator <= nLength) { nSeparator = sMasterName.getLength(); DBG_WARNING("no field var name!"); - bReturn = sal_False; + bReturn = false; } else { diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx index a505ed9e21c3..8ab8ef791b71 100644 --- a/xmloff/source/transform/FormPropOASISTContext.cxx +++ b/xmloff/source/transform/FormPropOASISTContext.cxx @@ -54,7 +54,7 @@ XMLTokenEnum XMLFormPropOASISTransformerContext::GetValueType( } // get number - sal_Bool bOverflow = sal_False; + bool bOverflow = false; while( nPos < nLen && '0' <= rValue[nPos] && '9' >= rValue[nPos] ) |