diff options
author | Johnny_M <klasse@partyheld.de> | 2018-03-31 13:51:07 +0200 |
---|---|---|
committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-04-12 18:39:22 +0200 |
commit | 667722ab8a366bf5275acb7cddbe1a9b03776821 (patch) | |
tree | 9407e1b896f8d3f0a00db93a78a78e7d7e9d4150 /svx | |
parent | 3ba75bf050336bef3738a92a7a942622b9326498 (diff) |
Translate German variable and function names
Akt -> Current in svdraw
Change-Id: I8df687a5e78ad3e5e5e89b7013f782aa665529cf
Reviewed-on: https://gerrit.libreoffice.org/52190
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdcrtv.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdedtv.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdpagv.cxx | 46 |
3 files changed, 26 insertions, 26 deletions
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index f2d739e76612..673c03ec72b3 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -635,7 +635,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) bool bSceneIntoScene(false); E3dScene* pObjScene = dynamic_cast<E3dScene*>(pObjMerk); - E3dScene* pCurrentScene = pObjScene ? dynamic_cast<E3dScene*>(pCreatePV->GetAktGroup()) : nullptr; + E3dScene* pCurrentScene = pObjScene ? dynamic_cast<E3dScene*>(pCreatePV->GetCurrentGroup()) : nullptr; if (pCurrentScene) { bool bDidInsert = static_cast<E3dView*>(this)->ImpCloneAll3DObjectsToDestScene( diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index ce620ae67e41..f90894df9902 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -853,8 +853,8 @@ void SdrEditView::DeleteMarkedObj() { // we detected an empty parent, a candidate to leave group/3DScene // if entered - if(GetSdrPageView()->GetAktGroup() - && GetSdrPageView()->GetAktGroup() == pParent) + if(GetSdrPageView()->GetCurrentGroup() + && GetSdrPageView()->GetCurrentGroup() == pParent) { GetSdrPageView()->LeaveOneGroup(); } diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index ff6349894259..fb1eee822d25 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -149,9 +149,9 @@ SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView) aLayerPrn.SetAll(); mbVisible = false; - pAktList = nullptr; - pAktGroup = nullptr; - SetAktGroupAndList(nullptr, mpPage); + pCurrentList = nullptr; + pCurrentGroup = nullptr; + SetCurrentGroupAndList(nullptr, mpPage); for(sal_uInt32 a(0); a < rNewView.PaintWindowCount(); a++) { @@ -198,7 +198,7 @@ css::uno::Reference< css::awt::XControlContainer > SdrPageView::GetControlContai void SdrPageView::ModelHasChanged() { - if (GetAktGroup()!=nullptr) CheckAktGroup(); + if (GetCurrentGroup()!=nullptr) CheckCurrentGroup(); } bool SdrPageView::IsReadOnly() const @@ -750,15 +750,15 @@ void SdrPageView::InsertHelpLine(const SdrHelpLine& rHL) } // set current group and list -void SdrPageView::SetAktGroupAndList(SdrObject* pNewGroup, SdrObjList* pNewList) +void SdrPageView::SetCurrentGroupAndList(SdrObject* pNewGroup, SdrObjList* pNewList) { - if(pAktGroup != pNewGroup) + if(pCurrentGroup != pNewGroup) { - pAktGroup = pNewGroup; + pCurrentGroup = pNewGroup; } - if(pAktList != pNewList) + if(pCurrentList != pNewList) { - pAktList = pNewList; + pCurrentList = pNewList; } } @@ -780,7 +780,7 @@ bool SdrPageView::EnterGroup(SdrObject* pObj) // set current group and list SdrObjList* pNewObjList = pObj->GetSubList(); - SetAktGroupAndList(pObj, pNewObjList); + SetCurrentGroupAndList(pObj, pNewObjList); // select contained object if only one object is contained, // else select nothing and let the user decide what to do next @@ -813,7 +813,7 @@ bool SdrPageView::EnterGroup(SdrObject* pObj) void SdrPageView::LeaveOneGroup() { - if(!GetAktGroup()) + if(!GetCurrentGroup()) return; bool bGlueInvalidate = GetView().ImpIsGlueVisible(); @@ -821,8 +821,8 @@ void SdrPageView::LeaveOneGroup() if(bGlueInvalidate) GetView().GlueInvalidate(); - SdrObject* pLastGroup = GetAktGroup(); - SdrObject* pParentGroup = GetAktGroup()->GetUpGroup(); + SdrObject* pLastGroup = GetCurrentGroup(); + SdrObject* pParentGroup = GetCurrentGroup()->GetUpGroup(); SdrObjList* pParentList = GetPage(); if(pParentGroup) @@ -831,8 +831,8 @@ void SdrPageView::LeaveOneGroup() // deselect everything GetView().UnmarkAll(); - // allocations, pAktGroup and pAktList need to be set - SetAktGroupAndList(pParentGroup, pParentList); + // allocations, pCurrentGroup and pCurrentList need to be set + SetCurrentGroupAndList(pParentGroup, pParentList); // select the group we just left if(pLastGroup) @@ -850,20 +850,20 @@ void SdrPageView::LeaveOneGroup() void SdrPageView::LeaveAllGroup() { - if(GetAktGroup()) + if(GetCurrentGroup()) { bool bGlueInvalidate = GetView().ImpIsGlueVisible(); if(bGlueInvalidate) GetView().GlueInvalidate(); - SdrObject* pLastGroup = GetAktGroup(); + SdrObject* pLastGroup = GetCurrentGroup(); // deselect everything GetView().UnmarkAll(); - // allocations, pAktGroup and pAktList always need to be set - SetAktGroupAndList(nullptr, GetPage()); + // allocations, pCurrentGroup and pCurrentList always need to be set + SetCurrentGroupAndList(nullptr, GetPage()); // find and select uppermost group if(pLastGroup) @@ -888,7 +888,7 @@ void SdrPageView::LeaveAllGroup() sal_uInt16 SdrPageView::GetEnteredLevel() const { sal_uInt16 nCount=0; - SdrObject* pGrp=GetAktGroup(); + SdrObject* pGrp=GetCurrentGroup(); while (pGrp!=nullptr) { nCount++; pGrp=pGrp->GetUpGroup(); @@ -896,9 +896,9 @@ sal_uInt16 SdrPageView::GetEnteredLevel() const return nCount; } -void SdrPageView::CheckAktGroup() +void SdrPageView::CheckCurrentGroup() { - SdrObject* pGrp(GetAktGroup()); + SdrObject* pGrp(GetCurrentGroup()); while(nullptr != pGrp && (!pGrp->IsInserted() || nullptr == pGrp->GetObjList() || nullptr == pGrp->GetPage())) @@ -907,7 +907,7 @@ void SdrPageView::CheckAktGroup() pGrp = pGrp->GetUpGroup(); } - if(pGrp != GetAktGroup()) + if(pGrp != GetCurrentGroup()) { if(nullptr != pGrp) { |