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
1940d00e
Kaydet (Commit)
1940d00e
authored
Nis 24, 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(SwBoxFrmFmts) to std::vector
üst
01bd9471
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
11 deletions
+10
-11
rtftbl.cxx
sw/source/filter/rtf/rtftbl.cxx
+10
-11
No files found.
sw/source/filter/rtf/rtftbl.cxx
Dosyayı görüntüle @
1940d00e
...
...
@@ -49,8 +49,7 @@
using
namespace
::
com
::
sun
::
star
;
typedef
SwTableBoxFmt
*
SwTableBoxFmtPtr
;
SV_DECL_PTRARR
(
SwBoxFrmFmts
,
SwTableBoxFmtPtr
,
25
)
typedef
std
::
vector
<
SwTableBoxFmt
*>
SwBoxFrmFmts
;
class
SwShareBoxFmts
;
extern
void
_DeleteBox
(
SwTable
&
rTbl
,
SwTableBox
*
pBox
,
SwUndo
*
=
0
,
...
...
@@ -297,7 +296,7 @@ void SwRTFParser::ReadTable( int nToken )
{
// neue Zellen lesen und noch keine Formate vorhanden,
// dann benutze das der vorhergebende
if
(
bReadNewCell
&&
!
aBoxFmts
.
Count
()
)
if
(
bReadNewCell
&&
aBoxFmts
.
empty
()
)
{
SwTableLines
&
rLns
=
pTableNode
->
GetTable
().
GetTabLines
();
SwTableLine
*
pLine
=
rLns
[
rLns
.
Count
()
-
1
];
...
...
@@ -309,7 +308,7 @@ void SwRTFParser::ReadTable( int nToken )
pLine
->
GetTabBoxes
()[
m_nCurrentBox
]
->
GetFrmFmt
());
}
else
pFmt
=
aBoxFmts
[
aBoxFmts
.
Count
()
-
1
]
;
pFmt
=
aBoxFmts
.
back
()
;
// #i73790# - method renamed
pBoxFmt
->
ResetAllFmtAttr
();
...
...
@@ -324,7 +323,7 @@ void SwRTFParser::ReadTable( int nToken )
aRow
.
mbUseRightRowPad
=
sal_True
;
}
SetRowBorder
((
SfxItemSet
&
)
pBoxFmt
->
GetAttrSet
(),
aRow
);
aBoxFmts
.
Insert
(
pBoxFmt
,
aBoxFmts
.
Count
()
);
aBoxFmts
.
push_back
(
pBoxFmt
);
pBoxFmt
=
pDoc
->
MakeTableBoxFmt
();
}
...
...
@@ -549,7 +548,7 @@ void SwRTFParser::ReadTable( int nToken )
pNewLine
=
(
*
pLns
)[
pLns
->
Count
()
-
1
];
// jetzt die Boxen abgleichen
sal_uInt16
nBoxes
=
Min
(
pNewLine
->
GetTabBoxes
().
Count
(),
aBoxFmts
.
Count
()
);
sal_uInt16
nBoxes
=
Min
(
pNewLine
->
GetTabBoxes
().
Count
(),
(
sal_uInt16
)
aBoxFmts
.
size
()
);
sal_uInt16
n
;
for
(
n
=
0
;
n
<
nBoxes
;
++
n
)
...
...
@@ -558,9 +557,9 @@ void SwRTFParser::ReadTable( int nToken )
*
pBox
->
GetFrmFmt
()
=
*
aBoxFmts
[
n
];
delete
aBoxFmts
[
n
];
}
aBoxFmts
.
Remove
(
0
,
n
);
aBoxFmts
.
erase
(
aBoxFmts
.
begin
(),
aBoxFmts
.
begin
()
+
n
);
if
(
aBoxFmts
.
Count
()
)
// es muessen noch neue zugefuegt werden
if
(
!
aBoxFmts
.
empty
()
)
// es muessen noch neue zugefuegt werden
{
m_nCurrentBox
=
n
;
}
...
...
@@ -630,7 +629,7 @@ void SwRTFParser::ReadTable( int nToken )
{
pNewLine
=
new
SwTableLine
(
(
SwTableLineFmt
*
)
rLns
[
rLns
.
Count
()
-
1
]
->
GetFrmFmt
(),
aBoxFmts
.
Count
(),
0
);
aBoxFmts
.
size
(),
0
);
pNewLine
->
ClaimFrmFmt
();
pNewLine
->
GetFrmFmt
()
->
ResetFmtAttr
(
RES_FRM_SIZE
);
rLns
.
C40_INSERT
(
SwTableLine
,
pNewLine
,
rLns
.
Count
()
);
...
...
@@ -696,7 +695,7 @@ void SwRTFParser::ReadTable( int nToken )
pNewLine
->
ClaimFrmFmt
()
->
SetFmtAttr
(
SwFmtRowSplit
(
!
bCantSplit
));
if
(
aBoxFmts
.
Count
()
)
if
(
!
aBoxFmts
.
empty
()
)
{
// setze das default Style
SwTxtFmtColl
*
pColl
=
NULL
;
...
...
@@ -723,7 +722,7 @@ void SwRTFParser::ReadTable( int nToken )
nRowsToRepeat
=
0
;
}
for
(
;
nStt
<
aBoxFmts
.
Count
();
++
nStt
)
for
(
;
nStt
<
aBoxFmts
.
size
();
++
nStt
)
{
pDoc
->
GetNodes
().
InsBoxen
(
pTableNode
,
pNewLine
,
aBoxFmts
[
nStt
],
...
...
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