[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/source

[Libreoffice Gerrit user]

 sc/source/ui/inc/xmlsourcedlg.hrc       |    9 +++++----
 sc/source/ui/inc/xmlsourcedlg.hxx       |    1 +
 sc/source/ui/src/xmlsourcedlg.src       |   12 ++++++++----
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |    4 ++--
 4 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit 48225f78ca36ae6dd9b14ae5088a1ebfe257e32a
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Fri Oct 12 17:30:20 2012 -0400

    Display selected tree item name on the dialog when clicked on.
    
    Change-Id: If7f7d938f4eacfc921a1e591fa4e59c5c9cf127e

diff --git a/sc/source/ui/inc/xmlsourcedlg.hrc b/sc/source/ui/inc/xmlsourcedlg.hrc
index 67cf9b8..03cb645 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hrc
+++ b/sc/source/ui/inc/xmlsourcedlg.hrc
@@ -17,10 +17,11 @@
 #define FT_SOURCE_FILE 12
 
 #define FL_MAP_XML_TO_DOCUMENT 20
-#define FT_MAPPED_CELL_TITLE 21
-#define ED_MAPPED_CELL 22
-#define BTN_MAPPED_CELL 23
-#define LB_SOURCE_TREE 24
+#define FT_TREE_ITEM_NAME 21
+#define FT_MAPPED_CELL_TITLE 22
+#define ED_MAPPED_CELL 23
+#define BTN_MAPPED_CELL 24
+#define LB_SOURCE_TREE 25
 
 #define IMG_ELEMENT_DEFAULT 50
 #define IMG_ELEMENT_REPEAT  51
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx
index 75d698f..f946fb2 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -37,6 +37,7 @@ class ScXMLSourceDlg : public ScAnyRefDlg
 
     FixedLine maFtMapXmlDoc;
 
+    FixedText maFtTreeItemName;
     FixedText maFtMappedCellTitle;
     formula::RefEdit   maEdit;
     formula::RefButton maBtnRb;
diff --git a/sc/source/ui/src/xmlsourcedlg.src b/sc/source/ui/src/xmlsourcedlg.src
index 4119601..342d47a 100644
--- a/sc/source/ui/src/xmlsourcedlg.src
+++ b/sc/source/ui/src/xmlsourcedlg.src
@@ -48,25 +48,29 @@ ModelessDialog RID_SCDLG_XML_SOURCE
         Text [ en-US ] = "Map to document";
     };
 
-    FixedText FT_MAPPED_CELL_TITLE
+    FixedText FT_TREE_ITEM_NAME
     {
         Pos = MAP_APPFONT( 12, 52 );
         Size = MAP_APPFONT ( 100 , 8 ) ;
+    };
 
-        Text [ en-US ] = "";
+    FixedText FT_MAPPED_CELL_TITLE
+    {
+        Pos = MAP_APPFONT( 12, 67 );
+        Size = MAP_APPFONT ( 100 , 8 ) ;
     };
 
     Edit ED_MAPPED_CELL
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 66 ) ;
+        Pos = MAP_APPFONT ( 12 , 81 ) ;
         Size = MAP_APPFONT ( 69 , 12 ) ;
         TabStop = TRUE ;
     };
 
     ImageButton BTN_MAPPED_CELL
     {
-        Pos = MAP_APPFONT ( 83 , 65 ) ;
+        Pos = MAP_APPFONT ( 83 , 80 ) ;
         Size = MAP_APPFONT ( 13 , 15 ) ;
         TabStop = FALSE ;
         QuickHelpText [ en-US ] = "Shrink" ;
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 1b9f213..6071f82 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -36,6 +36,7 @@ ScXMLSourceDlg::ScXMLSourceDlg(
     maBtnSelectSource(this, ScResId(BTN_SELECT_SOURCE_FILE)),
     maFtSourceFile(this, ScResId(FT_SOURCE_FILE)),
     maFtMapXmlDoc(this, ScResId(FL_MAP_XML_TO_DOCUMENT)),
+    maFtTreeItemName(this, ScResId(FT_TREE_ITEM_NAME)),
     maFtMappedCellTitle(this, ScResId(FT_MAPPED_CELL_TITLE)),
     maEdit(this, this, ScResId(ED_MAPPED_CELL)),
     maBtnRb(this, ScResId(BTN_MAPPED_CELL), &maEdit, this),
@@ -186,8 +187,7 @@ void ScXMLSourceDlg::TreeItemSelected()
 {
     SvLBoxEntry* pEntry = maLbTree.GetCurEntry();
     OUString aName = maLbTree.GetEntryText(pEntry);
-    fprintf(stdout, "ScXMLSourceDlg::TreeItemSelected:   name = '%s'\n",
-            rtl::OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr());
+    maFtTreeItemName.SetText(aName);
 }
 
 IMPL_LINK(ScXMLSourceDlg, GetFocusHdl, Control*, pCtrl)