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
80509545
Kaydet (Commit)
80509545
authored
Ara 13, 2015
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
hold WaterMarkLayout by reference
Change-Id: I7dc7739ee7b958319ddd4e0cf262254728ef0569
üst
64cfe976
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
16 deletions
+18
-16
lwpframelayout.cxx
lotuswordpro/source/filter/lwpframelayout.cxx
+8
-7
lwplayout.cxx
lotuswordpro/source/filter/lwplayout.cxx
+9
-8
lwplayout.hxx
lotuswordpro/source/filter/lwplayout.hxx
+1
-1
No files found.
lotuswordpro/source/filter/lwpframelayout.cxx
Dosyayı görüntüle @
80509545
...
...
@@ -272,7 +272,7 @@ void LwpFrame::ApplyWrapType(XFFrameStyle *pFrameStyle)
case
LwpPlacableLayout
:
:
LAY_NO_WRAP_AROUND
:
{
eWrap
=
enumXFWrapRunThrough
;
if
(
!
m_pLayout
->
GetBackColor
()
&&
!
m_pLayout
->
GetWaterMarkLayout
())
if
(
!
m_pLayout
->
GetBackColor
()
&&
!
m_pLayout
->
GetWaterMarkLayout
()
.
is
()
)
{
//pFrameStyle->SetBackGround(sal_True);
XFColor
aXFColor
(
0xffffff
);
//white color
...
...
@@ -534,12 +534,13 @@ void LwpFrame::ApplyWatermark(XFFrameStyle *pFrameStyle)
{
pFrameStyle
->
SetBackImage
(
pBGImage
);
//set watermark transparent
LwpMiddleLayout
*
pLay
=
static_cast
<
LwpMiddleLayout
*>
(
m_pLayout
->
GetWaterMarkLayout
());
LwpBackgroundStuff
*
pBackgroundStuff
=
pLay
->
GetBackgroundStuff
();
if
(
pBackgroundStuff
&&
!
pBackgroundStuff
->
IsTransparent
())
{
pFrameStyle
->
SetTransparency
(
100
);
}
rtl
::
Reference
<
LwpVirtualLayout
>
xWaterMarkLayout
(
m_pLayout
->
GetWaterMarkLayout
());
LwpMiddleLayout
*
pLay
=
dynamic_cast
<
LwpMiddleLayout
*>
(
xWaterMarkLayout
.
get
());
LwpBackgroundStuff
*
pBackgroundStuff
=
pLay
?
pLay
->
GetBackgroundStuff
()
:
nullptr
;
if
(
pBackgroundStuff
&&
!
pBackgroundStuff
->
IsTransparent
())
{
pFrameStyle
->
SetTransparency
(
100
);
}
}
}
...
...
lotuswordpro/source/filter/lwplayout.cxx
Dosyayı görüntüle @
80509545
...
...
@@ -1357,18 +1357,18 @@ bool LwpMiddleLayout::IsProtected()
* @descr: Get watermark layout
*
*/
LwpVirtualLayout
*
LwpMiddleLayout
::
GetWaterMarkLayout
()
rtl
::
Reference
<
LwpVirtualLayout
>
LwpMiddleLayout
::
GetWaterMarkLayout
()
{
LwpVirtualLayout
*
pLay
=
dynamic_cast
<
LwpVirtualLayout
*>
(
GetChildHead
().
obj
().
get
(
));
while
(
pLay
)
rtl
::
Reference
<
LwpVirtualLayout
>
xLay
(
dynamic_cast
<
LwpVirtualLayout
*>
(
GetChildHead
().
obj
().
get
()
));
while
(
xLay
.
is
()
)
{
if
(
p
Lay
->
IsForWaterMark
())
if
(
x
Lay
->
IsForWaterMark
())
{
return
p
Lay
;
return
x
Lay
;
}
pLay
=
dynamic_cast
<
LwpVirtualLayout
*>
(
pLay
->
GetNext
().
obj
().
get
(
));
xLay
.
set
(
dynamic_cast
<
LwpVirtualLayout
*>
(
xLay
->
GetNext
().
obj
().
get
()
));
}
return
nullptr
;
return
rtl
::
Reference
<
LwpVirtualLayout
>
()
;
}
/**
...
...
@@ -1377,7 +1377,8 @@ LwpVirtualLayout* LwpMiddleLayout::GetWaterMarkLayout()
*/
XFBGImage
*
LwpMiddleLayout
::
GetXFBGImage
()
{
LwpMiddleLayout
*
pLay
=
static_cast
<
LwpMiddleLayout
*>
(
GetWaterMarkLayout
());
rtl
::
Reference
<
LwpVirtualLayout
>
xWaterMarkLayout
(
GetWaterMarkLayout
());
LwpMiddleLayout
*
pLay
=
dynamic_cast
<
LwpMiddleLayout
*>
(
xWaterMarkLayout
.
get
());
if
(
pLay
)
{
//test BGImage
...
...
lotuswordpro/source/filter/lwplayout.hxx
Dosyayı görüntüle @
80509545
...
...
@@ -322,7 +322,7 @@ public:
virtual
sal_uInt8
GetContentOrientation
()
override
;
virtual
bool
HonorProtection
()
override
;
virtual
bool
IsProtected
()
override
;
LwpVirtualLayout
*
GetWaterMarkLayout
();
rtl
::
Reference
<
LwpVirtualLayout
>
GetWaterMarkLayout
();
XFBGImage
*
GetXFBGImage
();
bool
GetUsePrinterSettings
();
...
...
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