diff options
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/filter/excel/xltoolbar.cxx | 7 | ||||
-rw-r--r-- | sc/source/filter/oox/viewsettings.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index a743b97a25d4..efb54925bd69 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -10,13 +10,14 @@ #include <sal/log.hxx> #include <o3tl/safeint.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/document/IndexedPropertyValues.hpp> #include <com/sun/star/ui/XUIConfigurationPersistence.hpp> #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/ItemType.hpp> +#include <comphelper/indexedpropertyvalues.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertyvalue.hxx> #include <comphelper/sequence.hxx> +#include <rtl/ref.hxx> #include <map> using namespace com::sun::star; @@ -295,7 +296,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere ScCTB* pCustTB = rWrapper.GetCustomizationData( pMenu->Name() ); if ( pCustTB ) { - uno::Reference< container::XIndexContainer > xMenuDesc = document::IndexedPropertyValues::create( comphelper::getProcessComponentContext() ); + rtl::Reference< comphelper::IndexedPropertyValuesContainer > xMenuDesc = new comphelper::IndexedPropertyValuesContainer(); if ( !pCustTB->ImportMenuTB( rWrapper, xMenuDesc, helper ) ) return false; if ( !bIsMenuToolbar ) @@ -307,7 +308,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere { beans::PropertyValue aProp; aProp.Name = "ItemDescriptorContainer"; - aProp.Value <<= xMenuDesc; + aProp.Value <<= uno::Reference< container::XIndexContainer >(xMenuDesc); props.push_back( aProp ); } } diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx index 45a6a8fbcdd8..c72a61b17c15 100644 --- a/sc/source/filter/oox/viewsettings.cxx +++ b/sc/source/filter/oox/viewsettings.cxx @@ -23,11 +23,11 @@ #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/document/IndexedPropertyValues.hpp> #include <com/sun/star/document/XViewDataSupplier.hpp> #include <com/sun/star/document/NamedPropertyValues.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> +#include <comphelper/indexedpropertyvalues.hxx> #include <osl/diagnose.h> #include <unotools/mediadescriptor.hxx> #include <oox/core/filterbase.hxx> @@ -563,8 +563,8 @@ void ViewSettings::finalizeImport() if( !rxActiveSheetView ) rxActiveSheetView = std::make_shared<SheetViewModel>(); - Reference< XIndexContainer > xContainer = IndexedPropertyValues::create( getBaseFilter().getComponentContext() ); - if( xContainer.is() ) try + rtl::Reference< comphelper::IndexedPropertyValuesContainer > xContainer = new comphelper::IndexedPropertyValuesContainer(); + try { PropertyMap aPropMap; aPropMap.setProperty( PROP_Tables, xSheetsNC); diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 9bc6d1604c70..2f27948d0fe2 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -66,10 +66,10 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/ServiceNotRegisteredException.hpp> #include <com/sun/star/document/XDocumentEventBroadcaster.hpp> -#include <com/sun/star/document/IndexedPropertyValues.hpp> #include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/script/vba/XVBAEventProcessor.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> +#include <comphelper/indexedpropertyvalues.hxx> #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/profilezone.hxx> @@ -2615,8 +2615,8 @@ uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( ) SolarMutexGuard aGuard; if (pDocShell && pDocShell->GetCreateMode() == SfxObjectCreateMode::EMBEDDED) { - uno::Reference < container::XIndexContainer > xCont = document::IndexedPropertyValues::create( ::comphelper::getProcessComponentContext() ); - xRet.set( xCont, uno::UNO_QUERY_THROW ); + rtl::Reference< comphelper::IndexedPropertyValuesContainer > xCont = new comphelper::IndexedPropertyValuesContainer(); + xRet = xCont; OUString sName; pDocShell->GetDocument().GetName( pDocShell->GetDocument().GetVisibleTab(), sName ); |