mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for fdo43460, Part I, getLength to isEmpty

Browse Source 
Part I
Modules
unoControl, accessibility and avmedia
This commit is contained in:
Olivier Hallot
2011-12-09 14:00:09 -02:00
committed by Stephan Bergmann
parent 1d1f049859
commit f43311dfb7
9 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UnoControls/source/controls/framecontrol.cxx
View File

@@ -203,7 +203,7 @@ void SAL_CALL FrameControl::createPeer( const Reference< XToolkit >& xToo
BaseControl::createPeer( xToolkit, xParentPeer ); BaseControl::createPeer( xToolkit, xParentPeer );
if ( impl_getPeerWindow().is() ) if ( impl_getPeerWindow().is() )
{ {
if( m_sComponentURL.getLength() > 0 ) if( !m_sComponentURL.isEmpty() )
{ {
impl_createFrame( getPeer(), m_sComponentURL, m_seqLoaderArguments ); impl_createFrame( getPeer(), m_sComponentURL, m_seqLoaderArguments );
} }

6
UnoControls/source/controls/progressmonitor.cxx
View File

@@ -1038,11 +1038,11 @@ sal_Bool ProgressMonitor::impl_debug_checkParameter (
) { ) {
// Check "rTopic" // Check "rTopic"
if ( &rTopic == NULL ) return sal_False ; // NULL-pointer for reference ???!!! if ( &rTopic == NULL ) return sal_False ; // NULL-pointer for reference ???!!!
if ( rTopic.getLength () < 1 ) return sal_False ; // "" if ( rTopic.isEmpty() ) return sal_False ; // ""
// Check "rText" // Check "rText"
if ( &rText == NULL ) return sal_False ; // NULL-pointer for reference ???!!! if ( &rText == NULL ) return sal_False ; // NULL-pointer for reference ???!!!
if ( rText.getLength () < 1 ) return sal_False ; // "" if ( rText.isEmpty() ) return sal_False ; // ""
// "bbeforeProgress" is valid in everyway! // "bbeforeProgress" is valid in everyway!
@@ -1055,7 +1055,7 @@ sal_Bool ProgressMonitor::impl_debug_checkParameter ( const OUString& rTopic, sa
{ {
// Check "rTopic" // Check "rTopic"
if ( &rTopic == NULL ) return sal_False ; // NULL-pointer for reference ???!!! if ( &rTopic == NULL ) return sal_False ; // NULL-pointer for reference ???!!!
if ( rTopic.getLength () < 1 ) return sal_False ; // "" if ( rTopic.isEmpty() ) return sal_False ; // ""
// "bbeforeProgress" is valid in everyway! // "bbeforeProgress" is valid in everyway!

2
accessibility/source/extended/accessibleiconchoicectrl.cxx
View File

@@ -211,7 +211,7 @@ namespace accessibility
ensureAlive(); ensureAlive();
::rtl::OUString sName = getCtrl()->GetAccessibleName(); ::rtl::OUString sName = getCtrl()->GetAccessibleName();
if ( sName.getLength() == 0 ) if ( sName.isEmpty() )
sName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IconChoiceControl" ) ); sName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IconChoiceControl" ) );
return sName; return sName;
} }

2
accessibility/source/extended/textwindowaccessibility.cxx
View File

@@ -1798,7 +1798,7 @@ Document::changeParagraphText(::sal_uLong nNumber, ::sal_uInt16 nBegin, ::sal_uI
m_rView.DeleteSelected(); m_rView.DeleteSelected();
if (bPaste) if (bPaste)
m_rView.Paste(); m_rView.Paste();
else if (rText.getLength() != 0) else if (!rText.isEmpty())
m_rView.InsertText(rText); m_rView.InsertText(rText);
} }

2
accessibility/source/standard/accessiblemenuitemcomponent.cxx
View File

@@ -208,7 +208,7 @@ void OAccessibleMenuItemComponent::SetAccessibleName( const ::rtl::OUString& sAc
{ {
sal_uInt16 nItemId = m_pParent->GetItemId( m_nItemPos ); sal_uInt16 nItemId = m_pParent->GetItemId( m_nItemPos );
sName = m_pParent->GetAccessibleName( nItemId ); sName = m_pParent->GetAccessibleName( nItemId );
if ( sName.getLength() == 0 ) if ( sName.isEmpty() )
sName = m_pParent->GetItemText( nItemId ); sName = m_pParent->GetItemText( nItemId );
sName = OutputDevice::GetNonMnemonicString( sName ); sName = OutputDevice::GetNonMnemonicString( sName );
} }

2
accessibility/source/standard/vclxaccessiblebox.cxx
View File

@@ -156,7 +156,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
if ( xText.is() ) if ( xText.is() )
{ {
::rtl::OUString sText = xText->getSelectedText(); ::rtl::OUString sText = xText->getSelectedText();
if ( !sText.getLength() ) if ( sText.isEmpty() )
sText = xText->getText(); sText = xText->getText();
pList->UpdateSelection (sText); pList->UpdateSelection (sText);
} }

2
accessibility/source/standard/vclxaccessibletoolboxitem.cxx
View File

@@ -607,7 +607,7 @@ awt::FontDescriptor SAL_CALL VCLXAccessibleToolBoxItem::getFontMetrics( const Re
sRet = m_pToolBox->GetHelpText( m_nItemId ); sRet = m_pToolBox->GetHelpText( m_nItemId );
else else
sRet = m_pToolBox->GetQuickHelpText( m_nItemId ); sRet = m_pToolBox->GetQuickHelpText( m_nItemId );
if ( !sRet.getLength() ) if ( sRet.isEmpty() )
// no help text set, so use item text // no help text set, so use item text
sRet = m_pToolBox->GetItemText( m_nItemId ); sRet = m_pToolBox->GetItemText( m_nItemId );
} }

8
avmedia/source/framework/mediacontrol.cxx
View File

@@ -293,7 +293,7 @@ void MediaControl::setState( const MediaItem& rItem )
void MediaControl::implUpdateToolboxes() void MediaControl::implUpdateToolboxes()
{ {
const bool bValidURL = ( maItem.getURL().getLength() > 0 ); const bool bValidURL = ( !maItem.getURL().isEmpty());
maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_INSERT, bValidURL ); maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_INSERT, bValidURL );
maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_PLAY, bValidURL ); maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_PLAY, bValidURL );
@@ -372,7 +372,7 @@ void MediaControl::implUpdateToolboxes()
void MediaControl::implUpdateTimeSlider() void MediaControl::implUpdateTimeSlider()
{ {
if( !maItem.getURL().getLength() || !IsEnabled() ) if( maItem.getURL().isEmpty() || !IsEnabled() )
maTimeSlider.Disable(); maTimeSlider.Disable();
else else
{ {
@@ -399,7 +399,7 @@ void MediaControl::implUpdateTimeSlider()
void MediaControl::implUpdateVolumeSlider() void MediaControl::implUpdateVolumeSlider()
{ {
if( !maItem.getURL().getLength() || !IsEnabled() ) if( maItem.getURL().isEmpty() || !IsEnabled() )
maVolumeSlider.Disable(); maVolumeSlider.Disable();
else else
{ {
@@ -416,7 +416,7 @@ void MediaControl::implUpdateVolumeSlider()
void MediaControl::implUpdateTimeField( double fCurTime ) void MediaControl::implUpdateTimeField( double fCurTime )
{ {
if( maItem.getURL().getLength() > 0 ) if( !maItem.getURL().isEmpty() )
{ {
String aTimeString; String aTimeString;

8
avmedia/source/viewer/mediawindow.cxx
View File

@@ -274,7 +274,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
{ {
for( sal_Int32 nIndex = 0; nIndex >= 0; ) for( sal_Int32 nIndex = 0; nIndex >= 0; )
{ {
if( aAllTypes.getLength() ) if( !aAllTypes.isEmpty() )
aAllTypes += aSeparator; aAllTypes += aSeparator;
( aAllTypes += aWildcard ) += aFilters[ i ].second.getToken( 0, ';', nIndex ); ( aAllTypes += aWildcard ) += aFilters[ i ].second.getToken( 0, ';', nIndex );
@@ -290,7 +290,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
for( sal_Int32 nIndex = 0; nIndex >= 0; ) for( sal_Int32 nIndex = 0; nIndex >= 0; )
{ {
if( aTypes.getLength() ) if( !aTypes.isEmpty() )
aTypes += aSeparator; aTypes += aSeparator;
( aTypes += aWildcard ) += aFilters[ i ].second.getToken( 0, ';', nIndex ); ( aTypes += aWildcard ) += aFilters[ i ].second.getToken( 0, ';', nIndex );
@@ -334,10 +334,10 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
} }
} }
} }
else if( rURL.getLength() ) else if( !rURL.isEmpty() )
rURL = ::rtl::OUString(); rURL = ::rtl::OUString();
return( rURL.getLength() > 0 ); return( !rURL.isEmpty() );
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------