[Libreoffice-commits] .: sc/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Aug 24 18:03:13 PDT 2012
sc/source/ui/undo/refundo.cxx | 5
sc/source/ui/undo/undobase.cxx | 12 -
sc/source/ui/undo/undoblk.cxx | 17 --
sc/source/ui/undo/undoblk2.cxx | 6
sc/source/ui/undo/undoblk3.cxx | 301 -----------------------------------------
sc/source/ui/undo/undocell.cxx | 21 --
sc/source/ui/undo/undodat.cxx | 26 ---
sc/source/ui/undo/undodraw.cxx | 7
sc/source/ui/undo/undoolk.cxx | 9 -
sc/source/ui/undo/undotab.cxx | 23 ---
10 files changed, 2 insertions(+), 425 deletions(-)
New commits:
commit 2ba410edd7d6e26da36e1b1ac82f7c91031900f3
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sat Aug 25 02:12:39 2012 +0200
remove ascii-art and blank lines in sc/source/ui/undo
This is a follow-up patch to 06f611210cf487dcd32aa7ccfaae5ed80124e439.
However, since the rebasing process is not done yet, I submit it to
Gerrit, so that the changes are available as soon as they can be
applied again to the related files.
Change-Id: I61292e9d893839bd2f8b18a521a30e670f80f05b
Reviewed-on: https://gerrit.libreoffice.org/484
Reviewed-by: Kohei Yoshida <kohei.yoshida at gmail.com>
Tested-by: Kohei Yoshida <kohei.yoshida at gmail.com>
diff --git a/sc/source/ui/undo/refundo.cxx b/sc/source/ui/undo/refundo.cxx
index dbcc2e1..3ce9ed6 100644
--- a/sc/source/ui/undo/refundo.cxx
+++ b/sc/source/ui/undo/refundo.cxx
@@ -41,8 +41,6 @@
#include "areasave.hxx"
#include "unoreflist.hxx"
-// -----------------------------------------------------------------------
-
ScRefUndoData::ScRefUndoData( const ScDocument* pDoc ) :
pUnoRefs( NULL )
{
@@ -187,7 +185,4 @@ void ScRefUndoData::DoUndo( ScDocument* pDoc, sal_Bool bUndoRefFirst )
pUnoRefs->Undo( pDoc );
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index b6c3583..ef473c3 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -49,8 +49,6 @@ TYPEINIT1(ScMoveUndo, ScSimpleUndo);
TYPEINIT1(ScDBFuncUndo, ScSimpleUndo);
TYPEINIT1(ScUndoWrapper, SfxUndoAction);
-// -----------------------------------------------------------------------
-
ScSimpleUndo::ScSimpleUndo( ScDocShell* pDocSh ) :
pDocShell( pDocSh ),
pDetectiveUndo( NULL )
@@ -173,9 +171,6 @@ void ScSimpleUndo::ShowTable( const ScRange& rRange )
}
}
-
-// -----------------------------------------------------------------------
-
ScBlockUndo::ScBlockUndo( ScDocShell* pDocSh, const ScRange& rRange,
ScBlockUndoMode eBlockMode ) :
ScSimpleUndo( pDocSh ),
@@ -384,8 +379,6 @@ void ScMultiBlockUndo::ShowBlock()
}
}
-// -----------------------------------------------------------------------
-
ScMoveUndo::ScMoveUndo( ScDocShell* pDocSh, ScDocument* pRefDoc, ScRefUndoData* pRefData,
ScMoveUndoMode eRefMode ) :
ScSimpleUndo( pDocSh ),
@@ -440,8 +433,6 @@ void ScMoveUndo::EndUndo()
ScSimpleUndo::EndUndo();
}
-// -----------------------------------------------------------------------
-
ScDBFuncUndo::ScDBFuncUndo( ScDocShell* pDocSh, const ScRange& rOriginal, SdrUndoAction* pDrawUndo ) :
ScSimpleUndo( pDocSh ),
aOriginalRange( rOriginal ),
@@ -542,8 +533,6 @@ void ScDBFuncUndo::EndRedo()
ScSimpleUndo::EndRedo();
}
-// -----------------------------------------------------------------------
-
ScUndoWrapper::ScUndoWrapper( SfxUndoAction* pUndo ) :
pWrappedUndo( pUndo )
{
@@ -630,5 +619,4 @@ sal_Bool ScUndoWrapper::CanRepeat(SfxRepeatTarget& rTarget) const
return false;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index dbc36c3..83459c5 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -78,15 +78,12 @@ TYPEINIT1(ScUndoRemoveBreaks, SfxUndoAction);
TYPEINIT1(ScUndoRemoveMerge, ScBlockUndo);
TYPEINIT1(ScUndoBorder, ScBlockUndo);
-
-
// TODO:
/*A*/ // SetOptimalHeight on Document, if no View
/*B*/ // linked sheets
/*C*/ // ScArea
//? // check later
-
ScUndoInsertCells::ScUndoInsertCells( ScDocShell* pNewDocShell,
const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios,
InsCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData,
@@ -831,7 +828,6 @@ sal_Bool ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoPaste::ScUndoPaste( ScDocShell* pNewDocShell, const ScRangeList& rRanges,
const ScMarkData& rMark,
ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
@@ -1100,7 +1096,6 @@ sal_Bool ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell,
const ScRange& rRange, ScAddress aNewDestPos, sal_Bool bNewCut,
ScDocument* pUndoDocument, ScRefUndoData* pRefData, sal_Bool bScenario ) :
@@ -1210,7 +1205,6 @@ void ScUndoDragDrop::PaintArea( ScRange aRange, sal_uInt16 nExtFlags ) const
pDocShell->PostPaint( aRange, nPaint, nExtFlags );
}
-
void ScUndoDragDrop::DoUndo( ScRange aRange ) const
{
ScDocument* pDoc = pDocShell->GetDocument();
@@ -1344,7 +1338,6 @@ sal_Bool ScUndoDragDrop::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false; // not possible
}
-
// Insert list containing range names
// (Insert|Name|Insert =>[List])
ScUndoListNames::ScUndoListNames( ScDocShell* pNewDocShell, const ScRange& rRange,
@@ -1404,7 +1397,6 @@ sal_Bool ScUndoListNames::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoUseScenario::ScUndoUseScenario( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
/*C*/ const ScArea& rDestArea,
@@ -1525,7 +1517,6 @@ sal_Bool ScUndoUseScenario::CanRepeat(SfxRepeatTarget& rTarget) const
return false;
}
-
ScUndoSelectionStyle::ScUndoSelectionStyle( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
const ScRange& rRange,
@@ -1636,7 +1627,6 @@ sal_uInt16 ScUndoSelectionStyle::GetId() const
return STR_UNDO_APPLYCELLSTYLE;
}
-
ScUndoEnterMatrix::ScUndoEnterMatrix( ScDocShell* pNewDocShell, const ScRange& rArea,
ScDocument* pNewUndoDoc, const String& rForm ) :
ScBlockUndo( pNewDocShell, rArea, SC_UNDO_SIMPLE ),
@@ -1723,7 +1713,6 @@ sal_Bool ScUndoEnterMatrix::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScRange lcl_GetMultiMarkRange( const ScMarkData& rMark )
{
OSL_ENSURE( rMark.IsMultiMarked(), "wrong mark type" );
@@ -1790,7 +1779,6 @@ sal_Bool ScUndoIndent::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoTransliterate::ScUndoTransliterate( ScDocShell* pNewDocShell, const ScMarkData& rMark,
ScDocument* pNewUndoDoc, sal_Int32 nType ) :
ScBlockUndo( pNewDocShell, lcl_GetMultiMarkRange(rMark), SC_UNDO_AUTOHEIGHT ),
@@ -1847,7 +1835,6 @@ sal_Bool ScUndoTransliterate::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoClearItems::ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& rMark,
ScDocument* pNewUndoDoc, const sal_uInt16* pW ) :
ScBlockUndo( pNewDocShell, lcl_GetMultiMarkRange(rMark), SC_UNDO_AUTOHEIGHT ),
@@ -1976,7 +1963,6 @@ sal_Bool ScUndoRemoveBreaks::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoRemoveMerge::ScUndoRemoveMerge( ScDocShell* pNewDocShell,
const ScCellMergeOption& rOption, ScDocument* pNewUndoDoc ) :
ScBlockUndo( pNewDocShell, rOption.getFirstSingleRange(), SC_UNDO_SIMPLE ),
@@ -2183,7 +2169,4 @@ sal_Bool ScUndoBorder::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false; // See above
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index e5380d0..0af11fb 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -39,13 +39,8 @@
#include "undoolk.hxx" // TODO move GetUndo in Document
-
-// STATIC DATA -----------------------------------------------------------
-
TYPEINIT1(ScUndoWidthOrHeight, SfxUndoAction);
-// -----------------------------------------------------------------------
-
/** Change column widths or row heights */
ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
@@ -187,5 +182,4 @@ sal_Bool ScUndoWidthOrHeight::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 5457c7c..a8895ef 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -79,15 +79,12 @@ TYPEINIT1(ScUndoUpdateAreaLink, SfxUndoAction);
// TODO:
/*A*/ // SetOptimalHeight on Document, when no View
-
ScUndoDeleteContents::ScUndoDeleteContents(
ScDocShell* pNewDocShell,
const ScMarkData& rMark, const ScRange& rRange,
ScDocument* pNewUndoDoc, sal_Bool bNewMulti,
sal_uInt16 nNewFlags, sal_Bool bObjects )
- //
: ScSimpleUndo( pNewDocShell ),
- //
aRange ( rRange ),
aMarkData ( rMark ),
pUndoDoc ( pNewUndoDoc ),
@@ -104,24 +101,17 @@ ScUndoDeleteContents::ScUndoDeleteContents(
SetChangeTrack();
}
-
-//----------------------------------------------------------------------------
-
ScUndoDeleteContents::~ScUndoDeleteContents()
{
delete pUndoDoc;
DeleteSdrUndoAction( pDrawUndo );
}
-
-//----------------------------------------------------------------------------
-
rtl::OUString ScUndoDeleteContents::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); // "Delete"
}
-
void ScUndoDeleteContents::SetChangeTrack()
{
ScChangeTrack* pChangeTrack = pDocShell->GetDocument()->GetChangeTrack();
@@ -132,9 +122,6 @@ void ScUndoDeleteContents::SetChangeTrack()
nStartChangeAction = nEndChangeAction = 0;
}
-
-//----------------------------------------------------------------------------
-
void ScUndoDeleteContents::DoChange( const sal_Bool bUndo )
{
ScDocument* pDoc = pDocShell->GetDocument();
@@ -196,9 +183,6 @@ void ScUndoDeleteContents::DoChange( const sal_Bool bUndo )
ShowTable( aRange );
}
-
-//----------------------------------------------------------------------------
-
void ScUndoDeleteContents::Undo()
{
BeginUndo();
@@ -215,9 +199,6 @@ void ScUndoDeleteContents::Undo()
}
}
-
-//----------------------------------------------------------------------------
-
void ScUndoDeleteContents::Redo()
{
BeginRedo();
@@ -234,33 +215,24 @@ void ScUndoDeleteContents::Redo()
}
}
-
-//----------------------------------------------------------------------------
-
void ScUndoDeleteContents::Repeat(SfxRepeatTarget& rTarget)
{
if (rTarget.ISA(ScTabViewTarget))
((ScTabViewTarget&)rTarget).GetViewShell()->DeleteContents( nFlags, sal_True );
}
-
-//----------------------------------------------------------------------------
-
sal_Bool ScUndoDeleteContents::CanRepeat(SfxRepeatTarget& rTarget) const
{
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoFillTable::ScUndoFillTable( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
ScDocument* pNewUndoDoc, sal_Bool bNewMulti, SCTAB nSrc,
sal_uInt16 nFlg, sal_uInt16 nFunc, sal_Bool bSkip, sal_Bool bLink )
- //
: ScSimpleUndo( pNewDocShell ),
- //
aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
aMarkData ( rMark ),
pUndoDoc ( pNewUndoDoc ),
@@ -274,23 +246,16 @@ ScUndoFillTable::ScUndoFillTable( ScDocShell* pNewDocShell,
SetChangeTrack();
}
-
-//----------------------------------------------------------------------------
-
ScUndoFillTable::~ScUndoFillTable()
{
delete pUndoDoc;
}
-
-//----------------------------------------------------------------------------
-
rtl::OUString ScUndoFillTable::GetComment() const
{
return ScGlobal::GetRscString( STR_FILL_TAB );
}
-
void ScUndoFillTable::SetChangeTrack()
{
ScChangeTrack* pChangeTrack = pDocShell->GetDocument()->GetChangeTrack();
@@ -318,9 +283,6 @@ void ScUndoFillTable::SetChangeTrack()
nStartChangeAction = nEndChangeAction = 0;
}
-
-//----------------------------------------------------------------------------
-
void ScUndoFillTable::DoChange( const sal_Bool bUndo )
{
ScDocument* pDoc = pDocShell->GetDocument();
@@ -372,9 +334,6 @@ void ScUndoFillTable::DoChange( const sal_Bool bUndo )
}
}
-
-//----------------------------------------------------------------------------
-
void ScUndoFillTable::Undo()
{
BeginUndo();
@@ -382,9 +341,6 @@ void ScUndoFillTable::Undo()
EndUndo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoFillTable::Redo()
{
BeginRedo();
@@ -392,24 +348,17 @@ void ScUndoFillTable::Redo()
EndRedo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoFillTable::Repeat(SfxRepeatTarget& rTarget)
{
if (rTarget.ISA(ScTabViewTarget))
((ScTabViewTarget&)rTarget).GetViewShell()->FillTab( nFlags, nFunction, bSkipEmpty, bAsLink );
}
-
-//----------------------------------------------------------------------------
-
sal_Bool ScUndoFillTable::CanRepeat(SfxRepeatTarget& rTarget) const
{
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
@@ -417,9 +366,7 @@ ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell,
ScDocument* pNewUndoDoc, sal_Bool bNewMulti,
const ScPatternAttr* pNewApply,
const SvxBoxItem* pNewOuter, const SvxBoxInfoItem* pNewInner )
- //
: ScSimpleUndo( pNewDocShell ),
- //
aMarkData ( rMark ),
aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
pUndoDoc ( pNewUndoDoc ),
@@ -431,9 +378,6 @@ ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell,
pLineInner = pNewInner ? (SvxBoxInfoItem*) &pPool->Put( *pNewInner ) : NULL;
}
-
-//----------------------------------------------------------------------------
-
ScUndoSelectionAttr::~ScUndoSelectionAttr()
{
ScDocumentPool* pPool = pDocShell->GetDocument()->GetPool();
@@ -446,24 +390,17 @@ ScUndoSelectionAttr::~ScUndoSelectionAttr()
delete pUndoDoc;
}
-
-//----------------------------------------------------------------------------
-
rtl::OUString ScUndoSelectionAttr::GetComment() const
{
//"Attribute" "/Lines"
return ScGlobal::GetRscString( pLineOuter ? STR_UNDO_SELATTRLINES : STR_UNDO_SELATTR );
}
-//----------------------------------------------------------------------------
-
ScEditDataArray* ScUndoSelectionAttr::GetDataArray()
{
return &aDataArray;
}
-//----------------------------------------------------------------------------
-
void ScUndoSelectionAttr::DoChange( const sal_Bool bUndo )
{
ScDocument* pDoc = pDocShell->GetDocument();
@@ -522,9 +459,6 @@ void ScUndoSelectionAttr::ChangeEditData( const bool bUndo )
}
}
-
-//----------------------------------------------------------------------------
-
void ScUndoSelectionAttr::Undo()
{
BeginUndo();
@@ -532,9 +466,6 @@ void ScUndoSelectionAttr::Undo()
EndUndo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoSelectionAttr::Redo()
{
BeginRedo();
@@ -542,9 +473,6 @@ void ScUndoSelectionAttr::Redo()
EndRedo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoSelectionAttr::Repeat(SfxRepeatTarget& rTarget)
{
if (rTarget.ISA(ScTabViewTarget))
@@ -557,23 +485,17 @@ void ScUndoSelectionAttr::Repeat(SfxRepeatTarget& rTarget)
}
}
-
-//----------------------------------------------------------------------------
-
sal_Bool ScUndoSelectionAttr::CanRepeat(SfxRepeatTarget& rTarget) const
{
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoAutoFill::ScUndoAutoFill( ScDocShell* pNewDocShell,
const ScRange& rRange, const ScRange& rSourceArea,
ScDocument* pNewUndoDoc, const ScMarkData& rMark,
FillDir eNewFillDir, FillCmd eNewFillCmd, FillDateCmd eNewFillDateCmd,
double fNewStartValue, double fNewStepValue, double fNewMaxValue )
- //
: ScBlockUndo( pNewDocShell, rRange, SC_UNDO_AUTOHEIGHT ),
- //
aSource ( rSourceArea ),
aMarkData ( rMark ),
pUndoDoc ( pNewUndoDoc ),
@@ -587,23 +509,16 @@ ScUndoAutoFill::ScUndoAutoFill( ScDocShell* pNewDocShell,
SetChangeTrack();
}
-
-//----------------------------------------------------------------------------
-
ScUndoAutoFill::~ScUndoAutoFill()
{
delete pUndoDoc;
}
-
-//----------------------------------------------------------------------------
-
rtl::OUString ScUndoAutoFill::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_AUTOFILL ); //"Fill"
}
-
void ScUndoAutoFill::SetChangeTrack()
{
ScChangeTrack* pChangeTrack = pDocShell->GetDocument()->GetChangeTrack();
@@ -648,9 +563,6 @@ void ScUndoAutoFill::Undo()
EndUndo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoAutoFill::Redo()
{
BeginRedo();
@@ -708,9 +620,6 @@ void ScUndoAutoFill::Redo()
EndRedo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoAutoFill::Repeat(SfxRepeatTarget& rTarget)
{
if (rTarget.ISA(ScTabViewTarget))
@@ -724,20 +633,14 @@ void ScUndoAutoFill::Repeat(SfxRepeatTarget& rTarget)
}
}
-
-//----------------------------------------------------------------------------
-
sal_Bool ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const
{
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption,
bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo )
- //
: ScSimpleUndo( pNewDocShell ),
- //
maOption(rOption),
mbMergeContents( bMergeContents ),
mpUndoDoc( pUndoDoc ),
@@ -745,26 +648,17 @@ ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOp
{
}
-
-//----------------------------------------------------------------------------
-
ScUndoMerge::~ScUndoMerge()
{
delete mpUndoDoc;
DeleteSdrUndoAction( mpDrawUndo );
}
-
-//----------------------------------------------------------------------------
-
rtl::OUString ScUndoMerge::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_MERGE );
}
-
-//----------------------------------------------------------------------------
-
void ScUndoMerge::DoChange( bool bUndo ) const
{
using ::std::set;
@@ -840,9 +734,6 @@ void ScUndoMerge::DoChange( bool bUndo ) const
ShowTable(aCurRange);
}
-
-//----------------------------------------------------------------------------
-
void ScUndoMerge::Undo()
{
BeginUndo();
@@ -850,9 +741,6 @@ void ScUndoMerge::Undo()
EndUndo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoMerge::Redo()
{
BeginRedo();
@@ -860,9 +748,6 @@ void ScUndoMerge::Redo()
EndRedo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoMerge::Repeat(SfxRepeatTarget& rTarget)
{
if (rTarget.ISA(ScTabViewTarget))
@@ -873,21 +758,15 @@ void ScUndoMerge::Repeat(SfxRepeatTarget& rTarget)
}
}
-
-//----------------------------------------------------------------------------
-
sal_Bool ScUndoMerge::CanRepeat(SfxRepeatTarget& rTarget) const
{
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoAutoFormat::ScUndoAutoFormat( ScDocShell* pNewDocShell,
const ScRange& rRange, ScDocument* pNewUndoDoc,
const ScMarkData& rMark, sal_Bool bNewSize, sal_uInt16 nNewFormatNo )
- //
: ScBlockUndo( pNewDocShell, rRange, bNewSize ? SC_UNDO_MANUALHEIGHT : SC_UNDO_AUTOHEIGHT ),
- //
pUndoDoc ( pNewUndoDoc ),
aMarkData ( rMark ),
bSize ( bNewSize ),
@@ -895,25 +774,16 @@ ScUndoAutoFormat::ScUndoAutoFormat( ScDocShell* pNewDocShell,
{
}
-
-//----------------------------------------------------------------------------
-
ScUndoAutoFormat::~ScUndoAutoFormat()
{
delete pUndoDoc;
}
-
-//----------------------------------------------------------------------------
-
rtl::OUString ScUndoAutoFormat::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_AUTOFORMAT ); //"Auto-Format"
}
-
-//----------------------------------------------------------------------------
-
void ScUndoAutoFormat::Undo()
{
BeginUndo();
@@ -956,9 +826,6 @@ void ScUndoAutoFormat::Undo()
EndUndo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoAutoFormat::Redo()
{
BeginRedo();
@@ -1037,31 +904,22 @@ void ScUndoAutoFormat::Redo()
EndRedo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoAutoFormat::Repeat(SfxRepeatTarget& rTarget)
{
if (rTarget.ISA(ScTabViewTarget))
((ScTabViewTarget&)rTarget).GetViewShell()->AutoFormat( nFormatNo, sal_True );
}
-
-//----------------------------------------------------------------------------
-
sal_Bool ScUndoAutoFormat::CanRepeat(SfxRepeatTarget& rTarget) const
{
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoReplace::ScUndoReplace( ScDocShell* pNewDocShell, const ScMarkData& rMark,
SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
const String& rNewUndoStr, ScDocument* pNewUndoDoc,
const SvxSearchItem* pItem )
- //
: ScSimpleUndo( pNewDocShell ),
- //
aCursorPos ( nCurX, nCurY, nCurZ ),
aMarkData ( rMark ),
aUndoStr ( rNewUndoStr ),
@@ -1071,18 +929,12 @@ ScUndoReplace::ScUndoReplace( ScDocShell* pNewDocShell, const ScMarkData& rMark,
SetChangeTrack();
}
-
-//----------------------------------------------------------------------------
-
ScUndoReplace::~ScUndoReplace()
{
delete pUndoDoc;
delete pSearchItem;
}
-
-//----------------------------------------------------------------------------
-
void ScUndoReplace::SetChangeTrack()
{
ScDocument* pDoc = pDocShell->GetDocument();
@@ -1110,16 +962,11 @@ void ScUndoReplace::SetChangeTrack()
nStartChangeAction = nEndChangeAction = 0;
}
-//----------------------------------------------------------------------------
-
rtl::OUString ScUndoReplace::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_REPLACE ); // "Replace"
}
-
-//----------------------------------------------------------------------------
-
void ScUndoReplace::Undo()
{
BeginUndo();
@@ -1194,9 +1041,6 @@ void ScUndoReplace::Undo()
EndUndo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoReplace::Redo()
{
BeginRedo();
@@ -1233,18 +1077,12 @@ void ScUndoReplace::Redo()
EndRedo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoReplace::Repeat(SfxRepeatTarget& rTarget)
{
if (rTarget.ISA(ScTabViewTarget))
((ScTabViewTarget&)rTarget).GetViewShell()->SearchAndReplace( pSearchItem, sal_True, false );
}
-
-//----------------------------------------------------------------------------
-
sal_Bool ScUndoReplace::CanRepeat(SfxRepeatTarget& rTarget) const
{
return (rTarget.ISA(ScTabViewTarget));
@@ -1259,9 +1097,7 @@ ScUndoTabOp::ScUndoTabOp( ScDocShell* pNewDocShell,
const ScRefAddress& rRowCell,
const ScRefAddress& rColCell,
sal_uInt8 nMd )
- //
: ScSimpleUndo( pNewDocShell ),
- //
aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
pUndoDoc ( pNewUndoDoc ),
theFormulaCell ( rFormulaCell ),
@@ -1272,25 +1108,16 @@ ScUndoTabOp::ScUndoTabOp( ScDocShell* pNewDocShell,
{
}
-
-//----------------------------------------------------------------------------
-
ScUndoTabOp::~ScUndoTabOp()
{
delete pUndoDoc;
}
-
-//----------------------------------------------------------------------------
-
rtl::OUString ScUndoTabOp::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_TABOP ); // "Multiple operation"
}
-
-//----------------------------------------------------------------------------
-
void ScUndoTabOp::Undo()
{
BeginUndo();
@@ -1312,9 +1139,6 @@ void ScUndoTabOp::Undo()
EndUndo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoTabOp::Redo()
{
BeginRedo();
@@ -1332,22 +1156,15 @@ void ScUndoTabOp::Redo()
EndRedo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoTabOp::Repeat(SfxRepeatTarget& /* rTarget */)
{
}
-
-//----------------------------------------------------------------------------
-
sal_Bool ScUndoTabOp::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
return false;
}
-
ScUndoConversion::ScUndoConversion(
ScDocShell* pNewDocShell, const ScMarkData& rMark,
SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScDocument* pNewUndoDoc,
@@ -1364,18 +1181,12 @@ ScUndoConversion::ScUndoConversion(
SetChangeTrack();
}
-
-//----------------------------------------------------------------------------
-
ScUndoConversion::~ScUndoConversion()
{
delete pUndoDoc;
delete pRedoDoc;
}
-
-//----------------------------------------------------------------------------
-
void ScUndoConversion::SetChangeTrack()
{
ScDocument* pDoc = pDocShell->GetDocument();
@@ -1395,8 +1206,6 @@ void ScUndoConversion::SetChangeTrack()
nStartChangeAction = nEndChangeAction = 0;
}
-//----------------------------------------------------------------------------
-
rtl::OUString ScUndoConversion::GetComment() const
{
rtl::OUString aText;
@@ -1410,9 +1219,6 @@ rtl::OUString ScUndoConversion::GetComment() const
return aText;
}
-
-//----------------------------------------------------------------------------
-
void ScUndoConversion::DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPos )
{
if (pRefDoc)
@@ -1437,9 +1243,6 @@ void ScUndoConversion::DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPo
}
}
-
-//----------------------------------------------------------------------------
-
void ScUndoConversion::Undo()
{
BeginUndo();
@@ -1450,9 +1253,6 @@ void ScUndoConversion::Undo()
EndUndo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoConversion::Redo()
{
BeginRedo();
@@ -1461,24 +1261,17 @@ void ScUndoConversion::Redo()
EndRedo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoConversion::Repeat( SfxRepeatTarget& rTarget )
{
if( rTarget.ISA( ScTabViewTarget ) )
((ScTabViewTarget&)rTarget).GetViewShell()->DoSheetConversion( maConvParam, sal_True );
}
-
-//----------------------------------------------------------------------------
-
sal_Bool ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const
{
return rTarget.ISA( ScTabViewTarget );
}
-
ScUndoRefConversion::ScUndoRefConversion( ScDocShell* pNewDocShell,
const ScRange& aMarkRange, const ScMarkData& rMark,
ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, sal_Bool bNewMulti, sal_uInt16 nNewFlag) :
@@ -1533,6 +1326,7 @@ void ScUndoRefConversion::DoChange( ScDocument* pRefDoc)
if (pViewShell)
pViewShell->CellContentChanged();
}
+
void ScUndoRefConversion::Undo()
{
BeginUndo();
@@ -1564,37 +1358,25 @@ sal_Bool ScUndoRefConversion::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoRefreshLink::ScUndoRefreshLink( ScDocShell* pNewDocShell,
ScDocument* pNewUndoDoc )
- //
: ScSimpleUndo( pNewDocShell ),
- //
pUndoDoc( pNewUndoDoc ),
pRedoDoc( NULL )
{
}
-
-//----------------------------------------------------------------------------
-
ScUndoRefreshLink::~ScUndoRefreshLink()
{
delete pUndoDoc;
delete pRedoDoc;
}
-
-//----------------------------------------------------------------------------
-
rtl::OUString ScUndoRefreshLink::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_UPDATELINK );
}
-
-//----------------------------------------------------------------------------
-
void ScUndoRefreshLink::Undo()
{
BeginUndo();
@@ -1640,9 +1422,6 @@ void ScUndoRefreshLink::Undo()
EndUndo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoRefreshLink::Redo()
{
OSL_ENSURE(pRedoDoc, "No RedoDoc for ScUndoRefreshLink::Redo");
@@ -1672,25 +1451,16 @@ void ScUndoRefreshLink::Redo()
EndUndo();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoRefreshLink::Repeat(SfxRepeatTarget& /* rTarget */)
{
// makes no sense
}
-
-//----------------------------------------------------------------------------
-
sal_Bool ScUndoRefreshLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
return false;
}
-
-//----------------------------------------------------------------------------
-
ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const String& rDoc,
const String& rFlt, const String& rOpt,
const String& rSrc, const ScRange& rDest )
@@ -1709,15 +1479,12 @@ ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const String& rDo
return NULL;
}
-
ScUndoInsertAreaLink::ScUndoInsertAreaLink( ScDocShell* pShell,
const String& rDoc,
const String& rFlt, const String& rOpt,
const String& rArea, const ScRange& rDestRange,
sal_uLong nRefresh )
- //
: ScSimpleUndo ( pShell ),
- //
aDocName ( rDoc ),
aFltName ( rFlt ),
aOptions ( rOpt ),
@@ -1727,24 +1494,15 @@ ScUndoInsertAreaLink::ScUndoInsertAreaLink( ScDocShell* pShell,
{
}
-
-//----------------------------------------------------------------------------
-
ScUndoInsertAreaLink::~ScUndoInsertAreaLink()
{
}
-
-//----------------------------------------------------------------------------
-
rtl::OUString ScUndoInsertAreaLink::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_INSERTAREALINK );
}
-
-//----------------------------------------------------------------------------
-
void ScUndoInsertAreaLink::Undo()
{
ScDocument* pDoc = pDocShell->GetDocument();
@@ -1758,9 +1516,6 @@ void ScUndoInsertAreaLink::Undo()
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
}
-
-//----------------------------------------------------------------------------
-
void ScUndoInsertAreaLink::Redo()
{
ScDocument* pDoc = pDocShell->GetDocument();
@@ -1777,30 +1532,21 @@ void ScUndoInsertAreaLink::Redo()
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
}
-
-//----------------------------------------------------------------------------
-
void ScUndoInsertAreaLink::Repeat(SfxRepeatTarget& /* rTarget */)
{
// makes no sense
}
-
-//----------------------------------------------------------------------------
-
sal_Bool ScUndoInsertAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
return false;
}
-
ScUndoRemoveAreaLink::ScUndoRemoveAreaLink( ScDocShell* pShell,
const String& rDoc, const String& rFlt, const String& rOpt,
const String& rArea, const ScRange& rDestRange,
sal_uLong nRefresh )
- //
: ScSimpleUndo ( pShell ),
- //
aDocName ( rDoc ),
aFltName ( rFlt ),
aOptions ( rOpt ),
@@ -1810,24 +1556,15 @@ ScUndoRemoveAreaLink::ScUndoRemoveAreaLink( ScDocShell* pShell,
{
}
-
-//----------------------------------------------------------------------------
-
ScUndoRemoveAreaLink::~ScUndoRemoveAreaLink()
{
}
-
-//----------------------------------------------------------------------------
-
rtl::OUString ScUndoRemoveAreaLink::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_REMOVELINK ); //! eigener Text ??
}
-
-//----------------------------------------------------------------------------
-
void ScUndoRemoveAreaLink::Undo()
{
ScDocument* pDoc = pDocShell->GetDocument();
@@ -1844,9 +1581,6 @@ void ScUndoRemoveAreaLink::Undo()
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
}
-
-//----------------------------------------------------------------------------
-
void ScUndoRemoveAreaLink::Redo()
{
ScDocument* pDoc = pDocShell->GetDocument();
@@ -1860,32 +1594,23 @@ void ScUndoRemoveAreaLink::Redo()
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
}
-
-//----------------------------------------------------------------------------
-
void ScUndoRemoveAreaLink::Repeat(SfxRepeatTarget& /* rTarget */)
{
// makes no sense
}
-
-//----------------------------------------------------------------------------
-
sal_Bool ScUndoRemoveAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
return false;
}
-
ScUndoUpdateAreaLink::ScUndoUpdateAreaLink( ScDocShell* pShell,
const String& rOldD, const String& rOldF, const String& rOldO,
const String& rOldA, const ScRange& rOldR, sal_uLong nOldRD,
const String& rNewD, const String& rNewF, const String& rNewO,
const String& rNewA, const ScRange& rNewR, sal_uLong nNewRD,
ScDocument* pUndo, ScDocument* pRedo, sal_Bool bDoInsert )
- //
: ScSimpleUndo( pShell ),
- //
aOldDoc ( rOldD ),
aOldFlt ( rOldF ),
aOldOpt ( rOldO ),
@@ -1905,26 +1630,17 @@ ScUndoUpdateAreaLink::ScUndoUpdateAreaLink( ScDocShell* pShell,
OSL_ENSURE( aOldRange.aStart == aNewRange.aStart, "AreaLink moved ?" );
}
-
-//----------------------------------------------------------------------------
-
ScUndoUpdateAreaLink::~ScUndoUpdateAreaLink()
{
delete pUndoDoc;
delete pRedoDoc;
}
-
-//----------------------------------------------------------------------------
-
rtl::OUString ScUndoUpdateAreaLink::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); //! own text ??
}
-
-//----------------------------------------------------------------------------
-
void ScUndoUpdateAreaLink::DoChange( const sal_Bool bUndo ) const
{
ScDocument* pDoc = pDocShell->GetDocument();
@@ -1983,9 +1699,6 @@ void ScUndoUpdateAreaLink::DoChange( const sal_Bool bUndo ) const
pViewShell->CellContentChanged();
}
-
-//----------------------------------------------------------------------------
-
void ScUndoUpdateAreaLink::Undo()
{
ScDocument* pDoc = pDocShell->GetDocument();
@@ -2002,9 +1715,6 @@ void ScUndoUpdateAreaLink::Undo()
DoChange(sal_True);
}
-
-//----------------------------------------------------------------------------
-
void ScUndoUpdateAreaLink::Redo()
{
ScDocument* pDoc = pDocShell->GetDocument();
@@ -2021,23 +1731,14 @@ void ScUndoUpdateAreaLink::Redo()
DoChange(false);
}
-
-//----------------------------------------------------------------------------
-
void ScUndoUpdateAreaLink::Repeat(SfxRepeatTarget& /* rTarget */)
{
// makes no sense
}
-
-//----------------------------------------------------------------------------
-
sal_Bool ScUndoUpdateAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
return false;
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 58061bc..19e950e 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -26,10 +26,8 @@
*
************************************************************************/
-
#include "scitems.hxx"
#include <editeng/eeitem.hxx>
-
#include <editeng/editobj.hxx>
#include <svl/zforlist.hxx>
#include <sfx2/app.hxx>
@@ -55,8 +53,6 @@
using ::boost::shared_ptr;
-// STATIC DATA -----------------------------------------------------------
-
TYPEINIT1(ScUndoCursorAttr, ScSimpleUndo);
TYPEINIT1(ScUndoEnterData, ScSimpleUndo);
TYPEINIT1(ScUndoEnterValue, ScSimpleUndo);
@@ -176,7 +172,6 @@ sal_Bool ScUndoCursorAttr::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoEnterData::ScUndoEnterData( ScDocShell* pNewDocShell,
SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
SCTAB nNewCount, SCTAB* pNewTabs, ScBaseCell** ppOldData,
@@ -428,7 +423,6 @@ sal_Bool ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false;
}
-
ScUndoPutCell::ScUndoPutCell( ScDocShell* pNewDocShell, const ScAddress& rNewPos,
ScBaseCell* pUndoCell, ScBaseCell* pRedoCell, sal_Bool bHeight ) :
ScSimpleUndo( pNewDocShell ),
@@ -512,7 +506,6 @@ sal_Bool ScUndoPutCell::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false;
}
-
ScUndoPageBreak::ScUndoPageBreak( ScDocShell* pNewDocShell,
SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
sal_Bool bNewColumn, sal_Bool bNewInsert ) :
@@ -593,7 +586,6 @@ sal_Bool ScUndoPageBreak::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoPrintZoom::ScUndoPrintZoom( ScDocShell* pNewDocShell,
SCTAB nT, sal_uInt16 nOS, sal_uInt16 nOP, sal_uInt16 nNS, sal_uInt16 nNP ) :
ScSimpleUndo( pNewDocShell ),
@@ -664,7 +656,6 @@ sal_Bool ScUndoPrintZoom::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoThesaurus::ScUndoThesaurus( ScDocShell* pNewDocShell,
SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
const String& rNewUndoStr, const EditTextObject* pUndoTObj,
@@ -785,9 +776,6 @@ sal_Bool ScUndoThesaurus::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
-// ============================================================================
-
ScUndoReplaceNote::ScUndoReplaceNote( ScDocShell& rDocShell, const ScAddress& rPos,
const ScNoteData& rNoteData, bool bInsert, SdrUndoAction* pDrawUndo ) :
ScSimpleUndo( &rDocShell ),
@@ -884,8 +872,6 @@ void ScUndoReplaceNote::DoRemoveNote( const ScNoteData& rNoteData )
}
}
-// ============================================================================
-
ScUndoShowHideNote::ScUndoShowHideNote( ScDocShell& rDocShell, const ScAddress& rPos, bool bShow ) :
ScSimpleUndo( &rDocShell ),
maPos( rPos ),
@@ -927,8 +913,6 @@ rtl::OUString ScUndoShowHideNote::GetComment() const
return ScGlobal::GetRscString( mbShown ? STR_UNDO_SHOWNOTE : STR_UNDO_HIDENOTE );
}
-// ============================================================================
-
ScUndoDetective::ScUndoDetective( ScDocShell* pNewDocShell,
SdrUndoAction* pDraw, const ScDetOpData* pOperation,
ScDetOpList* pUndoList ) :
@@ -967,7 +951,6 @@ rtl::OUString ScUndoDetective::GetComment() const
return ScGlobal::GetRscString( nId );
}
-
void ScUndoDetective::Undo()
{
BeginUndo();
@@ -1035,7 +1018,6 @@ sal_Bool ScUndoDetective::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false;
}
-
ScUndoRangeNames::ScUndoRangeNames( ScDocShell* pNewDocShell,
ScRangeName* pOld, ScRangeName* pNew, SCTAB nTab ) :
ScSimpleUndo( pNewDocShell ),
@@ -1105,7 +1087,4 @@ sal_Bool ScUndoRangeNames::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false;
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 69feff1..fd5f56e 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -73,7 +73,6 @@ TYPEINIT1(ScUndoConsolidate, ScSimpleUndo);
TYPEINIT1(ScUndoChartData, ScSimpleUndo);
TYPEINIT1(ScUndoDataForm, SfxUndoAction);
-// -----------------------------------------------------------------------
// Show or hide outline groups
ScUndoDoOutline::ScUndoDoOutline( ScDocShell* pNewDocShell,
@@ -125,7 +124,6 @@ void ScUndoDoOutline::Undo()
pViewShell->ShowOutline( bColumns, nLevel, nEntry, false, false );
// Original column/row status
-
if (bColumns)
pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab,
static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, false, pDoc);
@@ -251,7 +249,6 @@ sal_Bool ScUndoMakeOutline::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoOutlineLevel::ScUndoOutlineLevel( ScDocShell* pNewDocShell,
SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab,
ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
@@ -338,7 +335,6 @@ sal_Bool ScUndoOutlineLevel::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
/** show/hide outline over block marks */
ScUndoOutlineBlock::ScUndoOutlineBlock( ScDocShell* pNewDocShell,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
@@ -375,11 +371,9 @@ void ScUndoOutlineBlock::Undo()
SCTAB nTab = aBlockStart.Tab();
// Original Outline table
-
pDoc->SetOutlineTable( nTab, pUndoTable );
// Original column/row status
-
SCCOLROW nStartCol = aBlockStart.Col();
SCCOLROW nEndCol = aBlockEnd.Col();
SCCOLROW nStartRow = aBlockStart.Row();
@@ -444,7 +438,6 @@ sal_Bool ScUndoOutlineBlock::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoRemoveAllOutlines::ScUndoRemoveAllOutlines( ScDocShell* pNewDocShell,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
@@ -477,11 +470,9 @@ void ScUndoRemoveAllOutlines::Undo()
SCTAB nTab = aBlockStart.Tab();
// Original Outline table
-
pDoc->SetOutlineTable( nTab, pUndoTable );
// Original column/row status
-
SCCOL nStartCol = aBlockStart.Col();
SCCOL nEndCol = aBlockEnd.Col();
SCROW nStartRow = aBlockStart.Row();
@@ -532,7 +523,6 @@ sal_Bool ScUndoRemoveAllOutlines::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoAutoOutline::ScUndoAutoOutline( ScDocShell* pNewDocShell,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
@@ -565,11 +555,9 @@ void ScUndoAutoOutline::Undo()
SCTAB nTab = aBlockStart.Tab();
// Original outline table
-
pDoc->SetOutlineTable( nTab, pUndoTable );
// Original column/row status
-
if (pUndoDoc && pUndoTable)
{
SCCOLROW nStartCol;
@@ -638,7 +626,6 @@ sal_Bool ScUndoAutoOutline::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoSubTotals::ScUndoSubTotals( ScDocShell* pNewDocShell, SCTAB nNewTab,
const ScSubTotalParam& rNewParam, SCROW nNewEndY,
ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
@@ -686,11 +673,9 @@ void ScUndoSubTotals::Undo()
// Original Outline table
-
pDoc->SetOutlineTable( nTab, pUndoTable );
// Original column/row status
-
if (pUndoDoc && pUndoTable)
{
SCCOLROW nStartCol;
@@ -764,7 +749,6 @@ sal_Bool ScUndoSubTotals::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false; // is not possible due to column numbers
}
-
ScUndoSort::ScUndoSort( ScDocShell* pNewDocShell,
SCTAB nNewTab, const ScSortParam& rParam,
sal_Bool bQuery, ScDocument* pNewUndoDoc, ScDBCollection* pNewUndoDB,
@@ -1196,7 +1180,6 @@ sal_Bool ScUndoDBData::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false; // is not possible
}
-
ScUndoImportData::ScUndoImportData( ScDocShell* pNewDocShell, SCTAB nNewTab,
const ScImportParam& rParam, SCCOL nNewEndX, SCROW nNewEndY,
SCCOL nNewFormula,
@@ -1500,11 +1483,9 @@ void ScUndoRepeatDB::Undo()
}
// Original Outline table
-
pDoc->SetOutlineTable( nTab, pUndoTable );
// Original column/row status
-
if (pUndoDoc && pUndoTable)
{
SCCOLROW nStartCol;
@@ -1523,7 +1504,6 @@ void ScUndoRepeatDB::Undo()
}
// Original data and references
-
ScUndoUtil::MarkSimpleBlock( pDocShell, 0, aBlockStart.Row(), nTab,
MAXCOL, aBlockEnd.Row(), nTab );
pDoc->DeleteAreaTab( 0, aBlockStart.Row(),
@@ -1586,7 +1566,6 @@ sal_Bool ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoDataPilot::ScUndoDataPilot( ScDocShell* pNewDocShell,
ScDocument* pOldDoc, ScDocument* pNewDoc,
const ScDPObject* pOldObj, const ScDPObject* pNewObj, sal_Bool bMove ) :
@@ -1747,7 +1726,6 @@ sal_Bool ScUndoDataPilot::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false;
}
-
ScUndoConsolidate::ScUndoConsolidate( ScDocShell* pNewDocShell, const ScArea& rArea,
const ScConsolidateParam& rPar, ScDocument* pNewUndoDoc,
sal_Bool bReference, SCROW nInsCount, ScOutlineTable* pTab,
@@ -1887,9 +1865,7 @@ sal_Bool ScUndoConsolidate::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false;
}
-
// Change source data of Chart
-
void ScUndoChartData::Init()
{
ScDocument* pDoc = pDocShell->GetDocument();
@@ -2017,7 +1993,6 @@ void ScUndoDataForm::SetChangeTrack()
nStartChangeAction = nEndChangeAction = 0;
}
-
void ScUndoDataForm::Undo()
{
BeginUndo();
@@ -2164,4 +2139,5 @@ void ScUndoDataForm::DoChange( const sal_Bool bUndo )
if (pViewShell)
pViewShell->CellContentChanged();
}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxx
index 2d9ea5e..42bd30b 100644
--- a/sc/source/ui/undo/undodraw.cxx
+++ b/sc/source/ui/undo/undodraw.cxx
@@ -32,13 +32,8 @@
#include "docsh.hxx"
#include "tabvwsh.hxx"
-
-// -----------------------------------------------------------------------
-
TYPEINIT1(ScUndoDraw, SfxUndoAction);
-// -----------------------------------------------------------------------
-
ScUndoDraw::ScUndoDraw( SfxUndoAction* pUndo, ScDocShell* pDocSh ) :
pDrawUndo( pUndo ),
pDocShell( pDocSh )
@@ -142,6 +137,4 @@ sal_Bool ScUndoDraw::CanRepeat(SfxRepeatTarget& rTarget) const
return false;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/undo/undoolk.cxx b/sc/source/ui/undo/undoolk.cxx
index 91109c7..9685161 100644
--- a/sc/source/ui/undo/undoolk.cxx
+++ b/sc/source/ui/undo/undoolk.cxx
@@ -22,11 +22,6 @@
#include "document.hxx"
#include "drwlayer.hxx"
-
-// STATIC DATA -----------------------------------------------------------
-
-// -----------------------------------------------------------------------
-
SdrUndoAction* GetSdrUndoAction( ScDocument* pDoc )
{
ScDrawLayer* pLayer = pDoc->GetDrawLayer();
@@ -62,11 +57,9 @@ void DoSdrUndoAction( SdrUndoAction* pUndoAction, ScDocument* pDoc )
}
}
-
void RedoSdrUndoAction( SdrUndoAction* pUndoAction )
{
// DoSdrUndoAction/RedoSdrUndoAction is called even if the pointer is null
-
if ( pUndoAction )
pUndoAction->Redo();
}
@@ -83,6 +76,4 @@ void EnableDrawAdjust( ScDocument* pDoc, sal_Bool bEnable )
pLayer->EnableAdjust(bEnable);
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index d5be4ed..6569139 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include <sfx2/app.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
@@ -68,8 +67,6 @@ using ::std::auto_ptr;
using ::std::vector;
using ::boost::shared_ptr;
-// STATIC DATA -----------------------------------------------------------
-
TYPEINIT1(ScUndoInsertTab, SfxUndoAction);
TYPEINIT1(ScUndoInsertTables, SfxUndoAction);
TYPEINIT1(ScUndoDeleteTab, SfxUndoAction);
@@ -86,7 +83,6 @@ TYPEINIT1(ScUndoRenameObject, SfxUndoAction);
TYPEINIT1(ScUndoLayoutRTL, SfxUndoAction);
TYPEINIT1(ScUndoTabColor, SfxUndoAction);
-
ScUndoInsertTab::ScUndoInsertTab( ScDocShell* pNewDocShell,
SCTAB nTabNum,
sal_Bool bApp,
@@ -181,7 +177,6 @@ sal_Bool ScUndoInsertTab::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell,
SCTAB nTabNum,
sal_Bool bApp,std::vector<rtl::OUString>& newNameList) :
@@ -278,7 +273,6 @@ sal_Bool ScUndoInsertTables::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoDeleteTab::ScUndoDeleteTab( ScDocShell* pNewDocShell, const vector<SCTAB> &aTab, //SCTAB nNewTab,
ScDocument* pUndoDocument, ScRefUndoData* pRefData ) :
ScMoveUndo( pNewDocShell, pUndoDocument, pRefData, SC_UNDO_REFLAST )
@@ -438,7 +432,6 @@ sal_Bool ScUndoDeleteTab::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoRenameTab::ScUndoRenameTab( ScDocShell* pNewDocShell,
SCTAB nT,
const String& rOldName,
@@ -496,7 +489,6 @@ sal_Bool ScUndoRenameTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false;
}
-
ScUndoMoveTab::ScUndoMoveTab(
ScDocShell* pNewDocShell, vector<SCTAB>* pOldTabs, vector<SCTAB>* pNewTabs,
vector<OUString>* pOldNames, vector<OUString>* pNewNames) :
@@ -602,7 +594,6 @@ sal_Bool ScUndoMoveTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false;
}
-
ScUndoCopyTab::ScUndoCopyTab(
ScDocShell* pNewDocShell,
vector<SCTAB>* pOldTabs, vector<SCTAB>* pNewTabs,
@@ -812,7 +803,6 @@ sal_Bool ScUndoTabColor::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false;
}
-
ScUndoMakeScenario::ScUndoMakeScenario( ScDocShell* pNewDocShell,
SCTAB nSrc, SCTAB nDest,
const String& rN, const String& rC,
@@ -900,7 +890,6 @@ sal_Bool ScUndoMakeScenario::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoImportTab::ScUndoImportTab( ScDocShell* pShell,
SCTAB nNewTab, SCTAB nNewCount, sal_Bool bNewLink ) :
ScSimpleUndo( pShell ),
@@ -1056,7 +1045,6 @@ sal_Bool ScUndoImportTab::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-
ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) :
ScSimpleUndo( pShell ),
aDocName( rDoc ),
@@ -1138,7 +1126,6 @@ sal_Bool ScUndoRemoveLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false;
}
-
ScUndoShowHideTab::ScUndoShowHideTab( ScDocShell* pShell, SCTAB nNewTab, sal_Bool bNewShow ) :
ScSimpleUndo( pShell ),
nTab( nNewTab ),
@@ -1192,8 +1179,6 @@ rtl::OUString ScUndoShowHideTab::GetComment() const
return ScGlobal::GetRscString( nId );
}
-// ============================================================================
-
SAL_WNODEPRECATED_DECLARATIONS_PUSH
ScUndoDocProtect::ScUndoDocProtect(ScDocShell* pShell, auto_ptr<ScDocProtection> pProtectSettings) :
ScSimpleUndo(pShell),
@@ -1265,8 +1250,6 @@ rtl::OUString ScUndoDocProtect::GetComment() const
return ScGlobal::GetRscString( nId );
}
-// ============================================================================
-
SAL_WNODEPRECATED_DECLARATIONS_PUSH
ScUndoTabProtect::ScUndoTabProtect(ScDocShell* pShell, SCTAB nTab, auto_ptr<ScTableProtection> pProtectSettings) :
ScSimpleUndo(pShell),
@@ -1339,7 +1322,6 @@ rtl::OUString ScUndoTabProtect::GetComment() const
return ScGlobal::GetRscString( nId );
}
-
ScUndoPrintRange::ScUndoPrintRange( ScDocShell* pShell, SCTAB nNewTab,
ScPrintRangeSaver* pOld, ScPrintRangeSaver* pNew ) :
ScSimpleUndo( pShell ),
@@ -1401,9 +1383,6 @@ rtl::OUString ScUndoPrintRange::GetComment() const
return ScGlobal::GetRscString( STR_UNDO_PRINTRANGES );
}
-
-//------------------------------------------------------------------------
-
ScUndoScenarioFlags::ScUndoScenarioFlags( ScDocShell* pNewDocShell, SCTAB nT,
const String& rON, const String& rNN, const String& rOC, const String& rNC,
const Color& rOCol, const Color& rNCol, sal_uInt16 nOF, sal_uInt16 nNF ) :
@@ -1473,7 +1452,6 @@ sal_Bool ScUndoScenarioFlags::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false;
}
-
// (move to different file?)
ScUndoRenameObject::ScUndoRenameObject( ScDocShell* pNewDocShell, const String& rPN,
const String& rON, const String& rNN ) :
@@ -1551,7 +1529,6 @@ sal_Bool ScUndoRenameObject::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false;
}
-
ScUndoLayoutRTL::ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, sal_Bool bNewRTL ) :
ScSimpleUndo( pShell ),
nTab( nNewTab ),
More information about the Libreoffice-commits
mailing list