[Libreoffice-commits] core.git: svx/source
Thomas Beck
thomas.beck at cib.de
Tue May 9 13:06:25 UTC 2017
svx/source/form/fmview.cxx | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
New commits:
commit a0badb15fa97e3f4be990ff83148e48ae1db7723
Author: Thomas Beck <thomas.beck at cib.de>
Date: Mon May 8 12:04:52 2017 +0200
tdf#39468 translate German comments, removing redundant ones
Translated remaining German comments in svx/source/form/fmview.cxx
Change-Id: I6e71bc1dc1ab1c0b87ec0a3d727cffe2237e9a59
Reviewed-on: https://gerrit.libreoffice.org/37381
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index fa7c596913d3..e190402400df 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -91,15 +91,15 @@ void FmFormView::Init()
pFormShell = nullptr;
pImpl = new FmXFormView(this);
- // Model setzen
+ // set model
SdrModel* pModel = GetModel();
- DBG_ASSERT( dynamic_cast<const FmFormModel*>( pModel) != nullptr, "Falsches Model" );
+ DBG_ASSERT( dynamic_cast<const FmFormModel*>( pModel) != nullptr, "Wrong model" );
if( dynamic_cast<const FmFormModel*>( pModel) == nullptr ) return;
FmFormModel* pFormModel = static_cast<FmFormModel*>(pModel);
- // DesignMode vom Model holen
+ // get DesignMode from model
bool bInitDesignMode = pFormModel->GetOpenInDesignMode();
if ( pFormModel->OpenInDesignModeIsDefaulted( ) )
{ // this means that nobody ever explicitly set this on the model, and the model has never
@@ -124,8 +124,8 @@ void FmFormView::Init()
}
}
- // dieses wird in der Shell vorgenommen
- // bDesignMode = !bInitDesignMode; // erzwingt, dass SetDesignMode ausgefuehrt wird
+ // this will be done in the shell
+ // bDesignMode = !bInitDesignMode; // forces execution of SetDesignMode
SetDesignMode( bInitDesignMode );
}
@@ -223,10 +223,9 @@ void FmFormView::ChangeDesignMode(bool bDesign)
FmFormModel* pModel = dynamic_cast<FmFormModel*>( GetModel() );
if (pModel)
- { // fuer die Zeit des Uebergangs das Undo-Environment ausschalten, das sichert, dass man dort auch nicht-transiente
- // Properties mal eben aendern kann (sollte allerdings mit Vorsicht genossen und beim Rueckschalten des Modes
- // auch immer wieder rueckgaegig gemacht werden. Ein Beispiel ist das Setzen der maximalen Text-Laenge durch das
- // FmXEditModel an seinem Control.)
+ { // For the duration of the transition the Undo-Environment is disabled. This ensures that non-transient Properties can
+ // also be changed (this should be done with care and also reversed before switching the mode back. An example is the
+ // setting of the maximal length of the text by FmXEditModel on its control.)
pModel->GetUndoEnv().Lock();
}
@@ -297,7 +296,7 @@ void FmFormView::ChangeDesignMode(bool bDesign)
}
}
- // und mein Undo-Environment wieder an
+ // Unlock Undo-Environment
if (pModel)
pModel->GetUndoEnv().UnLock();
}
@@ -321,7 +320,7 @@ SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage)
// creating the controllers
ActivateControls(pPV);
- // Alles deselektieren
+ // Deselect all
UnmarkAll();
}
else if ( pFormShell && pFormShell->IsDesignMode() )
@@ -329,7 +328,7 @@ SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage)
FmXFormShell* pFormShellImpl = pFormShell->GetImpl();
pFormShellImpl->UpdateForms( true );
- // damit der Formular-Navigator auf den Seitenwechsel reagieren kann
+ // so that the form navigator can react to the pagechange
pFormShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(SID_FM_FMEXPLORER_CONTROL, true);
pFormShellImpl->SetSelection(GetMarkedObjectList());
More information about the Libreoffice-commits
mailing list