[Libreoffice-commits] .: Branch 'feature/gsoc2011_wizards' - 66 commits - accessibility/inc accessibility/prj accessibility/source automation/inc automation/prj automation/source avmedia/AllLangResTarget_avmedia.mk avmedia/inc avmedia/Library_avmediagst.mk avmedia/Library_avmedia.mk avmedia/Library_avmediaQuickTime.mk avmedia/Library_avmediawin.mk avmedia/Makefile avmedia/Module_avmedia.mk avmedia/Package_inc.mk avmedia/prj avmedia/source avmedia/util basctl/inc basctl/sdi basctl/source basic/inc basic/source bean/com bean/native bean/prj comphelper/inc comphelper/Library_comphelp.mk comphelper/Package_inc.mk comphelper/source configure.in cppuhelper/source crashrep/prj cui/Library_cui.mk cui/source dbaccess/source desktop/prj desktop/registry desktop/source embedserv/prj embedserv/source extensions/source extensions/test forms/Library_frm.mk forms/qa forms/source framework/inc l10ntools/source libwpd/libwpd-mingw.patch libwpd/makefile.mk libwpg/libwpg-mingw.patch libwpg/makefile.mk libwp s/libwps-0.2.1.patch libwps/libwps-0.2.1-warnings.patch libwps/libwps-mingw.patch libwps/makefile.mk lingucomponent/prj lingucomponent/source lotuswordpro/source Makefile.in MathMLDTD/prj officecfg/registry oox/inc oox/source package/inc package/qa package/source padmin/source postprocess/packcomponents postprocess/packregistry postprocess/rebase RepositoryExternal.mk Repository.mk rsc/Executable_rsc.mk rsc/inc rsc/Package_yacc.mk rsc/source scp2/source sc/source sd/source set_soenv.in setup_native/prj setup_native/source sfx2/inc sfx2/source solenv/bin solenv/gbuild svl/inc svl/source svtools/AllLangResTarget_productregistration.mk svtools/inc svtools/Library_productregistration.mk svtools/Library_svt.mk svtools/Module_svtools.mk svtools/Package_inc.mk svtools/source svx/inc svx/source toolkit/source toolkit/src2xml tools/bootstrp tools/inc tools/source ucb/source UnoControls/prj unotools/inc unotools/Library_utl.mk unotools/Package_inc.mk unotools/source unusedcode.easy vc l/inc vcl/Library_vcl.mk vcl/Package_inc.mk vcl/source vcl/unx wizards/source xmloff/inc xmloff/Library_xo.mk xmloff/source xmlsecurity/inc xmlsecurity/qa xmlsecurity/source xmlsecurity/test_docs xmlsecurity/util
Xisco Fauli
xfauli at kemper.freedesktop.org
Wed Aug 24 07:58:54 PDT 2011
Makefile.in | 20
MathMLDTD/prj/d.lst | 4
Repository.mk | 4
RepositoryExternal.mk | 7
UnoControls/prj/build.lst | 2
UnoControls/prj/d.lst | 12
accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx | 5
accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx | 5
accessibility/prj/build.lst | 2
accessibility/prj/d.lst | 12
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 24
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 11
accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 11
accessibility/source/extended/AccessibleGridControlBase.cxx | 22
accessibility/source/extended/AccessibleGridControlHeader.cxx | 11
accessibility/source/extended/AccessibleGridControlTableBase.cxx | 11
accessibility/source/helper/accresmgr.cxx | 4
automation/inc/automation/commdefines.hxx | 20
automation/inc/automation/commtypes.hxx | 11
automation/prj/d.lst | 44
automation/source/inc/cmdbasestream.hxx | 32
automation/source/inc/icommstream.hxx | 14
automation/source/inc/rcontrol.hxx | 16
automation/source/inc/svcommstream.hxx | 14
automation/source/inc/testapp.hxx | 1
automation/source/miniapp/servres.cxx | 6
automation/source/miniapp/servres.hxx | 7
automation/source/miniapp/testapp.cxx | 2
automation/source/server/XMLParser.cxx | 12
automation/source/server/cmdbasestream.cxx | 150 -
automation/source/server/recorder.cxx | 26
automation/source/server/retstrm.cxx | 8
automation/source/server/retstrm.hxx | 16
automation/source/server/scmdstrm.cxx | 24
automation/source/server/scmdstrm.hxx | 4
automation/source/server/sta_list.cxx | 9
automation/source/server/statemnt.cxx | 548 +--
automation/source/server/statemnt.hxx | 18
automation/source/server/svcommstream.cxx | 14
automation/source/simplecm/communiio.hxx | 12
automation/source/simplecm/packethandler.cxx | 4
automation/source/simplecm/tcpio.cxx | 4
automation/source/simplecm/tcpio.hxx | 4
automation/source/testtool/cmdstrm.cxx | 42
automation/source/testtool/cmdstrm.hxx | 10
automation/source/testtool/cretstrm.hxx | 4
automation/source/testtool/makefile.mk | 2
automation/source/testtool/objtest.cxx | 131
automation/source/testtool/tcommuni.cxx | 23
automation/source/testtool/testtool.ini | 1
avmedia/AllLangResTarget_avmedia.mk | 49
avmedia/Library_avmedia.mk | 77
avmedia/Library_avmediaQuickTime.mk | 71
avmedia/Library_avmediagst.mk | 72
avmedia/Library_avmediawin.mk | 70
avmedia/Makefile | 39
avmedia/Module_avmedia.mk | 57
avmedia/Package_inc.mk | 37
avmedia/inc/avmedia/avmediadllapi.h | 16
avmedia/inc/avmedia/mediaitem.hxx | 3
avmedia/inc/avmedia/mediaplayer.hxx | 7
avmedia/inc/avmedia/mediatoolbox.hxx | 7
avmedia/inc/avmedia/mediawindow.hxx | 7
avmedia/prj/build.lst | 11
avmedia/prj/d.lst | 23
avmedia/prj/makefile.mk | 40
avmedia/source/framework/makefile.mk | 57
avmedia/source/gstreamer/exports.dxp | 1
avmedia/source/gstreamer/makefile.mk | 90
avmedia/source/java/FrameGrabber.java | 190 -
avmedia/source/java/Manager.java | 148 -
avmedia/source/java/MediaUno.java | 67
avmedia/source/java/Player.java | 325 --
avmedia/source/java/PlayerWindow.java | 600 ----
avmedia/source/java/WindowAdapter.java | 496 ---
avmedia/source/java/avmedia.jar.component | 34
avmedia/source/java/makefile.mk | 69
avmedia/source/java/manifest | 2
avmedia/source/java/win/SystemWindowAdapter.java | 53
avmedia/source/java/x11/SystemWindowAdapter.java | 123
avmedia/source/quicktime/makefile.mk | 93
avmedia/source/quicktime/window.cxx | 10
avmedia/source/quicktime/window.hxx | 10
avmedia/source/viewer/makefile.mk | 55
avmedia/source/win/exports.dxp | 1
avmedia/source/win/makefile.mk | 88
avmedia/util/hidother.src | 41
avmedia/util/makefile.mk | 91
basctl/inc/basidesh.hrc | 1
basctl/sdi/baside.sdi | 5
basctl/source/basicide/baside2.cxx | 9
basctl/source/basicide/baside2.hxx | 1
basctl/source/basicide/baside2b.cxx | 32
basctl/source/basicide/basidesh.src | 5
basctl/source/basicide/iderdll.cxx | 3
basctl/source/basicide/moduldl2.cxx | 2
basctl/source/dlged/dlged.cxx | 9
basic/inc/basic/basmgr.hxx | 4
basic/source/app/dialogs.cxx | 18
basic/source/basmgr/basmgr.cxx | 34
basic/source/uno/dlgcont.cxx | 33
bean/com/sun/star/comp/beans/HasConnectionException.java | 2
bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c | 1
bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c | 1
bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c | 9
bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c | 24
bean/prj/d.lst | 8
comphelper/Library_comphelp.mk | 1
comphelper/Package_inc.mk | 1
comphelper/inc/comphelper/componentfactory.hxx | 121
comphelper/source/processfactory/componentfactory.cxx | 83
configure.in | 19
cppuhelper/source/servicefactory.cxx | 3
crashrep/prj/d.lst | 6
cui/Library_cui.mk | 6
cui/source/customize/acccfg.cxx | 2
cui/source/customize/macropg.cxx | 20
cui/source/dialogs/SpellDialog.cxx | 3
cui/source/dialogs/about.cxx | 223 -
cui/source/dialogs/about.hrc | 7
cui/source/dialogs/about.src | 8
cui/source/dialogs/cuigaldlg.cxx | 92
cui/source/dialogs/cuihyperdlg.cxx | 1
cui/source/dialogs/hldocntp.cxx | 2
cui/source/dialogs/hlinettp.cxx | 50
cui/source/dialogs/hltpbase.cxx | 4
cui/source/dialogs/hyperdlg.hrc | 1
cui/source/dialogs/hyperdlg.src | 27
cui/source/dialogs/iconcdlg.cxx | 14
cui/source/dialogs/srchxtra.cxx | 8
cui/source/factory/cuiresmgr.cxx | 7
cui/source/factory/dlgfact.cxx | 1
cui/source/inc/about.hxx | 3
cui/source/inc/chardlg.hxx | 8
cui/source/inc/cuigaldlg.hxx | 28
cui/source/inc/cuitabline.hxx | 59
cui/source/inc/helpid.hrc | 26
cui/source/inc/hlinettp.hxx | 9
cui/source/inc/hltpbase.hxx | 2
cui/source/inc/page.hxx | 2
cui/source/options/fontsubs.cxx | 1
cui/source/options/fontsubs.hxx | 1
cui/source/options/optchart.cxx | 4
cui/source/options/optcolor.cxx | 61
cui/source/options/optcolor.src | 2
cui/source/options/optgdlg.cxx | 22
cui/source/options/opthtml.cxx | 74
cui/source/options/optinet2.cxx | 407 --
cui/source/options/optinet2.hrc | 23
cui/source/options/optinet2.hxx | 69
cui/source/options/optinet2.src | 166 -
cui/source/options/optmemory.cxx | 4
cui/source/options/optpath.cxx | 1
cui/source/options/optsave.cxx | 10
cui/source/options/treeopt.cxx | 4
cui/source/options/treeopt.src | 4
cui/source/tabpages/autocdlg.cxx | 60
cui/source/tabpages/chardlg.cxx | 288 -
cui/source/tabpages/numpages.cxx | 9
cui/source/tabpages/page.cxx | 17
cui/source/tabpages/tpline.cxx | 23
dbaccess/source/core/dataaccess/databasedocument.cxx | 104
desktop/prj/build.lst | 1
desktop/registry/data/org/openoffice/Office/Jobs.xcu | 74
desktop/registry/data/org/openoffice/Office/makefile.mk | 77
desktop/source/app/app.cxx | 1
dev/null |binary
embedserv/prj/build.lst | 2
embedserv/prj/d.lst | 4
embedserv/source/inc/embservconst.h | 2
extensions/source/ole/oleobjw.cxx | 11
extensions/source/ole/oleobjw.hxx | 4
extensions/source/oooimprovement/onlogrotate_job.cxx | 2
extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 2
extensions/source/propctrlr/eventhandler.cxx | 3
extensions/source/propctrlr/standardcontrol.cxx | 4
extensions/source/scanner/sanedlg.cxx | 52
extensions/source/svg/makefile.mk | 67
extensions/source/svg/svgaction.cxx | 1461 ----------
extensions/source/svg/svgaction.hxx | 167 -
extensions/source/svg/svgcom.hxx | 76
extensions/source/svg/svgprinter.cxx | 331 --
extensions/source/svg/svgprinter.hxx | 70
extensions/source/svg/svguno.cxx | 101
extensions/source/svg/svgwriter.cxx | 174 -
extensions/source/svg/svgwriter.hxx | 63
extensions/source/update/check/Jobs.xcu | 2
extensions/source/update/tools/ztool.cxx | 6
extensions/test/ole/OleClient/clientTest.cxx | 2
extensions/test/ole/OleConverterVar1/convTest.cxx | 2
extensions/test/ole/cppToUno/testcppuno.cxx | 2
forms/Library_frm.mk | 6
forms/qa/unoapi/knownissues.xcl | 6
forms/source/component/Columns.cxx | 30
forms/source/component/DatabaseForm.cxx | 91
forms/source/component/Edit.cxx | 62
forms/source/component/Edit.hxx | 1
forms/source/component/Filter.cxx | 34
forms/source/component/FormattedField.cxx | 4
forms/source/resource/frm_resource.cxx | 4
framework/inc/protocols.h | 107
l10ntools/source/helpmerge.cxx | 4
l10ntools/source/lngmerge.cxx | 4
l10ntools/source/localize.cxx | 2
libwpd/libwpd-mingw.patch | 11
libwpd/makefile.mk | 2
libwpg/libwpg-mingw.patch | 11
libwpg/makefile.mk | 2
libwps/libwps-0.2.1-warnings.patch | 60
libwps/libwps-0.2.1.patch | 28
libwps/libwps-mingw.patch | 11
libwps/makefile.mk | 2
lingucomponent/prj/d.lst | 106
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 8
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 4
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 15
lingucomponent/source/thesaurus/libnth/makefile.mk | 3
lotuswordpro/source/filter/lwpdoc.cxx | 33
lotuswordpro/source/filter/lwpdoc.hxx | 2
lotuswordpro/source/filter/lwpfootnote.cxx | 24
lotuswordpro/source/filter/lwpfootnote.hxx | 2
lotuswordpro/source/filter/lwpfribtable.cxx | 5
lotuswordpro/source/filter/lwpfribtable.hxx | 1
lotuswordpro/source/filter/xfilter/xfsection.cxx | 5
lotuswordpro/source/filter/xfilter/xfsection.hxx | 2
officecfg/registry/data/org/openoffice/Office/UI.xcu | 27
officecfg/registry/schema/org/openoffice/Office/UI.xcs | 58
oox/inc/oox/helper/graphichelper.hxx | 5
oox/source/helper/graphichelper.cxx | 26
package/inc/EncryptedDataHeader.hxx | 32
package/inc/EncryptionData.hxx | 52
package/inc/PackageConstants.hxx | 36
package/inc/ZipFile.hxx | 52
package/inc/ZipOutputStream.hxx | 33
package/inc/ZipPackage.hxx | 42
package/inc/ZipPackageEntry.hxx | 106
package/inc/ZipPackageFolder.hxx | 4
package/inc/ZipPackageStream.hxx | 218 +
package/qa/storages/TestHelper.java | 16
package/source/manifest/Base64Codec.cxx | 8
package/source/manifest/Base64Codec.hxx | 4
package/source/manifest/ManifestDefines.hxx | 21
package/source/manifest/ManifestExport.cxx | 285 +
package/source/manifest/ManifestImport.cxx | 169 -
package/source/manifest/ManifestImport.hxx | 28
package/source/manifest/UnoRegister.cxx | 5
package/source/xstor/owriteablestream.cxx | 188 -
package/source/xstor/xstorage.cxx | 212 +
package/source/xstor/xstorage.hxx | 11
package/source/zipapi/Deflater.cxx | 8
package/source/zipapi/EntryInputStream.cxx | 205 -
package/source/zipapi/EntryInputStream.hxx | 85
package/source/zipapi/Inflater.cxx | 4
package/source/zipapi/MemoryByteGrabber.hxx | 2
package/source/zipapi/XFileStream.cxx | 230 -
package/source/zipapi/XFileStream.hxx | 95
package/source/zipapi/XMemoryStream.cxx | 55
package/source/zipapi/XMemoryStream.hxx | 45
package/source/zipapi/XUnbufferedStream.cxx | 100
package/source/zipapi/XUnbufferedStream.hxx | 17
package/source/zipapi/ZipFile.cxx | 512 +--
package/source/zipapi/ZipOutputStream.cxx | 124
package/source/zipapi/blowfishcontext.cxx | 122
package/source/zipapi/blowfishcontext.hxx | 58
package/source/zipapi/makefile.mk | 2
package/source/zipapi/sha1context.cxx | 97
package/source/zipapi/sha1context.hxx | 59
package/source/zippackage/ZipPackage.cxx | 573 ++-
package/source/zippackage/ZipPackageEntry.cxx | 24
package/source/zippackage/ZipPackageEntry.hxx | 106
package/source/zippackage/ZipPackageFolder.cxx | 197 -
package/source/zippackage/ZipPackageStream.cxx | 406 +-
package/source/zippackage/ZipPackageStream.hxx | 196 -
package/source/zippackage/zipfileaccess.cxx | 5
padmin/source/adddlg.cxx | 84
postprocess/packcomponents/makefile.mk | 20
postprocess/packregistry/makefile.mk | 4
postprocess/rebase/coffbase.txt | 1
rsc/Executable_rsc.mk | 9
rsc/Package_yacc.mk | 36
rsc/inc/rscdb.hxx | 2
rsc/source/parser/rscdb.cxx | 8
sc/source/ui/inc/shtabdlg.hxx | 4
scp2/source/ooo/file_library_ooo.scp | 8
scp2/source/ooo/file_resource_ooo.scp | 2
scp2/source/ooo/makefile.mk | 4
scp2/source/ooo/module_hidden_ooo.scp | 2
scp2/source/ooo/module_lang_template.scp | 1
sd/source/filter/ppt/pptin.cxx | 8
sd/source/ui/dlg/dlgass.cxx | 2
set_soenv.in | 1
setup_native/prj/build.lst | 1
setup_native/prj/d.lst | 19
setup_native/source/mac/ooo/DS_Store |binary
setup_native/source/mac/ooo/DS_Store_Langpack |binary
setup_native/source/mac/ooo3_installer.icns |binary
setup_native/source/packinfo/packinfo_extensions.txt | 44
setup_native/source/packinfo/packinfo_office.txt | 108
setup_native/source/packinfo/packinfo_office_lang.txt | 4
setup_native/source/packinfo/shellscripts_extensions.txt | 24
setup_native/source/packinfo/spellchecker_selection.txt | 84
setup_native/source/win32/customactions/javafilter/makefile.mk | 4
setup_native/source/win32/customactions/languagepacks/makefile.mk | 2
setup_native/source/win32/customactions/patch/makefile.mk | 3
setup_native/source/win32/customactions/quickstarter/makefile.mk | 3
setup_native/source/win32/customactions/rebase/makefile.mk | 2
setup_native/source/win32/customactions/rebase/rebase.cxx | 85
setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk | 2
setup_native/source/win32/customactions/reg4msdoc/registrar.cxx | 48
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx | 36
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx | 14
setup_native/source/win32/customactions/reg64/makefile.mk | 3
setup_native/source/win32/customactions/regactivex/makefile.mk | 3
setup_native/source/win32/customactions/regpatchactivex/makefile.mk | 10
setup_native/source/win32/customactions/relnotes/exports.dxp | 3
setup_native/source/win32/customactions/relnotes/makefile.mk | 76
setup_native/source/win32/customactions/relnotes/relnotes.cxx | 188 -
setup_native/source/win32/customactions/sellang/makefile.mk | 20
setup_native/source/win32/customactions/shellextensions/makefile.mk | 4
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx | 25
setup_native/source/win32/customactions/thesaurus/makefile.mk | 9
setup_native/source/win32/customactions/tools/makefile.mk | 4
setup_native/source/win32/msi-encodinglist.txt | 2
sfx2/inc/inettbc.hxx | 1
sfx2/inc/pch/precompiled_sfx2.hxx | 1
sfx2/inc/sfx2/dispatch.hxx | 9
sfx2/source/appl/appserv.cxx | 1
sfx2/source/bastyp/mieclip.cxx | 22
sfx2/source/control/dispatch.cxx | 243 -
sfx2/source/doc/doctdlg.cxx | 2
sfx2/source/doc/docvor.cxx | 6
sfx2/source/doc/new.cxx | 3
sfx2/source/inet/inettbc.cxx | 16
solenv/bin/build.pl | 4
solenv/gbuild/Configuration.mk | 2
solenv/gbuild/Library.mk | 2
solenv/gbuild/LinkTarget.mk | 56
solenv/gbuild/TargetLocations.mk | 6
solenv/gbuild/platform/macosx.mk | 8
solenv/gbuild/platform/unxgcc.mk | 12
svl/inc/svl/aeitem.hxx | 2
svl/source/items/aeitem.cxx | 21
svtools/AllLangResTarget_productregistration.mk | 48
svtools/Library_productregistration.mk | 65
svtools/Library_svt.mk | 1
svtools/Module_svtools.mk | 2
svtools/Package_inc.mk | 1
svtools/inc/svtools/DocumentInfoPreview.hxx | 1
svtools/inc/svtools/colorcfg.hxx | 3
svtools/inc/svtools/extcolorcfg.hxx | 4
svtools/inc/svtools/grfmgr.hxx | 11
svtools/inc/svtools/toolbarmenu.hxx | 9
svtools/inc/svtools/tooltiplbox.hxx | 69
svtools/source/config/colorcfg.cxx | 18
svtools/source/config/extcolorcfg.cxx | 29
svtools/source/config/htmlcfg.cxx | 2
svtools/source/contnr/templwin.cxx | 7
svtools/source/contnr/tooltiplbox.cxx | 122
svtools/source/control/ctrltool.cxx | 2
svtools/source/control/toolbarmenu.cxx | 93
svtools/source/control/toolbarmenuacc.cxx | 24
svtools/source/control/toolbarmenuimp.hxx | 2
svtools/source/filter/sgvtext.cxx | 2
svtools/source/filter/wmf/winwmf.cxx | 4
svtools/source/graphic/grfcache.cxx | 100
svtools/source/graphic/grfcache.hxx | 135
svtools/source/graphic/grfmgr.cxx | 84
svtools/source/misc/imap.cxx | 6
svtools/source/misc/imap2.cxx | 4
svtools/source/misc/transfer.cxx | 20
svtools/source/productregistration/productregistration.cxx | 482 ---
svtools/source/productregistration/productregistration.hxx | 102
svtools/source/productregistration/productregistration.uno.component | 34
svtools/source/productregistration/registrationdlg.cxx | 164 -
svtools/source/productregistration/registrationdlg.hrc | 43
svtools/source/productregistration/registrationdlg.hxx | 88
svtools/source/productregistration/registrationdlg.src | 127
svtools/source/svhtml/htmlout.cxx | 6
svtools/source/urlobj/inetimg.cxx | 2
svx/inc/svx/wrapfield.hxx | 1
svx/source/dialog/wrapfield.cxx | 7
svx/source/form/navigatortree.cxx | 47
toolkit/source/awt/vclxtoolkit.cxx | 2
toolkit/src2xml/src.lst | 1
tools/bootstrp/cppdep.cxx | 2
tools/bootstrp/rscdep.cxx | 14
tools/inc/tools/fsys.hxx | 9
tools/source/fsys/comdep.hxx | 2
tools/source/fsys/dirent.cxx | 65
tools/source/fsys/unx.cxx | 26
tools/source/inet/inetmsg.cxx | 2
tools/source/stream/strmwnt.cxx | 4
ucb/source/ucp/webdav/ContentProperties.cxx | 28
ucb/source/ucp/webdav/ContentProperties.hxx | 6
unotools/Library_utl.mk | 1
unotools/Package_inc.mk | 1
unotools/inc/unotools/datetime.hxx | 3
unotools/inc/unotools/regoptions.hxx | 122
unotools/inc/unotools/ucbhelper.hxx | 12
unotools/inc/unotools/ucblockbytes.hxx | 1
unotools/source/config/itemholder1.cxx | 1
unotools/source/config/lingucfg.cxx | 2
unotools/source/config/regoptions.cxx | 497 ---
unotools/source/i18n/instance.hxx | 1
unotools/source/i18n/transliterationwrapper.cxx | 1
unotools/source/misc/datetime.cxx | 17
unotools/source/misc/syslocale.cxx | 2
unotools/source/ucbhelper/ucbhelper.cxx | 245 -
unotools/source/ucbhelper/ucblockbytes.cxx | 9
unusedcode.easy | 72
vcl/Library_vcl.mk | 1
vcl/Package_inc.mk | 1
vcl/inc/unx/salgdi.h | 4
vcl/inc/vcl/graph.hxx | 1
vcl/inc/vcl/svapp.hxx | 2
vcl/inc/vcl/wpropset.hxx | 69
vcl/source/app/settings.cxx | 2
vcl/source/app/svapp.cxx | 33
vcl/source/gdi/cvtsvm.cxx | 8
vcl/source/gdi/graph.cxx | 7
vcl/source/gdi/metaact.cxx | 4
vcl/source/gdi/outdev3.cxx | 2
vcl/source/window/wpropset.cxx | 350 --
vcl/unx/generic/app/i18n_cb.cxx | 2
vcl/unx/generic/gdi/gcach_xpeer.cxx | 10
vcl/unx/generic/gdi/gcach_xpeer.hxx | 1
vcl/unx/generic/gdi/salgdi3.cxx | 358 --
vcl/unx/generic/plugadapt/salplug.cxx | 2
vcl/unx/generic/printer/printerinfomanager.cxx | 2
wizards/source/importwizard/DialogModul.xba | 26
wizards/source/importwizard/ImportDialog.xdl | 38
wizards/source/importwizard/Language.xba | 4
wizards/source/importwizard/Main.xba | 28
wizards/source/importwizard/importwi.src | 24
xmloff/Library_xo.mk | 2
xmloff/inc/xmloff/formlayerexport.hxx | 13
xmloff/inc/xmloff/formlayerimport.hxx | 27
xmloff/source/draw/sdxmlimp.cxx | 2
xmloff/source/draw/viewcontext.cxx | 90
xmloff/source/draw/viewcontext.hxx | 54
xmloff/source/forms/formlayerexport.cxx | 12
xmloff/source/forms/formlayerimport.cxx | 6
xmloff/source/forms/formstyles.cxx | 68
xmloff/source/forms/formstyles.hxx | 74
xmloff/source/forms/layerexport.cxx | 7
xmloff/source/forms/layerexport.hxx | 4
xmloff/source/forms/layerimport.cxx | 9
xmloff/source/forms/layerimport.hxx | 5
xmloff/source/text/txtimppr.cxx | 2
xmlsecurity/inc/makefile.mk | 47
xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx | 4
xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx | 7
xmlsecurity/qa/certext/User_35_Root_11.crt | 64
xmlsecurity/source/component/documentdigitalsignatures.cxx | 10
xmlsecurity/source/component/makefile.mk | 54
xmlsecurity/source/dialogs/certificateviewer.cxx | 22
xmlsecurity/source/dialogs/dialogs.hrc | 12
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 4
xmlsecurity/source/dialogs/macrosecurity.cxx | 2
xmlsecurity/source/dialogs/makefile.mk | 64
xmlsecurity/source/dialogs/resourcemanager.cxx | 3
xmlsecurity/source/dialogs/stbcontrl.cxx | 8
xmlsecurity/source/dialogs/warnings.cxx | 6
xmlsecurity/source/framework/buffernode.cxx | 6
xmlsecurity/source/framework/elementcollector.cxx | 7
xmlsecurity/source/framework/elementcollector.hxx | 1
xmlsecurity/source/framework/makefile.mk | 61
xmlsecurity/source/framework/securityengine.hxx | 1
xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx | 3
xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx | 3
xmlsecurity/source/helper/makefile.mk | 54
xmlsecurity/source/helper/xmlsignaturehelper.cxx | 7
xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 1
xmlsecurity/source/xmlsec/diagnose.cxx | 3
xmlsecurity/source/xmlsec/makefile.mk | 72
xmlsecurity/source/xmlsec/mscrypt/makefile.mk | 73
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx | 182 +
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx | 84
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 20
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 3
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 28
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx | 161 -
xmlsecurity/source/xmlsec/nss/ciphercontext.cxx | 276 +
xmlsecurity/source/xmlsec/nss/ciphercontext.hxx | 89
xmlsecurity/source/xmlsec/nss/digestcontext.cxx | 101
xmlsecurity/source/xmlsec/nss/digestcontext.hxx | 68
xmlsecurity/source/xmlsec/nss/makefile.mk | 127
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 521 +++
xmlsecurity/source/xmlsec/nss/nssinitializer.hxx | 90
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx | 244 +
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx | 77
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 57
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 365 --
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx | 62
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 74
xmlsecurity/source/xmlsec/nss/xsec_nss.cxx | 34
xmlsecurity/source/xmlsec/saxhelper.cxx | 96
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 4
xmlsecurity/test_docs/CAs/Root_11/demoCA/index.txt | 1
xmlsecurity/test_docs/CAs/Root_11/demoCA/newcerts/1022.pem | 64
xmlsecurity/test_docs/CAs/Root_11/demoCA/serial | 2
xmlsecurity/test_docs/CAs/Root_11/openssl.cfg | 17
xmlsecurity/test_docs/certs/end_certs/User_35_Root_11.crt | 64
xmlsecurity/util/makefile.mk | 202 -
xmlsecurity/util/target.pmk | 31
xmlsecurity/util/xsec_xmlsec.component | 1
xmlsecurity/util/xsec_xmlsec.windows.component | 3
507 files changed, 7920 insertions(+), 17195 deletions(-)
New commits:
commit 117281ba12e703fcd04ca87309dfd4a31432d1c5
Author: Noel Power <noel.power at novell.com>
Date: Mon Aug 22 15:41:30 2011 +0100
fix leaking 'Pictures' streams from basic dialogs in base
With database document, any contents of the Pictures folder ( afaics only basic dialogs store content here ) is never cleaned up between saves.
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index b4f4470..6378a95 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -55,7 +55,7 @@
#include <cppuhelper/factory.hxx>
#include <svtools/sfxecode.hxx>
#include <svtools/ehdl.hxx>
-
+#include <svtools/grfmgr.hxx>
namespace basic
{
@@ -229,35 +229,6 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
xInput->closeInput();
}
-void lcl_deepInspectForEmbeddedImages( const Reference< XInterface >& xIf, std::vector< rtl::OUString >& rvEmbedImgUrls )
-{
- static rtl::OUString sImageURL= OUString(RTL_CONSTASCII_USTRINGPARAM( "ImageURL" ) );
- Reference< beans::XPropertySet > xProps( xIf, UNO_QUERY );
- if ( xProps.is() )
- {
-
- if ( xProps->getPropertySetInfo()->hasPropertyByName( sImageURL ) )
- {
- rtl::OUString sURL;
- xProps->getPropertyValue( sImageURL ) >>= sURL;
- if ( sURL.getLength() && sURL.compareToAscii( GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( GRAPHOBJ_URLPREFIX ) ) == 0 )
- rvEmbedImgUrls.push_back( sURL );
- }
- }
- Reference< XNameContainer > xContainer( xIf, UNO_QUERY );
- if ( xContainer.is() )
- {
- Sequence< rtl::OUString > sNames = xContainer->getElementNames();
- sal_Int32 nContainees = sNames.getLength();
- for ( sal_Int32 index = 0; index < nContainees; ++index )
- {
- Reference< XInterface > xCtrl;
- xContainer->getByName( sNames[ index ] ) >>= xCtrl;
- lcl_deepInspectForEmbeddedImages( xCtrl, rvEmbedImgUrls );
- }
- }
-}
-
void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< embed::XStorage >& xStorage ) throw ( RuntimeException )
{
LibraryContainerMethodGuard aGuard( *this );
@@ -315,7 +286,7 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e
OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
::xmlscript::importDialogModel( xInput, xDialogModel, xContext, mxOwnerDocument );
std::vector< rtl::OUString > vEmbeddedImageURLs;
- lcl_deepInspectForEmbeddedImages( Reference< XInterface >( xDialogModel, UNO_QUERY ), vEmbeddedImageURLs );
+ GraphicObject::InspectForGraphicObjectImageURL( Reference< XInterface >( xDialogModel, UNO_QUERY ), vEmbeddedImageURLs );
if ( !vEmbeddedImageURLs.empty() )
{
// Export the images to the storage
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index d8132a5..37f6091 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -64,6 +64,12 @@
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/ucb/XContent.hpp>
#include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
+
+#include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
+#include <com/sun/star/awt/XControl.hpp>
+#include <com/sun/star/awt/XDialogProvider.hpp>
+#include <com/sun/star/document/XGraphicObjectResolver.hpp>
+
/** === end UNO includes === **/
#include <comphelper/documentconstants.hxx>
@@ -95,6 +101,7 @@
#include <functional>
#include <list>
+#include <svtools/grfmgr.hxx>
#define MAP_LEN(x) x, sizeof(x) - 1
using namespace ::com::sun::star::uno;
@@ -384,6 +391,85 @@ namespace
}
}
+static rtl::OUString sPictures( RTL_CONSTASCII_USTRINGPARAM("Pictures") );
+
+// base documents seem to have a different behaviour to other documents, the
+// root storage contents at least seem to be re-used over different saves, thus if there is a
+// top level Picture directory it is never cleared.
+// If we delete the 'Pictures' directory then the dialog library storage which does store
+// any embed images will not work properly. ( this is due to the fact it will
+// try to load the dialog which will try and access the embed images, if those images are not cached in
+// memory it will try to read them from the Picture directory which is now gone, so... we have to use this
+// inglorious hack below which basically will
+// a) create a temp storage
+// b) introspect any dialogs for any embed graphics and grab the associate URL(s)
+// c) populate the temp storage with the associated embed images ( will be stored in a 'Pictures' folder )
+// d) delete the 'Picture' element from the root storage
+// e) copy the Pictures element of the temp storage to the root storage
+//
+// this assumes that we don't use the Pictures folder in the root of the base
+// document for anything, I believe this is a valid assumption ( as much as
+// I could check anyway )
+
+void lcl_uglyHackToStoreDialogeEmbedImages( const Reference< XStorageBasedLibraryContainer >& xDlgCont, const Reference< XStorage >& xStorage, const Reference< XModel >& rxModel, const ::comphelper::ComponentContext& aContext ) throw ( RuntimeException )
+{
+ Sequence< rtl::OUString > sLibraries = xDlgCont->getElementNames();
+ Reference< XStorage > xTmpPic = xStorage->openStorageElement( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("tempPictures") ), ElementModes::READWRITE );
+
+ std::vector< rtl::OUString > vEmbedImgUrls;
+ for ( sal_Int32 i=0; i < sLibraries.getLength(); ++i )
+ {
+ rtl::OUString sLibrary( sLibraries[ i ] );
+ xDlgCont->loadLibrary( sLibrary );
+ Reference< XNameContainer > xLib;
+ xDlgCont->getByName( sLibrary ) >>= xLib;
+ if ( xLib.is() )
+ {
+ Sequence< rtl::OUString > sDialogs = xLib->getElementNames();
+ sal_Int32 nDialogs( sDialogs.getLength() );
+ for ( sal_Int32 j=0; j < nDialogs; ++j )
+ {
+ Reference < ::com::sun::star::awt::XDialogProvider > xDlgPrv;
+ Sequence< Any > aArgs(1);
+ aArgs[ 0 ] <<= rxModel;
+ xDlgPrv.set( aContext.createComponentWithArguments( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.DialogProvider")) , aArgs), UNO_QUERY );
+ rtl::OUString sDialogUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script:") );
+ sDialogUrl = sDialogUrl.concat( sLibraries[ i ] ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("." ) ) ).concat ( sDialogs[ j ] ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?location=document") ) );
+
+ Reference< ::com::sun::star::awt::XControl > xDialog( xDlgPrv->createDialog( sDialogUrl ), UNO_QUERY );
+ Reference< XInterface > xModel = xDialog->getModel();
+ GraphicObject::InspectForGraphicObjectImageURL( xModel, vEmbedImgUrls );
+ }
+ }
+ }
+ // if we have any image urls, make sure we copy the associated images into tempPictures
+ if ( vEmbedImgUrls.size() )
+ {
+ // Export the images to the storage
+ Sequence< Any > aArgs( 1 );
+ aArgs[ 0 ] <<= xTmpPic;
+ Reference< XGraphicObjectResolver > xGraphicResolver(
+ aContext.createComponentWithArguments( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Svx.GraphicExportHelper" ) ), aArgs ), UNO_QUERY );
+ std::vector< rtl::OUString >::iterator it = vEmbedImgUrls.begin();
+ std::vector< rtl::OUString >::iterator it_end = vEmbedImgUrls.end();
+ if ( xGraphicResolver.is() )
+ {
+ for ( sal_Int32 count = 0; it != it_end; ++it, ++count )
+ xGraphicResolver->resolveGraphicObjectURL( *it );
+ }
+
+ // delete old 'Pictures' storage and copy the contents of tempPictures into xStorage
+ xStorage->removeElement( sPictures );
+ xTmpPic->copyElementTo( sPictures, xStorage, sPictures );
+ }
+ else
+ {
+ // clean up an existing Pictures dir
+ if ( xStorage->isStorageElement( sPictures ) )
+ xStorage->removeElement( sPictures );
+ }
+}
+
void ODatabaseDocument::impl_setInitialized()
{
m_eInitState = Initialized;
@@ -1600,6 +1686,24 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r
WriteThroughComponent( xComponent, "content.xml", "com.sun.star.comp.sdb.DBExportFilter",
aDelegatorArguments, aMediaDescriptor, _rxTargetStorage );
+ if ( _rxTargetStorage->hasByName ( sPictures ) )
+ {
+ try
+ {
+ // Delete any previously existing Pictures folder and regenerate
+ // any needed content if needed
+ Reference< XStorageBasedLibraryContainer > xDlgs = m_pImpl->getLibraryContainer( false );
+ if ( xDlgs.is() )
+ {
+ Reference< XModel > xModel(const_cast< ODatabaseDocument*>(this));
+ lcl_uglyHackToStoreDialogeEmbedImages( m_pImpl->getLibraryContainer(false), _rxTargetStorage, xModel, m_pImpl->m_aContext );
+ }
+ }
+ catch ( const Exception& )
+ {
+ DBG_UNHANDLED_EXCEPTION();
+ }
+ }
m_pImpl->storeLibraryContainersTo( _rxTargetStorage );
}
diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx
index 25d8929..f43aec4 100644
--- a/svtools/inc/svtools/grfmgr.hxx
+++ b/svtools/inc/svtools/grfmgr.hxx
@@ -536,6 +536,11 @@ public:
friend SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj );
static GraphicObject CreateGraphicObjectFromURL( const ::rtl::OUString &rURL );
+ // will inspect an object ( e.g. a control ) for any 'ImageURL'
+ // properties and return these in a vector. Note: this implementation
+ // will cater for XNameContainer objects and deepinspect any containees
+ // if they exist
+ static void InspectForGraphicObjectImageURL( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIf, std::vector< rtl::OUString >& rvEmbedImgUrls );
};
// ------------------
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index f41b26e..43b8687 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -47,9 +47,19 @@
#include <vcl/pdfextoutdevdata.hxx>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+
#define WATERMARK_LUM_OFFSET 50
#define WATERMARK_CON_OFFSET -70
+using com::sun::star::uno::Reference;
+using com::sun::star::uno::XInterface;
+using com::sun::star::uno::UNO_QUERY;
+using com::sun::star::uno::Sequence;
+using com::sun::star::container::XNameContainer;
+using com::sun::star::beans::XPropertySet;
+
GraphicManager* GraphicObject::mpGlobalMgr = NULL;
struct GrfSimpleCacheObj
@@ -1183,4 +1193,34 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( const ::rtl::OUString &
}
}
+void
+GraphicObject::InspectForGraphicObjectImageURL( const Reference< XInterface >& xIf, std::vector< rtl::OUString >& rvEmbedImgUrls )
+{
+ static rtl::OUString sImageURL(RTL_CONSTASCII_USTRINGPARAM( "ImageURL" ) );
+ Reference< XPropertySet > xProps( xIf, UNO_QUERY );
+ if ( xProps.is() )
+ {
+
+ if ( xProps->getPropertySetInfo()->hasPropertyByName( sImageURL ) )
+ {
+ rtl::OUString sURL;
+ xProps->getPropertyValue( sImageURL ) >>= sURL;
+ if ( sURL.getLength() && sURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 )
+ rvEmbedImgUrls.push_back( sURL );
+ }
+ }
+ Reference< XNameContainer > xContainer( xIf, UNO_QUERY );
+ if ( xContainer.is() )
+ {
+ Sequence< rtl::OUString > sNames = xContainer->getElementNames();
+ sal_Int32 nContainees = sNames.getLength();
+ for ( sal_Int32 index = 0; index < nContainees; ++index )
+ {
+ Reference< XInterface > xCtrl;
+ xContainer->getByName( sNames[ index ] ) >>= xCtrl;
+ InspectForGraphicObjectImageURL( xCtrl, rvEmbedImgUrls );
+ }
+ }
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit dcd3f14c52d056ccb7117622a6b2bf939ab0567d
Author: Andras Timar <atimar at suse.com>
Date: Mon Aug 22 16:35:08 2011 +0200
set SDF directory correctly so translations get picked up
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 06dce58..6e8e007 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -225,7 +225,7 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) :
gb_XcuMergeTarget_CFGEXTARGET := $(call gb_Executable_get_target,cfgex)
gb_XcuMergeTarget_CFGEXCOMMAND := \
$(gb_CFGEXPRECOMMAND) $(gb_XcuMergeTarget_CFGEXTARGET)
-gb_XcuMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf/
+gb_XcuMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
# PRJNAME is computed from the stem (parameter $(2))
define gb_XcuMergeTarget__command
commit 50b7733fa41879a62d35cab64da59b109e1a8502
Author: Peter Rabi <prabi at caesar.elte.hu>
Date: Thu Aug 11 11:18:45 2011 +0200
Make template names appear in the correct word order
This patch turns on sorting in many listboxes containing template or region names in Impress.
Contributed under license LGPLv3+/MPL.
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 44426e8..9e44987 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -456,6 +456,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
mpPage1RegionLB->SetSelectHdl(LINK(this,AssistentDlgImpl,SelectRegionHdl));
mpPage1RegionLB->SetDropDownLineCount( 6 );
mpPage1TemplateLB->SetSelectHdl(LINK(this,AssistentDlgImpl,SelectTemplateHdl));
+ mpPage1TemplateLB->SetStyle(mpPage1TemplateLB->GetStyle() | WB_SORT);
mpPage1TemplateLB->InsertEntry(String(SdResId(STR_ISLOADING)));
mpPage1EmptyRB->SetClickHdl(LINK(this,AssistentDlgImpl,StartTypeHdl));
@@ -494,6 +495,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
mpPage2RegionLB->SetSelectHdl(LINK(this,AssistentDlgImpl,SelectRegionHdl));
mpPage2RegionLB->SetDropDownLineCount( 6 );
mpPage2LayoutLB->SetSelectHdl(LINK(this,AssistentDlgImpl,SelectLayoutHdl));
+ mpPage2LayoutLB->SetStyle(mpPage2LayoutLB->GetStyle() | WB_SORT);
mpPage2LayoutLB->InsertEntry(String(SdResId(STR_ISLOADING)));
// Seite 3
diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx
index 360b1fe..36cd638 100644
--- a/sfx2/source/doc/doctdlg.cxx
+++ b/sfx2/source/doc/doctdlg.cxx
@@ -75,6 +75,8 @@ SfxDocumentTemplateDlg::SfxDocumentTemplateDlg( Window * pParent, SfxDocumentTem
aNameEd.SetModifyHdl(LINK(this, SfxDocumentTemplateDlg, NameModify));
aOkBt.SetClickHdl(LINK(this, SfxDocumentTemplateDlg, OkHdl));
aEditBt.SetClickHdl(LINK(this, SfxDocumentTemplateDlg, EditHdl));
+ aRegionLb.SetStyle(aRegionLb.GetStyle() | WB_SORT);
+ aTemplateLb.SetStyle(aTemplateLb.GetStyle() | WB_SORT);
Init();
}
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 4a81f92..7f2268d 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -219,6 +219,12 @@ SfxOrganizeDlg_Impl::SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent,
pFileDlg ( NULL )
{
+ // Enable sorting in the listboxes
+ aLeftLb.GetModel()->SetSortMode( SortAscending );
+ aRightLb.GetModel()->SetSortMode( SortAscending );
+ aLeftLb.GetModel()->SetCompareHdl( LINK( &aLeftLb, SvTreeListBox, DefaultCompare ) );
+ aRightLb.GetModel()->SetCompareHdl( LINK( &aRightLb, SvTreeListBox, DefaultCompare ) );
+
// update the SfxDocumentTemplates the manager works with
if ( aMgr.GetTemplates() ) // should never fail, but who knows ....
{
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 7f05f54..b54b292 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -613,6 +613,9 @@ SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
aTemplateLb.SetSelectHdl(LINK(this, SfxNewFileDialog_Impl, TemplateSelect));
aTemplateLb.SetDoubleClickHdl(LINK(this, SfxNewFileDialog_Impl, DoubleClick));
+ aTemplateLb.SetStyle(aTemplateLb.GetStyle() | WB_SORT);
+ aRegionLb.SetStyle(aRegionLb.GetStyle() | WB_SORT);
+
// update the template configuration if necessary
{
WaitObject aWaitCursor( pAntiImplP->GetParent() );
commit 598ea329b703fcf165690dac51202ee11754790f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 22 15:17:21 2011 +0100
OSL_DEBUG_LEVEL > 1
diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx
index 7971d7a..9b2d966 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -56,7 +56,9 @@
#include "com/sun/star/registry/XSimpleRegistry.hpp"
#include "com/sun/star/registry/XImplementationRegistration.hpp"
#include "com/sun/star/security/XAccessController.hpp"
+#if OSL_DEBUG_LEVEL > 1
#include <stdio.h>
+#endif
#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
commit 21384876933080a67733cc60bda5597e5b4e87fb
Author: Gabor <jengab at elte.hu>
Date: Mon Aug 22 15:55:25 2011 +0200
servicefactory fix
diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx
index e796a96..7971d7a 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -56,6 +56,7 @@
#include "com/sun/star/registry/XSimpleRegistry.hpp"
#include "com/sun/star/registry/XImplementationRegistration.hpp"
#include "com/sun/star/security/XAccessController.hpp"
+#include <stdio.h>
#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
commit 2c12d570104aca935a302efd2429b01ad8dc8081
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon Aug 22 15:53:47 2011 +0200
fix warning errors
diff --git a/avmedia/source/quicktime/window.cxx b/avmedia/source/quicktime/window.cxx
index 9b9c14a..ca7c6d1 100644
--- a/avmedia/source/quicktime/window.cxx
+++ b/avmedia/source/quicktime/window.cxx
@@ -106,7 +106,7 @@ Window::~Window()
}
}
-bool Window::create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
+bool Window::create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& )
{
return true;
}
@@ -122,7 +122,7 @@ void SAL_CALL Window::update( )
// ------------------------------------------------------------------------------
-sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
+sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel )
throw (uno::RuntimeException)
{
return false;
@@ -147,7 +147,7 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
// XWindow
// ------------------------------------------------------------------------------
-void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
+void SAL_CALL Window::setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
throw (uno::RuntimeException)
{
if( mpParentView && mpMovieView )
@@ -177,7 +177,7 @@ awt::Rectangle SAL_CALL Window::getPosSize()
// ------------------------------------------------------------------------------
-void SAL_CALL Window::setVisible( sal_Bool bVisible )
+void SAL_CALL Window::setVisible( sal_Bool )
throw (uno::RuntimeException)
{
OSL_TRACE ("Window::setVisible");
@@ -186,7 +186,7 @@ void SAL_CALL Window::setVisible( sal_Bool bVisible )
// ------------------------------------------------------------------------------
-void SAL_CALL Window::setEnable( sal_Bool bEnable )
+void SAL_CALL Window::setEnable( sal_Bool )
throw (uno::RuntimeException)
{
;
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index e782e63..fc54779 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -53,21 +53,21 @@ public:
);
~Window();
- bool create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments );
+ bool create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& );
void processGraphEvent();
void updatePointer();
// XPlayerWindow
virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException);
// XWindow
- virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setVisible( sal_Bool ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setEnable( sal_Bool ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setFocus( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
commit 496ccc46d645aa7648155477a241acab4b58ab53
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 22 13:47:43 2011 +0100
regenerate up to date list
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 57a6a91..fed1326 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -132,8 +132,6 @@ public:
const rtl::OUString& GetLoadedScheme() const {return m_sLoadedScheme;}
- uno::Sequence< ::rtl::OUString> GetSchemeNames();
-
sal_Bool AddScheme(const rtl::OUString& rNode);
sal_Bool RemoveScheme(const rtl::OUString& rNode);
void SetModified(){ConfigItem::SetModified();}
@@ -512,11 +510,6 @@ void ExtendedColorConfig_Impl::SetColorConfigValue(const ::rtl::OUString& _sName
}
}
-uno::Sequence< ::rtl::OUString> ExtendedColorConfig_Impl::GetSchemeNames()
-{
- return GetNodeNames(C2U("ExtendedColorScheme/ColorSchemes"));
-}
-
sal_Bool ExtendedColorConfig_Impl::AddScheme(const rtl::OUString& rScheme)
{
if(ConfigItem::AddNode(C2U("ExtendedColorScheme/ColorSchemes"), rScheme))
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index deffceb..39055f1 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -105,17 +105,6 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Stri
// --------------------------------------------------------------------
-ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, MenuItemBits nBits )
-: mrMenu( rMenu )
-{
- init( nEntryId, nBits );
-
- maImage = rImage;
- mbHasImage = true;
-}
-
-// --------------------------------------------------------------------
-
ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, const String& rText, MenuItemBits nBits )
: mrMenu( rMenu )
{
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index f732f3d..e487483 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -92,7 +92,6 @@ public:
public:
ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const String& rText, MenuItemBits nBits );
- ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, MenuItemBits nBits );
ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, const String& rText, MenuItemBits nBits );
ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, Control* pControl, MenuItemBits nBits );
~ToolbarMenuEntry();
diff --git a/unusedcode.easy b/unusedcode.easy
index a979058..6b5984c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -240,6 +240,9 @@ Graphic::GetGraphicsCompressMode(SvStream&)
Graphic::StartAnimation(OutputDevice*, Point const&, long, OutputDevice*)
Graphic::WriteEmbedded(SvStream&)
GraphicConverter::ImplConvert(unsigned long, void*, unsigned long, void**, unsigned long)
+GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Point const&) const
+GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Size const&) const
+GraphicHelper::getDeviceInfo() const
GraphicReader::IsPreviewModeEnabled() const
GroupTable::SkipCurrentGroup()
HTMLControls::Insert(HTMLControl const*&, unsigned short&)
@@ -3036,8 +3039,7 @@ oox::AttributeList::getHyperHex(int, long) const
oox::AttributeList::getUnsignedHex(int, unsigned int) const
oox::BinaryInputStream::readNulCharArrayUC(unsigned short)
oox::ContainerHelper::insertByIndex(com::sun::star::uno::Reference<com::sun::star::container::XIndexContainer> const&, int, com::sun::star::uno::Any const&)
-oox::GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Point const&) const
-oox::GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Size const&) const
+oox::GraphicHelper::convertScreenPixelToHmm(com::sun::star::awt::Point const&) const
oox::ObjectContainer::getObject(rtl::OUString const&) const
oox::PropertyMap::dump()
oox::PropertyMap::dumpCode()
diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx
index 2ca801c..8373935 100644
--- a/vcl/inc/vcl/graph.hxx
+++ b/vcl/inc/vcl/graph.hxx
@@ -176,7 +176,6 @@ public:
Link GetAnimationNotifyHdl() const;
sal_uLong GetAnimationLoopCount() const;
- void ResetAnimationLoopCount();
sal_uLong GetChecksum() const;
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 8fa11e9..1bb208b 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -655,13 +655,6 @@ sal_uLong Graphic::GetAnimationLoopCount() const
// ------------------------------------------------------------------------
-void Graphic::ResetAnimationLoopCount()
-{
- mpImpGraphic->ImplResetAnimationLoopCount();
-}
-
-// ------------------------------------------------------------------------
-
GraphicReader* Graphic::GetContext()
{
return mpImpGraphic->ImplGetContext();
commit 04d567d42980584b726e43ead6190ba7b5435fc7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 22 13:27:30 2011 +0100
get rid of interim OUStrings
diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h
index 3b30a3d..11ccfd4 100644
--- a/framework/inc/protocols.h
+++ b/framework/inc/protocols.h
@@ -31,15 +31,7 @@
#ifndef __FRAMEWORK_PROTOCOLS_H_
#define __FRAMEWORK_PROTOCOLS_H_
-//_________________________________________________________________________________________________________________
-// includes
-//_________________________________________________________________________________________________________________
-
-#include <macros/generic.hxx>
-
-//_________________________________________________________________________________________________________________
-// namespace
-//_________________________________________________________________________________________________________________
+#include <rtl/ustring.hxx>
namespace framework{
@@ -50,16 +42,26 @@ namespace framework{
a real visible component.
*/
-#define SPECIALPROTOCOL_PRIVATE DECLARE_ASCII("private:" ) // indicates a loadable content in general!
-#define SPECIALPROTOCOL_PRIVATE_OBJECT DECLARE_ASCII("private:object" ) // indicates loading of components using a model directly
-#define SPECIALPROTOCOL_PRIVATE_STREAM DECLARE_ASCII("private:stream" ) // indicates loading of components using a stream only
-#define SPECIALPROTOCOL_PRIVATE_FACTORY DECLARE_ASCII("private:factory") // indicates creation of empty documents
-#define SPECIALPROTOCOL_SLOT DECLARE_ASCII("slot:" ) // internal protocol of the sfx project for generic dispatch funtionality
-#define SPECIALPROTOCOL_UNO DECLARE_ASCII(".uno:" ) // external representation of the slot protocol using names instead of id's
-#define SPECIALPROTOCOL_MACRO DECLARE_ASCII("macro:" ) // special sfx protocol to execute macros
-#define SPECIALPROTOCOL_SERVICE DECLARE_ASCII("service:" ) // generic way to start uno services during dispatch
-#define SPECIALPROTOCOL_MAILTO DECLARE_ASCII("mailto:" ) // for sending mails
-#define SPECIALPROTOCOL_NEWS DECLARE_ASCII("news:" ) // for sending news
+// indicates a loadable content in general!
+#define SPECIALPROTOCOL_PRIVATE "private:"
+// indicates loading of components using a model directly
+#define SPECIALPROTOCOL_PRIVATE_OBJECT "private:object"
+// indicates loading of components using a stream only
+#define SPECIALPROTOCOL_PRIVATE_STREAM "private:stream"
+// indicates creation of empty documents
+#define SPECIALPROTOCOL_PRIVATE_FACTORY "private:factory"
+// internal protocol of the sfx project for generic dispatch funtionality
+#define SPECIALPROTOCOL_SLOT "slot:"
+// external representation of the slot protocol using names instead of id's
+#define SPECIALPROTOCOL_UNO ".uno:"
+// special sfx protocol to execute macros
+#define SPECIALPROTOCOL_MACRO "macro:"
+// generic way to start uno services during dispatch
+#define SPECIALPROTOCOL_SERVICE "service:"
+// for sending mails
+#define SPECIALPROTOCOL_MAILTO "mailto:"
+// for sending news
+#define SPECIALPROTOCOL_NEWS "news:"
class ProtocolCheck
{
@@ -94,34 +96,34 @@ class ProtocolCheck
{
// because "private:" is part of e.g. "private:object" too ...
// we must check it before all other ones!!!
- if (sURL.compareTo(SPECIALPROTOCOL_PRIVATE,SPECIALPROTOCOL_PRIVATE.getLength()) == 0)
+ if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_PRIVATE)))
return E_PRIVATE;
else
- if (sURL.compareTo(SPECIALPROTOCOL_PRIVATE_OBJECT,SPECIALPROTOCOL_PRIVATE_OBJECT.getLength()) == 0)
+ if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_PRIVATE_OBJECT)))
return E_PRIVATE_OBJECT;
else
- if (sURL.compareTo(SPECIALPROTOCOL_PRIVATE_STREAM,SPECIALPROTOCOL_PRIVATE_STREAM.getLength()) == 0)
+ if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_PRIVATE_STREAM)))
return E_PRIVATE_STREAM;
else
- if (sURL.compareTo(SPECIALPROTOCOL_PRIVATE_FACTORY,SPECIALPROTOCOL_PRIVATE_FACTORY.getLength()) == 0)
+ if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_PRIVATE_FACTORY)))
return E_PRIVATE_FACTORY;
else
- if (sURL.compareTo(SPECIALPROTOCOL_SLOT,SPECIALPROTOCOL_SLOT.getLength()) == 0)
+ if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_SLOT)))
return E_SLOT;
else
- if (sURL.compareTo(SPECIALPROTOCOL_UNO,SPECIALPROTOCOL_UNO.getLength()) == 0)
+ if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_UNO)))
return E_UNO;
else
- if (sURL.compareTo(SPECIALPROTOCOL_MACRO,SPECIALPROTOCOL_MACRO.getLength()) == 0)
+ if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_MACRO)))
return E_MACRO;
else
- if (sURL.compareTo(SPECIALPROTOCOL_SERVICE,SPECIALPROTOCOL_SERVICE.getLength()) == 0)
+ if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_SERVICE)))
return E_SERVICE;
else
- if (sURL.compareTo(SPECIALPROTOCOL_MAILTO,SPECIALPROTOCOL_MAILTO.getLength()) == 0)
+ if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_MAILTO)))
return E_MAILTO;
else
- if (sURL.compareTo(SPECIALPROTOCOL_NEWS,SPECIALPROTOCOL_NEWS.getLength()) == 0)
+ if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_NEWS)))
return E_NEWS;
else
return E_UNKNOWN_PROTOCOL;
@@ -139,34 +141,34 @@ class ProtocolCheck
switch(eRequired)
{
case E_PRIVATE:
- bRet = (sURL.equalsAsciiL(SPECIALPROTOCOL_PRIVATE ,SPECIALPROTOCOL_PRIVATE.getLength() ) == 0);
+ bRet = sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_PRIVATE));
break;
case E_PRIVATE_OBJECT:
- bRet = (sURL.compareTo(SPECIALPROTOCOL_PRIVATE_OBJECT ,SPECIALPROTOCOL_PRIVATE_OBJECT.getLength() ) == 0);
+ bRet = sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_PRIVATE_OBJECT));
break;
case E_PRIVATE_STREAM:
- bRet = (sURL.compareTo(SPECIALPROTOCOL_PRIVATE_STREAM ,SPECIALPROTOCOL_PRIVATE_STREAM.getLength() ) == 0);
+ bRet = sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_PRIVATE_STREAM));
break;
case E_PRIVATE_FACTORY:
- bRet = (sURL.compareTo(SPECIALPROTOCOL_PRIVATE_FACTORY,SPECIALPROTOCOL_PRIVATE_FACTORY.getLength()) == 0);
+ bRet = sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_PRIVATE_FACTORY));
break;
case E_SLOT:
- bRet = (sURL.compareTo(SPECIALPROTOCOL_SLOT ,SPECIALPROTOCOL_SLOT.getLength() ) == 0);
+ bRet = sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_SLOT));
break;
case E_UNO:
- bRet = (sURL.compareTo(SPECIALPROTOCOL_UNO ,SPECIALPROTOCOL_UNO.getLength() ) == 0);
+ bRet = sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_UNO));
break;
case E_MACRO:
- bRet = (sURL.compareTo(SPECIALPROTOCOL_MACRO ,SPECIALPROTOCOL_MACRO.getLength() ) == 0);
+ bRet = sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_MACRO));
break;
case E_SERVICE:
- bRet = (sURL.compareTo(SPECIALPROTOCOL_SERVICE ,SPECIALPROTOCOL_SERVICE.getLength() ) == 0);
+ bRet = sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_SERVICE));
break;
case E_MAILTO:
- bRet = (sURL.compareTo(SPECIALPROTOCOL_MAILTO ,SPECIALPROTOCOL_MAILTO.getLength() ) == 0);
+ bRet = sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_MAILTO));
break;
case E_NEWS:
- bRet = (sURL.compareTo(SPECIALPROTOCOL_NEWS ,SPECIALPROTOCOL_NEWS.getLength() ) == 0);
+ bRet = sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(SPECIALPROTOCOL_NEWS));
break;
default:
bRet = sal_False;
commit 86340f0a476cb19677dcf7991cae75049fd88579
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 22 12:19:04 2011 +0100
WaE: keep simple minded compiler happy
diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h
index 88ec160..3b30a3d 100644
--- a/framework/inc/protocols.h
+++ b/framework/inc/protocols.h
@@ -135,21 +135,44 @@ class ProtocolCheck
*/
static sal_Bool isProtocol( const ::rtl::OUString& sURL, EProtocol eRequired )
{
+ sal_Bool bRet = sal_False;
switch(eRequired)
{
- case E_PRIVATE : return (sURL.compareTo(SPECIALPROTOCOL_PRIVATE ,SPECIALPROTOCOL_PRIVATE.getLength() ) == 0);
- case E_PRIVATE_OBJECT : return (sURL.compareTo(SPECIALPROTOCOL_PRIVATE_OBJECT ,SPECIALPROTOCOL_PRIVATE_OBJECT.getLength() ) == 0);
- case E_PRIVATE_STREAM : return (sURL.compareTo(SPECIALPROTOCOL_PRIVATE_STREAM ,SPECIALPROTOCOL_PRIVATE_STREAM.getLength() ) == 0);
- case E_PRIVATE_FACTORY : return (sURL.compareTo(SPECIALPROTOCOL_PRIVATE_FACTORY,SPECIALPROTOCOL_PRIVATE_FACTORY.getLength()) == 0);
- case E_SLOT : return (sURL.compareTo(SPECIALPROTOCOL_SLOT ,SPECIALPROTOCOL_SLOT.getLength() ) == 0);
- case E_UNO : return (sURL.compareTo(SPECIALPROTOCOL_UNO ,SPECIALPROTOCOL_UNO.getLength() ) == 0);
- case E_MACRO : return (sURL.compareTo(SPECIALPROTOCOL_MACRO ,SPECIALPROTOCOL_MACRO.getLength() ) == 0);
- case E_SERVICE : return (sURL.compareTo(SPECIALPROTOCOL_SERVICE ,SPECIALPROTOCOL_SERVICE.getLength() ) == 0);
- case E_MAILTO : return (sURL.compareTo(SPECIALPROTOCOL_MAILTO ,SPECIALPROTOCOL_MAILTO.getLength() ) == 0);
- case E_NEWS : return (sURL.compareTo(SPECIALPROTOCOL_NEWS ,SPECIALPROTOCOL_NEWS.getLength() ) == 0);
- default : return sal_False;
+ case E_PRIVATE:
+ bRet = (sURL.equalsAsciiL(SPECIALPROTOCOL_PRIVATE ,SPECIALPROTOCOL_PRIVATE.getLength() ) == 0);
+ break;
+ case E_PRIVATE_OBJECT:
+ bRet = (sURL.compareTo(SPECIALPROTOCOL_PRIVATE_OBJECT ,SPECIALPROTOCOL_PRIVATE_OBJECT.getLength() ) == 0);
+ break;
+ case E_PRIVATE_STREAM:
+ bRet = (sURL.compareTo(SPECIALPROTOCOL_PRIVATE_STREAM ,SPECIALPROTOCOL_PRIVATE_STREAM.getLength() ) == 0);
+ break;
+ case E_PRIVATE_FACTORY:
+ bRet = (sURL.compareTo(SPECIALPROTOCOL_PRIVATE_FACTORY,SPECIALPROTOCOL_PRIVATE_FACTORY.getLength()) == 0);
+ break;
+ case E_SLOT:
+ bRet = (sURL.compareTo(SPECIALPROTOCOL_SLOT ,SPECIALPROTOCOL_SLOT.getLength() ) == 0);
+ break;
+ case E_UNO:
+ bRet = (sURL.compareTo(SPECIALPROTOCOL_UNO ,SPECIALPROTOCOL_UNO.getLength() ) == 0);
+ break;
+ case E_MACRO:
+ bRet = (sURL.compareTo(SPECIALPROTOCOL_MACRO ,SPECIALPROTOCOL_MACRO.getLength() ) == 0);
+ break;
+ case E_SERVICE:
+ bRet = (sURL.compareTo(SPECIALPROTOCOL_SERVICE ,SPECIALPROTOCOL_SERVICE.getLength() ) == 0);
+ break;
+ case E_MAILTO:
+ bRet = (sURL.compareTo(SPECIALPROTOCOL_MAILTO ,SPECIALPROTOCOL_MAILTO.getLength() ) == 0);
+ break;
+ case E_NEWS:
+ bRet = (sURL.compareTo(SPECIALPROTOCOL_NEWS ,SPECIALPROTOCOL_NEWS.getLength() ) == 0);
+ break;
+ default:
+ bRet = sal_False;
+ break;
}
- return sal_False;
+ return bRet;
}
};
commit e85875b9018cc7c286ff9d40789d15e003ca9845
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Aug 3 15:08:56 2011 +0200
convert avmedia to gbuild
diff --git a/Repository.mk b/Repository.mk
index f58d9f1..6892ecc 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
sdbc \
AppleRemote \
avmedia \
+ avmediaQuickTime \
basegfx \
chartcontroller \
chartmodel \
@@ -150,6 +151,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ avmediagst \
+ avmediawin \
collator_data \
dict_ja \
dict_zh \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 08c34dc..03ad711 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -661,6 +661,13 @@ $(call gb_LinkTarget_add_libs,$(1), \
endef
+define gb_LinkTarget__use_qtkit
+$(call gb_LinkTarget_add_libs,$(1), \
+ -framework QTKit \
+)
+
+endef
+
define gb_LinkTarget__use_quicktime
$(call gb_LinkTarget_add_libs,$(1), \
-framework QuickTime \
diff --git a/avmedia/AllLangResTarget_avmedia.mk b/avmedia/AllLangResTarget_avmedia.mk
new file mode 100644
index 0000000..c66f8da
--- /dev/null
+++ b/avmedia/AllLangResTarget_avmedia.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.kukan at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,avmedia))
+
+$(eval $(call gb_AllLangResTarget_add_srs,avmedia,\
+ avmedia/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,avmedia/res))
+
+$(eval $(call gb_SrsTarget_set_include,avmedia/res,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/avmedia/inc) \
+ -I$(realpath $(SRCDIR)/avmedia/source/framework) \
+ -I$(realpath $(SRCDIR)/avmedia/source/viewer) \
+))
+
+$(eval $(call gb_SrsTarget_add_files,avmedia/res,\
+ avmedia/source/framework/mediacontrol.src \
+ avmedia/source/viewer/mediawindow.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
new file mode 100644
index 0000000..9f6bd52
--- /dev/null
+++ b/avmedia/Library_avmedia.mk
@@ -0,0 +1,77 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.kukan at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,avmedia))
+
+$(eval $(call gb_Library_add_package_headers,avmedia,avmedia_inc))
+
+$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
+
+$(eval $(call gb_Library_set_include,avmedia,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/avmedia/inc) \
+ -I$(realpath $(SRCDIR)/avmedia/source/inc) \
+))
+
+$(eval $(call gb_Library_add_api,avmedia,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_defs,avmedia,\
+ -DAVMEDIA_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,avmedia,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sfx \
+ svl \
+ svt \
+ tl \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,avmedia,\
+ avmedia/source/framework/mediacontrol \
+ avmedia/source/framework/mediaitem \
+ avmedia/source/framework/mediamisc \
+ avmedia/source/framework/mediaplayer \
+ avmedia/source/framework/mediatoolbox \
+ avmedia/source/framework/soundhandler \
+ avmedia/source/viewer/mediaevent_impl \
+ avmedia/source/viewer/mediawindowbase_impl \
+ avmedia/source/viewer/mediawindow \
+ avmedia/source/viewer/mediawindow_impl \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk
new file mode 100644
index 0000000..6c25594
--- /dev/null
+++ b/avmedia/Library_avmediaQuickTime.mk
@@ -0,0 +1,71 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.kukan at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,avmediaQuickTime))
+
+$(eval $(call gb_Library_set_componentfile,avmediaQuickTime,avmedia/source/quicktime/avmediaQuickTime))
+
+$(eval $(call gb_Library_set_include,avmediaQuickTime,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/avmedia/source/inc) \
+))
+
+$(eval $(call gb_Library_add_api,avmediaQuickTime,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,avmediaQuickTime,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_use_externals,avmediaQuickTime,\
+ cocoa \
+ qtkit \
+ quicktime \
+))
+
+$(eval $(call gb_Library_add_exception_objects,avmediaQuickTime,\
+ avmedia/source/quicktime/framegrabber \
+ avmedia/source/quicktime/manager \
+ avmedia/source/quicktime/player \
+ avmedia/source/quicktime/quicktimeuno \
+ avmedia/source/quicktime/window \
+))
+
+$(eval $(call gb_Library_add_cxxflags,avmediaQuickTime,\
+ $(gb_LinkTarget_OBJCXXFLAGS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
new file mode 100644
index 0000000..4c014e6
--- /dev/null
+++ b/avmedia/Library_avmediagst.mk
@@ -0,0 +1,72 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.kukan at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,avmediagst))
+
+$(eval $(call gb_Library_set_componentfile,avmediagst,avmedia/source/gstreamer/avmediagstreamer))
+
+$(eval $(call gb_Library_set_include,avmediagst,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/avmedia/source/inc) \
+ $(shell pkg-config --cflags gstreamer-0.10, gstreamer-plugins-base-0.10) \
+))
+
+$(eval $(call gb_Library_add_api,avmediagst,\
+ udkapi \
+ offapi \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_defs,avmediagst,\
+ -DWINNT
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,avmediagst,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,avmediagst,\
+ $(shell pkg-config --libs gstreamer-0.10, gstreamer-plugins-base-0.10) \
+ -lgstinterfaces-0.10 \
+))
+
+$(eval $(call gb_Library_add_exception_objects,avmediagst,\
+ avmedia/source/gstreamer/gstmanager \
+ avmedia/source/gstreamer/gstplayer \
+ avmedia/source/gstreamer/gstuno \
+ avmedia/source/gstreamer/gstwindow \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk
new file mode 100644
index 0000000..bf09a03
--- /dev/null
+++ b/avmedia/Library_avmediawin.mk
@@ -0,0 +1,70 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.kukan at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,avmediawin))
+
+$(eval $(call gb_Library_set_componentfile,avmediawin,avmedia/source/win/avmediawin))
+
+$(eval $(call gb_Library_set_include,avmediawin,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/avmedia/source/inc) \
+))
+
+$(eval $(call gb_Library_add_api,avmediawin,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,avmediawin,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ gdi32 \
+ ole32 \
+ oleaut32 \
+ sal \
+ tl \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,avmediawin,\
+ strmiids.lib \
+ dxguid.lib \
+))
+
+$(eval $(call gb_Library_add_exception_objects,avmediawin,\
+ avmedia/source/win/framegrabber \
+ avmedia/source/win/manager \
+ avmedia/source/win/player \
+ avmedia/source/win/window \
+ avmedia/source/win/winuno \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Makefile b/avmedia/Makefile
new file mode 100644
index 0000000..a1b344d
--- /dev/null
+++ b/avmedia/Makefile
@@ -0,0 +1,39 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
new file mode 100644
index 0000000..729c24f
--- /dev/null
+++ b/avmedia/Module_avmedia.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.kukan at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,avmedia))
+
+$(eval $(call gb_Module_add_targets,avmedia,\
+ AllLangResTarget_avmedia \
+ Library_avmedia \
+ Package_inc \
+))
+
+ifeq ($(ENABLE_GSTREAMER),TRUE)
+$(eval $(call gb_Module_add_targets,avmedia,\
+ Library_avmediagst \
+))
+endif
+
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Module_add_targets,avmedia,\
+ Library_avmediaQuickTime \
+))
+endif
+
+ifeq ($(OS),WNT)
+ifneq ($(ENABLE_DIRECTX),)
+$(eval $(call gb_Module_add_targets,avmedia,\
+ Library_avmediawin \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Package_inc.mk b/avmedia/Package_inc.mk
new file mode 100644
index 0000000..c245ba3
--- /dev/null
+++ b/avmedia/Package_inc.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.kukan at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,avmedia_inc,$(SRCDIR)/avmedia/inc))
+
+$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/avmediadllapi.h,avmedia/avmediadllapi.h))
+$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediaitem.hxx,avmedia/mediaitem.hxx))
+$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediaplayer.hxx,avmedia/mediaplayer.hxx))
+$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediatoolbox.hxx,avmedia/mediatoolbox.hxx))
+$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediawindow.hxx,avmedia/mediawindow.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/inc/avmedia/avmediadllapi.h b/avmedia/inc/avmedia/avmediadllapi.h
new file mode 100644
index 0000000..93bcdf9
--- /dev/null
+++ b/avmedia/inc/avmedia/avmediadllapi.h
@@ -0,0 +1,16 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#ifndef INCLUDED_AVMEDIADLLAPI_H
+#define INCLUDED_AVMEDIADLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(AVMEDIA_DLLIMPLEMENTATION)
+#define AVMEDIA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define AVMEDIA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define AVMEDIA_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_AVMEDIADLLAPI_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index 4ae504f..a535040 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -32,6 +32,7 @@
#include <tools/rtti.hxx>
#include <svl/poolitem.hxx>
#include <com/sun/star/media/ZoomLevel.hpp>
+#include <avmedia/avmediadllapi.h>
#define AVMEDIA_SETMASK_NONE ((sal_uInt32)(0x00000000))
#define AVMEDIA_SETMASK_STATE ((sal_uInt32)(0x00000001))
@@ -65,7 +66,7 @@ enum MediaState
// - MediaItem -
// -------------
-class MediaItem : public SfxPoolItem
+class AVMEDIA_DLLPUBLIC MediaItem : public SfxPoolItem
{
public:
TYPEINFO();
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
index 2d49f80..f11f4c0 100644
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -32,6 +32,7 @@
#include <sfx2/ctrlitem.hxx>
#include <sfx2/dockwin.hxx>
#include <tools/urlobj.hxx>
+#include <avmedia/avmediadllapi.h>
// -----------
// - Defines -
@@ -50,7 +51,7 @@ namespace avmedia
// - MediaPlayer -
// ---------------
-class MediaPlayer : public SfxChildWindow
+class AVMEDIA_DLLPUBLIC MediaPlayer : public SfxChildWindow
{
public:
MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
@@ -65,7 +66,7 @@ public:
class MediaWindow;
-class MediaFloater : public SfxDockingWindow
+class AVMEDIA_DLLPUBLIC MediaFloater : public SfxDockingWindow
{
public:
@@ -89,7 +90,7 @@ private:
long mnDummy1;
long mnDummy2;
- void implInit();
+ AVMEDIA_DLLPRIVATE void implInit();
};
}
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
index 3b5023a..2f406ca 100644
--- a/avmedia/inc/avmedia/mediatoolbox.hxx
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -31,6 +31,7 @@
#include <svl/lstner.hxx>
#include <sfx2/tbxctrl.hxx>
+#include <avmedia/avmediadllapi.h>
namespace avmedia
{
@@ -41,7 +42,7 @@ namespace avmedia
class MediaItem;
-class MediaToolBoxControl : public SfxToolBoxControl
+class AVMEDIA_DLLPUBLIC MediaToolBoxControl : public SfxToolBoxControl
{
friend class MediaToolBoxControl_Impl;
@@ -57,8 +58,8 @@ public:
private:
- void implUpdateMediaControl();
- void implExecuteMediaControl( const MediaItem& rItem );
+ AVMEDIA_DLLPUBLIC void implUpdateMediaControl();
+ AVMEDIA_DLLPUBLIC void implExecuteMediaControl( const MediaItem& rItem );
};
}
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
index aee3397..9de4ab6 100644
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/avmedia/inc/avmedia/mediawindow.hxx
@@ -36,6 +36,7 @@
#include <com/sun/star/media/XPlayer.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/uno/XInterface.hpp>
+#include <avmedia/avmediadllapi.h>
// -----------
// - Defines -
@@ -72,7 +73,7 @@ namespace avmedia
// - MediaWindow -
// ---------------
- class MediaWindow
+ class AVMEDIA_DLLPUBLIC MediaWindow
{
public:
MediaWindow( Window* parent, bool bInternalMediaControl );
@@ -131,8 +132,8 @@ namespace avmedia
private:
// default: disabled copy/assignment
- MediaWindow(const MediaWindow&);
- MediaWindow& operator =( const MediaWindow& );
+ AVMEDIA_DLLPRIVATE MediaWindow(const MediaWindow&);
+ AVMEDIA_DLLPRIVATE MediaWindow& operator =( const MediaWindow& );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxIFace;
priv::MediaWindowImpl* mpImpl;
diff --git a/avmedia/prj/build.lst b/avmedia/prj/build.lst
index 78397f2..4cc76ad 100644
--- a/avmedia/prj/build.lst
+++ b/avmedia/prj/build.lst
@@ -1,11 +1,2 @@
av avmedia : TRANSLATIONS:translations tools sfx2 LIBXSLT:libxslt NULL
-av avmedia usr1 - all av_mkout NULL
-av avmedia\prj get - all av_prj NULL
-av avmedia\inc get - all av_inv NULL
-av avmedia\source\viewer nmake - all av_viewer NULL
-av avmedia\source\framework nmake - all av_framework NULL
-av avmedia\source\win nmake - all av_win NULL
-av avmedia\source\java nmake - all av_java NULL
-av avmedia\source\quicktime nmake - all av_quicktime 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_gstreamer NULL
+av avmedia\prj nmake - all av_prj NULL
diff --git a/avmedia/prj/d.lst b/avmedia/prj/d.lst
index 12fea55..e69de29 100644
--- a/avmedia/prj/d.lst
+++ b/avmedia/prj/d.lst
@@ -1,23 +0,0 @@
-mkdir: %COMMON_DEST%\bin\hid
-mkdir: %COMMON_DEST%\res
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
-..\%__SRC%\bin\avmedia*.dll %_DEST%\bin\avmedia*.dll
-..\source\java\avmedia.jar %_DEST%\bin\avmedia.jar
-..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.*
-..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
-..\%__SRC%\bin\avmedia*.res %_DEST%\bin\avmedia*.res
-
-mkdir: %_DEST%\inc\avmedia
-
-..\inc\avmedia\mediawindow.hxx %_DEST%\inc\avmedia\mediawindow.hxx
-..\inc\avmedia\mediaitem.hxx %_DEST%\inc\avmedia\mediaitem.hxx
-..\inc\avmedia\mediaplayer.hxx %_DEST%\inc\avmedia\mediaplayer.hxx
-..\inc\avmedia\mediatoolbox.hxx %_DEST%\inc\avmedia\mediatoolbox.hxx
-
-..\%__SRC%\class\avmedia.jar %_DEST%\bin\avmedia.jar
-..\%__SRC%\misc\avmedia.component %_DEST%\xml\avmedia.component
-..\%__SRC%\misc\avmedia.jar.component %_DEST%\xml\avmedia.jar.component
-..\%__SRC%\misc\avmediaQuickTime.component %_DEST%\xml\avmediaQuickTime.component
-..\%__SRC%\misc\avmediagstreamer.component %_DEST%\xml\avmediagstreamer.component
-..\%__SRC%\misc\avmediawin.component %_DEST%\xml\avmediawin.component
diff --git a/avmedia/prj/makefile.mk b/avmedia/prj/makefile.mk
new file mode 100644
index 0000000..d30ff8a
--- /dev/null
+++ b/avmedia/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# 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.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/avmedia/source/framework/makefile.mk b/avmedia/source/framework/makefile.mk
deleted file mode 100755
index 4c814c5..0000000
--- a/avmedia/source/framework/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=avmedia
-TARGET=framework
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Resources ---------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
- mediacontrol.src
-
-# --- Files -------------------------------------
-
-SLOFILES= \
- $(EXCEPTIONSFILES) \
- $(SLO)$/mediaitem.obj \
-
-EXCEPTIONSFILES = \
- $(SLO)$/mediacontrol.obj \
- $(SLO)$/mediamisc.obj \
- $(SLO)$/mediaplayer.obj \
- $(SLO)$/mediatoolbox.obj \
- $(SLO)$/soundhandler.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
diff --git a/avmedia/source/gstreamer/exports.dxp b/avmedia/source/gstreamer/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/avmedia/source/gstreamer/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/avmedia/source/gstreamer/makefile.mk b/avmedia/source/gstreamer/makefile.mk
deleted file mode 100755
index c87d43a..0000000
--- a/avmedia/source/gstreamer/makefile.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2010 Novell, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=avmedia
-TARGET=avmediagst
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(ENABLE_GSTREAMER)" == "TRUE"
-
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
-.ENDIF
-
-PKGCONFIG_MODULES=gstreamer-0.10, gstreamer-plugins-base-0.10
-.INCLUDE: pkg_config.mk
-PKGCONFIG_LIBS+=-lgstinterfaces-0.10
-
-# --- Files ----------------------------------
-
-.IF "$(GUI)" == "UNX" || "$(GUI)" == "WNT"
-
-.IF "$(GUI)" == "WNT"
-CDEFS+= -DWINNT
-.ENDIF
-
-SLOFILES= \
- $(SLO)$/gstuno.obj \
- $(SLO)$/gstmanager.obj \
- $(SLO)$/gstplayer.obj \
- $(SLO)$/gstwindow.obj
-
-
-EXCEPTIONSFILES= \
- $(SLO)$/gstuno.obj \
-
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(PKGCONFIG_LIBS) $(TOOLSLIB) $(VCLLIB)
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-# on Solaris checkdll does not work: LD_LIBRARY_PATH breaks the 2 libxml2.so.2
-SHL1NOCHECK=t
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-.ENDIF # UNX / WNT
-.ENDIF # ENABLE_GSTREAMER
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_GSTREAMER)" == "TRUE"
-.IF "$(GUI)" == "UNX" || "$(GUI)" == "WNT"
-
-ALLTAR : $(MISC)/avmediagstreamer.component
-$(MISC)/avmediagstreamer.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt avmediagstreamer.component
- $(XSLTPROC) --nonet \
- --stringparam uri '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' \
- -o $@ $(SOLARENV)/bin/createcomponent.xslt avmediagstreamer.component
-
-.ENDIF # UNX / WNT
-.ENDIF # ENABLE_GSTREAMER
diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk
deleted file mode 100755
index 358fce4..0000000
--- a/avmedia/source/quicktime/makefile.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=avmedia
-TARGET=avmediaQuickTime
-
-.IF "$(GUIBASE)"=="aqua"
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
-.ENDIF
-
-# --- Files ----------------------------------
-
-CFLAGSCXX+=$(OBJCXXFLAGS)
-
-SLOFILES= \
- $(SLO)$/quicktimeuno.obj \
- $(SLO)$/manager.obj \
- $(SLO)$/window.obj \
- $(SLO)$/framegrabber.obj \
- $(SLO)$/player.obj
-
-EXCEPTIONSFILES= \
- $(SLO)$/quicktimeuno.obj
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(SALLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(TOOLSLIB) \
- $(VCLLIB)
-
-SHL1STDLIBS+= \
- -framework Cocoa \
- -framework QTKit \
- -framework QuickTime
-
-# build DLL
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1IMPLIB=i$(TARGET)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.ELSE
-dummy:
- @echo " Nothing to build for GUIBASE=$(GUIBASE)"
-.ENDIF
-
-ALLTAR : $(MISC)/avmediaQuickTime.component
-
-$(MISC)/avmediaQuickTime.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
diff --git a/avmedia/source/viewer/makefile.mk b/avmedia/source/viewer/makefile.mk
deleted file mode 100755
index 7771d1e..0000000
--- a/avmedia/source/viewer/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=avmedia
-TARGET=viewer
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Resources ---------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
- mediawindow.src
-
-# --- Files -------------------------------------
-
-SLOFILES= \
- $(EXCEPTIONSFILES)
-
-EXCEPTIONSFILES= \
- $(SLO)$/mediaevent_impl.obj \
- $(SLO)$/mediawindow.obj \
- $(SLO)$/mediawindow_impl.obj \
- $(SLO)$/mediawindowbase_impl.obj \
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
diff --git a/avmedia/source/win/exports.dxp b/avmedia/source/win/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/avmedia/source/win/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/avmedia/source/win/makefile.mk b/avmedia/source/win/makefile.mk
deleted file mode 100755
index 7c6c9e1..0000000
--- a/avmedia/source/win/makefile.mk
+++ /dev/null
@@ -1,88 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=avmedia
-TARGET=avmediawin
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(ENABLE_DIRECTX)" != ""
-
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
-.ENDIF
-
-# --- Files ----------------------------------
-
-.IF "$(GUI)" == "WNT"
-
-SLOFILES= \
- $(SLO)$/winuno.obj \
- $(SLO)$/manager.obj \
- $(SLO)$/window.obj \
- $(SLO)$/player.obj \
- $(SLO)$/framegrabber.obj
-
-EXCEPTIONSFILES= \
- $(SLO)$/winuno.obj \
- $(SLO)$/framegrabber.obj
-
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(UNOTOOLSLIB) $(TOOLSLIB) $(VCLLIB)
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-SHL1STDLIBS += $(OLE32LIB)
-SHL1STDLIBS += $(OLEAUT32LIB)
-SHL1STDLIBS += $(GDI32LIB)
-
-.IF "$(COM)"=="GCC"
-SHL1STDLIBS += $(PSDK_HOME)$/lib$/strmiids.lib
-.ELSE
-SHL1STDLIBS += strmiids.lib
-SHL1STDLIBS += dxguid.lib
-.ENDIF
-
-.ENDIF
-.ENDIF
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/avmediawin.component
-
-$(MISC)/avmediawin.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- avmediawin.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt avmediawin.component
diff --git a/avmedia/util/hidother.src b/avmedia/util/hidother.src
deleted file mode 100644
index c6d5dc0..0000000
--- a/avmedia/util/hidother.src
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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.
- *
- ************************************************************************/
-
-#include "../inc/helpids.hrc"
-
-hidspecial HID_AVMEDIA_TOOLBOXITEM_PLAY { HelpId = HID_AVMEDIA_TOOLBOXITEM_PLAY; };
-hidspecial HID_AVMEDIA_TOOLBOXITEM_PAUSE { HelpId = HID_AVMEDIA_TOOLBOXITEM_PAUSE; };
-hidspecial HID_AVMEDIA_TOOLBOXITEM_STOP { HelpId = HID_AVMEDIA_TOOLBOXITEM_STOP; };
-hidspecial HID_AVMEDIA_TOOLBOXITEM_MUTE { HelpId = HID_AVMEDIA_TOOLBOXITEM_MUTE; };
-hidspecial HID_AVMEDIA_TOOLBOXITEM_LOOP { HelpId = HID_AVMEDIA_TOOLBOXITEM_LOOP; };
-hidspecial HID_AVMEDIA_TOOLBOXITEM_OPEN { HelpId = HID_AVMEDIA_TOOLBOXITEM_OPEN; };
-hidspecial HID_AVMEDIA_TOOLBOXITEM_INSERT { HelpId = HID_AVMEDIA_TOOLBOXITEM_INSERT; };
-hidspecial HID_AVMEDIA_ZOOMLISTBOX { HelpId = HID_AVMEDIA_ZOOMLISTBOX; };
-hidspecial HID_AVMEDIA_TIMESLIDER { HelpId = HID_AVMEDIA_TIMESLIDER; };
-hidspecial HID_AVMEDIA_TIMEEDIT { HelpId = HID_AVMEDIA_TIMEEDIT; };
-hidspecial HID_AVMEDIA_VOLUMESLIDER { HelpId = HID_AVMEDIA_VOLUMESLIDER; };
-hidspecial HID_AVMEDIA_PLAYERWINDOW { HelpId = HID_AVMEDIA_PLAYERWINDOW; };
diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk
deleted file mode 100755
index 06882dd..0000000
--- a/avmedia/util/makefile.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..
-PRJNAME=avmedia
-TARGET=avmedia
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Resources ---------------------------------
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES= \
- $(SRS)$/viewer.srs \
- $(SRS)$/framework.srs
-
-# --- Files -------------------------------------
-
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1FILES=\
- $(SLB)$/viewer.lib \
- $(SLB)$/framework.lib
-
-# ==========================================================================
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-.IF "$(COM)" == "MSC"
-SHL1IMPLIB=i$(TARGET)
-.ELSE
-SHL1IMPLIB=$(TARGET)$(DLLPOSTFIX)
-.ENDIF
-SHL1STDLIBS=$(UNOTOOLSLIB) $(TOOLSLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(SVTOOLLIB) $(SVLLIB) $(SFXLIB)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-
-DEF1NAME=$(SHL1TARGET)
-DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt $(LIB1TARGET)
-DEF1DES=Avmedia
-DEFLIB1NAME =$(TARGET)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(depend)"==""
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
- @echo ------------------------------
- @echo Making: $@
- @echo _Impl>$@
- @echo WEP>>$@
- @echo LIBMAIN>>$@
- @echo LibMain>>$@
- @echo CT>>$@
-.ENDIF
-
-ALLTAR : $(MISC)/avmedia.component
-
-$(MISC)/avmedia.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- avmedia.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt avmedia.component
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index fb54852..b5f50a0 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -40,12 +40,12 @@ GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
my_components = \
abp \
- avmedia \
basprov \
bib \
cached1 \
calc \
component/animations/source/animcore/animcore \
+ component/avmedia/util/avmedia \
component/basctl/util/basctl \
component/basic/util/sb \
component/chart2/source/controller/chartcontroller \
@@ -290,13 +290,16 @@ my_components += component/xmlsecurity/util/xsec_xmlsec
.IF "$(OS)" == "MACOSX"
my_components += \
MacOSXSpell \
- avmediaQuickTime \
fps_aqua \
macab1 \
macbe1 \
component/vcl/vcl.macosx
.END
+.IF "$(GUIBASE)" == "aqua"
+my_components += component/avmedia/source/quicktime/avmediaQuickTime
+.END
+
.IF "$(OS)" == "WNT"
my_components += \
ado \
@@ -326,7 +329,7 @@ my_components += \
.IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != ""
my_components += \
- avmediawin \
+ component/avmedia/source/win/avmediawin \
component/canvas/source/directx/directx9canvas \
component/canvas/source/directx/gdipluscanvas
.END
@@ -359,7 +362,7 @@ my_components += evoab
.END
.IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
-my_components += avmediagstreamer
+my_components += component/avmedia/source/gstreamer/avmediagstreamer
.END
my_ooo_components = mailmerge
commit fee5ca25dcb18cbdcfb9406905ece5d65d21b88e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon Aug 22 13:08:07 2011 +0200
remove Java piece from avmedia
diff --git a/avmedia/source/java/FrameGrabber.java b/avmedia/source/java/FrameGrabber.java
deleted file mode 100755
index 1a0deda..0000000
--- a/avmedia/source/java/FrameGrabber.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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.
- *
- ************************************************************************/
-
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.IQueryInterface;
-import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XEventListener;
-import com.sun.star.awt.*;
-import com.sun.star.media.*;
-import com.sun.star.graphic.*;
-
-// -----------------
-// - Player Window -
-// -----------------
-
-public class FrameGrabber implements com.sun.star.lang.XServiceInfo,
- com.sun.star.media.XFrameGrabber
-{
- private com.sun.star.lang.XMultiServiceFactory maFactory = null;
- private javax.media.Player maPlayer = null;
- private javax.media.control.FrameGrabbingControl maFrameGrabbingControl = null;
-
- // -------------------------------------------------------------------------
-
- public FrameGrabber( com.sun.star.lang.XMultiServiceFactory aFactory, String aURL )
- {
- maFactory = aFactory;
-
- try
- {
- maPlayer = javax.media.Manager.createRealizedPlayer( new java.net.URL( aURL ) );
- }
- catch( java.net.MalformedURLException e )
- {
- }
- catch( java.io.IOException e )
- {
- }
- catch( javax.media.NoPlayerException e )
- {
- }
- catch( javax.media.CannotRealizeException e )
- {
- }
- catch( java.lang.Exception e )
- {
- }
-
- if( maPlayer != null )
- {
- maFrameGrabbingControl = (javax.media.control.FrameGrabbingControl) maPlayer.getControl(
- "javax.media.control.FrameGrabbingControl" );
- }
- }
-
- // -------------------------------------------------------------------------
-
- public com.sun.star.graphic.XGraphic implImageToXGraphic( java.awt.Image aImage )
- {
- com.sun.star.graphic.XGraphic aRet = null;
-
- if( maFactory != null && aImage != null )
- {
- if( aImage instanceof java.awt.image.BufferedImage )
- {
- java.io.File aTempFile = null;
-
- try
- {
- aTempFile = java.io.File.createTempFile( "sv0", ".png" );
-
- if( aTempFile.canWrite() )
- {
- javax.imageio.ImageIO.write( (java.awt.image.BufferedImage) aImage, "png", aTempFile );
-
- com.sun.star.graphic.XGraphicProvider aProvider =
- (com.sun.star.graphic.XGraphicProvider) UnoRuntime.queryInterface(
- com.sun.star.graphic.XGraphicProvider.class,
- maFactory.createInstance("com.sun.star.graphic.GraphicProvider") );
-
- if( aProvider != null )
- {
- com.sun.star.beans.PropertyValue[] aArgs = new com.sun.star.beans.PropertyValue[ 1 ];
-
- aArgs[ 0 ] = new com.sun.star.beans.PropertyValue();
- aArgs[ 0 ].Name = "URL";
- aArgs[ 0 ].Value = "file://" + aTempFile.toString();
-
- aRet = aProvider.queryGraphic( aArgs );
- }
- }
- }
- catch( java.lang.IllegalArgumentException aExcp )
- {
- }
- catch( java.io.IOException aExcp )
- {
- }
- catch( com.sun.star.uno.Exception aExcp )
- {
- }
-
- if( aTempFile != null )
- aTempFile.delete();
- }
- }
-
- return aRet;
- }
-
- // -----------------
- // - XFrameGrabber -
- // -----------------
-
- public synchronized com.sun.star.graphic.XGraphic grabFrame( double fMediaTime )
- {
- com.sun.star.graphic.XGraphic aRet = null;
-
- if( maFrameGrabbingControl != null )
- {
- if( fMediaTime >= 0.0 && fMediaTime <= maPlayer.getDuration().getSeconds() )
- {
- maPlayer.setMediaTime( new javax.media.Time( fMediaTime ) );
-
- javax.media.Buffer aBuffer = maFrameGrabbingControl.grabFrame();
-
- if( aBuffer != null && aBuffer.getFormat() instanceof javax.media.format.VideoFormat )
- {
- aRet = implImageToXGraphic( new javax.media.util.BufferToImage(
- (javax.media.format.VideoFormat) aBuffer.getFormat() ).
- createImage( aBuffer ) );
- }
- }
- }
-
- return aRet;
- }
-
- // ----------------
- // - XServiceInfo -
- // ----------------
-
- private static final String s_implName = "com.sun.star.comp.FrameGrabber_Java";
- private static final String s_serviceName = "com.sun.star.media.FrameGrabber_Java";
-
- public synchronized String getImplementationName()
- {
- return s_implName;
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized String [] getSupportedServiceNames()
- {
- return new String [] { s_serviceName };
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized boolean supportsService( String serviceName )
- {
- return serviceName.equals( s_serviceName );
- }
-}
diff --git a/avmedia/source/java/Manager.java b/avmedia/source/java/Manager.java
deleted file mode 100755
index 4770747..0000000
--- a/avmedia/source/java/Manager.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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.
- *
- ************************************************************************/
-
-// UNO
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.IQueryInterface;
-import com.sun.star.lang.XInitialization;
-
-// media
-import com.sun.star.media.*;
-
-public class Manager implements com.sun.star.lang.XServiceInfo,
- com.sun.star.lang.XTypeProvider,
- com.sun.star.media.XManager
-
-{
- private com.sun.star.lang.XMultiServiceFactory maFactory;
-
- // -------------------------------------------------------------------------
-
- public Manager( com.sun.star.lang.XMultiServiceFactory aFactory )
- {
- maFactory = aFactory;
- }
-
- // ------------
- // - XManager -
- // ------------
-
- public com.sun.star.media.XPlayer createPlayer( String aURL )
- {
- javax.media.Player aPlayer = null;
-
- try
- {
- aPlayer = javax.media.Manager.createRealizedPlayer( new java.net.URL( aURL ) );
- }
- catch( java.net.MalformedURLException e )
- {
- }
- catch( java.io.IOException e )
- {
- }
- catch( javax.media.NoPlayerException e )
- {
- }
- catch( javax.media.CannotRealizeException e )
- {
- }
- catch( java.lang.Exception e )
- {
- }
-
- if( aPlayer != null )
- {
- return new Player( maFactory, aPlayer, aURL );
- }
- else
- return null;
- }
-
- // ----------------
- // - XServiceInfo -
- // ----------------
-
- private static final String s_implName = "com.sun.star.comp.media.Manager_Java";
- private static final String s_serviceName = "com.sun.star.media.Manager_Java";
-
- public synchronized String getImplementationName()
- {
- return s_implName;
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized String [] getSupportedServiceNames()
- {
- return new String [] { s_serviceName };
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized boolean supportsService( String serviceName )
- {
- return serviceName.equals( s_serviceName );
- }
-
- // -----------------
- // - XTypeProvider -
- // -----------------
- protected byte[] maImplementationId;
-
- public com.sun.star.uno.Type[] getTypes()
- {
- com.sun.star.uno.Type[] retValue = new com.sun.star.uno.Type[ 3 ];
-
- retValue[ 0 ]= new com.sun.star.uno.Type( com.sun.star.lang.XServiceInfo.class );
- retValue[ 1 ]= new com.sun.star.uno.Type( com.sun.star.lang.XTypeProvider.class );
- retValue[ 2 ]= new com.sun.star.uno.Type( com.sun.star.media.XManager.class );
-
- return retValue;
- }
-
- // -------------------------------------------------------------------------
-
- synchronized public byte[] getImplementationId()
- {
- if( maImplementationId == null)
- {
- maImplementationId = new byte[ 16 ];
-
- int hash = hashCode();
-
- maImplementationId[ 0 ] = (byte)(hash & 0xff);
- maImplementationId[ 1 ] = (byte)((hash >>> 8) & 0xff);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list