Update behavior and translation last record to prev record

4 files changed, 11 insertions, 10 deletions

diff --git a/sc/source/ui/inc/datafdlg.hrc b/sc/source/ui/inc/datafdlg.hrc
index 2a8341da5482..bdb1ea962a82 100644
--- a/sc/source/ui/inc/datafdlg.hrc
+++ b/sc/source/ui/inc/datafdlg.hrc
@@ -30,7 +30,7 @@
 #define BTN_DATAFORM_NEW          1
 #define BTN_DATAFORM_DELETE       2
 #define BTN_DATAFORM_RESTORE      3
-#define BTN_DATAFORM_LAST         4
+#define BTN_DATAFORM_PREV         4
 #define BTN_DATAFORM_NEXT         5
 #define BTN_DATAFORM_CLOSE        6
 #define WND_DATAFORM_SCROLLBAR    7
diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx
index 6fda3212c987..fbad64e9c1af 100644
--- a/sc/source/ui/inc/datafdlg.hxx
+++ b/sc/source/ui/inc/datafdlg.hxx
@@ -58,7 +58,7 @@ private:
     PushButton      aBtnNew;
     PushButton      aBtnDelete;
     PushButton      aBtnRestore;
-    PushButton      aBtnLast;
+    PushButton      aBtnPrev;
     PushButton      aBtnNext;
     PushButton      aBtnClose;
     ScrollBar       aSlider;
@@ -89,7 +89,7 @@ private:
 
     // Handler:
     DECL_LINK( Impl_NewHdl,     PushButton*    );
-    DECL_LINK( Impl_LastHdl,    PushButton*    );
+    DECL_LINK( Impl_PrevHdl,    PushButton*    );
     DECL_LINK( Impl_NextHdl,    PushButton*    );
 
     DECL_LINK( Impl_RestoreHdl, PushButton*    );
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
index b5eeccd01029..f5926c233442 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -51,7 +51,7 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, ScTabViewShell*  pTabViewShellOri
     aBtnNew          ( this, ScResId( BTN_DATAFORM_NEW ) ),
     aBtnDelete          ( this, ScResId( BTN_DATAFORM_DELETE ) ),
     aBtnRestore          ( this, ScResId( BTN_DATAFORM_RESTORE ) ),
-    aBtnLast          ( this, ScResId( BTN_DATAFORM_LAST ) ),
+    aBtnPrev          ( this, ScResId( BTN_DATAFORM_PREV ) ),
     aBtnNext          ( this, ScResId( BTN_DATAFORM_NEXT ) ),
     aBtnClose          ( this, ScResId( BTN_DATAFORM_CLOSE ) ),
     aSlider         ( this, ScResId( WND_DATAFORM_SCROLLBAR ) ),
@@ -222,7 +222,7 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, ScTabViewShell*  pTabViewShellOri
     aSlider.Show();
 
     aBtnNew.SetClickHdl     ( HDL(Impl_NewHdl)    );
-    aBtnLast.SetClickHdl    ( HDL(Impl_LastHdl)    );
+    aBtnPrev.SetClickHdl    ( HDL(Impl_PrevHdl)    );
     aBtnNext.SetClickHdl    ( HDL(Impl_NextHdl)    );
 
     aBtnRestore.SetClickHdl     ( HDL(Impl_RestoreHdl)    );
@@ -311,7 +311,7 @@ IMPL_LINK( ScDataFormDlg, Impl_NewHdl, PushButton*, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( ScDataFormDlg, Impl_LastHdl, PushButton*, EMPTYARG )
+IMPL_LINK( ScDataFormDlg, Impl_PrevHdl, PushButton*, EMPTYARG )
 {
     if (pDoc)
     {
@@ -386,7 +386,6 @@ void ScDataFormDlg::SetButtonState()
     if ( aCurrentRow > nEndRow )
     {
         aBtnDelete.Enable( false );
-        aBtnLast.Enable( true );
         aBtnNext.Enable( false );
     }
     else
@@ -395,7 +394,9 @@ void ScDataFormDlg::SetButtonState()
         aBtnNext.Enable( true );
     }
     if ( 1 == aCurrentRow )
-        aBtnLast.Enable( false );
+        aBtnPrev.Enable( false );
+    else
+        aBtnPrev.Enable( true );
 
     aBtnRestore.Enable( false );
     if ( maEdits.size()>=1 && !maEdits.is_null(0) )
diff --git a/sc/source/ui/src/datafdlg.src b/sc/source/ui/src/datafdlg.src
index 1cb3578f4546..5c0ee6d847bf 100644
--- a/sc/source/ui/src/datafdlg.src
+++ b/sc/source/ui/src/datafdlg.src
@@ -63,12 +63,12 @@ ModalDialog RID_SCDLG_DATAFORM
         TabStop = TRUE ;
         Text [ en-US ] = "Restore" ;
     };
-    PushButton BTN_DATAFORM_LAST
+    PushButton BTN_DATAFORM_PREV
     {
         Pos = MAP_APPFONT ( 135 , 82 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
-        Text [ en-US ] = "Last Record" ;
+        Text [ en-US ] = "Previous Record" ;
     };
     PushButton BTN_DATAFORM_NEXT
     {