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 /xmloff | |
| parent | 14d9d74717d999aae9d4ffb1e8c2e6369fef69fa (diff) | |
Deduplication of NavigationOrderAccess for disable-dynlinking
Change-Id: I70238711222a12cb6bd843ebbc742a21a325810d
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/ximppage.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 9346e6aefb3e..7e57d11df8a8 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -563,10 +563,10 @@ void SdXMLGenericPageContext::SetPageMaster( OUString& rsPageMasterName ) } } -class NavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess > +class XoNavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess > { public: - NavigationOrderAccess( std::vector< Reference< XShape > >& rShapes ); + XoNavigationOrderAccess( std::vector< Reference< XShape > >& rShapes ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException); @@ -580,18 +580,18 @@ private: std::vector< Reference< XShape > > maShapes; }; -NavigationOrderAccess::NavigationOrderAccess( std::vector< Reference< XShape > >& rShapes ) +XoNavigationOrderAccess::XoNavigationOrderAccess( std::vector< Reference< XShape > >& rShapes ) { maShapes.swap( rShapes ); } // XIndexAccess -sal_Int32 SAL_CALL NavigationOrderAccess::getCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL XoNavigationOrderAccess::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 XoNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { if( (Index < 0) || (Index > getCount()) ) throw IndexOutOfBoundsException(); @@ -600,12 +600,12 @@ Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOu } // XElementAccess -Type SAL_CALL NavigationOrderAccess::getElementType( ) throw (RuntimeException) +Type SAL_CALL XoNavigationOrderAccess::getElementType( ) throw (RuntimeException) { return XShape::static_type(); } -sal_Bool SAL_CALL NavigationOrderAccess::hasElements( ) throw (RuntimeException) +sal_Bool SAL_CALL XoNavigationOrderAccess::hasElements( ) throw (RuntimeException) { return maShapes.empty() ? sal_False : sal_True; } @@ -640,7 +640,7 @@ void SdXMLGenericPageContext::SetNavigationOrder() } Reference< XPropertySet > xSet( mxShapes, UNO_QUERY_THROW ); - xSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "NavigationOrder" ) ), Any( Reference< XIndexAccess >( new NavigationOrderAccess( aShapes ) ) ) ); + xSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "NavigationOrder" ) ), Any( Reference< XIndexAccess >( new XoNavigationOrderAccess( aShapes ) ) ) ); } catch(const uno::Exception&) { |