QueryBox MSG_QUERY_OPENASTEMPLATE -> MessageDialog + string

Change-Id: I031a145ca62e3bf7e74b9d447ff8bb041974daa6

16 files changed, 52 insertions, 71 deletions

diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index f1ec60ec4a8a..a4aaf0e7bdf6 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -100,9 +100,9 @@
 
 #define RID_DESKTOP                             (RID_SFX_APP_START + 184)
 
-#define RID_XMLSEC_QUERY_LOSINGSIGNATURE        (RID_SFX_APP_START + 186)
-#define RID_XMLSEC_QUERY_SAVEBEFORESIGN         (RID_SFX_APP_START + 187)
-#define RID_QUERY_CANCELCHECKOUT                (RID_SFX_APP_START + 188)
+#define RID_SVXSTR_XMLSEC_QUERY_LOSINGSIGNATURE (RID_SFX_APP_START + 186)
+#define RID_SVXSTR_XMLSEC_QUERY_SAVEBEFORESIGN  (RID_SFX_APP_START + 187)
+#define STR_QUERY_CANCELCHECKOUT                (RID_SFX_APP_START + 188)
 
 #define STR_INFO_WRONGDOCFORMAT                 (RID_SFX_APP_START + 190)
 
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 66f22b6310e0..a18b076c4d39 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -53,11 +53,9 @@ String STR_GB
 {
     Text [ en-US ] = "GB" ;
 };
-QueryBox MSG_QUERY_LASTVERSION
+String STR_QUERY_LASTVERSION
 {
-    Buttons = WB_YES_NO ;
-    DefButton = WB_DEF_NO ;
-    Message [ en-US ] = "Cancel all changes?" ;
+    Text [ en-US ] = "Cancel all changes?" ;
 };
 
 String STR_NO_WEBBROWSER_FOUND
@@ -345,25 +343,19 @@ String RID_DESKTOP
     Text = "%PRODUCTNAME" ;
 };
 
-QueryBox RID_XMLSEC_QUERY_LOSINGSIGNATURE
+String RID_SVXSTR_XMLSEC_QUERY_LOSINGSIGNATURE
 {
-    Buttons = WB_YES_NO ;
-    DefButton = WB_DEF_NO ;
-    Message [ en-US ] = "Saving will remove all existing signatures.\nDo you want to continue saving the document?" ;
+    Text [ en-US ] = "Saving will remove all existing signatures.\nDo you want to continue saving the document?" ;
 };
 
-QueryBox RID_XMLSEC_QUERY_SAVEBEFORESIGN
+String RID_SVXSTR_XMLSEC_QUERY_SAVEBEFORESIGN
 {
-    Buttons = WB_YES_NO ;
-    DefButton = WB_DEF_YES ;
-    Message [ en-US ] = "The document has to be saved before it can be signed.\nDo you want to save the document?" ;
+    Text [ en-US ] = "The document has to be saved before it can be signed.\nDo you want to save the document?" ;
 };
 
-QueryBox RID_QUERY_CANCELCHECKOUT
+String STR_QUERY_CANCELCHECKOUT
 {
-    Buttons = WB_YES_NO ;
-    DefButton = WB_DEF_YES ;
-    Message [ en-US ] = "This will discard all changes on the server since check-out.\nDo you want to proceed?" ;
+    Text [ en-US ] = "This will discard all changes on the server since check-out.\nDo you want to proceed?" ;
 };
 
 String STR_INFO_WRONGDOCFORMAT
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index 1cf86cdb54c0..74eaba91b313 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -34,7 +34,7 @@
 
 #define RID_DLG_ALIEN_WARNING           ( RC_DIALOG_BEGIN + 0)
 #define STR_RESET                       ( RC_DIALOG_BEGIN + 0)
-#define MSG_OVERWRITE                   ( RC_DIALOG_BEGIN + 1)
+#define STR_QUERY_OVERWRITE             ( RC_DIALOG_BEGIN + 1)
 #define STR_TABPAGE_INVALIDNAME         ( RC_DIALOG_BEGIN + 13)
 #define STR_TABPAGE_INVALIDSTYLE        ( RC_DIALOG_BEGIN + 14)
 #define STR_POOL_STYLE_NAME             ( RC_DIALOG_BEGIN + 16)
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 7ba8c7e2cbcf..d92fa6b6d62f 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <tools/urlobj.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
 #include <svl/eitem.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/localedatawrapper.hxx>
