Author: hanya
Date: Fri Jan 30 17:41:05 2015
New Revision: 1656067
URL: http://svn.apache.org/r1656067
Log:
#i105692# rearrange the order of the controls and fix name of type
Modified:
openoffice/trunk/main/helpcontent2/source/text/scalc/01/12090101.xhp
openoffice/trunk/main/sc/source/ui/dbgui/dapidata.cxx
openoffice/trunk/main/sc/source/ui/dbgui/dapitype.src
openoffice/trunk/main/sc/source/ui/inc/dapidata.hxx
Modified: openoffice/trunk/main/helpcontent2/source/text/scalc/01/12090101.xhp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/scalc/01/12090101.xhp?rev=1656067&r1=1656066&r2=1656067&view=diff
==============================================================================
--- openoffice/trunk/main/helpcontent2/source/text/scalc/01/12090101.xhp
(original)
+++ openoffice/trunk/main/helpcontent2/source/text/scalc/01/12090101.xhp Fri
Jan 30 17:41:05 2015
@@ -48,12 +48,12 @@
<bookmark xml-lang="en-US"
branch="hid/sc:ListBox:RID_SCDLG_DAPIDATA:LB_DATABASE" id="bm_id3154684"
localize="false"/>
<paragraph role="heading" id="hd_id3151041" xml-lang="en-US" level="3"
l10n="U" oldref="5">Database</paragraph>
<paragraph role="paragraph" id="par_id3156424" xml-lang="en-US" l10n="U"
oldref="6"><ahelp hid="SC:LISTBOX:RID_SCDLG_DAPIDATA:LB_DATABASE">Select the
database that contains the data source that you want to use.</ahelp></paragraph>
+<bookmark xml-lang="en-US"
branch="hid/sc:ListBox:RID_SCDLG_DAPIDATA:LB_OBJTYPE" id="bm_id3153726"
localize="false"/>
+<paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="3"
l10n="U" oldref="9">Type</paragraph>
+<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U"
oldref="10"><ahelp hid="SC:LISTBOX:RID_SCDLG_DAPIDATA:LB_OBJTYPE">Select the
source type to be shown in the data source.</ahelp> You can choose from four
source types: "Table", "Query" and "SQL" or SQL (Native).</paragraph>
<bookmark xml-lang="en-US"
branch="hid/sc:ComboBox:RID_SCDLG_DAPIDATA:CB_OBJECT" id="bm_id3151112"
localize="false"/>
<paragraph role="heading" id="hd_id3145364" xml-lang="en-US" level="3"
l10n="U" oldref="7">Data source</paragraph>
<paragraph role="paragraph" id="par_id3149260" xml-lang="en-US" l10n="U"
oldref="8"><ahelp hid="SC:COMBOBOX:RID_SCDLG_DAPIDATA:CB_OBJECT">Select the
data source that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/sc:ListBox:RID_SCDLG_DAPIDATA:LB_OBJTYPE" id="bm_id3153726"
localize="false"/>
-<paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="3"
l10n="U" oldref="9">Type</paragraph>
-<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U"
oldref="10"><ahelp hid="SC:LISTBOX:RID_SCDLG_DAPIDATA:LB_OBJTYPE">Click the
source type of for the selected data source.</ahelp> You can choose from four
source types: "Table", "Query" and "SQL" or SQL (Native).</paragraph>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3147348" xml-lang="en-US" l10n="U"
oldref="11"><link href="text/scalc/01/12090102.xhp" name="Pivot table
dialog">Pivot table dialog</link></paragraph>
</section>
Modified: openoffice/trunk/main/sc/source/ui/dbgui/dapidata.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/dbgui/dapidata.cxx?rev=1656067&r1=1656066&r2=1656067&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/dbgui/dapidata.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/dbgui/dapidata.cxx Fri Jan 30 17:41:05
2015
@@ -68,10 +68,10 @@ ScDataPilotDatabaseDlg::ScDataPilotDatab
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 ) )
Modified: openoffice/trunk/main/sc/source/ui/dbgui/dapitype.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/dbgui/dapitype.src?rev=1656067&r1=1656066&r2=1656067&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/dbgui/dapitype.src (original)
+++ openoffice/trunk/main/sc/source/ui/dbgui/dapitype.src Fri Jan 30 17:41:05
2015
@@ -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 ; > ;
Modified: openoffice/trunk/main/sc/source/ui/inc/dapidata.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/inc/dapidata.hxx?rev=1656067&r1=1656066&r2=1656067&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/inc/dapidata.hxx (original)
+++ openoffice/trunk/main/sc/source/ui/inc/dapidata.hxx Fri Jan 30 17:41:05 2015
@@ -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;
