Kaydet (Commit) 791f2fa1 authored tarafından Albert Thuswaldner's avatar Albert Thuswaldner Kaydeden (comit) Markus Mohrhard

fdo#39468 translated german comments in editsh.cxx and formatsh.cxx

Change-Id: Icf2afd6f841692d0f63f5989d720a703bf98568c
Reviewed-on: https://gerrit.libreoffice.org/17185Reviewed-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
üst d26eb83f
...@@ -160,13 +160,13 @@ void lclInsertCharacter( EditView* pTableView, EditView* pTopView, sal_Unicode c ...@@ -160,13 +160,13 @@ void lclInsertCharacter( EditView* pTableView, EditView* pTopView, sal_Unicode c
void ScEditShell::Execute( SfxRequest& rReq ) void ScEditShell::Execute( SfxRequest& rReq )
{ {
const SfxItemSet* pReqArgs = rReq.GetArgs(); const SfxItemSet* pReqArgs = rReq.GetArgs();
sal_uInt16 nSlot = rReq.GetSlot(); sal_uInt16 nSlot = rReq.GetSlot();
SfxBindings& rBindings = pViewData->GetBindings(); SfxBindings& rBindings = pViewData->GetBindings();
ScInputHandler* pHdl = GetMyInputHdl(); ScInputHandler* pHdl = GetMyInputHdl();
OSL_ENSURE(pHdl,"kein ScInputHandler"); OSL_ENSURE(pHdl,"no ScInputHandler");
EditView* pTopView = pHdl->GetTopView(); // hat Eingabezeile den Focus? EditView* pTopView = pHdl->GetTopView(); // Has thee input cell the focus?
EditView* pTableView = pHdl->GetTableView(); EditView* pTableView = pHdl->GetTableView();
OSL_ENSURE(pTableView,"no EditView :-("); OSL_ENSURE(pTableView,"no EditView :-(");
...@@ -187,7 +187,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) ...@@ -187,7 +187,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
switch ( nSlot ) switch ( nSlot )
{ {
case FID_INS_CELL_CONTENTS: // Insert-Taste, weil als Acc definiert case FID_INS_CELL_CONTENTS: // Insert taste, while defined as Acc
bIsInsertMode = !pTableView->IsInsertMode(); bIsInsertMode = !pTableView->IsInsertMode();
pTableView->SetInsertMode( bIsInsertMode ); pTableView->SetInsertMode( bIsInsertMode );
if (pTopView) if (pTopView)
...@@ -358,7 +358,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) ...@@ -358,7 +358,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
if ( pFontItem ) if ( pFontItem )
{ {
OUString aFontName(pFontItem->GetValue()); OUString aFontName(pFontItem->GetValue());
vcl::Font aFont(aFontName, Size(1,1)); // Size nur wg. CTOR vcl::Font aFont(aFontName, Size(1,1)); // Size just because CTOR
aNewItem = SvxFontItem( aFont.GetFamily(), aFont.GetName(), aNewItem = SvxFontItem( aFont.GetFamily(), aFont.GetName(),
aFont.GetStyleName(), aFont.GetPitch(), aFont.GetStyleName(), aFont.GetPitch(),
aFont.GetCharSet(), ATTR_FONT ); aFont.GetCharSet(), ATTR_FONT );
...@@ -390,7 +390,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) ...@@ -390,7 +390,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
aSetItem.PutItemForScriptType( nSetScript, aNewItem ); aSetItem.PutItemForScriptType( nSetScript, aNewItem );
aSet.Put( aSetItem.GetItemSet(), false ); aSet.Put( aSetItem.GetItemSet(), false );
// SetAttribs an der View selektiert ein Wort, wenn nichts selektiert ist // SetAttribs on the View selects a word, when nothing is selected
pTableView->GetEditEngine()->QuickSetAttribs( aSet, pTableView->GetSelection() ); pTableView->GetEditEngine()->QuickSetAttribs( aSet, pTableView->GetSelection() );
pTableView->InsertText(aString); pTableView->InsertText(aString);
if (pTopView) if (pTopView)
...@@ -483,7 +483,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) ...@@ -483,7 +483,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
if (pEngine->GetParagraphCount() == 1) if (pEngine->GetParagraphCount() == 1)
{ {
OUString aText = pEngine->GetText(); OUString aText = pEngine->GetText();
ESelection aSel = pEditView->GetSelection(); // aktuelle View ESelection aSel = pEditView->GetSelection(); // current View
ScDocument* pDoc = pViewData->GetDocument(); ScDocument* pDoc = pViewData->GetDocument();
ScRefFinder aFinder(aText, pViewData->GetCurPos(), pDoc, pDoc->GetAddressConvention()); ScRefFinder aFinder(aText, pViewData->GetCurPos(), pDoc, pDoc->GetAddressConvention());
...@@ -500,7 +500,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) ...@@ -500,7 +500,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
pTopView->SetSelection( aNewSel ); pTopView->SetSelection( aNewSel );
} }
// Referenz wird selektiert -> beim Tippen nicht ueberschreiben // refenence is being selected -> do not overwrite when typing
bSetSelIsRef = true; bSetSelIsRef = true;
} }
} }
...@@ -525,7 +525,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) ...@@ -525,7 +525,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
const SvxURLField* pURLField = GetURLField(); const SvxURLField* pURLField = GetURLField();
if ( pURLField ) if ( pURLField )
{ {
// altes Feld selektieren // select old field
ESelection aSel = pTableView->GetSelection(); ESelection aSel = pTableView->GetSelection();
aSel.Adjust(); aSel.Adjust();
...@@ -533,7 +533,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) ...@@ -533,7 +533,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
aSel.nEndPos = aSel.nStartPos + 1; aSel.nEndPos = aSel.nStartPos + 1;
pTableView->SetSelection( aSel ); pTableView->SetSelection( aSel );
// neues Feld einfuegen // insert new field
SvxURLField aURLField( rURL, rName, SVXURLFORMAT_REPR ); SvxURLField aURLField( rURL, rName, SVXURLFORMAT_REPR );
aURLField.SetTargetFrame( rTarget ); aURLField.SetTargetFrame( rTarget );
...@@ -541,7 +541,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) ...@@ -541,7 +541,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
pTableView->InsertField( aURLItem ); pTableView->InsertField( aURLItem );
pTableView->SetSelection( aSel ); // select inserted field pTableView->SetSelection( aSel ); // select inserted field
// jetzt doch auch Felder in der Top-View // now also fields in the Top-View
if ( pTopView ) if ( pTopView )
{ {
...@@ -562,9 +562,8 @@ void ScEditShell::Execute( SfxRequest& rReq ) ...@@ -562,9 +562,8 @@ void ScEditShell::Execute( SfxRequest& rReq )
pViewData->GetViewShell()-> pViewData->GetViewShell()->
InsertURL( rName, rURL, rTarget, (sal_uInt16) eMode ); InsertURL( rName, rURL, rTarget, (sal_uInt16) eMode );
// InsertURL an der ViewShell schaltet bei "Button" // when "Button", the InsertURL in ViewShell turns the EditShell off
// die EditShell ab, darum sofort return // thus the immediate return statement
return; return;
} }
} }
...@@ -659,7 +658,7 @@ void ScEditShell::GetState( SfxItemSet& rSet ) ...@@ -659,7 +658,7 @@ void ScEditShell::GetState( SfxItemSet& rSet )
{ {
switch (nWhich) switch (nWhich)
{ {
case SID_ATTR_INSERT: // Statuszeile case SID_ATTR_INSERT: // Status row
{ {
if ( pActiveView ) if ( pActiveView )
rSet.Put( SfxBoolItem( nWhich, pActiveView->IsInsertMode() ) ); rSet.Put( SfxBoolItem( nWhich, pActiveView->IsInsertMode() ) );
...@@ -1040,7 +1039,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) ...@@ -1040,7 +1039,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
break; break;
} }
// anwenden // apply
EditEngine* pEngine = pEditView->GetEditEngine(); EditEngine* pEngine = pEditView->GetEditEngine();
bool bOld = pEngine->GetUpdateMode(); bool bOld = pEngine->GetUpdateMode();
...@@ -1092,7 +1091,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) ...@@ -1092,7 +1091,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet)
if ( rSet.GetItemState( EE_CHAR_ITALIC ) != SfxItemState::UNKNOWN ) if ( rSet.GetItemState( EE_CHAR_ITALIC ) != SfxItemState::UNKNOWN )
ScViewUtil::PutItemScript( rSet, aAttribs, EE_CHAR_ITALIC, nScript ); ScViewUtil::PutItemScript( rSet, aAttribs, EE_CHAR_ITALIC, nScript );
// Unterstreichung // underline
SfxItemState eState = aAttribs.GetItemState( EE_CHAR_UNDERLINE, true ); SfxItemState eState = aAttribs.GetItemState( EE_CHAR_UNDERLINE, true );
if ( eState == SfxItemState::DONTCARE ) if ( eState == SfxItemState::DONTCARE )
...@@ -1118,10 +1117,10 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) ...@@ -1118,10 +1117,10 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet)
rSet.Put( SfxBoolItem( nId, true ) ); rSet.Put( SfxBoolItem( nId, true ) );
} }
//! Testen, ob Klammer-Hervorhebung aktiv ist !!!! //! Testing whether brace highlighting is active !!!!
ScInputHandler* pHdl = GetMyInputHdl(); ScInputHandler* pHdl = GetMyInputHdl();
if ( pHdl && pHdl->IsFormulaMode() ) if ( pHdl && pHdl->IsFormulaMode() )
rSet.ClearItem( EE_CHAR_WEIGHT ); // hervorgehobene Klammern hier nicht rSet.ClearItem( EE_CHAR_WEIGHT ); // Highlighted brace not here
SvxEscapement eEsc = (SvxEscapement) static_cast<const SvxEscapementItem&>( SvxEscapement eEsc = (SvxEscapement) static_cast<const SvxEscapementItem&>(
aAttribs.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); aAttribs.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
...@@ -1140,7 +1139,6 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) ...@@ -1140,7 +1139,6 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet)
pViewData->GetBindings().Invalidate( SID_ATTR_CHAR_KERNING ); pViewData->GetBindings().Invalidate( SID_ATTR_CHAR_KERNING );
if ( eState == SfxItemState::DONTCARE ) if ( eState == SfxItemState::DONTCARE )
{ {
// rSet.InvalidateItem( SID_ATTR_CHAR_KERNING );
rSet.InvalidateItem(EE_CHAR_KERNING); rSet.InvalidateItem(EE_CHAR_KERNING);
} }
} }
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment