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
28df98ab
Kaydet (Commit)
28df98ab
authored
Agu 19, 2014
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
empty m_aStates
valgrind + bff Change-Id: I7b45e10471de77bd0481adf0bccdbf852c36d815
üst
7b33dbb2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
10 deletions
+13
-10
sf_508f4e169fb76c80745d3541bd01b0a2-73462-minimized.rtf
...s/sf_508f4e169fb76c80745d3541bd01b0a2-73462-minimized.rtf
+0
-0
rtfdocumentimpl.cxx
writerfilter/source/rtftok/rtfdocumentimpl.cxx
+13
-10
No files found.
writerfilter/qa/cppunittests/rtftok/data/pass/sf_508f4e169fb76c80745d3541bd01b0a2-73462-minimized.rtf
0 → 100644
Dosyayı görüntüle @
28df98ab
File added
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Dosyayı görüntüle @
28df98ab
...
...
@@ -5743,16 +5743,19 @@ int RTFDocumentImpl::popState()
case
DESTINATION_FLYMAINCONTENT
:
case
DESTINATION_SHPPICT
:
case
DESTINATION_SHAPE
:
m_aStates
.
top
().
aFrame
=
aState
.
aFrame
;
if
(
aState
.
nDestinationState
==
DESTINATION_SHPPICT
&&
!
m_aStates
.
empty
()
&&
m_aStates
.
top
().
nDestinationState
==
DESTINATION_LISTPICTURE
)
if
(
!
m_aStates
.
empty
())
{
RTFSprms
aAttributes
;
aAttributes
.
set
(
NS_ooxml
::
LN_CT_NumPicBullet_numPicBulletId
,
RTFValue
::
Pointer_t
(
new
RTFValue
(
m_nListPictureId
++
)));
RTFSprms
aSprms
;
// Dummy value, real picture is already sent to dmapper.
aSprms
.
set
(
NS_ooxml
::
LN_CT_NumPicBullet_pict
,
RTFValue
::
Pointer_t
(
new
RTFValue
(
0
)));
RTFValue
::
Pointer_t
pValue
(
new
RTFValue
(
aAttributes
,
aSprms
));
m_aListTableSprms
.
set
(
NS_ooxml
::
LN_CT_Numbering_numPicBullet
,
pValue
,
OVERWRITE_NO_APPEND
);
m_aStates
.
top
().
aFrame
=
aState
.
aFrame
;
if
(
aState
.
nDestinationState
==
DESTINATION_SHPPICT
&&
m_aStates
.
top
().
nDestinationState
==
DESTINATION_LISTPICTURE
)
{
RTFSprms
aAttributes
;
aAttributes
.
set
(
NS_ooxml
::
LN_CT_NumPicBullet_numPicBulletId
,
RTFValue
::
Pointer_t
(
new
RTFValue
(
m_nListPictureId
++
)));
RTFSprms
aSprms
;
// Dummy value, real picture is already sent to dmapper.
aSprms
.
set
(
NS_ooxml
::
LN_CT_NumPicBullet_pict
,
RTFValue
::
Pointer_t
(
new
RTFValue
(
0
)));
RTFValue
::
Pointer_t
pValue
(
new
RTFValue
(
aAttributes
,
aSprms
));
m_aListTableSprms
.
set
(
NS_ooxml
::
LN_CT_Numbering_numPicBullet
,
pValue
,
OVERWRITE_NO_APPEND
);
}
}
break
;
case
DESTINATION_SHAPETEXT
:
...
...
@@ -5780,7 +5783,7 @@ int RTFDocumentImpl::popState()
break
;
default
:
{
if
(
m_aStates
.
size
()
&&
m_aStates
.
top
().
nDestinationState
==
DESTINATION_PICT
)
if
(
!
m_aStates
.
empty
()
&&
m_aStates
.
top
().
nDestinationState
==
DESTINATION_PICT
)
m_aStates
.
top
().
aPicture
=
aState
.
aPicture
;
}
break
;
...
...
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