summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-06-18 21:29:52 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-06-19 09:57:43 +0200
commitb3bbf89aa4c441a6734997185c7d2f0602bb1614 (patch)
tree6fe1c15571b89a9a4cdf2080a5adf390aa62d80c /filter
parent525f06ca797e3a5a81864e632f26421a10f43b01 (diff)
tidy up setting parents
Change-Id: Ic0d30d066c76f2b30a5c4e6c864d80c8242c2444 Reviewed-on: https://gerrit.libreoffice.org/56067 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter')
-rw-r--r--filter/source/pdf/impdialog.cxx4
-rw-r--r--filter/source/pdf/pdfdialog.cxx2
-rw-r--r--filter/source/pdf/pdfinteract.cxx5
3 files changed, 4 insertions, 7 deletions
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index d1e587a19a2a..afc84e0c3fc2 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -792,7 +792,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, weld::ToggleButton&,
// if a password was set, inform the user that this will not be used in PDF/A case
if( mxCbPDFA1b->get_active() && pSecPage && pSecPage->hasPassword() )
{
- std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(),
+ std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(m_xContainer.get(),
VclMessageType::Warning, VclButtonsType::Ok,
PDFFilterResId(STR_WARN_PASSWORD_PDFA)));
xBox->run();
@@ -1156,7 +1156,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* pParent
IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, weld::Button&, void)
{
- SfxPasswordDialog aPwdDialog(GetFrameWeld(), &msUserPwdTitle);
+ SfxPasswordDialog aPwdDialog(m_xContainer.get(), &msUserPwdTitle);
aPwdDialog.SetMinLen(0);
aPwdDialog.ShowMinLengthText(false);
aPwdDialog.ShowExtras( SfxShowExtras::CONFIRM | SfxShowExtras::PASSWORD2 | SfxShowExtras::CONFIRM2 );
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index 00743c8afecf..b3a99a486f9e 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -103,13 +103,11 @@ Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo()
return xInfo;
}
-
::cppu::IPropertyArrayHelper& PDFDialog::getInfoHelper()
{
return *getArrayHelper();
}
-
::cppu::IPropertyArrayHelper* PDFDialog::createArrayHelper() const
{
Sequence< Property > aProps;
diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx
index a08221562141..802c7a65d83a 100644
--- a/filter/source/pdf/pdfinteract.cxx
+++ b/filter/source/pdf/pdfinteract.cxx
@@ -60,9 +60,8 @@ sal_Bool SAL_CALL PDFInteractionHandler::handleInteractionRequest( const Referen
for( sal_Int32 i = 0; i < nCodes; i++ )
aCodes.insert( static_cast<vcl::PDFWriter::ErrorCode>(aExc.ErrorCodes.getConstArray()[i]) );
- VclPtr<vcl::Window> xParent(VCLUnoHelper::GetWindow(m_xParent));
- ImplErrorDialog aDlg(xParent ? xParent->GetFrameWeld() : nullptr, aCodes);
- (void)aDlg.run();
+ ImplErrorDialog aDlg(Application::GetFrameWeld(m_xParent), aCodes);
+ aDlg.run();
bHandled = true;
}
return bHandled;