[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source

[Tsutomu Uchino]

 sc/source/ui/dbgui/dapidata.cxx |    4 ++--
 sc/source/ui/dbgui/dapitype.src |   10 +++++-----
 sc/source/ui/inc/dapidata.hxx   |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 8254a15eafde7a1b666b02967758fef45a5cf32c
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Fri Jan 30 17:41:05 2015 +0000

    #i105692# rearrange the order of the controls and fix name of type

diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index 0998e66..fd8786b 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -68,10 +68,10 @@ ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) :
     aFlFrame        ( this, ScResId( FL_FRAME ) ),
     aFtDatabase     ( this, ScResId( FT_DATABASE ) ),
     aLbDatabase     ( this, ScResId( LB_DATABASE ) ),
-    aFtObject       ( this, ScResId( FT_OBJECT ) ),
-    aCbObject       ( this, ScResId( CB_OBJECT ) ),
     aFtType         ( this, ScResId( FT_OBJTYPE ) ),
     aLbType         ( this, ScResId( LB_OBJTYPE ) ),
+    aFtObject       ( this, ScResId( FT_OBJECT ) ),
+    aCbObject       ( this, ScResId( CB_OBJECT ) ),
     aBtnOk          ( this, ScResId( BTN_OK ) ),
     aBtnCancel      ( this, ScResId( BTN_CANCEL ) ),
     aBtnHelp        ( this, ScResId( BTN_HELP ) )
diff --git a/sc/source/ui/dbgui/dapitype.src b/sc/source/ui/dbgui/dapitype.src
index aeafa4a..9ffff67 100644
--- a/sc/source/ui/dbgui/dapitype.src
+++ b/sc/source/ui/dbgui/dapitype.src
@@ -247,7 +247,7 @@ ModalDialog RID_SCDLG_DAPIDATA
 
     FixedText FT_OBJECT
     {
-        Pos = MAP_APPFONT ( 12 , 30 ) ;
+        Pos = MAP_APPFONT ( 12 , 46 ) ;
         Size = MAP_APPFONT ( 52 , 8 ) ;
         Text [ en-US ] = "Data so~urce";
     };
@@ -255,7 +255,7 @@ ModalDialog RID_SCDLG_DAPIDATA
     {
         HelpID = "sc:ComboBox:RID_SCDLG_DAPIDATA:CB_OBJECT";
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 66 , 28 ) ;
+        Pos = MAP_APPFONT ( 66 , 44 ) ;
         Size = MAP_APPFONT ( 110 , 80 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -263,7 +263,7 @@ ModalDialog RID_SCDLG_DAPIDATA
 
     FixedText FT_OBJTYPE
     {
-        Pos = MAP_APPFONT ( 12 , 46 ) ;
+        Pos = MAP_APPFONT ( 12 , 30 ) ;
         Size = MAP_APPFONT ( 52 , 8 ) ;
         Text [ en-US ] = "~Type";
     };
@@ -271,13 +271,13 @@ ModalDialog RID_SCDLG_DAPIDATA
     {
         HelpID = "sc:ListBox:RID_SCDLG_DAPIDATA:LB_OBJTYPE";
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 66 , 44 ) ;
+        Pos = MAP_APPFONT ( 66 , 28 ) ;
         Size = MAP_APPFONT ( 110 , 80 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     StringList [ en-US ] =
     {
-            < "Sheet" ; Default ; > ;
+        < "Table" ; Default ; > ;
         < "Query" ; Default ; > ;
         < "Sql" ; Default ; > ;
         < "Sql [Native]" ; Default ; > ;
diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx
index 03b4e66..20bc58f 100644
--- a/sc/source/ui/inc/dapidata.hxx
+++ b/sc/source/ui/inc/dapidata.hxx
@@ -43,10 +43,10 @@ private:
     FixedLine       aFlFrame;
     FixedText       aFtDatabase;
     ListBox         aLbDatabase;
-    FixedText       aFtObject;
-    ComboBox        aCbObject;
     FixedText       aFtType;
     ListBox         aLbType;
+    FixedText       aFtObject;
+    ComboBox        aCbObject;
     OKButton        aBtnOk;
     CancelButton    aBtnCancel;
     HelpButton      aBtnHelp;