You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/06/27 15:45:34 UTC
svn commit: r1354497 [2/33] - in /incubator/ooo/branches/alg/aw080: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/coinmp/
ext_libraries/serf/ ext_libraries/serf/prj/ ext_libraries/serf/win/
ext_sources/ main/ main/animations/source/animco...
Modified: incubator/ooo/branches/alg/aw080/ext_libraries/coinmp/coinmp-1.6.0.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/ext_libraries/coinmp/coinmp-1.6.0.patch?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/ext_libraries/coinmp/coinmp-1.6.0.patch (original)
+++ incubator/ooo/branches/alg/aw080/ext_libraries/coinmp/coinmp-1.6.0.patch Wed Jun 27 13:44:09 2012
@@ -190,3 +190,1041 @@
;;
irix | nonstopux)
+--- misc/build/CoinMP-1.6.0/Cbc/configure.orig 2011-11-03 20:55:10.000000000 -0700
++++ misc/build/CoinMP-1.6.0/Cbc/configure 2012-05-21 23:29:18.000000000 -0700
+@@ -9224,7 +9224,7 @@
+ hardcode_shlibpath_var=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs=no
+ ;;
+
+@@ -9240,7 +9240,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+@@ -9836,7 +9836,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -9859,7 +9859,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -9877,7 +9877,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -12311,7 +12311,7 @@
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[12].*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ ld_shlibs_CXX=no
+ ;;
+@@ -13796,7 +13796,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -13819,7 +13819,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -13837,7 +13837,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -15771,7 +15771,7 @@
+ hardcode_shlibpath_var_F77=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_F77=no
+ ;;
+
+@@ -15787,7 +15787,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_F77=yes
+ hardcode_minus_L_F77=yes
+@@ -16383,7 +16383,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -16406,7 +16406,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -16424,7 +16424,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -18370,7 +18370,7 @@
+ hardcode_shlibpath_var_GCJ=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_GCJ=no
+ ;;
+
+@@ -18386,7 +18386,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_GCJ=yes
+ hardcode_minus_L_GCJ=yes
+@@ -18982,7 +18982,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -19005,7 +19005,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -19023,7 +19023,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+--- misc/build/CoinMP-1.6.0/Cgl/configure.orig 2011-10-15 07:48:24.000000000 -0700
++++ misc/build/CoinMP-1.6.0/Cgl/configure 2012-05-21 23:30:19.000000000 -0700
+@@ -9202,7 +9202,7 @@
+ hardcode_shlibpath_var=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs=no
+ ;;
+
+@@ -9218,7 +9218,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+@@ -9814,7 +9814,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -9837,7 +9837,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -9855,7 +9855,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -12289,7 +12289,7 @@
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[12].*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ ld_shlibs_CXX=no
+ ;;
+@@ -13774,7 +13774,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -13797,7 +13797,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -13815,7 +13815,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -15749,7 +15749,7 @@
+ hardcode_shlibpath_var_F77=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_F77=no
+ ;;
+
+@@ -15765,7 +15765,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_F77=yes
+ hardcode_minus_L_F77=yes
+@@ -16361,7 +16361,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -16384,7 +16384,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -16402,7 +16402,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -18348,7 +18348,7 @@
+ hardcode_shlibpath_var_GCJ=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_GCJ=no
+ ;;
+
+@@ -18364,7 +18364,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_GCJ=yes
+ hardcode_minus_L_GCJ=yes
+@@ -18960,7 +18960,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -18983,7 +18983,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -19001,7 +19001,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+--- misc/build/CoinMP-1.6.0/Clp/configure.orig 2011-11-05 12:32:33.000000000 -0700
++++ misc/build/CoinMP-1.6.0/Clp/configure 2012-05-21 23:35:23.000000000 -0700
+@@ -9225,7 +9225,7 @@
+ hardcode_shlibpath_var=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs=no
+ ;;
+
+@@ -9241,7 +9241,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+@@ -9837,7 +9837,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -9860,7 +9860,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -9878,7 +9878,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -12312,7 +12312,7 @@
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[12].*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ ld_shlibs_CXX=no
+ ;;
+@@ -13797,7 +13797,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -13820,7 +13820,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -13838,7 +13838,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -15772,7 +15772,7 @@
+ hardcode_shlibpath_var_F77=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_F77=no
+ ;;
+
+@@ -15788,7 +15788,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_F77=yes
+ hardcode_minus_L_F77=yes
+@@ -16384,7 +16384,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -16407,7 +16407,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -16425,7 +16425,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -18371,7 +18371,7 @@
+ hardcode_shlibpath_var_GCJ=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_GCJ=no
+ ;;
+
+@@ -18387,7 +18387,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_GCJ=yes
+ hardcode_minus_L_GCJ=yes
+@@ -18983,7 +18983,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -19006,7 +19006,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -19024,7 +19024,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+--- misc/build/CoinMP-1.6.0/CoinMP/configure.orig 2011-11-07 19:35:10.000000000 -0800
++++ misc/build/CoinMP-1.6.0/CoinMP/configure 2012-05-21 23:32:22.000000000 -0700
+@@ -9168,7 +9168,7 @@
+ hardcode_shlibpath_var=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs=no
+ ;;
+
+@@ -9184,7 +9184,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+@@ -9780,7 +9780,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -9803,7 +9803,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -9821,7 +9821,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -12255,7 +12255,7 @@
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[12].*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ ld_shlibs_CXX=no
+ ;;
+@@ -13740,7 +13740,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -13763,7 +13763,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -13781,7 +13781,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -15715,7 +15715,7 @@
+ hardcode_shlibpath_var_F77=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_F77=no
+ ;;
+
+@@ -15731,7 +15731,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_F77=yes
+ hardcode_minus_L_F77=yes
+@@ -16327,7 +16327,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -16350,7 +16350,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -16368,7 +16368,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -18314,7 +18314,7 @@
+ hardcode_shlibpath_var_GCJ=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_GCJ=no
+ ;;
+
+@@ -18330,7 +18330,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_GCJ=yes
+ hardcode_minus_L_GCJ=yes
+@@ -18926,7 +18926,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -18949,7 +18949,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -18967,7 +18967,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+--- misc/build/CoinMP-1.6.0/CoinUtils/configure.orig 2011-11-03 20:11:07.000000000 -0700
++++ misc/build/CoinMP-1.6.0/CoinUtils/configure 2012-05-21 23:33:08.000000000 -0700
+@@ -10658,7 +10658,7 @@
+ hardcode_shlibpath_var=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs=no
+ ;;
+
+@@ -10674,7 +10674,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+@@ -11270,7 +11270,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -11293,7 +11293,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -11311,7 +11311,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -13817,7 +13817,7 @@
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[12].*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ ld_shlibs_CXX=no
+ ;;
+@@ -15302,7 +15302,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -15325,7 +15325,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -15343,7 +15343,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -17277,7 +17277,7 @@
+ hardcode_shlibpath_var_F77=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_F77=no
+ ;;
+
+@@ -17293,7 +17293,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_F77=yes
+ hardcode_minus_L_F77=yes
+@@ -17889,7 +17889,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -17912,7 +17912,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -17930,7 +17930,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -19892,7 +19892,7 @@
+ hardcode_shlibpath_var_GCJ=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_GCJ=no
+ ;;
+
+@@ -19908,7 +19908,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_GCJ=yes
+ hardcode_minus_L_GCJ=yes
+@@ -20504,7 +20504,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -20527,7 +20527,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -20545,7 +20545,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+--- misc/build/CoinMP-1.6.0/Osi/configure.orig 2011-10-15 07:26:34.000000000 -0700
++++ misc/build/CoinMP-1.6.0/Osi/configure 2012-05-21 23:34:02.000000000 -0700
+@@ -9197,7 +9197,7 @@
+ hardcode_shlibpath_var=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs=no
+ ;;
+
+@@ -9213,7 +9213,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+@@ -9809,7 +9809,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -9832,7 +9832,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -9850,7 +9850,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -12284,7 +12284,7 @@
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[12].*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ ld_shlibs_CXX=no
+ ;;
+@@ -13769,7 +13769,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -13792,7 +13792,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -13810,7 +13810,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -15744,7 +15744,7 @@
+ hardcode_shlibpath_var_F77=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_F77=no
+ ;;
+
+@@ -15760,7 +15760,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_F77=yes
+ hardcode_minus_L_F77=yes
+@@ -16356,7 +16356,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -16379,7 +16379,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -16397,7 +16397,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -18343,7 +18343,7 @@
+ hardcode_shlibpath_var_GCJ=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_GCJ=no
+ ;;
+
+@@ -18359,7 +18359,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct_GCJ=yes
+ hardcode_minus_L_GCJ=yes
+@@ -18955,7 +18955,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -18978,7 +18978,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -18996,7 +18996,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
Modified: incubator/ooo/branches/alg/aw080/ext_libraries/coinmp/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/ext_libraries/coinmp/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/ext_libraries/coinmp/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/ext_libraries/coinmp/makefile.mk Wed Jun 27 13:44:09 2012
@@ -35,6 +35,11 @@ TARGET=coinmp
all:
@echo "CoinMP is disabled and will not be built."
+.ELIF "$(SYSTEM_COINMP)"=="YES"
+
+all:
+ @echo "Using system CoinMP. Does not have to be built."
+
.ELSE
TARFILE_NAME=CoinMP-1.6.0
Modified: incubator/ooo/branches/alg/aw080/ext_libraries/serf/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/ext_libraries/serf/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/ext_libraries/serf/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/ext_libraries/serf/makefile.mk Wed Jun 27 13:44:09 2012
@@ -31,35 +31,32 @@ TARGET=so_serf
# --- Files --------------------------------------------------------
+.IF "$(SYSTEM_SERF)"=="YES"
+
+all:
+ @echo "Using system serf. Does not have to be built."
+
+.ELSE
+
# Assemble the full version number from the parts defined in serf_version.mk
LIBSERFVERSION=$(SERF_MAJOR).$(SERF_MINOR).$(SERF_MICRO)
TARFILE_NAME=$(PRJNAME)-$(LIBSERFVERSION)
-TARFILE_MD5=3b179ed18f65c43141528aa6d2440db4
-
-# Apply patches that provide callbacks for ssl certificate verification with the
-# whole certificate chain (issue68.patch). The patch is taken from serf's
-# issue 68 (http://code.google.com/p/serf/issues/detail?id=68).
-# This patch needs some minor fixes (issue68b.patch) for proper initialization of
-# some callbacks and export of new functions.
-PATCH_FILES=$(TARFILE_NAME).issue68.patch $(TARFILE_NAME).issue68b.patch
+# This is the SHA1 checksum, not MD5 but tg_ext.mk does not now about this and,
+# thankfully, does not care.
+TARFILE_MD5=231af70b7567a753b49df4216743010c193884b7
-# disable default used Transfer-Encoding = chunked for sending requests.
-PATCH_FILES+=$(TARFILE_NAME).nochunkedtransferencoding.patch
+PATCH_FILES=
.IF "$(OS)"=="WNT"
-ADDITIONAL_FILES=Makefile Module_serf.mk Library_serf.mk Package_inc.mk
-
-PATCH_FILES+=$(TARFILE_NAME).makewin32.patch
-
CONFIGURE_DIR=
CONFIGURE_ACTION=
CONFIGURE_FLAGS=
-BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_DIR=
BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_FLAGS+= -f ../../../../win/Makefile -j$(EXTMAXPROCESS)
.ELIF "$(GUI)" == "OS2"
@@ -68,19 +65,31 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
.ELSE
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="LINUX"
# Do not link against expat. It is not necessary (apr-util is already linked against it)
# and does not work (we use a different expat library schema.)
-PATCH_FILES+=$(TARFILE_NAME).mac.patch
-.ELSE
+#PATCH_FILES+=$(TARFILE_NAME).mac.patch
+.ENDIF
+
+.IF "$(OS)"=="LINUX"
# Add -ldl as last library so that the linker has no trouble resolving dependencies.
-PATCH_FILES+=$(TARFILE_NAME).ldl.patch
+#PATCH_FILES+=$(TARFILE_NAME).ldl.patch
.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=autoconf && .$/configure
-.IF "$(OS)"=="MACOSX"
-# On Mac we need the content of CDEFS in CFLAGS so that the ssl headers are searched for
+
+.IF "$(OS)"=="LINUX"
+.IF "$(SYSTEM_OPENSSL)"=="YES"
+CDEFS+=$(OPENSSL_CFLAGS)
+.ELSE
+OPENSSLINCDIR=external
+CDEFS+=-I$(SOLARINCDIR)$/$(OPENSSLINCDIR)
+.ENDIF
+.ENDIF
+
+# On Linux/Mac we need the content of CDEFS in CFLAGS so that the ssl headers are searched for
+.IF "$(OS)"=="MACOSX" || "$(OS)"=="LINUX"
# in a directory that corresponds to the directory that is searched for the ssl library.
CONFIGURE_FLAGS='CFLAGS=$(CDEFS)'
.ENDIF
@@ -89,10 +98,20 @@ BUILD_DIR=$(CONFIGURE_DIR)
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+.IF "$(OS)"=="MACOSX"
+# Serf names its library only with the major number.
+# We are using minor and micro as well. Fix that here
+# by creating a copy with the right name.
+SERF_ORIGINAL_LIB=.libs/libserf-$(SERF_MAJOR).0.0.0.dylib
+SERF_FIXED_LIB=.libs/libserf-$(LIBSERFVERSION).0.dylib
+INSTALL_ACTION=if [ -f "$(SERF_ORIGINAL_LIB)" -a ! -f "$(SERF_FIXED_LIB)" ]; then cp $(SERF_ORIGINAL_LIB) $(SERF_FIXED_LIB); fi
+.ENDIF
+
OUT2INC+=serf*.h
OUT2INC_SUBDIR=serf
.IF "$(OS)"=="MACOSX"
+OUT2LIB+=$(SERF_FIXED_LIB)
OUT2LIB+=.libs/libserf-1.*dylib
.ELSE
OUT2LIB=.libs/libserf-1.so*
@@ -105,3 +124,5 @@ OUT2LIB=.libs/libserf-1.so*
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
+
+.ENDIF
Modified: incubator/ooo/branches/alg/aw080/ext_libraries/serf/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/ext_libraries/serf/prj/build.lst?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/ext_libraries/serf/prj/build.lst (original)
+++ incubator/ooo/branches/alg/aw080/ext_libraries/serf/prj/build.lst Wed Jun 27 13:44:09 2012
@@ -1,3 +1,3 @@
-serf serf : apr-util NULL
+serf serf : APR_UTIL:apr-util OPENSSL:openssl NULL
serf serf usr1 - all serf_mkout NULL
serf serf nmake - all serf_serf NULL
Modified: incubator/ooo/branches/alg/aw080/ext_libraries/serf/serf_version.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/ext_libraries/serf/serf_version.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/ext_libraries/serf/serf_version.mk (original)
+++ incubator/ooo/branches/alg/aw080/ext_libraries/serf/serf_version.mk Wed Jun 27 13:44:09 2012
@@ -20,5 +20,5 @@
#**************************************************************
SERF_MAJOR=1
-SERF_MINOR=0
+SERF_MINOR=1
SERF_MICRO=0
Modified: incubator/ooo/branches/alg/aw080/main/NOTICE_category_b
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/NOTICE_category_b?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/NOTICE_category_b (original)
+++ incubator/ooo/branches/alg/aw080/main/NOTICE_category_b Wed Jun 27 13:44:09 2012
@@ -5,3 +5,23 @@ when the configure option --enable-categ
When you used this option make sure to comply with the
distribution requirements of these parts by extending
this file with the notices recommended by them:
+
+___
+
+Notices for CoinMP libary:
+The Computational Infrastructure for Operations Research COIN_OR
+project developed the CoinMP library (a lightweight API and DLL
+for CLP, CBC, and CGL).
+It includes and depends on
+- CoinUtils: COIN-OR utilities, utilities, data structures, and
+linear algebra methods for COIN-OR projects
+- CLP: COIN-OR Graph Classes, a collection of network representations
+and algorithms
+- CBC: COIN-OR Branch and Cut, an LP-based branch-and-cut library
+- CGL: Cut Generator Library, a library of cutting-plane generators
+The source code of these dependencies which are available under
+license EPL can found at
+ http://www.coin-or.org/download/source/CoinMP/
+
+___
+
Modified: incubator/ooo/branches/alg/aw080/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/RepositoryFixes.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/RepositoryFixes.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/RepositoryFixes.mk Wed Jun 27 13:44:09 2012
@@ -194,6 +194,7 @@ gb_Library_FILENAMES := $(patsubst xslt:
gb_Library_FILENAMES := $(patsubst stl:stl%,stl:stdc++%,$(gb_Library_FILENAMES))
# translate to 8.3 naming
+gb_Library_DLLFILENAMES := $(patsubst sw:sw%,sw:swoo%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst drawinglayer:drawinglayer%,drawinglayer:drawingl%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst fsstorage:fsstorage.uno%,fsstorage:fsstorag%,$(gb_Library_DLLFILENAMES))
Modified: incubator/ooo/branches/alg/aw080/main/animations/source/animcore/animcore.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/animations/source/animcore/animcore.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/animations/source/animcore/animcore.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/animations/source/animcore/animcore.cxx Wed Jun 27 13:44:09 2012
@@ -49,6 +49,7 @@
#include <com/sun/star/util/XChangesNotifier.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/interfacecontainer.hxx>
+#include <cppuhelper/weakref.hxx>
#include <cppuhelper/implbase1.hxx>
#include <rtl/uuid.h>
@@ -68,6 +69,7 @@ using ::com::sun::star::uno::XInterface;
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::WeakReference;
using ::com::sun::star::uno::XComponentContext;
using ::com::sun::star::uno::Exception;
using ::com::sun::star::uno::XWeak;
@@ -307,7 +309,7 @@ private:
Sequence< NamedValue > maUserData;
// parent interface for XChild interface implementation
- Reference<XInterface> mxParent;
+ WeakReference<XInterface> mxParent;
AnimationNode* mpParent;
// attributes for XAnimate
@@ -741,7 +743,7 @@ void SAL_CALL AnimationNode::acquire( )
// XInterface
void SAL_CALL AnimationNode::release( ) throw ()
{
- OWeakObject::acquire();
+ OWeakObject::release();
}
// --------------------------------------------------------------------
@@ -1141,7 +1143,7 @@ void SAL_CALL AnimationNode::setUserData
Reference< XInterface > SAL_CALL AnimationNode::getParent() throw (RuntimeException)
{
Guard< Mutex > aGuard( maMutex );
- return mxParent;
+ return mxParent.get();
}
// --------------------------------------------------------------------
@@ -1150,12 +1152,12 @@ Reference< XInterface > SAL_CALL Animati
void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException)
{
Guard< Mutex > aGuard( maMutex );
- if( Parent != mxParent )
+ if( Parent != mxParent.get() )
{
mxParent = Parent;
mpParent = 0;
- Reference< XUnoTunnel > xTunnel( mxParent, UNO_QUERY );
+ Reference< XUnoTunnel > xTunnel( mxParent.get(), UNO_QUERY );
if( xTunnel.is() )
mpParent = reinterpret_cast< AnimationNode* >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething( getUnoTunnelId() )));
@@ -2067,7 +2069,7 @@ void AnimationNode::fireChangeListener()
{
Reference< XInterface > xSource( static_cast<OWeakObject*>(this), UNO_QUERY );
Sequence< ElementChange > aChanges;
- const ChangesEvent aEvent( xSource, makeAny( mxParent ), aChanges );
+ const ChangesEvent aEvent( xSource, makeAny( mxParent.get() ), aChanges );
while( aIterator.hasMoreElements() )
{
Reference< XChangesListener > xListener( aIterator.next(), UNO_QUERY );
Modified: incubator/ooo/branches/alg/aw080/main/animations/source/animcore/targetpropertiescreator.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/animations/source/animcore/targetpropertiescreator.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/animations/source/animcore/targetpropertiescreator.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/animations/source/animcore/targetpropertiescreator.cxx Wed Jun 27 13:44:09 2012
@@ -276,9 +276,9 @@ namespace animcore
// FALLTHROUGH intended
case animations::AnimationNodeType::AUDIO:
// FALLTHROUGH intended
- default:
+ /*default:
// ignore this node, no valuable content for now.
- break;
+ break;*/
case animations::AnimationNodeType::SET:
{
@@ -343,9 +343,9 @@ namespace animcore
// initially. This is currently the only place
// where a shape effect influences shape
// attributes outside it's effective duration.
+ sal_Bool bVisible( sal_False );
if( xAnimateNode->getAttributeName().equalsIgnoreAsciiCaseAscii("visibility") )
{
- sal_Bool bVisible( sal_False );
uno::Any aAny( xAnimateNode->getTo() );
@@ -371,22 +371,27 @@ namespace animcore
}
}
- if( bVisible )
+ /*if( bVisible )
{
// target is set to 'visible' at the
// first relevant effect. Thus, target
// must be initially _hidden_, for the
// effect to have visible impact.
- mrShapeHash.insert(
+ */
+ }
+ // target is set the 'visible' value,
+ // so we should record the opposite value
+ mrShapeHash.insert(
XShapeHash::value_type(
aTarget,
VectorOfNamedValues(
1,
beans::NamedValue(
- xAnimateNode->getAttributeName(),
- uno::makeAny( sal_False ) ) ) ) );
- }
- }
+ //xAnimateNode->getAttributeName(),
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("visibility")),
+ uno::makeAny( !bVisible ) ) ) ) );
+ //}
+ //}
}
break;
}
Modified: incubator/ooo/branches/alg/aw080/main/autodoc/source/display/html/cfrstd.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/autodoc/source/display/html/cfrstd.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/autodoc/source/display/html/cfrstd.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/autodoc/source/display/html/cfrstd.cxx Wed Jun 27 13:44:09 2012
@@ -330,9 +330,9 @@ MakeCopyRight()
plt = localtime(>);
int year = 1900 + plt->tm_year;
- cr << "Copyright © 1995, "
+ cr << "Copyright © "
<< year
- << ", Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.";
+ << ", The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOfifce.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.";
return String(cr.c_str());
}
Modified: incubator/ooo/branches/alg/aw080/main/avmedia/source/gstreamer/gstplayer.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/avmedia/source/gstreamer/gstplayer.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/avmedia/source/gstreamer/gstplayer.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/avmedia/source/gstreamer/gstplayer.hxx Wed Jun 27 13:44:09 2012
@@ -26,7 +26,6 @@
#include "gstcommon.hxx"
#include <glib.h>
-#include <glib/gatomic.h>
// necessary for mixed environments with GStreamer-0.10 and GLib versions < 2.8
#ifndef G_GNUC_NULL_TERMINATED
Modified: incubator/ooo/branches/alg/aw080/main/avmedia/source/viewer/mediawindow.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/avmedia/source/viewer/mediawindow.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/avmedia/source/viewer/mediawindow.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/avmedia/source/viewer/mediawindow.cxx Wed Jun 27 13:44:09 2012
@@ -366,14 +366,17 @@ void MediaWindow::getMediaFilters( Filte
"AU Audio", "au",
"AVI", "avi",
"CD Audio", "cda",
+ "FLAC Audio", "flac",
+ "Flash Video", "flv",
"Matroska Media", "mkv",
"MIDI Audio", "mid;midi",
"MPEG Audio", "mp2;mp3;mpa",
"MPEG Video", "mpg;mpeg;mpv;mp4",
- "Ogg bitstream", "ogg",
+ "Ogg bitstream", "ogg;oga;ogv",
"Quicktime Video", "mov",
"Vivo Video", "viv",
- "WAVE Audio", "wav" };
+ "WAVE Audio", "wav",
+ "Windows Media Video", "wmv" };
unsigned int i;
for( i = 0; i < ( sizeof( pFilters ) / sizeof( char* ) ); i += 2 )
Modified: incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/menubar/menubar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/menubar/menubar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/menubar/menubar.xml Wed Jun 27 13:44:09 2012
@@ -102,7 +102,6 @@
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:HelpSupport"/>
- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
Modified: incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/statusbar/statusbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/statusbar/statusbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/statusbar/statusbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/statusbar/statusbar.xml Wed Jun 27 13:44:09 2012
@@ -21,10 +21,10 @@
*
***********************************************************-->
<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:StatusGetTitle" statusbar:align="left" statusbar:autosize="true" statusbar:width="240" statusbar:helpid="helpid:30808"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="14" statusbar:helpid="helpid:5584"/>
- <statusbar:statusbaritem xlink:href=".uno:StatusGetPosition" statusbar:align="left" statusbar:width="120" statusbar:helpid="helpid:30806"/>
- <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="41" statusbar:helpid="helpid:10221"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
- <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="160" statusbar:helpid="helpid:10224"/>
+ <statusbar:statusbaritem xlink:href=".uno:StatusGetTitle" statusbar:align="left" statusbar:autosize="true" statusbar:width="240"/>
+ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="14"/>
+ <statusbar:statusbaritem xlink:href=".uno:StatusGetPosition" statusbar:align="left" statusbar:width="120"/>
+ <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="41"/>
+ <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16"/>
+ <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="160"/>
</statusbar:statusbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/dialogbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/dialogbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/dialogbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/dialogbar.xml Wed Jun 27 13:44:09 2012
@@ -23,9 +23,9 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:LibSelector" />
+ <toolbar:toolbaritem xlink:href=".uno:LibSelector"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ChooseControls" />
- <toolbar:toolbaritem xlink:href=".uno:ImportDialog" />
- <toolbar:toolbaritem xlink:href=".uno:ExportDialog" />
+ <toolbar:toolbaritem xlink:href=".uno:ChooseControls"/>
+ <toolbar:toolbaritem xlink:href=".uno:ImportDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDialog"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/fullscreenbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/fullscreenbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/fullscreenbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/fullscreenbar.xml Wed Jun 27 13:44:09 2012
@@ -23,5 +23,5 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="helpid:5627" />
+ <toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml Wed Jun 27 13:44:09 2012
@@ -23,43 +23,43 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:SelectMode" toolbar:helpid="helpid:10198" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ManageLanguage" toolbar:helpid="helpid:30820" />
+ <toolbar:toolbaritem xlink:href=".uno:SelectMode" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ManageLanguage"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:TestMode" toolbar:helpid="helpid:10199" />
- <toolbar:toolbaritem xlink:href=".uno:ShowPropBrowser" toolbar:helpid="helpid:10943" />
+ <toolbar:toolbaritem xlink:href=".uno:TestMode"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowPropBrowser"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertPushbutton" toolbar:helpid="helpid:10146" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertImageControl" toolbar:helpid="helpid:10926" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:InsertPushbutton" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertImageControl" toolbar:style="radio"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Checkbox" toolbar:helpid="helpid:10148" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Radiobutton" toolbar:helpid="helpid:10147" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:Checkbox" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Radiobutton" toolbar:style="radio"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFixedText" toolbar:helpid="helpid:10188" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertEdit" toolbar:helpid="helpid:10190" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:InsertFixedText" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertEdit" toolbar:style="radio"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertListbox" toolbar:helpid="helpid:10191" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Combobox" toolbar:helpid="helpid:10192" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:InsertListbox" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Combobox" toolbar:style="radio"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:HScrollbar" toolbar:helpid="helpid:10194" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:VScrollbar" toolbar:helpid="helpid:10195" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:HScrollbar" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:VScrollbar" toolbar:style="radio"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Groupbox" toolbar:helpid="helpid:10189" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:ProgressBar" toolbar:helpid="helpid:10927" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:Groupbox" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ProgressBar" toolbar:style="radio"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:HFixedLine" toolbar:helpid="helpid:10928" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:VFixedLine" toolbar:helpid="helpid:10929" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:HFixedLine" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:VFixedLine" toolbar:style="radio"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:AddDateField" toolbar:helpid="helpid:10936" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertTimeField" toolbar:helpid="helpid:10937" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:AddDateField" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertTimeField" toolbar:style="radio"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertNumericField" toolbar:helpid="helpid:10938" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertCurrencyField" toolbar:helpid="helpid:10939" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:InsertNumericField" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertCurrencyField" toolbar:style="radio"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFormattedField" toolbar:helpid="helpid:10940" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertPatternField" toolbar:helpid="helpid:10941" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:InsertFormattedField" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertPatternField" toolbar:style="radio"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:InsertFileControl" toolbar:helpid="helpid:10942" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:InsertTreeControl" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:InsertFileControl" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertTreeControl" toolbar:style="radio"/>
<toolbar:toolbarbreak/>
</toolbar:toolbar>
Modified: incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/macrobar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/macrobar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/macrobar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/macrobar.xml Wed Jun 27 13:44:09 2012
@@ -23,22 +23,22 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:LibSelector" toolbar:helpid="helpid:30787" />
+ <toolbar:toolbaritem xlink:href=".uno:LibSelector"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CompileBasic" toolbar:helpid="helpid:5954" />
- <toolbar:toolbaritem xlink:href=".uno:RunBasic" toolbar:helpid="helpid:5955" />
- <toolbar:toolbaritem xlink:href=".uno:BasicStop" toolbar:helpid="helpid:5958" />
+ <toolbar:toolbaritem xlink:href=".uno:CompileBasic"/>
+ <toolbar:toolbaritem xlink:href=".uno:RunBasic"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicStop"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BasicStepOver" toolbar:helpid="helpid:5957" />
- <toolbar:toolbaritem xlink:href=".uno:BasicStepInto" toolbar:helpid="helpid:5956" />
- <toolbar:toolbaritem xlink:href=".uno:BasicStepOut" toolbar:helpid="helpid:5963" />
- <toolbar:toolbaritem xlink:href=".uno:ToggleBreakPoint" toolbar:helpid="helpid:30768" />
- <toolbar:toolbaritem xlink:href=".uno:ManageBreakPoints" toolbar:helpid="helpid:30810" />
- <toolbar:toolbaritem xlink:href=".uno:AddWatch" toolbar:helpid="helpid:30769" />
- <toolbar:toolbaritem xlink:href=".uno:MatchGroup" toolbar:helpid="helpid:30782" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicStepOver"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicStepInto"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicStepOut"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleBreakPoint"/>
+ <toolbar:toolbaritem xlink:href=".uno:ManageBreakPoints"/>
+ <toolbar:toolbaritem xlink:href=".uno:AddWatch"/>
+ <toolbar:toolbaritem xlink:href=".uno:MatchGroup"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LoadBasic" toolbar:helpid="helpid:5951" />
- <toolbar:toolbaritem xlink:href=".uno:SaveBasicAs" toolbar:helpid="helpid:5953" />
+ <toolbar:toolbaritem xlink:href=".uno:LoadBasic"/>
+ <toolbar:toolbaritem xlink:href=".uno:SaveBasicAs"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ImportDialog" />
+ <toolbar:toolbaritem xlink:href=".uno:ImportDialog"/>
</toolbar:toolbar>
Modified: incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/standardbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/standardbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/standardbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/standardbar.xml Wed Jun 27 13:44:09 2012
@@ -23,25 +23,25 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="helpid:5537" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="helpid:5501" />
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="helpid:5505" />
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Save"/>
+ <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509" />
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="helpid:5710" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712" />
+ <toolbar:toolbaritem xlink:href=".uno:Cut"/>
+ <toolbar:toolbaritem xlink:href=".uno:Copy"/>
+ <toolbar:toolbaritem xlink:href=".uno:Paste"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="helpid:5701" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="helpid:5700" />
+ <toolbar:toolbaritem xlink:href=".uno:Undo"/>
+ <toolbar:toolbaritem xlink:href=".uno:Redo"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectCatalog" toolbar:helpid="helpid:30774" />
- <toolbar:toolbaritem xlink:href=".uno:ChooseMacro" toolbar:helpid="helpid:30770" />
- <toolbar:toolbaritem xlink:href=".uno:ModuleDialog" toolbar:helpid="helpid:30773" />
+ <toolbar:toolbaritem xlink:href=".uno:ObjectCatalog"/>
+ <toolbar:toolbaritem xlink:href=".uno:ChooseMacro"/>
+ <toolbar:toolbaritem xlink:href=".uno:ModuleDialog"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex" />
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/translationbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/translationbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/translationbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/basctl/uiconfig/basicide/toolbar/translationbar.xml Wed Jun 27 13:44:09 2012
@@ -23,6 +23,6 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:CurrentLanguage" toolbar:helpid="helpid:30821" />
- <toolbar:toolbaritem xlink:href=".uno:ManageLanguage" toolbar:helpid="helpid:30820" />
+ <toolbar:toolbaritem xlink:href=".uno:CurrentLanguage"/>
+ <toolbar:toolbaritem xlink:href=".uno:ManageLanguage"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/basic/source/sbx/sbxscan.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/basic/source/sbx/sbxscan.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/basic/source/sbx/sbxscan.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/basic/source/sbx/sbxscan.cxx Wed Jun 27 13:44:09 2012
@@ -727,14 +727,19 @@ void SbxValue::Format( XubString& rRes,
{
String aStr = GetString();
+ SvtSysLocale aSysLocale;
+ const CharClass& rCharClass = aSysLocale.GetCharClass();
+
if( pFmt->EqualsIgnoreCaseAscii( VBAFORMAT_LOWERCASE ) )
{
- rRes = aStr.ToLowerAscii();
+ rCharClass.toLower( aStr );
+ rRes = aStr;
return;
}
if( pFmt->EqualsIgnoreCaseAscii( VBAFORMAT_UPPERCASE ) )
{
- rRes = aStr.ToUpperAscii();
+ rCharClass.toUpper( aStr );
+ rRes = aStr;
return;
}
Modified: incubator/ooo/branches/alg/aw080/main/bootstrap.1
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/bootstrap.1?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/bootstrap.1 (original)
+++ incubator/ooo/branches/alg/aw080/main/bootstrap.1 Wed Jun 27 13:44:09 2012
@@ -28,7 +28,7 @@ else
fi
export EXEEXT
-mkdir -p "$SOLARENV/$OUTPATH/bin"
+mkdir -p "$SOLARENV/$INPATH/bin"
#make sure build.pl is executable
@@ -39,19 +39,19 @@ chmod +x "$SRC_ROOT/solenv/bin/gccinstli
# fetch or update external tarballs
if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
- $SRC_ROOT/fetch_tarballs.sh $SRC_ROOT/ooo.lst
+ download_external_dependencies.pl $SRC_ROOT/external_deps.lst
fi
# ------------------------------------------------------------------------------
# Build dmake
-if test -n "$DMAKE_URL" -a ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then
+if test -n "$DMAKE_URL" -a ! -x "$SOLARENV/$INPATH/bin/dmake$EXEEXT"; then
# Assume that the dmake archive has been downloaded by fetch_tarballs.sh
# Determine the name of the downloaded file.
dmake_package_name=`echo $DMAKE_URL | sed "s/^\(.*\/\)//"`
- tmp_build_dir="$SOLARENV/$OUTPATH/misc/build/"
+ tmp_build_dir="$SOLARENV/$INPATH/misc/build/"
echo "making and entering $tmp_build_dir"
# Clean up any residues from a previous and unsuccessful build.
rm -rf "$tmp_build_dir"
@@ -120,9 +120,9 @@ if test -n "$DMAKE_URL" -a ! -x "$SOLAR
# Deploy the dmake executable to solenv
- cp -f "$tmp_build_dir/$dmake_directory_name/dmake$EXEEXT" "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT" || exit
+ cp -f "$tmp_build_dir/$dmake_directory_name/dmake$EXEEXT" "$SOLARENV/$INPATH/bin/dmake$EXEEXT" || exit
echo ""
- echo "dmake successfully built and copied to $SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
+ echo "dmake successfully built and copied to $SOLARENV/$INPATH/bin/dmake$EXEEXT"
echo ""
# Clean up. Note that this is skipped when one of the exits is executed above.
@@ -134,19 +134,19 @@ elif test "$IS_SYSTEM_DMAKE" = "YES"; th
echo "dmake is located in search path"
echo ""
-elif test -n "$DMAKE_PATH" -a -x "$DMAKE_PATH" -a ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then
+elif test -n "$DMAKE_PATH" -a -x "$DMAKE_PATH" -a ! -x "$SOLARENV/$INPATH/bin/dmake$EXEEXT"; then
- cp -f "$DMAKE_PATH" "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT" || exit
+ cp -f "$DMAKE_PATH" "$SOLARENV/$INPATH/bin/dmake$EXEEXT" || exit
echo ""
- echo "dmake copied to $SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
+ echo "dmake copied to $SOLARENV/$INPATH/bin/dmake$EXEEXT"
echo ""
else
- if test -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then
+ if test -x "$SOLARENV/$INPATH/bin/dmake$EXEEXT"; then
echo ""
- echo "dmake present in $SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
+ echo "dmake present in $SOLARENV/$INPATH/bin/dmake$EXEEXT"
fi
fi
Modified: incubator/ooo/branches/alg/aw080/main/bridges/source/jni_uno/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/bridges/source/jni_uno/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/bridges/source/jni_uno/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/bridges/source/jni_uno/makefile.mk Wed Jun 27 13:44:09 2012
@@ -61,9 +61,7 @@ SHL1STDLIBS= \
$(SALLIB) \
$(SALHELPERLIB)
-.IF "$(GUI)" != "OS2"
SHL1VERSIONMAP=$(TARGET).map
-.ENDIF
SHL1CREATEJNILIB=TRUE
SHL1IMPLIB=i$(TARGET)
Modified: incubator/ooo/branches/alg/aw080/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx Wed Jun 27 13:44:09 2012
@@ -148,7 +148,7 @@ sal_Int32 lcl_getSymbolType( const ::com
nSymbol = ::com::sun::star::chart::ChartSymbolType::AUTO;
break;
case chart2::SymbolStyle_STANDARD:
- nSymbol = rSymbol.StandardSymbol%8;
+ nSymbol = rSymbol.StandardSymbol%15;
break;
case chart2::SymbolStyle_POLYGON://new feature
nSymbol = ::com::sun::star::chart::ChartSymbolType::AUTO;
Modified: incubator/ooo/branches/alg/aw080/main/chart2/source/controller/main/ChartController.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/source/controller/main/ChartController.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/source/controller/main/ChartController.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/source/controller/main/ChartController.cxx Wed Jun 27 13:44:09 2012
@@ -596,8 +596,9 @@ void SAL_CALL ChartController::modeChang
xMBroadcaster->addModifyListener( this );
#endif
- //select chart area per default:
- select( uno::makeAny( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) ) );
+ // #119999# Do not do this per default to allow the user to deselect the chart OLE with a single press to ESC
+ // select chart area per default:
+ // select( uno::makeAny( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) ) );
uno::Reference< lang::XMultiServiceFactory > xFact( getModel(), uno::UNO_QUERY );
if( xFact.is())
Modified: incubator/ooo/branches/alg/aw080/main/chart2/source/view/main/ShapeFactory.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/source/view/main/ShapeFactory.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/source/view/main/ShapeFactory.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/source/view/main/ShapeFactory.cxx Wed Jun 27 13:44:09 2012
@@ -1296,6 +1296,13 @@ enum SymbolType { SYMBOL_SQUARE=0
, SYMBOL_ARROW_LEFT
, SYMBOL_BOWTIE
, SYMBOL_SANDGLASS
+ , SYMBOL_CIRCLE
+ , SYMBOL_STAR
+ , SYMBOL_X
+ , SYMBOL_PLUS
+ , SYMBOL_ASTERISK
+ , SYMBOL_HORIZONTAL_BAR
+ , SYMBOL_VERTICAL_BAR
, SYMBOL_COUNT
};
@@ -1319,6 +1326,9 @@ drawing::PolyPolygonShape3D createPolyPo
const double fWidthH = rSize.DirectionX/2.0; //fWidthH stands for Half Width
const double fHeightH = rSize.DirectionY/2.0; //fHeightH stands for Half Height
+ // double fMaxSize = fHeightH > fWidthH ? fHeightH : fWidthH; //assumes non negative
+ const sal_Int32 nQuarterCount = 35; // points inside a quadrant, used in case circle
+
sal_Int32 nPointCount = 4; //all arrow symbols only need 4 points
switch( eSymbolType )
{
@@ -1326,8 +1336,25 @@ drawing::PolyPolygonShape3D createPolyPo
case SYMBOL_DIAMOND:
case SYMBOL_BOWTIE:
case SYMBOL_SANDGLASS:
+ case SYMBOL_HORIZONTAL_BAR:
+ case SYMBOL_VERTICAL_BAR:
nPointCount = 5;
break;
+ case SYMBOL_X:
+ nPointCount = 13;
+ break;
+ case SYMBOL_PLUS:
+ nPointCount = 13;
+ break;
+ case SYMBOL_STAR:
+ nPointCount = 9;
+ break;
+ case SYMBOL_ASTERISK:
+ nPointCount = 19;
+ break;
+ case SYMBOL_CIRCLE:
+ nPointCount = 5 + 4 * nQuarterCount;
+ break;
default:
break;
}
@@ -1356,6 +1383,24 @@ drawing::PolyPolygonShape3D createPolyPo
switch(eSymbolType)
{
+ case SYMBOL_SQUARE:
+ {
+ *pInnerSequenceX++ = fX-fWidthH;
+ *pInnerSequenceY++ = fY-fHeightH;
+
+ *pInnerSequenceX++ = fX-fWidthH;
+ *pInnerSequenceY++ = fY+fHeightH;
+
+ *pInnerSequenceX++ = fX+fWidthH;
+ *pInnerSequenceY++ = fY+fHeightH;
+
+ *pInnerSequenceX++ = fX+fWidthH;
+ *pInnerSequenceY++ = fY-fHeightH;
+
+ *pInnerSequenceX++ = fX-fWidthH;
+ *pInnerSequenceY++ = fY-fHeightH;
+ break;
+ }
case SYMBOL_ARROW_UP:
{
*pInnerSequenceX++ = fX-fWidthH;
@@ -1471,6 +1516,284 @@ drawing::PolyPolygonShape3D createPolyPo
*pInnerSequenceY++ = fY;
break;
}
+ case SYMBOL_HORIZONTAL_BAR:
+ {
+ *pInnerSequenceX++ = fX-fWidthH;
+ *pInnerSequenceY++ = fY-0.2*fHeightH;
+
+ *pInnerSequenceX++ = fX+fWidthH;
+ *pInnerSequenceY++ = fY-0.2*fHeightH;
+
+
+ *pInnerSequenceX++ = fX+fWidthH;
+ *pInnerSequenceY++ = fY+0.2*fHeightH;
+
+ *pInnerSequenceX++ = fX-fWidthH;
+ *pInnerSequenceY++ = fY+0.2*fHeightH;
+
+ *pInnerSequenceX++ = fX-fWidthH;
+ *pInnerSequenceY++ = fY-0.2*fHeightH;
+ break;
+ }
+ case SYMBOL_VERTICAL_BAR:
+ {
+ *pInnerSequenceX++ = fX-0.2*fWidthH;
+ *pInnerSequenceY++ = fY-fHeightH;
+
+ *pInnerSequenceX++ = fX+0.2*fWidthH;
+ *pInnerSequenceY++ = fY-fHeightH;
+
+
+ *pInnerSequenceX++ = fX+0.2*fWidthH;
+ *pInnerSequenceY++ = fY+fHeightH;
+
+ *pInnerSequenceX++ = fX-0.2*fWidthH;
+ *pInnerSequenceY++ = fY+fHeightH;
+
+ *pInnerSequenceX++ = fX-0.2*fWidthH;
+ *pInnerSequenceY++ = fY-fHeightH;
+
+ break;
+ }
+ case SYMBOL_CIRCLE:
+ {
+ double fOmega = 1.5707963267948966192 / (nQuarterCount + 1.0);
+ // one point in the middle of each edge to get full size bounding rectangle
+ *pInnerSequenceX++ = fX + fWidthH;
+ *pInnerSequenceY++ = fY;
+ // 0 to PI/2
+ for (sal_Int32 i = 1; i <= nQuarterCount; ++i)
+ {
+ *pInnerSequenceX++ = fX + fWidthH * cos( i * fOmega );
+ *pInnerSequenceY++ = fY - fHeightH * sin( i * fOmega );
+ }
+ // PI/2 to PI
+ *pInnerSequenceX++ = fX;
+ *pInnerSequenceY++ = fY - fHeightH;
+ for (sal_Int32 i = 1; i <= nQuarterCount; ++i)
+ {
+ *pInnerSequenceX++ = fX - fWidthH * sin( i * fOmega);
+ *pInnerSequenceY++ = fY - fHeightH * cos( i * fOmega);
+ }
+ // PI to 3/2*PI
+ *pInnerSequenceX++ = fX - fWidthH;
+ *pInnerSequenceY++ = fY;
+ for (sal_Int32 i = 1; i <= nQuarterCount; ++i)
+ {
+ *pInnerSequenceX++ = fX - fWidthH * cos( i * fOmega);
+ *pInnerSequenceY++ = fY + fHeightH * sin( i * fOmega);
+ }
+ // 3/2*PI to 2*PI
+ *pInnerSequenceX++ = fX;
+ *pInnerSequenceY++ = fY + fHeightH;
+ for (sal_Int32 i = 1; i <= nQuarterCount; ++i)
+ {
+ *pInnerSequenceX++ = fX + fWidthH * sin(i * fOmega);
+ *pInnerSequenceY++ = fY + fHeightH * cos(i * fOmega);
+ }
+ // close polygon
+ *pInnerSequenceX++ = fX + fWidthH;
+ *pInnerSequenceY++ = fY;
+ break;
+ }
+ case SYMBOL_STAR:
+ {
+ *pInnerSequenceX++ = fX;
+ *pInnerSequenceY++ = fY-fHeightH;
+
+ *pInnerSequenceX++ = fX+0.2*fWidthH;
+ *pInnerSequenceY++ = fY-0.2*fHeightH;
+
+ *pInnerSequenceX++ = fX+fWidthH;
+ *pInnerSequenceY++ = fY;
+
+ *pInnerSequenceX++ = fX+0.2*fWidthH;
+ *pInnerSequenceY++ = fY+0.2*fHeightH;
+
+ *pInnerSequenceX++ = fX;
+ *pInnerSequenceY++ = fY+fHeightH;
+
+ *pInnerSequenceX++ = fX-0.2*fWidthH;
+ *pInnerSequenceY++ = fY+0.2*fHeightH;
+
+ *pInnerSequenceX++ = fX-fWidthH;
+ *pInnerSequenceY++ = fY;
+
+ *pInnerSequenceX++ = fX-0.2*fWidthH;
+ *pInnerSequenceY++ = fY-0.2*fHeightH;
+
+ *pInnerSequenceX++ = fX;
+ *pInnerSequenceY++ = fY-fHeightH;
+ break;
+ }
+ case SYMBOL_X:
+ {
+ const double fScaleX = fWidthH / 128.0;
+ const double fScaleY = fHeightH / 128.0;
+ const double fSmall = sqrt(200.0);
+ const double fLarge = 128.0 - fSmall;
+
+ *pInnerSequenceX++ = fX;
+ *pInnerSequenceY++ = fY - fScaleY * fSmall;
+
+ *pInnerSequenceX++ = fX - fScaleX * fLarge;
+ *pInnerSequenceY++ = fY - fHeightH;
+
+ *pInnerSequenceX++ = fX - fWidthH;
+ *pInnerSequenceY++ = fY - fScaleY * fLarge;
+
+ *pInnerSequenceX++ = fX - fScaleX * fSmall;
+ *pInnerSequenceY++ = fY;
+
+ *pInnerSequenceX++ = fX - fWidthH;
+ *pInnerSequenceY++ = fY + fScaleY * fLarge;
+
+ *pInnerSequenceX++ = fX - fScaleX * fLarge;
+ *pInnerSequenceY++ = fY + fHeightH;
+
+ *pInnerSequenceX++ = fX;
+ *pInnerSequenceY++ = fY + fScaleY * fSmall;
+
+ *pInnerSequenceX++ = fX + fScaleX * fLarge;
+ *pInnerSequenceY++ = fY + fHeightH;
+
+ *pInnerSequenceX++ = fX + fWidthH;
+ *pInnerSequenceY++ = fY + fScaleY * fLarge;
+
+ *pInnerSequenceX++ = fX + fScaleX * fSmall;
+ *pInnerSequenceY++ = fY;
+
+ *pInnerSequenceX++ = fX + fWidthH;
+ *pInnerSequenceY++ = fY - fScaleY * fLarge;
+
+ *pInnerSequenceX++ = fX + fScaleX * fLarge;
+ *pInnerSequenceY++ = fY - fHeightH;
+
+ *pInnerSequenceX++ = fX;
+ *pInnerSequenceY++ = fY - fScaleY * fSmall;
+ break;
+
+ }
+ case SYMBOL_PLUS:
+ {
+ const double fScaleX = fWidthH / 128.0;
+ const double fScaleY = fHeightH / 128.0;
+ const double fHalf = 10.0; //half line width on 256 size square
+ const double fdX = fScaleX * fHalf;
+ const double fdY = fScaleY * fHalf;
+
+ *pInnerSequenceX++ = fX-fdX;
+ *pInnerSequenceY++ = fY-fHeightH;
+
+ *pInnerSequenceX++ = fX-fdX;
+ *pInnerSequenceY++ = fY-fdY;
+
+ *pInnerSequenceX++ = fX-fWidthH;
+ *pInnerSequenceY++ = fY-fdY;
+
+ *pInnerSequenceX++ = fX-fWidthH;
+ *pInnerSequenceY++ = fY+fdY;
+
+ *pInnerSequenceX++ = fX-fdX;
+ *pInnerSequenceY++ = fY+fdY;
+
+ *pInnerSequenceX++ = fX-fdX;
+ *pInnerSequenceY++ = fY+fHeightH;
+
+ *pInnerSequenceX++ = fX+fdX;
+ *pInnerSequenceY++ = fY+fHeightH;
+
+ *pInnerSequenceX++ = fX+fdX;
+ *pInnerSequenceY++ = fY+fdY;
+
+ *pInnerSequenceX++ = fX+fWidthH;
+ *pInnerSequenceY++ = fY+fdY;
+
+ *pInnerSequenceX++ = fX+fWidthH;
+ *pInnerSequenceY++ = fY-fdY;
+
+ *pInnerSequenceX++ = fX+fdX;
+ *pInnerSequenceY++ = fY-fdY;
+
+ *pInnerSequenceX++ = fX+fdY;
+ *pInnerSequenceY++ = fY-fHeightH;
+
+ *pInnerSequenceX++ = fX-fdX;
+ *pInnerSequenceY++ = fY-fHeightH;
+ break;
+
+ }
+ case SYMBOL_ASTERISK:
+ {
+ const double fHalf = 10.0; // half line width on 256 size square
+ const double fTwoY = fHalf * sqrt(3.0);
+ const double fFourY = (128.0 - 2.0 * fHalf ) / sqrt(3.0);
+ const double fThreeX = 128.0 - fHalf;
+ const double fThreeY = fHalf * sqrt(3.0) + fFourY;
+ const double fFiveX = 2.0 * fHalf;
+
+ const double fScaleX = fWidthH / 128.0;
+ const double fScaleY = fHeightH / 128.0;
+
+ //1
+ *pInnerSequenceX++ = fX-fScaleX * fHalf;
+ *pInnerSequenceY++ = fY-fHeightH;
+ //2
+ *pInnerSequenceX++ = fX-fScaleX * fHalf;
+ *pInnerSequenceY++ = fY-fScaleY * fTwoY;
+ //3
+ *pInnerSequenceX++ = fX-fScaleX * fThreeX;
+ *pInnerSequenceY++ = fY-fScaleY * fThreeY;
+ //4
+ *pInnerSequenceX++ = fX-fWidthH;
+ *pInnerSequenceY++ = fY-fScaleY * fFourY;
+ //5
+ *pInnerSequenceX++ = fX-fScaleX * fFiveX;
+ *pInnerSequenceY++ = fY;
+ //6 as 4
+ *pInnerSequenceX++ = fX-fWidthH;
+ *pInnerSequenceY++ = fY+fScaleY * fFourY;
+ //7 as 3
+ *pInnerSequenceX++ = fX-fScaleX * fThreeX;
+ *pInnerSequenceY++ = fY+fScaleY * fThreeY;
+ //8 as 2
+ *pInnerSequenceX++ = fX-fScaleX * fHalf;
+ *pInnerSequenceY++ = fY+fScaleY * fTwoY;
+ //9 as 1
+ *pInnerSequenceX++ = fX-fScaleX * fHalf;
+ *pInnerSequenceY++ = fY+fHeightH;
+ //10 as 1
+ *pInnerSequenceX++ = fX+fScaleX * fHalf;
+ *pInnerSequenceY++ = fY+fHeightH;
+ //11 as 2
+ *pInnerSequenceX++ = fX+fScaleX * fHalf;
+ *pInnerSequenceY++ = fY+fScaleY * fTwoY;
+ //12 as 3
+ *pInnerSequenceX++ = fX+fScaleX * fThreeX;
+ *pInnerSequenceY++ = fY+fScaleY * fThreeY;
+ //13 as 4
+ *pInnerSequenceX++ = fX+fWidthH;
+ *pInnerSequenceY++ = fY+fScaleY * fFourY;
+ //14 as 5
+ *pInnerSequenceX++ = fX+fScaleX * fFiveX;
+ *pInnerSequenceY++ = fY;
+ //15 as 4
+ *pInnerSequenceX++ = fX+fWidthH;
+ *pInnerSequenceY++ = fY-fScaleY * fFourY;
+ //16 as 3
+ *pInnerSequenceX++ = fX+fScaleX * fThreeX;
+ *pInnerSequenceY++ = fY-fScaleY * fThreeY;
+ //17 as 2
+ *pInnerSequenceX++ = fX+fScaleX * fHalf;
+ *pInnerSequenceY++ = fY-fScaleY * fTwoY;
+ // 18 as 1
+ *pInnerSequenceX++ = fX+fScaleX * fHalf;
+ *pInnerSequenceY++ = fY-fHeightH;
+ // 19 = 1, closing
+ *pInnerSequenceX++ = fX-fScaleX * fHalf;
+ *pInnerSequenceY++ = fY-fHeightH;
+ break;
+ }
default: //case SYMBOL_SQUARE:
{
*pInnerSequenceX++ = fX-fWidthH;