include/sfx2/dinfdlg.hxx | 2 +- sfx2/source/dialog/dinfdlg.cxx | 6 +++--- sfx2/uiconfig/ui/documentinfopage.ui | 9 +++------ 3 files changed, 7 insertions(+), 10 deletions(-)
New commits: commit c8e39299ac4ced2dc72f373526089b9574a14a8a Author: Caolán McNamara <caol...@redhat.com> Date: Fri Apr 3 11:50:52 2015 +0100 Resolves: tdf#89885 use a readonly GtkEntry for location Change-Id: I324d5e0776da942eae62984b96951d9947702b49 diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 1e5490d..9179c69 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -185,7 +185,7 @@ private: PushButton* m_pChangePassBtn; SelectableFixedText* m_pShowTypeFT; - 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 1237d4c..4317295 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -754,7 +754,7 @@ SfxDocumentPage::SfxDocumentPage(vcl::Window* pParent, const SfxItemSet& rItemSe get(m_pChangePassBtn, "changepass"); get(m_pShowTypeFT, "showtype"); - get(m_pFileValFt, "showlocation"); + get(m_pFileValEd, "showlocation"); get(m_pShowSizeFT, "showsize"); m_aUnknownSize = m_pShowSizeFT->GetText(); m_pShowSizeFT->SetText(OUString()); @@ -1028,10 +1028,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() != INetProtocol::PrivSoffice ) - 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 46e1c28..7d75d8a 100644 --- a/sfx2/uiconfig/ui/documentinfopage.ui +++ b/sfx2/uiconfig/ui/documentinfopage.ui @@ -297,13 +297,10 @@ </packing> </child> <child> - <object class="GtkLabel" id="showlocation"> + <object class="GtkEntry" 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> + <property name="can_focus">True</property> + <property name="editable">False</property> </object> <packing> <property name="left_attach">1</property>
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits