[ooo-build-commit] .: distro-configs/OOo4Kids.conf.in patches/dev300
Thorsten Behrens
thorsten at kemper.freedesktop.org
Mon Mar 29 14:51:54 PDT 2010
distro-configs/OOo4Kids.conf.in | 21
patches/dev300/apply | 9
patches/dev300/ooo4kids-allpatches.diff |62046 ++++++++++++++++++++++++++++++++
3 files changed, 62076 insertions(+)
New commits:
commit 6c137153f481b8efaf75195891f235253bd5cad5
Author: Eric Bachard <eric.bachard at free.fr>
Date: Mon Mar 29 23:46:00 2010 +0200
Initial version of OOo4Kids on top of ooo-build
* distro-configs/OOo4Kids.conf.in: the distro - use
--with-distro=OOo4Kids to build it
* patches/dev300/apply: added the distro flavor and wholesale
patch
* patches/dev300/ooo4kids-allpatches.diff: the wholesale patch,
still missing l10n and icon work
diff --git a/distro-configs/OOo4Kids.conf.in b/distro-configs/OOo4Kids.conf.in
new file mode 100644
index 0000000..5574095
--- /dev/null
+++ b/distro-configs/OOo4Kids.conf.in
@@ -0,0 +1,21 @@
+--disable-cups
+--disable-neon
+--disable-crashdump
+--disable-fontconfig
+--with-epm=internal
+--disable-gnome-vfs
+--with-system-curl
+--with-stlport=no
+--disable-build-mozilla
+--disable-binfilter
+--disable-odk
+--disable-vba
+--disable-mozilla
+--with-java=no
+--enable-crashdump=no
+--with-OOo4Kids
+--with-use-shell=bash
+--with-system-python
+--with-intro-bitmaps=\"$TOOLSDIR/src/ooo4kids_intro.png\"
+--with-about-bitmaps=\"$TOOLSDIR/src/ooo4kids_about.png\"
+--with-vendor=\"EducOOo\"
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3d180a8..2c3801d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -160,6 +160,8 @@ FSFhuMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, Cu
PlainLinux: PlainBuildFixes
# Experimental crosscompile support
CrossWin32 : CrossWin32Patches
+# OOo4Kids flavor
+OOo4Kids: OOo4KidsPatches
# -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
@@ -310,6 +312,13 @@ gcc-HelpLinker.diff
# configmgr paths are not yet existing then
speed-sal-fewer-lstats.diff, i#89730, jholesov
+[ OOo4KidsPatches ]
+
+# TODO: updated icons missing, updated sdf files missing
+
+# cumulated patch set for OOo4Kids
+ooo4kids-allpatches.diff
+
[ CJK ]
# add a new unit 'character unit'
cjk-character-units-imp.diff, Amelia Wang
diff --git a/patches/dev300/ooo4kids-allpatches.diff b/patches/dev300/ooo4kids-allpatches.diff
new file mode 100644
index 0000000..9527946
--- /dev/null
+++ b/patches/dev300/ooo4kids-allpatches.diff
@@ -0,0 +1,62046 @@
+ooo4kids all in one patch
+
+From: Eric Bachard <ericb at openoffice.org>
+
+
+---
+
+ .../org/openoffice/accessibility/makefile.mk | 4
+ .../org/openoffice/java/accessibility/makefile.mk | 5
+ accessibility/bridge/source/java/makefile.mk | 5
+ apple_remote/AppleRemote.m | 45
+ apple_remote/HIDRemoteControlDevice.m | 10
+ apple_remote/MultiClickRemoteBehavior.m | 2
+ apple_remote/RemoteMainController.m | 9
+ apple_remote/inc/RemoteControl.h | 5
+ apple_remote/makefile2.pmk | 35
+ automation/packimages/makefile.mk | 5
+ automation/source/app/makefile.mk | 5
+ automation/source/communi/makefile.mk | 5
+ automation/source/miniapp/makefile.mk | 5
+ automation/source/mozillaserver/makefile.mk | 5
+ automation/source/server/makefile.mk | 7
+ automation/source/simplecm/makefile.mk | 5
+ automation/source/testtool/makefile.mk | 5
+ automation/util/makefile.mk | 5
+ avmedia/prj/build.lst | 3
+ avmedia/source/gstreamer/ChangeLog | 112 +
+ avmedia/source/gstreamer/exports.dxp | 4
+ avmedia/source/gstreamer/gstcommon.hxx | 83
+ avmedia/source/gstreamer/gstframegrabber.cxx | 244 +
+ avmedia/source/gstreamer/gstframegrabber.hxx | 78
+ avmedia/source/gstreamer/gstmanager.cxx | 114 +
+ avmedia/source/gstreamer/gstmanager.hxx | 74
+ avmedia/source/gstreamer/gstplayer.cxx | 639 +++
+ avmedia/source/gstreamer/gstplayer.hxx | 121 +
+ avmedia/source/gstreamer/gstuno.cxx | 111 +
+ avmedia/source/gstreamer/gstwindow.cxx | 365 ++
+ avmedia/source/gstreamer/gstwindow.hxx | 119 +
+ avmedia/source/gstreamer/makefile.mk | 85
+ avmedia/source/inc/mediamisc.hxx | 4
+ avmedia/source/viewer/mediawindow.cxx | 1
+ avmedia/source/viewer/mediawindow_impl.cxx | 49
+ avmedia/source/viewer/mediawindow_impl.hxx | 8
+ bean/com/sun/star/beans/makefile.mk | 9
+ bean/com/sun/star/comp/beans/makefile.mk | 11
+ bean/native/win32/makefile.mk | 5
+ bean/util/makefile.mk | 8
+ boost/prj/d.lst | 37
+ .../java/com/sun/star/bridges/jni_uno/makefile.mk | 6
+ bridges/source/jni_uno/makefile.mk | 2
+ canvas/source/cairo/cairo_canvashelper.cxx | 22
+ chart2/uiconfig/toolbar/average.xml | 22
+ chart2/uiconfig/toolbar/beginner.xml | 22
+ chart2/uiconfig/toolbar/chart2_average.xml | 22
+ chart2/uiconfig/toolbar/chart2_beginner.xml | 22
+ cli_ure/source/basetypes/makefile.mk | 7
+ cli_ure/source/climaker/makefile.mk | 8
+ cli_ure/source/native/makefile.mk | 2
+ cli_ure/source/ure/makefile.mk | 7
+ cli_ure/unotypes/makefile.mk | 7
+ cli_ure/util/makefile.pmk | 4
+ configure.in | 81
+ .../com/sun/star/sdbcx/comp/hsqldb/makefile.mk | 6
+ connectivity/source/commontools/CommonTools.cxx | 2
+ connectivity/source/drivers/adabas/makefile.mk | 6
+ connectivity/source/drivers/dbase/makefile.mk | 6
+ connectivity/source/drivers/evoab2/makefile.mk | 2
+ connectivity/source/drivers/hsqldb/makefile.mk | 2
+ connectivity/source/drivers/jdbc/makefile.mk | 6
+ .../source/drivers/mozab/bootstrap/makefile.mk | 9
+ connectivity/source/drivers/mozab/makefile.mk | 2
+ .../source/drivers/mozab/mozillasrc/makefile.mk | 4
+ connectivity/source/drivers/mysql/makefile.mk | 6
+ connectivity/source/drivers/odbc/makefile.mk | 5
+ connectivity/source/drivers/odbcbase/makefile.mk | 5
+ cppcanvas/inc/cppcanvas/color.hxx | 10
+ cppuhelper/source/findsofficepath.c | 5
+ dbaccess/source/core/api/makefile.mk | 5
+ dbaccess/source/core/dataaccess/makefile.mk | 5
+ dbaccess/source/core/misc/makefile.mk | 5
+ dbaccess/source/core/resource/makefile.mk | 5
+ dbaccess/source/ext/adabas/makefile.mk | 6
+ dbaccess/source/ext/macromigration/makefile.mk | 5
+ dbaccess/source/filter/migration/makefile.mk | 5
+ dbaccess/source/filter/xml/makefile.mk | 5
+ dbaccess/source/filter/xml/xmlJavaClassPath.cxx | 113 +
+ dbaccess/source/filter/xml/xmlJavaClassPath.hxx | 58
+ dbaccess/source/sdbtools/connection/makefile.mk | 5
+ dbaccess/source/sdbtools/misc/makefile.mk | 5
+ dbaccess/source/sdbtools/resource/makefile.mk | 5
+ dbaccess/source/shared/makefile.mk | 5
+ dbaccess/source/ui/app/makefile.mk | 5
+ dbaccess/source/ui/browser/makefile.mk | 5
+ dbaccess/source/ui/control/makefile.mk | 5
+ dbaccess/source/ui/dlg/makefile.mk | 5
+ dbaccess/source/ui/misc/makefile.mk | 5
+ dbaccess/source/ui/querydesign/makefile.mk | 5
+ dbaccess/source/ui/relationdesign/makefile.mk | 5
+ dbaccess/source/ui/tabledesign/makefile.mk | 5
+ dbaccess/source/ui/uno/makefile.mk | 5
+ dbaccess/util/makefile.mk | 5
+ desktop/scripts/soffice.sh | 2
+ desktop/source/app/app.cxx | 51
+ desktop/source/app/appfirststart.cxx | 4
+ desktop/source/app/cmdlineargs.cxx | 8
+ desktop/source/app/cmdlineargs.hxx | 2
+ desktop/source/app/cmdlinehelp.cxx | 4
+ desktop/source/app/copyright_ascii_ooo.c | 12
+ desktop/source/app/copyright_ascii_sun.c | 22
+ desktop/source/app/officeipcthread.cxx | 2
+ desktop/source/deployment/gui/dp_gui_service.cxx | 8
+ desktop/source/migration/pages.cxx | 7
+ desktop/source/migration/services/makefile.mk | 6
+ desktop/source/splash/makefile.mk | 13
+ desktop/source/splash/splash_png.cxx | 750 ++++
+ desktop/source/splash/splash_png.hxx | 143 +
+ desktop/util/ooverinfo.rc | 11
+ desktop/util/ooverinfo2.rc | 4
+ desktop/util/template.manifest | 2
+ desktop/util/verinfo.rc | 8
+ desktop/win32/source/applauncher/ooo/makefile.mk | 2
+ desktop/zipintro/makefile.mk | 40
+ dictionaries/de_CH/VERSION | 1
+ dictionaries/de_DE/VERSION | 1
+ dictionaries/zu_ZA/dictionary.lst | 1
+ epm/epm-3.7.patch | 512 +--
+ filter/source/config/fragments/makefile.mk | 3
+ filter/source/config/tools/merge/FCFGMerge.cfg | 125 +
+ filter/source/config/tools/merge/FCFGMerge.java | 128 +
+ filter/source/config/tools/merge/Manifest.mf | 1
+ filter/source/config/tools/merge/Merger.java | 362 ++
+ filter/source/config/tools/merge/makefile.mk | 95
+ .../config/tools/utils/AnalyzeStartupLog.java | 324 ++
+ filter/source/config/tools/utils/Cache.java | 2444 +++++++++++++
+ filter/source/config/tools/utils/ConfigHelper.java | 297 ++
+ filter/source/config/tools/utils/FileHelper.java | 760 ++++
+ filter/source/config/tools/utils/Logger.java | 172 +
+ .../tools/utils/MalformedCommandLineException.java | 46
+ filter/source/config/tools/utils/XMLHelper.java | 820 ++++
+ filter/source/config/tools/utils/makefile.mk | 68
+ filter/source/svg/makefile.mk | 5
+ filter/source/svg/svgfilter.cxx | 4
+ filter/source/svg/svgfilter.hxx | 12
+ filter/source/xsltfilter/makefile.mk | 4
+ filter/source/xsltvalidate/makefile.mk | 2
+ fpicker/source/aqua/FilterHelper.cxx | 3
+ fpicker/source/aqua/makefile.mk | 1
+ fpicker/util/makefile.pmk | 35
+ framework/inc/framework.hrc | 37
+ .../source/dispatch/windowcommanddispatch.cxx | 4
+ .../source/inc/dispatch/windowcommanddispatch.hxx | 5
+ .../source/services/backingwindow-OOo4Kids.cxx | 662 +++
+ framework/source/services/backingwindow.hxx | 27
+ framework/source/services/fwk_services.src | 135 -
+ framework/source/services/makefile.mk | 7
+ framework/uiconfig/startmodule/menubar/menubar.xml | 38
+ framework/util/makefile.mk | 6
+ graphite/graphite-2.3.1.patch.mingw | 168 -
+ helpcontent2/prj/d.lst | 3
+ helpcontent2/settings.pmk | 5
+ helpcontent2/source/auxiliary/makefile.mk | 2
+ helpcontent2/util/sbasic/makefile.mk | 6
+ helpcontent2/util/sdatabase/makefile.mk | 5
+ helpcontent2/util/smath/makefile.mk | 6
+ helpcontent2/util/target.pmk | 6
+ hsqldb/makefile.mk | 5
+ hsqldb/patches/i103528.patch | 11
+ hsqldb/patches/i104901.patch | 27
+ hsqldb/patches/i96823.patch | 94
+ hsqldb/patches/i97032.patch | 10
+ hsqldb/patches/index.txt | 17
+ .../windows/msi_templates/Binary.idt | 4
+ .../windows/msi_languages/Control.ulf | 22
+ .../inc_openoffice/windows/msi_languages/Nsis.ulf | 4
+ .../windows/msi_templates/Binary.idt | 4
+ .../windows/msi_templates/RegLocat.idt | 16
+ .../windows/msi_templates/TextStyl.idt | 2
+ .../inc_openoffice/windows/msi_templates/codes.txt | 2
+ .../inc_sdkoo/windows/msi_templates/RegLocat.idt | 4
+ instsetoo_native/macosx/make_versioned.sh | 13
+ instsetoo_native/macosx/makefile.mk | 5
+ instsetoo_native/util/OOo4Kids.lst | 526 +++
+ instsetoo_native/util/makefile.mk | 48
+ instsetoo_native/util/pack-OOo4Kids.lst | 23
+ javaunohelper/com/sun/star/comp/helper/makefile.mk | 5
+ .../com/sun/star/comp/juhtest/makefile.mk | 5
+ javaunohelper/com/sun/star/comp/makefile.mk | 5
+ .../com/sun/star/lib/uno/adapter/makefile.mk | 5
+ .../com/sun/star/lib/uno/helper/makefile.mk | 5
+ javaunohelper/source/makefile.mk | 2
+ javaunohelper/util/makefile.mk | 5
+ jurt/com/sun/star/comp/bridgefactory/makefile.mk | 5
+ jurt/com/sun/star/comp/connections/makefile.mk | 5
+ jurt/com/sun/star/comp/loader/makefile.mk | 5
+ jurt/com/sun/star/comp/servicemanager/makefile.mk | 5
+ jurt/com/sun/star/comp/urlresolver/makefile.mk | 5
+ jurt/com/sun/star/lib/connections/pipe/makefile.mk | 5
+ .../sun/star/lib/connections/socket/makefile.mk | 5
+ .../star/lib/uno/bridges/java_remote/makefile.mk | 5
+ .../sun/star/lib/uno/environments/java/makefile.mk | 5
+ .../star/lib/uno/environments/remote/makefile.mk | 6
+ jurt/com/sun/star/lib/uno/makefile.mk | 5
+ .../com/sun/star/lib/uno/protocols/urp/makefile.mk | 5
+ jurt/com/sun/star/lib/util/makefile.mk | 5
+ jurt/com/sun/star/uno/makefile.mk | 5
+ jurt/source/pipe/makefile.mk | 2
+ jvmaccess/inc/jvmaccess/classpath.hxx | 2
+ jvmaccess/inc/jvmaccess/virtualmachine.hxx | 3
+ jvmaccess/source/classpath.cxx | 6
+ jvmaccess/source/unovirtualmachine.cxx | 6
+ jvmaccess/source/virtualmachine.cxx | 6
+ jvmaccess/util/gcc3.map | 4
+ jvmaccess/util/msvc_win32_intel.map | 1
+ jvmfwk/inc/jvmfwk/framework.h | 2
+ jvmfwk/inc/jvmfwk/vendorplugin.h | 2
+ jvmfwk/plugins/sunmajor/pluginlib/makefile.mk | 2
+ .../plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 15
+ jvmfwk/source/elements.cxx | 5
+ jvmfwk/source/framework.cxx | 12
+ jvmfwk/source/javasettings_template.xml | 6
+ .../libtextcat-2.2-gdium-mips-workaround.patch | 22
+ libtextcat/makefile.mk | 3
+ lucene/makefile.mk | 4
+ offapi/com/sun/star/awt/SystemPointer.idl | 5
+ offapi/com/sun/star/presentation/XSlideShow.idl | 19
+ offapi/util/makefile.mk | 4
+ .../registry/data/org/openoffice/Office/Common.xcu | 15
+ .../registry/data/org/openoffice/Office/Jobs.xcu | 45
+ .../org/openoffice/Office/UI/CalcWindowState.xcu | 100 -
+ .../org/openoffice/Office/UI/DrawWindowState.xcu | 138 +
+ .../org/openoffice/Office/UI/GenericCommands.xcu | 13
+ .../org/openoffice/Office/UI/WriterWindowState.xcu | 240 +
+ .../registry/data/org/openoffice/Office/Views.xcu | 39
+ officecfg/registry/data/org/openoffice/Setup.xcu | 4
+ .../schema/org/openoffice/Office/Common.xcs | 64
+ .../schema/org/openoffice/Office/Impress.xcs | 2
+ .../schema/org/openoffice/Office/Writer.xcs | 22
+ openssl/makefile.mk | 6
+ packimages/pack/image-OOo4Kids-sort.lst | 314 ++
+ packimages/pack/makefile.mk | 26
+ .../macosx/macosx_menubar_modification.xsl | 3
+ postprocess/rebase/makefile.mk | 4
+ qadevOOo/makefile.mk | 7
+ qadevOOo/runner/makefile.mk | 5
+ readlicense_oo/docs/readme/makefile.mk | 7
+ readlicense_oo/docs/readme/readme_OOo4Kids.xrm | 300 ++
+ readlicense_oo/html/THIRDPARTYLICENSEREADME.html | 28
+ readlicense_oo/source/license/license_en-US.html | 180 -
+ readlicense_oo/source/license/license_en-US.txt | 9
+ readlicense_oo/util/makefile.pmk | 10
+ reportdesign/source/core/api/makefile.mk | 7
+ reportdesign/source/core/misc/makefile.mk | 6
+ reportdesign/source/core/resource/makefile.mk | 5
+ reportdesign/source/core/sdr/makefile.mk | 6
+ reportdesign/source/filter/xml/makefile.mk | 6
+ reportdesign/source/ui/dlg/makefile.mk | 4
+ reportdesign/source/ui/inspection/makefile.mk | 4
+ reportdesign/source/ui/misc/makefile.mk | 5
+ reportdesign/source/ui/report/makefile.mk | 5
+ reportdesign/util/makefile.mk | 6
+ ridljar/com/makefile.mk | 9
+ ridljar/javamaker/makefile.mk | 5
+ .../com/sun/star/lib/unoloader/makefile.mk | 5
+ ridljar/source/unoloader/makefile.mk | 5
+ ridljar/util/makefile.mk | 5
+ sandbox/com/sun/star/lib/sandbox/makefile.mk | 4
+ sandbox/util/makefile.mk | 6
+ saxon/makefile.mk | 5
+ sc/inc/address.hxx | 17
+ sc/source/core/data/global.cxx | 158 +
+ sc/source/ui/view/tabvwsh4.cxx | 4
+ sc/uiconfig/scalc/menubar/menubar.xml | 294 --
+ sc/uiconfig/scalc/toolbar/average.xml | 49
+ sc/uiconfig/scalc/toolbar/beginner.xml | 49
+ sc/uiconfig/scalc/toolbar/calc_average.xml | 49
+ sc/uiconfig/scalc/toolbar/calc_beginner.xml | 49
+ sc/uiconfig/scalc/toolbar/formatobjectbar.xml | 60
+ sc/uiconfig/scalc/toolbar/standardbar.xml | 37
+ scp2/source/base/file_base.scp | 3
+ scp2/source/base/makefile.mk | 5
+ scp2/source/binfilter/makefile.mk | 5
+ scp2/source/impress/makefile.mk | 4
+ scp2/source/impress/module_impress.scp | 3
+ scp2/source/impress/module_ogltrans.scp | 4
+ scp2/source/javafilter/makefile.mk | 9
+ scp2/source/math/file_math.scp | 2
+ scp2/source/math/makefile.mk | 4
+ scp2/source/ooo/common_brand.scp | 55
+ scp2/source/ooo/directory_ooo.scp | 21
+ scp2/source/ooo/file_extra_ooo.scp | 14
+ scp2/source/ooo/file_library_ooo.scp | 55
+ scp2/source/ooo/file_ooo.scp | 81
+ scp2/source/ooo/file_resource_ooo.scp | 2
+ scp2/source/ooo/folderitem_ooo.ulf | 2
+ scp2/source/ooo/makefile.mk | 11
+ scp2/source/ooo/module_hidden_ooo.scp | 5
+ scp2/source/ooo/ooo_brand.scp | 5
+ scp2/source/ooo/profileitem_ooo.scp | 4
+ scp2/source/ooo/registryitem_ooo.scp | 48
+ scp2/source/ooo/registryitem_ooo.ulf | 2
+ scp2/source/ooo/scpaction_ooo.scp | 13
+ scp2/source/ooo/shortcut_ooo.scp | 4
+ scp2/source/ooo/ure.scp | 58
+ scp2/source/ooo/ure_standalone.scp | 12
+ scp2/source/quickstart/registryitem_quickstart.scp | 4
+ scp2/source/sdkoo/makefile.mk | 5
+ scp2/source/sdkoo/sdkoo.scp | 4
+ scp2/source/testtool/makefile.mk | 5
+ scp2/source/writer/makefile.mk | 4
+ scp2/util/makefile.mk | 64
+ scripting/examples/java/makefile.mk | 5
+ scripting/examples/makefile.mk | 7
+ scripting/java/makefile.mk | 6
+ scripting/source/basprov/makefile.mk | 5
+ scripting/source/dlgprov/makefile.mk | 5
+ sd/source/ui/inc/docprev.hxx | 2
+ sd/source/ui/slideshow/makefile.mk | 5
+ sd/source/ui/slideshow/slideshow.cxx | 2
+ sd/source/ui/slideshow/slideshow.hrc | 22
+ sd/source/ui/slideshow/slideshow.src | 128 +
+ sd/source/ui/slideshow/slideshowimpl.cxx | 411 ++
+ sd/source/ui/slideshow/slideshowimpl.hxx | 17
+ sd/uiconfig/sdraw/accelerator/de/default.xml | 63
+ sd/uiconfig/sdraw/accelerator/en-GB/default.xml | 63
+ sd/uiconfig/sdraw/accelerator/en-US/default.xml | 63
+ sd/uiconfig/sdraw/accelerator/es/default.xml | 63
+ sd/uiconfig/sdraw/accelerator/fr/default.xml | 63
+ sd/uiconfig/sdraw/menubar/menubar.xml | 118 -
+ sd/uiconfig/sdraw/toolbar/average.xml | 37
+ sd/uiconfig/sdraw/toolbar/beginner.xml | 37
+ sd/uiconfig/sdraw/toolbar/draw_average.xml | 37
+ sd/uiconfig/sdraw/toolbar/draw_beginner.xml | 37
+ sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml | 2
+ sd/uiconfig/sdraw/toolbar/standardbar.xml | 26
+ sd/uiconfig/simpress/accelerator/de/default.xml | 11
+ sd/uiconfig/simpress/accelerator/default.xml | 71
+ sd/uiconfig/simpress/accelerator/es/default.xml | 9
+ sd/uiconfig/simpress/accelerator/fr/default.xml | 4
+ sd/uiconfig/simpress/menubar/menubar.xml | 4
+ sd/uiconfig/simpress/toolbar/average.xml | 39
+ sd/uiconfig/simpress/toolbar/beginner.xml | 39
+ sd/uiconfig/simpress/toolbar/impress_average.xml | 39
+ sd/uiconfig/simpress/toolbar/impress_beginner.xml | 39
+ set_soenv.in | 12
+ setup_native/scripts/update.sh | 2
+ setup_native/scripts/userland.txt | 2
+ setup_native/source/packinfo/package_names.txt | 91
+ setup_native/source/packinfo/packinfo_brand.txt | 30
+ setup_native/source/packinfo/packinfo_office.txt | 256 +
+ .../source/packinfo/packinfo_office_lang.txt | 104 -
+ setup_native/source/packinfo/packinfo_sdkoo.txt | 8
+ setup_native/source/packinfo/packinfo_ure.txt | 8
+ .../source/packinfo/shellscripts_brand.txt | 8
+ .../source/packinfo/shellscripts_core01.txt | 14
+ .../source/packinfo/spellchecker_selection.txt | 12
+ .../win32/customactions/relnotes/makefile.mk | 5
+ .../win32/customactions/relnotes/relnotes.cxx | 3
+ setup_native/source/win32/stwrapper/resource.rc | 14
+ setup_native/source/win32/stwrapper/stwrapper.cxx | 2
+ sfx2/inc/sfx2/passwd.hxx | 20
+ sfx2/inc/sfx2/sfx.hrc | 11
+ sfx2/inc/sfx2/sfxsids.hrc | 10
+ sfx2/inc/showlicense.hxx | 85
+ sfx2/sdi/appslots.sdi | 4
+ sfx2/sdi/sfx.sdi | 25
+ sfx2/source/appl/appserv.cxx | 95
+ sfx2/source/appl/appuno.cxx | 5
+ sfx2/source/appl/newhelp.cxx | 3
+ sfx2/source/appl/sfxhelp.cxx | 4
+ sfx2/source/appl/shutdownicon.hxx | 2
+ sfx2/source/appl/shutdowniconaqua.mm | 7
+ sfx2/source/appl/shutdowniconunx.cxx | 4
+ sfx2/source/appl/shutdowniconw32.cxx | 4
+ sfx2/source/appl/workwin.cxx | 149 +
+ sfx2/source/control/bindings.cxx | 4
+ sfx2/source/dialog/about.cxx | 82
+ sfx2/source/dialog/dialog.hrc | 1
+ sfx2/source/dialog/makefile.mk | 11
+ sfx2/source/dialog/passwd.cxx | 285 +
+ sfx2/source/dialog/passwd.hrc | 14
+ sfx2/source/dialog/passwd.src | 67
+ sfx2/source/dialog/passwd_OOo4Kids.cxx | 468 ++
+ sfx2/source/dialog/showlicense.cxx | 436 ++
+ sfx2/source/doc/sfxbasemodel.cxx | 37
+ sfx2/util/makefile.mk | 4
+ shell/source/unix/misc/senddoc.sh | 33
+ shell/source/unix/sysshell/systemshell.cxx | 151 +
+ slideshow/prj/build.lst | 4
+ .../engine/OGLTrans/OGLTrans_TransitionImpl.cxx | 1318 -------
+ .../engine/OGLTrans/OGLTrans_TransitionImpl.hxx | 509 ---
+ .../engine/OGLTrans/OGLTrans_TransitionerImpl.cxx | 1487 --------
+ .../engine/OGLTrans/mac/OGLTrans_Shaders_MACOSX.h | 94
+ .../engine/OGLTrans/mac/OGLTrans_Shaders_MACOSX.m | 236 +
+ .../OGLTrans/mac/OGLTrans_TransitionImpl.hxx | 501 +++
+ .../OGLTrans/mac/OGLTrans_TransitionImpl_MACOSX.mm | 1329 +++++++
+ .../mac/OGLTrans_TransitionerImpl_MACOSX.mm | 1137 ++++++
+ .../source/engine/OGLTrans/mac/aquaOpenGLView.h | 36
+ .../source/engine/OGLTrans/mac/aquaOpenGLView.m | 195 +
+ slideshow/source/engine/OGLTrans/mac/makefile.mk | 92
+ slideshow/source/engine/OGLTrans/makefile.mk | 84
+ .../engine/OGLTrans/unx/OGLTrans_Shaders.hxx | 71
+ .../engine/OGLTrans/unx/OGLTrans_Shaders_LINUX.cxx | 143 +
+ .../OGLTrans/unx/OGLTrans_TransitionImpl.cxx | 1318 +++++++
+ .../OGLTrans/unx/OGLTrans_TransitionImpl.hxx | 509 +++
+ .../unx/OGLTrans_TransitionerImpl_LINUX.cxx | 1487 ++++++++
+ slideshow/source/engine/OGLTrans/unx/makefile.mk | 76
+ .../engine/OGLTrans/win/OGLTrans_Shaders.hxx | 71
+ .../engine/OGLTrans/win/OGLTrans_Shaders_WNT.cxx | 143 +
+ .../OGLTrans/win/OGLTrans_TransitionImpl.cxx | 1321 +++++++
+ .../OGLTrans/win/OGLTrans_TransitionImpl.hxx | 513 +++
+ .../OGLTrans/win/OGLTrans_TransitionerImpl_WNT.cxx | 1455 ++++++++
+ slideshow/source/engine/OGLTrans/win/makefile.mk | 76
+ slideshow/source/engine/color.cxx | 13
+ slideshow/source/engine/eventmultiplexer.cxx | 39
+ slideshow/source/engine/makefile.mk | 4
+ slideshow/source/engine/shapes/shapeimporter.cxx | 104 +
+ slideshow/source/engine/shapes/viewmediashape.cxx | 33
+ slideshow/source/engine/shapes/viewmediashape.hxx | 5
+ slideshow/source/engine/slide/slideimpl.cxx | 84
+ slideshow/source/engine/slide/userpaintoverlay.cxx | 241 +
+ slideshow/source/engine/slide/userpaintoverlay.hxx | 12
+ slideshow/source/engine/slideshowimpl.cxx | 336 ++
+ slideshow/source/engine/tools.cxx | 32
+ slideshow/source/inc/eventmultiplexer.hxx | 27
+ slideshow/source/inc/rgbcolor.hxx | 3
+ slideshow/source/inc/shapeimporter.hxx | 22
+ slideshow/source/inc/slide.hxx | 15
+ slideshow/source/inc/tools.hxx | 3
+ slideshow/source/inc/userpainteventhandler.hxx | 6
+ solenv/bin/deliver.pl | 4
+ solenv/bin/modules/installer/download.pm | 3
+ solenv/bin/modules/installer/epmfile.pm | 36
+ solenv/bin/modules/installer/globals.pm | 10
+ solenv/bin/modules/installer/servicesfile.pm | 9
+ solenv/bin/modules/installer/windows/msp.pm | 13
+ solenv/bin/modules/installer/windows/sign.pm | 277 -
+ solenv/bin/modules/installer/ziplist.pm | 5
+ solenv/bin/modules/packager/globals.pm | 8
+ solenv/inc/minor.mk | 10
+ solenv/inc/settings.mk | 4
+ solenv/inc/shlinfo.rc | 8
+ solenv/inc/unxlng.mk | 5
+ solenv/inc/unxlngi6.mk | 9
+ solenv/inc/unxlngmips.mk | 5
+ solenv/inc/unxlngppc.mk | 2
+ solenv/inc/unxlngppc4.mk | 4
+ solenv/inc/unxlngx6.mk | 15
+ solenv/inc/unxmacx.mk | 9
+ solenv/inc/version.hrc | 4
+ solenv/inc/wnt.mk | 3
+ solenv/inc/wntmsci10.mk | 4
+ solenv/inc/wntmsci11.mk | 4
+ starmath/inc/rect.hxx | 5
+ starmath/source/makefile.mk | 5
+ starmath/source/node.cxx | 3
+ starmath/source/viewhdl.cxx | 170 +
+ starmath/uiconfig/smath/menubar/menubar.xml | 1
+ starmath/uiconfig/smath/toolbar/average.xml | 26
+ starmath/uiconfig/smath/toolbar/beginner.xml | 26
+ starmath/uiconfig/smath/toolbar/math_average.xml | 26
+ starmath/uiconfig/smath/toolbar/math_beginner.xml | 26
+ starmath/util/makefile.mk | 5
+ stax/makefile.mk | 7
+ svtools/inc/imgdef.hxx | 10
+ svtools/inc/svtools/inettype.hxx | 4
+ svtools/inc/svtools/svtools.hrc | 210 +
+ svtools/source/config/miscopt.cxx | 10
+ svtools/source/misc1/inettype.cxx | 5
+ svtools/source/misc1/loginerr.cxx | 45
+ svtools/source/misc1/mediatyp.src | 162 +
+ svx/inc/globlmn_tmpl.hrc | 10
+ svx/inc/helpid.hrc | 12
+ svx/inc/svx/svxacorr.hxx | 4
+ svx/inc/svx/swafopt.hxx | 1
+ svx/source/cui/autocdlg.cxx | 15
+ svx/source/cui/autocdlg.hrc | 1
+ svx/source/cui/autocdlg.hxx | 2
+ svx/source/cui/autocdlg.src | 4
+ svx/source/cui/cfg.src | 4
+ svx/source/cui/makefile.mk | 4
+ svx/source/cui/optgdlg.cxx | 612 +++
+ svx/source/cui/optgdlg.hrc | 17
+ svx/source/cui/optgdlg.hxx | 53
+ svx/source/cui/optgdlg.src | 163 +
+ svx/source/cui/tpcolor.cxx | 7
+ svx/source/cui/treeopt.cxx | 176 +
+ svx/source/cui/treeopt.hrc | 15
+ svx/source/cui/treeopt.hxx | 15
+ svx/source/cui/treeopt.src | 92
+ svx/source/editeng/acorrcfg.cxx | 14
+ svx/source/editeng/svxacorr.cxx | 54
+ svx/source/editeng/swafopt.cxx | 2
+ svx/source/inc/dbcharsethelper.hxx | 69
+ svx/source/inc/dbtoolsclient.hxx | 238 +
+ svx/source/intro/intro_tmpl.hrc | 26
+ svx/source/intro/iso.src | 4
+ svx/source/intro/ooo.src | 38
+ svx/source/tbxctrls/tbcontrl.cxx | 12
+ svx/source/tbxctrls/tbunocontroller.cxx | 5
+ sw/inc/bookmrk.hxx | 218 +
+ sw/inc/comcore.hrc | 3
+ sw/inc/fmthbsh.hxx | 74
+ sw/inc/swenumdef.hxx | 72
+ .../complex/writer/TextPortionEnumerationTest.java | 3871 --------------------
+ sw/source/core/doc/docfly.cxx | 32
+ sw/source/core/edit/autofmt.cxx | 9
+ sw/source/core/text/txtfrm.cxx | 6
+ sw/source/core/txtnode/fmtatr1.cxx | 97 +
+ sw/source/ui/dbui/dbtree.cxx | 4
+ sw/source/ui/dialog/SwDialogAssistant.cxx | 2066 +++++++++++
+ sw/source/ui/dialog/SwDialogAssistant.src | 240 +
+ sw/source/ui/fldui/fldtdlg.src | 6
+ sw/source/ui/inc/SwAssistantClass.hxx | 89
+ sw/source/ui/inc/SwDialogAssistant.hrc | 123 +
+ sw/source/ui/inc/SwDialogAssistant.hxx | 83
+ sw/source/ui/utlui/utlui.src | 4
+ sw/uiconfig/swriter/menubar/menubar.xml | 331 --
+ sw/uiconfig/swriter/toolbar/average.xml | 30
+ sw/uiconfig/swriter/toolbar/beginner.xml | 21
+ sw/uiconfig/swriter/toolbar/standardbar.xml | 35
+ sw/uiconfig/swriter/toolbar/textobjectbar.xml | 64
+ sw/uiconfig/swriter/toolbar/viewerbar.xml | 8
+ sw/uiconfig/swriter/toolbar/writer_average.xml | 30
+ sw/uiconfig/swriter/toolbar/writer_beginner.xml | 21
+ sysui/desktop/debian/OOo4Kids-debian-menus | 42
+ sysui/desktop/debian/control | 8
+ sysui/desktop/debian/makefile.mk | 12
+ sysui/desktop/debian/postinst | 6
+ sysui/desktop/freedesktop/freedesktop-menus.spec | 10
+ sysui/desktop/icons/makefile.mk | 10
+ sysui/desktop/macosx/Info.plist | 43
+ sysui/desktop/macosx/makefile.mk | 2
+ sysui/desktop/mandriva/mandriva-menus.spec | 24
+ sysui/desktop/menus/base.desktop | 11
+ sysui/desktop/menus/calc.desktop | 2
+ sysui/desktop/menus/draw.desktop | 2
+ sysui/desktop/menus/impress.desktop | 2
+ sysui/desktop/menus/math.desktop | 2
+ sysui/desktop/menus/ooo4kids.desktop | 11
+ sysui/desktop/menus/printeradmin.desktop | 2
+ sysui/desktop/menus/qstart.desktop | 2
+ sysui/desktop/menus/startcenter.desktop | 2
+ sysui/desktop/menus/writer.desktop | 2
+ sysui/desktop/mimetypes/OOo4Kids.applications | 9
+ sysui/desktop/mimetypes/OOo4Kids.mime | 80
+ sysui/desktop/productversion.mk | 20
+ sysui/desktop/redhat/redhat-menus.spec | 29
+ sysui/desktop/share/OOo4Kids.sh | 2
+ sysui/desktop/share/brand.pl | 4
+ sysui/desktop/share/create_mime_xml.pl | 2
+ sysui/desktop/share/create_tree.sh | 16
+ sysui/desktop/share/documents.ulf | 3
+ sysui/desktop/share/launcher_comment.ulf | 6
+ sysui/desktop/share/launcher_genericname.ulf | 4
+ sysui/desktop/share/makefile.mk | 50
+ sysui/desktop/share/misc/MANIFEST | 6
+ sysui/desktop/share/misc/activity-ooo4kids.svg | 729 ++++
+ sysui/desktop/share/misc/activity.info | 8
+ sysui/desktop/share/misc/ooo4kidsrc.txt | 44
+ sysui/desktop/share/misc/setup.py | 3
+ sysui/desktop/share/misc/sugarOOo4Kids | 13
+ sysui/desktop/share/translate.pl | 2
+ sysui/desktop/slackware/makefile.mk | 2
+ sysui/desktop/slackware/slack-desc | 2
+ sysui/desktop/suse/suse-menus.spec | 15
+ sysui/prj/d.lst | 14
+ testtools/com/sun/star/comp/bridge/makefile.mk | 4
+ testtools/source/bridgetest/cli/makefile.mk | 5
+ testtools/source/bridgetest/idl/makefile.mk | 6
+ testtools/source/bridgetest/makefile.mk | 10
+ testtools/source/bridgetest/pyuno/makefile.mk | 6
+ testtools/source/cliversioning/makefile.mk | 5
+ testtools/source/performance/makefile.mk | 5
+ testtools/source/servicetests/makefile.mk | 6
+ testtools/util/makefile.pmk | 4
+ transex3/java/l10nconv/makefile.mk | 5
+ transex3/java/receditor/makefile.mk | 5
+ transex3/source/filter/merge/makefile.mk | 7
+ transex3/source/filter/utils/makefile.mk | 5
+ transex3/source/help/makefile.mk | 4
+ unoil/climaker/makefile.mk | 5
+ unoil/climaker/version.txt | 6
+ unoil/util/makefile.mk | 5
+ unotools/inc/unotools/configmgr.hxx | 3
+ unotools/source/config/configmgr.cxx | 10
+ unoxml/source/rdf/makefile.mk | 5
+ vcl/aqua/source/app/saldata.cxx | 9
+ vcl/aqua/source/window/salframe.cxx | 2
+ vcl/aqua/source/window/salmenu.cxx | 34
+ vcl/inc/vcl/cmdevt.hxx | 4
+ vcl/inc/vcl/graphite_layout.hxx | 3
+ vcl/inc/vcl/introwin.hxx | 2
+ vcl/inc/vcl/menu.hxx | 1
+ vcl/inc/vcl/ptrstyle.hxx | 7
+ vcl/inc/vcl/salobj.hxx | 1
+ vcl/inc/vcl/settings.hxx | 6
+ vcl/inc/vcl/svids.hrc | 3
+ vcl/inc/vcl/syschild.hxx | 1
+ vcl/inc/vcl/toolbox.h | 8
+ vcl/inc/vcl/wrkwin.hxx | 6
+ vcl/source/app/settings.cxx | 28
+ vcl/source/src/stdtext.src | 12
+ vcl/source/window/cursor.cxx | 9
+ vcl/source/window/javachild.cxx | 10
+ vcl/source/window/syschild.cxx | 6
+ vcl/source/window/toolbox.cxx | 9
+ vcl/source/window/toolbox2.cxx | 8
+ vcl/source/window/window.cxx | 2
+ vcl/unx/gtk/window/gtkobject.cxx | 9
+ vcl/unx/inc/ooo4kidsint.hxx | 57
+ vcl/unx/inc/plugins/gtk/gtkobject.hxx | 1
+ vcl/unx/inc/sugarxproperties.hxx | 18
+ vcl/unx/source/app/makefile.mk | 4
+ vcl/unx/source/app/saldisp.cxx | 8
+ vcl/unx/source/app/sm.cxx | 7
+ vcl/unx/source/app/wmadaptor.cxx | 32
+ vcl/unx/source/gdi/dtint.cxx | 6
+ vcl/unx/source/gdi/makefile.mk | 5
+ vcl/unx/source/gdi/ooo4kidsint.cxx | 259 +
+ vcl/unx/source/gdi/salgdi.cxx | 12
+ vcl/unx/source/gdi/salgdi2.cxx | 5
+ vcl/unx/source/window/FWS.cxx | 7
+ vcl/unx/source/window/SugarProperties.cxx | 95
+ vcl/unx/source/window/makefile.mk | 9
+ vcl/unx/source/window/salframe.cxx | 24
+ vcl/win/source/window/salframe.cxx | 2
+ wizards/com/sun/star/wizards/agenda/makefile.mk | 6
+ wizards/com/sun/star/wizards/fax/makefile.mk | 5
+ wizards/com/sun/star/wizards/form/makefile.mk | 5
+ wizards/com/sun/star/wizards/letter/makefile.mk | 5
+ wizards/com/sun/star/wizards/makefile.mk | 5
+ wizards/com/sun/star/wizards/query/makefile.mk | 5
+ wizards/com/sun/star/wizards/report/makefile.mk | 5
+ .../star/wizards/reportbuilder/layout/makefile.mk | 5
+ .../com/sun/star/wizards/reportbuilder/makefile.mk | 5
+ wizards/com/sun/star/wizards/table/makefile.mk | 5
+ wizards/com/sun/star/wizards/web/data/makefile.mk | 5
+ .../com/sun/star/wizards/web/export/makefile.mk | 6
+ wizards/com/sun/star/wizards/web/makefile.mk | 5
+ wizards/util/makefile.mk | 4
+ writerperfect/prj/d.lst | 1
+ xmerge/source/aportisdoc/makefile.mk | 5
+ xmerge/source/bridge/makefile.mk | 6
+ xmerge/source/htmlsoff/makefile.mk | 5
+ xmerge/source/pexcel/makefile.mk | 5
+ xmerge/source/pocketword/makefile.mk | 6
+ xmerge/source/xmerge/makefile.mk | 5
+ xmerge/util/makefile.mk | 6
+ xmlhelp/source/com/sun/star/help/makefile.mk | 4
+ xmloff/source/forms/elementimport.cxx | 6
+ 643 files changed, 36911 insertions(+), 10492 deletions(-)
+ create mode 100644 apple_remote/makefile2.pmk
+ create mode 100644 avmedia/source/gstreamer/ChangeLog
+ create mode 100644 avmedia/source/gstreamer/exports.dxp
+ create mode 100644 avmedia/source/gstreamer/gstcommon.hxx
+ create mode 100644 avmedia/source/gstreamer/gstframegrabber.cxx
+ create mode 100644 avmedia/source/gstreamer/gstframegrabber.hxx
+ create mode 100644 avmedia/source/gstreamer/gstmanager.cxx
+ create mode 100644 avmedia/source/gstreamer/gstmanager.hxx
+ create mode 100644 avmedia/source/gstreamer/gstplayer.cxx
+ create mode 100644 avmedia/source/gstreamer/gstplayer.hxx
+ create mode 100644 avmedia/source/gstreamer/gstuno.cxx
+ create mode 100644 avmedia/source/gstreamer/gstwindow.cxx
+ create mode 100644 avmedia/source/gstreamer/gstwindow.hxx
+ create mode 100644 avmedia/source/gstreamer/makefile.mk
+ create mode 100644 chart2/uiconfig/toolbar/average.xml
+ create mode 100644 chart2/uiconfig/toolbar/beginner.xml
+ create mode 100644 chart2/uiconfig/toolbar/chart2_average.xml
+ create mode 100644 chart2/uiconfig/toolbar/chart2_beginner.xml
+ create mode 100644 dbaccess/source/filter/xml/xmlJavaClassPath.cxx
+ create mode 100644 dbaccess/source/filter/xml/xmlJavaClassPath.hxx
+ create mode 100644 desktop/source/splash/splash_png.cxx
+ create mode 100644 desktop/source/splash/splash_png.hxx
+ create mode 100644 dictionaries/de_CH/VERSION
+ create mode 100644 dictionaries/de_DE/VERSION
+ create mode 100644 dictionaries/zu_ZA/dictionary.lst
+ create mode 100644 filter/source/config/tools/merge/FCFGMerge.cfg
+ create mode 100644 filter/source/config/tools/merge/FCFGMerge.java
+ create mode 100644 filter/source/config/tools/merge/Manifest.mf
+ create mode 100644 filter/source/config/tools/merge/Merger.java
+ create mode 100644 filter/source/config/tools/merge/makefile.mk
+ create mode 100644 filter/source/config/tools/utils/AnalyzeStartupLog.java
+ create mode 100644 filter/source/config/tools/utils/Cache.java
+ create mode 100644 filter/source/config/tools/utils/ConfigHelper.java
+ create mode 100644 filter/source/config/tools/utils/FileHelper.java
+ create mode 100644 filter/source/config/tools/utils/Logger.java
+ create mode 100644 filter/source/config/tools/utils/MalformedCommandLineException.java
+ create mode 100644 filter/source/config/tools/utils/XMLHelper.java
+ create mode 100644 filter/source/config/tools/utils/makefile.mk
+ create mode 100644 fpicker/util/makefile.pmk
+ create mode 100644 framework/source/services/backingwindow-OOo4Kids.cxx
+ delete mode 100755 graphite/graphite-2.3.1.patch.mingw
+ delete mode 100644 hsqldb/patches/i103528.patch
+ delete mode 100644 hsqldb/patches/i104901.patch
+ delete mode 100644 hsqldb/patches/i96823.patch
+ delete mode 100644 hsqldb/patches/i97032.patch
+ create mode 100644 hsqldb/patches/index.txt
+ create mode 100644 instsetoo_native/util/OOo4Kids.lst
+ create mode 100644 instsetoo_native/util/pack-OOo4Kids.lst
+ create mode 100644 libtextcat/libtextcat-2.2-gdium-mips-workaround.patch
+ create mode 100644 packimages/pack/image-OOo4Kids-sort.lst
+ create mode 100644 readlicense_oo/docs/readme/readme_OOo4Kids.xrm
+ create mode 100644 sc/uiconfig/scalc/toolbar/average.xml
+ create mode 100644 sc/uiconfig/scalc/toolbar/beginner.xml
+ create mode 100644 sc/uiconfig/scalc/toolbar/calc_average.xml
+ create mode 100644 sc/uiconfig/scalc/toolbar/calc_beginner.xml
+ create mode 100644 sd/uiconfig/sdraw/accelerator/de/default.xml
+ create mode 100644 sd/uiconfig/sdraw/accelerator/en-GB/default.xml
+ create mode 100644 sd/uiconfig/sdraw/accelerator/en-US/default.xml
+ create mode 100644 sd/uiconfig/sdraw/accelerator/es/default.xml
+ create mode 100644 sd/uiconfig/sdraw/accelerator/fr/default.xml
+ create mode 100644 sd/uiconfig/sdraw/toolbar/average.xml
+ create mode 100644 sd/uiconfig/sdraw/toolbar/beginner.xml
+ create mode 100644 sd/uiconfig/sdraw/toolbar/draw_average.xml
+ create mode 100644 sd/uiconfig/sdraw/toolbar/draw_beginner.xml
+ create mode 100644 sd/uiconfig/simpress/accelerator/de/default.xml
+ create mode 100644 sd/uiconfig/simpress/accelerator/default.xml
+ create mode 100644 sd/uiconfig/simpress/accelerator/es/default.xml
+ create mode 100644 sd/uiconfig/simpress/accelerator/fr/default.xml
+ create mode 100644 sd/uiconfig/simpress/toolbar/average.xml
+ create mode 100644 sd/uiconfig/simpress/toolbar/beginner.xml
+ create mode 100644 sd/uiconfig/simpress/toolbar/impress_average.xml
+ create mode 100644 sd/uiconfig/simpress/toolbar/impress_beginner.xml
+ create mode 100644 sfx2/inc/showlicense.hxx
+ create mode 100644 sfx2/source/dialog/passwd_OOo4Kids.cxx
+ create mode 100644 sfx2/source/dialog/showlicense.cxx
+ create mode 100644 shell/source/unix/sysshell/systemshell.cxx
+ delete mode 100644 slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx
+ delete mode 100644 slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx
+ delete mode 100644 slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx
+ create mode 100644 slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders_MACOSX.h
+ create mode 100644 slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders_MACOSX.m
+ create mode 100644 slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
+ create mode 100644 slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl_MACOSX.mm
+ create mode 100644 slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl_MACOSX.mm
+ create mode 100644 slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.h
+ create mode 100644 slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
+ create mode 100644 slideshow/source/engine/OGLTrans/mac/makefile.mk
+ delete mode 100644 slideshow/source/engine/OGLTrans/makefile.mk
+ create mode 100644 slideshow/source/engine/OGLTrans/unx/OGLTrans_Shaders.hxx
+ create mode 100644 slideshow/source/engine/OGLTrans/unx/OGLTrans_Shaders_LINUX.cxx
+ create mode 100644 slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
+ create mode 100644 slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx
+ create mode 100644 slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl_LINUX.cxx
+ create mode 100644 slideshow/source/engine/OGLTrans/unx/makefile.mk
+ create mode 100644 slideshow/source/engine/OGLTrans/win/OGLTrans_Shaders.hxx
+ create mode 100644 slideshow/source/engine/OGLTrans/win/OGLTrans_Shaders_WNT.cxx
+ create mode 100644 slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx
+ create mode 100644 slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx
+ create mode 100644 slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl_WNT.cxx
+ create mode 100644 slideshow/source/engine/OGLTrans/win/makefile.mk
+ create mode 100644 starmath/source/viewhdl.cxx
+ create mode 100644 starmath/uiconfig/smath/toolbar/average.xml
+ create mode 100644 starmath/uiconfig/smath/toolbar/beginner.xml
+ create mode 100644 starmath/uiconfig/smath/toolbar/math_average.xml
+ create mode 100644 starmath/uiconfig/smath/toolbar/math_beginner.xml
+ create mode 100644 svtools/source/misc1/loginerr.cxx
+ create mode 100644 svx/source/inc/dbcharsethelper.hxx
+ create mode 100644 svx/source/inc/dbtoolsclient.hxx
+ create mode 100644 sw/inc/bookmrk.hxx
+ create mode 100644 sw/inc/fmthbsh.hxx
+ create mode 100644 sw/inc/swenumdef.hxx
+ delete mode 100755 sw/qa/complex/writer/TextPortionEnumerationTest.java
+ create mode 100644 sw/source/core/txtnode/fmtatr1.cxx
+ create mode 100644 sw/source/ui/dialog/SwDialogAssistant.cxx
+ create mode 100644 sw/source/ui/dialog/SwDialogAssistant.src
+ create mode 100644 sw/source/ui/inc/SwAssistantClass.hxx
+ create mode 100644 sw/source/ui/inc/SwDialogAssistant.hrc
+ create mode 100644 sw/source/ui/inc/SwDialogAssistant.hxx
+ create mode 100644 sw/uiconfig/swriter/toolbar/average.xml
+ create mode 100644 sw/uiconfig/swriter/toolbar/beginner.xml
+ create mode 100644 sw/uiconfig/swriter/toolbar/writer_average.xml
+ create mode 100644 sw/uiconfig/swriter/toolbar/writer_beginner.xml
+ create mode 100644 sysui/desktop/debian/OOo4Kids-debian-menus
+ delete mode 100644 sysui/desktop/menus/base.desktop
+ create mode 100644 sysui/desktop/menus/ooo4kids.desktop
+ create mode 100644 sysui/desktop/mimetypes/OOo4Kids.applications
+ create mode 100644 sysui/desktop/mimetypes/OOo4Kids.mime
+ create mode 100644 sysui/desktop/share/OOo4Kids.sh
+ create mode 100644 sysui/desktop/share/misc/MANIFEST
+ create mode 100644 sysui/desktop/share/misc/activity-ooo4kids.svg
+ create mode 100644 sysui/desktop/share/misc/activity.info
+ create mode 100644 sysui/desktop/share/misc/ooo4kidsrc.txt
+ create mode 100644 sysui/desktop/share/misc/setup.py
+ create mode 100644 sysui/desktop/share/misc/sugarOOo4Kids
+ create mode 100644 vcl/unx/inc/ooo4kidsint.hxx
+ create mode 100644 vcl/unx/inc/sugarxproperties.hxx
+ create mode 100644 vcl/unx/source/gdi/ooo4kidsint.cxx
+ create mode 100644 vcl/unx/source/window/SugarProperties.cxx
+
+
+diff --git accessibility/bridge/org/openoffice/accessibility/makefile.mk accessibility/bridge/org/openoffice/accessibility/makefile.mk
+index dc6f848..8ee787c 100755
+--- accessibility/bridge/org/openoffice/accessibility/makefile.mk
++++ accessibility/bridge/org/openoffice/accessibility/makefile.mk
+@@ -35,6 +35,10 @@ TARGET = java_uno_accessbridge
+ PACKAGE = org$/openoffice$/accessibility
+
+ # --- Settings -----------------------------------------------------
++.IF "$(OOo4Kids)"=="YES"
++dummy:
++ @echo "Nothing to build"
++.ENDIF
+
+ .INCLUDE : settings.mk
+
+diff --git accessibility/bridge/org/openoffice/java/accessibility/makefile.mk accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
+index d48817b..cfbb246 100755
+--- accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
++++ accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
+@@ -38,6 +38,11 @@ PACKAGE = org$/openoffice$/java$/accessibility
+
+ .INCLUDE : settings.mk
+
++.IF "$(OOo4Kids)"=="YES"
++dummy:
++ @echo "Nothing to build"
++.ENDIF
++
+ JAVADIR = $(OUT)$/misc$/java
+ JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar
+ JAVAFILES = \
+diff --git accessibility/bridge/source/java/makefile.mk accessibility/bridge/source/java/makefile.mk
+index 7f81f85..db74d0f 100644
+--- accessibility/bridge/source/java/makefile.mk
++++ accessibility/bridge/source/java/makefile.mk
+@@ -43,6 +43,11 @@ VERSIONOBJ=
+
+ # --- Files --------------------------------------------------------
+
++.IF "$(OOo4Kids)"=="YES"
++dummy:
++ @echo "Nothing to build"
++.ENDIF
++
+ .IF "$(GUI)"=="WNT"
+
+ SLOFILES= $(SLO)$/WindowsAccessBridgeAdapter.obj
+diff --git apple_remote/AppleRemote.m apple_remote/AppleRemote.m
+index 25a6771..09f5f5f 100644
+--- apple_remote/AppleRemote.m
++++ apple_remote/AppleRemote.m
+@@ -43,16 +43,25 @@ const char* AppleRemoteDeviceName = "AppleIRController";
+ #define NSAppKitVersionNumber10_4 824
+ #endif
+
++#ifndef NSAppKitVersionNumber10_5
++ #define NSAppKitVersionNumber10_5 949
++#endif
++
+ @implementation AppleRemote
+
+ + (const char*) remoteControlDeviceName {
+ return AppleRemoteDeviceName;
+ }
+
+-- (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping {
+-
++- (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping
++{
+ // TODO : avoid such magics
+- if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
++ if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4)
++ {
++ #ifdef DEBUG
++ NSLog( @"setting 10.4 cookies" );
++ #endif
++
+ // 10.4.x Tiger
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"14_12_11_6_"];
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"14_13_11_6_"];
+@@ -65,7 +74,12 @@ const char* AppleRemoteDeviceName = "AppleIRController";
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"14_6_14_6_"];
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"18_14_6_18_14_6_"];
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
+- } else {
++ }
++ else if( floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_5 )
++ {
++ #ifdef DEBUG
++ NSLog( @"setting 10.5 cookies" );
++ #endif
+ // 10.5.x Leopard
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"31_29_28_19_18_"];
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"31_30_28_19_18_"];
+@@ -79,9 +93,30 @@ const char* AppleRemoteDeviceName = "AppleIRController";
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"35_31_19_18_35_31_19_18_"];
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
+ }
++ else
++ {
++ #ifdef DEBUG
++ NSLog( @"setting 10.6 cookies" );
++ #endif
++ // 10.6.x Snow Leopard
++ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"33_31_30_21_20_2_"];
++ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"33_32_30_21_20_2_"];
++ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu] forKey:@"33_22_21_20_2_33_22_21_20_2_"];
++ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay] forKey:@"33_23_21_20_2_33_23_21_20_2_"];
++ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight] forKey:@"33_24_21_20_2_33_24_21_20_2_"];
++ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft] forKey:@"33_25_21_20_2_33_25_21_20_2_"];
++ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold] forKey:@"33_21_20_14_12_2_"];
++ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold] forKey:@"33_21_20_13_12_2_"];
++ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"33_21_20_2_33_21_20_2_"];
++ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"37_33_21_20_2_37_33_21_20_2_"];
++ [cookieToButtonMapping setObject:[NSNumber numberWithInt:kMetallicRemote2009ButtonPlay] forKey:@"33_21_20_8_2_33_21_20_8_2_"];
++ [cookieToButtonMapping setObject:[NSNumber numberWithInt:kMetallicRemote2009ButtonMiddlePlay] forKey:@"33_21_20_3_2_33_21_20_3_2_"];
++ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
++ }
+ }
+
+-- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {
++- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown
++{
+ if (pressedDown == NO && event == kRemoteButtonMenu_Hold) {
+ // There is no seperate event for pressed down on menu hold. We are simulating that event here
+ [super sendRemoteButtonEvent:event pressedDown:YES];
+diff --git apple_remote/HIDRemoteControlDevice.m apple_remote/HIDRemoteControlDevice.m
+index 9421590..93f34be 100644
+--- apple_remote/HIDRemoteControlDevice.m
++++ apple_remote/HIDRemoteControlDevice.m
+@@ -281,7 +281,17 @@ cleanup:
+
+ NSNumber* buttonId = [[self cookieToButtonMapping] objectForKey: cookieString];
+ if (buttonId != nil) {
++ switch ( (int)buttonId )
++ {
++ case kMetallicRemote2009ButtonPlay:
++ case kMetallicRemote2009ButtonMiddlePlay:
++ buttonId = [NSNumber numberWithInt:kRemoteButtonPlay];
++ break;
++ default:
++ break;
++ }
+ [self sendRemoteButtonEvent: [buttonId intValue] pressedDown: (sumOfValues>0)];
++
+ } else {
+ // let's see if a number of events are stored in the cookie string. this does
+ // happen when the main thread is too busy to handle all incoming events in time.
+diff --git apple_remote/MultiClickRemoteBehavior.m apple_remote/MultiClickRemoteBehavior.m
+index 03b2497..070aefa 100644
+--- apple_remote/MultiClickRemoteBehavior.m
++++ apple_remote/MultiClickRemoteBehavior.m
+@@ -75,7 +75,7 @@ const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL = 0.4;
+ }
+ - (void) setClickCountingEnabled: (BOOL) value {
+ if (value) {
+- [self setClickCountEnabledButtons: kRemoteButtonPlus | kRemoteButtonMinus | kRemoteButtonPlay | kRemoteButtonLeft | kRemoteButtonRight | kRemoteButtonMenu];
++ [self setClickCountEnabledButtons: kRemoteButtonPlus | kRemoteButtonMinus | kRemoteButtonPlay | kRemoteButtonLeft | kRemoteButtonRight | kRemoteButtonMenu | kMetallicRemote2009ButtonPlay | kMetallicRemote2009ButtonMiddlePlay];
+ } else {
+ [self setClickCountEnabledButtons: 0];
+ }
+diff --git apple_remote/RemoteMainController.m apple_remote/RemoteMainController.m
+index 5b3b893..4f1db29 100644
+--- apple_remote/RemoteMainController.m
++++ apple_remote/RemoteMainController.m
+@@ -63,15 +63,6 @@
+ #endif
+ }
+
+- if ( [container instantiateAndAddRemoteControlDeviceWithClass: [KeyspanFrontRowControl class]] != 0 ) {
+-#ifdef DEBUG
+- NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [KeyspanFrontRowControl class]] successfull");
+- }
+- else {
+- NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [KeyspanFrontRowControl class]] failed");
+-#endif
+- }
+-
+ if ( [container instantiateAndAddRemoteControlDeviceWithClass: [GlobalKeyboardDevice class]] != 0 ) {
+ #ifdef DEBUG
+ NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [GlobalKeyboardDevice class]] successfull");
+diff --git apple_remote/inc/RemoteControl.h apple_remote/inc/RemoteControl.h
+index c736775..d3f1616 100644
+--- apple_remote/inc/RemoteControl.h
++++ apple_remote/inc/RemoteControl.h
+@@ -65,6 +65,11 @@ typedef enum _RemoteControlEventIdentifier {
+
+ // special events (not supported by all devices)
+ kRemoteControl_Switched =1<<13,
++
++ // New values for the "metallic" Remote (2009 model)
++ kMetallicRemote2009ButtonPlay =1<<14,
++ kMetallicRemote2009ButtonMiddlePlay =1<<15
++
+ } RemoteControlEventIdentifier;
+
+ @interface NSObject(RemoteControlDelegate)
+diff --git apple_remote/makefile2.pmk apple_remote/makefile2.pmk
+new file mode 100644
+index 0000000..cc06558
+--- /dev/null
++++ apple_remote/makefile2.pmk
+@@ -0,0 +1,35 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: makefile2.pmk,v $
++#
++# $Revision: 1.1 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org. If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++.IF "$(GUIBASE)"=="aqua"
++OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions
++CFLAGSCXX+=$(OBJCXXFLAGS)
++.ENDIF # "$(GUIBASE)"=="aqua"
+diff --git automation/packimages/makefile.mk automation/packimages/makefile.mk
+index 1c497b2..3807d37 100644
+--- automation/packimages/makefile.mk
++++ automation/packimages/makefile.mk
+@@ -41,6 +41,11 @@ RSCCUSTOMIMG*=$(PRJNAME)$/util
+ # to a "find" that looks for "*.png"
+ RSCCUSTOMIMG*=$(PRJNAME)$/util
+
++.IF "$(OOo4Kids)"=="YES"
++dummy:
++ @echo "Nothing to build"
++.ENDIF
++
+ .INCLUDE: settings.mk
+
+ .INCLUDE: target.mk
+diff --git automation/source/app/makefile.mk automation/source/app/makefile.mk
+index ab1de73..35ac2ba 100644
+--- automation/source/app/makefile.mk
++++ automation/source/app/makefile.mk
+@@ -38,6 +38,11 @@ TARGET=app
+
+ .INCLUDE : settings.mk
+
++.IF "$(OOo4Kids)"=="YES"
++dummy:
++ @echo "Nothing to build."
++.ENDIF
++
+ # --- Allgemein ------------------------------------------------------------
+
+ CXXFILES = \
+diff --git automation/source/communi/makefile.mk automation/source/communi/makefile.mk
+index 6c3a576..31f5ecd 100644
+--- automation/source/communi/makefile.mk
++++ automation/source/communi/makefile.mk
+@@ -38,6 +38,11 @@ TARGET=communi
+
+ .INCLUDE : settings.mk
+
++.IF "$(OOo4Kids)"=="YES"
++dummy:
++ @echo "Nothing to build."
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+
+ SLOFILES= \
+diff --git automation/source/miniapp/makefile.mk automation/source/miniapp/makefile.mk
+index 4ab23d9..318f9ca 100644
+--- automation/source/miniapp/makefile.mk
++++ automation/source/miniapp/makefile.mk
+@@ -38,6 +38,11 @@ TARGET=miniapp
+
+ .INCLUDE : settings.mk
+
++.IF "$(OOo4Kids)"=="YES"
++dummy:
++ @echo "Nothing to build."
++.ENDIF
++
+ # --- Allgemein ------------------------------------------------------------
+
+ OBJFILES = \
+diff --git automation/source/mozillaserver/makefile.mk automation/source/mozillaserver/makefile.mk
+index 761f09d..cd9c37d 100644
+--- automation/source/mozillaserver/makefile.mk
++++ automation/source/mozillaserver/makefile.mk
+@@ -42,6 +42,11 @@ LIBTARGET=NO
+
+ .INCLUDE : settings.mk
+
++.IF "$(OOo4Kids)"=="YES"
++dummy:
++ @echo "Nothing to build"
++.ENDIF
++
+ # ------------------------------------------------------------------
+
+ PACKAGE := com$/sun$/star$/testtool
+diff --git automation/source/server/makefile.mk automation/source/server/makefile.mk
+index 5f0ada2..4ccd5ce 100644
+--- automation/source/server/makefile.mk
++++ automation/source/server/makefile.mk
+@@ -37,6 +37,13 @@ TARGET=server
+
+ .INCLUDE : settings.mk
+
++.IF "$(OOo4Kids)" == "YES"
++
++dummy:
++ @echo "Nothing to build."
++
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+
+ SLOFILES = \
+diff --git automation/source/simplecm/makefile.mk automation/source/simplecm/makefile.mk
+index ab2e70e..0d94c80 100644
+--- automation/source/simplecm/makefile.mk
++++ automation/source/simplecm/makefile.mk
+@@ -38,6 +38,11 @@ TARGET=simplecm
+
+ .INCLUDE : settings.mk
+
++.IF "$(OOo4Kids)"=="YES"
++dummy:
++ @echo "Nothing to build"
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+
+ SLOFILES= \
+diff --git automation/source/testtool/makefile.mk automation/source/testtool/makefile.mk
+index 79a811f..c7d801f 100644
+--- automation/source/testtool/makefile.mk
++++ automation/source/testtool/makefile.mk
+@@ -38,6 +38,11 @@ TARGET=testtool
+
+ .INCLUDE : settings.mk
+
++.IF "$(OOo4Kids)"=="YES"
++dummy:
++ @echo "Nothing to build"
++.ENDIF
++
+ # --- Allgemein ------------------------------------------------------------
+
+ OBJFILES = \
+diff --git automation/util/makefile.mk automation/util/makefile.mk
+index 8d68000..268ae26 100644
+--- automation/util/makefile.mk
++++ automation/util/makefile.mk
+@@ -39,6 +39,11 @@ TARGETTYPE=GUI
+
+ .INCLUDE : settings.mk
+
++.IF "$(OOo4Kids)"=="YES"
++all:
++ @echo "Nothing to build"
++.ENDIF
++
+ # --- Allgemein ---------------------------------------------------
+
+ LIB1TARGET=$(SLB)$/$(TARGET).lib
+diff --git avmedia/prj/build.lst avmedia/prj/build.lst
+index 1ef04ca..9e3f9ea 100644
+--- avmedia/prj/build.lst
++++ avmedia/prj/build.lst
+@@ -8,4 +8,5 @@ av avmedia\source\win nmake - all av_win NULL
+ av avmedia\source\java nmake - all av_java NULL
+ av avmedia\source\xine nmake - all av_xine NULL
+ av avmedia\source\quicktime nmake - all av_quicktime NULL
+-av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_quicktime av_xine NULL
++av avmedia\source\gstreamer nmake - all av_gstreamer NULL
++av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_quicktime av_xine av_gstreamer NULL
+diff --git avmedia/source/gstreamer/ChangeLog avmedia/source/gstreamer/ChangeLog
+new file mode 100644
+index 0000000..beef4f0
+--- /dev/null
++++ avmedia/source/gstreamer/ChangeLog
+@@ -0,0 +1,112 @@
++2006-09-22 Radek Doulik <rodo at novell.com>
++
++ * gstplayer.cxx (processSyncMessage): remember GstXOverlay
++ (processMessage): explicit expose when we reach paused state -
++ this mean that now once stream is loaded/video inserted, the 1st
++ frame is rendered
++ (setMediaTime): if not playing set PAUSED state again, seems like
++ seek is changing state to PLAYING. this fixes problem when stop
++ seeked to begin and started playing again
++
++2006-09-21 Radek Doulik <rodo at novell.com>
++
++ * gstplayer.cxx (processSyncMessage): when error occurs, set the
++ condition so that OOo does'n waste time waiting for us to finish
++ reaching PAUSED state
++
++2006-09-19 Radek Doulik <rodo at novell.com>
++
++ * gstplayer.cxx (processSyncMessage): set condition even if we
++ weren't able to get video size - might be audio only stream
++ (getPreferredPlayerWindowSize): init size to 0, 0 - in case we
++ don't have video size, it will fallback to system media window
++ content (some icon)
++
++2006-08-31 Radek Doulik <rodo at novell.com>
++
++ * gstplayer.cxx (processSyncMessage): when we get to paused state,
++ get stream-info from playbin and look for video size. set
++ condition when done
++ (Player): added width, height, size condition
++ (preparePlaybin): new helper method, extracted from create
++ method. use fake video sink in the beggining so that we don't get
++ xwindow-id message too early
++ (getPreferredPlayerWindowSize): wait for size condition to be sure
++ we know video size (if possible). reset video sink to default one
++ (NULL) and set state to READY and immediatelly to PAUSE so that
++ the default sink is relinked
++
++2006-08-16 Radek Doulik <rodo at novell.com>
++
++ * gstplayer.cxx (create): set state to PAUSED so that we can query
++ duration ASAP
++ (processMessage): watch for state changed and query duration when
++ going to PAUSED state
++
++2006-08-15 Radek Doulik <rodo at novell.com>
++
++ * makefile.mk: require gstreamer-plugins-base-0.10 and link with
++ gst interfaces library
++
++ * gstwindow.cxx: make it build
++
++ * gstplayer.cxx: removed WINNT ifdefs (relict from time when I
++ thought Cedric develops on win architecture)
++ (gst_pipeline_bus_callback): added sync handler for setting
++ xwindow id to to video sink
++ (processSyncMessage): new metrhod, process message from sync
++ handler
++ (create): set playbin state to READY so that playback start is
++ faster
++ (createPlayerWindow): implemented, we pass xwindow id in 3rd
++ argument
++
++2006-08-04 Radek Doulik <rodo at novell.com>
++
++ * gstplayer.cxx (create): add bus watch, watch for EOS in
++ processMessage method (called from watch callback)
++
++2006-08-02 Radek Doulik <rodo at novell.com>
++
++ * gstplayer.cxx: test for mpPlaybin != NULL before using it,
++ initialize it in constructor to NULL and also reset it to NULL
++ after unrefing
++ (getDuration): check for sucessful query and the right format
++ (getMediaTime): ditto,
++ (setMediaTime): implemented
++
++2006-08-01 Radek Doulik <rodo at novell.com>
++
++ * gstwindow.hxx: removed mpWndClass for now, so that the rest
++ compiles
++
++ * gstuno.cxx (component_getFactory): s/DirectX/GStreamer so that
++ component is loaded
++
++ * gstplayer.cxx (Player::Player): do not create gerror object, it
++ is noit needed, free the error object only if created during
++ initialization of gstremer
++ (Player::create, start, stop): use g_main_loop only on windows
++ (create): fixed ascURL declaration, added rtl namespace prefix
++ (setMute): set mbMuted
++ (setVolumeDB): convert avmedia volume to gstreamer volume, added
++ missing NULL to the end of g_object_set call
++ (getVolumeDB): convert gstreamer volume back to avmedia volume
++
++ * gstplayer.hxx: keep g_main_loop only on win platform. make
++ mnUnmutedVolume double, moved mbInitialized to the end to quiet
++ compiler warning
++
++ * gstcommon.hxx: removed wrong #include <rtl/ustring>
++
++ * renamed source files, prefixed the names with gst so that obj
++ file names do not clash with xine object files
++
++ * makefile.mk: changed PRJNAME and TARGET to reflect
++ gstreamer. enabled build on unix as well. removed win library
++ references. removed source files which are not yet ported from
++ SLOFILES list.
++
++2006-08-31 Radek Doulik <rodo at novell.com>
++
++ * imported initial sources from Cedric Bosdonnat
+\ No newline at end of file
+diff --git avmedia/source/gstreamer/exports.dxp avmedia/source/gstreamer/exports.dxp
+new file mode 100644
+index 0000000..db9c0a5
+--- /dev/null
++++ avmedia/source/gstreamer/exports.dxp
+@@ -0,0 +1,4 @@
++component_getImplementationEnvironment
++component_writeInfo
++component_getFactory
++
+diff --git avmedia/source/gstreamer/gstcommon.hxx avmedia/source/gstreamer/gstcommon.hxx
+new file mode 100644
+index 0000000..54df6e8
+--- /dev/null
++++ avmedia/source/gstreamer/gstcommon.hxx
+@@ -0,0 +1,83 @@
++/*************************************************************************
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ *
++ * $Revision$
++ *
++ * last change: $Author$ $Date$
++ *
++ * The Contents of this file are made available subject to
++ * the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ * GNU Lesser General Public License Version 2.1
++ * =============================================
++ * Copyright 2005 by Sun Microsystems, Inc.
++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ ************************************************************************/
++
++#ifndef _GSTCOMMON_HXX
++#define _GSTCOMMON_HXX
++
++#include <gst/gst.h>
++
++#ifndef _OSL_MUTEX_HXX_
++#include <osl/mutex.hxx>
++#endif
++#ifndef _DEBUG_HXX
++#include <tools/debug.hxx>
++#endif
++#ifndef _STREAM_HXX
++#include <tools/stream.hxx>
++#endif
++#ifndef _STRING_HXX
++#include <tools/string.hxx>
++#endif
++#ifndef _URLOBJ_HXX
++#include <tools/urlobj.hxx>
++#endif
++#ifndef _CPPUHELPER_IMPLBASE1_HXX_
++#include <cppuhelper/implbase1.hxx>
++#endif
++#ifndef _CPPUHELPER_IMPLBASE2_HXX_
++#include <cppuhelper/implbase2.hxx>
++#endif
++#ifndef _CPPUHELPER_WEAK_HXX_
++#include <cppuhelper/weak.hxx>
++#endif
++#ifndef _CPPUHELPER_FACTORY_HXX_
++#include <cppuhelper/factory.hxx>
++#endif
++
++#include <com/sun/star/uno/Reference.h>
++#include <com/sun/star/uno/RuntimeException.hpp>
++#include <com/sun/star/lang/XMultiServiceFactory.hpp>
++#include <com/sun/star/lang/XComponent.hpp>
++#include <com/sun/star/registry/XRegistryKey.hpp>
++#include <com/sun/star/lang/XComponent.hpp>
++#include <com/sun/star/lang/XServiceInfo.hpp>
++#include <com/sun/star/awt/Rectangle.hpp>
++#include <com/sun/star/awt/KeyModifier.hpp>
++#include <com/sun/star/awt/MouseButton.hpp>
++#include <com/sun/star/media/XManager.hpp>
++
++#define WM_GRAPHNOTIFY (WM_USER + 567)
++
++#endif // _GSTCOMMOM_HXX
+diff --git avmedia/source/gstreamer/gstframegrabber.cxx avmedia/source/gstreamer/gstframegrabber.cxx
+new file mode 100644
+index 0000000..bbe0062
+--- /dev/null
++++ avmedia/source/gstreamer/gstframegrabber.cxx
+@@ -0,0 +1,244 @@
++/*************************************************************************
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ *
++ * $Revision$
++ *
++ * last change: $Author$ $Date$
++ *
++ * The Contents of this file are made available subject to
++ * the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ * GNU Lesser General Public License Version 2.1
++ * =============================================
++ * Copyright 2005 by Sun Microsystems, Inc.
++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ ************************************************************************/
++
++#include <tools/prewin.h>
++#include <windows.h>
++#include <objbase.h>
++#include <strmif.h>
++#include <Amvideo.h>
++#include <Qedit.h>
++#include <uuids.h>
++#include <tools/postwin.h>
++
++#include "framegrabber.hxx"
++#include "player.hxx"
++
++#include <tools/stream.hxx>
++#include <vcl/graph.hxx>
++#include <unotools/localfilehelper.hxx>
++
++#define AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.FrameGrabber_GStreamer"
++#define AVMEDIA_GST_FRAMEGRABBER_SERVICENAME "com.sun.star.media.FrameGrabber_GStreamer"
++
++using namespace ::com::sun::star;
++
++namespace avmedia { namespace gstreamer {
++
++// ----------------
++// - FrameGrabber -
++// ----------------
++
++FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
++ mxMgr( rxMgr )
++{
++ ::CoInitialize( NULL );
++}
++
++// ------------------------------------------------------------------------------
++
++FrameGrabber::~FrameGrabber()
++{
++ ::CoUninitialize();
++}
++
++// ------------------------------------------------------------------------------
++
++IMediaDet* FrameGrabber::implCreateMediaDet( const ::rtl::OUString& rURL ) const
++{
++ IMediaDet* pDet = NULL;
++
++ if( SUCCEEDED( CoCreateInstance( CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, IID_IMediaDet, (void**) &pDet ) ) )
++ {
++ String aLocalStr;
++
++ if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( rURL, aLocalStr ) && aLocalStr.Len() )
++ {
++ if( !SUCCEEDED( pDet->put_Filename( ::SysAllocString( aLocalStr.GetBuffer() ) ) ) )
++ {
++ pDet->Release();
++ pDet = NULL;
++ }
++ }
++ }
++
++ return pDet;
++}
++
++// ------------------------------------------------------------------------------
++
++bool FrameGrabber::create( const ::rtl::OUString& rURL )
++{
++ // just check if a MediaDet interface can be created with the given URL
++ IMediaDet* pDet = implCreateMediaDet( rURL );
++
++ if( pDet )
++ {
++ maURL = rURL;
++ pDet->Release();
++ pDet = NULL;
++ }
++ else
++ maURL = ::rtl::OUString();
++
++ return( maURL.getLength() > 0 );
++}
++
++// ------------------------------------------------------------------------------
++
++uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
++ throw (uno::RuntimeException)
++{
++ uno::Reference< graphic::XGraphic > xRet;
++ IMediaDet* pDet = implCreateMediaDet( maURL );
++
++ if( pDet )
++ {
++ double fLength;
++ long nStreamCount;
++ bool bFound = false;
++
++ if( SUCCEEDED( pDet->get_OutputStreams( &nStreamCount ) ) )
++ {
++ for( long n = 0; ( n < nStreamCount ) && !bFound; ++n )
++ {
++ GUID aMajorType;
++
++ if( SUCCEEDED( pDet->put_CurrentStream( n ) ) &&
++ SUCCEEDED( pDet->get_StreamType( &aMajorType ) ) &&
++ ( aMajorType == MEDIATYPE_Video ) )
++ {
++ bFound = true;
++ }
++ }
++ }
++
++ if( bFound &&
++ ( S_OK == pDet->get_StreamLength( &fLength ) ) &&
++ ( fLength > 0.0 ) && ( fMediaTime >= 0.0 ) && ( fMediaTime <= fLength ) )
++ {
++ AM_MEDIA_TYPE aMediaType;
++ long nWidth = 0, nHeight = 0, nSize = 0;
++
++ if( SUCCEEDED( pDet->get_StreamMediaType( &aMediaType ) ) )
++ {
++ if( ( aMediaType.formattype == FORMAT_VideoInfo ) &&
++ ( aMediaType.cbFormat >= sizeof( VIDEOINFOHEADER ) ) )
++ {
++ VIDEOINFOHEADER* pVih = reinterpret_cast< VIDEOINFOHEADER* >( aMediaType.pbFormat );
++
++ nWidth = pVih->bmiHeader.biWidth;
++ nHeight = pVih->bmiHeader.biHeight;
++
++ if( nHeight < 0 )
++ nHeight *= -1;
++ }
++
++ if( aMediaType.cbFormat != 0 )
++ {
++ ::CoTaskMemFree( (PVOID) aMediaType.pbFormat );
++ aMediaType.cbFormat = 0;
++ aMediaType.pbFormat = NULL;
++ }
++
++ if( aMediaType.pUnk != NULL )
++ {
++ aMediaType.pUnk->Release();
++ aMediaType.pUnk = NULL;
++ }
++ }
++
++ if( ( nWidth > 0 ) && ( nHeight > 0 ) &&
++ SUCCEEDED( pDet->GetBitmapBits( 0, &nSize, NULL, nWidth, nHeight ) ) &&
++ ( nSize > 0 ) )
++ {
++ char* pBuffer = new char[ nSize ];
++
++ try
++ {
++ if( SUCCEEDED( pDet->GetBitmapBits( fMediaTime, NULL, pBuffer, nWidth, nHeight ) ) )
++ {
++ SvMemoryStream aMemStm( pBuffer, nSize, STREAM_READ | STREAM_WRITE );
++ Bitmap aBmp;
++
++ if( aBmp.Read( aMemStm, false ) && !aBmp.IsEmpty() )
++ {
++ const Graphic aGraphic( aBmp );
++ xRet = aGraphic.GetXGraphic();
++ }
++ }
++ }
++ catch( ... )
++ {
++ }
++
++ delete [] pBuffer;
++ }
++ }
++
++ pDet->Release();
++ }
++
++ return xRet;
++}
++
++// ------------------------------------------------------------------------------
++
++::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( )
++ throw (uno::RuntimeException)
++{
++ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME ) );
++}
++
++// ------------------------------------------------------------------------------
++
++sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
++ throw (uno::RuntimeException)
++{
++ return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_GST_FRAMEGRABBER_SERVICENAME ) );
++}
++
++// ------------------------------------------------------------------------------
++
++uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
++ throw (uno::RuntimeException)
++{
++ uno::Sequence< ::rtl::OUString > aRet(1);
++ aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_GST_FRAMEGRABBER_SERVICENAME ) );
++
++ return aRet;
++}
++
++} // namespace gstreamer
++} // namespace avmedia
+diff --git avmedia/source/gstreamer/gstframegrabber.hxx avmedia/source/gstreamer/gstframegrabber.hxx
+new file mode 100644
+index 0000000..30e431f
+--- /dev/null
++++ avmedia/source/gstreamer/gstframegrabber.hxx
+@@ -0,0 +1,78 @@
++/*************************************************************************
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ *
++ * $Revision$
++ *
++ * last change: $Author$ $Date$
++ *
++ * The Contents of this file are made available subject to
++ * the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ * GNU Lesser General Public License Version 2.1
++ * =============================================
++ * Copyright 2005 by Sun Microsystems, Inc.
++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ ************************************************************************/
++
++#ifndef _FRAMEGRABBER_HXX
++#define _FRAMEGRABBER_HXX
++
++#include "gstcommon.hxx"
++
++#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_
++#include "com/sun/star/media/XFrameGrabber.hdl"
++#endif
++
++namespace avmedia { namespace gstreamer {
++
++// ----------------
++// - FrameGrabber -
++// ----------------
++
++class FrameGrabber : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XFrameGrabber,
++ ::com::sun::star::lang::XServiceInfo >
++{
++public:
++
++ FrameGrabber( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
++ ~FrameGrabber();
++
++ bool create( const ::rtl::OUString& rURL );
++
++ // XFrameGrabber
++ virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException);
++
++ // XServiceInfo
++ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
++ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
++ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
++
++private:
++
++ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
++ ::rtl::OUString maURL;
++};
++
++} // namespace gstreamer
++} // namespace avmedia
++
++#endif // _FRAMEGRABBER_HXX
+diff --git avmedia/source/gstreamer/gstmanager.cxx avmedia/source/gstreamer/gstmanager.cxx
+new file mode 100644
+index 0000000..5b6cb15
+--- /dev/null
++++ avmedia/source/gstreamer/gstmanager.cxx
+@@ -0,0 +1,114 @@
++/*************************************************************************
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ *
++ * $Revision$
++ *
++ * last change: $Author$ $Date$
++ *
++ * The Contents of this file are made available subject to
++ * the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ * GNU Lesser General Public License Version 2.1
++ * =============================================
++ * Copyright 2005 by Sun Microsystems, Inc.
++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ ************************************************************************/
++
++#include "gstmanager.hxx"
++#include "gstplayer.hxx"
++
++#include <tools/urlobj.hxx>
++
++#define AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Manager_GStreamer"
++#define AVMEDIA_GST_MANAGER_SERVICENAME "com.sun.star.media.Manager"
++
++#if DEBUG
++#define DBG OSL_TRACE
++#else
++#define DBG(...)
++#endif
++
++using namespace ::com::sun::star;
++
++namespace avmedia { namespace gstreamer {
++// ----------------
++// - Manager -
++// ----------------
++
++Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
++ mxMgr( rxMgr )
++{
++ DBG( "avmediagst: Manager::Manager" );
++}
++
++// ------------------------------------------------------------------------------
++
++Manager::~Manager()
++{
++}
++
++// ------------------------------------------------------------------------------
++
++uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
++ throw (uno::RuntimeException)
++{
++ Player* pPlayer( new Player( mxMgr ) );
++ uno::Reference< media::XPlayer > xRet( pPlayer );
++ const INetURLObject aURL( rURL );
++
++ DBG( "avmediagst: Manager::createPlayer" );
++
++ if( !pPlayer->create( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) )
++ xRet = uno::Reference< media::XPlayer >();
++
++ return xRet;
++}
++
++// ------------------------------------------------------------------------------
++
++::rtl::OUString SAL_CALL Manager::getImplementationName( )
++ throw (uno::RuntimeException)
++{
++ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME ) );
++}
++
++// ------------------------------------------------------------------------------
++
++sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
++ throw (uno::RuntimeException)
++{
++ return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_GST_MANAGER_SERVICENAME ) );
++}
++
++// ------------------------------------------------------------------------------
++
++uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
++ throw (uno::RuntimeException)
++{
++ uno::Sequence< ::rtl::OUString > aRet(1);
++ aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_GST_MANAGER_SERVICENAME ) );
++
++ return aRet;
++}
++
++} // namespace gstreamer
++} // namespace avmedia
+diff --git avmedia/source/gstreamer/gstmanager.hxx avmedia/source/gstreamer/gstmanager.hxx
+new file mode 100644
+index 0000000..8ed38bb
+--- /dev/null
++++ avmedia/source/gstreamer/gstmanager.hxx
+@@ -0,0 +1,74 @@
++/*************************************************************************
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ *
++ * $Revision$
++ *
++ * last change: $Author$ $Date$
++ *
++ * The Contents of this file are made available subject to
++ * the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ * GNU Lesser General Public License Version 2.1
++ * =============================================
++ * Copyright 2005 by Sun Microsystems, Inc.
++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ ************************************************************************/
++
++#ifndef _MANAGER_HXX
++#define _MANAGER_HXX
++
++#include "gstcommon.hxx"
++
++#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
++#include "com/sun/star/media/XManager.hdl"
++#endif
++
++// -----------
++// - Manager -
++// -----------
++
++namespace avmedia { namespace gstreamer {
++
++class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManager,
++ ::com::sun::star::lang::XServiceInfo >
++{
++public:
++
++ Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
++ ~Manager();
++
++ // XManager
++ virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) throw (::com::sun::star::uno::RuntimeException);
++
++ // XServiceInfo
++ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
++ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
++ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
++private:
++
++ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
++};
++
++} // namespace gstreamer
++} // namespace avmedia
++
++#endif // _MANAGER_HXX
+diff --git avmedia/source/gstreamer/gstplayer.cxx avmedia/source/gstreamer/gstplayer.cxx
+new file mode 100644
+index 0000000..f1a53e7
+--- /dev/null
++++ avmedia/source/gstreamer/gstplayer.cxx
+@@ -0,0 +1,639 @@
++/*************************************************************************
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ *
++ * $Revision$
++ *
++ * last change: $Author$ $Date$
++ *
++ * The Contents of this file are made available subject to
++ * the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ * GNU Lesser General Public License Version 2.1
++ * =============================================
++ * Copyright 2005 by Sun Microsystems, Inc.
++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ ************************************************************************/
++
++#include <math.h>
++
++#ifndef __RTL_USTRING_
++#include <rtl/string.hxx>
++#endif
++
++#include "gstplayer.hxx"
++#include "gstframegrabber.hxx"
++#include "gstwindow.hxx"
++
++#include <gst/interfaces/xoverlay.h>
++
++#define AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Player_GStreamer"
++#define AVMEDIA_GST_PLAYER_SERVICENAME "com.sun.star.media.Player_GStreamer"
++
++#if DEBUG
++#define DBG OSL_TRACE
++#else
++#define DBG(...)
++#endif
++
++using namespace ::com::sun::star;
++
++namespace avmedia { namespace gstreamer {
++
++// ----------------
++// - Player -
++// ----------------
++
++Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
++ mxMgr( rxMgr ),
++ mpPlaybin( NULL ),
++ mbFakeVideo (sal_False ),
++ mnUnmutedVolume( 0 ),
++ mbPlayPending ( false ),
++ mbMuted( false ),
++ mbLooping( false ),
++ mbInitialized( false ),
++ mnWindowID( 0 ),
++ mpXOverlay( NULL ),
++ mnDuration( 0 ),
++ mnWidth( 0 ),
++ mnHeight( 0 ),
++ maSizeCondition( osl_createCondition() )
++{
++ // Initialize GStreamer library
++ int argc = 1;
++ char *arguments[] = { "openoffice.org" };
++ char** argv = arguments;
++ GError* pError = NULL;
++
++ mbInitialized = gst_init_check( &argc, &argv, &pError );
++
++ if (pError != NULL)
++ // TODO: thow an exception?
++ g_error_free (pError);
++}
++
++// ------------------------------------------------------------------------------
++
++Player::~Player()
++{
++ // Release the elements and pipeline
++ if( mbInitialized )
++ {
++ if( mpPlaybin )
++ {
++ gst_element_set_state( mpPlaybin, GST_STATE_NULL );
++ gst_object_unref( GST_OBJECT( mpPlaybin ) );
++
++ mpPlaybin = NULL;
++ }
++
++ if( mpXOverlay ) {
++ g_object_unref( G_OBJECT ( mpXOverlay ) );
++ mpXOverlay = NULL;
++ }
++ }
++}
++
++// ------------------------------------------------------------------------------
++
++static gboolean gst_pipeline_bus_callback( GstBus *, GstMessage *message, gpointer data )
++{
++ Player* pPlayer = (Player *) data;
++
++ pPlayer->processMessage( message );
++
++ return TRUE;
++}
++
++static GstBusSyncReply gst_pipeline_bus_sync_handler( GstBus *, GstMessage * message, gpointer data )
++{
++ Player* pPlayer = (Player *) data;
++
++ return pPlayer->processSyncMessage( message );
++}
++
++void Player::processMessage( GstMessage *message )
++{
++ //DBG ( "gst message received: src name: %s structure type: %s",
++ // gst_object_get_name (message->src),
++ // message->structure ? gst_structure_get_name (message->structure) : "<none>");
++
++ switch( GST_MESSAGE_TYPE( message ) ) {
++ case GST_MESSAGE_EOS:
++ //DBG( "EOS, reset state to NULL" );
++ gst_element_set_state( mpPlaybin, GST_STATE_READY );
++ mbPlayPending = false;
++ if (mbLooping)
++ start();
++ break;
++ case GST_MESSAGE_STATE_CHANGED:
++ if( message->src == GST_OBJECT( mpPlaybin ) ) {
++ GstState newstate, pendingstate;
++
++ gst_message_parse_state_changed (message, NULL, &newstate, &pendingstate);
++
++ if( newstate == GST_STATE_PAUSED &&
++ pendingstate == GST_STATE_VOID_PENDING &&
++ mpXOverlay )
++ gst_x_overlay_expose( mpXOverlay );
++
++ if (mbPlayPending)
++ mbPlayPending = ((newstate == GST_STATE_READY) || (newstate == GST_STATE_PAUSED));
++ }
++ default:
++ break;
++ }
++}
++
++GstBusSyncReply Player::processSyncMessage( GstMessage *message )
++{
++ DBG( "%p processSyncMessage", this );
++ //DBG ( "gst message received: src name: %s structure type: %s",
++ // gst_object_get_name (message->src),
++ // message->structure ? gst_structure_get_name (message->structure) : "<none>");
++
++ if (message->structure) {
++ if( !strcmp( gst_structure_get_name( message->structure ), "prepare-xwindow-id" ) && mnWindowID != 0 ) {
++ if( mpXOverlay )
++ g_object_unref( G_OBJECT ( mpXOverlay ) );
++ mpXOverlay = GST_X_OVERLAY( GST_MESSAGE_SRC( message ) );
++ g_object_ref( G_OBJECT ( mpXOverlay ) );
++ gst_x_overlay_set_xwindow_id( mpXOverlay, mnWindowID );
++ return GST_BUS_DROP;
++ }
++ }
++
++ if( GST_MESSAGE_TYPE( message ) == GST_MESSAGE_STATE_CHANGED ) {
++ if( message->src == GST_OBJECT( mpPlaybin ) ) {
++ GstState newstate, pendingstate;
++
++ gst_message_parse_state_changed (message, NULL, &newstate, &pendingstate);
++
++ DBG( "%p state change received, new state %d", this, newstate );
++ if( newstate == GST_STATE_PAUSED &&
++ pendingstate == GST_STATE_VOID_PENDING ) {
++
++ DBG( "%p change to paused received", this );
++
++ if( mnDuration == 0) {
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list