summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny_M <klasse@partyheld.de>2018-03-03 23:45:19 +0100
committerBartosz Kosiorek <gang65@poczta.onet.pl>2018-03-04 02:58:44 +0100
commit615015f2684a2e05944c75275dfef4e2f6c64630 (patch)
treee09078cbf88ef629f7a084b1f58ccfe4b7661004
parente108a31a8fee09c2fa4031e45e45ed73bbdb7c6f (diff)
Translate German variable names
Akt -> Current in svdmodel (Including translation fix of a two-line comment, where it was no longer clear that it is one.) Change-Id: I00fba0fddc177b709df227316cdfbf7895a61291 Reviewed-on: https://gerrit.libreoffice.org/50706 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
-rw-r--r--include/svx/svdmodel.hxx6
-rw-r--r--svx/source/svdraw/svdmodel.cxx38
2 files changed, 22 insertions, 22 deletions
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 8cd17f31f6f4..590011ce9f66 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -172,11 +172,11 @@ protected:
sfx2::LinkManager* pLinkManager; // LinkManager
std::unique_ptr<std::deque<std::unique_ptr<SfxUndoAction>>> pUndoStack;
std::unique_ptr<std::deque<std::unique_ptr<SfxUndoAction>>> pRedoStack;
- std::unique_ptr<SdrUndoGroup> pAktUndoGroup; // for deeper
- sal_uInt16 nUndoLevel; // undo nesting
+ std::unique_ptr<SdrUndoGroup> pCurrentUndoGroup; // For multi-level
+ sal_uInt16 nUndoLevel; // undo nesting
bool bMyPool:1; // to clean up pMyPool from 303a
bool mbUndoEnabled:1; // If false no undo is recorded or we are during the execution of an undo action
- bool bExtColorTable:1; // ne separate ColorTable
+ bool bExtColorTable:1; // For no own ColorTable
bool mbChanged:1;
bool bPagNumsDirty:1;
bool bMPgNumsDirty:1;
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 2fab5db4323f..3ab2007acf18 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -139,7 +139,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
pUndoStack=nullptr;
pRedoStack=nullptr;
nMaxUndoCount=16;
- pAktUndoGroup=nullptr;
+ pCurrentUndoGroup=nullptr;
nUndoLevel=0;
mbUndoEnabled=true;
bExtColorTable=false;
@@ -250,10 +250,10 @@ SdrModel::~SdrModel()
ClearUndoBuffer();
#ifdef DBG_UTIL
- SAL_WARN_IF(pAktUndoGroup, "svx", "In the Dtor of the SdrModel there is an open Undo left: \""
- << pAktUndoGroup->GetComment() << '\"');
+ SAL_WARN_IF(pCurrentUndoGroup, "svx", "In the Dtor of the SdrModel there is an open Undo left: \""
+ << pCurrentUndoGroup->GetComment() << '\"');
#endif
- pAktUndoGroup.reset();
+ pCurrentUndoGroup.reset();
ClearModel(true);
@@ -442,9 +442,9 @@ void SdrModel::BegUndo()
}
else if( IsUndoEnabled() )
{
- if(!pAktUndoGroup)
+ if(!pCurrentUndoGroup)
{
- pAktUndoGroup.reset(new SdrUndoGroup(*this));
+ pCurrentUndoGroup.reset(new SdrUndoGroup(*this));
nUndoLevel=1;
}
else
@@ -469,7 +469,7 @@ void SdrModel::BegUndo(const OUString& rComment)
BegUndo();
if (nUndoLevel==1)
{
- pAktUndoGroup->SetComment(rComment);
+ pCurrentUndoGroup->SetComment(rComment);
}
}
}
@@ -494,9 +494,9 @@ void SdrModel::BegUndo(const OUString& rComment, const OUString& rObjDescr, SdrR
BegUndo();
if (nUndoLevel==1)
{
- pAktUndoGroup->SetComment(rComment);
- pAktUndoGroup->SetObjDescription(rObjDescr);
- pAktUndoGroup->SetRepeatFunction(eFunc);
+ pCurrentUndoGroup->SetComment(rComment);
+ pCurrentUndoGroup->SetObjDescription(rObjDescr);
+ pCurrentUndoGroup->SetRepeatFunction(eFunc);
}
}
}
@@ -514,20 +514,20 @@ void SdrModel::EndUndo()
}
else
{
- if(pAktUndoGroup!=nullptr && IsUndoEnabled())
+ if(pCurrentUndoGroup!=nullptr && IsUndoEnabled())
{
nUndoLevel--;
if(nUndoLevel==0)
{
- if(pAktUndoGroup->GetActionCount()!=0)
+ if(pCurrentUndoGroup->GetActionCount()!=0)
{
- SdrUndoAction* pUndo=pAktUndoGroup.release();
+ SdrUndoAction* pUndo=pCurrentUndoGroup.release();
ImpPostUndoAction(std::unique_ptr<SdrUndoAction>(pUndo));
}
else
{
// was empty
- pAktUndoGroup.reset();
+ pCurrentUndoGroup.reset();
}
}
}
@@ -546,7 +546,7 @@ void SdrModel::SetUndoComment(const OUString& rComment)
{
if(nUndoLevel==1)
{
- pAktUndoGroup->SetComment(rComment);
+ pCurrentUndoGroup->SetComment(rComment);
}
}
}
@@ -562,8 +562,8 @@ void SdrModel::SetUndoComment(const OUString& rComment, const OUString& rObjDesc
{
if (nUndoLevel==1)
{
- pAktUndoGroup->SetComment(rComment);
- pAktUndoGroup->SetObjDescription(rObjDescr);
+ pCurrentUndoGroup->SetComment(rComment);
+ pCurrentUndoGroup->SetObjDescription(rObjDescr);
}
}
}
@@ -580,9 +580,9 @@ void SdrModel::AddUndo(SdrUndoAction* pUndo)
}
else
{
- if (pAktUndoGroup)
+ if (pCurrentUndoGroup)
{
- pAktUndoGroup->AddAction(pUndo);
+ pCurrentUndoGroup->AddAction(pUndo);
}
else
{