mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

com::sun::star->css in writerperfect/

Browse Source 
Change-Id: I3b1f51d3a02b999476d12e680f2f76a11ac6b3b9
Reviewed-on: https://gerrit.libreoffice.org/20146
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin
2015-11-24 14:00:36 +02:00
committed by Noel Grandin
parent a15b9b44d9
commit 651649233f
28 changed files with 308 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
writerperfect/inc/DirectoryStream.hxx
View File

@@ -37,11 +37,11 @@ class WRITERPERFECT_DLLPUBLIC DirectoryStream : public librevenge::RVNGInputStre
struct Impl;
public:
explicit DirectoryStream(const com::sun::star::uno::Reference<com::sun::star::ucb::XContent> &xContent);
explicit DirectoryStream(const css::uno::Reference<css::ucb::XContent> &xContent);
virtual ~DirectoryStream();
static DirectoryStream *createForParent(const com::sun::star::uno::Reference<com::sun::star::ucb::XContent> &xContent);
static bool isDirectory(const com::sun::star::uno::Reference<com::sun::star::ucb::XContent> &xContent);
static DirectoryStream *createForParent(const css::uno::Reference<css::ucb::XContent> &xContent);
static bool isDirectory(const css::uno::Reference<css::ucb::XContent> &xContent);
virtual bool isStructured() override;
virtual unsigned subStreamCount() override;

4
writerperfect/inc/DocumentHandler.hxx
View File

@@ -49,7 +49,7 @@ namespace writerperfect
class WRITERPERFECT_DLLPUBLIC DocumentHandler: public OdfDocumentHandler
{
public:
DocumentHandler(com::sun::star::uno::Reference < com::sun::star::xml::sax::XDocumentHandler > &xHandler);
DocumentHandler(css::uno::Reference < css::xml::sax::XDocumentHandler > &xHandler);
void startDocument() override;
void endDocument() override;
void startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList) override;
@@ -57,7 +57,7 @@ public:
void characters(const librevenge::RVNGString &sCharacters) override;
private:
com::sun::star::uno::Reference < com::sun::star::xml::sax::XDocumentHandler > mxHandler;
css::uno::Reference < css::xml::sax::XDocumentHandler > mxHandler;
};
}

38
writerperfect/inc/ImportFilter.hxx
View File

@@ -48,14 +48,14 @@ namespace detail
template<class Generator>
class ImportFilterImpl : public cppu::WeakImplHelper
<
com::sun::star::document::XFilter,
com::sun::star::document::XImporter,
com::sun::star::document::XExtendedFilterDetection,
com::sun::star::lang::XInitialization
css::document::XFilter,
css::document::XImporter,
css::document::XExtendedFilterDetection,
css::lang::XInitialization
>
{
public:
ImportFilterImpl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
ImportFilterImpl(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: mxContext(rxContext)
{
}
@@ -65,8 +65,8 @@ public:
}
// XFilter
virtual sal_Bool SAL_CALL filter(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > &rDescriptor)
throw (::com::sun::star::uno::RuntimeException, std::exception) override
virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &rDescriptor)
throw (css::uno::RuntimeException, std::exception) override
{
utl::MediaDescriptor aDescriptor(rDescriptor);
css::uno::Reference < css::io::XInputStream > xInputStream;
@@ -102,20 +102,20 @@ public:
}
virtual void SAL_CALL cancel()
throw (::com::sun::star::uno::RuntimeException, std::exception) override
throw (css::uno::RuntimeException, std::exception) override
{
}
// XImporter
virtual void SAL_CALL setTargetDocument(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &xDoc)
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override
virtual void SAL_CALL setTargetDocument(const css::uno::Reference< css::lang::XComponent > &xDoc)
throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override
{
mxDoc = xDoc;
}
//XExtendedFilterDetection
virtual OUString SAL_CALL detect(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &Descriptor)
throw(com::sun::star::uno::RuntimeException, std::exception) override
virtual OUString SAL_CALL detect(css::uno::Sequence< css::beans::PropertyValue > &Descriptor)
throw(css::uno::RuntimeException, std::exception) override
{
OUString sTypeName;
sal_Int32 nLength = Descriptor.getLength();
@@ -152,8 +152,8 @@ public:
}
// XInitialization
virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &aArguments)
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override
virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > &aArguments)
throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override
{
css::uno::Sequence < css::beans::PropertyValue > aAnySeq;
sal_Int32 nLength = aArguments.getLength();
@@ -177,10 +177,10 @@ private:
virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, Generator &rGenerator, utl::MediaDescriptor &rDescriptor) = 0;
virtual void doRegisterHandlers(Generator &) {};
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc;
css::uno::Reference< css::uno::XComponentContext > mxContext;
css::uno::Reference< css::lang::XComponent > mxDoc;
OUString msFilterName;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
css::uno::Reference< css::xml::sax::XDocumentHandler > mxHandler;
};
}
@@ -188,10 +188,10 @@ private:
/** A base class for import filters.
*/
template<class Generator>
struct ImportFilter : public cppu::ImplInheritanceHelper<detail::ImportFilterImpl<Generator>, com::sun::star::lang::XServiceInfo>
struct ImportFilter : public cppu::ImplInheritanceHelper<detail::ImportFilterImpl<Generator>, css::lang::XServiceInfo>
{
ImportFilter(const css::uno::Reference<css::uno::XComponentContext> &rxContext)
: cppu::ImplInheritanceHelper<detail::ImportFilterImpl<Generator>, com::sun::star::lang::XServiceInfo>(rxContext)
: cppu::ImplInheritanceHelper<detail::ImportFilterImpl<Generator>, css::lang::XServiceInfo>(rxContext)
{
}
};

2
writerperfect/inc/WPXSvInputStream.hxx
View File

@@ -38,7 +38,7 @@ class WPXSvInputStreamImpl;
class WRITERPERFECT_DLLPUBLIC WPXSvInputStream : public librevenge::RVNGInputStream
{
public:
WPXSvInputStream(::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xStream);
WPXSvInputStream(css::uno::Reference< css::io::XInputStream > xStream);
virtual ~WPXSvInputStream();
virtual bool isStructured() override;

10
writerperfect/qa/unit/WpftImportTestBase.hxx
View File

@@ -71,14 +71,14 @@ private:
virtual bool load(const OUString &, const OUString &rURL, const OUString &,
SfxFilterFlags, SotClipboardFormatId, unsigned int) override;
void impl_detectFilterName(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> &rDescriptor, const rtl::OUString &rTypeName);
void impl_detectFilterName(css::uno::Sequence<css::beans::PropertyValue> &rDescriptor, const rtl::OUString &rTypeName);
private:
const rtl::OUString m_aFactoryURL;
com::sun::star::uno::Reference<com::sun::star::frame::XDesktop2> m_xDesktop;
com::sun::star::uno::Reference<com::sun::star::ucb::XSimpleFileAccess> m_xFileAccess;
com::sun::star::uno::Reference<com::sun::star::document::XFilter> m_xFilter;
com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> m_xTypeMap;
css::uno::Reference<css::frame::XDesktop2> m_xDesktop;
css::uno::Reference<css::ucb::XSimpleFileAccess> m_xFileAccess;
css::uno::Reference<css::document::XFilter> m_xFilter;
css::uno::Reference<css::container::XNameAccess> m_xTypeMap;
};
}

22
writerperfect/source/calc/MSWorksCalcImportFilter.hxx
View File

@@ -23,16 +23,16 @@
class MSWorksCalcImportFilter : public writerperfect::ImportFilter<OdsGenerator>
{
public:
explicit MSWorksCalcImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit MSWorksCalcImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdsGenerator>(rxContext) {}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -41,14 +41,14 @@ private:
};
OUString MSWorksCalcImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL MSWorksCalcImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL MSWorksCalcImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL MSWorksCalcImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL MSWorksCalcImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

22
writerperfect/source/calc/MWAWCalcImportFilter.hxx
View File

@@ -23,16 +23,16 @@
class MWAWCalcImportFilter : public writerperfect::ImportFilter<OdsGenerator>
{
public:
explicit MWAWCalcImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit MWAWCalcImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdsGenerator>(rxContext) {}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -41,14 +41,14 @@ private:
};
OUString MWAWCalcImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL MWAWCalcImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL MWAWCalcImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL MWAWCalcImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL MWAWCalcImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

22
writerperfect/source/calc/NumbersImportFilter.hxx
View File

@@ -22,16 +22,16 @@
class NumbersImportFilter : public writerperfect::ImportFilter<OdsGenerator>
{
public:
explicit NumbersImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit NumbersImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdsGenerator>(rxContext) {}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -40,14 +40,14 @@ private:
};
OUString NumbersImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL NumbersImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL NumbersImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL NumbersImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL NumbersImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