@@ -1601,7 +1601,7 @@ void CustomPropertiesWindow::ValidateLine( CustomPropertyLine* pLine, bool bIsFr
         if ( bIsFromTypeBox ) // LoseFocus of TypeBox
             pLine->m_bTypeLostFocus = true;
         Window* pParent = GetParent()->GetParent();
-        if ( QueryBox( pParent, SfxResId( SFX_QB_WRONG_TYPE ) ).Execute() == RET_OK )
+        if (MessageDialog(pParent, SfxResId(STR_SFX_QUERY_WRONG_TYPE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_OK_CANCEL).Execute() == RET_OK)
             pLine->m_aTypeBox.SelectEntryPos( m_aTypeBox.GetEntryPos( (void*)CUSTOM_TYPE_TEXT ) );
         else
             pLine->m_aValueEdit.GrabFocus();
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index 8f6ad2e9ac00..ac379b194dc5 100644
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -172,11 +172,9 @@ Image SFX_IMG_PROPERTY_REMOVE
     MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
 };
 
-QueryBox SFX_QB_WRONG_TYPE
+String STR_SFX_QUERY_WRONG_TYPE
 {
-    Buttons = WB_OK_CANCEL ;
-    DefButton = WB_DEF_OK ;
-    Message [ en-US ] = "The value entered does not match the specified type.\nThe value will be stored as text." ;
+    Text [ en-US ] = "The value entered does not match the specified type.\nThe value will be stored as text." ;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index b2927b692375..56ae0e9c1aca 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -50,8 +50,6 @@ IMPL_LINK( SfxNewStyleDlg, OKHdl, Control *, pControl )
     return 0;
 }
 
-
-
 IMPL_LINK_INLINE_START( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox )
 {
     m_pOKBtn->Enable( !comphelper::string::remove(pBox->GetText(), ' ').isEmpty() );
@@ -59,16 +57,11 @@ IMPL_LINK_INLINE_START( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox )
 }
 IMPL_LINK_INLINE_END( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox )
 
-// CTOR / DTOR -----------------------------------------------------------
-
-SfxNewStyleDlg::SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& rInPool ) :
-
-    ModalDialog( pParent, "CreateStyleDialog", "sfx/ui/newstyle.ui" ),
-
-    aQueryOverwriteBox  ( this, SfxResId( MSG_OVERWRITE ) ),
-
-    rPool( rInPool )
-
+SfxNewStyleDlg::SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& rInPool )
+    : ModalDialog(pParent, "CreateStyleDialog", "sfx/ui/newstyle.ui")
+    , aQueryOverwriteBox(this, SfxResId(STR_QUERY_OVERWRITE),
+                         VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO)
+    , rPool(rInPool)
 {
     get(m_pColBox, "stylename");
     m_pColBox->set_width_request(m_pColBox->approximate_char_width() * 25);
@@ -87,8 +80,6 @@ SfxNewStyleDlg::SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& rInPool
     }
 }
 
-
-
 SfxNewStyleDlg::~SfxNewStyleDlg()
 {
 }
diff --git a/sfx2/source/dialog/newstyle.src b/sfx2/source/dialog/newstyle.src
index 10c7744e2a46..d595e553536d 100644
--- a/sfx2/source/dialog/newstyle.src
+++ b/sfx2/source/dialog/newstyle.src
@@ -21,11 +21,9 @@
 #include "dialog.hrc"
 #include <sfx2/sfxcommands.h>
 
-QueryBox MSG_OVERWRITE
+String STR_QUERY_OVERWRITE
 {
-    Buttons = WB_YES_NO ;
-    DefButton = WB_DEF_NO ;
-    Message [ en-US ] = "Style already exists. Overwrite?" ;
+    Text [ en-US ] = "Style already exists. Overwrite?" ;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 7b022d35f825..09f30cedcde1 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2115,11 +2115,13 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
         // we only want to show the dialog once and if we want to delete a style in use (UX-advice)
         if ( bUsedStyle )
         {
-            #if defined UNX
-                QueryBox aBox( SfxGetpApp()->GetTopWindow(), WB_YES_NO | WB_DEF_NO, aMsg );
-            #else
-                QueryBox aBox( GetWindow(), WB_YES_NO | WB_DEF_NO , aMsg );
-            #endif
+        #if defined UNX
+            MessageDialog aBox(SfxGetpApp()->GetTopWindow(), aMsg,
+                               VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO);
+        #else
+            MessageDialog aBox(GetWindow(), aMsg,
+                               VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO);
+        #endif
             aApproved = aBox.Execute() == RET_YES;
         }
 
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index 997c78c81805..451781514459 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -135,7 +135,7 @@
 #define STR_ERROR_DELETE_TEMPLATE_DIR       (RID_SFX_DOC_START+123)
 #define STR_DOCINFO_INFOFIELD               (RID_SFX_DOC_START+124)
 
-#define MSG_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN (RID_SFX_DOC_START+125)
+#define STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN (RID_SFX_DOC_START+125)
 #define STR_XMLSEC_ODF12_EXPECTED           (RID_SFX_DOC_START+126)
 
 #define STR_QRYTEMPL_MESSAGE                (RID_SFX_DOC_START+127)
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index 7c71343bb311..4bffbda9d577 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -347,11 +347,9 @@ String STR_XMLSEC_ODF12_EXPECTED
     Text [ en-US ] = "The document format version is set to ODF 1.1 (OpenOffice.org 2.x) in Tools-Options-Load/Save-General. Signing documents requires ODF 1.2 (OpenOffice.org 3.x).";
 };
 
