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
76220aaf
Kaydet (Commit)
76220aaf
authored
Ara 13, 2015
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
guard against infinite recursion
Change-Id: I1b566c835b6cdc733d0aa4393d3b3ce2ff7b764f
üst
012bdecf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
lwpdoc.cxx
lotuswordpro/source/filter/lwpdoc.cxx
+3
-2
lwpdoc.hxx
lotuswordpro/source/filter/lwpdoc.hxx
+11
-1
No files found.
lotuswordpro/source/filter/lwpdoc.cxx
Dosyayı görüntüle @
76220aaf
...
@@ -71,6 +71,7 @@
...
@@ -71,6 +71,7 @@
LwpDocument
::
LwpDocument
(
LwpObjectHeader
&
objHdr
,
LwpSvStream
*
pStrm
)
LwpDocument
::
LwpDocument
(
LwpObjectHeader
&
objHdr
,
LwpSvStream
*
pStrm
)
:
LwpDLNFPVList
(
objHdr
,
pStrm
)
:
LwpDLNFPVList
(
objHdr
,
pStrm
)
,
m_pOwnedFoundry
(
nullptr
)
,
m_pOwnedFoundry
(
nullptr
)
,
m_bGettingFirstDivisionWithContentsThatIsNotOLE
(
false
)
,
m_nFlags
(
0
)
,
m_nFlags
(
0
)
,
m_nPersistentFlags
(
0
)
,
m_nPersistentFlags
(
0
)
,
m_pLnOpts
(
nullptr
)
,
m_pLnOpts
(
nullptr
)
...
@@ -619,7 +620,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
...
@@ -619,7 +620,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
/**
/**
* @descr Get first division with contents that is not ole, copy from lwp-source code
* @descr Get first division with contents that is not ole, copy from lwp-source code
*/
*/
LwpDocument
*
LwpDocument
::
GetFirstDivisionWithContentsThatIsNotOLE
()
LwpDocument
*
LwpDocument
::
Impl
GetFirstDivisionWithContentsThatIsNotOLE
()
{
{
LwpDivInfo
*
pDivInfo
=
dynamic_cast
<
LwpDivInfo
*>
(
GetDivInfoID
().
obj
().
get
());
LwpDivInfo
*
pDivInfo
=
dynamic_cast
<
LwpDivInfo
*>
(
GetDivInfoID
().
obj
().
get
());
if
(
pDivInfo
&&
pDivInfo
->
HasContents
()
if
(
pDivInfo
&&
pDivInfo
->
HasContents
()
...
@@ -628,7 +629,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
...
@@ -628,7 +629,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
LwpDocument
*
pDivision
=
GetFirstDivision
();
LwpDocument
*
pDivision
=
GetFirstDivision
();
while
(
pDivision
&&
pDivision
!=
this
)
while
(
pDivision
)
{
{
LwpDocument
*
pContentDivision
=
pDivision
->
GetFirstDivisionWithContentsThatIsNotOLE
();
LwpDocument
*
pContentDivision
=
pDivision
->
GetFirstDivisionWithContentsThatIsNotOLE
();
if
(
pContentDivision
)
if
(
pContentDivision
)
...
...
lotuswordpro/source/filter/lwpdoc.hxx
Dosyayı görüntüle @
76220aaf
...
@@ -84,6 +84,7 @@ public:
...
@@ -84,6 +84,7 @@ public:
private
:
private
:
LwpFoundry
*
m_pOwnedFoundry
;
LwpFoundry
*
m_pOwnedFoundry
;
bool
m_bGettingFirstDivisionWithContentsThatIsNotOLE
;
//Data members in file format
//Data members in file format
LwpObjectID
m_DocSockID
;
LwpObjectID
m_DocSockID
;
...
@@ -154,7 +155,15 @@ public:
...
@@ -154,7 +155,15 @@ public:
LwpDocument
*
GetLastDivisionWithContents
();
LwpDocument
*
GetLastDivisionWithContents
();
LwpDocument
*
GetLastInGroupWithContents
();
LwpDocument
*
GetLastInGroupWithContents
();
LwpDocument
*
GetRootDocument
();
LwpDocument
*
GetRootDocument
();
LwpDocument
*
GetFirstDivisionWithContentsThatIsNotOLE
();
LwpDocument
*
GetFirstDivisionWithContentsThatIsNotOLE
()
{
if
(
m_bGettingFirstDivisionWithContentsThatIsNotOLE
)
throw
std
::
runtime_error
(
"recursion in page divisions"
);
m_bGettingFirstDivisionWithContentsThatIsNotOLE
=
true
;
LwpDocument
*
pRet
=
ImplGetFirstDivisionWithContentsThatIsNotOLE
();
m_bGettingFirstDivisionWithContentsThatIsNotOLE
=
false
;
return
pRet
;
}
LwpDocument
*
GetLastDivisionThatHasEndnote
();
LwpDocument
*
GetLastDivisionThatHasEndnote
();
LwpDocument
*
GetLastDivision
();
LwpDocument
*
GetLastDivision
();
...
@@ -167,6 +176,7 @@ public:
...
@@ -167,6 +176,7 @@ public:
private
:
private
:
void
MaxNumberOfPages
(
sal_uInt16
&
nNumPages
);
void
MaxNumberOfPages
(
sal_uInt16
&
nNumPages
);
LwpDocument
*
ImplGetFirstDivisionWithContentsThatIsNotOLE
();
void
XFConvertFrameInPage
(
XFContentContainer
*
pCont
);
void
XFConvertFrameInPage
(
XFContentContainer
*
pCont
);
static
void
ChangeStyleName
();
static
void
ChangeStyleName
();
bool
IsSkippedDivision
();
bool
IsSkippedDivision
();
...
...
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