From cae16645e17df6a1f87443c00b6abfd26dabd27f Mon Sep 17 00:00:00 2001
From: Rosemary Sebastian <rosemaryseb8@gmail.com>
Date: Thu, 16 Mar 2017 15:25:26 +0000
Subject: [PATCH] Revert "Implement export and import of author field in fixed
 format"

This reverts commit 5de40734af30a8b897c6c5b7f681759e36a25557.

Change-Id: Ib09fb1dc54066cadcd9503c92140d78e7482ae6c
Reviewed-on: https://gerrit.libreoffice.org/35281
Reviewed-by: Rosemary Sebastian <rosemaryseb8@gmail.com>
Tested-by: Rosemary Sebastian <rosemaryseb8@gmail.com>
---
 editeng/source/items/flditem.cxx     |  15 ++++++---------
 sd/qa/unit/data/odp/author_fixed.odp | Bin 10680 -> 0 bytes
 sd/qa/unit/export-tests.cxx          |  19 -------------------
 xmloff/inc/txtfldi.hxx               |   4 ----
 xmloff/source/text/txtflde.cxx       |   7 ++-----
 xmloff/source/text/txtfldi.cxx       |  10 ----------
 6 files changed, 8 insertions(+), 47 deletions(-)
 delete mode 100644 sd/qa/unit/data/odp/author_fixed.odp

diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 690425594227..1d5ba3fa784e 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -181,16 +181,13 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
                     SvxAuthorField* pData = new SvxAuthorField(
                             aFirstName, aLastName, OUString(), bIsFixed ? SVXAUTHORTYPE_FIX : SVXAUTHORTYPE_VAR);
 
-                    if (!bIsFixed)
+                    if (!bFullName)
                     {
-                        if (!bFullName)
-                        {
-                            pData->SetFormat(SVXAUTHORFORMAT_SHORTNAME);
-                        }
-                        else if (nFmt >= SVXAUTHORFORMAT_FULLNAME && nFmt <= SVXAUTHORFORMAT_SHORTNAME)
-                        {
-                            pData->SetFormat(static_cast<SvxAuthorFormat>(nFmt));
-                        }
+                        pData->SetFormat(SVXAUTHORFORMAT_SHORTNAME);
+                    }
+                    else if (nFmt >= SVXAUTHORFORMAT_FULLNAME && nFmt <= SVXAUTHORFORMAT_SHORTNAME)
+                    {
+                        pData->SetFormat(static_cast<SvxAuthorFormat>(nFmt));
                     }
 
                     return pData;
