diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-04 15:46:41 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-05 19:09:15 +0100 |
| commit | f25cdaa78d5e7d200fbaf31cce9895bab7c5ee63 (patch) | |
| tree | 4a05313e773c0182b68e00508287aaeb583668e7 /include | |
| parent | Remove unfinished code. (diff) | |
| download | core-f25cdaa78d5e7d200fbaf31cce9895bab7c5ee63.tar.gz core-f25cdaa78d5e7d200fbaf31cce9895bab7c5ee63.zip | |
fdo#74132: Do not interrupt search in Writer.
Instead of "Do you want to continue at the beginning?" dialog,
just inform that we were at the end of the document in new label.
Also replace 'Search key not found' dialog with label.
Change-Id: I6a140cbad93406b73996f87a6d05fcc5d245fdbf
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/dialogs.hrc | 2 | ||||
| -rw-r--r-- | include/svx/srchdlg.hxx | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 2bf58e7f7c2b..e0d70950f37b 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -242,11 +242,13 @@ #define RID_SVXSTR_LANGUAGE_ALL (RID_SVX_START + 15) // Strings from the search dialog +#define RID_SVXSTR_SEARCH_END (RID_SVX_START + 79) #define RID_SVXSTR_SEARCH_STYLES (RID_SVX_START + 80) #define RID_SVXSTR_SEARCH (RID_SVX_START + 81) #define RID_SVXSTR_REPLACE (RID_SVX_START + 82) #define RID_SVXSTR_WRITER_STYLES (RID_SVX_START + 83) #define RID_SVXSTR_CALC_STYLES (RID_SVX_START + 85) +#define RID_SVXSTR_SEARCH_NOT_FOUND (RID_SVX_START + 88) // ResIds for the PageDialog // Strings of the ToolBox-Controls from tbcontrl.cxx diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index b6401009f2d8..50f7d6366254 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -79,6 +79,13 @@ public: // class SvxSearchDialogWrapper ------------------------------------------ +enum SearchLabel +{ + SL_Empty, + SL_NotFound, + SL_End +}; + class SvxSearchDialog; class SVX_DLLPUBLIC SvxSearchDialogWrapper : public SfxChildWindow { @@ -89,6 +96,7 @@ public: ~SvxSearchDialogWrapper (); SvxSearchDialog *getDialog (); + static void SetSearchLabel(const SearchLabel& rSL); SFX_DECL_CHILDWINDOW_WITHID(SvxSearchDialogWrapper); }; @@ -139,6 +147,8 @@ public: void SetSaveToModule(bool b); + void SetSearchLabel(const OUString& rStr) { m_pSearchLabel->SetText(rStr); } + private: Window* mpDocWin; sal_Bool mbSuccess; @@ -147,6 +157,7 @@ private: ComboBox* m_pSearchLB; ListBox* m_pSearchTmplLB; FixedText* m_pSearchAttrText; + FixedText* m_pSearchLabel; VclFrame* m_pReplaceFrame; ComboBox* m_pReplaceLB; |