Kaydet (Commit) fefa76cf authored tarafından Winfried Donkers's avatar Winfried Donkers Kaydeden (comit) Noel Power

german comments translated to english On branch master Changes to be committed:…

german comments translated to english On branch master Changes to be committed: modified: sc/source/ui/view/cellsh.cxx modified: sc/source/ui/view/cellsh1.cxx modified: sc/source/ui/view/cellsh2.cxx modified: sc/source/ui/view/cellsh4.cxx
üst 0e6f0400
This diff is collapsed.
This diff is collapsed.
...@@ -291,7 +291,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ...@@ -291,7 +291,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
ScDBData* pDBData = pTabViewShell->GetDBData(sal_True,SC_DB_OLD); ScDBData* pDBData = pTabViewShell->GetDBData(sal_True,SC_DB_OLD);
if (pDBData) if (pDBData)
{ {
// Import wiederholen wie SID_REIMPORT_DATA // repeat import like SID_REIMPORT_DATA
sal_Bool bContinue = sal_True; sal_Bool bContinue = sal_True;
ScImportParam aImportParam; ScImportParam aImportParam;
...@@ -301,21 +301,21 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ...@@ -301,21 +301,21 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
bContinue = pTabViewShell->ImportData( aImportParam ); bContinue = pTabViewShell->ImportData( aImportParam );
pDBData->SetImportParam( aImportParam ); //! Undo ?? pDBData->SetImportParam( aImportParam ); //! Undo ??
// markieren (Groesse kann sich geaendert haben) // mark (size may have been changed)
ScRange aNewRange; ScRange aNewRange;
pDBData->GetArea(aNewRange); pDBData->GetArea(aNewRange);
pTabViewShell->MarkRange(aNewRange); pTabViewShell->MarkRange(aNewRange);
} }
if ( bContinue ) // Fehler beim Import -> Abbruch if ( bContinue ) // fail at import -> break
{ {
// interne Operationen, wenn welche gespeichert // internal operations, when any stored
if ( pDBData->HasQueryParam() || pDBData->HasSortParam() || if ( pDBData->HasQueryParam() || pDBData->HasSortParam() ||
pDBData->HasSubTotalParam() ) pDBData->HasSubTotalParam() )
pTabViewShell->RepeatDB(); pTabViewShell->RepeatDB();
// Pivottabellen die den Bereich als Quelldaten haben // pivot tables that have the range as data source
ScRange aRange; ScRange aRange;
pDBData->GetArea(aRange); pDBData->GetArea(aRange);
...@@ -391,7 +391,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ...@@ -391,7 +391,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
aArgSet.Put( ScSortItem( SCITEM_SORTDATA, GetViewData(), &aSortParam ) ); aArgSet.Put( ScSortItem( SCITEM_SORTDATA, GetViewData(), &aSortParam ) );
pTabViewShell->UISort( aSortParam ); // Teilergebnisse bei Bedarf neu pTabViewShell->UISort( aSortParam ); // subtotal when needed new
rReq.Done(); rReq.Done();
} }
...@@ -422,7 +422,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ...@@ -422,7 +422,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
if( bHasHeader ) if( bHasHeader )
aSortParam.bHasHeader = bHasHeader; aSortParam.bHasHeader = bHasHeader;
aSortParam.bInplace = sal_True; // von Basic immer aSortParam.bInplace = sal_True; // from Basic always
const SfxPoolItem* pItem; const SfxPoolItem* pItem;
if ( pArgs->GetItemState( SID_SORT_BYROW, sal_True, &pItem ) == SFX_ITEM_SET ) if ( pArgs->GetItemState( SID_SORT_BYROW, sal_True, &pItem ) == SFX_ITEM_SET )
...@@ -440,7 +440,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ...@@ -440,7 +440,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
sal_uInt16 nUserIndex = ((const SfxUInt16Item*)pItem)->GetValue(); sal_uInt16 nUserIndex = ((const SfxUInt16Item*)pItem)->GetValue();
aSortParam.bUserDef = ( nUserIndex != 0 ); aSortParam.bUserDef = ( nUserIndex != 0 );
if ( nUserIndex ) if ( nUserIndex )
aSortParam.nUserIndex = nUserIndex - 1; // Basic: 1-basiert aSortParam.nUserIndex = nUserIndex - 1; // Basic: 1-based
} }
SCCOLROW nField0 = 0; SCCOLROW nField0 = 0;
...@@ -465,7 +465,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ...@@ -465,7 +465,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
if ( pArgs->GetItemState( FN_PARAM_6, sal_True, &pItem ) == SFX_ITEM_SET ) if ( pArgs->GetItemState( FN_PARAM_6, sal_True, &pItem ) == SFX_ITEM_SET )
aSortParam.bAscending[2] = ((const SfxBoolItem*)pItem)->GetValue(); aSortParam.bAscending[2] = ((const SfxBoolItem*)pItem)->GetValue();
// Teilergebnisse bei Bedarf neu // subtotal when needed new
pTabViewShell->UISort( aSortParam ); pTabViewShell->UISort( aSortParam );
rReq.Done(); rReq.Done();
} }
...@@ -504,7 +504,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ...@@ -504,7 +504,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
const ScSortParam& rOutParam = ((const ScSortItem&) const ScSortParam& rOutParam = ((const ScSortItem&)
pOutSet->Get( SCITEM_SORTDATA )).GetSortData(); pOutSet->Get( SCITEM_SORTDATA )).GetSortData();
// Teilergebnisse bei Bedarf neu // subtotal when needed new
pTabViewShell->UISort( rOutParam ); pTabViewShell->UISort( rOutParam );
if ( rOutParam.bInplace ) if ( rOutParam.bInplace )
...@@ -661,8 +662,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ...@@ -661,8 +662,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
SCTAB nCurTab = GetViewData()->GetTabNo(); SCTAB nCurTab = GetViewData()->GetTabNo();
SCTAB nRefTab = GetViewData()->GetRefTabNo(); SCTAB nRefTab = GetViewData()->GetRefTabNo();
// Wenn RefInput auf andere Tabelle als Datentabelle umgeschaltet // If RefInput switched to a different sheet from the data sheet,
// hat wieder zurueckschalten: // switch back:
if ( nCurTab != nRefTab ) if ( nCurTab != nRefTab )
{ {
...@@ -761,7 +762,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ...@@ -761,7 +762,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
const SfxItemSet* pArgs = rReq.GetArgs(); const SfxItemSet* pArgs = rReq.GetArgs();
if ( pArgs ) if ( pArgs )
{ {
OSL_FAIL("spaeter..."); OSL_FAIL("later...");
} }
else else
{ {
...@@ -902,13 +903,13 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ...@@ -902,13 +903,13 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
aData.SetIgnoreBlank( bBlank ); aData.SetIgnoreBlank( bBlank );
aData.SetListType( nListType ); aData.SetListType( nListType );
aData.SetInput(aHelpTitle, aHelpText); // sets bShowInput to TRUE aData.SetInput(aHelpTitle, aHelpText); // sets bShowInput to TRUE
if (!bShowHelp) if (!bShowHelp)
aData.ResetInput(); // reset only bShowInput aData.ResetInput(); // reset only bShowInput
aData.SetError(aErrTitle, aErrText, eErrStyle); // sets bShowError to TRUE aData.SetError(aErrTitle, aErrText, eErrStyle); // sets bShowError to TRUE
if (!bShowError) if (!bShowError)
aData.ResetError(); // reset only bShowError aData.ResetError(); // reset only bShowError
pTabViewShell->SetValidation( aData ); pTabViewShell->SetValidation( aData );
rReq.Done( *pOutSet ); rReq.Done( *pOutSet );
...@@ -995,8 +996,8 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) ...@@ -995,8 +996,8 @@ void ScCellShell::GetDBState( SfxItemSet& rSet )
{ {
case SID_REFRESH_DBAREA: case SID_REFRESH_DBAREA:
{ {
// importierte Daten ohne Selektion // imported data without selection
// oder Filter,Sortierung,Teilergebis (auch ohne Import) // or filter,sort,subtotal (also without import)
sal_Bool bOk = false; sal_Bool bOk = false;
ScDBData* pDBData = pTabViewShell->GetDBData(false,SC_DB_OLD); ScDBData* pDBData = pTabViewShell->GetDBData(false,SC_DB_OLD);
if (pDBData && pDoc->GetChangeTrack() == NULL) if (pDBData && pDoc->GetChangeTrack() == NULL)
...@@ -1028,7 +1029,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) ...@@ -1028,7 +1029,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet )
break; break;
//Bei Redlining und Multiselektion Disablen //in case of Redlining and multiselection disable
case SID_SORT_ASCENDING: case SID_SORT_ASCENDING:
case SID_SORT_DESCENDING: case SID_SORT_DESCENDING:
case SCITEM_SORTDATA: case SCITEM_SORTDATA:
...@@ -1047,7 +1048,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) ...@@ -1047,7 +1048,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet )
case SID_REIMPORT_DATA: case SID_REIMPORT_DATA:
{ {
// nur importierte Daten ohne Selektion // only imported data without selection
ScDBData* pDBData = pTabViewShell->GetDBData(false,SC_DB_OLD); ScDBData* pDBData = pTabViewShell->GetDBData(false,SC_DB_OLD);
if (!pDBData || !pDBData->HasImportParam() || pDBData->HasImportSelection() || if (!pDBData || !pDBData->HasImportParam() || pDBData->HasImportSelection() ||
pDoc->GetChangeTrack()!=NULL) pDoc->GetChangeTrack()!=NULL)
...@@ -1068,7 +1069,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) ...@@ -1068,7 +1069,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet )
break; break;
case SID_SBA_BRW_INSERT: case SID_SBA_BRW_INSERT:
{ {
// SBA will ein sal_Bool-Item, damit ueberhaupt enabled // SBA wants a sal_Bool-item, enabled
sal_Bool bEnable = sal_True; sal_Bool bEnable = sal_True;
rSet.Put(SfxBoolItem(nWhich, bEnable)); rSet.Put(SfxBoolItem(nWhich, bEnable));
......
...@@ -144,10 +144,10 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) ...@@ -144,10 +144,10 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
nRTLSign = -1; nRTLSign = -1;
} }
// einmal extra, damit der Cursor bei ExecuteInputDirect nicht zuoft gemalt wird: // once extra, so that the cursor will not be painted too often with ExecuteInputDirect:
pTabViewShell->HideAllCursors(); pTabViewShell->HideAllCursors();
//OS: einmal fuer alle wird doch reichen! //OS: once for all should do, however!
pTabViewShell->ExecuteInputDirect(); pTabViewShell->ExecuteInputDirect();
switch ( nSlotId ) switch ( nSlotId )
{ {
...@@ -200,7 +200,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) ...@@ -200,7 +200,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
break; break;
default: default:
OSL_FAIL("Unbekannte Message bei ViewShell (Cursor)"); OSL_FAIL("Unknown message in ViewShell (Cursor)");
return; return;
} }
...@@ -312,8 +312,8 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq ) ...@@ -312,8 +312,8 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq )
pTabViewShell->SelectNextTab( -1, (nSlotId == SID_PREV_TABLE_SEL) ); pTabViewShell->SelectNextTab( -1, (nSlotId == SID_PREV_TABLE_SEL) );
break; break;
// Cursorbewegungen in Bloecken gehen nicht von Basic aus, // cursor movements in range do not originate from Basic,
// weil das ScSbxRange-Objekt bei Eingaben die Markierung veraendert // because the ScSbxRange-object changes the marking at input
case SID_NEXT_UNPROTECT: case SID_NEXT_UNPROTECT:
pTabViewShell->FindNextUnprot( false, !rReq.IsAPI() ); pTabViewShell->FindNextUnprot( false, !rReq.IsAPI() );
...@@ -386,7 +386,7 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq ) ...@@ -386,7 +386,7 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq )
break; break;
default: default:
OSL_FAIL("Unbekannte Message bei ViewShell (Cursor)"); OSL_FAIL("Unknown message in ViewShell (Cursor)");
return; return;
} }
...@@ -403,7 +403,7 @@ void ScCellShell::ExecutePageSel( SfxRequest& rReq ) ...@@ -403,7 +403,7 @@ void ScCellShell::ExecutePageSel( SfxRequest& rReq )
case SID_CURSORTOPOFFILE_SEL: rReq.SetSlot( SID_CURSORTOPOFFILE ); break; case SID_CURSORTOPOFFILE_SEL: rReq.SetSlot( SID_CURSORTOPOFFILE ); break;
case SID_CURSORENDOFFILE_SEL: rReq.SetSlot( SID_CURSORENDOFFILE ); break; case SID_CURSORENDOFFILE_SEL: rReq.SetSlot( SID_CURSORENDOFFILE ); break;
default: default:
OSL_FAIL("Unbekannte Message bei ViewShell (ExecutePageSel)"); OSL_FAIL("Unknown message in ViewShell (ExecutePageSel)");
return; return;
} }
rReq.AppendItem( SfxBoolItem(FN_PARAM_2, sal_True) ); rReq.AppendItem( SfxBoolItem(FN_PARAM_2, sal_True) );
...@@ -458,7 +458,7 @@ void ScCellShell::ExecutePage( SfxRequest& rReq ) ...@@ -458,7 +458,7 @@ void ScCellShell::ExecutePage( SfxRequest& rReq )
break; break;
default: default:
OSL_FAIL("Unbekannte Message bei ViewShell (ExecutePage)"); OSL_FAIL("Unknown message in ViewShell (ExecutePage)");
return; return;
} }
......
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