diff options
Diffstat (limited to 'uui')
-rw-r--r-- | uui/source/authfallbackdlg.cxx | 15 | ||||
-rw-r--r-- | uui/source/authfallbackdlg.hxx | 12 | ||||
-rw-r--r-- | uui/source/fltdlg.cxx | 12 | ||||
-rw-r--r-- | uui/source/fltdlg.hxx | 6 | ||||
-rw-r--r-- | uui/source/logindlg.cxx | 25 | ||||
-rw-r--r-- | uui/source/logindlg.hxx | 32 | ||||
-rw-r--r-- | uui/source/masterpasscrtdlg.cxx | 13 | ||||
-rw-r--r-- | uui/source/masterpasscrtdlg.hxx | 8 | ||||
-rw-r--r-- | uui/source/masterpassworddlg.cxx | 12 | ||||
-rw-r--r-- | uui/source/masterpassworddlg.hxx | 6 | ||||
-rw-r--r-- | uui/source/nameclashdlg.cxx | 15 | ||||
-rw-r--r-- | uui/source/nameclashdlg.hxx | 12 | ||||
-rw-r--r-- | uui/source/passworddlg.cxx | 15 | ||||
-rw-r--r-- | uui/source/passworddlg.hxx | 12 | ||||
-rw-r--r-- | uui/source/secmacrowarnings.cxx | 15 | ||||
-rw-r--r-- | uui/source/secmacrowarnings.hxx | 19 | ||||
-rw-r--r-- | uui/source/unknownauthdlg.cxx | 14 | ||||
-rw-r--r-- | uui/source/unknownauthdlg.hxx | 10 |
18 files changed, 203 insertions, 50 deletions
diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx index eac0d301b300..0f568fc1d0fa 100644 --- a/uui/source/authfallbackdlg.cxx +++ b/uui/source/authfallbackdlg.cxx @@ -32,6 +32,21 @@ AuthFallbackDlg::AuthFallbackDlg(Window* pParent, const OUString& instructions, m_pEDUrl->SetText( url ); } +AuthFallbackDlg::~AuthFallbackDlg() +{ + dispose(); +} + +void AuthFallbackDlg::dispose() +{ + m_pTVInstructions.clear(); + m_pEDUrl.clear(); + m_pEDCode.clear(); + m_pBTOk.clear(); + m_pBTCancel.clear(); + ModalDialog::dispose(); +} + IMPL_LINK ( AuthFallbackDlg, OKHdl, Button *, EMPTYARG ) { EndDialog( RET_OK ); diff --git a/uui/source/authfallbackdlg.hxx b/uui/source/authfallbackdlg.hxx index d73eebf70f4f..29634d1f69b0 100644 --- a/uui/source/authfallbackdlg.hxx +++ b/uui/source/authfallbackdlg.hxx @@ -19,15 +19,17 @@ class AuthFallbackDlg : public ModalDialog { private: - VclMultiLineEdit* m_pTVInstructions; - Edit* m_pEDUrl; - Edit* m_pEDCode; - PushButton* m_pBTOk; - PushButton* m_pBTCancel; + VclPtr<VclMultiLineEdit> m_pTVInstructions; + VclPtr<Edit> m_pEDUrl; + VclPtr<Edit> m_pEDCode; + VclPtr<PushButton> m_pBTOk; + VclPtr<PushButton> m_pBTCancel; public: AuthFallbackDlg(Window* pParent, const OUString& instructions, const OUString& url); + virtual ~AuthFallbackDlg(); + virtual void dispose() SAL_OVERRIDE; OUString GetCode() const { return m_pEDCode->GetText(); } diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx index a24a34e1e35a..ca0ef809abac 100644 --- a/uui/source/fltdlg.cxx +++ b/uui/source/fltdlg.cxx @@ -57,6 +57,18 @@ FilterDialog::FilterDialog( vcl::Window* pParentWindow ) m_pFtURL->SetSizePixel(Size(aSize.Width(), m_pFtURL->GetOptimalSize().Height())); } +FilterDialog::~FilterDialog() +{ + dispose(); +} + +void FilterDialog::dispose() +{ + m_pFtURL.clear(); + m_pLbFilters.clear(); + ModalDialog::dispose(); +} + /*-************************************************************************************************************ @short set file name on dialog control @descr We convert given URL (it must be an URL!) into valid file name and show it on our dialog. diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx index 6c245445ab97..958ad99f5f54 100644 --- a/uui/source/fltdlg.hxx +++ b/uui/source/fltdlg.hxx @@ -47,6 +47,8 @@ class FilterDialog : public ModalDialog // public interface public: FilterDialog ( vcl::Window* pParentWindow ); + virtual ~FilterDialog(); + virtual void dispose() SAL_OVERRIDE; void SetURL ( const OUString& sURL ); void ChangeFilters( const FilterNameList* pFilterNames ); bool AskForFilter ( FilterNameListPtr& pSelectedItem ); @@ -58,8 +60,8 @@ class FilterDialog : public ModalDialog // member private: - FixedText *m_pFtURL ; - ListBox *m_pLbFilters ; + VclPtr<FixedText> m_pFtURL ; + VclPtr<ListBox> m_pLbFilters ; const FilterNameList* m_pFilterNames; }; // class FilterDialog diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index c28e17098a51..facfdf63d12e 100644 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -36,6 +36,31 @@ using namespace com::sun::star; +LoginDialog::~LoginDialog() +{ + dispose(); +} + +void LoginDialog::dispose() +{ + m_pErrorFT.clear(); + m_pErrorInfo.clear(); + m_pRequestInfo.clear(); + m_pPathFT.clear(); + m_pPathED.clear(); + m_pPathBtn.clear(); + m_pNameFT.clear(); + m_pNameED.clear(); + m_pPasswordFT.clear(); + m_pPasswordED.clear(); + m_pAccountFT.clear(); + m_pAccountED.clear(); + m_pSavePasswdBtn.clear(); + m_pUseSysCredsCB.clear(); + m_pOKBtn.clear(); + ModalDialog::dispose(); +} + void LoginDialog::HideControls_Impl( sal_uInt16 nFlags ) { if ( ( nFlags & LF_NO_PATH ) == LF_NO_PATH ) diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx index 0cd7eb6e2016..cc32d5e94ae9 100644 --- a/uui/source/logindlg.hxx +++ b/uui/source/logindlg.hxx @@ -43,21 +43,21 @@ class LoginDialog : public ModalDialog { - FixedText* m_pErrorFT; - FixedText* m_pErrorInfo; - FixedText* m_pRequestInfo; - FixedText* m_pPathFT; - Edit* m_pPathED; - PushButton* m_pPathBtn; - FixedText* m_pNameFT; - Edit* m_pNameED; - FixedText* m_pPasswordFT; - Edit* m_pPasswordED; - FixedText* m_pAccountFT; - Edit* m_pAccountED; - CheckBox* m_pSavePasswdBtn; - CheckBox* m_pUseSysCredsCB; - OKButton* m_pOKBtn; + VclPtr<FixedText> m_pErrorFT; + VclPtr<FixedText> m_pErrorInfo; + VclPtr<FixedText> m_pRequestInfo; + VclPtr<FixedText> m_pPathFT; + VclPtr<Edit> m_pPathED; + VclPtr<PushButton> m_pPathBtn; + VclPtr<FixedText> m_pNameFT; + VclPtr<Edit> m_pNameED; + VclPtr<FixedText> m_pPasswordFT; + VclPtr<Edit> m_pPasswordED; + VclPtr<FixedText> m_pAccountFT; + VclPtr<Edit> m_pAccountED; + VclPtr<CheckBox> m_pSavePasswdBtn; + VclPtr<CheckBox> m_pUseSysCredsCB; + VclPtr<OKButton> m_pOKBtn; void HideControls_Impl( sal_uInt16 nFlags ); void EnableUseSysCredsControls_Impl( bool bUseSysCredsEnabled ); @@ -69,6 +69,8 @@ class LoginDialog : public ModalDialog public: LoginDialog(vcl::Window* pParent, sal_uInt16 nFlags, const OUString& rServer, const OUString &rRealm); + virtual ~LoginDialog(); + virtual void dispose() SAL_OVERRIDE; OUString GetPath() const { return m_pPathED->GetText(); } void SetPath( const OUString& rNewPath ) { m_pPathED->SetText( rNewPath ); } diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx index f54078ad9435..95289017d55d 100644 --- a/uui/source/masterpasscrtdlg.cxx +++ b/uui/source/masterpasscrtdlg.cxx @@ -63,4 +63,17 @@ MasterPasswordCreateDialog::MasterPasswordCreateDialog(vcl::Window* pParent, Res m_pEDMasterPasswordCrt->SetModifyHdl( LINK( this, MasterPasswordCreateDialog, EditHdl_Impl ) ); } +MasterPasswordCreateDialog::~MasterPasswordCreateDialog() +{ + dispose(); +} + +void MasterPasswordCreateDialog::dispose() +{ + m_pEDMasterPasswordCrt.clear(); + m_pEDMasterPasswordRepeat.clear(); + m_pOKBtn.clear(); + ModalDialog::dispose(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx index 31e9eb60ab87..b8279fcec363 100644 --- a/uui/source/masterpasscrtdlg.hxx +++ b/uui/source/masterpasscrtdlg.hxx @@ -32,9 +32,9 @@ class MasterPasswordCreateDialog : public ModalDialog { private: - Edit* m_pEDMasterPasswordCrt; - Edit* m_pEDMasterPasswordRepeat; - OKButton* m_pOKBtn; + VclPtr<Edit> m_pEDMasterPasswordCrt; + VclPtr<Edit> m_pEDMasterPasswordRepeat; + VclPtr<OKButton> m_pOKBtn; DECL_LINK(OKHdl_Impl, void *); @@ -42,6 +42,8 @@ private: public: MasterPasswordCreateDialog( vcl::Window* pParent, ResMgr * pResMgr ); + virtual ~MasterPasswordCreateDialog(); + virtual void dispose() SAL_OVERRIDE; OUString GetMasterPassword() const { return m_pEDMasterPasswordCrt->GetText(); } diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx index 0b219a62b835..7a10b3044a82 100644 --- a/uui/source/masterpassworddlg.cxx +++ b/uui/source/masterpassworddlg.cxx @@ -56,4 +56,16 @@ MasterPasswordDialog::MasterPasswordDialog m_pOKBtn->SetClickHdl( LINK( this, MasterPasswordDialog, OKHdl_Impl ) ); }; +MasterPasswordDialog::~MasterPasswordDialog() +{ + dispose(); +} + +void MasterPasswordDialog::dispose() +{ + m_pEDMasterPassword.clear(); + m_pOKBtn.clear(); + ModalDialog::dispose(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx index 4b834d4fa5ed..1d37d0d93d78 100644 --- a/uui/source/masterpassworddlg.hxx +++ b/uui/source/masterpassworddlg.hxx @@ -30,13 +30,15 @@ class MasterPasswordDialog : public ModalDialog { - Edit* m_pEDMasterPassword; - OKButton* m_pOKBtn; + VclPtr<Edit> m_pEDMasterPassword; + VclPtr<OKButton> m_pOKBtn; DECL_LINK(OKHdl_Impl, void *); public: MasterPasswordDialog( vcl::Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr ); + virtual ~MasterPasswordDialog(); + virtual void dispose() SAL_OVERRIDE; OUString GetMasterPassword() const { return m_pEDMasterPassword->GetText(); } diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx index 105ba878a4fd..4329dd68660d 100644 --- a/uui/source/nameclashdlg.cxx +++ b/uui/source/nameclashdlg.cxx @@ -94,4 +94,19 @@ NameClashDialog::NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr, m_pEDNewName->SetText( rClashingName ); } +NameClashDialog::~NameClashDialog() +{ + dispose(); +} + +void NameClashDialog::dispose() +{ + m_pFTMessage.clear(); + m_pEDNewName.clear(); + m_pBtnOverwrite.clear(); + m_pBtnRename.clear(); + m_pBtnCancel.clear(); + ModalDialog::dispose(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/nameclashdlg.hxx b/uui/source/nameclashdlg.hxx index 6185e996305c..545f581dd077 100644 --- a/uui/source/nameclashdlg.hxx +++ b/uui/source/nameclashdlg.hxx @@ -31,11 +31,11 @@ enum NameClashResolveDialogResult { ABORT, RENAME, OVERWRITE }; class NameClashDialog : public ModalDialog { - FixedText *m_pFTMessage; - Edit *m_pEDNewName; - PushButton *m_pBtnOverwrite; - PushButton *m_pBtnRename; - CancelButton *m_pBtnCancel; + VclPtr<FixedText> m_pFTMessage; + VclPtr<Edit> m_pEDNewName; + VclPtr<PushButton> m_pBtnOverwrite; + VclPtr<PushButton> m_pBtnRename; + VclPtr<CancelButton> m_pBtnCancel; OUString maSameName; OUString maNewName; @@ -48,6 +48,8 @@ public: OUString const & rClashingName, OUString const & rProposedNewName, bool bAllowOverwrite ); + virtual ~NameClashDialog(); + virtual void dispose() SAL_OVERRIDE; OUString getNewName() const { return maNewName; } }; diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index 421b84681ad7..c0872bc30342 100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -82,6 +82,21 @@ PasswordDialog::PasswordDialog(vcl::Window* _pParent, m_pOKBtn->SetClickHdl( LINK( this, PasswordDialog, OKHdl_Impl ) ); } +PasswordDialog::~PasswordDialog() +{ + dispose(); +} + +void PasswordDialog::dispose() +{ + m_pFTPassword.clear(); + m_pEDPassword.clear(); + m_pFTConfirmPassword.clear(); + m_pEDConfirmPassword.clear(); + m_pOKBtn.clear(); + ModalDialog::dispose(); +} + IMPL_LINK_NOARG(PasswordDialog, OKHdl_Impl) { bool bEDPasswdValid = m_pEDPassword->GetText().getLength() >= nMinLen; diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index 3cec5ca190d3..712bcfae0ee3 100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -32,11 +32,11 @@ class PasswordDialog : public ModalDialog { - FixedText* m_pFTPassword; - Edit* m_pEDPassword; - FixedText* m_pFTConfirmPassword; - Edit* m_pEDConfirmPassword; - OKButton* m_pOKBtn; + VclPtr<FixedText> m_pFTPassword; + VclPtr<Edit> m_pEDPassword; + VclPtr<FixedText> m_pFTConfirmPassword; + VclPtr<Edit> m_pEDConfirmPassword; + VclPtr<OKButton> m_pOKBtn; sal_uInt16 nMinLen; OUString aPasswdMismatch; @@ -46,6 +46,8 @@ class PasswordDialog : public ModalDialog public: PasswordDialog( vcl::Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL, bool bOpenToModify = false, bool bIsSimplePasswordRequest = false ); + virtual ~PasswordDialog(); + virtual void dispose() SAL_OVERRIDE; void SetMinLen( sal_uInt16 nMin ) { nMinLen = nMin; } OUString GetPassword() const { return m_pEDPassword->GetText(); } diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index 935ecf66ecf4..bde5dc287e4c 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -89,6 +89,21 @@ MacroWarning::MacroWarning( vcl::Window* _pParent, bool _bWithSignatures, ResMgr MacroWarning::~MacroWarning() { + dispose(); +} + +void MacroWarning::dispose() +{ + mpSymbolImg.clear(); + mpDocNameFI.clear(); + mpDescr1FI.clear(); + mpSignsFI.clear(); + mpViewSignsBtn.clear(); + mpDescr2FI.clear(); + mpAlwaysTrustCB.clear(); + mpEnableBtn.clear(); + mpDisableBtn.clear(); + ModalDialog::dispose(); } void MacroWarning::SetDocumentURL( const OUString& rDocURL ) diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index 84daaad9ee3a..076916fc10cc 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -44,15 +44,15 @@ private: OUString maODFVersion; const css::uno::Sequence< css::security::DocumentSignatureInformation >* mpInfos; - FixedImage* mpSymbolImg; - FixedText* mpDocNameFI; - FixedText* mpDescr1FI; - FixedText* mpSignsFI; - PushButton* mpViewSignsBtn; - FixedText* mpDescr2FI; - CheckBox* mpAlwaysTrustCB; - PushButton* mpEnableBtn; - PushButton* mpDisableBtn; + VclPtr<FixedImage> mpSymbolImg; + VclPtr<FixedText> mpDocNameFI; + VclPtr<FixedText> mpDescr1FI; + VclPtr<FixedText> mpSignsFI; + VclPtr<PushButton> mpViewSignsBtn; + VclPtr<FixedText> mpDescr2FI; + VclPtr<CheckBox> mpAlwaysTrustCB; + VclPtr<PushButton> mpEnableBtn; + VclPtr<PushButton> mpDisableBtn; const bool mbSignedMode; // modus of dialog (signed / unsigned macros) const bool mbShowSignatures; @@ -68,6 +68,7 @@ private: public: MacroWarning( vcl::Window* pParent, bool _bShowSignatures, ResMgr& rResMgr ); virtual ~MacroWarning(); + virtual void dispose() SAL_OVERRIDE; void SetDocumentURL( const OUString& rDocURL ); diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index 34f706fec139..8a30bd54b44d 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -75,4 +75,18 @@ UnknownAuthDialog::UnknownAuthDialog(vcl::Window* pParent, m_pCommandButtonOK->SetClickHdl(LINK(this, UnknownAuthDialog, OKHdl_Impl)); } +UnknownAuthDialog::~UnknownAuthDialog() +{ + dispose(); +} + +void UnknownAuthDialog::dispose() +{ + m_pCommandButtonOK.clear(); + m_pView_Certificate.clear(); + m_pOptionButtonAccept.clear(); + m_pOptionButtonDontAccept.clear(); + MessageDialog::dispose(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx index 0b8d1e64ab2b..2eafe5e3b5f0 100644 --- a/uui/source/unknownauthdlg.hxx +++ b/uui/source/unknownauthdlg.hxx @@ -31,10 +31,10 @@ class UnknownAuthDialog : public MessageDialog { private: - PushButton* m_pCommandButtonOK; - PushButton* m_pView_Certificate; - RadioButton* m_pOptionButtonAccept; - RadioButton* m_pOptionButtonDontAccept; + VclPtr<PushButton> m_pCommandButtonOK; + VclPtr<PushButton> m_pView_Certificate; + VclPtr<RadioButton> m_pOptionButtonAccept; + VclPtr<RadioButton> m_pOptionButtonDontAccept; const css::uno::Reference< css::uno::XComponentContext >& m_xContext; const css::uno::Reference< css::security::XCertificate >& m_rXCert; @@ -46,6 +46,8 @@ public: UnknownAuthDialog(vcl::Window* pParent, const css::uno::Reference< css::security::XCertificate >& rXCert, const css::uno::Reference< css::uno::XComponentContext >& xContext); + virtual ~UnknownAuthDialog(); + virtual void dispose() SAL_OVERRIDE; css::uno::Reference< css::security::XCertificate > getCert() { |