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
61dc0d2c
Kaydet (Commit)
61dc0d2c
authored
Nis 29, 2013
tarafından
Michael Meeks
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fdo#62336 - fix horribly coupled table rendering code to not crash.
Change-Id: I7a6ee4dce338b7529fa7500bb0c8341a4f2ebc22
üst
a1f3824e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
0 deletions
+10
-0
wrtswtbl.cxx
sw/source/filter/writer/wrtswtbl.cxx
+10
-0
No files found.
sw/source/filter/writer/wrtswtbl.cxx
Dosyayı görüntüle @
61dc0d2c
...
@@ -396,6 +396,10 @@ sal_Bool SwWriteTable::ShouldExpandSub(const SwTableBox *pBox, sal_Bool /*bExpan
...
@@ -396,6 +396,10 @@ sal_Bool SwWriteTable::ShouldExpandSub(const SwTableBox *pBox, sal_Bool /*bExpan
return
!
pBox
->
GetSttNd
()
&&
nDepth
>
0
;
return
!
pBox
->
GetSttNd
()
&&
nDepth
>
0
;
}
}
// FIXME: the degree of coupling between this method and
// FillTableRowsCols which is called immediately afterwards
// is -extremely- unpleasant and potentially problematic.
void
SwWriteTable
::
CollectTableRowsCols
(
long
nStartRPos
,
void
SwWriteTable
::
CollectTableRowsCols
(
long
nStartRPos
,
sal_uInt32
nStartCPos
,
sal_uInt32
nStartCPos
,
long
nParentLineHeight
,
long
nParentLineHeight
,
...
@@ -740,8 +744,14 @@ SwWriteTable::SwWriteTable(const SwTableLines& rLines, long nWidth,
...
@@ -740,8 +744,14 @@ SwWriteTable::SwWriteTable(const SwTableLines& rLines, long nWidth,
// case the end of a column
// case the end of a column
SwWriteTableCol
*
pCol
=
new
SwWriteTableCol
(
nParentWidth
);
SwWriteTableCol
*
pCol
=
new
SwWriteTableCol
(
nParentWidth
);
aCols
.
insert
(
pCol
);
aCols
.
insert
(
pCol
);
bUseLayoutHeights
=
true
;
CollectTableRowsCols
(
0
,
0
,
0
,
nParentWidth
,
rLines
,
nMaxDepth
-
1
);
CollectTableRowsCols
(
0
,
0
,
0
,
nParentWidth
,
rLines
,
nMaxDepth
-
1
);
// FIXME: awfully GetLineHeight writes to this in its first call
// and proceeds to return a rather odd number fdo#62336, we have to
// behave identically since the code in FillTableRowsCols duplicates
// and is highly coupled to CollectTableRowsCols - sadly.
bUseLayoutHeights
=
true
;
// And now fill with life
// And now fill with life
FillTableRowsCols
(
0
,
0
,
0
,
0
,
0
,
nParentWidth
,
rLines
,
0
,
nMaxDepth
-
1
,
static_cast
<
sal_uInt16
>
(
nNumOfRowsToRepeat
)
);
FillTableRowsCols
(
0
,
0
,
0
,
0
,
0
,
nParentWidth
,
rLines
,
0
,
nMaxDepth
-
1
,
static_cast
<
sal_uInt16
>
(
nNumOfRowsToRepeat
)
);
...
...
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