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
3d66457b
Kaydet (Commit)
3d66457b
authored
Şub 28, 2014
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
-Werror,-Wunused-parameter
Change-Id: Ib468220253c494279cfd4f46235a91522fb0889c
üst
2df809f4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
9 deletions
+6
-9
undobj.hxx
sw/inc/undobj.hxx
+1
-1
undobj.cxx
sw/source/core/undo/undobj.cxx
+2
-3
unredln.cxx
sw/source/core/undo/unredln.cxx
+3
-5
No files found.
sw/inc/undobj.hxx
Dosyayı görüntüle @
3d66457b
...
@@ -115,7 +115,7 @@ public:
...
@@ -115,7 +115,7 @@ public:
// Save and set Redline data.
// Save and set Redline data.
static
sal_Bool
FillSaveData
(
const
SwPaM
&
rRange
,
SwRedlineSaveDatas
&
rSData
,
static
sal_Bool
FillSaveData
(
const
SwPaM
&
rRange
,
SwRedlineSaveDatas
&
rSData
,
sal_Bool
bDelRange
=
sal_True
,
sal_Bool
bCopyNext
=
sal_True
);
sal_Bool
bDelRange
=
sal_True
);
static
sal_Bool
FillSaveDataForFmt
(
const
SwPaM
&
,
SwRedlineSaveDatas
&
);
static
sal_Bool
FillSaveDataForFmt
(
const
SwPaM
&
,
SwRedlineSaveDatas
&
);
static
void
SetSaveData
(
SwDoc
&
rDoc
,
const
SwRedlineSaveDatas
&
rSData
);
static
void
SetSaveData
(
SwDoc
&
rDoc
,
const
SwRedlineSaveDatas
&
rSData
);
static
sal_Bool
HasHiddenRedlines
(
const
SwRedlineSaveDatas
&
rSData
);
static
sal_Bool
HasHiddenRedlines
(
const
SwRedlineSaveDatas
&
rSData
);
...
...
sw/source/core/undo/undobj.cxx
Dosyayı görüntüle @
3d66457b
...
@@ -848,7 +848,7 @@ void SwUndoSaveSection::SaveSection(
...
@@ -848,7 +848,7 @@ void SwUndoSaveSection::SaveSection(
}
}
pRedlSaveData
=
new
SwRedlineSaveDatas
;
pRedlSaveData
=
new
SwRedlineSaveDatas
;
if
(
!
SwUndo
::
FillSaveData
(
aPam
,
*
pRedlSaveData
,
sal_True
,
sal_True
))
if
(
!
SwUndo
::
FillSaveData
(
aPam
,
*
pRedlSaveData
,
sal_True
))
delete
pRedlSaveData
,
pRedlSaveData
=
0
;
delete
pRedlSaveData
,
pRedlSaveData
=
0
;
nStartPos
=
rRange
.
aStart
.
GetIndex
();
nStartPos
=
rRange
.
aStart
.
GetIndex
();
...
@@ -997,8 +997,7 @@ void SwRedlineSaveData::RedlineToDoc( SwPaM& rPam )
...
@@ -997,8 +997,7 @@ void SwRedlineSaveData::RedlineToDoc( SwPaM& rPam )
sal_Bool
SwUndo
::
FillSaveData
(
sal_Bool
SwUndo
::
FillSaveData
(
const
SwPaM
&
rRange
,
const
SwPaM
&
rRange
,
SwRedlineSaveDatas
&
rSData
,
SwRedlineSaveDatas
&
rSData
,
sal_Bool
bDelRange
,
sal_Bool
bDelRange
)
sal_Bool
/* bCopyNext */
)
{
{
rSData
.
DeleteAndDestroyAll
();
rSData
.
DeleteAndDestroyAll
();
...
...
sw/source/core/undo/unredln.cxx
Dosyayı görüntüle @
3d66457b
...
@@ -58,8 +58,7 @@ SwUndoRedline::SwUndoRedline( SwUndoId nUsrId, const SwPaM& rRange )
...
@@ -58,8 +58,7 @@ SwUndoRedline::SwUndoRedline( SwUndoId nUsrId, const SwPaM& rRange )
sal_uLong
nEndExtra
=
rDoc
.
GetNodes
().
GetEndOfExtras
().
GetIndex
();
sal_uLong
nEndExtra
=
rDoc
.
GetNodes
().
GetEndOfExtras
().
GetIndex
();
mpRedlSaveData
=
new
SwRedlineSaveDatas
;
mpRedlSaveData
=
new
SwRedlineSaveDatas
;
if
(
!
FillSaveData
(
rRange
,
*
mpRedlSaveData
,
sal_False
,
if
(
!
FillSaveData
(
rRange
,
*
mpRedlSaveData
,
sal_False
))
UNDO_REJECT_REDLINE
!=
mnUserId
))
delete
mpRedlSaveData
,
mpRedlSaveData
=
0
;
delete
mpRedlSaveData
,
mpRedlSaveData
=
0
;
else
else
{
{
...
@@ -117,8 +116,7 @@ void SwUndoRedline::RedoImpl(::sw::UndoRedoContext & rContext)
...
@@ -117,8 +116,7 @@ void SwUndoRedline::RedoImpl(::sw::UndoRedoContext & rContext)
if
(
mpRedlSaveData
&&
mbHiddenRedlines
)
if
(
mpRedlSaveData
&&
mbHiddenRedlines
)
{
{
sal_uLong
nEndExtra
=
pDoc
->
GetNodes
().
GetEndOfExtras
().
GetIndex
();
sal_uLong
nEndExtra
=
pDoc
->
GetNodes
().
GetEndOfExtras
().
GetIndex
();
FillSaveData
(
rPam
,
*
mpRedlSaveData
,
sal_False
,
FillSaveData
(
rPam
,
*
mpRedlSaveData
,
sal_False
);
UNDO_REJECT_REDLINE
!=
mnUserId
);
nEndExtra
-=
pDoc
->
GetNodes
().
GetEndOfExtras
().
GetIndex
();
nEndExtra
-=
pDoc
->
GetNodes
().
GetEndOfExtras
().
GetIndex
();
nSttNode
-=
nEndExtra
;
nSttNode
-=
nEndExtra
;
...
@@ -381,7 +379,7 @@ SwUndoCompDoc::SwUndoCompDoc( const SwRangeRedline& rRedl )
...
@@ -381,7 +379,7 @@ SwUndoCompDoc::SwUndoCompDoc( const SwRangeRedline& rRedl )
}
}
pRedlSaveData
=
new
SwRedlineSaveDatas
;
pRedlSaveData
=
new
SwRedlineSaveDatas
;
if
(
!
FillSaveData
(
rRedl
,
*
pRedlSaveData
,
sal_False
,
sal_True
))
if
(
!
FillSaveData
(
rRedl
,
*
pRedlSaveData
,
sal_False
))
delete
pRedlSaveData
,
pRedlSaveData
=
0
;
delete
pRedlSaveData
,
pRedlSaveData
=
0
;
}
}
...
...
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