[Libreoffice-commits] core.git: 2 commits - svx/source svx/uiconfig sw/source

[Caolán McNamara]

 svx/source/dialog/docrecovery.src           |    2 +-
 svx/source/inc/docrecovery.hxx              |    2 +-
 svx/uiconfig/ui/docrecoveryrecoverdialog.ui |    5 +++--
 sw/source/uibase/shells/basesh.cxx          |    6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 6ac621f1e07c2717d69880866522056996fe9546
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 30 14:56:31 2014 +0000

    Resolves: fdo#80815 rename Cancel and explain what it will do
    
    Change-Id: Ifdd68f7e415176062b9eee6825b3c0bb09cb05db

diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src
index eb55d1f..8f8cd98 100644
--- a/svx/source/dialog/docrecovery.src
+++ b/svx/source/dialog/docrecovery.src
@@ -24,7 +24,7 @@
 
 String RID_SVXSTR_QUERY_EXIT_RECOVERY
 {
-    Text [ en-US ] = "Are you sure you want to cancel the %PRODUCTNAME document recovery?";
+    Text [ en-US ] = "Are you sure you want to discard the %PRODUCTNAME document recovery data?";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 74946f1..c29d139 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -502,7 +502,7 @@ class RecoveryDialog : public Dialog
         vcl::Window*         m_pProgrParent;
         RecovDocList*   m_pFileListLB;
         PushButton*     m_pNextBtn;
-        CancelButton*   m_pCancelBtn;
+        PushButton*     m_pCancelBtn;
         OUString        m_aTitleRecoveryInProgress;
         OUString        m_aRecoveryOnlyFinish;
         OUString        m_aRecoveryOnlyFinishDescr;
diff --git a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
index 034380e..fe77eb8 100644
--- a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
+++ b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
@@ -35,12 +35,11 @@
             </child>
             <child>
               <object class="GtkButton" id="cancel">
-                <property name="label">gtk-cancel</property>
+                <property name="label">Discard Recovery Data</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -77,6 +76,8 @@
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Press 'Start Recovery' to start the recovery process of the documents listed below.
 
+Press 'Discard Recovery Data' to abandon attempting recovery of these document.
+
 The 'Status' column shows whether the document can be recovered.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">87</property>
commit f6011536a888be3a4e1cda2de9532b6ba3f4a275
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 30 14:35:17 2014 +0000

    coverity#704378 gold, Logically dead code
    
    Change-Id: I53bd1e36b2c4e9e7f5e8ec95fa79348fc9cac98b

diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 96f5218..9c8b35d 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -1041,7 +1041,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                     if( eVOrient != text::VertOrientation::TOP && eVOrient != text::VertOrientation::NONE)
                         aSet.Put(SwFmtVertOrient(0, text::VertOrientation::TOP));
 
-                    if(eHOrient != text::HoriOrientation::NONE || eHOrient != text::HoriOrientation::LEFT)
+                    if (eHOrient != text::HoriOrientation::NONE && eHOrient != text::HoriOrientation::LEFT)
                         aSet.Put(SwFmtHoriOrient(0, text::HoriOrientation::LEFT));
                     break;
 
@@ -1053,7 +1053,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                     if( eVOrient != text::VertOrientation::TOP)
                         aSet.Put(SwFmtVertOrient(0, text::VertOrientation::TOP));
 
-                    if(eHOrient != text::HoriOrientation::NONE || eHOrient != text::HoriOrientation::LEFT || eHOrient != text::HoriOrientation::RIGHT)
+                    if (eHOrient != text::HoriOrientation::NONE && eHOrient != text::HoriOrientation::LEFT && eHOrient != text::HoriOrientation::RIGHT)
                         aSet.Put(SwFmtHoriOrient(0, text::HoriOrientation::LEFT));
                     break;
 
@@ -1065,7 +1065,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                     if( eVOrient != text::VertOrientation::TOP)
                         aSet.Put(SwFmtVertOrient(0, text::VertOrientation::TOP));
 
-                    if(eHOrient != text::HoriOrientation::NONE || eHOrient != text::HoriOrientation::LEFT || eHOrient != text::HoriOrientation::RIGHT)
+                    if (eHOrient != text::HoriOrientation::NONE && eHOrient != text::HoriOrientation::LEFT && eHOrient != text::HoriOrientation::RIGHT)
                         aSet.Put(SwFmtHoriOrient(0, text::HoriOrientation::LEFT));
                     break;