diff options
author | Olivier Hallot <olivier.hallot@alta.org.br> | 2011-12-10 22:03:11 -0200 |
---|---|---|
committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2011-12-13 00:36:43 +0400 |
commit | 0eac98aa742e8e76ebb1af91b32bd02e04b2e20a (patch) | |
tree | d44b28e26f61342e8a05d9c2c52e9139a5a2258b /chart2/source/controller | |
parent | Skip more components for Android and iOS (diff) | |
download | core-0eac98aa742e8e76ebb1af91b32bd02e04b2e20a.tar.gz core-0eac98aa742e8e76ebb1af91b32bd02e04b2e20a.zip |
Fix for fdo43460 Part V getLength to isEmpty
Part V
Module
chart2
Diffstat (limited to 'chart2/source/controller')
30 files changed, 56 insertions, 56 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index 380e3cf799fd..c14ddcbb6e67 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -78,10 +78,10 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg aArguments[1] >>= xEventSource; aArguments[2] >>= xWindow; } - OSL_ENSURE( aCID.getLength() > 0, "Empty CID" ); + OSL_ENSURE( !aCID.isEmpty(), "Empty CID" ); OSL_ENSURE( xEventSource.is(), "Empty Event Source" ); OSL_ENSURE( xWindow.is(), "Empty Window" ); - if( !xEventSource.is() || aCID.getLength() == 0 ) + if( !xEventSource.is() || aCID.isEmpty() ) return; SolarMutexGuard aSolarGuard; diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 46bb9a1f416d..0000196ee94e 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -668,7 +668,7 @@ OUString SAL_CALL DiagramWrapper::getDiagramType() aRet = lcl_getDiagramType( aTemplateAndService.second ); } - if( !aRet.getLength()) + if( aRet.isEmpty()) { // none of the standard templates matched // use first chart type @@ -676,10 +676,10 @@ OUString SAL_CALL DiagramWrapper::getDiagramType() if( xChartType.is() ) { aRet = xChartType->getChartType(); - if( aRet.getLength() ) + if( !aRet.isEmpty() ) aRet = lcl_getOldChartTypeName( aRet ); } - if( !aRet.getLength()) + if( aRet.isEmpty()) aRet = C2U( "com.sun.star.chart.BarDiagram" ); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index 65b76e93713c..076e87caabc7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -311,7 +311,7 @@ Any WrappedAxisTitleExistenceProperty::getPropertyValue( const Reference< beans: sal_Bool bHasTitle = sal_False; Reference< chart2::XTitle > xTitle( TitleHelper::getTitle( m_eTitleType, m_spChart2ModelContact->getChartModel() ) ); - if( xTitle.is() && (TitleHelper::getCompleteString( xTitle ).getLength() != 0) ) + if( xTitle.is() && !TitleHelper::getCompleteString( xTitle ).isEmpty() ) bHasTitle = sal_True; Any aRet; diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 54f76d8dbf19..75ac24569a7d 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -146,7 +146,7 @@ void lcl_ConvertRangeFromXML( ::rtl::OUString & rInOutRange, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) { - if( rInOutRange.getLength()) + if( !rInOutRange.isEmpty()) { uno::Reference< chart2::data::XRangeXMLConversion > xConverter( lcl_getDataProviderFromContact( spChart2ModelContact ), uno::UNO_QUERY ); @@ -162,7 +162,7 @@ void lcl_ConvertRangeToXML( ::rtl::OUString & rInOutRange, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) { - if( rInOutRange.getLength()) + if( !rInOutRange.isEmpty()) { uno::Reference< chart2::data::XRangeXMLConversion > xConverter( lcl_getDataProviderFromContact( spChart2ModelContact ), uno::UNO_QUERY ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index bd1ed551a6fd..c01fc8ef10d4 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -169,7 +169,7 @@ WrappedVolumeProperty::~WrappedVolumeProperty() if( aTemplateAndService.second.equals( C2U( "com.sun.star.chart2.template.StockVolumeLowHighClose" ) ) || aTemplateAndService.second.equals( C2U( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ) ) ) m_aOuterValue <<= sal_Bool(sal_True); - else if( aTemplateAndService.second.getLength() || !m_aOuterValue.hasValue() ) + else if( !aTemplateAndService.second.isEmpty() || !m_aOuterValue.hasValue() ) m_aOuterValue <<= sal_Bool(sal_False); } else if(!m_aOuterValue.hasValue()) @@ -240,7 +240,7 @@ WrappedUpDownProperty::~WrappedUpDownProperty() if( aTemplateAndService.second.equals( C2U( "com.sun.star.chart2.template.StockOpenLowHighClose" ) ) || aTemplateAndService.second.equals( C2U( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ) ) ) m_aOuterValue <<= sal_Bool(sal_True); - else if( aTemplateAndService.second.getLength() || !m_aOuterValue.hasValue() ) + else if( !aTemplateAndService.second.isEmpty() || !m_aOuterValue.hasValue() ) m_aOuterValue <<= sal_Bool(sal_False); } else if(!m_aOuterValue.hasValue()) diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 1dae363fd956..af6794b11cd5 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -285,7 +285,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla uno::Reference< XChartTypeTemplate > xTemplate(0); rtl::OUString aServiceName( this->getServiceNameForParameter( rParameter ) ); - if(aServiceName.getLength()) + if(!aServiceName.isEmpty()) { xTemplate.set( xTemplateManager->createInstance( aServiceName ), uno::UNO_QUERY ); if(xTemplate.is()) diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 5a3198fa3cf7..5de9287229ec 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -1138,7 +1138,7 @@ bool DataBrowser::isDateString( rtl::OUString aInputString, double& fOutDateValu { sal_uInt32 nNumberFormat=0; SvNumberFormatter* pSvNumberFormatter = m_spNumberFormatterWrapper.get() ? m_spNumberFormatterWrapper->getSvNumberFormatter() : 0; - if( aInputString.getLength() > 0 && pSvNumberFormatter && pSvNumberFormatter->IsNumberFormat( aInputString, nNumberFormat, fOutDateValue ) ) + if( !aInputString.isEmpty() && pSvNumberFormatter && pSvNumberFormatter->IsNumberFormat( aInputString, nNumberFormat, fOutDateValue ) ) { Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( m_xChartDoc, uno::UNO_QUERY ); Reference< util::XNumberFormats > xNumberFormats; diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index 80e19a222d7e..1ec9acfae18f 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -103,7 +103,7 @@ OUString lcl_getUIRoleName( const Reference< chart2::data::XLabeledDataSequence > & xLSeq ) { OUString aResult( lcl_getRole( xLSeq )); - if( aResult.getLength()) + if( !aResult.isEmpty()) aResult = ::chart::DialogModel::ConvertRoleFromInternalToUI( aResult ); return aResult; } diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index ee0e61d3a740..84e31162559f 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -93,9 +93,9 @@ OUString lcl_getFullSeriesName( const rtl::OUString& rObjectCID, const Reference void lcl_addText( OUString& rOut, const OUString& rSeparator, const OUString& rNext ) { - if( rOut.getLength() && rNext.getLength() ) + if( !(rOut.isEmpty() || rNext.isEmpty()) ) rOut+=rSeparator; - if( rNext.getLength() ) + if( !rNext.isEmpty() ) rOut+=rNext; } @@ -188,7 +188,7 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal } } - if( aX.getLength() == 0 ) + if( aX.isEmpty() ) { aRet = ExplicitCategoriesProvider::getCategoryByIndex( xCooSys, xChartModel, nPointIndex ); } @@ -396,7 +396,7 @@ OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType ) break; } - if( !aRet.getLength() ) + if( aRet.isEmpty() ) aRet=String(SchResId(STR_OBJECT_TITLE)); return aRet; @@ -415,7 +415,7 @@ OUString ObjectNameProvider::getTitleName( const OUString& rObjectCID if( TitleHelper::getTitleType( eType, xTitle, xChartModel ) ) aRet = ObjectNameProvider::getTitleNameByType( eType ); } - if( !aRet.getLength() ) + if( aRet.isEmpty() ) aRet=String(SchResId(STR_OBJECT_TITLE)); return aRet; @@ -721,7 +721,7 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r // use the verbose text including the formula for trend lines const bool bVerbose( OBJECTTYPE_DATA_CURVE == eObjectType || OBJECTTYPE_DATA_AVERAGE_LINE == eObjectType ); const OUString aHelpText( getHelpText( rObjectCID, xChartModel, bVerbose )); - if( aHelpText.getLength()) + if( !aHelpText.isEmpty()) { aRet = String( SchResId( STR_STATUS_OBJECT_MARKED )); replaceParamterInString( aRet, C2U("%OBJECTNAME"), aHelpText ); diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index ed1f5e858429..e05c5195966e 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -748,7 +748,7 @@ void ErrorBarResources::disposingRangeSelection() bool ErrorBarResources::isRangeFieldContentValid( Edit & rEdit ) { ::rtl::OUString aRange( rEdit.GetText()); - bool bIsValid = ( aRange.getLength() == 0 ) || + bool bIsValid = ( aRange.isEmpty() ) || ( m_apRangeSelectionHelper.get() && m_apRangeSelectionHelper->verifyCellRange( aRange )); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 2deb40595b7a..3d99e97aac80 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -401,7 +401,7 @@ sal_Bool DataSourceTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*e bool DataSourceTabPage::isRangeFieldContentValid( Edit & rEdit ) { OUString aRange( rEdit.GetText()); - bool bIsValid = ( aRange.getLength() == 0 ) || + bool bIsValid = ( aRange.isEmpty() ) || m_rDialogModel.getRangeSelectionHelper()->verifyCellRange( aRange ); if( bIsValid ) @@ -906,7 +906,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField ) if( xDataProvider.is()) { OUString aRange( m_aEDT_CATEGORIES.GetText()); - if( aRange.getLength()) + if( !aRange.isEmpty()) { // create or change categories if( !xLabeledSeq.is()) @@ -972,7 +972,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField ) } if( xLabeledSeq.is()) { - if( aRange.getLength()) + if( !aRange.isEmpty()) { Reference< data::XDataSequence > xNewSeq; try @@ -1003,7 +1003,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField ) } else { - if( aRange.getLength()) + if( !aRange.isEmpty()) { Reference< data::XDataSequence > xNewSeq; try diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 7403771ce6ca..67889c3408a9 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -285,7 +285,7 @@ bool RangeChooserTabPage::isValid() || ( m_aCB_FirstRowAsLabel.IsChecked() && !m_aRB_Rows.IsChecked() ); sal_Bool bHasCategories = ( m_aCB_FirstColumnAsLabel.IsChecked() && m_aRB_Columns.IsChecked() ) || ( m_aCB_FirstRowAsLabel.IsChecked() && m_aRB_Rows.IsChecked() ); - bool bIsValid = ( aRange.getLength() == 0 ) || + bool bIsValid = ( aRange.isEmpty() ) || m_rDialogModel.getRangeSelectionHelper()->verifyArguments( DataSourceHelper::createArguments( aRange, Sequence< sal_Int32 >(), m_aRB_Columns.IsChecked(), bFirstCellAsLabel, bHasCategories )); diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index 8359aa2f4362..e573944e5be4 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -311,7 +311,7 @@ SfxItemSet DrawViewWrapper::getPositionAndSizeItemSetFromMarkedObject() const SdrObject* DrawViewWrapper::getNamedSdrObject( const rtl::OUString& rName ) const { - if(rName.getLength()==0) + if(rName.isEmpty()) return 0; SdrPageView* pSdrPageView = this->GetPageView(); if( pSdrPageView ) diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx index c9d290e04d33..71082044e8dd 100644 --- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx @@ -301,7 +301,7 @@ bool ErrorBarItemConverter::ApplySpecialItem( bool bIsPositiveValue( nWhichId == SCHATTR_STAT_RANGE_POS ); if( xChartDoc->hasInternalDataProvider()) { - if( aNewRange.getLength()) + if( !aNewRange.isEmpty()) { uno::Reference< chart2::data::XDataSequence > xSeq( StatisticsHelper::getErrorDataSequenceFromDataSource( diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index c173ad26b5d3..debad5880281 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -290,7 +290,7 @@ void GraphicPropertyItemConverter::FillSpecialItem( // this is important to enable the item ::rtl::OUString aName; if( (aValue >>= aName) && - aName.getLength()) + !aName.isEmpty()) { aItem.SetEnabled( sal_True ); rOutItemSet.Put( aItem ); @@ -532,7 +532,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( { ::rtl::OUString aName; if( ( GetPropertySet()->getPropertyValue( aPropName ) >>= aName ) - && aName.getLength() > 0 ) + && !aName.isEmpty() ) { uno::Reference< beans::XPropertyState > xState( GetPropertySet(), uno::UNO_QUERY ); if( xState.is()) diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index 797df1e6b6e1..a15fdda68f2a 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -480,7 +480,7 @@ bool StatisticsItemConverter::ApplySpecialItem( bool bIsPositiveValue( nWhichId == SCHATTR_STAT_RANGE_POS ); if( xChartDoc->hasInternalDataProvider()) { - if( aNewRange.getLength()) + if( !aNewRange.isEmpty()) { uno::Reference< chart2::data::XDataSequence > xSeq( StatisticsHelper::getErrorDataSequenceFromDataSource( diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 31ad274858c6..1d8424bbd80b 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1041,7 +1041,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) { if ( !m_aLifeTimeManager.impl_isDisposed() && getModel().is() ) { - if( rTargetFrameName.getLength() && + if( !rTargetFrameName.isEmpty() && rTargetFrameName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("_self"))) return m_aDispatchContainer.getDispatchForURL( rURL ); } @@ -1394,7 +1394,7 @@ IMPL_LINK( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction ) ENSURE_OR_RETURN( pUndoAction, "invalid Undo action", 1L ); ::rtl::OUString aObjectCID = m_aSelection.getSelectedCID(); - if ( aObjectCID.getLength() == 0 ) + if ( aObjectCID.isEmpty() ) { try { diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index f4dcb0340d04..3c7ecee03728 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -127,7 +127,7 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize() { const ::rtl::OUString aCID( m_aSelection.getSelectedCID() ); - if( !aCID.getLength() ) + if( aCID.isEmpty() ) return; awt::Size aSelectedSize; diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 4697458d3140..9d73b31f9af2 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -726,7 +726,7 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl: { //return true if the properties were changed successfully bool bRet = false; - if( !rObjectCID.getLength() ) + if( rObjectCID.isEmpty() ) { return bRet; } diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 96f0eab8139b..9263fb50e4a7 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -145,7 +145,7 @@ bool ChartController::EndTextEdit() pOutliner->GetParagraphCount() ); ::rtl::OUString aObjectCID = m_aSelection.getSelectedCID(); - if ( aObjectCID.getLength() > 0 ) + if ( !aObjectCID.isEmpty() ) { uno::Reference< beans::XPropertySet > xPropSet = ObjectIdentifier::getObjectPropertySet( aObjectCID, getModel() ); diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 51021eeca84a..e1a22797157d 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -600,7 +600,7 @@ bool ChartController::executeDispatch_Delete() // remove the selected object rtl::OUString aCID( m_aSelection.getSelectedCID() ); - if( aCID.getLength() ) + if( !aCID.isEmpty() ) { if( !isObjectDeleteable( uno::Any( aCID ) ) ) return false; diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 84fb32e0a606..4b285dc640ec 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -944,7 +944,7 @@ void ChartController::execute_DoubleClick( const Point* pMousePixel ) if ( m_aSelection.hasSelection() ) { ::rtl::OUString aCID( m_aSelection.getSelectedCID() ); - if ( aCID.getLength() ) + if ( !aCID.isEmpty() ) { ObjectType eObjectType = ObjectIdentifier::getObjectType( aCID ); if ( OBJECTTYPE_TITLE == eObjectType ) @@ -1227,7 +1227,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) bool bHasTitle = false; uno::Reference< XTitled > xTitled( xAxis, uno::UNO_QUERY ); if( xTitled.is()) - bHasTitle = TitleHelper::getCompleteString( xTitled->getTitleObject() ).getLength()>0; + bHasTitle = !TitleHelper::getCompleteString( xTitled->getTitleObject() ).isEmpty(); if( OBJECTTYPE_AXIS != eObjectType && bIsAxisVisible ) lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatAxis") ); @@ -1500,7 +1500,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) fShiftAmountX = 0.0; break; } - if( m_aSelection.getSelectedCID().getLength() ) + if( !m_aSelection.getSelectedCID().isEmpty() ) { //move chart objects bReturn = impl_moveOrResizeObject( @@ -1599,7 +1599,7 @@ bool ChartController::requestQuickHelp( aCID = SelectionHelper::getHitObjectCID( aAtLogicPosition, *m_pDrawViewWrapper ); } - bool bResult( aCID.getLength()); + bool bResult( !aCID.isEmpty()); if( bResult ) { @@ -1679,7 +1679,7 @@ bool ChartController::requestQuickHelp( if ( m_aSelection.hasSelection() ) { ::rtl::OUString aCID( m_aSelection.getSelectedCID() ); - if ( aCID.getLength() ) + if ( !aCID.isEmpty() ) { aReturn = uno::makeAny( aCID ); } @@ -2004,7 +2004,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) } } - if( !aHitObjectCID.getLength() ) + if( aHitObjectCID.isEmpty() ) { //additional shape was hit m_pChartWindow->SetPointer( POINTER_MOVE ); diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index 1a37a1ce75ab..c6dac76313cb 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -708,14 +708,14 @@ void ControllerCommandDispatch::fireStatusEvent( const Reference< frame::XStatusListener > & xSingleListener /* = 0 */ ) { bool bIsChartSelectorURL = rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:ChartElementSelector") ); - if( rURL.getLength() == 0 || bIsChartSelectorURL ) + if( rURL.isEmpty() || bIsChartSelectorURL ) { uno::Any aArg; aArg <<= m_xController; fireStatusEventForURL( C2U(".uno:ChartElementSelector"), aArg, true, xSingleListener ); } - if( rURL.getLength() == 0 ) + if( rURL.isEmpty() ) for( ::std::map< OUString, bool >::const_iterator aIt( m_aCommandAvailability.begin()); aIt != m_aCommandAvailability.end(); ++aIt ) fireStatusEventForURLImpl( aIt->first, xSingleListener ); @@ -724,7 +724,7 @@ void ControllerCommandDispatch::fireStatusEvent( // statusbar. Should be handled by base implementation // @todo: remove if Issue 68864 is fixed - if( rURL.getLength() == 0 || + if( rURL.isEmpty() || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:StatusBarVisible"))) { bool bIsStatusBarVisible( lcl_isStatusBarVisible( m_xController )); diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 0a3ec48380a1..b367245bc331 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -595,7 +595,7 @@ bool DrawCommandDispatch::parseCommandURL( const ::rtl::OUString& rCommandURL, s sal_Int32 nIndex = 1; ::rtl::OUString aToken = rCommandURL.getToken( 0, '.', nIndex ); - if ( nIndex == -1 || !aToken.getLength() ) + if ( nIndex == -1 || aToken.isEmpty() ) { aBaseCommand = rCommandURL; SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find( aBaseCommand ); diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 7015526795f3..e795a7dcf4a2 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -155,7 +155,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection() ListBoxEntryData aEntry; SdrObject* pSelectedObj = DrawViewWrapper::getSdrObject( aSelectedOID.getAdditionalShape() ); ::rtl::OUString aName( pSelectedObj ? pSelectedObj->GetName() : String() ); - aEntry.UIName = ( aName.getLength() > 0 ? aName : ::rtl::OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) ); + aEntry.UIName = ( aName.isEmpty() ? ::rtl::OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) : aName ); aEntry.OID = aSelectedOID; m_aEntries.push_back( aEntry ); } diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx index fecbe84e1686..15a6bfa45637 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx @@ -66,7 +66,7 @@ bool FeatureCommandDispatchBase::isFeatureSupported( const ::rtl::OUString& rCom void FeatureCommandDispatchBase::fireStatusEvent( const ::rtl::OUString& rURL, const Reference< frame::XStatusListener >& xSingleListener /* = 0 */ ) { - if ( rURL.getLength() == 0 ) + if ( rURL.isEmpty() ) { SupportedFeatures::const_iterator aEnd( m_aSupportedFeatures.end() ); for ( SupportedFeatures::const_iterator aIter( m_aSupportedFeatures.begin() ); aIter != aEnd; ++aIter ) diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index d059c1ab2234..14158baf57fd 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -96,7 +96,7 @@ void lcl_getChildOIDs( if( xInfo.is() && xInfo->hasPropertyByName( C2U("Name")) && (xShapeProp->getPropertyValue( C2U("Name")) >>= aName ) && - aName.getLength() > 0 && + !aName.isEmpty() && ::chart::ObjectIdentifier::isCID( aName )) { rOutChildren.push_back( ::chart::ObjectIdentifier( aName ) ); diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index def21edc2861..256354a6c3e3 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -372,7 +372,7 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject if(!pObj) return false; - if(!aName.getLength()) + if(aName.isEmpty()) return false; pInOutObject = pObj; @@ -397,7 +397,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos , const rtl::OUString& rNameOfSelectedObject , const DrawViewWrapper& rDrawViewWrapper ) { - if(!rNameOfSelectedObject.getLength()) + if(rNameOfSelectedObject.isEmpty()) return false; if( !ObjectIdentifier::isDragableObject(rNameOfSelectedObject) ) return false; @@ -436,13 +436,13 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos rtl::OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) );//@todo read CID from model //get page when nothing was hit - if( aRet.getLength() == 0 && !pNewObj ) + if( aRet.isEmpty() && !pNewObj ) { aRet = aPageCID; } //get diagram instead wall or page if hit inside diagram - if( aRet.getLength() != 0 ) + if( !aRet.isEmpty() ) { if( aRet.equals( aPageCID ) ) { @@ -510,7 +510,7 @@ SdrObject* SelectionHelper::getMarkHandlesObject( SdrObject* pObj ) rtl::OUString aName( lcl_getObjectName( pObj ) ); if( aName.match(C2U("MarkHandles")) || aName.match(C2U("HandlesOnly")) ) return pObj; - if( aName.getLength() )//dont't get the markhandles of a different object + if( !aName.isEmpty() )//dont't get the markhandles of a different object return 0; //search for a child with name "MarkHandles" or "HandlesOnly" diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index bee7a543cd1f..db5a09ca3a11 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -76,7 +76,7 @@ void StatusBarCommandDispatch::fireStatusEvent( const OUString & rURL, const Reference< frame::XStatusListener > & xSingleListener /* = 0 */ ) { - bool bFireAll(rURL.getLength() == 0); + bool bFireAll( rURL.isEmpty() ); bool bFireContext( bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:Context"))); bool bFireModified( bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:ModifiedStatus"))); diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 643667f16967..f1dbf032ea3c 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -77,7 +77,7 @@ void UndoCommandDispatch::fireStatusEvent( { if( m_xUndoManager.is() ) { - bool bFireAll = (rURL.getLength() == 0); + bool bFireAll = rURL.isEmpty(); uno::Any aUndoState, aRedoState; if( m_xUndoManager->isUndoPossible()) { |