From 77856e81ce4d279f00d0f92e917099f4f5220034 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 11 Jan 2013 13:12:07 +0200 Subject: fdo#46808, Adapt document::*PropertyValues UNO service to new style The services are: document::NamedPropertyValues document::IndexedPropertyValues The services already existed, they just did not have IDL files Change-Id: Ibafe9b5afb9b30785df4f66aa923f4b96ceabeed --- oox/inc/oox/helper/containerhelper.hxx | 11 ----------- oox/source/helper/containerhelper.cxx | 30 ------------------------------ 2 files changed, 41 deletions(-) (limited to 'oox') diff --git a/oox/inc/oox/helper/containerhelper.hxx b/oox/inc/oox/helper/containerhelper.hxx index 494729bd36d9..48432268780f 100644 --- a/oox/inc/oox/helper/containerhelper.hxx +++ b/oox/inc/oox/helper/containerhelper.hxx @@ -157,17 +157,6 @@ private: class OOX_DLLPUBLIC ContainerHelper { public: - // com.sun.star.container.XIndexContainer --------------------------------- - - /** Creates a new index container object from scratch. */ - static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > - createIndexContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); - - // com.sun.star.container.XNameContainer ---------------------------------- - - /** Creates a new name container object from scratch. */ - static ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > - createNameContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); /** Returns a name that is not used in the passed name container. diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx index 75bd99e6a4d3..0686395010e2 100644 --- a/oox/source/helper/containerhelper.cxx +++ b/oox/source/helper/containerhelper.cxx @@ -82,36 +82,6 @@ void ValueRangeSet::insert( const ValueRange& rRange ) // ============================================================================ -Reference< XIndexContainer > ContainerHelper::createIndexContainer( const Reference< XComponentContext >& rxContext ) -{ - Reference< XIndexContainer > xContainer; - if( rxContext.is() ) try - { - Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW ); - xContainer.set( xFactory->createInstance( "com.sun.star.document.IndexedPropertyValues" ), UNO_QUERY_THROW ); - } - catch( Exception& ) - { - } - OSL_ENSURE( xContainer.is(), "ContainerHelper::createIndexContainer - cannot create container" ); - return xContainer; -} - -Reference< XNameContainer > ContainerHelper::createNameContainer( const Reference< XComponentContext >& rxContext ) -{ - Reference< XNameContainer > xContainer; - if( rxContext.is() ) try - { - Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW ); - xContainer.set( xFactory->createInstance( "com.sun.star.document.NamedPropertyValues" ), UNO_QUERY_THROW ); - } - catch( Exception& ) - { - } - OSL_ENSURE( xContainer.is(), "ContainerHelper::createNameContainer - cannot create container" ); - return xContainer; -} - OUString ContainerHelper::getUnusedName( const Reference< XNameAccess >& rxNameAccess, const OUString& rSuggestedName, sal_Unicode cSeparator, sal_Int32 nFirstIndexToAppend ) -- cgit