include/sfx2/msg.hxx | 2 +- include/svl/memberid.hrc | 4 ++++ sfx2/sdi/sfxitems.sdi | 1 + 3 files changed, 6 insertions(+), 1 deletion(-)
New commits: commit 6554961459d990cfa2ca26d8a102b177f7cc84f5 Author: Eike Rathke <er...@redhat.com> Date: Thu Oct 22 21:11:27 2015 +0200 add missing SearchFiltered to SvxSearchItem slot definitions Already since 26d5cf1ecadc17e5c6aff071b8750b9fadaa1d28 there was one SfxTypeAttrib element less in aAttrib[n] than defined MID_SEARCH_... values in include/svl/memberid.hrc, also SearchFiltered was missing from sfx2/sdi/sfxitems.sdi As a consequence the generated slot definitions workdir/SdiTarget/sc/sdi/scslots.hxx lacked that item. Change-Id: Ic901b3a85fb5242037d713f3642971e7073e684d diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index 7e3c706..94b3ecf 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(20); // for SvxSearchItem +SFX_DECL_TYPE(21); // 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 1593e23..5c9f4e2 100644 --- a/include/svl/memberid.hrc +++ b/include/svl/memberid.hrc @@ -34,6 +34,10 @@ #define MID_SIZE_HEIGHT 2 // SvxSearchItem +// XXX When changing the MID count here, also increment the corresponding +// SvxSearchItem SFX_DECL_TYPE(n) value to match, and add a member to +// struct SvxSearch in sfx2/sdi/sfxitems.sdi so that dependent slot items get +// generated. #define MID_SEARCH_STYLEFAMILY 1 #define MID_SEARCH_CELLTYPE 2 #define MID_SEARCH_ROWDIRECTION 3 diff --git a/sfx2/sdi/sfxitems.sdi b/sfx2/sdi/sfxitems.sdi index f293e5c..f98e9c9 100644 --- a/sfx2/sdi/sfxitems.sdi +++ b/sfx2/sdi/sfxitems.sdi @@ -75,6 +75,7 @@ UINT16 CellType MID_SEARCH_CELLTYPE; BOOL RowDirection MID_SEARCH_ROWDIRECTION; BOOL AllTables MID_SEARCH_ALLTABLES; + BOOL SearchFiltered MID_SEARCH_SEARCHFILTERED; BOOL Backward MID_SEARCH_BACKWARD; BOOL Pattern MID_SEARCH_PATTERN; BOOL Content MID_SEARCH_CONTENT; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits