include/svx/svdcrtv.hxx | 12 +++++-----
svx/source/svdraw/svdcrtv.cxx | 46 +++++++++++++++++++++---------------------
svx/source/svdraw/svdview.cxx | 6 ++---
3 files changed, 32 insertions(+), 32 deletions(-)
New commits:
commit bb3366b8e72070000ad77f430d9a15410af82511
Author: Johnny_M <kla...@partyheld.de>
Date: Sat Mar 24 12:53:15 2018 +0100
Translate German variable names
Akt -> Current in svdraw
(Other occurrences will be done separately.)
Change-Id: I5dc6b52678b4ce4e875f8c1aaf68e7367bf6e922
Reviewed-on: https://gerrit.libreoffice.org/51799
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gan...@poczta.onet.pl>
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index fdfe5206b71f..3b71a5088510 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -44,12 +44,12 @@ protected:
// compile the apps all the time
std::unique_ptr<ImpSdrCreateViewExtraData> mpCreateViewExtraData;
- Pointer aAktCreatePointer;
+ Pointer aCurrentCreatePointer;
sal_Int32 nAutoCloseDistPix;
sal_Int32 nFreeHandMinDistPix;
- SdrInventor nAktInvent; // set the current ones
- sal_uInt16 nAktIdent; // Obj for re-creating
+ SdrInventor nCurrentInvent; // set the current ones
+ sal_uInt16 nCurrentIdent; // Obj for re-creating
bool b1stPointAsCenter : 1;
bool bUseIncompatiblePathCreateInterface : 1;
@@ -100,9 +100,9 @@ public:
bool IsMeasureTool() const;
void SetCurrentObj(sal_uInt16 nIdent, SdrInventor
nInvent=SdrInventor::Default);
- void TakeCurrentObj(sal_uInt16& nIdent, SdrInventor& nInvent) const {
nInvent=nAktInvent; nIdent=nAktIdent; }
- SdrInventor GetCurrentObjInventor() const { return nAktInvent; }
- sal_uInt16 GetCurrentObjIdentifier() const { return nAktIdent; }
+ void TakeCurrentObj(sal_uInt16& nIdent, SdrInventor& nInvent) const {
nInvent=nCurrentInvent; nIdent=nCurrentIdent; }
+ SdrInventor GetCurrentObjInventor() const { return nCurrentInvent; }
+ sal_uInt16 GetCurrentObjIdentifier() const { return nCurrentIdent; }
// Beginning the regular Create
bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=nullptr, short
nMinMov=-3);
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 8ec3eb68637c..33cf4eb9b3c2 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -184,12 +184,12 @@ void SdrCreateView::ImpClearConnectMarker()
void SdrCreateView::ImpClearVars()
{
- nAktInvent=SdrInventor::Default;
- nAktIdent=OBJ_NONE;
+ nCurrentInvent=SdrInventor::Default;
+ nCurrentIdent=OBJ_NONE;
pCurrentCreate=nullptr;
pCreatePV=nullptr;
b1stPointAsCenter=false;
- aAktCreatePointer=Pointer(PointerStyle::Cross);
+ aCurrentCreatePointer=Pointer(PointerStyle::Cross);
bUseIncompatiblePathCreateInterface=false;
nAutoCloseDistPix=5;
nFreeHandMinDistPix=10;
@@ -264,10 +264,10 @@ bool SdrCreateView::CheckEdgeMode()
if (pCurrentCreate!=nullptr)
{
// is managed by EdgeObj
- if (nAktInvent==SdrInventor::Default && nAktIdent==OBJ_EDGE) return
false;
+ if (nCurrentInvent==SdrInventor::Default && nCurrentIdent==OBJ_EDGE)
return false;
}
- if (!IsCreateMode() || nAktInvent!=SdrInventor::Default ||
nAktIdent!=OBJ_EDGE)
+ if (!IsCreateMode() || nCurrentInvent!=SdrInventor::Default ||
nCurrentIdent!=OBJ_EDGE)
{
ImpClearConnectMarker();
return false;
@@ -328,25 +328,25 @@ bool SdrCreateView::MouseMove(const MouseEvent& rMEvt,
vcl::Window* pWin)
bool SdrCreateView::IsTextTool() const
{
- return meEditMode==SdrViewEditMode::Create &&
nAktInvent==SdrInventor::Default && (nAktIdent==OBJ_TEXT ||
nAktIdent==OBJ_TEXTEXT || nAktIdent==OBJ_TITLETEXT ||
nAktIdent==OBJ_OUTLINETEXT);
+ return meEditMode==SdrViewEditMode::Create &&
nCurrentInvent==SdrInventor::Default && (nCurrentIdent==OBJ_TEXT ||
nCurrentIdent==OBJ_TEXTEXT || nCurrentIdent==OBJ_TITLETEXT ||
nCurrentIdent==OBJ_OUTLINETEXT);
}
bool SdrCreateView::IsEdgeTool() const
{
- return meEditMode==SdrViewEditMode::Create &&
nAktInvent==SdrInventor::Default && (nAktIdent==OBJ_EDGE);
+ return meEditMode==SdrViewEditMode::Create &&
nCurrentInvent==SdrInventor::Default && (nCurrentIdent==OBJ_EDGE);
}
bool SdrCreateView::IsMeasureTool() const
{
- return meEditMode==SdrViewEditMode::Create &&
nAktInvent==SdrInventor::Default && (nAktIdent==OBJ_MEASURE);
+ return meEditMode==SdrViewEditMode::Create &&
nCurrentInvent==SdrInventor::Default && (nCurrentIdent==OBJ_MEASURE);
}
void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, SdrInventor nInvent)
{
- if (nAktInvent!=nInvent || nAktIdent!=nIdent)
+ if (nCurrentInvent!=nInvent || nCurrentIdent!=nIdent)
{
- nAktInvent=nInvent;
- nAktIdent=nIdent;
+ nCurrentInvent=nInvent;
+ nCurrentIdent=nIdent;
SdrObject * pObj = (nIdent == OBJ_NONE) ? nullptr :
SdrObjFactory::MakeNewObject(nInvent, nIdent, nullptr);
@@ -358,16 +358,16 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent,
SdrInventor nInvent)
{
// Here the correct pointer needs to be used
// if the default is set to vertical writing
- aAktCreatePointer = PointerStyle::Text;
+ aCurrentCreatePointer = PointerStyle::Text;
}
else
- aAktCreatePointer = pObj->GetCreatePointer();
+ aCurrentCreatePointer = pObj->GetCreatePointer();
SdrObject::Free( pObj );
}
else
{
- aAktCreatePointer = Pointer(PointerStyle::Cross);
+ aCurrentCreatePointer = Pointer(PointerStyle::Cross);
}
}
@@ -418,9 +418,9 @@ bool SdrCreateView::ImpBegCreateObj(SdrInventor nInvent,
sal_uInt16 nIdent, cons
}
Point aPnt(rPnt);
- if (nAktInvent!=SdrInventor::Default ||
(nAktIdent!=sal_uInt16(OBJ_EDGE) &&
-
nAktIdent!=sal_uInt16(OBJ_FREELINE) &&
-
nAktIdent!=sal_uInt16(OBJ_FREEFILL) )) { // no snapping for Edge and Freehand
+ if (nCurrentInvent!=SdrInventor::Default ||
(nCurrentIdent!=sal_uInt16(OBJ_EDGE) &&
+
nCurrentIdent!=sal_uInt16(OBJ_FREELINE) &&
+
nCurrentIdent!=sal_uInt16(OBJ_FREEFILL) )) { // no snapping for Edge and
Freehand
aPnt=GetSnapPos(aPnt,pCreatePV);
}
if (pCurrentCreate!=nullptr)
@@ -508,13 +508,13 @@ bool SdrCreateView::ImpBegCreateObj(SdrInventor nInvent,
sal_uInt16 nIdent, cons
bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short
nMinMov)
{
- return
ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,tools::Rectangle(),
nullptr);
+ return
ImpBegCreateObj(nCurrentInvent,nCurrentIdent,rPnt,pOut,nMinMov,tools::Rectangle(),
nullptr);
}
bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16
nMinMov, SdrObject* pPreparedFactoryObject)
{
- SdrInventor nInvent(nAktInvent);
- sal_uInt16 nIdent(nAktIdent);
+ SdrInventor nInvent(nCurrentInvent);
+ sal_uInt16 nIdent(nCurrentIdent);
if(pPreparedFactoryObject)
{
@@ -630,11 +630,11 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
bool bSceneIntoScene(false);
E3dScene* pObjScene = dynamic_cast<E3dScene*>(pObjMerk);
- E3dScene* pAktScene = pObjScene ?
dynamic_cast<E3dScene*>(pCreatePV->GetAktGroup()) : nullptr;
- if (pAktScene)
+ E3dScene* pCurrentScene = pObjScene ?
dynamic_cast<E3dScene*>(pCreatePV->GetAktGroup()) : nullptr;
+ if (pCurrentScene)
{
bool bDidInsert =
static_cast<E3dView*>(this)->ImpCloneAll3DObjectsToDestScene(
- pObjScene, pAktScene, Point(0, 0));
+ pObjScene, pCurrentScene, Point(0, 0));
if(bDidInsert)
{
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 2cf33d1311f1..b5dbcd4959f8 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -894,7 +894,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
case SdrEventKind::BeginDragHelpline:
bRet=BegDragHelpLine(rVEvt.nHlplIdx,rVEvt.pPV); break;
case SdrEventKind::BeginDragObj:
bRet=BegDragObj(aLogicPos,nullptr,rVEvt.pHdl,mnMinMovLog); break;
case SdrEventKind::BeginCreateObj: {
- if (nAktInvent==SdrInventor::Default && nAktIdent==OBJ_CAPTION) {
+ if (nCurrentInvent==SdrInventor::Default &&
nCurrentIdent==OBJ_CAPTION) {
long nHgt=SdrEngineDefaults::GetFontHeight();
bRet=BegCreateCaptionObj(aLogicPos,Size(5*nHgt,2*nHgt));
} else bRet=BegCreateObj(aLogicPos);
@@ -998,7 +998,7 @@ Pointer SdrView::GetPreferredPointer(const Point&
rMousePos, const OutputDevice*
switch (eEvent)
{
case SdrEventKind::BeginCreateObj:
- return aAktCreatePointer;
+ return aCurrentCreatePointer;
case SdrEventKind::MarkObj:
return Pointer(PointerStyle::Move);
case SdrEventKind::BeginMark:
@@ -1153,7 +1153,7 @@ Pointer SdrView::GetPreferredPointer(const Point&
rMousePos, const OutputDevice*
return Pointer(PointerStyle::Move);
}
}
- if (meEditMode==SdrViewEditMode::Create) return aAktCreatePointer;
+ if (meEditMode==SdrViewEditMode::Create) return aCurrentCreatePointer;
return Pointer(PointerStyle::Arrow);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
