filter/source/pdf/impdialog.cxx | 4 ++--
filter/source/pdf/pdfdialog.cxx | 2 --
filter/source/pdf/pdfinteract.cxx | 5 ++---
include/sfx2/passwd.hxx | 2 +-
sfx2/source/dialog/passwd.cxx | 2 +-
5 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 2e752143b59945223a6d6852890547a9f134bdab
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jun 18 21:29:52 2018 +0100
tidy up setting parents
Change-Id: Ic0d30d066c76f2b30a5c4e6c864d80c8242c2444
Reviewed-on: https://gerrit.libreoffice.org/56082
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 9080dcca72dc..a02784cb7c7c 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -830,7 +830,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();
@@ -1194,7 +1194,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const
ImpPDFTabDialog* paParen
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 f66eb343e0c5..22dacdc099ee 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -104,13 +104,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;
diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx
index 4c8b7f15868c..a09364cf6918 100644
--- a/include/sfx2/passwd.hxx
+++ b/include/sfx2/passwd.hxx
@@ -80,7 +80,7 @@ private:
void SetPasswdText();
public:
- SfxPasswordDialog(weld::Window* pParent, const OUString* pGroupText =
nullptr);
+ SfxPasswordDialog(weld::Widget* pParent, const OUString* pGroupText =
nullptr);
OUString GetUser() const
{
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 71df5e7d8d72..497deca9ccb7 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -81,7 +81,7 @@ IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl, weld::Button&, void)
// CTOR / DTOR -----------------------------------------------------------
-SfxPasswordDialog::SfxPasswordDialog(weld::Window* pParent, const OUString*
pGroupText)
+SfxPasswordDialog::SfxPasswordDialog(weld::Widget* pParent, const OUString*
pGroupText)
: GenericDialogController(pParent, "sfx/ui/password.ui", "PasswordDialog")
, m_xPassword1Box(m_xBuilder->weld_frame("password1frame"))
, m_xUserFT(m_xBuilder->weld_label("userft"))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
