diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-05-24 20:54:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-05-25 19:01:03 +0200 |
| commit | b4bf19321ed9ce2d0e49341193690fef0c7085ea (patch) | |
| tree | 1ada5626ee19de2217f3178e2888282cd1aaf9f2 /xmloff | |
| parent | 18321eb3f447c9e6519e1691673677fc8a2c8117 (diff) | |
directly instantiate IndexedPropertyValuesContainer
without the overhead of the UNO service engine
Change-Id: I4a02fda2b3c92a897634374bf72cfffee4f531f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134923
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/DocumentSettingsContext.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/core/SettingsExportHelper.cxx | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index 9eb30779be6a..bf3a8f7f6472 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -40,9 +40,9 @@ #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/document/XViewDataSupplier.hpp> #include <com/sun/star/document/PrinterIndependentLayout.hpp> -#include <com/sun/star/document/IndexedPropertyValues.hpp> #include <com/sun/star/document/NamedPropertyValues.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <comphelper/indexedpropertyvalues.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> #include <tools/diagnose_ex.h> @@ -109,7 +109,7 @@ uno::Reference<container::XNameContainer> XMLMyList::GetNameContainer() uno::Reference<container::XIndexContainer> XMLMyList::GetIndexContainer() { - uno::Reference<container::XIndexContainer> xIndexContainer = document::IndexedPropertyValues::create(m_xContext); + rtl::Reference< comphelper::IndexedPropertyValuesContainer > xIndexContainer = new comphelper::IndexedPropertyValuesContainer(); sal_uInt32 i(0); for (auto const& prop : aProps) { diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx index 090aa2bc3263..9f0444d8f9f5 100644 --- a/xmloff/source/core/SettingsExportHelper.cxx +++ b/xmloff/source/core/SettingsExportHelper.cxx @@ -22,6 +22,7 @@ #include <xmloff/SettingsExportHelper.hxx> #include <xmloff/xmltoken.hxx> +#include <rtl/ref.hxx> #include <sal/log.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> @@ -38,7 +39,7 @@ #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/formula/SymbolDescriptor.hpp> #include <com/sun/star/document/PrinterIndependentLayout.hpp> -#include <com/sun/star/document/IndexedPropertyValues.hpp> +#include <comphelper/indexedpropertyvalues.hxx> #include <xmloff/XMLSettingsExportContext.hxx> #include "xmlenums.hxx" @@ -284,7 +285,7 @@ void XMLSettingsExportHelper::exportSymbolDescriptors( const uno::Sequence < formula::SymbolDescriptor > &rProps, const OUString& rName) const { - uno::Reference< container::XIndexContainer > xBox = document::IndexedPropertyValues::create(m_rContext.GetComponentContext()); + rtl::Reference< comphelper::IndexedPropertyValuesContainer > xBox = new comphelper::IndexedPropertyValuesContainer(); static const OUStringLiteral sName ( u"Name" ); static const OUStringLiteral sExportName ( u"ExportName" ); @@ -419,7 +420,7 @@ void XMLSettingsExportHelper::exportForbiddenCharacters( if( !xForbChars.is() || !xLocales.is() ) return; - uno::Reference< container::XIndexContainer > xBox = document::IndexedPropertyValues::create(m_rContext.GetComponentContext()); + rtl::Reference< comphelper::IndexedPropertyValuesContainer > xBox = new comphelper::IndexedPropertyValuesContainer(); const uno::Sequence< lang::Locale > aLocales( xLocales->getLocales() ); /* FIXME-BCP47: this stupid and counterpart in |