summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@alta.org.br>2011-12-09 22:23:22 -0200
committerIvan Timofeev <timofeev.i.s@gmail.com>2011-12-10 13:54:31 +0400
commit1688a9d9235dd2ee4f3b9497308efd41f7a3fb6f (patch)
tree63839fbeb7af54f25b574b2edd1cd93a77394ba5
parent79a8567b422459d1ba42ce60e6cafea416441e75 (diff)
Fix for fdo43460 Part II getLength to isEmpty
Part II Module basctl
-rw-r--r--basctl/source/basicide/basicrenderable.cxx4
-rw-r--r--basctl/source/basicide/baside2.cxx2
-rw-r--r--basctl/source/basicide/bastype2.cxx2
-rw-r--r--basctl/source/basicide/localizationmgr.cxx6
-rw-r--r--basctl/source/basicide/moduldl2.cxx2
-rw-r--r--basctl/source/basicide/scriptdocument.cxx6
-rw-r--r--basctl/source/dlged/dlgedobj.cxx2
7 files changed, 12 insertions, 12 deletions
diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx
index 1da202ffe7aa..d2de323209f0 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -120,7 +120,7 @@ sal_Int32 SAL_CALL BasicRenderable::getRendererCount (
if( nContent == 1 )
{
rtl::OUString aPageRange( getStringValue( "PageRange" ) );
- if( aPageRange.getLength() )
+ if( !aPageRange.isEmpty() )
{
StringRangeEnumerator aRangeEnum( aPageRange, 0, nCount-1 );
sal_Int32 nSelCount = aRangeEnum.size();
@@ -179,7 +179,7 @@ void SAL_CALL BasicRenderable::render (
if( nContent == 1 )
{
rtl::OUString aPageRange( getStringValue( "PageRange" ) );
- if( aPageRange.getLength() )
+ if( !aPageRange.isEmpty() )
{
sal_Int32 nPageCount = mpWindow->countPages( pPrinter );
StringRangeEnumerator aRangeEnum( aPageRange, 0, nPageCount-1 );
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index d1a15898505c..cf245cac0c6b 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -341,7 +341,7 @@ sal_Bool ModulWindow::BasicExecute()
if ( !pMethod )
{
// If not in a method then prompt the user
- return ( BasicIDE::ChooseMacro( uno::Reference< frame::XModel >(), sal_False, rtl::OUString() ).getLength() > 0 ) ? sal_True : sal_False;
+ return ( !BasicIDE::ChooseMacro( uno::Reference< frame::XModel >(), sal_False, rtl::OUString() ).isEmpty() );
}
if ( pMethod )
{
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index c3ce38a757f0..abacd01b802c 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -773,7 +773,7 @@ void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Ima
}
}
- if ( sFactoryURL.getLength() )
+ if ( !sFactoryURL.isEmpty() )
{
rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ), sal_False );
}
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index cf034d84deed..59f2316f1e03 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -185,7 +185,7 @@ void LocalizationMgr::implEnableDisableResourceForAllLibraryDialogs( HandleResou
aPureIdStr += aDot;
aPureIdStr += aDialogName;
aPureIdStr += aDot;
- if( aCtrlName.getLength() )
+ if( !aCtrlName.isEmpty() )
{
aPureIdStr += aCtrlName;
aPureIdStr += aDot;
@@ -245,7 +245,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties
// Replace string by id, add id+string to StringResource
if( eMode == SET_IDS )
{
- bool bEscAlreadyExisting = (aPropStr.getLength() && aPropStr.getStr()[0] == '&' );
+ bool bEscAlreadyExisting = (!aPropStr.isEmpty() && aPropStr.getStr()[0] == '&' );
if( bEscAlreadyExisting )
continue;
@@ -435,7 +435,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties
for ( i = 0; i < nPropStringCount; ++i )
{
::rtl::OUString aPropStr = pPropStrings[i];
- bool bEscAlreadyExisting = (aPropStr.getLength() && aPropStr.getStr()[0] == '&' );
+ bool bEscAlreadyExisting = (!aPropStr.isEmpty() && aPropStr.getStr()[0] == '&' );
if( bEscAlreadyExisting )
{
pIdStrings[i] = aPropStr;
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index ebc662c0e8cd..c8960a411d79 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1332,7 +1332,7 @@ void LibPage::ExportAsPackage( const String& aLibName )
Sequence< ::rtl::OUString > aFiles = xFP->getFiles();
INetURLObject aURL( aFiles[0] );
- if( !aURL.getExtension().getLength() )
+ if( aURL.getExtension().isEmpty() )
aURL.setExtension( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "oxt" ) ) );
::rtl::OUString aPackageURL( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 38bf926714fb..279452040ed1 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -975,7 +975,7 @@ namespace basctl
}
}
- if ( aFileURL.getLength() )
+ if ( !aFileURL.isEmpty() )
{
::osl::DirectoryItem aFileItem;
::osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileURL );
@@ -1129,7 +1129,7 @@ namespace basctl
ScriptDocument ScriptDocument::getDocumentWithURLOrCaption( const ::rtl::OUString& _rUrlOrCaption )
{
ScriptDocument aDocument( getApplicationScriptDocument() );
- if ( _rUrlOrCaption.getLength() == 0 )
+ if ( _rUrlOrCaption.isEmpty() )
return aDocument;
docs::Documents aDocuments;
@@ -1486,7 +1486,7 @@ namespace basctl
LibraryLocation ScriptDocument::getLibraryLocation( const ::rtl::OUString& _rLibName ) const
{
LibraryLocation eLocation = LIBRARY_LOCATION_UNKNOWN;
- if ( _rLibName.getLength() )
+ if ( !_rLibName.isEmpty() )
{
if ( isDocument() )
{
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index eb06efe9b0d1..1941df09d8db 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -509,7 +509,7 @@ void SAL_CALL DlgEdObj::NameChange( const ::com::sun::star::beans::PropertyChan
Reference< container::XNameAccess > xNameAcc((GetDlgEdForm()->GetUnoControlModel()), UNO_QUERY);
if ( xNameAcc.is() && xNameAcc->hasByName(aOldName) )
{
- if ( !xNameAcc->hasByName(aNewName) && aNewName.getLength() != 0 )
+ if ( !xNameAcc->hasByName(aNewName) && !aNewName.isEmpty())
{
// remove the control by the old name and insert the control by the new name in the container
Reference< container::XNameContainer > xCont(xNameAcc, UNO_QUERY );