diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2019-08-15 19:44:25 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2019-08-15 20:49:17 +0200 |
commit | f817ce79d501ce32d54d6c8a3492f1913fb85a55 (patch) | |
tree | 94d7d1dac8a6e452a1d52594f220cbcbd9ea2568 /writerperfect/source/impress | |
parent | dc50b7f952cf339f66fcdf1ac78d7fbeb31014d4 (diff) |
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in writerperfect
+ remove some using
Change-Id: I7ced8e49ba2d85a4354d9a5d048531c023faacf0
Reviewed-on: https://gerrit.libreoffice.org/77540
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'writerperfect/source/impress')
-rw-r--r-- | writerperfect/source/impress/KeynoteImportFilter.cxx | 29 | ||||
-rw-r--r-- | writerperfect/source/impress/MWAWPresentationImportFilter.cxx | 14 |
2 files changed, 11 insertions, 32 deletions
diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx index 124f0cbc3c81..9b8a2b27e8e3 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.cxx +++ b/writerperfect/source/impress/KeynoteImportFilter.cxx @@ -33,16 +33,6 @@ #include "KeynoteImportFilter.hxx" -using std::shared_ptr; - -using com::sun::star::io::XInputStream; -using com::sun::star::uno::Reference; -using com::sun::star::uno::RuntimeException; -using com::sun::star::uno::Sequence; -using com::sun::star::uno::UNO_QUERY; -using com::sun::star::uno::XComponentContext; -using com::sun::star::uno::XInterface; - using writerperfect::DocumentHandler; using writerperfect::WPXSvInputStream; @@ -78,10 +68,10 @@ KeynoteImportFilter::detect(css::uno::Sequence<css::beans::PropertyValue>& Descr bool bIsPackage = false; bool bUCBContentChanged = false; const beans::PropertyValue* pValue = Descriptor.getConstArray(); - Reference<XInputStream> xInputStream; - Reference<ucb::XContent> xContent; - Sequence<beans::NamedValue> lComponentDataNV; - Sequence<beans::PropertyValue> lComponentDataPV; + css::uno::Reference<com::sun::star::io::XInputStream> xInputStream; + css::uno::Reference<ucb::XContent> xContent; + css::uno::Sequence<beans::NamedValue> lComponentDataNV; + css::uno::Sequence<beans::PropertyValue> lComponentDataPV; bool bComponentDataNV = true; for (sal_Int32 i = 0; i < nLength; i++) @@ -115,7 +105,7 @@ KeynoteImportFilter::detect(css::uno::Sequence<css::beans::PropertyValue>& Descr if (!xInputStream.is()) return OUString(); - shared_ptr<librevenge::RVNGInputStream> input(new WPXSvInputStream(xInputStream)); + std::shared_ptr<librevenge::RVNGInputStream> input(new WPXSvInputStream(xInputStream)); /* Apple Keynote documents come in two variants: * * actual files (zip), only produced by Keynote 5 (at least with @@ -248,13 +238,10 @@ sal_Bool SAL_CALL KeynoteImportFilter::supportsService(const OUString& rServiceN return cppu::supportsService(this, rServiceName); } -Sequence<OUString> SAL_CALL KeynoteImportFilter::getSupportedServiceNames() +css::uno::Sequence<OUString> SAL_CALL KeynoteImportFilter::getSupportedServiceNames() { - Sequence<OUString> aRet(2); - OUString* pArray = aRet.getArray(); - pArray[0] = "com.sun.star.document.ImportFilter"; - pArray[1] = "com.sun.star.document.ExtendedTypeDetection"; - return aRet; + return css::uno::Sequence<OUString>{ "com.sun.star.document.ImportFilter", + "com.sun.star.document.ExtendedTypeDetection" }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx index 8cccdb469cfa..df202dcc252e 100644 --- a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx +++ b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx @@ -17,11 +17,6 @@ #include "MWAWPresentationImportFilter.hxx" -using com::sun::star::uno::RuntimeException; -using com::sun::star::uno::Sequence; -using com::sun::star::uno::XComponentContext; -using com::sun::star::uno::XInterface; - static bool handleEmbeddedMWAWGraphicObject(const librevenge::RVNGBinaryData& data, OdfDocumentHandler* pHandler, const OdfStreamType streamType) @@ -96,13 +91,10 @@ sal_Bool SAL_CALL MWAWPresentationImportFilter::supportsService(const OUString& { return cppu::supportsService(this, rServiceName); } -Sequence<OUString> SAL_CALL MWAWPresentationImportFilter::getSupportedServiceNames() +css::uno::Sequence<OUString> SAL_CALL MWAWPresentationImportFilter::getSupportedServiceNames() { - Sequence<OUString> aRet(2); - OUString* pArray = aRet.getArray(); - pArray[0] = "com.sun.star.document.ImportFilter"; - pArray[1] = "com.sun.star.document.ExtendedTypeDetection"; - return aRet; + return css::uno::Sequence<OUString>{ "com.sun.star.document.ImportFilter", + "com.sun.star.document.ExtendedTypeDetection" }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* |