diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-07 13:18:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-07 15:38:57 +0000 |
| commit | 6efdd843c831527b2880959746c302fca87c40db (patch) | |
| tree | 7f90d77e75e3cd6cac2bde67a7a66eb14f670dff | |
| parent | c5049234211816dbaa731f5a7a2c3eefcb35a374 (diff) | |
Related: tdf#105371 we can do this with a sizegroup
Change-Id: Ie37a3d960ec244033f2b05e7a902c7a23ba9b94d
| -rw-r--r-- | include/svx/srchdlg.hxx | 3 | ||||
| -rw-r--r-- | svx/source/dialog/srchdlg.cxx | 12 | ||||
| -rw-r--r-- | svx/uiconfig/ui/findreplacedialog.ui | 4 |
3 files changed, 4 insertions, 15 deletions
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 154e201b27e4..25798fd0837c 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -202,9 +202,6 @@ private: VclPtr<RadioButton> m_pColumnsBtn; VclPtr<CheckBox> m_pAllSheetsCB; - VclPtr<FixedText> m_pFindLabel; - VclPtr<FixedText> m_pReplaceLabel; - SfxBindings& rBindings; bool bWriter; bool bSearch; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index b2ca9e0ddb75..2b9f124a1810 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -333,16 +333,6 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWi get(m_pColumnsBtn, "cols"); get(m_pAllSheetsCB, "allsheets"); - //align find and replace inputs without a predefined with for the labels - get(m_pFindLabel, "label4"); //"Find:" - get(m_pReplaceLabel, "label5"); //"Replace:" - long nFindWidth = m_pFindLabel->get_preferred_size().Width(); - long nReplaceWidth = m_pReplaceLabel->get_preferred_size().Width(); - if ( nFindWidth > nReplaceWidth) - m_pReplaceLabel->set_width_request(nFindWidth); - else - m_pFindLabel->set_width_request(nReplaceWidth); - // m_pSimilarityBtn->set_height_request(m_pSimilarityBox->get_preferred_size().Height()); // m_pJapOptionsBtn->set_height_request(m_pJapOptionsCB->get_preferred_size().Height()); @@ -422,8 +412,6 @@ void SvxSearchDialog::dispose() m_pRowsBtn.clear(); m_pColumnsBtn.clear(); m_pAllSheetsCB.clear(); - m_pFindLabel.clear(); - m_pReplaceLabel.clear(); SfxModelessDialog::dispose(); } diff --git a/svx/uiconfig/ui/findreplacedialog.ui b/svx/uiconfig/ui/findreplacedialog.ui index 358848d5af5e..8a21d441c1ac 100644 --- a/svx/uiconfig/ui/findreplacedialog.ui +++ b/svx/uiconfig/ui/findreplacedialog.ui @@ -1101,5 +1101,9 @@ </object> <object class="GtkSizeGroup" id="sizegroup2"> <property name="ignore_hidden">True</property> + <widgets> + <widget name="label4"/> + <widget name="label5"/> + </widgets> </object> </interface> |