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
6dc48ef5
Kaydet (Commit)
6dc48ef5
authored
May 19, 2014
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fdo#78149: assert if SwVirtFlyDrawObj is being painted with no ViewPort set
Change-Id: I2f94a28d85fa31c5623ff0c6067edc7060998d9e
üst
638b8086
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
dflyobj.cxx
sw/source/core/draw/dflyobj.cxx
+7
-3
dflyobj.hxx
sw/source/core/inc/dflyobj.hxx
+2
-1
No files found.
sw/source/core/draw/dflyobj.cxx
Dosyayı görüntüle @
6dc48ef5
...
...
@@ -168,7 +168,7 @@ namespace drawinglayer
virtual
basegfx
::
B2DRange
getB2DRange
(
const
geometry
::
ViewInformation2D
&
rViewInformation
)
const
SAL_OVERRIDE
;
// over
loaded
to allow callbacks to wrap_DoPaintObject
// over
ride
to allow callbacks to wrap_DoPaintObject
virtual
Primitive2DSequence
get2DDecomposition
(
const
geometry
::
ViewInformation2D
&
rViewInformation
)
const
SAL_OVERRIDE
;
// data read access
...
...
@@ -233,7 +233,7 @@ namespace drawinglayer
// when they do not know this primitive (and they do not). Inside wrap_DoPaintObject
// there needs to be a test that paint is only done during SW repaints (see there).
// Using this mechanism guarantees the correct Z-Order of the VirtualObject-based FlyFrames.
getSwVirtFlyDrawObj
().
wrap_DoPaintObject
();
getSwVirtFlyDrawObj
().
wrap_DoPaintObject
(
rViewInformation
);
// call parent
return
BufferedDecompositionPrimitive2D
::
get2DDecomposition
(
rViewInformation
);
...
...
@@ -445,7 +445,8 @@ namespace
}
// <--
void
SwVirtFlyDrawObj
::
wrap_DoPaintObject
()
const
void
SwVirtFlyDrawObj
::
wrap_DoPaintObject
(
drawinglayer
::
geometry
::
ViewInformation2D
const
&
rViewInformation
)
const
{
SwViewShell
*
pShell
=
pFlyFrm
->
getRootFrm
()
->
GetCurrShell
();
...
...
@@ -465,6 +466,9 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject() const
if
(
bDrawObject
)
{
// if there's no viewport set, all fly-frames will be painted,
// which is slow, wastes memory, and can cause other trouble.
assert
(
!
rViewInformation
.
getViewport
().
isEmpty
());
if
(
!
pFlyFrm
->
IsFlyInCntFrm
()
)
{
// it is also necessary to restore the VCL MapMode from ViewInformation since e.g.
...
...
sw/source/core/inc/dflyobj.hxx
Dosyayı görüntüle @
6dc48ef5
...
...
@@ -70,7 +70,8 @@ protected:
public
:
// for paints triggered form ExecutePrimitive
void
wrap_DoPaintObject
()
const
;
void
wrap_DoPaintObject
(
drawinglayer
::
geometry
::
ViewInformation2D
const
&
)
const
;
// for simple access to inner and outer bounds
basegfx
::
B2DRange
getOuterBound
()
const
;
...
...
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