sw/inc/helpid.h | 1 -
sw/source/ui/frmdlg/cption.cxx | 2 +-
sw/uiconfig/swriter/ui/insertcaption.ui | 5 +++++
3 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 8f7855b61a29e47db70be92541422594ad99d13f
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Dec 10 13:19:48 2012 +0000
some minor cleanup of caption dialog
ensure that some button in the dialog is the default button
ensure the CategoryBox is sorted like the original was
drop HID_DLG_CAPTION help id
put a big more spacing between groups
Change-Id: Id9e020a9dcad50c0d0b0ecb3bdbe7fd5434c8100
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 8c31ca4..917d9de 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -60,7 +60,6 @@
#define HID_INSERT_CHART
"SW_HID_INSERT_CHART"
#define HID_NAVIGATOR_TREELIST
"SW_HID_NAVIGATOR_TREELIST"
-#define HID_DLG_CAPTION
"SW_HID_DLG_CAPTION"
#define HID_DLG_GLOSS_DECIDE
"SW_HID_DLG_GLOSS_DECIDE"
#define HID_NAVIGATOR_TOOLBOX
"SW_HID_NAVIGATOR_TOOLBOX"
#define HID_NAVIGATOR_LISTBOX
"SW_HID_NAVIGATOR_LISTBOX"
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 84bbbe6..404b36d 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -551,7 +551,7 @@ long CategoryBox::PreNotify( NotifyEvent& rNEvt )
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCategoryBox(Window*
pParent)
{
- CategoryBox* pCategoryBox = new CategoryBox(pParent, WB_LEFT | WB_DROPDOWN
| WB_VCENTER | WB_3DLOOK);
+ CategoryBox* pCategoryBox = new CategoryBox(pParent, WB_LEFT | WB_DROPDOWN
| WB_VCENTER | WB_3DLOOK | WB_SORT);
pCategoryBox->EnableAutoSize(true);
return pCategoryBox;
}
diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui
b/sw/uiconfig/swriter/ui/insertcaption.ui
index 7a95855..9af1ea5 100644
--- a/sw/uiconfig/swriter/ui/insertcaption.ui
+++ b/sw/uiconfig/swriter/ui/insertcaption.ui
@@ -15,6 +15,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@@ -71,6 +72,8 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="numbering_label">
<property name="visible">True</property>
@@ -290,6 +293,8 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
