sw/qa/extras/rtfexport/data/tdf161878.rtf | 229 +++++++++++++++++++
sw/qa/extras/rtfexport/rtfexport8.cxx | 18 +
sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx | 77 +++---
3 files changed, 288 insertions(+), 36 deletions(-)
New commits:
commit 3b8aad9781654a392b973690fb62f69433366c58
Author: Oliver Specht <oliver.spe...@cib.de>
AuthorDate: Wed Jul 3 07:45:12 2024 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Tue Jul 30 22:41:17 2024 +0200
tdf#161878 Ignore nested SYMBOL field inside IF field
Adds SYMBOL field to the list of content that cannot be nested into
an IF field. Prevents importing of SYMBOLs before the IF field.
Change-Id: I0c2f92d7893c189a42e835ffd4b9fd6e0e23a17b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169900
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Tested-by: Jenkins
diff --git a/sw/qa/extras/rtfexport/data/tdf161878.rtf
b/sw/qa/extras/rtfexport/data/tdf161878.rtf
new file mode 100755
index 000000000000..a669f477b7e0
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf161878.rtf
@@ -0,0 +1,229 @@
+{
tf1deflang1025nsinsicpg1252\uc1deff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang3079\deflangfe3079
hemelang3079 hemelangfe0 hemelangcs0{ onttbl{ 0 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ 2 bidi modern charset0 prq1{\*\panose 02070309020205020404}Courier New{\*
alt Times New Roman};}{ 3 bidi roman charset2 prq2{\*\panose
05050102010706020507}Symbol{\* alt Times New Roman};}
+{ 10 bidi nil charset2 prq2{\*\panose 05000000000000000000}Mangal{\* alt
Times New Roman};}{ 34 bidi roman charset0 prq2{\*\panose
02040503050406030204}Cambria Math;}
+{ lomajor 31500 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman{\* alt Times New Roman};}{ dbmajor 31501 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ himajor 31502 bidi swiss charset0 prq2{\*\panose
020f0302020204030204}Calibri Light;}{ bimajor 31503 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ lominor 31504 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman{\* alt Times New Roman};}{ dbminor 31505 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ himinor 31506 bidi swiss charset0 prq2{\*\panose
020f0502020204030204}Calibri;}{ biminor 31507 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ 41 bidi roman charset238 prq2 Times New Roman CE{\* alt Times New Roman};}{
42 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Times New Roman};}{
44 bidi roman charset161 prq2 Times New Roman Greek{\* alt Times New Roman};}
+{ 45 bidi roman charset162 prq2 Times New Roman Tur{\* alt Times New
Roman};}{ 46 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Times
New Roman};}
+{ 47 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Times New
Roman};}{ 48 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Times
New Roman};}
+{ 49 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Times New
Roman};}{ 61 bidi modern charset238 prq1 Courier New CE{\* alt Times New
Roman};}{ 62 bidi modern charset204 prq1 Courier New Cyr{\* alt Times New
Roman};}
+{ 64 bidi modern charset161 prq1 Courier New Greek{\* alt Times New Roman};}{
65 bidi modern charset162 prq1 Courier New Tur{\* alt Times New Roman};}{ 66
bidi modern charset177 prq1 Courier New (Hebrew){\* alt Times New Roman};}
+{ 67 bidi modern charset178 prq1 Courier New (Arabic){\* alt Times New
Roman};}{ 68 bidi modern charset186 prq1 Courier New Baltic{\* alt Times New
Roman};}
+{ 69 bidi modern charset163 prq1 Courier New (Vietnamese){\* alt Times New
Roman};}{ 381 bidi roman charset238 prq2 Cambria Math CE;}{ 382 bidi roman
charset204 prq2 Cambria Math Cyr;}
+{ 384 bidi roman charset161 prq2 Cambria Math Greek;}{ 385 bidi roman
charset162 prq2 Cambria Math Tur;}{ 388 bidi roman charset186 prq2 Cambria
Math Baltic;}{ 389 bidi roman charset163 prq2 Cambria Math (Vietnamese);}
+{ lomajor 31508 bidi roman charset238 prq2 Times New Roman CE{\* alt Times
New Roman};}{ lomajor 31509 bidi roman charset204 prq2 Times New Roman Cyr{\*
alt Times New Roman};}
+{ lomajor 31511 bidi roman charset161 prq2 Times New Roman Greek{\* alt Times
New Roman};}{ lomajor 31512 bidi roman charset162 prq2 Times New Roman Tur{\*
alt Times New Roman};}
+{ lomajor 31513 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt
Times New Roman};}{ lomajor 31514 bidi roman charset178 prq2 Times New Roman
(Arabic){\* alt Times New Roman};}
+{ lomajor 31515 bidi roman charset186 prq2 Times New Roman Baltic{\* alt
Times New Roman};}{ lomajor 31516 bidi roman charset163 prq2 Times New Roman
(Vietnamese){\* alt Times New Roman};}
+{ dbmajor 31518 bidi roman charset238 prq2 Times New Roman CE{\* alt Times
New Roman};}{ dbmajor 31519 bidi roman charset204 prq2 Times New Roman Cyr{\*
alt Times New Roman};}
+{ dbmajor 31521 bidi roman charset161 prq2 Times New Roman Greek{\* alt Times
New Roman};}{ dbmajor 31522 bidi roman charset162 prq2 Times New Roman Tur{\*
alt Times New Roman};}
+{ dbmajor 31523 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt
Times New Roman};}{ dbmajor 31524 bidi roman charset178 prq2 Times New Roman
(Arabic){\* alt Times New Roman};}
+{ dbmajor 31525 bidi roman charset186 prq2 Times New Roman Baltic{\* alt
Times New Roman};}{ dbmajor 31526 bidi roman charset163 prq2 Times New Roman
(Vietnamese){\* alt Times New Roman};}
+{ himajor 31528 bidi swiss charset238 prq2 Calibri Light CE;}{ himajor 31529
bidi swiss charset204 prq2 Calibri Light Cyr;}{ himajor 31531 bidi swiss
charset161 prq2 Calibri Light Greek;}
+{ himajor 31532 bidi swiss charset162 prq2 Calibri Light Tur;}{ himajor 31533
bidi swiss charset177 prq2 Calibri Light (Hebrew);}{ himajor 31534 bidi swiss
charset178 prq2 Calibri Light (Arabic);}
+{ himajor 31535 bidi swiss charset186 prq2 Calibri Light Baltic;}{ himajor
31536 bidi swiss charset163 prq2 Calibri Light (Vietnamese);}{ bimajor 31538
bidi roman charset238 prq2 Times New Roman CE{\* alt Times New Roman};}
+{ bimajor 31539 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Times
New Roman};}{ bimajor 31541 bidi roman charset161 prq2 Times New Roman
Greek{\* alt Times New Roman};}
+{ bimajor 31542 bidi roman charset162 prq2 Times New Roman Tur{\* alt Times
New Roman};}{ bimajor 31543 bidi roman charset177 prq2 Times New Roman
(Hebrew){\* alt Times New Roman};}
+{ bimajor 31544 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt
Times New Roman};}{ bimajor 31545 bidi roman charset186 prq2 Times New Roman
Baltic{\* alt Times New Roman};}
+{ bimajor 31546 bidi roman charset163 prq2 Times New Roman (Vietnamese){\*
alt Times New Roman};}{ lominor 31548 bidi roman charset238 prq2 Times New
Roman CE{\* alt Times New Roman};}
+{ lominor 31549 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Times
New Roman};}{ lominor 31551 bidi roman charset161 prq2 Times New Roman
Greek{\* alt Times New Roman};}
+{ lominor 31552 bidi roman charset162 prq2 Times New Roman Tur{\* alt Times
New Roman};}{ lominor 31553 bidi roman charset177 prq2 Times New Roman
(Hebrew){\* alt Times New Roman};}
+{ lominor 31554 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt
Times New Roman};}{ lominor 31555 bidi roman charset186 prq2 Times New Roman
Baltic{\* alt Times New Roman};}
+{ lominor 31556 bidi roman charset163 prq2 Times New Roman (Vietnamese){\*
alt Times New Roman};}{ dbminor 31558 bidi roman charset238 prq2 Times New
Roman CE{\* alt Times New Roman};}
+{ dbminor 31559 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Times
New Roman};}{ dbminor 31561 bidi roman charset161 prq2 Times New Roman
Greek{\* alt Times New Roman};}
+{ dbminor 31562 bidi roman charset162 prq2 Times New Roman Tur{\* alt Times
New Roman};}{ dbminor 31563 bidi roman charset177 prq2 Times New Roman
(Hebrew){\* alt Times New Roman};}
+{ dbminor 31564 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt
Times New Roman};}{ dbminor 31565 bidi roman charset186 prq2 Times New Roman
Baltic{\* alt Times New Roman};}
+{ dbminor 31566 bidi roman charset163 prq2 Times New Roman (Vietnamese){\*
alt Times New Roman};}{ himinor 31568 bidi swiss charset238 prq2 Calibri CE;}{
himinor 31569 bidi swiss charset204 prq2 Calibri Cyr;}
+{ himinor 31571 bidi swiss charset161 prq2 Calibri Greek;}{ himinor 31572
bidi swiss charset162 prq2 Calibri Tur;}{ himinor 31573 bidi swiss charset177
prq2 Calibri (Hebrew);}
+{ himinor 31574 bidi swiss charset178 prq2 Calibri (Arabic);}{ himinor 31575
bidi swiss charset186 prq2 Calibri Baltic;}{ himinor 31576 bidi swiss
charset163 prq2 Calibri (Vietnamese);}
+{ biminor 31578 bidi roman charset238 prq2 Times New Roman CE{\* alt Times
New Roman};}{ biminor 31579 bidi roman charset204 prq2 Times New Roman Cyr{\*
alt Times New Roman};}
+{ biminor 31581 bidi roman charset161 prq2 Times New Roman Greek{\* alt Times
New Roman};}{ biminor 31582 bidi roman charset162 prq2 Times New Roman Tur{\*
alt Times New Roman};}
+{ biminor 31583 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt
Times New Roman};}{ biminor 31584 bidi roman charset178 prq2 Times New Roman
(Arabic){\* alt Times New Roman};}
+{ biminor 31585 bidi roman charset186 prq2 Times New Roman Baltic{\* alt
Times New Roman};}{ biminor 31586 bidi roman charset163 prq2 Times New Roman
(Vietnamese){\* alt Times New Roman};}}{+ ed0\green0lue255;
ed0\green255lue255; ed0\green255lue0; ed255\green0lue255; ed255\green0lue0;
ed255\green255lue0; ed255\green255lue255; ed0\green0lue128;
ed0\green128lue128; ed0\green128lue0; ed128\green0lue128;
+ ed128\green0lue0; ed128\green128lue0; ed128\green128lue128;
ed192\green192lue192; ed153\green0lue0;}{\*\defchp s22 }{\*\defpap \ql \li0
i0\sa160\sl259\slmult1\widctlpar\wrapdefaultspalphaspnum aautodjustright
in0\lin0\itap0 }
+
oqfpromote {\stylesheet{\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum
aautodjustright in0\lin0\itap0 tlch cs1 f0fs26lang1025 \ltrch cs0
s26\lang3079\langfe3079+\snext0 \sqformat \spriority0 \styrsid9702153
Normal;}{\*+ s11 srowd rftsWidthB3 rpaddl108 rpaddr108
rpaddfl3 rpaddft3 rpaddfb3 rpaddfr3 rcbpat1
rcfpat1 blind0 blindtype3 svertalt sbrdrt sbrdrl sbrdrb sbrdrr
sbrdrdgl sbrdrdgr sbrdrh sbrdrv \ql \li0 i0\sa160\sl259\slmult1
+\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1
f0fs22lang1025 \ltrch cs0 s22\lang3079\langfe3079+ x3402
x6237\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1
f0fs28lang1025 \ltrch cs0 s28\lang1031\langfe3079+ tlch cs1 f0fs26 \ltrch
cs0 s26 \sbasedon10 \slink15 \slocked \ssemihidden Textk\'f6rper Zchn;}{\*+
x1985 x5245\wrapdefaultspalphaspnum aautodjustright in0\lin567\itap0 tlch
cs1 f0fs24lang1025 \ltrch cs0 s24\lang1031\langfe3079+rdrsrdrw10
rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10
rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10
+ rpaddl108 rpaddr108 rpaddfl3 rpaddft3
rpaddfb3 rpaddfr3 rcbpat1 rcfpat1 blind0 blindtype0
svertalt sbrdrt sbrdrl sbrdrb sbrdrr sbrdrdgl sbrdrdgr
sbrdrh sbrdrv
+\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright
in0\lin0\itap0 tlch cs1 f0fs20lang1025 \ltrch cs0
s20\lang3079\langfe3079+\s20\ql \li0 i0\widctlpar qc x4536 qr
x9072\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1
f0fs26lang1025 \ltrch cs0 s26\lang3079\langfe3079+\sbasedon0 \snext20
\slink21 \styrsid4073588 header;}{\*+ qc x4536 qr
x9072\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1
f0fs26lang1025 \ltrch cs0 s26\lang3079\langfe3079+dditive tlch cs1
f0fs26 \ltrch cs0 s26 \sbasedon10 \slink22 \slocked \ssemihidden Fu\'dfzeile
Zchn;}{\*+\listrestarthdn{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+{\list\listtemplateid-322418280\listhybrid\listrestarthdn{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid201785345\'0
1\u-3913 ?;}{\levelnumbers;}
+ 3 bias0\hres0+ i-360\li1440\jclisttab x1440\lin1440
}{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid201785349\'01\u-3929
?;}{\levelnumbers;} 10 bias0\hres0+\jclisttab x2160\lin2160
}{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid201785345\'01\u-3913
?;}{\levelnumbers;} 3 bias0\hres0+\jclisttab x2880\lin2880
}{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid201785347\'01o;}{\levelnumbers;}
2 bias0\hres0+\jclisttab x3600\lin3600
}{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid201785349\'01\u-3929
?;}{\levelnumbers;} 10 bias0\hres0+\jclisttab x4320\lin4320
}{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspa
ce360\levelindent0{\leveltext\leveltemplateid201785345\'01\u-3913
?;}{\levelnumbers;} 3 bias0\hres0+\jclisttab x5040\lin5040
}{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid201785347\'01o;}{\levelnumbers;}
2 bias0\hres0+\jclisttab x5760\lin5760
}{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid201785349\'01\u-3929
?;}{\levelnumbers;} 10 bias0\hres0+\jclisttab x6480\lin6480 }{\listname
;}\listid64454043}{\list\listtemplateid-1072637736\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid201785345
+\'01\u-3913 ?;}{\levelnumbers;} 3 bias0\hres0+\'01o;}{\levelnumbers;} 2
bias0\hres0+\'01\u-3929 ?;}{\levelnumbers;} 10 bias0\hres0+\'01\u-3913
?;}{\levelnumbers;} 3 bias0\hres0+\'01o;}{\levelnumbers;} 2
bias0\hres0+\'01\u-3929 ?;}{\levelnumbers;} 10 bias0\hres0+\'01\u-3913
?;}{\levelnumbers;} 3 bias0\hres0+\'01o;}{\levelnumbers;} 2
bias0\hres0+\'01\u-3929 ?;}{\levelnumbers;} 10
bias0\hres0+\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid201785345\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid201785347\'01o;}{\levelnumbers;}
2
bias0\hres0+\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid201785349\'01\u-3929
?;}{\levelnumbers;} 10
bias0\hres0+\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid201785345\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid201785347\'01o;}{\levelnumbers;}
2
bias0\hres0+\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid201785349\'01\u-3929
?;}{\levelnumbers;} 10
bias0\hres0+\levelspace360\levelindent0{\leveltext\leveltemplateid201785345\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+\levelindent0{\leveltext\leveltemplateid201785347\'01o;}{\levelnumbers;}
2 bias0\hres0+{\leveltext\leveltemplateid201785349\'01\u-3929
?;}{\levelnumbers;} 10
bias0\hres0+\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid201785345\'01\u-3913
?
;}{\levelnumbers;} 3
bias0\hres0+\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid201785347\'01o;}{\levelnumbers;}
2
bias0\hres0+\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid201785349\'01\u-3929
?;}{\levelnumbers;} 10
bias0\hres0+\levelspace0\levelindent0{\leveltext\leveltemplateid201785345\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+\levelindent0{\leveltext\leveltemplateid201785347\'01o;}{\levelnumbers;}
2 bias0\hres0+\leveltemplateid201785349\'01\u-3929 ?;}{\levelnumbers;} 10
bias0\hres0+\leveltemplateid201785345\'01\u-3913 ?;}{\levelnumbers;} 3
bias0\hres0+\leveltemplateid201785347\'01o;}{\levelnumbers;} 2
bias0\hres0+\'01\u-3929 ?;}{\levelnumbers;} 10
bias0\hres0+\levelspace68\levelindent0{\leveltext\leveltemplateid1777919490\'01\u-3988
?;}{\levelnumbers;} s16\lochf10\hichf10\dbchf0
bias0\hres0+\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid201785347\'01o;}{\levelnumbers;}
2 bias0\hres0+\level
startat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid201785349\'01\u-3929
?;}{\levelnumbers;} 10
bias0\hres0+\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid201785345\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid201785347\'01o;}{\levelnumbers;}
2
bias0\hres0+\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid201785349\'01\u-3929
?;}{\levelnumbers;} 10
bias0\hres0+\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid201785345\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid201785347\'01o;}{\levelnumbers;}
2
bias0\hres0+\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid201785349\'01\u-3929
?;}{\levelnumbers;} 10
bias0\hres0+\listsimple\listrestarthdn{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn
0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+;}\listid571039764}{\list\listtemplateid176863268\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat0\levelspace0\levelindent0{\leveltext\leveltemplateid585903656\'01\u-3988
?;}{\levelnumbers;}
+ s16\lochf10\hichf10\dbchf0 bias0\hres0+\'01o;}{\levelnumbers;} 2
bias0\hres0+\'01\u-3929 ?;}{\levelnumbers;} 10 bias0\hres0+\'01\u-3913
?;}{\levelnumbers;} 3 bias0\hres0+\'01o;}{\levelnumbers;} 2
bias0\hres0+\'01\u-3929 ?;}{\levelnumbers;} 10 bias0\hres0+\'01\u-3913
?;}{\levelnumbers;} 3 bias0\hres0+\'01o;}{\levelnumbers;} 2
bias0\hres0+\'01\u-3929 ?;}{\levelnumbers;} 10
bias0\hres0+\levelspace360\levelindent0{\leveltext\leveltemplateid201785345\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+\levelspace360\levelindent0{\leveltext\leveltemplateid201785347\'01o;}{\levelnumbers;}
2
bias0\hres0+\levelspace360\levelindent0{\leveltext\leveltemplateid201785349\'01\u-3929
?;}{\levelnumbers;} 10
bias0\hres0+\levelspace360\levelindent0{\leveltext\leveltemplateid201785345\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+\levelspace360\levelindent0{\leveltext\leveltemplateid201785347\'01o;}{\levelnumbers;}
2
bias0\hres0+\levelspace360\levelindent0{\leveltext\leveltemplateid201785349\'01\u-3929
?;
}{\levelnumbers;} 10
bias0\hres0+\levelspace360\levelindent0{\leveltext\leveltemplateid201785345\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+\levelspace360\levelindent0{\leveltext\leveltemplateid201785347\'01o;}{\levelnumbers;}
2
bias0\hres0+\levelspace360\levelindent0{\leveltext\leveltemplateid201785349\'01\u-3929
?;}{\levelnumbers;} 10
bias0\hres0+{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+{\list\listtemplateid67567617\listsimple\listrestarthdn{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913
?;}{\levelnumbers;} 3 bias0\hres0+\jclisttab x360\lin360 }{\listname
;}\listid983243959}{\list\listtemplateid532460330\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid201785345
+\'01\u-3913 ?;}{\levelnumbers;} 3 bias0\hres0+\'01o;}{\levelnumbers;} 2
bias0\hres0+\'01\u-3929 ?;}{\levelnumbers;} 10 bias0\hres0+\'01\u-3913
?;}{\levelnumbers;} 3 bias0\hres0+\'01o;}{\levelnumbers;} 2
bias0\hres0+\'01\u-3929 ?;}{\levelnumbers;} 10 bias0\hres0+\'01\u-3913
?;}{\levelnumbers;} 3 bias0\hres0+\'01o;}{\levelnumbers;} 2
bias0\hres0+\'01\u-3929 ?;}{\levelnumbers;} 10
bias0\hres0+\levelindent0{\leveltext\'01\u-3988 ?;}{\levelnumbers;}
s16\lochf10\hichf10\dbchf0 bias0\hres0+{\leveltext\'01o;}{\levelnumbers;} 2
bias0\hres0+ 10 bias0\hres0+\jclisttab x2588\lin2588
}{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01o;}{\levelnumbers;}
2
bias0\hres0+\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3929
?;}{\levelnumbers;} 10
bias0\hres0+\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913
?;}{\levelnumbers;} 3 bias0\hres0+\levelinden
t0{\leveltext\'01o;}{\levelnumbers;} 2 bias0\hres0+\'01\u-3929
?;}{\levelnumbers;} 10 bias0\hres0+\levelindent0{\leveltext\'01\u-3988
?;}{\levelnumbers;} s16\lochf10\hichf10\dbchf0
bias0\hres0+{\leveltext\'01o;}{\levelnumbers;} 2 bias0\hres0+ 10
bias0\hres0+\jclisttab x2588\lin2588
}{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01o;}{\levelnumbers;}
2
bias0\hres0+\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3929
?;}{\levelnumbers;} 10
bias0\hres0+\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+\levelindent0{\leveltext\'01o;}{\levelnumbers;} 2
bias0\hres0+\'01\u-3929 ?;}{\levelnumbers;} 10
bias0\hres0+\levelspace0\levelindent0{\leveltext\leveltemplateid1659278964\'01\u-3988
?;}{\levelnumbers;} s16\lochf10\hichf10\dbchf0
bias0\hres0+\levelstartat1\lvltentative\levelspace0\levelindent0{\levelte
xt\leveltemplateid201785347\'01o;}{\levelnumbers;} 2
bias0\hres0+\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid201785349\'01\u-3929
?;}{\levelnumbers;} 10
bias0\hres0+\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid201785345\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid201785347\'01o;}{\levelnumbers;}
2
bias0\hres0+\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid201785349\'01\u-3929
?;}{\levelnumbers;} 10
bias0\hres0+\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid201785345\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid201785347\'01o;}{\levelnumbers;}
2
bias0\hres0+\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid201785349\'01\u-3929
?;}{\levelnumbers;} 10 bias0\hres0+{\listl
evel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01o;}{\levelnumbers;}
2 bias0\hres0+\levelspace360\levelindent0{\leveltext\'01\u-3929
?;}{\levelnumbers;} 10 bias0\hres0+\'01\u-3913 ?;}{\levelnumbers;} 3
bias0\hres0+ 2 bias0\hres0+\jclisttab x4320\lin4320
}{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-3913
?;}{\levelnumbers;} 3
bias0\hres0+\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01o;}{\levelnumbers;}
2
bias0\hres0+\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-3929
?;}{\levelnumbers;} 10
bias0\hres0+\listoverridecount0\ls1}{\listoverride\listid768157600\listoverridecount0\ls2}{\listoverride\listid259532448\listoverridecount0\ls3}{\
listoverride\listid334236502\listoverridecount0\ls4}{\listoverride\listid571039764\listoverridecount0\ls5}
+{\listoverride\listid983243959\listoverridecount0\ls6}{\listoverride\listid64454043\listoverridecount0\ls7}{\listoverride\listid397555505\listoverridecount0\ls8}{\listoverride\listid1054740754\listoverridecount0\ls9}{\listoverride\listid78601234
+\listoverridecount0\ls10}{\listoverride\listid342049731\listoverridecount0\ls11}{\listoverride\listid559905662\listoverridecount0\ls12}{\listoverride\listid1629126586\listoverridecount0\ls13}{\listoverride\listid1122191900\listoverridecount0\ls14}
+{\listoverride\listid639850684\listoverridecount0\ls15}{\listoverride\listid1789886414\listoverridecount0\ls16}{\listoverride\listid1658000691\listoverridecount0\ls17}{\listoverride\listid632755922\listoverridecount0\ls18}}{\*
sidtbl sid13855 sid19684
+ sid72872 sid75391 sid95851 sid141180 sid142383 sid159375 sid468936 sid485762
sid609275 sid789151 sid817791 sid875945 sid880456 sid931731 sid933271 sid995031
sid1053200 sid1246248 sid1516451 sid1523447 sid1574037 sid1586344
+ sid1597812 sid1600890 sid1705386 sid1726724 sid1795914 sid1920490 sid1926647
sid1927109 sid2039770 sid2104771 sid2125861 sid2248854 sid2364651 sid2446869
sid2492288 sid2506024 sid2562227 sid2577305 sid2715624 sid2844013 sid2951564
+ sid2953167 sid3167611 sid3174323 sid3230448 sid3231768 sid3239968 sid3279491
sid3281241 sid3367252 sid3368798 sid3735833 sid3744614 sid3748767 sid3803319
sid4005440 sid4073588 sid4084059 sid4135785 sid4222047 sid4287624 sid4329109
+ sid4395516 sid4404109 sid4464373 sid4537399 sid4543299 sid4545169 sid4719506
sid4721778 sid4733816 sid4745018 sid4787628 sid4795220 sid4857395 sid4877499
sid4933904 sid4945715 sid5051251 sid5113954 sid5445085 sid5506897 sid5514354
+ sid5524949 sid5592566 sid5658631 sid5707700 sid5970725 sid5976653 sid6056234
sid6180146 sid6250369 sid6376522 sid6500165 sid6516673 sid6635845 sid6779884
sid6975462 sid6975959 sid7152151 sid7158525 sid7164947 sid7215136 sid7233377
+ sid7234789 sid7411861 sid7421333 sid7489343 sid7492014 sid7602772 sid7764160
sid7887638 sid7998036 sid8027966 sid8278579 sid8408602 sid8522994 sid8534193
sid8722154 sid9066152 sid9270855 sid9371838 sid9395530 sid9455016 sid9636938
+ sid9647984 sid9654353 sid9702153 sid9775276 sid9792165 sid9909722 sid9927916
sid9962844 sid9976475 sid9982957 sid10159844 sid10177050 sid10247765
sid10315394 sid10321696 sid10385335 sid10492017 sid10507512 sid10617845
sid10628648
+ sid10635187 sid10705086 sid10759270 sid10836498 sid10953314 sid11210748
sid11220710 sid11223591 sid11272863 sid11346618 sid11429257 sid11469795
sid11479283 sid11538388 sid11550882 sid11630717 sid11930187 sid11995316
sid12075392
+ sid12078492 sid12200975 sid12270025 sid12406233 sid12408560 sid12545245
sid12595060 sid12595908 sid12662516 sid12734640 sid12791691 sid12804434
sid12869304 sid12913614 sid13048482 sid13118155 sid13174688 sid13203519
sid13243603
+ sid13331652 sid13374885 sid13390277 sid13568205 sid13573775 sid13728428
sid13792914 sid13847925 sid13855986 sid13919860 sid14033830 sid14056342
sid14113968 sid14305938 sid14307524 sid14428152 sid14578133 sid14633216
sid14700783
+ sid14831227 sid14900426 sid15073295 sid15170680 sid15472998 sid15474364
sid15563078 sid15612504 sid15673789 sid15688391 sid15794819 sid15931731
sid15938371 sid16023536 sid16136937 sid16139725 sid16148250 sid16347441
sid16404408
+ sid16416105 sid16543851 sid16598203 sid16606492
sid16661478}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\operator
xmwd}{+{ evtim\yr2023\mo3\dy7\hr8\min1}{\printim\yr2023\mo1\dy23\hr14\min4}{
ersion8}{dmins0}{
ofpages1}{
ofwords118}{
ofchars747}{
ofcharsws864}{ ern107}}{\*\userprops {\propname
KPH_Enabled}\proptype30{\staticval 0}}{\*\xmlnstbl {\xmlns1 http://schema
+s.microsoft.com/office/word/2003/wordml}}\paperw11906\paperh16838\margl1134\margr1134\margt1134\margb1134\gutter0\ltrsect
+\deftab709\widowctrl tnbjenddoc\hyphhotz425 rackmoves0
rackformatting1\donotembedsysfont0 elyonvml0\donotembedlingdata1\grfdocevents0
alidatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0
+\showxmlerrors0
oxlattoyenxpshrtn
oultrlspc\dntblnsbdb
ospaceforul\hyphcaps0
ormshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1134\dgvorigin1134\dghshow1\dgvshow1
+\jexpand iewkind1 iewscale100\pgbrdrhead\pgbrdrfoot\splytwnine tnlytwnine
olnhtadjtbl\useltbalnlntblind\lytcalctblwd\lyttblrtgr\lnbrkrule
obrkwrptbl\snaptogridincellllowfieldendsel\wrppunctsianbrkrule
+ sidroot9702153
ewtblstyruls
ogrowautofit et0{\*\wgrffmtfilter 013f}\ilfomacatclnup0{\* tnsep \ltrpar
\pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum
aautodjustright in0\lin0\itap0 tlch cs1 f0fs26lang1025
+\ltrch cs0 s26\lang3079\langfe3079+\par }}{\* tnsepc \ltrpar \pard\plain
\ltrpar\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright
in0\lin0\itap0 tlch cs1 f0fs26lang1025 \ltrch cs0
s26\lang3079\langfe3079+\ltrch cs0 \insrsid1926647 +\par }}{\*ftnsep \ltrpar
\pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum
aautodjustright in0\lin0\itap0 tlch cs1 f0fs26lang1025 \ltrch cs0
s26\lang3079\langfe3079+\ltrch cs0 \insrsid1926647 +\par }}{\*ftnsepc \ltrpar
\pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum
aautodjustright in0\lin0\itap0 tlch cs1 f0fs26lang1025 \ltrch cs0
s26\lang3079\langfe3079+\ltrch cs0 \insrsid1926647 +\par }}\ltrpar \sectd
\ltrsect\psz9\pgnrestart\linex0
ootery567ndnhere\sectlinegrid354\sectdefaultcl\sectrsid13855\sftnbj
{\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta
.}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}
+{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta
.}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta
)}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta
)}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}
+{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb
(}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb
(}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb
(}{\pntxta )}}\pard\plain \ltrpar
+\qj i-357\li538 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright
in0\lin538\itap0\pararsid3367252 tlch cs1 f0fs26lang1025 \ltrch cs0
s26\lang3079\langfe3079+ s16\insrsid7764160+
+{ ield ldedit{\* ldinst { tlch cs1 f0fs24 \ltrch cs0
+ s24\lang1024\langfe1024
oproof\insrsid7764160++ s24\lang1024\langfe1024
oproof\langnp1031\insrsid13847925 Fehler! Verweisquelle konnte nicht gefunden
werden.}}}\sectd \ltrsect\psz9\pgnrestart\linex0
ootery567ndnhere\sectlinegrid354\sectdefaultcl\sectrsid13855\sftnbj { tlch cs1
f0fs24
+\ltrch cs0 s24\lang1024\langfe1024
oproof\insrsid8534193 ="}{ tlch cs1 f0fs24 \ltrch cs0 s24\lang1024\langfe1024
oproof\insrsid1053200 W}{ tlch cs1 f0fs24 \ltrch cs0 s24\lang1024\langfe1024
oproof\insrsid8534193 " "}{ tlch cs1
+f0fs24 \ltrch cs0 s24\insrsid1053200+\par }\pard \ltrpar\qj i-357\li538
i0\widctlpar\wrapdefaultspalphaspnum aautodjustright
in0\lin538\itap0\pararsid5445085 { tlch cs1 f0fs16 \ltrch cs0
s16\insrsid3367252+ \s 8}{ ldrslt 10 s16}}}{ tlch cs1 f0fs24 \ltrch cs0
s24\insrsid3367252+ s24\lang1024\langfe1024
oproof\insrsid7764160+\pard\plain \ltrpar\qj i-357\li538
i0\widctlpar\wrapdefaultspalphaspnum aautodjustright
in0\lin538\itap0\pararsid5445085 tlch cs1 f0fs26lang1025 \ltrch cs0
+ s26\lang3079\langfe3079+{ tlch cs1 f0fs24 \ltrch cs0 s24\insrsid13048482 ,
xxxxxxxxxxxxxxxx, xxxxxxxxxxxxx, xxxxxxxxxxx}{ tlch cs1 f0fs24 \ltrch cs0
s24\lang1024\langfe1024
oproof\insrsid5707700+\par }\pard \ltrpar\qj \li540
i0\widctlpar\wrapdefaultspalphaspnum aautodjustright
in0\lin540\itap0\pararsid4545169 { tlch cs1 f0fs24 \ltrch cs0
s24\ul\insrsid4945715+}{
+ tlch cs1 f0fs24 \ltrch cs0 s24\lang1024\langfe1024
oproof\insrsid2104771+\par }\pard \ltrpar\qj i-359\li540
i0\widctlpar\wrapdefaultspalphaspnum aautodjustright
in0\lin540\itap0\pararsid4545169 { tlch cs1 f0fs16 \ltrch cs0
s16\insrsid7764160+\par
+\par }\pard \ltrpar\qj i-359\li540 i0\widctlpar\wrapdefaultspalphaspnum
aautodjustright in0\lin540\itap0\pararsid4545169
+
+}
\ No newline at end of file
diff --git a/sw/qa/extras/rtfexport/rtfexport8.cxx
b/sw/qa/extras/rtfexport/rtfexport8.cxx
index 002b6086bbbc..2e2071097e88 100644
--- a/sw/qa/extras/rtfexport/rtfexport8.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport8.cxx
@@ -616,6 +616,24 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf161864)
verify();
}
+CPPUNIT_TEST_FIXTURE(Test, testTdf161878)
+{
+ auto verify = [this]() {
+ //check that the IF field is a pos 2
+ uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<text::XText> xText = xTextDocument->getText();
+ uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
+ uno::Reference<beans::XPropertySet> xPropSet(xCursor, uno::UNO_QUERY);
+ xCursor->goRight(2, false);
+ uno::Any xField = xPropSet->getPropertyValue("TextField");
+ CPPUNIT_ASSERT(xField.hasValue());
+ };
+ createSwDoc("tdf161878.rtf");
+ verify();
+ saveAndReload(mpFilter);
+ verify();
+}
+
} // end of anonymous namespace
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
index 3beb26711f72..15665d93f51f 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
@@ -320,6 +320,7 @@ static bool IsFieldNestingAllowed(const FieldContextPtr&
pOuter, const FieldCont
case FIELD_REF:
case FIELD_PAGE:
case FIELD_NUMPAGES:
+ case FIELD_SYMBOL:
{
// LO does not currently know how to evaluate these as
conditions or results
return false;
@@ -8382,52 +8383,56 @@ void DomainMapper_Impl::CloseFieldCommand()
break;
case FIELD_SYMBOL:
{
- uno::Reference< text::XTextAppend > xTextAppend =
m_aTextAppendStack.top().xTextAppend;
+ FieldContextPtr pOuter =
GetParentFieldContext(m_aFieldStack);
OUString sSymbol( sal_Unicode(
sFirstParam.startsWithIgnoreAsciiCase("0x") ?
o3tl::toUInt32(sFirstParam.subView(2),16) : sFirstParam.toUInt32() ) );
- OUString sFont;
- bool bHasFont = lcl_FindInCommand( pContext->GetCommand(),
'f', sFont);
- if ( bHasFont )
+ if (!pOuter || IsFieldNestingAllowed(pOuter,
m_aFieldStack.back()))
{
- sFont = sFont.trim();
- if (sFont.startsWith("\""))
- sFont = sFont.copy(1);
- if (sFont.endsWith("\""))
- sFont = sFont.copy(0,sFont.getLength()-1);
- }
+ uno::Reference< text::XTextAppend > xTextAppend =
m_aTextAppendStack.top().xTextAppend;
+ OUString sFont;
+ bool bHasFont = lcl_FindInCommand(
pContext->GetCommand(), 'f', sFont);
+ if ( bHasFont )
+ {
+ sFont = sFont.trim();
+ if (sFont.startsWith("\""))
+ sFont = sFont.copy(1);
+ if (sFont.endsWith("\""))
+ sFont = sFont.copy(0,sFont.getLength()-1);
+ }
- if (xTextAppend.is())
- {
- uno::Reference< text::XText > xText =
xTextAppend->getText();
- uno::Reference< text::XTextCursor > xCrsr =
xText->createTextCursor();
- if (xCrsr.is())
+ if (xTextAppend.is())
{
- xCrsr->gotoEnd(false);
- xText->insertString(xCrsr, sSymbol, true);
- uno::Reference< beans::XPropertySet > xProp(
xCrsr, uno::UNO_QUERY );
-
xProp->setPropertyValue(getPropertyName(PROP_CHAR_FONT_CHAR_SET),
uno::Any(awt::CharSet::SYMBOL));
- if(bHasFont)
+ uno::Reference< text::XText > xText =
xTextAppend->getText();
+ uno::Reference< text::XTextCursor > xCrsr =
xText->createTextCursor();
+ if (xCrsr.is())
{
- uno::Any aVal( sFont );
-
xProp->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME), aVal);
-
xProp->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME_ASIAN), aVal);
-
xProp->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME_COMPLEX), aVal);
+ xCrsr->gotoEnd(false);
+ xText->insertString(xCrsr, sSymbol, true);
+ uno::Reference< beans::XPropertySet > xProp(
xCrsr, uno::UNO_QUERY );
+
xProp->setPropertyValue(getPropertyName(PROP_CHAR_FONT_CHAR_SET),
uno::Any(awt::CharSet::SYMBOL));
+ if(bHasFont)
+ {
+ uno::Any aVal( sFont );
+
xProp->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME), aVal);
+
xProp->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME_ASIAN), aVal);
+
xProp->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME_COMPLEX), aVal);
- }
- PropertyMapPtr pCharTopContext =
GetTopContextOfType(CONTEXT_CHARACTER);
- if (pCharTopContext.is())
- {
- uno::Sequence<beans::PropertyValue> aValues
- = pCharTopContext->GetPropertyValues(
- /*bCharGrabBag=*/!IsInComments());
- OUString sFontName =
getPropertyName(PROP_CHAR_FONT_NAME);
- for (const beans::PropertyValue& rProperty :
aValues)
+ }
+ PropertyMapPtr pCharTopContext =
GetTopContextOfType(CONTEXT_CHARACTER);
+ if (pCharTopContext.is())
{
- if (!bHasFont ||
!rProperty.Name.startsWith(sFontName))
-
xProp->setPropertyValue(rProperty.Name, rProperty.Value);
+ uno::Sequence<beans::PropertyValue> aValues
+ = pCharTopContext->GetPropertyValues(
+ /*bCharGrabBag=*/!IsInComments());
+ OUString sFontName =
getPropertyName(PROP_CHAR_FONT_NAME);
+ for (const beans::PropertyValue& rProperty
: aValues)
+ {
+ if (!bHasFont ||
!rProperty.Name.startsWith(sFontName))
+
xProp->setPropertyValue(rProperty.Name, rProperty.Value);
+ }
+
}
}
-
}
}
}
