[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 11 commits - connectivity/source cui/uiconfig download.lst external/libmwaw filter/source framework/source sc/inc sc/source svx/uiconfig vcl/opengl vcl/source vcl/workben wizards/com writerperfect/qa writerperfect/source
David Tardon
dtardon at redhat.com
Tue Jan 6 07:38:03 PST 2015
connectivity/source/drivers/file/FResultSet.cxx | 1
cui/uiconfig/ui/movemenu.ui | 2
download.lst | 9
external/libmwaw/ExternalPackage_libmwaw.mk | 2
filter/source/xslt/import/uof/uof2odf_presentation.xsl | 4
framework/source/fwe/classes/addonsoptions.cxx | 44 ++--
sc/inc/formulacell.hxx | 4
sc/inc/tokenarray.hxx | 3
sc/source/core/data/formulacell.cxx | 9
sc/source/core/tool/token.cxx | 27 ++
svx/uiconfig/ui/floatingcontour.ui | 3
vcl/opengl/gdiimpl.cxx | 5
vcl/source/filter/jpeg/jpegc.cxx | 2
vcl/workben/vcldemo.cxx | 1
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py | 2
writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraw_Pro_1.0.hqx | 109 ++++++++++
writerperfect/qa/unit/data/writer/libe-book/pass/Broad_Band_eBook.lrf |binary
writerperfect/source/writer/EBookImportFilter.cxx | 5
18 files changed, 201 insertions(+), 31 deletions(-)
New commits:
commit ce72753e64cc29590d5cb813577ec2b7803f18d3
Author: David Tardon <dtardon at redhat.com>
Date: Sun Jan 4 21:51:29 2015 +0100
upload libmwaw 0.3.4
Change-Id: I0208d53522da4d3d32c4060b6d784d62a64bf0eb
(cherry picked from commit 32c3167be34546bd437ad0f1cacc50a61ef753f7)
Reviewed-on: https://gerrit.libreoffice.org/13748
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/download.lst b/download.lst
index f2bd8d2..cb087d1 100644
--- a/download.lst
+++ b/download.lst
@@ -102,8 +102,9 @@ export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-
export MDDS_TARBALL := cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2
export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
-export MWAW_MD5SUM := 19b879c2a27251db6fb274d6c585d488
-export MWAW_TARBALL := libmwaw-0.3.3.tar.bz2
+export MWAW_MD5SUM := edb8a92a4b6746efbd45bde5006f71b9
+export MWAW_VERSION_MICRO := 4
+export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
diff --git a/external/libmwaw/ExternalPackage_libmwaw.mk b/external/libmwaw/ExternalPackage_libmwaw.mk
index 3b3bcb6..97a6e6d 100644
--- a/external/libmwaw/ExternalPackage_libmwaw.mk
+++ b/external/libmwaw/ExternalPackage_libmwaw.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3
else ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.dll,src/lib/.libs/libmwaw-0.3.dll))
else ifeq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.so.3,src/lib/.libs/libmwaw-0.3.so.3.0.3))
+$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.so.3,src/lib/.libs/libmwaw-0.3.so.3.0.$(MWAW_VERSION_MICRO)))
endif
# vim: set noet sw=4 ts=4:
diff --git a/writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraw_Pro_1.0.hqx b/writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraw_Pro_1.0.hqx
new file mode 100644
index 0000000..f89c7118
--- /dev/null
+++ b/writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraw_Pro_1.0.hqx
@@ -0,0 +1,109 @@
+(This file must be converted with BinHex 4.0)
+:#R4PFh404&!a,M!!C%4[Bf43FQm"!!!!%!!!!!cJjC0N4'pM4$,rr`!2!!!"D!&
+S!*!%$VJ,32qerkB2,3ZDB`)&+!2m!3!!!!&S!@J!N!31Z!Y!!!%&!!"N!!%!!!!
+"!!)!!!!"*`m!!3#3$K!!N!N3!2qerkB2,3ZD!!J!N!iC!3!#!(J!5!!!!%J!N!J
+"!3!#!*"Y!3!'!!B!!3!"!!B!"J!"!!%!!!!,!!!!!J#3#!%PT8X!MMaj!8ZP5`#
+rQAN"*D9,!)imH3&,T8X![jPj!!!!#`#3"5'&#J!R,em"5k9,!F"I[`%PT8X!MMa
+j!8ZP5`#rQAN!!!!,!*!&)B8+!#F[A`&,T8X"`&qr!5 at P5`#12(N"5k9,!,qCH3!
+!!*!!!!!!5!!!!+J!!!"8!!!!&J!!!1i!!!##!!!!#J!!!43!N!S$P!!!!B3!N!9
+4rkJ!!!!"!!!!!8!L!*!'2laaaaaaaa`!##%!N!3(3!DY at V9UeDXreT2T2T2T2`!
++)!-!!!!"2rJ!N!Brj9 at 3"J!-)3%!!!!"2q)N5*%L4)Nrr$MMMMMMMJ!")!-!!!!
+"3"c-N!A02m(((((((()!&#%!N!3"2mki8HZ&(VK!%+U3"DX",#%!N!3(!!%!!!!
+"!!%!!!!"!!)!!!!#!!)!!!!"!!3!!!!%!!3!!!!"!!B!!!!'!!B!!!!"!!J!!!!
+)!!J!!!!"!!S!!!!+!!S!!!!"!!N!!!!*!*!9!3!E!!!!#3#3&3%!%J!!!")!N"8
+"!$B!!!!5!*!9!3")!!!!#3!!!!N!!!!*!*!0!3")!!!!#3!!!!N!!!!*!!!!#3!
+!!!N!N!8"!!%!$!!!!!3!N!8%!!)!$!!!!!-!N!8"!!-!"J!!!!B!N!8"!!3!$!!
+!!!8!N!8"!!8!"3!!!!8!N!8"!!B!!`!!!!-!!!!&!!d!!!!*!!!!&3!!!$!!!-!
+'!!!!"3#3(2rr!*$4!3#3"`X!N!X,rj!%!*!-!5 at P5`#12(N"5k9,!,qCH3!KK3S
+!*bpI!8ZP5`(!Alm!N!`"*D9,!)imH3&,T8X![jPj!#'&#J!R,em"5k9,!F"I[`"
+4rm3!!!&f!!!!#!!!#8CPG at PXE'8J-3!!!3J!!!!-!!!!"!#3r``!!!!"!!!!#!!
+!!3J!!!!S!!!!"!!!!'!!!!#B!!!!p!!!!5`!!!')!!!"`!!!!K`!N1)#M!!!!!%
+!!!"F!!!!#!!!!"`!!!!"!!!!!J!"!*!%J!#3"Khrr`!!!!%!$3!!!!N!N!HD#`#
+3"!%!!!!F!!%!$3!!!!N!N!d1!*!&!3!!!$J!!J!"!!'K+`#3#@"J`J!&UeF!$NK
+8!!KF-3!1%e8!"0GF!!hH9J!"8SF!!!!"!!!!A!!!!!`!!!!0!!!!!3!!!!)!!3#
+3")!!N!B1rrm!!!!"!!d!!!!*!*!(5,L!!!!!!3!!!!d!!3!0!!!!#3#3$3i!N!8
+"!!!!1!!#!!%!!D%V!*!*B'$#!!@V9`!15&3!#&`a!!i693!%ee`!$Gj@!!&5K`!
+!!!%!!!"F!!!!%!!!!"%!!!!"!!!!!J!"!*!%J!#3"K,rr`!!!!%!$3!!!!N!N!G
+CBS!!!!!"!!!!%3!"!!d!!!!*!*!0$J#3"3%!!!!i!!)!!3!"S5X!N!PJB-)!"DY
+A!!j)9!!)A$%!$K09!!6AA!!0hPB!!9+(!!!!!3!!!&`!!!!8!!!!#!!!!!%!!!!
+#!!%!N!5!!*!'#Irr!!!!!3!0!!!!#3#3"bB#J!!!!!%!!!!)!!%!$3!!!!N!N!d
+1!*!&!3!!!(!!!!!B!!!!"J!!!!%!!!!#!!%!N"L!!*!'"rrr!!!!!3!0!!!!#3#
+3"b&G!*!%!3!!!!B!!3!0!!!!#3#3$3i!N!3"#!!!!"`!!!!%!!!!+!!!!%!!!!"
+F!!!!E!#3lh`!!!!"!!!!*%%JFfeKE'`J6@&M4(*KGb"3FQmJCQPXC5!a,M!!!!!
+"!!!!''%JBQaeC5"cFA9KFQ8!!#J!!!!"!!!!('%JCh*PC at iJFQ9MG#"[GQ&X!!!
+N!!!!!3!!!""K)'0TFQ0XC3!!!!%!!!!3B5"ZEh4P!$!!)B8+!(3iF3![K3S"$N0
+a3!%!N!X)!!"!!!"AAlm!*bpI!+6SdJ#6jXi!!`!"!J$!"X!'!*!'J!!!9)S8!,I
+!J3#@[(N"2IVf!!3!!3)!`!E!"J!"aBX!!)!"!&GI[`&U9DX!LfA-!F"I[`!&!!%
+#!-!'`!B!N!D!!J#TP#J!A3X@!3VdkJ"QCdG!)J!"!J$!"J#3"3`!N!3"%REZ!$A
+EY`%JGZi!IT3h3!%!N!X3!!"!!!#ECp!!pKdk!2c)NJ$rH at Y!)J!"!J$!"J#3"43
+!N!AqRci!e*Nb!3bI2J%Yql*!!3#3#aJ!!%!!!*,QcJ'5"3N!p%H3!!'EB6T!)J!
+"!J$!"J#3"4`!N!Af(M`"H3)%!33H2!'I")4!!3#3#b!!!%!!!5 at P5`#12(N"5k9
+,!,qCH8!+!*!,*!!!3!$rrc-c!!!!,!#3"30e9Irr-c-!!!!Y!*!&!i!!rrmc-`!
+!!#i!N!8$K9Arrc-c!!!!,`#3"31+U[rr-c-!!!!`!*!&!irrrrmc-`!!!$%!N!8
+$P96rrc-c!!!!-J#3"31GU2rr-c-!!!!c!*!&!kUTrrmc-`!!!$3!N!8$[rrrrc-
+c!!!!03#3"32992rr-c-!!!!f!*!&!q10rrmc-`!!!$F!N!8$lMMrrc-c!!!!1!#
+3"3-!!2rp6-d!!!!j!*!&!`UVrre-c3!!!$S!N!8$&9Arr8c0!!!!1`#3"3-J!2r
+p6-d!!!!m!*!&!b99rre-c3!!!$d!N!8$+UVrr8c0!!!!2J#3"30!!2rp6-d!!!!
+r!*!&!e99rre-c3!!!%!!N!8$DUVrr8c0!!!!33#3"30e9Irp6-d!!!"#!*!&!i!
+!rre-c3!!!%-!N!8$K9Arr8c0!!!!4!#3"31+U[rp6-d!!!"&!*!&!j!!!2rp6-d
+!!!"'!*!&!j99rre-c3!!!%F!N!8$RDMrr8c0!!!!5!#3"31UU[rp6-d!!!"*!*!
+&!lrqrre-c3!!!%S!N!8$e9Arr8c0!!!!5`#3"32MMIrp6-d!!!"-!*!&!qiirre
+-c3!!!%d!N!8$!!$rrQCQ!!!!6J#3"3-+UrrqCQB!!!"2!*!&!a99rrjQCJ!!!&!
+!N!8$)!$rrQCQ!!!!83#3"3-P9IrqCQB!!!"5!*!&!bUUrrjQCJ!!!&-!N!8$3!$
+rrQCQ!!!!9!#3"30992rqCQB!!!"9!*!&!fUUrrjQCJ!!!&B!N!8$G9ArrQCQ!!!
+!9`#3"31!!2rqCQB!!!"B!*!&!i99rrjQCJ!!!&N!N!8$LUVrrQCQ!!!!@J#3"31
+3!!$rrQCQ!!!!@`#3"3199IrqCQB!!!"F!*!&!jfSrrjQCJ!!!&d!N!8$UUVrrQC
+Q!!!e at 3!!!3!!!!S+!!!*#J!!!YB!!!!#$R4PFh4(FQ&`D#jhF(-cG`)!!J""9eG
+3690A5`TdCA0d6843-5i`!!)!!!"N4'pMC&"bE`#3#Q4%Ef0N8(*[!*!Bd(I'3!!
+!%!!!!!cJ!*!-%3#3"!),G'9cG%GbBA"S3eF#!!)!3eGA8%*23Nm"!!'!!8!!N!3
+#[3#3"!r&!!!3!*!&!FJ!!!J!cQa0IFjXlYi!N"B%'J!#!*!)""`!!3#3$A*N(3%
+*!#N!!`(G!M-!!!!#!!)!!!!"!!%!!J!#!!%!!3!"`!E!"J!"!!"!!!!"!3%!&3!
+`!*!%rrm!N"B#3!!!!['CQJ!!!6UP5`#@2(N!N!J#mCQD!N!!N!8'!!-!N!F5!!%
+23fpeE'9eFR-J3faKFQPc!!!!,J!"!+J!8Ip3!!J!&3!!!'3!N!9N!!!!8Im-!&(
+r@!"4re`!N!dm!!!!!3#3"31GU2rqCQB!!!"F!!!!!3#3"30992rqCQB!!!"8!!!
+!!3#3"3-!!2rqJ!#3"')!!!"3!*!13fp&6!!3!*!08Ip`!*!-4&"$E`!8!!-!N!4
+$EdjK!!X!$J"4rhJ!N!X3!!%06 at pdD@Cc)%0XBA*TF`!!!#i!!3"!!&(r,!!)!!J
+!!!"N!*!&C!#3"e(r0!"4rcJ!N!d+!*!08!!"!*!,!9"K48`!$J#3"`%!!!!"!&(
+r9!#3$%438'%!%J#3"3&3B8jK!!i!)!"4rd`!N!X5!!%24)jRFQ&NMR-J3faKFQP
+c!!!!,J!"!"!!8Im)!!)!#!!!!'3!N!9N!*!(8Im3!&(r&!#3$3S!N!e3!!)!N!X
+#8Q&&6!!d!*!(!J!!!!)!8ImS!*!-4&"5B3!i!*!&!P*K6Q%!$J!J!&(r-!#3#bi
+!!3!I!&(rG!!"!"m!!!"N!*!&#`#3"e(rI!"4ri!!N!d+!*!08!!$!*!,!dCK48`
+!@J#3"`-!!!!$!&(rN!!!N!a%8%CK!$B!N!8$4Q&1B3!3!#!!8IqN!*!,E!#3Ea,
+rN")!!!#3!!!"!!!!!3!!)3#3$!J!!3!"!!!!!3!!)!!$!*!+#J!#!!"!!!!"!!!
+K!J%!N!S-!!-!!3!!!$)!!#!!!`#3#J%!"!!#!!!!!3!!)3#3$"3!"3!"!!!!!3!
+!)3#3#`%X!!B!!!!`!!%!!!)!!!%!!J!!!J!!!J!%!!!#!!!$!!B!!!)!!!3!#!!
+!!J!!"3!+!!!#!!!'!!!!R)!*!!!!#3#3%`'!'`!!!!N!N"-#J")!!!!5!*!6!i!
+f!!!!%J#3%`5!5!!!!!N!!!!*!!!!#3#3#`@!5!!!!!N!!!!*!!!!#3!!!!N!!!!
+*!!!!"J!!!$`!$!!!!!3!!!!"!!`!!!!$!!!!!J!'!!!!"J!!!!-!$!!!!!8!!!!
+%!!8!!!!&!!!!"3!$!!!!!`!!!!B!!!!D!!8!!!`!!"aBX3!H!*!%`!#3$#i!!3#
+3"@3!-J$A!4J!-J!b!0J!b3"N!A3!UJ),!)`!P3#J!6)!N!F#!!!!"J%!!3!!!3!
+!!!)"!3!!!!3!!!!"!!!!"J#3"!%!N!55rj!)&N4TBh4TEfjZB at PbC5"`FQPZBfP
+`B@`!N#NB4'PMG'P[EQjKDA*P)(9dD at aTFf&dCA9b!*!Rr"Rm'3!"!*!(+!!"!!!
+!!3!!!!%!!!!"!!!!!3!!!!%!!!!"!!!!!3!!!!%!!!!"!*!&&!!!!!%!N"-)!!!
+!&3#3"`S*5'9XGQ9dD at 0K!!!!#!(j!#S!6N3B!!!"q4K"FQPKE#"09#"$EfjNC at j
+cC at 3J6'PRD(3,3ACKER3J4f&bC'883QpNEfjT)%e8)&9XG(*K)%*[E'3(3Qp[Dfe
+KEJG$D'PMB at G["d0[GA*TCA))4'9XF'KTB at i*4A0`H5"6B at jc$N9cF(NJ8f&ZFb"
+#EfaN$'9AEh*XC#"8D at GSG!p(BA*KE at pZC#"1BA*bEhF'4f9ZCACK'%GTE'`J8f&
+ZFb"$EfjNC at jcC@3J3QpXC!P)C at afCA4TBf%25'9XGQ9dD at 0K)%*XB at 0V&%KPE(C
+PG'PMB5"$Efe`FQ9cFf9N#%YXB at jR)%e8$8aeBQ&XD at iJ4h*KF'J06(9MD at 4K)%*
+bD at GSG!G0B at 0SD@jP"Ne[EQ&ME`K09#"&H(4bB4*1)%KPE(CPG'PMB5"1BA*bEhF
+)6Q&ND@&ZEQ826Q9h)%*PFQpXD at jK)%e8%NjPGb"$C at jdGA*j)&0MD'aLD`K1CAF
+J@@pbDa"2E'3J4 at jRE'PcD#"8CAKd%dpXC#"&EQGXDA0S)&4PH(3J693%6fjjH!C
+2H'C[FQ3)8'&XBA4TEQm18f0bDA"d)%e8)%*[E'3&8hGTEQF'8hPYBQpX#&4PE'9
+dCAKd"94TE at 9c"e48 at 8C[ER30 at Q&`CL"$D'&ZBf9bH3eDBA"Q)%4TEQGLBA4c"&T
+PB@`&9P3a-$!!!!!)!"X!#!"14"!!!!!E"6NJF(4c!M%`!M%b!M%d!M%i!M)d!M-
+f!M3i!!!"!!!!#JS!!!N+!!!#eJ"*k-`BqJ!!!"`#eJ!G4'PZCJ!!!2*69&P*!!!
+!rP088L-!!J%+99"%6!!$!5j%8%0[!!!"AP"K4%)!!`&U4&"3B3!!!CT%8&*K!!!
+"TN434Q%!!!'b4(ChF`!!!Ej%Fh4X!!!"bP*cCA3!!!(@8(0PG!!!!H*%Ff9d!!!
+"lN&cCA3!!!(k8(*PCJ!!!JC3FQBa!!!#%P"bCM)!!!)H8(*Q-`!!!LT3FQBd!!!
+#0P"bCM8!!!*#8(*Q0J!!!Nj3FQBi!!!#@P"bCMN!!!*Q4QedH!!!!R*'EQec!!!
+#IQCZG%`!!!++CQjd4!!!!TCcDAT-!!!#SR0THN3!!!+Z!3$rr`#3"8j%E!!!rrm
+!!!"f!%j%D!!!rrm!!!#!!*!&!Irr!!!"A!#3"3,rr`!!!J3!N!Err`!!!*B!N!8
+"rrm!!!&`!*!&![rr!!!#'J#3"32rr`!!!Ui!N!Err`!!!-J!N!Err`!!!3J!N!8
+"rrm!!!'`!*!&![rr!!!#@J#3"32rr`!!!Zi!N!8"rrm!!!'L!*!&![rr!!!#6!#
+3"32rr`!!!Z!!N!3"!2rr!!!$3J"14&J"!2rr!!!$XJ"14&3"!2rr!!!$b!"14&!
+"!2rr!!!%A!"14%`"!2rr!!!%N!!!6N4)!3$rr`!!"6!!6N4%!3$rr`!!"A!!6N4
+!!3$rr`!!"Bi!6N3m!3$rr`!!"F!!6N3i!3$rr`!!"FS!6N3d!3$rr`!!"G!!6N3
+`!3$rr`!!"GJ!6N3X!3$rr`!!"H)!6N3S!3$rr`!!"RJ!6N3N!3$rr`!!"U3!6N3
+J!3$rr`!!"V`!8Ir!!3$rr`!!"XJ!8Iqm!J$rr`!!"YB!6N3F!J$rr`!!"Z)!6N3
+B!J$rr`!!#0m!6N38!J$rr`!!#1X!6N33imS!:
commit 9e5c39ceeaea20b2e0d98ea5a23bfaf62f323b7d
Author: David Tardon <dtardon at redhat.com>
Date: Mon Jan 5 12:15:13 2015 +0100
upload libe-book 0.1.2
Change-Id: I1dc1231661c8fed6021c10ed3c4676d2581ad1fc
(cherry picked from commit 14dc6341f71a0f012efa7c5e58e1bce49d7a0af2)
Reviewed-on: https://gerrit.libreoffice.org/13749
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/download.lst b/download.lst
index 6231c21..f2bd8d2 100644
--- a/download.lst
+++ b/download.lst
@@ -31,8 +31,8 @@ export CT2N_TARBALL := 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.
export CURL_MD5SUM := e6d1f9d1b59da5062109ffe14e0569a4
export CURL_TARBALL := curl-7.36.0.tar.bz2
export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
-export EBOOK_MD5SUM := c25a881d21abc5b4da19205db513cc22
-export EBOOK_TARBALL := libe-book-0.1.1.tar.bz2
+export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78
+export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2
export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
export ETONYEK_MD5SUM := 805f941b06448212a988cb65f0691a7a
export ETONYEK_TARBALL := libetonyek-0.1.1.tar.bz2
diff --git a/writerperfect/qa/unit/data/writer/libe-book/pass/Broad_Band_eBook.lrf b/writerperfect/qa/unit/data/writer/libe-book/pass/Broad_Band_eBook.lrf
new file mode 100644
index 0000000..5e5b69d
Binary files /dev/null and b/writerperfect/qa/unit/data/writer/libe-book/pass/Broad_Band_eBook.lrf differ
diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx
index 6f9ddf5..fe16676 100644
--- a/writerperfect/source/writer/EBookImportFilter.cxx
+++ b/writerperfect/source/writer/EBookImportFilter.cxx
@@ -35,6 +35,8 @@ bool EBookImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, Od
rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] >>= aFilterName;
assert(!aFilterName.isEmpty());
+ if (aFilterName == "BroadBand eBook")
+ type = EBOOKDocument::TYPE_BBEB;
if (aFilterName == "FictionBook 2")
type = EBOOKDocument::TYPE_FICTIONBOOK2;
else if (aFilterName == "PalmDoc")
@@ -64,6 +66,9 @@ bool EBookImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUSt
{
switch (type)
{
+ case EBOOKDocument::TYPE_BBEB :
+ rTypeName = "writer_BroadBand_eBook";
+ break;
case EBOOKDocument::TYPE_FICTIONBOOK2 :
rTypeName = "writer_FictionBook_2";
break;
commit 28a762a697a7dd1f01aa2cf2538e86e84ea887a7
Author: Eike Rathke <erack at redhat.com>
Date: Tue Jan 6 13:00:59 2015 +0100
move nScanLineBufferComponents to where it is used [-Werror=clobbered]
gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1)
vcl/source/filter/jpeg/jpegc.cxx: In function ‘void ReadJPEG(JPEGReader*, void*, long int*, const Size&)’:
vcl/source/filter/jpeg/jpegc.cxx:72:10: error: variable ‘nScanLineBufferComponents’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]
long nScanLineBufferComponents = 0;
^
Change-Id: I90a0d02977c49d2471069788a02fb1c7d28c039a
(cherry picked from commit 09a5910c96a822c6e7fc4b82d89c00c22e905eba)
Reviewed-on: https://gerrit.libreoffice.org/13767
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index 04aa3a2..411b17b 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -69,7 +69,6 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
long nAlignedWidth;
JSAMPLE* aRangeLimit;
boost::scoped_array<unsigned char> pScanLineBuffer;
- long nScanLineBufferComponents = 0;
if ( setjmp( jerr.setjmp_buffer ) )
{
@@ -150,6 +149,7 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
nAlignedWidth = aCreateBitmapParam.nAlignedWidth;
aRangeLimit = cinfo.sample_range_limit;
+ long nScanLineBufferComponents = 0;
if ( cinfo.out_color_space == JCS_CMYK )
{
nScanLineBufferComponents = cinfo.output_width * 4;
commit 7e1b012220d7a313266804dc8e09428bce377680
Author: Eike Rathke <erack at redhat.com>
Date: Mon Jan 5 22:28:34 2015 +0100
workaround a weird gcc optimization werror bug
gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1)
framework/source/fwe/classes/addonsoptions.cxx: In member function ‘void framework::AddonsOptions_Impl::ReadAndAssociateImages(const rtl::OUString&, const rtl::OUString&)’:
framework/source/fwe/classes/addonsoptions.cxx:267:16: error: array subscript is above array bounds [-Werror=array-bounds]
struct ImageEntry
^
The combination of aScaled[2]; aImage[2]; aURL[2] in sequence apparently lead
to some overoptimization and/or alignment problem, already declaring aImage[3]
helped (but not aScaled[3]), but that's not what we want.
Change-Id: I82e28d4887ab8072a17d0a9341d322c1cf61aedc
(cherry picked from commit 549b7fad48bb9ddcba7dfa92daea6ce917853a03)
Reviewed-on: https://gerrit.libreoffice.org/13768
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 975a256..1aa39e8 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -259,19 +259,24 @@ class AddonsOptions_Impl : public ConfigItem
private:
enum ImageSize
{
- IMGSIZE_SMALL,
+ IMGSIZE_SMALL = 0,
IMGSIZE_BIG
};
+ struct OneImageEntry
+ {
+ Image aScaled; ///< cached scaled image
+ Image aImage; ///< original un-scaled image
+ OUString aURL; ///< URL in case it is not loaded yet
+ };
+
struct ImageEntry
{
// if the image is set, it was embedded in some way,
// otherwise we use the associated URL to load on demand
// accessed in this order
- Image aScaled[2]; // cached scaled images
- Image aImage[2]; // original un-scaled images
- OUString aURL[2]; // URLs in case they are not loaded yet
+ OneImageEntry aSizeEntry[2];
ImageEntry() {}
void addImage(ImageSize eSize, const Image &rImage, const OUString &rURL);
};
@@ -352,8 +357,8 @@ void AddonsOptions_Impl::ImageEntry::addImage(ImageSize eSize,
const Image &rImage,
const OUString &rURL)
{
- aImage[(int)eSize] = rImage;
- aURL[(int)eSize] = rURL;
+ aSizeEntry[(int)eSize].aImage = rImage;
+ aSizeEntry[(int)eSize].aURL = rURL;
}
// constructor
@@ -552,35 +557,36 @@ Image AddonsOptions_Impl::GetImageFromURL( const OUString& aURL, bool bBig, bool
ImageManager::iterator pIter = m_aImageManager.find(aURL);
if ( pIter != m_aImageManager.end() )
{
- ImageEntry &rEntry = pIter->second;
+ OneImageEntry& rSizeEntry = pIter->second.aSizeEntry[nIdx];
+ OneImageEntry& rOtherEntry = pIter->second.aSizeEntry[nOtherIdx];
// actually read the image ...
- if (!rEntry.aImage[nIdx])
- rEntry.aImage[nIdx] = ReadImageFromURL(rEntry.aURL[nIdx]);
+ if (!rSizeEntry.aImage)
+ rSizeEntry.aImage = ReadImageFromURL(rSizeEntry.aURL);
- if (!rEntry.aImage[nIdx])
+ if (!rSizeEntry.aImage)
{ // try the other size and scale it
- aImage = ScaleImage(ReadImageFromURL(rEntry.aURL[nOtherIdx]), bBig);
- rEntry.aImage[nIdx] = aImage;
- if (!rEntry.aImage[nIdx])
+ aImage = ScaleImage(ReadImageFromURL(rOtherEntry.aURL), bBig);
+ rSizeEntry.aImage = aImage;
+ if (!rSizeEntry.aImage)
SAL_WARN("fwk", "failed to load addons image " << aURL);
}
// FIXME: bNoScale is not terribly meaningful or useful
if (!aImage && bNoScale)
- aImage = rEntry.aImage[nIdx];
+ aImage = rSizeEntry.aImage;
- if (!aImage && !!rEntry.aScaled[nIdx])
- aImage = rEntry.aScaled[nIdx];
+ if (!aImage && !!rSizeEntry.aScaled)
+ aImage = rSizeEntry.aScaled;
else // scale to the correct size for the theme / toolbox
{
- aImage = rEntry.aImage[nIdx];
+ aImage = rSizeEntry.aImage;
if (!aImage) // use and scale the other if one size is missing
- aImage = rEntry.aImage[nOtherIdx];
+ aImage = rOtherEntry.aImage;
aImage = ScaleImage(aImage, bBig);
- rEntry.aScaled[nIdx] = aImage; // cache for next time
+ rSizeEntry.aScaled = aImage; // cache for next time
}
}
commit fb5b995067702df770366b0af4c546a2b85c9f48
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 6 14:36:05 2015 +0000
Resolves: fdo#87823 Move Menu->New Menu
Change-Id: I677b519a1bcae3266baff4577b63971b6f8add75
(cherry picked from commit 3fda8cb3ed7c790d1b591f4f833054b777e5b490)
diff --git a/cui/uiconfig/ui/movemenu.ui b/cui/uiconfig/ui/movemenu.ui
index 952955c..8dc7e2a 100644
--- a/cui/uiconfig/ui/movemenu.ui
+++ b/cui/uiconfig/ui/movemenu.ui
@@ -16,7 +16,7 @@
<object class="GtkDialog" id="MoveMenuDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Move Menu</property>
+ <property name="title" translatable="yes">New Menu</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
commit 04bf17165cecb7987d1af362f0b85271d0cd1208
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 6 09:23:24 2015 +0000
Resolves: fdo#86911 add tooltip for Color Tolerance spinbutton
Change-Id: I9a30d81124da4e4037834caaf41a8f78fd320290
(cherry picked from commit 1b5c8e4a031af17c47a2900da09c1db1df1242df)
diff --git a/svx/uiconfig/ui/floatingcontour.ui b/svx/uiconfig/ui/floatingcontour.ui
index 2edef22..78662a8 100644
--- a/svx/uiconfig/ui/floatingcontour.ui
+++ b/svx/uiconfig/ui/floatingcontour.ui
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface>
- <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">99</property>
<property name="value">10</property>
@@ -307,6 +307,7 @@
<object class="GtkSpinButton" id="spinbutton:0%">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">Color Tolerance</property>
<property name="adjustment">adjustment1</property>
</object>
<packing>
commit 593d02a5696da3959f59eb9818001e29bebb0fe1
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Sat Nov 15 17:33:36 2014 +0100
vcldemo: disable broken gradient stencil use.
Change-Id: Ifce85b1a7fa8e8b6fc57802a5fb559d2db50ba2a
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index d89f072..f75966f 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1592,6 +1592,8 @@ bool OpenGLSalGraphicsImpl::drawGradient(const tools::PolyPolygon& rPolyPoly,
PreDraw();
+#define FIXME_BROKEN_STENCIL_FOR_GRADIENTS 0
+#if FIXME_BROKEN_STENCIL_FOR_GRADIENTS
ImplSetClipBit( vcl::Region( rPolyPoly ), 0x02 );
if( mbUseStencil )
{
@@ -1603,6 +1605,7 @@ bool OpenGLSalGraphicsImpl::drawGradient(const tools::PolyPolygon& rPolyPoly,
glEnable( GL_STENCIL_TEST );
glStencilFunc( GL_EQUAL, 2, 0xFF );
}
+#endif
// if border >= 100%, draw solid rectangle with start color
if( rGradient.GetBorder() >= 100.0 )
@@ -1627,8 +1630,10 @@ bool OpenGLSalGraphicsImpl::drawGradient(const tools::PolyPolygon& rPolyPoly,
DrawRadialGradient( rGradient, aBoundRect );
}
+#if FIXME_BROKEN_STENCIL_FOR_GRADIENTS
if( !mbUseStencil )
glDisable( GL_STENCIL_TEST );
+#endif
PostDraw();
CHECK_GL_ERROR();
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 95329f3..1b5a709 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -199,6 +199,7 @@ public:
void drawBackground(OutputDevice &rDev, Rectangle r)
{
+ rDev.Erase();
Gradient aGradient;
aGradient.SetStartColor(COL_BLUE);
aGradient.SetEndColor(COL_GREEN);
commit b8faf41a2ba7ad787c93eaa66e0665940e1d2b85
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Mon Jan 5 15:08:22 2015 +0100
fdo#80968 file resultset seek table to before beginning on opening resultset
Change-Id: I73abbc7cfe0804e729a711a247b6e085b4e41d95
Reviewed-on: https://gerrit.libreoffice.org/13741
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 4e44f5e..afc9d96 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1296,6 +1296,7 @@ bool OResultSet::OpenImpl()
m_nRowPos = -1;
m_nFilePos = 0;
m_nRowCountResult = -1;
+ m_pTable->seekRow(IResultSetHelper::ABSOLUTE1, 0, m_nFilePos);
m_nLastVisitedPos = m_pTable->getCurrentLastPos();
commit 9417a42c29bcd695471736c944c7144f7b275229
Author: Peter Jentsch <pjotr at guineapics.de>
Date: Tue Jan 6 09:31:18 2015 +0100
fdo#50430: UOP import failed because of leading and trailing space in XSLT.
Change-Id: I5d802073505cec1800654e4413a161870506988e
Reviewed-on: https://gerrit.libreoffice.org/13761
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/filter/source/xslt/import/uof/uof2odf_presentation.xsl b/filter/source/xslt/import/uof/uof2odf_presentation.xsl
index 9e2d2cf..5150da3 100644
--- a/filter/source/xslt/import/uof/uof2odf_presentation.xsl
+++ b/filter/source/xslt/import/uof/uof2odf_presentation.xsl
@@ -1341,7 +1341,7 @@
<xsl:attribute name="smil:end">next</xsl:attribute>
</xsl:when>
<xsl:when test="演:定时/@演:重复='until next slide' ">
- <xsl:attribute name="smil:repeatCount ">indefinite</xsl:attribute>
+ <xsl:attribute name="smil:repeatCount">indefinite</xsl:attribute>
</xsl:when>
<xsl:when test="演:定时/@演:重复 !='none'">
<xsl:attribute name="smil:repeatCount"><xsl:value-of select="演:定时/@演:重复"/></xsl:attribute>
@@ -2745,7 +2745,7 @@
<xsl:choose>
<xsl:when test="@字:字下划线 = 'true'">
<xsl:attribute name="style:text-underline">single</xsl:attribute>
- <xsl:attribute name=" style:text-underline-color">font-color</xsl:attribute>
+ <xsl:attribute name="style:text-underline-color">font-color</xsl:attribute>
<xsl:attribute name="fo:score-spaces">false</xsl:attribute>
</xsl:when>
<xsl:when test="@字:类型 = 'thick'">
commit 1ae0e6938b58cb94403aa71eeaf73ef9785b38e8
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Dec 19 17:51:53 2014 +0200
Check number of cells referenced by group instead of group size
It's more relevant when deciding whether to use OpenCL or not.
Note that we won't use OpenCL for a single formula cell, no matter how large a
calculation it invokes (like =SUM(A1:A1000000), for instance), as a single
cell is not a group.
Change-Id: I66b03c197431c2b4cef96f46b010d99d3e0624fc
Reviewed-on: https://gerrit.libreoffice.org/13597
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 86b8045..746ca550 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -410,6 +410,10 @@ public:
bool IsSharedTop() const;
SCROW GetSharedTopRow() const;
SCROW GetSharedLength() const;
+
+ // An estimate of the number of cells referenced by the formula
+ sal_Int32 GetWeight() const;
+
ScTokenArray* GetSharedCode();
const ScTokenArray* GetSharedCode() const;
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 07f344b..ad61ef3 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -59,6 +59,9 @@ public:
virtual ~ScTokenArray();
ScTokenArray* Clone() const; /// True copy!
+ // An estimate of the number of cells referenced by the token array
+ sal_Int32 GetWeight() const;
+
void GenHash();
size_t GetHash() const { return mnHashValue;}
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index bc9ffbe..daefcc6 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3750,7 +3750,7 @@ bool ScFormulaCell::InterpretFormulaGroup()
if (mxGroup->meCalcState == sc::GroupCalcDisabled)
return false;
- if (GetSharedLength() < ScInterpreter::GetGlobalConfig().mnOpenCLMinimumFormulaGroupSize)
+ if (GetWeight() < ScInterpreter::GetGlobalConfig().mnOpenCLMinimumFormulaGroupSize)
{
mxGroup->meCalcState = sc::GroupCalcDisabled;
return false;
@@ -4128,6 +4128,13 @@ SCROW ScFormulaCell::GetSharedLength() const
return mxGroup ? mxGroup->mnLength : 0;
}
+sal_Int32 ScFormulaCell::GetWeight() const
+{
+ if (!mxGroup)
+ return pCode->GetWeight();
+ return GetSharedLength() * GetSharedCode()->GetWeight();
+}
+
ScTokenArray* ScFormulaCell::GetSharedCode()
{
return mxGroup ? mxGroup->mpCode : NULL;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 8816b87..89a33e6 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1412,6 +1412,33 @@ bool ScTokenArray::ImplGetReference( ScRange& rRange, const ScAddress& rPos, boo
return bIs;
}
+sal_Int32 ScTokenArray::GetWeight() const
+{
+ sal_Int32 result(0);
+
+ FormulaToken** p = pCode;
+ FormulaToken** pEnd = p + static_cast<size_t>(nLen);
+ for (; p != pEnd; ++p)
+ {
+ switch ((*p)->GetType())
+ {
+ case svDoubleRef :
+ case svExternalDoubleRef:
+ {
+ const ScComplexRefData& rRef = *(*p)->GetDoubleRef();
+ result += ( (rRef.Ref2.Row() - rRef.Ref1.Row() + 1) * (rRef.Ref2.Col() - rRef.Ref1.Col() + 1) );
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ // Just print out the this pointer. It turns out to be quite complicated to get
+ // a symbolic printout of the ScTokenArray here.
+ SAL_INFO("sc.token", "GetWeight(" << this << "): " << result);
+ return result;
+}
+
namespace {
// we want to compare for similar not identical formulae
commit 85c632cf640a23be3f760d42599f905b24772280
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon Jan 5 22:15:29 2015 +0100
fdo#88068 make the string 'Red Line' localizable in Letter Wizard
Change-Id: If6a69eb384b7b7e6c71e96f126a27bcd45709ad4
(cherry picked from commit 219b151ea72b942434167c862473203e5e68d568)
Reviewed-on: https://gerrit.libreoffice.org/13759
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
index e61b6a7..2ef81e0 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
@@ -229,7 +229,7 @@ class LetterWizardDialogResources(object):
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 64),
"Marine" : oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 65),
- "RedLine" : oWizardResource.getResText(
+ "Red Line" : oWizardResource.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 66)}
#Common Resources
More information about the Libreoffice-commits
mailing list