Kaydet (Commit) 773bb53d authored tarafından David Tardon's avatar David Tardon

enable new formats supported by libmwaw

Change-Id: I228b5f0a317c05ae845a9fded0ef19f87b648cde
üst c5d37cc9
......@@ -7610,7 +7610,7 @@ libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
dnl ===================================================================
dnl Check for system libmwaw
dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.4])
libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.5])
dnl ===================================================================
dnl Check for system libpagemaker
......
......@@ -570,8 +570,10 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,f
draw_Freehand_Document \
draw_Visio_Document \
draw_Beagle_Works \
draw_ClarisDraw \
draw_ClarisWorks \
draw_Great_Works \
draw_MacDraft \
draw_MacDraw \
draw_MacDrawPro \
draw_Mac_Works \
......@@ -594,8 +596,10 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.x
CorelPresentationExchange \
FreehandDocument \
Beagle_Works_Draw \
ClarisDraw \
ClarisWorks_Draw \
Great_Works_Draw \
MacDraft \
MacDraw_Draw \
MacDrawPro_Draw \
Mac_Works_Draw \
......
<!--
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="ClarisDraw" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop>
<prop oor:name="UserData"><value></value></prop>
<prop oor:name="UIName">
<value xml:lang="en-US">ClarisDraw</value>
</prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>draw_ClarisDraw</value></prop>
<prop oor:name="TemplateName"/>
<prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
</node>
<!--
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="MacDraft" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop>
<prop oor:name="UserData"><value></value></prop>
<prop oor:name="UIName">
<value xml:lang="en-US">MacDraft</value>
</prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>draw_MacDraft</value></prop>
<prop oor:name="TemplateName"/>
<prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
</node>
<!--
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="draw_ClarisDraw" oor:op="replace" >
<prop oor:name="DetectService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>dummy</value></prop>
<prop oor:name="MediaType"></prop>
<prop oor:name="Preferred"><value>true</value></prop>
<prop oor:name="PreferredFilter"><value>ClarisDraw</value></prop>
<prop oor:name="UIName">
<value>ClarisDraw</value>
</prop>
<prop oor:name="ClipboardFormat"/>
</node>
<!--
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<node oor:name="draw_MacDraft" oor:op="replace" >
<prop oor:name="DetectService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>dummy</value></prop>
<prop oor:name="MediaType"></prop>
<prop oor:name="Preferred"><value>true</value></prop>
<prop oor:name="PreferredFilter"><value>MacDraft</value></prop>
<prop oor:name="UIName">
<value>MacDraft</value>
</prop>
<prop oor:name="ClipboardFormat"/>
</node>
(This file must be converted with BinHex 4.0)
:#R0TEA"XC5jME'3!C%4bGd0%FRF!N!3e@3!!!D([eJ%!X3"&@&"A!!%!3NZ%!*!
%![!#3!#3$!,`!N!"!!!"!*!5!3!!!J!#!*!(3NMB!!%!N!Vrr`#3"3%!!3!!!%J
!!!!)!!!!!3!!!!%!3NMB!*!%!3-!!3#3#3i!3NZ!!*"R&3!"!")!!3#3$8*,L!#
3#48!!!!-!!%!!"%"!!)!!J!!!3#3"!%"!!!"!!%!,3!!!3!!!C!*!*!N!3!!"J!
&"!!"!*!%3!!"!!N!#3!)!"8!%!!3!3#3"&S!!!!*!*!("J%!N!3"!N!!N#0#5e`
!3NY3!%*,9!!"!*!(3NYm!*!&!3"#5hJ!N!F"!!)!!`!%!!8!!!"#5C3!N!8"!!!
!!3!!B3#3$!J!!!!"!!!!!3!!B!!$!*!+#J!"!!"!!!!"!!"K!J%!N!S-!!)!!3!
!!$)!!'!!!`#3#J%!!`!#!!!!!3!!B3#3$"3!"!!"!!!!!3!!B3#3#`%X!!8!3NA
m!!!!%!!#!*$r!!"#5f3!N!3"!*!13NNm!%**5!#3"!%!N!4#563!N(9#56!!N2m
!N2m!N)%%!!)!N!8*!*!M"`!#rrm!N!6rN!i!N"i5!!!!!3!"!3!!!!%&"I`!!!%
!!3!#!*!,!3!#!3!!m!%!N!a)!!i*!!!$!3%"!!!"!!%"!3!1!!!"!%!#J!#3"d!
"i!#3#3%!!!!"!!!#!!3!N%N"!3%!)!#3"f3!N#)"!J!!!3!!!%!&N!!!N!TX!!(
rr`!!!'!!!!!#!!)!N'&i!!m!!!")!%J!N!3#m!*!rr(rlJ-*!P*M!J8S!r`"!!!
!!@J"D!#3"!k`#d!!!3%!!'3!!3!!!!%!!J!!!!%R$`!"!*!1%!#3#4!!rlArTJm
Y#jS!#!%!N!dC!3#3$J&-!!Mrr`!!!#J!!!!"!"8!!3!5)!%(5'9KC'PZCfRk!%I
b5!"#5e`!!!!B!%k!U!"JDK3!5J!9!!%!$#!"#P0eBQKPB@4TEQG(mNJ!3NYF!!!
!'!"1J+J!B'S8!%S!&3!!!!`J!3a5C@GeE'&b)(4PH(4)!%*,A!!!!"J!6S#S!'"
U&!"+!"8!"3!1)#m'9A*RC@jdFL"dCAKd5!"#5e`!!!!B!%k!U!"JDK3!5J!9!!8
!$#!"#8PYF'pbG'&ZG'9iG%J!3NYF!!!!'!"1J+J!B'S8!%S!&3#!!!`J!3P$B@j
MC@aXC@4PH(4)!%*,A!!!!"J!6S#S!'"U&!"+!"8!!`!+)!%%6QpdC@9XE'9NCAK
d5!"#5e`!!!!B!%k!U!"JDK3!5J!9!3!!$#![#N0[FR*PBh4TEfjiG%J!3NYF!!!
!'!"1J+J!B'S8!%S!N!FJ!!$rr`!!!!3!&!!"!!8!!!%!!3%!!!%"!!!!!3!"*a!
!!!!3!!$rr`!!!!`!"!!"!%*,B!!!!"!!!2rr!!!!"!!%!!%!3NYS!*!A0!!#rrm
!!!!8!!!!!MrrJ!#3#!%!!!X!!!!%!$rrJ!#3#!)!!!N!!!!*!*!%Y!!'rrm!!!!
F!!!!!J!!!!%!!!N!!!!*!*!8!3!!%J!!!")!N"3"!!!E!!!!#3#3&!%!!$B!!!!
5!*!8!3!!5!!!!!N!!!!*!!!!#3#3$!%!!%J!!!!*!!!!#3!!!!N!!!!*!!!!#3#
3",3!"[rr!!!!(!!!!!)!!!!#3!+3!!#3"crliiiiiiiiiii!#'%!N!3"3!#eDY@
V9UeDYMrpY*p*p*p*p*m!#Q!$!!!!!6rr`!#3"crqUT!(U`!-B3%!!!!"2rk4)N5
*%L4)N6rriFFFFFFFFFF!!@!$!!!!!8!"jQD3"crmMMMMMMMMMMN!&'%!N!3"2rc
e`SpF+2A#Md!"K9@3"`%XB3#3#`(b!!Rrr`!!!$B!!!!"!+-!!!!"!!!!#`#3"!M
(J+-53faKFQPc)&K86N3J3R*TC'GP-3#3$3&38`"339GA8!!!%deTBh*[FfpQG#"
AEh*VFb!a,M&Y%`!!,1!J-5jB)&4bB@jcE'&dEh)8@&414!"8FQ&ZFfaKG'pb)%a
TFh34@&41#%&MG'%J-bi`)!!!!E!J8(*PCQ9bC@jM%deTBh*[FfpQG!"AEh*VFb!
a,M&Y%`!!,1!J-5jB)&3!!NC-4dN!!2rr!*!AS`!!!!%!!!!-!*!%#-H!Sa*$E'&
bDA-J@&414#"#FQPNCf8`!*!0!9"6!$*"9eG3!!!66@PMFQpcEfCd)&G[FQYc)$)
Z-!!r!!!X,'aP9fpbDh0K!!!!T(4[FL"-DA0d!&K86N3J-L"8FQ&ZFfaKG'pb&d0
XBA*TFb"B9%j%)&"bC@CPFQ9ZBf9c%N-66@PMFQpcEfCd!&G[FQYc)$)Z-!!r!!!
X,'aP9fpbD`!#4Na(53!!rrm!!J#3"2id!*!2S`!!!!%!!!!B!*!%#-H!Sa*$E'&
bDA-J@&414#"#FQPNCf8!N!i"69-!!!!d!!Rrr`!!!!3!"!!"!%*,@!!"!!!!!3!
"!!%!!J!"!!-!!3!%!!%!"3!"!!B!!3!(!!%!#!!!!!Na-M-d06Bh1$N!N!P1-,J
!N!8"!*!-rrm!N!6rr`!"!!%!!!!"!*!,!3"K!!%!N"%#3!!!![!!N!B"!!%![!*
I!*!&%`'Q!*!G3NP3!*!*3NP-!*"46LfB!%i!N!3"Y3*Z!%im!!!#!*!%!E8#EJ"
#4B3!3NA)!%*'"!#3"4-!'3'Q!Pm!!3!!!3#3"!%!!!%!N!a11e`!N!9JikBP!*!
8!3!)!*!(3NQ-!!!I*!!!!!J!N!V'!!!!SJ#3+!8!!`!M!!3!"J!-!!)!+!!$!Gd
#F3!!"8`!"2rr!!!"8!!!!!%-6@&cG'9b)&0XD@4P3NN8!'"Q@!")i+S!3NN8!!!
!3NNF!'"QNJ"*-*B!3NN8!!!!3NPJ!!!!!3"#5l`!!!!"!*!%)%),+J"#54`!3NN
F!%M5QJ#3"dJ!B'DS!%N`'!"#54`!N!8"!%**@!"JCqJ!4DUN!%**(!"#5h!!!!!
"!%*,[!!!!!%!!!!")%),+J"#5@!!3NNF!3%!5!#3"3J!!3!)!*!'3)$TB!!!!$!
!!!!#!!!!&!!!!!`!!!!#3)"!J1Rf!)!!#!#!!*!%&i)!!!!"!%*,[!""T6)!!ad
'3)$PN!!!6S#S3)$JMJ!!&i)!!!!"3%)!N!8'!*"&3NN%"daKH@9b)$&6E'PNC8*
*&!"JCPJ!51#U!%**&!!!!%**(!"JCT)!56#@!%**&!!!!%**B!!!!!%!3NZm!!!
!!3#3"#"##bS!3NNF!%**(!")dTS!N!G)!'"QU!"*-"J!3NNF!*!&!3"#59J!B'I
S!%@UT!"#54`!3NY`!!!!!3"#5l`!!!!"!!!!!5"##bS!3NPJ!%**(!%"!%J!N!8
)!!%!#!#3"N#!k@!!!!!`!!!!!J!!!"3!!!!-!!!!!N#!3)$TpJ#!!!J!J!#3""H
#!!!!!3"#5l`!3D8b!!-G"N#!jC!!!%k!U%#!i)i!!"H#!!!!!8"#!*!&#3!!!!%
!N%&#5h!(6'&jCA)J-P0XD@4P3NN8!'"Q@!")i+S!3NN8!!!!3NNF!'"QNJ"*-*B
!3NN8!!!!3NPJ!!!!!3"#5l`!!!!"!*!%)%),+J"#54`!3NNF!%M5QJ#3"dJ!B'D
S!%N`'!"#54`!N!8"!%**@!"JCqJ!4DUN!%**(!"#5h!!!!!"!%*,[!!!!!%!!!!
")%),+J"#5@!!3NNF!3%!5!#3"3J!!3!)!*!'3)$TB!!!!$!!!!!#!!!!&!!!!!`
!!!!#3)"!J1Rf!)!!#!#!!*!%&i)!!!!"!%*,[!""T6)!!ad'3)$PN!!!6S#S3)$
JMJ!!&i)!!!!"3%)!N!8"!!!!!3#338*)f!G-BAPPFL!b!%ilA!"#4CJ!6MYF!%*
&Q!"1!(@*k!"eF%3!GA"%!'"bNJ"ePj3!GCH8!%iKh!"J!%3!!3#3"Q2e!03"TJ!
!!'"bdJ"&%iS(6'&jCA)J-3"12h3!B`%*!(F"E5"##bS!DJ%[!%*&j!!,8%B!6J"
#!!3!&-I3!'"cC!!8b1J!6hFX!!!!GBRS!(9`4!"eF%3!B(-'!(@AP!"ePj3!!%#
!iiS!!)4D!%*&N!!!B(-5!!$!B!"#!!3!&-I3)"3!&!!8ZB!!!-"J!%)!"2q3"!!
!!!&bD3!"!!!!!3!!!!B!3r!S)%),+J"11e`!3N@3!2%k3)$M)J!!3&S!N!80!*"
-!3#3%!8!3NP)!*!%!3#3"%**0!#3G8**-!#3r`#3r`#3J33!!J#3"3N!N"d3!!$
rr`!!!!3!"!!"!%*&a!#3"``!!2rr!!!!B!!!!!)!N"S'$!%!rrm!!!!'!!!!!Iq
3"J#3"RH3"P@3"[q3"!!!rrpQCJ!!hGd!N!6rr`!!QCPQCJ!!QCN!N!6Gh3!!QCR
rr`!!lZi!N!4QCJ!!CQBc-`!!QCPQCM-cZj!'rj!%c-crN!5CQIq3"'CQrj!%-c2
rrmc-rj!%c*!%rrr-c*QCrrr-c'CQrrr-c$-crrr-c!!!rrqCQIq3"*QCc-crrjQ
3"2rrQCPQC[rrQCNc-rrrQCN!!2rrCQErN!4QCXc-rrpQCTQCrrpQN!6rrfCQ-c2
rrc-crj!%-c2-c2rr-c1CQIrr-c0QC[rr-j!%rrmc-`!!rrm!!2q3"!!!c-crr`!
!CQErr`!!-c2rr`#3"-c-rj!%c-crrmb3"2rrQCR-c2rrCQE-c2rr-c2-c2rr!!$
-N!6rrmb3#TQCc*!%CQE-N!3c-mb3"!!!c-bCQIrrc-bCQFb3"*Q3"-c-QCPQCXc
-QCNc-mc-QCN!!-c-CQErrmc-CQE-N!4QCTQCc-aQN!6-c'CQ-c2-c'CQ!!$-c$-
crrr-c$-cc*!%-c1CQFc--c0QCXc--j!%c-`c-`!!c-`!!2rrc-`!!-b3"!!!QCR
-c!!!CQE-c!!!-c2-c!#3"*QCrj!%QCRrrmc-QCRrrjQ3"2rrCQDCQIrr-c1CQIr
r!!#CQFc-rrqCQFb3"*QCc-bCN!6-c'CQQCR-c$-cQCR-c!!!QC!%rrqCN!6-c*Q
3#QCQQC!%-c1CN!3!!*QCCQErrjQCCQE-c*QCCQDCN!4QN!5CQ@CQ!!#CQ6-crrq
CQ6-cc-bCQ6-cQC!%-c0QCTQC-j!%QCNc-`!!QCN!!2rrQCN!!-c-QCN!!*Q3"!!
!CQDCQ3!!-c1CQ3#3"'CQrj!%CQErrmc-CQErrjQCCQErrfD3"2rr-c0QC[rr!!"
QCXc-rrpQCXb3"'CQc-bCQ@CQc-aQN!6-c$-cCQE-c!!!CQDCQIrrCQDCQFc-CQD
CN!4QCTQCCT!%QCNc-fCQQCN!!'D3"2rrCT!%c-aQN!5CQ@D3#M-cCT!%!!"QCM-
crrpQCM-cc-aQCM-cQCPQCM-cCT!%-j!%CQB!!2rrCQB!!-c-CQB!!'D3"!!!-c0
QCJ#3"$-crj!%-c2rrmc--c2rrjQC-c2rrfCQ-c2rrc13"2rr!!!c-mc-rrmc-mb
3"$-cc-bCQ6-cc-aQCM-cc-`cN!6-c!!!-c1CQIrr-c1CQFc--c1CN!3c-jQCCQB
c-jQC-j!%QCN!!$-cCQErrc-cCQE-c$-cCQDCQ6-cCT!%-c0QCM13"'CQ!!!cN!6
rrc13"-c--j!%QCNcN!4QCM13#J!!-c-!!2rr-c-!!-c--c-!!*QC-c-!!'CQ-c-
!!$13"!#3"[q3"!!!rrr-c!!!rrqCQ3!!rrpQCJ!!rrmc-`!!rrm!N!6-c2rr!!$
-N!3!!-c-QCN!!-c-CQB!!-c--c-!!-c-!*!%QCR-c!!!QC!%!!#CQ@CQ!!#CQ6-
c!!#CQ3#3"'CQrrm!!'CQc-`!!'CQQCN!!'D3"!!!CQBc-`!!-c2rr`!!-c2-c!!
!-c1CQ3!!-c0QCJ!!-j!%!!!c-`#3"[rr!*!%c-`!N!5CQ3#3"'CQ!*!%-c2ZlJ#
3",Zl!*!%UUS!N!5)L!#3"(Gh!*!%998!N!4%4!#3"#)L!*!%%4%!N!EGh3#3",Z
l!*!%UUS!N!5)L!#3"(Gh!*!%998!N!4%4!#3"#)L!*!%%4%!N!EZlJ#3",Zl!*!
%UUS!N!5)L!#3"(Gh!*!%998!N!4%4!#3"#)L!*!%%4(ZN!EGN!DUN!D)N!C%N!B
LN!B4N!B!N!N64&0&9!!!!9i!!rrr!!!!1!#U!!%!!!!"!*!,!3&0!!!!![!!!!*
!!!"#503!!!!"!*!4!3!"!*!'DHJ!N!`"B!#3"2q3"!#384aZG!%!#J#3#J,`!!!
#3!!!!!%!!!)!!J#3#3)!N!3G"N#!!*!%rrm!N!3")!!$!!!q!!!!SJ!!!&!!!!$
H!!!!!3!!!J!#!!%!N!F%!*!*J!!!rrm!N!3#)!-H!!"C!!!!Q!!!!&X!!!%K!!)
!!4%!!J!#!!)!N"6rr`#3"f!!![rr!!!!+J!!!!)!N"%"!!%!N!CTk!#3$!&J!*!
+!NB!!!'6!!%!!3#3"N##!*!-!3#3%846493!!!$Z!!(rr`!!!$J!UJ!"!!!!!J#
3#`%!!+4-Irrrrhrrrrm!3NM-!*!9!3!"!*!&!3#3$J&J!*!%rj!%!(m!N&)"!*!
-![!!!!*!!!!!!3!!!J!#!*!*!`#3""d'3)!!N!6rr`#3"cB!!Irr!!!!+J!!!!)
!N"%"!!%!N!CSeJ#3$!&J!*!)4&0&9!!!!,B!!2rr!!!!1!#U!!%!!!!$!*!06@P
M!!,`!!!#3!!!3NM%!*!9!3!"!*!&!J#3$J&J!*!%rj!%!*"4('jd!!!!0J!"rrm
!!!!U!!!!!J#3%3%!!3#3"QMF!*!-!@!!N!K%8d98!!!!9!!"!!!!"`#3"))!!3!
!"!!!!!%!!!!(!!%!!3!"!!!!3NCB!%*&T!"#4I!!N!J%!*!)2!!5!%*&i!!"!")
!N!F"!*!(#!#3#``!N!89!!%!%J!"!*!(#J#3"3J!3NN)!!!!#&0XD@4P)$)!N!P
%8d98!!!!YJ!!rrm!!!!i!+S!!3!!!!8!N""rrrrrIrrrr`"#58!!N"8"!!%!N!C
SVJ#3$!&J!*!%rj!%!*"A0J!"rrm!!!!U!!!!!J#3%3%!!3#3"QLZ!*!-!@!!N!K
%8d98!!!"*J!#rrm!!!!i!+S!!3!!!!B!N!X"!8d!!!!#m!!!!N!!!%**!*!%!3#
3%3%!!3#3"QRS!*!-!@!!N!6rN!3!N&%FER3"!!S!N!`%!!!AJJ!!!3!!!J!#!*!
*"`#3""d'3)!!N!6rr`#3"!-J!!i!!"U!!!!DJ!!"HS!!!L@!!3!"(`!#!!)!!3#
3&2rr!*!(B!!#rrm!!!!U!!!!!J#3%3%!!3#3"QRS!*!-!@!!N!S#4J!!!C-!!3!
"!*!'3))!N!`"r!#3%%46493!!!$Z!!(rr`!!!$J!UJ!"!!!!"`#3#`%!!+4-Irr
rrhrrrrm!3NMi!*!9!3!"!*!&"J#3$J&J!*!%rj!%!(m!N&)"!*!1"!!!&i)!!!%
!!!)!!J#3#3J!N!3G"N#!!*!%rrm!N!Ff!!(rr`!!!#S!!!!#!*!4!3!"!*!'D0B
!N!`"B!#3#%46493!!!#f!!$rr`!!!$J!UJ!"!!!!#!#3$8eTB`!#m!!!!N!!!%*
*$!#3&3%!!3#3"3F!N!i"B!#3"2q3"!#384aZG!!!!$B!!Irr!!!!+J!!!!)!N"%
"!!%!N!CSh!#3$!&J!*!)4&0&9!!!!CB!"2rr!!!!1!#U!!%!!!!*!*!,!3&0!!!
!![!!!!*!!!"#5i`!!!!"!*!4!3!"!*!'DHJ!N!`"B!#3"2q3"!#384aZG!%!#J#
3$!3!!"H#!!!"!!!#!!)!N!N+!*!%(3C!J!#3"2rr!*!%!5!!!`!!2J!!!'`!!!"
-!!!!NJ!!!!%!!!)!!J#3#3`!N!Q!!!$rr`#3"!)J!`i!!&#!!!"VJ!!!8B!!!@L
!!3!"!!!#!!)!N"Err`#3"!8J!)i!!)q!!!"pJ!!!r)!!!6Z!!3!"%3!#!!)!N"E
rr`#3"f!!![rr!!!!+J!!!!)!N"%"!!%!N!CTk!#3$!&J!*!+!NB!!!'6!!%!!3#
3"N##!*!-!I`!N""%8d98!!!!lJ!"rrm!!!!i!+S!!3!!!!S!N!X"!!#N6(rrrrp
rrrrr!%**A!#3&3%!!3#3"3N!N!i"B!#3"2q3"!"r!*"5!3#3$J3!!"H#!!!"!!!
#!!)!N!N,!*!%(3C!J!#3"2rr!*!(0J!"rrm!!!!U!!!!!J#3%3%!!3#3"QM@!*!
-!@!!N!K%8d98!!!!YJ!!rrm!!!!i!+S!!3!!!!X!N!e0D@-!![!!!!*!!!"#593
!N"8"!!%!N!8+!*!1!@!!N!6rN!3!N&%FER3!!!!f!!(rr`!!!#S!!!!#!*!4!3!
"!*!'D0`!N!`"B!#3#%46493!!!"8!!%!!!!(!*!%JJ!"!!!-!!!!#3!!!!F!!3!
"!!%!!!"#4J`!3NB)!%*'B!#3#!3!N!JQ!!i!3NC8!!%!$J#3"`%!N!F)!*!,$!#
3"48!!!!-!!%!N!F+!*!&#!"#4K3!!!!)8faTC'8J-3#3#846493!!!$Z!!(rr`!
!!$J!UJ!"!!!!$3#3#`%"63!!!!,`!!!#3!!!3N9F!!!!!3#3#J*'!!!"N`!"!!%
!N!CTk!#3$!&J!*!%rj!%!*"4('jd!3!+!*!-"!!!&i)!!!%!!!)!!J#3#3i!N!3
G"N#!!*!%rrm!N!GJ!!,rr`!!!#S!!!!#!*!+!NB!!!'6!!%!!3#3"QRS!*!-!@!
!N"%"!!%!N!C!JJ#3$!(m!*!34&0&9!!!!1i!!Irr!!!!1!#U!!%!!!!1!*!,!3!
!T%arrrrrIrrrr`"#4A3!N"8"!!%!N!80!*!1!@!!N!6rN!3!I`#38J%!N!i%!!!
AJJ!!!3!!!J!#!*!*$`#3""d'3)!!N!6rr`#3"cB!!Irr!!!!+J!!!!)!N"%"!!%
!N!CSeJ#3$!&J!*!)4&0&9!!!!,B!!2rr!!!!1!#U!!%!!!!2!*!06@PM!!,`!!!
#3!!!3N9N!*!9!3!"!*!&$J#3$J&J!*!%rj!%!*"4('jd!!!!0J!"rrm!!!!U!!!
!!J#3%3%!!3#3"QMF!*!-!@!!N!K%8d98!!!!lJ!"rrm!!!!i!+S!!3!!!"!!N!X
"!8d!!!!#m!!!!N!!!%**)!!!!!%!N"%"!!%!N!CTk!#3$!&J!*!%rj!%!*"4('j
d!3!+!*!-"!!!&i)!!!%!!!)!!J#3#4%!N!3G"N#!!*!%rrm!N!GJ!!,rr`!!!#S
!!!!#!*!4!3!"!*!'DHJ!N!`"B!#3#J*'!!!"N`!"!!%!N!BG"J#3$!&J!*!34&0
&9!!!!1i!!Irr!!!!1!#U!!%!!!!4!*!,!3!!T%arrrrrIrrrr`"#54J!N"8"!!%
!N!83!*!1!@!!N!6rN!3!I`#38J%!N!i%!!!AJJ!!!3!!!J!#!*!*%J#3""d'3)!
!N!6rr`#3"cB!!Irr!!!!+J!!!!)!N"%"!!%!N!CSeJ#3$!&J!*!)4&0&9!!!!,B
!!2rr!!!!1!#U!!%!!!!5!*!06@PM!!,`!!!#3!!!3NN3!*!9!3!"!*!&%3#3$J&
J!*!%rj!%!*"4('jd!!!!0J!"rrm!!!!U!!!!!J#3%3%!!3#3"QMF!*!-!@!!N!a
'6P40!!!!9!!"rrm!!!")!!!!!3!9!"8!3Nb!#8KPE(CPG'PMBH0k!!#%@J"#6)!
!!&pXCAKd!*!&)%),+L!)3)!!4Lh'!*!%CAKd!*!&3)$69J!!Af`!N!3Z1!!!!3!
!!!&2!!!!6`!!!&)!!!"X!!!'cJ!!!%i!!!!"!J!!*3!!!)!!!!!&!*!%#R0TEA"
XC5jME'3!!J!!!'4%FRG$4(*h!*!+C%4bGd0%FRF!N"M4CljZ!*!'!D%!N(VrN!J
!!!!V!31!X3!!"6%Z-(Bc(N0XBA*TFd4bBAFJ-5i`GM-0CQpb)%eKBfPZG'pcD!!
!!!d"!i#a!!!&-5i`GM-!N!3,#N0XBA*TFd4bBAF!!!%!!!!"6`!!!%m!!!"5!%*
+2"Tb!!!!(!"5!!&fCA*c!!%!%P088L!!!!!U!!(rr`#3#3,rr`!!!#m!N!5rp2r
r!!!!3!#3""G5:
(This file must be converted with BinHex 4.0)
:$A4PFh46D'&`C5jYC'B!4&*A4de%4P3"!!!!iC!!!*!%S,%!!J!!!!)#BJ*L!!!
!9"'Xr%#-B!"8%I3!!!"8$T`!9"&N!&314!"8$N3!!J#3"!G96Nj"689%6PEpmNM
R!aK#Tcmm!3ZTZLKI3UFr2!%0!&34p!!!!!%!N!6Irrrr!*!%lYIrr`#3"*h9[rm
b)N!!rZlrr`3!!)!!!!Ir!*!%prhrr`#3"2q3"!!)!!$lEErr!*!%lEDrrb!!!!$
Yf[rr!*!K"3J*!BN+"`'-#JX"MJS-!C!!#Ji"NJJ5!C-!N"!"4!!+!9)!$!#3"%c
58bf@@8Dc!"%!#rq3#!!J!!3!N!8"!!%!N#X"!!%!N!8"!!%!!!!"!!!6!"85r`)
#!3!1!!8!!J#3"`%!!3!"!!!!!3%"!"!!3J%3!8)!N!3AJ")!!!%!-!!`!3&rrhr
rJ!'!!3!!!8!"3!!"!!,ljrrCrqF$f3#3'2r*!*!%rrm!!!!"!!%#3!(m!"3!!3S
!"43SC-L3"#L3##+3"&@3"!!!!!%!!3*!!I`!&!!"#J!&&#KNb*!%+*!))T!%9C!
%!3%!!`"N!3!"!!!"!!)!!3!)!!B!"`$J!"!"!*!&!3#3#!%!!3,`!N!!9!fd!!!
!!`#3"Z*k!!!!9!j`!*!&!`!#!!!!!J!#!"i!9!kJ!2!!9"(N!!8!"Iq3#!#3#4i
!9"(`!2!!9!kJ!!8!"Iq3#!#3#4i!9"))!2!!9"(`!!8!"Iq3#!#3#4i!N!A`!&3
5#!!&!!ArN!J!N!X`!&34q!#3"!4!(!!,#8!!"X!$B!YN#I`!N!J&p!,k#JX)cJ"
8%@J%)!AJ!$!!9"(J!&342)4!(!!*#8!!#0`$B!V8"4!!N!J(i!-!#D!%J!"8%2!
"`!'!!%B!N!Li3"S!#3P!!!MF!f!+e!83#'!$!*!+B!$!!!B!!!!J!1!!!!&!!1!
!S!'!rk!"B2q!!)!!!!!J!!!!-!"8%9`!N!5%3"`!#3P!!!RB"RJ,C!L8!*!)#-!
&`!SJ"k!!9!rJ!@!"i!!S!*!)R%!D!!N*3!!*f!Ci#f3)P!M!"F!!N!J"B!(J!!!
!-!#3"9343)4!(!!*#8!!"X!'-!K-#I`!N!J'!!@!"f!)i!"8%HJ"B!0J!#J!9!r
i!*!%R%!D!!N*3!!'`!B`#!3)6!B!"B!!N!J")!(J!%B!N!98%Ibi3"S!#3P!!!E
N#%`)6!Rm"L!(B!#3#D!!`!!'!#!!S!$J!!!"3!$J!+!"J!!!!@!!!!$J!#!!S!#
3"8)!9"&J!*!%$%!L!!N*!!!!b!%2!9m#J!%(!2%!N!6rU`!!!$%"5!#3"4!$$!!
#!!!!!3!'!!&ZEh*YB@`J8!"#!&32Z!#3"!a!)J!*#3!!!0!$4!&R"*`"$J1!!*!
%rk[rC`!a!*N!N!9I!``"!J!!!!%!"J!"Bf9ZG'9b!!!!33"8%I`!N!3-3#)!#3P
!!!$J"4N"G`BS!4`&!*!&rk[rL!!a!(N!!!"j!!!$$2m#!!!!!3!&!!&bD@GSG!!
!!$)!9"(X!*!%4%!L!!N*!!!"q!%J!IJ$'!(!!3#3$1!!!3#3"J(!!$)!9!mS!*!
%5%!L!!N*!!!"q!3i!aJ%1!(!!m!!N!Q!!!!!!3#3"!%!N!3b!&321!#3"%K!)J!
*#3!!!IJ&a!,d"F3"`!8J!*!*F!!!!!%!i!#3"c)!9!md!*!%4%!L!!N*!!!"q!D
F!IJ(i!(!"H!!N!Z3!!!"!!!")!#3"6)!9!mN!*!%1%!L#!N*38S$T`%@!r!#Y3-
J!3#3#N!!X!!"!*!&J!&J!$)!9!m8!*!%1%!L!!N*3!!$K!-m""3%A!-J!Z!!N!P
!!)!!!3#!!*!%!3!!-J"8%d`!N!3i3#)!#3N!!!1%")!%J!8d!b!%!*!+F!"3!!%
!!!#J!1!!!!!b!&32'!#3"$K!)K!*#8!!!f!&S!4F"J`$!!8!N!T`!$!!!3#3"H!
!B!!b!&32(!#3"$K!)J!*#3!!!i3'9!4F"X!$)!@J!*!*B!!`!!%!`!"J!*!&-J"
8$``!N!3i3#)J#3NK-306"Nm%4!LI!`!'B!&8$a!!N!9J!%!!!3$!!*!&J!!D!*!
+!``"!3!!!iF'6`3A#*m$"!!b!&32#!#3"$K!)J!*#3!!!m`)"!2`#,J$B!FJ!*!
*%!"3!!%!)!#J!*!&-J"8$`3!N!3i3#)!#3N!!!2-#8J%&!SJ!f!)3!#3#5!!B!!
"!!!!`!"!!!!!+!"8$`#3"44!)J!*#d!!"+)"a!81!T`%&J'2!*!*B!$!!#J!9!l
m!*!%&%!L!!N*!!!%T!,d"4!$U!3J!U!!N!PJ!+!!+!"8$[J!N!383#)!#3P"$J5
N")!&@!6X"%!$i!#3#@!!S!!S!&31p!#3""4!)J!*#3&H")d&r!9+"[-%)!9J!*!
*J!$!!#`!9!lX!*!%'%!L!!N*!!!&S!&S"P3#L!8!!8!!N!QJ!3!!8!"3!#`!9!m
J!*!%'%!L!!N*!!!&S!-m"P3%A!8!!Z!!N!QJ!3!!8!"3!#`!9!lS!*!%'%!D!)N
*39i&CJ8""N8''J6J")!!N!QJ!1!!8!"3!#`!9!lN!*!%'%!L!)N*!93&3`EA"N3
)@!6J"L!!N!Q!!8!!3!"!!$!!9!lF!*!%+%#+!!N*8!!'S`"3#%8$%3C!!@!"9!l
JrkErjJ%D!9S!N!A!!8!!'J#3#6)$$2m"!!!(,!"3"l`#@!-%!$J!9!lB!*!%-%!
D!)N*3!!'S!+-#@J&9!FJ!i!!N!6qa2l%!6`"2!#'rVi!N!AH!1B"2!!X!$B!9!l
8!*!%3%!D!!N*!!!(#!U`"cm,(`C!#B!!N!NB!$%!!J!!!'-!-3#3"@-"0J"8$Y!
!N!4!3"S!#3P#!!Fh#RF)J`af"Q-*3!#3#CS!m3"#!)!!B`#1!(-!R!#%!+N!P!#
d!+8![3#f!-N!a`$D!0S!l3$Y!2B!rJ$V!3X!e3%A!,m"*3#S!6J!N3&0!)!"BJ"
p!AJ!JJ'0!)8"SJ#&!EB!JJ(*!(X"e!"V!G!!93(%!%)"Y!!b!C`!)`&r!"F"C3!
1!8i!"`%i!!S"*`!M!4i!4`%D!'N"&J#*!4F!U!%C!-3"&`$F!3i!m3$r!38!i!%
A!+%"+!"3!5i!&`%I!!i""3!F!1m!+`$N!$d!h!"3!0-!DJ$(!*3!Z3$'!,!!mJ#
b!43!Z3%a!,m"2J$%!5d!b3%,!-8!k`#[!-i!N3#a!)!!QJ#1!)i!UJ#(!,S!I`#
[!(B!Q!"Y!)!!B`#b!&31c!#3"%"!'J!*#8+d#(i+JJR($()(JJP!!*!*R!$c!#%
!J!"M!*`!K!#d!+8!b3$(!1d!l3$V!3X![`%P!*%"63"p!AJ!K3'L!))"b3"V!G!
!3J'd!#-"I`!1!8i!#J%R!%F"'J#*!4F!a!%A!2%!r`%A!+%",J!A!38!(!$N!$d
!d`"U!,N!aJ#b!43![`%q!-N"#`#[!-i!J!#D!+S!K`#[!(B!J!"M!#`!9!l)!*!
%'%!D!!N*!!!,V!-m$$`&%!TJ!Z!!N!Q!!D!!3!"!!$!!9!l%!*!%+%!D!!N*!!!
,3`@4$+8'm`TJ"3#3"IqMrr-!h3%Y!*!&J!%J!$J!9!l`!*!%-%!D!!N*!!!,L!H
B$+3*"!T!"X!!N!6qV2kX!93"9!#+rq)!N!3"!!$J!)!"J!!S!&31`!#3""a!'J!
*#3!!#iJ*f!aJ#f3+3!M!!*!*`!&J!$d!9!kB!*!%$%!L!!N*3!!+a`Zq#ei-$`R
U#VJ!N!6rUrqi!$%!N!J$$2m#!!!!!3!"!!&KL'%!6J"8$V3!N!3-3#3!#3Y"$JR
8"+X3mJBT#im('J#3"2q@qRi!kJ$5!!$pU"-!&4)"!J)"!!%!%J!"58`JMP4"593
J98j&)%C2590#60m!0J"8$V`!N!4!3"`!#3P!!!Rr!(m,(`$m#1-!3!#3#B!!D!!
#!3!!S!!!!$%"!!#J!$)!9!ki!*!%1%!F3!N*!!!**!%J#C!!![3))!%!N!S`!0!
!!3"J!*!%!D!!-!"8$N3!N!3%3"`!#`Y!!!5*#$m*,3lErJ`%6!#3"!Ad![S+#`M
1!&31V!3J"H!!-!"8$U3!N!5%3"`!#3P!!!DP#$m)R3R[!*!)"q!$!!QJ")!!9!k
`!F!"J!"'!*!)Z%!D!!N*3!!'T3Jr#*d*l`KJ!`#3#Q!!`!!'!!!!)!$J!!!"3!$
J!+!"J2qJ!@$rJ!#!!!!!)!!!!$!!9"(F!*!%K%!F!!N*3!!(S3YA#5d0F`#3#!M
!"F!+)!HJ!&31U!&J!H!!+!#3#*a!'J!*#8!!"k%,9`NY$A-)`!A!!*!)!@!"i!!
!!$!!N!L%3"`!#3P!!!5*#`m'&3lE!*!)"J!&J!GJ#1!!9"$8!@!$B!!S!&35!*!
&R%!D!!N*3!!%L3X2"Fd0+`B!"B!!N!J")!(J!%B!N!Li3"S!#3P!!!5Y$5X'&3l
E"L!(B!#3#D!!`!!'!#!!S!$J!!!"3!$J!+!"J!!!!@!!!!$J!#!!S!#3"6!!N!L
)3!!!#`X!N!B@J"(r!!!!pJ#3"[m+%pJ1k3"8$N!6f!rI!$i!9!ii!&314-a!!!!
,#`#3"J&3%Im!!2m+!*!)!5J2h`"8$M`!!3#3"5S#3!#3"5S#3!!q!&31-!"8$N$
-3!!!#`X!!!&3!!!#S"(r!5Mr#J#3#!%S$pm!9!id!!%!+J!!!&3#3!!U!!!!9!*
!!$i!9!iS!&311-a!!!!,#`!!!Tm!!!2`%Im#82m+!*!)!5N2h`"8$L`!!3"8!!!
!IJ*!!&3!!!"q!N!!2J"8$L!!9!i`c%!!!!X,!!!$m!!!"8!4r`0jr`S!N!J"+!r
I!&31*!!"!(i!!!#S!N!!IJ!!!+J#3!!q!&31'!"8$LM-3!!!#`X!!!9!!!!'N!!
4r`5Kr`S!N!J"+!rI!&31(!!"!+J!!!$5!N!!U!!!!0)#3!!q!&31%!"8$L$-3!!
!#`X!!!D2!!!(i"(r"FRr#J#3#!%T$pm!9!i8!!%!dJ!!!2`#3!$5!!!!r!*!!$i
!9!i)!&31'-a!!!!,#`!!"q!!!!N`%Im'm[m+!*!)!5J2h`"8$J`!!3$m!!!"*J*
!!2`!!!%Q!N!!2J"8$J!!9!i3c%!!!!X,!!!*-!!!#S!4r`JDr`S!N!J"+!rI!&3
1"!!"!5B!!!&3!N!"*J!!!9!#3!!q!&30q!"8$JM-3!!!#`X!!!Tr!!!,d"(r#8,
r#J#3#!%T$pm!9!hm!!%"8!!!!AS#3!&3!!!"HJ*!!$i!9!h`!&31!-a!!!!,#`!
!#p!!!!dJ%Im+Drm+!*!)!5J2h`"8$I3!!3&k!!!"T!*!!AS!!!'N!N!!2J"8$HJ
!9!hic%!!!!X,!!!0)!!!$R!4r`Z6r`S!N!J"+!rI!&30l!!"!D3!!!(1!N!"T!!
!!Fi#3!!q!&30i!"8$I$-3!!!#`X!!!j[!!!2`"(r$,[r#J#3#!%T$pm!9!hN!!%
"cJ!!!IJ#3!(1!!!"q!*!!$i!9!hB!&30k-a!!!!,#`!!$m!!!"%3%Im0j2m+!*!
)!5J2h`"8$G`!!3(i!!!#)J*!!IJ!!!)L!N!!2J"8$G!!9!hJc%!!!!X,!!!4%!!
!%Q!4r`m-r`S!N!J"+!rI!&30e!!"!L)!!!*-!N!#)J!!!N`#3!!q!&30b!"8$GM
-3!!!#`X!!"*I!!!6X"(r%$6r#J#3#!%T$pm!9!h-!!%#6!!!!RB#3!*-!!!#GJ*
!!$i!9!h!!&30d-a!!!!,#`!!%l!!!"8!%Im4AIm+!*!)!5J2h`"8$F3!!3*f!!!
#S!*!!RB!!!+J!N!!2J"8$EJ!9!h)c%!!!!X,!!!9!!!!&P!4ra+&r`S!N!J"+!r
I!&30[!!"!U!!!!,+!N!#S!!!!XS#3!!q!*!&9!h!c%!!!!X,!!!@6`!!&S!4ra1
Yr`S!N!NV$pm!9!fd!!%#bJ!!!Y!#3!,+!!!#d!*!!*!)!F`!9!fm!!!!9!fd!!%
!!)"9ccJ!5!,+!!!#d!*!!*$r!*#a#q`!9!h%!!!!9!fm!!%!!)"9`[`!5!+J!!!
#bJ*!!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$E#q`!9!h-!!!
!9!h%!!%!!)"9YX!!5!*f!!!#S!*!!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$
r!*$r!*$r!*$E#q`!9!h8!!!!9!h-!!%!!)"9US3!5!*-!!!#GJ*!!*$r!*$r!*$
r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$E#q`!9!hF!!!!9!h8!!%!!)"9RNJ
!5!)L!!!#6!*!!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$E#q`
!9!hN!!!!9!hF!!%!!)"9NJ`!5!(i!!!#)J*!!*$r!*$r!*$r!*$r!*$r!*$r!*$
r!*$r!*$r!*$r!*$r!*$E#q`!9!hX!!!!9!hN!!%!!)"9KG!!5!(1!!!"q!*!!*$
r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$E#q`!9!hd!!!!9!hX!!%
!!)"9HC3!5!'N!!!"cJ*!!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$
r!*$E#q`!9!hm!!!!9!hd!!%!!)"9E9J!5!&k!!!"T!*!!*$r!*$r!*$r!*$r!*$
r!*$r!*$r!*$r!*$r!*$r!*$r!*$E#q`!9!i%!!!!9!hm!!%!!)"9B4`!5!&3!!!
"HJ*!!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$E#q`!9!i-!!!
!9!i%!!%!!)"991!!5!%Q!!!"8!*!!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$
r!*$r!*$r!*$E#q`!9!i83UF!9!i-!!%!!)"95+3!5!$m!!!"*J*!!*$r!*$r!*$
r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$E#q`!9!iF6Ud!9!i8!!%!!)"92'J
!5!$5!!!!r!*!!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$E#q`
!9!iN-#i!9!iF!!%!!)"9-#`!5!#S!!!!dJ*!!*$r!*$r!*$r!*$r!*$r!*$r!*$
r!*$r!*$r!*$r!*$r!*$E#q`!9!iX!!%!9!iN!!%!!)"9)r!!5!"q!!!!U!*!!*$
r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$r!*$E#q`!9!id)&m!9!iX!!%
!!)"9&l3!5!"8!!!!IJ*!!*!'(J#3"Ai!N%%H!*!%!I`!N%%H!*!%!r!!N%%H!*!
%"q!!N%%H!*!%(m!!N%%H!*!%2`#33Ki!N!6q!*"#(J!!!!(m!*"#(J!!!!I`!*"
#(J!!!"rJ!*"#(J!!!$q!!*"#(J!!!(m!N%-H!!!!r!#33ai!!!(`!*"$(J!!"q!
!N%-H!!!2`!#33ai!!"q!!*"$(J!!2`#34"i!!2`!N%3H!!2i!*"%(J!2m!#34"i
!2q!!N%3H!(q!!*"%(J(q!*"&(JIi!*"&(KrJ!*"&(Rr!!*"&(rm!N%BIr!#34Kr
`!*"'$m!!N2m!N2m!N2m!N&X,l!"8$Ma#E`"8$M3!!3!!J&8,H!")!#S!!!"8!N!
!N!BH!*"((J#34ai!N%FH!*"((J#34ai!N%FH!*"((J#34ai!N%FH!*"((J#34ai
!N%FH!*"((J#34ai!N%FH!!!Irrrri!#33"rrN!Em!*"!(rq3"`#33"rrN!IJ!*!
r(rrrm!!!!$ri!*!r(Mr!!*!%"ri!N$mH"q!!N!3"r`#32ai"m!#3"6q!!*!q(J$
`!*!&$i!!N$iH"r!!N!8(`!#32Ki2m!#3"32!!*!q(Jr`!*!&!m!!N$iH"q!!N!8
$`!#32Ki!N!F$`!#32Ki!N!F$`!#32Ki!N!F(`!#32Ki!N!F2J!#32Ki!N!FI!*!
r(J#3"hi!N$mH!*!'!I`!N$mH!*!'"rJ!N$mH!*!'2r!!N$mH!*!&!Ir!!*!r(J#
3"32r!*"!(J#3"3Im!*"!(J#3"4rJ!*"!(J#3"6m!N$X,l!#3"2rr!&312!!"!!#
!92mm!%J!N!8U!N!!N2m!N2m!N2m!N2m!N2m!N2m!N-`1!*"((`#34am!N%FH!*"
((J#34ai!N%FH!*"((J#34ai!N%FH!*"((J#34ai!N%FH!*"((J#34ai!N%FH!*"
((J#34ai!N%3H!&32M!!4!&31F#,B!!"-dP-YPPP'Xdc58ff@@8Dc!"i!N!8$!&3
2M!&T!!!"!J3)%#"!J!%#4'J`-ND'!!!!H!!!!''dP!"KY)`!BE5)rrm!BE5FUP@
U9DT9UP8!!!!JEh"d)'ecC`#3"!YQEh)JC@4TG'ecC`#3"`%F!'%RQ!!)!*!)rrf
fh`4@D@9h#PT[EfdJ5@iJ0&J!-3!!#PT[EfdJ5@iJ-PJ!-J!!#eT[5DN!!!:
......@@ -67,6 +67,9 @@ bool MWAWDrawImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, O
case MWAWDocument::MWAW_T_GREATWORKS:
rTypeName = "draw_Great_Works";
break;
case MWAWDocument::MWAW_T_MACDRAFT:
rTypeName = "draw_MacDraft";
break;
case MWAWDocument::MWAW_T_MACDRAW:
rTypeName = "draw_MacDraw";
break;
......@@ -82,6 +85,9 @@ bool MWAWDrawImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, O
case MWAWDocument::MWAW_T_SUPERPAINT:
rTypeName = "draw_SuperPaint";
break;
case MWAWDocument::MWAW_T_RESERVED1:
rTypeName = "draw_ClarisDraw";
break;
case MWAWDocument::MWAW_T_ACTA:
case MWAWDocument::MWAW_T_ADOBEILLUSTRATOR:
......@@ -102,7 +108,6 @@ bool MWAWDrawImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, O
case MWAWDocument::MWAW_T_HANMACWORDK:
case MWAWDocument::MWAW_T_LIGHTWAYTEXT:
case MWAWDocument::MWAW_T_MACDOC:
case MWAWDocument::MWAW_T_MACDRAFT:
case MWAWDocument::MWAW_T_MACWRITE:
case MWAWDocument::MWAW_T_MACWRITEPRO:
case MWAWDocument::MWAW_T_MARINERWRITE:
......@@ -128,7 +133,6 @@ bool MWAWDrawImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, O
case MWAWDocument::MWAW_T_ZWRITE:
case MWAWDocument::MWAW_T_4DIMENSION:
case MWAWDocument::MWAW_T_RESERVED1:
case MWAWDocument::MWAW_T_RESERVED2:
case MWAWDocument::MWAW_T_RESERVED3:
case MWAWDocument::MWAW_T_RESERVED4:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment