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/writer/MSWorksImportFilter.cxx | |
| 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/writer/MSWorksImportFilter.cxx')
| -rw-r--r-- | writerperfect/source/writer/MSWorksImportFilter.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx index 4c2c86c5e787..1b082c806a9b 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.cxx +++ b/writerperfect/source/writer/MSWorksImportFilter.cxx @@ -32,7 +32,8 @@ static bool handleEmbeddedWKSObject(const librevenge::RVNGBinaryData& data, return libwps::WPSDocument::parse(data.getDataStream(), &exporter) == libwps::WPS_OK; } -bool MSWorksImportFilter::doImportDocument(librevenge::RVNGInputStream& rInput, +bool MSWorksImportFilter::doImportDocument(weld::Window* pParent, + librevenge::RVNGInputStream& rInput, OdtGenerator& rGenerator, utl::MediaDescriptor&) { libwps::WPSKind kind = libwps::WPS_TEXT; @@ -69,14 +70,14 @@ bool MSWorksImportFilter::doImportDocument(librevenge::RVNGInputStream& rInput, break; } - const ScopedVclPtrInstance<writerperfect::WPFTEncodingDialog> pDlg(title, encoding); - if (pDlg->Execute() == RET_OK) + writerperfect::WPFTEncodingDialog aDlg(pParent, title, encoding); + if (aDlg.run() == RET_OK) { - if (!pDlg->GetEncoding().isEmpty()) - fileEncoding = pDlg->GetEncoding().toUtf8().getStr(); + if (!aDlg.GetEncoding().isEmpty()) + fileEncoding = aDlg.GetEncoding().toUtf8().getStr(); } // we can fail because we are in headless mode, the user has cancelled conversion, ... - else if (pDlg->hasUserCalledCancel()) + else if (aDlg.hasUserCalledCancel()) return false; } } |