diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-26 10:55:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-27 10:18:12 +0100 |
| commit | 876463415a47113433a5bf92887e0623c6626649 (patch) | |
| tree | 0c109783120b12c1ea713cf259b57c8e8b882149 /include | |
| parent | ce6ac77816005b380700118d0b1de0f145503024 (diff) | |
remove unused SdrSearchOptions enum values
Change-Id: I0a8867399699d1c5ce17c2e5dadf96510246f173
Reviewed-on: https://gerrit.libreoffice.org/64067
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdmrkv.hxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index abffdba68434..fd9d2399e910 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -39,22 +39,18 @@ enum class SdrSearchOptions TESTMARKABLE = 0x0008, /* just markable objects/points/handles/... */ TESTMACRO = 0x0010, /* Just objects with macro */ TESTTEXTEDIT = 0x0020, /* Just TextEdit-enabled objects */ - WITHTEXT = 0x0040, /* Just objects with text */ - TESTTEXTAREA = 0x0080, /* The textarea of objects with text (TextEditHit) */ - BACKWARD = 0x0100, /* Backwards search */ - MARKED = 0x0400, /* Just marked objects/points/... */ - PASS2BOUND = 0x0800, /* In case of empty search results, then 2nd. try with BoundRectHit */ - PASS3NEAREST = 0x1000, /* In case of empty search results, then new 3rd. Try with NearestBoundRectHit */ - BEFOREMARK = 0x2000, /* if one marked one found, ignore all behind that */ - - IMPISMASTER = 0x8000, /* MasterPage is being searched right now */ + MARKED = 0x0040, /* Just marked objects/points/... */ + PASS2BOUND = 0x0080, /* In case of empty search results, then 2nd. try with BoundRectHit */ + BEFOREMARK = 0x0100, /* if one marked one found, ignore all behind that */ + + IMPISMASTER = 0x0200, /* MasterPage is being searched right now */ PICKMARKABLE = TESTMARKABLE, PICKTEXTEDIT = DEEP | TESTMARKABLE | TESTTEXTEDIT, PICKMACRO = DEEP | ALSOONMASTER | WHOLEPAGE | TESTMACRO, }; namespace o3tl { - template<> struct typed_flags<SdrSearchOptions> : is_typed_flags<SdrSearchOptions, 0xbdff> {}; + template<> struct typed_flags<SdrSearchOptions> : is_typed_flags<SdrSearchOptions, 0x03ff> {}; } enum class SdrHitKind @@ -267,13 +263,13 @@ public: // Pick: Supported options for nOptions are: // SdrSearchOptions::DEEP SdrSearchOptions::ALSOONMASTER SdrSearchOptions::TESTMARKABLE SdrSearchOptions::TESTTEXTEDIT - // SdrSearchOptions::WITHTEXT SdrSearchOptions::TESTTEXTAREA SdrSearchOptions::BACKWARD SdrSearchOptions::MARKED + // SdrSearchOptions::MARKED // SdrSearchOptions::WHOLEPAGE SdrObject* PickObj(const Point& rPnt, short nTol, SdrPageView*& rpPV, SdrSearchOptions nOptions, SdrObject** ppRootObj, bool* pbHitPassDirect=nullptr) const; SdrObject* PickObj(const Point& rPnt, short nTol, SdrPageView*& rpPV, SdrSearchOptions nOptions=SdrSearchOptions::NONE) const; bool MarkObj(const Point& rPnt, short nTol=-2, bool bToggle=false, bool bDeep=false); - // Pick: Supported options for nOptions are SdrSearchOptions::PASS2BOUND and SdrSearchOptions::PASS3NEAREST + // Pick: Supported options for nOptions are SdrSearchOptions::PASS2BOUND bool PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions) const; // Selects the most upper of the marked objects (O1) and scans from there |