cui/source/factory/dlgfact.cxx | 18 +++--------------- cui/source/factory/dlgfact.hxx | 3 +-- cui/source/inc/helpid.hrc | 1 - cui/source/options/optlingu.cxx | 2 +- cui/uiconfig/ui/optnewdictionarydialog.ui | 13 ++++++++----- include/sfx2/sfx.hrc | 1 - include/svx/svxdlg.hxx | 3 +-- 7 files changed, 14 insertions(+), 27 deletions(-)
New commits: commit 1766de5a5e0c831127e735b60e46e32b984c524f Author: Caolán McNamara <[email protected]> Date: Mon Jul 15 15:26:38 2013 +0100 can drop RID_SFXDLG_NEWDICT Change-Id: I15d1669a870f991ae4c8428838b22c33a2c021f0 diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 1bc9399..94a7a16 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1420,22 +1420,10 @@ AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordN } AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( Window* pParent, - ::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl, - sal_uInt32 nResId ) + ::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) { - SvxNewDictionaryDialog* pDlg=NULL; - switch ( nResId ) - { - case RID_SFXDLG_NEWDICT : - pDlg = new SvxNewDictionaryDialog( pParent, xSpl ); - break; - default: - break; - } - - if ( pDlg ) - return new AbstractSvxNewDictionaryDialog_Impl( pDlg ); - return 0; + SvxNewDictionaryDialog* pDlg = new SvxNewDictionaryDialog( pParent, xSpl ); + return new AbstractSvxNewDictionaryDialog_Impl( pDlg ); } VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( Window* pParent, diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 34c4913..4c36e81 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -692,8 +692,7 @@ public: sal_Int32 nInitialFlags); virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ); virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl, - sal_uInt32 nResId ); //add for SvxNewDictionaryDialog + ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ); virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( Window* pParent, const String& rName, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index b0d050d..0c30fea 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1651,7 +1651,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - AbstractSvxNewDictionaryDialog* aDlg = pFact->CreateSvxNewDictionaryDialog( this, xSpellChecker1, RID_SFXDLG_NEWDICT ); + AbstractSvxNewDictionaryDialog* aDlg = pFact->CreateSvxNewDictionaryDialog( this, xSpellChecker1 ); DBG_ASSERT(aDlg, "Dialogdiet fail!"); uno::Reference< XDictionary > xNewDic; if ( aDlg->Execute() == RET_OK ) diff --git a/cui/uiconfig/ui/optnewdictionarydialog.ui b/cui/uiconfig/ui/optnewdictionarydialog.ui index 643465d..9158de3a 100644 --- a/cui/uiconfig/ui/optnewdictionarydialog.ui +++ b/cui/uiconfig/ui/optnewdictionarydialog.ui @@ -23,7 +23,8 @@ <property name="label">gtk-ok</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="has_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> <property name="receives_default">True</property> <property name="use_stock">True</property> </object> diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index 7d1fc0a..4044de2 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -222,7 +222,6 @@ #define RID_SFXPAGE_SAVE (RID_OPTIONS_START + 0) #define RID_SFXPAGE_GENERAL (RID_OPTIONS_START + 1) -#define RID_SFXDLG_NEWDICT (RID_OPTIONS_START + 3) #define RID_SFXDLG_EDITDICT (RID_OPTIONS_START + 4) #define RID_SFXQB_DELDICT (RID_OPTIONS_START + 5) #define RID_SFXPAGE_PATH (RID_OPTIONS_START + 6) diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index fd8ced0..a1b8f2d 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -397,8 +397,7 @@ public: sal_Int32 nInitialFlags )=0; virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) = 0; virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl, - sal_uInt32 nResId ) = 0; //add for SvxNewDictionaryDialog + ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) = 0; virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( Window* pParent, const String& rName, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, commit c3a83920dc784ea79a16ed13343394df4c031ca6 Author: Caolán McNamara <[email protected]> Date: Mon Jul 15 15:10:47 2013 +0100 drop unused helpids Change-Id: Ie8b8a929c08ed418619866b1ea28d516ab8a0a87 diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 280b746..2e22e73 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -25,7 +25,6 @@ // Help-Ids -------------------------------------------------------------- #define HID_OPTIONS_LINGU "CUI_HID_OPTIONS_LINGU" -#define HID_OPTIONS_DICT_NEW "CUI_HID_OPTIONS_DICT_NEW" #define HID_OPTIONS_DICT_EDIT "CUI_HID_OPTIONS_DICT_EDIT" #define HID_OPTIONS_ASIAN_LAYOUT "CUI_HID_OPTIONS_ASIAN_LAYOUT" #define HID_CLB_EDIT_MODULES_DICS "CUI_HID_CLB_EDIT_MODULES_DICS" diff --git a/cui/uiconfig/ui/optnewdictionarydialog.ui b/cui/uiconfig/ui/optnewdictionarydialog.ui index 7649acf..643465d 100644 --- a/cui/uiconfig/ui/optnewdictionarydialog.ui +++ b/cui/uiconfig/ui/optnewdictionarydialog.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <!-- interface-requires gtk+ 3.0 --> + <!-- interface-requires LibreOffice 1.0 --> <object class="GtkDialog" id="OptNewDictionaryDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -90,7 +91,9 @@ <object class="GtkEntry" id="nameedit"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="max_length">32</property> <property name="invisible_char">â</property> + <property name="width_chars">32</property> <property name="invisible_char_set">True</property> </object> <packing> @@ -102,9 +105,9 @@ </child> <child> <object class="svxcorelo-SvxLanguageBox" id="language"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> @@ -150,7 +153,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="hexpand">True</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
