diff options
author | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-01-11 11:37:33 -0200 |
---|---|---|
committer | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-01-11 18:43:07 -0200 |
commit | 806dce17d6631738c7388d8d68d8b5ac2e4c11a8 (patch) | |
tree | 0759954593c2fa8a85b94e5d3a4b4f40e913f091 /starmath | |
parent | e33702442a22a72f96a093fbfdf8bfac217f416f (diff) |
Fix for fdo43460 Part XXXIV getLength() to isEmpty()
Part XXXIV
Modules
shell, slideshow, sot, starmath
Diffstat (limited to 'starmath')
-rw-r--r-- | starmath/source/cfgitem.cxx | 4 | ||||
-rw-r--r-- | starmath/source/dialog.cxx | 2 | ||||
-rw-r--r-- | starmath/source/mathmlexport.cxx | 2 | ||||
-rw-r--r-- | starmath/source/mathmlimport.cxx | 14 | ||||
-rw-r--r-- | starmath/source/smdetect.cxx | 2 | ||||
-rw-r--r-- | starmath/source/unomodel.cxx | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 33c83c1c4717..74247f907bbb 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -1027,7 +1027,7 @@ void SmMathConfig::LoadFormat() bool bUseDefaultFont = true; if (pVal->hasValue() && (*pVal >>= aTmpStr)) { - bUseDefaultFont = 0 == aTmpStr.getLength(); + bUseDefaultFont = aTmpStr.isEmpty(); if (bUseDefaultFont) { aFnt = pFormat->GetFont( i ); @@ -1092,7 +1092,7 @@ void SmMathConfig::SaveFormat() { SmFontFormat aFntFmt( pFormat->GetFont( i ) ); aFntFmtId = GetFontFormatList().GetFontFormatId( aFntFmt, true ); - OSL_ENSURE( aFntFmtId.getLength(), "FontFormatId not found" ); + OSL_ENSURE( !aFntFmtId.isEmpty(), "FontFormatId not found" ); } *pValue++ <<= aFntFmtId; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 859d635d4608..23fd2de70e6d 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1628,7 +1628,7 @@ void SmShowChar::Paint(const Rectangle &rRect) Control::Paint( rRect ); OUString aText( GetText() ); - if (aText.getLength() > 0) + if (!aText.isEmpty()) { #if OSL_DEBUG_LEVEL > 1 sal_Int32 nPos = 0; diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index 6f449d11e28b..d35e161300e3 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -201,7 +201,7 @@ sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium) aName = pDocHierarchItem->GetValue(); } - if ( aName.getLength() ) + if ( !aName.isEmpty() ) { sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")); xInfoSet->setPropertyValue( sPropName, makeAny( aName ) ); diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index de00ebb9accd..50a412ce98d5 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -202,7 +202,7 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium) aName = pDocHierarchItem->GetValue(); } - if ( aName.getLength() ) + if ( !aName.isEmpty() ) { sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")); xInfoSet->setPropertyValue( sPropName, makeAny( aName ) ); @@ -649,7 +649,7 @@ void SmXMLImportContext::Characters(const OUString &rChars) */ //collapsing not done yet! const OUString &rChars2 = rChars.trim(); - if (rChars2.getLength()) + if (!rChars2.isEmpty()) TCharacters(rChars2/*.collapse()*/); } @@ -733,7 +733,7 @@ void SmXMLContext_Helper::RetrieveAttrs(const uno::Reference< if ((nOldIsBold!=nIsBold) || (nOldIsItalic!=nIsItalic) || (nOldFontSize!=nFontSize) || (sOldFontFamily!=sFontFamily) - || sColor.getLength()) + || !sColor.isEmpty()) bFontNodeNeeded=sal_True; else bFontNodeNeeded=sal_False; @@ -793,7 +793,7 @@ void SmXMLContext_Helper::ApplyAttrs() pFontNode->SetSubNodes(0,lcl_popOrZero(rNodeStack)); rNodeStack.push(pFontNode); } - if (sFontFamily.getLength()) + if (!sFontFamily.isEmpty()) { if (sFontFamily.equalsIgnoreAsciiCase(GetXMLToken(XML_FIXED))) aToken.eType = TFIXED; @@ -812,7 +812,7 @@ void SmXMLContext_Helper::ApplyAttrs() pFontNode->SetSubNodes(0,lcl_popOrZero(rNodeStack)); rNodeStack.push(pFontNode); } - if (sColor.getLength()) + if (!sColor.isEmpty()) { //Again we can only handle a small set of colours in //StarMath for now. @@ -1337,8 +1337,8 @@ void SmXMLIdentifierContext_Impl::EndElement() } if ((-1!=aStyleHelper.nIsBold) || (0.0!=aStyleHelper.nFontSize) || - (aStyleHelper.sFontFamily.getLength()) || - aStyleHelper.sColor.getLength()) + (!aStyleHelper.sFontFamily.isEmpty()) || + !aStyleHelper.sColor.isEmpty()) aStyleHelper.bFontNodeNeeded=sal_True; else aStyleHelper.bFontNodeNeeded=sal_False; diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index 3920a7272e83..c2d0a5c596ba 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -397,7 +397,7 @@ SmFilterDetect::~SmFilterDetect() lDescriptor[nIndexOfTemplateFlag].Value <<= bOpenAsTemplate; } - if ( aDocumentTitle.getLength() ) + if ( !aDocumentTitle.isEmpty() ) { // the title was set here if ( nIndexOfDocumentTitle == -1 ) diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 70627ac21cef..0e1ba83559c1 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -628,7 +628,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* OUString sPrinterName; if (*pValues >>= sPrinterName ) { - if ( sPrinterName.getLength() ) + if ( !sPrinterName.isEmpty() ) { SfxPrinter *pNewPrinter = new SfxPrinter ( pPrinter->GetOptions().Clone(), sPrinterName ); if (pNewPrinter->IsKnown()) |