[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source

[Cédric Bosdonnat]

 sfx2/source/doc/templatedlg.cxx |    5 -----
 sfx2/source/doc/templatedlg.hrc |    1 -
 sfx2/source/doc/templatedlg.src |    5 -----
 3 files changed, 11 deletions(-)

New commits:
commit 0708ce5b862bbb052f0d50bc4d1e931ff20952e4
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date:   Mon Mar 11 16:49:09 2013 +0100

    Revert "Ask for confirmation when deleting a template, fdo#61466"
    
    This reverts commit 1847de945a2b4ca66c02d19621404c567ee3b5be. This
    commit was introducing a new string... my bad, shouldn't have pushed it
    in libreoffice-4-0 in the first time.

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 2ff1b05..7041966 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1019,11 +1019,6 @@ void SfxTemplateManagerDlg::OnTemplateProperties ()
 
 void SfxTemplateManagerDlg::OnTemplateDelete ()
 {
-    QueryBox aQueryDlg(this, WB_YES_NO | WB_DEF_YES, SfxResId(STR_QMSG_SEL_TEMPLATE_DELETE).toString());
-
-    if ( aQueryDlg.Execute() == RET_NO )
-        return;
-
     OUString aTemplateList;
 
     if (mpSearchView->IsVisible())
diff --git a/sfx2/source/doc/templatedlg.hrc b/sfx2/source/doc/templatedlg.hrc
index abddcd9..672575c 100644
--- a/sfx2/source/doc/templatedlg.hrc
+++ b/sfx2/source/doc/templatedlg.hrc
@@ -71,7 +71,6 @@
 
 #define STR_QMSG_SEL_FOLDER_DELETE          289
 #define STR_QMSG_TEMPLATE_OVERWRITE         290
-#define STR_QMSG_SEL_TEMPLATE_DELETE        291
 
 #define IMG_ACTION_SORT             304
 #define IMG_ACTION_REFRESH          305
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index 28b6963..a351431 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -101,11 +101,6 @@ String STR_QMSG_TEMPLATE_OVERWRITE
     Text [ en-US ] = "A template named $1 already exist in $2. Do you want to overwrite it?";
 };
 
-String STR_QMSG_SEL_TEMPLATE_DELETE
-{
-    Text [ en-US ] = "Do you want to delete the selected templates?";
-};
-
 ModelessDialog DLG_TEMPLATE_MANAGER
 {
     OutputSize = TRUE;