shell/source/cmdmail/cmdmailmsg.cxx | 18 +++++----- shell/source/cmdmail/cmdmailsuppl.cxx | 8 ++-- shell/source/unix/exec/shellexec.cxx | 4 +- shell/source/unix/sysshell/recently_used_file.cxx | 2 - slideshow/source/engine/activities/activitiesfactory.cxx | 2 - slideshow/source/engine/animationnodes/animationaudionode.cxx | 2 - slideshow/source/engine/shapes/shapeimporter.cxx | 2 - slideshow/source/engine/shapes/viewmediashape.cxx | 4 +- slideshow/source/engine/slide/shapemanagerimpl.cxx | 4 +- slideshow/source/engine/slideshowimpl.cxx | 4 +- sot/source/sdstor/storage.cxx | 2 - sot/source/sdstor/ucbstorage.cxx | 8 ++-- sot/source/unoolestorage/xolesimplestorage.cxx | 4 +- starmath/source/cfgitem.cxx | 4 +- starmath/source/dialog.cxx | 2 - starmath/source/mathmlexport.cxx | 2 - starmath/source/mathmlimport.cxx | 14 +++---- starmath/source/smdetect.cxx | 2 - starmath/source/unomodel.cxx | 2 - 19 files changed, 45 insertions(+), 45 deletions(-)
New commits: commit 806dce17d6631738c7388d8d68d8b5ac2e4c11a8 Author: Olivier Hallot <olivier.hal...@alta.org.br> Date: Wed Jan 11 11:37:33 2012 -0200 Fix for fdo43460 Part XXXIV getLength() to isEmpty() Part XXXIV Modules shell, slideshow, sot, starmath diff --git a/shell/source/cmdmail/cmdmailmsg.cxx b/shell/source/cmdmail/cmdmailmsg.cxx index 1a33afd..2a2bb8a 100644 --- a/shell/source/cmdmail/cmdmailmsg.cxx +++ b/shell/source/cmdmail/cmdmailmsg.cxx @@ -167,10 +167,10 @@ Any SAL_CALL CmdMailMsg::getByName( const OUString& aName ) { MutexGuard aGuard( m_aMutex ); - if( 0 == aName.compareToAscii( "from" ) && m_aOriginator.getLength() ) + if( 0 == aName.compareToAscii( "from" ) && !m_aOriginator.isEmpty() ) return makeAny( m_aOriginator ); - else if( 0 == aName.compareToAscii( "to" ) && m_aRecipient.getLength() ) + else if( 0 == aName.compareToAscii( "to" ) && !m_aRecipient.isEmpty() ) return makeAny( m_aRecipient ); else if( 0 == aName.compareToAscii( "cc" ) && m_CcRecipients.getLength() ) @@ -179,7 +179,7 @@ Any SAL_CALL CmdMailMsg::getByName( const OUString& aName ) else if( 0 == aName.compareToAscii( "bcc" ) && m_BccRecipients.getLength() ) return makeAny( m_BccRecipients ); - else if( 0 == aName.compareToAscii( "subject" ) && m_aSubject.getLength() ) + else if( 0 == aName.compareToAscii( "subject" ) && !m_aSubject.isEmpty() ) return makeAny( m_aSubject ); else if( 0 == aName.compareToAscii( "attachment" ) && m_Attachments.getLength() ) @@ -199,10 +199,10 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( ) sal_Int32 nItems = 0; Sequence< OUString > aRet( 6 ); - if( m_aOriginator.getLength() ) + if( !m_aOriginator.isEmpty() ) aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("from")); - if( m_aRecipient.getLength() ) + if( !m_aRecipient.isEmpty() ) aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("to")); if( m_CcRecipients.getLength() ) @@ -211,7 +211,7 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( ) if( m_BccRecipients.getLength() ) aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("bcc")); - if( m_aSubject.getLength() ) + if( !m_aSubject.isEmpty() ) aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("subject")); if( m_Attachments.getLength() ) @@ -228,10 +228,10 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( ) { MutexGuard aGuard( m_aMutex ); - if( 0 == aName.compareToAscii( "from" ) && m_aOriginator.getLength() ) + if( 0 == aName.compareToAscii( "from" ) && !m_aOriginator.isEmpty() ) return sal_True; - else if( 0 == aName.compareToAscii( "to" ) && m_aRecipient.getLength() ) + else if( 0 == aName.compareToAscii( "to" ) && !m_aRecipient.isEmpty() ) return sal_True; else if( 0 == aName.compareToAscii( "cc" ) && m_CcRecipients.getLength() ) @@ -240,7 +240,7 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( ) else if( 0 == aName.compareToAscii( "bcc" ) && m_BccRecipients.getLength() ) return sal_True; - else if( 0 == aName.compareToAscii( "subject" ) && m_aSubject.getLength() ) + else if( 0 == aName.compareToAscii( "subject" ) && !m_aSubject.isEmpty() ) return sal_True; else if( 0 == aName.compareToAscii( "attachment" ) && m_Attachments.getLength() ) diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index 3af65c8..c0531e3 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -195,7 +195,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM // using the (undocumented) --mailclient switch xNameAccess->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("Program")) ) >>= aMailer; - if( aMailer.getLength() ) + if( !aMailer.isEmpty() ) { // make sure we have a system path FileBase::getSystemPathFromFileURL( aMailer, aMailer ); @@ -221,7 +221,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM } // Append originator if set in the message - if ( xSimpleMailMessage->getOriginator().getLength() > 0 ) + if ( !xSimpleMailMessage->getOriginator().isEmpty() ) { aBuffer.append("--from \""); aBuffer.append(OUStringToOString(xSimpleMailMessage->getOriginator(), osl_getThreadTextEncoding())); @@ -229,7 +229,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM } // Append receipient if set in the message - if ( xSimpleMailMessage->getRecipient().getLength() > 0 ) + if ( !xSimpleMailMessage->getRecipient().isEmpty() ) { aBuffer.append("--to \""); aBuffer.append(OUStringToOString(xSimpleMailMessage->getRecipient(), osl_getThreadTextEncoding())); @@ -257,7 +257,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM } // Append subject if set in the message - if ( xSimpleMailMessage->getSubject().getLength() > 0 ) + if ( !xSimpleMailMessage->getSubject().isEmpty() ) { aBuffer.append("--subject \""); aBuffer.append(OUStringToOString(xSimpleMailMessage->getSubject(), osl_getThreadTextEncoding())); diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 39eed5a..988eefd 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -144,7 +144,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar OUString aURL( com::sun::star::uri::ExternalUriReferenceTranslator::create( m_xContext)->translateToExternal(aCommand)); - if ( aURL.getLength() == 0 && aCommand.getLength() != 0 ) + if ( aURL.isEmpty() && !aCommand.isEmpty() ) { throw RuntimeException( (OUString( @@ -207,7 +207,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar // Respect the desktop environment - if there is an executable named // <desktop-environement-is>-open-url, pass the url to this one instead // of the default "open-url" script. - if ( m_aDesktopEnvironment.getLength() > 0 ) + if ( !m_aDesktopEnvironment.isEmpty() ) { OString aDesktopEnvironment(m_aDesktopEnvironment.toAsciiLowerCase()); OStringBuffer aCopy(aTmp); diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx index 4b7bea0..0336a7f 100644 --- a/shell/source/unix/sysshell/recently_used_file.cxx +++ b/shell/source/unix/sysshell/recently_used_file.cxx @@ -49,7 +49,7 @@ namespace /* private */ { inline void ensure_final_slash(/*inout*/ rtl::OUString& path) { - if ((path.getLength() > 0) && + if (!path.isEmpty() && (SLASH.pData->buffer[0] != path.pData->buffer[path.getLength() - 1])) path += SLASH; } diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx index 82d8506..47e8464 100644 --- a/slideshow/source/engine/activities/activitiesfactory.cxx +++ b/slideshow/source/engine/activities/activitiesfactory.cxx @@ -644,7 +644,7 @@ AnimationActivitySharedPtr createActivity( // is a formula given? const ::rtl::OUString& rFormulaString( xNode->getFormula() ); - if( rFormulaString.getLength() ) + if( !rFormulaString.isEmpty() ) { // yep, parse and pass to ActivityParameters try diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx b/slideshow/source/engine/animationnodes/animationaudionode.cxx index f8e75db..4f89afb 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.cxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx @@ -54,7 +54,7 @@ AnimationAudioNode::AnimationAudioNode( { mxAudioNode->getSource() >>= maSoundURL; - OSL_ENSURE( maSoundURL.getLength(), + OSL_ENSURE( !maSoundURL.isEmpty(), "could not extract sound source URL/empty URL string" ); ENSURE_OR_THROW( getContext().mxComponentContext.is(), diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index f9df63b..2c45996 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -80,7 +80,7 @@ bool importShapeGraphic( { rtl::OUString aURL; if( !getPropertyValue( aURL, xPropSet, OUSTR("GraphicURL")) || - aURL.getLength() == 0 ) + aURL.isEmpty() ) { // no or empty property - cannot import shape graphic return false; diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index f13e883..72db644 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -291,7 +291,7 @@ namespace slideshow if ((xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "PrivateTempFileURL"))) >>= aURL) - && aURL.getLength()) + && !aURL.isEmpty()) { implInitializeMediaPlayer( aURL ); } @@ -394,7 +394,7 @@ namespace slideshow { try { - if( rMediaURL.getLength() ) + if( !rMediaURL.isEmpty() ) { mxPlayer.set( avmedia::MediaWindow::createPlayer( rMediaURL ), uno::UNO_QUERY ); diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index 5a940b2..d0ef048 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -148,7 +148,7 @@ bool ShapeManagerImpl::handleMouseReleased( awt::MouseEvent const& e ) // first check for hyperlinks, because these have // highest prio: rtl::OUString const hyperlink( checkForHyperlink(aPosition) ); - if( hyperlink.getLength() > 0 ) + if( !hyperlink.isEmpty() ) { mrMultiplexer.notifyHyperlinkClicked(hyperlink); return true; // event consumed @@ -219,7 +219,7 @@ bool ShapeManagerImpl::handleMouseMoved( const awt::MouseEvent& e ) const ::basegfx::B2DPoint aPosition( e.X, e.Y ); sal_Int16 nNewCursor(-1); - if( checkForHyperlink(aPosition).getLength() > 0 ) + if( !checkForHyperlink(aPosition).isEmpty() ) { nNewCursor = awt::SystemPointer::REFHAND; } diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 4277280..ffdf438 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -722,12 +722,12 @@ SoundPlayerSharedPtr SlideShowImpl::resetSlideTransitionSound( const uno::Any& r bStopSound = sal_False; rSound >>= url; - if( !bStopSound && (url.getLength() == 0) ) + if( !bStopSound && url.isEmpty() ) return SoundPlayerSharedPtr(); stopSlideTransitionSound(); - if (url.getLength() > 0) + if (!url.isEmpty()) { try { diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index d6a5f53..9cf5a4f 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -1290,7 +1290,7 @@ sal_Int32 SotStorage::GetFormatID( const com::sun::star::uno::Reference < com::s ::rtl::OUString aMediaType; xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ) >>= aMediaType; - if ( aMediaType.getLength() ) + if ( !aMediaType.isEmpty() ) { ::com::sun::star::datatransfer::DataFlavor aDataFlavor; aDataFlavor.MimeType = aMediaType; diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index c1981aa..dc21316 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -1840,7 +1840,7 @@ void UCBStorage_Impl::Init() try { Any aAny = m_pContent->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ); rtl::OUString aTmp; - if ( ( aAny >>= aTmp ) && aTmp.getLength() ) + if ( ( aAny >>= aTmp ) && !aTmp.isEmpty() ) m_aContentType = m_aOriginalContentType = aTmp; } catch( Exception& ) @@ -1977,7 +1977,7 @@ void UCBStorage_Impl::ReadContent() Any aAny = aContent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ); if ( ( aAny >>= aMediaType ) && ( aMediaType.compareToAscii("application/vnd.sun.star.oleobject") == 0 ) ) pElement->m_bIsStorage = sal_True; - else if ( !aMediaType.getLength() ) + else if ( aMediaType.isEmpty() ) { // older files didn't have that special content type, so they must be detected OpenStream( pElement, STREAM_STD_READ, m_bDirect ); @@ -2063,12 +2063,12 @@ sal_Int32 UCBStorage_Impl::GetObjectCount() rtl::OUString aTmp; if ( ( rAny.Value >>= aTmp ) && aTmp == rPath ) bFound = sal_True; - if ( aType.getLength() ) + if ( !aType.isEmpty() ) break; } else if ( rAny.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MediaType")) ) { - if ( ( rAny.Value >>= aType ) && aType.getLength() && bFound ) + if ( ( rAny.Value >>= aType ) && !aType.isEmpty() && bFound ) break; } } diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx index ce4c6a7..cdf5470 100644 --- a/sot/source/unoolestorage/xolesimplestorage.cxx +++ b/sot/source/unoolestorage/xolesimplestorage.cxx @@ -129,7 +129,7 @@ void OLESimpleStorage::UpdateOriginal_Impl() void OLESimpleStorage::InsertInputStreamToStorage_Impl( BaseStorage* pStorage, ::rtl::OUString aName, const uno::Reference< io::XInputStream >& xInputStream ) throw ( uno::Exception ) { - if ( !pStorage || !aName.getLength() || !xInputStream.is() ) + if ( !pStorage || aName.isEmpty() || !xInputStream.is() ) throw uno::RuntimeException(); if ( pStorage->IsContained( aName ) ) @@ -174,7 +174,7 @@ void OLESimpleStorage::InsertInputStreamToStorage_Impl( BaseStorage* pStorage, : void OLESimpleStorage::InsertNameAccessToStorage_Impl( BaseStorage* pStorage, ::rtl::OUString aName, const uno::Reference< container::XNameAccess >& xNameAccess ) throw ( uno::Exception ) { - if ( !pStorage || !aName.getLength() || !xNameAccess.is() ) + if ( !pStorage || aName.isEmpty() || !xNameAccess.is() ) throw uno::RuntimeException(); if ( pStorage->IsContained( aName ) ) diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 33c83c1..74247f9 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 859d635..23fd2de 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 6f449d1..d35e161 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 de00ebb..50a412c 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 3920a72..c2d0a5c 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 70627ac..0e1ba83 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()) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits