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
4ad9e3f5
Kaydet (Commit)
4ad9e3f5
authored
Tem 23, 2012
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
implement import of RTF_{MOMATH,MR,MF,MFPR,MCTRLPR,MNUM,MDEN}
Change-Id: I4d0d9df26de1ef52a808c82d89a8404c98ef7bc4
üst
e7e2b7da
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
104 additions
and
1 deletion
+104
-1
rtfdocumentimpl.cxx
writerfilter/source/rtftok/rtfdocumentimpl.cxx
+93
-0
rtfdocumentimpl.hxx
writerfilter/source/rtftok/rtfdocumentimpl.hxx
+11
-1
No files found.
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Dosyayı görüntüle @
4ad9e3f5
...
...
@@ -48,11 +48,17 @@
#include <filter/msfilter/util.hxx>
#include <filter/msfilter/escherex.hxx>
#include <comphelper/string.hxx>
#include <tools/globname.hxx>
#include <comphelper/classids.hxx>
#include <comphelper/embeddedobjectcontainer.hxx>
#include <oox/mathml/import.hxx>
#include <doctok/sprmids.hxx> // NS_sprm namespace
#include <doctok/resourceids.hxx> // NS_rtf namespace
#include <ooxml/resourceids.hxx> // NS_ooxml namespace
#include <ooxml/OOXMLFastTokens.hxx> // ooxml namespace
#include <oox/token/namespaces.hxx> // oox namespace
#include <oox/token/tokens.hxx>
#include <rtfsdrimport.hxx>
#include <rtftokenizer.hxx>
...
...
@@ -943,6 +949,7 @@ void RTFDocumentImpl::text(OUString& rString)
case
DESTINATION_SUBJECT
:
case
DESTINATION_DOCCOMM
:
case
DESTINATION_ATNID
:
case
DESTINATION_MR
:
m_aStates
.
top
().
aDestinationText
.
append
(
rString
);
break
;
case
DESTINATION_EQINSTRUCTION
:
...
...
@@ -1390,6 +1397,54 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
case
RTF_ATNID
:
m_aStates
.
top
().
nDestinationState
=
DESTINATION_ATNID
;
break
;
case
RTF_MMATH
:
// Nothing to do here (just enter the destination) till RTF_MMATHPR is implemented.
break
;
case
RTF_MOMATH
:
{
uno
::
Reference
<
xml
::
sax
::
XFastAttributeList
>
aAttribs
;
m_aMathBuffer
.
appendOpeningTag
(
oox
::
NMSP_officeMath
|
oox
::
XML_oMath
,
aAttribs
);
m_aStates
.
top
().
nDestinationState
=
DESTINATION_MOMATH
;
}
break
;
case
RTF_MR
:
m_aStates
.
top
().
nDestinationState
=
DESTINATION_MR
;
break
;
case
RTF_MF
:
{
uno
::
Reference
<
xml
::
sax
::
XFastAttributeList
>
aAttribs
;
m_aMathBuffer
.
appendOpeningTag
(
oox
::
NMSP_officeMath
|
oox
::
XML_f
,
aAttribs
);
m_aStates
.
top
().
nDestinationState
=
DESTINATION_MF
;
}
break
;
case
RTF_MFPR
:
{
uno
::
Reference
<
xml
::
sax
::
XFastAttributeList
>
aAttribs
;
m_aMathBuffer
.
appendOpeningTag
(
oox
::
NMSP_officeMath
|
oox
::
XML_fPr
,
aAttribs
);
m_aStates
.
top
().
nDestinationState
=
DESTINATION_MFPR
;
}
break
;
case
RTF_MCTRLPR
:
{
uno
::
Reference
<
xml
::
sax
::
XFastAttributeList
>
aAttribs
;
m_aMathBuffer
.
appendOpeningTag
(
oox
::
NMSP_officeMath
|
oox
::
XML_ctrlPr
,
aAttribs
);
m_aStates
.
top
().
nDestinationState
=
DESTINATION_MCTRLPR
;
}
break
;
case
RTF_MNUM
:
{
uno
::
Reference
<
xml
::
sax
::
XFastAttributeList
>
aAttribs
;
m_aMathBuffer
.
appendOpeningTag
(
oox
::
NMSP_officeMath
|
oox
::
XML_num
,
aAttribs
);
m_aStates
.
top
().
nDestinationState
=
DESTINATION_MNUM
;
}
break
;
case
RTF_MDEN
:
{
uno
::
Reference
<
xml
::
sax
::
XFastAttributeList
>
aAttribs
;
m_aMathBuffer
.
appendOpeningTag
(
oox
::
NMSP_officeMath
|
oox
::
XML_den
,
aAttribs
);
m_aStates
.
top
().
nDestinationState
=
DESTINATION_MDEN
;
}
break
;
default
:
SAL_INFO
(
"writerfilter"
,
OSL_THIS_FUNC
<<
": TODO handle destination '"
<<
lcl_RtfToString
(
nKeyword
)
<<
"'"
);
// Make sure we skip destinations (even without \*) till we don't handle them
...
...
@@ -3443,6 +3498,44 @@ int RTFDocumentImpl::popState()
parBreak
();
m_bNeedPap
=
true
;
}
else
if
(
m_aStates
.
top
().
nDestinationState
==
DESTINATION_MOMATH
)
{
uno
::
Reference
<
xml
::
sax
::
XFastAttributeList
>
aAttribs
;
m_aMathBuffer
.
appendClosingTag
(
oox
::
NMSP_officeMath
|
oox
::
XML_oMath
);
SvGlobalName
aGlobalName
(
SO3_SM_CLASSID
);
comphelper
::
EmbeddedObjectContainer
aContainer
;
OUString
aName
;
uno
::
Reference
<
embed
::
XEmbeddedObject
>
xObject
=
aContainer
.
CreateEmbeddedObject
(
aGlobalName
.
GetByteSequence
(),
aName
);
uno
::
Reference
<
util
::
XCloseable
>
xComponent
(
xObject
->
getComponent
(),
uno
::
UNO_QUERY
);
if
(
oox
::
FormulaImportBase
*
pImport
=
dynamic_cast
<
oox
::
FormulaImportBase
*>
(
xComponent
.
get
()))
pImport
->
readFormulaOoxml
(
m_aMathBuffer
);
RTFValue
::
Pointer_t
pValue
(
new
RTFValue
(
xObject
));
RTFSprms
aMathAttributes
;
aMathAttributes
.
set
(
NS_ooxml
::
LN_starmath
,
pValue
);
writerfilter
::
Reference
<
Properties
>::
Pointer_t
const
pProperties
(
new
RTFReferenceProperties
(
aMathAttributes
));
Mapper
().
props
(
pProperties
);
m_aMathBuffer
=
oox
::
formulaimport
::
XmlStreamBuilder
();
}
else
if
(
m_aStates
.
top
().
nDestinationState
==
DESTINATION_MR
)
{
uno
::
Reference
<
xml
::
sax
::
XFastAttributeList
>
aAttribs
;
m_aMathBuffer
.
appendOpeningTag
(
oox
::
NMSP_officeMath
|
oox
::
XML_r
,
aAttribs
);
m_aMathBuffer
.
appendOpeningTag
(
oox
::
NMSP_officeMath
|
oox
::
XML_t
,
aAttribs
);
m_aMathBuffer
.
appendCharacters
(
m_aStates
.
top
().
aDestinationText
.
makeStringAndClear
());
m_aMathBuffer
.
appendClosingTag
(
oox
::
NMSP_officeMath
|
oox
::
XML_t
);
m_aMathBuffer
.
appendClosingTag
(
oox
::
NMSP_officeMath
|
oox
::
XML_r
);
}
else
if
(
m_aStates
.
top
().
nDestinationState
==
DESTINATION_MF
)
m_aMathBuffer
.
appendClosingTag
(
oox
::
NMSP_officeMath
|
oox
::
XML_f
);
else
if
(
m_aStates
.
top
().
nDestinationState
==
DESTINATION_MFPR
)
m_aMathBuffer
.
appendClosingTag
(
oox
::
NMSP_officeMath
|
oox
::
XML_fPr
);
else
if
(
m_aStates
.
top
().
nDestinationState
==
DESTINATION_MCTRLPR
)
m_aMathBuffer
.
appendClosingTag
(
oox
::
NMSP_officeMath
|
oox
::
XML_ctrlPr
);
else
if
(
m_aStates
.
top
().
nDestinationState
==
DESTINATION_MNUM
)
m_aMathBuffer
.
appendClosingTag
(
oox
::
NMSP_officeMath
|
oox
::
XML_num
);
else
if
(
m_aStates
.
top
().
nDestinationState
==
DESTINATION_MDEN
)
m_aMathBuffer
.
appendClosingTag
(
oox
::
NMSP_officeMath
|
oox
::
XML_den
);
// See if we need to end a track change
RTFValue
::
Pointer_t
pTrackchange
=
m_aStates
.
top
().
aCharacterSprms
.
find
(
NS_ooxml
::
LN_trackchange
);
...
...
writerfilter/source/rtftok/rtfdocumentimpl.hxx
Dosyayı görüntüle @
4ad9e3f5
...
...
@@ -35,6 +35,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <oox/helper/graphichelper.hxx>
#include <oox/mathml/importutils.hxx>
#include <rtl/strbuf.hxx>
#include <rtftok/RTFDocument.hxx>
...
...
@@ -118,7 +119,14 @@ namespace writerfilter {
DESTINATION_TITLE
,
DESTINATION_SUBJECT
,
DESTINATION_DOCCOMM
,
DESTINATION_ATNID
DESTINATION_ATNID
,
DESTINATION_MOMATH
,
DESTINATION_MR
,
DESTINATION_MF
,
DESTINATION_MFPR
,
DESTINATION_MCTRLPR
,
DESTINATION_MNUM
,
DESTINATION_MDEN
};
enum
RTFBorderState
...
...
@@ -512,6 +520,8 @@ namespace writerfilter {
rtl
::
OUStringBuffer
m_aUnicodeBuffer
;
/// Same for hex characters.
rtl
::
OStringBuffer
m_aHexBuffer
;
/// Formula import.
oox
::
formulaimport
::
XmlStreamBuilder
m_aMathBuffer
;
};
}
// namespace rtftok
}
// namespace writerfilter
...
...
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