diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-24 14:32:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-29 10:41:39 +0200 |
| commit | 11bce3212788d03fd53b9f005eaf0e70e6277763 (patch) | |
| tree | 194f3bd15dbadb6338eaa9da3545f952756b9ef9 /include/svx | |
| parent | 4e62eee559f798f9d6f5d7dbcb9179007248d16c (diff) | |
simplify SDRSEARCHPASS_ constants
the calling code only cared about direct or not-direct, so a bool
suffices here
Change-Id: I39c01dedf391777d3a7bc7338afc6de4c6d3a531
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/svdmrkv.hxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index cddd924de42c..18d2a83c71a7 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -56,11 +56,6 @@ namespace o3tl template<> struct typed_flags<SdrSearchOptions> : is_typed_flags<SdrSearchOptions, 0xbfff> {}; } -// SDRSEARCHPASS_... is return parameter value at PickObj(). -#define SDRSEARCHPASS_DIRECT 0x0000 /* Object is hit by 'direct hit' */ -#define SDRSEARCHPASS_INACTIVELIST 0x0001 /* Obj is on the page, but not in the AktGroup (at WHOLEPAGE) */ -#define SDRSEARCHPASS_MASTERPAGE 0x0002 /* Object was found on the MasterPage */ - enum SdrHitKind {SDRHIT_NONE, // No hit SDRHIT_OBJECT, // Hit SDRHIT_BOUNDRECT, // Hit at BoundRect @@ -286,7 +281,7 @@ public: // SdrSearchOptions::DEEP SdrSearchOptions::ALSOONMASTER SdrSearchOptions::TESTMARKABLE SdrSearchOptions::TESTTEXTEDIT // SdrSearchOptions::WITHTEXT SdrSearchOptions::TESTTEXTAREA SdrSearchOptions::BACKWARD SdrSearchOptions::MARKED // SdrSearchOptions::WHOLEPAGE - bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions, SdrObject** ppRootObj, sal_uInt16* pnPassNum=NULL) const; + bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions, SdrObject** ppRootObj, bool* pbHitPassDirect=NULL) const; bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions=SdrSearchOptions::NONE) const; bool MarkObj(const Point& rPnt, short nTol=-2, bool bToggle=false, bool bDeep=false); |