summaryrefslogtreecommitdiff
path: root/sc/source/ui/undo
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/undo')
-rw-r--r--sc/source/ui/undo/areasave.cxx30
-rw-r--r--sc/source/ui/undo/refundo.cxx18
-rw-r--r--sc/source/ui/undo/target.cxx2
-rw-r--r--sc/source/ui/undo/undobase.cxx44
-rw-r--r--sc/source/ui/undo/undoblk.cxx260
-rw-r--r--sc/source/ui/undo/undoblk2.cxx18
-rw-r--r--sc/source/ui/undo/undoblk3.cxx366
-rw-r--r--sc/source/ui/undo/undocell.cxx94
-rw-r--r--sc/source/ui/undo/undodat.cxx292
-rw-r--r--sc/source/ui/undo/undodraw.cxx4
-rw-r--r--sc/source/ui/undo/undoolk.cxx4
-rw-r--r--sc/source/ui/undo/undostyl.cxx26
-rw-r--r--sc/source/ui/undo/undotab.cxx212
-rw-r--r--sc/source/ui/undo/undoutil.cxx2
14 files changed, 686 insertions, 686 deletions
diff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx
index 8f5ce350b887..77cae60a8eec 100644
--- a/sc/source/ui/undo/areasave.cxx
+++ b/sc/source/ui/undo/areasave.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -44,22 +44,22 @@
// -----------------------------------------------------------------------
ScAreaLinkSaver::ScAreaLinkSaver( const ScAreaLink& rSource ) :
- aFileName ( rSource.GetFile() ),
- aFilterName ( rSource.GetFilter() ),
- aOptions ( rSource.GetOptions() ),
- aSourceArea ( rSource.GetSource() ),
- aDestArea ( rSource.GetDestArea() ),
+ aFileName ( rSource.GetFile() ),
+ aFilterName ( rSource.GetFilter() ),
+ aOptions ( rSource.GetOptions() ),
+ aSourceArea ( rSource.GetSource() ),
+ aDestArea ( rSource.GetDestArea() ),
nRefresh ( rSource.GetRefreshDelay() ) // seconds
{
}
ScAreaLinkSaver::ScAreaLinkSaver( const ScAreaLinkSaver& rCopy ) :
ScDataObject(),
- aFileName ( rCopy.aFileName ),
- aFilterName ( rCopy.aFilterName ),
- aOptions ( rCopy.aOptions ),
- aSourceArea ( rCopy.aSourceArea ),
- aDestArea ( rCopy.aDestArea ),
+ aFileName ( rCopy.aFileName ),
+ aFilterName ( rCopy.aFilterName ),
+ aOptions ( rCopy.aOptions ),
+ aSourceArea ( rCopy.aSourceArea ),
+ aDestArea ( rCopy.aDestArea ),
nRefresh ( rCopy.nRefresh )
{
}
@@ -68,16 +68,16 @@ ScAreaLinkSaver::~ScAreaLinkSaver()
{
}
-ScDataObject* ScAreaLinkSaver::Clone() const
+ScDataObject* ScAreaLinkSaver::Clone() const
{
return new ScAreaLinkSaver( *this );
}
BOOL ScAreaLinkSaver::IsEqualSource( const ScAreaLink& rCompare ) const
{
- return ( aFileName == rCompare.GetFile() &&
+ return ( aFileName == rCompare.GetFile() &&
aFilterName == rCompare.GetFilter() &&
- aOptions == rCompare.GetOptions() &&
+ aOptions == rCompare.GetOptions() &&
aSourceArea == rCompare.GetSource() &&
nRefresh == rCompare.GetRefreshDelay() );
}
@@ -127,7 +127,7 @@ ScAreaLinkSaveCollection::~ScAreaLinkSaveCollection()
{
}
-ScDataObject* ScAreaLinkSaveCollection::Clone() const
+ScDataObject* ScAreaLinkSaveCollection::Clone() const
{
return new ScAreaLinkSaveCollection( *this );
}
diff --git a/sc/source/ui/undo/refundo.cxx b/sc/source/ui/undo/refundo.cxx
index c863259ddf94..69344dffa9ce 100644
--- a/sc/source/ui/undo/refundo.cxx
+++ b/sc/source/ui/undo/refundo.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -58,14 +58,14 @@ ScRefUndoData::ScRefUndoData( const ScDocument* pDoc ) :
ScDBCollection* pOldDBColl = pDoc->GetDBCollection();
pDBCollection = pOldDBColl ? new ScDBCollection(*pOldDBColl) : NULL;
- ScRangeName* pOldRanges = ((ScDocument*)pDoc)->GetRangeName(); //! const
+ ScRangeName* pOldRanges = ((ScDocument*)pDoc)->GetRangeName(); //! const
pRangeName = pOldRanges ? new ScRangeName(*pOldRanges) : NULL;
- pPrintRanges = pDoc->CreatePrintRangeSaver(); // neu erzeugt
+ pPrintRanges = pDoc->CreatePrintRangeSaver(); // neu erzeugt
- //! bei Pivot nur Bereiche merken ???
+ //! bei Pivot nur Bereiche merken ???
- ScDPCollection* pOldDP = ((ScDocument*)pDoc)->GetDPCollection(); //! const
+ ScDPCollection* pOldDP = ((ScDocument*)pDoc)->GetDPCollection(); //! const
pDPCollection = pOldDP ? new ScDPCollection(*pOldDP) : NULL;
ScConditionalFormatList* pOldCond = pDoc->GetCondFormList();
@@ -79,7 +79,7 @@ ScRefUndoData::ScRefUndoData( const ScDocument* pDoc ) :
pChartListenerCollection = pOldChartListenerCollection ?
new ScChartListenerCollection( *pOldChartListenerCollection ) : NULL;
- pAreaLinks = ScAreaLinkSaveCollection::CreateFromDoc(pDoc); // returns NULL if empty
+ pAreaLinks = ScAreaLinkSaveCollection::CreateFromDoc(pDoc); // returns NULL if empty
const_cast<ScDocument*>(pDoc)->BeginUnoRefUndo();
}
@@ -107,7 +107,7 @@ void ScRefUndoData::DeleteUnchanged( const ScDocument* pDoc )
}
if (pRangeName)
{
- ScRangeName* pNewRanges = ((ScDocument*)pDoc)->GetRangeName(); //! const
+ ScRangeName* pNewRanges = ((ScDocument*)pDoc)->GetRangeName(); //! const
if ( pNewRanges && *pRangeName == *pNewRanges )
DELETEZ(pRangeName);
}
@@ -122,7 +122,7 @@ void ScRefUndoData::DeleteUnchanged( const ScDocument* pDoc )
if (pDPCollection)
{
- ScDPCollection* pNewDP = ((ScDocument*)pDoc)->GetDPCollection(); //! const
+ ScDPCollection* pNewDP = ((ScDocument*)pDoc)->GetDPCollection(); //! const
if ( pNewDP && pDPCollection->RefsEqual(*pNewDP) )
DELETEZ(pDPCollection);
}
@@ -196,7 +196,7 @@ void ScRefUndoData::DoUndo( ScDocument* pDoc, BOOL bUndoRefFirst )
if (pDBCollection || pRangeName)
{
BOOL bOldAutoCalc = pDoc->GetAutoCalc();
- pDoc->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
+ pDoc->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
pDoc->CompileAll();
pDoc->SetDirty();
pDoc->SetAutoCalc( bOldAutoCalc );
diff --git a/sc/source/ui/undo/target.cxx b/sc/source/ui/undo/target.cxx
index 1c2e4a925378..feac9ddb34e0 100644
--- a/sc/source/ui/undo/target.cxx
+++ b/sc/source/ui/undo/target.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index fffb76ebd061..3798d7f76f54 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1(ScSimpleUndo, SfxUndoAction);
+TYPEINIT1(ScSimpleUndo, SfxUndoAction);
TYPEINIT1(ScBlockUndo, ScSimpleUndo);
TYPEINIT1(ScMoveUndo, ScSimpleUndo);
TYPEINIT1(ScDBFuncUndo, ScSimpleUndo);
@@ -68,17 +68,17 @@ __EXPORT ScSimpleUndo::~ScSimpleUndo()
BOOL __EXPORT ScSimpleUndo::Merge( SfxUndoAction *pNextAction )
{
- // Zu jeder Undo-Action kann eine SdrUndoGroup fuer das Aktualisieren
- // der Detektiv-Pfeile gehoeren.
- // DetectiveRefresh kommt immer hinterher, die SdrUndoGroup ist in
- // eine ScUndoDraw Action verpackt.
- // Nur beim automatischen Aktualisieren wird AddUndoAction mit
- // bTryMerg=TRUE gerufen.
+ // Zu jeder Undo-Action kann eine SdrUndoGroup fuer das Aktualisieren
+ // der Detektiv-Pfeile gehoeren.
+ // DetectiveRefresh kommt immer hinterher, die SdrUndoGroup ist in
+ // eine ScUndoDraw Action verpackt.
+ // Nur beim automatischen Aktualisieren wird AddUndoAction mit
+ // bTryMerg=TRUE gerufen.
if ( !pDetectiveUndo && pNextAction->ISA(ScUndoDraw) )
{
- // SdrUndoAction aus der ScUndoDraw Action uebernehmen,
- // ScUndoDraw wird dann vom UndoManager geloescht
+ // SdrUndoAction aus der ScUndoDraw Action uebernehmen,
+ // ScUndoDraw wird dann vom UndoManager geloescht
ScUndoDraw* pCalcUndo = (ScUndoDraw*)pNextAction;
pDetectiveUndo = pCalcUndo->GetDrawUndo();
@@ -95,9 +95,9 @@ void ScSimpleUndo::BeginUndo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
- pViewShell->HideAllCursors(); // z.B. wegen zusammengefassten Zellen
+ pViewShell->HideAllCursors(); // z.B. wegen zusammengefassten Zellen
- // detective updates happened last, must be undone first
+ // detective updates happened last, must be undone first
if (pDetectiveUndo)
pDetectiveUndo->Undo();
}
@@ -119,11 +119,11 @@ void ScSimpleUndo::EndUndo()
void ScSimpleUndo::BeginRedo()
{
- pDocShell->SetInUndo( TRUE ); //! eigenes Flag fuer Redo?
+ pDocShell->SetInUndo( TRUE ); //! eigenes Flag fuer Redo?
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
- pViewShell->HideAllCursors(); // z.B. wegen zusammengefassten Zellen
+ pViewShell->HideAllCursors(); // z.B. wegen zusammengefassten Zellen
}
void ScSimpleUndo::EndRedo()
@@ -144,14 +144,14 @@ void ScSimpleUndo::EndRedo()
pDocShell->SetInUndo( FALSE );
}
-void ScSimpleUndo::ShowTable( SCTAB nTab ) // static
+void ScSimpleUndo::ShowTable( SCTAB nTab ) // static
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
pViewShell->SetTabNo( nTab );
}
-void ScSimpleUndo::ShowTable( const ScRange& rRange ) // static
+void ScSimpleUndo::ShowTable( const ScRange& rRange ) // static
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
@@ -159,8 +159,8 @@ void ScSimpleUndo::ShowTable( const ScRange& rRange ) // static
SCTAB nStart = rRange.aStart.Tab();
SCTAB nEnd = rRange.aEnd.Tab();
SCTAB nTab = pViewShell->GetViewData()->GetTabNo();
- if ( nTab < nStart || nTab > nEnd ) // wenn nicht im Bereich:
- pViewShell->SetTabNo( nStart ); // auf erste des Bereiches
+ if ( nTab < nStart || nTab > nEnd ) // wenn nicht im Bereich:
+ pViewShell->SetTabNo( nStart ); // auf erste des Bereiches
}
}
@@ -234,13 +234,13 @@ BOOL ScBlockUndo::AdjustHeight()
}
else
{
- // Zoom auf 100 lassen
+ // Zoom auf 100 lassen
nPPTX = ScGlobal::nScreenPPTX;
nPPTY = ScGlobal::nScreenPPTY;
}
BOOL bRet = pDoc->SetOptimalHeight( aBlockRange.aStart.Row(), aBlockRange.aEnd.Row(),
-/*!*/ aBlockRange.aStart.Tab(), 0, &aVirtDev,
+/*!*/ aBlockRange.aStart.Tab(), 0, &aVirtDev,
nPPTX, nPPTY, aZoomX, aZoomY, FALSE );
if (bRet)
@@ -256,7 +256,7 @@ void ScBlockUndo::ShowBlock()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
{
- ShowTable( aBlockRange ); // bei mehreren Tabs im Range ist jede davon gut
+ ShowTable( aBlockRange ); // bei mehreren Tabs im Range ist jede davon gut
pViewShell->MoveCursorAbs( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(),
SC_FOLLOW_JUMP, FALSE, FALSE );
SCTAB nTab = pViewShell->GetViewData()->GetTabNo();
@@ -265,7 +265,7 @@ void ScBlockUndo::ShowBlock()
aRange.aEnd.SetTab( nTab );
pViewShell->MarkRange( aRange );
- // nicht per SetMarkArea an MarkData, wegen evtl. fehlendem Paint
+ // nicht per SetMarkArea an MarkData, wegen evtl. fehlendem Paint
}
}
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 3fb2c74a9954..6c096c99fb75 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -67,37 +67,37 @@
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1(ScUndoInsertCells, SfxUndoAction);
-TYPEINIT1(ScUndoDeleteCells, SfxUndoAction);
-TYPEINIT1(ScUndoDeleteMulti, SfxUndoAction);
-TYPEINIT1(ScUndoCut, ScBlockUndo);
-TYPEINIT1(ScUndoPaste, SfxUndoAction);
-TYPEINIT1(ScUndoDragDrop, SfxUndoAction);
-TYPEINIT1(ScUndoListNames, SfxUndoAction);
-TYPEINIT1(ScUndoUseScenario, SfxUndoAction);
-TYPEINIT1(ScUndoSelectionStyle, SfxUndoAction);
-TYPEINIT1(ScUndoEnterMatrix, ScBlockUndo);
-TYPEINIT1(ScUndoIndent, ScBlockUndo);
-TYPEINIT1(ScUndoTransliterate, ScBlockUndo);
-TYPEINIT1(ScUndoClearItems, ScBlockUndo);
-TYPEINIT1(ScUndoRemoveBreaks, SfxUndoAction);
-TYPEINIT1(ScUndoRemoveMerge, ScBlockUndo);
-TYPEINIT1(ScUndoBorder, ScBlockUndo);
+TYPEINIT1(ScUndoInsertCells, SfxUndoAction);
+TYPEINIT1(ScUndoDeleteCells, SfxUndoAction);
+TYPEINIT1(ScUndoDeleteMulti, SfxUndoAction);
+TYPEINIT1(ScUndoCut, ScBlockUndo);
+TYPEINIT1(ScUndoPaste, SfxUndoAction);
+TYPEINIT1(ScUndoDragDrop, SfxUndoAction);
+TYPEINIT1(ScUndoListNames, SfxUndoAction);
+TYPEINIT1(ScUndoUseScenario, SfxUndoAction);
+TYPEINIT1(ScUndoSelectionStyle, SfxUndoAction);
+TYPEINIT1(ScUndoEnterMatrix, ScBlockUndo);
+TYPEINIT1(ScUndoIndent, ScBlockUndo);
+TYPEINIT1(ScUndoTransliterate, ScBlockUndo);
+TYPEINIT1(ScUndoClearItems, ScBlockUndo);
+TYPEINIT1(ScUndoRemoveBreaks, SfxUndoAction);
+TYPEINIT1(ScUndoRemoveMerge, ScBlockUndo);
+TYPEINIT1(ScUndoBorder, ScBlockUndo);
// To Do:
-/*A*/ // SetOptimalHeight auf Dokument, wenn keine View
-/*B*/ // gelinkte Tabellen
-/*C*/ // ScArea
-//? // spaeter mal pruefen
+/*A*/ // SetOptimalHeight auf Dokument, wenn keine View
+/*B*/ // gelinkte Tabellen
+/*C*/ // ScArea
+//? // spaeter mal pruefen
// -----------------------------------------------------------------------
//
-// Zellen einfuegen
+// Zellen einfuegen
// Zeilen einfuegen
-// einzeln oder Block
+// einzeln oder Block
//
ScUndoInsertCells::ScUndoInsertCells( ScDocShell* pNewDocShell,
@@ -113,13 +113,13 @@ ScUndoInsertCells::ScUndoInsertCells( ScDocShell* pNewDocShell,
bPartOfPaste( bNewPartOfPaste ),
pPasteUndo( NULL )
{
- if (eCmd == INS_INSROWS) // ganze Zeilen?
+ if (eCmd == INS_INSROWS) // ganze Zeilen?
{
aEffRange.aStart.SetCol(0);
aEffRange.aEnd.SetCol(MAXCOL);
}
- if (eCmd == INS_INSCOLS) // ganze Spalten?
+ if (eCmd == INS_INSCOLS) // ganze Spalten?
{
aEffRange.aStart.SetRow(0);
aEffRange.aEnd.SetRow(MAXROW);
@@ -142,7 +142,7 @@ String __EXPORT ScUndoInsertCells::GetComment() const
BOOL ScUndoInsertCells::Merge( SfxUndoAction* pNextAction )
{
- // If a paste undo action has already been added, append (detective) action there.
+ // If a paste undo action has already been added, append (detective) action there.
if ( pPasteUndo )
return pPasteUndo->Merge( pNextAction );
@@ -152,16 +152,16 @@ BOOL ScUndoInsertCells::Merge( SfxUndoAction* pNextAction )
SfxUndoAction* pWrappedAction = pWrapper->GetWrappedUndo();
if ( pWrappedAction && pWrappedAction->ISA( ScUndoPaste ) )
{
- // Store paste action if this is part of paste with inserting cells.
- // A list action isn't used because Repeat wouldn't work (insert wrong cells).
+ // Store paste action if this is part of paste with inserting cells.
+ // A list action isn't used because Repeat wouldn't work (insert wrong cells).
pPasteUndo = pWrappedAction;
- pWrapper->ForgetWrappedUndo(); // pWrapper is deleted by UndoManager
+ pWrapper->ForgetWrappedUndo(); // pWrapper is deleted by UndoManager
return TRUE;
}
}
- // Call base class for detective handling
+ // Call base class for detective handling
return ScMoveUndo::Merge( pNextAction );
}
@@ -239,7 +239,7 @@ void ScUndoInsertCells::DoChange( const BOOL bUndo )
}
}
-//? Undo fuer herausgeschobene Attribute ?
+//? Undo fuer herausgeschobene Attribute ?
USHORT nPaint = PAINT_GRID;
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
@@ -262,14 +262,14 @@ void ScUndoInsertCells::DoChange( const BOOL bUndo )
}
break;
case INS_INSCOLS:
- nPaint |= PAINT_TOP; // obere Leiste
+ nPaint |= PAINT_TOP; // obere Leiste
case INS_CELLSRIGHT:
for( i=0; i<nCount; i++ )
{
- aWorkRange.aEnd.SetCol(MAXCOL); // bis ganz nach rechts
+ aWorkRange.aEnd.SetCol(MAXCOL); // bis ganz nach rechts
if ( pDocShell->AdjustRowHeight( aWorkRange.aStart.Row(), aWorkRange.aEnd.Row(), pTabs[i]) )
- { // AdjustDraw zeichnet PAINT_TOP nicht,
- aWorkRange.aStart.SetCol(0); // daher so geloest
+ { // AdjustDraw zeichnet PAINT_TOP nicht,
+ aWorkRange.aStart.SetCol(0); // daher so geloest
aWorkRange.aEnd.SetRow(MAXROW);
nPaint |= PAINT_LEFT;
}
@@ -294,9 +294,9 @@ void ScUndoInsertCells::DoChange( const BOOL bUndo )
void __EXPORT ScUndoInsertCells::Undo()
{
if ( pPasteUndo )
- pPasteUndo->Undo(); // undo paste first
+ pPasteUndo->Undo(); // undo paste first
- WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
+ WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
BeginUndo();
DoChange( TRUE );
EndUndo();
@@ -304,13 +304,13 @@ void __EXPORT ScUndoInsertCells::Undo()
void __EXPORT ScUndoInsertCells::Redo()
{
- WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
+ WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
BeginRedo();
DoChange( FALSE );
EndRedo();
if ( pPasteUndo )
- pPasteUndo->Redo(); // redo paste last
+ pPasteUndo->Redo(); // redo paste last
}
void __EXPORT ScUndoInsertCells::Repeat(SfxRepeatTarget& rTarget)
@@ -319,8 +319,8 @@ void __EXPORT ScUndoInsertCells::Repeat(SfxRepeatTarget& rTarget)
{
if ( pPasteUndo )
{
- // #94115# Repeat for paste with inserting cells is handled completely
- // by the Paste undo action
+ // #94115# Repeat for paste with inserting cells is handled completely
+ // by the Paste undo action
pPasteUndo->Repeat( rTarget );
}
@@ -337,9 +337,9 @@ BOOL __EXPORT ScUndoInsertCells::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Zellen loeschen
+// Zellen loeschen
// Zeilen loeschen
-// einzeln oder Block
+// einzeln oder Block
//
ScUndoDeleteCells::ScUndoDeleteCells( ScDocShell* pNewDocShell,
@@ -352,13 +352,13 @@ ScUndoDeleteCells::ScUndoDeleteCells( ScDocShell* pNewDocShell,
pScenarios( pNewScenarios ),
eCmd( eNewCmd )
{
- if (eCmd == DEL_DELROWS) // gaze Zeilen?
+ if (eCmd == DEL_DELROWS) // gaze Zeilen?
{
aEffRange.aStart.SetCol(0);
aEffRange.aEnd.SetCol(MAXCOL);
}
- if (eCmd == DEL_DELCOLS) // ganze Spalten?
+ if (eCmd == DEL_DELCOLS) // ganze Spalten?
{
aEffRange.aStart.SetRow(0);
aEffRange.aEnd.SetRow(MAXROW);
@@ -458,7 +458,7 @@ void ScUndoDeleteCells::DoChange( const BOOL bUndo )
{
if ( eCmd==DEL_DELCOLS || eCmd==DEL_CELLSLEFT )
aWorkRange.aEnd.SetCol(MAXCOL);
- if ( eCmd==DEL_DELROWS || eCmd==DEL_CELLSUP )
+ if ( eCmd==DEL_DELROWS || eCmd==DEL_CELLSUP )
aWorkRange.aEnd.SetRow(MAXROW);
ScMarkData aMarkData;
aMarkData.SelectOneTable( aWorkRange.aStart.Tab() );
@@ -496,11 +496,11 @@ void ScUndoDeleteCells::DoChange( const BOOL bUndo )
}
break;
case DEL_DELCOLS:
- nPaint |= PAINT_TOP; // obere Leiste
+ nPaint |= PAINT_TOP; // obere Leiste
case DEL_CELLSLEFT:
for( i=0; i<nCount; i++ )
{
- aWorkRange.aEnd.SetCol(MAXCOL); // bis ganz nach rechts
+ aWorkRange.aEnd.SetCol(MAXCOL); // bis ganz nach rechts
if ( pDocShell->AdjustRowHeight( aWorkRange.aStart.Row(), aWorkRange.aEnd.Row(), pTabs[i] ) )
{
aWorkRange.aStart.SetCol(0);
@@ -523,12 +523,12 @@ void ScUndoDeleteCells::DoChange( const BOOL bUndo )
// Markierung erst nach EndUndo
pDocShell->PostDataChanged();
- // CellContentChanged kommt mit der Markierung
+ // CellContentChanged kommt mit der Markierung
}
void __EXPORT ScUndoDeleteCells::Undo()
{
- WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
+ WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
BeginUndo();
DoChange( TRUE );
EndUndo();
@@ -547,7 +547,7 @@ void __EXPORT ScUndoDeleteCells::Undo()
void __EXPORT ScUndoDeleteCells::Redo()
{
- WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
+ WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
BeginRedo();
DoChange( FALSE);
EndRedo();
@@ -555,7 +555,7 @@ void __EXPORT ScUndoDeleteCells::Redo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
- pViewShell->DoneBlockMode(); // aktuelle weg
+ pViewShell->DoneBlockMode(); // aktuelle weg
}
void __EXPORT ScUndoDeleteCells::Repeat(SfxRepeatTarget& rTarget)
@@ -572,7 +572,7 @@ BOOL __EXPORT ScUndoDeleteCells::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Zellen loeschen auf Mehrfachselektion
+// Zellen loeschen auf Mehrfachselektion
//
ScUndoDeleteMulti::ScUndoDeleteMulti( ScDocShell* pNewDocShell,
@@ -597,7 +597,7 @@ __EXPORT ScUndoDeleteMulti::~ScUndoDeleteMulti()
String __EXPORT ScUndoDeleteMulti::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // wie DeleteCells
+ return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // wie DeleteCells
}
void ScUndoDeleteMulti::DoChange() const
@@ -674,14 +674,14 @@ void ScUndoDeleteMulti::SetChangeTrack()
void __EXPORT ScUndoDeleteMulti::Undo()
{
- WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
+ WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
BeginUndo();
ScDocument* pDoc = pDocShell->GetDocument();
SCCOLROW* pOneRange;
SCCOLROW nRangeNo;
- // rueckwaerts geloescht -> vorwaerts einfuegen
+ // rueckwaerts geloescht -> vorwaerts einfuegen
pOneRange = pRanges;
for (nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++)
{
@@ -711,8 +711,8 @@ void __EXPORT ScUndoDeleteMulti::Undo()
DoChange();
- //! Markierung wieder einzeichnen
- //! geht im Moment nicht, da keine Daten fuer Markierung vorhanden!
+ //! Markierung wieder einzeichnen
+ //! geht im Moment nicht, da keine Daten fuer Markierung vorhanden!
EndUndo();
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
@@ -720,7 +720,7 @@ void __EXPORT ScUndoDeleteMulti::Undo()
void __EXPORT ScUndoDeleteMulti::Redo()
{
- WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
+ WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
BeginRedo();
ScDocument* pDoc = pDocShell->GetDocument();
@@ -741,10 +741,10 @@ void __EXPORT ScUndoDeleteMulti::Redo()
DoChange();
-//! Markierung loeschen, derzeit unnoetig (s.o.)
-//! ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-//! if (pViewShell)
-//! DoneBlockMode();
+//! Markierung loeschen, derzeit unnoetig (s.o.)
+//! ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
+//! if (pViewShell)
+//! DoneBlockMode();
EndRedo();
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
@@ -752,7 +752,7 @@ void __EXPORT ScUndoDeleteMulti::Redo()
void __EXPORT ScUndoDeleteMulti::Repeat(SfxRepeatTarget& rTarget)
{
- // DeleteCells, falls einfache Selektion
+ // DeleteCells, falls einfache Selektion
if (rTarget.ISA(ScTabViewTarget))
((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( DEL_DELROWS, TRUE );
}
@@ -765,7 +765,7 @@ BOOL __EXPORT ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Ausschneiden (Cut)
+// Ausschneiden (Cut)
//
ScUndoCut::ScUndoCut( ScDocShell* pNewDocShell,
@@ -807,7 +807,7 @@ void ScUndoCut::DoChange( const BOOL bUndo )
// do not undo/redo objects and note captions, they are handled via drawing undo
USHORT nUndoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
- if (bUndo) // nur bei Undo
+ if (bUndo) // nur bei Undo
{
// all sheets - CopyToDocument skips those that don't exist in pUndoDoc
SCTAB nTabCount = pDoc->GetTableCount();
@@ -819,7 +819,7 @@ void ScUndoCut::DoChange( const BOOL bUndo )
if ( pChangeTrack )
pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
}
- else // nur bei Redo
+ else // nur bei Redo
{
pDocShell->UpdatePaintExt( nExtFlags, aExtendedRange );
pDoc->DeleteArea( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(),
@@ -829,10 +829,10 @@ void ScUndoCut::DoChange( const BOOL bUndo )
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if ( !( (pViewShell) && pViewShell->AdjustBlockHeight() ) )
-/*A*/ pDocShell->PostPaint( aExtendedRange, PAINT_GRID, nExtFlags );
+/*A*/ pDocShell->PostPaint( aExtendedRange, PAINT_GRID, nExtFlags );
if ( !bUndo ) // draw redo after updating row heights
- RedoSdrUndoAction( pDrawUndo ); //! include in ScBlockUndo?
+ RedoSdrUndoAction( pDrawUndo ); //! include in ScBlockUndo?
pDocShell->PostDataChanged();
if (pViewShell)
@@ -850,9 +850,9 @@ void __EXPORT ScUndoCut::Redo()
{
BeginRedo();
ScDocument* pDoc = pDocShell->GetDocument();
- EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo?
+ EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo?
DoChange( FALSE );
- EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo?
+ EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo?
EndRedo();
}
@@ -870,7 +870,7 @@ BOOL __EXPORT ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Einfuegen (Paste)
+// Einfuegen (Paste)
//
ScUndoPaste::ScUndoPaste( ScDocShell* pNewDocShell,
@@ -891,18 +891,18 @@ ScUndoPaste::ScUndoPaste( ScDocShell* pNewDocShell,
pRefRedoData( NULL ),
bRedoFilled( bRedoIsFilled )
{
- // pFill1,pFill2,pFill3 are there so the ctor calls for simple paste (without cutting)
- // don't have to be changed and branched for 641.
- // They can be removed later.
+ // pFill1,pFill2,pFill3 are there so the ctor calls for simple paste (without cutting)
+ // don't have to be changed and branched for 641.
+ // They can be removed later.
- if ( !aMarkData.IsMarked() ) // no cell marked:
- aMarkData.SetMarkArea( aBlockRange ); // mark paste block
+ if ( !aMarkData.IsMarked() ) // no cell marked:
+ aMarkData.SetMarkArea( aBlockRange ); // mark paste block
if ( pRefUndoData )
pRefUndoData->DeleteUnchanged( pDocShell->GetDocument() );
if ( pOptions )
- aPasteOptions = *pOptions; // used only for Repeat
+ aPasteOptions = *pOptions; // used only for Repeat
SetChangeTrack();
}
@@ -934,15 +934,15 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
{
ScDocument* pDoc = pDocShell->GetDocument();
- // RefUndoData for redo is created before first undo
- // (with DeleteUnchanged after the DoUndo call)
+ // RefUndoData for redo is created before first undo
+ // (with DeleteUnchanged after the DoUndo call)
BOOL bCreateRedoData = ( bUndo && pRefUndoData && !pRefRedoData );
if ( bCreateRedoData )
pRefRedoData = new ScRefUndoData( pDoc );
ScRefUndoData* pWorkRefData = bUndo ? pRefUndoData : pRefRedoData;
- // fuer Undo immer alle oder keine Inhalte sichern
+ // fuer Undo immer alle oder keine Inhalte sichern
USHORT nUndoFlags = IDF_NONE;
if (nFlags & IDF_CONTENTS)
nUndoFlags |= IDF_CONTENTS;
@@ -1006,7 +1006,7 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
if (pWorkRefData)
{
- pWorkRefData->DoUndo( pDoc, TRUE ); // TRUE = bSetChartRangeLists for SetChartListenerCollection
+ pWorkRefData->DoUndo( pDoc, TRUE ); // TRUE = bSetChartRangeLists for SetChartListenerCollection
if ( pDoc->RefreshAutoFilter( 0,0, MAXCOL,MAXROW, aBlockRange.aStart.Tab() ) )
bPaintAll = TRUE;
}
@@ -1047,22 +1047,22 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
aDrawRange.aEnd.SetCol(MAXCOL);
aDrawRange.aEnd.SetRow(MAXROW);
nPaint |= PAINT_TOP | PAINT_LEFT;
-/*A*/ if (pViewShell)
+/*A*/ if (pViewShell)
pViewShell->AdjustBlockHeight(FALSE);
}
else
{
- if ( aBlockRange.aStart.Row() == 0 && aBlockRange.aEnd.Row() == MAXROW ) // ganze Spalte
+ if ( aBlockRange.aStart.Row() == 0 && aBlockRange.aEnd.Row() == MAXROW ) // ganze Spalte
{
nPaint |= PAINT_TOP;
aDrawRange.aEnd.SetCol(MAXCOL);
}
- if ( aBlockRange.aStart.Col() == 0 && aBlockRange.aEnd.Col() == MAXCOL ) // ganze Zeile
+ if ( aBlockRange.aStart.Col() == 0 && aBlockRange.aEnd.Col() == MAXCOL ) // ganze Zeile
{
nPaint |= PAINT_LEFT;
aDrawRange.aEnd.SetRow(MAXROW);
}
-/*A*/ if ((pViewShell) && pViewShell->AdjustBlockHeight(FALSE))
+/*A*/ if ((pViewShell) && pViewShell->AdjustBlockHeight(FALSE))
{
aDrawRange.aStart.SetCol(0);
aDrawRange.aStart.SetRow(0);
@@ -1074,7 +1074,7 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
}
if ( !bUndo ) // draw redo after updating row heights
- RedoSdrUndoAction( pDrawUndo ); //! include in ScBlockUndo?
+ RedoSdrUndoAction( pDrawUndo ); //! include in ScBlockUndo?
pDocShell->PostPaint( aDrawRange, nPaint, nExtFlags );
@@ -1096,9 +1096,9 @@ void __EXPORT ScUndoPaste::Redo()
{
BeginRedo();
ScDocument* pDoc = pDocShell->GetDocument();
- EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo?
+ EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo?
DoChange( FALSE );
- EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo?
+ EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo?
EndRedo();
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
}
@@ -1116,7 +1116,7 @@ void __EXPORT ScUndoPaste::Repeat(SfxRepeatTarget& rTarget)
pViewSh->PasteFromClip( nFlags, pOwnClip->GetDocument(),
aPasteOptions.nFunction, aPasteOptions.bSkipEmpty, aPasteOptions.bTranspose,
aPasteOptions.bAsLink, aPasteOptions.eMoveMode, IDF_NONE,
- TRUE ); // allow warning dialog
+ TRUE ); // allow warning dialog
}
}
}
@@ -1129,7 +1129,7 @@ BOOL __EXPORT ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Verschieben/Kopieren (Drag & Drop)
+// Verschieben/Kopieren (Drag & Drop)
//
ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell,
@@ -1168,7 +1168,7 @@ __EXPORT ScUndoDragDrop::~ScUndoDragDrop()
}
String __EXPORT ScUndoDragDrop::GetComment() const
-{ // "Verschieben" : "Kopieren"
+{ // "Verschieben" : "Kopieren"
return bCut ?
ScGlobal::GetRscString( STR_UNDO_MOVE ) :
ScGlobal::GetRscString( STR_UNDO_COPY );
@@ -1219,14 +1219,14 @@ void ScUndoDragDrop::PaintArea( ScRange aRange, USHORT nExtFlags ) const
if ( bKeepScenarioFlags )
{
- // Szenarien mitkopiert -> auch Szenario-Rahmen painten
+ // Szenarien mitkopiert -> auch Szenario-Rahmen painten
aRange.aStart.SetCol(0);
aRange.aStart.SetRow(0);
aRange.aEnd.SetCol(MAXCOL);
aRange.aEnd.SetRow(MAXROW);
}
- // column/row info (width/height) included if whole columns/rows were copied
+ // column/row info (width/height) included if whole columns/rows were copied
if ( aSrcRange.aStart.Col() == 0 && aSrcRange.aEnd.Col() == MAXCOL )
{
nPaint |= PAINT_LEFT;
@@ -1250,10 +1250,10 @@ void ScUndoDragDrop::DoUndo( ScRange aRange ) const
if ( pChangeTrack )
pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
-//? DB-Areas vor Daten, damit bei ExtendMerge die Autofilter-Knoepfe stimmen
+//? DB-Areas vor Daten, damit bei ExtendMerge die Autofilter-Knoepfe stimmen
ScRange aPaintRange = aRange;
- pDoc->ExtendMerge( aPaintRange ); // before deleting
+ pDoc->ExtendMerge( aPaintRange ); // before deleting
USHORT nExtFlags = 0;
pDocShell->UpdatePaintExt( nExtFlags, aPaintRange );
@@ -1290,7 +1290,7 @@ void __EXPORT ScUndoDragDrop::Redo()
ScDocument* pDoc = pDocShell->GetDocument();
ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP );
- EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo?
+ EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo?
// do not undo/redo objects and note captions, they are handled via drawing undo
USHORT nRedoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
@@ -1320,7 +1320,7 @@ void __EXPORT ScUndoDragDrop::Redo()
if (bCut)
{
ScRange aSrcPaintRange = aSrcRange;
- pDoc->ExtendMerge( aSrcPaintRange ); // before deleting
+ pDoc->ExtendMerge( aSrcPaintRange ); // before deleting
USHORT nExtFlags = 0;
pDocShell->UpdatePaintExt( nExtFlags, aSrcPaintRange );
pDoc->DeleteAreaTab( aSrcRange, nRedoFlags );
@@ -1360,7 +1360,7 @@ void __EXPORT ScUndoDragDrop::Redo()
ShowTable( aDestRange.aStart.Tab() );
RedoSdrUndoAction( pDrawUndo ); //! include in ScBlockUndo?
- EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo?
+ EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo?
EndRedo();
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
@@ -1372,14 +1372,14 @@ void __EXPORT ScUndoDragDrop::Repeat(SfxRepeatTarget& /* rTarget */)
BOOL __EXPORT ScUndoDragDrop::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // geht nicht
+ return FALSE; // geht nicht
}
// -----------------------------------------------------------------------
//
-// Liste der Bereichsnamen einfuegen
-// (Einfuegen|Name|Einfuegen =>[Liste])
+// Liste der Bereichsnamen einfuegen
+// (Einfuegen|Name|Einfuegen =>[Liste])
//
ScUndoListNames::ScUndoListNames( ScDocShell* pNewDocShell, const ScRange& rRange,
@@ -1442,13 +1442,13 @@ BOOL __EXPORT ScUndoListNames::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Szenario anwenden
-// (Extras|Szenarien)
+// Szenario anwenden
+// (Extras|Szenarien)
//
ScUndoUseScenario::ScUndoUseScenario( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
-/*C*/ const ScArea& rDestArea,
+/*C*/ const ScArea& rDestArea,
ScDocument* pNewUndoDoc,
const String& rNewName ) :
ScSimpleUndo( pNewDocShell ),
@@ -1489,7 +1489,7 @@ void __EXPORT ScUndoUseScenario::Undo()
pDoc->DeleteSelection( IDF_ALL, aMarkData );
pUndoDoc->CopyToDocument( aRange, IDF_ALL, TRUE, pDoc, &aMarkData );
- // Szenario-Tabellen
+ // Szenario-Tabellen
BOOL bFrame = FALSE;
SCTAB nTab = aRange.aStart.Tab();
SCTAB nEndTab = nTab;
@@ -1497,7 +1497,7 @@ void __EXPORT ScUndoUseScenario::Undo()
++nEndTab;
for (SCTAB i = nTab+1; i<=nEndTab; i++)
{
- // Flags immer
+ // Flags immer
String aComment;
Color aColor;
USHORT nScenFlags;
@@ -1505,7 +1505,7 @@ void __EXPORT ScUndoUseScenario::Undo()
pDoc->SetScenarioData( i, aComment, aColor, nScenFlags );
BOOL bActive = pUndoDoc->IsActiveScenario( i );
pDoc->SetActiveScenario( i, bActive );
- // Bei Zurueckkopier-Szenarios auch Inhalte
+ // Bei Zurueckkopier-Szenarios auch Inhalte
if ( nScenFlags & SC_SCENARIO_TWOWAY )
{
pDoc->DeleteAreaTab( 0,0, MAXCOL,MAXROW, i, IDF_ALL );
@@ -1515,7 +1515,7 @@ void __EXPORT ScUndoUseScenario::Undo()
bFrame = TRUE;
}
- // Wenn sichtbare Rahmen, dann alles painten
+ // Wenn sichtbare Rahmen, dann alles painten
if (bFrame)
pDocShell->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID | PAINT_EXTRAS );
else
@@ -1569,8 +1569,8 @@ BOOL __EXPORT ScUndoUseScenario::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Vorlage anwenden
-// (Format|Vorlagenkatalog)
+// Vorlage anwenden
+// (Format|Vorlagenkatalog)
//
ScUndoSelectionStyle::ScUndoSelectionStyle( ScDocShell* pNewDocShell,
@@ -1606,13 +1606,13 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo )
pViewShell->SetMarkData( aMarkData );
ScRange aWorkRange( aRange );
- if ( pDoc->HasAttrib( aWorkRange, HASATTR_MERGED ) ) // zusammengefasste Zellen?
+ if ( pDoc->HasAttrib( aWorkRange, HASATTR_MERGED ) ) // zusammengefasste Zellen?
pDoc->ExtendMerge( aWorkRange, TRUE );
USHORT nExtFlags = 0;
pDocShell->UpdatePaintExt( nExtFlags, aWorkRange );
- if (bUndo) // bei Undo alte Daten wieder reinschubsen
+ if (bUndo) // bei Undo alte Daten wieder reinschubsen
{
SCTAB nTabCount = pDoc->GetTableCount();
ScRange aCopyRange = aWorkRange;
@@ -1620,7 +1620,7 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo )
aCopyRange.aEnd.SetTab(nTabCount-1);
pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, TRUE, pDoc, &aMarkData );
}
- else // bei Redo Style wieder zuweisen
+ else // bei Redo Style wieder zuweisen
{
ScStyleSheetPool* pStlPool = pDoc->GetStyleSheetPool();
ScStyleSheet* pStyleSheet =
@@ -1636,7 +1636,7 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo )
pDocShell->UpdatePaintExt( nExtFlags, aWorkRange );
if ( !( (pViewShell) && pViewShell->AdjustBlockHeight() ) )
-/*A*/ pDocShell->PostPaint( aWorkRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
+/*A*/ pDocShell->PostPaint( aWorkRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
ShowTable( aWorkRange.aStart.Tab() );
}
@@ -1687,7 +1687,7 @@ USHORT __EXPORT ScUndoSelectionStyle::GetId() const
// -----------------------------------------------------------------------
//
-// Matrix-Formel eingeben
+// Matrix-Formel eingeben
//
ScUndoEnterMatrix::ScUndoEnterMatrix( ScDocShell* pNewDocShell, const ScRange& rArea,
@@ -1754,7 +1754,7 @@ void __EXPORT ScUndoEnterMatrix::Redo()
pDoc->InsertMatrixFormula( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(),
aBlockRange.aEnd.Col(), aBlockRange.aEnd.Row(),
aDestMark, aFormula );
-// pDocShell->PostPaint( aBlockRange, PAINT_GRID ); // nicht noetig ???
+// pDocShell->PostPaint( aBlockRange, PAINT_GRID ); // nicht noetig ???
SetChangeTrack();
@@ -1777,7 +1777,7 @@ BOOL __EXPORT ScUndoEnterMatrix::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Einzug vermindern / erhoehen
+// Einzug vermindern / erhoehen
//
ScRange lcl_GetMultiMarkRange( const ScMarkData& rMark )
@@ -1848,7 +1848,7 @@ BOOL __EXPORT ScUndoIndent::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Transliteration for cells
+// Transliteration for cells
//
ScUndoTransliterate::ScUndoTransliterate( ScDocShell* pNewDocShell, const ScMarkData& rMark,
@@ -1909,7 +1909,7 @@ BOOL __EXPORT ScUndoTransliterate::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// einzelne Items per Which-IDs aus Bereich loeschen
+// einzelne Items per Which-IDs aus Bereich loeschen
//
ScUndoClearItems::ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& rMark,
@@ -1979,7 +1979,7 @@ BOOL __EXPORT ScUndoClearItems::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Alle Umbrueche einer Tabelle loeschen
+// Alle Umbrueche einer Tabelle loeschen
//
ScUndoRemoveBreaks::ScUndoRemoveBreaks( ScDocShell* pNewDocShell,
@@ -2047,7 +2047,7 @@ BOOL __EXPORT ScUndoRemoveBreaks::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Zusammenfassung aufheben (fuer einen ganzen Bereich)
+// Zusammenfassung aufheben (fuer einen ganzen Bereich)
//
ScUndoRemoveMerge::ScUndoRemoveMerge( ScDocShell* pNewDocShell,
@@ -2064,7 +2064,7 @@ __EXPORT ScUndoRemoveMerge::~ScUndoRemoveMerge()
String __EXPORT ScUndoRemoveMerge::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_REMERGE ); // "Zusammenfassung aufheben"
+ return ScGlobal::GetRscString( STR_UNDO_REMERGE ); // "Zusammenfassung aufheben"
}
void __EXPORT ScUndoRemoveMerge::Undo()
@@ -2103,7 +2103,7 @@ void __EXPORT ScUndoRemoveMerge::Redo()
ScRange aRefresh = aExtended;
pDoc->ExtendOverlapped( aRefresh );
- // ausfuehren
+ // ausfuehren
const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE );
ScPatternAttr aPattern( pDoc->GetPool() );
@@ -2118,7 +2118,7 @@ void __EXPORT ScUndoRemoveMerge::Redo()
pDoc->ExtendMerge( aRefresh, TRUE, FALSE );
- // Paint
+ // Paint
BOOL bDidPaint = FALSE;
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
@@ -2146,7 +2146,7 @@ BOOL __EXPORT ScUndoRemoveMerge::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// nur Umrandung setzen, per ScRangeList (StarOne)
+// nur Umrandung setzen, per ScRangeList (StarOne)
//
ScRange lcl_TotalRange( const ScRangeList& rRanges )
@@ -2198,7 +2198,7 @@ __EXPORT ScUndoBorder::~ScUndoBorder()
String __EXPORT ScUndoBorder::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_SELATTRLINES ); //! eigener String?
+ return ScGlobal::GetRscString( STR_UNDO_SELATTRLINES ); //! eigener String?
}
void __EXPORT ScUndoBorder::Undo()
@@ -2218,7 +2218,7 @@ void __EXPORT ScUndoBorder::Redo()
{
BeginRedo();
- ScDocument* pDoc = pDocShell->GetDocument(); //! Funktion an docfunc aufrufen
+ ScDocument* pDoc = pDocShell->GetDocument(); //! Funktion an docfunc aufrufen
ULONG nCount = pRanges->Count();
ULONG i;
for (i=0; i<nCount; i++)
@@ -2240,12 +2240,12 @@ void __EXPORT ScUndoBorder::Redo()
void __EXPORT ScUndoBorder::Repeat(SfxRepeatTarget& /* rTarget */)
{
- //! spaeter (wenn die Funktion aus cellsuno nach docfunc gewandert ist)
+ //! spaeter (wenn die Funktion aus cellsuno nach docfunc gewandert ist)
}
BOOL __EXPORT ScUndoBorder::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // s.o.
+ return FALSE; // s.o.
}
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index 2ab03eb71923..bf9540ce7cf1 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -52,14 +52,14 @@
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1(ScUndoWidthOrHeight, SfxUndoAction);
+TYPEINIT1(ScUndoWidthOrHeight, SfxUndoAction);
// -----------------------------------------------------------------------
//
-// Spaltenbreiten oder Zeilenhoehen aendern
+// Spaltenbreiten oder Zeilenhoehen aendern
//
ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
@@ -123,12 +123,12 @@ void __EXPORT ScUndoWidthOrHeight::Undo()
{
pViewShell->SetMarkData( aMarkData );
- nPaintStart = 0; // paint all, because of changed selection
+ nPaintStart = 0; // paint all, because of changed selection
}
}
- //! outlines from all tables?
- if (pUndoTab) // Outlines mit gespeichert?
+ //! outlines from all tables?
+ if (pUndoTab) // Outlines mit gespeichert?
pDoc->SetOutlineTable( nStartTab, pUndoTab );
SCTAB nTabCount = pDoc->GetTableCount();
@@ -136,7 +136,7 @@ void __EXPORT ScUndoWidthOrHeight::Undo()
for (nTab=0; nTab<nTabCount; nTab++)
if (aMarkData.GetTableSelect(nTab))
{
- if (bWidth) // Width
+ if (bWidth) // Width
{
pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab,
static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE,
@@ -145,7 +145,7 @@ void __EXPORT ScUndoWidthOrHeight::Undo()
pDocShell->PostPaint( static_cast<SCCOL>(nPaintStart), 0, nTab,
MAXCOL, MAXROW, nTab, PAINT_GRID | PAINT_TOP );
}
- else // Height
+ else // Height
{
pUndoDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, FALSE, pDoc );
pDoc->UpdatePageBreaks( nTab );
@@ -180,7 +180,7 @@ void __EXPORT ScUndoWidthOrHeight::Redo()
{
pViewShell->SetMarkData( aMarkData );
- bPaintAll = TRUE; // paint all, because of changed selection
+ bPaintAll = TRUE; // paint all, because of changed selection
}
}
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 506afeac138e..0a6325198b18 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -62,30 +62,30 @@
// STATIC DATA ---------------------------------------------------------------
-TYPEINIT1(ScUndoDeleteContents, SfxUndoAction);
-TYPEINIT1(ScUndoFillTable, SfxUndoAction);
-TYPEINIT1(ScUndoSelectionAttr, SfxUndoAction);
-TYPEINIT1(ScUndoAutoFill, SfxUndoAction);
-TYPEINIT1(ScUndoMerge, SfxUndoAction);
-TYPEINIT1(ScUndoAutoFormat, SfxUndoAction);
-TYPEINIT1(ScUndoReplace, SfxUndoAction);
-TYPEINIT1(ScUndoTabOp, SfxUndoAction);
+TYPEINIT1(ScUndoDeleteContents, SfxUndoAction);
+TYPEINIT1(ScUndoFillTable, SfxUndoAction);
+TYPEINIT1(ScUndoSelectionAttr, SfxUndoAction);
+TYPEINIT1(ScUndoAutoFill, SfxUndoAction);
+TYPEINIT1(ScUndoMerge, SfxUndoAction);
+TYPEINIT1(ScUndoAutoFormat, SfxUndoAction);
+TYPEINIT1(ScUndoReplace, SfxUndoAction);
+TYPEINIT1(ScUndoTabOp, SfxUndoAction);
TYPEINIT1(ScUndoConversion, SfxUndoAction);
TYPEINIT1(ScUndoRefConversion, SfxUndoAction);
-TYPEINIT1(ScUndoRefreshLink, SfxUndoAction);
-TYPEINIT1(ScUndoInsertAreaLink, SfxUndoAction);
-TYPEINIT1(ScUndoRemoveAreaLink, SfxUndoAction);
-TYPEINIT1(ScUndoUpdateAreaLink, SfxUndoAction);
+TYPEINIT1(ScUndoRefreshLink, SfxUndoAction);
+TYPEINIT1(ScUndoInsertAreaLink, SfxUndoAction);
+TYPEINIT1(ScUndoRemoveAreaLink, SfxUndoAction);
+TYPEINIT1(ScUndoUpdateAreaLink, SfxUndoAction);
// To Do:
-/*A*/ // SetOptimalHeight auf Dokument, wenn keine View
+/*A*/ // SetOptimalHeight auf Dokument, wenn keine View
//============================================================================
-// class ScUndoDeleteContents
+// class ScUndoDeleteContents
//
-// Inhalte loeschen
+// Inhalte loeschen
//----------------------------------------------------------------------------
@@ -95,20 +95,20 @@ ScUndoDeleteContents::ScUndoDeleteContents(
ScDocument* pNewUndoDoc, BOOL bNewMulti,
USHORT nNewFlags, BOOL bObjects )
//
- : ScSimpleUndo( pNewDocShell ),
+ : ScSimpleUndo( pNewDocShell ),
//
- aRange ( rRange ),
- aMarkData ( rMark ),
- pUndoDoc ( pNewUndoDoc ),
- pDrawUndo ( NULL ),
- nFlags ( nNewFlags ),
- bMulti ( bNewMulti ) // ueberliquid
+ aRange ( rRange ),
+ aMarkData ( rMark ),
+ pUndoDoc ( pNewUndoDoc ),
+ pDrawUndo ( NULL ),
+ nFlags ( nNewFlags ),
+ bMulti ( bNewMulti ) // ueberliquid
{
if (bObjects)
pDrawUndo = GetSdrUndoAction( pDocShell->GetDocument() );
- if ( !(aMarkData.IsMarked() || aMarkData.IsMultiMarked()) ) // keine Zelle markiert:
- aMarkData.SetMarkArea( aRange ); // Zelle unter Cursor markieren
+ if ( !(aMarkData.IsMarked() || aMarkData.IsMultiMarked()) ) // keine Zelle markiert:
+ aMarkData.SetMarkArea( aRange ); // Zelle unter Cursor markieren
SetChangeTrack();
}
@@ -127,7 +127,7 @@ __EXPORT ScUndoDeleteContents::~ScUndoDeleteContents()
String __EXPORT ScUndoDeleteContents::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); // "Loeschen"
+ return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); // "Loeschen"
}
@@ -154,15 +154,15 @@ void ScUndoDeleteContents::DoChange( const BOOL bUndo )
USHORT nExtFlags = 0;
- if (bUndo) // nur Undo
+ if (bUndo) // nur Undo
{
- USHORT nUndoFlags = IDF_NONE; // entweder alle oder keine Inhalte kopieren
- if (nFlags & IDF_CONTENTS) // (es sind nur die richtigen ins UndoDoc kopiert worden)
+ USHORT nUndoFlags = IDF_NONE; // entweder alle oder keine Inhalte kopieren
+ if (nFlags & IDF_CONTENTS) // (es sind nur die richtigen ins UndoDoc kopiert worden)
nUndoFlags |= IDF_CONTENTS;
if (nFlags & IDF_ATTRIB)
nUndoFlags |= IDF_ATTRIB;
- if (nFlags & IDF_EDITATTR) // Edit-Engine-Attribute
- nUndoFlags |= IDF_STRING; // -> Zellen werden geaendert
+ if (nFlags & IDF_EDITATTR) // Edit-Engine-Attribute
+ nUndoFlags |= IDF_STRING; // -> Zellen werden geaendert
// do not create clones of note captions, they will be restored via drawing undo
nUndoFlags |= IDF_NOCAPTIONS;
@@ -179,11 +179,11 @@ void ScUndoDeleteContents::DoChange( const BOOL bUndo )
if ( pChangeTrack )
pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
- pDocShell->UpdatePaintExt( nExtFlags, aRange ); // content after the change
+ pDocShell->UpdatePaintExt( nExtFlags, aRange ); // content after the change
}
- else // nur Redo
+ else // nur Redo
{
- pDocShell->UpdatePaintExt( nExtFlags, aRange ); // content before the change
+ pDocShell->UpdatePaintExt( nExtFlags, aRange ); // content before the change
aMarkData.MarkToMulti();
RedoSdrUndoAction( pDrawUndo );
@@ -197,7 +197,7 @@ void ScUndoDeleteContents::DoChange( const BOOL bUndo )
if ( !( (pViewShell) && pViewShell->AdjustRowHeight(
aRange.aStart.Row(), aRange.aEnd.Row() ) ) )
-/*A*/ pDocShell->PostPaint( aRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
+/*A*/ pDocShell->PostPaint( aRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
pDocShell->PostDataChanged();
if (pViewShell)
@@ -263,10 +263,10 @@ BOOL __EXPORT ScUndoDeleteContents::CanRepeat(SfxRepeatTarget& rTarget) const
//============================================================================
-// class ScUndoFillTable
+// class ScUndoFillTable
//
-// Tabellen ausfuellen
-// (Bearbeiten|Ausfuellen|...)
+// Tabellen ausfuellen
+// (Bearbeiten|Ausfuellen|...)
//----------------------------------------------------------------------------
@@ -277,17 +277,17 @@ ScUndoFillTable::ScUndoFillTable( ScDocShell* pNewDocShell,
ScDocument* pNewUndoDoc, BOOL bNewMulti, SCTAB nSrc,
USHORT nFlg, USHORT nFunc, BOOL bSkip, BOOL bLink )
//
- : ScSimpleUndo( pNewDocShell ),
+ : ScSimpleUndo( pNewDocShell ),
//
- aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
- aMarkData ( rMark ),
- pUndoDoc ( pNewUndoDoc ),
- nFlags ( nFlg ),
- nFunction ( nFunc ),
- nSrcTab ( nSrc ),
- bMulti ( bNewMulti ),
- bSkipEmpty ( bSkip ),
- bAsLink ( bLink )
+ aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
+ aMarkData ( rMark ),
+ pUndoDoc ( pNewUndoDoc ),
+ nFlags ( nFlg ),
+ nFunction ( nFunc ),
+ nSrcTab ( nSrc ),
+ bMulti ( bNewMulti ),
+ bSkipEmpty ( bSkip ),
+ bAsLink ( bLink )
{
SetChangeTrack();
}
@@ -346,7 +346,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo )
if (pViewShell)
pViewShell->SetMarkData( aMarkData );
- if (bUndo) // nur Undo
+ if (bUndo) // nur Undo
{
SCTAB nTabCount = pDoc->GetTableCount();
ScRange aWorkRange(aRange);
@@ -366,7 +366,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo )
if ( pChangeTrack )
pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
}
- else // nur Redo
+ else // nur Redo
{
aMarkData.MarkToMulti();
pDoc->FillTabMarked( nSrcTab, aMarkData, nFlags, nFunction, bSkipEmpty, bAsLink );
@@ -377,7 +377,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo )
pDocShell->PostPaint(0,0,0,MAXCOL,MAXROW,MAXTAB, PAINT_GRID|PAINT_EXTRAS);
pDocShell->PostDataChanged();
- // CellContentChanged kommt mit der Markierung
+ // CellContentChanged kommt mit der Markierung
if (pViewShell)
{
@@ -385,7 +385,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo )
if ( !aMarkData.GetTableSelect(nTab) )
pViewShell->SetTabNo( nSrcTab );
- pViewShell->DoneBlockMode(); // gibt sonst Probleme, weil Markierung auf falscher Tabelle
+ pViewShell->DoneBlockMode(); // gibt sonst Probleme, weil Markierung auf falscher Tabelle
}
}
@@ -428,9 +428,9 @@ BOOL __EXPORT ScUndoFillTable::CanRepeat(SfxRepeatTarget& rTarget) const
//============================================================================
-// class ScUndoSelectionAttr
+// class ScUndoSelectionAttr
//
-// Zellformat aendern
+// Zellformat aendern
//----------------------------------------------------------------------------
@@ -442,12 +442,12 @@ ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell,
const ScPatternAttr* pNewApply,
const SvxBoxItem* pNewOuter, const SvxBoxInfoItem* pNewInner )
//
- : ScSimpleUndo( pNewDocShell ),
+ : ScSimpleUndo( pNewDocShell ),
//
- aMarkData ( rMark ),
- aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
- pUndoDoc ( pNewUndoDoc ),
- bMulti ( bNewMulti )
+ aMarkData ( rMark ),
+ aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
+ pUndoDoc ( pNewUndoDoc ),
+ bMulti ( bNewMulti )
{
ScDocumentPool* pPool = pDocShell->GetDocument()->GetPool();
pApplyPattern = (ScPatternAttr*) &pPool->Put( *pNewApply );
@@ -491,13 +491,13 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
pViewShell->SetMarkData( aMarkData );
ScRange aEffRange( aRange );
- if ( pDoc->HasAttrib( aEffRange, HASATTR_MERGED ) ) // zusammengefasste Zellen?
+ if ( pDoc->HasAttrib( aEffRange, HASATTR_MERGED ) ) // zusammengefasste Zellen?
pDoc->ExtendMerge( aEffRange );
USHORT nExtFlags = 0;
pDocShell->UpdatePaintExt( nExtFlags, aEffRange );
- if (bUndo) // nur bei Undo
+ if (bUndo) // nur bei Undo
{
ScRange aCopyRange = aRange;
SCTAB nTabCount = pDoc->GetTableCount();
@@ -505,7 +505,7 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
aCopyRange.aEnd.SetTab(nTabCount-1);
pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, bMulti, pDoc, &aMarkData );
}
- else // nur bei Redo
+ else // nur bei Redo
{
aMarkData.MarkToMulti();
pDoc->ApplySelectionPattern( *pApplyPattern, aMarkData );
@@ -516,7 +516,7 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
}
if ( !( (pViewShell) && pViewShell->AdjustBlockHeight() ) )
-/*A*/ pDocShell->PostPaint( aEffRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
+/*A*/ pDocShell->PostPaint( aEffRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
ShowTable( aRange );
}
@@ -566,9 +566,9 @@ BOOL __EXPORT ScUndoSelectionAttr::CanRepeat(SfxRepeatTarget& rTarget) const
//============================================================================
-// class ScUndoAutoFill
+// class ScUndoAutoFill
//
-// Auto-Fill (nur einfache Bloecke)
+// Auto-Fill (nur einfache Bloecke)
//----------------------------------------------------------------------------
@@ -579,18 +579,18 @@ ScUndoAutoFill::ScUndoAutoFill( ScDocShell* pNewDocShell,
double fNewStartValue, double fNewStepValue, double fNewMaxValue,
USHORT nMaxShIndex )
//
- : ScBlockUndo( pNewDocShell, rRange, SC_UNDO_AUTOHEIGHT ),
+ : ScBlockUndo( pNewDocShell, rRange, SC_UNDO_AUTOHEIGHT ),
//
- aSource ( rSourceArea ),
- aMarkData ( rMark ),
- pUndoDoc ( pNewUndoDoc ),
- eFillDir ( eNewFillDir ),
- eFillCmd ( eNewFillCmd ),
- eFillDateCmd ( eNewFillDateCmd ),
- fStartValue ( fNewStartValue ),
- fStepValue ( fNewStepValue ),
- fMaxValue ( fNewMaxValue ),
- nMaxSharedIndex ( nMaxShIndex)
+ aSource ( rSourceArea ),
+ aMarkData ( rMark ),
+ pUndoDoc ( pNewUndoDoc ),
+ eFillDir ( eNewFillDir ),
+ eFillCmd ( eNewFillCmd ),
+ eFillDateCmd ( eNewFillDateCmd ),
+ fStartValue ( fNewStartValue ),
+ fStepValue ( fNewStepValue ),
+ fMaxValue ( fNewMaxValue ),
+ nMaxSharedIndex ( nMaxShIndex)
{
SetChangeTrack();
}
@@ -696,7 +696,7 @@ void __EXPORT ScUndoAutoFill::Redo()
{
BeginRedo();
-//! Tabellen selektieren
+//! Tabellen selektieren
SCCOLROW nCount = 0;
switch (eFillDir)
@@ -766,9 +766,9 @@ BOOL __EXPORT ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const
//============================================================================
-// class ScUndoMerge
+// class ScUndoMerge
//
-// Zellen zusammenfassen / Zusammenfassung aufheben
+// Zellen zusammenfassen / Zusammenfassung aufheben
//----------------------------------------------------------------------------
@@ -777,7 +777,7 @@ ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo )
//
- : ScSimpleUndo( pNewDocShell ),
+ : ScSimpleUndo( pNewDocShell ),
//
maRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
mbMergeContents( bMergeContents ),
@@ -817,7 +817,7 @@ void ScUndoMerge::DoChange( bool bUndo ) const
pDoc->RemoveMerge( maRange.aStart.Col(), maRange.aStart.Row(), maRange.aStart.Tab() );
else
// repeat merge, but do not remove note captions (will be done by drawing redo below)
-/*!*/ pDoc->DoMerge( maRange.aStart.Tab(),
+/*!*/ pDoc->DoMerge( maRange.aStart.Tab(),
maRange.aStart.Col(), maRange.aStart.Row(),
maRange.aEnd.Col(), maRange.aEnd.Row(), false );
@@ -898,9 +898,9 @@ BOOL ScUndoMerge::CanRepeat(SfxRepeatTarget& rTarget) const
//============================================================================
-// class ScUndoAutoFormat
+// class ScUndoAutoFormat
//
-// Auto-Format (nur einfache Bloecke)
+// Auto-Format (nur einfache Bloecke)
//----------------------------------------------------------------------------
@@ -908,12 +908,12 @@ ScUndoAutoFormat::ScUndoAutoFormat( ScDocShell* pNewDocShell,
const ScRange& rRange, ScDocument* pNewUndoDoc,
const ScMarkData& rMark, BOOL bNewSize, USHORT nNewFormatNo )
//
- : ScBlockUndo( pNewDocShell, rRange, bNewSize ? SC_UNDO_MANUALHEIGHT : SC_UNDO_AUTOHEIGHT ),
+ : ScBlockUndo( pNewDocShell, rRange, bNewSize ? SC_UNDO_MANUALHEIGHT : SC_UNDO_AUTOHEIGHT ),
//
- pUndoDoc ( pNewUndoDoc ),
- aMarkData ( rMark ),
- bSize ( bNewSize ),
- nFormatNo ( nNewFormatNo )
+ pUndoDoc ( pNewUndoDoc ),
+ aMarkData ( rMark ),
+ bSize ( bNewSize ),
+ nFormatNo ( nNewFormatNo )
{
}
@@ -930,7 +930,7 @@ __EXPORT ScUndoAutoFormat::~ScUndoAutoFormat()
String __EXPORT ScUndoAutoFormat::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_AUTOFORMAT ); //"Auto-Format"
+ return ScGlobal::GetRscString( STR_UNDO_AUTOFORMAT ); //"Auto-Format"
}
@@ -943,8 +943,8 @@ void __EXPORT ScUndoAutoFormat::Undo()
ScDocument* pDoc = pDocShell->GetDocument();
// Attribute
-// pDoc->DeleteAreaTab( aBlockRange, IDF_ATTRIB );
-// pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, FALSE, pDoc );
+// pDoc->DeleteAreaTab( aBlockRange, IDF_ATTRIB );
+// pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, FALSE, pDoc );
SCTAB nTabCount = pDoc->GetTableCount();
pDoc->DeleteArea( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(),
@@ -1013,12 +1013,12 @@ void __EXPORT ScUndoAutoFormat::Redo()
}
else
{
- // Zoom auf 100 lassen
+ // Zoom auf 100 lassen
nPPTX = ScGlobal::nScreenPPTX;
nPPTY = ScGlobal::nScreenPPTY;
}
- BOOL bFormula = FALSE; //! merken
+ BOOL bFormula = FALSE; //! merken
for (SCTAB nTab=nStartZ; nTab<=nEndZ; nTab++)
{
@@ -1080,9 +1080,9 @@ BOOL __EXPORT ScUndoAutoFormat::CanRepeat(SfxRepeatTarget& rTarget) const
//============================================================================
-// class ScUndoReplace
+// class ScUndoReplace
//
-// Ersetzen
+// Ersetzen
//----------------------------------------------------------------------------
@@ -1091,12 +1091,12 @@ ScUndoReplace::ScUndoReplace( ScDocShell* pNewDocShell, const ScMarkData& rMark,
const String& rNewUndoStr, ScDocument* pNewUndoDoc,
const SvxSearchItem* pItem )
//
- : ScSimpleUndo( pNewDocShell ),
+ : ScSimpleUndo( pNewDocShell ),
//
- aCursorPos ( nCurX, nCurY, nCurZ ),
- aMarkData ( rMark ),
- aUndoStr ( rNewUndoStr ),
- pUndoDoc ( pNewUndoDoc )
+ aCursorPos ( nCurX, nCurY, nCurZ ),
+ aMarkData ( rMark ),
+ aUndoStr ( rNewUndoStr ),
+ pUndoDoc ( pNewUndoDoc )
{
pSearchItem = new SvxSearchItem( *pItem );
SetChangeTrack();
@@ -1121,10 +1121,10 @@ void ScUndoReplace::SetChangeTrack()
if ( pChangeTrack )
{
if ( pUndoDoc )
- { //! im UndoDoc stehen nur die geaenderten Zellen,
+ { //! im UndoDoc stehen nur die geaenderten Zellen,
// deswegen per Iterator moeglich
pChangeTrack->AppendContentsIfInRefDoc( pUndoDoc,
- nStartChangeAction, nEndChangeAction );
+ nStartChangeAction, nEndChangeAction );
}
else
{
@@ -1145,7 +1145,7 @@ void ScUndoReplace::SetChangeTrack()
String __EXPORT ScUndoReplace::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_REPLACE ); // "Ersetzen"
+ return ScGlobal::GetRscString( STR_UNDO_REPLACE ); // "Ersetzen"
}
@@ -1160,7 +1160,7 @@ void __EXPORT ScUndoReplace::Undo()
ShowTable( aCursorPos.Tab() );
- if (pUndoDoc) // nur bei ReplaceAll !!
+ if (pUndoDoc) // nur bei ReplaceAll !!
{
DBG_ASSERT(pSearchItem->GetCommand() == SVX_SEARCHCMD_REPLACE_ALL,
"ScUndoReplace:: Falscher Modus");
@@ -1168,22 +1168,22 @@ void __EXPORT ScUndoReplace::Undo()
if (pViewShell)
pViewShell->SetMarkData( aMarkData );
-//! markierte Tabellen
-//! Bereich merken ?
+//! markierte Tabellen
+//! Bereich merken ?
- // Undo-Dokument hat keine Zeilen-/Spalten-Infos, also mit bColRowFlags = FALSE
- // kopieren, um Outline-Gruppen nicht kaputtzumachen.
+ // Undo-Dokument hat keine Zeilen-/Spalten-Infos, also mit bColRowFlags = FALSE
+ // kopieren, um Outline-Gruppen nicht kaputtzumachen.
USHORT nUndoFlags = (pSearchItem->GetPattern()) ? IDF_ATTRIB : IDF_CONTENTS;
pUndoDoc->CopyToDocument( 0, 0, 0,
MAXCOL, MAXROW, MAXTAB,
- nUndoFlags, FALSE, pDoc, NULL, FALSE ); // ohne Row-Flags
+ nUndoFlags, FALSE, pDoc, NULL, FALSE ); // ohne Row-Flags
pDocShell->PostPaintGridAll();
}
else if (pSearchItem->GetPattern() &&
pSearchItem->GetCommand() == SVX_SEARCHCMD_REPLACE)
{
- String aTempStr = pSearchItem->GetSearchString(); // vertauschen
+ String aTempStr = pSearchItem->GetSearchString(); // vertauschen
pSearchItem->SetSearchString(pSearchItem->GetReplaceString());
pSearchItem->SetReplaceString(aTempStr);
pDoc->ReplaceStyle( *pSearchItem,
@@ -1284,9 +1284,9 @@ BOOL __EXPORT ScUndoReplace::CanRepeat(SfxRepeatTarget& rTarget) const
//============================================================================
-// class ScUndoTabOp
+// class ScUndoTabOp
//
-// Mehrfachoperation (nur einfache Bloecke)
+// Mehrfachoperation (nur einfache Bloecke)
//----------------------------------------------------------------------------
@@ -1299,15 +1299,15 @@ ScUndoTabOp::ScUndoTabOp( ScDocShell* pNewDocShell,
const ScRefAddress& rColCell,
BYTE nMd )
//
- : ScSimpleUndo( pNewDocShell ),
+ : ScSimpleUndo( pNewDocShell ),
//
- aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
- pUndoDoc ( pNewUndoDoc ),
- theFormulaCell ( rFormulaCell ),
- theFormulaEnd ( rFormulaEnd ),
- theRowCell ( rRowCell ),
- theColCell ( rColCell ),
- nMode ( nMd )
+ aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
+ pUndoDoc ( pNewUndoDoc ),
+ theFormulaCell ( rFormulaCell ),
+ theFormulaEnd ( rFormulaEnd ),
+ theRowCell ( rRowCell ),
+ theColCell ( rColCell ),
+ nMode ( nMd )
{
}
@@ -1324,7 +1324,7 @@ __EXPORT ScUndoTabOp::~ScUndoTabOp()
String __EXPORT ScUndoTabOp::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_TABOP ); // "Mehrfachoperation"
+ return ScGlobal::GetRscString( STR_UNDO_TABOP ); // "Mehrfachoperation"
}
@@ -1390,7 +1390,7 @@ BOOL __EXPORT ScUndoTabOp::CanRepeat(SfxRepeatTarget& /* rTarget */) const
//============================================================================
// class ScUndoConversion
//
-// Spelling
+// Spelling
//----------------------------------------------------------------------------
@@ -1471,7 +1471,7 @@ void ScUndoConversion::DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPo
pViewShell->SetMarkData( aMarkData );
SCTAB nTabCount = pDoc->GetTableCount();
- // Undo/Redo-doc has only selected tables
+ // Undo/Redo-doc has only selected tables
BOOL bMulti = aMarkData.IsMultiMarked();
pRefDoc->CopyToDocument( 0, 0, 0,
@@ -1530,7 +1530,7 @@ BOOL ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const
//============================================================================
// class ScUndoRefConversion
//
-// cell reference conversion
+// cell reference conversion
//----------------------------------------------------------------------------
@@ -1539,9 +1539,9 @@ ScUndoRefConversion::ScUndoRefConversion( ScDocShell* pNewDocShell,
ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, BOOL bNewMulti, USHORT nNewFlag) :
ScSimpleUndo( pNewDocShell ),
aMarkData ( rMark ),
-pUndoDoc ( pNewUndoDoc ),
-pRedoDoc ( pNewRedoDoc ),
-aRange ( aMarkRange ),
+pUndoDoc ( pNewUndoDoc ),
+pRedoDoc ( pNewRedoDoc ),
+aRange ( aMarkRange ),
bMulti ( bNewMulti ),
nFlags ( nNewFlag )
{
@@ -1620,16 +1620,16 @@ BOOL __EXPORT ScUndoRefConversion::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
//============================================================================
-// class ScUndoRefreshLink
+// class ScUndoRefreshLink
//
-// Link aktualisieren / aendern
+// Link aktualisieren / aendern
//----------------------------------------------------------------------------
ScUndoRefreshLink::ScUndoRefreshLink( ScDocShell* pNewDocShell,
ScDocument* pNewUndoDoc )
//
- : ScSimpleUndo( pNewDocShell ),
+ : ScSimpleUndo( pNewDocShell ),
//
pUndoDoc( pNewUndoDoc ),
pRedoDoc( NULL )
@@ -1679,7 +1679,7 @@ void __EXPORT ScUndoRefreshLink::Undo()
pRedoDoc->AddUndoTab( nTab, nTab, TRUE, TRUE );
bFirst = FALSE;
pDoc->CopyToDocument(aRange, IDF_ALL, FALSE, pRedoDoc);
-// pRedoDoc->TransferDrawPage( pDoc, nTab, nTab );
+// pRedoDoc->TransferDrawPage( pDoc, nTab, nTab );
pRedoDoc->SetLink( nTab,
pDoc->GetLinkMode(nTab),
pDoc->GetLinkDoc(nTab),
@@ -1691,7 +1691,7 @@ void __EXPORT ScUndoRefreshLink::Undo()
pDoc->DeleteAreaTab( aRange,IDF_ALL );
pUndoDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pDoc );
-// pDoc->TransferDrawPage( pUndoDoc, nTab, nTab );
+// pDoc->TransferDrawPage( pUndoDoc, nTab, nTab );
pDoc->SetLink( nTab, pUndoDoc->GetLinkMode(nTab), pUndoDoc->GetLinkDoc(nTab),
pUndoDoc->GetLinkFlt(nTab), pUndoDoc->GetLinkOpt(nTab),
pUndoDoc->GetLinkTab(nTab),
@@ -1721,7 +1721,7 @@ void __EXPORT ScUndoRefreshLink::Redo()
pDoc->DeleteAreaTab( aRange, IDF_ALL );
pRedoDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pDoc );
-// pDoc->TransferDrawPage( pRedoDoc, nTab, nTab );
+// pDoc->TransferDrawPage( pRedoDoc, nTab, nTab );
pDoc->SetLink( nTab,
pRedoDoc->GetLinkMode(nTab),
pRedoDoc->GetLinkDoc(nTab),
@@ -1741,7 +1741,7 @@ void __EXPORT ScUndoRefreshLink::Redo()
void __EXPORT ScUndoRefreshLink::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // gippsnich
+ // gippsnich
}
@@ -1775,9 +1775,9 @@ ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const String& rDo
//============================================================================
-// class ScUndoInsertAreaLink
+// class ScUndoInsertAreaLink
//
-// Bereichs-Verknuepfung einfuegen
+// Bereichs-Verknuepfung einfuegen
//----------------------------------------------------------------------------
@@ -1787,14 +1787,14 @@ ScUndoInsertAreaLink::ScUndoInsertAreaLink( ScDocShell* pShell,
const String& rArea, const ScRange& rDestRange,
ULONG nRefresh )
//
- : ScSimpleUndo ( pShell ),
+ : ScSimpleUndo ( pShell ),
//
- aDocName ( rDoc ),
- aFltName ( rFlt ),
- aOptions ( rOpt ),
- aAreaName ( rArea ),
- aRange ( rDestRange ),
- nRefreshDelay ( nRefresh )
+ aDocName ( rDoc ),
+ aFltName ( rFlt ),
+ aOptions ( rOpt ),
+ aAreaName ( rArea ),
+ aRange ( rDestRange ),
+ nRefreshDelay ( nRefresh )
{
}
@@ -1826,7 +1826,7 @@ void __EXPORT ScUndoInsertAreaLink::Undo()
if (pLink)
pLinkManager->Remove( pLink );
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
}
@@ -1845,7 +1845,7 @@ void __EXPORT ScUndoInsertAreaLink::Redo()
pLink->Update();
pLink->SetInCreate( FALSE );
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
}
@@ -1853,7 +1853,7 @@ void __EXPORT ScUndoInsertAreaLink::Redo()
void __EXPORT ScUndoInsertAreaLink::Repeat(SfxRepeatTarget& /* rTarget */)
{
- //! ....
+ //! ....
}
@@ -1866,9 +1866,9 @@ BOOL __EXPORT ScUndoInsertAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) co
//============================================================================
-// class ScUndoRemoveAreaLink
+// class ScUndoRemoveAreaLink
//
-// Bereichs-Verknuepfung loeschen
+// Bereichs-Verknuepfung loeschen
//----------------------------------------------------------------------------
@@ -1877,14 +1877,14 @@ ScUndoRemoveAreaLink::ScUndoRemoveAreaLink( ScDocShell* pShell,
const String& rArea, const ScRange& rDestRange,
ULONG nRefresh )
//
- : ScSimpleUndo ( pShell ),
+ : ScSimpleUndo ( pShell ),
//
- aDocName ( rDoc ),
- aFltName ( rFlt ),
- aOptions ( rOpt ),
- aAreaName ( rArea ),
- aRange ( rDestRange ),
- nRefreshDelay ( nRefresh )
+ aDocName ( rDoc ),
+ aFltName ( rFlt ),
+ aOptions ( rOpt ),
+ aAreaName ( rArea ),
+ aRange ( rDestRange ),
+ nRefreshDelay ( nRefresh )
{
}
@@ -1900,7 +1900,7 @@ __EXPORT ScUndoRemoveAreaLink::~ScUndoRemoveAreaLink()
String __EXPORT ScUndoRemoveAreaLink::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_REMOVELINK ); //! eigener Text ??
+ return ScGlobal::GetRscString( STR_UNDO_REMOVELINK ); //! eigener Text ??
}
@@ -1919,7 +1919,7 @@ void __EXPORT ScUndoRemoveAreaLink::Undo()
pLink->Update();
pLink->SetInCreate( FALSE );
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
}
@@ -1935,7 +1935,7 @@ void __EXPORT ScUndoRemoveAreaLink::Redo()
if (pLink)
pLinkManager->Remove( pLink );
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
}
@@ -1943,7 +1943,7 @@ void __EXPORT ScUndoRemoveAreaLink::Redo()
void __EXPORT ScUndoRemoveAreaLink::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // gippsnich
+ // gippsnich
}
@@ -1956,9 +1956,9 @@ BOOL __EXPORT ScUndoRemoveAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) co
//============================================================================
-// class ScUndoUpdateAreaLink
+// class ScUndoUpdateAreaLink
//
-// Bereichs-Verknuepfung aktualisieren
+// Bereichs-Verknuepfung aktualisieren
//----------------------------------------------------------------------------
@@ -1969,23 +1969,23 @@ ScUndoUpdateAreaLink::ScUndoUpdateAreaLink( ScDocShell* pShell,
const String& rNewA, const ScRange& rNewR, ULONG nNewRD,
ScDocument* pUndo, ScDocument* pRedo, BOOL bDoInsert )
//
- : ScSimpleUndo( pShell ),
+ : ScSimpleUndo( pShell ),
//
- aOldDoc ( rOldD ),
- aOldFlt ( rOldF ),
- aOldOpt ( rOldO ),
- aOldArea ( rOldA ),
- aOldRange ( rOldR ),
- aNewDoc ( rNewD ),
- aNewFlt ( rNewF ),
- aNewOpt ( rNewO ),
- aNewArea ( rNewA ),
- aNewRange ( rNewR ),
- pUndoDoc ( pUndo ),
- pRedoDoc ( pRedo ),
- nOldRefresh ( nOldRD ),
- nNewRefresh ( nNewRD ),
- bWithInsert ( bDoInsert )
+ aOldDoc ( rOldD ),
+ aOldFlt ( rOldF ),
+ aOldOpt ( rOldO ),
+ aOldArea ( rOldA ),
+ aOldRange ( rOldR ),
+ aNewDoc ( rNewD ),
+ aNewFlt ( rNewF ),
+ aNewOpt ( rNewO ),
+ aNewArea ( rNewA ),
+ aNewRange ( rNewR ),
+ pUndoDoc ( pUndo ),
+ pRedoDoc ( pRedo ),
+ nOldRefresh ( nOldRD ),
+ nNewRefresh ( nNewRD ),
+ bWithInsert ( bDoInsert )
{
DBG_ASSERT( aOldRange.aStart == aNewRange.aStart, "AreaLink verschoben ?" );
}
@@ -2004,7 +2004,7 @@ __EXPORT ScUndoUpdateAreaLink::~ScUndoUpdateAreaLink()
String __EXPORT ScUndoUpdateAreaLink::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); //! eigener Text ??
+ return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); //! eigener Text ??
}
@@ -2016,7 +2016,7 @@ void ScUndoUpdateAreaLink::DoChange( const BOOL bUndo ) const
SCCOL nEndX = Max( aOldRange.aEnd.Col(), aNewRange.aEnd.Col() );
SCROW nEndY = Max( aOldRange.aEnd.Row(), aNewRange.aEnd.Row() );
- SCTAB nEndZ = Max( aOldRange.aEnd.Tab(), aNewRange.aEnd.Tab() ); //?
+ SCTAB nEndZ = Max( aOldRange.aEnd.Tab(), aNewRange.aEnd.Tab() ); //?
if ( bUndo )
{
@@ -2052,7 +2052,7 @@ void ScUndoUpdateAreaLink::DoChange( const BOOL bUndo ) const
ScRange aWorkRange( aNewRange.aStart, ScAddress( nEndX, nEndY, nEndZ ) );
pDoc->ExtendMerge( aWorkRange, TRUE );
- // Paint
+ // Paint
if ( aNewRange.aEnd.Col() != aOldRange.aEnd.Col() )
aWorkRange.aEnd.SetCol(MAXCOL);
@@ -2079,7 +2079,7 @@ void __EXPORT ScUndoUpdateAreaLink::Undo()
aNewArea, aNewRange );
if (pLink)
{
- pLink->SetSource( aOldDoc, aOldFlt, aOldOpt, aOldArea ); // alte Werte im Link
+ pLink->SetSource( aOldDoc, aOldFlt, aOldOpt, aOldArea ); // alte Werte im Link
pLink->SetDestArea( aOldRange );
pLink->SetRefreshDelay( nOldRefresh );
}
@@ -2098,7 +2098,7 @@ void __EXPORT ScUndoUpdateAreaLink::Redo()
aOldArea, aOldRange );
if (pLink)
{
- pLink->SetSource( aNewDoc, aNewFlt, aNewOpt, aNewArea ); // neue Werte im Link
+ pLink->SetSource( aNewDoc, aNewFlt, aNewOpt, aNewArea ); // neue Werte im Link
pLink->SetDestArea( aNewRange );
pLink->SetRefreshDelay( nNewRefresh );
}
@@ -2111,7 +2111,7 @@ void __EXPORT ScUndoUpdateAreaLink::Redo()
void __EXPORT ScUndoUpdateAreaLink::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // gippsnich
+ // gippsnich
}
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index cc13ce9f1412..453bd15eeed0 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -71,7 +71,7 @@ TYPEINIT1(ScUndoRangeNames, ScSimpleUndo);
// -----------------------------------------------------------------------
//
-// Attribute auf Cursor anwenden
+// Attribute auf Cursor anwenden
//
ScUndoCursorAttr::ScUndoCursorAttr( ScDocShell* pNewDocShell,
@@ -100,9 +100,9 @@ __EXPORT ScUndoCursorAttr::~ScUndoCursorAttr()
String __EXPORT ScUndoCursorAttr::GetComment() const
{
- //! eigener Text fuer automatische Attributierung
+ //! eigener Text fuer automatische Attributierung
- USHORT nId = STR_UNDO_CURSORATTR; // "Attribute"
+ USHORT nId = STR_UNDO_CURSORATTR; // "Attribute"
return ScGlobal::GetRscString( nId );
}
@@ -138,8 +138,8 @@ void __EXPORT ScUndoCursorAttr::Undo()
if ( bIsAutomatic )
{
- // wenn automatische Formatierung rueckgaengig gemacht wird,
- // soll auch nicht weiter automatisch formatiert werden:
+ // wenn automatische Formatierung rueckgaengig gemacht wird,
+ // soll auch nicht weiter automatisch formatiert werden:
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
@@ -170,7 +170,7 @@ BOOL __EXPORT ScUndoCursorAttr::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Daten eingeben
+// Daten eingeben
//
ScUndoEnterData::ScUndoEnterData( ScDocShell* pNewDocShell,
@@ -214,8 +214,8 @@ String __EXPORT ScUndoEnterData::GetComment() const
void ScUndoEnterData::DoChange() const
{
- // Zeilenhoehe anpassen
- //! nur wenn noetig (alte oder neue EditZelle, oder Attribute) ??
+ // Zeilenhoehe anpassen
+ //! nur wenn noetig (alte oder neue EditZelle, oder Attribute) ??
for (USHORT i=0; i<nCount; i++)
pDocShell->AdjustRowHeight( nRow, nRow, pTabs[i] );
@@ -248,7 +248,7 @@ void ScUndoEnterData::SetChangeTrack()
pChangeTrack->AppendContent( aPos, ppOldCells[i], nFormat );
}
if ( nEndChangeAction > pChangeTrack->GetActionMax() )
- nEndChangeAction = 0; // nichts appended
+ nEndChangeAction = 0; // nichts appended
}
else
nEndChangeAction = 0;
@@ -349,16 +349,16 @@ BOOL __EXPORT ScUndoEnterData::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Wert aendern
+// Wert aendern
//
ScUndoEnterValue::ScUndoEnterValue( ScDocShell* pNewDocShell, const ScAddress& rNewPos,
ScBaseCell* pUndoCell, double nVal, BOOL bHeight ) :
ScSimpleUndo( pNewDocShell ),
- aPos ( rNewPos ),
- pOldCell ( pUndoCell ),
- nValue ( nVal ),
- bNeedHeight ( bHeight )
+ aPos ( rNewPos ),
+ pOldCell ( pUndoCell ),
+ nValue ( nVal ),
+ bNeedHeight ( bHeight )
{
SetChangeTrack();
}
@@ -383,7 +383,7 @@ void ScUndoEnterValue::SetChangeTrack()
nEndChangeAction = pChangeTrack->GetActionMax() + 1;
pChangeTrack->AppendContent( aPos, pOldCell );
if ( nEndChangeAction > pChangeTrack->GetActionMax() )
- nEndChangeAction = 0; // nichts appended
+ nEndChangeAction = 0; // nichts appended
}
else
nEndChangeAction = 0;
@@ -422,7 +422,7 @@ void __EXPORT ScUndoEnterValue::Redo()
void __EXPORT ScUndoEnterValue::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // gippsnich
+ // gippsnich
}
BOOL __EXPORT ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const
@@ -433,16 +433,16 @@ BOOL __EXPORT ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const
// -----------------------------------------------------------------------
//
-// Beliebige Zelle eingeben
+// Beliebige Zelle eingeben
//
ScUndoPutCell::ScUndoPutCell( ScDocShell* pNewDocShell, const ScAddress& rNewPos,
ScBaseCell* pUndoCell, ScBaseCell* pRedoCell, BOOL bHeight ) :
ScSimpleUndo( pNewDocShell ),
- aPos ( rNewPos ),
- pOldCell ( pUndoCell ),
+ aPos ( rNewPos ),
+ pOldCell ( pUndoCell ),
pEnteredCell( pRedoCell ),
- bNeedHeight ( bHeight )
+ bNeedHeight ( bHeight )
{
SetChangeTrack();
}
@@ -469,7 +469,7 @@ void ScUndoPutCell::SetChangeTrack()
nEndChangeAction = pChangeTrack->GetActionMax() + 1;
pChangeTrack->AppendContent( aPos, pOldCell );
if ( nEndChangeAction > pChangeTrack->GetActionMax() )
- nEndChangeAction = 0; // nichts appended
+ nEndChangeAction = 0; // nichts appended
}
else
nEndChangeAction = 0;
@@ -511,7 +511,7 @@ void __EXPORT ScUndoPutCell::Redo()
void __EXPORT ScUndoPutCell::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // gippsnich
+ // gippsnich
}
BOOL __EXPORT ScUndoPutCell::CanRepeat(SfxRepeatTarget& /* rTarget */) const
@@ -522,7 +522,7 @@ BOOL __EXPORT ScUndoPutCell::CanRepeat(SfxRepeatTarget& /* rTarget */) const
// -----------------------------------------------------------------------
//
-// Seitenumbrueche
+// Seitenumbrueche
//
ScUndoPageBreak::ScUndoPageBreak( ScDocShell* pNewDocShell,
@@ -607,7 +607,7 @@ BOOL __EXPORT ScUndoPageBreak::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Druck-Skalierung
+// Druck-Skalierung
//
ScUndoPrintZoom::ScUndoPrintZoom( ScDocShell* pNewDocShell,
@@ -683,7 +683,7 @@ BOOL __EXPORT ScUndoPrintZoom::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Thesaurus
+// Thesaurus
//
ScUndoThesaurus::ScUndoThesaurus( ScDocShell* pNewDocShell,
@@ -717,7 +717,7 @@ __EXPORT ScUndoThesaurus::~ScUndoThesaurus()
String __EXPORT ScUndoThesaurus::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_THESAURUS ); // "Thesaurus"
+ return ScGlobal::GetRscString( STR_UNDO_THESAURUS ); // "Thesaurus"
}
void ScUndoThesaurus::SetChangeTrack( ScBaseCell* pOldCell )
@@ -728,7 +728,7 @@ void ScUndoThesaurus::SetChangeTrack( ScBaseCell* pOldCell )
nEndChangeAction = pChangeTrack->GetActionMax() + 1;
pChangeTrack->AppendContent( ScAddress( nCol, nRow, nTab ), pOldCell );
if ( nEndChangeAction > pChangeTrack->GetActionMax() )
- nEndChangeAction = 0; // nichts appended
+ nEndChangeAction = 0; // nichts appended
}
else
nEndChangeAction = 0;
@@ -952,16 +952,16 @@ String ScUndoShowHideNote::GetComment() const
// -----------------------------------------------------------------------
//
-// Detektiv
+// Detektiv
//
ScUndoDetective::ScUndoDetective( ScDocShell* pNewDocShell,
SdrUndoAction* pDraw, const ScDetOpData* pOperation,
ScDetOpList* pUndoList ) :
ScSimpleUndo( pNewDocShell ),
- pOldList ( pUndoList ),
- nAction ( 0 ),
- pDrawUndo ( pDraw )
+ pOldList ( pUndoList ),
+ nAction ( 0 ),
+ pDrawUndo ( pDraw )
{
bIsDelete = ( pOperation == NULL );
if (!bIsDelete)
@@ -983,11 +983,11 @@ String __EXPORT ScUndoDetective::GetComment() const
if ( !bIsDelete )
switch ( (ScDetOpType) nAction )
{
- case SCDETOP_ADDSUCC: nId = STR_UNDO_DETADDSUCC; break;
- case SCDETOP_DELSUCC: nId = STR_UNDO_DETDELSUCC; break;
- case SCDETOP_ADDPRED: nId = STR_UNDO_DETADDPRED; break;
- case SCDETOP_DELPRED: nId = STR_UNDO_DETDELPRED; break;
- case SCDETOP_ADDERROR: nId = STR_UNDO_DETADDERROR; break;
+ case SCDETOP_ADDSUCC: nId = STR_UNDO_DETADDSUCC; break;
+ case SCDETOP_DELSUCC: nId = STR_UNDO_DETDELSUCC; break;
+ case SCDETOP_ADDPRED: nId = STR_UNDO_DETADDPRED; break;
+ case SCDETOP_DELPRED: nId = STR_UNDO_DETDELPRED; break;
+ case SCDETOP_ADDERROR: nId = STR_UNDO_DETADDERROR; break;
}
return ScGlobal::GetRscString( nId );
@@ -1008,7 +1008,7 @@ void __EXPORT ScUndoDetective::Undo()
}
else
{
- // Eintrag aus der Liste loeschen
+ // Eintrag aus der Liste loeschen
ScDetOpList* pList = pDoc->GetDetOpList();
if (pList && pList->Count())
@@ -1026,7 +1026,7 @@ void __EXPORT ScUndoDetective::Undo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
- pViewShell->RecalcPPT(); //! use broadcast instead?
+ pViewShell->RecalcPPT(); //! use broadcast instead?
EndUndo();
}
@@ -1046,14 +1046,14 @@ void __EXPORT ScUndoDetective::Redo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
- pViewShell->RecalcPPT(); //! use broadcast instead?
+ pViewShell->RecalcPPT(); //! use broadcast instead?
EndRedo();
}
void __EXPORT ScUndoDetective::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // hammanich
+ // hammanich
}
BOOL __EXPORT ScUndoDetective::CanRepeat(SfxRepeatTarget& /* rTarget */) const
@@ -1063,14 +1063,14 @@ BOOL __EXPORT ScUndoDetective::CanRepeat(SfxRepeatTarget& /* rTarget */) const
// -----------------------------------------------------------------------
//
-// Benannte Bereiche
+// Benannte Bereiche
//
ScUndoRangeNames::ScUndoRangeNames( ScDocShell* pNewDocShell,
ScRangeName* pOld, ScRangeName* pNew ) :
ScSimpleUndo( pNewDocShell ),
- pOldRanges ( pOld ),
- pNewRanges ( pNew )
+ pOldRanges ( pOld ),
+ pNewRanges ( pNew )
{
}
@@ -1088,14 +1088,14 @@ String __EXPORT ScUndoRangeNames::GetComment() const
void ScUndoRangeNames::DoChange( BOOL bUndo )
{
ScDocument* pDoc = pDocShell->GetDocument();
- pDoc->CompileNameFormula( TRUE ); // CreateFormulaString
+ pDoc->CompileNameFormula( TRUE ); // CreateFormulaString
if ( bUndo )
pDoc->SetRangeName( new ScRangeName( *pOldRanges ) );
else
pDoc->SetRangeName( new ScRangeName( *pNewRanges ) );
- pDoc->CompileNameFormula( FALSE ); // CompileFormulaString
+ pDoc->CompileNameFormula( FALSE ); // CompileFormulaString
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREAS_CHANGED ) );
}
@@ -1116,7 +1116,7 @@ void __EXPORT ScUndoRangeNames::Redo()
void __EXPORT ScUndoRangeNames::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // hammanich
+ // hammanich
}
BOOL __EXPORT ScUndoRangeNames::CanRepeat(SfxRepeatTarget& /* rTarget */) const
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 0f7834b2a8df..d42dc6486c9c 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -77,7 +77,7 @@ TYPEINIT1(ScUndoChartData, ScSimpleUndo);
//
-// Outline-Gruppen ein- oder ausblenden
+// Outline-Gruppen ein- oder ausblenden
//
ScUndoDoOutline::ScUndoDoOutline( ScDocShell* pNewDocShell,
@@ -102,7 +102,7 @@ __EXPORT ScUndoDoOutline::~ScUndoDoOutline()
}
String __EXPORT ScUndoDoOutline::GetComment() const
-{ // Detail einblenden" "Detail ausblenden"
+{ // Detail einblenden" "Detail ausblenden"
return bShow ?
ScGlobal::GetRscString( STR_UNDO_DOOUTLINE ) :
ScGlobal::GetRscString( STR_UNDO_REDOOUTLINE );
@@ -115,20 +115,20 @@ void __EXPORT ScUndoDoOutline::Undo()
ScDocument* pDoc = pDocShell->GetDocument();
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
+ // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
if ( nVisTab != nTab )
pViewShell->SetTabNo( nTab );
- // inverse Funktion ausfuehren
+ // inverse Funktion ausfuehren
if (bShow)
pViewShell->HideOutline( bColumns, nLevel, nEntry, FALSE, FALSE );
else
pViewShell->ShowOutline( bColumns, nLevel, nEntry, FALSE, FALSE );
- // Original Spalten-/Zeilenstatus
+ // Original Spalten-/Zeilenstatus
if (bColumns)
pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab,
@@ -149,7 +149,7 @@ void __EXPORT ScUndoDoOutline::Redo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
+ // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
if ( nVisTab != nTab )
@@ -169,11 +169,11 @@ void __EXPORT ScUndoDoOutline::Repeat(SfxRepeatTarget& /* rTarget */)
BOOL __EXPORT ScUndoDoOutline::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // geht nicht
+ return FALSE; // geht nicht
}
//
-// Outline-Gruppen erzeugen oder loeschen
+// Outline-Gruppen erzeugen oder loeschen
//
ScUndoMakeOutline::ScUndoMakeOutline( ScDocShell* pNewDocShell,
@@ -195,7 +195,7 @@ __EXPORT ScUndoMakeOutline::~ScUndoMakeOutline()
}
String __EXPORT ScUndoMakeOutline::GetComment() const
-{ // "Gruppierung" "Gruppierung aufheben"
+{ // "Gruppierung" "Gruppierung aufheben"
return bMake ?
ScGlobal::GetRscString( STR_UNDO_MAKEOUTLINE ) :
ScGlobal::GetRscString( STR_UNDO_REMAKEOUTLINE );
@@ -259,7 +259,7 @@ BOOL __EXPORT ScUndoMakeOutline::CanRepeat(SfxRepeatTarget& rTarget) const
}
//
-// Outline-Ebene auswaehlen
+// Outline-Ebene auswaehlen
//
ScUndoOutlineLevel::ScUndoOutlineLevel( ScDocShell* pNewDocShell,
@@ -284,7 +284,7 @@ __EXPORT ScUndoOutlineLevel::~ScUndoOutlineLevel()
}
String __EXPORT ScUndoOutlineLevel::GetComment() const
-{ // "Gliederungsebene auswaehlen";
+{ // "Gliederungsebene auswaehlen";
return ScGlobal::GetRscString( STR_UNDO_OUTLINELEVEL );
}
@@ -295,11 +295,11 @@ void __EXPORT ScUndoOutlineLevel::Undo()
ScDocument* pDoc = pDocShell->GetDocument();
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- // Original Outline-Table
+ // Original Outline-Table
pDoc->SetOutlineTable( nTab, pUndoTable );
- // Original Spalten-/Zeilenstatus
+ // Original Spalten-/Zeilenstatus
if (bColumns)
pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab,
@@ -326,7 +326,7 @@ void __EXPORT ScUndoOutlineLevel::Redo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
+ // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
if ( nVisTab != nTab )
@@ -349,7 +349,7 @@ BOOL __EXPORT ScUndoOutlineLevel::CanRepeat(SfxRepeatTarget& rTarget) const
}
//
-// Outline ueber Blockmarken ein- oder ausblenden
+// Outline ueber Blockmarken ein- oder ausblenden
//
ScUndoOutlineBlock::ScUndoOutlineBlock( ScDocShell* pNewDocShell,
@@ -372,7 +372,7 @@ __EXPORT ScUndoOutlineBlock::~ScUndoOutlineBlock()
}
String __EXPORT ScUndoOutlineBlock::GetComment() const
-{ // "Detail einblenden" "Detail ausblenden"
+{ // "Detail einblenden" "Detail ausblenden"
return bShow ?
ScGlobal::GetRscString( STR_UNDO_DOOUTLINEBLK ) :
ScGlobal::GetRscString( STR_UNDO_REDOOUTLINEBLK );
@@ -386,19 +386,19 @@ void __EXPORT ScUndoOutlineBlock::Undo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
SCTAB nTab = aBlockStart.Tab();
- // Original Outline-Table
+ // Original Outline-Table
pDoc->SetOutlineTable( nTab, pUndoTable );
- // Original Spalten-/Zeilenstatus
+ // Original Spalten-/Zeilenstatus
- SCCOLROW nStartCol = aBlockStart.Col();
- SCCOLROW nEndCol = aBlockEnd.Col();
- SCCOLROW nStartRow = aBlockStart.Row();
- SCCOLROW nEndRow = aBlockEnd.Row();
+ SCCOLROW nStartCol = aBlockStart.Col();
+ SCCOLROW nEndCol = aBlockEnd.Col();
+ SCCOLROW nStartRow = aBlockStart.Row();
+ SCCOLROW nEndRow = aBlockEnd.Row();
if (!bShow)
- { // Groesse des ausgeblendeten Blocks
+ { // Groesse des ausgeblendeten Blocks
USHORT nLevel;
pUndoTable->GetColArray()->FindTouchedLevel( nStartCol, nEndCol, nLevel );
pUndoTable->GetColArray()->ExtendBlock( nLevel, nStartCol, nEndCol );
@@ -457,7 +457,7 @@ BOOL __EXPORT ScUndoOutlineBlock::CanRepeat(SfxRepeatTarget& rTarget) const
}
//
-// alle Outlines loeschen
+// alle Outlines loeschen
//
ScUndoRemoveAllOutlines::ScUndoRemoveAllOutlines( ScDocShell* pNewDocShell,
@@ -479,7 +479,7 @@ __EXPORT ScUndoRemoveAllOutlines::~ScUndoRemoveAllOutlines()
}
String __EXPORT ScUndoRemoveAllOutlines::GetComment() const
-{ // "Gliederung entfernen"
+{ // "Gliederung entfernen"
return ScGlobal::GetRscString( STR_UNDO_REMOVEALLOTLNS );
}
@@ -491,16 +491,16 @@ void __EXPORT ScUndoRemoveAllOutlines::Undo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
SCTAB nTab = aBlockStart.Tab();
- // Original Outline-Table
+ // Original Outline-Table
pDoc->SetOutlineTable( nTab, pUndoTable );
- // Original Spalten-/Zeilenstatus
+ // Original Spalten-/Zeilenstatus
- SCCOL nStartCol = aBlockStart.Col();
- SCCOL nEndCol = aBlockEnd.Col();
- SCROW nStartRow = aBlockStart.Row();
- SCROW nEndRow = aBlockEnd.Row();
+ SCCOL nStartCol = aBlockStart.Col();
+ SCCOL nEndCol = aBlockEnd.Col();
+ SCROW nStartRow = aBlockStart.Row();
+ SCROW nEndRow = aBlockEnd.Row();
pUndoDoc->CopyToDocument( nStartCol, 0, nTab, nEndCol, MAXROW, nTab, IDF_NONE, FALSE, pDoc );
pUndoDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, FALSE, pDoc );
@@ -524,7 +524,7 @@ void __EXPORT ScUndoRemoveAllOutlines::Redo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
+ // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
SCTAB nTab = aBlockStart.Tab();
SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
@@ -548,7 +548,7 @@ BOOL __EXPORT ScUndoRemoveAllOutlines::CanRepeat(SfxRepeatTarget& rTarget) const
}
//
-// Auto-Outline
+// Auto-Outline
//
ScUndoAutoOutline::ScUndoAutoOutline( ScDocShell* pNewDocShell,
@@ -570,7 +570,7 @@ __EXPORT ScUndoAutoOutline::~ScUndoAutoOutline()
}
String __EXPORT ScUndoAutoOutline::GetComment() const
-{ // "Auto-Gliederung"
+{ // "Auto-Gliederung"
return ScGlobal::GetRscString( STR_UNDO_AUTOOUTLINE );
}
@@ -582,11 +582,11 @@ void __EXPORT ScUndoAutoOutline::Undo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
SCTAB nTab = aBlockStart.Tab();
- // Original Outline-Table
+ // Original Outline-Table
pDoc->SetOutlineTable( nTab, pUndoTable );
- // Original Spalten-/Zeilenstatus
+ // Original Spalten-/Zeilenstatus
if (pUndoDoc && pUndoTable)
{
@@ -623,7 +623,7 @@ void __EXPORT ScUndoAutoOutline::Redo()
SCTAB nTab = aBlockStart.Tab();
if (pViewShell)
{
- // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
+ // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
if ( nVisTab != nTab )
@@ -635,9 +635,9 @@ void __EXPORT ScUndoAutoOutline::Redo()
ScOutlineDocFunc aFunc( *pDocShell );
aFunc.AutoOutline( aRange, FALSE, FALSE );
- // auf der View markieren
- // Wenn's beim Aufruf eine Mehrfachselektion war, ist es jetzt der
- // umschliessende Bereich...
+ // auf der View markieren
+ // Wenn's beim Aufruf eine Mehrfachselektion war, ist es jetzt der
+ // umschliessende Bereich...
if (pViewShell)
pViewShell->MarkRange( aRange );
@@ -657,7 +657,7 @@ BOOL __EXPORT ScUndoAutoOutline::CanRepeat(SfxRepeatTarget& rTarget) const
}
//
-// Zwischenergebnisse
+// Zwischenergebnisse
//
ScUndoSubTotals::ScUndoSubTotals( ScDocShell* pNewDocShell, SCTAB nNewTab,
@@ -685,7 +685,7 @@ __EXPORT ScUndoSubTotals::~ScUndoSubTotals()
}
String __EXPORT ScUndoSubTotals::GetComment() const
-{ // "Teilergebnisse"
+{ // "Teilergebnisse"
return ScGlobal::GetRscString( STR_UNDO_SUBTOTALS );
}
@@ -696,8 +696,8 @@ void __EXPORT ScUndoSubTotals::Undo()
ScDocument* pDoc = pDocShell->GetDocument();
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- // um einzelnen DB-Bereich anzupassen
-/* ScDBData* pOldDBData = ScUndoUtil::GetOldDBData( pUndoDBData, pDoc, nTab,
+ // um einzelnen DB-Bereich anzupassen
+/* ScDBData* pOldDBData = ScUndoUtil::GetOldDBData( pUndoDBData, pDoc, nTab,
aParam.nCol1, aParam.nRow1, aParam.nCol2, nNewEndRow );
*/
@@ -711,11 +711,11 @@ void __EXPORT ScUndoSubTotals::Undo()
}
- // Original Outline-Table
+ // Original Outline-Table
pDoc->SetOutlineTable( nTab, pUndoTable );
- // Original Spalten-/Zeilenstatus
+ // Original Spalten-/Zeilenstatus
if (pUndoDoc && pUndoTable)
{
@@ -734,7 +734,7 @@ void __EXPORT ScUndoSubTotals::Undo()
pViewShell->UpdateScrollBars();
}
- // Original-Daten & Referenzen
+ // Original-Daten & Referenzen
ScUndoUtil::MarkSimpleBlock( pDocShell, 0, aParam.nRow1+1, nTab,
MAXCOL, aParam.nRow2, nTab );
@@ -742,14 +742,14 @@ void __EXPORT ScUndoSubTotals::Undo()
pDoc->DeleteAreaTab( 0,aParam.nRow1+1, MAXCOL,aParam.nRow2, nTab, IDF_ALL );
pUndoDoc->CopyToDocument( 0, aParam.nRow1+1, nTab, MAXCOL, aParam.nRow2, nTab,
- IDF_NONE, FALSE, pDoc ); // Flags
+ IDF_NONE, FALSE, pDoc ); // Flags
pUndoDoc->UndoToDocument( 0, aParam.nRow1+1, nTab, MAXCOL, aParam.nRow2, nTab,
IDF_ALL, FALSE, pDoc );
ScUndoUtil::MarkSimpleBlock( pDocShell, aParam.nCol1,aParam.nRow1,nTab,
aParam.nCol2,aParam.nRow2,nTab );
-/* if (pUndoDBData)
+/* if (pUndoDBData)
*pOldDBData = *pUndoDBData;
*/
if (pUndoRange)
@@ -790,11 +790,11 @@ void __EXPORT ScUndoSubTotals::Repeat(SfxRepeatTarget& /* rTarget */)
BOOL __EXPORT ScUndoSubTotals::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // geht nicht wegen Spaltennummern
+ return FALSE; // geht nicht wegen Spaltennummern
}
//
-// Sortieren
+// Sortieren
//
ScUndoSort::ScUndoSort( ScDocShell* pNewDocShell,
@@ -837,8 +837,8 @@ void __EXPORT ScUndoSort::Undo()
SCCOL nStartCol = aSortParam.nCol1;
SCROW nStartRow = aSortParam.nRow1;
- SCCOL nEndCol = aSortParam.nCol2;
- SCROW nEndRow = aSortParam.nRow2;
+ SCCOL nEndCol = aSortParam.nCol2;
+ SCROW nEndRow = aSortParam.nRow2;
SCTAB nSortTab = nTab;
if ( !aSortParam.bInplace )
{
@@ -864,9 +864,9 @@ void __EXPORT ScUndoSort::Undo()
pUndoDoc->CopyToDocument( aDestRange, IDF_ALL|IDF_NOCAPTIONS, FALSE, pDoc );
}
- // Zeilenhoehen immer (wegen automatischer Anpassung)
- //! auf ScBlockUndo umstellen
-// if (bRepeatQuery)
+ // Zeilenhoehen immer (wegen automatischer Anpassung)
+ //! auf ScBlockUndo umstellen
+// if (bRepeatQuery)
pUndoDoc->CopyToDocument( 0, nStartRow, nSortTab, MAXCOL, nEndRow, nSortTab,
IDF_NONE, FALSE, pDoc );
@@ -893,16 +893,16 @@ void __EXPORT ScUndoSort::Redo()
if ( nVisTab != nTab )
pViewShell->SetTabNo( nTab );
-// pViewShell->DoneBlockMode();
-// pViewShell->InitOwnBlockMode();
-// pViewShell->GetViewData()->GetMarkData() = aMarkData; // CopyMarksTo
+// pViewShell->DoneBlockMode();
+// pViewShell->InitOwnBlockMode();
+// pViewShell->GetViewData()->GetMarkData() = aMarkData; // CopyMarksTo
pViewShell->MarkRange( ScRange( aSortParam.nCol1, aSortParam.nRow1, nTab,
aSortParam.nCol2, aSortParam.nRow2, nTab ) );
pViewShell->Sort( aSortParam, FALSE );
- // Quellbereich painten wegen Markierung
+ // Quellbereich painten wegen Markierung
if ( !aSortParam.bInplace )
pDocShell->PostPaint( aSortParam.nCol1, aSortParam.nRow1, nTab,
aSortParam.nCol2, aSortParam.nRow2, nTab, PAINT_GRID );
@@ -916,11 +916,11 @@ void __EXPORT ScUndoSort::Repeat(SfxRepeatTarget& /* rTarget */)
BOOL __EXPORT ScUndoSort::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // geht nicht wegen Spaltennummern
+ return FALSE; // geht nicht wegen Spaltennummern
}
//
-// Filtern
+// Filtern
//
ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQueryParam& rParam,
@@ -932,7 +932,7 @@ ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQuery
nTab( nNewTab ),
aQueryParam( rParam ),
pUndoDoc( pNewUndoDoc ),
-// pUndoDBData( pNewData )
+// pUndoDBData( pNewData )
pUndoDB( pNewUndoDB ),
bIsAdvanced( FALSE ),
bDestArea( FALSE ),
@@ -955,13 +955,13 @@ ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQuery
__EXPORT ScUndoQuery::~ScUndoQuery()
{
delete pUndoDoc;
-// delete pUndoDBData;
+// delete pUndoDBData;
delete pUndoDB;
DeleteSdrUndoAction( pDrawUndo );
}
String __EXPORT ScUndoQuery::GetComment() const
-{ // "Filtern";
+{ // "Filtern";
return ScGlobal::GetRscString( STR_UNDO_QUERY );
}
@@ -992,7 +992,7 @@ void __EXPORT ScUndoQuery::Undo()
if ( bDoSize && bDestArea )
{
- // aDestRange ist der alte Bereich
+ // aDestRange ist der alte Bereich
pDoc->FitBlock( ScRange(
aQueryParam.nDestCol, aQueryParam.nDestRow, aQueryParam.nDestTab,
nDestEndCol, nDestEndRow, aQueryParam.nDestTab ),
@@ -1010,9 +1010,9 @@ void __EXPORT ScUndoQuery::Undo()
pUndoDoc->CopyToDocument( aQueryParam.nDestCol, aQueryParam.nDestRow, aQueryParam.nDestTab,
nDestEndCol, nDestEndRow, aQueryParam.nDestTab,
IDF_ALL, FALSE, pDoc );
- // Attribute werden immer mitkopiert (#49287#)
+ // Attribute werden immer mitkopiert (#49287#)
- // Rest von altem Bereich
+ // Rest von altem Bereich
if ( bDestArea && !bDoSize )
{
pDoc->DeleteAreaTab( aOldDest, IDF_ALL );
@@ -1028,7 +1028,7 @@ void __EXPORT ScUndoQuery::Undo()
if (!bCopy)
{
- pDoc->InvalidatePageBreaks(nTab);
+ pDoc->InvalidatePageBreaks(nTab);
pDoc->UpdatePageBreaks( nTab );
}
@@ -1042,7 +1042,7 @@ void __EXPORT ScUndoQuery::Undo()
if ( nVisTab != nTab )
pViewShell->SetTabNo( nTab );
- // Paint
+ // Paint
if (bCopy)
{
@@ -1092,7 +1092,7 @@ void __EXPORT ScUndoQuery::Repeat(SfxRepeatTarget& /* rTarget */)
BOOL __EXPORT ScUndoQuery::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // geht nicht wegen Spaltennummern
+ return FALSE; // geht nicht wegen Spaltennummern
}
//
@@ -1168,7 +1168,7 @@ BOOL ScUndoAutoFilter::CanRepeat(SfxRepeatTarget& /* rTarget */) const
}
//
-// Datenbankbereiche aendern (Dialog)
+// Datenbankbereiche aendern (Dialog)
//
ScUndoDBData::ScUndoDBData( ScDocShell* pNewDocShell,
@@ -1186,7 +1186,7 @@ __EXPORT ScUndoDBData::~ScUndoDBData()
}
String __EXPORT ScUndoDBData::GetComment() const
-{ // "Datenbankbereiche aendern";
+{ // "Datenbankbereiche aendern";
return ScGlobal::GetRscString( STR_UNDO_DBDATA );
}
@@ -1197,10 +1197,10 @@ void __EXPORT ScUndoDBData::Undo()
ScDocument* pDoc = pDocShell->GetDocument();
BOOL bOldAutoCalc = pDoc->GetAutoCalc();
- pDoc->SetAutoCalc( FALSE ); // unnoetige Berechnungen vermeiden
- pDoc->CompileDBFormula( TRUE ); // CreateFormulaString
+ pDoc->SetAutoCalc( FALSE ); // unnoetige Berechnungen vermeiden
+ pDoc->CompileDBFormula( TRUE ); // CreateFormulaString
pDoc->SetDBCollection( new ScDBCollection(*pUndoColl), TRUE );
- pDoc->CompileDBFormula( FALSE ); // CompileFormulaString
+ pDoc->CompileDBFormula( FALSE ); // CompileFormulaString
pDoc->SetAutoCalc( bOldAutoCalc );
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
@@ -1215,10 +1215,10 @@ void __EXPORT ScUndoDBData::Redo()
ScDocument* pDoc = pDocShell->GetDocument();
BOOL bOldAutoCalc = pDoc->GetAutoCalc();
- pDoc->SetAutoCalc( FALSE ); // unnoetige Berechnungen vermeiden
- pDoc->CompileDBFormula( TRUE ); // CreateFormulaString
+ pDoc->SetAutoCalc( FALSE ); // unnoetige Berechnungen vermeiden
+ pDoc->CompileDBFormula( TRUE ); // CreateFormulaString
pDoc->SetDBCollection( new ScDBCollection(*pRedoColl), TRUE );
- pDoc->CompileDBFormula( FALSE ); // CompileFormulaString
+ pDoc->CompileDBFormula( FALSE ); // CompileFormulaString
pDoc->SetAutoCalc( bOldAutoCalc );
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
@@ -1232,11 +1232,11 @@ void __EXPORT ScUndoDBData::Repeat(SfxRepeatTarget& /* rTarget */)
BOOL __EXPORT ScUndoDBData::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // geht nicht
+ return FALSE; // geht nicht
}
//
-// Import
+// Import
//
ScUndoImportData::ScUndoImportData( ScDocShell* pNewDocShell, SCTAB nNewTab,
@@ -1268,7 +1268,7 @@ __EXPORT ScUndoImportData::~ScUndoImportData()
}
String __EXPORT ScUndoImportData::GetComment() const
-{ // "Importieren";
+{ // "Importieren";
return ScGlobal::GetRscString( STR_UNDO_IMPORTDATA );
}
@@ -1294,12 +1294,12 @@ void __EXPORT ScUndoImportData::Undo()
if ( !bRedoFilled )
{
- // read redo data from document at first undo
- // imported data is deleted later anyway,
- // so now delete each column after copying to save memory (#41216#)
+ // read redo data from document at first undo
+ // imported data is deleted later anyway,
+ // so now delete each column after copying to save memory (#41216#)
BOOL bOldAutoCalc = pDoc->GetAutoCalc();
- pDoc->SetAutoCalc( FALSE ); // outside of the loop
+ pDoc->SetAutoCalc( FALSE ); // outside of the loop
for (SCCOL nCopyCol = nCol1; nCopyCol <= nCol2; nCopyCol++)
{
pDoc->CopyToDocument( nCopyCol,nRow1,nTab, nCopyCol,nRow2,nTab,
@@ -1312,10 +1312,10 @@ void __EXPORT ScUndoImportData::Undo()
}
}
BOOL bMoveCells = pUndoDBData && pRedoDBData &&
- pRedoDBData->IsDoSize(); // in alt und neu gleich
+ pRedoDBData->IsDoSize(); // in alt und neu gleich
if (bMoveCells)
{
- // Undo: erst die neuen Daten loeschen, dann FitBlock rueckwaerts
+ // Undo: erst die neuen Daten loeschen, dann FitBlock rueckwaerts
ScRange aOld, aNew;
pUndoDBData->GetArea( aOld );
@@ -1324,9 +1324,9 @@ void __EXPORT ScUndoImportData::Undo()
pDoc->DeleteAreaTab( aNew.aStart.Col(), aNew.aStart.Row(),
aNew.aEnd.Col(), aNew.aEnd.Row(), nTab, IDF_ALL & ~IDF_NOTE );
- aOld.aEnd.SetCol( aOld.aEnd.Col() + nFormulaCols ); // FitBlock auch fuer Formeln
+ aOld.aEnd.SetCol( aOld.aEnd.Col() + nFormulaCols ); // FitBlock auch fuer Formeln
aNew.aEnd.SetCol( aNew.aEnd.Col() + nFormulaCols );
- pDoc->FitBlock( aNew, aOld, FALSE ); // rueckwaerts
+ pDoc->FitBlock( aNew, aOld, FALSE ); // rueckwaerts
}
else
pDoc->DeleteAreaTab( aImportParam.nCol1,aImportParam.nRow1,
@@ -1345,7 +1345,7 @@ void __EXPORT ScUndoImportData::Undo()
}
// erack! it's broadcasted
-// pDoc->SetDirty();
+// pDoc->SetDirty();
SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
if ( nVisTab != nTab )
@@ -1382,16 +1382,16 @@ void __EXPORT ScUndoImportData::Redo()
nCol1, nRow1, nCol2, nRow2 );
}
BOOL bMoveCells = pUndoDBData && pRedoDBData &&
- pRedoDBData->IsDoSize(); // in alt und neu gleich
+ pRedoDBData->IsDoSize(); // in alt und neu gleich
if (bMoveCells)
{
- // Redo: FitBlock, dann Daten loeschen (noetig fuer CopyToDocument)
+ // Redo: FitBlock, dann Daten loeschen (noetig fuer CopyToDocument)
ScRange aOld, aNew;
pUndoDBData->GetArea( aOld );
pRedoDBData->GetArea( aNew );
- aOld.aEnd.SetCol( aOld.aEnd.Col() + nFormulaCols ); // FitBlock auch fuer Formeln
+ aOld.aEnd.SetCol( aOld.aEnd.Col() + nFormulaCols ); // FitBlock auch fuer Formeln
aNew.aEnd.SetCol( aNew.aEnd.Col() + nFormulaCols );
pDoc->FitBlock( aOld, aNew );
@@ -1417,7 +1417,7 @@ void __EXPORT ScUndoImportData::Redo()
}
// erack! it's broadcasted
-// pDoc->SetDirty();
+// pDoc->SetDirty();
SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
if ( nVisTab != nTab )
@@ -1450,16 +1450,16 @@ void __EXPORT ScUndoImportData::Repeat(SfxRepeatTarget& rTarget)
BOOL __EXPORT ScUndoImportData::CanRepeat(SfxRepeatTarget& rTarget) const
{
- // Repeat nur fuer Import per DB-Bereich, dann ist pUndoDBData gesetzt
+ // Repeat nur fuer Import per DB-Bereich, dann ist pUndoDBData gesetzt
if (pUndoDBData)
return (rTarget.ISA(ScTabViewTarget));
else
- return FALSE; // Adressbuch
+ return FALSE; // Adressbuch
}
//
-// Operationen wiederholen
+// Operationen wiederholen
//
ScUndoRepeatDB::ScUndoRepeatDB( ScDocShell* pNewDocShell, SCTAB nNewTab,
@@ -1496,7 +1496,7 @@ __EXPORT ScUndoRepeatDB::~ScUndoRepeatDB()
}
String __EXPORT ScUndoRepeatDB::GetComment() const
-{ // "Wiederholen"; //! bessere Beschreibung!
+{ // "Wiederholen"; //! bessere Beschreibung!
return ScGlobal::GetRscString( STR_UNDO_REPEATDB );
}
@@ -1516,7 +1516,7 @@ void __EXPORT ScUndoRepeatDB::Undo()
{
SCCOL nFormulaCols = 0;
SCCOL nCol = aOldQuery.aEnd.Col() + 1;
- SCROW nRow = aOldQuery.aStart.Row() + 1; //! Header testen
+ SCROW nRow = aOldQuery.aStart.Row() + 1; //! Header testen
while ( nCol <= MAXCOL &&
pDoc->GetCellType(ScAddress( nCol, nRow, nTab )) == CELLTYPE_FORMULA )
++nCol, ++nFormulaCols;
@@ -1533,7 +1533,7 @@ void __EXPORT ScUndoRepeatDB::Undo()
}
}
- //! Daten von Filter in anderen Bereich fehlen noch !!!!!!!!!!!!!!!!!
+ //! Daten von Filter in anderen Bereich fehlen noch !!!!!!!!!!!!!!!!!
if (nNewEndRow > aBlockEnd.Row())
{
@@ -1544,11 +1544,11 @@ void __EXPORT ScUndoRepeatDB::Undo()
pDoc->InsertRow( 0,nTab, MAXCOL,nTab, nNewEndRow+1, static_cast<SCSIZE>(nNewEndRow-aBlockEnd.Row()) );
}
- // Original Outline-Table
+ // Original Outline-Table
pDoc->SetOutlineTable( nTab, pUndoTable );
- // Original Spalten-/Zeilenstatus
+ // Original Spalten-/Zeilenstatus
if (pUndoDoc && pUndoTable)
{
@@ -1567,7 +1567,7 @@ void __EXPORT ScUndoRepeatDB::Undo()
pViewShell->UpdateScrollBars();
}
- // Original-Daten & Referenzen
+ // Original-Daten & Referenzen
ScUndoUtil::MarkSimpleBlock( pDocShell, 0, aBlockStart.Row(), nTab,
MAXCOL, aBlockEnd.Row(), nTab );
@@ -1575,7 +1575,7 @@ void __EXPORT ScUndoRepeatDB::Undo()
MAXCOL, aBlockEnd.Row(), nTab, IDF_ALL );
pUndoDoc->CopyToDocument( 0, aBlockStart.Row(), nTab, MAXCOL, aBlockEnd.Row(), nTab,
- IDF_NONE, FALSE, pDoc ); // Flags
+ IDF_NONE, FALSE, pDoc ); // Flags
pUndoDoc->UndoToDocument( 0, aBlockStart.Row(), nTab, MAXCOL, aBlockEnd.Row(), nTab,
IDF_ALL, FALSE, pDoc );
@@ -1588,7 +1588,7 @@ void __EXPORT ScUndoRepeatDB::Undo()
pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), TRUE );
// erack! it's broadcasted
-// pDoc->SetDirty();
+// pDoc->SetDirty();
SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
if ( nVisTab != nTab )
@@ -1632,7 +1632,7 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
}
//UNUSED2008-05 //
-//UNUSED2008-05 // Pivot-Tabellen
+//UNUSED2008-05 // Pivot-Tabellen
//UNUSED2008-05 //
//UNUSED2008-05
//UNUSED2008-05 ScUndoPivot::ScUndoPivot( ScDocShell* pNewDocShell,
@@ -1719,9 +1719,9 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
//UNUSED2008-05 pOldPivot->ReleaseData();
//UNUSED2008-05 pPivotCollection->Insert( pOldPivot );
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 // erack! it's broadcasted
-//UNUSED2008-05 // pDoc->SetDirty();
+//UNUSED2008-05 // pDoc->SetDirty();
//UNUSED2008-05 if (pNewUndoDoc)
//UNUSED2008-05 pDocShell->PostPaint( aNewArea.nColStart, aNewArea.nRowStart, aNewArea.nTab,
//UNUSED2008-05 aNewArea.nColEnd, aNewArea.nRowEnd, aNewArea.nTab,
@@ -1731,7 +1731,7 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
//UNUSED2008-05 aOldArea.nColEnd, aOldArea.nRowEnd, aOldArea.nTab,
//UNUSED2008-05 PAINT_GRID, SC_PF_LINES );
//UNUSED2008-05 pDocShell->PostDataChanged();
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
//UNUSED2008-05 if (pViewShell)
//UNUSED2008-05 {
@@ -1747,19 +1747,19 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
//UNUSED2008-05 pViewShell->SetTabNo( aNewArea.nTab );
//UNUSED2008-05 }
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 EndUndo();
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 void __EXPORT ScUndoPivot::Redo()
//UNUSED2008-05 {
//UNUSED2008-05 BeginRedo();
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 ScDocument* pDoc = pDocShell->GetDocument();
//UNUSED2008-05 ScPivotCollection* pPivotCollection = pDoc->GetPivotCollection();
//UNUSED2008-05 ScPivot* pOldPivot = pPivotCollection->GetPivotAtCursor(
//UNUSED2008-05 aOldParam.nCol, aOldParam.nRow, aOldParam.nTab );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 ScPivot* pNewPivot = NULL;
//UNUSED2008-05 if (pNewUndoDoc)
//UNUSED2008-05 {
@@ -1768,29 +1768,29 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
//UNUSED2008-05 pNewPivot->SetName( aNewName );
//UNUSED2008-05 pNewPivot->SetTag( aNewTag );
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 pDocShell->PivotUpdate( pOldPivot, pNewPivot, FALSE );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 EndRedo();
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 void __EXPORT ScUndoPivot::Repeat(SfxRepeatTarget& rTarget)
//UNUSED2008-05 {
//UNUSED2008-05 // Wiederholen: nur loeschen
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 if ( pOldUndoDoc && !pNewUndoDoc && rTarget.ISA(ScTabViewTarget) )
//UNUSED2008-05 ((ScTabViewTarget&)rTarget).GetViewShell()->DeletePivotTable();
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 BOOL __EXPORT ScUndoPivot::CanRepeat(SfxRepeatTarget& rTarget) const
//UNUSED2008-05 {
//UNUSED2008-05 // Wiederholen: nur loeschen
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 return ( pOldUndoDoc && !pNewUndoDoc && rTarget.ISA(ScTabViewTarget) );
//UNUSED2008-05 }
//
-// data pilot
+// data pilot
//
ScUndoDataPilot::ScUndoDataPilot( ScDocShell* pNewDocShell,
@@ -1852,12 +1852,12 @@ void __EXPORT ScUndoDataPilot::Undo()
pOldUndoDoc->CopyToDocument( aOldRange, IDF_ALL, FALSE, pDoc );
}
- // update objects in collection
+ // update objects in collection
if ( pNewDPObject )
{
- // find updated object
- //! find by name!
+ // find updated object
+ //! find by name!
ScDPObject* pDocObj = pDoc->GetDPAtCursor(
aNewRange.aStart.Col(), aNewRange.aStart.Row(), aNewRange.aStart.Tab() );
@@ -1866,7 +1866,7 @@ void __EXPORT ScUndoDataPilot::Undo()
{
if ( pOldDPObject )
{
- // restore old settings
+ // restore old settings
pOldDPObject->WriteSourceDataTo( *pDocObj );
ScDPSaveData* pData = pOldDPObject->GetSaveData();
if (pData)
@@ -1876,14 +1876,14 @@ void __EXPORT ScUndoDataPilot::Undo()
}
else
{
- // delete inserted object
+ // delete inserted object
pDoc->GetDPCollection()->FreeTable(pDocObj);
}
}
}
else if ( pOldDPObject )
{
- // re-insert deleted object
+ // re-insert deleted object
ScDPObject* pDestObj = new ScDPObject( *pOldDPObject );
pDestObj->SetAlive(TRUE);
@@ -1903,7 +1903,7 @@ void __EXPORT ScUndoDataPilot::Undo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
{
- //! set current sheet
+ //! set current sheet
}
if (pNewDPObject)
@@ -1919,16 +1919,16 @@ void __EXPORT ScUndoDataPilot::Redo()
{
BeginRedo();
- //! copy output data instead of repeating the change,
- //! in case external data have changed!
+ //! copy output data instead of repeating the change,
+ //! in case external data have changed!
ScDocument* pDoc = pDocShell->GetDocument();
ScDPObject* pSourceObj = NULL;
if ( pOldDPObject )
{
- // find object to modify
- //! find by name!
+ // find object to modify
+ //! find by name!
ScRange aOldRange = pOldDPObject->GetOutRange();
pSourceObj = pDoc->GetDPAtCursor(
@@ -1937,25 +1937,25 @@ void __EXPORT ScUndoDataPilot::Redo()
}
ScDBDocFunc aFunc( *pDocShell );
- aFunc.DataPilotUpdate( pSourceObj, pNewDPObject, FALSE, FALSE, bAllowMove ); // no new undo action
+ aFunc.DataPilotUpdate( pSourceObj, pNewDPObject, FALSE, FALSE, bAllowMove ); // no new undo action
EndRedo();
}
void __EXPORT ScUndoDataPilot::Repeat(SfxRepeatTarget& /* rTarget */)
{
- //! allow deletion
+ //! allow deletion
}
BOOL __EXPORT ScUndoDataPilot::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- //! allow deletion
+ //! allow deletion
return FALSE;
}
//
-// Konsolidieren
+// Konsolidieren
//
ScUndoConsolidate::ScUndoConsolidate( ScDocShell* pNewDocShell, const ScArea& rArea,
@@ -1998,22 +1998,22 @@ void __EXPORT ScUndoConsolidate::Undo()
if (bInsRef)
{
- // Zeilen loeschen
+ // Zeilen loeschen
pDoc->DeleteRow( 0,nTab, MAXCOL,nTab, aDestArea.nRowStart, nInsertCount );
- // Outlines
+ // Outlines
pDoc->SetOutlineTable( nTab, pUndoTab );
- // Zeilenstatus
+ // Zeilenstatus
pUndoDoc->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab, IDF_NONE, FALSE, pDoc );
- // Daten & Referenzen
+ // Daten & Referenzen
pDoc->DeleteAreaTab( 0,aDestArea.nRowStart, MAXCOL,aDestArea.nRowEnd, nTab, IDF_ALL );
pUndoDoc->UndoToDocument( 0, aDestArea.nRowStart, nTab,
MAXCOL, aDestArea.nRowEnd, nTab,
IDF_ALL, FALSE, pDoc );
- // Original-Bereich
+ // Original-Bereich
if (pUndoData)
{
pDoc->DeleteAreaTab(aOldRange, IDF_ALL);
@@ -2031,7 +2031,7 @@ void __EXPORT ScUndoConsolidate::Undo()
aDestArea.nColEnd, aDestArea.nRowEnd, nTab,
IDF_ALL, FALSE, pDoc );
- // Original-Bereich
+ // Original-Bereich
if (pUndoData)
{
pDoc->DeleteAreaTab(aOldRange, IDF_ALL);
@@ -2051,10 +2051,10 @@ void __EXPORT ScUndoConsolidate::Undo()
nEndX, nEndY, nTab, PAINT_GRID );
}
- // DB-Bereich wieder anpassen
+ // DB-Bereich wieder anpassen
if (pUndoData)
{
- ScDBCollection* pColl = pDoc->GetDBCollection();
+ ScDBCollection* pColl = pDoc->GetDBCollection();
if (pColl)
{
USHORT nIndex;
@@ -2110,7 +2110,7 @@ BOOL __EXPORT ScUndoConsolidate::CanRepeat(SfxRepeatTarget& /* rTarget */) const
//
-// Quell-Daten von Chart aendern
+// Quell-Daten von Chart aendern
//
void ScUndoChartData::Init()
diff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxx
index a10a7381d808..458cabec8de2 100644
--- a/sc/source/ui/undo/undodraw.cxx
+++ b/sc/source/ui/undo/undodraw.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -184,7 +184,7 @@ __EXPORT ScUndoDraw::~ScUndoDraw()
void ScUndoDraw::ForgetDrawUndo()
{
- pDrawUndo = NULL; // nicht loeschen (Draw-Undo muss dann von aussen gemerkt werden)
+ pDrawUndo = NULL; // nicht loeschen (Draw-Undo muss dann von aussen gemerkt werden)
}
String __EXPORT ScUndoDraw::GetComment() const
diff --git a/sc/source/ui/undo/undoolk.cxx b/sc/source/ui/undo/undoolk.cxx
index 183b9d1cd7b4..8053f472cd6c 100644
--- a/sc/source/ui/undo/undoolk.cxx
+++ b/sc/source/ui/undo/undoolk.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ SdrUndoAction* GetSdrUndoAction( ScDocument* pDoc )
{
ScDrawLayer* pLayer = pDoc->GetDrawLayer();
if (pLayer)
- return pLayer->GetCalcUndo(); // muss vorhanden sein
+ return pLayer->GetCalcUndo(); // muss vorhanden sein
else
return NULL;
}
diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx
index b4ea7f35448c..7f85a38adebd 100644
--- a/sc/source/ui/undo/undostyl.cxx
+++ b/sc/source/ui/undo/undostyl.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -51,7 +51,7 @@ TYPEINIT1(ScUndoApplyPageStyle, ScSimpleUndo);
// -----------------------------------------------------------------------
//
-// modify style (cell or page style)
+// modify style (cell or page style)
//
ScStyleSaveData::ScStyleSaveData() :
@@ -98,7 +98,7 @@ void ScStyleSaveData::InitFromStyle( const SfxStyleSheetBase* pSource )
pItems = new SfxItemSet( ((SfxStyleSheetBase*)pSource)->GetItemSet() );
}
else
- *this = ScStyleSaveData(); // empty
+ *this = ScStyleSaveData(); // empty
}
// -----------------------------------------------------------------------
@@ -126,7 +126,7 @@ String ScUndoModifyStyle::GetComment() const
void lcl_DocStyleChanged( ScDocument* pDoc, SfxStyleSheetBase* pStyle, BOOL bRemoved )
{
- //! move to document or docshell
+ //! move to document or docshell
VirtualDevice aVDev;
Point aLogic = aVDev.LogicToPixel( Point(1000,1000), MAP_TWIP );
@@ -147,8 +147,8 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName,
ScDocument* pDoc = pDocSh->GetDocument();
ScStyleSheetPool* pStlPool = pDoc->GetStyleSheetPool();
String aNewName = rData.GetName();
- BOOL bDelete = ( aNewName.Len() == 0 ); // no new name -> delete style
- BOOL bNew = ( rName.Len() == 0 && !bDelete ); // creating new style
+ BOOL bDelete = ( aNewName.Len() == 0 ); // no new name -> delete style
+ BOOL bNew = ( rName.Len() == 0 && !bDelete ); // creating new style
SfxStyleSheetBase* pStyle = NULL;
if ( rName.Len() )
@@ -177,7 +177,7 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName,
if ( bDelete )
{
if ( eStyleFamily == SFX_STYLE_FAMILY_PARA )
- lcl_DocStyleChanged( pDoc, pStyle, TRUE ); // TRUE: remove usage of style
+ lcl_DocStyleChanged( pDoc, pStyle, TRUE ); // TRUE: remove usage of style
else
pDoc->RemovePageStyleInUse( rName );
@@ -200,7 +200,7 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName,
if ( eStyleFamily == SFX_STYLE_FAMILY_PARA )
{
- lcl_DocStyleChanged( pDoc, pStyle, FALSE ); // cell styles: row heights
+ lcl_DocStyleChanged( pDoc, pStyle, FALSE ); // cell styles: row heights
}
else
{
@@ -219,8 +219,8 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName,
pDocSh->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID|PAINT_LEFT );
- //! undo/redo document modifications for deleted styles
- //! undo/redo modifications of number formatter
+ //! undo/redo document modifications for deleted styles
+ //! undo/redo modifications of number formatter
}
void ScUndoModifyStyle::Undo()
@@ -243,12 +243,12 @@ void ScUndoModifyStyle::Repeat(SfxRepeatTarget& /* rTarget */)
BOOL ScUndoModifyStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // no repeat possible
+ return FALSE; // no repeat possible
}
// -----------------------------------------------------------------------
//
-// apply page style
+// apply page style
//
ScUndoApplyPageStyle::ApplyStyleEntry::ApplyStyleEntry( SCTAB nTab, const String& rOldStyle ) :
mnTab( nTab ),
@@ -300,7 +300,7 @@ void ScUndoApplyPageStyle::Redo()
void ScUndoApplyPageStyle::Repeat(SfxRepeatTarget& /* rTarget */)
{
- //! set same page style to current tab
+ //! set same page style to current tab
}
BOOL ScUndoApplyPageStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 70845f6c0bc9..1b4f94521624 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,7 @@
#include "drwlayer.hxx"
#include "scresid.hxx"
-extern BOOL bDrawIsInUndo; //! irgendwo als Member !!!
+extern BOOL bDrawIsInUndo; //! irgendwo als Member !!!
using namespace com::sun::star;
using ::com::sun::star::uno::Sequence;
@@ -64,27 +64,27 @@ using ::std::auto_ptr;
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1(ScUndoInsertTab, SfxUndoAction);
-TYPEINIT1(ScUndoInsertTables, SfxUndoAction);
-TYPEINIT1(ScUndoDeleteTab, SfxUndoAction);
-TYPEINIT1(ScUndoRenameTab, SfxUndoAction);
-TYPEINIT1(ScUndoMoveTab, SfxUndoAction);
-TYPEINIT1(ScUndoCopyTab, SfxUndoAction);
-TYPEINIT1(ScUndoMakeScenario, SfxUndoAction);
-TYPEINIT1(ScUndoImportTab, SfxUndoAction);
-TYPEINIT1(ScUndoRemoveLink, SfxUndoAction);
-TYPEINIT1(ScUndoShowHideTab, SfxUndoAction);
-TYPEINIT1(ScUndoPrintRange, SfxUndoAction);
-TYPEINIT1(ScUndoScenarioFlags, SfxUndoAction);
-TYPEINIT1(ScUndoRenameObject, SfxUndoAction);
-TYPEINIT1(ScUndoLayoutRTL, SfxUndoAction);
-//UNUSED2009-05 TYPEINIT1(ScUndoSetGrammar, SfxUndoAction);
+TYPEINIT1(ScUndoInsertTab, SfxUndoAction);
+TYPEINIT1(ScUndoInsertTables, SfxUndoAction);
+TYPEINIT1(ScUndoDeleteTab, SfxUndoAction);
+TYPEINIT1(ScUndoRenameTab, SfxUndoAction);
+TYPEINIT1(ScUndoMoveTab, SfxUndoAction);
+TYPEINIT1(ScUndoCopyTab, SfxUndoAction);
+TYPEINIT1(ScUndoMakeScenario, SfxUndoAction);
+TYPEINIT1(ScUndoImportTab, SfxUndoAction);
+TYPEINIT1(ScUndoRemoveLink, SfxUndoAction);
+TYPEINIT1(ScUndoShowHideTab, SfxUndoAction);
+TYPEINIT1(ScUndoPrintRange, SfxUndoAction);
+TYPEINIT1(ScUndoScenarioFlags, SfxUndoAction);
+TYPEINIT1(ScUndoRenameObject, SfxUndoAction);
+TYPEINIT1(ScUndoLayoutRTL, SfxUndoAction);
+//UNUSED2009-05 TYPEINIT1(ScUndoSetGrammar, SfxUndoAction);
TYPEINIT1(ScUndoTabColor, SfxUndoAction);
// -----------------------------------------------------------------------
//
-// Tabelle einfuegen
+// Tabelle einfuegen
//
ScUndoInsertTab::ScUndoInsertTab( ScDocShell* pNewDocShell,
@@ -132,11 +132,11 @@ void ScUndoInsertTab::Undo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
pViewShell->SetTabNo(nTab);
- pDocShell->SetInUndo( TRUE ); //! BeginUndo
+ pDocShell->SetInUndo( TRUE ); //! BeginUndo
bDrawIsInUndo = TRUE;
pViewShell->DeleteTable( nTab, FALSE );
bDrawIsInUndo = FALSE;
- pDocShell->SetInUndo( FALSE ); //! EndUndo
+ pDocShell->SetInUndo( FALSE ); //! EndUndo
DoSdrUndoAction( pDrawUndo, pDocShell->GetDocument() );
@@ -144,7 +144,7 @@ void ScUndoInsertTab::Undo()
if ( pChangeTrack )
pChangeTrack->Undo( nEndChangeAction, nEndChangeAction );
- // SetTabNo(...,TRUE) for all views to sync with drawing layer pages
+ // SetTabNo(...,TRUE) for all views to sync with drawing layer pages
pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
}
@@ -154,7 +154,7 @@ void ScUndoInsertTab::Redo()
RedoSdrUndoAction( pDrawUndo ); // Draw Redo first
- pDocShell->SetInUndo( TRUE ); //! BeginRedo
+ pDocShell->SetInUndo( TRUE ); //! BeginRedo
bDrawIsInUndo = TRUE;
if (bAppend)
pViewShell->AppendTable( sNewName, FALSE );
@@ -164,7 +164,7 @@ void ScUndoInsertTab::Redo()
pViewShell->InsertTable( sNewName, nTab, FALSE );
}
bDrawIsInUndo = FALSE;
- pDocShell->SetInUndo( FALSE ); //! EndRedo
+ pDocShell->SetInUndo( FALSE ); //! EndRedo
SetChangeTrack();
}
@@ -183,7 +183,7 @@ BOOL ScUndoInsertTab::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Tabellen einfuegen
+// Tabellen einfuegen
//
ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell,
@@ -194,7 +194,7 @@ ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell,
nTab( nTabNum ),
bAppend( bApp )
{
- pNameList = pNewNameList;
+ pNameList = pNewNameList;
pDrawUndo = GetSdrUndoAction( pDocShell->GetDocument() );
SetChangeTrack();
@@ -246,7 +246,7 @@ void ScUndoInsertTables::Undo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
pViewShell->SetTabNo(nTab);
- pDocShell->SetInUndo( TRUE ); //! BeginUndo
+ pDocShell->SetInUndo( TRUE ); //! BeginUndo
bDrawIsInUndo = TRUE;
SvShorts TheTabs;
@@ -259,7 +259,7 @@ void ScUndoInsertTables::Undo()
TheTabs.Remove(0,TheTabs.Count());
bDrawIsInUndo = FALSE;
- pDocShell->SetInUndo( FALSE ); //! EndUndo
+ pDocShell->SetInUndo( FALSE ); //! EndUndo
DoSdrUndoAction( pDrawUndo, pDocShell->GetDocument() );
@@ -267,7 +267,7 @@ void ScUndoInsertTables::Undo()
if ( pChangeTrack )
pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
- // SetTabNo(...,TRUE) for all views to sync with drawing layer pages
+ // SetTabNo(...,TRUE) for all views to sync with drawing layer pages
pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
}
@@ -277,13 +277,13 @@ void ScUndoInsertTables::Redo()
RedoSdrUndoAction( pDrawUndo ); // Draw Redo first
- pDocShell->SetInUndo( TRUE ); //! BeginRedo
+ pDocShell->SetInUndo( TRUE ); //! BeginRedo
bDrawIsInUndo = TRUE;
pViewShell->SetTabNo(nTab);
pViewShell->InsertTables( pNameList, nTab, static_cast<SCTAB>(pNameList->Count()),FALSE );
bDrawIsInUndo = FALSE;
- pDocShell->SetInUndo( FALSE ); //! EndRedo
+ pDocShell->SetInUndo( FALSE ); //! EndRedo
SetChangeTrack();
}
@@ -303,7 +303,7 @@ BOOL ScUndoInsertTables::CanRepeat(SfxRepeatTarget& rTarget) const
//----------------------------------------------------------------------------------
//
-// Tabelle loeschen
+// Tabelle loeschen
//
ScUndoDeleteTab::ScUndoDeleteTab( ScDocShell* pNewDocShell,const SvShorts &aTab, //SCTAB nNewTab,
@@ -374,8 +374,8 @@ void ScUndoDeleteTab::Undo()
bDrawIsInUndo = FALSE;
if (bOk)
{
- // Ref-Undo passiert in EndUndo
- // pUndoDoc->UndoToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pDoc );
+ // Ref-Undo passiert in EndUndo
+ // pUndoDoc->UndoToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pDoc );
pRefUndoDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pDoc );
String aOldName;
@@ -407,16 +407,16 @@ void ScUndoDeleteTab::Undo()
if ( pRefUndoDoc->IsTabProtected( nTab ) )
pDoc->SetTabProtection(nTab, pRefUndoDoc->GetTabProtection(nTab));
- // Drawing-Layer passiert beim MoveUndo::EndUndo
- // pDoc->TransferDrawPage(pRefUndoDoc, nTab,nTab);
+ // Drawing-Layer passiert beim MoveUndo::EndUndo
+ // pDoc->TransferDrawPage(pRefUndoDoc, nTab,nTab);
}
}
if (bLink)
{
- pDocShell->UpdateLinks(); // Link-Manager updaten
+ pDocShell->UpdateLinks(); // Link-Manager updaten
}
- EndUndo(); // Draw-Undo muss vor dem Broadcast kommen!
+ EndUndo(); // Draw-Undo muss vor dem Broadcast kommen!
ScChangeTrack* pChangeTrack = pDocShell->GetDocument()->GetChangeTrack();
if ( pChangeTrack )
@@ -431,14 +431,14 @@ void ScUndoDeleteTab::Undo()
pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
- pDocShell->PostPaint(0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_ALL ); // incl. Extras
+ pDocShell->PostPaint(0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_ALL ); // incl. Extras
- // nicht ShowTable wegen SetTabNo(..., TRUE):
+ // nicht ShowTable wegen SetTabNo(..., TRUE):
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
pViewShell->SetTabNo( lcl_GetVisibleTabBefore( *pDoc, theTabs[0] ), TRUE );
-// EndUndo();
+// EndUndo();
}
void ScUndoDeleteTab::Redo()
@@ -448,15 +448,15 @@ void ScUndoDeleteTab::Redo()
RedoSdrUndoAction( pDrawUndo ); // Draw Redo first
- pDocShell->SetInUndo( TRUE ); //! BeginRedo
+ pDocShell->SetInUndo( TRUE ); //! BeginRedo
bDrawIsInUndo = TRUE;
pViewShell->DeleteTables( theTabs, FALSE );
bDrawIsInUndo = FALSE;
- pDocShell->SetInUndo( TRUE ); //! EndRedo
+ pDocShell->SetInUndo( TRUE ); //! EndRedo
SetChangeTrack();
- // SetTabNo(...,TRUE) for all views to sync with drawing layer pages
+ // SetTabNo(...,TRUE) for all views to sync with drawing layer pages
pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
}
@@ -477,7 +477,7 @@ BOOL ScUndoDeleteTab::CanRepeat(SfxRepeatTarget& rTarget) const
//---------------------------------------------------------------------------------
//
-// Tabelle umbenennen
+// Tabelle umbenennen
//
ScUndoRenameTab::ScUndoRenameTab( ScDocShell* pNewDocShell,
@@ -485,7 +485,7 @@ ScUndoRenameTab::ScUndoRenameTab( ScDocShell* pNewDocShell,
const String& rOldName,
const String& rNewName) :
ScSimpleUndo( pNewDocShell ),
- nTab ( nT )
+ nTab ( nT )
{
sOldName = rOldName;
sNewName = rNewName;
@@ -505,13 +505,13 @@ void ScUndoRenameTab::DoChange( SCTAB nTabP, const String& rName ) const
ScDocument* pDoc = pDocShell->GetDocument();
pDoc->RenameTab( nTabP, rName );
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator
pDocShell->PostPaintGridAll();
pDocShell->PostPaintExtras();
pDocShell->PostDataChanged();
- // Der Tabellenname koennte in einer Formel vorkommen...
+ // Der Tabellenname koennte in einer Formel vorkommen...
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
pViewShell->UpdateInputHandler();
@@ -529,7 +529,7 @@ void ScUndoRenameTab::Redo()
void ScUndoRenameTab::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // Repeat macht keinen Sinn
+ // Repeat macht keinen Sinn
}
BOOL ScUndoRenameTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
@@ -540,7 +540,7 @@ BOOL ScUndoRenameTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
//----------------------------------------------------------------------------------
//
-// Tabelle verschieben
+// Tabelle verschieben
//
ScUndoMoveTab::ScUndoMoveTab( ScDocShell* pNewDocShell,
@@ -572,13 +572,13 @@ void ScUndoMoveTab::DoChange( BOOL bUndo ) const
ScDocument* pDoc = pDocShell->GetDocument();
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- if (bUndo) // UnDo
+ if (bUndo) // UnDo
{
for(int i=theNewTabs.Count()-1;i>=0;i--)
{
SCTAB nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)];
SCTAB nOldTab = theOldTabs[sal::static_int_cast<USHORT>(i)];
- if (nDestTab > MAXTAB) // angehaengt ?
+ if (nDestTab > MAXTAB) // angehaengt ?
nDestTab = pDoc->GetTableCount() - 1;
pDoc->MoveTab( nDestTab, nOldTab );
@@ -593,7 +593,7 @@ void ScUndoMoveTab::DoChange( BOOL bUndo ) const
SCTAB nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)];
SCTAB nNewTab = theNewTabs[sal::static_int_cast<USHORT>(i)];
SCTAB nOldTab = theOldTabs[sal::static_int_cast<USHORT>(i)];
- if (nDestTab > MAXTAB) // angehaengt ?
+ if (nDestTab > MAXTAB) // angehaengt ?
nDestTab = pDoc->GetTableCount() - 1;
pDoc->MoveTab( nOldTab, nNewTab );
@@ -602,7 +602,7 @@ void ScUndoMoveTab::DoChange( BOOL bUndo ) const
}
}
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator
pDocShell->PostPaintGridAll();
pDocShell->PostPaintExtras();
@@ -632,7 +632,7 @@ BOOL ScUndoMoveTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
//----------------------------------------------------------------------------------
//
-// Tabelle kopieren
+// Tabelle kopieren
//
ScUndoCopyTab::ScUndoCopyTab( ScDocShell* pNewDocShell,
@@ -668,7 +668,7 @@ void ScUndoCopyTab::DoChange() const
if (pViewShell)
pViewShell->SetTabNo(theOldTabs[0],TRUE);
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator
pDocShell->PostPaintGridAll();
pDocShell->PostPaintExtras();
@@ -685,7 +685,7 @@ void ScUndoCopyTab::Undo()
for(i=theNewTabs.Count()-1;i>=0;i--)
{
SCTAB nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)];
- if (nDestTab > MAXTAB) // append?
+ if (nDestTab > MAXTAB) // append?
nDestTab = pDoc->GetTableCount() - 1;
bDrawIsInUndo = TRUE;
@@ -693,13 +693,13 @@ void ScUndoCopyTab::Undo()
bDrawIsInUndo = FALSE;
}
- // ScTablesHint broadcasts after all sheets have been deleted,
- // so sheets and draw pages are in sync!
+ // ScTablesHint broadcasts after all sheets have been deleted,
+ // so sheets and draw pages are in sync!
for(i=theNewTabs.Count()-1;i>=0;i--)
{
SCTAB nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)];
- if (nDestTab > MAXTAB) // append?
+ if (nDestTab > MAXTAB) // append?
nDestTab = pDoc->GetTableCount() - 1;
pDocShell->Broadcast( ScTablesHint( SC_TAB_DELETED, nDestTab ) );
@@ -719,7 +719,7 @@ void ScUndoCopyTab::Redo()
nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)];
SCTAB nNewTab = theNewTabs[sal::static_int_cast<USHORT>(i)];
SCTAB nOldTab = theOldTabs[sal::static_int_cast<USHORT>(i)];
- if (nDestTab > MAXTAB) // angehaengt ?
+ if (nDestTab > MAXTAB) // angehaengt ?
nDestTab = pDoc->GetTableCount() - 1;
bDrawIsInUndo = TRUE;
@@ -730,7 +730,7 @@ void ScUndoCopyTab::Redo()
SCTAB nAdjSource = nOldTab;
if ( nNewTab <= nOldTab )
- ++nAdjSource; // new position of source table after CopyTab
+ ++nAdjSource; // new position of source table after CopyTab
if ( pDoc->IsScenario(nAdjSource) )
{
@@ -752,7 +752,7 @@ void ScUndoCopyTab::Redo()
RedoSdrUndoAction( pDrawUndo ); // after the sheets are inserted
- pViewShell->SetTabNo( nDestTab, TRUE ); // after draw-undo
+ pViewShell->SetTabNo( nDestTab, TRUE ); // after draw-undo
DoChange();
@@ -773,7 +773,7 @@ BOOL ScUndoCopyTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
// Tab Bg Color
//
-ScUndoTabColor::ScUndoTabColor(
+ScUndoTabColor::ScUndoTabColor(
ScDocShell* pNewDocShell, SCTAB nT, const Color& aOTabBgColor, const Color& aNTabBgColor) :
ScSimpleUndo( pNewDocShell )
{
@@ -843,7 +843,7 @@ BOOL ScUndoTabColor::CanRepeat(SfxRepeatTarget& /* rTarget */) const
// -----------------------------------------------------------------------
//
-// Szenario anlegen
+// Szenario anlegen
//
ScUndoMakeScenario::ScUndoMakeScenario( ScDocShell* pNewDocShell,
@@ -937,7 +937,7 @@ BOOL ScUndoMakeScenario::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Tabelle einfuegen
+// Tabelle einfuegen
//
ScUndoImportTab::ScUndoImportTab( ScDocShell* pShell,
@@ -980,14 +980,14 @@ void ScUndoImportTab::DoChange() const
}
}
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator
pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB,
PAINT_GRID | PAINT_TOP | PAINT_LEFT | PAINT_EXTRAS );
}
void ScUndoImportTab::Undo()
{
- //! eingefuegte Bereichsnamen etc.
+ //! eingefuegte Bereichsnamen etc.
SCTAB i;
ScDocument* pDoc = pDocShell->GetDocument();
@@ -1047,7 +1047,7 @@ void ScUndoImportTab::Redo()
ScDocument* pDoc = pDocShell->GetDocument();
String aName;
SCTAB i;
- for (i=0; i<nCount; i++) // first insert all sheets (#63304#)
+ for (i=0; i<nCount; i++) // first insert all sheets (#63304#)
{
SCTAB nTabPos=nTab+i;
pRedoDoc->GetName(nTabPos,aName);
@@ -1055,7 +1055,7 @@ void ScUndoImportTab::Redo()
pDoc->InsertTab(nTabPos,aName);
bDrawIsInUndo = FALSE;
}
- for (i=0; i<nCount; i++) // then copy into inserted sheets
+ for (i=0; i<nCount; i++) // then copy into inserted sheets
{
SCTAB nTabPos=nTab+i;
pRedoDoc->CopyToDocument(0,0,nTabPos, MAXCOL,MAXROW,nTabPos, IDF_ALL,FALSE, pDoc );
@@ -1098,7 +1098,7 @@ BOOL ScUndoImportTab::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Tabellen-Verknuepfung aufheben
+// Tabellen-Verknuepfung aufheben
//
ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) :
@@ -1108,8 +1108,8 @@ ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) :
{
ScDocument* pDoc = pDocShell->GetDocument();
SCTAB nTabCount = pDoc->GetTableCount();
- pTabs = new SCTAB[nTabCount];
- pModes = new BYTE[nTabCount];
+ pTabs = new SCTAB[nTabCount];
+ pModes = new BYTE[nTabCount];
pTabNames = new String[nTabCount];
for (SCTAB i=0; i<nTabCount; i++)
@@ -1155,9 +1155,9 @@ void ScUndoRemoveLink::DoChange( BOOL bLink ) const
ScDocument* pDoc = pDocShell->GetDocument();
String aEmpty;
for (USHORT i=0; i<nCount; i++)
- if (bLink) // establish link
+ if (bLink) // establish link
pDoc->SetLink( pTabs[i], pModes[i], aDocName, aFltName, aOptions, pTabNames[i], nRefreshDelay );
- else // remove link
+ else // remove link
pDoc->SetLink( pTabs[i], SC_LINK_NONE, aEmpty, aEmpty, aEmpty, aEmpty, 0 );
pDocShell->UpdateLinks();
}
@@ -1174,7 +1174,7 @@ void ScUndoRemoveLink::Redo()
void ScUndoRemoveLink::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // gippsnich
+ // gippsnich
}
BOOL ScUndoRemoveLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
@@ -1185,7 +1185,7 @@ BOOL ScUndoRemoveLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
// -----------------------------------------------------------------------
//
-// Tabellen ein-/ausblenden
+// Tabellen ein-/ausblenden
//
ScUndoShowHideTab::ScUndoShowHideTab( ScDocShell* pShell, SCTAB nNewTab, BOOL bNewShow ) :
@@ -1382,7 +1382,7 @@ String ScUndoTabProtect::GetComment() const
// -----------------------------------------------------------------------
//
-// Druck-/Wiederholungsbereiche aendern
+// Druck-/Wiederholungsbereiche aendern
//
ScUndoPrintRange::ScUndoPrintRange( ScDocShell* pShell, SCTAB nNewTab,
@@ -1433,12 +1433,12 @@ void ScUndoPrintRange::Redo()
void ScUndoPrintRange::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // gippsnich
+ // gippsnich
}
BOOL ScUndoPrintRange::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // gippsnich
+ return FALSE; // gippsnich
}
String ScUndoPrintRange::GetComment() const
@@ -1451,22 +1451,22 @@ String ScUndoPrintRange::GetComment() const
//---------------------------------------------------------------------------------
//
-// Szenario-Flags
+// Szenario-Flags
//
ScUndoScenarioFlags::ScUndoScenarioFlags( ScDocShell* pNewDocShell, SCTAB nT,
const String& rON, const String& rNN, const String& rOC, const String& rNC,
const Color& rOCol, const Color& rNCol, USHORT nOF, USHORT nNF ) :
ScSimpleUndo( pNewDocShell ),
- nTab ( nT ),
- aOldName ( rON ),
- aNewName ( rNN ),
- aOldComment ( rOC ),
- aNewComment ( rNC ),
- aOldColor ( rOCol ),
- aNewColor ( rNCol ),
- nOldFlags ( nOF ),
- nNewFlags ( nNF )
+ nTab ( nT ),
+ aOldName ( rON ),
+ aNewName ( rNN ),
+ aOldComment ( rOC ),
+ aNewComment ( rNC ),
+ aOldColor ( rOCol ),
+ aNewColor ( rNCol ),
+ nOldFlags ( nOF ),
+ nNewFlags ( nNF )
{
}
@@ -1487,7 +1487,7 @@ void ScUndoScenarioFlags::Undo()
pDoc->SetScenarioData( nTab, aOldComment, aOldColor, nOldFlags );
pDocShell->PostPaintGridAll();
- // Der Tabellenname koennte in einer Formel vorkommen...
+ // Der Tabellenname koennte in einer Formel vorkommen...
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
pViewShell->UpdateInputHandler();
@@ -1504,7 +1504,7 @@ void ScUndoScenarioFlags::Redo()
pDoc->SetScenarioData( nTab, aNewComment, aNewColor, nNewFlags );
pDocShell->PostPaintGridAll();
- // Der Tabellenname koennte in einer Formel vorkommen...
+ // Der Tabellenname koennte in einer Formel vorkommen...
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
pViewShell->UpdateInputHandler();
@@ -1515,7 +1515,7 @@ void ScUndoScenarioFlags::Redo()
void ScUndoScenarioFlags::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // Repeat macht keinen Sinn
+ // Repeat macht keinen Sinn
}
BOOL ScUndoScenarioFlags::CanRepeat(SfxRepeatTarget& /* rTarget */) const
@@ -1526,16 +1526,16 @@ BOOL ScUndoScenarioFlags::CanRepeat(SfxRepeatTarget& /* rTarget */) const
//---------------------------------------------------------------------------------
//
-// rename object
-// (move to different file?)
+// rename object
+// (move to different file?)
//
ScUndoRenameObject::ScUndoRenameObject( ScDocShell* pNewDocShell, const String& rPN,
const String& rON, const String& rNN ) :
ScSimpleUndo( pNewDocShell ),
aPersistName( rPN ),
- aOldName ( rON ),
- aNewName ( rNN )
+ aOldName ( rON ),
+ aNewName ( rNN )
{
}
@@ -1545,7 +1545,7 @@ ScUndoRenameObject::~ScUndoRenameObject()
String ScUndoRenameObject::GetComment() const
{
- // string resource shared with title for dialog
+ // string resource shared with title for dialog
return String( ScResId(SCSTR_RENAMEOBJECT) );
}
@@ -1608,7 +1608,7 @@ BOOL ScUndoRenameObject::CanRepeat(SfxRepeatTarget& /* rTarget */) const
// -----------------------------------------------------------------------
//
-// Switch sheet between left-to-right and right-to-left
+// Switch sheet between left-to-right and right-to-left
//
ScUndoLayoutRTL::ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, BOOL bNewRTL ) :
@@ -1669,7 +1669,7 @@ String ScUndoLayoutRTL::GetComment() const
// -----------------------------------------------------------------------
//
-// Set the grammar used for the sheet
+// Set the grammar used for the sheet
//
//UNUSED2009-05 ScUndoSetGrammar::ScUndoSetGrammar( ScDocShell* pShell,
@@ -1679,11 +1679,11 @@ String ScUndoLayoutRTL::GetComment() const
//UNUSED2009-05 {
//UNUSED2009-05 meOldGrammar = pDocShell->GetDocument()->GetGrammar();
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 __EXPORT ScUndoSetGrammar::~ScUndoSetGrammar()
//UNUSED2009-05 {
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 void ScUndoSetGrammar::DoChange( formula::FormulaGrammar::Grammar eGrammar )
//UNUSED2009-05 {
//UNUSED2009-05 pDocShell->SetInUndo( TRUE );
@@ -1692,17 +1692,17 @@ String ScUndoLayoutRTL::GetComment() const
//UNUSED2009-05 pDocShell->SetDocumentModified();
//UNUSED2009-05 pDocShell->SetInUndo( FALSE );
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 void __EXPORT ScUndoSetGrammar::Undo()
//UNUSED2009-05 {
//UNUSED2009-05 DoChange( meOldGrammar );
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 void __EXPORT ScUndoSetGrammar::Redo()
//UNUSED2009-05 {
//UNUSED2009-05 DoChange( meNewGrammar );
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 void __EXPORT ScUndoSetGrammar::Repeat(SfxRepeatTarget& /* rTarget */)
//UNUSED2009-05 {
//UNUSED2009-05 #if 0
@@ -1712,12 +1712,12 @@ String ScUndoLayoutRTL::GetComment() const
//UNUSED2009-05 Execute( FID_TAB_USE_R1C1, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
//UNUSED2009-05 #endif
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 BOOL __EXPORT ScUndoSetGrammar::CanRepeat(SfxRepeatTarget& rTarget) const
//UNUSED2009-05 {
//UNUSED2009-05 return (rTarget.ISA(ScTabViewTarget));
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 String __EXPORT ScUndoSetGrammar::GetComment() const
//UNUSED2009-05 {
//UNUSED2009-05 return ScGlobal::GetRscString( STR_UNDO_TAB_R1C1 );
diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx
index 168975cdda3a..c87fd8a54eaf 100644
--- a/sc/source/ui/undo/undoutil.cxx
+++ b/sc/source/ui/undo/undoutil.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-05 04:14:56 +0000