-QueryBox MSG_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN
+String STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN
 {
-    Buttons = WB_YES_NO ;
-    DefButton = WB_DEF_YES ;
-    Message [ en-US ] = "The document has to be saved before it can be signed. Saving the document removes all present signatures.\nDo you want to save the document?";
+    Text [ en-US ] = "The document has to be saved before it can be signed. Saving the document removes all present signatures.\nDo you want to save the document?";
 };
 
 String STR_QRYTEMPL_MESSAGE
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index cf18115c3e45..e19e5172117a 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -63,7 +63,7 @@
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/mimeconfighelper.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/window.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 
@@ -666,7 +666,8 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus )
         {
             // notify the user that SaveAs is going to be done
             Window* pWin = SfxStoringHelper::GetModelWindow( m_xModel );
-            QueryBox aMessageBox( pWin, WB_OK_CANCEL | WB_DEF_OK, SfxResId(STR_NEW_FILENAME_SAVE).toString() );
+            MessageDialog aMessageBox(pWin, SfxResId(STR_NEW_FILENAME_SAVE),
+                                      VCL_MESSAGE_QUESTION, VCL_BUTTONS_OK_CANCEL);
             if ( aMessageBox.Execute() == RET_OK )
                 nResult = STATUS_SAVEAS;
             else
@@ -1438,7 +1439,8 @@ bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel,
            || SIGNATURESTATE_SIGNATURES_NOTVALIDATED == nDocumentSignatureState
            || SIGNATURESTATE_SIGNATURES_PARTIAL_OK == nDocumentSignatureState)
         {
-            if ( QueryBox( NULL, SfxResId( RID_XMLSEC_QUERY_LOSINGSIGNATURE ) ).Execute() != RET_YES )
+            if (MessageDialog(NULL, SfxResId(RID_SVXSTR_XMLSEC_QUERY_LOSINGSIGNATURE),
+                              VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO).Execute() != RET_YES)
             {
                 // the user has decided not to store the document
                 throw task::ErrorCodeIOException(
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 2f87469f572b..d365ed8f0db9 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/security/DocumentDigitalSignatures.hpp>
 #include <tools/urlobj.hxx>
 #include <svl/whiter.hxx>
-#include <vcl/msgbox.hxx>
 #include <vcl/layout.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
@@ -865,7 +864,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
         }
         case SID_CANCELCHECKOUT:
         {
-            if (  QueryBox( NULL, SfxResId( RID_QUERY_CANCELCHECKOUT ) ).Execute( ) == RET_YES )
+            if (MessageDialog(NULL, SfxResId(STR_QUERY_CANCELCHECKOUT), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO).Execute() == RET_YES)
             {
                 CancelCheckOut( );
 
@@ -1427,8 +1426,8 @@ void SfxObjectShell::ImplSign( bool bScriptingContent )
         if ( nVersion >= SvtSaveOptions::ODFVER_012 )
         {
 
-            if ( (bHasSign && QueryBox( NULL, SfxResId( MSG_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN ) ).Execute() == RET_YES)
-              || (!bHasSign && QueryBox( NULL, SfxResId( RID_XMLSEC_QUERY_SAVEBEFORESIGN ) ).Execute() == RET_YES) )
+            if ( (bHasSign && MessageDialog(NULL, SfxResId(STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO).Execute() == RET_YES)
+              || (!bHasSign && MessageDialog(NULL, SfxResId(RID_SVXSTR_XMLSEC_QUERY_SAVEBEFORESIGN), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO).Execute() == RET_YES) )
             {
                 sal_uInt16 nId = SID_SAVEDOC;
                 if ( !GetMedium() || GetMedium()->GetName().isEmpty() )
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index 7cf92f20c9d7..4a570607649b 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -36,6 +36,7 @@
 #define STR_SFX_UNDOCK                      (RID_SFX_SFXLOCAL_START +  8)
 #define STR_SFX_TASK_PANE_VIEW              (RID_SFX_SFXLOCAL_START +  9)
 #define STR_SFX_TASKS                       (RID_SFX_SFXLOCAL_START + 10)
+#define STR_SFX_QUERY_WRONG_TYPE            (RID_SFX_SFXLOCAL_START + 11)
 
 // Controls --------------------------------------------------------------
 
@@ -44,7 +45,6 @@
 #define SFX_LB_PROPERTY_TYPE                (RID_SFX_SFXLOCAL_START +  4)
 #define SFX_PB_PROPERTY_REMOVE              (RID_SFX_SFXLOCAL_START +  5)
 #define SFX_WIN_PROPERTY_YESNO              (RID_SFX_SFXLOCAL_START +  6)
-#define SFX_QB_WRONG_TYPE                   (RID_SFX_SFXLOCAL_START +  7)
 #define SFX_FLD_DATE                        (RID_SFX_SFXLOCAL_START +  10)
 #define SFX_FLD_TIME                        (RID_SFX_SFXLOCAL_START +  11)
 #define SFX_FLD_DURATION                    (RID_SFX_SFXLOCAL_START +  12)
diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc
index 42fe1a16fa27..3c374328144b 100644
--- a/sfx2/source/view/view.hrc
+++ b/sfx2/source/view/view.hrc
@@ -35,7 +35,7 @@
 
 #define STR_ERROR_SAVE_TEMPLATE             (RID_SFX_VIEW_START+33)
 
-#define MSG_QUERY_OPENASTEMPLATE            (RID_SFX_VIEW_START+41)
+#define STR_QUERY_OPENASTEMPLATE            (RID_SFX_VIEW_START+41)
 #define STR_CANT_CLOSE                      (RID_SFX_VIEW_START+42)
 
 #endif
diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src
index d2ea1f79deee..c4213fc2bbdb 100644
--- a/sfx2/source/view/view.src
+++ b/sfx2/source/view/view.src
@@ -73,11 +73,9 @@ String STR_ERROR_SEND_MAIL
     Text [ en-US ] = "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\nPlease check the %PRODUCTNAME settings or your e-mail program settings." ;
 };
 
-QueryBox MSG_QUERY_OPENASTEMPLATE
+String STR_QUERY_OPENASTEMPLATE
 {
-    Buttons = WB_YES_NO ;
-    DefButton = WB_DEF_NO ;
-    Message [ en-US ] = "This document cannot be edited, possibly due to missing access rights. Do you want to edit a copy of the document?" ;
+    Text [ en-US ] = "This document cannot be edited, possibly due to missing access rights. Do you want to edit a copy of the document?" ;
 };
 String STR_REPAIREDDOCUMENT
 {
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index bbabaa3db562..a01e9162f2ae 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -41,7 +41,7 @@
 #include <svl/slstitm.hxx>
 #include <svl/whiter.hxx>
 #include <svl/undo.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/ehdl.hxx>
@@ -491,7 +491,8 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                     if ( nOpenMode == SFX_STREAM_READWRITE && !rReq.IsAPI() )
                     {
                         // ::com::sun::star::sdbcx::User offering to open it as a template
-                        QueryBox aBox( &GetWindow(), SfxResId(MSG_QUERY_OPENASTEMPLATE) );
+                        MessageDialog aBox(&GetWindow(), SfxResId(STR_QUERY_OPENASTEMPLATE),
+                                           VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO);
                         if ( RET_YES == aBox.Execute() )
                         {
                             SfxApplication* pApp = SfxGetpApp();
@@ -574,7 +575,8 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
             if ( bDo && GetFrame().DocIsModified_Impl() &&
                  !rReq.IsAPI() && ( !pSilentItem || !pSilentItem->GetValue() ) )
             {
-                QueryBox aBox( &GetWindow(), SfxResId(MSG_QUERY_LASTVERSION) );
+                MessageDialog aBox(&GetWindow(), SfxResId(STR_QUERY_LASTVERSION),
+                                   VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO);
                 bDo = ( RET_YES == aBox.Execute() );
             }
 
@@ -750,7 +752,8 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                     if ( bForEdit && SID_EDITDOC == rReq.GetSlot() )
                     {
                         // ask user for opening as template
-                        QueryBox aBox( &GetWindow(), SfxResId(MSG_QUERY_OPENASTEMPLATE) );
+                        MessageDialog aBox(&GetWindow(), SfxResId(STR_QUERY_OPENASTEMPLATE),
+                                           VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO);
                         if ( RET_YES == aBox.Execute() )
                         {
                             SfxAllItemSet aSet( pApp->GetPool() );