diff options
author | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-01-08 09:52:25 -0200 |
---|---|---|
committer | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-01-10 23:08:01 -0200 |
commit | db08c1ac5ed566fbec4d2ce8345ed483fa8bf9ab (patch) | |
tree | bc321e6f2f15c95b3bba78f1e2f8514f0eeb894a /sd/source/ui/view | |
parent | 5e7d38fe5b8115fe4860fe3e8a77d298cf67391b (diff) |
Fix for fdo43460 Part XXXI getLength() to isEmpty()
Part XXXI
Modules
sd
Diffstat (limited to 'sd/source/ui/view')
-rw-r--r-- | sd/source/ui/view/DocumentRenderer.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/view/ViewTabBar.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/sdview2.cxx | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 0d15f445df00..af8f45ff9dcc 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -222,7 +222,7 @@ namespace { if (nContent == 1) // range { OUString sValue = mrProperties.getStringValue("PageRange"); - return sValue.getLength() ? sValue : sFullRange; + return sValue.isEmpty() ? sFullRange : sValue; } if (nContent == 2 && // selection @@ -261,7 +261,7 @@ namespace { const bool bDefaultValue = false) const { OUString sValue( mrProperties.getStringValue( pName ) ); - if (sValue.getLength()) + if (!sValue.isEmpty()) return sValue.equalsAscii(pValue); else return bDefaultValue; diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 94ed8ff2d3dd..253e2884869e 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -360,7 +360,7 @@ void ViewShellBase::LateInit (const ::rtl::OUString& rsDefaultView) if (xConfigurationController.is()) { OUString sView (rsDefaultView); - if (sView.getLength() == 0) + if (sView.isEmpty()) sView = GetInitialViewShellType(); ::boost::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(*this)); @@ -824,7 +824,7 @@ void ViewShellBase::ReadUserDataSequence ( sViewURL = framework::FrameworkHelper::msHandoutViewURL; break; } - if (sViewURL.getLength() > 0) + if (!sViewURL.isEmpty()) framework::FrameworkHelper::Instance(*this)->RequestView( sViewURL, framework::FrameworkHelper::msCenterPaneURL); @@ -1162,7 +1162,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB { ::rtl::OUString aLabel; - if ( aCmdURL.getLength() > 0 ) try + if ( !aCmdURL.isEmpty() ) try { Reference< XMultiServiceFactory > xServiceManager( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); @@ -1171,7 +1171,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB ::rtl::OUString aModuleIdentifier( xModuleManager->identify( xIfac ) ); - if( aModuleIdentifier.getLength() > 0 ) + if( !aModuleIdentifier.isEmpty() ) { Reference< XNameAccess > xNameAccess( xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.UICommandDescription" ) ) ), UNO_QUERY ); if( xNameAccess.is() ) diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 082c78939e37..99521a69625f 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -508,8 +508,8 @@ void ViewTabBar::AddTabBarButton ( sal_uInt32 nIndex; if ( ! rAnchor.ResourceId.is() - || (rAnchor.ResourceId->getResourceURL().getLength() == 0 - && rAnchor.ButtonLabel.getLength() == 0)) + || (rAnchor.ResourceId->getResourceURL().isEmpty() + && rAnchor.ButtonLabel.isEmpty())) { nIndex = 0; } diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index f01e5c9ea552..59ee92b32fa4 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -782,7 +782,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo( pPickObj ); sal_Bool bCreated = sal_False; - if( aBookmark.getLength() ) + if( !aBookmark.isEmpty() ) { presentation::ClickAction eClickAction = presentation::ClickAction_DOCUMENT; |