summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-06-19 21:18:20 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-06-19 21:18:34 +0100
commit7694bb997a68f6f8ebc03817be7e31ceb872ceb4 (patch)
tree0342d46e1f53091c882b6a9cd574939afd303a60 /sfx2/source
parentb7f2129c1186e1c5b2dd19ebb79ff82b213c0870 (diff)
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
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx26
1 files changed, 13 insertions, 13 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 60fb441149bb..cc2768c18320 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