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
c9e146f0
Kaydet (Commit)
c9e146f0
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(SwTblToTxtSaves) to boost::ptr_vector
üst
62a0ec2c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
8 deletions
+9
-8
untbl.cxx
sw/source/core/undo/untbl.cxx
+9
-8
No files found.
sw/source/core/undo/untbl.cxx
Dosyayı görüntüle @
c9e146f0
...
@@ -94,8 +94,10 @@ typedef SwUndoMove* SwUndoMovePtr;
...
@@ -94,8 +94,10 @@ typedef SwUndoMove* SwUndoMovePtr;
SV_DECL_PTRARR_DEL
(
SwUndoMoves
,
SwUndoMovePtr
,
0
)
SV_DECL_PTRARR_DEL
(
SwUndoMoves
,
SwUndoMovePtr
,
0
)
struct
SwTblToTxtSave
;
struct
SwTblToTxtSave
;
typedef
SwTblToTxtSave
*
SwTblToTxtSavePtr
;
class
SwTblToTxtSaves
:
public
boost
::
ptr_vector
<
SwTblToTxtSave
>
{
SV_DECL_PTRARR_DEL
(
SwTblToTxtSaves
,
SwTblToTxtSavePtr
,
0
)
public
:
SwTblToTxtSaves
(
size_type
n
)
:
boost
::
ptr_vector
<
SwTblToTxtSave
>
(
n
)
{}
};
struct
_UndoTblCpyTbl_Entry
struct
_UndoTblCpyTbl_Entry
{
{
...
@@ -221,7 +223,6 @@ struct SwTblToTxtSave
...
@@ -221,7 +223,6 @@ struct SwTblToTxtSave
SV_IMPL_PTRARR
(
SfxItemSets
,
SfxItemSetPtr
)
SV_IMPL_PTRARR
(
SfxItemSets
,
SfxItemSetPtr
)
SV_IMPL_PTRARR
(
SwUndoSaveSections
,
SwUndoSaveSectionPtr
)
SV_IMPL_PTRARR
(
SwUndoSaveSections
,
SwUndoSaveSectionPtr
)
SV_IMPL_PTRARR
(
SwUndoMoves
,
SwUndoMovePtr
)
SV_IMPL_PTRARR
(
SwUndoMoves
,
SwUndoMovePtr
)
SV_IMPL_PTRARR
(
SwTblToTxtSaves
,
SwTblToTxtSavePtr
)
sal_uInt16
aSave_BoxCntntSet
[]
=
{
sal_uInt16
aSave_BoxCntntSet
[]
=
{
RES_CHRATR_COLOR
,
RES_CHRATR_CROSSEDOUT
,
RES_CHRATR_COLOR
,
RES_CHRATR_CROSSEDOUT
,
...
@@ -424,7 +425,7 @@ SwUndoTblToTxt::SwUndoTblToTxt( const SwTable& rTbl, sal_Unicode cCh )
...
@@ -424,7 +425,7 @@ SwUndoTblToTxt::SwUndoTblToTxt( const SwTable& rTbl, sal_Unicode cCh )
cTrenner
(
cCh
),
nHdlnRpt
(
rTbl
.
GetRowsToRepeat
()
)
cTrenner
(
cCh
),
nHdlnRpt
(
rTbl
.
GetRowsToRepeat
()
)
{
{
pTblSave
=
new
_SaveTable
(
rTbl
);
pTblSave
=
new
_SaveTable
(
rTbl
);
pBoxSaves
=
new
SwTblToTxtSaves
(
(
sal_uInt8
)
rTbl
.
GetTabSortBoxes
().
Count
()
);
pBoxSaves
=
new
SwTblToTxtSaves
(
(
SwTblToTxtSaves
::
size_type
)
rTbl
.
GetTabSortBoxes
().
Count
()
);
if
(
rTbl
.
IsA
(
TYPE
(
SwDDETable
)
)
)
if
(
rTbl
.
IsA
(
TYPE
(
SwDDETable
)
)
)
pDDEFldType
=
(
SwDDEFieldType
*
)((
SwDDETable
&
)
rTbl
).
GetDDEFldType
()
->
Copy
();
pDDEFldType
=
(
SwDDEFieldType
*
)((
SwDDETable
&
)
rTbl
).
GetDDEFldType
()
->
Copy
();
...
@@ -561,13 +562,13 @@ SwTableNode* SwNodes::UndoTableToText( sal_uLong nSttNd, sal_uLong nEndNd,
...
@@ -561,13 +562,13 @@ SwTableNode* SwNodes::UndoTableToText( sal_uLong nSttNd, sal_uLong nEndNd,
// SaveStruct
// SaveStruct
SwTableBoxFmt
*
pBoxFmt
=
GetDoc
()
->
MakeTableBoxFmt
();
SwTableBoxFmt
*
pBoxFmt
=
GetDoc
()
->
MakeTableBoxFmt
();
SwTableLineFmt
*
pLineFmt
=
GetDoc
()
->
MakeTableLineFmt
();
SwTableLineFmt
*
pLineFmt
=
GetDoc
()
->
MakeTableLineFmt
();
SwTableLine
*
pLine
=
new
SwTableLine
(
pLineFmt
,
rSavedData
.
Count
(),
0
);
SwTableLine
*
pLine
=
new
SwTableLine
(
pLineFmt
,
rSavedData
.
size
(),
0
);
pTblNd
->
GetTable
().
GetTabLines
().
C40_INSERT
(
SwTableLine
,
pLine
,
0
);
pTblNd
->
GetTable
().
GetTabLines
().
C40_INSERT
(
SwTableLine
,
pLine
,
0
);
std
::
vector
<
sal_uLong
>
aBkmkArr
;
std
::
vector
<
sal_uLong
>
aBkmkArr
;
for
(
sal_uInt16
n
=
rSavedData
.
Count
();
n
;
)
for
(
sal_uInt16
n
=
rSavedData
.
size
();
n
;
)
{
{
SwTblToTxtSave
*
pSave
=
rSavedData
[
--
n
];
const
SwTblToTxtSave
*
pSave
=
&
rSavedData
[
--
n
];
// if the start node was merged with last from prev. cell,
// if the start node was merged with last from prev. cell,
// subtract 1 from index to get the merged paragraph, and split that
// subtract 1 from index to get the merged paragraph, and split that
aSttIdx
=
pSave
->
m_nSttNd
-
(
(
USHRT_MAX
!=
pSave
->
m_nCntnt
)
?
1
:
0
);
aSttIdx
=
pSave
->
m_nSttNd
-
(
(
USHRT_MAX
!=
pSave
->
m_nCntnt
)
?
1
:
0
);
...
@@ -707,7 +708,7 @@ void SwUndoTblToTxt::SetRange( const SwNodeRange& rRg )
...
@@ -707,7 +708,7 @@ void SwUndoTblToTxt::SetRange( const SwNodeRange& rRg )
void
SwUndoTblToTxt
::
AddBoxPos
(
SwDoc
&
rDoc
,
sal_uLong
nNdIdx
,
sal_uLong
nEndIdx
,
xub_StrLen
nCntntIdx
)
void
SwUndoTblToTxt
::
AddBoxPos
(
SwDoc
&
rDoc
,
sal_uLong
nNdIdx
,
sal_uLong
nEndIdx
,
xub_StrLen
nCntntIdx
)
{
{
SwTblToTxtSave
*
pNew
=
new
SwTblToTxtSave
(
rDoc
,
nNdIdx
,
nEndIdx
,
nCntntIdx
);
SwTblToTxtSave
*
pNew
=
new
SwTblToTxtSave
(
rDoc
,
nNdIdx
,
nEndIdx
,
nCntntIdx
);
pBoxSaves
->
Insert
(
pNew
,
pBoxSaves
->
Count
()
);
pBoxSaves
->
push_back
(
pNew
);
}
}
// -----------------------------------------------------
// -----------------------------------------------------
...
...
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