diff options
author | Akshay Deep <akshaydeepiitr@gmail.com> | 2016-03-29 03:41:05 +0530 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-04-04 09:07:44 +0000 |
commit | e099c5bdaa458105148059228ec11c98b9d13029 (patch) | |
tree | 2aecedc6780a6f95552095bca50ab64c98967139 /cui/source/options | |
parent | d69c03a3520205db549b2c84e7825967c8ea3ac5 (diff) |
Make InputDialog class global to reuse it's code and tdf#97425
tdf#97425 -> Use InputDialog to edit Java Class Parameter
Change-Id: I41ac9ffbc660c4bbb9d4fd3335e95d64ccdd2842
Reviewed-on: https://gerrit.libreoffice.org/23580
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'cui/source/options')
-rw-r--r-- | cui/source/options/optjava.cxx | 85 | ||||
-rw-r--r-- | cui/source/options/optjava.hxx | 21 | ||||
-rw-r--r-- | cui/source/options/optjava.src | 5 |
3 files changed, 18 insertions, 93 deletions
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 6ab367aad345..b954b3077708 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -38,6 +38,7 @@ #include "svtools/restartdialog.hxx" #include "svtools/treelistentry.hxx" #include <sfx2/filedlghelper.hxx> +#include <sfx2/inputdlg.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -888,45 +889,25 @@ void SvxJavaParameterDlg::EditParameter() { sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos(); m_pParameterEdit->SetText( OUString() ); - OUString editedClassPath; if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { - if ( !m_pParamEditDlg ) - { - m_pParamEditDlg = VclPtr<SvxJavaParameterEditDlg>::Create( this ); - editedClassPath = m_pAssignedList->GetSelectEntry(); - m_pParamEditDlg->SetParameter( editedClassPath ); - } - else{ - editedClassPath = m_pAssignedList->GetSelectEntry(); - m_pParamEditDlg->SetParameter( editedClassPath ); - } - } - else - { - if(m_pParamEditDlg) - { - editedClassPath = m_pParamEditDlg->GetParameter(); - } - } + ScopedVclPtrInstance< InputDialog > m_pParamEditDlg( CUI_RES( RID_SVXSTR_JAVA_START_PARAM ).toString(), this); + OUString editableClassPath = m_pAssignedList->GetSelectEntry(); + m_pParamEditDlg->SetEntryText( editableClassPath ); + m_pParamEditDlg->HideHelpBtn(); - if ( m_pParamEditDlg->Execute() == RET_OK ) - { - if (!( editedClassPath == m_pParamEditDlg->GetParameter() ) ) + if(!m_pParamEditDlg->Execute()) + return; + OUString editedClassPath = comphelper::string::strip( m_pParamEditDlg->GetEntryText(), ' '); + + if ( !editedClassPath.isEmpty() && editableClassPath != editedClassPath ) { - editedClassPath = m_pParamEditDlg->GetParameter(); - if( !editedClassPath.isEmpty() ){ - m_pAssignedList->RemoveEntry( nPos ); - m_pAssignedList->InsertEntry( editedClassPath, nPos ); - m_pAssignedList->SelectEntryPos( nPos ); - } + m_pAssignedList->RemoveEntry( nPos ); + m_pAssignedList->InsertEntry( editedClassPath, nPos ); + m_pAssignedList->SelectEntryPos( nPos ); } } - else - { - m_pParamEditDlg->SetParameter( editedClassPath ); - } } short SvxJavaParameterDlg::Execute() @@ -969,46 +950,6 @@ void SvxJavaParameterDlg::SetParameters( Sequence< OUString >& rParams ) DisableRemoveButton(); } -// class SvxJavaParameterEditDlg --------------------------------------------- - -SvxJavaParameterEditDlg::SvxJavaParameterEditDlg( vcl::Window* pParent ) : - - ModalDialog( pParent, "JavaStartParametersEdit", - "cui/ui/javastartparameterseditdialog.ui" ) -{ - get( m_pParameterEditField, "parametereditfield"); -} - -SvxJavaParameterEditDlg::~SvxJavaParameterEditDlg() -{ - disposeOnce(); -} - -void SvxJavaParameterEditDlg::dispose() -{ - m_pParameterEditField.clear(); - ModalDialog::dispose(); -} - - -short SvxJavaParameterEditDlg::Execute() -{ - m_pParameterEditField->GrabFocus(); - return ModalDialog::Execute(); -} - -OUString SvxJavaParameterEditDlg::GetParameter() const -{ - OUString sParamEdit = comphelper::string::strip(m_pParameterEditField->GetText(), ' '); - return sParamEdit; -} - - -void SvxJavaParameterEditDlg::SetParameter( OUString const & strParams ) -{ - m_pParameterEditField->SetText( strParams ); - m_pParameterEditField->SetCursorAtLast(); -} // class SvxJavaClassPathDlg --------------------------------------------- diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index ca5ac45688d1..85905df10641 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -43,7 +43,6 @@ typedef void* JavaInfo; #endif class SvxJavaParameterDlg; -class SvxJavaParameterEditDlg; class SvxJavaClassPathDlg; class SvxJavaListBox; @@ -130,8 +129,6 @@ private: VclPtr<PushButton> m_pEditBtn; - VclPtr<SvxJavaParameterEditDlg> m_pParamEditDlg; - DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void); DECL_LINK_TYPED(AssignHdl_Impl, Button*, void); DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void); @@ -177,24 +174,6 @@ public: void EditParameter(); }; -// class SvxJavaParameterEditDlg --------------------------------------------- - -class SvxJavaParameterEditDlg : public ModalDialog -{ -private: - VclPtr<Edit> m_pParameterEditField; - -public: - explicit SvxJavaParameterEditDlg( vcl::Window* pParent ); - virtual ~SvxJavaParameterEditDlg(); - virtual void dispose() override; - - virtual short Execute() override; - - OUString GetParameter() const; - void SetParameter( OUString const & rParams ); -}; - // class SvxJavaClassPathDlg --------------------------------------------- class SvxJavaClassPathDlg : public ModalDialog diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src index 807cedc94423..f4e931a9fbd8 100644 --- a/cui/source/options/optjava.src +++ b/cui/source/options/optjava.src @@ -35,4 +35,9 @@ String RID_SVXSTR_OPTIONS_RESTART Text [ en-US ] = "Please restart %PRODUCTNAME now so the new or modified values can take effect." ; }; +String RID_SVXSTR_JAVA_START_PARAM +{ + Text [ en-US ] = "Edit Parameter" ; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |