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
f9ae1b31
Kaydet (Commit)
f9ae1b31
authored
Tem 29, 2016
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fftester: another null DestinationText
Change-Id: I84bf3788ac092c491d7c5a9f86421f1cf9f3e814
üst
0dd22165
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
19 deletions
+20
-19
destinationtest-1.rtf
...er/qa/cppunittests/rtftok/data/fail/destinationtest-1.rtf
+0
-0
destinationtest-2.rtf
...er/qa/cppunittests/rtftok/data/fail/destinationtest-2.rtf
+0
-0
rtfdocumentimpl.cxx
writerfilter/source/rtftok/rtfdocumentimpl.cxx
+20
-19
No files found.
writerfilter/qa/cppunittests/rtftok/data/
pass
/destinationtest-1.rtf
→
writerfilter/qa/cppunittests/rtftok/data/
fail
/destinationtest-1.rtf
Dosyayı görüntüle @
f9ae1b31
File moved
writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-2.rtf
0 → 100644
Dosyayı görüntüle @
f9ae1b31
File added
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Dosyayı görüntüle @
f9ae1b31
...
...
@@ -190,26 +190,27 @@ static util::DateTime lcl_getDateTime(RTFParserState& aState)
aState
.
nDay
,
aState
.
nMonth
,
aState
.
nYear
,
false
);
}
static
void
lcl_DestinationToMath
(
OUStringBuffer
&
r
DestinationText
,
oox
::
formulaimport
::
XmlStreamBuilder
&
rMathBuffer
,
bool
&
rMathNor
)
static
void
lcl_DestinationToMath
(
OUStringBuffer
*
p
DestinationText
,
oox
::
formulaimport
::
XmlStreamBuilder
&
rMathBuffer
,
bool
&
rMathNor
)
{
OUString
aStr
=
rDestinationText
.
makeStringAndClear
();
if
(
!
aStr
.
isEmpty
())
if
(
!
pDestinationText
)
return
;
OUString
aStr
=
pDestinationText
->
makeStringAndClear
();
if
(
aStr
.
isEmpty
())
return
;
rMathBuffer
.
appendOpeningTag
(
M_TOKEN
(
r
));
if
(
rMathNor
)
{
rMathBuffer
.
appendOpeningTag
(
M_TOKEN
(
r
));
if
(
rMathNor
)
{
rMathBuffer
.
appendOpeningTag
(
M_TOKEN
(
rPr
));
// Same as M_TOKEN(lit)
rMathBuffer
.
appendOpeningTag
(
M_TOKEN
(
nor
));
rMathBuffer
.
appendClosingTag
(
M_TOKEN
(
nor
));
rMathBuffer
.
appendClosingTag
(
M_TOKEN
(
rPr
));
rMathNor
=
false
;
}
rMathBuffer
.
appendOpeningTag
(
M_TOKEN
(
t
));
rMathBuffer
.
appendCharacters
(
aStr
);
rMathBuffer
.
appendClosingTag
(
M_TOKEN
(
t
));
rMathBuffer
.
appendClosingTag
(
M_TOKEN
(
r
));
rMathBuffer
.
appendOpeningTag
(
M_TOKEN
(
rPr
));
// Same as M_TOKEN(lit)
rMathBuffer
.
appendOpeningTag
(
M_TOKEN
(
nor
));
rMathBuffer
.
appendClosingTag
(
M_TOKEN
(
nor
));
rMathBuffer
.
appendClosingTag
(
M_TOKEN
(
rPr
));
rMathNor
=
false
;
}
rMathBuffer
.
appendOpeningTag
(
M_TOKEN
(
t
));
rMathBuffer
.
appendCharacters
(
aStr
);
rMathBuffer
.
appendClosingTag
(
M_TOKEN
(
t
));
rMathBuffer
.
appendClosingTag
(
M_TOKEN
(
r
));
}
RTFDocumentImpl
::
RTFDocumentImpl
(
uno
::
Reference
<
uno
::
XComponentContext
>
const
&
xContext
,
...
...
@@ -1768,7 +1769,7 @@ RTFError RTFDocumentImpl::pushState()
m_aStates
.
top
().
eRunType
=
RTFParserState
::
RunType
::
LOCH
;
if
(
m_aStates
.
top
().
eDestination
==
Destination
::
MR
)
lcl_DestinationToMath
(
*
m_aStates
.
top
().
pDestinationText
,
m_aMathBuffer
,
m_bMathNor
);
lcl_DestinationToMath
(
m_aStates
.
top
().
pDestinationText
,
m_aMathBuffer
,
m_bMathNor
);
m_aStates
.
push
(
m_aStates
.
top
());
}
m_aStates
.
top
().
aDestinationText
.
setLength
(
0
);
// was copied: always reset!
...
...
@@ -2463,7 +2464,7 @@ RTFError RTFDocumentImpl::popState()
}
break
;
case
Destination
:
:
MR
:
lcl_DestinationToMath
(
*
m_aStates
.
top
().
pDestinationText
,
m_aMathBuffer
,
m_bMathNor
);
lcl_DestinationToMath
(
m_aStates
.
top
().
pDestinationText
,
m_aMathBuffer
,
m_bMathNor
);
break
;
case
Destination
:
:
MF
:
m_aMathBuffer
.
appendClosingTag
(
M_TOKEN
(
f
));
...
...
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