editeng/inc/EditSelection.hxx | 2 +-
editeng/source/editeng/editview.cxx | 4 ++--
editeng/source/editeng/edtspell.cxx | 2 +-
editeng/source/editeng/eertfpar.cxx | 2 +-
editeng/source/editeng/impedit.cxx | 4 ++--
editeng/source/editeng/impedit.hxx | 1 +
editeng/source/editeng/impedit2.cxx | 22 +++++++++++-----------
editeng/source/editeng/impedit4.cxx | 4 ++--
editeng/source/editeng/impedit5.cxx | 2 +-
editeng/source/xml/xmltxtimp.cxx | 4 ++--
lotuswordpro/source/filter/lwptablelayout.cxx | 2 +-
lotuswordpro/source/filter/lwptablelayout.hxx | 2 +-
12 files changed, 26 insertions(+), 25 deletions(-)
New commits:
commit 5c997461bfa0bb40189a96f478cb80e5b4d8a1dc
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Jul 18 11:27:55 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jul 18 15:33:48 2024 +0200
make XFCellListener single-arg constructor explicit
Change-Id: If519af401dca2ec77ff448409888bbc2871a0c9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170682
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx
b/lotuswordpro/source/filter/lwptablelayout.cxx
index 90fb18c7ba67..6ad5534c792f 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -1422,7 +1422,7 @@ void
LwpTableLayout::ConvertDefaultRow(rtl::Reference<XFTable> const & pXFTable,
void LwpTableLayout::SetCellsMap(sal_uInt16 nRow1, sal_uInt8 nCol1,
sal_uInt16 nRow2, sal_uInt8 nCol2, XFCell*
pXFCell)
{
- m_CellsMap.insert({{nRow1, nCol1}, {nRow2, nCol2}}, pXFCell);
+ m_CellsMap.insert({{nRow1, nCol1}, {nRow2, nCol2}},
XFCellListener(pXFCell));
}
/**
diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx
b/lotuswordpro/source/filter/lwptablelayout.hxx
index f54c82b8e1f9..a81abec610fb 100644
--- a/lotuswordpro/source/filter/lwptablelayout.hxx
+++ b/lotuswordpro/source/filter/lwptablelayout.hxx
@@ -101,7 +101,7 @@ struct TableConvertAttempt
class XFCellListener : public SfxListener
{
public:
- XFCellListener(XFCell* pCell)
+ explicit XFCellListener(XFCell* pCell)
: m_pCell(pCell)
{
if (m_pCell)
commit cd3382cd727f905723c95167733836a90a89a101
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Thu Jul 18 09:24:22 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jul 18 15:33:36 2024 +0200
make EditSelection single-arg constructor explicit
Change-Id: Id7a81db385dd3ca30daa37ba74a82d06c417a51c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170678
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/editeng/inc/EditSelection.hxx b/editeng/inc/EditSelection.hxx
index 9d11a9685c30..e6ccdb715612 100644
--- a/editeng/inc/EditSelection.hxx
+++ b/editeng/inc/EditSelection.hxx
@@ -30,7 +30,7 @@ private:
public:
EditSelection() = default;
- EditSelection(const EditPaM& rStartAndEnd)
+ explicit EditSelection(const EditPaM& rStartAndEnd)
: aStartPaM(rStartAndEnd)
, aEndPaM(rStartAndEnd)
{
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index a8dda101c606..a686ccb04111 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -365,7 +365,7 @@ void EditView::setEditEngine(EditEngine* pEditEngine)
assert(pEditEngine);
getImpl().mpEditEngine = pEditEngine;
- EditSelection aStartSel = getEditEngine().GetEditDoc().GetStartPaM();
+ EditSelection aStartSel( getEditEngine().GetEditDoc().GetStartPaM() );
getImpl().SetEditSelection( aStartSel );
}
@@ -1301,7 +1301,7 @@ void EditView::SelectCurrentWord( sal_Int16 nWordType )
{
EditSelection aCurSel( getImpl().GetEditSelection() );
getImpl().DrawSelectionXOR();
- aCurSel = getEditEngine().SelectWord(aCurSel.Max(), nWordType);
+ aCurSel = getEditEngine().SelectWord(EditSelection(aCurSel.Max()),
nWordType);
getImpl().SetEditSelection( aCurSel );
getImpl().DrawSelectionXOR();
ShowCursor( true, false );
diff --git a/editeng/source/editeng/edtspell.cxx
b/editeng/source/editeng/edtspell.cxx
index 77ff6fab9019..0dbcfedd55a0 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -517,7 +517,7 @@ bool EdtAutoCorrDoc::Delete(sal_Int32 nStt, sal_Int32 nEnd)
bool EdtAutoCorrDoc::Insert(sal_Int32 nPos, const OUString& rTxt)
{
- EditSelection aSel = EditPaM( pCurNode, nPos );
+ EditSelection aSel(EditPaM( pCurNode, nPos ));
mpEditEngine->InsertText(aSel, rTxt);
SAL_WARN_IF(nCursor < nPos, "editeng",
"Cursor in the heart of the action?!");
diff --git a/editeng/source/editeng/eertfpar.cxx
b/editeng/source/editeng/eertfpar.cxx
index 9aeea98f6201..2b983cc404f4 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -94,7 +94,7 @@ SvParserState EditRTFParser::CallParser()
// Useful or not?
aStart2PaM.GetNode()->GetContentAttribs().GetItems().ClearItem();
AddRTFDefaultValues( aStart2PaM, aStart2PaM );
- EditPaM aEnd1PaM = mpEditEngine->InsertParaBreak(aCurSel.Max());
+ EditPaM aEnd1PaM =
mpEditEngine->InsertParaBreak(EditSelection(aCurSel.Max()));
// aCurCel now points to the gap
if (mpEditEngine->IsRtfImportHandlerSet())
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index 411b96b8dfe8..cdf309a20e0a 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1767,7 +1767,7 @@ bool ImpEditView::IsWrongSpelledWord( const EditPaM&
rPaM, bool bMarkIfWrong )
bool bIsWrong = false;
if ( rPaM.GetNode()->GetWrongList() )
{
- EditSelection aSel = getEditEngine().SelectWord( rPaM,
css::i18n::WordType::DICTIONARY_WORD );
+ EditSelection aSel = getEditEngine().SelectWord( EditSelection(rPaM),
css::i18n::WordType::DICTIONARY_WORD );
bIsWrong = rPaM.GetNode()->GetWrongList()->HasWrong(
aSel.Min().GetIndex(), aSel.Max().GetIndex() );
if ( bIsWrong && bMarkIfWrong )
{
@@ -1787,7 +1787,7 @@ OUString ImpEditView::SpellIgnoreWord()
EditPaM aPaM = GetEditSelection().Max();
if ( !HasSelection() )
{
- EditSelection aSel = getEditEngine().SelectWord(aPaM);
+ EditSelection aSel =
getEditEngine().SelectWord(EditSelection(aPaM));
aWord = getImpEditEngine().GetSelected( aSel );
}
else
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 768bbbadfc29..5ea71794912d 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -398,6 +398,7 @@ public:
const EditSelection& GetEditSelection() const { return maEditSelection; }
void SetEditSelection(const EditSelection& rEditSelection);
+ void SetEditSelection(const EditPaM& rEditPaM) {
SetEditSelection(EditSelection(rEditPaM)); }
bool HasSelection() const { return maEditSelection.HasRange(); }
void SelectionChanged();
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index d0a49d86ac67..1722b2157480 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -435,7 +435,7 @@ bool ImpEditEngine::Command( const CommandEvent& rCEvt,
EditView* pView )
sal_Int32 nRestore = nOldIMETextLen - nNewIMETextLen;
EditPaM aPaM( mpIMEInfos->aPos );
aPaM.SetIndex( aPaM.GetIndex() + nNewIMETextLen );
- ImpInsertText( aPaM,
mpIMEInfos->aOldTextAfterStartPos.copy( nNewIMETextLen, nRestore ) );
+ ImpInsertText( EditSelection(aPaM),
mpIMEInfos->aOldTextAfterStartPos.copy( nNewIMETextLen, nRestore ) );
}
else if ( ( nOldIMETextLen < nNewIMETextLen ) &&
( nOldIMETextLen <
mpIMEInfos->aOldTextAfterStartPos.getLength() ) )
@@ -467,7 +467,7 @@ bool ImpEditEngine::Command( const CommandEvent& rCEvt,
EditView* pView )
FormatAndLayout( pView );
}
- EditSelection aNewSel = EditPaM( mpIMEInfos->aPos.GetNode(),
mpIMEInfos->aPos.GetIndex()+pData->GetCursorPos() );
+ EditSelection aNewSel( EditPaM( mpIMEInfos->aPos.GetNode(),
mpIMEInfos->aPos.GetIndex()+pData->GetCursorPos() ) );
pView->SetSelection( CreateESel( aNewSel ) );
pView->SetInsertMode( !pData->IsCursorOverwrite() );
@@ -2771,7 +2771,7 @@ EditPaM ImpEditEngine::ImpInsertText(const EditSelection&
aCurSel, const OUStrin
// #i107201# do the expensive SelectWord call only if online spelling is
active
EditSelection aCurWord;
if ( GetStatus().DoOnlineSpelling() )
- aCurWord = SelectWord( aCurPaM, i18n::WordType::DICTIONARY_WORD );
+ aCurWord = SelectWord( EditSelection(aCurPaM),
i18n::WordType::DICTIONARY_WORD );
OUString aText(convertLineEnd(rStr, LINEEND_LF));
if (mbFuzzing) //tab expansion performance in editeng is appalling
@@ -2918,7 +2918,7 @@ EditPaM ImpEditEngine::ImpFastInsertText( EditPaM aPaM,
const OUString& rStr )
}
else
{
- aPaM = ImpInsertText( aPaM, rStr );
+ aPaM = ImpInsertText( EditSelection(aPaM), rStr );
}
return aPaM;
@@ -3068,9 +3068,9 @@ EditPaM ImpEditEngine::InsertParaBreak(const
EditSelection& rCurSel)
( ( aPrevParaText[n] == ' ' ) || ( aPrevParaText[n] == '
' ) ) )
{
if ( aPrevParaText[n] == ' ' )
- aPaM = ImpInsertFeature( aPaM, SfxVoidItem( EE_FEATURE_TAB ) );
+ aPaM = ImpInsertFeature( EditSelection(aPaM), SfxVoidItem(
EE_FEATURE_TAB ) );
else
- aPaM = ImpInsertText( aPaM, OUString(aPrevParaText[n]) );
+ aPaM = ImpInsertText( EditSelection(aPaM),
OUString(aPrevParaText[n]) );
n++;
}
@@ -3998,7 +3998,7 @@ EditSelection ImpEditEngine::PasteText( uno::Reference<
datatransfer::XTransfera
aData >>= aSeq;
{
SvMemoryStream aODFStream( aSeq.getArray(),
aSeq.getLength(), StreamMode::READ );
- aNewSelection = Read( aODFStream, rBaseURL,
EETextFormat::Xml, rPaM );
+ aNewSelection = Read( aODFStream, rBaseURL,
EETextFormat::Xml, EditSelection(rPaM) );
}
bDone = true;
}
@@ -4023,7 +4023,7 @@ EditSelection ImpEditEngine::PasteText( uno::Reference<
datatransfer::XTransfera
SvMemoryStream aHtmlStream(aSeq.getArray(),
aSeq.getLength(), StreamMode::READ);
SvStream* pHtmlStream =
aMSE40HTMLClipFormatObj.IsValid(aHtmlStream);
if (pHtmlStream != nullptr) {
- aNewSelection = Read(*pHtmlStream, rBaseURL,
EETextFormat::Html, rPaM);
+ aNewSelection = Read(*pHtmlStream, rBaseURL,
EETextFormat::Html, EditSelection(rPaM));
}
}
bDone = true;
@@ -4056,7 +4056,7 @@ EditSelection ImpEditEngine::PasteText( uno::Reference<
datatransfer::XTransfera
aData >>= aSeq;
{
SvMemoryStream aRTFStream( aSeq.getArray(),
aSeq.getLength(), StreamMode::READ );
- aNewSelection = Read( aRTFStream, rBaseURL,
EETextFormat::Rtf, rPaM );
+ aNewSelection = Read( aRTFStream, rBaseURL,
EETextFormat::Rtf, EditSelection(rPaM) );
}
bDone = true;
}
@@ -4080,7 +4080,7 @@ EditSelection ImpEditEngine::PasteText( uno::Reference<
datatransfer::XTransfera
uno::Sequence<sal_Int8> aSeq;
aData >>= aSeq;
SvMemoryStream aHtmlStream(aSeq.getArray(),
aSeq.getLength(), StreamMode::READ);
- aNewSelection = Read(aHtmlStream, rBaseURL,
EETextFormat::Html, rPaM);
+ aNewSelection = Read(aHtmlStream, rBaseURL,
EETextFormat::Html, EditSelection(rPaM));
bDone = true;
}
catch (const css::uno::Exception&)
@@ -4100,7 +4100,7 @@ EditSelection ImpEditEngine::PasteText( uno::Reference<
datatransfer::XTransfera
uno::Any aData = rxDataObj->getTransferData( aFlavor );
OUString aText;
aData >>= aText;
- aNewSelection = ImpInsertText( rPaM, aText );
+ aNewSelection = ImpInsertText( EditSelection(rPaM), aText );
}
catch( ... )
{
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index e1f655c1cc89..7df703d9e559 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2289,10 +2289,10 @@ void ImpEditEngine::ApplyChangedSentence(EditView const
& rEditView,
}
SfxItemSet aSet( maEditDoc.GetItemPool(), nLangWhichId,
nLangWhichId);
aSet.Put(SvxLanguageItem(rCurrentNewPortion.eLanguage,
nLangWhichId));
- SetAttribs( aCurrentPaM, aSet );
+ SetAttribs( EditSelection(aCurrentPaM), aSet );
}
//insert the new string and set the cursor to the end of the
inserted string
- aCurrentPaM = ImpInsertText( aCurrentPaM ,
rCurrentNewPortion.sText );
+ aCurrentPaM = ImpInsertText( EditSelection(aCurrentPaM) ,
rCurrentNewPortion.sText );
}
}
UndoActionEnd();
diff --git a/editeng/source/editeng/impedit5.cxx
b/editeng/source/editeng/impedit5.cxx
index 7e3f6ef970c5..7606a8e7c574 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -836,7 +836,7 @@ void ImpEditEngine::InsertView(EditView* pEditView, size_t
nIndex)
maEditViews.insert(maEditViews.begin()+nIndex, pEditView);
- EditSelection aStartSel = maEditDoc.GetStartPaM();
+ EditSelection aStartSel( maEditDoc.GetStartPaM() );
pEditView->getImpl().SetEditSelection( aStartSel );
if (!mpActiveView)
SetActiveView(pEditView);
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index 7d708d0d75d8..8e32d8f62045 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -147,8 +147,8 @@ EditPaM SvxReadXML( EditEngine& rEditEngine, SvStream&
rStream, const ESelection
//get the initial para count before paste
sal_uInt32 initialParaCount = rEditEngine.GetEditDoc().Count();
//insert para breaks before inserting the copied text
- rEditEngine.InsertParaBreak( rEditEngine.CreateSelection( rSel ).Max() );
- rEditEngine.InsertParaBreak( rEditEngine.CreateSelection( rSel ).Max() );
+ rEditEngine.InsertParaBreak( EditSelection(rEditEngine.CreateSelection(
rSel ).Max()) );
+ rEditEngine.InsertParaBreak( EditSelection(rEditEngine.CreateSelection(
rSel ).Max()) );
// Init return PaM.
EditPaM aPaM( rEditEngine.CreateSelection( rSel ).Max());