diff --git a/sd/qa/unit/data/odp/author_fixed.odp b/sd/qa/unit/data/odp/author_fixed.odp
deleted file mode 100644
index 2e666ad17fee0b918668eb50f62709a0d6843fcf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10680
zcmch7WmFtlyEX3alHg8o2n0)Tg1ftf;O_2j4K(f^EO@Zs9<*_HcL@$3nRm@fW^QJ_
z_x`z0cXgerReM*}Id%5wI?tAqgoMHZ1A_wtD|z!qf{m)QhzSe~?8oxF3(V5g(%8Y(
z##rCR#=_K4-@(+{ipj~!h|yZ#-qfDa+Q!(*$lB1+(%8y@(Z<f${(1e!F>-$))p!RH
zYXt=c_G7_&CRO_AXlY=jZ)#!B<nU*a(Z<RoR8B?=8G!)d`4Hsy;=&4GVBpV1ur@fz
z=idc3X{F~KV{%eTBF~#_9GtxD%xruzf}9+3!o2S!wWQ>gl$Di5<n;}7)$O$<%nj7-
zO*CAM<;*{RG&FOwu(r3db+UHycCawEvov+JHn*|1akR1Uwl{NhaIklDakIB|b#-=g
zb2D-YxAqFRclEb(4fpg7^ze^x^#S-hTSU5=`Fq&=d3%Pt*aZ4{hWfe12DzsMJ12#@
z2L=WD2ZcpMg!_jj1car8g~tT}Qh`wc!06CeKxA@UWKsga7myc`m>ZE=5|&yG0A$6c
z7Q|#$rsS2y=T#>a)uxp-XMAocNc7DHM&=|3=O#y&q=o0D0jhGMs|({R3sP!|62F!K
zzZ9qD<>r=_mgSXy`BYI`P}Ndg)l^khP*YjnQk7F%S6x}#*jQWnwW+qbr8&2zyP~P9
zsCl@xd$6)|tg2_eacI4xB6YYWue+_Ouf1uk>kFvAX>+2Xdth*&w{4)mYjCi?`x|I*
zeEQqO+{Cx;iLv3uso|yB{?Vza>80g`snMm`v7!0>iG_{%mGz~KebCzZ^7hH%?)l0@
z&&I;U>eB4i%Ixm?;^}Jl+Q!Dl-tp1?#>W1|&e7T3<>tfn&c)g3>Gzw9yT{w_r}wwt
zA0Ho|oAT-DDbo3t2Mi2C?Y*#olFQuT)V?gT-V4~10W`bfC`l7+%7L`vC<1BR+**tL
z0+|3M#!Y~xt>8}Ar$~ofw@0l)+@9vMsEeBxmyGSE<@3F2zQl;n{q#Scn*W1H#nY>6
zYT`U)E5CdgZ_2p!yb`}^xiq~L^SUsy%Z2ptthO%yNYXI%L>94tu<mJm9$I|mZy$=f
zyVO~5TC%J|jU#raSi%W7hEeVCtxu24#6aBSD^A`Go$cx<q3_(izMmE4hmg!C1$?tK
zr^PGs9!<Nt7H?Ow+CO|SY}lOw^&Hh9##R~)E7hD0XNP5@A*fEBk>%c0hJq4?sIQ`c
zUED#S^<gGLe7y#Ctl*rpL-ktcw}~$`=>|~)%i=Vv>q{Zo5BrOj9l3;s9In29+qvL=
z7h+^=%~LI>?930;dB(F=J7ZbzNZK?|bqP&=8{4~C!z>PSkv3`0-ZwP4>_#(y)y2u6
ze?!;`RGem3(4NnL;nKmDuI+Vi)L^VnBQT4;np$l3rd=X@TGsVlJCU7OhE%&i{Xb}&
z=To$0PCFY?){F3H3a9@#<9iVq;c`JezyD|y930#q!uRX7{2_eC4*HBPmKKrm($T5R
zXhFvh*dgB$>TY_-4vZ&-YL)3Z65PUHu)SaKi?o27_ts@5rCclu<63q7ur$pE*$pyR
z<S`i)rD?DYjn;;xP)&&GjlA=`8yj3GJk!obfo=Cy3A;k>8#d1}98RJ`P8TAqp9au<
z2*?I-=zZ)hHWOf^b&yu1XU}Y&5`3KdQdn+IE7-|=Ewn@LDNHe9Z<LFuaY{e^y|GTI
z8-0SA7Ejp2568*wx~Mo*ThojqiDiI$KEBti)PAZqUO^S4IJW?1&ez5zcz!3CDmoEO
zCsW$142nv*yDcb`3fmfE#k}jelvh>uw5G}3MvK%od3inz5p;DlL~#F9cXL^n$f3rd
zvjQ9hO0Ux(@?e#>yPb;)&_GHlpkgwG)CY{x<bt18V^O=}#pJznW(^Ai@f6z%`*-!q
zhvjl1gCH1Yy5<oi66Z0CBus7iSwMbH8QFyICbAg5%2mr233Ga}>P(uK=y)wsWv*M}
z%39~tzrW|KXpi3@zP0167K_O$TM3^rzc%2xL^8p;i;eCLo;(a)MP(BFUeQFXUL{Fp
z5_qIh<^^#qH^2r^F~wUY8Sa3bU1u*7>;Uj?*<w_4MF3t6j)y0=HdaUP6Sql~SaG+%
zbT9v|cxn66eb#b;#7<s4E7di}{VC=QRZbEXjv*Hp{_J`1@qHe#{`omUdVXl^jU60J
ztxW8HJS&SD+V%vTSf0lfCkJ_K{g66RX%oyrNHbI)1erOwEN`h)aOKJpoG8jz9xhun
za3u6_*B^Eq_JU_-6NcY3HjY2|49br1zjcMkPsWnoKB(DC^Esg~HkfiC>RB8JJTJZk
z<)_Ic!y?nQjKb>E5k$0;-a-{3E~>Ryac5&7zh?&_3wVqouX7lI8Ss@=@-?EzmSynT
zQxT;OFC=BHHimbvIh;N!eM)v$shD2eIduD&^^P2iC3a;Uu72AB<fb4sd!QCSxpR1<
zFcA5XN5A&7xJ#J^pR?+dZuAuYdavDVCARD>xLL*tv4sfKd30c<;gw2@f}@(dXD;7T
zDFbfto3h%srHfgP_=F~xB^^lDQ(`h}y()$vfq@=O|Lz|5v^>|h!#6!O9Pc#2@dw+~
zTiFM}bXoP&R5qKvympV)n-Q8&72}X}9w<4lts_!gG29Mwbod65y%8;5%PQ%XC@)V(
zcUN3f6fp~|;_ooxz5-m)rT8Be0DEbIM52%SCPcHzxfu3w@EK0kS>`~Md`>IW3U(wN
zrqb}!F|e&Ac{8=P=sSFT7!-Jtg8&$7r6f#G@ed~nMfjMFycl=Znea5RYgT8}E(Ikg
z`m+>5p<*<Sv<*%keL|j+P@7rv9s)p0?g~e(`*n@jSvXVzCPRBGuJdFPm>>WXdG+O~
zuc>BZp62d>P;H7M$DNk3g?uxyXH{2GeYh;U2k&tfT&;t~(b!wuAq$Nl7XgAZU3pOA
z68UIi{ud@8WTW|&!?(1Ckg#VGb`4A{t<}rHFO-s3dvqpsnURiR1{#!HoLGs{&~2K>
zeKbx4ecidw0xJMOdw1<Yv>}h~<SVWq6MG?bGqhp*Q!yx2d$JEUOsbB8r|jgzG&`h4
z?hWEg0THgHwGtgD!iknWo)61~i?w#3qw@%-defBz3JIacTeGQ?8`Nv?!-mnOq{o*S
z8K^f|dk3Sh_rrys_}k{x(aDuVUrei+iP1{2N=A`=>^yzYRqMU7n;HYj&wVtt3K()z
z2+w(;-<^{flm1AW?@f&%XaQcC%fO3-{>~Du*&Tvo({3yn{}hOS5O-qJ6eH{Y@(Kn3
z`;obq(^mym5F2`K+QENLpe+%VV1k1s&xPJOsXZ{NY?*K2N>KybddUFWa;d>h2I~v>
zDh;uh*Rt#RYhnFk0|QmU(vy&!LJgU!;&u;V^lx($2^W^Ipzq5)H2I@Yj016qx|NC2
z-#Et3J8DNGH1s3{t>lLLC`{g&)S}`?dacX)I2p@#o4ak7(@zG-BN(hp-rTu(egkv{
zaFZ>OpsBxPskx^uY7yx1h@=tyPT<V4hc03U`$1}^K;=UKp#bXeh&z7ki&}VNIF;*$
z6ytgH`D;M-SiM4J>j@m1&OM)(WQ6Ly2<u47xCc1p9KnMP9>Pcf?BJkBq{uw|p7>2j
zIBj~CP;)P<*{NlezxLGvMUrqls8%hTzUp&^3h<VZE!b}89x+7LEEG!qV^uiKCb@rz
zA&E4%+au*dV9@dM5j2L{J`#$@LTsk~H?H`7aYL0bFG3ZTMjWpZlLT`37Ffaj74@*H
z#1(QeI2K!_q=_4fN@PGKDQDM$O@TNwao|^76^Ah1)#(_U4^BgIh4T3AetY`dMy-!N
zp)#4TuB^*yIrV0>+7%?uMj6>~jXR2Y`ROBAMD;or=hkX7b0hjNJv2Re)@8J8iwC*P
zQ<og=<U-6xqi5TQA;Mzu3|rp9yj_9Kv2)`RKYahiU02x_^!3}sE#VKf72dHqXNLv@
zL!taPwMBeZTSIFrhac}6e~4|n)%t6+mMeNBhPhOV!79x8$QGK<GeWV@IMNyy5|Z&l
z+7eje+;w-DeBYmLDPIBrQvJYE_MRL^6nJ(IA(Uk#6E0z*rDH{Imv${QAVXRkAva{2
z$SbN@x7GXG`>}NH<HTjY&lIHS8NILO3b^8|x>(`8VYAXh8}PNcG&6?qF@(Rd#T&3B
zj-_pK(bsOhb}OG|#UMqksc(dtpTjsd)-?_++s#paO5m88ih475sjQ+#GN~e~rn}ja
zW!2$x$u0(9FP%{YcxrPI(w;XQA3O0_<GMvuJm|eny>Y8y<@#iE15}I*BPUiY#liGi
zf%XcOt`zn>R8*VKvq&vxK9)uX>~xj9>4hNqtc{)YKvm^vc6wQL^irE?A15Ujd97t#
z%6~r_qvt`0GQx5Zt6w_YyYP`3Z=#i-k7zxt&~sX0hCmse+V$9ypr&jDuS7~2Ve7NG
zy;$e!4CgYA+cf;LEg4Jwiaa&1Ap0jglifGtV7S*lHmBhTH+yKbWWwPceVm=xYF%ZD
zPmjB&v~w$1FWWa*XDE|nXn0u36$IVg!9OzygtLzGU}1gV*s;MzDvOZyh_df7-ptDL
zM)y$`#TFw>9{-M2AS$_&(tD~-lZ1I2Gfa~Fg$e3-=}qn4#LJ{=QN2AS@Ao492O6Wr
zXh@!c#pCb+dzCh)j>?*tbwdX0utFqD+ew%l0YxgQ(;q&!h|IPoRTcG4A=Q$JFf*{J
z*5+4(n70ZbAn;LM4Q>OSTDDFdmaVxR#nsc;O)Mx%#Y5yW!h^SUJvg>L0Z>KC)cPCu
zBGQaqD_C5mt`kUn?;=yP;F?&Xiq!a%Zk0k|w=`#4Y>42oc%+Y4;EiJ_vqIwKxKe@x
z&mjkruPc4o1Wn{pHC7inhJE0~9n<n@N=WU<$Z24hLNH%?dU=EN2J#Xu5v~~`?tEIa
zmg^SN)RTy)Lj7a7JmaL(V%3;9uS00Gvv<s!EDL9>4c5h?Y!OYTMl~5u=A#5j#Wees
zT0*q=WF18>j#FA}iIl>zop9>)ImOHm;#2BIhgSOx8R2pK=W1mto44q)1%SB1y33Ty
zf<#vSm6NzH-jBgYhxXBOw^63PceFk9`M5uTXysS*5mK<HyPU$bA!ltOrzpH)?DCqf
zY*r6TcV^bx;N08`<CS^T8FHwEZPXVtfy-d?_=!bYQQq<*S|tk=EX~hECb|NohWKjb
zBJkN4!eG<11A5`d7!QgOMKR8#pPY`Oy7pwOk|bt$De;-5rU+?7gsgF7a%up$Gs(C?
zB%aXd)ber|W0iw`WGERCZ8!ptF3?vuv{!ZZJTFebsXt2Qr?xk)<=_spF6gnqwVYVp
z6Lj!r5=3*2zxEN?G5{Hmb(8E^_lIulnDloCUb4YZ=GX|fY`{h#XN_);cBqyx<g1~4
z%K|_SMcuFqmG5cd4ljE@sNamHbg?S$(>Tl5_{EZS1uv!BCdn(4Xu|Vq(W}T}oE8c-
z8r0;O(=&gAZs{1F?DGrWOES$4+YMyP@ThRzo!g~%!E5n_jV;;x(qY5VO$lG$E9b%y
zw6f<JhZI@SH+n&ZpQ06+9n1Okeb7;PkDN=~{eo_ECgBhWRKmjkb&Qv<iA<<IxzK-g
zk|yQ86{D6zYoYdG>MF`WuX|1CQvXVF5Y{tSm9M&C9#<R316F1>n#i5zK`JMo7GpF7
zcc^Yrmm|gUt}`q9@`I*2&BFyAFKT*6Sb+b5gZ!eEc`?;8(XCcgTi&NdPWx1`!cT?i
zd#t&_%IjOup!c*3^is?zz-3r$%_SQ<RKE`9mZPx4@RM)ht?#aaY%Rm!GXf55wZ1sr
zG`GJBx+b`ffD#^DfdukM(QE}mG8~Q<GFL9EjlN~A_9$X0xtp<PBzOZ<)oz$AC_zGZ
zi<%h|xrOK>Uf+fHZPRlxVZn3jybJAK=_53SfE5!Opia(0Cq)+#Oo~x#w-ymZ{y>=F
zEG!(&u;_YKJ=+f)`0#aMybtjp2G6}+?szBdbW1uL{RYeKThQ2goC<l$eUS5m;uR21
zM5glrLh^l;<2o&aG2NolNXXXBpc`#jre`aV=pOi#rS=H<V|WQb0868S0R!_R{kP%e
z$E=gRgR6z{AAjW!wHKrI>(IX*E8?L5c=~V8m$we!$6>$`(k%VAYU;rm#_H^h<g+#|
zZ?!g&-NwSd>SpHMqf-uG823-j=~Q5lsK*J}ZmoZdc@b5F`nK7^ubr){GP<KTyO^*O
z97%iQW_8c@dSv9SdG#tP@zVu3L*iFNV%`laPG+eZu31=SqL?22`!;&wV9gi&BxrZ1
zLU6B{y~Gz_vD)R>-C~M~)l{1U_)1OfMPJp+tVoX6u;eq;K!<Pfu^BYf2Dg`+8cIkq
zC!{jTgL;^3vlwExa-^X!o_xX++fZA1QKsKx@I{C=Ey^s<a(9%(zR4UBD}8M^GqjV#
zfP$B>9i<0mYI52)F%+A%*apSE89hGmDsX-XVy$P?2P$5aql1}>LRjll;t&x<J?+l)
z`KL-Jz6vbnCUYOceSC7pPhp1~s@U^!^H%SwR3eToE`;f3y)*bX-2yqK?{aFOi?j~J
zBD*&x?A!z7dgv_MBGW6)@q^gbS}FIm8E#PS;JYvyG$oJx+J?}?Qt3wF(%+C_5qK2P
zW%jq6`u8YcY6Jp&My-+f@)?Th3RdVTUqmxUpvkbl0}iD#?sgAo^>EKZnI#ICL+>KE
z>rm3__Y$FB2}G#6e_uUH)z^Prq#AJJOU69yRtirJ@U*ss1mVf2eDer3+rWg@F;<+#
zuoQ}phJ;1?DvWklg8)@JE3^uK_7Qp~K&;?A^CF-lZ>95{OPEyNKrcz2rNIztsBhMe
zfSLA*hOGs)a_7|zF}X(J7=G;aeGRcGsUGs%Fm><HzKB*R#tGgXnA2X=1x=G~$j4OH
z8?O5e%;}K;;(G)^1HG<%1O)@GyWUl262a3eSchgCE*jpHadUb+jN;H$!y0gXU$QgI
z#4kN2KAr`Hxm%^NVvK~RqVP=Z3$iE9Cl!`_A26gLfoq;=ZA0q3`Wx=0P3<Eja5!xb
zIa_5??&w6`J!o|A;yw*;>gBNp)}&PgzxB#u43?U?M(l$8&S`Qc7BLoOFYdXSIX1XH
ziiZa|h&KbnL@oMc1gLt)X1Y4Z`gJSE-3Go+pz#2wv_PSpIb`Z94_3{tH3OLy_*xhB
zpu_DwSNjek#kq=4-@pOkd~$>@+lCb514*A*!IZ}?#=Kfi@JrYDAhNG8h_RyH+fpK6
zkW=c}^eQ4PVK8;@VdU?eVZOqmQ$q{Xz(5>+By8*l;uE;P#z*$Xl&2oq@1MgqLqq~s
zU&eU!<V5Fi(0>O6&B3^CoPtjQMD*bvM*SUd^4zh%V-3K~gI)=sbt1iDEku)(#{#ja
zgeSx*Hb{(H85YHMw*)&8?DLASwri^CNo)qfjhFI&Zw0swhGMAT_}J7!(<?v;sjL88
zDcg<uo^I>M?K!HTz*e&f`%QPMp^=YC1Gx@`Cp@*oQ))QnPZPuVcgbjcn8e(Mis<f!
z%%&gpN7S)nIf*m<7(#qwk^MVgQ2R)A%n;Ub;(owf(CM?6TX7ef4RHD@hPx5egiloa
z>Iea@!su-b#{|P%jn=UscQPV20~(rgxv7kK34vnMFom2ZcS-gq<d9-h^MHqnkaCug
z%3FHYi&pFPF5RPK6w$WaO7O@TB;)Ryo_PFX17AP@V@t^%#22X~uwd*N-LiZFelYWu
z%0u5{*9ovZ!AO@yJgPZK^hkrvuT=_t{A@d|!iZ|(Bq!@R_I#tH$*)Lwf_*T}!!6O;
zjN0f;->APqzLC|*A4^|ZKk<Hga4xVJ7otcvw0!MV1g$4vR#lmS1};i>MgAgq^ia1S
z?y+(Cl^nChT1uE#FTVF+X{pRO4wstAO4|oyOYr_9ECjS8RMIB40IBkA=inF+sbF=J
z@W%ywLEzB>rC{7JTGcT|rm6GwLUCq>V^EBJp_khdso>Rap>!@=NRRcPyyWC=lx5zW
z%Onhr__9%bbq>V2ws2#hIAS+Sj@p1TZFiN0KLDrtq>bS0dx5^kpai}hKO%|Ecy3aa
z4SGHb`jQWcw}fART@vv?08Kz-46spfKA<Y;@F0(_$E~X8W0QvYF72lUkz|@#F<ADn
zKB)PA;!lJ7B37tMgK7CJXgX9B^lNmlLnuS*jb@mmZ~Kx$dJo4daYiH$QK^icN@EWl
z`qqRK#!_DmDB$BUfX66g5|Lob%0bhLct+)tZFGVs&?m<h)QV70#F)W_foC<!nUj-|
z+K857y~&kBOpm4M8s3}qqZd!|YL~8o(UO-02I#MJ8V4%mY}2Kel8L_*IKs+XnU2lE
z)woAlG}@*%a$7~;9+*jlYlTSLwELJJ(%Z1gviO3Y%n0VLkPHF{Jz#EN0=k{S=hQUb
z`L>nO%#gA$*-VvI%;f&vFthlgM7T*NChZ$P`-f}p9AXeMQL7PfJn6EPZOXekVwvXd
z;)yipDSssAiCSwjaAGL{DT7!He8&9D5at5k9}W5AKDepG6Ogba$JiFumK9~9uo;;V
zw{KoI4s>g*-AIxg6Pj16#BTHTBKr(!&2GFHIB}m<j<;paK&4ByTpq*l9l6`Mbw-LK
zpi|bbggb~T?0~BbD>=+aM~G@OJE6U>3Q;z7s4Rp@I0Yqm(u=E9H8Z?=5)hl&gWaRo
z;IMdeU)Pfr8hfsT(h1pE42NcfjlJ%!5#fW{xM;?zF0`WU-aiI+izVHw&~BPM#A0TG
z2a#Ly<<q{e5>i~qmmUac9rqob{<4Kv4l*JE{jwpkP1|IRz9dU)k~8M6=ZpO~O?0h!
zRq15(A_SVN<Do*!L0*8Pk<_Tz$sXAI_$}zMwmAe4)<P$G%rdG=*(45A84^_nDg1JD
zuL=AFMf<j0C?_sBvoJg_YK@FD(Y;5_?2?eV3jmbKZ4}LOH_^^&wK3sa({K5fn2hXo
zCdbjXmY)!#YSqoj(g-D%!SZ24fK6YqDlG$u=c2#aXDh?J%gbrD--?9^cr6yM;o02d
zbshLf)h&i0C~2of!*an)TJ;*+)XNYb%%mXV@ibF${Gq4bcl1I<QMBw<ICWNYGJ7w6
zOwnQI1E7|BD*H%5bXkpR99uz@+BpSdR(pKsLI(4(QIa5inUa4oKO&{4jB9Ux2%lr9
ze)Ch4EP=Ftuc64n7t~s<*AoVso<*A-**GXSO^CHLU0zJt!0}2Q(uo}Y@J}HQHK*0X
z_+GD(dw>ego1gWKjfr$p)9q~H!_1uhlO{1(?mW8ExVz}+!z;Ej!;(PA22PS)O51G=
zX!L>l=0c!Nw4>sX$R>errlCo6W1Gk%uXkZ8PwxaQ=8z5IuKZ_83A+l8VJlrZLxz^X
z4NjfplSvkC##DjZr&5}YuE5@&t7fp*ysHB<hZX$0e|#Ha?Mol`;{NlU=jq<7;CE#!
z+~stSn$-2QvxbMAZnzDAU+Nx|cyLwy{^hZ`<n8g^NR!oV^F9N#>TRC{vHC7Ky{FNp
zDEi)yb$)c|MQj3pmEAntWo!Zp89nwYfS=W_y)Q)35nYTJ-*xD@Gyv^^8;c$|<BWkH
zEA&!BxV03^htHNK5UeXYGhzg1Xot>&jsu}j>9Z&}OTIw1pDxcCmlot&Qyo_G_9Wzx
z&sgNCl-5yWAz^m0VfgZHo<6~?3om-$8iU2qC<9MRz$Gt{6svLaa6&Q{lwYZe^#0sC
zE&os<5;$45^SO6vJzYgh85(n`H?tott;phM7iL~*W^NlY=2cx*vhYEx)2d2yG_$!+
zg}{QS`d&jhIh?R`Ur@IU`g+k$PYMUBjVb#-4#u&RW)%<8C~afb@p>3Oz`v7fkOMOq
zy1|};K+5ED3V68JoW6i;#k;l((@(gi4dk>Ix>nCW`B1h4Ub!;^jb57A@<Pq~EN48O
zY!`PrIm|ewFEAex%=D(0`U1Lxh>xG|#?7!pbr(8K#RL1B;)0xX#lhe)cLjwyS^Nu9
zeeF=D+Csu82|-i}Bh}SvL~%{+&dZvP>86;<vpI#^kxD{?A~(#%;TL$x!adNiPFj2W
zi}@~6W}7$IoOi0dRCMOTgYl<l`7WHf)Wgk`INM*-oIBNOro!!Yo0`~hrt9)_2ZAWb
zv^ot>>2DB}L?W^pS)V>jlw3h)deNFUc3Jp*WS8ZTitNdoEUQRFZzvtjKQ+aO3&?g3
zA5U1m@yG}F?8Hl0KI454Ik!mT{T_Uf$yi4o-U_E+gi=;oy(uNGTvE>M)}fLfdAW^N
zF%vjZNO@`cp3`6M&!VTsxFh-=2yk1Iw`KbNGTgF6*WxPt(5rHhsm>ZT`;YZqw^QrP
z5$=3_q+II^a0y(FDk2}75RLl4KDaqPod-%!Hhc&3eEDA7j|t>@gl=5asB^od2T5Sd
zRYu_mkAeryfwg-@Y3jzDOYm}_9b6Vf&cW!wQY)6=Ux+;(P%U)T>6W5TJv@3f`<_?Q
zNh0}!CE(Jj8qSv($quFDb4)dy$*l+fTPd=%9Yt#TJXk^nx}5xxt=(xe#s#((CGS10
zd~^DT*XMz5U&)rHp_)-nDXF-1^&wwvGDxD)8h!fwDrAdy*b!8N>YC?D7S)wYTG{u=
znAAY%!?l%p9jKN>wQlaKGya}RqR<Z_cb1kUnY07JZ)8hff$f<5e6A+_ng@fC?$|Zn
z&;=z!X4?e=J9UUk`rS|!+5C!GeGkX}7DrZXdH$y<srqk~2pSp9w~e<0cVC!`a7U-z
zjPlc#hbMuYBRtpF+A$s@Pxn>{9!zZsa58OPO0{+9^cfDWVofwq8X&Cp#>)uxmJF8Q
zz*WX~ba6ylf*_BWvPvtU3EAyhk1&z3wpUsAsL6LFjt*MbPgi{7&{yp<(Gvt-N*nia
z8QT(;8jWw#>ARgS-gq|^N*u(8OTrD?C-I!7VtQIACx2m6%+bTB*Go;8kvL2@F^L-w
zC6S%;;RTt1PFZ5MZ(X=ek?il_%{=nq_k?{krIjLUlFBnRN$$6(Kl#ZW@Lbe3?d~B<
zU!6zp?o@kdRkgGBtMy?<NyC`Gs-SZ)FHN(X375)ss)iBD!(KOXR$(!oY2=HY76R(b
zFmpGW(%i_ne(8&_txfp;(gH!Yt9JQ?6J+J0HAV%5RjWF$d$n3dK=sSK8r5&8C@90Q
z!j-`bhg9yzuO6?xf4oNviYlC;Jtu8Bn*Mx`{?j$`Yx0!fc|*wB>Vv6?qun1~5PMc8
z2Wx8!8+|Kd3#PvsLw?1*_zh0q(9rnVuA%Q>ZTBxo;@==mE%i-|?U@8k9W3>2?EeM)
zyUYE<8S?CDar|H6?4Qjqj`jxn|8}vzyG<KAYm;a5%>M`Z!#VT2iv9QV{SNix*8caX
z4;I$?4#t1p+wbz`*w0reEutjA@Loog$x`3S^n<beA9M9(itSdNBuLM5^<+oBWrgsR
zhuPy_v+lq|)3D%?5DLs5y(kn?r4;i-2H*+bwq6+tIeKwvE@Vgd7!EDn5YmIyS|d4e
z+%<Xui4Q!um1MF_NdX=(B1fIq66Qd+cpVW;N;+710FWQ-wGK6`_!*~;j6{Wn{z{)r
zu)&mhWFYI+RcC}%T&=O3LrJn4d2+=|cF_cOsG?+qc7igR&aRh){P<gvnY<Th=Wq0r
zX4W>{B##IaD&<GnHo%*(nR<#*y405Q)_kx=I<@pEU1IPCQ^m>AHY0l%Lu<td3LBgB
z30@soU#(SgXzvvs_U2x1vxUKn(evV$CnDv#P(I$LgHV5Tpbz4Xb&$_lWv6Fniku`k
z1Qyso8?T<L@|XD2hV^&U-<?%IA<ECifAU%V$?|6#{+jLn;eGfSH_!R+X9L(DPKdvw
ze$Cqa$b|n4QrN%d#s7}{bwch(R_A9#KNJ0u<M})AR|WbpU-vVPFn*oA`xEz1`t%d`
zn(X(T>QA-$Ya{){fr0(#$UnpCH#~n;uYYFxp<h3v=r>INL(Tq~?1!HHjLqMW{i<&N
zEze8x|5;7Hs@*^H{I!~tf5Y=v_4{Y0A4>K!qJP8mW0?7muKl+x-M?Y^sgD0G%iV8S
teyZhvSpMv5ziPk_z5E$06#t-}a+1)`v)5o?XwM(|=ML%ooF)YW`+o#BPFw&0

diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index dd57ec01bf3d..797bf36d6192 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -92,7 +92,6 @@ public:
     void testTdf62176();
     void testTransparentBackground();
     void testEmbeddedPdf();
-    void testAuthorField();
 
     CPPUNIT_TEST_SUITE(SdExportTest);
 
@@ -107,7 +106,6 @@ public:
     CPPUNIT_TEST(testTdf62176);
     CPPUNIT_TEST(testTransparentBackground);
     CPPUNIT_TEST(testEmbeddedPdf);
-    CPPUNIT_TEST(testAuthorField);
 
     CPPUNIT_TEST_SUITE_END();
 
@@ -554,23 +552,6 @@ void SdExportTest::testEmbeddedPdf()
 #endif
 }
 
-void SdExportTest::testAuthorField()
-{
-    ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/author_fixed.odp"), ODP);
-
-    xDocShRef = saveAndReload( xDocShRef.get(), ODP );
-
-    uno::Reference< text::XTextField > xField = getTextFieldFromPage(0, 0, 0, 0, xDocShRef);
-    CPPUNIT_ASSERT_MESSAGE("Where is the text field?", xField.is() );
-
-    uno::Reference< beans::XPropertySet > xPropSet( xField, uno::UNO_QUERY_THROW );
-    bool bFixed = false;
-    xPropSet->getPropertyValue("IsFixed") >>= bFixed;
-    CPPUNIT_ASSERT_MESSAGE("Author field is not fixed", bFixed);
-
-    xDocShRef->DoClose();
-}
-
 CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index ed154c72ffe0..106545c34503 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -234,10 +234,6 @@ protected:
     virtual void StartElement(
         const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override;
 
-    /// process attribute values
-    virtual void ProcessAttribute( sal_uInt16 nAttrToken,
-                                   const OUString& sAttrValue ) override;
-
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
         const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 91dba974616d..4692856b96e2 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1055,11 +1055,8 @@ void XMLTextFieldExport::ExportFieldHelper(
     switch (nToken) {
     case FIELD_ID_AUTHOR:
         // author field: fixed, field (sub-)type
-        if (xPropSetInfo->hasPropertyByName(sPropertyIsFixed))
-        {
-            GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_FIXED,
-                                 (GetBoolProperty(sPropertyIsFixed, rPropSet) ? XML_TRUE : XML_FALSE) );
-        }
+        ProcessBoolean(XML_FIXED,
+                       GetBoolProperty(sPropertyIsFixed, rPropSet), true);
         ExportElement(MapAuthorFieldName(rPropSet), sPresentation);
         break;
 
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index e521e19eb982..4c2bcbf7a20f 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -680,16 +680,6 @@ void XMLAuthorFieldImportContext::StartElement(
     XMLTextFieldImportContext::StartElement(xAttrList);
 }
 
-void XMLAuthorFieldImportContext::ProcessAttribute(sal_uInt16 nAttrToken, const OUString& sAttrValue)
-{
-    if(nAttrToken == XML_TOK_TEXTFIELD_FIXED)
-    {
-        bool bTmp(false);
-        if (::sax::Converter::convertBool(bTmp, sAttrValue))
-            bFixed = bTmp;
-    }
-}
-
 void XMLAuthorFieldImportContext::PrepareField(
     const Reference<XPropertySet> & rPropSet)
 {