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
974492a0
Kaydet (Commit)
974492a0
authored
May 23, 2014
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sw: try not to include sw/souce/core stuff from sw/source/filter
Change-Id: I21f1de79ed0a6df73afc53d1c93450f9eef23ac6
üst
68ec7f48
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
29 deletions
+28
-29
Library_msword.mk
sw/Library_msword.mk
+0
-1
frmfmt.hxx
sw/inc/frmfmt.hxx
+2
-0
atrfrm.cxx
sw/source/core/layout/atrfrm.cxx
+25
-0
wrtw8esh.cxx
sw/source/filter/ww8/wrtw8esh.cxx
+1
-28
No files found.
sw/Library_msword.mk
Dosyayı görüntüle @
974492a0
...
...
@@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_custom_headers,msword,\
$(eval $(call gb_Library_set_precompiled_header,msword,$(SRCDIR)/sw/inc/pch/precompiled_msword))
$(eval $(call gb_Library_set_include,msword,\
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/filter/inc \
-I$(SRCDIR)/sw/inc \
$$(INCLUDE) \
...
...
sw/inc/frmfmt.hxx
Dosyayı görüntüle @
974492a0
...
...
@@ -295,6 +295,8 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL
(
SwDrawFrmFmt
);
};
SW_DLLPUBLIC
bool
IsFlyFrmFmtInHeader
(
const
SwFrmFmt
&
rFmt
);
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/core/layout/atrfrm.cxx
Dosyayı görüntüle @
974492a0
...
...
@@ -3304,4 +3304,29 @@ FillAttributesPtr SwFrmFmt::getFillAttributes() const
return
maFillAttributes
;
}
bool
IsFlyFrmFmtInHeader
(
const
SwFrmFmt
&
rFmt
)
{
const
SwFlyFrmFmt
*
pFlyFrmFmt
=
dynamic_cast
<
const
SwFlyFrmFmt
*>
(
&
rFmt
);
if
(
!
pFlyFrmFmt
)
return
false
;
SwFlyFrm
*
pFlyFrm
=
const_cast
<
SwFlyFrm
*>
(
pFlyFrmFmt
->
GetFrm
());
if
(
!
pFlyFrm
)
// fdo#54648: "hidden" drawing object has no layout frame
{
return
false
;
}
SwPageFrm
*
pPageFrm
=
pFlyFrm
->
FindPageFrmOfAnchor
();
SwFrm
*
pHeader
=
pPageFrm
->
Lower
();
if
(
pHeader
->
GetType
()
==
FRM_HEADER
)
{
const
SwFrm
*
pFrm
=
pFlyFrm
->
GetAnchorFrm
();
while
(
pFrm
)
{
if
(
pFrm
==
pHeader
)
return
true
;
pFrm
=
pFrm
->
GetUpper
();
}
}
return
false
;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/filter/ww8/wrtw8esh.cxx
Dosyayı görüntüle @
974492a0
...
...
@@ -58,8 +58,6 @@
#include <fmtfollowtextflow.hxx>
#include <dcontact.hxx>
#include <frmfmt.hxx>
#include <flyfrm.hxx>
#include <pagefrm.hxx>
#include <frmatr.hxx>
#include <fmtcntnt.hxx>
#include <ndindex.hxx>
...
...
@@ -1893,31 +1891,6 @@ void SwBasicEscherEx::WriteBrushAttr(const SvxBrushItem &rBrush,
}
}
static
bool
lcl_isInHeader
(
const
SwFrmFmt
&
rFmt
)
{
const
SwFlyFrmFmt
*
pFlyFrmFmt
=
dynamic_cast
<
const
SwFlyFrmFmt
*>
(
&
rFmt
);
if
(
!
pFlyFrmFmt
)
return
false
;
SwFlyFrm
*
pFlyFrm
=
const_cast
<
SwFlyFrm
*>
(
pFlyFrmFmt
->
GetFrm
());
if
(
!
pFlyFrm
)
// fdo#54648: "hidden" drawing object has no layout frame
{
return
false
;
}
SwPageFrm
*
pPageFrm
=
pFlyFrm
->
FindPageFrmOfAnchor
();
SwFrm
*
pHeader
=
pPageFrm
->
Lower
();
if
(
pHeader
->
GetType
()
==
FRM_HEADER
)
{
const
SwFrm
*
pFrm
=
pFlyFrm
->
GetAnchorFrm
();
while
(
pFrm
)
{
if
(
pFrm
==
pHeader
)
return
true
;
pFrm
=
pFrm
->
GetUpper
();
}
}
return
false
;
}
sal_Int32
SwBasicEscherEx
::
WriteFlyFrameAttr
(
const
SwFrmFmt
&
rFmt
,
MSO_SPT
eShapeType
,
EscherPropertyContainer
&
rPropOpt
)
{
...
...
@@ -2061,7 +2034,7 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt,
// SwWW8ImplReader::Read_GrafLayer() imports these as opaque
// unconditionally, so if both are true, don't export the property.
bool
bIsInHeader
=
lcl_is
InHeader
(
rFmt
);
bool
bIsInHeader
=
IsFlyFrmFmt
InHeader
(
rFmt
);
bool
bIsThrought
=
rFmt
.
GetSurround
().
GetValue
()
==
SURROUND_THROUGHT
;
if
(
bIsInHeader
)
...
...
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