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
9cab649c
Kaydet (Commit)
9cab649c
authored
Mar 27, 2012
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Resolves: fdo#47865 insertions into deque invalidate nLastCount
üst
919f7104
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
10 deletions
+12
-10
paintfrm.cxx
sw/source/core/layout/paintfrm.cxx
+12
-10
No files found.
sw/source/core/layout/paintfrm.cxx
Dosyayı görüntüle @
9cab649c
...
...
@@ -191,9 +191,9 @@ public:
class SwLineRects : public std::deque< SwLineRect >
{
s
td::deque< SwLineRect >::iterator
nLastCount; //avoid unnecessary cycles in PaintLines
s
ize_t
nLastCount; //avoid unnecessary cycles in PaintLines
public:
SwLineRects() : nLastCount(
this->begin()
) {}
SwLineRects() : nLastCount(
0
) {}
void AddLineRect( const SwRect& rRect, const Color *pColor, const SvxBorderStyle nStyle,
const SwTabFrm *pTab, const sal_uInt8 nSCol );
void ConnectEdges( OutputDevice *pOut );
...
...
@@ -827,7 +827,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
{
// Paint the borders. Sadly two passes are needed.
// Once for the inside and once for the outside edges of tables
if ( this->
end
() != nLastCount )
if ( this->
size
() != nLastCount )
{
// #i16816# tagged pdf support
SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pOut );
...
...
@@ -839,18 +839,18 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
const Color *pLast = 0;
sal_Bool bPaint2nd = sal_False;
SwLineRects::iterator nMinCount = this->end
();
size_t nMinCount = this->size
();
for (
SwLineRects::iterator it = this->begin(); it != this->end(); ++it
)
for (
size_t i = 0; i < size(); ++i
)
{
SwLineRect &rLRect =
*it
;
SwLineRect &rLRect =
operator[](i)
;
if ( rLRect.IsPainted() )
continue;
if ( rLRect.IsLocked() )
{
nMinCount = Min( nMinCount, i
t
);
nMinCount = Min( nMinCount, i );
continue;
}
...
...
@@ -905,15 +905,16 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
bPaint2nd = sal_True;
}
if ( bPaint2nd )
for (SwLineRects::iterator it = this->begin(); it != this->end(); ++it)
{
for ( size_t i = 0; i < size(); ++i )
{
SwLineRect &rLRect =
*it
;
SwLineRect &rLRect =
operator[](i)
;
if ( rLRect.IsPainted() )
continue;
if ( rLRect.IsLocked() )
{
nMinCount = Min( nMinCount, i
t
);
nMinCount = Min( nMinCount, i );
continue;
}
...
...
@@ -935,6 +936,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
lcl_DrawDashedRect( pOut, rLRect );
rLRect.SetPainted();
}
}
nLastCount = nMinCount;
pOut->Pop();
}
...
...
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