diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/dbui/mmoutputtypepage.cxx | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/mmsendmails.ui | 4 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/signatureline.ui | 8 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/sortdialog.ui | 4 |
4 files changed, 11 insertions, 7 deletions
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index c77fadac9ca5..ed7fcba2d4df 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -248,7 +248,7 @@ SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent, SwMailMergeConfigItem& m_pErrorStatus(get<FixedText>("errorstatus")), m_pContainer(get<SvSimpleTableContainer>("container")), m_pStop(get<PushButton>("stop")), - m_pClose(get<PushButton>("close")), + m_pClose(get<PushButton>("cancel")), m_sContinue(SwResId( ST_CONTINUE )), m_sStop(m_pStop->GetText()), m_sTransferStatus(m_pTransferStatus->GetText()), diff --git a/sw/uiconfig/swriter/ui/mmsendmails.ui b/sw/uiconfig/swriter/ui/mmsendmails.ui index 0c0c293559e5..fc96ba2676ae 100644 --- a/sw/uiconfig/swriter/ui/mmsendmails.ui +++ b/sw/uiconfig/swriter/ui/mmsendmails.ui @@ -37,7 +37,7 @@ </packing> </child> <child> - <object class="GtkButton" id="close"> + <object class="GtkButton" id="cancel"> <property name="label">gtk-cancel</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> @@ -269,7 +269,7 @@ </child> <action-widgets> <action-widget response="0">stop</action-widget> - <action-widget response="-7">close</action-widget> + <action-widget response="-6">cancel</action-widget> </action-widgets> </object> </interface> diff --git a/sw/uiconfig/swriter/ui/signatureline.ui b/sw/uiconfig/swriter/ui/signatureline.ui index bc6b4d26d36a..42db748fba81 100644 --- a/sw/uiconfig/swriter/ui/signatureline.ui +++ b/sw/uiconfig/swriter/ui/signatureline.ui @@ -16,7 +16,7 @@ <property name="can_focus">False</property> <property name="layout_style">end</property> <child> - <object class="GtkButton" id="btn_cancel"> + <object class="GtkButton" id="cancel"> <property name="label">gtk-cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -30,7 +30,7 @@ </packing> </child> <child> - <object class="GtkButton" id="btn_ok"> + <object class="GtkButton" id="ok"> <property name="label">gtk-ok</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -236,5 +236,9 @@ </child> </object> </child> + <action-widgets> + <action-widget response="-5">ok</action-widget> + <action-widget response="-6">cancel</action-widget> + </action-widgets> </object> </interface> diff --git a/sw/uiconfig/swriter/ui/sortdialog.ui b/sw/uiconfig/swriter/ui/sortdialog.ui index ce1403aa07f5..89dcc436c490 100644 --- a/sw/uiconfig/swriter/ui/sortdialog.ui +++ b/sw/uiconfig/swriter/ui/sortdialog.ui @@ -41,7 +41,7 @@ </packing> </child> <child> - <object class="GtkButton" id="button2"> + <object class="GtkButton" id="cancel"> <property name="label">gtk-cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -786,7 +786,7 @@ </child> <action-widgets> <action-widget response="-5">ok</action-widget> - <action-widget response="0">button2</action-widget> + <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> </object> |