compilerplugins/clang/constantparam.numbers.results | 4 ++-- compilerplugins/clang/unusedvariablemore.cxx | 2 +- solenv/clang-format/excludelist | 4 ++-- sw/Library_sw.mk | 2 +- sw/inc/pch/precompiled_sw.hxx | 2 +- sw/source/core/crsr/DateFormFieldButton.cxx | 2 +- sw/source/core/crsr/DropDownFormFieldButton.cxx | 2 +- sw/source/core/crsr/FormFieldButton.cxx | 2 +- sw/source/core/crsr/bookmark.cxx | 2 +- sw/source/core/crsr/swcrsr.cxx | 2 +- sw/source/core/doc/CntntIdxStore.cxx | 2 +- sw/source/core/doc/DocumentContentOperationsManager.cxx | 2 +- sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 2 +- sw/source/core/doc/docbm.cxx | 2 +- sw/source/core/doc/swserv.cxx | 2 +- sw/source/core/inc/annotationmark.hxx | 2 +- sw/source/core/inc/crossrefbookmark.hxx | 2 +- sw/source/core/text/porfld.cxx | 2 +- sw/source/core/text/redlnitr.cxx | 2 +- sw/source/core/undo/rolbck.cxx | 2 +- sw/source/core/view/viewsh.cxx | 2 +- sw/source/filter/basflt/fltshell.cxx | 2 +- sw/source/uibase/shells/textsh1.cxx | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-)
New commits: commit 21b2c6b7d8f4661dcbd40df4f8b9126d331cbd7f Author: Julien Nabet <serval2...@yahoo.fr> AuthorDate: Sat Oct 9 21:48:41 2021 +0200 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Sat Oct 9 23:17:06 2021 +0200 Rename bookmrk* -> bookmark* Change-Id: I9dec77b2af8abe5abb286ff76ed85d1e4078ee6a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123325 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/compilerplugins/clang/constantparam.numbers.results b/compilerplugins/clang/constantparam.numbers.results index baacd2131d57..faa5ad0485a6 100644 --- a/compilerplugins/clang/constantparam.numbers.results +++ b/compilerplugins/clang/constantparam.numbers.results @@ -2886,11 +2886,11 @@ sw/source/core/access/accmap.cxx:469 void SwAccessibleEvent_Impl::SwAccessibleEvent_Impl(enum SwAccessibleEvent_Impl::EventType,const class SwFrame *,const class sw::access::SwAccessibleChild &,const class SwRect &) enum SwAccessibleEvent_Impl::EventType eT 3 -sw/source/core/crsr/bookmrk.cxx:160 +sw/source/core/crsr/bookmark.cxx:160 void lcl_SetFieldMarks(class sw::mark::Fieldmark &,class SwDoc &,const char16_t,const char16_t,const struct SwPosition *const) const char16_t aStartMark 7 -sw/source/core/crsr/bookmrk.cxx:216 +sw/source/core/crsr/bookmark.cxx:216 void lcl_RemoveFieldMarks(const class sw::mark::Fieldmark &,class SwDoc &,const char16_t,const char16_t) const char16_t aStartMark 7 diff --git a/compilerplugins/clang/unusedvariablemore.cxx b/compilerplugins/clang/unusedvariablemore.cxx index b4394b31f8d6..f165a6d6b50c 100644 --- a/compilerplugins/clang/unusedvariablemore.cxx +++ b/compilerplugins/clang/unusedvariablemore.cxx @@ -98,7 +98,7 @@ void UnusedVariableMore::run() if (fn == SRCDIR "/sc/source/ui/miscdlgs/simpref.cxx") return; // Using an SwPaM to do stuff - if (fn == SRCDIR "/sw/source/core/crsr/bookmrk.cxx") + if (fn == SRCDIR "/sw/source/core/crsr/bookmark.cxx") return; // index variable in for loop? if (fn == SRCDIR "/sw/source/uibase/docvw/edtwin.cxx") diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 92219dba46ae..163d778fb3b1 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -12401,7 +12401,7 @@ sw/source/core/bastyp/swregion.cxx sw/source/core/bastyp/tabcol.cxx sw/source/core/crsr/BlockCursor.hxx sw/source/core/crsr/annotationmark.cxx -sw/source/core/crsr/bookmrk.cxx +sw/source/core/crsr/bookmark.cxx sw/source/core/crsr/callnk.cxx sw/source/core/crsr/callnk.hxx sw/source/core/crsr/crbm.cxx @@ -12600,7 +12600,7 @@ sw/source/core/inc/anchoredobjectposition.hxx sw/source/core/inc/annotationmark.hxx sw/source/core/inc/ascharanchoredobjectposition.hxx sw/source/core/inc/bodyfrm.hxx -sw/source/core/inc/bookmrk.hxx +sw/source/core/inc/bookmark.hxx sw/source/core/inc/cellfrm.hxx sw/source/core/inc/cntfrm.hxx sw/source/core/inc/crossrefbookmark.hxx diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 8f9398d2ab8b..87018ce438b9 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -147,7 +147,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/core/bastyp/tabcol \ sw/source/core/crsr/annotationmark \ sw/source/core/crsr/BlockCursor \ - sw/source/core/crsr/bookmrk \ + sw/source/core/crsr/bookmark \ sw/source/core/crsr/callnk \ sw/source/core/crsr/crbm \ sw/source/core/crsr/crossrefbookmark \ diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 0ecdc4eb2bb3..a85fb672873a 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -479,7 +479,7 @@ #include <authfld.hxx> #include <basesh.hxx> #include <bodyfrm.hxx> -#include <bookmrk.hxx> +#include <bookmark.hxx> #include <breakit.hxx> #include <calbck.hxx> #include <calc.hxx> diff --git a/sw/source/core/crsr/DateFormFieldButton.cxx b/sw/source/core/crsr/DateFormFieldButton.cxx index 0cc1268bb7e1..aee3bf326f1e 100644 --- a/sw/source/core/crsr/DateFormFieldButton.cxx +++ b/sw/source/core/crsr/DateFormFieldButton.cxx @@ -9,7 +9,7 @@ #include <DateFormFieldButton.hxx> #include <edtwin.hxx> -#include <bookmrk.hxx> +#include <bookmark.hxx> #include <tools/date.hxx> #include <svl/numformat.hxx> #include <svl/zforlist.hxx> diff --git a/sw/source/core/crsr/DropDownFormFieldButton.cxx b/sw/source/core/crsr/DropDownFormFieldButton.cxx index 4dd968e7ee62..0bf317bc6757 100644 --- a/sw/source/core/crsr/DropDownFormFieldButton.cxx +++ b/sw/source/core/crsr/DropDownFormFieldButton.cxx @@ -9,7 +9,7 @@ #include <DropDownFormFieldButton.hxx> #include <edtwin.hxx> -#include <bookmrk.hxx> +#include <bookmark.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <xmloff/odffields.hxx> diff --git a/sw/source/core/crsr/FormFieldButton.cxx b/sw/source/core/crsr/FormFieldButton.cxx index 0f13494b648e..43534de207c0 100644 --- a/sw/source/core/crsr/FormFieldButton.cxx +++ b/sw/source/core/crsr/FormFieldButton.cxx @@ -10,7 +10,7 @@ #include <DropDownFormFieldButton.hxx> #include <edtwin.hxx> #include <basegfx/color/bcolortools.hxx> -#include <bookmrk.hxx> +#include <bookmark.hxx> #include <vcl/weldutils.hxx> #include <vcl/event.hxx> diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmark.cxx similarity index 99% rename from sw/source/core/crsr/bookmrk.cxx rename to sw/source/core/crsr/bookmark.cxx index b1d89245f58c..6e7863d7dc7d 100644 --- a/sw/source/core/crsr/bookmrk.cxx +++ b/sw/source/core/crsr/bookmark.cxx @@ -18,7 +18,7 @@ */ #include <memory> -#include <bookmrk.hxx> +#include <bookmark.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentLinksAdministration.hxx> #include <IDocumentState.hxx> diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 2159d3dd2224..a8adba16c10e 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -29,7 +29,7 @@ #include <swtblfmt.hxx> #include <swcrsr.hxx> #include <unocrsr.hxx> -#include <bookmrk.hxx> +#include <bookmark.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <IDocumentRedlineAccess.hxx> diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx index 6fc683fe9800..ae4210aa563c 100644 --- a/sw/source/core/doc/CntntIdxStore.cxx +++ b/sw/source/core/doc/CntntIdxStore.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <bookmrk.hxx> +#include <bookmark.hxx> #include <cntfrm.hxx> #include <doc.hxx> #include <IDocumentRedlineAccess.hxx> diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 787e3ee6c2ff..dd0541fae84c 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -63,7 +63,7 @@ #include <UndoAttribute.hxx> #include <rolbck.hxx> #include <acorrect.hxx> -#include <bookmrk.hxx> +#include <bookmark.hxx> #include <ftnidx.hxx> #include <txtftn.hxx> #include <hints.hxx> diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx index 76d982fa7c2b..c53fbb27aef9 100644 --- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx +++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/document/UpdateDocMode.hpp> #include <swtypes.hxx> #include <docsh.hxx> -#include <bookmrk.hxx> +#include <bookmark.hxx> #include <swserv.hxx> #include <swbaslnk.hxx> #include <section.hxx> diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index 32908e877cc7..56510b143ab0 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -21,7 +21,7 @@ #include <utility> #include <MarkManager.hxx> -#include <bookmrk.hxx> +#include <bookmark.hxx> #include <crossrefbookmark.hxx> #include <crsrsh.hxx> #include <annotationmark.hxx> diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx index 2236938a5ad2..d9bb20079701 100644 --- a/sw/source/core/doc/swserv.cxx +++ b/sw/source/core/doc/swserv.cxx @@ -27,7 +27,7 @@ #include <swbaslnk.hxx> #include <mvsave.hxx> #include <IMark.hxx> -#include <bookmrk.hxx> +#include <bookmark.hxx> #include <pam.hxx> #include <shellio.hxx> diff --git a/sw/source/core/inc/annotationmark.hxx b/sw/source/core/inc/annotationmark.hxx index a807c36e01af..c4c2bc1288d1 100644 --- a/sw/source/core/inc/annotationmark.hxx +++ b/sw/source/core/inc/annotationmark.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SW_SOURCE_CORE_INC_ANNOTATIONMARK_HXX #define INCLUDED_SW_SOURCE_CORE_INC_ANNOTATIONMARK_HXX -#include "bookmrk.hxx" +#include "bookmark.hxx" #include <rtl/ustring.hxx> class SwFormatField; diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmark.hxx similarity index 100% rename from sw/source/core/inc/bookmrk.hxx rename to sw/source/core/inc/bookmark.hxx diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx index 70ebba4284f9..90e4927ed862 100644 --- a/sw/source/core/inc/crossrefbookmark.hxx +++ b/sw/source/core/inc/crossrefbookmark.hxx @@ -24,7 +24,7 @@ #include <string_view> -#include "bookmrk.hxx" +#include "bookmark.hxx" #include <rtl/ustring.hxx> #include <vcl/keycod.hxx> diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 7b1bf03e10fc..7c9aba47d74e 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -42,7 +42,7 @@ #include <accessibilityoptions.hxx> #include <editeng/lrspitem.hxx> #include <unicode/ubidi.h> -#include <bookmrk.hxx> +#include <bookmark.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index ccb520abb82a..1440c08a7e89 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -37,7 +37,7 @@ #include <IDocumentLayoutAccess.hxx> #include <IDocumentMarkAccess.hxx> #include <IMark.hxx> -#include <bookmrk.hxx> +#include <bookmark.hxx> #include <rootfrm.hxx> #include <breakit.hxx> #include <vcl/commandevent.hxx> diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index 824874f4a3e0..4b304c1ff845 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -55,7 +55,7 @@ #include <IMark.hxx> #include <charfmt.hxx> #include <strings.hrc> -#include <bookmrk.hxx> +#include <bookmark.hxx> #include <frameformats.hxx> #include <memory> diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 91de951d9eb4..c1adf1af8337 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -52,7 +52,7 @@ #include <ptqueue.hxx> #include <docsh.hxx> #include <pagedesc.hxx> -#include <bookmrk.hxx> +#include <bookmark.hxx> #include <ndole.hxx> #include <ndindex.hxx> #include <accmap.hxx> diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index dd8d439d076d..3d551ae475a1 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -44,7 +44,7 @@ #include <txtfld.hxx> #include <tox.hxx> #include <expfld.hxx> -#include <bookmrk.hxx> +#include <bookmark.hxx> #include <fltshell.hxx> #include <rdfhelper.hxx> diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index daf3f0c6803a..c60e3bd32adc 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -100,7 +100,7 @@ #include <numrule.hxx> #include <memory> #include <xmloff/odffields.hxx> -#include <bookmrk.hxx> +#include <bookmark.hxx> #include <linguistic/misc.hxx> #include <authfld.hxx>