diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 20:38:45 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 20:38:45 +0200 |
| commit | ff2f7926a5f818981e77869bf41a45e4fa56f521 (patch) | |
| tree | 3bbccec1edbe9d8c90603e2f0eff921ff29b27a2 /writerfilter/source/filter | |
| parent | 68ef83dbd75b7f25466e007140aedb9ed3694e50 (diff) | |
gnumake4: switching gbuildization
* mostly switching to gnumake4/writerfilter10 gbuild implementation (thanks mst, hb)
Diffstat (limited to 'writerfilter/source/filter')
| -rw-r--r-- | writerfilter/source/filter/ImportFilter.cxx | 3 | ||||
| -rw-r--r-- | writerfilter/source/filter/RtfFilter.hxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/filter/WriterFilter.hxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/filter/WriterFilterDetection.hxx | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx index f94d65590f48..2950f9f521a8 100644 --- a/writerfilter/source/filter/ImportFilter.cxx +++ b/writerfilter/source/filter/ImportFilter.cxx @@ -79,9 +79,8 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes ::oox::core::FilterDetect aDetector( m_xContext ); xInputStream = aDetector.extractUnencryptedPackage( aMediaDesc ); } - catch( uno::Exception& e) + catch( uno::Exception& ) { - (void) e; } if ( !xInputStream.is() ) diff --git a/writerfilter/source/filter/RtfFilter.hxx b/writerfilter/source/filter/RtfFilter.hxx index 03488db64ff1..aada3c609f72 100644 --- a/writerfilter/source/filter/RtfFilter.hxx +++ b/writerfilter/source/filter/RtfFilter.hxx @@ -39,7 +39,7 @@ #include <WriterFilterDllApi.hxx> /// Common RTF filter, calls RtfImportFilter and RtfExportFilter via UNO. -class WRITERFILTER_WRITERFILTER_DLLPUBLIC RtfFilter : public cppu::WeakImplHelper5 +class WRITERFILTER_DLLPUBLIC RtfFilter : public cppu::WeakImplHelper5 < com::sun::star::document::XFilter, com::sun::star::document::XImporter, diff --git a/writerfilter/source/filter/WriterFilter.hxx b/writerfilter/source/filter/WriterFilter.hxx index a2b2fb7a4b5b..b883ca1e91d7 100644 --- a/writerfilter/source/filter/WriterFilter.hxx +++ b/writerfilter/source/filter/WriterFilter.hxx @@ -39,7 +39,7 @@ #include <WriterFilterDllApi.hxx> /// Common DOC/DOCX filter, calls DocxExportFilter via UNO or does the DOC (currently unused) / DOCX import. -class WRITERFILTER_WRITERFILTER_DLLPUBLIC WriterFilter : public cppu::WeakImplHelper5 +class WRITERFILTER_DLLPUBLIC WriterFilter : public cppu::WeakImplHelper5 < com::sun::star::document::XFilter, com::sun::star::document::XImporter, diff --git a/writerfilter/source/filter/WriterFilterDetection.hxx b/writerfilter/source/filter/WriterFilterDetection.hxx index f7caa549d6d8..f84252e05d1a 100644 --- a/writerfilter/source/filter/WriterFilterDetection.hxx +++ b/writerfilter/source/filter/WriterFilterDetection.hxx @@ -35,7 +35,7 @@ #include <WriterFilterDllApi.hxx> /// File format detection service for DOC (unused) / DOCX. -class WRITERFILTER_WRITERFILTER_DLLPUBLIC WriterFilterDetection : public cppu::WeakImplHelper2 +class WRITERFILTER_DLLPUBLIC WriterFilterDetection : public cppu::WeakImplHelper2 < com::sun::star::document::XExtendedFilterDetection, com::sun::star::lang::XServiceInfo |