summaryrefslogtreecommitdiff
path: root/writerperfect/source/draw
diff options
context:
space:
mode:
Diffstat (limited to 'writerperfect/source/draw')
-rw-r--r--writerperfect/source/draw/CDRImportFilter.cxx14
-rw-r--r--writerperfect/source/draw/CMXImportFilter.cxx14
-rw-r--r--writerperfect/source/draw/FreehandImportFilter.cxx14
-rw-r--r--writerperfect/source/draw/MSPUBImportFilter.cxx14
-rw-r--r--writerperfect/source/draw/MWAWDrawImportFilter.cxx14
-rw-r--r--writerperfect/source/draw/PageMakerImportFilter.cxx14
-rw-r--r--writerperfect/source/draw/VisioImportFilter.cxx14
-rw-r--r--writerperfect/source/draw/WPGImportFilter.cxx14
8 files changed, 24 insertions, 88 deletions
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx
index fd317ec26bac..649b1f47e628 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -20,11 +20,6 @@
#include "CDRImportFilter.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;
-
bool CDRImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputStream& rInput,
OdgGenerator& rGenerator, utl::MediaDescriptor&)
{
@@ -53,13 +48,10 @@ sal_Bool SAL_CALL CDRImportFilter::supportsService(const OUString& rServiceName)
return cppu::supportsService(this, rServiceName);
}
-Sequence<OUString> SAL_CALL CDRImportFilter::getSupportedServiceNames()
+css::uno::Sequence<OUString> SAL_CALL CDRImportFilter::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/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx
index 117da40e3540..68a2db3557bd 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -20,11 +20,6 @@
#include "CMXImportFilter.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;
-
bool CMXImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputStream& rInput,
OdgGenerator& rGenerator, utl::MediaDescriptor&)
{
@@ -53,13 +48,10 @@ sal_Bool SAL_CALL CMXImportFilter::supportsService(const OUString& rServiceName)
return cppu::supportsService(this, rServiceName);
}
-Sequence<OUString> SAL_CALL CMXImportFilter::getSupportedServiceNames()
+css::uno::Sequence<OUString> SAL_CALL CMXImportFilter::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/draw/FreehandImportFilter.cxx b/writerperfect/source/draw/FreehandImportFilter.cxx
index 432532647fd2..2e07914937f8 100644
--- a/writerperfect/source/draw/FreehandImportFilter.cxx
+++ b/writerperfect/source/draw/FreehandImportFilter.cxx
@@ -16,11 +16,6 @@
#include "FreehandImportFilter.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;
-
bool FreehandImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputStream& rInput,
OdgGenerator& rGenerator, utl::MediaDescriptor&)
{
@@ -49,13 +44,10 @@ sal_Bool SAL_CALL FreehandImportFilter::supportsService(const OUString& rService
return cppu::supportsService(this, rServiceName);
}
-Sequence<OUString> SAL_CALL FreehandImportFilter::getSupportedServiceNames()
+css::uno::Sequence<OUString> SAL_CALL FreehandImportFilter::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/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx
index 7ed175efcb85..d895334b8b9a 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.cxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.cxx
@@ -16,11 +16,6 @@
#include "MSPUBImportFilter.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;
-
bool MSPUBImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputStream& rInput,
OdgGenerator& rGenerator, utl::MediaDescriptor&)
{
@@ -49,13 +44,10 @@ sal_Bool SAL_CALL MSPUBImportFilter::supportsService(const OUString& rServiceNam
return cppu::supportsService(this, rServiceName);
}
-Sequence<OUString> SAL_CALL MSPUBImportFilter::getSupportedServiceNames()
+css::uno::Sequence<OUString> SAL_CALL MSPUBImportFilter::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/draw/MWAWDrawImportFilter.cxx b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
index 72495b7b24a2..0a3c701bbbaf 100644
--- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx
+++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
@@ -17,11 +17,6 @@
#include "MWAWDrawImportFilter.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)
@@ -108,13 +103,10 @@ sal_Bool SAL_CALL MWAWDrawImportFilter::supportsService(const OUString& rService
return cppu::supportsService(this, rServiceName);
}
-Sequence<OUString> SAL_CALL MWAWDrawImportFilter::getSupportedServiceNames()
+css::uno::Sequence<OUString> SAL_CALL MWAWDrawImportFilter::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/draw/PageMakerImportFilter.cxx b/writerperfect/source/draw/PageMakerImportFilter.cxx
index 49409141cd59..cb12957b5c91 100644
--- a/writerperfect/source/draw/PageMakerImportFilter.cxx
+++ b/writerperfect/source/draw/PageMakerImportFilter.cxx
@@ -17,11 +17,6 @@
#include "PageMakerImportFilter.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;
-
bool PageMakerImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputStream& rInput,
OdgGenerator& rGenerator, utl::MediaDescriptor&)
{
@@ -50,13 +45,10 @@ sal_Bool SAL_CALL PageMakerImportFilter::supportsService(const OUString& rServic
return cppu::supportsService(this, rServiceName);
}
-Sequence<OUString> SAL_CALL PageMakerImportFilter::getSupportedServiceNames()
+css::uno::Sequence<OUString> SAL_CALL PageMakerImportFilter::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/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx
index 7338f930450a..d4060407151a 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -16,11 +16,6 @@
#include "VisioImportFilter.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;
-
bool VisioImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputStream& rInput,
OdgGenerator& rGenerator, utl::MediaDescriptor&)
{
@@ -49,13 +44,10 @@ sal_Bool SAL_CALL VisioImportFilter::supportsService(const OUString& rServiceNam
return cppu::supportsService(this, rServiceName);
}
-Sequence<OUString> SAL_CALL VisioImportFilter::getSupportedServiceNames()
+css::uno::Sequence<OUString> SAL_CALL VisioImportFilter::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/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx
index e11badb7ac9d..4b0ec488b503 100644
--- a/writerperfect/source/draw/WPGImportFilter.cxx
+++ b/writerperfect/source/draw/WPGImportFilter.cxx
@@ -23,11 +23,6 @@
#include "WPGImportFilter.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;
-
bool WPGImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputStream& rInput,
OdgGenerator& rGenerator, utl::MediaDescriptor&)
{
@@ -56,13 +51,10 @@ sal_Bool SAL_CALL WPGImportFilter::supportsService(const OUString& rServiceName)
return cppu::supportsService(this, rServiceName);
}
-Sequence<OUString> SAL_CALL WPGImportFilter::getSupportedServiceNames()
+css::uno::Sequence<OUString> SAL_CALL WPGImportFilter::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*