[Libreoffice-commits] core.git: svx/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Feb 20 09:44:24 UTC 2019
svx/source/svdraw/svdcrtv.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit dc14490b816aa71b1b949c0df7d678bacccce3c4
Author: Johnny_M <klasse at partyheld.de>
AuthorDate: Sun Jan 13 14:50:43 2019 +0100
Commit: Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Feb 20 10:44:01 2019 +0100
Translate German variable names
Please feel free to suggest a better name, if desired
Change-Id: If3acbbc2ff29ec9b25b7be1fa1bc4836f79e52c9
Reviewed-on: https://gerrit.libreoffice.org/66259
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 15e6a07cef00..d1e1be7a8e1d 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -554,10 +554,10 @@ void SdrCreateView::MovCreateObj(const Point& rPnt)
}
if (aPnt==maDragStat.GetNow()) return;
- bool bMerk(maDragStat.IsMinMoved());
+ bool bIsMinMoved(maDragStat.IsMinMoved());
if (maDragStat.CheckMinMoved(aPnt))
{
- if (!bMerk) maDragStat.NextPoint();
+ if (!bIsMinMoved) maDragStat.NextPoint();
maDragStat.NextMove(aPnt);
pCurrentCreate->MovCreate(maDragStat);
@@ -598,7 +598,7 @@ void SdrCreateView::SetupObjLayer(const SdrPageView* pPageView, const OUString&
bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
{
bool bRet=false;
- SdrObject* pObjMerk=pCurrentCreate;
+ SdrObject* pObjCreated=pCurrentCreate;
if (pCurrentCreate!=nullptr)
{
@@ -630,7 +630,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
// recognize creation of a new 3D object inside a 3D scene
bool bSceneIntoScene(false);
- E3dScene* pObjScene = dynamic_cast<E3dScene*>(pObjMerk);
+ E3dScene* pObjScene = dynamic_cast<E3dScene*>(pObjCreated);
E3dScene* pCurrentScene = pObjScene ? dynamic_cast<E3dScene*>(pCreatePV->GetCurrentGroup()) : nullptr;
if (pCurrentScene)
{
@@ -640,8 +640,8 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
if(bDidInsert)
{
// delete object, its content is cloned and inserted
- SdrObject::Free( pObjMerk );
- pObjMerk = nullptr;
+ SdrObject::Free( pObjCreated );
+ pObjCreated = nullptr;
bSceneIntoScene = true;
}
}
More information about the Libreoffice-commits
mailing list