Kaydet (Commit) b3bbf89a authored tarafından Caolán McNamara's avatar Caolán McNamara

tidy up setting parents

Change-Id: Ic0d30d066c76f2b30a5c4e6c864d80c8242c2444
Reviewed-on: https://gerrit.libreoffice.org/56067
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 525f06ca
...@@ -792,7 +792,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, weld::ToggleButton&, ...@@ -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 a password was set, inform the user that this will not be used in PDF/A case
if( mxCbPDFA1b->get_active() && pSecPage && pSecPage->hasPassword() ) 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, VclMessageType::Warning, VclButtonsType::Ok,
PDFFilterResId(STR_WARN_PASSWORD_PDFA))); PDFFilterResId(STR_WARN_PASSWORD_PDFA)));
xBox->run(); xBox->run();
...@@ -1156,7 +1156,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* pParent ...@@ -1156,7 +1156,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* pParent
IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, weld::Button&, void) IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, weld::Button&, void)
{ {
SfxPasswordDialog aPwdDialog(GetFrameWeld(), &msUserPwdTitle); SfxPasswordDialog aPwdDialog(m_xContainer.get(), &msUserPwdTitle);
aPwdDialog.SetMinLen(0); aPwdDialog.SetMinLen(0);
aPwdDialog.ShowMinLengthText(false); aPwdDialog.ShowMinLengthText(false);
aPwdDialog.ShowExtras( SfxShowExtras::CONFIRM | SfxShowExtras::PASSWORD2 | SfxShowExtras::CONFIRM2 ); aPwdDialog.ShowExtras( SfxShowExtras::CONFIRM | SfxShowExtras::PASSWORD2 | SfxShowExtras::CONFIRM2 );
......
...@@ -103,13 +103,11 @@ Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo() ...@@ -103,13 +103,11 @@ Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo()
return xInfo; return xInfo;
} }
::cppu::IPropertyArrayHelper& PDFDialog::getInfoHelper() ::cppu::IPropertyArrayHelper& PDFDialog::getInfoHelper()
{ {
return *getArrayHelper(); return *getArrayHelper();
} }
::cppu::IPropertyArrayHelper* PDFDialog::createArrayHelper() const ::cppu::IPropertyArrayHelper* PDFDialog::createArrayHelper() const
{ {
Sequence< Property > aProps; Sequence< Property > aProps;
......
...@@ -60,9 +60,8 @@ sal_Bool SAL_CALL PDFInteractionHandler::handleInteractionRequest( const Referen ...@@ -60,9 +60,8 @@ sal_Bool SAL_CALL PDFInteractionHandler::handleInteractionRequest( const Referen
for( sal_Int32 i = 0; i < nCodes; i++ ) for( sal_Int32 i = 0; i < nCodes; i++ )
aCodes.insert( static_cast<vcl::PDFWriter::ErrorCode>(aExc.ErrorCodes.getConstArray()[i]) ); aCodes.insert( static_cast<vcl::PDFWriter::ErrorCode>(aExc.ErrorCodes.getConstArray()[i]) );
VclPtr<vcl::Window> xParent(VCLUnoHelper::GetWindow(m_xParent)); ImplErrorDialog aDlg(Application::GetFrameWeld(m_xParent), aCodes);
ImplErrorDialog aDlg(xParent ? xParent->GetFrameWeld() : nullptr, aCodes); aDlg.run();
(void)aDlg.run();
bHandled = true; bHandled = true;
} }
return bHandled; return bHandled;
......
...@@ -80,7 +80,7 @@ private: ...@@ -80,7 +80,7 @@ private:
void SetPasswdText(); void SetPasswdText();
public: public:
SfxPasswordDialog(weld::Window* pParent, const OUString* pGroupText = nullptr); SfxPasswordDialog(weld::Widget* pParent, const OUString* pGroupText = nullptr);
OUString GetUser() const OUString GetUser() const
{ {
......
...@@ -81,7 +81,7 @@ IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl, weld::Button&, void) ...@@ -81,7 +81,7 @@ IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl, weld::Button&, void)
// CTOR / DTOR ----------------------------------------------------------- // 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") : GenericDialogController(pParent, "sfx/ui/password.ui", "PasswordDialog")
, m_xPassword1Box(m_xBuilder->weld_frame("password1frame")) , m_xPassword1Box(m_xBuilder->weld_frame("password1frame"))
, m_xUserFT(m_xBuilder->weld_label("userft")) , m_xUserFT(m_xBuilder->weld_label("userft"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment