diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-14 14:06:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-15 13:05:35 +0200 |
| commit | 5f170e69728b8741ce3c0af1d140023577cc470b (patch) | |
| tree | 5bdde1373c80fa784bbaeef9ed3a4e952197741a /writerperfect/source/impress | |
| parent | d15c240434d61422e718a08db7d184d86f2b5f15 (diff) | |
weld WPFTEncodingDialog
and pass in parent window for dialog
Change-Id: Ibe9f576a74dfbbee3e568c8d3454440700cb0405
Reviewed-on: https://gerrit.libreoffice.org/54328
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerperfect/source/impress')
6 files changed, 11 insertions, 9 deletions
diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx index c535786ff91f..3083790e4f9c 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.cxx +++ b/writerperfect/source/impress/KeynoteImportFilter.cxx @@ -48,7 +48,7 @@ using writerperfect::WPXSvInputStream; namespace beans = com::sun::star::beans; namespace ucb = com::sun::star::ucb; -bool KeynoteImportFilter::doImportDocument(librevenge::RVNGInputStream& rInput, +bool KeynoteImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputStream& rInput, OdpGenerator& rGenerator, utl::MediaDescriptor&) { return libetonyek::EtonyekDocument::parse(&rInput, &rGenerator); diff --git a/writerperfect/source/impress/KeynoteImportFilter.hxx b/writerperfect/source/impress/KeynoteImportFilter.hxx index dc62b44f1d61..cae19663a7c7 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.hxx +++ b/writerperfect/source/impress/KeynoteImportFilter.hxx @@ -36,8 +36,8 @@ public: private: virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, OUString& rTypeName) override; - virtual bool doImportDocument(librevenge::RVNGInputStream& rInput, OdpGenerator& rGenerator, - utl::MediaDescriptor&) override; + virtual bool doImportDocument(weld::Window* pParent, librevenge::RVNGInputStream& rInput, + OdpGenerator& rGenerator, utl::MediaDescriptor&) override; }; #endif diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx index cd35fb6f275c..46c3ec7f3545 100644 --- a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx +++ b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx @@ -40,7 +40,8 @@ static bool handleEmbeddedMWAWSpreadsheetObject(const librevenge::RVNGBinaryData return MWAWDocument::decodeSpreadsheet(data, &exporter); } -bool MWAWPresentationImportFilter::doImportDocument(librevenge::RVNGInputStream& rInput, +bool MWAWPresentationImportFilter::doImportDocument(weld::Window*, + librevenge::RVNGInputStream& rInput, OdpGenerator& rGenerator, utl::MediaDescriptor&) { return MWAWDocument::MWAW_R_OK == MWAWDocument::parse(&rInput, &rGenerator); diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.hxx b/writerperfect/source/impress/MWAWPresentationImportFilter.hxx index 2d004282f7f1..0967eeec7b9e 100644 --- a/writerperfect/source/impress/MWAWPresentationImportFilter.hxx +++ b/writerperfect/source/impress/MWAWPresentationImportFilter.hxx @@ -36,8 +36,8 @@ public: private: virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, OUString& rTypeName) override; - virtual bool doImportDocument(librevenge::RVNGInputStream& rInput, OdpGenerator& rGenerator, - utl::MediaDescriptor&) override; + virtual bool doImportDocument(weld::Window* pParent, librevenge::RVNGInputStream& rInput, + OdpGenerator& rGenerator, utl::MediaDescriptor&) override; virtual void doRegisterHandlers(OdpGenerator& rGenerator) override; }; diff --git a/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx b/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx index 34ed2a72ffd3..1a6c5255aea6 100644 --- a/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx +++ b/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx @@ -38,7 +38,8 @@ static bool handleEmbeddedSTOFFSpreadsheetObject(const librevenge::RVNGBinaryDat return STOFFDocument::decodeSpreadsheet(data, &exporter); } -bool StarOfficePresentationImportFilter::doImportDocument(librevenge::RVNGInputStream& rInput, +bool StarOfficePresentationImportFilter::doImportDocument(weld::Window*, + librevenge::RVNGInputStream& rInput, OdpGenerator& rGenerator, utl::MediaDescriptor&) { diff --git a/writerperfect/source/impress/StarOfficePresentationImportFilter.hxx b/writerperfect/source/impress/StarOfficePresentationImportFilter.hxx index 4df403bae184..f8179455710f 100644 --- a/writerperfect/source/impress/StarOfficePresentationImportFilter.hxx +++ b/writerperfect/source/impress/StarOfficePresentationImportFilter.hxx @@ -36,8 +36,8 @@ public: private: virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, OUString& rTypeName) override; - virtual bool doImportDocument(librevenge::RVNGInputStream& rInput, OdpGenerator& rGenerator, - utl::MediaDescriptor&) override; + virtual bool doImportDocument(weld::Window* pParent, librevenge::RVNGInputStream& rInput, + OdpGenerator& rGenerator, utl::MediaDescriptor&) override; virtual void doRegisterHandlers(OdpGenerator& rGenerator) override; }; |