Skip to content

C
core
Kaydet (Commit) fefa76cf authored tarafından Winfried Donkers's avatar Winfried Donkers Kaydeden (comit) Noel Power
Dosyalara gözat
Seçenekler

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
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 117 deletions
sc/source/ui/view/cellsh.cxx
Dosyayı görüntüle @ fefa76cf
......@@ -137,59 +137,59 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
while ( nWhich )
{
sal_Bool bDisable = false;
sal_Bool bNeedEdit = sal_True; // muss Selektion editierbar sein?
sal_Bool bNeedEdit = sal_True; // need selection be editable?
switch ( nWhich )
{
case FID_FILL_TO_BOTTOM: // Fuellen oben/unten
case FID_FILL_TO_TOP: // mind. 2 Zeilen markiert?
case FID_FILL_TO_BOTTOM: // fill to top / bottom
case FID_FILL_TO_TOP: // are at least 2 rows marked?
bDisable = (!bSimpleArea) || (nRow1 == nRow2);
if ( !bDisable && bEditable )
{ // Matrix nicht zerreissen
{ // do not damage matrix
if ( nWhich == FID_FILL_TO_BOTTOM )
bDisable = pDoc->HasSelectedBlockMatrixFragment(
nCol1, nRow1, nCol2, nRow1, rMark ); // erste Zeile
nCol1, nRow1, nCol2, nRow1, rMark ); // first row
else
bDisable = pDoc->HasSelectedBlockMatrixFragment(
nCol1, nRow2, nCol2, nRow2, rMark ); // letzte Zeile
nCol1, nRow2, nCol2, nRow2, rMark ); // last row
}
break;
case FID_FILL_TO_RIGHT: // Fuellen links/rechts
case FID_FILL_TO_LEFT: // mind. 2 Spalten markiert?
case FID_FILL_TO_RIGHT: // fill to left / right
case FID_FILL_TO_LEFT: // are at least 2 columns marked?
bDisable = (!bSimpleArea) || (nCol1 == nCol2);
if ( !bDisable && bEditable )
{ // Matrix nicht zerreissen
if ( nWhich == FID_FILL_TO_RIGHT )
bDisable = pDoc->HasSelectedBlockMatrixFragment(
nCol1, nRow1, nCol1, nRow2, rMark ); // erste Spalte
nCol1, nRow1, nCol1, nRow2, rMark ); // first column
else
bDisable = pDoc->HasSelectedBlockMatrixFragment(
nCol2, nRow1, nCol2, nRow2, rMark ); // letzte Spalte
nCol2, nRow1, nCol2, nRow2, rMark ); // last column
}
break;
case FID_FILL_SERIES: // Block fuellen
case SID_OPENDLG_TABOP: // Mehrfachoperationen, mind. 2 Zellen markiert?
case FID_FILL_SERIES: // fill block
case SID_OPENDLG_TABOP: // multiple-cell operations, are at least 2 cells marked?
if (pDoc->GetChangeTrack()!=NULL &&nWhich ==SID_OPENDLG_TABOP)
bDisable = sal_True;
else
bDisable = (!bSimpleArea) || (nCol1 == nCol2 && nRow1 == nRow2);
if ( !bDisable && bEditable && nWhich == FID_FILL_SERIES )
{ // Matrix nicht zerreissen
{ // do not damage matrix
bDisable = pDoc->HasSelectedBlockMatrixFragment(
nCol1, nRow1, nCol2, nRow1, rMark ) // erste Zeile
nCol1, nRow1, nCol2, nRow1, rMark ) // first row
|| pDoc->HasSelectedBlockMatrixFragment(
nCol1, nRow2, nCol2, nRow2, rMark ) // letzte Zeile
nCol1, nRow2, nCol2, nRow2, rMark ) // last row
|| pDoc->HasSelectedBlockMatrixFragment(
nCol1, nRow1, nCol1, nRow2, rMark ) // erste Spalte
nCol1, nRow1, nCol1, nRow2, rMark ) // first column
|| pDoc->HasSelectedBlockMatrixFragment(
nCol2, nRow1, nCol2, nRow2, rMark ); // letzte Spalte
nCol2, nRow1, nCol2, nRow2, rMark ); // last column
}
break;
case SID_CUT: // Ausschneiden,
case FID_INS_CELL: // Zellen einfuegen, nur einf. Selektion
case SID_CUT: // cut
case FID_INS_CELL: // insert cells, just simple selection
bDisable = (!bSimpleArea);
break;
......@@ -203,16 +203,16 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
bDisable = (!bSimpleArea) || GetViewData()->SimpleRowMarked();
break;
case SID_COPY: // Kopieren
// nur wegen Matrix nicht editierbar? Matrix nicht zerreissen
//! schlaegt nicht zu, wenn geschuetzt UND Matrix, aber damit
//! muss man leben.. wird in Copy-Routine abgefangen, sonst
//! muesste hier nochmal Aufwand getrieben werden
case SID_COPY: // copy
// not editable because of matrix only? Do not damage matrix
//! is not called, when protected AND matrix, we will have
//! to live with this... is caught in Copy-Routine, otherwise
//! work is to be done once more
if ( !(!bEditable && bOnlyNotBecauseOfMatrix) )
bNeedEdit = false; // erlaubt, wenn geschuetzt/ReadOnly
bNeedEdit = false; // allowed when protected/ReadOnly
break;
case SID_AUTOFORMAT: // Autoformat, mind. 3x3 selektiert
case SID_AUTOFORMAT: // Autoformat, at least 3x3 selected
bDisable = (!bSimpleArea)
|| ((nCol2 - nCol1) < 2) || ((nRow2 - nRow1) < 2);
break;
......@@ -234,7 +234,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
case SID_CELL_FORMAT_RESET :
case FID_CELL_FORMAT :
case SID_ENABLE_HYPHENATION :
// nur wegen Matrix nicht editierbar? Attribute trotzdem ok
// not editable because of matrix only? Attribute ok nonetheless
if ( !bEditable && bOnlyNotBecauseOfMatrix )
bNeedEdit = false;
break;
......@@ -269,7 +269,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
}
}
// Funktionen, die je nach Cursorposition disabled sind
// functionen, disabled depending on cursor position
// Default:
// SID_INSERT_POSTIT, SID_CHARMAP, SID_OPENDLG_FUNCTION
......@@ -285,7 +285,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet )
while ( nWhich )
{
sal_Bool bDisable = false;
sal_Bool bNeedEdit = sal_True; // muss Cursorposition editierbar sein?
sal_Bool bNeedEdit = sal_True; // need cursor position be editable?
switch ( nWhich )
{
case SID_THESAURUS:
......@@ -400,7 +400,7 @@ void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats )
lcl_TestFormat( rFormats, aDataHelper, SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE );
}
// Einfuegen, Inhalte einfuegen
// insert, insert contents
sal_Bool lcl_IsCellPastePossible( const TransferableDataHelper& rData )
{
......@@ -510,7 +510,7 @@ void ScCellShell::GetClipState( SfxItemSet& rSet )
bool bDisable = !bPastePossible;
// Zellschutz / Multiselektion
// cell protection / multiple selection
if (!bDisable)
{
......@@ -648,16 +648,16 @@ void ScCellShell::GetState(SfxItemSet &rSet)
case SID_STATUS_SELMODE:
{
/* 0: STD Click hebt Sel auf
* 1: ER Click erweitert Selektion
* 2: ERG Click definiert weitere Selektion
/* 0: STD Click cancels Sel
* 1: ER Click extends selection
* 2: ERG Click defines further selection
*/
sal_uInt16 nMode = pTabViewShell->GetLockedModifiers();
switch ( nMode )
{
case KEY_SHIFT: nMode = 1; break;
case KEY_MOD1: nMode = 2; break; // Control-Taste
case KEY_MOD1: nMode = 2; break; // Control-key
case 0:
default:
nMode = 0;
......@@ -679,14 +679,14 @@ void ScCellShell::GetState(SfxItemSet &rSet)
}
break;
// Summe etc. mit Datum/Zeit/Fehler/Pos&Groesse zusammengefasst
// calculations etc. with date/time/Fail/position&size together
// #i34458# The SfxStringItem belongs only into SID_TABLE_CELL. It no longer has to be
// duplicated in SID_ATTR_POSITION or SID_ATTR_SIZE for SvxPosSizeStatusBarControl.
case SID_TABLE_CELL:
{
// Testen, ob Fehler unter Cursor
// (nicht pDoc->GetErrCode, um keine zirkulaeren Referenzen auszuloesen)
// Test, if error under cursor
// (not pDoc->GetErrCode, to avoid erasing circular references)
// In interpreter may happen via rescheduled Basic
if ( pDoc->IsInInterpreter() )
......@@ -883,7 +883,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
if ( pDocSh->IsReadOnly())
rSet.DisableItem( nWhich );
//XXX Disablen wenn nicht eindeutig
//XXX disable if not conclusive
}
break;
......@@ -892,7 +892,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
//GetViewData()->GetCurY();
SfxUInt16Item aHeightItem( FID_ROW_HEIGHT, pDoc->GetRowHeight( nPosY , nTab) );
rSet.Put( aHeightItem );
//XXX Disablen wenn nicht eindeutig
//XXX disable if not conclusive
if ( pDocSh->IsReadOnly())
rSet.DisableItem( nWhich );
}
......@@ -906,8 +906,8 @@ void ScCellShell::GetState(SfxItemSet &rSet)
OSL_FAIL( "Old update method. Use ScTabViewShell::UpdateInputHandler()." );
break;
case SID_SCENARIOS: // Szenarios:
if (!(rMark.IsMarked() || rMark.IsMultiMarked())) // nur, wenn etwas selektiert
case SID_SCENARIOS: // scenarios:
if (!(rMark.IsMarked() || rMark.IsMultiMarked())) // only, if something selected
rSet.DisableItem( nWhich );
break;
......
sc/source/ui/view/cellsh1.cxx
Dosyayı görüntüle @ fefa76cf
......@@ -136,7 +136,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox
// Eingabe beenden
// finish input
if ( GetViewData()->HasEditView( GetViewData()->GetActivePart() ) )
{
switch ( nSlot )
......@@ -159,7 +159,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
switch ( nSlot )
{
//
// Einfuegen / Loeschen von Zellen / Zeilen / Spalten
// insert / delete cells / rows / columns
//
case FID_INS_ROW:
......@@ -337,7 +337,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
break;
//
// Inhalte von Zellen loeschen
// delete contents from cells
//
case SID_DELETE_CONTENTS:
......@@ -364,9 +364,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
switch( aFlags.GetChar(i) )
{
case 'A': // Alle
case 'A': // all
nFlags |= IDF_ALL;
bCont = false; // nicht mehr weitermachen!
bCont = false; // don't continue!
break;
case 'S': nFlags |= IDF_STRING; break;
case 'V': nFlags |= IDF_VALUE; break;
......@@ -433,7 +433,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
break;
//
// Ausfuellen...
// fill...
//
case FID_FILL_TO_BOTTOM:
......@@ -478,9 +478,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
switch( aFlags.GetChar(i) )
{
case 'A': // Alle
case 'A': // all
nFlags |= IDF_ALL;
bCont = false; // nicht mehr weitermachen!
bCont = false; // don't continue!
break;
case 'S': nFlags |= IDF_STRING; break;
case 'V': nFlags |= IDF_VALUE; break;
......@@ -508,7 +508,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
nFunction = pDlg->GetFormulaCmdBits();
bSkipEmpty = pDlg->IsSkipEmptyCells();
bAsLink = pDlg->IsLink();
// MoveMode gibt's bei Tabelle fuellen nicht
// there is no MoveMode with fill tabs
}
delete pDlg;
}
......@@ -643,9 +643,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
bDoIt = sal_True;
}
else // (pReqArgs == NULL) => Dialog hochziehen
else // (pReqArgs == NULL) => raise Dialog
{
//
sal_uInt32 nPrivFormat;
CellType eCellType;
pDoc->GetNumberFormat( nStartCol, nStartRow, nStartTab, nPrivFormat );
......@@ -653,7 +652,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
const SvNumberformat* pPrivEntry = pFormatter->GetEntry( nPrivFormat );
if (!pPrivEntry)
{
OSL_FAIL("Zahlformat nicht gefunden !!!");
OSL_FAIL("Numberformat not found !!!");
}
else
{
......@@ -671,7 +670,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
//
String aStartStr;
// Startwert nur vorbelegen, wenn nur 1 Zeile oder Spalte:
// suggest default Startvalue only, when just 1 row or column
if ( nStartCol == nEndCol || nStartRow == nEndRow )
{
double fInputEndVal = 0.0;
......@@ -765,7 +764,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if( bDoIt )
{
//nScFillModeMouseModifier = 0; // kein Ctrl/Copy
//nScFillModeMouseModifier = 0; // no Ctrl/Copy
pTabViewShell->FillSeries( eFillDir, eFillCmd, eFillDateCmd, fStartVal, fIncVal, fMaxVal );
if( ! rReq.IsAPI() )
......@@ -854,9 +853,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
GetViewData()->GetSimpleArea( nStartCol,nStartRow,nStartTab,
nEndCol,nEndRow,nEndTab );
}
else // Aufruf per Maus
else // call via mouse
{
// nicht innerhalb einer zusammengefassten Zelle
// not in a merged cell
if ( nStartCol == nEndCol && nStartRow == nEndRow )
{
......@@ -926,14 +925,14 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
else
{
OSL_FAIL( "Richtung nicht eindeutig fuer AutoFill" );
OSL_FAIL( "Direction not unique for autofill" );
}
}
}
break;
//
// Gliederung (Outlines)
// disposal (Outlines)
// SID_AUTO_OUTLINE, SID_OUTLINE_DELETEALL in Execute (in docsh.idl)
//
......@@ -1042,7 +1041,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
}
}
else // Dialog, wenn nicht ganze Zeilen/Spalten markiert
else // Dialog, when not whole rows/columns are marked
{
if ( GetViewData()->SimpleColMarked() && !GetViewData()->SimpleRowMarked() )
bColumns = sal_True;
......@@ -1104,7 +1103,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
}
}
else // Dialog nur, wenn Aufheben fuer Zeilen und Spalten moeglich
else // Dialog only when removal for rows and columns is possible
{
sal_Bool bColPoss, bRowPoss;
pTabViewShell->TestRemoveOutline( bColPoss, bRowPoss );
......@@ -1147,7 +1146,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
//
case SID_COPY: // fuer Grafiken in DrawShell
case SID_COPY: // for graphs in DrawShell
{
WaitObject aWait( GetViewData()->GetDialogParent() );
pTabViewShell->CopyToClip( NULL, false, false, true );
......@@ -1158,7 +1157,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
break;
case SID_CUT: // fuer Grafiken in DrawShell
case SID_CUT: // for graphs in DrawShell
{
WaitObject aWait( GetViewData()->GetDialogParent() );
pTabViewShell->CutToClip( NULL, true );
......@@ -1243,9 +1242,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
switch( aFlags.GetChar(i) )
{
case 'A': // Alle
case 'A': // all
nFlags |= IDF_ALL;
bCont = false; // nicht mehr weitermachen!
bCont = false; // don't continue!
break;
case 'S': nFlags |= IDF_STRING; break;
case 'V': nFlags |= IDF_VALUE; break;
......@@ -1284,7 +1283,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
RID_SCDLG_INSCONT);
OSL_ENSURE(pDlg, "Dialog create fail!");
pDlg->SetOtherDoc( bOtherDoc );
// bei ChangeTrack MoveMode disablen
// if ChangeTrack MoveMode disable
pDlg->SetChangeTrack( pDoc->GetChangeTrack() != NULL );
// cut/move references may disable shift
// directions if source and destination ranges intersect
......@@ -1335,7 +1334,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
WaitObject aWait( GetViewData()->GetDialogParent() );
if ( bAsLink && bOtherDoc )
pTabViewShell->PasteFromSystem(SOT_FORMATSTR_ID_LINK); // DDE einfuegen
pTabViewShell->PasteFromSystem(SOT_FORMATSTR_ID_LINK); // DDE insert
else
pTabViewShell->PasteFromClip( nFlags, pOwnClip->GetDocument(),
nFunction, bSkipEmpty, bTranspose, bAsLink,
......@@ -1375,12 +1374,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
break;
case SID_PASTE_SPECIAL:
// Unterscheidung, ob eigene oder fremde Daten,
// dadurch FID_INS_CELL_CONTENTS ueberfluessig
// differentiate between own cell data and draw objects/external data
// this makes FID_INS_CELL_CONTENTS superfluous
{
Window* pWin = GetViewData()->GetActiveWin();
// Clipboard-ID als Parameter angegeben? Basic "PasteSpecial(Format)"
// Clipboard-ID given as parameter? Basic "PasteSpecial(Format)"
const SfxPoolItem* pItem=NULL;
if ( pReqArgs &&
pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET &&
......@@ -1394,12 +1393,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if ( bDraw && nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE )
pTabViewShell->PasteDraw();
else
bRet = pTabViewShell->PasteFromSystem(nFormat, sal_True); // TRUE: keine Fehlermeldungen
bRet = pTabViewShell->PasteFromSystem(nFormat, sal_True); // TRUE: no error messages
}
if ( bRet )
{
rReq.SetReturnValue(SfxInt16Item(nSlot, bRet)); // 1 = Erfolg, 0 = Fehler
rReq.SetReturnValue(SfxInt16Item(nSlot, bRet)); // 1 = success, 0 = fail
rReq.Done();
}
else
......@@ -1413,9 +1412,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
rReq.SetSlot( FID_INS_CELL_CONTENTS );
ExecuteSlot( rReq, GetInterface() );
rReq.SetReturnValue(SfxInt16Item(nSlot, 1)); // 1 = Erfolg
rReq.SetReturnValue(SfxInt16Item(nSlot, 1)); // 1 = success
}
else // Zeichenobjekte oder fremde Daten
else // draw objects or external data
{
sal_Bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
......@@ -1451,13 +1450,13 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
else
pTabViewShell->PasteFromSystem(nFormat);
}
rReq.SetReturnValue(SfxInt16Item(nSlot, 1)); // 1 = Erfolg
rReq.SetReturnValue(SfxInt16Item(nSlot, 1)); // 1 = success
rReq.AppendItem( SfxUInt32Item( nSlot, nFormat ) );
rReq.Done();
}
else
{
rReq.SetReturnValue(SfxInt16Item(nSlot, 0)); // 0 = Fehler
rReq.SetReturnValue(SfxInt16Item(nSlot, 0)); // 0 = fail
rReq.Ignore();
}
......@@ -1465,7 +1464,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
}
else
rReq.SetReturnValue(SfxInt16Item(nSlot, 0)); // 0 = Fehler
rReq.SetReturnValue(SfxInt16Item(nSlot, 0)); // 0 = fail
}
}
}
......@@ -1473,7 +1472,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
break;
//
// sonstiges
// other
//
case FID_INS_ROWBRK:
......@@ -1732,7 +1731,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if (pTabViewShell->InsertName( aName, aSymbol, aAttrib ))
rReq.Done();
else
SbxBase::SetError( SbxERR_BAD_PARAMETER ); // Basic-Fehler
SbxBase::SetError( SbxERR_BAD_PARAMETER ); // Basic-error
}
}
else
......@@ -1825,11 +1824,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScInputHandler* pHdl = pScMod->GetInputHdl( pTabViewShell );
if (pHdl)
{
// das "=" per Key-Event, schaltet in den Eingabe-Modus
// "=" in KeyEvent, switches to input-mode
pScMod->InputKeyEvent( KeyEvent('=',KeyCode()) );
String aName = pDlg->GetSelectedName();
pHdl->InsertFunction( aName, false ); // ohne "()"
pHdl->InsertFunction( aName, false ); // without "()"
}
}
break;
......@@ -1843,7 +1842,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
const SfxStringItem& rTextItem = (const SfxStringItem&)pReqArgs->Get( SID_RANGE_NOTETEXT );
// immer Cursorposition
// always cursor position
ScAddress aPos( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
pTabViewShell->SetNoteText( aPos, rTextItem.GetValue() );
rReq.Done();
......@@ -1863,7 +1862,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
else
{
pTabViewShell->EditNote(); // Zeichenobjekt zum Editieren
pTabViewShell->EditNote(); // note object to edit
}
break;
......@@ -1978,7 +1977,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if( pItem )
{
pTabViewShell->UseScenario( pItem->GetValue() );
//! wofuer soll der Return-Wert gut sein?!?!
//! why should the return value be valid?!?!
rReq.SetReturnValue( SfxStringItem( SID_SELECT_SCENARIO, pItem->GetValue() ) );
rReq.Done();
}
......@@ -2016,8 +2015,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
const SfxPoolItem* pItem;
if( IS_AVAILABLE( FID_CONDITIONAL_FORMAT, &pItem ) )
{
// Wenn RefInput auf andere Tabelle als Datentabelle umgeschaltet
// hat wieder zurueckschalten:
// when RefInput has switched to other tabs as data table, switch back
if ( GetViewData()->GetTabNo() != GetViewData()->GetRefTabNo() )
{
pTabViewShell->SetTabNo( GetViewData()->GetRefTabNo() );
......@@ -2080,7 +2078,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
//
default:
OSL_FAIL("falscher Slot bei ExecuteEdit");
OSL_FAIL("incorrect slot in ExecuteEdit");
break;
}
}
......
sc/source/ui/view/cellsh2.cxx
Dosyayı görüntüle @ fefa76cf
......@@ -291,7 +291,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
ScDBData* pDBData = pTabViewShell->GetDBData(sal_True,SC_DB_OLD);
if (pDBData)
{
// Import wiederholen wie SID_REIMPORT_DATA
// repeat import like SID_REIMPORT_DATA
sal_Bool bContinue = sal_True;
ScImportParam aImportParam;
......@@ -301,21 +301,21 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
bContinue = pTabViewShell->ImportData( aImportParam );
pDBData->SetImportParam( aImportParam ); //! Undo ??
// markieren (Groesse kann sich geaendert haben)
// mark (size may have been changed)
ScRange aNewRange;
pDBData->GetArea(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() ||
pDBData->HasSubTotalParam() )
pTabViewShell->RepeatDB();
// Pivottabellen die den Bereich als Quelldaten haben
// pivot tables that have the range as data source
ScRange aRange;
pDBData->GetArea(aRange);
......@@ -391,7 +391,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
aArgSet.Put( ScSortItem( SCITEM_SORTDATA, GetViewData(), &aSortParam ) );
pTabViewShell->UISort( aSortParam ); // Teilergebnisse bei Bedarf neu
pTabViewShell->UISort( aSortParam ); // subtotal when needed new
rReq.Done();
}
......@@ -422,7 +422,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
if( bHasHeader )
aSortParam.bHasHeader = bHasHeader;
aSortParam.bInplace = sal_True; // von Basic immer
aSortParam.bInplace = sal_True; // from Basic always
const SfxPoolItem* pItem;
if ( pArgs->GetItemState( SID_SORT_BYROW, sal_True, &pItem ) == SFX_ITEM_SET )
......@@ -440,7 +440,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
sal_uInt16 nUserIndex = ((const SfxUInt16Item*)pItem)->GetValue();
aSortParam.bUserDef = ( nUserIndex != 0 );
if ( nUserIndex )
aSortParam.nUserIndex = nUserIndex - 1; // Basic: 1-basiert
aSortParam.nUserIndex = nUserIndex - 1; // Basic: 1-based
}
SCCOLROW nField0 = 0;
......@@ -465,7 +465,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
if ( pArgs->GetItemState( FN_PARAM_6, sal_True, &pItem ) == SFX_ITEM_SET )
aSortParam.bAscending[2] = ((const SfxBoolItem*)pItem)->GetValue();
// Teilergebnisse bei Bedarf neu
// subtotal when needed new
pTabViewShell->UISort( aSortParam );
rReq.Done();
}
......@@ -504,7 +504,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
const ScSortParam& rOutParam = ((const ScSortItem&)
pOutSet->Get( SCITEM_SORTDATA )).GetSortData();
// Teilergebnisse bei Bedarf neu
// subtotal when needed new
pTabViewShell->UISort( rOutParam );
if ( rOutParam.bInplace )
......@@ -661,8 +662,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
SCTAB nCurTab = GetViewData()->GetTabNo();
SCTAB nRefTab = GetViewData()->GetRefTabNo();
// Wenn RefInput auf andere Tabelle als Datentabelle umgeschaltet
// hat wieder zurueckschalten:
// If RefInput switched to a different sheet from the data sheet,
// switch back:
if ( nCurTab != nRefTab )
{
......@@ -761,7 +762,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
const SfxItemSet* pArgs = rReq.GetArgs();
if ( pArgs )
{
OSL_FAIL("spaeter...");
OSL_FAIL("later...");
}
else
{
......@@ -902,13 +903,13 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
aData.SetIgnoreBlank( bBlank );
aData.SetListType( nListType );
aData.SetInput(aHelpTitle, aHelpText); // sets bShowInput to TRUE
aData.SetInput(aHelpTitle, aHelpText); // sets bShowInput to TRUE
if (!bShowHelp)
aData.ResetInput(); // reset only bShowInput
aData.ResetInput(); // reset only bShowInput
aData.SetError(aErrTitle, aErrText, eErrStyle); // sets bShowError to TRUE
if (!bShowError)
aData.ResetError(); // reset only bShowError
aData.ResetError(); // reset only bShowError
pTabViewShell->SetValidation( aData );
rReq.Done( *pOutSet );
......@@ -995,8 +996,8 @@ void ScCellShell::GetDBState( SfxItemSet& rSet )
{
case SID_REFRESH_DBAREA:
{
// importierte Daten ohne Selektion
// oder Filter,Sortierung,Teilergebis (auch ohne Import)
// imported data without selection
// or filter,sort,subtotal (also without import)
sal_Bool bOk = false;
ScDBData* pDBData = pTabViewShell->GetDBData(false,SC_DB_OLD);
if (pDBData && pDoc->GetChangeTrack() == NULL)
......@@ -1028,7 +1029,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet )
break;
//Bei Redlining und Multiselektion Disablen
//in case of Redlining and multiselection disable
case SID_SORT_ASCENDING:
case SID_SORT_DESCENDING:
case SCITEM_SORTDATA:
......@@ -1047,7 +1048,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet )
case SID_REIMPORT_DATA:
{
// nur importierte Daten ohne Selektion
// only imported data without selection
ScDBData* pDBData = pTabViewShell->GetDBData(false,SC_DB_OLD);
if (!pDBData || !pDBData->HasImportParam() || pDBData->HasImportSelection() ||
pDoc->GetChangeTrack()!=NULL)
......@@ -1068,7 +1069,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet )
break;
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;
rSet.Put(SfxBoolItem(nWhich, bEnable));
......
sc/source/ui/view/cellsh4.cxx
Dosyayı görüntüle @ fefa76cf
......@@ -144,10 +144,10 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
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();
//OS: einmal fuer alle wird doch reichen!
//OS: once for all should do, however!
pTabViewShell->ExecuteInputDirect();
switch ( nSlotId )
{
......@@ -200,7 +200,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
break;
default:
OSL_FAIL("Unbekannte Message bei ViewShell (Cursor)");
OSL_FAIL("Unknown message in ViewShell (Cursor)");
return;
}
......@@ -312,8 +312,8 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq )
pTabViewShell->SelectNextTab( -1, (nSlotId == SID_PREV_TABLE_SEL) );
break;
// Cursorbewegungen in Bloecken gehen nicht von Basic aus,
// weil das ScSbxRange-Objekt bei Eingaben die Markierung veraendert
// cursor movements in range do not originate from Basic,
// because the ScSbxRange-object changes the marking at input
case SID_NEXT_UNPROTECT:
pTabViewShell->FindNextUnprot( false, !rReq.IsAPI() );
......@@ -386,7 +386,7 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq )
break;
default:
OSL_FAIL("Unbekannte Message bei ViewShell (Cursor)");
OSL_FAIL("Unknown message in ViewShell (Cursor)");
return;
}
......@@ -403,7 +403,7 @@ void ScCellShell::ExecutePageSel( SfxRequest& rReq )
case SID_CURSORTOPOFFILE_SEL: rReq.SetSlot( SID_CURSORTOPOFFILE ); break;
case SID_CURSORENDOFFILE_SEL: rReq.SetSlot( SID_CURSORENDOFFILE ); break;
default:
OSL_FAIL("Unbekannte Message bei ViewShell (ExecutePageSel)");
OSL_FAIL("Unknown message in ViewShell (ExecutePageSel)");
return;
}
rReq.AppendItem( SfxBoolItem(FN_PARAM_2, sal_True) );
......@@ -458,7 +458,7 @@ void ScCellShell::ExecutePage( SfxRequest& rReq )
break;
default:
OSL_FAIL("Unbekannte Message bei ViewShell (ExecutePage)");
OSL_FAIL("Unknown message in ViewShell (ExecutePage)");
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