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
a8a26535
Kaydet (Commit)
a8a26535
authored
Haz 04, 2014
tarafından
Armin Le Grand
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Corrected GetDrawBackgrdColor to return a value, not a reference, removed unused var
üst
08030236
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
pagefrm.hxx
sw/source/core/inc/pagefrm.hxx
+1
-1
paintfrm.cxx
sw/source/core/layout/paintfrm.cxx
+5
-6
No files found.
sw/source/core/inc/pagefrm.hxx
Dosyayı görüntüle @
a8a26535
...
@@ -317,7 +317,7 @@ public:
...
@@ -317,7 +317,7 @@ public:
@return reference to an instance of class Color
@return reference to an instance of class Color
*/
*/
const
Color
&
GetDrawBackgrdColor
()
const
;
const
Color
GetDrawBackgrdColor
()
const
;
/** paint margin area of a page
/** paint margin area of a page
...
...
sw/source/core/layout/paintfrm.cxx
Dosyayı görüntüle @
a8a26535
...
@@ -308,8 +308,7 @@ void SwCalcPixStatics( OutputDevice *pOut )
...
@@ -308,8 +308,7 @@ void SwCalcPixStatics( OutputDevice *pOut )
//Zum Sichern der statics, damit das Paint (quasi) reentrant wird.
//Zum Sichern der statics, damit das Paint (quasi) reentrant wird.
class
SwSavePaintStatics
class
SwSavePaintStatics
{
{
sal_Bool
bSFlyMetafile
,
sal_Bool
bSFlyMetafile
;
// not used: bSPageOnly;
bSPageOnly
;
ViewShell
*
pSGlobalShell
;
ViewShell
*
pSGlobalShell
;
OutputDevice
*
pSFlyMetafileOut
;
OutputDevice
*
pSFlyMetafileOut
;
SwFlyFrm
*
pSRetoucheFly
,
SwFlyFrm
*
pSRetoucheFly
,
...
@@ -3011,7 +3010,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const
...
@@ -3011,7 +3010,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const
/// OD 29.08.2002 #102450#
/// OD 29.08.2002 #102450#
/// determine background color of page for <PaintLayer> method
/// determine background color of page for <PaintLayer> method
/// calls, paint <hell> or <heaven>
/// calls, paint <hell> or <heaven>
const
Color
aPageBackgrdColor
=
pPage
->
GetDrawBackgrdColor
(
);
const
Color
aPageBackgrdColor
(
pPage
->
GetDrawBackgrdColor
()
);
pPage
->
PaintBaBo
(
aPaintRect
,
pPage
,
sal_True
);
pPage
->
PaintBaBo
(
aPaintRect
,
pPage
,
sal_True
);
...
@@ -6489,7 +6488,7 @@ void SwLayoutFrm::RefreshExtraData( const SwRect &rRect ) const
...
@@ -6489,7 +6488,7 @@ void SwLayoutFrm::RefreshExtraData( const SwRect &rRect ) const
@return Color
@return Color
*/
*/
const
Color
&
SwPageFrm
::
GetDrawBackgrdColor
()
const
const
Color
SwPageFrm
::
GetDrawBackgrdColor
()
const
{
{
const
SvxBrushItem
*
pBrushItem
;
const
SvxBrushItem
*
pBrushItem
;
const
Color
*
pDummyColor
;
const
Color
*
pDummyColor
;
...
@@ -6605,7 +6604,7 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const
...
@@ -6605,7 +6604,7 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const
SwRect
aRetouchePart
(
rRetouche
);
SwRect
aRetouchePart
(
rRetouche
);
if
(
aRetouchePart
.
HasArea
()
)
if
(
aRetouchePart
.
HasArea
()
)
{
{
const
Color
aPageBackgrdColor
=
pPage
->
GetDrawBackgrdColor
(
);
const
Color
aPageBackgrdColor
(
pPage
->
GetDrawBackgrdColor
()
);
const
IDocumentDrawModelAccess
*
pIDDMA
=
pSh
->
getIDocumentDrawModelAccess
();
const
IDocumentDrawModelAccess
*
pIDDMA
=
pSh
->
getIDocumentDrawModelAccess
();
// --> OD #i76669#
// --> OD #i76669#
SwViewObjectContactRedirector
aSwRedirector
(
*
pSh
);
SwViewObjectContactRedirector
aSwRedirector
(
*
pSh
);
...
@@ -6881,7 +6880,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
...
@@ -6881,7 +6880,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
// OD 09.12.2002 #103045# - determine page, fly frame is on
// OD 09.12.2002 #103045# - determine page, fly frame is on
const
SwPageFrm
*
pFlyPage
=
pFly
->
FindPageFrm
();
const
SwPageFrm
*
pFlyPage
=
pFly
->
FindPageFrm
();
const
Color
aPageBackgrdColor
=
pFlyPage
->
GetDrawBackgrdColor
(
);
const
Color
aPageBackgrdColor
(
pFlyPage
->
GetDrawBackgrdColor
()
);
const
IDocumentDrawModelAccess
*
pIDDMA
=
pSh
->
getIDocumentDrawModelAccess
();
const
IDocumentDrawModelAccess
*
pIDDMA
=
pSh
->
getIDocumentDrawModelAccess
();
// --> OD #i76669#
// --> OD #i76669#
SwViewObjectContactRedirector
aSwRedirector
(
*
pSh
);
SwViewObjectContactRedirector
aSwRedirector
(
*
pSh
);
...
...
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