diff options
| author | Dennis Francis <dennisfrancis.in@gmail.com> | 2015-10-17 23:14:35 +0530 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-10-23 00:24:18 +0000 |
| commit | 9a85743766e8a063d20d5f93ee88758e243397f4 (patch) | |
| tree | 5cfcdbf0072a5ba099ee22d06af618717bffa22b /include | |
| parent | b5a1a23ed05d5b72d50bf08b8f6fd550eea17b64 (diff) | |
tdf#48456 : when searching for a number, consider formatting
Change-Id: I4a1e3e269a269bb37e88aa8810a46d0f4ecfc518
Reviewed-on: https://gerrit.libreoffice.org/19420
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/msg.hxx | 2 | ||||
| -rw-r--r-- | include/svl/memberid.hrc | 1 | ||||
| -rw-r--r-- | include/svl/srchitem.hxx | 4 | ||||
| -rw-r--r-- | include/svx/dialogs.hrc | 1 | ||||
| -rw-r--r-- | include/svx/srchdlg.hxx | 1 | ||||
| -rw-r--r-- | include/unotools/searchopt.hxx | 2 |
6 files changed, 10 insertions, 1 deletions
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index 94b3ecf9fbda..d9e2c12d650e 100644 --- a/include/sfx2/msg.hxx +++ b/include/sfx2/msg.hxx @@ -153,7 +153,7 @@ SFX_DECL_TYPE(13); // for SwAddPrinterItem, Sd... SFX_DECL_TYPE(14); SFX_DECL_TYPE(16); // for SwDocDisplayItem SFX_DECL_TYPE(17); // for SvxAddressItem -SFX_DECL_TYPE(21); // for SvxSearchItem +SFX_DECL_TYPE(22); // for SvxSearchItem // all SfxTypes must be in this header #undef SFX_DECL_TYPE diff --git a/include/svl/memberid.hrc b/include/svl/memberid.hrc index 5c9f4e249d14..f3fdd5334667 100644 --- a/include/svl/memberid.hrc +++ b/include/svl/memberid.hrc @@ -59,6 +59,7 @@ #define MID_SEARCH_COMMAND 19 #define MID_SEARCH_STARTPOINTX 20 #define MID_SEARCH_STARTPOINTY 21 +#define MID_SEARCH_SEARCHFORMATTED 22 #endif diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 70b54103a96b..4813458afb9a 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -75,6 +75,7 @@ class SVL_DLLPUBLIC SvxSearchItem : bool m_bRowDirection; // search direction: row-wise/column-wise bool m_bAllTables; // search in all sheets bool m_bSearchFiltered; // search filtered cells. + bool m_bSearchFormatted; // search formatted display strings // Writer-specific bool m_bNotes; @@ -149,6 +150,9 @@ public: bool IsSearchFiltered() const { return m_bSearchFiltered; } void SetSearchFiltered(bool b) { m_bSearchFiltered = b; } + bool IsSearchFormatted() const { return m_bSearchFormatted; } + void SetSearchFormatted(bool b) { m_bSearchFormatted = b; } + SvxSearchCellType GetCellType() const { return m_nCellType; } void SetCellType(SvxSearchCellType nNewCellType) { m_nCellType = nNewCellType; } diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 222440fc2ec7..88da6a980e59 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -942,6 +942,7 @@ #define RID_SVXSTR_TEXTCOLOR (RID_SVX_START + 1178) +#define RID_SVXSTR_FINDBAR_SEARCHFORMATTED (RID_SVX_START + 1188) #define RID_SVXSTR_FINDBAR_MATCHCASE (RID_SVX_START + 1189) #define RID_SVXSTR_FINDBAR_FIND (RID_SVX_START + 1190) diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index b27a0478bf64..556659fa618a 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -171,6 +171,7 @@ private: VclPtr<PushButton> m_pSearchComponent2PB; VclPtr<CheckBox> m_pMatchCaseCB; + VclPtr<CheckBox> m_pSearchFormattedCB; VclPtr<CheckBox> m_pWordBtn; VclPtr<PushButton> m_pCloseBtn; diff --git a/include/unotools/searchopt.hxx b/include/unotools/searchopt.hxx index df655d74dec5..c560ae98e429 100644 --- a/include/unotools/searchopt.hxx +++ b/include/unotools/searchopt.hxx @@ -47,6 +47,7 @@ public: bool IsSimilaritySearch() const; bool IsUseAsianOptions() const; bool IsMatchCase() const; // also Japanese search option + bool IsSearchFormatted() const; bool IsNotes() const; void SetWholeWordsOnly( bool bVal ); @@ -56,6 +57,7 @@ public: void SetSimilaritySearch( bool bVal ); void SetUseAsianOptions( bool bVal ); void SetMatchCase( bool bVal ); // also Japanese search option + void SetSearchFormatted( bool bVal ); void SetNotes( bool bVal); // Japanese search options |