config_host/config_global.h.in | 2 +- extensions/source/propctrlr/formcomponenthandler.hxx | 2 +- include/formula/grammar.hxx | 2 +- include/svx/svdmodel.hxx | 2 +- offapi/com/sun/star/chart2/XChartDocument.idl | 4 ++-- offapi/com/sun/star/ucb/XFileIdentifierConverter.idl | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 493d3558c6e6dce980cb92434f72c0ad03487aa0 Author: Andrea Gelmini <[email protected]> AuthorDate: Thu Jan 20 15:33:13 2022 +0100 Commit: Julien Nabet <[email protected]> CommitDate: Thu Jan 20 17:34:36 2022 +0100 Fix typo Thanks a lot to Valter Mura: https://listarchives.libreoffice.org/global/l10n/2022/msg00005.html Change-Id: I37467e1b9ba7cba2553be5df0d8324da8fe6c13b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128303 Tested-by: Jenkins Reviewed-by: Julien Nabet <[email protected]> diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in index 5f24fe8da397..40b804a60f77 100644 --- a/config_host/config_global.h.in +++ b/config_host/config_global.h.in @@ -35,7 +35,7 @@ Any change in this header will cause a rebuild of almost everything. <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87150> "move ctor wrongly chosen in return stmt (derived vs. base)"; MSVC++ 14.24 started to implement it, see <https:// developercommunity.visualstudio.com/content/problem/852827/ - msvc-1424-started-to-chose-move-ctor-in-return-der.html> "MSVC++ 14.24 started to chose move ctor + msvc-1424-started-to-chose-move-ctor-in-return-der.html> "MSVC++ 14.24 started to choose move ctor in return derived vs. base". At least Clang 9, which does not implement it, emits -Werror,-Wreturn-std-move when it therefore considers a std::move to be missing. On the other hand, at least some versions of GCC would emit -Werror=redundant-move in places where such a diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 79b83fb927ed..bc7367abbeae 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -255,7 +255,7 @@ namespace pcr */ bool impl_dialogFilterOrSort_nothrow( bool _bFilter, OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; - /** executes a dialog which allows the user to chose the columns linking + /** executes a dialog which allows the user to choose the columns linking a sub to a master form, and sets the respective MasterFields / SlaveFields properties at the form. @precond diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx index b5b499d5aab4..677087d19934 100644 --- a/include/formula/grammar.hxx +++ b/include/formula/grammar.hxx @@ -33,7 +33,7 @@ class FORMULA_DLLPUBLIC FormulaGrammar { public: enum AddressConvention{ - CONV_UNSPECIFIED = -1, /* useful when we want method to chose, must be first */ + CONV_UNSPECIFIED = -1, /* useful when we want method to choose, must be first */ /* elements must be sequential and changes should be reflected in ScCompiler::pCharTables */ CONV_OOO = 0, /* 'doc'#sheet.A1:sheet2.B2 */ diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 2170f78907ed..62c9be0344e5 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -279,7 +279,7 @@ public: // If you do use a custom Pool, make sure you inherit from SdrItemPool, // if you want to use symbol objects inherited from SdrAttrObj. // If, however, you use objects inheriting from SdrObject you are free - // to chose a pool of your liking. + // to choose a pool of your liking. // // tdf#118731 a bDisablePropertyFiles of true will disable ability to load // XPropertyFiles describing defaults. Useful for UI preview widgets diff --git a/offapi/com/sun/star/chart2/XChartDocument.idl b/offapi/com/sun/star/chart2/XChartDocument.idl index 0055cbb83fd2..484d4c256a94 100644 --- a/offapi/com/sun/star/chart2/XChartDocument.idl +++ b/offapi/com/sun/star/chart2/XChartDocument.idl @@ -42,7 +42,7 @@ interface XChartDocument : ::com::sun::star::frame::XModel <p>Notes: this is preliminary, we need an API that supports more than one diagram. The method name getDiagram exists in - the css.chart API, so there is would be no way to chose either + the css.chart API, so there is would be no way to choose either this or the other method from Basic (it would chose one or the other by random).</p> */ @@ -52,7 +52,7 @@ interface XChartDocument : ::com::sun::star::frame::XModel <p>Notes: this is preliminary, we need an API that supports more than one diagram. The method name setDiagram exists in - the css.chart API, so there is would be no way to chose either + the css.chart API, so there is would be no way to choose either this or the other method from Basic (it would chose one or the other by random).</p> */ diff --git a/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl b/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl index 0f210ea1251b..618cfa33bf4d 100644 --- a/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl +++ b/offapi/com/sun/star/ucb/XFileIdentifierConverter.idl @@ -33,7 +33,7 @@ published interface XFileIdentifierConverter : com::sun::star::uno::XInterface { /** Get information about the "locality" of a file content provider. - <p>The returned information can be used to chose the "best" among a + <p>The returned information can be used to choose the "best" among a number of file content providers implementing this interface. @param BaseURL
