[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - include/sfx2 sfx2/source sfx2/uiconfig

[Caolán McNamara]

 include/sfx2/dinfdlg.hxx             |    2 +-
 sfx2/source/dialog/dinfdlg.cxx       |    7 +++----
 sfx2/uiconfig/ui/documentinfopage.ui |   25 +++++++++++--------------
 3 files changed, 15 insertions(+), 19 deletions(-)

New commits:
commit 233d3efda5523921b80ad8ebaf2b2e7175169e0e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 3 11:50:52 2015 +0100

    Resolves: tdf#89885 use a readonly GtkEntry for location
    
    Change-Id: I324d5e0776da942eae62984b96951d9947702b49
    Reviewed-on: https://gerrit.libreoffice.org/15137
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 340681a..6622e11 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -187,7 +187,7 @@ private:
 
     SelectableFixedText*        m_pShowTypeFT;
     CheckBox*                   m_pReadOnlyCB;
-    FixedText*                  m_pFileValFt;
+    Edit*                       m_pFileValEd;
     SelectableFixedText*        m_pShowSizeFT;
 
     SelectableFixedText*        m_pCreateValFt;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index bf2124e..b65bf40 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -753,12 +753,11 @@ SfxDocumentPage::SfxDocumentPage(vcl::Window* pParent, const SfxItemSet& rItemSe
 {
     get(m_pBmp, "icon");
     get(m_pNameED, "nameed");
-//FIXME    m_pNameED->SetAccessibleName( SfxResId( EDIT_FILE_NAME ).toString() );
     get(m_pChangePassBtn, "changepass");
 
     get(m_pShowTypeFT, "showtype");
     get(m_pReadOnlyCB, "readonlycb");
-    get(m_pFileValFt, "showlocation");
+    get(m_pFileValEd, "showlocation");
     get(m_pShowSizeFT, "showsize");
     m_aUnknownSize = m_pShowSizeFT->GetText();
     m_pShowSizeFT->SetText(OUString());
@@ -1072,10 +1071,10 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
         // we know it's a folder -> don't need the final slash, but it's better for WB_PATHELLIPSIS
         aPath.removeFinalSlash();
         OUString aText( aPath.PathToFileName() ); //! (pb) MaxLen?
-        m_pFileValFt->SetText( aText );
+        m_pFileValEd->SetText( aText );
     }
     else if ( aURL.GetProtocol() != INET_PROT_PRIVATE )
-        m_pFileValFt->SetText( aURL.GetPartBeforeLastName() );
+        m_pFileValEd->SetText( aURL.GetPartBeforeLastName() );
 
     // handle access data
     bool m_bUseUserData = rInfoItem.IsUseUserData();
diff --git a/sfx2/uiconfig/ui/documentinfopage.ui b/sfx2/uiconfig/ui/documentinfopage.ui
index b3e7831..86e9b33 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -261,20 +261,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkLabel" id="showlocation">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
-        <property name="xalign">0</property>
-        <property name="wrap">True</property>
-        <property name="max_width_chars">56</property>
-      </object>
-      <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">3</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkLabel" id="label7">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -410,6 +396,17 @@
       </packing>
     </child>
     <child>
+      <object class="GtkEntry" id="showlocation">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="editable">False</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="top_attach">3</property>
+      </packing>
+    </child>
+    <child>
       <placeholder/>
     </child>
     <child>