sw/inc/dialog.hrc | 2 +- sw/inc/index.hrc | 2 +- sw/source/ui/dialog/dialog.src | 6 ++---- sw/source/ui/index/idxmrk.src | 6 ++---- sw/source/ui/index/swuiidxmrk.cxx | 3 +-- sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 7 ++++--- 6 files changed, 11 insertions(+), 15 deletions(-)
New commits: commit 82ddade71441ba98427470b8a05a56b7b572e74e Author: Caolán McNamara <caol...@redhat.com> Date: Fri Aug 22 14:18:42 2014 +0100 QueryBox RID_QB_SPELL_CONTINUE -> MessageDialog + string Change-Id: Ie08970cefccdb1339e162bb5f4d3318efc6c61a5 diff --git a/sw/inc/dialog.hrc b/sw/inc/dialog.hrc index e4a171f..769101d 100644 --- a/sw/inc/dialog.hrc +++ b/sw/inc/dialog.hrc @@ -24,7 +24,7 @@ // Dialoge ****************************************************************** -#define RID_QB_SPELL_CONTINUE (RC_DIALOG_BEGIN + 11) +#define STR_QUERY_SPELL_CONTINUE (RC_DIALOG_BEGIN + 11) #define STR_SPELLING_COMPLETED (RC_DIALOG_BEGIN + 12) // Strings ****************************************************************** diff --git a/sw/source/ui/dialog/dialog.src b/sw/source/ui/dialog/dialog.src index 19f96a0..80e0d4f 100644 --- a/sw/source/ui/dialog/dialog.src +++ b/sw/source/ui/dialog/dialog.src @@ -35,11 +35,9 @@ String STR_PATH_NOT_FOUND Text [ en-US ] = "The directory '%1' does not exist." ; }; -QueryBox RID_QB_SPELL_CONTINUE +String STR_QUERY_SPELL_CONTINUE { - BUTTONS = WB_YES_NO ; - DEFBUTTON = WB_DEF_YES ; - MESSAGE [ en-US ] = "Continue checking at beginning of document?" ; + Text [ en-US ] = "Continue checking at beginning of document?" ; }; String STR_SPELLING_COMPLETED { diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index 90a5632..ddf8ac5 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -18,7 +18,7 @@ */ #include <SwSpellDialogChildWindow.hxx> -#include <vcl/msgbox.hxx> +#include <vcl/layout.hxx> #include <editeng/svxacorr.hxx> #include <editeng/acorrcfg.hxx> #include <svx/svxids.hrc> @@ -391,7 +391,8 @@ The code below would only be part of the solution. if(m_pSpellState->m_xStartRange.is()) { LockFocusNotification( true ); - sal_uInt16 nRet = QueryBox( GetWindow(), SW_RES(RID_QB_SPELL_CONTINUE)).Execute(); + sal_uInt16 nRet = MessageDialog(GetWindow(), SW_RES(STR_QUERY_SPELL_CONTINUE), + VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO).Execute(); if(RET_YES == nRet) { SwUnoInternalPaM aPam(*pWrtShell->GetDoc()); @@ -420,7 +421,7 @@ The code below would only be part of the solution. OUString sInfo(SW_RES(STR_SPELLING_COMPLETED)); // #i84610# Window* pTemp = GetWindow(); // temporary needed for g++ 3.3.5 - InfoBox(pTemp, sInfo ).Execute(); + MessageDialog(pTemp, sInfo, VCL_MESSAGE_INFO).Execute(); LockFocusNotification( false ); // take care that the now valid selection is stored LoseFocus(); commit 302cb1d031af68aa13820eae2265f46199433ab9 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Aug 22 12:46:55 2014 +0100 QueryBox DLG_CHANGE_AUTH_ENTRY -> MessageDialog + string Change-Id: I836381f710e4f36b977284f6996bb135fc328049 diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc index 192e3c1..aa4b984 100644 --- a/sw/inc/index.hrc +++ b/sw/inc/index.hrc @@ -39,7 +39,7 @@ #define STR_AUTOMARK_TYPE (RC_INDEX_BEGIN + 17) #define STR_FILE_NOT_FOUND (RC_INDEX_BEGIN + 18) -#define DLG_CHANGE_AUTH_ENTRY (RC_INDEX_BEGIN + 19) +#define STR_QUERY_CHANGE_AUTH_ENTRY (RC_INDEX_BEGIN + 19) #define STR_USER_DEFINED_INDEX (RC_INDEX_BEGIN + 20) #define STR_NOSORTKEY (RC_INDEX_BEGIN + 21) #define STR_NO_CHAR_STYLE (RC_INDEX_BEGIN + 22) diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src index 072fa46..0519dbe 100644 --- a/sw/source/ui/index/idxmrk.src +++ b/sw/source/ui/index/idxmrk.src @@ -32,11 +32,9 @@ String STR_IDXMRK_INSERT Text [ en-US ] = "Insert Index Entry" ; }; -QueryBox DLG_CHANGE_AUTH_ENTRY +String STR_QUERY_CHANGE_AUTH_ENTRY { - BUTTONS = WB_YES_NO ; - DEFBUTTON = WB_DEF_NO ; - Message [ en-US ] = "The document already contains the bibliography entry but with different data. Do you want to adjust the existing entries?"; + Text [ en-US ] = "The document already contains the bibliography entry but with different data. Do you want to adjust the existing entries?"; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 7d30239..eed951a 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/util/SearchFlags.hpp> #include <svl/stritem.hxx> #include <vcl/layout.hxx> -#include <vcl/msgbox.hxx> #include <sfx2/dispatch.hxx> #include <svl/eitem.hxx> #include <unotools/textsearch.hxx> @@ -1205,7 +1204,7 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl) bDifferent |= m_sFields[i] != pEntry->GetAuthorField((ToxAuthorityField)i); if(bDifferent) { - QueryBox aQuery(&m_rDialog, SW_RES(DLG_CHANGE_AUTH_ENTRY)); + MessageDialog aQuery(&m_rDialog, SW_RES(STR_QUERY_CHANGE_AUTH_ENTRY), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); if(RET_YES != aQuery.Execute()) return 0; }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits