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
9e0004f2
Kaydet (Commit)
9e0004f2
authored
Mar 15, 2016
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
recurse protection for XFConvert
Change-Id: Ib6008d4b07159acad26c7baeb775702119c12e3b
üst
c5bee7b8
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
25 additions
and
14 deletions
+25
-14
recurse-2.lwp
lotuswordpro/qa/cppunit/data/fail/recurse-2.lwp
+0
-0
lwpfootnote.cxx
lotuswordpro/source/filter/lwpfootnote.cxx
+1
-1
lwpframelayout.cxx
lotuswordpro/source/filter/lwpframelayout.cxx
+2
-2
lwpfribframe.cxx
lotuswordpro/source/filter/lwpfribframe.cxx
+1
-1
lwpnotes.cxx
lotuswordpro/source/filter/lwpnotes.cxx
+2
-2
lwpobj.cxx
lotuswordpro/source/filter/lwpobj.cxx
+1
-0
lwpobj.hxx
lotuswordpro/source/filter/lwpobj.hxx
+12
-2
lwppagelayout.cxx
lotuswordpro/source/filter/lwppagelayout.cxx
+2
-2
lwpstory.cxx
lotuswordpro/source/filter/lwpstory.cxx
+4
-4
No files found.
lotuswordpro/qa/cppunit/data/fail/recurse-2.lwp
0 → 100644
Dosyayı görüntüle @
9e0004f2
File added
lotuswordpro/source/filter/lwpfootnote.cxx
Dosyayı görüntüle @
9e0004f2
...
...
@@ -187,7 +187,7 @@ void LwpFootnote::XFConvert(XFContentContainer * pCont)
LwpContent
*
pContent
=
FindFootnoteContent
();
if
(
pContent
)
{
pContent
->
XFConvert
(
pCont
);
pContent
->
Do
XFConvert
(
pCont
);
}
}
...
...
lotuswordpro/source/filter/lwpframelayout.cxx
Dosyayı görüntüle @
9e0004f2
...
...
@@ -835,7 +835,7 @@ void LwpFrameLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart
rtl
::
Reference
<
LwpObject
>
content
=
m_Content
.
obj
();
if
(
content
.
is
())
{
content
->
XFConvert
(
pXFFrame
);
content
->
Do
XFConvert
(
pXFFrame
);
//set frame size according to ole size
ApplyGraphicSize
(
pXFFrame
);
}
...
...
@@ -1103,7 +1103,7 @@ void LwpGroupLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart
while
(
pLayout
&&
pLayout
!=
this
)
{
pLayout
->
XFConvert
(
pXFFrame
);
pLayout
->
Do
XFConvert
(
pXFFrame
);
pLayout
=
dynamic_cast
<
LwpVirtualLayout
*>
(
pLayout
->
GetNext
().
obj
().
get
());
}
...
...
lotuswordpro/source/filter/lwpfribframe.cxx
Dosyayı görüntüle @
9e0004f2
...
...
@@ -180,7 +180,7 @@ void LwpFribFrame::XFConvert(XFContentContainer* pCont)
}
}
pLayout
->
XFConvert
(
pXFContentContainer
);
pLayout
->
Do
XFConvert
(
pXFContentContainer
);
if
(
m_bRevisionFlag
)
{
...
...
lotuswordpro/source/filter/lwpnotes.cxx
Dosyayı görüntüle @
9e0004f2
...
...
@@ -181,7 +181,7 @@ void LwpNoteLayout::XFConvert(XFContentContainer * pCont)
LwpVirtualLayout
*
pTextLayout
=
GetTextLayout
();
if
(
pTextLayout
)
{
pTextLayout
->
XFConvert
(
pCont
);
pTextLayout
->
Do
XFConvert
(
pCont
);
}
}
...
...
@@ -290,7 +290,7 @@ void LwpNoteTextLayout::XFConvert(XFContentContainer * pCont)
rtl
::
Reference
<
LwpObject
>
pContent
=
m_Content
.
obj
();
if
(
pContent
.
is
())
{
pContent
->
XFConvert
(
pCont
);
pContent
->
Do
XFConvert
(
pCont
);
}
}
...
...
lotuswordpro/source/filter/lwpobj.cxx
Dosyayı görüntüle @
9e0004f2
...
...
@@ -62,6 +62,7 @@
LwpObject
::
LwpObject
(
LwpObjectHeader
objHdr
,
LwpSvStream
*
pStrm
)
:
m_ObjHdr
(
objHdr
),
m_pObjStrm
(
nullptr
),
m_pFoundry
(
nullptr
)
,
m_pStrm
(
pStrm
),
m_bRegisteringStyle
(
false
),
m_bParsingStyle
(
false
)
,
m_bConvertingContent
(
false
)
{
m_pObjStrm
=
new
LwpObjectStream
(
pStrm
,
m_ObjHdr
.
IsCompressed
(),
static_cast
<
sal_uInt16
>
(
m_ObjHdr
.
GetSize
())
);
...
...
lotuswordpro/source/filter/lwpobj.hxx
Dosyayı görüntüle @
9e0004f2
...
...
@@ -92,10 +92,12 @@ protected:
LwpSvStream
*
m_pStrm
;
bool
m_bRegisteringStyle
;
bool
m_bParsingStyle
;
bool
m_bConvertingContent
;
protected
:
virtual
void
Read
();
virtual
void
RegisterStyle
();
virtual
void
Parse
(
IXFStream
*
pOutputStream
);
virtual
void
XFConvert
(
XFContentContainer
*
pCont
);
public
:
void
QuickRead
();
//calls RegisterStyle but bails if DoRegisterStyle is called
...
...
@@ -118,8 +120,16 @@ public:
Parse
(
pOutputStream
);
m_bParsingStyle
=
false
;
}
virtual
void
XFConvert
(
XFContentContainer
*
pCont
);
//calls XFConvert but bails if DoXFConvert is called
//on the same object recursively
void
DoXFConvert
(
XFContentContainer
*
pCont
)
{
if
(
m_bConvertingContent
)
throw
std
::
runtime_error
(
"recursion in parsing"
);
m_bConvertingContent
=
true
;
XFConvert
(
pCont
);
m_bConvertingContent
=
false
;
}
LwpFoundry
*
GetFoundry
(){
return
m_pFoundry
;}
void
SetFoundry
(
LwpFoundry
*
pFoundry
){
m_pFoundry
=
pFoundry
;}
...
...
lotuswordpro/source/filter/lwppagelayout.cxx
Dosyayı görüntüle @
9e0004f2
...
...
@@ -889,7 +889,7 @@ void LwpHeaderLayout::RegisterStyle(XFMasterPage* mp1)
RegisterChildStyle
();
//End
pChangeMgr
->
SetHeadFootChange
(
pHeader
);
pStory
->
XFConvert
(
pHeader
);
pStory
->
Do
XFConvert
(
pHeader
);
pChangeMgr
->
SetHeadFootFribMap
(
false
);
}
...
...
@@ -1042,7 +1042,7 @@ void LwpFooterLayout::RegisterStyle(XFMasterPage* mp1)
pChangeMgr
->
SetHeadFootChange
(
pFooter
);
pStory
->
XFConvert
(
pFooter
);
pStory
->
Do
XFConvert
(
pFooter
);
pChangeMgr
->
SetHeadFootFribMap
(
false
);
}
...
...
lotuswordpro/source/filter/lwpstory.cxx
Dosyayı görüntüle @
9e0004f2
...
...
@@ -314,7 +314,7 @@ void LwpStory::XFConvertFrameInCell(XFContentContainer* pCont)
pCont
->
FindFirstContent
(
enumXFContentPara
));
XFContentContainer
*
pXFFirtPara
=
static_cast
<
XFContentContainer
*>
(
first
.
get
());
if
(
pXFFirtPara
)
xFrameLayout
->
XFConvert
(
pXFFirtPara
);
xFrameLayout
->
Do
XFConvert
(
pXFFirtPara
);
}
xFrameLayout
.
set
(
dynamic_cast
<
LwpVirtualLayout
*>
(
xFrameLayout
->
GetNext
().
obj
().
get
()));
}
...
...
@@ -338,7 +338,7 @@ void LwpStory::XFConvertFrameInPage(XFContentContainer* pCont)
||
xFrameLayout
->
IsSuperTable
()
||
xFrameLayout
->
IsGroupHead
())))
{
xFrameLayout
->
XFConvert
(
pCont
);
xFrameLayout
->
Do
XFConvert
(
pCont
);
}
xFrameLayout
.
set
(
dynamic_cast
<
LwpVirtualLayout
*>
(
xFrameLayout
->
GetNext
().
obj
().
get
()));
}
...
...
@@ -358,7 +358,7 @@ void LwpStory::XFConvertFrameInFrame(XFContentContainer* pCont)
{
if
(
xFrameLayout
->
IsAnchorFrame
())
{
xFrameLayout
->
XFConvert
(
pCont
);
xFrameLayout
->
Do
XFConvert
(
pCont
);
}
xFrameLayout
.
set
(
dynamic_cast
<
LwpVirtualLayout
*>
(
xFrameLayout
->
GetNext
().
obj
().
get
()));
}
...
...
@@ -383,7 +383,7 @@ void LwpStory::XFConvertFrameInHeaderFooter(XFContentContainer* pCont)
pCont
->
FindFirstContent
(
enumXFContentPara
));
XFContentContainer
*
pXFFirtPara
=
static_cast
<
XFContentContainer
*>
(
first
.
get
());
if
(
pXFFirtPara
)
xFrameLayout
->
XFConvert
(
pXFFirtPara
);
xFrameLayout
->
Do
XFConvert
(
pXFFirtPara
);
}
xFrameLayout
.
set
(
dynamic_cast
<
LwpVirtualLayout
*>
(
xFrameLayout
->
GetNext
().
obj
().
get
()));
}
...
...
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