From f810750b0cf7b661fa768550782affbd41f035ca Mon Sep 17 00:00:00 2001 From: George Litvinov Date: Mon, 21 Oct 2019 13:25:47 +0300 Subject: [PATCH] Bugfix --- IPHRedaction/Validation.xba | 16 ++++++++++------ description.xml | 2 +- redaction.oxt | Bin 55473 -> 55554 bytes 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/IPHRedaction/Validation.xba b/IPHRedaction/Validation.xba index 87573be..f616dbf 100644 --- a/IPHRedaction/Validation.xba +++ b/IPHRedaction/Validation.xba @@ -1,6 +1,6 @@ -Sub markZZZ +Sub markZZZX End Sub @@ -89,11 +89,15 @@ Private Function checkGraphics drawingN = drawingN + 1 EndIf If InStr(shapeType,"FrameShape") = 1 Then - embeededObject = draw.getEmbeddedObject() - If Not embeededObject.supportsService("com.sun.star.formula.FormulaProperties") Then - badFrame = badFrame + 1 - Else - 'Formula +' Globalscope.BasicLibraries.LoadLibrary( "MRILib" ) +' MRI draw + If draw.supportsService("com.sun.star.text.TextEmbeddedObject") Then + embeededObject = draw.getEmbeddedObject() + If Not embeededObject.supportsService("com.sun.star.formula.FormulaProperties") Then + badFrame = badFrame + 1 + Else + 'Formula + EndIf EndIf EndIf Next i diff --git a/description.xml b/description.xml index 370bfb2..af018c5 100644 --- a/description.xml +++ b/description.xml @@ -3,7 +3,7 @@ xmlns:dep="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> - + Redaction for publishing in Institute of philosophy diff --git a/redaction.oxt b/redaction.oxt index 2807d14e524d03c843870f0385018647d5047358..bd916ac4fe0ac4262dbec95cd375d0cb9e788418 100644 GIT binary patch delta 4864 zcmZWtcRW?^A3wUb$jZ9LHL_h$e+r^J)H@L@UdBBlY!sU_(nA|8ucWS?UyBaB~OE~tLQL<2A5@ayOc<60OVDm?b zN%nnhbrB8OLqSv$^KY5RDXQ~&7d`eGI5!RXe+D|{ z?l{e~&R>fAQ0`Wjypo;7sd7N4w8WT5w|5hxMZ|sT&+!%5gJ|1UQ2pc?n49> z1PytVjoTe~3AfChdEBY%ic7%4mE5Zy6eJ6s7B>>=C-&%9i~A6QcS(H%ByO1}efw$g z3NKk!E@}paEwroR99gB}f>Tds>OfM&LM%owGfV&*7WPM(N^w4JrF5Ha71}l{KnRt<5$Uhhrn^p6CdR~aGdknCl9}G z_y8kdZ{_0bA!wja1VD~!;oo^bL%@5Q_hnRsxzZ=a(4ctX54fNhDRBb&fZTt;91zKL z0!pQ_pMXC@ewEUgg8?!ym7icQq|lTow6Lr)m6Cz%2-N2GY{V%g0DwJuv%X|e&llk1eWs=zW+w_7FBn3PIiH!L&4f@l3?t;5bD_d_M^ zVh|VtU*B`ZXSVgq`@S3zF3>F%qF*ScI@+0OS`UIl(fX}WSp6>*#7%1~SS zXAfGMr=B00GBz^0%@cd~v)-4e+qnm&R68%&L0EDMh4?hg8^39ZC{$1)_S;bL_Kc~p z`_ANzD(CxpuL^^hanuSc+xDfEbzU=s!Wmc}l+(xo(P5GkOk21F<{g#_1BfzPuYHPz zGVu*I4wsb==|wsNdFt#w5ro$nNHk{@II_0G&`RFaq29PJM(YNM*zZNkm)vB$#vxQ_ z40fu8E}h*c%zDR<%k7kaa4q9XmBTsv^t%!QJswd;hnvRZ>-_GS(s?TJ`&?nS4YIk& z&M??W>Df5<%QA}l+kjp6LFcWEzQxNf#t_?zsb^Y;V7KMZF*>PGkvEx`&Dz(kvUc2r z74?v|8oUM~L<@|c^{77BiHOQj7;=-nJ`Da4t}>RqBi8lv1&X4UngmBQRgP1R^LDxB zyQoOEwg~BuJ-%P+>|A}ATtZjW*C?%UvV?M7S~E=};`;bkP%;(s=US4^uq=A;)eB3X zyR@FJk(Vs!q2~O_n(7gmTj)RoNzMBu1u--rhqhk%vShG4N0joD&32Xh(6%OJI$H}w zX)uq8Job;Tp%l%@UJ~X@?R9>~hf#)4JT??8E_zTD)*W{tn#-iL(>BL{i1%_vGv)Z@ z*~_9H+bFd`7%9_2$LC62?FgMsg}xqfdBw!NI1TL2_Z)soas3;w=IqzlB-9R6USv%* z&2#u^#o4`AT_Y$t2pXQn468r=~7|Ktz5ocQu zL?@7|O!l-CFfC=rCvb@mYnbWBeCGZTaaJgDGYysiA|HvfTUi39;L?PgD$xRag+=_GMOP_|n!>bD2wc=DR67vsv?Y50(}4>0mk z7fEjBv?b{wwdsw)Oizy7f<(Zd+uB0%1`#k#N~~5ujdYqNeRwsx zKv>Iv<0)YdrV$f@eHI3lR42HTuDlJE$uq{wQ0rW=!5wrRl6zPatKQA0%vYD#&I2W8 z!uE_Kh+6i(JAJe>#M}i(S%qb>sXYA*7b3~OMmIUBHuWiPFi6GeD14{m(iq6}KR2|{ z9yNj|Y6ZQrMogWSK$|866F}!_M~iV}qC%7O$s8|QP;Y*%?zi*Dy_4I3lG%K4R!2iZ z{|(M=rdD*kn9@!zfZd|j-t3uSMbF`raW+0{=0Zw0#D1>2akT^dkl0(C?`Oh7QJk=nrs|i9u=&GZgz>Cz;USqUsE(cm3Zze%UHKA&MJxW2-(E6VTZR!af zGfIY35RNxK-}lvN!*zx!+FQGzNrl#pG~)Go0C3z^-vyJu#F@vqSCwH+X6w)rd_ zxcE$^Cl1WKmpgOT)Ct~Ljdm*WL6=f9`m_v|zfQE%Z?~+u9=?BYm(8d_BcXO~r*EV= zJJwJ?egq=D#nyWAG$r8`q7fC zxt$LsNhZ1^JpbA2!IHSOA&qImV?{CVNp0TCjxYGTkcvI2fl6ihFxMT}-T9l1iZ%>e zA<3nko-V|DOM3HbdRGtS9(~x zV{KBE45fb+8&5BJ$bYpzw5ub^&!L8Re7>kP+4~h`YzJJId>Y#JT zunSVWSzxOlLhUJ|HycmdkUymF*YalTd-^R+x`qC(s3nLj9wFjgmq%5FLrx9mc{1Z$iZeBJ zU<@T$F5lxh=_#g;7%GMYyeL(^%BCJE8ht@9Ur9oscuPd#AgJlX>uSO!@92OD%b&B~ z&b<%@-PQ=ILxk1K%9++xDQstS?W5x`_Z;pv;QP#o3Eb)#KJ$JdWS9dThj9DZmC7hH zg}ru;$?IFWrE$AQOOSoYZYjD_aN?!E_7i(INN$;SWIw#O^s1eTtLkgE$y-lUL(pP% zw^P>#hzWPCD9SCR9?cgk{~eD%9w`!3#JluY}2$v0BYqu*MNg!M3-{&}Qq z4;}cE?=zuZ2}ueeEl1Xt9xF#HL6D`MdMuNK7Q1tP01Zz(r2-%JS&$x)I4gF5ldLq= zEODRx!%|Kdgs^_B!pHk__w&nlm{;}NZld7%aP5JjyWR9}^x&&2h5{{bT}neq%-q{O zW)O^RQf)aO<8nOc55P-uc-t*r4#3Y|Ff-@8na4ces*d~Ap9e^>D(IStZvn%-4vAyeiPI~Yn~UeZ zJ>s+XbcO_pmWJ@^vzQUICIxoj*>Q5>G$$n9OXen4%=1=fRUmSmHaeqRez827m!1q% zaV6(|0`W?RY)9eqF{aYYl7b{pBa7QG_i+|X@$u5yyCUjv3j^n^4z-G_U zd)79?zB`6HRJT(}+d#X4t>db(+vDzNscE6ccj9MOXbV^>J|*smTw;$B(oj({+}{V@ zv4%zMu5S0s$L!gDR5I!%zhBgAsKedNDL%h-C@K<5qWOb3@){5Q`)mH`WY-0r3ce() z(l{t$G+0)he^t(;*o~U?lw_(~sal2=Tp6ALk!zyHEZElg7f2*$}b`OM`sUkAH$iV=w;37*F1(uyUvG|2h#+?H7O?od%pr zUi^Q`MfaP0kpug(2}i8wlz`!#5U?XbMwVkC8kL)K(b53G3Bd)Zfm5NQ!U!0S8(=)O zeBz1B02KOK@l=zQqm6|#+|}96K>t4~`NLxs{g{5Kr2I>zBeHma;s0j*bpT2)lnMZ< zIx2cL))rQt_AbsxOz|JBkYh?GGYG};MVbsULym~svHPrlb2$y$~$*7S%SX=NLv6vLsec;3!(V$iJV0I?_K3r#DBRQhGZV5Idw_=*utM> z>gc$K>@N%EJ;0y+$ldGLe)MNP|6~(t7<#@30|1(e`mzG5T1tP%^~eNrcNhwx=mU_G s7`lG~a-sls>;Ywfkv7*+P>wJ1zdRtrBHc!4Puz_hf#HMLqY=RW0Nw4dssI20 delta 4768 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Μ&%poOm}$|#u%;-@ME&LtY09_y1#;a zSp48T&Ac1zKy5pVeA1ucLy^;sz2<{6N9_Z}&yM+MvtDZbXS3#N+dpoPPqcIWZjUQf z+ToNmgg)AYz6o2LOauTGxJP{_Fh?Erf9a8v64mcMlwyipPuSv_A5Y?U@i#FlE|S%+ z&~=3n4T|Z2=*nitd*oq<*LehsF9o?=uX@xy*{5)o{PE}5aw+Bz0j|ZAldCy{@u()- z(6Nk|5*^N*^;~&nl`6zjhfRdC{BmaXylee9=DuH51xhJH^~OG@1Z%IByq?$t8>9}4 zrepM!;T#z08awDK5*d|iriga@5E#Bq|BU*Wh4F~j^vB5Zxq(Zz; zNXLstm`;Ri)|7L}w%WP4R`y0T8s;PS7(4Y@Ai2mL7zwa)mWxmU8c2(6f~un_|IU znM~%1yNvy>Jt_j{zAoy7U@OHH9wE}WYF%%?7gdk+x#zGs?~R3|Nxt}c4+Y{C+V9RO zI_pWBBPf~UUAZ96I(y$J$wkw|7Or05jFAZoe|vbB``+Le_wB=1+-J$K;x02*p49u* zo6U$@(^AyxB@Ll1h=Mg@=y!S00ogy8bhMVZ7sZSc!~oDhU>jOO)9CJc#S!J>c-i|J z)HlHQxOw~^3mj|Sh8k9*$293|srE7COfe}iKy`Ijb2W6abmW~m$^7TM)3o22flir; z31KaBPEq7SJT-C(jX3SkwMc!_X?$bE0Hz#%EeTBtndYYI1-pn}e9Bmdq_ zYg*S#s2%BSO_OEv$K+*FN)pZ=QWAjZ#A{b&PtKrORjPBv_Erv{j4+Q$<=s%ITcP=P1LC-os!g86Ir_S9>0z?EIq2 z;vDnHLZak8`rMCOhhz#52_{-@_1Sf$j#5XL%Z16Bf)arp1KL&}(*u?0s9})4g%pQ{a;`R%L8KT;!e|W7_F&mm;&&mbDj#&)9C(e~TP{Vkwqx-2F7z<1O8CQk1%f#gieE ze`w_h#@`O`{H`p2V4QnU{Er43>^ZJL97Do?G~J=|AOhRt;)b9g0@&jihFNe^!(_+z zeHfAg5i*saaUNew4Qu?q{uk7z4xa)Mp#INH0yp87hB+Wf1R(j%OQgrVbY#RsU?me4 zUEA4MWdINckpN5p+aJoR3d7?}M>s(Qjyitm5klP^;ovCK`fYW^-4Tg`dZL^y-~>+s zS{-{5sLDhlIzcOt>!&B=FHg5b{0R^Nxc)?V#9K;u4tB|O0MLW!nmIZkulTy6Q3S9f zm=Y-L_~Azcb{Ee<b*vs$b;D5(;^tbM>nJyfKw?KS-`^Al035#}Ae3~V zDr}?p0S1Ys2%`20|!2w13SK$Dzkqey^Lte-@~ppZ{l|6#c+|lq*8eKOgi@VtgCpV7@*8 z07hDH^;3Gr+CM+szf(njoCDN40N|j5Y)5bXF9XG+2q0k>OimI$&C#I$E83<(0PuDs btg??I3hnFY^Rs0BvUoSnO9mY}N|*lwzGGK?