commit 8943dc062b47df92fbd28dbee2dfd77be6e88775
author Caolán McNamara <caolanm@redhat.com> Wed May 07 12:25:33 2014 +0100
committer Kohei Yoshida <libreoffice@kohei.us> Wed May 07 22:48:52 2014 +0000
tree 22c42484cc0bdb8c795f7d1cc993a9b00f710873
parent c369a60b60dfeaa12a688d2182c78bc8d4efb38e

Resolves: fdo#68600 limit comment width

(cherry picked from commit 087fcc43b13985b03d935dfd1e25a0d36d58cb1e)

Conflicts:
	sfx2/source/dialog/dinfdlg.cxx

Change-Id: I7060ae18a98e0793a936834b398f1e232d336672
Reviewed-on: https://gerrit.libreoffice.org/9269
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>

sfx2/source/dialog/dinfdlg.cxx

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 4975c61..a7c6c95 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -630,19 +630,18 @@ bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId )
    return bRet;
}

//------------------------------------------------------------------------
SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rItemSet )
    : SfxTabPage(pParent, "DescriptionInfoPage", "sfx/ui/descriptioninfopage.ui", rItemSet)
    , m_pInfoItem   ( NULL )

{
    get(m_pTitleEd, "title");
    get(m_pThemaEd, "subject");
    get(m_pKeywordsEd, "keywords");
    get(m_pCommentEd, "comments");
    m_pCommentEd->set_width_request(m_pKeywordsEd->get_preferred_size().Width());
    m_pCommentEd->set_height_request(m_pCommentEd->GetTextHeight() * 16);
}

//------------------------------------------------------------------------
SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet &rItemSet)
{
     return new SfxDocumentDescPage(pParent, rItemSet);