diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-04-29 14:44:11 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-30 11:47:42 +0100 |
commit | b80e865d369b4d94f29ac6dcc27379d3c6e72ada (patch) | |
tree | cf23896080dc7beb85129069468d114cfd508147 /include | |
parent | findandreplace.ui widget (diff) | |
download | core-b80e865d369b4d94f29ac6dcc27379d3c6e72ada.tar.gz core-b80e865d369b4d94f29ac6dcc27379d3c6e72ada.zip |
Convert find & replace dialog to .ui
Change-Id: Ib5637a3601fc77588b2bd581f17dc6bcb36290db
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/dialogs.hrc | 3 | ||||
-rw-r--r-- | include/svx/srchdlg.hxx | 114 |
2 files changed, 55 insertions, 62 deletions
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index d41157c46877..339cba761e34 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -155,9 +155,6 @@ //--------------------------------------------------------------------- -// ResId fuer den Suchen/Ersetzen-Dialog -#define RID_SVXDLG_SEARCH (RID_SVX_START + 20) - // ResId fuer die PageDialog #define RID_SVXQBX_DELETE_HEADFOOT (RID_SVX_START + 28) diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index f9c44fa683db..60cf509c745f 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -22,8 +22,9 @@ #include <svtools/stdctrl.hxx> #include <vcl/combobox.hxx> #include <vcl/edit.hxx> -#include <vcl/lstbox.hxx> #include <vcl/button.hxx> +#include <vcl/layout.hxx> +#include <vcl/lstbox.hxx> #include <vcl/group.hxx> #include <vcl/fixed.hxx> #include <vcl/dialog.hxx> @@ -133,64 +134,59 @@ public: inline sal_Bool HasSearchAttributes() const; inline sal_Bool HasReplaceAttributes() const; - PushButton& GetReplaceBtn() { return aReplaceBtn; } + PushButton& GetReplaceBtn() { return *m_pReplaceBtn; } - sal_Int32 GetTransliterationFlags() const; + sal_Int32 GetTransliterationFlags() const; void SetSaveToModule(bool b); private: - FixedText aSearchText; - ComboBox aSearchLB; - ListBox aSearchTmplLB; - FixedInfo aSearchAttrText; - - FixedText aReplaceText; - ComboBox aReplaceLB; - ListBox aReplaceTmplLB; - FixedInfo aReplaceAttrText; - - PushButton aSearchBtn; - PushButton aSearchAllBtn; - FixedLine aSearchCmdLine; - PushButton aReplaceBtn; - PushButton aReplaceAllBtn; - - FixedLine aSearchComponentFL; - PushButton aSearchComponent1PB; - PushButton aSearchComponent2PB; - - CheckBox aMatchCaseCB; - CheckBox aWordBtn; - - FixedLine aButtonsFL; - MoreButton* pMoreBtn; - HelpButton aHelpBtn; - CancelButton aCloseBtn; - - FixedLine aOptionsFL; - CheckBox aSelectionBtn; - CheckBox aBackwardsBtn; - CheckBox aRegExpBtn; - CheckBox aSimilarityBox; - PushButton aSimilarityBtn; - CheckBox aLayoutBtn; - CheckBox aNotesBtn; - CheckBox aJapMatchFullHalfWidthCB; - CheckBox aJapOptionsCB; - PushButton aJapOptionsBtn; - - PushButton aAttributeBtn; - PushButton aFormatBtn; - PushButton aNoFormatBtn; - - FixedLine aCalcFL; - FixedText aCalcSearchInFT; - ListBox aCalcSearchInLB; - FixedText aCalcSearchDirFT; - RadioButton aRowsBtn; - RadioButton aColumnsBtn; - CheckBox aAllSheetsCB; + VclFrame* m_pSearchFrame; + ComboBox* m_pSearchLB; + ListBox* m_pSearchTmplLB; + FixedText* m_pSearchAttrText; + + VclFrame* m_pReplaceFrame; + ComboBox* m_pReplaceLB; + ListBox* m_pReplaceTmplLB; + FixedText* m_pReplaceAttrText; + + PushButton* m_pSearchBtn; + PushButton* m_pSearchAllBtn; + PushButton* m_pReplaceBtn; + PushButton* m_pReplaceAllBtn; + + VclFrame* m_pComponentFrame; + PushButton* m_pSearchComponent1PB; + PushButton* m_pSearchComponent2PB; + + CheckBox* m_pMatchCaseCB; + CheckBox* m_pWordBtn; + + PushButton* m_pCloseBtn; + + CheckBox* m_pSelectionBtn; + CheckBox* m_pBackwardsBtn; + CheckBox* m_pRegExpBtn; + CheckBox* m_pSimilarityBox; + PushButton* m_pSimilarityBtn; + CheckBox* m_pLayoutBtn; + CheckBox* m_pNotesBtn; + CheckBox* m_pJapMatchFullHalfWidthCB; + CheckBox* m_pJapOptionsCB; + PushButton* m_pJapOptionsBtn; + + PushButton* m_pAttributeBtn; + PushButton* m_pFormatBtn; + PushButton* m_pNoFormatBtn; + + VclContainer* m_pCalcGrid; + FixedText* m_pCalcSearchInFT; + ListBox* m_pCalcSearchInLB; + FixedText* m_pCalcSearchDirFT; + RadioButton* m_pRowsBtn; + RadioButton* m_pColumnsBtn; + CheckBox* m_pAllSheetsCB; SfxBindings& rBindings; sal_Bool bWriter; @@ -236,7 +232,7 @@ private: void Construct_Impl(); void InitControls_Impl(); - void CalculateDelta_Impl(); + void ShowOptionalControls_Impl(); void Init_Impl( int bHasItemSet ); void InitAttrList_Impl( const SfxItemSet* pSSet, const SfxItemSet* pRSet ); @@ -257,14 +253,14 @@ private: inline sal_Bool SvxSearchDialog::HasSearchAttributes() const { - sal_Bool bLen = !aSearchAttrText.GetText().isEmpty(); - return ( aSearchAttrText.IsEnabled() && bLen ); + sal_Bool bLen = !m_pSearchAttrText->GetText().isEmpty(); + return ( m_pSearchAttrText->IsEnabled() && bLen ); } inline sal_Bool SvxSearchDialog::HasReplaceAttributes() const { - sal_Bool bLen = !aReplaceAttrText.GetText().isEmpty(); - return ( aReplaceAttrText.IsEnabled() && bLen ); + sal_Bool bLen = !m_pReplaceAttrText->GetText().isEmpty(); + return ( m_pReplaceAttrText->IsEnabled() && bLen ); } |