Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
37b48385
Kaydet (Commit)
37b48385
authored
Şub 19, 2014
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sal_Bool->bool
Change-Id: I9921d8a5d883e519f0345aedc7bc36c3e553105b
üst
47f3b228
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
38 deletions
+38
-38
undoblk.hxx
sc/source/ui/inc/undoblk.hxx
+0
-0
undoblk.cxx
sc/source/ui/undo/undoblk.cxx
+18
-18
undoblk2.cxx
sc/source/ui/undo/undoblk2.cxx
+1
-1
undoblk3.cxx
sc/source/ui/undo/undoblk3.cxx
+19
-19
No files found.
sc/source/ui/inc/undoblk.hxx
Dosyayı görüntüle @
37b48385
This diff is collapsed.
Click to expand it.
sc/source/ui/undo/undoblk.cxx
Dosyayı görüntüle @
37b48385
...
@@ -79,7 +79,7 @@ TYPEINIT1(ScUndoBorder, ScBlockUndo);
...
@@ -79,7 +79,7 @@ TYPEINIT1(ScUndoBorder, ScBlockUndo);
ScUndoInsertCells
::
ScUndoInsertCells
(
ScDocShell
*
pNewDocShell
,
ScUndoInsertCells
::
ScUndoInsertCells
(
ScDocShell
*
pNewDocShell
,
const
ScRange
&
rRange
,
SCTAB
nNewCount
,
SCTAB
*
pNewTabs
,
SCTAB
*
pNewScenarios
,
const
ScRange
&
rRange
,
SCTAB
nNewCount
,
SCTAB
*
pNewTabs
,
SCTAB
*
pNewScenarios
,
InsCellCmd
eNewCmd
,
ScDocument
*
pUndoDocument
,
ScRefUndoData
*
pRefData
,
InsCellCmd
eNewCmd
,
ScDocument
*
pUndoDocument
,
ScRefUndoData
*
pRefData
,
sal_B
ool
bNewPartOfPaste
)
:
b
ool
bNewPartOfPaste
)
:
ScMoveUndo
(
pNewDocShell
,
pUndoDocument
,
pRefData
,
SC_UNDO_REFLAST
),
ScMoveUndo
(
pNewDocShell
,
pUndoDocument
,
pRefData
,
SC_UNDO_REFLAST
),
aEffRange
(
rRange
),
aEffRange
(
rRange
),
nCount
(
nNewCount
),
nCount
(
nNewCount
),
...
@@ -153,7 +153,7 @@ void ScUndoInsertCells::SetChangeTrack()
...
@@ -153,7 +153,7 @@ void ScUndoInsertCells::SetChangeTrack()
nEndChangeAction
=
0
;
nEndChangeAction
=
0
;
}
}
void
ScUndoInsertCells
::
DoChange
(
const
sal_B
ool
bUndo
)
void
ScUndoInsertCells
::
DoChange
(
const
b
ool
bUndo
)
{
{
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
SCTAB
i
;
SCTAB
i
;
...
@@ -274,7 +274,7 @@ void ScUndoInsertCells::Undo()
...
@@ -274,7 +274,7 @@ void ScUndoInsertCells::Undo()
WaitObject
aWait
(
pDocShell
->
GetActiveDialogParent
()
);
// important due to TrackFormulas in UpdateReference
WaitObject
aWait
(
pDocShell
->
GetActiveDialogParent
()
);
// important due to TrackFormulas in UpdateReference
BeginUndo
();
BeginUndo
();
DoChange
(
sal_T
rue
);
DoChange
(
t
rue
);
EndUndo
();
EndUndo
();
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
...
@@ -365,7 +365,7 @@ void ScUndoDeleteCells::SetChangeTrack()
...
@@ -365,7 +365,7 @@ void ScUndoDeleteCells::SetChangeTrack()
nStartChangeAction
=
nEndChangeAction
=
0
;
nStartChangeAction
=
nEndChangeAction
=
0
;
}
}
void
ScUndoDeleteCells
::
DoChange
(
const
sal_B
ool
bUndo
)
void
ScUndoDeleteCells
::
DoChange
(
const
b
ool
bUndo
)
{
{
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
SCTAB
i
;
SCTAB
i
;
...
@@ -506,7 +506,7 @@ void ScUndoDeleteCells::Undo()
...
@@ -506,7 +506,7 @@ void ScUndoDeleteCells::Undo()
{
{
WaitObject
aWait
(
pDocShell
->
GetActiveDialogParent
()
);
// important because of TrackFormulas in UpdateReference
WaitObject
aWait
(
pDocShell
->
GetActiveDialogParent
()
);
// important because of TrackFormulas in UpdateReference
BeginUndo
();
BeginUndo
();
DoChange
(
sal_T
rue
);
DoChange
(
t
rue
);
EndUndo
();
EndUndo
();
SFX_APP
()
->
Broadcast
(
SfxSimpleHint
(
SC_HINT_AREALINKS_CHANGED
)
);
SFX_APP
()
->
Broadcast
(
SfxSimpleHint
(
SC_HINT_AREALINKS_CHANGED
)
);
...
@@ -764,7 +764,7 @@ void ScUndoCut::SetChangeTrack()
...
@@ -764,7 +764,7 @@ void ScUndoCut::SetChangeTrack()
nStartChangeAction
=
nEndChangeAction
=
0
;
nStartChangeAction
=
nEndChangeAction
=
0
;
}
}
void
ScUndoCut
::
DoChange
(
const
sal_B
ool
bUndo
)
void
ScUndoCut
::
DoChange
(
const
b
ool
bUndo
)
{
{
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
sal_uInt16
nExtFlags
=
0
;
sal_uInt16
nExtFlags
=
0
;
...
@@ -809,7 +809,7 @@ void ScUndoCut::DoChange( const sal_Bool bUndo )
...
@@ -809,7 +809,7 @@ void ScUndoCut::DoChange( const sal_Bool bUndo )
void
ScUndoCut
::
Undo
()
void
ScUndoCut
::
Undo
()
{
{
BeginUndo
();
BeginUndo
();
DoChange
(
sal_T
rue
);
DoChange
(
t
rue
);
EndUndo
();
EndUndo
();
}
}
...
@@ -1107,8 +1107,8 @@ bool ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const
...
@@ -1107,8 +1107,8 @@ bool ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const
}
}
ScUndoDragDrop
::
ScUndoDragDrop
(
ScDocShell
*
pNewDocShell
,
ScUndoDragDrop
::
ScUndoDragDrop
(
ScDocShell
*
pNewDocShell
,
const
ScRange
&
rRange
,
ScAddress
aNewDestPos
,
sal_B
ool
bNewCut
,
const
ScRange
&
rRange
,
ScAddress
aNewDestPos
,
b
ool
bNewCut
,
ScDocument
*
pUndoDocument
,
ScRefUndoData
*
pRefData
,
sal_B
ool
bScenario
)
:
ScDocument
*
pUndoDocument
,
ScRefUndoData
*
pRefData
,
b
ool
bScenario
)
:
ScMoveUndo
(
pNewDocShell
,
pUndoDocument
,
pRefData
,
SC_UNDO_REFFIRST
),
ScMoveUndo
(
pNewDocShell
,
pUndoDocument
,
pRefData
,
SC_UNDO_REFFIRST
),
aSrcRange
(
rRange
),
aSrcRange
(
rRange
),
bCut
(
bNewCut
),
bCut
(
bNewCut
),
...
@@ -1119,7 +1119,7 @@ ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell,
...
@@ -1119,7 +1119,7 @@ ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell,
aDestEnd
.
IncCol
(
aSrcRange
.
aEnd
.
Col
()
-
aSrcRange
.
aStart
.
Col
());
aDestEnd
.
IncCol
(
aSrcRange
.
aEnd
.
Col
()
-
aSrcRange
.
aStart
.
Col
());
aDestEnd
.
IncTab
(
aSrcRange
.
aEnd
.
Tab
()
-
aSrcRange
.
aStart
.
Tab
());
aDestEnd
.
IncTab
(
aSrcRange
.
aEnd
.
Tab
()
-
aSrcRange
.
aStart
.
Tab
());
sal_B
ool
bIncludeFiltered
=
bCut
;
b
ool
bIncludeFiltered
=
bCut
;
if
(
!
bIncludeFiltered
)
if
(
!
bIncludeFiltered
)
{
{
// find number of non-filtered rows
// find number of non-filtered rows
...
@@ -1304,7 +1304,7 @@ void ScUndoDragDrop::Redo()
...
@@ -1304,7 +1304,7 @@ void ScUndoDragDrop::Redo()
for
(
nTab
=
aDestRange
.
aStart
.
Tab
();
nTab
<=
aDestRange
.
aEnd
.
Tab
();
nTab
++
)
for
(
nTab
=
aDestRange
.
aStart
.
Tab
();
nTab
<=
aDestRange
.
aEnd
.
Tab
();
nTab
++
)
aDestMark
.
SelectTable
(
nTab
,
true
);
aDestMark
.
SelectTable
(
nTab
,
true
);
sal_B
ool
bIncludeFiltered
=
bCut
;
b
ool
bIncludeFiltered
=
bCut
;
// TODO: restore old note captions instead of cloning new captions...
// TODO: restore old note captions instead of cloning new captions...
pDoc
->
CopyFromClip
(
aDestRange
,
aDestMark
,
IDF_ALL
&
~
IDF_OBJECTS
,
NULL
,
pClipDoc
,
true
,
false
,
bIncludeFiltered
);
pDoc
->
CopyFromClip
(
aDestRange
,
aDestMark
,
IDF_ALL
&
~
IDF_OBJECTS
,
NULL
,
pClipDoc
,
true
,
false
,
bIncludeFiltered
);
...
@@ -1451,7 +1451,7 @@ void ScUndoUseScenario::Undo()
...
@@ -1451,7 +1451,7 @@ void ScUndoUseScenario::Undo()
pUndoDoc
->
CopyToDocument
(
aRange
,
IDF_ALL
,
true
,
pDoc
,
&
aMarkData
);
pUndoDoc
->
CopyToDocument
(
aRange
,
IDF_ALL
,
true
,
pDoc
,
&
aMarkData
);
// scenario table
// scenario table
sal_B
ool
bFrame
=
false
;
b
ool
bFrame
=
false
;
SCTAB
nTab
=
aRange
.
aStart
.
Tab
();
SCTAB
nTab
=
aRange
.
aStart
.
Tab
();
SCTAB
nEndTab
=
nTab
;
SCTAB
nEndTab
=
nTab
;
while
(
pUndoDoc
->
HasTable
(
nEndTab
+
1
)
&&
pUndoDoc
->
IsScenario
(
nEndTab
+
1
)
)
while
(
pUndoDoc
->
HasTable
(
nEndTab
+
1
)
&&
pUndoDoc
->
IsScenario
(
nEndTab
+
1
)
)
...
@@ -1464,7 +1464,7 @@ void ScUndoUseScenario::Undo()
...
@@ -1464,7 +1464,7 @@ void ScUndoUseScenario::Undo()
sal_uInt16
nScenFlags
;
sal_uInt16
nScenFlags
;
pUndoDoc
->
GetScenarioData
(
i
,
aComment
,
aColor
,
nScenFlags
);
pUndoDoc
->
GetScenarioData
(
i
,
aComment
,
aColor
,
nScenFlags
);
pDoc
->
SetScenarioData
(
i
,
aComment
,
aColor
,
nScenFlags
);
pDoc
->
SetScenarioData
(
i
,
aComment
,
aColor
,
nScenFlags
);
sal_B
ool
bActive
=
pUndoDoc
->
IsActiveScenario
(
i
);
b
ool
bActive
=
pUndoDoc
->
IsActiveScenario
(
i
);
pDoc
->
SetActiveScenario
(
i
,
bActive
);
pDoc
->
SetActiveScenario
(
i
,
bActive
);
// For copy-back scenario also consider content
// For copy-back scenario also consider content
if
(
nScenFlags
&
SC_SCENARIO_TWOWAY
)
if
(
nScenFlags
&
SC_SCENARIO_TWOWAY
)
...
@@ -1473,7 +1473,7 @@ void ScUndoUseScenario::Undo()
...
@@ -1473,7 +1473,7 @@ void ScUndoUseScenario::Undo()
pUndoDoc
->
CopyToDocument
(
0
,
0
,
i
,
MAXCOL
,
MAXROW
,
i
,
IDF_ALL
,
false
,
pDoc
);
pUndoDoc
->
CopyToDocument
(
0
,
0
,
i
,
MAXCOL
,
MAXROW
,
i
,
IDF_ALL
,
false
,
pDoc
);
}
}
if
(
nScenFlags
&
SC_SCENARIO_SHOWFRAME
)
if
(
nScenFlags
&
SC_SCENARIO_SHOWFRAME
)
bFrame
=
sal_T
rue
;
bFrame
=
t
rue
;
}
}
// if visible borders, then paint all
// if visible borders, then paint all
...
@@ -1551,7 +1551,7 @@ OUString ScUndoSelectionStyle::GetComment() const
...
@@ -1551,7 +1551,7 @@ OUString ScUndoSelectionStyle::GetComment() const
return
ScGlobal
::
GetRscString
(
STR_UNDO_APPLYCELLSTYLE
);
return
ScGlobal
::
GetRscString
(
STR_UNDO_APPLYCELLSTYLE
);
}
}
void
ScUndoSelectionStyle
::
DoChange
(
const
sal_B
ool
bUndo
)
void
ScUndoSelectionStyle
::
DoChange
(
const
b
ool
bUndo
)
{
{
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
...
@@ -1597,7 +1597,7 @@ void ScUndoSelectionStyle::DoChange( const sal_Bool bUndo )
...
@@ -1597,7 +1597,7 @@ void ScUndoSelectionStyle::DoChange( const sal_Bool bUndo )
void
ScUndoSelectionStyle
::
Undo
()
void
ScUndoSelectionStyle
::
Undo
()
{
{
BeginUndo
();
BeginUndo
();
DoChange
(
sal_T
rue
);
DoChange
(
t
rue
);
EndUndo
();
EndUndo
();
}
}
...
@@ -1732,7 +1732,7 @@ static ScRange lcl_GetMultiMarkRange( const ScMarkData& rMark )
...
@@ -1732,7 +1732,7 @@ static ScRange lcl_GetMultiMarkRange( const ScMarkData& rMark )
}
}
ScUndoIndent
::
ScUndoIndent
(
ScDocShell
*
pNewDocShell
,
const
ScMarkData
&
rMark
,
ScUndoIndent
::
ScUndoIndent
(
ScDocShell
*
pNewDocShell
,
const
ScMarkData
&
rMark
,
ScDocument
*
pNewUndoDoc
,
sal_B
ool
bIncrement
)
:
ScDocument
*
pNewUndoDoc
,
b
ool
bIncrement
)
:
ScBlockUndo
(
pNewDocShell
,
lcl_GetMultiMarkRange
(
rMark
),
SC_UNDO_AUTOHEIGHT
),
ScBlockUndo
(
pNewDocShell
,
lcl_GetMultiMarkRange
(
rMark
),
SC_UNDO_AUTOHEIGHT
),
aMarkData
(
rMark
),
aMarkData
(
rMark
),
pUndoDoc
(
pNewUndoDoc
),
pUndoDoc
(
pNewUndoDoc
),
...
@@ -2056,7 +2056,7 @@ void ScUndoRemoveMerge::Redo()
...
@@ -2056,7 +2056,7 @@ void ScUndoRemoveMerge::Redo()
// Paint
// Paint
sal_B
ool
bDidPaint
=
false
;
b
ool
bDidPaint
=
false
;
if
(
pViewShell
)
if
(
pViewShell
)
{
{
pViewShell
->
SetTabNo
(
nTab
);
pViewShell
->
SetTabNo
(
nTab
);
...
...
sc/source/ui/undo/undoblk2.cxx
Dosyayı görüntüle @
37b48385
...
@@ -38,7 +38,7 @@ ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
...
@@ -38,7 +38,7 @@ ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
SCCOLROW
nNewStart
,
SCTAB
nNewStartTab
,
SCCOLROW
nNewEnd
,
SCTAB
nNewEndTab
,
SCCOLROW
nNewStart
,
SCTAB
nNewStartTab
,
SCCOLROW
nNewEnd
,
SCTAB
nNewEndTab
,
ScDocument
*
pNewUndoDoc
,
SCCOLROW
nNewCnt
,
SCCOLROW
*
pNewRanges
,
ScDocument
*
pNewUndoDoc
,
SCCOLROW
nNewCnt
,
SCCOLROW
*
pNewRanges
,
ScOutlineTable
*
pNewUndoTab
,
ScOutlineTable
*
pNewUndoTab
,
ScSizeMode
eNewMode
,
sal_uInt16
nNewSizeTwips
,
sal_B
ool
bNewWidth
)
:
ScSizeMode
eNewMode
,
sal_uInt16
nNewSizeTwips
,
b
ool
bNewWidth
)
:
ScSimpleUndo
(
pNewDocShell
),
ScSimpleUndo
(
pNewDocShell
),
aMarkData
(
rMark
),
aMarkData
(
rMark
),
nStart
(
nNewStart
),
nStart
(
nNewStart
),
...
...
sc/source/ui/undo/undoblk3.cxx
Dosyayı görüntüle @
37b48385
...
@@ -76,8 +76,8 @@ TYPEINIT1(ScUndoUpdateAreaLink, SfxUndoAction);
...
@@ -76,8 +76,8 @@ TYPEINIT1(ScUndoUpdateAreaLink, SfxUndoAction);
ScUndoDeleteContents
::
ScUndoDeleteContents
(
ScUndoDeleteContents
::
ScUndoDeleteContents
(
ScDocShell
*
pNewDocShell
,
ScDocShell
*
pNewDocShell
,
const
ScMarkData
&
rMark
,
const
ScRange
&
rRange
,
const
ScMarkData
&
rMark
,
const
ScRange
&
rRange
,
ScDocument
*
pNewUndoDoc
,
sal_B
ool
bNewMulti
,
ScDocument
*
pNewUndoDoc
,
b
ool
bNewMulti
,
sal_uInt16
nNewFlags
,
sal_B
ool
bObjects
)
sal_uInt16
nNewFlags
,
b
ool
bObjects
)
:
ScSimpleUndo
(
pNewDocShell
),
:
ScSimpleUndo
(
pNewDocShell
),
aRange
(
rRange
),
aRange
(
rRange
),
aMarkData
(
rMark
),
aMarkData
(
rMark
),
...
@@ -116,7 +116,7 @@ void ScUndoDeleteContents::SetChangeTrack()
...
@@ -116,7 +116,7 @@ void ScUndoDeleteContents::SetChangeTrack()
nStartChangeAction
=
nEndChangeAction
=
0
;
nStartChangeAction
=
nEndChangeAction
=
0
;
}
}
void
ScUndoDeleteContents
::
DoChange
(
const
sal_B
ool
bUndo
)
void
ScUndoDeleteContents
::
DoChange
(
const
b
ool
bUndo
)
{
{
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
...
@@ -181,7 +181,7 @@ void ScUndoDeleteContents::DoChange( const sal_Bool bUndo )
...
@@ -181,7 +181,7 @@ void ScUndoDeleteContents::DoChange( const sal_Bool bUndo )
void
ScUndoDeleteContents
::
Undo
()
void
ScUndoDeleteContents
::
Undo
()
{
{
BeginUndo
();
BeginUndo
();
DoChange
(
sal_T
rue
);
DoChange
(
t
rue
);
EndUndo
();
EndUndo
();
BroadcastChanges
(
aRange
);
BroadcastChanges
(
aRange
);
...
@@ -213,8 +213,8 @@ ScUndoFillTable::ScUndoFillTable( ScDocShell* pNewDocShell,
...
@@ -213,8 +213,8 @@ ScUndoFillTable::ScUndoFillTable( ScDocShell* pNewDocShell,
const
ScMarkData
&
rMark
,
const
ScMarkData
&
rMark
,
SCCOL
nStartX
,
SCROW
nStartY
,
SCTAB
nStartZ
,
SCCOL
nStartX
,
SCROW
nStartY
,
SCTAB
nStartZ
,
SCCOL
nEndX
,
SCROW
nEndY
,
SCTAB
nEndZ
,
SCCOL
nEndX
,
SCROW
nEndY
,
SCTAB
nEndZ
,
ScDocument
*
pNewUndoDoc
,
sal_B
ool
bNewMulti
,
SCTAB
nSrc
,
ScDocument
*
pNewUndoDoc
,
b
ool
bNewMulti
,
SCTAB
nSrc
,
sal_uInt16
nFlg
,
sal_uInt16
nFunc
,
sal_Bool
bSkip
,
sal_B
ool
bLink
)
sal_uInt16
nFlg
,
sal_uInt16
nFunc
,
bool
bSkip
,
b
ool
bLink
)
:
ScSimpleUndo
(
pNewDocShell
),
:
ScSimpleUndo
(
pNewDocShell
),
aRange
(
nStartX
,
nStartY
,
nStartZ
,
nEndX
,
nEndY
,
nEndZ
),
aRange
(
nStartX
,
nStartY
,
nStartZ
,
nEndX
,
nEndY
,
nEndZ
),
aMarkData
(
rMark
),
aMarkData
(
rMark
),
...
@@ -266,7 +266,7 @@ void ScUndoFillTable::SetChangeTrack()
...
@@ -266,7 +266,7 @@ void ScUndoFillTable::SetChangeTrack()
nStartChangeAction
=
nEndChangeAction
=
0
;
nStartChangeAction
=
nEndChangeAction
=
0
;
}
}
void
ScUndoFillTable
::
DoChange
(
const
sal_B
ool
bUndo
)
void
ScUndoFillTable
::
DoChange
(
const
b
ool
bUndo
)
{
{
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
...
@@ -320,7 +320,7 @@ void ScUndoFillTable::DoChange( const sal_Bool bUndo )
...
@@ -320,7 +320,7 @@ void ScUndoFillTable::DoChange( const sal_Bool bUndo )
void
ScUndoFillTable
::
Undo
()
void
ScUndoFillTable
::
Undo
()
{
{
BeginUndo
();
BeginUndo
();
DoChange
(
sal_T
rue
);
DoChange
(
t
rue
);
EndUndo
();
EndUndo
();
}
}
...
@@ -346,7 +346,7 @@ ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell,
...
@@ -346,7 +346,7 @@ ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell,
const
ScMarkData
&
rMark
,
const
ScMarkData
&
rMark
,
SCCOL
nStartX
,
SCROW
nStartY
,
SCTAB
nStartZ
,
SCCOL
nStartX
,
SCROW
nStartY
,
SCTAB
nStartZ
,
SCCOL
nEndX
,
SCROW
nEndY
,
SCTAB
nEndZ
,
SCCOL
nEndX
,
SCROW
nEndY
,
SCTAB
nEndZ
,
ScDocument
*
pNewUndoDoc
,
sal_B
ool
bNewMulti
,
ScDocument
*
pNewUndoDoc
,
b
ool
bNewMulti
,
const
ScPatternAttr
*
pNewApply
,
const
ScPatternAttr
*
pNewApply
,
const
SvxBoxItem
*
pNewOuter
,
const
SvxBoxInfoItem
*
pNewInner
)
const
SvxBoxItem
*
pNewOuter
,
const
SvxBoxInfoItem
*
pNewInner
)
:
ScSimpleUndo
(
pNewDocShell
),
:
ScSimpleUndo
(
pNewDocShell
),
...
@@ -385,7 +385,7 @@ ScEditDataArray* ScUndoSelectionAttr::GetDataArray()
...
@@ -385,7 +385,7 @@ ScEditDataArray* ScUndoSelectionAttr::GetDataArray()
return
mpDataArray
.
get
();
return
mpDataArray
.
get
();
}
}
void
ScUndoSelectionAttr
::
DoChange
(
const
sal_B
ool
bUndo
)
void
ScUndoSelectionAttr
::
DoChange
(
const
b
ool
bUndo
)
{
{
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
...
@@ -454,7 +454,7 @@ void ScUndoSelectionAttr::ChangeEditData( const bool bUndo )
...
@@ -454,7 +454,7 @@ void ScUndoSelectionAttr::ChangeEditData( const bool bUndo )
void
ScUndoSelectionAttr
::
Undo
()
void
ScUndoSelectionAttr
::
Undo
()
{
{
BeginUndo
();
BeginUndo
();
DoChange
(
sal_T
rue
);
DoChange
(
t
rue
);
EndUndo
();
EndUndo
();
}
}
...
@@ -757,7 +757,7 @@ bool ScUndoMerge::CanRepeat(SfxRepeatTarget& rTarget) const
...
@@ -757,7 +757,7 @@ bool ScUndoMerge::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoAutoFormat
::
ScUndoAutoFormat
(
ScDocShell
*
pNewDocShell
,
ScUndoAutoFormat
::
ScUndoAutoFormat
(
ScDocShell
*
pNewDocShell
,
const
ScRange
&
rRange
,
ScDocument
*
pNewUndoDoc
,
const
ScRange
&
rRange
,
ScDocument
*
pNewUndoDoc
,
const
ScMarkData
&
rMark
,
sal_B
ool
bNewSize
,
sal_uInt16
nNewFormatNo
)
const
ScMarkData
&
rMark
,
b
ool
bNewSize
,
sal_uInt16
nNewFormatNo
)
:
ScBlockUndo
(
pNewDocShell
,
rRange
,
bNewSize
?
SC_UNDO_MANUALHEIGHT
:
SC_UNDO_AUTOHEIGHT
),
:
ScBlockUndo
(
pNewDocShell
,
rRange
,
bNewSize
?
SC_UNDO_MANUALHEIGHT
:
SC_UNDO_AUTOHEIGHT
),
pUndoDoc
(
pNewUndoDoc
),
pUndoDoc
(
pNewUndoDoc
),
aMarkData
(
rMark
),
aMarkData
(
rMark
),
...
@@ -1224,7 +1224,7 @@ void ScUndoConversion::DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPo
...
@@ -1224,7 +1224,7 @@ void ScUndoConversion::DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPo
SCTAB
nTabCount
=
pDoc
->
GetTableCount
();
SCTAB
nTabCount
=
pDoc
->
GetTableCount
();
// Undo/Redo-doc has only selected tables
// Undo/Redo-doc has only selected tables
sal_B
ool
bMulti
=
aMarkData
.
IsMultiMarked
();
b
ool
bMulti
=
aMarkData
.
IsMultiMarked
();
pRefDoc
->
CopyToDocument
(
0
,
0
,
0
,
pRefDoc
->
CopyToDocument
(
0
,
0
,
0
,
MAXCOL
,
MAXROW
,
nTabCount
-
1
,
MAXCOL
,
MAXROW
,
nTabCount
-
1
,
IDF_CONTENTS
,
bMulti
,
pDoc
,
&
aMarkData
);
IDF_CONTENTS
,
bMulti
,
pDoc
,
&
aMarkData
);
...
@@ -1267,7 +1267,7 @@ bool ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const
...
@@ -1267,7 +1267,7 @@ bool ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoRefConversion
::
ScUndoRefConversion
(
ScDocShell
*
pNewDocShell
,
ScUndoRefConversion
::
ScUndoRefConversion
(
ScDocShell
*
pNewDocShell
,
const
ScRange
&
aMarkRange
,
const
ScMarkData
&
rMark
,
const
ScRange
&
aMarkRange
,
const
ScMarkData
&
rMark
,
ScDocument
*
pNewUndoDoc
,
ScDocument
*
pNewRedoDoc
,
sal_B
ool
bNewMulti
,
sal_uInt16
nNewFlag
)
:
ScDocument
*
pNewUndoDoc
,
ScDocument
*
pNewRedoDoc
,
b
ool
bNewMulti
,
sal_uInt16
nNewFlag
)
:
ScSimpleUndo
(
pNewDocShell
),
ScSimpleUndo
(
pNewDocShell
),
aMarkData
(
rMark
),
aMarkData
(
rMark
),
pUndoDoc
(
pNewUndoDoc
),
pUndoDoc
(
pNewUndoDoc
),
...
@@ -1374,11 +1374,11 @@ void ScUndoRefreshLink::Undo()
...
@@ -1374,11 +1374,11 @@ void ScUndoRefreshLink::Undo()
{
{
BeginUndo
();
BeginUndo
();
sal_B
ool
bMakeRedo
=
!
pRedoDoc
;
b
ool
bMakeRedo
=
!
pRedoDoc
;
if
(
bMakeRedo
)
if
(
bMakeRedo
)
pRedoDoc
=
new
ScDocument
(
SCDOCMODE_UNDO
);
pRedoDoc
=
new
ScDocument
(
SCDOCMODE_UNDO
);
sal_Bool
bFirst
=
sal_T
rue
;
bool
bFirst
=
t
rue
;
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
SCTAB
nCount
=
pDoc
->
GetTableCount
();
SCTAB
nCount
=
pDoc
->
GetTableCount
();
for
(
SCTAB
nTab
=
0
;
nTab
<
nCount
;
nTab
++
)
for
(
SCTAB
nTab
=
0
;
nTab
<
nCount
;
nTab
++
)
...
@@ -1607,7 +1607,7 @@ ScUndoUpdateAreaLink::ScUndoUpdateAreaLink( ScDocShell* pShell,
...
@@ -1607,7 +1607,7 @@ ScUndoUpdateAreaLink::ScUndoUpdateAreaLink( ScDocShell* pShell,
const
OUString
&
rOldA
,
const
ScRange
&
rOldR
,
sal_uLong
nOldRD
,
const
OUString
&
rOldA
,
const
ScRange
&
rOldR
,
sal_uLong
nOldRD
,
const
OUString
&
rNewD
,
const
OUString
&
rNewF
,
const
OUString
&
rNewO
,
const
OUString
&
rNewD
,
const
OUString
&
rNewF
,
const
OUString
&
rNewO
,
const
OUString
&
rNewA
,
const
ScRange
&
rNewR
,
sal_uLong
nNewRD
,
const
OUString
&
rNewA
,
const
ScRange
&
rNewR
,
sal_uLong
nNewRD
,
ScDocument
*
pUndo
,
ScDocument
*
pRedo
,
sal_B
ool
bDoInsert
)
ScDocument
*
pUndo
,
ScDocument
*
pRedo
,
b
ool
bDoInsert
)
:
ScSimpleUndo
(
pShell
),
:
ScSimpleUndo
(
pShell
),
aOldDoc
(
rOldD
),
aOldDoc
(
rOldD
),
aOldFlt
(
rOldF
),
aOldFlt
(
rOldF
),
...
@@ -1639,7 +1639,7 @@ OUString ScUndoUpdateAreaLink::GetComment() const
...
@@ -1639,7 +1639,7 @@ OUString ScUndoUpdateAreaLink::GetComment() const
return
ScGlobal
::
GetRscString
(
STR_UNDO_UPDATELINK
);
//! own text ??
return
ScGlobal
::
GetRscString
(
STR_UNDO_UPDATELINK
);
//! own text ??
}
}
void
ScUndoUpdateAreaLink
::
DoChange
(
const
sal_B
ool
bUndo
)
const
void
ScUndoUpdateAreaLink
::
DoChange
(
const
b
ool
bUndo
)
const
{
{
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
ScDocument
*
pDoc
=
pDocShell
->
GetDocument
();
...
@@ -1710,7 +1710,7 @@ void ScUndoUpdateAreaLink::Undo()
...
@@ -1710,7 +1710,7 @@ void ScUndoUpdateAreaLink::Undo()
pLink
->
SetRefreshDelay
(
nOldRefresh
);
pLink
->
SetRefreshDelay
(
nOldRefresh
);
}
}
DoChange
(
sal_T
rue
);
DoChange
(
t
rue
);
}
}
void
ScUndoUpdateAreaLink
::
Redo
()
void
ScUndoUpdateAreaLink
::
Redo
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment