diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-10-01 11:29:42 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-10-01 13:23:48 +0300 |
| commit | f1d9c520a2a2df5bdbb02fff7ba8f3a134dfc32d (patch) | |
| tree | 1b957036d034708e0dfd8d71f7ef3d35510883f2 /sd/source/ui/unoidl | |
| parent | 14d9d74717d999aae9d4ffb1e8c2e6369fef69fa (diff) | |
Deduplication of NavigationOrderAccess for disable-dynlinking
Change-Id: I70238711222a12cb6bd843ebbc742a21a325810d
Diffstat (limited to 'sd/source/ui/unoidl')
| -rw-r--r-- | sd/source/ui/unoidl/unopage.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index fcdae15a7cda..614cb88c4593 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -2602,10 +2602,10 @@ void SdGenericDrawPage::setNavigationOrder( const Any& rValue ) throw IllegalArgumentException(); } -class NavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess > +class SdNavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess > { public: - NavigationOrderAccess( SdrPage* pPage ); + SdNavigationOrderAccess( SdrPage* pPage ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException); @@ -2619,7 +2619,7 @@ private: std::vector< Reference< XShape > > maShapes; }; -NavigationOrderAccess::NavigationOrderAccess( SdrPage* pPage ) +SdNavigationOrderAccess::SdNavigationOrderAccess( SdrPage* pPage ) : maShapes( static_cast< sal_uInt32 >( pPage ? pPage->GetObjCount() : 0 ) ) { if( pPage ) @@ -2630,19 +2630,19 @@ NavigationOrderAccess::NavigationOrderAccess( SdrPage* pPage ) { SdrObject* pObj = pPage->GetObj( nIndex ); sal_uInt32 nNavPos = pObj->GetNavigationPosition(); - DBG_ASSERT( !maShapes[nNavPos].is(), "sd::NavigationOrderAccess::NavigationOrderAccess(), duplicate navigation positions from core!" ); + DBG_ASSERT( !maShapes[nNavPos].is(), "sd::SdNavigationOrderAccess::SdNavigationOrderAccess(), duplicate navigation positions from core!" ); maShapes[nNavPos] = Reference< XShape >( pObj->getUnoShape(), UNO_QUERY ); } } } // XIndexAccess -sal_Int32 SAL_CALL NavigationOrderAccess::getCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL SdNavigationOrderAccess::getCount( ) throw (RuntimeException) { return static_cast< sal_Int32 >( maShapes.size() ); } -Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) +Any SAL_CALL SdNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { if( (Index < 0) || (Index > getCount()) ) throw IndexOutOfBoundsException(); @@ -2651,12 +2651,12 @@ Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOu } // XElementAccess -Type SAL_CALL NavigationOrderAccess::getElementType( ) throw (RuntimeException) +Type SAL_CALL SdNavigationOrderAccess::getElementType( ) throw (RuntimeException) { return XShape::static_type(); } -sal_Bool SAL_CALL NavigationOrderAccess::hasElements( ) throw (RuntimeException) +sal_Bool SAL_CALL SdNavigationOrderAccess::hasElements( ) throw (RuntimeException) { return maShapes.empty() ? sal_False : sal_True; } @@ -2665,7 +2665,7 @@ Any SdGenericDrawPage::getNavigationOrder() { if( GetPage()->HasObjectNavigationOrder() ) { - return Any( Reference< XIndexAccess >( new NavigationOrderAccess( GetPage() ) ) ); + return Any( Reference< XIndexAccess >( new SdNavigationOrderAccess( GetPage() ) ) ); } else { |