6
writerperfect/source/common/DirectoryStream.cxx
View File

@@ -104,7 +104,7 @@ DirectoryStream::Impl::Impl(const uno::Reference<ucb::XContent> &rxContent)
{
}
DirectoryStream::DirectoryStream(const com::sun::star::uno::Reference<com::sun::star::ucb::XContent> &xContent)
DirectoryStream::DirectoryStream(const css::uno::Reference<css::ucb::XContent> &xContent)
: m_pImpl(isDirectory(xContent) ? new Impl(xContent) : nullptr)
{
}
@@ -113,7 +113,7 @@ DirectoryStream::~DirectoryStream()
{
}
DirectoryStream *DirectoryStream::createForParent(const com::sun::star::uno::Reference<com::sun::star::ucb::XContent> &xContent)
DirectoryStream *DirectoryStream::createForParent(const css::uno::Reference<css::ucb::XContent> &xContent)
{
try
{
@@ -145,7 +145,7 @@ DirectoryStream *DirectoryStream::createForParent(const com::sun::star::uno::Ref
}
}
bool DirectoryStream::isDirectory(const com::sun::star::uno::Reference<com::sun::star::ucb::XContent> &xContent)
bool DirectoryStream::isDirectory(const css::uno::Reference<css::ucb::XContent> &xContent)
{
try
{

10
writerperfect/source/common/WPXSvInputStream.cxx
View File

@@ -400,8 +400,8 @@ Reference<XInputStream> ZipStorageImpl::createStream(const rtl::OUString &rPath)
class WPXSvInputStreamImpl
{
public:
explicit WPXSvInputStreamImpl(::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > xStream);
explicit WPXSvInputStreamImpl(css::uno::Reference<
css::io::XInputStream > xStream);
~WPXSvInputStreamImpl();
bool isStructured();
@@ -429,9 +429,9 @@ private:
static librevenge::RVNGInputStream *createWPXStream(const Reference<XInputStream> &rxStream);
private:
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > mxStream;
::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > mxSeekable;
::com::sun::star::uno::Sequence< sal_Int8 > maData;
css::uno::Reference< css::io::XInputStream > mxStream;
css::uno::Reference< css::io::XSeekable > mxSeekable;
css::uno::Sequence< sal_Int8 > maData;
std::unique_ptr< OLEStorageImpl > mpOLEStorage;
std::unique_ptr< ZipStorageImpl > mpZipStorage;
bool mbCheckedOLE;

22
writerperfect/source/draw/CDRImportFilter.hxx
View File

@@ -21,18 +21,18 @@
class CDRImportFilter : public writerperfect::ImportFilter<OdgGenerator>
{
public:
explicit CDRImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit CDRImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdgGenerator>(rxContext)
{
}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -40,14 +40,14 @@ private:
};
OUString CDRImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL CDRImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL CDRImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL CDRImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL CDRImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

22
writerperfect/source/draw/CMXImportFilter.hxx
View File

@@ -21,18 +21,18 @@
class CMXImportFilter : public writerperfect::ImportFilter<OdgGenerator>
{
public:
explicit CMXImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit CMXImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdgGenerator>(rxContext)
{
}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -40,14 +40,14 @@ private:
};
OUString CMXImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL CMXImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL CMXImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL CMXImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL CMXImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

22
writerperfect/source/draw/FreehandImportFilter.hxx
View File

@@ -18,18 +18,18 @@
class FreehandImportFilter : public writerperfect::ImportFilter<OdgGenerator>
{
public:
explicit FreehandImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit FreehandImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdgGenerator>(rxContext)
{
}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -37,14 +37,14 @@ private:
};
OUString FreehandImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL FreehandImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL FreehandImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL FreehandImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL FreehandImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

22
writerperfect/source/draw/MSPUBImportFilter.hxx
View File

@@ -18,18 +18,18 @@
class MSPUBImportFilter : public writerperfect::ImportFilter<OdgGenerator>
{
public:
explicit MSPUBImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit MSPUBImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdgGenerator>(rxContext)
{
}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -37,14 +37,14 @@ private:
};
OUString MSPUBImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL MSPUBImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL MSPUBImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL MSPUBImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL MSPUBImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

22
writerperfect/source/draw/MWAWDrawImportFilter.hxx
View File

@@ -23,16 +23,16 @@
class MWAWDrawImportFilter : public writerperfect::ImportFilter<OdgGenerator>
{
public:
explicit MWAWDrawImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit MWAWDrawImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdgGenerator>(rxContext) {}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -41,14 +41,14 @@ private:
};
OUString MWAWDrawImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL MWAWDrawImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL MWAWDrawImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL MWAWDrawImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL MWAWDrawImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

22
writerperfect/source/draw/PageMakerImportFilter.hxx
View File

@@ -18,18 +18,18 @@
class PageMakerImportFilter : public writerperfect::ImportFilter<OdgGenerator>
{
public:
explicit PageMakerImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit PageMakerImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdgGenerator>(rxContext)
{
}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -37,14 +37,14 @@ private:
};
OUString PageMakerImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL PageMakerImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL PageMakerImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL PageMakerImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL PageMakerImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

22
writerperfect/source/draw/VisioImportFilter.hxx
View File

@@ -18,18 +18,18 @@
class VisioImportFilter : public writerperfect::ImportFilter<OdgGenerator>
{
public:
explicit VisioImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit VisioImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdgGenerator>(rxContext)
{
}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -37,14 +37,14 @@ private:
};
OUString VisioImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL VisioImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL VisioImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL VisioImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL VisioImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

22
writerperfect/source/draw/WPGImportFilter.hxx
View File

@@ -23,18 +23,18 @@
class WPGImportFilter : public writerperfect::ImportFilter<OdgGenerator>
{
public:
explicit WPGImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit WPGImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdgGenerator>(rxContext)
{
}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -42,14 +42,14 @@ private:
};
OUString WPGImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL WPGImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL WPGImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL WPGImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL WPGImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

4
writerperfect/source/impress/KeynoteImportFilter.cxx
View File

@@ -69,8 +69,8 @@ bool KeynoteImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OU
}
// XExtendedFilterDetection
OUString SAL_CALL KeynoteImportFilter::detect(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &Descriptor)
throw(com::sun::star::uno::RuntimeException, std::exception)
OUString SAL_CALL KeynoteImportFilter::detect(css::uno::Sequence< css::beans::PropertyValue > &Descriptor)
throw(css::uno::RuntimeException, std::exception)
{
sal_Int32 nLength = Descriptor.getLength();
sal_Int32 nNewLength = nLength + 2;

28
writerperfect/source/impress/KeynoteImportFilter.hxx
View File

@@ -20,21 +20,21 @@
class KeynoteImportFilter : public writerperfect::ImportFilter<OdpGenerator>
{
public:
explicit KeynoteImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit KeynoteImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdpGenerator>(rxContext) {}
virtual ~KeynoteImportFilter() {}
//XExtendedFilterDetection
virtual OUString SAL_CALL detect(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &Descriptor)
throw(com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL detect(css::uno::Sequence< css::beans::PropertyValue > &Descriptor)
throw(css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -42,17 +42,17 @@ private:
};
OUString KeynoteImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
bool SAL_CALL KeynoteImportFilter_supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL KeynoteImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL KeynoteImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL KeynoteImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL KeynoteImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

22
writerperfect/source/impress/MWAWPresentationImportFilter.hxx
View File

@@ -23,16 +23,16 @@
class MWAWPresentationImportFilter : public writerperfect::ImportFilter<OdpGenerator>
{
public:
explicit MWAWPresentationImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit MWAWPresentationImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdpGenerator>(rxContext) {}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -41,14 +41,14 @@ private:
};
OUString MWAWPresentationImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL MWAWPresentationImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL MWAWPresentationImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL MWAWPresentationImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL MWAWPresentationImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

22
writerperfect/source/writer/AbiWordImportFilter.hxx
View File

@@ -23,16 +23,16 @@
class AbiWordImportFilter : public writerperfect::ImportFilter<OdtGenerator>
{
public:
explicit AbiWordImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit AbiWordImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -40,14 +40,14 @@ private:
};
OUString AbiWordImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL AbiWordImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL AbiWordImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL AbiWordImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL AbiWordImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

22
writerperfect/source/writer/EBookImportFilter.hxx
View File

@@ -23,16 +23,16 @@
class EBookImportFilter : public writerperfect::ImportFilter<OdtGenerator>
{
public:
explicit EBookImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit EBookImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -40,14 +40,14 @@ private:
};
OUString EBookImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL EBookImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL EBookImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL EBookImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL EBookImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

22
writerperfect/source/writer/MSWorksImportFilter.hxx
View File

@@ -23,16 +23,16 @@
class MSWorksImportFilter : public writerperfect::ImportFilter<OdtGenerator>
{
public:
explicit MSWorksImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit MSWorksImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -41,14 +41,14 @@ private:
};
OUString MSWorksImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL MSWorksImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL MSWorksImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL MSWorksImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL MSWorksImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

22
writerperfect/source/writer/MWAWImportFilter.hxx
View File

@@ -23,16 +23,16 @@
class MWAWImportFilter : public writerperfect::ImportFilter<OdtGenerator>
{
public:
explicit MWAWImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit MWAWImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -41,14 +41,14 @@ private:
};
OUString MWAWImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL MWAWImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL MWAWImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL MWAWImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL MWAWImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

22
writerperfect/source/writer/PagesImportFilter.hxx
View File

@@ -22,16 +22,16 @@
class PagesImportFilter : public writerperfect::ImportFilter<OdtGenerator>
{
public:
explicit PagesImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit PagesImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
@@ -39,14 +39,14 @@ private:
};
OUString PagesImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL PagesImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL PagesImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL PagesImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL PagesImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif

18
writerperfect/source/writer/WordPerfectImportFilter.cxx
View File

@@ -94,7 +94,7 @@ static bool handleEmbeddedWPGImage(const librevenge::RVNGBinaryData &input, libr
return true;
}
bool SAL_CALL WordPerfectImportFilter::importImpl(const Sequence< ::com::sun::star::beans::PropertyValue > &aDescriptor)
bool SAL_CALL WordPerfectImportFilter::importImpl(const Sequence< css::beans::PropertyValue > &aDescriptor)
throw (RuntimeException, std::exception)
{
sal_Int32 nLength = aDescriptor.getLength();
@@ -160,7 +160,7 @@ throw (RuntimeException, std::exception)
return false;
}
sal_Bool SAL_CALL WordPerfectImportFilter::filter(const Sequence< ::com::sun::star::beans::PropertyValue > &aDescriptor)
sal_Bool SAL_CALL WordPerfectImportFilter::filter(const Sequence< css::beans::PropertyValue > &aDescriptor)
throw (RuntimeException, std::exception)
{
return importImpl(aDescriptor);
@@ -171,8 +171,8 @@ throw (RuntimeException, std::exception)
}
// XImporter
void SAL_CALL WordPerfectImportFilter::setTargetDocument(const Reference< ::com::sun::star::lang::XComponent > &xDoc)
throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception)
void SAL_CALL WordPerfectImportFilter::setTargetDocument(const Reference< css::lang::XComponent > &xDoc)
throw (css::lang::IllegalArgumentException, RuntimeException, std::exception)
{
mxDoc = xDoc;
}
@@ -309,7 +309,7 @@ throw (RuntimeException, std::exception)
ScopedVclPtrInstance< SfxPasswordDialog > aPasswdDlg(nullptr);
aPasswdDlg->SetMinLen(0);
if (!aPasswdDlg->Execute())
return com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL;
return css::ui::dialogs::ExecutableDialogResults::CANCEL;
msPassword = aPasswdDlg->GetPassword().getStr();
aUtf8Passwd = OUStringToOString(msPassword, RTL_TEXTENCODING_UTF8);
if (libwpd::WPD_PASSWORD_MATCH_OK == libwpd::WPDocument::verifyPassword(&input, aUtf8Passwd.getStr()))
@@ -317,10 +317,10 @@ throw (RuntimeException, std::exception)
else
unsuccessfulAttempts++;
if (unsuccessfulAttempts == 3) // timeout after 3 password atempts
return com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL;
return css::ui::dialogs::ExecutableDialogResults::CANCEL;
}
}
return com::sun::star::ui::dialogs::ExecutableDialogResults::OK;
return css::ui::dialogs::ExecutableDialogResults::OK;
}
Sequence<PropertyValue> SAL_CALL WordPerfectImportFilterDialog::getPropertyValues() throw(RuntimeException, std::exception)
@@ -335,8 +335,8 @@ Sequence<PropertyValue> SAL_CALL WordPerfectImportFilterDialog::getPropertyValue
}
void SAL_CALL WordPerfectImportFilterDialog::setPropertyValues(const Sequence<PropertyValue> &aProps)
throw(com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException,
com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception)
throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
css::lang::IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception)
{
const PropertyValue *pPropArray = aProps.getConstArray();
long nPropCount = aProps.getLength();

116
writerperfect/source/writer/WordPerfectImportFilter.hxx
View File

@@ -27,123 +27,123 @@
* member calls */
class WordPerfectImportFilter : public cppu::WeakImplHelper
<
com::sun::star::document::XFilter,
com::sun::star::document::XImporter,
com::sun::star::document::XExtendedFilterDetection,
com::sun::star::lang::XInitialization,
com::sun::star::lang::XServiceInfo
css::document::XFilter,
css::document::XImporter,
css::document::XExtendedFilterDetection,
css::lang::XInitialization,
css::lang::XServiceInfo
>
{
protected:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc;
css::uno::Reference< css::uno::XComponentContext > mxContext;
css::uno::Reference< css::lang::XComponent > mxDoc;
OUString msFilterName;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
css::uno::Reference< css::xml::sax::XDocumentHandler > mxHandler;
bool SAL_CALL importImpl(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > &aDescriptor)
bool SAL_CALL importImpl(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor)
throw (css::uno::RuntimeException, std::exception);
public:
explicit WordPerfectImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
explicit WordPerfectImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: mxContext(rxContext) {}
virtual ~WordPerfectImportFilter() {}
// XFilter
virtual sal_Bool SAL_CALL filter(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > &aDescriptor)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor)
throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL cancel()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
// XImporter
virtual void SAL_CALL setTargetDocument(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &xDoc)
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setTargetDocument(const css::uno::Reference< css::lang::XComponent > &xDoc)
throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
//XExtendedFilterDetection
virtual OUString SAL_CALL detect(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &Descriptor)
throw(com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL detect(css::uno::Sequence< css::beans::PropertyValue > &Descriptor)
throw(css::uno::RuntimeException, std::exception) override;
// XInitialization
virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &aArguments)
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > &aArguments)
throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
};
OUString WordPerfectImportFilter_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
bool SAL_CALL WordPerfectImportFilter_supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL WordPerfectImportFilter_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL WordPerfectImportFilter_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL WordPerfectImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL WordPerfectImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
class WordPerfectImportFilterDialog : public cppu::WeakImplHelper <
com::sun::star::ui::dialogs::XExecutableDialog,
com::sun::star::lang::XServiceInfo,
com::sun::star::beans::XPropertyAccess
css::ui::dialogs::XExecutableDialog,
css::lang::XServiceInfo,
css::beans::XPropertyAccess
>
{
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
css::uno::Reference< css::uno::XComponentContext > mxContext;
OUString msPassword;
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > mxInputStream;
css::uno::Reference< css::io::XInputStream > mxInputStream;
virtual ~WordPerfectImportFilterDialog();
// XExecutableDialog
virtual void SAL_CALL setTitle(const OUString &aTitle)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int16 SAL_CALL execute()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
// XPropertyAccess
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& aProps)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< css::beans::PropertyValue >
SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyValues(const css::uno::Sequence<
css::beans::PropertyValue >& aProps)
throw (css::beans::UnknownPropertyException,
css::beans::PropertyVetoException,
css::lang::IllegalArgumentException,
css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception) override;
public:
explicit WordPerfectImportFilterDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext);
explicit WordPerfectImportFilterDialog(const css::uno::Reference< css::uno::XComponentContext > &rContext);
};
OUString WordPerfectImportFilterDialog_getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
bool SAL_CALL WordPerfectImportFilterDialog_supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException);
throw (css::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL WordPerfectImportFilterDialog_getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
css::uno::Sequence< OUString > SAL_CALL WordPerfectImportFilterDialog_getSupportedServiceNames()
throw (css::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL WordPerfectImportFilterDialog_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
throw (::com::sun::star::uno::Exception);
css::uno::Reference< css::uno::XInterface >
SAL_CALL WordPerfectImportFilterDialog_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext)
throw (css::uno::Exception);
#endif