summaryrefslogtreecommitdiff
path: root/svx/source/svdraw
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-03-19 11:22:11 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-03-19 11:03:42 +0100
commit34ea5c21a752364caef9727850ef34943ad5c752 (patch)
treecfda8f313f8cc1b574c54caf104306319c2ac13f /svx/source/svdraw
parent5ac6f02fdc6015a5d78071570dee310febf95fc6 (diff)
add operator* to tools::WeakReference
which fixes warnings from commit ef37ab245b8095895f715217236e8e2fb90613c6 Date: Thu Mar 19 09:21:45 2020 +0200 loplugin:redundantpointerops add some more smart pointer types which I pushed earlier, where I added tools::WeakReference to the list of smart pointer types, but of course the conversion it recommended is not possible without an operator* Change-Id: I9433b7aba46a3a15f9d833847ae3659367388109 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90735 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r--svx/source/svdraw/svdedxv.cxx13
1 files changed, 5 insertions, 8 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index c5ddfef3dac4..9b76a6eafe31 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1450,7 +1450,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
if (GetModel() && mxTextEditObj.is())
{
- SdrHint aHint(SdrHintKind::EndEdit, *mxTextEditObj.get());
+ SdrHint aHint(SdrHintKind::EndEdit, *mxTextEditObj);
GetModel()->Broadcast(aHint);
}
@@ -2168,8 +2168,7 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll)
if (bUndo)
{
BegUndo(ImpGetDescriptionString(STR_EditSetAttributes));
- AddUndo(
- GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*mxTextEditObj.get()));
+ AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*mxTextEditObj));
// If this is a text object also rescue the OutlinerParaObject since
// applying attributes to the object may change text layout when
@@ -2179,7 +2178,7 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll)
bool bRescueText = mxTextEditObj.get();
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(
- *mxTextEditObj.get(), false, !bNoEEItems || bRescueText));
+ *mxTextEditObj, false, !bNoEEItems || bRescueText));
EndUndo();
}
@@ -2216,10 +2215,8 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll)
if (IsUndoEnabled())
{
BegUndo(ImpGetDescriptionString(STR_EditSetAttributes));
- AddUndo(
- GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*mxTextEditObj.get()));
- AddUndo(
- GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*mxTextEditObj.get()));
+ AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*mxTextEditObj));
+ AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*mxTextEditObj));
EndUndo();
}