editeng/source/editeng/editview.cxx | 4 ++-- editeng/source/editeng/impedit.cxx | 4 ++-- editeng/source/items/CustomPropertyField.cxx | 2 +- editeng/source/items/flditem.cxx | 16 ++++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-)
New commits: commit c860e7cc974c306961c421be1eb034c78c6c244f Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Sun Nov 19 22:04:58 2023 +0100 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Mon Nov 20 07:55:09 2023 +0100 Extended loplugin:ostr: editeng Change-Id: I5dbd4047d2b66c12475020abfdd2b8f16d65a8f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159714 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index adf135b8e7f6..df9f193ebfe6 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -535,7 +535,7 @@ void EditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bActivat static const OString aPayload = OString::boolean(true); pImpEditView->mpViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CURSOR_VISIBLE, aPayload); - pImpEditView->mpViewShell->NotifyOtherViews(LOK_CALLBACK_VIEW_CURSOR_VISIBLE, "visible", aPayload); + pImpEditView->mpViewShell->NotifyOtherViews(LOK_CALLBACK_VIEW_CURSOR_VISIBLE, "visible"_ostr, aPayload); } } @@ -553,7 +553,7 @@ void EditView::HideCursor(bool bDeactivate) OString aPayload = OString::boolean(false); pImpEditView->mpViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CURSOR_VISIBLE, aPayload); - pImpEditView->mpViewShell->NotifyOtherViews(LOK_CALLBACK_VIEW_CURSOR_VISIBLE, "visible", aPayload); + pImpEditView->mpViewShell->NotifyOtherViews(LOK_CALLBACK_VIEW_CURSOR_VISIBLE, "visible"_ostr, aPayload); } } diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 393a208703b4..851e63c0453d 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -439,12 +439,12 @@ void ImpEditView::lokSelectionCallback(const std::optional<tools::PolyPolygon> & { // Another shell wants to know about our existing selection. if (mpViewShell != mpOtherShell) - mpViewShell->NotifyOtherView(mpOtherShell, LOK_CALLBACK_TEXT_VIEW_SELECTION, "selection", sRectangle); + mpViewShell->NotifyOtherView(mpOtherShell, LOK_CALLBACK_TEXT_VIEW_SELECTION, "selection"_ostr, sRectangle); } else { mpViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_TEXT_SELECTION, sRectangle); - mpViewShell->NotifyOtherViews(LOK_CALLBACK_TEXT_VIEW_SELECTION, "selection", sRectangle); + mpViewShell->NotifyOtherViews(LOK_CALLBACK_TEXT_VIEW_SELECTION, "selection"_ostr, sRectangle); } pOutWin->GetOutDev()->Pop(); diff --git a/editeng/source/items/CustomPropertyField.cxx b/editeng/source/items/CustomPropertyField.cxx index 939a6af0c0d9..eaad4c4c4db8 100644 --- a/editeng/source/items/CustomPropertyField.cxx +++ b/editeng/source/items/CustomPropertyField.cxx @@ -45,7 +45,7 @@ bool CustomPropertyField::operator==(const SvxFieldData& rOther) const MetaAction* CustomPropertyField::createBeginComment() const { - return new MetaCommentAction("FIELD_SEQ_BEGIN"); + return new MetaCommentAction("FIELD_SEQ_BEGIN"_ostr); } OUString CustomPropertyField::GetFormatted(uno::Reference<document::XDocumentProperties> const & xDocumentProperties) diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 1f6a9d9cc485..b501d40ba968 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -266,12 +266,12 @@ bool SvxFieldData::operator==( const SvxFieldData& rFld ) const MetaAction* SvxFieldData::createBeginComment() const { - return new MetaCommentAction( "FIELD_SEQ_BEGIN" ); + return new MetaCommentAction( "FIELD_SEQ_BEGIN"_ostr ); } MetaAction* SvxFieldData::createEndComment() { - return new MetaCommentAction( "FIELD_SEQ_END" ); + return new MetaCommentAction( "FIELD_SEQ_END"_ostr ); } @@ -428,7 +428,7 @@ OUString SvxDateField::GetFormatted( Date const & aDate, SvxDateFormat eFormat, MetaAction* SvxDateField::createBeginComment() const { - return new MetaCommentAction( "FIELD_SEQ_BEGIN" ); + return new MetaCommentAction( "FIELD_SEQ_BEGIN"_ostr ); } SvxURLField::SvxURLField() @@ -466,7 +466,7 @@ bool SvxURLField::operator==( const SvxFieldData& rOther ) const MetaAction* SvxURLField::createBeginComment() const { // #i46618# Adding target URL to metafile comment - return new MetaCommentAction( "FIELD_SEQ_BEGIN", + return new MetaCommentAction( "FIELD_SEQ_BEGIN"_ostr, 0, reinterpret_cast<const sal_uInt8*>(aURL.getStr()), 2*aURL.getLength() ); @@ -490,7 +490,7 @@ bool SvxPageTitleField::operator==( const SvxFieldData& rCmp ) const MetaAction* SvxPageTitleField::createBeginComment() const { - return new MetaCommentAction( "FIELD_SEQ_BEGIN;PageTitleField" ); + return new MetaCommentAction( "FIELD_SEQ_BEGIN;PageTitleField"_ostr ); } // @@ -513,7 +513,7 @@ bool SvxPageField::operator==( const SvxFieldData& rCmp ) const MetaAction* SvxPageField::createBeginComment() const { - return new MetaCommentAction( "FIELD_SEQ_BEGIN;PageField" ); + return new MetaCommentAction( "FIELD_SEQ_BEGIN;PageField"_ostr ); } @@ -543,7 +543,7 @@ bool SvxTimeField::operator==( const SvxFieldData& rCmp ) const MetaAction* SvxTimeField::createBeginComment() const { - return new MetaCommentAction( "FIELD_SEQ_BEGIN" ); + return new MetaCommentAction( "FIELD_SEQ_BEGIN"_ostr ); } SvxFileField::SvxFileField() {} @@ -691,7 +691,7 @@ OUString SvxExtTimeField::GetFormatted( tools::Time const & aTime, SvxTimeFormat MetaAction* SvxExtTimeField::createBeginComment() const { - return new MetaCommentAction( "FIELD_SEQ_BEGIN" ); + return new MetaCommentAction( "FIELD_SEQ_BEGIN"_ostr ); }