diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-07-22 14:20:33 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-07-25 14:44:02 +0000 |
commit | 602b4643e0d92a1b8102032652abb2b08c790ec2 (patch) | |
tree | b68d13e3412a1980a449280d380e839bddc7f5fa /include | |
parent | ca88a0ea6ed7277e8522d83458e3cfb975fcfb7d (diff) |
Related: fdo#81457 skip setting an empty allocation
if the dimension is 0, don't bother calculating
a bunch of <= 0 sizes, rely on the parents clipping
to hide the lot instead
Change-Id: I5b593a5b6b6c3614beb7f9bf3328fa469b700972
(cherry picked from commit 13807fbf9f3a4aae6767da8bcf796bea4b065159)
and
Related: fdo#81457 quadratic time required when setting a11y name
when calling SetAccessibleName GetAccessibleName is called
in order to send a name changed a11y event. Getting an Accessible
Name is very slow in a non-layout aware widget because it scans
for a "nearby" label and there is none in this widget, but it
has a huge pile of other widgets to iterate over.
call add_mnemonic_label before hand to cut off that entire
branch.
While we're at it, only call InitControl to adjust to a new
width if the new width is different from the old width
Change-Id: Ie4ba1276127226e49442278e46447b84bbeb1cde
(cherry picked from commit aff263c8b814c6bf352312403d3c1e448c8013a3)
Reviewed-on: https://gerrit.libreoffice.org/10461
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/sfx2/dinfdlg.hxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 95eab18df1d3..8b9e93626ca1 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -407,6 +407,10 @@ struct CustomPropertyLine class CustomPropertiesWindow : public Window { private: + FixedText* m_pHeaderAccName; + FixedText* m_pHeaderAccType; + FixedText* m_pHeaderAccValue; + ComboBox m_aNameBox; ListBox m_aTypeBox; Edit m_aValueEdit; @@ -441,13 +445,13 @@ private: public: CustomPropertiesWindow(Window* pParent, - const OUString &rHeaderAccName, - const OUString &rHeaderAccType, - const OUString &rHeaderAccValue); + FixedText *pHeaderAccName, + FixedText *pHeaderAccType, + FixedText *pHeaderAccValue); virtual ~CustomPropertiesWindow(); - void InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar ); - sal_uInt16 GetVisibleLineCount() const; + bool InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar ); + sal_uInt16 GetVisibleLineCount() const; inline sal_Int32 GetLineHeight() const { return m_nLineHeight; } void AddLine( const OUString& sName, com::sun::star::uno::Any& rAny ); bool AreAllLinesValid() const; |