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

[Caolán McNamara]

 sfx2/source/dialog/dinfdlg.cxx |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 722ce13234182692996c586607868a0cd4b039b5
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed Jun 19 21:18:20 2013 +0100

    Resolves: fdo#65930 line height needs to be calculated in ctor
    
    we need to know that right from the start, not after the first
    layout event after shown.
    
    Change-Id: If7cc12cdf3e83913f0162fe34b376196162f6a45
    (cherry picked from commit 7694bb997a68f6f8ebc03817be7e31ceb872ceb4)
    Reviewed-on: https://gerrit.libreoffice.org/4373
    Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org>
    Tested-by: Fridrich Strba <fridr...@documentfoundation.org>

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index e13e557..f5f619d 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1398,6 +1398,19 @@ CustomPropertiesWindow::CustomPropertiesWindow(Window* 
pParent,
     m_aNameBox.SetAccessibleName(rHeaderAccName);
     m_aTypeBox.SetAccessibleName(rHeaderAccType);
     m_aValueEdit.SetAccessibleName(rHeaderAccValue);
+
+    m_aNameBox.Hide();
+    m_aTypeBox.Hide();
+    m_aValueEdit.Hide();
+    m_aDateField.Hide();
+    m_aTimeField.Hide();
+    m_aDurationField.Hide();
+    m_aEditButton.Hide();
+    m_aYesNoButton.Hide();
+    m_aRemoveButton.Hide();
+
+    m_nLineHeight =
+        ( m_aRemoveButton.GetPosPixel().Y() * 2 ) + 
m_aRemoveButton.GetSizePixel().Height();
 }
 
 CustomPropertiesWindow::~CustomPropertiesWindow()
@@ -1555,16 +1568,6 @@ void CustomPropertiesWindow::InitControls( HeaderBar* 
pHeaderBar, const ScrollBa
     DBG_ASSERT( pHeaderBar, "CustomPropertiesWindow::InitControls(): invalid 
headerbar" );
     DBG_ASSERT( pScrollBar, "CustomPropertiesWindow::InitControls(): invalid 
scrollbar" );
 
-    m_aNameBox.Hide();
-    m_aTypeBox.Hide();
-    m_aValueEdit.Hide();
-    m_aDateField.Hide();
-    m_aTimeField.Hide();
-    m_aDurationField.Hide();
-    m_aEditButton.Hide();
-    m_aYesNoButton.Hide();
-    m_aRemoveButton.Hide();
-
     const long nOffset = 4;
     const long nScrollBarWidth = pScrollBar->GetSizePixel().Width();
     const long nButtonWidth = m_aRemoveButton.GetSizePixel().Width() + 
nScrollBarWidth + nOffset;
@@ -1614,9 +1617,6 @@ void CustomPropertiesWindow::InitControls( HeaderBar* 
pHeaderBar, const ScrollBa
 
         pCurrent++;
     }
-
-    m_nLineHeight =
-        ( m_aRemoveButton.GetPosPixel().Y() * 2 ) + 
m_aRemoveButton.GetSizePixel().Height();
 }
 
 sal_uInt16 CustomPropertiesWindow::GetVisibleLineCount() const

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits