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
62a0ec2c
Kaydet (Commit)
62a0ec2c
authored
Nis 25, 2012
tarafından
Noel Grandin
Kaydeden (comit)
Michael Stahl
May 09, 2012
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Convert SV_DECL_PTRARR_DEL(_UndoTblCpyTbl_Entries) to ptr_vector
üst
5fca48a9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
11 deletions
+9
-11
untbl.cxx
sw/source/core/undo/untbl.cxx
+9
-11
No files found.
sw/source/core/undo/untbl.cxx
Dosyayı görüntüle @
62a0ec2c
...
...
@@ -109,8 +109,7 @@ struct _UndoTblCpyTbl_Entry
_UndoTblCpyTbl_Entry
(
const
SwTableBox
&
rBox
);
~
_UndoTblCpyTbl_Entry
();
};
typedef
_UndoTblCpyTbl_Entry
*
_UndoTblCpyTbl_EntryPtr
;
SV_DECL_PTRARR_DEL
(
_UndoTblCpyTbl_Entries
,
_UndoTblCpyTbl_EntryPtr
,
0
)
class
_UndoTblCpyTbl_Entries
:
public
boost
::
ptr_vector
<
_UndoTblCpyTbl_Entry
>
{};
class
_SaveBox
;
class
_SaveLine
;
...
...
@@ -223,7 +222,6 @@ SV_IMPL_PTRARR( SfxItemSets, SfxItemSetPtr )
SV_IMPL_PTRARR
(
SwUndoSaveSections
,
SwUndoSaveSectionPtr
)
SV_IMPL_PTRARR
(
SwUndoMoves
,
SwUndoMovePtr
)
SV_IMPL_PTRARR
(
SwTblToTxtSaves
,
SwTblToTxtSavePtr
)
SV_IMPL_PTRARR
(
_UndoTblCpyTbl_Entries
,
_UndoTblCpyTbl_EntryPtr
)
sal_uInt16
aSave_BoxCntntSet
[]
=
{
RES_CHRATR_COLOR
,
RES_CHRATR_CROSSEDOUT
,
...
...
@@ -2497,9 +2495,9 @@ void SwUndoTblCpyTbl::UndoImpl(::sw::UndoRedoContext & rContext)
_DEBUG_REDLINE
(
&
rDoc
)
SwTableNode
*
pTblNd
=
0
;
for
(
sal_uInt16
n
=
pArr
->
Count
();
n
;
)
for
(
sal_uInt16
n
=
pArr
->
size
();
n
;
)
{
_UndoTblCpyTbl_Entry
*
pEntry
=
(
*
pArr
)[
--
n
];
_UndoTblCpyTbl_Entry
*
pEntry
=
&
(
*
pArr
)[
--
n
];
sal_uLong
nSttPos
=
pEntry
->
nBoxIdx
+
pEntry
->
nOffset
;
SwStartNode
*
pSNd
=
rDoc
.
GetNodes
()[
nSttPos
]
->
StartOfSectionNode
();
if
(
!
pTblNd
)
...
...
@@ -2648,9 +2646,9 @@ void SwUndoTblCpyTbl::RedoImpl(::sw::UndoRedoContext & rContext)
}
SwTableNode
*
pTblNd
=
0
;
for
(
sal_uInt16
n
=
0
;
n
<
pArr
->
Count
();
++
n
)
for
(
sal_uInt16
n
=
0
;
n
<
pArr
->
size
();
++
n
)
{
_UndoTblCpyTbl_Entry
*
pEntry
=
(
*
pArr
)[
n
];
_UndoTblCpyTbl_Entry
*
pEntry
=
&
(
*
pArr
)[
n
];
sal_uLong
nSttPos
=
pEntry
->
nBoxIdx
+
pEntry
->
nOffset
;
SwStartNode
*
pSNd
=
rDoc
.
GetNodes
()[
nSttPos
]
->
StartOfSectionNode
();
if
(
!
pTblNd
)
...
...
@@ -2725,11 +2723,11 @@ void SwUndoTblCpyTbl::RedoImpl(::sw::UndoRedoContext & rContext)
void
SwUndoTblCpyTbl
::
AddBoxBefore
(
const
SwTableBox
&
rBox
,
sal_Bool
bDelCntnt
)
{
if
(
pArr
->
Count
()
&&
!
bDelCntnt
)
if
(
!
pArr
->
empty
()
&&
!
bDelCntnt
)
return
;
_UndoTblCpyTbl_Entry
*
pEntry
=
new
_UndoTblCpyTbl_Entry
(
rBox
);
pArr
->
Insert
(
pEntry
,
pArr
->
Count
()
);
pArr
->
push_back
(
pEntry
);
SwDoc
*
pDoc
=
rBox
.
GetFrmFmt
()
->
GetDoc
();
_DEBUG_REDLINE
(
pDoc
)
...
...
@@ -2754,7 +2752,7 @@ void SwUndoTblCpyTbl::AddBoxBefore( const SwTableBox& rBox, sal_Bool bDelCntnt )
void
SwUndoTblCpyTbl
::
AddBoxAfter
(
const
SwTableBox
&
rBox
,
const
SwNodeIndex
&
rIdx
,
sal_Bool
bDelCntnt
)
{
_UndoTblCpyTbl_Entry
*
pEntry
=
(
*
pArr
)[
pArr
->
Count
()
-
1
]
;
_UndoTblCpyTbl_Entry
*
pEntry
=
&
(
*
pArr
).
back
()
;
// wurde der Inhalt geloescht, so loesche jetzt auch noch den temp.
// erzeugten Node
...
...
@@ -2876,7 +2874,7 @@ sal_Bool SwUndoTblCpyTbl::InsertRow( SwTable& rTbl, const SwSelBoxes& rBoxes,
sal_Bool
SwUndoTblCpyTbl
::
IsEmpty
()
const
{
return
!
pInsRowUndo
&&
!
pArr
->
Count
();
return
!
pInsRowUndo
&&
pArr
->
empty
();
}
...
...
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