summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/source/extended/textwindowaccessibility.cxx12
-rw-r--r--accessibility/source/standard/vclxaccessiblelistboxlist.cxx335
-rw-r--r--avmedia/prj/build.lst4
-rw-r--r--avmedia/source/framework/mediacontrol.cxx4
-rw-r--r--avmedia/source/gstreamer/exports.dxp3
-rw-r--r--avmedia/source/gstreamer/gstcommon.hxx68
-rw-r--r--avmedia/source/gstreamer/gstframegrabber.cxx307
-rw-r--r--avmedia/source/gstreamer/gstframegrabber.hxx81
-rw-r--r--avmedia/source/gstreamer/gstmanager.cxx85
-rw-r--r--avmedia/source/gstreamer/gstmanager.hxx74
-rw-r--r--avmedia/source/gstreamer/gstplayer.cxx938
-rw-r--r--avmedia/source/gstreamer/gstplayer.hxx236
-rw-r--r--avmedia/source/gstreamer/gstuno.cxx106
-rw-r--r--avmedia/source/gstreamer/gstwindow.cxx668
-rw-r--r--avmedia/source/gstreamer/gstwindow.hxx197
-rw-r--r--avmedia/source/gstreamer/makefile.mk71
-rw-r--r--avmedia/source/inc/mediamisc.hxx24
-rw-r--r--avmedia/source/java/PlayerWindow.java4
-rw-r--r--avmedia/source/java/avmedia.jarbin16420 -> 15776 bytes
-rw-r--r--avmedia/source/viewer/mediawindow.cxx47
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx47
-rw-r--r--avmedia/source/viewer/mediawindow_impl.hxx9
-rw-r--r--avmedia/source/viewer/mediawindowbase_impl.cxx61
-rw-r--r--avmedia/source/viewer/mediawindowbase_impl.hxx5
-rw-r--r--avmedia/source/win/winuno.cxx6
-rw-r--r--berkeleydb/makefile.mk2
-rw-r--r--canvas/source/tools/pagemanager.cxx42
-rw-r--r--[-rwxr-xr-x]canvas/source/vcl/canvashelper_texturefill.cxx2
-rw-r--r--configure.in37
-rw-r--r--connectivity/source/commontools/FValue.cxx107
-rw-r--r--connectivity/source/drivers/ado/AResultSet.cxx6
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx2
-rw-r--r--connectivity/source/drivers/file/FResultSet.cxx4
-rw-r--r--connectivity/source/drivers/flat/ETable.cxx5
-rw-r--r--connectivity/source/drivers/hsqldb/HStorageAccess.cxx10
-rw-r--r--connectivity/source/drivers/hsqldb/HStorageMap.cxx14
-rw-r--r--connectivity/source/drivers/jdbc/Boolean.cxx17
-rw-r--r--connectivity/source/drivers/jdbc/Object.cxx8
-rw-r--r--connectivity/source/drivers/jdbc/String.cxx20
-rw-r--r--connectivity/source/drivers/kab/makefile.mk3
-rw-r--r--connectivity/source/inc/java/lang/Boolean.hxx1
-rw-r--r--connectivity/source/inc/java/lang/Object.hxx2
-rw-r--r--connectivity/source/inc/java/lang/String.hxx1
-rw-r--r--cppunit/makefile.mk4
-rw-r--r--cui/source/customize/acccfg.cxx158
-rw-r--r--cui/source/customize/cfg.cxx250
-rw-r--r--cui/source/customize/cfgutil.cxx107
-rw-r--r--cui/source/customize/selector.cxx42
-rw-r--r--cui/source/dialogs/commonlingui.cxx46
-rw-r--r--cui/source/dialogs/commonlingui.hxx12
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx3
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx11
-rw-r--r--cui/source/dialogs/hldocntp.cxx31
-rw-r--r--cui/source/dialogs/iconcdlg.cxx204
-rw-r--r--cui/source/dialogs/insdlg.cxx5
-rw-r--r--cui/source/dialogs/scriptdlg.cxx67
-rwxr-xr-xcui/source/dialogs/thesdlg.cxx64
-rwxr-xr-xcui/source/dialogs/thesdlg.src6
-rwxr-xr-xcui/source/dialogs/thesdlg_impl.hxx27
-rw-r--r--cui/source/dialogs/zoom.cxx44
-rw-r--r--[-rwxr-xr-x]cui/source/factory/dlgfact.hxx18
-rw-r--r--cui/source/inc/acccfg.hxx49
-rw-r--r--cui/source/inc/cfg.hxx14
-rw-r--r--cui/source/inc/cfgutil.hxx5
-rw-r--r--cui/source/inc/chardlg.hxx1
-rw-r--r--cui/source/inc/cuisrchdlg.hxx1
-rw-r--r--cui/source/inc/dbregister.hxx7
-rw-r--r--cui/source/inc/hangulhanjadlg.hxx3
-rw-r--r--cui/source/inc/hldocntp.hxx2
-rw-r--r--cui/source/inc/iconcdlg.hxx19
-rw-r--r--cui/source/inc/insdlg.hxx2
-rwxr-xr-x[-rw-r--r--]cui/source/inc/macroass.hxx9
-rw-r--r--cui/source/inc/optimprove.hxx20
-rw-r--r--cui/source/inc/paragrph.hxx1
-rw-r--r--cui/source/inc/scriptdlg.hxx11
-rw-r--r--cui/source/inc/selector.hxx6
-rw-r--r--cui/source/inc/treeopt.hxx7
-rw-r--r--cui/source/inc/zoom.hxx3
-rw-r--r--cui/source/options/connpoolsettings.cxx7
-rw-r--r--cui/source/options/connpoolsettings.hxx1
-rw-r--r--cui/source/options/cuisrchdlg.cxx6
-rw-r--r--cui/source/options/dbregister.cxx54
-rwxr-xr-x[-rw-r--r--]cui/source/options/optdict.cxx1
-rw-r--r--cui/source/options/optgdlg.cxx45
-rw-r--r--cui/source/options/optgenrl.cxx20
-rw-r--r--cui/source/options/optimprove.cxx28
-rw-r--r--cui/source/options/optimprove2.cxx15
-rw-r--r--[-rwxr-xr-x]cui/source/options/optinet2.cxx200
-rw-r--r--cui/source/options/optjava.cxx50
-rw-r--r--cui/source/options/optjava.hxx21
-rw-r--r--cui/source/options/optsave.cxx48
-rw-r--r--cui/source/options/sdbcdriverenum.cxx7
-rw-r--r--cui/source/options/sdbcdriverenum.hxx1
-rw-r--r--cui/source/options/treeopt.cxx29
-rw-r--r--cui/source/tabpages/border.cxx11
-rw-r--r--cui/source/tabpages/borderconn.cxx7
-rw-r--r--cui/source/tabpages/borderconn.hxx7
-rw-r--r--cui/source/tabpages/chardlg.cxx42
-rw-r--r--cui/source/tabpages/macroass.cxx49
-rw-r--r--cui/source/tabpages/numpages.cxx22
-rw-r--r--cui/source/tabpages/paragrph.cxx7
-rw-r--r--dbaccess/source/core/api/KeySet.cxx522
-rw-r--r--dbaccess/source/core/api/KeySet.hxx24
-rw-r--r--dbaccess/source/core/api/OptimisticSet.cxx939
-rw-r--r--dbaccess/source/core/api/OptimisticSet.hxx95
-rw-r--r--dbaccess/source/core/api/PrivateRow.cxx142
-rw-r--r--dbaccess/source/core/api/PrivateRow.hxx69
-rw-r--r--dbaccess/source/core/api/RowSet.cxx3
-rw-r--r--dbaccess/source/core/api/RowSetCache.cxx26
-rw-r--r--dbaccess/source/core/api/WrappedResultSet.cxx23
-rw-r--r--dbaccess/source/core/api/makefile.mk1
-rw-r--r--dbaccess/source/core/inc/DatabaseDataProvider.hxx2
-rw-r--r--dbaccess/source/core/misc/DatabaseDataProvider.cxx31
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx1
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx4
-rw-r--r--dbaccess/source/ui/inc/TableController.hxx2
-rw-r--r--dbaccess/source/ui/inc/unodatbr.hxx2
-rw-r--r--dbaccess/source/ui/misc/TokenWriter.cxx4
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx3
-rw-r--r--dbaccess/source/ui/tabledesign/TableController.cxx15
-rw-r--r--desktop/test/deployment/boxt/makefile.mk6
-rw-r--r--desktop/util/ooverinfo2.rc22
-rwxr-xr-x[-rw-r--r--]dtrans/source/win32/dtobj/DOTransferable.cxx9
-rwxr-xr-x[-rw-r--r--]dtrans/source/win32/dtobj/FmtFilter.cxx43
-rwxr-xr-x[-rw-r--r--]dtrans/source/win32/dtobj/FmtFilter.hxx6
-rwxr-xr-x[-rw-r--r--]dtrans/source/win32/ftransl/ftransl.cxx1
-rwxr-xr-xediteng/source/editeng/editview.cxx10
-rwxr-xr-xediteng/source/editeng/impedit2.cxx12
-rwxr-xr-x[-rw-r--r--]editeng/source/misc/unolingu.cxx3
-rw-r--r--extensions/source/nsplugin/source/so_env.cxx4
-rw-r--r--extensions/source/scanner/scanner.cxx3
-rw-r--r--extensions/source/scanner/scanner.hxx5
-rw-r--r--extensions/source/scanner/scanunx.cxx101
-rw-r--r--extensions/source/scanner/scanwin.cxx12
-rwxr-xr-x[-rw-r--r--]extensions/source/update/check/updatecheckjob.cxx7
-rw-r--r--filter/source/docbook/sofftodocbookheadings.xsl9
-rw-r--r--filter/source/msfilter/svdfppt.cxx4
-rw-r--r--filter/source/xslt/export/uof/odf2uof_text.xsl8
-rw-r--r--filter/source/xslt/odf2xhtml/export/xhtml/body.xsl90
-rw-r--r--forms/source/component/ImageControl.cxx11
-rw-r--r--forms/source/component/ImageControl.hxx2
-rw-r--r--forms/source/component/imgprod.cxx45
-rw-r--r--forms/source/component/imgprod.hxx22
-rw-r--r--fpicker/source/unx/gnome/SalGtkFilePicker.cxx13
-rw-r--r--graphite/graphite-2.3.1.patch414
-rw-r--r--graphite/makefile.mk17
-rw-r--r--hsqldb/patches/i96823.patch2
-rw-r--r--hunspell/makefile.mk2
-rw-r--r--hyphen/makefile.mk2
-rw-r--r--icu/icu-mp.patch24
-rw-r--r--icu/makefile.mk4
-rw-r--r--instsetoo_native/util/openoffice.lst14
-rw-r--r--libegg/source/makefile.mk3
-rw-r--r--libxml2/libxml2-global-symbols.patch59
-rw-r--r--libxml2/libxml2-gnome602728.patch12
-rw-r--r--libxml2/makefile.mk5
-rw-r--r--libxmlsec/makefile.mk6
-rw-r--r--libxmlsec/xmlsec1-configure-libxml-libxslt.patch40
-rw-r--r--libxslt/libxslt-gnome602728.patch11
-rw-r--r--libxslt/libxslt-internal-symbols.patch66
-rw-r--r--libxslt/makefile.mk5
-rw-r--r--mysqlc/source/mysqlc_resultset.cxx17
-rw-r--r--mysqlc/version.mk2
-rw-r--r--mythes/makefile.mk7
-rw-r--r--offapi/com/sun/star/awt/XDialogProvider2.idl22
-rw-r--r--offapi/com/sun/star/awt/XStyleChangeListener.idl54
-rw-r--r--offapi/com/sun/star/awt/XStyleSettings.idl239
-rw-r--r--offapi/com/sun/star/awt/XStyleSettingsSupplier.idl53
-rw-r--r--offapi/com/sun/star/awt/makefile.mk5
-rw-r--r--offapi/com/sun/star/util/Color.idl8
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu9
-rw-r--r--oox/inc/oox/drawingml/customshapeproperties.hxx4
-rw-r--r--oox/inc/oox/drawingml/shape.hxx1
-rw-r--r--oox/inc/oox/ppt/pptshape.hxx5
-rw-r--r--oox/source/drawingml/customshapeproperties.cxx5
-rw-r--r--oox/source/drawingml/shape.cxx15
-rw-r--r--oox/source/drawingml/shapegroupcontext.cxx5
-rw-r--r--oox/source/drawingml/textliststyle.cxx4
-rw-r--r--oox/source/ppt/pptshape.cxx4
-rw-r--r--oox/source/ppt/pptshapecontext.cxx203
-rw-r--r--oox/source/ppt/pptshapegroupcontext.cxx5
-rw-r--r--oox/source/ppt/slidemastertextstylescontext.cxx6
-rw-r--r--oox/source/ppt/slidepersist.cxx1
-rw-r--r--oox/source/token/properties.txt2
-rw-r--r--padmin/source/padialog.cxx14
-rw-r--r--padmin/source/padialog.src5
-rwxr-xr-xreadlicense_oo/util/makefile.pmk6
-rw-r--r--reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java12
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java2
-rwxr-xr-xreportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java7
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java15
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java4
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java4
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu2
-rw-r--r--reportbuilder/registry/data/org/openoffice/Setup.xcu2
-rw-r--r--reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs4
-rwxr-xr-xreportbuilder/util/description.xml3
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx1
-rw-r--r--reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx14
-rw-r--r--reportdesign/source/ui/report/FormattedFieldBeautifier.cxx7
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx2
-rwxr-xr-x[-rw-r--r--]rsc/source/parser/rsclex.cxx11
-rw-r--r--sc/inc/docpool.hxx1
-rw-r--r--sc/source/core/data/docpool.cxx20
-rw-r--r--[-rwxr-xr-x]sc/source/core/data/dpobject.cxx16
-rwxr-xr-x[-rw-r--r--]sc/source/ui/app/inputwin.cxx6
-rw-r--r--sc/source/ui/undo/undostyl.cxx4
-rw-r--r--sc/source/ui/unoobj/styleuno.cxx8
-rw-r--r--sc/source/ui/view/formatsh.cxx4
-rwxr-xr-x[-rw-r--r--]scp2/inc/macros.inc15
-rw-r--r--scp2/source/binfilter/module_binfilter.scp3
-rwxr-xr-x[-rw-r--r--]scp2/source/calc/registryitem_calc.scp4
-rwxr-xr-x[-rw-r--r--]scp2/source/draw/registryitem_draw.scp6
-rwxr-xr-x[-rw-r--r--]scp2/source/impress/registryitem_impress.scp8
-rw-r--r--scp2/source/ooo/file_library_ooo.scp5
-rw-r--r--scp2/source/ooo/makefile.mk4
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp1
-rw-r--r--scp2/source/templates/module_langpack_binfilter.sct1
-rwxr-xr-x[-rw-r--r--]scp2/source/writer/registryitem_writer.scp14
-rw-r--r--scripting/source/dlgprov/dlgprov.cxx25
-rw-r--r--scripting/source/dlgprov/dlgprov.hxx5
-rw-r--r--scripting/source/pyprov/mailmerge.py4
-rwxr-xr-x[-rw-r--r--]sd/source/filter/html/pubdlg.cxx1
-rwxr-xr-xsd/source/ui/dlg/PaneChildWindows.cxx34
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fupage.cxx10
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/futext.cxx13
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fupage.hxx3
-rwxr-xr-xsd/source/ui/slidesorter/controller/SlsSlotManager.cxx11
-rwxr-xr-xsd/source/ui/view/DocumentRenderer.cxx5
-rwxr-xr-xsd/source/ui/view/Outliner.cxx4
-rwxr-xr-xsd/source/ui/view/drviews1.cxx1
-rwxr-xr-xsd/source/ui/view/drviews7.cxx2
-rwxr-xr-xsd/source/ui/view/viewoverlaymanager.cxx2
-rw-r--r--sd/uiconfig/sdraw/menubar/menubar.xml2
-rw-r--r--set_soenv.in3
-rw-r--r--setup_native/source/mac/broffice/DS_Storebin12292 -> 12292 bytes
-rw-r--r--setup_native/source/mac/ooo/DS_Storebin12292 -> 12292 bytes
-rw-r--r--setup_native/source/mac/ooo/DS_Store_Langpackbin12292 -> 12292 bytes
-rwxr-xr-x[-rw-r--r--]setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx33
-rwxr-xr-xsfx2/source/menu/mnumgr.cxx8
-rw-r--r--sfx2/source/view/frame2.cxx5
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.cxx24
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.hxx4
-rw-r--r--slideshow/source/engine/slide/layer.cxx4
-rw-r--r--solenv/config/sdev300.ini267
-rw-r--r--solenv/config/ssolar.cmn1
-rw-r--r--solenv/inc/minor.mk6
-rw-r--r--solenv/inc/settings.mk3
-rw-r--r--solenv/inc/unx.mk3
-rw-r--r--solenv/inc/version.hrc6
-rw-r--r--solenv/inc/version.lst30
-rw-r--r--solenv/inc/version_so.hrc6
-rw-r--r--solenv/inc/versionlist.mk30
-rw-r--r--solenv/prj/d.lst2
-rw-r--r--svtools/inc/svtools/svlbitm.hxx2
-rw-r--r--svtools/source/contnr/svlbitm.cxx53
-rw-r--r--svtools/source/filter.vcl/wmf/winmtf.cxx2
-rw-r--r--svtools/source/inc/unoiface.hxx5
-rw-r--r--svtools/source/uno/unoiface.cxx2
-rw-r--r--svx/inc/svx/sdrmasterpagedescriptor.hxx3
-rw-r--r--svx/inc/svx/svdpage.hxx1
-rw-r--r--svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx18
-rw-r--r--svx/source/svdraw/sdrmasterpagedescriptor.cxx23
-rw-r--r--svx/source/svdraw/svdpage.cxx12
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx14
-rw-r--r--sw/inc/pch/precompiled_sw.hxx1
-rw-r--r--sw/source/core/doc/acmplwrd.cxx1
-rw-r--r--sw/source/core/text/itrform2.cxx8
-rw-r--r--[-rwxr-xr-x]sw/source/core/view/printdata.cxx22
-rw-r--r--sw/source/filter/html/htmlform.cxx4
-rw-r--r--sw/source/ui/docvw/edtwin.cxx2
-rw-r--r--sw/source/ui/lingu/olmenu.cxx26
-rwxr-xr-x[-rw-r--r--]sw/source/ui/ribbar/inputwin.cxx2
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/optional/ch2_flexible_source_range_selection.bas2
-rwxr-xr-xtestautomation/chart2/optional/ch2_losa_ods_to_ods.bas2
-rwxr-xr-xtestautomation/chart2/optional/ch2_losa_ods_to_ots.bas2
-rwxr-xr-xtestautomation/chart2/optional/ch2_losa_ods_to_sdc.bas2
-rwxr-xr-xtestautomation/chart2/optional/ch2_losa_ods_to_sxc.bas2
-rwxr-xr-xtestautomation/chart2/optional/ch2_losa_ods_to_xls.bas2
-rwxr-xr-xtestautomation/chart2/optional/ch2_losa_sxc_to_ods.bas2
-rwxr-xr-xtestautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas2
-rwxr-xr-xtestautomation/chart2/optional/ch2_lvl1.bas2
-rwxr-xr-xtestautomation/chart2/optional/ch2_lvl1_wizard.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/optional/ch2_xml_format.bas2
-rw-r--r--testautomation/chart2/optional/includes/ch2_datadialogue.inc2
-rw-r--r--testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc2
-rw-r--r--testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/optional/includes/ch2_lvl1a.inc2
-rwxr-xr-xtestautomation/chart2/optional/includes/loadsave/ch2_losa.inc2
-rw-r--r--testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc2
-rwxr-xr-xtestautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc2
-rw-r--r--testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/ch2_updt_calc.bas2
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_file.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_format.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_format1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_insert.inc2
-rw-r--r--testautomation/chart2/required/includes/ch2_insert_ctl.inc2
-rw-r--r--testautomation/chart2/required/includes/ch2_menu.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_ole.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_toolbars.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_view.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_window.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_wizard.inc2
-rw-r--r--testautomation/chart2/tools/ch_tools_axes.inc2
-rw-r--r--testautomation/chart2/tools/ch_tools_chart_type.inc2
-rw-r--r--testautomation/chart2/tools/ch_tools_common.inc2
-rw-r--r--testautomation/chart2/tools/ch_tools_data_labels.inc2
-rw-r--r--testautomation/chart2/tools/ch_tools_grids.inc2
-rw-r--r--testautomation/chart2/tools/ch_tools_legend.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/tools/ch_tools_select.inc2
-rw-r--r--testautomation/chart2/tools/ch_tools_statistics.inc2
-rw-r--r--testautomation/chart2/tools/ch_tools_tab_borders_lines.inc2
-rw-r--r--testautomation/chart2/tools/ch_tools_tab_pages.inc2
-rw-r--r--testautomation/chart2/tools/ch_tools_titles.inc2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_ctrl_Clipboard.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_ctrl_General.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_ctrl_Grid.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_ctrl_PropertyBrowser.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_ctrl_Several.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_ctrl_Spreadsheet.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_ctrl_TextControl.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_ctrl_Wizards.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_db_ADOAccess.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_db_AdabasD.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_db_Addressbook.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_db_Dbase.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_db_JDBCMySQL.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_db_Spreadsheet.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_db_Text.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_db_dBase_functions.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_db_hsqldb.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_frm_FormFilter.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_frm_Forms.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/dba_misc_Macros.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_misc_RegisterDatabase.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_rpt_DateTime.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_rpt_ExecuteReport.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_rpt_Formating.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_rpt_FunctionWizard.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_rpt_Grouping.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_rpt_PageNumber.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_rpt_PropertyBrowser.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_wiz_CopyTableWizard.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_wiz_DatabaseWizards.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_wiz_FormWizard.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_wiz_QueryWizard.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_wiz_ReportWizard.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_wiz_TableWizard.bas2
-rwxr-xr-xtestautomation/dbaccess/optional/dba_xf_Submission.bas2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc2
-rwxr-xr-xtestautomation/dbaccess/optional/includes/ctrl_General.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_Grid.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc2
-rwxr-xr-xtestautomation/dbaccess/optional/includes/ctrl_Several1.inc2
-rwxr-xr-xtestautomation/dbaccess/optional/includes/ctrl_Several2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_TextControl.inc2
-rwxr-xr-xtestautomation/dbaccess/optional/includes/ctrl_Wizards.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_ADOAccess.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_AdabasD.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_Dbase.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_DbaseFunction.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_IndexDesign.inc2
-rwxr-xr-xtestautomation/dbaccess/optional/includes/db_JDBCMySQL.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_Mozilla.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_Query.inc2
-rwxr-xr-xtestautomation/dbaccess/optional/includes/db_Relations.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_Spreadsheet.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_Text.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_Windows.inc2
-rwxr-xr-xtestautomation/dbaccess/optional/includes/db_hsqldb.inc2
-rwxr-xr-xtestautomation/dbaccess/optional/includes/frm_FormFilter.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/frm_Forms.inc2
-rwxr-xr-xtestautomation/dbaccess/optional/includes/misc_Macros.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/rpt_DateTime.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/rpt_Formating.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/rpt_Grouping.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/rpt_PageNumber.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc2
-rwxr-xr-xtestautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/wiz_FormWizard.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/wiz_TableWizard.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/xf_Submission.inc2
-rwxr-xr-xtestautomation/dbaccess/required/dba_Main.bas2
-rwxr-xr-xtestautomation/dbaccess/required/dba_ReportBuilder.bas2
-rwxr-xr-xtestautomation/dbaccess/required/dba_xforms_Main.bas2
-rwxr-xr-xtestautomation/dbaccess/required/includes/DatabaseTypes.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/Forms.inc2
-rwxr-xr-xtestautomation/dbaccess/required/includes/MainApp.inc2
-rwxr-xr-xtestautomation/dbaccess/required/includes/Query.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/ReportBuilder01.inc2
-rwxr-xr-xtestautomation/dbaccess/required/includes/Table.inc2
-rwxr-xr-xtestautomation/dbaccess/required/includes/TableDesign.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/Wizards.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/Xforms01.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/tools/controltools.inc2
-rwxr-xr-xtestautomation/dbaccess/tools/dbcreatetools.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/tools/dbinit.inc2
-rwxr-xr-xtestautomation/dbaccess/tools/dbtools.inc2
-rwxr-xr-xtestautomation/dbaccess/tools/formtools.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/tools/querytools.inc2
-rwxr-xr-xtestautomation/dbaccess/tools/reporttools.inc2
-rwxr-xr-xtestautomation/dbaccess/tools/tabletools.inc2
-rwxr-xr-xtestautomation/extensions/optional/e_display_name.bas2
-rwxr-xr-xtestautomation/extensions/optional/e_extensions.bas2
-rwxr-xr-xtestautomation/extensions/optional/e_fileopen.bas2
-rwxr-xr-xtestautomation/extensions/optional/e_help.bas2
-rwxr-xr-xtestautomation/extensions/optional/e_identifiers.bas2
-rwxr-xr-xtestautomation/extensions/optional/e_issues.bas2
-rwxr-xr-xtestautomation/extensions/optional/e_location.bas2
-rwxr-xr-xtestautomation/extensions/optional/e_meta-inf.bas2
-rwxr-xr-xtestautomation/extensions/optional/e_online_update.bas2
-rwxr-xr-xtestautomation/extensions/optional/e_options.bas2
-rwxr-xr-xtestautomation/extensions/optional/e_platforms.bas2
-rwxr-xr-xtestautomation/extensions/optional/e_publisher.bas2
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/includes/display_name.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/includes/extensions.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/includes/fileopen.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/includes/help.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/includes/identifiers.inc2
-rwxr-xr-xtestautomation/extensions/optional/includes/issue110083.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/includes/location.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/includes/meta-inf.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/includes/online_update.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/includes/options.inc2
-rwxr-xr-xtestautomation/extensions/optional/includes/platforms.inc2
-rwxr-xr-xtestautomation/extensions/optional/includes/publisher.inc2
-rwxr-xr-xtestautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java2
-rwxr-xr-xtestautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java2
-rw-r--r--[-rwxr-xr-x]testautomation/extensions/required/e_update.bas2
-rw-r--r--testautomation/extensions/required/includes/e_update.inc2
-rwxr-xr-xtestautomation/framework/optional/f_CJK_CollationDialogue.bas2
-rwxr-xr-xtestautomation/framework/optional/f_CJK_FeatureSwitch.bas2
-rwxr-xr-xtestautomation/framework/optional/f_CJK_GridLayout.bas2
-rwxr-xr-xtestautomation/framework/optional/f_CJK_RubyDialogueProposal.bas2
-rwxr-xr-xtestautomation/framework/optional/f_NewSortingAlgorithmForJapanese.bas2
-rwxr-xr-xtestautomation/framework/optional/f_basic_dialog_i18n.bas2
-rwxr-xr-xtestautomation/framework/optional/f_basic_documents.bas2
-rwxr-xr-xtestautomation/framework/optional/f_basic_eventbinding.bas2
-rwxr-xr-xtestautomation/framework/optional/f_basic_first.bas2
-rwxr-xr-xtestautomation/framework/optional/f_basic_formcontrols.bas2
-rwxr-xr-xtestautomation/framework/optional/f_basic_gridcontrol.bas2
-rwxr-xr-xtestautomation/framework/optional/f_basic_library_export_import.bas2
-rwxr-xr-xtestautomation/framework/optional/f_basic_modules.bas2
-rwxr-xr-xtestautomation/framework/optional/f_basic_package_export_import.bas2
-rwxr-xr-xtestautomation/framework/optional/f_basic_protected_libraries.bas2
-rwxr-xr-xtestautomation/framework/optional/f_basic_shared_modules.bas2
-rwxr-xr-xtestautomation/framework/optional/f_basic_templatedocuments.bas2
-rwxr-xr-xtestautomation/framework/optional/f_basic_vba-compat.bas2
-rwxr-xr-xtestautomation/framework/optional/f_configuration.bas2
-rwxr-xr-xtestautomation/framework/optional/f_extras_labels.bas2
-rwxr-xr-xtestautomation/framework/optional/f_extras_samplefileopen.bas2
-rwxr-xr-xtestautomation/framework/optional/f_extras_sampleopen.bas2
-rwxr-xr-xtestautomation/framework/optional/f_extras_samplepreview.bas2
-rwxr-xr-xtestautomation/framework/optional/f_extras_tableautoformat.bas2
-rwxr-xr-xtestautomation/framework/optional/f_extras_templatefileopen.bas2
-rwxr-xr-xtestautomation/framework/optional/f_extras_templateopen.bas2
-rwxr-xr-xtestautomation/framework/optional/f_extras_templatepreview.bas2
-rwxr-xr-xtestautomation/framework/optional/f_filedlg_allowed_names.bas2
-rwxr-xr-xtestautomation/framework/optional/f_filedlg_autocompletion.bas2
-rwxr-xr-xtestautomation/framework/optional/f_filedlg_cjk_files.bas2
-rwxr-xr-xtestautomation/framework/optional/f_filedlg_dialogtest.bas2
-rwxr-xr-xtestautomation/framework/optional/f_filedlg_folder_navigation.bas2
-rwxr-xr-xtestautomation/framework/optional/f_filedlg_forbidden_names_windows.bas2
-rwxr-xr-xtestautomation/framework/optional/f_filedlg_multiselection.bas2
-rwxr-xr-xtestautomation/framework/optional/f_filedlg_passwords.bas2
-rwxr-xr-xtestautomation/framework/optional/f_filedlg_reserved_names_unix.bas2
-rwxr-xr-xtestautomation/framework/optional/f_filedlg_reserved_names_windows.bas2
-rwxr-xr-xtestautomation/framework/optional/f_fontworkgallery.bas2
-rwxr-xr-xtestautomation/framework/optional/f_help_bookmarks.bas2
-rwxr-xr-xtestautomation/framework/optional/f_help_compare_applications.bas2
-rwxr-xr-xtestautomation/framework/optional/f_help_compare_content.bas2
-rwxr-xr-xtestautomation/framework/optional/f_help_compare_topics.bas2
-rwxr-xr-xtestautomation/framework/optional/f_help_search.bas2
-rwxr-xr-xtestautomation/framework/optional/f_help_view_topics.bas2
-rwxr-xr-xtestautomation/framework/optional/f_loadsave_general.bas2
-rwxr-xr-xtestautomation/framework/optional/f_menuentries.bas2
-rwxr-xr-xtestautomation/framework/optional/f_ole.bas2
-rwxr-xr-xtestautomation/framework/optional/f_options_loadsave.bas2
-rwxr-xr-xtestautomation/framework/optional/f_options_ooo.bas2
-rwxr-xr-xtestautomation/framework/optional/f_scripting_organizers.bas2
-rwxr-xr-xtestautomation/framework/optional/f_security_broken_signature.bas2
-rwxr-xr-xtestautomation/framework/optional/f_security_certification_dialogs.bas2
-rwxr-xr-xtestautomation/framework/optional/f_security_certified_docs.bas2
-rwxr-xr-xtestautomation/framework/optional/f_security_evilmacro.bas2
-rwxr-xr-xtestautomation/framework/optional/f_security_incorrect_password.bas2
-rwxr-xr-xtestautomation/framework/optional/f_security_macrosecurity.bas2
-rwxr-xr-xtestautomation/framework/optional/f_security_recommend_password.bas2
-rwxr-xr-xtestautomation/framework/optional/f_security_trusted_path.bas2
-rwxr-xr-xtestautomation/framework/optional/f_toolbar_behavior.bas2
-rwxr-xr-xtestautomation/framework/optional/f_toolbar_items.bas2
-rwxr-xr-xtestautomation/framework/optional/f_usage_tracking.bas2
-rwxr-xr-xtestautomation/framework/optional/includes/CJK_CollationDialogue_1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_delete_modules.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_documents.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_eventbinding.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_formcontrols.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_gridcontrol.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_ide.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_library_export.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_library_import.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_macros.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_modulehide.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_modulenames.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_modules.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_package_export.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_package_import.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_protected_libraries.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_shared_modules.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_spectemplate.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_usertemplate.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_vba-compat_application-union.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc2
-rw-r--r--testautomation/framework/optional/includes/basic_vba-compat_security_check.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_vba_compat_tools.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/configuration.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/extras_file_open.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/extras_modify_objects.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/extras_preview.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/extras_table_autoformat.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/f_usage_tracking.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_allowed_names.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_autocomplete.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/filedlg_cjk_files.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_cjk_folders.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/filedlg_document_properties.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/filedlg_filternames.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_folders1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_folders2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_folders3.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_folders4.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_folders5.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_folders6.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_folders7.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_multiselection.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/filedlg_passwords.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_tools.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_triggers.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/fontworkgallery.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/help_bookmarks.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/help_compare_applications.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/help_compare_content.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/help_compare_topics.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/help_search.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/help_view_topics.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/loadsave_files.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/loadsave_new.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/menuentries.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/ole_1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/ole_2.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/ole_3.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/ole_tools.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_asia.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_data.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_int1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_lan1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_loadsave_general.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_loadsave_html.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_loadsave_msoffice.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_loadsave_vba.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_accessibility.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_appearance.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_colors.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_fontreplacement.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/options_ooo_general.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_java.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_memory.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_paths.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_print.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/options_ooo_security.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_userdata.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_view.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/scripting_organizers.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/security_broken_signature.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/security_certification_dialogs.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/security_evilmacro1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/security_evilmacro2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/security_evilmacro3.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/security_incorrect_password.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/security_macrosecurity.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/security_recommend_password.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/security_trusted_path.inc2
-rwxr-xr-xtestautomation/framework/optional/includes/standardbar2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/toolbar_behavior.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/w_grid_layout1.inc2
-rwxr-xr-xtestautomation/framework/required/f_help_browser.bas2
-rwxr-xr-xtestautomation/framework/required/f_printer_administration.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/f_programmability_dialogs.bas2
-rwxr-xr-xtestautomation/framework/required/f_security_dialogs.bas2
-rwxr-xr-xtestautomation/framework/required/f_standard_toolbar.bas2
-rwxr-xr-xtestautomation/framework/required/f_tools_options.bas2
-rwxr-xr-xtestautomation/framework/required/f_topten.bas2
-rwxr-xr-xtestautomation/framework/required/f_window_functions.bas2
-rwxr-xr-xtestautomation/framework/required/f_wizards.bas2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/basic_dialog_export.inc2
-rwxr-xr-xtestautomation/framework/required/includes/basic_dialog_i18n.inc2
-rw-r--r--testautomation/framework/required/includes/basic_dialog_i18n_import.inc2
-rwxr-xr-xtestautomation/framework/required/includes/basic_macroassignment.inc2
-rwxr-xr-xtestautomation/framework/required/includes/basic_organizer.inc2
-rwxr-xr-xtestautomation/framework/required/includes/first.inc2
-rwxr-xr-xtestautomation/framework/required/includes/help_browser.inc2
-rwxr-xr-xtestautomation/framework/required/includes/printer_administration.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/scripting_basics.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/security_dialogs.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/smoketest.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/standard_toolbar_1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/standard_toolbar_3.inc2
-rwxr-xr-xtestautomation/framework/required/includes/standard_toolbar_4.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/standard_toolbar_5.inc2
-rwxr-xr-xtestautomation/framework/required/includes/standard_toolbar_6.inc2
-rwxr-xr-xtestautomation/framework/required/includes/tools_customize.inc2
-rwxr-xr-xtestautomation/framework/required/includes/tools_options.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/topten.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/window_functions.inc2
-rwxr-xr-xtestautomation/framework/required/includes/wizard_agenda.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/wizard_documentconverter.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/wizard_euroconverter.inc2
-rwxr-xr-xtestautomation/framework/required/includes/wizard_fax.inc2
-rwxr-xr-xtestautomation/framework/required/includes/wizard_firsttime.inc2
-rwxr-xr-xtestautomation/framework/required/includes/wizard_letter.inc2
-rwxr-xr-xtestautomation/framework/required/includes/wizard_mailmerge.inc2
-rwxr-xr-xtestautomation/framework/required/includes/wizard_presentation.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/wizard_webpage.inc2
-rwxr-xr-xtestautomation/framework/tools/includes/CJK_tools.inc2
-rwxr-xr-xtestautomation/framework/tools/includes/customize_tools.inc2
-rwxr-xr-xtestautomation/framework/tools/includes/fileoperations.inc2
-rwxr-xr-xtestautomation/framework/tools/includes/formcontrols.inc2
-rwxr-xr-xtestautomation/framework/tools/includes/help_tools.inc2
-rwxr-xr-xtestautomation/framework/tools/includes/i18n_tools.inc2
-rwxr-xr-xtestautomation/framework/tools/includes/options_tools.inc2
-rwxr-xr-xtestautomation/framework/tools/includes/pbrowser_tools.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/tools/includes/private_environment.inc2
-rwxr-xr-xtestautomation/framework/tools/includes/scriptorganizer_tools.inc2
-rwxr-xr-xtestautomation/framework/tools/includes/spadmin_tools.inc2
-rwxr-xr-xtestautomation/framework/tools/includes/template_tools.inc2
-rwxr-xr-xtestautomation/framework/tools/includes/toolbar_tools.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/tools/includes/webtools.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/tools/includes/window_tools.inc2
-rwxr-xr-xtestautomation/framework/tools/includes/wizards.inc2
-rw-r--r--testautomation/global/input/empty/please_do_not_delete_this_file2
-rwxr-xr-xtestautomation/global/required/includes/g_001.inc2
-rwxr-xr-xtestautomation/global/required/includes/g_009.inc2
-rw-r--r--testautomation/global/required/includes/g_customize.inc2
-rwxr-xr-xtestautomation/global/required/includes/g_numberformatter1.inc2
-rwxr-xr-xtestautomation/global/required/includes/g_option.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/global/required/includes/g_option_application.inc2
-rw-r--r--testautomation/global/required/includes/g_printing.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/global/system/includes/declare.inc2
-rwxr-xr-xtestautomation/global/system/includes/gvariabl.inc2
-rwxr-xr-xtestautomation/global/system/includes/iniinfo.inc2
-rwxr-xr-xtestautomation/global/system/includes/inivalue.inc2
-rwxr-xr-xtestautomation/global/system/includes/master.inc2
-rwxr-xr-xtestautomation/global/system/includes/status.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/global/system/includes/sysinfo.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/closeoffice.bas2
-rwxr-xr-xtestautomation/global/tools/compressstatus.bas2
-rwxr-xr-xtestautomation/global/tools/declare.bas2
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_accels.inc2
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_basic_ide_tools.inc2
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_basic_organizer_tools.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_control_objects.inc2
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_docfuncs.inc2
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_extension_manager_tools.inc2
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_filetools.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_key_tools.inc2
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_listfuncs.inc2
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_locale_strings1.inc2
-rw-r--r--testautomation/global/tools/includes/optional/t_locale_tools.inc2
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_macro_tools.inc2
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_ole.inc2
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_security_tools.inc2
-rw-r--r--testautomation/global/tools/includes/optional/t_set_standard_controls.inc2
-rw-r--r--testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc2
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_stringtools.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_toolbar_tools1.inc4
-rw-r--r--testautomation/global/tools/includes/optional/t_toolbar_writer.inc2
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_treelist_tools.inc2
-rw-r--r--testautomation/global/tools/includes/optional/t_ui_filters.inc2
-rw-r--r--testautomation/global/tools/includes/optional/t_user_info.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_xml1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_xml2.inc2
-rw-r--r--testautomation/global/tools/includes/optional/t_xml_filter1.inc2
-rwxr-xr-xtestautomation/global/tools/includes/required/t_dir.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/required/t_doc1.inc2
-rwxr-xr-xtestautomation/global/tools/includes/required/t_doc2.inc2
-rwxr-xr-xtestautomation/global/tools/includes/required/t_files.inc2
-rwxr-xr-xtestautomation/global/tools/includes/required/t_filters.inc2
-rwxr-xr-xtestautomation/global/tools/includes/required/t_lists.inc2
-rwxr-xr-xtestautomation/global/tools/includes/required/t_menu.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/required/t_option.inc2
-rw-r--r--testautomation/global/tools/includes/required/t_option2.inc2
-rwxr-xr-xtestautomation/global/tools/includes/required/t_tools1.inc2
-rwxr-xr-xtestautomation/global/tools/includes/required/t_tools2.inc2
-rwxr-xr-xtestautomation/global/tools/includes/required/t_tools3.inc6
-rwxr-xr-xtestautomation/global/tools/resetoffice.bas2
-rwxr-xr-xtestautomation/global/tools/wintree.bas2
-rwxr-xr-xtestautomation/global/win/bars.win2
-rwxr-xr-xtestautomation/global/win/sys_dial.win2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/d_export_graphic_a.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/d_export_graphic_b.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/export_graphic_a.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/export_graphic_b.bas2
-rw-r--r--testautomation/graphics/optional/g_accessability.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_area.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_arrangealign.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_autocorrection.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_character.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_clipboard.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_clipexport.bas2
-rw-r--r--testautomation/graphics/optional/g_convertto.bas146
-rw-r--r--testautomation/graphics/optional/g_crossfading.bas2
-rw-r--r--testautomation/graphics/optional/g_customshapes.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_demoguide.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_dimensions.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_edit.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_export_html.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_findreplace.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_format.bas2
-rw-r--r--testautomation/graphics/optional/g_group.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_imagemap.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_insert.bas2
-rw-r--r--testautomation/graphics/optional/g_line.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_load_save.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_mediaplayer.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_navigator.bas2
-rw-r--r--testautomation/graphics/optional/g_ole.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_paneview.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_paragraph.bas2
-rw-r--r--testautomation/graphics/optional/g_savepictureas.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_shaddow.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_slidelayer.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_spellcheck.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_stylist.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_tables.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_toolbars.bas2
-rw-r--r--testautomation/graphics/optional/g_tools.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_zoom.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/gallery.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/gallery2.bas2
-rw-r--r--testautomation/graphics/optional/i_animation.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/i_headerfooter.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/i_only_updt_1.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/i_only_updt_2.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/i_pengine.bas2
-rw-r--r--testautomation/graphics/optional/i_saveloadlayout.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/i_shape.bas2
-rw-r--r--testautomation/graphics/optional/i_slidecopy.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/i_slideshow.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/i_us_presentation.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/i_view.bas2
-rw-r--r--testautomation/graphics/optional/includes/draw/d_002_.inc2
-rw-r--r--testautomation/graphics/optional/includes/draw/d_003_.inc2
-rw-r--r--testautomation/graphics/optional/includes/draw/d_005_.inc2
-rw-r--r--testautomation/graphics/optional/includes/draw/d_007.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/export_graphic.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/export_graphic_2.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_accessability.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_area.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_arrangealign.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_autocorrection.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_character.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_clipboard.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_clipexport.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_clipexport2.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_clipexport3.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_convertto.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_crossfading.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_customshapes.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_demoguide.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_dimensions.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_edit.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_export_html.inc8
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/includes/global/g_find_replace.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_format.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_group.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_imagemap.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_insert.inc4
-rw-r--r--testautomation/graphics/optional/includes/global/g_line.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_load_save.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_mediaplayer.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_navigator.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_ole.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_paneview.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_paragraph.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_savepictureas.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_shaddow.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_slidelayer.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_spellcheck.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_stylist.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_tables.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_toolbars.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_tools.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_zoom.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/includes/global/gallery.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/gallery2.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/id_001.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/id_002.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/id_003.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/id_004.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/includes/global/id_005.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/id_006.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/id_007.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/id_008.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/id_009.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/id_011.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/i_animation.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/i_headerfooter.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/i_pengine.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/i_pengine1.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/i_pengine2.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/i_shape.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/i_slidecopy.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/i_slidelayer.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/includes/impress/i_slideshow.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/i_slideshow2.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/i_slideshow3.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/i_stylist.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/i_us2_present.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/i_us_present.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/i_view.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/im_002_.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/im_003_.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/im_004_.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/im_005_.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/im_007_.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/im_011_.inc2
-rw-r--r--testautomation/graphics/optional/includes/impress/options.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/required/d_opt.bas2
-rw-r--r--testautomation/graphics/required/d_updt.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/required/i_opt.bas2
-rw-r--r--testautomation/graphics/required/i_updt_1.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/required/i_updt_2.bas2
-rw-r--r--testautomation/graphics/required/includes/draw/d_002_.inc2
-rw-r--r--testautomation/graphics/required/includes/draw/d_003_.inc2
-rw-r--r--testautomation/graphics/required/includes/draw/d_005_.inc2
-rw-r--r--testautomation/graphics/required/includes/draw/d_007.inc2
-rw-r--r--testautomation/graphics/required/includes/global/gallery.inc2
-rw-r--r--testautomation/graphics/required/includes/global/gallery2.inc2
-rw-r--r--testautomation/graphics/required/includes/global/id_001.inc2
-rw-r--r--testautomation/graphics/required/includes/global/id_002.inc2
-rw-r--r--testautomation/graphics/required/includes/global/id_003.inc2
-rw-r--r--testautomation/graphics/required/includes/global/id_004.inc2
-rw-r--r--testautomation/graphics/required/includes/global/id_005.inc2
-rw-r--r--testautomation/graphics/required/includes/global/id_006.inc2
-rw-r--r--testautomation/graphics/required/includes/global/id_007.inc2
-rw-r--r--testautomation/graphics/required/includes/global/id_008.inc2
-rw-r--r--testautomation/graphics/required/includes/global/id_009.inc2
-rw-r--r--testautomation/graphics/required/includes/global/id_011.inc2
-rw-r--r--testautomation/graphics/required/includes/global/id_opt_1.inc2
-rw-r--r--testautomation/graphics/required/includes/global/id_opt_2.inc2
-rw-r--r--testautomation/graphics/required/includes/impress/i_opt_1_.inc2
-rw-r--r--testautomation/graphics/required/includes/impress/im_002_.inc2
-rw-r--r--testautomation/graphics/required/includes/impress/im_003_.inc2
-rw-r--r--testautomation/graphics/required/includes/impress/im_004_.inc2
-rw-r--r--testautomation/graphics/required/includes/impress/im_005_.inc2
-rw-r--r--testautomation/graphics/required/includes/impress/im_007_.inc2
-rw-r--r--testautomation/graphics/required/includes/impress/im_011_.inc2
-rw-r--r--testautomation/graphics/tools/id_tools.inc2
-rw-r--r--testautomation/graphics/tools/id_tools_2.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/tools/makeLokaleTxt.bas2
-rwxr-xr-xtestautomation/math/optional/includes/m_101_.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/math/optional/includes/m_105.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/math/optional/includes/m_106_.inc2
-rwxr-xr-xtestautomation/math/optional/m_lvl1.bas2
-rwxr-xr-x[-rw-r--r--]testautomation/math/required/includes/m_001_.inc2
-rwxr-xr-xtestautomation/math/required/includes/m_002_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/math/required/includes/m_003_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/math/required/includes/m_004_.inc2
-rwxr-xr-xtestautomation/math/required/includes/m_005_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/math/required/includes/m_006_.inc2
-rwxr-xr-xtestautomation/math/required/includes/m_007_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/math/required/includes/m_010_.inc2
-rwxr-xr-xtestautomation/math/required/includes/m_020_.inc2
-rwxr-xr-xtestautomation/math/required/m_updt.bas2
-rwxr-xr-xtestautomation/spreadsheet/optional/c_arrayconstants.bas2
-rwxr-xr-xtestautomation/spreadsheet/optional/c_getpivotdata.bas2
-rwxr-xr-xtestautomation/spreadsheet/optional/c_import_general.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/optional/c_solver.bas2
-rwxr-xr-xtestautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc2
-rwxr-xr-xtestautomation/spreadsheet/optional/includes/import_general/c_import_general.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/optional/includes/namedrange/c_namedrange.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/optional/includes/solver/c_solver.inc2
-rwxr-xr-xtestautomation/spreadsheet/required/c_updt1.bas2
-rwxr-xr-xtestautomation/spreadsheet/required/c_updt2.bas2
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/required/includes/c_upd_datamenu.inc2
-rwxr-xr-xtestautomation/spreadsheet/required/includes/c_upd_editmenu.inc2
-rwxr-xr-xtestautomation/spreadsheet/required/includes/c_upd_editmenu2.inc2
-rwxr-xr-xtestautomation/spreadsheet/required/includes/c_upd_filemenu.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc2
-rwxr-xr-xtestautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/required/includes/c_upd_helpmenu.inc2
-rwxr-xr-xtestautomation/spreadsheet/required/includes/c_upd_insertmenu.inc2
-rwxr-xr-xtestautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc2
-rwxr-xr-xtestautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc2
-rwxr-xr-xtestautomation/spreadsheet/required/includes/c_upd_viewmenu.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/required/includes/c_upd_windowmenu.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/tools/includes/c_cell_tools.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/tools/includes/c_l10n_tools.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/tools/includes/c_select_tools.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/tools/includes/c_tool_l10n_mnomics.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/tools/includes/c_tool_options.inc2
-rwxr-xr-xtestautomation/tools/hid/hid.pl2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/CJKCTLDependency/CJKCTLDependency1.inc2
-rw-r--r--testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/autotext/w_autotext.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/calculate/w_calculate.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate2.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/clipboard/clipbrd_func.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/clipboard/w_210_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/clipboard/w_211_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/clipboard/w_212_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/clipboard/w_213_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/clipboard/w_214_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/clipboard/w_215_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/clipboard/w_216_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/clipboard/w_217_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/clipboard/w_218_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/clipboard/w_219_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/clipboard/w_220_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/clipboard/w_221_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/clipboard/w_222_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/drawing/w_drawing_tools1.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/drawing/w_drawing_tools2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/fields/w_fields1.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/fields/w_fields2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/fields/w_fields3.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/fields/w_fields4.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/fields/w_fields5.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/fields/w_fields6.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/fields/w_fields7.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/filter/w_filter.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/fontwork/w_fontwork1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/formatpage/w_formatpage1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/formatpage/w_formatpage2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/formatpage/w_formatpage3.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/formatpage/w_formatpage4.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/hangulhanjaonversion/hhConversion3.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/hyphenation/w_hyphenation.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc2
-rw-r--r--testautomation/writer/optional/includes/loadsave/w_loadsave.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/navigator/w_navigator.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/number/w_205_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/number/w_205a_.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/number/w_206_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/number/w_207_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/option/wh_o_1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/option/wh_o_2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/option/wh_o_3.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/option/wr_o_1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/option/wr_o_2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/option/wr_o_3.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/option/wr_o_4.inc6
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/option/wr_o_5.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/option/wr_o_a.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/redlining/w_redlining1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/redlining/w_redlining2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/regexp/regular.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/regexp/search.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/section/w_section_1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/section/w_section_2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/section/w_section_3.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/section/w_section_4.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/section/w_section_tools.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/shortcut/w_shortcuts.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/sorting/w_sorting1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/sorting/w_sorting2.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/spellcheck/w_spellcheck.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/stylist/w_stylist.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/table/w_204_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/table/w_204a_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/table/w_204b_.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/textframes/w_textframes1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/textframes/w_textframes2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/textframes/w_textframes3.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/textframes/w_textframes4.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/textframes/w_textframes5.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/tools/tools1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/tools/tools2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/undo/w_undo1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/undo/w_undo_history_1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/undo/w_undo_history_2.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/undo/w_undo_history_3.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/undo/w_undo_history_4.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_CJKCTLDependency.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_alternative_text.bas2
-rw-r--r--testautomation/writer/optional/w_autocorrection.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_autotext.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_calculate.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_chinesetranslate.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_clipbrd.bas2
-rwxr-xr-xtestautomation/writer/optional/w_contextmenu.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_drawing_tools.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_dropdownLB.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_fields.bas2
-rwxr-xr-xtestautomation/writer/optional/w_filter.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_fontwork.bas2
-rwxr-xr-xtestautomation/writer/optional/w_formatcharacter.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_formatpage.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_formatparagraph.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_hhConversion.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_hyphenation.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_insertgraphic.bas2
-rwxr-xr-xtestautomation/writer/optional/w_issuezilla_regression.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_loadsave.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_navigator.bas2
-rwxr-xr-xtestautomation/writer/optional/w_numbering.bas2
-rwxr-xr-xtestautomation/writer/optional/w_opt.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_redlining.bas2
-rwxr-xr-xtestautomation/writer/optional/w_search.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_section.bas2
-rwxr-xr-xtestautomation/writer/optional/w_shortcuts.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_sorting.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_spellcheck.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_stylist.bas2
-rwxr-xr-xtestautomation/writer/optional/w_table.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_textframes.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_undo.bas2
-rwxr-xr-xtestautomation/writer/optional/ww_opt.bas2
-rwxr-xr-xtestautomation/writer/required/includes/w_001_.inc2
-rw-r--r--testautomation/writer/required/includes/w_001a_.inc2
-rw-r--r--testautomation/writer/required/includes/w_001b_.inc2
-rwxr-xr-xtestautomation/writer/required/includes/w_002_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/required/includes/w_003_.inc2
-rwxr-xr-xtestautomation/writer/required/includes/w_004_.inc2
-rwxr-xr-xtestautomation/writer/required/includes/w_005_.inc2
-rwxr-xr-xtestautomation/writer/required/includes/w_005b_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/required/includes/w_006_.inc2
-rwxr-xr-xtestautomation/writer/required/includes/w_007_.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/required/includes/w_008_.inc2
-rwxr-xr-xtestautomation/writer/required/includes/w_009_.inc2
-rwxr-xr-xtestautomation/writer/required/includes/w_010_.inc2
-rw-r--r--testautomation/writer/required/includes/w_010_1.inc2
-rwxr-xr-xtestautomation/writer/required/includes/w_011_.inc2
-rwxr-xr-xtestautomation/writer/required/includes/w_020_.inc2
-rwxr-xr-xtestautomation/writer/required/w_updt.bas2
-rw-r--r--testautomation/writer/tools/includes/w_get_locale_strings.inc2
-rwxr-xr-xtestautomation/writer/tools/includes/w_locale_strings2.inc2
-rwxr-xr-xtestautomation/writer/tools/includes/w_tool1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/tools/includes/w_tool2.inc2
-rwxr-xr-xtestautomation/writer/tools/includes/w_tool3.inc2
-rwxr-xr-xtestautomation/writer/tools/includes/w_tool4.inc2
-rw-r--r--testautomation/writer/tools/includes/w_tool5.inc2
-rwxr-xr-xtestautomation/writer/tools/includes/w_tool6.inc2
-rw-r--r--testautomation/writer/tools/includes/w_tool7.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/writer/tools/includes/w_tools.inc2
-rw-r--r--testautomation/writer/tools/includes/w_tools_autocorrection.inc2
-rw-r--r--testautomation/writer/tools/includes/w_tools_drawing.inc2
-rw-r--r--testautomation/writer/tools/includes/w_tools_hyphenation.inc2
-rw-r--r--testautomation/writer/tools/includes/w_tools_undo.inc2
-rwxr-xr-xtestautomation/writer/tools/w_get_locale_strings.bas2
-rwxr-xr-xtestautomation/xml/optional/calc_xml_7_export.bas2
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/docbook_losa.bas2
-rwxr-xr-xtestautomation/xml/optional/draw_xml_7_export.bas2
-rwxr-xr-xtestautomation/xml/optional/impress_xml_7_export.bas2
-rw-r--r--testautomation/xml/optional/includes/c_datapilot_pagefields.inc2
-rw-r--r--testautomation/xml/optional/includes/c_xml_print_scale.inc2
-rw-r--r--testautomation/xml/optional/includes/c_xml_scenario.inc2
-rw-r--r--testautomation/xml/optional/includes/ch_xml_japanese_candlestick.inc2
-rw-r--r--testautomation/xml/optional/includes/docbook_001.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/f_xml_save_ms_ole.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxc7_01.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxc7_02.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxc7_03.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxd7_01.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxd7_02.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxd7_03.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxd7_04.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxd7_05.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxi7_01.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxm7_01.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxw7_01.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxw7_01a.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxw7_02.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxw7_03.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/w_xml_vertical_alignment.inc2
-rwxr-xr-xtestautomation/xml/optional/math_xml_7_export.bas2
-rwxr-xr-xtestautomation/xml/optional/w_xml_vertical_alignment.bas2
-rwxr-xr-xtestautomation/xml/optional/writer_xml_7_export.bas2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/required/includes/oasis_graphics_01.inc2
-rwxr-xr-xtestautomation/xml/required/oasis_graphics_update.bas2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/tools/includes/itools1.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/tools/includes/xmltool1.inc2
-rw-r--r--toolkit/inc/pch/precompiled_toolkit.hxx3
-rw-r--r--toolkit/inc/toolkit/awt/vclxwindow.hxx9
-rw-r--r--toolkit/inc/toolkit/awt/vclxwindows.hxx31
-rw-r--r--toolkit/inc/toolkit/controls/roadmapcontrol.hxx31
-rw-r--r--toolkit/inc/toolkit/controls/unocontrol.hxx9
-rw-r--r--toolkit/inc/toolkit/controls/unocontrolbase.hxx2
-rw-r--r--toolkit/inc/toolkit/controls/unocontrolmodel.hxx20
-rw-r--r--toolkit/inc/toolkit/controls/unocontrols.hxx99
-rw-r--r--toolkit/inc/toolkit/helper/listenermultiplexer.hxx2
-rw-r--r--toolkit/inc/toolkit/helper/property.hxx2
-rw-r--r--toolkit/inc/toolkit/helper/servicenames.hxx5
-rw-r--r--toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx1
-rw-r--r--toolkit/source/awt/makefile.mk1
-rw-r--r--toolkit/source/awt/stylesettings.cxx987
-rw-r--r--toolkit/source/awt/stylesettings.hxx188
-rw-r--r--toolkit/source/awt/vclxwindow.cxx41
-rw-r--r--toolkit/source/awt/vclxwindows.cxx142
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx11
-rw-r--r--toolkit/source/controls/roadmapcontrol.cxx94
-rw-r--r--toolkit/source/controls/unocontrol.cxx14
-rw-r--r--toolkit/source/controls/unocontrols.cxx173
-rw-r--r--toolkit/source/helper/servicenames.cxx1
-rw-r--r--toolkit/source/layout/core/import.cxx11
-rw-r--r--[-rwxr-xr-x]uui/source/iahndl-authentication.cxx1
-rwxr-xr-x[-rw-r--r--]uui/source/iahndl.cxx73
-rwxr-xr-xuui/source/iahndl.hxx3
-rw-r--r--[-rwxr-xr-x]uui/source/ids.hrc8
-rwxr-xr-x[-rw-r--r--]uui/source/makefile.mk4
-rwxr-xr-xuui/source/nameclashdlg.cxx107
-rwxr-xr-x[-rw-r--r--]uui/source/nameclashdlg.hrc (renamed from uui/source/passcrtdlg.hrc)26
-rwxr-xr-x[-rw-r--r--]uui/source/nameclashdlg.hxx (renamed from uui/source/passcrtdlg.hxx)56
-rwxr-xr-xuui/source/nameclashdlg.src113
-rw-r--r--uui/source/passcrtdlg.cxx128
-rw-r--r--uui/source/passcrtdlg.src108
-rw-r--r--vcl/aqua/inc/salgdi.h2
-rw-r--r--vcl/aqua/source/app/salinst.cxx1
-rw-r--r--vcl/aqua/source/gdi/salgdi.cxx4
-rwxr-xr-x[-rw-r--r--]vcl/inc/vcl/edit.hxx4
-rw-r--r--vcl/inc/vcl/gfxlink.hxx7
-rw-r--r--vcl/inc/vcl/graphite_adaptors.hxx4
-rw-r--r--vcl/inc/vcl/graphite_cache.hxx34
-rw-r--r--vcl/inc/vcl/graphite_layout.hxx15
-rw-r--r--vcl/inc/vcl/imgcons.hxx105
-rw-r--r--vcl/inc/vcl/javachild.hxx2
-rw-r--r--vcl/inc/vcl/print.hxx2
-rw-r--r--vcl/inc/vcl/salgdi.hxx2
-rw-r--r--vcl/inc/vcl/svdata.hxx3
-rw-r--r--vcl/inc/vcl/syschild.hxx6
-rw-r--r--vcl/prj/d.lst3
-rwxr-xr-x[-rw-r--r--]vcl/source/control/edit.cxx8
-rw-r--r--vcl/source/control/field.cxx48
-rw-r--r--vcl/source/gdi/gfxlink.cxx59
-rw-r--r--vcl/source/gdi/imgcons.cxx574
-rwxr-xr-x[-rw-r--r--]vcl/source/gdi/makefile.mk1
-rw-r--r--vcl/source/gdi/metric.cxx46
-rw-r--r--vcl/source/gdi/outdev2.cxx71
-rw-r--r--vcl/source/gdi/outdev3.cxx44
-rw-r--r--vcl/source/gdi/outdev6.cxx40
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx1
-rw-r--r--vcl/source/gdi/print3.cxx31
-rw-r--r--vcl/source/glyphs/gcach_ftyp.cxx3
-rw-r--r--vcl/source/glyphs/graphite_adaptors.cxx56
-rw-r--r--vcl/source/glyphs/graphite_cache.cxx2
-rw-r--r--vcl/source/glyphs/graphite_layout.cxx81
-rw-r--r--vcl/source/glyphs/graphite_textsrc.hxx1
-rw-r--r--vcl/source/helper/strhelper.cxx8
-rw-r--r--vcl/source/window/javachild.cxx154
-rw-r--r--vcl/source/window/printdlg.cxx17
-rw-r--r--vcl/source/window/status.cxx4
-rw-r--r--vcl/source/window/syschild.cxx164
-rw-r--r--vcl/source/window/toolbox.cxx2
-rw-r--r--vcl/unx/headless/svpgdi.hxx2
-rw-r--r--vcl/unx/headless/svppspgraphics.cxx2
-rw-r--r--vcl/unx/headless/svppspgraphics.hxx2
-rw-r--r--vcl/unx/headless/svptext.cxx9
-rw-r--r--vcl/unx/inc/pspgraphics.h2
-rw-r--r--vcl/unx/inc/salgdi.h2
-rw-r--r--vcl/unx/source/fontmanager/fontconfig.cxx21
-rw-r--r--vcl/unx/source/gdi/pspgraphics.cxx2
-rw-r--r--vcl/unx/source/gdi/salgdi3.cxx13
-rw-r--r--vcl/util/makefile.mk8
-rwxr-xr-xvcl/win/inc/salgdi.h2
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx15
-rwxr-xr-x[-rw-r--r--]vcl/win/source/gdi/winlayout.cxx2
-rw-r--r--xmloff/source/draw/ximpcustomshape.cxx1
1210 files changed, 9057 insertions, 7328 deletions
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 04b07215d372..8af1b240343e 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1989,10 +1989,14 @@ void Document::handleParagraphNotifications()
determineVisibleRange();
notifyVisibleRangeChanges(aOldVisibleBegin, aOldVisibleEnd,
m_xParagraphs->end());
- Paragraphs::iterator aIt(m_xParagraphs->begin() + n);
- ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(aIt));
- if (xParagraph.is())
- xParagraph->textChanged();
+
+ if (n < m_xParagraphs->size())
+ {
+ Paragraphs::iterator aIt(m_xParagraphs->begin() + n);
+ ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(aIt));
+ if (xParagraph.is())
+ xParagraph->textChanged();
+ }
break;
}
default:
diff --git a/accessibility/source/standard/vclxaccessiblelistboxlist.cxx b/accessibility/source/standard/vclxaccessiblelistboxlist.cxx
deleted file mode 100644
index df37c3239667..000000000000
--- a/accessibility/source/standard/vclxaccessiblelistboxlist.cxx
+++ /dev/null
@@ -1,335 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_accessibility.hxx"
-#include <accessibility/standard/vclxaccessiblelistboxlist.hxx>
-#include <accessibility/standard/vclxaccessiblelistitem.hxx>
-#include <accessibility/helper/listboxhelper.hxx>
-
-#include <algorithm>
-
-#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <tools/debug.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/unohelp.hxx>
-
-#include <toolkit/awt/vclxwindow.hxx>
-#include <toolkit/helper/convert.hxx>
-
-#include <comphelper/sequence.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <unotools/accessiblestatesethelper.hxx>
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::accessibility;
-
-
-namespace
-{
- void checkSelection_Impl( sal_Int32 _nIndex, const ListBox& _rListBox, sal_Bool bSelected )
- throw (::com::sun::star::lang::IndexOutOfBoundsException)
- {
- sal_Int32 nCount = bSelected ? (sal_Int32)_rListBox.GetSelectEntryCount()
- : (sal_Int32)_rListBox.GetEntryCount();
- if ( _nIndex < 0 || _nIndex >= nCount )
- throw ::com::sun::star::lang::IndexOutOfBoundsException();
- }
-}
-
-
-VCLXAccessibleListBoxList::VCLXAccessibleListBoxList (VCLXWindow* pVCLWindow,
- BoxType aBoxType,const Reference< XAccessible >& _xParent)
- : VCLXAccessibleList (pVCLWindow, aBoxType, _xParent)
-{
-}
-
-
-
-
-VCLXAccessibleListBoxList::~VCLXAccessibleListBoxList (void)
-{
-}
-
-
-
-
-void VCLXAccessibleListBoxList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
-{
- switch ( rVclWindowEvent.GetId() )
- {
- case VCLEVENT_LISTBOX_SCROLLED:
- UpdateEntryRange_Impl();
- break;
-
- case VCLEVENT_LISTBOX_SELECT:
- if ( !m_bDisableProcessEvent )
- UpdateSelection_Impl();
- break;
-
- default:
- VCLXAccessibleList::ProcessWindowEvent (rVclWindowEvent);
- }
-}
-
-IMPLEMENT_FORWARD_XINTERFACE2(VCLXAccessibleListBoxList, VCLXAccessibleList, VCLXAccessibleListBoxList_BASE)
-IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleListBoxList, VCLXAccessibleList, VCLXAccessibleListBoxList_BASE)
-
-
-
-//===== XServiceInfo ========================================================
-
-::rtl::OUString VCLXAccessibleListBoxList::getImplementationName (void)
- throw (RuntimeException)
-{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleListBoxList");
-}
-
-
-
-
-Sequence< ::rtl::OUString > VCLXAccessibleListBoxList::getSupportedServiceNames (void)
- throw (RuntimeException)
-{
- Sequence< ::rtl::OUString > aNames = VCLXAccessibleList::getSupportedServiceNames();
- sal_Int32 nLength = aNames.getLength();
- aNames.realloc( nLength + 1 );
- aNames[nLength] = ::rtl::OUString::createFromAscii(
- "com.sun.star.accessibility.AccessibleListBoxList");
- return aNames;
-}
-// -----------------------------------------------------------------------------
-
-void VCLXAccessibleListBoxList::UpdateSelection_Impl()
-{
- uno::Any aOldValue, aNewValue;
-
- {
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
- ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
- Reference< XAccessible > xNewAcc;
-
- ListBox* pListBox = static_cast< ListBox* >( GetWindow() );
- if ( pListBox )
- {
- USHORT nPos = 0;
- ListItems::iterator aEnd = m_aAccessibleChildren.end();
- for ( ListItems::iterator aIter = m_aAccessibleChildren.begin();
- aIter != aEnd; ++aIter,++nPos)
- {
- if ( aIter->is() )
- {
- VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >( aIter->get() );
- // Retrieve the item's index from the list entry.
- BOOL bNowSelected = pListBox->IsEntryPosSelected (nPos);
-
- if ( bNowSelected && !pItem->IsSelected() )
- {
- xNewAcc = *aIter;
- aNewValue <<= xNewAcc;
- m_nLastSelectedPos = nPos;
- }
-
- pItem->SetSelected( bNowSelected );
- }
- else
- { // it could happen that a child was not created before
- checkEntrySelected(pListBox,nPos,aNewValue,xNewAcc);
- }
- }
-
- USHORT nCount = pListBox->GetEntryCount();
- if ( nPos < nCount ) // here we have to check the if any other listbox entry is selected
- {
- for (; nPos < nCount && !checkEntrySelected(pListBox,nPos,aNewValue,xNewAcc) ;++nPos )
- ;
- }
- }
-
- if ( xNewAcc.is() && pListBox->HasFocus() )
- {
- if ( m_nLastSelectedPos != LISTBOX_ENTRY_NOTFOUND )
- aOldValue <<= getAccessibleChild( (sal_Int32)m_nLastSelectedPos );
- aNewValue <<= xNewAcc;
- }
- }
-
- if ( aNewValue.hasValue() || aOldValue.hasValue() )
- NotifyAccessibleEvent(
- AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
- aOldValue,
- aNewValue );
-
- NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
-}
-
-// -----------------------------------------------------------------------------
-// XAccessibleSelection
-// -----------------------------------------------------------------------------
-void SAL_CALL VCLXAccessibleListBoxList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
-{
- sal_Bool bNotify = sal_False;
-
- {
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
- ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
- ListBox* pListBox = static_cast< ListBox* >( GetWindow() );
- if ( pListBox )
- {
- checkSelection_Impl( nChildIndex, *pListBox, sal_False );
- pListBox->SelectEntryPos( (USHORT)nChildIndex, TRUE );
- // call the select handler, don't handle events in this time
- m_bDisableProcessEvent = true;
- pListBox->Select();
- m_bDisableProcessEvent = false;
- bNotify = sal_True;
- }
- }
-
- if ( bNotify )
- UpdateSelection_Impl();
-}
-// -----------------------------------------------------------------------------
-sal_Bool SAL_CALL VCLXAccessibleListBoxList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
-{
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
- ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
- sal_Bool bRet = sal_False;
- ListBox* pListBox = static_cast< ListBox* >( GetWindow() );
- if ( pListBox )
- {
- checkSelection_Impl( nChildIndex, *pListBox, sal_False );
- bRet = pListBox->IsEntryPosSelected( (USHORT)nChildIndex );
- }
- return bRet;
-}
-// -----------------------------------------------------------------------------
-void SAL_CALL VCLXAccessibleListBoxList::clearAccessibleSelection( ) throw (RuntimeException)
-{
- sal_Bool bNotify = sal_False;
-
- {
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
- ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
- ListBox* pListBox = static_cast< ListBox* >( GetWindow() );
- if ( pListBox )
- {
- pListBox->SetNoSelection();
- bNotify = sal_True;
- }
- }
-
- if ( bNotify )
- UpdateSelection_Impl();
-}
-// -----------------------------------------------------------------------------
-void SAL_CALL VCLXAccessibleListBoxList::selectAllAccessibleChildren( ) throw (RuntimeException)
-{
- sal_Bool bNotify = sal_False;
-
- {
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
- ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
- ListBox* pListBox = static_cast< ListBox* >( GetWindow() );
- if ( pListBox )
- {
- USHORT nCount = pListBox->GetEntryCount();
- for ( USHORT i = 0; i < nCount; ++i )
- pListBox->SelectEntryPos( i, TRUE );
- // call the select handler, don't handle events in this time
- m_bDisableProcessEvent = true;
- pListBox->Select();
- m_bDisableProcessEvent = false;
- bNotify = sal_True;
- }
- }
-
- if ( bNotify )
- UpdateSelection_Impl();
-}
-// -----------------------------------------------------------------------------
-sal_Int32 SAL_CALL VCLXAccessibleListBoxList::getSelectedAccessibleChildCount( ) throw (RuntimeException)
-{
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
- ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
- sal_Int32 nCount = 0;
- ListBox* pListBox = static_cast< ListBox* >( GetWindow() );
- if ( pListBox )
- nCount = pListBox->GetSelectEntryCount();
- return nCount;
-}
-// -----------------------------------------------------------------------------
-Reference< XAccessible > SAL_CALL VCLXAccessibleListBoxList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
-{
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
- ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
- ListBox* pListBox = static_cast< ListBox* >( GetWindow() );
- if ( pListBox )
- {
- checkSelection_Impl( nSelectedChildIndex, *pListBox, sal_True );
- return getAccessibleChild( (sal_Int32)pListBox->GetSelectEntryPos( (USHORT)nSelectedChildIndex ) );
- }
-
- return NULL;
-}
-// -----------------------------------------------------------------------------
-void SAL_CALL VCLXAccessibleListBoxList::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
-{
- sal_Bool bNotify = sal_False;
-
- {
- vos::OGuard aSolarGuard( Application::GetSolarMutex() );
- ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
- ListBox* pListBox = static_cast< ListBox* >( GetWindow() );
- if ( pListBox )
- {
- checkSelection_Impl( nSelectedChildIndex, *pListBox, sal_False );
- pListBox->SelectEntryPos( (USHORT)nSelectedChildIndex, FALSE );
- // call the select handler, don't handle events in this time
- m_bDisableProcessEvent = true;
- pListBox->Select();
- m_bDisableProcessEvent = false;
- bNotify = sal_True;
- }
- }
-
- if ( bNotify )
- UpdateSelection_Impl();
-}
-// -----------------------------------------------------------------------------
-
diff --git a/avmedia/prj/build.lst b/avmedia/prj/build.lst
index 1ef04ca0f7d5..6651d9d74f8f 100644
--- a/avmedia/prj/build.lst
+++ b/avmedia/prj/build.lst
@@ -6,6 +6,6 @@ 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\xine nmake - all av_xine NULL
av avmedia\source\quicktime nmake - all av_quicktime NULL
-av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_quicktime av_xine NULL
+av avmedia\source\gstreamer nmake - all av_gstreamer NULL
+av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_quicktime av_gstreamer NULL
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index a71b5268abd7..2eb18cb164d9 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -91,8 +91,6 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle )
{
-
-
maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage( AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) );
maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, HID_AVMEDIA_TOOLBOXITEM_OPEN );
@@ -103,8 +101,6 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
}
else
{
- maTimeSlider.SetBackground();
- maVolumeSlider.SetBackground();
mpZoomListBox->SetBackground();
maZoomToolBox.SetBackground();
diff --git a/avmedia/source/gstreamer/exports.dxp b/avmedia/source/gstreamer/exports.dxp
new file mode 100644
index 000000000000..9630d7e06768
--- /dev/null
+++ b/avmedia/source/gstreamer/exports.dxp
@@ -0,0 +1,3 @@
+component_getImplementationEnvironment
+component_writeInfo
+component_getFactory
diff --git a/avmedia/source/gstreamer/gstcommon.hxx b/avmedia/source/gstreamer/gstcommon.hxx
new file mode 100644
index 000000000000..83bb818aefdc
--- /dev/null
+++ b/avmedia/source/gstreamer/gstcommon.hxx
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _GSTCOMMON_HXX
+#define _GSTCOMMON_HXX
+
+#include <osl/mutex.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/debug.hxx>
+#include <tools/stream.hxx>
+#include <tools/string.hxx>
+#include <tools/urlobj.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/factory.hxx>
+
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/KeyModifier.hpp>
+#include <com/sun/star/awt/MouseButton.hpp>
+#include <com/sun/star/media/XManager.hpp>
+
+#include <memory>
+
+#define AVMEDIA_GSTREAMER_MANAGER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Manager_GStreamer"
+#define AVMEDIA_GSTREAMER_MANAGER_SERVICENAME "com.sun.star.media.Manager_GStreamer"
+
+#define AVMEDIA_GSTREAMER_PLAYER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Player_GStreamer"
+#define AVMEDIA_GSTREAMER_PLAYER_SERVICENAME "com.sun.star.media.Player_GStreamer"
+
+#define AVMEDIA_GSTREAMER_WINDOW_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Window_GStreamer"
+#define AVMEDIA_GSTREAMER_WINDOW_SERVICENAME "com.sun.star.media.Window_GStreamer"
+
+#define AVMEDIA_GSTREAMER_FRAMEGRABBER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.FrameGrabber_GStreamer"
+#define AVMEDIA_GSTREAMER_FRAMEGRABBER_SERVICENAME "com.sun.star.media.FrameGrabber_GStreamer"
+
+#endif // _GSTCOMMOM_HXX
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
new file mode 100644
index 000000000000..bd55e11f8afe
--- /dev/null
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -0,0 +1,307 @@
+/*************************************************************************
+ *
+ * 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 "gstframegrabber.hxx"
+#include "gstplayer.hxx"
+
+#include <vcl/graph.hxx>
+#include <vcl/bmpacc.hxx>
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace gst {
+
+const gulong GRAB_TIMEOUT = 10000000;
+
+// ----------------
+// - FrameGrabber -
+// ----------------
+
+FrameGrabber::FrameGrabber( GString* pURI ) :
+ Player( pURI ),
+ mpFrameMutex( g_mutex_new() ),
+ mpFrameCond( g_cond_new() ),
+ mpLastPixbuf( NULL ),
+ mbIsInGrabMode( false )
+{
+}
+
+// ------------------------------------------------------------------------------
+
+FrameGrabber::~FrameGrabber()
+{
+ if( g_atomic_pointer_get( &mpPlayer ) )
+ {
+ implQuitThread();
+ }
+
+ // thread has ended, so that no more synchronization is necessary
+ if( mpLastPixbuf )
+ {
+ g_object_unref( mpLastPixbuf );
+ mpLastPixbuf = NULL;
+ }
+
+ g_cond_free( mpFrameCond );
+ g_mutex_free( mpFrameMutex );
+}
+
+// ------------------------------------------------------------------------------
+
+FrameGrabber* FrameGrabber::create( const GString* pURI )
+{
+ FrameGrabber* pFrameGrabber = NULL;
+
+ if( pURI && pURI->len )
+ {
+ // safely initialize GLib threading framework
+ try
+ {
+ if( !g_thread_supported() )
+ {
+ g_thread_init( NULL );
+ }
+ }
+ catch( ... )
+ {}
+
+ if( g_thread_supported() )
+ {
+ pFrameGrabber = new FrameGrabber( g_string_new( pURI->str ) );
+
+ // wait until thread signals that it has finished initialization
+ if( pFrameGrabber->mpThread )
+ {
+ g_mutex_lock( pFrameGrabber->mpMutex );
+
+ while( !pFrameGrabber->implIsInitialized() )
+ {
+ g_cond_wait( pFrameGrabber->mpCond, pFrameGrabber->mpMutex );
+ }
+
+ g_mutex_unlock( pFrameGrabber->mpMutex );
+ }
+
+ GstElement* pPixbufSink = gst_element_factory_make( "gdkpixbufsink", NULL );
+
+ // check if player pipeline and GdkPixbufSink could be initialized
+ if( !pFrameGrabber->mpPlayer || !pPixbufSink )
+ {
+ delete pFrameGrabber;
+ pFrameGrabber = NULL;
+ }
+ else
+ {
+ g_object_set( pFrameGrabber->mpPlayer, "audio-sink", gst_element_factory_make( "fakesink", NULL ), NULL );
+ g_object_set( pFrameGrabber->mpPlayer, "video-sink", pPixbufSink, NULL );
+ }
+ }
+ }
+
+ return( pFrameGrabber );
+}
+
+// ------------------------------------------------------------------------------
+
+gboolean FrameGrabber::busCallback( GstBus* pBus, GstMessage* pMsg )
+{
+ bool bDone = false;
+
+ if( pMsg && pMsg->structure )
+ {
+ GstStructure* pStruct = pMsg->structure;
+ const gchar* pStructName = gst_structure_get_name( pStruct );
+
+ if( ( ::std::string( pStructName ).find( "pixbuf" ) != ::std::string::npos ) &&
+ gst_structure_has_field ( pStruct, "pixbuf") )
+ {
+ bool bFrameGrabbed = false;
+
+ g_mutex_lock( mpFrameMutex );
+
+ if( mbIsInGrabMode && ( getMediaTime() >= mfGrabTime ) )
+ {
+ OSL_TRACE( "Grabbing frame at %fs", getMediaTime() );
+
+ if( mpLastPixbuf )
+ {
+ g_object_unref( mpLastPixbuf );
+ mpLastPixbuf = NULL;
+ }
+
+ mpLastPixbuf = GDK_PIXBUF( g_value_dup_object( gst_structure_get_value( pStruct, "pixbuf" ) ) );
+ bFrameGrabbed = true;
+ }
+
+ g_mutex_unlock( mpFrameMutex );
+
+ if( bFrameGrabbed )
+ {
+ g_cond_signal( mpFrameCond );
+ }
+
+ bDone = true;
+ }
+ }
+
+ return( bDone || Player::busCallback( pBus, pMsg ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
+ throw (uno::RuntimeException)
+{
+ uno::Reference< graphic::XGraphic > xRet;
+
+ if( implInitPlayer() )
+ {
+ OSL_TRACE( "Trying to grab frame at %fs", fMediaTime );
+
+ GTimeVal aTimeoutTime;
+
+ g_get_current_time( &aTimeoutTime );
+ g_time_val_add( &aTimeoutTime, GRAB_TIMEOUT );
+ setMediaTime( fMediaTime );
+ start();
+
+ if( isPlaying() )
+ {
+ g_mutex_lock( mpFrameMutex );
+
+ mbIsInGrabMode = true;
+ mfGrabTime = fMediaTime;
+ g_cond_timed_wait( mpFrameCond, mpFrameMutex, &aTimeoutTime );
+ mbIsInGrabMode = false;
+
+ g_mutex_unlock( mpFrameMutex );
+
+ stop();
+ }
+
+ OSL_ENSURE( g_atomic_pointer_get( &mpLastPixbuf ), "FrameGrabber timed out without receiving a Pixbuf" );
+
+ if( g_atomic_pointer_get( &mpLastPixbuf ) )
+ {
+ OSL_TRACE( "FrameGrabber received a GdkPixbuf");
+
+ g_mutex_lock( mpFrameMutex );
+
+ const int nWidth = gdk_pixbuf_get_width( mpLastPixbuf );
+ const int nHeight = gdk_pixbuf_get_height( mpLastPixbuf );
+ const int nChannels = gdk_pixbuf_get_n_channels( mpLastPixbuf );
+ const guchar* pBuffer = gdk_pixbuf_get_pixels( mpLastPixbuf );
+
+ if( pBuffer && ( nWidth > 0 ) && ( nHeight > 0 ) )
+ {
+ Bitmap aFrame( Size( nWidth, nHeight), 24 );
+ bool bInit = false;
+
+ if( ( gdk_pixbuf_get_colorspace( mpLastPixbuf ) == GDK_COLORSPACE_RGB ) &&
+ ( nChannels >= 3 ) && ( nChannels <= 4 ) &&
+ ( gdk_pixbuf_get_bits_per_sample( mpLastPixbuf ) == 8 ) )
+ {
+ BitmapWriteAccess* pAcc = aFrame.AcquireWriteAccess();
+
+ if( pAcc )
+ {
+ BitmapColor aPixel( 0, 0, 0 );
+ const int nRowStride = gdk_pixbuf_get_rowstride( mpLastPixbuf );
+ const bool bAlpha = ( nChannels == 4 );
+
+ for( int nRow = 0; nRow < nHeight; ++nRow )
+ {
+ guchar* pCur = const_cast< guchar* >( pBuffer + nRow * nRowStride );
+
+ for( int nCol = 0; nCol < nWidth; ++nCol )
+ {
+ aPixel.SetRed( *pCur++ );
+ aPixel.SetGreen( *pCur++ );
+ aPixel.SetBlue( *pCur++ );
+
+ // ignore alpha channel
+ if( bAlpha )
+ {
+ ++pCur;
+ }
+
+ pAcc->SetPixel( nRow, nCol, aPixel );
+ }
+ }
+
+ aFrame.ReleaseAccess( pAcc );
+ bInit = true;
+ }
+ }
+
+ if( !bInit )
+ {
+ aFrame.Erase( Color( COL_BLACK ) );
+ }
+
+ xRet = Graphic( aFrame ).GetXGraphic();
+ }
+
+ g_object_unref( mpLastPixbuf );
+ mpLastPixbuf = NULL;
+
+ g_mutex_unlock( mpFrameMutex );
+ }
+ }
+
+ return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( )
+ throw (uno::RuntimeException)
+{
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_GSTREAMER_FRAMEGRABBER_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
+ throw (uno::RuntimeException)
+{
+ return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_GSTREAMER_FRAMEGRABBER_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
+ throw (uno::RuntimeException)
+{
+ uno::Sequence< ::rtl::OUString > aRet(1);
+ aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_GSTREAMER_FRAMEGRABBER_SERVICENAME ) );
+
+ return aRet;
+}
+
+} // namespace win
+} // namespace avmedia
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
new file mode 100644
index 000000000000..9a7ec1b74102
--- /dev/null
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -0,0 +1,81 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _FRAMEGRABBER_HXX
+#define _FRAMEGRABBER_HXX
+
+#include "gstplayer.hxx"
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_
+#include "com/sun/star/media/XFrameGrabber.hdl"
+#endif
+
+namespace avmedia { namespace gst {
+
+// ----------------
+// - FrameGrabber -
+// ----------------
+
+class FrameGrabber : public Player,
+ public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XFrameGrabber,
+ ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+ // static create method instead of public Ctor
+ static FrameGrabber* create( const GString* pUri );
+
+ ~FrameGrabber();
+
+ // XFrameGrabber
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException);
+
+ // XServiceInfo
+ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
+
+protected: FrameGrabber( GString* pURI = NULL );
+
+ virtual gboolean busCallback( GstBus* pBus,
+ GstMessage* pMsg );
+
+private: FrameGrabber( const FrameGrabber& );
+ FrameGrabber& operator=( const FrameGrabber& );
+
+ GMutex* mpFrameMutex;
+ GCond* mpFrameCond;
+ GdkPixbuf* mpLastPixbuf;
+ double mfGrabTime;
+ bool mbIsInGrabMode;
+};
+
+} // namespace gst
+} // namespace avmedia
+
+#endif // _FRAMEGRABBER_HXX
diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx
new file mode 100644
index 000000000000..61ee4ce22cd8
--- /dev/null
+++ b/avmedia/source/gstreamer/gstmanager.cxx
@@ -0,0 +1,85 @@
+/*************************************************************************
+ *
+ * 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 "gstmanager.hxx"
+#include "gstplayer.hxx"
+
+using namespace ::com::sun::star;
+
+namespace avmedia
+{
+namespace gst
+{
+// ----------------
+// - Manager -
+// ----------------
+
+Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
+ mxMgr( rxMgr )
+{}
+
+// ------------------------------------------------------------------------------
+
+Manager::~Manager()
+{}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
+ throw( uno::RuntimeException )
+{
+ return( ::avmedia::gst::Player::create( rURL ) );
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Manager::getImplementationName()
+ throw( uno::RuntimeException )
+{
+ return( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_GSTREAMER_MANAGER_IMPLEMENTATIONNAME ) ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
+ throw( uno::RuntimeException )
+{
+ return( ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( AVMEDIA_GSTREAMER_MANAGER_SERVICENAME ) ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames()
+ throw( uno::RuntimeException )
+{
+ uno::Sequence< ::rtl::OUString > aRet( 1 );
+ aRet[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_GSTREAMER_MANAGER_SERVICENAME ) );
+
+ return( aRet );
+}
+} // namespace gst
+} // namespace avmedia
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
new file mode 100644
index 000000000000..9f80e8c1a901
--- /dev/null
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _GSTMANAGER_HXX
+#define _GSTMANAGER_HXX
+
+#include "gstcommon.hxx"
+
+#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
+#include "com/sun/star/media/XManager.hdl"
+#endif
+
+// -----------
+// - Manager -
+// -----------
+
+namespace avmedia
+{
+namespace gst
+{
+class Manager : public ::cppu::WeakImplHelper2< ::com::sun::star::media::XManager,
+ ::com::sun::star::lang::XServiceInfo >
+{
+public: Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+ ~Manager();
+
+ // XManager
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer(
+ const ::rtl::OUString& aURL )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ // XServiceInfo
+ virtual ::rtl::OUString SAL_CALL getImplementationName()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+
+private:
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+};
+} // namespace gst
+} // namespace avmedia
+
+#endif // _GSTMANAGER_HXX
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
new file mode 100644
index 000000000000..f082cfc5c513
--- /dev/null
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -0,0 +1,938 @@
+/*************************************************************************
+ *
+ * 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 "gstplayer.hxx"
+#include "gstwindow.hxx"
+#include "gstframegrabber.hxx"
+#include <stdio.h>
+#include <unistd.h>
+#include <math.h>
+#include <string>
+#include <gst/gstelement.h>
+#include <gst/interfaces/xoverlay.h>
+
+
+// maximum timeout time in nanoseconds
+#define GST_MAX_TIMEOUT (2500 * GST_MSECOND)
+
+using namespace ::com::sun::star;
+
+namespace avmedia
+{
+namespace gst
+{
+const double NANO_TIME_FACTOR = 1000000000.0;
+
+const long VIDEO_DEFAULT_WIDTH = 256;
+const long VIDEO_DEFAULT_HEIGHT = 192;
+
+// ----------------
+// - GstBusSource -
+// ----------------
+
+struct GstBusSource : public GSource
+{
+ GstBus* mpBus;
+
+ GstBusSource() :
+ mpBus( NULL )
+ {}
+
+ ~GstBusSource()
+ {}
+};
+
+// ---------------
+// - Player -
+// ---------------
+Player::Player( GString* pURI ) :
+ mpMutex( g_mutex_new() ),
+ mpCond( g_cond_new() ),
+ mpThread( NULL ),
+ mpContext( NULL ),
+ mpLoop( NULL ),
+ mpPlayer( NULL ),
+ mpURI( pURI ),
+ mpPlayerWindow( NULL ),
+ mnIsVideoSource( 0 ),
+ mnVideoWidth( 0 ),
+ mnVideoHeight( 0 ),
+ mnInitialized( 0 ),
+ mnVolumeDB( 0 ),
+ mnLooping( 0 ),
+ mnQuit( 0 ),
+ mnVideoWindowSet( 0 ),
+ mnInitFail( 0 )
+{
+ // initialize GStreamer framework only once
+ static bool bGstInitialized = false;
+
+ if( !bGstInitialized )
+ {
+ gst_init( NULL, NULL );
+ bGstInitialized = true;
+ }
+
+ if( pURI )
+ {
+ OSL_TRACE( ">>> --------------------------------" );
+ OSL_TRACE( ">>> Creating Player object with URL: %s", pURI->str );
+
+ mpThread = g_thread_create( Player::implThreadFunc, this, true, NULL );
+ }
+}
+
+// ------------------------------------------------------------------------------
+
+Player::~Player()
+{
+ if( g_atomic_pointer_get( &mpPlayer ) )
+ {
+ implQuitThread();
+ }
+
+ // cleanup
+ g_cond_free( mpCond );
+ g_mutex_free( mpMutex );
+ g_string_free( mpURI, false );
+}
+
+// ------------------------------------------------------------------------------
+Player* Player::create( const ::rtl::OUString& rURL )
+{
+ Player* pPlayer = NULL;
+
+ if( rURL.getLength() )
+ {
+ // safely initialize GLib threading framework
+ try
+ {
+ if( !g_thread_supported() )
+ {
+ g_thread_init( NULL );
+ }
+ }
+ catch( ... )
+ {}
+
+ if( g_thread_supported() )
+ {
+ const INetURLObject aURL( rURL );
+
+ if( aURL.GetProtocol() != INET_PROT_NOT_VALID )
+ {
+ GString* pURI = g_string_new( ::rtl::OUStringToOString(
+ aURL.GetMainURL( INetURLObject::NO_DECODE ),
+ RTL_TEXTENCODING_UTF8 ).getStr() );
+
+ if( pURI->len )
+ {
+ pPlayer = new Player( pURI );
+
+ // wait until thread signals that it has finished initialization
+ if( pPlayer->mpThread )
+ {
+ g_mutex_lock( pPlayer->mpMutex );
+
+ while( !pPlayer->implIsInitialized() )
+ {
+ g_cond_wait( pPlayer->mpCond, pPlayer->mpMutex );
+ }
+
+ g_mutex_unlock( pPlayer->mpMutex );
+ }
+
+ // check if player pipeline could be initialized
+ if( !pPlayer->mpPlayer )
+ {
+ delete pPlayer;
+ pPlayer = NULL;
+ }
+ }
+ else
+ {
+ g_string_free( pURI, false );
+ }
+ }
+ }
+ }
+
+ return( pPlayer );
+}
+
+// ------------------------------------------------------------------------------
+void SAL_CALL Player::start()
+ throw( uno::RuntimeException )
+{
+ if( implInitPlayer() && !isPlaying() )
+ {
+ gst_element_set_state( mpPlayer, GST_STATE_PLAYING );
+ }
+}
+
+// ------------------------------------------------------------------------------
+void SAL_CALL Player::stop()
+ throw( uno::RuntimeException )
+{
+ if( implInitPlayer() && isPlaying() )
+ {
+ gst_element_set_state( mpPlayer, GST_STATE_PAUSED );
+ }
+}
+
+// ------------------------------------------------------------------------------
+sal_Bool SAL_CALL Player::isPlaying()
+ throw( uno::RuntimeException )
+{
+ GstState aState = GST_STATE_NULL;
+
+ if( mpPlayer )
+ {
+ gst_element_get_state( mpPlayer, &aState, NULL, GST_MAX_TIMEOUT );
+ }
+
+ return( GST_STATE_PLAYING == aState );
+}
+
+// ------------------------------------------------------------------------------
+double SAL_CALL Player::getDuration()
+ throw( uno::RuntimeException )
+{
+ gint64 nDuration = 0;
+
+ if( implInitPlayer() )
+ {
+ GstFormat aFormat = GST_FORMAT_TIME;
+
+ if( !gst_element_query_duration( mpPlayer, &aFormat, &nDuration ) ||
+ ( GST_FORMAT_TIME != aFormat ) ||
+ ( nDuration < 0 ) )
+ {
+ nDuration = 0;
+ }
+ }
+
+ return( static_cast< double >( nDuration ) / NANO_TIME_FACTOR );
+}
+
+// ------------------------------------------------------------------------------
+void SAL_CALL Player::setMediaTime( double fTime )
+ throw( uno::RuntimeException )
+{
+ if( implInitPlayer() )
+ {
+ fTime = ::std::min( ::std::max( fTime, 0.0 ), getDuration() );
+
+ gst_element_seek_simple( mpPlayer, GST_FORMAT_TIME,
+ (GstSeekFlags) ( GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT ),
+ static_cast< gint64 >( fTime * NANO_TIME_FACTOR ) );
+ }
+}
+
+// ------------------------------------------------------------------------------
+double SAL_CALL Player::getMediaTime()
+ throw( uno::RuntimeException )
+{
+ double fRet = 0.0;
+
+ if( implInitPlayer() )
+ {
+ GstFormat aFormat = GST_FORMAT_TIME;
+ gint64 nCurTime = 0;
+
+ if( gst_element_query_position( mpPlayer, &aFormat, &nCurTime ) &&
+ ( GST_FORMAT_TIME == aFormat ) &&
+ ( nCurTime >= 0 ) )
+ {
+ fRet = static_cast< double >( nCurTime ) / NANO_TIME_FACTOR;
+ }
+ }
+
+ return( fRet );
+}
+
+// ------------------------------------------------------------------------------
+void SAL_CALL Player::setStopTime( double /* fTime */ )
+ throw( uno::RuntimeException )
+{
+ OSL_TRACE( "GStreamer method avmedia::gst::Player::setStopTime needs to be implemented" );
+
+ /* Currently no need for implementation since higher levels of code don't use this method at all
+ !!! TODO: needs to be implemented if this functionality is needed at a later point of time
+ if( implInitPlayer() )
+ {
+ }
+
+ */
+}
+
+// ------------------------------------------------------------------------------
+double SAL_CALL Player::getStopTime()
+ throw( uno::RuntimeException )
+{
+ /*
+ Currently no need for implementation since higher levels of code don't set a stop time ATM
+ !!! TODO: needs to be fully implemented if this functionality is needed at a later point of time
+ */
+
+ return( getDuration() );
+}
+
+// ------------------------------------------------------------------------------
+void SAL_CALL Player::setRate( double /* fRate */ )
+ throw( uno::RuntimeException )
+{
+ OSL_TRACE( "GStreamer method avmedia::gst::Player::setRate needs to be implemented" );
+
+ /* Currently no need for implementation since higher levels of code don't use this method at all
+ !!! TODO: needs to be implemented if this functionality is needed at a later point of time
+ */
+}
+
+// ------------------------------------------------------------------------------
+double SAL_CALL Player::getRate()
+ throw( uno::RuntimeException )
+{
+ /*
+ Currently no need for implementation since higher levels of code don't set a different rate than 1 ATM
+ !!! TODO: needs to be fully implemented if this functionality is needed at a later point of time
+ */
+
+ return( 1.0 );
+}
+
+// ------------------------------------------------------------------------------
+void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
+ throw( uno::RuntimeException )
+{
+ if( bSet && !isPlaybackLoop() )
+ g_atomic_int_inc( &mnLooping );
+ else if( !bSet && isPlaybackLoop() )
+ g_atomic_int_dec_and_test( &mnLooping );
+}
+
+// ------------------------------------------------------------------------------
+sal_Bool SAL_CALL Player::isPlaybackLoop()
+ throw( uno::RuntimeException )
+{
+ return( g_atomic_int_get( &mnLooping ) > 0 );
+}
+
+// ------------------------------------------------------------------------------
+void SAL_CALL Player::setMute( sal_Bool bSet )
+ throw( uno::RuntimeException )
+{
+ if( implInitPlayer() && ( bSet != isMute() ) )
+ {
+ if( bSet )
+ {
+ g_object_set( mpPlayer, "volume", 0.0, NULL );
+ }
+ else
+ {
+ setVolumeDB( mnVolumeDB );
+ }
+ }
+}
+
+// ------------------------------------------------------------------------------
+sal_Bool SAL_CALL Player::isMute()
+ throw( uno::RuntimeException )
+{
+ gdouble fGstVolume = 1.0;
+
+ if( implInitPlayer() )
+ {
+ g_object_get( mpPlayer, "volume", &fGstVolume, NULL );
+ }
+
+ return( 0.0 == fGstVolume );
+}
+
+// ------------------------------------------------------------------------------
+void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
+ throw( uno::RuntimeException )
+{
+ if( implInitPlayer() )
+ {
+ g_mutex_lock( mpMutex );
+ mnVolumeDB = nVolumeDB;
+ g_mutex_unlock( mpMutex );
+
+ // maximum gain for gstreamer volume is 10
+ double fGstVolume = pow( 10.0, static_cast< double >( ::std::min(
+ nVolumeDB, static_cast< sal_Int16 >( 20 ) ) / 20.0 ) );
+
+ g_object_set( mpPlayer, "volume", fGstVolume, NULL );
+ }
+}
+
+// ------------------------------------------------------------------------------
+sal_Int16 SAL_CALL Player::getVolumeDB()
+ throw( uno::RuntimeException )
+{
+ return( static_cast< sal_Int16 >( g_atomic_int_get( &mnVolumeDB ) ) );
+}
+
+// ------------------------------------------------------------------------------
+awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
+ throw( uno::RuntimeException )
+{
+ awt::Size aSize( 0, 0 );
+
+ if( implInitPlayer() && ( g_atomic_int_get( &mnIsVideoSource ) > 0 ) )
+ {
+ aSize.Width = g_atomic_int_get( &mnVideoWidth );
+ aSize.Height = g_atomic_int_get( &mnVideoHeight );
+
+ // if we have a video source, but no size is given => use default size
+ if( ( aSize.Width <= 0 ) || ( aSize.Height <= 0 ) )
+ {
+ aSize.Width = VIDEO_DEFAULT_WIDTH;
+ aSize.Height = VIDEO_DEFAULT_HEIGHT;
+ }
+ }
+
+ OSL_TRACE( ">>> Requested preferred video size is: %d x %d pixel", aSize.Width, aSize.Height );
+
+ return( aSize );
+}
+
+// ------------------------------------------------------------------------------
+uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow(
+ const uno::Sequence< uno::Any >& rArguments )
+ throw( uno::RuntimeException )
+{
+ uno::Reference< ::media::XPlayerWindow > xRet;
+ awt::Size aSize( getPreferredPlayerWindowSize() );
+
+ OSL_ENSURE( !g_atomic_pointer_get( &mpPlayerWindow ), "::avmedia::gst::Player already has a player window" );
+
+ if( ( aSize.Width > 0 ) && ( aSize.Height > 0 ) )
+ {
+ Window* pPlayerWindow = new Window( *this );
+
+ xRet = pPlayerWindow;
+
+ if( !pPlayerWindow->create( rArguments ) )
+ {
+ xRet.clear();
+ }
+ else
+ {
+ // try to use gconf user configurable video sink first
+ GstElement* pVideoSink = gst_element_factory_make( "gconfvideosink", NULL );
+
+ if( ( NULL != pVideoSink ) ||
+ ( NULL != ( pVideoSink = gst_element_factory_make( "autovideosink", NULL ) ) ) ||
+ ( NULL != ( pVideoSink = gst_element_factory_make( "xvimagesink", NULL ) ) ) ||
+ ( NULL != ( pVideoSink = gst_element_factory_make( "ximagesink", NULL ) ) ) )
+ {
+ GstState aOldState = GST_STATE_NULL;
+
+ mpPlayerWindow = pPlayerWindow;
+ gst_element_get_state( mpPlayer, &aOldState, NULL, GST_MAX_TIMEOUT );
+ gst_element_set_state( mpPlayer, GST_STATE_READY );
+ g_object_set( mpPlayer, "video-sink", pVideoSink, NULL );
+ gst_element_set_state( mpPlayer, aOldState );
+ }
+ }
+ }
+
+ return( xRet );
+}
+
+// ------------------------------------------------------------------------------
+uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
+ throw( ::com::sun::star::uno::RuntimeException )
+{
+ FrameGrabber* pFrameGrabber = NULL;
+ const awt::Size aPrefSize( getPreferredPlayerWindowSize() );
+
+ if( ( aPrefSize.Width > 0 ) && ( aPrefSize.Height > 0 ) )
+ {
+ pFrameGrabber = FrameGrabber::create( mpURI );
+ }
+
+ return( pFrameGrabber );
+}
+
+// ------------------------------------------------------------------------------
+void SAL_CALL Player::dispose()
+ throw( uno::RuntimeException )
+{
+ if( mpPlayer )
+ {
+ stop();
+ implQuitThread();
+ }
+
+ OSL_ASSERT( NULL == mpPlayer );
+}
+
+// ------------------------------------------------------------------------------
+void SAL_CALL Player::addEventListener( const uno::Reference< lang::XEventListener >& /*rxListener*/ )
+ throw( uno::RuntimeException )
+{}
+
+// ------------------------------------------------------------------------------
+void SAL_CALL Player::removeEventListener( const uno::Reference< lang::XEventListener >& /*rxListener*/ )
+ throw( uno::RuntimeException )
+{}
+
+// ------------------------------------------------------------------------------
+::rtl::OUString SAL_CALL Player::getImplementationName()
+ throw( uno::RuntimeException )
+{
+ return( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_GSTREAMER_PLAYER_IMPLEMENTATIONNAME ) ) );
+}
+
+// ------------------------------------------------------------------------------
+sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
+ throw( uno::RuntimeException )
+{
+ return( ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( AVMEDIA_GSTREAMER_PLAYER_SERVICENAME ) ) );
+}
+
+// ------------------------------------------------------------------------------
+uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames()
+ throw( uno::RuntimeException )
+{
+ uno::Sequence< ::rtl::OUString > aRet( 1 );
+ aRet[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_GSTREAMER_PLAYER_SERVICENAME ) );
+
+ return( aRet );
+}
+
+// ------------------------------------------------------------------------------
+void Player::implQuitThread()
+{
+ if( mpThread )
+ {
+ // set quit flag to 1 so that the main loop will be quit in idle
+ // handler the next time it is called from the thread's main loop
+ g_atomic_int_inc( &mnQuit );
+
+ // wait until loop and as such the thread has quit
+ g_thread_join( mpThread );
+ mpThread = NULL;
+ }
+}
+
+// ------------------------------------------------------------------------------
+bool Player::implInitPlayer()
+{
+ bool bRet = false;
+
+ if( mpPlayer && (mnInitFail < 3) )
+ {
+ GstState aState = GST_STATE_NULL;
+
+ if( gst_element_get_state( mpPlayer, &aState, NULL, GST_MAX_TIMEOUT ) == GST_STATE_CHANGE_SUCCESS )
+ {
+ bRet = ( GST_STATE_PAUSED == aState ) || ( GST_STATE_PLAYING == aState );
+
+ if( !bRet )
+ {
+ gst_element_set_state( mpPlayer, GST_STATE_PAUSED );
+ bRet = ( gst_element_get_state( mpPlayer, &aState, NULL,
+ GST_MAX_TIMEOUT ) == GST_STATE_CHANGE_SUCCESS ) &&
+ ( GST_STATE_PAUSED == aState );
+ }
+ }
+
+ if( ! bRet )
+ mnInitFail++;
+ }
+
+ return( bRet );
+}
+
+// ------------------------------------------------------------------------------
+gboolean Player::implBusPrepare( GSource* pSource,
+ gint* pTimeout )
+{
+ if( pTimeout )
+ {
+ *pTimeout = 0;
+ }
+
+ return( implBusCheck( pSource ) );
+}
+
+// ------------------------------------------------------------------------------
+gboolean Player::implBusCheck( GSource* pSource )
+{
+ GstBusSource* pBusSource = static_cast< GstBusSource* >( pSource );
+
+ return( pBusSource &&
+ GST_IS_BUS( pBusSource->mpBus ) &&
+ gst_bus_have_pending( GST_BUS_CAST( pBusSource->mpBus ) ) );
+}
+
+// ------------------------------------------------------------------------------
+gboolean Player::implBusDispatch( GSource* pSource,
+ GSourceFunc /*aCallback*/,
+ gpointer pData )
+{
+ GstBusSource* pBusSource = static_cast< GstBusSource* >( pSource );
+ gboolean bRet = false;
+
+ if( pData && pBusSource && GST_IS_BUS( pBusSource->mpBus ) )
+ {
+ GstMessage* pMsg = gst_bus_pop( pBusSource->mpBus );
+
+ if( pMsg )
+ {
+ bRet = static_cast< Player* >( pData )->busCallback( pBusSource->mpBus, pMsg );
+ gst_message_unref( pMsg );
+ }
+ }
+
+ return( bRet );
+}
+
+// ------------------------------------------------------------------------------
+void Player::implBusFinalize( GSource* pSource )
+{
+ GstBusSource* pBusSource = static_cast< GstBusSource* >( pSource );
+
+ if( pBusSource && pBusSource->mpBus )
+ {
+ gst_object_unref( pBusSource->mpBus );
+ pBusSource->mpBus = NULL;
+ }
+}
+
+// ------------------------------------------------------------------------------
+gboolean Player::busCallback( GstBus* /*pBus*/,
+ GstMessage* pMsg )
+{
+ if( pMsg && mpLoop )
+ {
+ switch( GST_MESSAGE_TYPE( pMsg ) )
+ {
+ case ( GST_MESSAGE_EOS ):
+ {
+ if( g_atomic_int_get( &mnLooping ) > 0 )
+ {
+ setMediaTime( 0.0 );
+ start();
+ }
+ else
+ {
+ stop();
+ }
+ }
+ break;
+
+ case ( GST_MESSAGE_ERROR ):
+ {
+ gchar* pDebug;
+ GError* pErr;
+
+ gst_message_parse_error( pMsg, &pErr, &pDebug );
+ fprintf( stderr, "Error: %s\n", pErr->message );
+
+ g_free( pDebug );
+ g_error_free( pErr );
+ }
+ break;
+
+ default:
+ {
+ break;
+ }
+ }
+ }
+
+ return( true );
+}
+
+// ------------------------------------------------------------------------------
+gboolean Player::implIdleFunc( gpointer pData )
+{
+ return( pData ? static_cast< Player* >( pData )->idle() : true );
+}
+
+// ------------------------------------------------------------------------------
+gpointer Player::implThreadFunc( gpointer pData )
+{
+ return( pData ? static_cast< Player* >( pData )->run() : NULL );
+}
+
+// ------------------------------------------------------------------------------
+GstBusSyncReply Player::implHandleCreateWindowFunc( GstBus* pBus,
+ GstMessage* pMsg,
+ gpointer pData )
+{
+ return( pData ? static_cast< Player* >( pData )->handleCreateWindow( pBus, pMsg ) : GST_BUS_PASS );
+}
+
+// ------------------------------------------------------------------------------
+void Player::implHandleNewElementFunc( GstBin* /* pBin */,
+ GstElement* pElement,
+ gpointer pData )
+{
+ if( pElement )
+ {
+#ifdef DEBUG
+ gchar* pElementName = gst_element_get_name( pElement );
+
+ if( pElementName )
+ {
+ OSL_TRACE( ">>> Bin has element: %s", pElementName );
+ g_free( pElementName );
+ }
+#endif
+
+ if( GST_IS_BIN( pElement ) )
+ {
+ // set this handler in case we have a GstBin element
+ g_signal_connect( GST_BIN( pElement ), "element-added",
+ G_CALLBACK( Player::implHandleNewElementFunc ), pData );
+ }
+
+ // watch for all pads that are going to be added to this element;
+ g_signal_connect( pElement, "pad-added",
+ G_CALLBACK( Player::implHandleNewPadFunc ), pData );
+ }
+}
+
+// ------------------------------------------------------------------------------
+void Player::implHandleNewPadFunc( GstElement* pElement,
+ GstPad* pPad,
+ gpointer pData )
+{
+ Player* pPlayer = static_cast< Player* >( pData );
+
+ if( pPlayer && pElement && pPad )
+ {
+#ifdef DEBUG
+ gchar* pElementName = gst_element_get_name( pElement );
+ gchar* pPadName = gst_pad_get_name( pPad );
+
+ OSL_TRACE( ">>> Element %s has pad: %s", pElementName, pPadName );
+
+ g_free( pPadName );
+ g_free( pElementName );
+#endif
+
+ GstCaps* pCaps = gst_pad_get_caps( pPad );
+
+ // we are interested only in getting video properties
+ // width and height or if we have a video source at all
+ if( pCaps )
+ {
+ for( gint i = 0, nSize = gst_caps_get_size( pCaps ); i < nSize; ++i )
+ {
+ const GstStructure* pStruct = gst_caps_get_structure( pCaps, i );
+
+ if( pStruct )
+ {
+ const gchar* pStructName = gst_structure_get_name( pStruct );
+
+#ifdef DEBUG
+ OSL_TRACE( "\t>>> Pad has structure: %s", pStructName );
+
+ for( gint n = 0, nFields = gst_structure_n_fields( pStruct ); n < nFields; ++n )
+ {
+ OSL_TRACE( "\t\t>>> Structure has field: %s", gst_structure_nth_field_name( pStruct, n ) );
+ }
+#endif
+
+ // just look for structures having 'video' in their names
+ if( ::std::string( pStructName ).find( "video" ) != ::std::string::npos )
+ {
+ g_atomic_int_inc( &pPlayer->mnIsVideoSource );
+
+ for( gint n = 0, nFields = gst_structure_n_fields( pStruct ); n < nFields; ++n )
+ {
+ const gchar* pFieldName = gst_structure_nth_field_name( pStruct, n );
+ gint nValue;
+
+ if( ( ::std::string( pFieldName ).find( "width" ) != ::std::string::npos ) &&
+ gst_structure_get_int( pStruct, pFieldName, &nValue ) )
+ {
+ const gint nDiff = nValue - g_atomic_int_get( &pPlayer->mnVideoWidth );
+ g_atomic_int_add( &pPlayer->mnVideoWidth, ::std::max( nDiff, 0 ) );
+ }
+ else if( ( ::std::string( pFieldName ).find( "height" ) != ::std::string::npos ) &&
+ gst_structure_get_int( pStruct, pFieldName, &nValue ) )
+ {
+ const gint nDiff = nValue - g_atomic_int_get( &pPlayer->mnVideoHeight );
+ g_atomic_int_add( &pPlayer->mnVideoHeight, ::std::max( nDiff, 0 ) );
+ }
+ }
+ }
+ }
+ }
+
+ gst_caps_unref( pCaps );
+ }
+ }
+}
+
+// ------------------------------------------------------------------------------
+gboolean Player::idle()
+{
+ // test if main loop should quit and set flag mnQuit to 1
+ bool bQuit = g_atomic_int_compare_and_exchange( &mnQuit, 1, 1 );
+
+ if( bQuit )
+ {
+ // set mnQuit back to 0 to avoid mutiple g_main_loop_quit calls
+ // in case Player::idle() is called again later;
+ // the flag should have been set only once within Ctor called from
+ // the application thread
+ g_atomic_int_dec_and_test( &mnQuit );
+ g_main_loop_quit( mpLoop );
+ }
+
+ // don't eat up all cpu time
+ usleep( 1000 );
+
+ return( true );
+}
+
+// ------------------------------------------------------------------------------
+gpointer Player::run()
+{
+ static GSourceFuncs aSourceFuncs =
+ {
+ Player::implBusPrepare,
+ Player::implBusCheck,
+ Player::implBusDispatch,
+ Player::implBusFinalize,
+ NULL,
+ NULL
+ };
+
+ if( NULL != ( mpPlayer = gst_element_factory_make( "playbin", NULL ) ) )
+ {
+ // initialization
+ // no mutex necessary since initialization
+ // is synchronous until loop is started
+ mpContext = g_main_context_new();
+ mpLoop = g_main_loop_new( mpContext, false );
+
+ // add idle callback
+ GSource* pIdleSource = g_idle_source_new();
+ g_source_set_callback( pIdleSource, Player::implIdleFunc, this, NULL );
+ g_source_attach( pIdleSource, mpContext );
+
+ // add bus callback
+ GSource* pBusSource = g_source_new( &aSourceFuncs, sizeof( GstBusSource ) );
+ static_cast< GstBusSource* >( pBusSource )->mpBus = gst_pipeline_get_bus( GST_PIPELINE( mpPlayer ) );
+ g_source_set_callback( pBusSource, NULL, this, NULL );
+ g_source_attach( pBusSource, mpContext );
+
+ // add bus sync handler to intercept video window creation for setting our own window
+ gst_bus_set_sync_handler( static_cast< GstBusSource* >( pBusSource )->mpBus,
+ Player::implHandleCreateWindowFunc, this );
+
+ // watch for all elements (and pads) that will be added to the playbin,
+ // in order to retrieve properties like video width and height
+ g_signal_connect( GST_BIN( mpPlayer ), "element-added",
+ G_CALLBACK( Player::implHandleNewElementFunc ), this );
+
+ // set source URI for player
+ g_object_set( mpPlayer, "uri", mpURI->str, NULL );
+
+ // set video fake sink first, since we only create a player without window here
+ // and don't want to have the gstreamer default window appearing
+ g_object_set( mpPlayer, "video-sink", gst_element_factory_make( "fakesink", NULL ), NULL );
+
+ // set state of player to READY or destroy object in case of FAILURE
+ if( gst_element_set_state( mpPlayer, GST_STATE_READY ) == GST_STATE_CHANGE_FAILURE )
+ {
+ gst_object_unref( mpPlayer );
+ mpPlayer = NULL;
+ }
+
+ g_atomic_int_add( &mnInitialized, 1 );
+ g_cond_signal( mpCond );
+
+ // run the main loop
+ g_main_loop_run( mpLoop );
+
+ // clenanup
+ // no mutex necessary since other thread joined us (this thread)
+ // after setting the quit flag
+ if( mpPlayer )
+ {
+ gst_element_set_state( mpPlayer, GST_STATE_NULL );
+ gst_object_unref( mpPlayer );
+ mpPlayer = NULL;
+ }
+
+ g_main_loop_unref( mpLoop );
+ mpLoop = NULL;
+
+ g_source_destroy( pBusSource );
+ g_source_unref( pBusSource );
+
+ g_source_destroy( pIdleSource );
+ g_source_unref( pIdleSource );
+
+ g_main_context_unref( mpContext );
+ mpContext = NULL;
+ }
+ else
+ {
+ g_atomic_int_add( &mnInitialized, 1 );
+ g_cond_signal( mpCond );
+ }
+
+ return( NULL );
+}
+
+// ------------------------------------------------------------------------------
+GstBusSyncReply Player::handleCreateWindow( GstBus* /* pBus */,
+ GstMessage* pMsg )
+{
+ GstBusSyncReply eRet = GST_BUS_PASS;
+
+ if( pMsg &&
+ ( GST_MESSAGE_TYPE( pMsg ) == GST_MESSAGE_ELEMENT ) &&
+ gst_structure_has_name( pMsg->structure, "prepare-xwindow-id" ) &&
+ g_atomic_pointer_get( &mpPlayerWindow ) )
+ {
+ OSL_TRACE( ">>> Got Request to create XOverlay" );
+
+ gst_x_overlay_set_xwindow_id( GST_X_OVERLAY( GST_MESSAGE_SRC( pMsg ) ),
+ static_cast< Window* >( g_atomic_pointer_get(
+ &mpPlayerWindow ) )->getXWindowHandle() );
+
+ gst_message_unref( pMsg );
+ eRet = GST_BUS_DROP;
+ }
+
+ return( eRet );
+}
+} // namespace gst
+} // namespace avmedia
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
new file mode 100644
index 000000000000..d751e381258d
--- /dev/null
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -0,0 +1,236 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _GSTPLAYER_HXX
+#define _GSTPLAYER_HXX
+
+#include "gstcommon.hxx"
+#include <glib.h>
+#include <glib/gatomic.h>
+
+// necessary for mixed environments with GStreamer-0.10 and GLib versions < 2.8
+#ifndef G_GNUC_NULL_TERMINATED
+#if __GNUC__ >= 4
+#define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
+#else
+#define G_GNUC_NULL_TERMINATED
+#endif
+#endif
+
+struct _GOptionGroup;
+typedef struct _GOptionGroup GOptionGroup;
+
+#include <gst/gst.h>
+#include "com/sun/star/media/XPlayer.hdl"
+
+namespace avmedia
+{
+namespace gst
+{
+class Window;
+
+// ---------------
+// - Player_Impl -
+// ---------------
+
+class Player : public ::cppu::WeakImplHelper3< ::com::sun::star::media::XPlayer,
+ ::com::sun::star::lang::XComponent,
+ ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+ // static create method instead of public Ctor
+ static Player* create( const ::rtl::OUString& rURL );
+
+ ~Player();
+
+ // XPlayer
+ virtual void SAL_CALL start()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL stop()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual sal_Bool SAL_CALL isPlaying()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual double SAL_CALL getDuration()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL setMediaTime( double fTime )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual double SAL_CALL getMediaTime()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL setStopTime( double fTime )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual double SAL_CALL getStopTime()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL setRate( double fRate )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual double SAL_CALL getRate()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual sal_Bool SAL_CALL isPlaybackLoop()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL setMute( sal_Bool bSet )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual sal_Bool SAL_CALL isMute()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual sal_Int16 SAL_CALL getVolumeDB()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > SAL_CALL createPlayerWindow(
+ const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ // XComponent
+ virtual void SAL_CALL dispose()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL addEventListener(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL removeEventListener(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ // XServiceInfo
+ virtual ::rtl::OUString SAL_CALL getImplementationName()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+
+protected:
+
+ Player( GString* pURI = NULL );
+
+ virtual gboolean busCallback( GstBus* pBus,
+ GstMessage* pMsg );
+
+ virtual gboolean idle();
+
+ virtual gpointer run();
+
+ virtual GstBusSyncReply handleCreateWindow( GstBus* pBus,
+ GstMessage* pMsg );
+
+ void implQuitThread();
+
+ bool implInitPlayer();
+
+ bool implIsInitialized() const
+ {
+ return( g_atomic_int_get( &mnInitialized ) > 0 );
+ }
+
+
+private:
+
+ Player( const Player& );
+
+ Player& operator=( const Player& );
+
+ static gboolean implBusPrepare( GSource* pSource,
+ gint* pTimeout );
+
+ static gboolean implBusCheck( GSource* pSource );
+
+ static gboolean implBusDispatch( GSource* pSource,
+ GSourceFunc aCallback,
+ gpointer pData );
+
+ static void implBusFinalize( GSource* pSource );
+
+ static gboolean implIdleFunc( gpointer pData );
+
+ static gpointer implThreadFunc( gpointer pData );
+
+ static GstBusSyncReply implHandleCreateWindowFunc( GstBus* pBus,
+ GstMessage* pMsg,
+ gpointer pDData );
+
+ static void implHandleNewElementFunc( GstBin* pBin,
+ GstElement* pElement,
+ gpointer pData );
+
+ static void implHandleNewPadFunc( GstElement* pElem,
+ GstPad* pPad,
+ gpointer pData );
+
+protected:
+
+ GMutex* mpMutex;
+ GCond* mpCond;
+ GThread* mpThread;
+ GMainContext* mpContext;
+ GMainLoop* mpLoop;
+ GstElement* mpPlayer;
+ GString* mpURI;
+
+private:
+
+ ::avmedia::gst::Window* mpPlayerWindow;
+ gint mnIsVideoSource;
+ gint mnVideoWidth;
+ gint mnVideoHeight;
+ gint mnInitialized;
+ gint mnVolumeDB;
+ gint mnLooping;
+ gint mnQuit;
+ gint mnVideoWindowSet;
+ gint mnInitFail;
+};
+} // namespace gst
+} // namespace avmedia
+
+#endif // _GSTPLAYER_HXX
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
new file mode 100644
index 000000000000..adcda63fcd9c
--- /dev/null
+++ b/avmedia/source/gstreamer/gstuno.cxx
@@ -0,0 +1,106 @@
+/*************************************************************************
+ *
+ * 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 "gstcommon.hxx"
+#include "gstmanager.hxx"
+
+using namespace ::com::sun::star;
+
+// -------------------
+// - factory methods -
+// -------------------
+
+static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact )
+{
+ return uno::Reference< uno::XInterface >( *new ::avmedia::gst::Manager( rxFact ) );
+}
+
+// ------------------------------------------
+// - component_getImplementationEnvironment -
+// ------------------------------------------
+
+extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
+{
+ *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
+// -----------------------
+// - component_writeInfo -
+// -----------------------
+
+extern "C" sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey )
+{
+ sal_Bool bRet = sal_False;
+
+ if( pRegistryKey )
+ {
+ try
+ {
+ uno::Reference< registry::XRegistryKey > xNewKey1(
+ static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
+ ::rtl::OUString::createFromAscii(
+ "/" AVMEDIA_GSTREAMER_MANAGER_IMPLEMENTATIONNAME "/UNO/SERVICES/"
+ AVMEDIA_GSTREAMER_MANAGER_SERVICENAME ) ) );
+
+ bRet = sal_True;
+ }
+ catch( registry::InvalidRegistryException& )
+ {
+ OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+ }
+ }
+
+ return bRet;
+}
+
+// ------------------------
+// - component_getFactory -
+// ------------------------
+
+extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+{
+ uno::Reference< lang::XSingleServiceFactory > xFactory;
+ void* pRet = 0;
+
+ if( rtl_str_compare( pImplName, AVMEDIA_GSTREAMER_MANAGER_IMPLEMENTATIONNAME ) == 0 )
+ {
+ const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( AVMEDIA_GSTREAMER_MANAGER_SERVICENAME ) );
+
+ xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
+ reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
+ ::rtl::OUString::createFromAscii( AVMEDIA_GSTREAMER_MANAGER_IMPLEMENTATIONNAME ),
+ create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
+ }
+
+ if( xFactory.is() )
+ {
+ xFactory->acquire();
+ pRet = xFactory.get();
+ }
+
+ return pRet;
+}
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
new file mode 100644
index 000000000000..3b24e9974a3f
--- /dev/null
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -0,0 +1,668 @@
+/*************************************************************************
+ *
+ * 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 <tools/prex.h>
+#include <tools/postx.h>
+
+#include <com/sun/star/awt/SystemPointer.hdl>
+
+#include "gstwindow.hxx"
+#include "gstplayer.hxx"
+#include <vcl/syschild.hxx>
+#include <vcl/sysdata.hxx>
+
+using namespace ::com::sun::star;
+
+namespace avmedia
+{
+namespace gst
+{
+// ---------------------
+// - PlayerChildWindow -
+// ---------------------
+
+class PlayerChildWindow : public SystemChildWindow
+{
+public:
+
+ PlayerChildWindow( Window* pParent );
+ ~PlayerChildWindow();
+
+protected:
+
+ virtual void MouseMove( const MouseEvent& rMEvt );
+ virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ virtual void MouseButtonUp( const MouseEvent& rMEvt );
+ virtual void KeyInput( const KeyEvent& rKEvt );
+ virtual void KeyUp( const KeyEvent& rKEvt );
+ virtual void Command( const CommandEvent& rCEvt );
+};
+
+// ---------------------------------------------------------------------
+
+PlayerChildWindow::PlayerChildWindow( Window* pParent ) :
+ SystemChildWindow( pParent, WB_CLIPCHILDREN )
+{
+}
+
+// ---------------------------------------------------------------------
+
+PlayerChildWindow::~PlayerChildWindow()
+{
+}
+
+// ---------------------------------------------------------------------
+
+void PlayerChildWindow::MouseMove( const MouseEvent& rMEvt )
+{
+ const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
+ rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+
+ SystemChildWindow::MouseMove( rMEvt );
+ GetParent()->MouseMove( aTransformedEvent );
+}
+
+// ---------------------------------------------------------------------
+
+void PlayerChildWindow::MouseButtonDown( const MouseEvent& rMEvt )
+{
+ const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
+ rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+
+ SystemChildWindow::MouseButtonDown( rMEvt );
+ GetParent()->MouseButtonDown( aTransformedEvent );
+}
+
+// ---------------------------------------------------------------------
+
+void PlayerChildWindow::MouseButtonUp( const MouseEvent& rMEvt )
+{
+ const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
+ rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+
+ SystemChildWindow::MouseButtonUp( rMEvt );
+ GetParent()->MouseButtonUp( aTransformedEvent );
+}
+
+// ---------------------------------------------------------------------
+
+void PlayerChildWindow::KeyInput( const KeyEvent& rKEvt )
+{
+ SystemChildWindow::KeyInput( rKEvt );
+ GetParent()->KeyInput( rKEvt );
+}
+
+// ---------------------------------------------------------------------
+
+void PlayerChildWindow::KeyUp( const KeyEvent& rKEvt )
+{
+ SystemChildWindow::KeyUp( rKEvt );
+ GetParent()->KeyUp( rKEvt );
+}
+
+// ---------------------------------------------------------------------
+
+void PlayerChildWindow::Command( const CommandEvent& rCEvt )
+{
+ const CommandEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rCEvt.GetMousePosPixel() ) ),
+ rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() );
+
+ SystemChildWindow::Command( rCEvt );
+ GetParent()->Command( aTransformedEvent );
+}
+
+// ---------------
+// - Window -
+// ---------------
+Window::Window( ::avmedia::gst::Player& rPlayer ) :
+ maListeners( maMutex ),
+ maWindowRect( 0, 0, 0, 0 ),
+ mrPlayer( rPlayer ),
+ mpPlayerWindow( NULL ),
+ meZoomLevel( media::ZoomLevel_NOT_AVAILABLE ),
+ mnPointerType( awt::SystemPointer::ARROW )
+{}
+
+// ------------------------------------------------------------------------------
+
+Window::~Window()
+{
+ dispose();
+}
+
+// ------------------------------------------------------------------------------
+
+void Window::implLayoutVideoWindow()
+{
+ if( mpPlayerWindow && ( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel ) )
+ {
+ awt::Size aPrefSize( mrPlayer.getPreferredPlayerWindowSize() );
+ awt::Rectangle aRect = getPosSize();
+ int nW = aRect.Width, nH = aRect.Height;
+ int nVideoW = nW, nVideoH = nH;
+ int nX = 0, nY = 0, nWidth = 0, nHeight = 0;
+ bool bDone = false, bZoom = false;
+
+ if( media::ZoomLevel_ORIGINAL == meZoomLevel )
+ {
+ bZoom = true;
+ }
+ else if( media::ZoomLevel_ZOOM_1_TO_4 == meZoomLevel )
+ {
+ aPrefSize.Width >>= 2;
+ aPrefSize.Height >>= 2;
+ bZoom = true;
+ }
+ else if( media::ZoomLevel_ZOOM_1_TO_2 == meZoomLevel )
+ {
+ aPrefSize.Width >>= 1;
+ aPrefSize.Height >>= 1;
+ bZoom = true;
+ }
+ else if( media::ZoomLevel_ZOOM_2_TO_1 == meZoomLevel )
+ {
+ aPrefSize.Width <<= 1;
+ aPrefSize.Height <<= 1;
+ bZoom = true;
+ }
+ else if( media::ZoomLevel_ZOOM_4_TO_1 == meZoomLevel )
+ {
+ aPrefSize.Width <<= 2;
+ aPrefSize.Height <<= 2;
+ bZoom = true;
+ }
+ else if( media::ZoomLevel_FIT_TO_WINDOW == meZoomLevel )
+ {
+ nWidth = nVideoW;
+ nHeight = nVideoH;
+ bDone = true;
+ }
+
+ if( bZoom )
+ {
+ if( ( aPrefSize.Width <= nVideoW ) && ( aPrefSize.Height <= nVideoH ) )
+ {
+ nX = ( nVideoW - aPrefSize.Width ) >> 1;
+ nY = ( nVideoH - aPrefSize.Height ) >> 1;
+ nWidth = aPrefSize.Width;
+ nHeight = aPrefSize.Height;
+ bDone = true;
+ }
+ }
+
+ if( !bDone )
+ {
+ if( ( aPrefSize.Width > 0 ) && ( aPrefSize.Height > 0 ) && ( nVideoW > 0 ) && ( nVideoH > 0 ) )
+ {
+ double fPrefWH = (double) aPrefSize.Width / aPrefSize.Height;
+
+ if( fPrefWH < ( (double) nVideoW / nVideoH ) )
+ {
+ nVideoW = (int) ( nVideoH * fPrefWH );
+ }
+ else
+ {
+ nVideoH = (int) ( nVideoW / fPrefWH );
+ }
+
+ nX = ( nW - nVideoW ) >> 1;
+ nY = ( nH - nVideoH ) >> 1;
+ nWidth = nVideoW;
+ nHeight = nVideoH;
+ }
+ else
+ {
+ nX = nY = nWidth = nHeight = 0;
+ }
+ }
+
+ mpPlayerWindow->SetPosSizePixel( Point( nX, nY ), Size( nWidth, nHeight ) );
+ }
+}
+
+// ------------------------------------------------------------------------------
+
+bool Window::create( const uno::Sequence< uno::Any >& rArguments )
+{
+ OSL_ASSERT( !mpPlayerWindow );
+ OSL_ENSURE( rArguments.getLength() > 2,
+"::avmedia::gst::Windiow::create: GStreamer backend needs \
+valid parent SystemChildWindow pointer (sal_IntPtr) as third Any \
+value in sequence of arguments" );
+
+ bool bRet = false;
+
+ if( !mpPlayerWindow && ( rArguments.getLength() > 2 ) )
+ {
+ SystemChildWindow* pParentWindow = NULL;
+ sal_IntPtr pIntPtr = NULL;
+
+ // we are not interested in the first argument, which is a pure X11 window handle;
+ // this backend relies on a SystemChildWindow as parent for the PlayerWindow, given
+ // as third Sal_IntPtr value within the argument Sequence
+ rArguments[ 1 ] >>= maWindowRect;
+
+ rArguments[ 2 ] >>= pIntPtr;
+ pParentWindow = reinterpret_cast< SystemChildWindow* >( pIntPtr );
+
+ if( pParentWindow )
+ {
+ meZoomLevel = media::ZoomLevel_ORIGINAL;
+
+ mpPlayerWindow = new PlayerChildWindow( pParentWindow );
+ mpPlayerWindow->SetBackground( Color( COL_BLACK ) );
+ mpPlayerWindow->SetPosSizePixel( Point( maWindowRect.X, maWindowRect.Y ),
+ Size( maWindowRect.Width, maWindowRect.Height ) );
+ mpPlayerWindow->Show();
+
+ bRet = true;
+ }
+ }
+
+ return( bRet );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::update()
+ throw( uno::RuntimeException )
+{
+ if( mpPlayerWindow )
+ {
+ mpPlayerWindow->Invalidate( INVALIDATE_UPDATE );
+ mpPlayerWindow->Sync();
+ }
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
+ throw(uno::RuntimeException)
+{
+ bool bRet = false;
+
+ if( ( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel ) &&
+ ( media::ZoomLevel_NOT_AVAILABLE != eZoomLevel ) )
+ {
+ if( eZoomLevel != meZoomLevel )
+ {
+ meZoomLevel = eZoomLevel;
+ implLayoutVideoWindow();
+ }
+
+ bRet = true;
+ }
+
+ return( bRet );
+}
+
+// ------------------------------------------------------------------------------
+
+media::ZoomLevel SAL_CALL Window::getZoomLevel()
+ throw( uno::RuntimeException )
+{
+ return( meZoomLevel );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
+ throw( uno::RuntimeException )
+{
+ if( mpPlayerWindow )
+ {
+ Pointer ePointer = POINTER_ARROW;
+
+ switch( nPointerType )
+ {
+ case (awt::SystemPointer::CROSS) :
+ {
+ ePointer = POINTER_CROSS;
+ }
+ break;
+
+ case (awt::SystemPointer::HAND) :
+ {
+ ePointer = POINTER_HAND;
+ }
+ break;
+
+ case (awt::SystemPointer::MOVE) :
+ {
+ ePointer = POINTER_MOVE;
+ }
+ break;
+
+ case (awt::SystemPointer::WAIT) :
+ {
+ ePointer = POINTER_WAIT;
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ mpPlayerWindow->SetPointer( ePointer );
+ }
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setPosSize( sal_Int32 nX,
+ sal_Int32 nY,
+ sal_Int32 nWidth,
+ sal_Int32 nHeight,
+ sal_Int16 /* Flags */ )
+ throw( uno::RuntimeException )
+{
+ maWindowRect.X = nX;
+ maWindowRect.Y = nY;
+ maWindowRect.Width = nWidth;
+ maWindowRect.Height = nHeight;
+
+ implLayoutVideoWindow();
+}
+
+// ------------------------------------------------------------------------------
+
+awt::Rectangle SAL_CALL Window::getPosSize()
+ throw( uno::RuntimeException )
+{
+ return( maWindowRect );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setVisible( sal_Bool bVisible )
+ throw( uno::RuntimeException )
+{
+ if( mpPlayerWindow )
+ {
+ bVisible ? mpPlayerWindow->Show() : mpPlayerWindow->Hide();
+ }
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setEnable( sal_Bool bEnable )
+ throw( uno::RuntimeException )
+{
+ if( mpPlayerWindow )
+ {
+ mpPlayerWindow->Enable( bEnable );
+ }
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setFocus()
+ throw( uno::RuntimeException )
+{
+ if( mpPlayerWindow )
+ {
+ mpPlayerWindow->GrabFocus();
+ }
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
+ throw( uno::RuntimeException )
+{
+ maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
+ throw( uno::RuntimeException )
+{
+ maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
+ throw( uno::RuntimeException )
+{
+ maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
+ throw( uno::RuntimeException )
+{
+ maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
+ throw( uno::RuntimeException )
+{
+ maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
+ throw( uno::RuntimeException )
+{
+ maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
+ throw( uno::RuntimeException )
+{
+ maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
+ throw( uno::RuntimeException )
+{
+ maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
+ throw( uno::RuntimeException )
+{
+ maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
+ throw( uno::RuntimeException )
+{
+ maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
+ throw( uno::RuntimeException )
+{
+ maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
+ throw( uno::RuntimeException )
+{
+ maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::dispose()
+ throw( uno::RuntimeException )
+{
+ delete mpPlayerWindow;
+ mpPlayerWindow = NULL;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
+ throw( uno::RuntimeException )
+{
+ maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >&
+ xListener )
+ throw( uno::RuntimeException )
+{
+ maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
+{
+ ::cppu::OInterfaceContainerHelper* pContainer =
+ maListeners.getContainer( getCppuType( ( uno::Reference< awt::XMouseListener >* ) 0 ) );
+
+ if( pContainer )
+ {
+ ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
+
+ while( aIter.hasMoreElements() )
+ {
+ uno::Reference< awt::XMouseListener >( aIter.next(),
+ uno::UNO_QUERY )->mousePressed( rEvt );
+ }
+ }
+}
+
+// -----------------------------------------------------------------------------
+
+void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
+{
+ ::cppu::OInterfaceContainerHelper* pContainer =
+ maListeners.getContainer( getCppuType( ( uno::Reference< awt::XMouseListener >* ) 0 ) );
+
+ if( pContainer )
+ {
+ ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
+
+ while( aIter.hasMoreElements() )
+ {
+ uno::Reference< awt::XMouseListener >( aIter.next(),
+ uno::UNO_QUERY )->mouseReleased( rEvt );
+ }
+ }
+}
+
+// -----------------------------------------------------------------------------
+
+void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
+{
+ ::cppu::OInterfaceContainerHelper* pContainer =
+ maListeners.getContainer( getCppuType( ( uno::Reference< awt::XMouseMotionListener >* )
+ 0 ) );
+
+ if( pContainer )
+ {
+ ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
+
+ while( aIter.hasMoreElements() )
+ {
+ uno::Reference< awt::XMouseMotionListener >( aIter.next(),
+ uno::UNO_QUERY )->mouseMoved( rEvt );
+ }
+ }
+}
+
+// -----------------------------------------------------------------------------
+
+void Window::fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt )
+{
+ ::cppu::OInterfaceContainerHelper* pContainer =
+ maListeners.getContainer( getCppuType( ( uno::Reference< awt::XFocusListener >* ) 0 ) );
+
+ if( pContainer )
+ {
+ ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
+
+ while( aIter.hasMoreElements() )
+ {
+ uno::Reference< awt::XFocusListener >( aIter.next(),
+ uno::UNO_QUERY )->focusGained( rEvt );
+ }
+ }
+}
+
+// ------------------------------------------------------------------------------
+
+long Window::getXWindowHandle() const
+{
+ return( mpPlayerWindow ? mpPlayerWindow->GetSystemData()->aWindow : 0 );
+}
+
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Window::getImplementationName()
+ throw( uno::RuntimeException )
+{
+ return( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+ AVMEDIA_GSTREAMER_WINDOW_IMPLEMENTATIONNAME ) ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
+ throw( uno::RuntimeException )
+{
+ return( ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
+ AVMEDIA_GSTREAMER_WINDOW_SERVICENAME ) ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames()
+ throw( uno::RuntimeException )
+{
+ uno::Sequence< ::rtl::OUString > aRet( 1 );
+ aRet[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_GSTREAMER_WINDOW_SERVICENAME ) );
+
+ return( aRet );
+}
+} // namespace gst
+} // namespace avmedia
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
new file mode 100644
index 000000000000..3a55fca9c8bf
--- /dev/null
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -0,0 +1,197 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _GSTWINDOW_HXX
+#define _GSTWINDOW_HXX
+
+#include "gstcommon.hxx"
+#include <cppuhelper/interfacecontainer.h>
+
+#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
+#include "com/sun/star/media/XPlayerWindow.hdl"
+#endif
+
+namespace avmedia
+{
+namespace gst
+{
+
+class PlayerChildWindow;
+
+// ---------------
+// - Window -
+// ---------------
+
+class Player;
+
+class Window : public ::cppu::WeakImplHelper2< ::com::sun::star::media::XPlayerWindow,
+ ::com::sun::star::lang::XServiceInfo >
+{
+ friend class Player;
+
+public: Window( ::avmedia::gst::Player& rPlayer );
+ ~Window();
+
+ bool create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments );
+
+ // 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 ::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 ::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 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 );
+
+ virtual void SAL_CALL addFocusListener(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL removeFocusListener(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL addKeyListener(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL removeKeyListener(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL addMouseListener(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL removeMouseListener(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL addMouseMotionListener(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL removeMouseMotionListener(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL addPaintListener(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL removePaintListener(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ // XComponent
+ virtual void SAL_CALL dispose()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL addEventListener(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual void SAL_CALL removeEventListener(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ // XServiceInfo
+ virtual ::rtl::OUString SAL_CALL getImplementationName()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ throw( ::com::sun::star::uno::RuntimeException );
+
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+ throw( ::com::sun::star::uno::RuntimeException );
+
+
+public:
+
+ void fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEvt );
+
+ void fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rEvt );
+
+ void fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt );
+
+ void fireKeyPressedEvent( const ::com::sun::star::awt::KeyEvent& rEvt );
+
+ void fireKeyReleasedEvent( const ::com::sun::star::awt::KeyEvent& rEvt );
+
+ void fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt );
+
+protected:
+
+ long getXWindowHandle() const;
+
+private:
+
+ ::osl::Mutex maMutex;
+ ::cppu::OMultiTypeInterfaceContainerHelper maListeners;
+ ::com::sun::star::awt::Rectangle maWindowRect;
+ Player& mrPlayer;
+ PlayerChildWindow* mpPlayerWindow;
+ ::com::sun::star::media::ZoomLevel meZoomLevel;
+ sal_Int32 mnPointerType;
+
+ void implLayoutVideoWindow();
+};
+} // namespace gst
+} // namespace avmedia
+
+#endif // _GSTWINDOW_HXX
diff --git a/avmedia/source/gstreamer/makefile.mk b/avmedia/source/gstreamer/makefile.mk
new file mode 100644
index 000000000000..2f22c7333778
--- /dev/null
+++ b/avmedia/source/gstreamer/makefile.mk
@@ -0,0 +1,71 @@
+#*************************************************************************
+#
+# 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=avmediagst
+TARGET=avmediagst
+
+# --- Settings ----------------------------------
+
+.INCLUDE : settings.mk
+
+.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
+CDEFS+= -DVERBOSE
+.ENDIF
+
+# --- Files ----------------------------------
+
+.IF "$(GUI)" == "UNX" && "$(GUIBASE)"!="aqua" && "$(ENABLE_GSTREAMER)" != ""
+
+PKGCONFIG_MODULES=gtk+-2.0 gstreamer-0.10 gstreamer-interfaces-0.10
+.INCLUDE : pkg_config.mk
+
+SLOFILES= \
+ $(SLO)$/gstuno.obj \
+ $(SLO)$/gstmanager.obj \
+ $(SLO)$/gstwindow.obj \
+ $(SLO)$/gstplayer.obj \
+ $(SLO)$/gstframegrabber.obj
+
+EXCEPTIONSFILES= \
+ $(SLO)$/gstuno.obj \
+ $(SLO)$/gstplayer.obj \
+ $(SLO)$/gstframegrabber.obj
+
+SHL1TARGET=$(TARGET)
+SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(TOOLSLIB) $(VCLLIB)
+SHL1STDLIBS+=$(PKGCONFIG_LIBS)
+SHL1IMPLIB=i$(TARGET)
+SHL1LIBS=$(SLB)$/$(TARGET).lib
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME=$(SHL1TARGET)
+DEF1EXPORTFILE=exports.dxp
+
+.ENDIF
+
+.INCLUDE : target.mk
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index fd89e9d4abde..f33bd46568c8 100644
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -30,12 +30,30 @@ class ResMgr;
#define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() )
#ifdef WNT
-#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
+
+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_DirectX"
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED sal_False
+
+#define AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1 ""
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1 sal_False
+
#else
#ifdef QUARTZ
-#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_QuickTime"
+
+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_QuickTime"
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED sal_False
+
+#define AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1 ""
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1 sal_False
+
#else
-#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
+
+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_GStreamer"
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED sal_False
+
+#define AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1 "com.sun.star.comp.avmedia.Manager_Java"
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1 sal_True
+
#endif
#endif
diff --git a/avmedia/source/java/PlayerWindow.java b/avmedia/source/java/PlayerWindow.java
index 229c651d9f54..2229e4f1644b 100644
--- a/avmedia/source/java/PlayerWindow.java
+++ b/avmedia/source/java/PlayerWindow.java
@@ -67,9 +67,7 @@ public class PlayerWindow implements java.awt.event.KeyListener,
maFrame = new WindowAdapter( AnyConverter.toInt( aArgs[ 0 ] ) );
maFrame.setPosSize( aBoundRect.X, aBoundRect.Y, aBoundRect.Width, aBoundRect.Height, (short) 0 );
-
- if( aArgs.length > 2 )
- mbShowControls = AnyConverter.toBoolean( aArgs[ 2 ] );
+ mbShowControls = false;
java.awt.Panel aPanel = new java.awt.Panel( new java.awt.BorderLayout() );
diff --git a/avmedia/source/java/avmedia.jar b/avmedia/source/java/avmedia.jar
index 55576baa5b34..85a98bbcf33c 100644
--- a/avmedia/source/java/avmedia.jar
+++ b/avmedia/source/java/avmedia.jar
Binary files differ
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index b2d1e5162cb5..5005446633f4 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -162,7 +162,9 @@ Size MediaWindow::getPreferredSize() const
void MediaWindow::setPosSize( const Rectangle& rNewRect )
{
if( mpImpl )
+ {
mpImpl->setPosSize( rNewRect );
+ }
}
// -------------------------------------------------------------------------
@@ -368,6 +370,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
"AU Audio", "au",
"AVI", "avi",
"CD Audio", "cda",
+ "Matroska Media", "mkv",
"MIDI Audio", "mid;midi",
"MPEG Audio", "mp2;mp3;mpa",
"MPEG Video", "mpg;mpeg;mpv;mp4",
@@ -464,39 +467,28 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr
{
if( bDeep || pPreferredSizePixel )
{
- uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
-
- if( xFactory.is() )
+ try
{
- try
- {
- fprintf(stderr, "-->%s uno reference \n\n",AVMEDIA_MANAGER_SERVICE_NAME);
+ sal_Bool bIsJavaBasedMediaWindow;
+ uno::Reference< media::XPlayer > xPlayer( priv::MediaWindowImpl::createPlayer(
+ aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ),
+ bIsJavaBasedMediaWindow ) );
- uno::Reference< ::com::sun::star::media::XManager > xManager(
- xFactory->createInstance( ::rtl::OUString::createFromAscii( AVMEDIA_MANAGER_SERVICE_NAME ) ),
- uno::UNO_QUERY );
+ if( xPlayer.is() )
+ {
+ bRet = true;
- if( xManager.is() )
+ if( pPreferredSizePixel )
{
- uno::Reference< media::XPlayer > xPlayer( xManager->createPlayer( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) );
-
- if( xPlayer.is() )
- {
- bRet = true;
+ const awt::Size aAwtSize( xPlayer->getPreferredPlayerWindowSize() );
- if( pPreferredSizePixel )
- {
- const awt::Size aAwtSize( xPlayer->getPreferredPlayerWindowSize() );
-
- pPreferredSizePixel->Width() = aAwtSize.Width;
- pPreferredSizePixel->Height() = aAwtSize.Height;
- }
- }
+ pPreferredSizePixel->Width() = aAwtSize.Width;
+ pPreferredSizePixel->Height() = aAwtSize.Height;
}
}
- catch( ... )
- {
- }
+ }
+ catch( ... )
+ {
}
}
else
@@ -525,7 +517,8 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr
uno::Reference< media::XPlayer > MediaWindow::createPlayer( const ::rtl::OUString& rURL )
{
- return priv::MediaWindowImpl::createPlayer( rURL );
+ sal_Bool bJavaBased = sal_False;
+ return priv::MediaWindowImpl::createPlayer( rURL, bJavaBased );
}
// -------------------------------------------------------------------------
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 553eea6196c1..15c830cb97a6 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -1,4 +1,4 @@
-/*************************************************************************
+/************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -94,7 +94,7 @@ void MediaWindowControl::execute( const MediaItem& rItem )
// --------------------
MediaChildWindow::MediaChildWindow( Window* pParent ) :
- JavaChildWindow( pParent, WB_CLIPCHILDREN )
+ SystemChildWindow( pParent, WB_CLIPCHILDREN )
{
}
@@ -111,7 +111,7 @@ void MediaChildWindow::MouseMove( const MouseEvent& rMEvt )
const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
- JavaChildWindow::MouseMove( rMEvt );
+ SystemChildWindow::MouseMove( rMEvt );
GetParent()->MouseMove( aTransformedEvent );
}
@@ -122,7 +122,7 @@ void MediaChildWindow::MouseButtonDown( const MouseEvent& rMEvt )
const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
- JavaChildWindow::MouseButtonDown( rMEvt );
+ SystemChildWindow::MouseButtonDown( rMEvt );
GetParent()->MouseButtonDown( aTransformedEvent );
}
@@ -133,7 +133,7 @@ void MediaChildWindow::MouseButtonUp( const MouseEvent& rMEvt )
const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
- JavaChildWindow::MouseButtonUp( rMEvt );
+ SystemChildWindow::MouseButtonUp( rMEvt );
GetParent()->MouseButtonUp( aTransformedEvent );
}
@@ -141,7 +141,7 @@ void MediaChildWindow::MouseButtonUp( const MouseEvent& rMEvt )
void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
{
- JavaChildWindow::KeyInput( rKEvt );
+ SystemChildWindow::KeyInput( rKEvt );
GetParent()->KeyInput( rKEvt );
}
@@ -149,7 +149,7 @@ void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
void MediaChildWindow::KeyUp( const KeyEvent& rKEvt )
{
- JavaChildWindow::KeyUp( rKEvt );
+ SystemChildWindow::KeyUp( rKEvt );
GetParent()->KeyUp( rKEvt );
}
@@ -160,7 +160,7 @@ void MediaChildWindow::Command( const CommandEvent& rCEvt )
const CommandEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rCEvt.GetMousePosPixel() ) ),
rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() );
- JavaChildWindow::Command( rCEvt );
+ SystemChildWindow::Command( rCEvt );
GetParent()->Command( aTransformedEvent );
}
@@ -179,6 +179,7 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bo
mpEmptyBmpEx( NULL ),
mpAudioBmpEx( NULL )
{
+ maChildWindow.SetBackground( Color( COL_BLACK ) );
maChildWindow.SetHelpId( HID_AVMEDIA_PLAYERWINDOW );
maChildWindow.Hide();
@@ -229,19 +230,24 @@ void MediaWindowImpl::onURLChanged()
{
if( getPlayer().is() )
{
- uno::Sequence< uno::Any > aArgs( 2 );
uno::Reference< media::XPlayerWindow > xPlayerWindow;
- const Point aPoint;
- const Size aSize( maChildWindow.GetSizePixel() );
- const sal_IntPtr nWndHandle = static_cast< sal_IntPtr >( maChildWindow.getParentWindowHandleForJava() );
- aArgs[ 0 ] = uno::makeAny( nWndHandle );
- aArgs[ 1 ] = uno::makeAny( awt::Rectangle( aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height() ) );
+ const Point aPoint;
+ const Size aSize( maChildWindow.GetSizePixel() );
+ const sal_IntPtr nWndHandle = (sal_IntPtr) maChildWindow.GetParentWindowHandle( isMediaWindowJavaBased() );
try
{
if( nWndHandle != 0 )
+ {
+ uno::Sequence< uno::Any > aArgs( 3 );
+
+ aArgs[ 0 ] = uno::makeAny( nWndHandle );
+ aArgs[ 1 ] = uno::makeAny( awt::Rectangle( aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height() ) );
+ aArgs[ 2 ] = uno::makeAny( reinterpret_cast< sal_IntPtr >( &maChildWindow ) );
+
xPlayerWindow = getPlayer()->createPlayerWindow( aArgs );
+ }
}
catch( uno::RuntimeException )
{
@@ -273,8 +279,6 @@ void MediaWindowImpl::onURLChanged()
updateMediaItem( aItem );
mpMediaWindowControl->setState( aItem );
}
-
- Invalidate();
}
// ---------------------------------------------------------------------
@@ -291,7 +295,7 @@ void MediaWindowImpl::update()
void MediaWindowImpl::setPosSize( const Rectangle& rRect )
{
- SetPosSizePixel( rRect.Left(), rRect.Top(), rRect.GetWidth(), rRect.GetHeight() );
+ SetPosSizePixel( rRect.TopLeft(), rRect.GetSize() );
}
// ---------------------------------------------------------------------
@@ -305,7 +309,6 @@ void MediaWindowImpl::setPointer( const Pointer& rPointer )
if( xPlayerWindow.is() )
{
-
long nPointer;
switch( rPointer.GetStyle() )
@@ -355,10 +358,10 @@ void MediaWindowImpl::Resize()
mpMediaWindowControl->SetPosSizePixel( Point( nOffset, nControlY ), Size( aCurSize.Width() - ( nOffset << 1 ), nControlHeight ) );
}
- maChildWindow.SetPosSizePixel( Point( nOffset, nOffset ), aPlayerWindowSize );
-
if( xPlayerWindow.is() )
xPlayerWindow->setPosSize( 0, 0, aPlayerWindowSize.Width(), aPlayerWindowSize.Height(), 0 );
+
+ maChildWindow.SetPosSizePixel( Point( nOffset, nOffset ), aPlayerWindowSize );
}
// ---------------------------------------------------------------------
@@ -405,7 +408,7 @@ void MediaWindowImpl::Paint( const Rectangle& )
pLogo = mpEmptyBmpEx;
}
- else if ( !getPlayerWindow().is() )
+ else if( !getPlayerWindow().is() )
{
if( !mpAudioBmpEx )
mpAudioBmpEx = new BitmapEx( AVMEDIA_RESID( AVMEDIA_BMP_AUDIOLOGO ) );
@@ -446,8 +449,6 @@ void MediaWindowImpl::Paint( const Rectangle& )
aBasePos.Y() + ( ( aVideoRect.GetHeight() - aLogoSize.Height() ) >> 1 ) ),
aLogoSize, *pLogo );
}
-
- update();
}
// ---------------------------------------------------------------------
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index 679b864af6b7..9008e499647d 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -2,10 +2,13 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
+ * $RCSfile: mediawindow_impl.hxx,v $
+ * $Revision: 1.3 $
+ *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +32,7 @@
#define _AVMEDIA_MEDIAWINDOW_IMPL_HXX
#include <svtools/transfer.hxx>
-#include <vcl/javachild.hxx>
+#include <vcl/syschild.hxx>
#include "mediawindowbase_impl.hxx"
#include "mediacontrol.hxx"
@@ -61,7 +64,7 @@ namespace avmedia
// - MediaChildWindow -
// --------------------
- class MediaChildWindow : public JavaChildWindow
+ class MediaChildWindow : public SystemChildWindow
{
public:
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index ea28121e3609..94a6c36ed064 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -47,8 +47,18 @@ namespace avmedia { namespace priv {
// - MediaWindowBaseImpl -
// -----------------------
+struct ServiceManager
+{
+ const char* pServiceName;
+ sal_Bool bIsJavaBased;
+};
+
+// ---------------------------------------------------------------------
+
+
MediaWindowBaseImpl::MediaWindowBaseImpl( MediaWindow* pMediaWindow ) :
- mpMediaWindow( pMediaWindow )
+ mpMediaWindow( pMediaWindow ),
+ mbIsMediaWindowJavaBased( sal_False )
{
}
@@ -61,35 +71,53 @@ MediaWindowBaseImpl::~MediaWindowBaseImpl()
// -------------------------------------------------------------------------
-uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl::OUString& rURL )
+uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl::OUString& rURL, sal_Bool& rbJavaBased )
{
uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
uno::Reference< media::XPlayer > xPlayer;
+ rbJavaBased = sal_False;
+
if( xFactory.is() )
{
- try
+ static const ServiceManager aServiceManagers[] =
+ {
+ { AVMEDIA_MANAGER_SERVICE_NAME, AVMEDIA_MANAGER_SERVICE_IS_JAVABASED },
+ { AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1, AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1 }
+ };
+
+ for( sal_uInt32 i = 0; !xPlayer.is() && ( i < ( sizeof( aServiceManagers ) / sizeof( ServiceManager ) ) ); ++i )
{
+ const String aServiceName( aServiceManagers[ i ].pServiceName, RTL_TEXTENCODING_ASCII_US );
+
+ if( aServiceName.Len() )
+ {
+ OSL_TRACE( "Trying to create media manager service %s", aServiceManagers[ i ].pServiceName );
- uno::Reference< ::com::sun::star::media::XManager > xManager(
- xFactory->createInstance( ::rtl::OUString::createFromAscii( AVMEDIA_MANAGER_SERVICE_NAME ) ),
- uno::UNO_QUERY );
+ try
+ {
+ uno::Reference< media::XManager > xManager( xFactory->createInstance( aServiceName ), uno::UNO_QUERY );
+
+ if( xManager.is() )
+ {
+ xPlayer = uno::Reference< media::XPlayer >( xManager->createPlayer( rURL ), uno::UNO_QUERY );
+ }
+ }
+ catch( ... )
+ {
+ }
+ }
- if( xManager.is() )
+ if( xPlayer.is() )
{
- xPlayer = uno::Reference< ::com::sun::star::media::XPlayer >(
- xManager->createPlayer( rURL ), uno::UNO_QUERY );
+ rbJavaBased = aServiceManagers[ i ].bIsJavaBased;
}
}
- catch( ... )
- {
- }
}
return xPlayer;
}
-
// ---------------------------------------------------------------------
void MediaWindowBaseImpl::setURL( const ::rtl::OUString& rURL )
@@ -112,7 +140,7 @@ void MediaWindowBaseImpl::setURL( const ::rtl::OUString& rURL )
if( aURL.GetProtocol() != INET_PROT_NOT_VALID )
maFileURL = aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
- mxPlayer = createPlayer( maFileURL );
+ mxPlayer = createPlayer( maFileURL, mbIsMediaWindowJavaBased );
onURLChanged();
}
}
@@ -143,10 +171,7 @@ void MediaWindowBaseImpl::stopPlayingInternal( bool bStop )
{
if( isPlaying() )
{
- if( bStop )
- mxPlayer->stop();
- else
- mxPlayer->start();
+ bStop ? mxPlayer->stop() : mxPlayer->start();
}
}
diff --git a/avmedia/source/viewer/mediawindowbase_impl.hxx b/avmedia/source/viewer/mediawindowbase_impl.hxx
index 0b0f160b6e3c..028b7c6ed079 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.hxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.hxx
@@ -61,7 +61,8 @@ namespace avmedia
virtual void cleanUp();
virtual void onURLChanged();
- static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const ::rtl::OUString& rURL );
+ static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const ::rtl::OUString& rURL,
+ sal_Bool& rbJavaBased );
public:
@@ -112,6 +113,7 @@ namespace avmedia
void stopPlayingInternal( bool );
MediaWindow* getMediaWindow() const;
+ inline sal_Bool isMediaWindowJavaBased() const { return( mbIsMediaWindowJavaBased ); }
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > getPlayer() const;
@@ -124,6 +126,7 @@ namespace avmedia
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer;
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > mxPlayerWindow;
MediaWindow* mpMediaWindow;
+ sal_Bool mbIsMediaWindowJavaBased;
};
}
}
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index 4b06fd10727f..645871290413 100644
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -62,7 +62,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
{
uno::Reference< registry::XRegistryKey > xNewKey1(
static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
- ::rtl::OUString::createFromAscii( "/com.sun.star.comp.media.Manager_DirectX/UNO/SERVICES/com.sun.star.media.Manager_DirectX" ) ) );
+ ::rtl::OUString::createFromAscii( "/com.sun.star.comp.avmedia.Manager_DirectX/UNO/SERVICES/com.sun.star.media.Manager_DirectX" ) ) );
bRet = sal_True;
}
@@ -84,13 +84,13 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
uno::Reference< lang::XSingleServiceFactory > xFactory;
void* pRet = 0;
- if( rtl_str_compare( pImplName, "com.sun.star.comp.media.Manager_DirectX" ) == 0 )
+ if( rtl_str_compare( pImplName, "com.sun.star.comp.avmedia.Manager_DirectX" ) == 0 )
{
const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( "com.sun.star.media.Manager_DirectX" ) );
xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
- ::rtl::OUString::createFromAscii( "com.sun.star.comp.media.Manager_DirectX" ),
+ ::rtl::OUString::createFromAscii( "com.sun.star.comp.avmedia.Manager_DirectX" ),
create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
}
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index 325e8700e7a8..0b6bbde381cb 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -107,7 +107,7 @@ CXXFLAGS+:=$(ARCH_FLAGS)
BUILD_DIR=$(CONFIGURE_DIR)
BUILD_DIR_OUT=$(CONFIGURE_DIR)
-BUILD_ACTION=make
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
OUT2INC= \
diff --git a/canvas/source/tools/pagemanager.cxx b/canvas/source/tools/pagemanager.cxx
index b867b432857c..b2a71bf86cd3 100644
--- a/canvas/source/tools/pagemanager.cxx
+++ b/canvas/source/tools/pagemanager.cxx
@@ -70,7 +70,8 @@ namespace canvas
{
maPages.push_back(pPage);
FragmentSharedPtr pFragment(pPage->allocateSpace(rSize));
- maFragments.push_back(pFragment);
+ if (pFragment)
+ maFragments.push_back(pFragment);
return pFragment;
}
@@ -124,34 +125,39 @@ namespace canvas
FragmentContainer_t::const_iterator candidate(maFragments.begin());
while(candidate != aEnd)
{
- if(!((*candidate)->isNaked()))
+ if(*candidate && !((*candidate)->isNaked()))
break;
++candidate;
}
- const ::basegfx::B2ISize& rSize((*candidate)->getSize());
- sal_uInt32 nMaxArea(rSize.getX()*rSize.getY());
-
- FragmentContainer_t::const_iterator it(candidate);
- while(it != aEnd)
+ if (candidate != aEnd)
{
- if(!((*it)->isNaked()))
+ const ::basegfx::B2ISize& rSize((*candidate)->getSize());
+ sal_uInt32 nMaxArea(rSize.getX()*rSize.getY());
+
+ FragmentContainer_t::const_iterator it(candidate);
+ while(it != aEnd)
{
- const ::basegfx::B2ISize& rCandidateSize((*it)->getSize());
- const sal_uInt32 nArea(rCandidateSize.getX()*rCandidateSize.getY());
- if(nArea > nMaxArea)
+ if (*it && !((*it)->isNaked()))
{
- candidate=it;
- nMaxArea=nArea;
+ const ::basegfx::B2ISize& rCandidateSize((*it)->getSize());
+ const sal_uInt32 nArea(rCandidateSize.getX()*rCandidateSize.getY());
+ if(nArea > nMaxArea)
+ {
+ candidate=it;
+ nMaxArea=nArea;
+ }
}
+
+ ++it;
}
- ++it;
+ // this does not erase the candidate,
+ // but makes it 'naked'...
+ (*candidate)->free(*candidate);
}
-
- // this does not erase the candidate,
- // but makes it 'naked'...
- (*candidate)->free(*candidate);
+ else
+ break;
}
}
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index 023ceb2b5005..637b3af3315e 100755..100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -700,7 +700,7 @@ namespace vclcanvas
}
#endif // complex-clipping vs. XOR-trick
-#if defined(VERBOSE) && OSL_DEBUG_LEVEL > 0
+#if 0 //defined(VERBOSE) && OSL_DEBUG_LEVEL > 0
{
::basegfx::B2DRectangle aRect(0.0, 0.0, 1.0, 1.0);
::basegfx::B2DRectangle aTextureDeviceRect;
diff --git a/configure.in b/configure.in
index 2d276e9ffde8..943c9d017acd 100644
--- a/configure.in
+++ b/configure.in
@@ -198,6 +198,10 @@ AC_ARG_ENABLE(gtk,
[ --disable-gtk Determines whether to use Gtk+ vclplug on platforms
where Gtk+ is available.
],,enable_gtk=yes)
+AC_ARG_ENABLE(gstreamer,
+[ --disable-gstreamer Determines whether to use the GStreamer media
+ backend on platforms where GStreamer is available.
+],,enable_gstreamer=yes)
AC_ARG_ENABLE(systray,
[ --disable-systray Determines whether to build the systray quickstarter.
],,enable_systray=yes)
@@ -926,6 +930,7 @@ case "$build_os" in
test_cups=yes
test_randr=yes
test_freetype=yes
+ test_gstreamer=yes
_os=SunOS
AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
if test -z "$GNUTAR"; then
@@ -960,7 +965,8 @@ case "$build_os" in
test_cups=yes
test_randr=yes
test_freetype=yes
- _os=Linux
+ test_gstreamer=yes
+ _os=Linux
;;
gnu)
test_cups=no
@@ -970,6 +976,7 @@ case "$build_os" in
test_cups=no
test_cairo=yes
test_freetype=no
+ test_gstreamer=no
_os=WINNT
;;
darwin*) # Mac OS X
@@ -978,6 +985,7 @@ case "$build_os" in
test_cairo=yes
test_randr=no
test_freetype=no
+ test_gstreamer=no
_os=Darwin
if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
@@ -991,6 +999,7 @@ case "$build_os" in
test_randr=no
test_gtk=no
test_freetype=no
+ test_gstreamer=no
_os=OS2
;;
freebsd*)
@@ -1001,6 +1010,7 @@ case "$build_os" in
test_cups=yes
test_randr=yes
test_freetype=yes
+ test_gstreamer=yes
AC_MSG_CHECKING([the FreeBSD operating system release])
if test -n "$with_os_version"; then
OSVERSION="$with_os_version"
@@ -1035,6 +1045,7 @@ case "$build_os" in
test_cups=no
test_randr=yes
test_freetype=yes
+ test_gstreamer=yes
PTHREAD_CFLAGS="-pthread"
PTHREAD_LIBS="-pthread -lpthread"
_os=NetBSD
@@ -1043,6 +1054,7 @@ case "$build_os" in
test_cups=no
test_randr=no
test_freetype=yes
+ test_gstreamer=yes
PTHREAD_LIBS=-pthread
echo "AIX is an alpha port --- Use at own risk" >> warn
_os=AIX
@@ -5750,6 +5762,29 @@ AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
dnl ===================================================================
+dnl Check whether the GStreamer libraries are available.
+dnl ===================================================================
+
+GSTREAMER_CFLAGS=""
+GSTREAMER_LIBS=""
+ENABLE_GSTREAMER=""
+
+if test "$test_gstreamer" = "yes"; then
+ AC_MSG_CHECKING([whether to build the GStreamer media backend])
+ if test "x$enable_gstreamer" != "xno" ; then
+ PKG_CHECK_MODULES( GSTREAMER, gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 ,,AC_MSG_ERROR([requirements to build the GStreamer media backend not met. Use --disable-gstreamer or install the missing packages]))
+ ENABLE_GSTREAMER="TRUE"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
+fi
+AC_SUBST(ENABLE_GSTREAMER)
+AC_SUBST(GSTREAMER_CFLAGS)
+AC_SUBST(GSTREAMER_LIBS)
+
+
+dnl ===================================================================
dnl Check whether the Cairo libraries are available.
dnl ===================================================================
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 2884e6179aaa..aca181916b47 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -258,6 +258,7 @@ void ORowSetValue::setTypeKind(sal_Int32 _eType)
(*this) = getAny();
break;
default:
+ (*this) = getAny();
OSL_ENSURE(0,"ORowSetValue:operator==(): UNSPUPPORTED TYPE!");
}
}
@@ -344,6 +345,19 @@ void ORowSetValue::free()
TRACE_FREE( Any )
m_aValue.m_pValue = NULL;
break;
+ case DataType::BIT:
+ case DataType::TINYINT:
+ case DataType::SMALLINT:
+ case DataType::BOOLEAN:
+ break;
+ default:
+ if ( m_aValue.m_pValue )
+ {
+ delete (Any*)m_aValue.m_pValue;
+ TRACE_FREE( Any )
+ m_aValue.m_pValue = NULL;
+ }
+ break;
}
m_bNull = sal_True;
@@ -849,7 +863,9 @@ bool ORowSetValue::operator==(const ORowSetValue& _rRH) const
bRet = false;
break;
default:
+ bRet = false;
OSL_ENSURE(0,"ORowSetValue::operator==(): UNSPUPPORTED TYPE!");
+ break;
}
return bRet;
}
@@ -942,6 +958,8 @@ Any ORowSetValue::makeAny() const
break;
default:
OSL_ENSURE(0,"ORowSetValue::makeAny(): UNSPUPPORTED TYPE!");
+ rValue = getAny();
+ break;
}
}
return rValue;
@@ -1032,6 +1050,12 @@ Any ORowSetValue::makeAny() const
}
}
break;
+ default:
+ {
+ Any aValue = getAny();
+ aValue >>= aRet;
+ break;
+ }
}
}
return aRet;
@@ -1104,8 +1128,11 @@ sal_Bool ORowSetValue::getBool() const
bRet = m_bSigned ? (m_aValue.m_nInt32 != 0) : (*static_cast<sal_Int64*>(m_aValue.m_pValue) != sal_Int64(0));
break;
default:
- OSL_ENSURE(0,"Illegal conversion!");
- break;
+ {
+ Any aValue = getAny();
+ aValue >>= bRet;
+ break;
+ }
}
}
return bRet;
@@ -1174,8 +1201,11 @@ sal_Int8 ORowSetValue::getInt8() const
nRet = static_cast<sal_Int8>(*static_cast<sal_Int64*>(m_aValue.m_pValue));
break;
default:
- OSL_ENSURE(0,"Illegal conversion!");
- break;
+ {
+ Any aValue = getAny();
+ aValue >>= nRet;
+ break;
+ }
}
}
return nRet;
@@ -1244,8 +1274,11 @@ sal_Int16 ORowSetValue::getInt16() const
nRet = static_cast<sal_Int16>(*static_cast<sal_Int64*>(m_aValue.m_pValue));
break;
default:
- OSL_ENSURE(0,"Illegal conversion!");
- break;
+ {
+ Any aValue = getAny();
+ aValue >>= nRet;
+ break;
+ }
}
}
return nRet;
@@ -1314,8 +1347,11 @@ sal_Int32 ORowSetValue::getInt32() const
nRet = static_cast<sal_Int32>(*static_cast<sal_Int64*>(m_aValue.m_pValue));
break;
default:
- OSL_ENSURE(0,"Illegal conversion!");
- break;
+ {
+ Any aValue = getAny();
+ aValue >>= nRet;
+ break;
+ }
}
}
return nRet;
@@ -1384,8 +1420,11 @@ sal_Int64 ORowSetValue::getLong() const
nRet = *(sal_Int64*)m_aValue.m_pValue;
break;
default:
- OSL_ENSURE(0,"Illegal conversion!");
- break;
+ {
+ Any aValue = getAny();
+ aValue >>= nRet;
+ break;
+ }
}
}
return nRet;
@@ -1458,8 +1497,11 @@ float ORowSetValue::getFloat() const
nRet = float(*(sal_Int64*)m_aValue.m_pValue);
break;
default:
- OSL_ENSURE(0,"Illegal conversion!");
- break;
+ {
+ Any aValue = getAny();
+ aValue >>= nRet;
+ break;
+ }
}
}
return nRet;
@@ -1534,8 +1576,11 @@ double ORowSetValue::getDouble() const
nRet = double(*(sal_Int64*)m_aValue.m_pValue);
break;
default:
- OSL_ENSURE(0,"Illegal conversion!");
- break;
+ {
+ Any aValue = getAny();
+ aValue >>= nRet;
+ break;
+ }
}
}
return nRet;
@@ -1626,6 +1671,11 @@ void ORowSetValue::setFromDouble(const double& _rVal,sal_Int32 _nDatatype)
TRACE_ALLOC( sal_Int64 )
}
break;
+ default:
+ {
+ m_aValue.m_pValue = new Any(_rVal);
+ break;
+ }
}
m_eTypeKind = _nDatatype;
}
@@ -1692,7 +1742,11 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
aSeq = *static_cast< Sequence<sal_Int8>*>(m_aValue.m_pValue);
break;
default:
- ;
+ {
+ Any aValue = getAny();
+ aValue >>= aSeq;
+ break;
+ }
}
}
return aSeq;
@@ -1734,8 +1788,11 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
}
break;
default:
- OSL_ENSURE(0,"Illegal conversion!");
- break;
+ {
+ Any aAnyValue = getAny();
+ aAnyValue >>= aValue;
+ break;
+ }
}
}
return aValue;
@@ -1776,8 +1833,11 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
aValue = *static_cast< ::com::sun::star::util::Time*>(m_aValue.m_pValue);
break;
default:
- OSL_ENSURE(0,"Illegal conversion!");
- break;
+ {
+ Any aAnyValue = getAny();
+ aAnyValue >>= aValue;
+ break;
+ }
}
}
return aValue;
@@ -1826,8 +1886,11 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
aValue = *static_cast< ::com::sun::star::util::DateTime*>(m_aValue.m_pValue);
break;
default:
- OSL_ENSURE(0,"Illegal conversion!");
- break;
+ {
+ Any aAnyValue = getAny();
+ aAnyValue >>= aValue;
+ break;
+ }
}
}
return aValue;
@@ -2094,7 +2157,7 @@ void ORowSetValue::impl_fill( const sal_Int32 _nType, sal_Bool _bNullable, const
break;
default:
OSL_ENSURE( false, "ORowSetValue::fill: unsupported type!" );
- bReadData = false;
+ (*this) = _rValueSource.getObject();
break;
}
if ( bReadData && _bNullable && _rValueSource.wasNull() )
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index c71d620d527c..0c5db12c3355 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -692,6 +692,10 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeExcept
void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeException)
{
+ // ::osl::MutexGuard aGuard( m_aMutex );
+ //checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ // if ( getResultSetConcurrency() == ResultSetConcurrency::READ_ONLY )
+ // throw SQLException();
}
// -------------------------------------------------------------------------
@@ -977,7 +981,7 @@ Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& ro
sal_Int32 OResultSet::getResultSetConcurrency() const
throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
- sal_Int32 nValue=0;
+ sal_Int32 nValue=ResultSetConcurrency::READ_ONLY;
LockTypeEnum eRet;
if(!SUCCEEDED(m_pRecordSet->get_LockType(&eRet)))
{
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 8544e4affda7..157d1f7b68fa 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2607,7 +2607,7 @@ void ODbaseTable::throwInvalidDbaseFormat()
// no dbase file
const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
- STR_SQL_NAME_ERROR,
+ STR_INVALID_DBASE_FILE,
"$filename$", getEntry(m_pConnection,m_Name)
) );
::dbtools::throwGenericSQLException( sError, *this );
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 265084be697f..421225b34935 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1200,7 +1200,9 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
break;
}
- if (m_nRowPos == 0)
+ if ( m_nRowPos < 0 )
+ goto Error;
+ else if (m_nRowPos == 0)
{
// COUNT(*) in Ergebnisrow packen
// (muss die erste und einzige Variable in der Row sein)
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index eff2464ce533..70be592405eb 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -159,7 +159,10 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
(m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0)))
{
bNumeric = FALSE;
- nStartPosFirstLine2 = nStartPosFirstLine;
+ if ( m_cStringDelimiter != '\0' )
+ aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
+ else
+ nStartPosFirstLine2 = nStartPosFirstLine;
}
else
{
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index 1452df992a74..e7fab6acb6c0 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -234,7 +234,7 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js
if ( xIn.is() )
{
jsize nLen = env->GetArrayLength(buffer);
- if ( nLen < len )
+ if ( nLen < len || len <= 0 )
{
ThrowException( env,
"java/io/IOException",
@@ -439,21 +439,17 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst
if ( xOut.is() )
{
jbyte *buf = env->GetByteArrayElements(buffer,NULL);
-#ifdef HSQLDB_DBG
- OSL_ENSURE(len <= env->GetArrayLength(buffer),"Length is greater than the buffer!");
-#endif
-
if (JNI_FALSE != env->ExceptionCheck())
{
env->ExceptionClear();
OSL_ENSURE(0,"ExceptionClear");
}
OSL_ENSURE(buf,"buf is NULL");
- if ( buf )
+ if ( buf && len > 0 && len <= env->GetArrayLength(buffer))
{
Sequence< ::sal_Int8 > aData(buf + off,len);
- xOut->writeBytes(aData);
env->ReleaseByteArrayElements(buffer, buf, JNI_ABORT);
+ xOut->writeBytes(aData);
#ifdef HSQLDB_DBG
if ( logger )
logger->write( aData.getConstArray(), len );
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index afb4d0da2640..57ed88b1dda8 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -61,14 +61,15 @@ namespace connectivity
{
try
{
- m_xStream.clear();
- m_xSeek.clear();
+ m_xStream.clear();
+ m_xSeek.clear();
if ( m_xInputStream.is() )
{
m_xInputStream->closeInput();
- m_xInputStream.clear();
+ m_xInputStream.clear();
}
- if ( m_xOutputStream.is() )
+ // this is done implicity by the closing of the input stream
+ else if ( m_xOutputStream.is() )
{
m_xOutputStream->closeOutput();
try
@@ -83,11 +84,12 @@ namespace connectivity
OSL_UNUSED( e );
OSL_ENSURE(0,"Could not dispose OutputStream");
}
- m_xOutputStream.clear();
+ m_xOutputStream.clear();
}
}
- catch(Exception& )
+ catch(Exception& ex)
{
+ OSL_UNUSED( ex );
OSL_ENSURE(0,"Exception catched!");
}
}
diff --git a/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx
index 2df75283a14b..fd52f3092c0e 100644
--- a/connectivity/source/drivers/jdbc/Boolean.cxx
+++ b/connectivity/source/drivers/jdbc/Boolean.cxx
@@ -49,20 +49,3 @@ jclass java_lang_Boolean::getMyClass() const
{
return st_getMyClass();
}
-
-java_lang_Boolean::java_lang_Boolean( sal_Bool _par0 ): java_lang_Object( NULL, (jobject)NULL )
-{
- SDBThreadAttach t;
- // Java-Call fuer den Konstruktor absetzen
- // temporaere Variable initialisieren
- static const char * cSignature = "(Z)V";
- jobject tempObj;
- static jmethodID mID(NULL);
- obtainMethodId(t.pEnv, "<init>",cSignature, mID);
- tempObj = t.pEnv->NewObject( getMyClass(), mID, _par0 );
- saveRef( t.pEnv, tempObj );
- t.pEnv->DeleteLocalRef( tempObj );
- // und aufraeumen
-}
-
-
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index 4866781d23dd..4f5670ace8aa 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -166,14 +166,6 @@ void java_lang_Object::saveRef( JNIEnv * pXEnv, jobject myObj )
}
-java_lang_Class * java_lang_Object::getClass()
-{
- SDBThreadAttach t;
- static jmethodID mID(NULL);
- jobject out = callObjectMethod(t.pEnv,"getClass","()Ljava/lang/Class;", mID);
- return out ? new java_lang_Class( t.pEnv, out ) : NULL;
-}
-
::rtl::OUString java_lang_Object::toString() const
{
static jmethodID mID(NULL);
diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx
index e6102fc3a471..f32b0cce4325 100644
--- a/connectivity/source/drivers/jdbc/String.cxx
+++ b/connectivity/source/drivers/jdbc/String.cxx
@@ -52,26 +52,6 @@ jclass java_lang_String::st_getMyClass()
}
//--------------------------------------------------------------------------
-java_lang_String::java_lang_String( const ::rtl::OUString& _par0 ): java_lang_Object( NULL, (jobject)NULL )
-{
- SDBThreadAttach t;
- if( !t.pEnv )
- return;
- jvalue args[1];
- // Parameter konvertieren
- args[0].l = convertwchar_tToJavaString(t.pEnv,_par0);
- // Java-Call fuer den Konstruktor absetzen
- // temporaere Variable initialisieren
- static const char * cSignature = "(Ljava/lang/String;)V";
- jobject tempObj;
- static jmethodID mID(NULL);
- obtainMethodId(t.pEnv, "<init>",cSignature, mID);
- tempObj = t.pEnv->NewObjectA( getMyClass(), mID, args );
- saveRef( t.pEnv, tempObj );
- t.pEnv->DeleteLocalRef( tempObj );
- t.pEnv->DeleteLocalRef((jstring)args[0].l);
-}
-//--------------------------------------------------------------------------
java_lang_String::operator ::rtl::OUString()
{
SDBThreadAttach t;
diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk
index 2a0dc5cd8999..219bdd6cd020 100644
--- a/connectivity/source/drivers/kab/makefile.mk
+++ b/connectivity/source/drivers/kab/makefile.mk
@@ -46,6 +46,9 @@ CFLAGS+=$(KDE_CFLAGS)
.IF "$(KDE_ROOT)"!=""
EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib
+.IF "$(OS)$(CPU)" == "LINUXX"
+EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib64
+.ENDIF
.ENDIF
# === KAB base library ==========================
diff --git a/connectivity/source/inc/java/lang/Boolean.hxx b/connectivity/source/inc/java/lang/Boolean.hxx
index f1f8081d9780..35655f8c1934 100644
--- a/connectivity/source/inc/java/lang/Boolean.hxx
+++ b/connectivity/source/inc/java/lang/Boolean.hxx
@@ -44,7 +44,6 @@ namespace connectivity
// ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
java_lang_Boolean( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
- java_lang_Boolean( sal_Bool _par0 );
static jclass st_getMyClass();
};
}
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index f0bacc2ee840..c00c5e67e06d 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -118,8 +118,6 @@ namespace connectivity
void clearObject(JNIEnv& rEnv);
void clearObject();
- java_lang_Class * getClass();
-
virtual ::rtl::OUString toString() const;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() { return m_xFactory; }
diff --git a/connectivity/source/inc/java/lang/String.hxx b/connectivity/source/inc/java/lang/String.hxx
index 64584dab5e76..3e4bfd6c1399 100644
--- a/connectivity/source/inc/java/lang/String.hxx
+++ b/connectivity/source/inc/java/lang/String.hxx
@@ -42,7 +42,6 @@ namespace connectivity
// ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
java_lang_String( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
- java_lang_String( const ::rtl::OUString& _par0 );
operator ::rtl::OUString();
static jclass st_getMyClass();
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index f50f4aadc164..9441e9219483 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -97,7 +97,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
-BUILD_ACTION = $(GNUMAKE)
+BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
BUILD_FLAGS = install
OUTDIR2INC = ooo-install/include/cppunit
@@ -172,7 +172,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
-BUILD_ACTION = $(GNUMAKE)
+BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
BUILD_FLAGS = install
OUTDIR2INC = ooo-install/include/cppunit
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index a75a7cf1f24d..ad5c8b1b3201 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1366,133 +1366,6 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, EMPTYARG
return 0;
}
-::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL )
-{
- ::rtl::OUString aLabel;
- if ( aCmdURL.getLength() )
- {
- try
- {
- uno::Reference< container::XNameAccess > xNameAccess( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.frame.UICommandDescription") ), uno::UNO_QUERY );
- if ( xNameAccess.is() )
- {
- uno::Reference< container::XNameAccess > xUICommandLabels;
- const ::rtl::OUString aModule( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ) );
- uno::Any a = xNameAccess->getByName( aModule );
- uno::Reference< container::XNameAccess > xUICommands;
- a >>= xUICommandLabels;
- rtl::OUString aStr;
- uno::Sequence< beans::PropertyValue > aPropSeq;
- a = xUICommandLabels->getByName( aCmdURL );
- if ( a >>= aPropSeq )
- {
- for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
- {
- if ( aPropSeq[i].Name.equalsAscii( "Name" ))
- {
- aPropSeq[i].Value >>= aStr;
- break;
- }
- }
- }
- aLabel = aStr;
- }
- }
- catch ( uno::Exception& )
- {
- }
- }
-
- return aLabel;
-}
-
-
-//-----------------------------------------------
-String SfxAcceleratorConfigPage::GetFunctionName(KeyFuncType eType) const
-{
- ::rtl::OUStringBuffer sName(256);
- sName.appendAscii("\"");
- switch(eType)
- {
- case KEYFUNC_NEW :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:NewDoc") ) );
- break;
-
- case KEYFUNC_OPEN :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Open") ) );
- break;
-
- case KEYFUNC_SAVE :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Save") ) );
- break;
-
- case KEYFUNC_SAVEAS :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:SaveAs") ) );
- break;
-
- case KEYFUNC_PRINT :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Print") ) );
- break;
-
- case KEYFUNC_CLOSE :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Close") ) );
- break;
-
- case KEYFUNC_QUIT :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Quit") ) );
- break;
-
- case KEYFUNC_CUT :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Cut") ) );
- break;
-
- case KEYFUNC_COPY :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Copy") ) );
- break;
-
- case KEYFUNC_PASTE :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Paste") ) );
- break;
-
- case KEYFUNC_UNDO :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Undo") ) );
- break;
-
- case KEYFUNC_REDO :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Redo") ) );
- break;
-
- case KEYFUNC_DELETE :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Delete") ) );
- break;
-
- case KEYFUNC_REPEAT :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Repeat") ) );
- break;
-
- case KEYFUNC_FIND :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Search") ) );
- break;
-
- case KEYFUNC_FINDBACKWARD :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:SearchBackwards") ) );
- break;
-
- case KEYFUNC_PROPERTIES :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Options") ) );
- break;
-
- case KEYFUNC_FRONT :
- sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:ToFront") ) );
- break;
-
- default:
- break;
- }
- sName.appendAscii("\"");
- return String(sName.makeStringAndClear());
-}
-
//-----------------------------------------------
void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTitle )
{
@@ -1575,37 +1448,6 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
}
//-----------------------------------------------
-void SfxAcceleratorConfigPage::SelectMacro(const SfxMacroInfoItem *pItem)
-{
- m_pMacroInfoItem = pItem;
- pGroupLBox->SelectMacro( pItem );
-}
-
-//-----------------------------------------------
-void SfxAcceleratorConfigPage::CopySource2Target(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xSourceAccMgr,
- const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xTargetAccMgr)
-{
- const css::uno::Sequence< css::awt::KeyEvent > lKeys = xSourceAccMgr->getAllKeyEvents();
- sal_Int32 c = lKeys.getLength();
- sal_Int32 i = 0;
- for (i=0; i<c; ++i)
- {
- const css::awt::KeyEvent& rKey = lKeys[i];
- ::rtl::OUString sCommand = xSourceAccMgr->getCommandByKeyEvent(rKey);
- xTargetAccMgr->setKeyEvent(rKey, sCommand);
- }
-}
-
-//-----------------------------------------------
-KeyCode SfxAcceleratorConfigPage::MapPosToKeyCode(USHORT nPos) const
-{
- TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData();
- KeyCode aCode(KEYCODE_ARRAY[pEntry->m_nKeyPos] & 0xFFF ,
- KEYCODE_ARRAY[pEntry->m_nKeyPos] & (KEY_SHIFT | KEY_MOD2));
- return aCode;
-}
-
-//-----------------------------------------------
USHORT SfxAcceleratorConfigPage::MapKeyCodeToPos(const KeyCode& aKey) const
{
USHORT nCode1 = aKey.GetCode()+aKey.GetModifier();
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index d9f730e0224f..c706e2f8a6a8 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -144,6 +144,8 @@ namespace container = com::sun::star::container;
namespace beans = com::sun::star::beans;
namespace graphic = com::sun::star::graphic;
+#if OSL_DEBUG_LEVEL > 1
+
void printPropertySet(
const OUString& prefix,
const uno::Reference< beans::XPropertySet >& xPropSet )
@@ -208,6 +210,8 @@ void printEntries(SvxEntries* entries)
}
}
+#endif
+
OUString
stripHotKey( const OUString& str )
{
@@ -918,11 +922,6 @@ void SvxConfigDialog::PageCreated( USHORT nId, SfxTabPage& rPage )
}
}
-void SvxConfigDialog::ActivateTabPage( USHORT nSlotId )
-{
- (void)nSlotId;
-}
-
/******************************************************************************
*
* The SaveInData class is used to hold data for entries in the Save In
@@ -3055,75 +3054,6 @@ SvxConfigEntry* SvxMainMenuOrganizerDialog::GetSelectedEntry()
return (SvxConfigEntry*)aMenuListBox.FirstSelected()->GetUserData();
}
-SvxConfigEntry::SvxConfigEntry(
- const uno::Sequence< beans::PropertyValue >& rProperties,
- const uno::Reference< container::XNameAccess >& rCommandToLabelMap )
- :
- nId( 1 ),
- bPopUp( FALSE ),
- bStrEdited( FALSE ),
- bIsUserDefined( FALSE ),
- bIsMain( FALSE ),
- bIsParentData( FALSE ),
- bIsVisible( TRUE ),
- nStyle( 0 ),
- pEntries( 0 )
-{
- sal_uInt16 nType( css::ui::ItemType::DEFAULT );
- OUString aHelpURL_;
-
- for ( sal_Int32 i = 0; i < rProperties.getLength(); i++ )
- {
- if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL ))
- {
- rProperties[i].Value >>= aCommand;
- }
- else if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
- {
- rProperties[i].Value >>= aHelpURL_;
- }
- else if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL ))
- {
- rProperties[i].Value >>= aLabel;
- }
- else if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_TYPE ))
- {
- rProperties[i].Value >>= nType;
- }
- }
-
- if ( nType == css::ui::ItemType::DEFAULT )
- {
- uno::Any a;
- try
- {
- a = rCommandToLabelMap->getByName( aCommand );
- bIsUserDefined = FALSE;
- }
- catch ( container::NoSuchElementException& )
- {
- bIsUserDefined = TRUE;
- }
-
- // If custom label not set retrieve it from the command to info service
- if ( aLabel.equals( OUString() ) )
- {
- uno::Sequence< beans::PropertyValue > aPropSeq;
- if ( a >>= aPropSeq )
- {
- for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
- {
- if ( aPropSeq[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL ) )
- {
- aPropSeq[i].Value >>= aLabel;
- break;
- }
- }
- }
- }
- }
-}
-
const OUString&
SvxConfigEntry::GetHelpText()
{
@@ -3150,133 +3080,6 @@ SvxConfigEntry::GetHelpText()
return aHelpText;
}
-uno::Sequence< beans::PropertyValue >
-SvxConfigEntry::GetProperties(
- const uno::Reference< container::XNameAccess >& rCommandToLabelMap )
-{
- if ( IsSeparator() )
- {
- uno::Sequence< beans::PropertyValue > aPropSeq( 1 );
-
- aPropSeq[0].Name = OUString(
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ) );
- aPropSeq[0].Value <<= css::ui::ItemType::SEPARATOR_LINE;
-
- return aPropSeq;
- }
-
- static const OUString aDescriptorCommandURL (
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL ) );
-
- static const OUString aDescriptorType(
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ) );
-
- static const OUString aDescriptorLabel(
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) );
-
- static const OUString aDescriptorHelpURL(
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ) );
-
- uno::Sequence< beans::PropertyValue > aPropSeq( 4 );
-
- aPropSeq[0].Name = aDescriptorCommandURL;
- aPropSeq[0].Value <<= rtl::OUString( GetCommand() );
-
- aPropSeq[1].Name = aDescriptorType;
- aPropSeq[1].Value <<= css::ui::ItemType::DEFAULT;
-
- // If the name has not been changed and the name is the same as
- // in the default command to label map then the label can be stored
- // as an empty string.
- // It will be initialised again later using the command to label map.
- aPropSeq[2].Name = aDescriptorLabel;
- if ( HasChangedName() == FALSE && GetCommand().getLength() )
- {
- BOOL isDefaultName = FALSE;
- try
- {
- uno::Any a( rCommandToLabelMap->getByName( GetCommand() ) );
- uno::Sequence< beans::PropertyValue > tmpPropSeq;
- if ( a >>= tmpPropSeq )
- {
- for ( sal_Int32 i = 0; i < tmpPropSeq.getLength(); i++ )
- {
- if ( tmpPropSeq[i].Name.equals( aDescriptorLabel ) )
- {
- OUString tmpLabel;
- tmpPropSeq[i].Value >>= tmpLabel;
-
- if ( tmpLabel.equals( GetName() ) )
- {
- isDefaultName = TRUE;
- }
-
- break;
- }
- }
- }
- }
- catch ( container::NoSuchElementException& )
- {
- // isDefaultName is left as FALSE
- }
-
- if ( isDefaultName )
- {
- aPropSeq[2].Value <<= rtl::OUString();
- }
- else
- {
- aPropSeq[2].Value <<= rtl::OUString( GetName() );
- }
- }
- else
- {
- aPropSeq[2].Value <<= rtl::OUString( GetName() );
- }
-
- aPropSeq[3].Name = aDescriptorHelpURL;
- aPropSeq[3].Value <<= rtl::OUString( GetHelpURL() );
-
- return aPropSeq;
-}
-
-/*
-SvxMenuConfigEntry::SvxMenuConfigEntry(
- const uno::Sequence< beans::PropertyValue >& rProperties,
- const uno::Reference< container::XNameAccess >& rCommandToLabelMap )
- :
- SvxConfigEntry( rProperties, rCommandToLabelMap )
-{
- uno::Reference< container::XIndexAccess > aChildren;
-
- for ( sal_Int32 i = 0; i < rProperties.getLength(); i++ )
- {
- if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_CONTAINER ))
- {
- rProperties[i].Value >>= aChildren;
- }
- }
-
- if ( aChildren.is() )
- {
- SetPopup( TRUE );
- SetEntries( new SvxEntries() );
-
- uno::Sequence< beans::PropertyValue > aProps;
- for ( sal_Int32 i = 0; i < aChildren->getCount(); i++ )
- {
- if ( aChildren->getByIndex( i ) >>= aProps )
- {
- SvxConfigEntry* pEntry =
- new SvxMenuConfigEntry( aProps, rCommandToLabelMap );
- GetEntries()->push_back( pEntry );
- }
- }
- }
-}
-*/
-
SvxConfigEntry::SvxConfigEntry( const OUString& rDisplayName,
const OUString& rCommandURL, bool bPopup, bool bParentData )
: nId( 1 )
@@ -4695,51 +4498,6 @@ void ToolbarSaveInData::RestoreToolbar( SvxConfigEntry* pToolbar )
}
}
-void ToolbarSaveInData::ReloadToolbar( const OUString& rResourceURL )
-{
- SvxEntries::const_iterator iter = GetEntries()->begin();
- SvxConfigEntry* pToolbar = NULL;
-
- for ( ; iter != GetEntries()->end(); iter++ )
- {
- SvxConfigEntry* pEntry = *iter;
-
- if ( pEntry->GetCommand().equals( rResourceURL ) )
- {
- pToolbar = pEntry;
- break;
- }
- }
-
- if ( pToolbar != NULL )
- {
- delete pToolbar->GetEntries();
-
- try
- {
- uno::Reference< container::XIndexAccess > xToolbarSettings;
-
- if ( pToolbar->IsParentData() )
- {
- xToolbarSettings = GetParentConfigManager()->getSettings(
- pToolbar->GetCommand(), sal_False);
- }
- else
- {
- xToolbarSettings = GetConfigManager()->getSettings(
- pToolbar->GetCommand(), sal_False);
- }
-
- LoadToolbar( xToolbarSettings, pToolbar );
- }
- catch ( container::NoSuchElementException& )
- {
- // toolbar not found for some reason
- // it will not appear in the toolbar list
- }
- }
-}
-
bool ToolbarSaveInData::LoadToolbar(
const uno::Reference< container::XIndexAccess >& xToolbarSettings,
SvxConfigEntry* pParentData )
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 952de1f9275e..da294a4526b0 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -376,40 +376,6 @@ void SfxConfigFunctionListBox_Impl::ClearAll()
Clear();
}
-SvLBoxEntry* SfxConfigFunctionListBox_Impl::GetEntry_Impl( const String& rName )
-/* Beschreibung
- Ermittelt den SvLBoxEntry zu einem "ubergebenen String. Das setzt voraus, da\s
- die Namen eindeutig sind.
-*/
-{
- SvLBoxEntry *pEntry = First();
- while ( pEntry )
- {
- if ( GetEntryText( pEntry ) == rName )
- return pEntry;
- pEntry = Next( pEntry );
- }
-
- return NULL;
-}
-
-SvLBoxEntry* SfxConfigFunctionListBox_Impl::GetEntry_Impl( USHORT nId )
-/* Beschreibung
- Ermittelt den SvLBoxEntry zu einer "ubergebenen Id.
-*/
-{
- SvLBoxEntry *pEntry = First();
- while ( pEntry )
- {
- SfxGroupInfo_Impl *pData = (SfxGroupInfo_Impl*) pEntry->GetUserData();
- if ( pData && pData->nOrd == nId )
- return pEntry;
- pEntry = Next( pEntry );
- }
-
- return NULL;
-}
-
SfxMacroInfo* SfxConfigFunctionListBox_Impl::GetMacroInfo()
/* Beschreibung
Gibt die MacroInfo des selektierten Entry zur"uck ( sofern vorhanden ).
@@ -451,60 +417,6 @@ String SfxConfigFunctionListBox_Impl::GetCurLabel()
return pData->sCommand;
}
-USHORT SfxConfigFunctionListBox_Impl::GetId( SvLBoxEntry *pEntry )
-/* Beschreibung
- Gibt die Ordnungsnummer ( SlotId oder Macro-Nummer ) des Eintrags zur"uck.
-*/
-{
- SfxGroupInfo_Impl *pData = pEntry ?
- (SfxGroupInfo_Impl*) pEntry->GetUserData() : 0;
- if ( pData )
- return pData->nOrd;
- return 0;
-}
-
-/*
-String SfxConfigFunctionListBox_Impl::GetHelpText( SvLBoxEntry *pEntry )
-{
- // Information zum selektierten Entry aus den Userdaten holen
- SfxGroupInfo_Impl *pInfo = pEntry ? (SfxGroupInfo_Impl*) pEntry->GetUserData(): 0;
- if ( pInfo )
- {
- switch ( pInfo->nKind )
- {
- case SFX_CFGGROUP_FUNCTION :
- case SFX_CFGFUNCTION_SLOT :
- {
- // Eintrag ist eine Funktion, Hilfe aus der Office-Hilfe
- USHORT nId = pInfo->nOrd;
- String aText = Application::GetHelp()->GetHelpText( nId, this );
-
- if ( !aText.Len() )
- aText = SFX_SLOTPOOL().GetSlotHelpText_Impl( nId );
- return aText;
- }
-
- case SFX_CFGGROUP_SCRIPTCONTAINER :
- case SFX_CFGFUNCTION_SCRIPT :
- case SFX_CFGGROUP_BASICMGR :
- case SFX_CFGGROUP_DOCBASICMGR :
- case SFX_CFGGROUP_BASICLIB :
- case SFX_CFGGROUP_BASICMOD :
- case SFX_CFGFUNCTION_MACRO :
- {
- // Eintrag ist ein Macro, Hilfe aus der MacroInfo
- SfxMacroInfo *pMacInfo = (SfxMacroInfo*) pInfo->pObject;
- return pMacInfo->GetHelpText();
- }
-
- case SFX_CFGGROUP_STYLES :
- return String();
- }
- }
-
- return String();
-}*/
-
void SfxConfigFunctionListBox_Impl::FunctionSelected()
/* Beschreibung
Setzt die Balloonhelp zur"uck, da diese immer den Helptext des selektierten
@@ -1247,25 +1159,6 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC
return xModel;
}
-::rtl::OUString SfxConfigGroupListBox_Impl::parseLocationName( const ::rtl::OUString& location )
-{
- // strip out the last leaf of location name
- // e.g. file://dir1/dir2/Blah.sxw - > Blah.sxw
- ::rtl::OUString temp = location;
- sal_Int32 lastSlashIndex = temp.lastIndexOf( ::rtl::OUString::createFromAscii( "/" ) );
-
- if ( ( lastSlashIndex + 1 ) < temp.getLength() )
- {
- temp = temp.copy( lastSlashIndex + 1 );
- }
- // maybe we should throw here!!!
- else
- {
- OSL_TRACE("Something wrong with name, perhaps we should throw an exception");
- }
- return temp;
-}
-
//-----------------------------------------------
::rtl::OUString SfxConfigGroupListBox_Impl::MapCommand2UIName(const ::rtl::OUString& sCommand)
{
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 3e99f3e95b5f..833dc0f32c82 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -154,42 +154,6 @@ void SvxConfigFunctionListBox_Impl::ClearAll()
Clear();
}
-SvLBoxEntry* SvxConfigFunctionListBox_Impl::GetEntry_Impl( const String& rName )
-{
- SvLBoxEntry *pEntry = First();
- while ( pEntry )
- {
- if ( GetEntryText( pEntry ) == rName )
- return pEntry;
- pEntry = Next( pEntry );
- }
-
- return NULL;
-}
-
-SvLBoxEntry* SvxConfigFunctionListBox_Impl::GetEntry_Impl( USHORT nId )
-{
- SvLBoxEntry *pEntry = First();
- while ( pEntry )
- {
- SvxGroupInfo_Impl *pData = (SvxGroupInfo_Impl*) pEntry->GetUserData();
- if ( pData && pData->nOrd == nId )
- return pEntry;
- pEntry = Next( pEntry );
- }
-
- return NULL;
-}
-
-USHORT SvxConfigFunctionListBox_Impl::GetId( SvLBoxEntry *pEntry )
-{
- SvxGroupInfo_Impl *pData = pEntry ?
- (SvxGroupInfo_Impl*) pEntry->GetUserData() : 0;
- if ( pData )
- return pData->nOrd;
- return 0;
-}
-
String SvxConfigFunctionListBox_Impl::GetHelpText( SvLBoxEntry *pEntry )
{
// Information zum selektierten Entry aus den Userdaten holen
@@ -1214,12 +1178,6 @@ SvxScriptSelectorDialog::SetDialogDescription( const String& rDescription )
aDialogDescription.SetText( rDescription );
}
-USHORT
-SvxScriptSelectorDialog::GetSelectedId()
-{
- return aCommands.GetId( aCommands.GetLastSelectedEntry() );
-}
-
String
SvxScriptSelectorDialog::GetScriptURL() const
{
diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx
index f1cc2a869d6a..327ffd4cbc17 100644
--- a/cui/source/dialogs/commonlingui.cxx
+++ b/cui/source/dialogs/commonlingui.cxx
@@ -183,52 +183,6 @@ void SvxCommonLinguisticControl::InsertControlGroup( Window& _rFirstGroupWindow,
// (FirstWindow, LastWindow) was no valid control group
}
-// -----------------------------------------------------------------------
-String SvxCommonLinguisticControl::GetNewEditWord()
-{
- return aNewWordED.GetText();
-}
-
-// -----------------------------------------------------------------------
-void SvxCommonLinguisticControl::SetNewEditWord( const String& _rNew )
-{
- aNewWordED.SetText( _rNew );
-}
-
-//-----------------------------------------------------------------------------
-void SvxCommonLinguisticControl::UpdateIgnoreHelp( )
-{
-
- String aInfoStr( RTL_CONSTASCII_USTRINGPARAM( ": " ) );
- aInfoStr.Append( GetCurrentText() );
-
- String aString = GetNonMnemonicString( aIgnoreAllBtn.GetText() );
- aString.Append( aInfoStr );
- aIgnoreAllBtn.SetQuickHelpText( aString );
-
- aString = GetNonMnemonicString( aIgnoreBtn.GetText() );
- aString.Append( aInfoStr );
- aIgnoreBtn.SetQuickHelpText( aString );
-}
-
-//-----------------------------------------------------------------------------
-void SvxCommonLinguisticControl::UpdateChangesHelp( const String& _rNewText )
-{
- String aInfoStr( RTL_CONSTASCII_USTRINGPARAM( ": " ) );
- aInfoStr.Append( GetCurrentText() );
- aInfoStr.Append( String( RTL_CONSTASCII_USTRINGPARAM( " -> " ) ) );
- aInfoStr.Append( _rNewText );
- // TODO: shouldn't this be part of the resources, for proper localization?
-
- String aString = GetNonMnemonicString( aChangeAllBtn.GetText() );
- aString.Append( aInfoStr );
- aChangeAllBtn.SetQuickHelpText( aString );
-
- aString = GetNonMnemonicString( aChangeBtn.GetText() );
- aString.Append( aInfoStr );
- aChangeBtn.SetQuickHelpText( aString );
-}
-
//-----------------------------------------------------------------------------
void SvxCommonLinguisticControl::Paint( const Rectangle& rRect )
{
diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx
index 04d9fbcc58e4..c6eb11b9a48c 100644
--- a/cui/source/dialogs/commonlingui.hxx
+++ b/cui/source/dialogs/commonlingui.hxx
@@ -152,18 +152,6 @@ public:
// returns the location (upper-left corner) of the group of action buttons
inline Point GetActionButtonsLocation( ) const { return aIgnoreBtn.GetPosPixel(); }
-
- // updates the help texts for the "change" and "change all" buttons according to the currently
- // entered texts
- void UpdateChangesHelp( const String& _rNewText );
- inline void UpdateChangesHelp( ) { UpdateChangesHelp( GetWordInputControl().GetText() ); }
-
- // updates the help texts for the "ignore" and "always ignore" buttons according to the currently
- // entered texts
- void UpdateIgnoreHelp( );
-
- String GetNewEditWord();
- void SetNewEditWord( const String& _rNew );
};
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 297b1ad921c4..94477b6ef3dc 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -136,9 +136,6 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, aImage, aImageHC, SvxHyperlinkNewDocTp::Create );
pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
- // all tab pages set -> create mnemonics
- // CreateIconTextAutoMnemonics(); #99671# not useful, because this is not what user expects when using mnemonics on the pages
-
// create itemset for tabpages
mpItemSet = new SfxItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK,
SID_HYPERLINK_SETLINK );
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 2198a42c3fcf..32e62d3e7f80 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -690,12 +690,6 @@ namespace svx
}
//-------------------------------------------------------------------------
- void HangulHanjaConversionDialog::SetOptionsHdl( const Link& _rHdl )
- {
- m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eOptions, _rHdl );
- }
-
- //-------------------------------------------------------------------------
void HangulHanjaConversionDialog::SetFindHdl( const Link& _rHdl )
{
m_aFind.SetClickHdl( _rHdl );
@@ -866,11 +860,6 @@ namespace svx
}
//-------------------------------------------------------------------------
- sal_Bool HangulHanjaConversionDialog::GetByCharacter( ) const
- {
- return m_aReplaceByChar.IsChecked();
- }
- //-------------------------------------------------------------------------
void HangulHanjaConversionDialog::SetConversionDirectionState(
sal_Bool _bTryBothDirections,
HHC::ConversionDirection _ePrimaryConversionDirection )
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index dc50bd8f205d..1015063b05e3 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -173,37 +173,6 @@ void SvxHyperlinkNewDocTp::FillDlgFields ( String& /*aStrURL*/ )
#define INTERNETSHORTCUT_URL_TAG "URL"
#define INTERNETSHORTCUT_ICONID_TAG "IconIndex"
-void SvxHyperlinkNewDocTp::ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder )
-{
- // Open file
- Config aCfg( rFile );
- aCfg.SetGroup( INTERNETSHORTCUT_ID_TAG );
-
- // read URL
- rURL = aCfg.ReadKey( ByteString( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_URL_TAG) ), RTL_TEXTENCODING_ASCII_US );
- SvtPathOptions aPathOpt;
- rURL = aPathOpt.SubstituteVariable( rURL );
-
- // read target
- if ( pShowAsFolder )
- {
- String aTemp( aCfg.ReadKey( ByteString( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_TARGET_TAG ) ), RTL_TEXTENCODING_ASCII_US ) );
- *pShowAsFolder = aTemp == String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_FOLDER_TAG ) );
- }
-
- // read image-ID
- String aStrIconId( aCfg.ReadKey( ByteString( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_ICONID_TAG ) ), RTL_TEXTENCODING_ASCII_US ) );
- rIconId = aStrIconId.ToInt32();
-
- // read title
- String aLangStr = aPathOpt.SubstituteVariable( DEFINE_CONST_UNICODE("$(vlang)") );
- ByteString aLang( aLangStr, RTL_TEXTENCODING_UTF8 );
- ByteString aGroup = INTERNETSHORTCUT_ID_TAG;
- ( ( aGroup += '-' ) += aLang ) += ".W";
- aCfg.SetGroup( aGroup );
- rTitle = String( aCfg.ReadKey( INTERNETSHORTCUT_TITLE_TAG ), RTL_TEXTENCODING_UTF7 );
-}
-
void SvxHyperlinkNewDocTp::FillDocumentList ()
{
EnterWait();
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index adea20068499..a9356704e503 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -149,56 +149,6 @@ sal_Bool IconChoicePage::QueryClose()
/**********************************************************************
|
-| handling itemsets
-|
-\**********************************************************************/
-
-const SfxPoolItem* IconChoicePage::GetItem( const SfxItemSet& rSet,
- USHORT nSlot )
-{
- const SfxItemPool* pPool = rSet.GetPool();
- USHORT nWh = pPool->GetWhich( nSlot );
- const SfxPoolItem* pItem = 0;
- rSet.GetItemState( nWh, TRUE, &pItem );
-
- if ( !pItem && nWh != nSlot )
- pItem = &pPool->GetDefaultItem( nWh );
-
- return pItem;
-}
-
-// -----------------------------------------------------------------------
-
-const SfxPoolItem* IconChoicePage::GetOldItem( const SfxItemSet& rSet,
- USHORT nSlot )
-{
- const SfxItemSet& rOldSet = GetItemSet();
- USHORT nWh = GetWhich( nSlot );
- const SfxPoolItem* pItem = 0;
-
- if ( bStandard && rOldSet.GetParent() )
- pItem = GetItem( *rOldSet.GetParent(), nSlot );
- else if ( rSet.GetParent() && SFX_ITEM_DONTCARE == rSet.GetItemState( nWh ) )
- pItem = GetItem( *rSet.GetParent(), nSlot );
- else
- pItem = GetItem( rOldSet, nSlot );
-
- return pItem;
-}
-
-// -----------------------------------------------------------------------
-
-const SfxPoolItem* IconChoicePage::GetExchangeItem( const SfxItemSet& rSet,
- USHORT nSlot )
-{
- if ( pDialog && !pDialog->IsInOK() && pDialog->GetExampleSet() )
- return GetItem( *pDialog->GetExampleSet(), nSlot );
- else
- return GetOldItem( rSet, nSlot );
-}
-
-/**********************************************************************
-|
| window-methods
|
\**********************************************************************/
@@ -380,18 +330,6 @@ IconChoiceDialog ::~IconChoiceDialog ()
delete pData;
}
- // remove Pagelist
-/* for ( i=0; i<maPageList.Count(); i++ )
- {
- IconChoicePageData* pData = (IconChoicePageData*)maPageList.GetObject ( i );
-
- if ( pData->bOnDemand )
- delete ( SfxItemSet * )&( pData->pPage->GetItemSet() );
-
- delete pData->pPage;
- delete pData;
- }*/
-
// remove Userdata from Icons
for ( i=0; i<maIconCtrl.GetEntryCount(); i++)
{
@@ -415,26 +353,6 @@ IconChoiceDialog ::~IconChoiceDialog ()
SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& rIconText,
const Image& rChoiceIcon,
- CreatePage pCreateFunc /* != 0 */,
- GetPageRanges pRangesFunc /* darf 0 sein */,
- BOOL bItemsOnDemand, ULONG /*nPos*/ )
-{
- IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc,
- pRangesFunc,
- bItemsOnDemand );
- maPageList.Insert ( pData, LIST_APPEND );
-
- pData->fnGetRanges = pRangesFunc;
- pData->bOnDemand = bItemsOnDemand;
-
- USHORT *pId = new USHORT ( nId );
- SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon );
- pEntry->SetUserData ( (void*) pId );
- return pEntry;
-}
-
-SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& rIconText,
- const Image& rChoiceIcon,
const Image& rChoiceIconHC,
CreatePage pCreateFunc /* != 0 */,
GetPageRanges pRangesFunc /* darf 0 sein */,
@@ -456,65 +374,6 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String&
/**********************************************************************
|
-| remove page
-|
-\**********************************************************************/
-
-void IconChoiceDialog::RemoveTabPage( USHORT nId )
-{
- IconChoicePageData* pData = GetPageData ( nId );
-
- // remove page from list
- if ( pData )
- {
- maPageList.Remove ( pData );
-
- // save settings
- if ( pData->pPage )
- {
- pData->pPage->FillUserData();
- String aPageData(pData->pPage->GetUserData());
- if ( aPageData.Len() )
- {
- SvtViewOptions aTabPageOpt( E_TABPAGE, String::CreateFromInt32( pData->nId ) );
-
- SetViewOptUserItem( aTabPageOpt, aPageData );
- }
- }
-
- if ( pData->bOnDemand )
- delete ( SfxItemSet * )&( pData->pPage->GetItemSet() );
-
- delete pData->pPage;
- delete pData;
- }
-
- // remove Icon
- BOOL bFound=FALSE;
- for ( ULONG i=0; i<maIconCtrl.GetEntryCount() && !bFound; i++)
- {
- SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i );
- USHORT* pUserData = (USHORT*) pEntry->GetUserData();
-
- if ( *pUserData == nId )
- {
- delete pUserData;
- maIconCtrl.RemoveEntry ( pEntry );
- bFound = TRUE;
- }
- }
-
- // was it the current page ?
- if ( nId == mnCurrentPageId )
- {
- mnCurrentPageId = maPageList.First()->nId;
- }
-
- Invalidate ();
-}
-
-/**********************************************************************
-|
| Paint-method
|
\**********************************************************************/
@@ -572,13 +431,6 @@ EIconChoicePos IconChoiceDialog::SetCtrlPos( const EIconChoicePos& rPos )
return eOldPos;
}
-void IconChoiceDialog::SetCtrlColor ( const Color& rColor )
-{
- Wallpaper aWallpaper ( rColor );
- maIconCtrl.SetBackground( aWallpaper );
- maIconCtrl.SetFontColorToBackground ();
-}
-
/**********************************************************************
|
| Show / Hide page or button
@@ -601,14 +453,6 @@ void IconChoiceDialog::HidePageImpl ( IconChoicePageData* pData )
// -----------------------------------------------------------------------
-void IconChoiceDialog::RemoveResetButton()
-{
- aResetBtn.Hide();
- bHideResetBtn = TRUE;
-}
-
-// -----------------------------------------------------------------------
-
void IconChoiceDialog::ShowPage( USHORT nId )
{
bool bInvalidate = GetCurPageId() != nId;
@@ -1144,40 +988,6 @@ void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet )
// -----------------------------------------------------------------------
-// Liefert die Pages, die ihre Sets onDemand liefern, das OutputItemSet.
-const SfxItemSet* IconChoiceDialog::GetOutputItemSet ( USHORT nId )
-{
- IconChoicePageData * pData = GetPageData ( nId );
- DBG_ASSERT( pData, "TabPage nicht gefunden" );
-
- if ( pData )
- {
- if ( !pData->pPage )
- return NULL;
-
- if ( pData->bOnDemand )
- return &pData->pPage->GetItemSet();
-
- return pOutSet;
- }
-
- return NULL;
-}
-
-// -----------------------------------------------------------------------
-
-int IconChoiceDialog::FillOutputItemSet()
-{
- int nRet = IconChoicePage::LEAVE_PAGE;
- if ( OK_Impl() )
- Ok();
- else
- nRet = IconChoicePage::KEEP_PAGE;
- return nRet;
-}
-
-// -----------------------------------------------------------------------
-
void IconChoiceDialog::PageCreated( USHORT /*nId*/, IconChoicePage& /*rPage*/ )
{
// not interested in
@@ -1404,13 +1214,6 @@ short IconChoiceDialog::Ok()
// -----------------------------------------------------------------------
-BOOL IconChoiceDialog::IsInOK() const
-{
- return bInOK;
-}
-
-// -----------------------------------------------------------------------
-
void IconChoiceDialog::FocusOnIcon( USHORT nId )
{
// set focus to icon for the current visible page
@@ -1426,10 +1229,3 @@ void IconChoiceDialog::FocusOnIcon( USHORT nId )
}
}
}
-
-// -----------------------------------------------------------------------
-
-void IconChoiceDialog::CreateIconTextAutoMnemonics( void )
-{
- maIconCtrl.CreateAutoMnemonics();
-}
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index c45dfeb9dc06..8cf21129f52c 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -196,11 +196,6 @@ void SvInsertOleDlg::SelectDefault()
aLbObjecttype.SelectEntryPos( 0 );
}
-void SvInsertOleDlg::FillObjectServerList( SvObjectServerList* pList )
-{
- pList->FillInsertObjects();
-}
-
// -----------------------------------------------------------------------
SvInsertOleDlg::SvInsertOleDlg
(
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index e1763249479c..62ec77c3c26a 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -367,15 +367,6 @@ void SFTreeListBox:: RequestSubEntries( SvLBoxEntry* pRootEntry, Reference< ::co
}
}
-void SFTreeListBox::UpdateEntries()
-{
-}
-
-SvLBoxEntry* SFTreeListBox::FindEntry( SvLBoxEntry* , const String& , BYTE )
-{
- return 0;
-}
-
long SFTreeListBox::ExpandingHdl()
{
return TRUE;
@@ -626,10 +617,6 @@ short SvxScriptOrgDialog::Execute()
return nRet;
}
-void SvxScriptOrgDialog::EnableButton( Button& , BOOL )
-{
-}
-
void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
{
if ( node.is() )
@@ -921,38 +908,6 @@ Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry )
return model;
}
-Reference< XInterface >
-SvxScriptOrgDialog::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OUString& docName )
-{
- Reference< XInterface > xModel;
- Reference< lang::XMultiComponentFactory > mcf =
- xCtx->getServiceManager();
- Reference< frame::XDesktop > desktop (
- mcf->createInstanceWithContext(
- ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx ),
- UNO_QUERY );
-
- Reference< container::XEnumerationAccess > componentsAccess =
- desktop->getComponents();
- Reference< container::XEnumeration > components =
- componentsAccess->createEnumeration();
- while (components->hasMoreElements())
- {
- Reference< frame::XModel > model(
- components->nextElement(), UNO_QUERY );
- if ( model.is() )
- {
- ::rtl::OUString sTdocUrl = ::comphelper::DocumentInfo::getDocumentTitle( model );
- if( sTdocUrl.equals( docName ) )
- {
- xModel = model;
- break;
- }
- }
- }
- return xModel;
-}
-
void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
{
@@ -1371,28 +1326,6 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
aScriptsBox.SetCurEntry( pEntry );
}
-BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1,
- Reference< browse::XBrowseNode > node2 )
-{
- ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user");
- ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share");
- if( node1->getName().equals( userStr ) )
- return true;
- if( node2->getName().equals( userStr ) )
- return false;
- if( node1->getName().equals( shareStr ) )
- return true;
- if( node2->getName().equals( shareStr ) )
- return false;
- return dialogSort2( node1, node2 );
-}
-
-BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
- Reference< browse::XBrowseNode > node2 )
-{
- return ( node1->getName().compareTo( node2->getName() ) < 0 );
-}
-
::rtl::OUString ReplaceString(
const ::rtl::OUString& source,
const ::rtl::OUString& token,
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index bf617b126747..ec04362b488d 100755
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -172,12 +172,21 @@ void ReplaceEdit_Impl::SetText( const XubString& rStr, const Selection& rNewSele
// class ThesaurusAlternativesCtrl_Impl ----------------------------------
+AlternativesString_Impl::AlternativesString_Impl(
+ ThesaurusAlternativesCtrl_Impl &rControl,
+ SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ) :
+ //
+ SvLBoxString( pEntry, nFlags, rStr ),
+ m_rControlImpl( rControl )
+{
+}
+
void AlternativesString_Impl::Paint(
const Point& rPos,
SvLBox& rDev, USHORT,
SvLBoxEntry* pEntry )
{
- AlternativesUserData_Impl* pData = (AlternativesUserData_Impl*)pEntry->GetUserData();
+ AlternativesExtraData* pData = m_rControlImpl.GetExtraData( pEntry );
Point aPos( rPos );
Font aOldFont( rDev.GetFont());
if (pData && pData->IsHeader())
@@ -207,14 +216,40 @@ ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl(
ThesaurusAlternativesCtrl_Impl::~ThesaurusAlternativesCtrl_Impl()
{
- ClearUserData();
+ ClearExtraData();
+}
+
+
+void ThesaurusAlternativesCtrl_Impl::ClearExtraData()
+{
+ UserDataMap_t aEmpty;
+ m_aUserData.swap( aEmpty );
+}
+
+
+void ThesaurusAlternativesCtrl_Impl::SetExtraData(
+ const SvLBoxEntry *pEntry,
+ const AlternativesExtraData &rData )
+{
+ if (!pEntry)
+ return;
+
+ UserDataMap_t::iterator aIt( m_aUserData.find( pEntry ) );
+ if (aIt != m_aUserData.end())
+ aIt->second = rData;
+ else
+ m_aUserData[ pEntry ] = rData;
}
-void ThesaurusAlternativesCtrl_Impl::ClearUserData()
+AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData(
+ const SvLBoxEntry *pEntry )
{
- for (USHORT i = 0; i < GetEntryCount(); ++i)
- delete (AlternativesUserData_Impl*)GetEntry(i)->GetUserData();
+ AlternativesExtraData *pRes = NULL;
+ UserDataMap_t::iterator aIt( m_aUserData.find( pEntry ) );
+ if (aIt != m_aUserData.end())
+ pRes = &aIt->second;
+ return pRes;
}
@@ -230,10 +265,9 @@ SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const St
pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) ); // add empty column
aText += rText;
pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0 ) ); // otherwise crash
- pEntry->AddItem( new AlternativesString_Impl( pEntry, 0, aText ) );
+ pEntry->AddItem( new AlternativesString_Impl( *this, pEntry, 0, aText ) );
- AlternativesUserData_Impl* pUserData = new AlternativesUserData_Impl( rText, bIsHeader );
- pEntry->SetUserData( pUserData );
+ SetExtraData( pEntry, AlternativesExtraData( rText, bIsHeader ) );
GetModel()->Insert( pEntry );
if (bIsHeader)
@@ -365,7 +399,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl()
m_pAlternativesCT->SetUpdateMode( FALSE );
// clear old user data of control before creating new ones via AddEntry below
- m_pAlternativesCT->ClearUserData();
+ m_pAlternativesCT->ClearExtraData();
m_pAlternativesCT->Clear();
for (sal_Int32 i = 0; i < nMeanings; ++i)
@@ -468,9 +502,9 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox
SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL;
if (pEntry)
{
- AlternativesUserData_Impl * pData = (AlternativesUserData_Impl *) pEntry->GetUserData();
+ AlternativesExtraData * pData = m_pAlternativesCT->GetExtraData( pEntry );
String aStr;
- if (!pData->IsHeader())
+ if (pData && !pData->IsHeader())
{
aStr = pData->GetText();
GetReplaceEditString( aStr );
@@ -486,9 +520,9 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis
SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL;
if (pEntry)
{
- AlternativesUserData_Impl * pData = (AlternativesUserData_Impl *) pEntry->GetUserData();
+ AlternativesExtraData * pData = m_pAlternativesCT->GetExtraData( pEntry );
String aStr;
- if (!pData->IsHeader())
+ if (pData && !pData->IsHeader())
{
aStr = pData->GetText();
GetReplaceEditString( aStr );
@@ -509,8 +543,8 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis
IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox *, pBox )
{
(void) pThis;
- if (pBox && pBox->GetEntryCount() > 0)
- pBox->SelectEntryPos( 0 );
+ if (pBox && pBox->GetEntryCount() >= 2)
+ pBox->SelectEntryPos( 1 ); // pos 0 is a 'header' that is not selectable
return 0;
}
diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src
index 16d724473d20..6c6a6444b33d 100755
--- a/cui/source/dialogs/thesdlg.src
+++ b/cui/source/dialogs/thesdlg.src
@@ -59,7 +59,7 @@ ModalDialog RID_SVXDLG_THESAURUS
{
Pos = MAP_APPFONT ( 24 , 5 ) ;
Size = MAP_APPFONT ( 143 , 8 ) ;
- Text [ en-US ] = "Current ~word" ;
+ Text [ en-US ] = "~Current word" ;
LEFT = TRUE ;
};
ComboBox CB_WORD
@@ -95,7 +95,7 @@ ModalDialog RID_SVXDLG_THESAURUS
{
Pos = MAP_APPFONT ( 5 , 173 ) ;
Size = MAP_APPFONT ( 255 , 8 ) ;
- Text [ en-US ] = "Replace ~with" ;
+ Text [ en-US ] = "~Replace with" ;
LEFT = TRUE ;
};
Edit ED_REPL
@@ -120,7 +120,7 @@ ModalDialog RID_SVXDLG_THESAURUS
{
Pos = MAP_APPFONT ( 105 , 210 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
- Text [ en-US ] = "~Replace" ;
+ Text [ en-US ] = "Replace" ;
DefButton = TRUE ;
};
CancelButton BTN_THES_CANCEL
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index 70ce91391456..b682c8d0c129 100755
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -51,11 +51,16 @@
#include <com/sun/star/linguistic2/XMeaning.hpp>
#include <stack>
+#include <map>
#include <algorithm>
using namespace ::com::sun::star;
using ::rtl::OUString;
+class SvLBoxEntry;
+class ThesaurusAlternativesCtrl_Impl;
+
+
// class LookUpComboBox_Impl --------------------------------------------------
class LookUpComboBox_Impl : public ComboBox
@@ -105,17 +110,14 @@ public:
// class ThesaurusAlternativesCtrl_Impl ----------------------------------
-class AlternativesUserData_Impl
+class AlternativesExtraData
{
String sText;
bool bHeader;
- // disable copy c-tor and assignment operator
- AlternativesUserData_Impl( const AlternativesUserData_Impl & );
- AlternativesUserData_Impl & operator = ( const AlternativesUserData_Impl & );
-
public:
- AlternativesUserData_Impl( const String &rText, bool bIsHeader ) :
+ AlternativesExtraData() : bHeader( false ) {}
+ AlternativesExtraData( const String &rText, bool bIsHeader ) :
sText(rText),
bHeader(bIsHeader)
{
@@ -128,10 +130,11 @@ public:
class AlternativesString_Impl : public SvLBoxString
{
+ ThesaurusAlternativesCtrl_Impl & m_rControlImpl;
public:
- AlternativesString_Impl( SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr )
- : SvLBoxString( pEntry, nFlags, rStr ) {}
+ AlternativesString_Impl( ThesaurusAlternativesCtrl_Impl &rControl,
+ SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr );
virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, SvLBoxEntry* pEntry);
};
@@ -142,6 +145,9 @@ class ThesaurusAlternativesCtrl_Impl :
{
SvxThesaurusDialog_Impl & m_rDialogImpl;
+ typedef std::map< const SvLBoxEntry *, AlternativesExtraData > UserDataMap_t;
+ UserDataMap_t m_aUserData;
+
// disable copy c-tor and assignment operator
ThesaurusAlternativesCtrl_Impl( const ThesaurusAlternativesCtrl_Impl & );
ThesaurusAlternativesCtrl_Impl & operator = ( const ThesaurusAlternativesCtrl_Impl & );
@@ -152,7 +158,10 @@ public:
SvLBoxEntry * AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader );
- void ClearUserData();
+
+ void ClearExtraData();
+ void SetExtraData( const SvLBoxEntry *pEntry, const AlternativesExtraData &rData );
+ AlternativesExtraData * GetExtraData( const SvLBoxEntry *pEntry );
virtual void KeyInput( const KeyEvent& rKEvt );
virtual void Paint( const Rectangle& rRect );
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 1b6d1c37651e..55886b6b8032 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -58,13 +58,6 @@
// static ----------------------------------------------------------------
-static USHORT pRanges[] =
-{
- SID_ATTR_ZOOM,
- SID_ATTR_ZOOM,
- 0
-};
-
#define SPECIAL_FACTOR ((USHORT)0xFFFF)
// class SvxZoomDialog ---------------------------------------------------
@@ -124,29 +117,6 @@ void SvxZoomDialog::SetFactor( USHORT nNewFactor, USHORT nBtnId )
// -----------------------------------------------------------------------
-void SvxZoomDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt )
-{
- switch ( nBtnId )
- {
- case ZOOMBTN_OPTIMAL: // Optimal-Button
- aOptimalBtn.SetText( rNewTxt );
- break;
-
- case ZOOMBTN_PAGEWIDTH: // Seitenbreite-Button
- aPageWidthBtn.SetText( rNewTxt );
- break;
-
- case ZOOMBTN_WHOLEPAGE: // Ganze Seite-Button
- aWholePageBtn.SetText( rNewTxt );
- break;
-
- default:
- DBG_ERROR( "wrong button number" );
- }
-}
-
-// -----------------------------------------------------------------------
-
void SvxZoomDialog::HideButton( USHORT nBtnId )
{
switch ( nBtnId )
@@ -181,13 +151,6 @@ void SvxZoomDialog::SetLimits( USHORT nMin, USHORT nMax )
// -----------------------------------------------------------------------
-void SvxZoomDialog::SetSpinSize( USHORT nNewSpin )
-{
- aUserEdit.SetSpinSize( nNewSpin );
-}
-
-// -----------------------------------------------------------------------
-
SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_ZOOM ) ),
@@ -370,13 +333,6 @@ SvxZoomDialog::~SvxZoomDialog()
// -----------------------------------------------------------------------
-USHORT* SvxZoomDialog::GetRanges()
-{
- return pRanges;
-}
-
-// -----------------------------------------------------------------------
-
IMPL_LINK( SvxZoomDialog, UserHdl, RadioButton *, pBtn )
{
bModified |= TRUE;
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index efe7c0763d9d..dd720bd0e4c5 100755..100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -235,24 +235,6 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog
virtual SfxBindings& GetBindings();
};
-//for SvxSpellCheckDialog begin
-//STRIP001 class AbstractSvxSpellCheckDialog_Impl : public AbstractSvxSpellCheckDialog //add for FmShowColsDialog
-//STRIP001 {
-//STRIP001 SvxSpellCheckDialog * pDlg;
-//STRIP001 public
-//STRIP001 AbstractSvxSpellCheckDialog_Impl ( SvxSpellCheckDialog* p)
-//STRIP001 : pDlg(p)
-//STRIP001 {}
-//STRIP001 virtual USHORT Execute() ;
-//STRIP001 virtual void SetNewEditWord( const String& _rNew ) ;
-//STRIP001 virtual void SetLanguage( sal_uInt16 nLang ) ;
-//STRIP001 virtual void HideAutoCorrect() ;
-//STRIP001 virtual String GetNewEditWord();
-//STRIP001 virtual void SetNewEditWord( const String& _rNew );
-//STRIP001 }
-//for SvxSpellCheckDialog end
-
-
//for SearchProgress begin
class SearchProgress;
class AbstractSearchProgress_Impl : public AbstractSearchProgress
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 4b104c6739ff..aa8224654c65 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -184,9 +184,7 @@ private:
String GetLabel4Command(const String& sCommand);
void InitAccCfg();
- KeyCode MapPosToKeyCode( USHORT nPos ) const;
USHORT MapKeyCodeToPos( const KeyCode &rCode ) const;
- String GetFunctionName( KeyFuncType eType ) const;
css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const String& sName);
void StartFileDialog( WinBits nBits, const String& rTitle );
@@ -202,10 +200,7 @@ public:
virtual BOOL FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet& );
- void SelectMacro(const SfxMacroInfoItem*);
void Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
- void CopySource2Target(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xSourceAccMgr,
- const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xTargetAccMgr);
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
};
@@ -223,50 +218,6 @@ public:
void ExpandEntry ( USHORT nPos, const String &rStr );
};
-/*
-// class USHORTArr **********************************************************
-
-DECL_2BYTEARRAY(USHORTArr, USHORT, 10, 10)
-
-// class SfxAcceleratorConfigDialog **************************************************
-
-class SfxAcceleratorConfigDialog : public ModalDialog
-{
- OKButton aOKButton;
- CancelButton aCancelButton;
- PushButton aChangeButton;
- PushButton aRemoveButton;
- SfxAcceleratorConfigListBox aEntriesBox;
- FixedText aDescriptionTextText;
- FixedText aDescriptionInfoText;
- FixedLine aKeyboardGroup;
- FixedText aGroupText;
- ListBox aGroupLBox;
- FixedText aFunctionText;
- ListBox aFunctionBox;
- FixedText aKeyText;
- ListBox aKeyBox;
- FixedLine aFunctionsGroup;
-
- USHORTArr aAccelArr;
- USHORTArr aFunctionArr;
- USHORTArr aKeyArr;
-
- void OKHdl ( Button * );
- void ChangeHdl( Button * );
- void RemoveHdl( Button * );
- void SelectHdl( ListBox *pListBox );
-
- KeyCode PosToKeyCode ( USHORT nPos ) const;
- USHORT KeyCodeToPos ( const KeyCode &rCode ) const;
- String GetFunctionName( KeyFuncType eType ) const;
-
-public:
-
- SfxAcceleratorConfigDialog( Window *pParent );
-};
-*/
-
class SvxShortcutAssignDlg : public SfxSingleTabDialog
{
public:
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index ecf0f81dd754..683bb6ff5010 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -75,8 +75,6 @@ public:
SvxConfigDialog( Window*, const SfxItemSet* );
~SvxConfigDialog();
- void ActivateTabPage( USHORT );
-
virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
virtual short Ok();
@@ -258,12 +256,6 @@ private:
public:
- SvxConfigEntry(
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue >& rProperties,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XNameAccess >& rCommandToLabelMap );
-
SvxConfigEntry( const ::rtl::OUString& rDisplayName,
const ::rtl::OUString& rCommandURL,
bool bPopup = FALSE,
@@ -337,11 +329,6 @@ public:
sal_Int32 GetStyle() { return nStyle; }
void SetStyle( sal_Int32 style ) { nStyle = style; }
-
- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >
- GetProperties(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XNameAccess >& rCommandToLabelMap );
};
class SvxMenuEntriesListBox : public SvTreeListBox
@@ -694,7 +681,6 @@ public:
void RestoreToolbar( SvxConfigEntry* pToolbar );
void RemoveToolbar( SvxConfigEntry* pToolbar );
void ApplyToolbar( SvxConfigEntry* pToolbar );
- void ReloadToolbar( const rtl::OUString& rURL );
rtl::OUString GetSystemUIName( const rtl::OUString& rResourceURL );
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 5a5d9ee0473a..944fca908b8a 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -139,12 +139,8 @@ public:
~SfxConfigFunctionListBox_Impl();
void ClearAll();
- SvLBoxEntry* GetEntry_Impl( USHORT nId );
- SvLBoxEntry* GetEntry_Impl( const String& );
- USHORT GetId( SvLBoxEntry *pEntry );
using Window::GetHelpText;
String GetHelpText( SvLBoxEntry *pEntry );
- USHORT GetCurId() { return GetId( FirstSelected() ); }
String GetCurCommand();
String GetCurLabel();
SfxMacroInfo* GetMacroInfo();
@@ -173,7 +169,6 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox
Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
- ::rtl::OUString parseLocationName( const ::rtl::OUString& location );
void InitModule();
void InitBasic();
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 0f09c8971e5d..315a78e70a03 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -155,7 +155,6 @@ private:
void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp );
BOOL FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp );
void ResetColor_Impl( const SfxItemSet& rSet );
- BOOL FillItemSetColor_Impl( SfxItemSet& rSet );
DECL_LINK( UpdateHdl_Impl, Timer* );
DECL_LINK( FontModifyHdl_Impl, void* );
diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index be4c4bc0cd7a..d1b835cd1966 100644
--- a/cui/source/inc/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -67,7 +67,6 @@ public:
virtual void Activate();
INT32 GetTransliterationFlags() const;
- void SetTransliterationFlags( INT32 nSettings );
};
#endif
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index a2ef9da67553..b89ec4e779a0 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -95,13 +95,6 @@ namespace svx
*/
void openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvLBoxEntry* _pEntry = NULL);
- /** opens a file pciker to select a database file
- @param _sLocation
- If set, the file picker use it as default directory
- @return
- the location of the database file
- */
- String getFileLocation(const String& _sLocation);
#endif
public:
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index 287fa206f148..6c344cec81c5 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -152,7 +152,6 @@ namespace svx
void SetIgnoreAllHdl( const Link& _rHdl );
void SetChangeHdl( const Link& _rHdl );
void SetChangeAllHdl( const Link& _rHdl );
- void SetOptionsHdl( const Link& _rHdl );
void SetClickByCharacterHdl( const Link& _rHdl );
void SetConversionFormatChangedHdl( const Link& _rHdl );
@@ -174,8 +173,6 @@ namespace svx
editeng::HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const;
void SetByCharacter( sal_Bool _bByCharacter );
- sal_Bool GetByCharacter( ) const;
-
void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection );
// should text which does not match the primary conversion direction be ignored?
diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx
index edfc790afc0d..9859fc9c0f80 100644
--- a/cui/source/inc/hldocntp.hxx
+++ b/cui/source/inc/hldocntp.hxx
@@ -53,8 +53,6 @@ private:
DECL_LINK (ClickNewHdl_Impl , void * ); // Button : New
Image GetImage( USHORT nId );
- void ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder);//, String* pFrame, String* pOpenAs, String* pDefTempl, String* pDefURL );
- //String ReadURL_Impl( Config& rURLFile, const DirEntry& rFile );
protected:
void FillDlgFields ( String& aStrURL );
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index f4646daf376e..35f010583fb9 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -116,8 +116,6 @@ protected :
USHORT GetSlot( USHORT nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); }
USHORT GetWhich( USHORT nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); }
- const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, USHORT nSlot );
- const SfxPoolItem* GetExchangeItem( const SfxItemSet& rSet, USHORT nSlot );
public :
virtual ~IconChoicePage();
@@ -148,8 +146,6 @@ public :
virtual BOOL IsReadOnly() const;
virtual sal_Bool QueryClose();
- static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot );
-
void StateChanged( StateChangedType nType );
void DataChanged( const DataChangedEvent& rDCEvt );
};
@@ -221,7 +217,6 @@ protected :
void ResetPageImpl ();
short Ok();
- BOOL IsInOK() const;
public :
@@ -242,17 +237,10 @@ public :
//
SvxIconChoiceCtrlEntry* AddTabPage(
- USHORT nId, const String& rIconText, const Image& rChoiceIcon,
- CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
- BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND );
-
- SvxIconChoiceCtrlEntry* AddTabPage(
USHORT nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC,
CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND );
- void RemoveTabPage( USHORT nId );
-
void SetCurPageId( USHORT nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
USHORT GetCurPageId() const { return mnCurrentPageId; }
void ShowPage( USHORT nId );
@@ -261,8 +249,6 @@ public :
const USHORT* GetInputRanges( const SfxItemPool& );
void SetInputSet( const SfxItemSet* pInSet );
const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
- const SfxItemSet* GetOutputItemSet( USHORT nId );
- int FillOutputItemSet();
const OKButton& GetOKButton() const { return aOKBtn; }
OKButton& GetOKButton() { return aOKBtn; }
@@ -271,18 +257,13 @@ public :
const HelpButton& GetHelpButton() const { return aHelpBtn; }
HelpButton& GetHelpButton() { return aHelpBtn; }
- void RemoveResetButton();
-
short Execute();
void Start( BOOL bShow = TRUE );
sal_Bool QueryClose();
const SfxItemSet* GetExampleSet() const { return pExampleSet; }
- void SetCtrlColor ( const Color& rColor );
EIconChoicePos SetCtrlPos ( const EIconChoicePos& rPos );
-
- void CreateIconTextAutoMnemonics( void );
};
#endif //_ICCDLG_HXX
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 299e784ae191..a93b93498d37 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -89,8 +89,6 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
BOOL IsCreateNew() const { return aRbNewObject.IsChecked(); }
public:
- static void FillObjectServerList( SvObjectServerList* );
-
SvInsertOleDlg( Window* pParent,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage,
const SvObjectServerList* pServers = NULL );
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index d6a2b607eac3..45cf2fdbf79e 100644..100755
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -60,7 +60,6 @@ class _SfxMacroTabPage : public SfxTabPage
DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton * );
DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, ChangeScriptHdl_Impl, RadioButton * );
- DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit* );
DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* );
protected:
@@ -86,19 +85,11 @@ public:
virtual void ScriptChanged( const String& rLanguage );
virtual void PageCreated (SfxAllItemSet aSet);
- // zum setzen / abfragen der Links
- void SetGetRangeLink( FNGetRangeHdl pFn );
- FNGetRangeHdl GetGetRangeLink() const;
- void SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn );
- FNGetMacrosOfRangeHdl GetGetMacrosOfRangeLink() const;
-
// --------- Erben aus der Basis -------------
virtual BOOL FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
- void SetReadOnly( BOOL bSet );
BOOL IsReadOnly() const;
- void SelectEvent( const String& rEventName, USHORT nEventId );
};
inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
diff --git a/cui/source/inc/optimprove.hxx b/cui/source/inc/optimprove.hxx
index e7259f2a682c..266c51944b09 100644
--- a/cui/source/inc/optimprove.hxx
+++ b/cui/source/inc/optimprove.hxx
@@ -36,14 +36,6 @@
#include <sfx2/basedlgs.hxx>
#include <sfx2/tabdlg.hxx>
-// class SvxEmptyPage ----------------------------------------------------
-
-class SvxEmptyPage : public TabPage
-{
-public:
- SvxEmptyPage( Window* pParent );
-};
-
// class SvxImprovementPage ----------------------------------------------
class SvxImprovementPage : public TabPage
@@ -105,7 +97,6 @@ public:
virtual ~SvxImprovementOptionsPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static sal_uInt16* GetRanges();
virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
@@ -123,16 +114,5 @@ public:
SvxImprovementDialog( Window* pParent, const String& rInfoURL );
};
-class SvxInfoWindow : public Window
-{
-private:
- FixedText m_aInfoText;
-
-public:
- SvxInfoWindow( Window* pParent, const ResId& rResId );
-
- void SetInfoText( const String& rText );
-};
-
#endif
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 82752a7af01a..64a926f5ef89 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -135,7 +135,6 @@ public:
void SetPageWidth( USHORT nPageWidth );
- void SetMaxDistance( USHORT nMaxDist );
void EnableRelativeMode();
void EnableRegisterMode();
void EnableAutoFirstLine();
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 0b8930c57827..8ecdd93a5d2e 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -97,13 +97,7 @@ protected:
void ExpandTree( SvLBoxEntry* pRootEntry );
virtual void RequestingChilds( SvLBoxEntry* pParent );
virtual void ExpandedHdl();
- SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const String& rText, BYTE nType );
virtual long ExpandingHdl();
- static BOOL dialogSort1( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1,
- com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 );
- static BOOL dialogSort2( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1,
- com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 );
-
public:
void Init( const ::rtl::OUString& language );
void RequestSubEntries( SvLBoxEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
@@ -111,8 +105,6 @@ public:
SFTreeListBox( Window* pParent, const ResId& rRes );
~SFTreeListBox();
- void UpdateEntries();
-
void ExpandAllTrees();
@@ -202,15 +194,12 @@ protected:
BOOL getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName );
void CheckButtons( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node );
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
-
void createEntry( SvLBoxEntry* pEntry );
void renameEntry( SvLBoxEntry* pEntry );
void deleteEntry( SvLBoxEntry* pEntry );
::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >
getBrowseNode( SvLBoxEntry* pEntry );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel( SvLBoxEntry* pEntry );
- void EnableButton( Button& rButton, BOOL bEnable );
String getListOfChildren( ::com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node, int depth );
void StoreCurrentSelection();
void RestorePreviousSelection();
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 104cc928071e..3c01b955a474 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -115,13 +115,8 @@ public:
SvxConfigFunctionListBox_Impl( Window*, const ResId& );
~SvxConfigFunctionListBox_Impl();
void ClearAll();
- SvLBoxEntry* GetEntry_Impl( USHORT nId );
- SvLBoxEntry* GetEntry_Impl( const String& );
- USHORT GetId( SvLBoxEntry *pEntry );
String GetHelpText( SvLBoxEntry *pEntry );
using Window::GetHelpText;
- USHORT GetCurId()
- { return GetId( FirstSelected() ); }
SvLBoxEntry* GetLastSelectedEntry();
void FunctionSelected();
@@ -235,7 +230,6 @@ public:
void SetImageProvider( ImageProvider* provider )
{ aCategories.SetImageProvider( provider ); }
- USHORT GetSelectedId();
String GetScriptURL() const;
String GetSelectedDisplayName();
String GetSelectedHelpText();
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 72fb9d4d61f6..72859aa70945 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -336,12 +336,6 @@ private:
public:
ExtensionsTabPage(
- Window* pParent, const ResId&,
- const rtl::OUString& rPageURL, const rtl::OUString& rEvtHdl,
- const com::sun::star::uno::Reference<
- com::sun::star::awt::XContainerWindowProvider >& rProvider );
-
- ExtensionsTabPage(
Window* pParent, WinBits nStyle,
const rtl::OUString& rPageURL, const rtl::OUString& rEvtHdl,
const com::sun::star::uno::Reference<
@@ -354,6 +348,5 @@ public:
void ResetPage();
void SavePage();
- void HideWindow();
};
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index 5b494a0448b3..9a8c9b03da1c 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -99,16 +99,13 @@ public:
SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet );
~SvxZoomDialog();
- static USHORT* GetRanges();
const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
USHORT GetFactor() const;
void SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 );
- void SetButtonText( USHORT nBtnId, const String& aNewTxt );
void HideButton( USHORT nBtnId );
void SetLimits( USHORT nMin, USHORT nMax );
- void SetSpinSize( USHORT nNewSpin );
};
#include <layout/layout-post.hxx>
diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx
index f17b805000f9..ae01a4f08f27 100644
--- a/cui/source/options/connpoolsettings.cxx
+++ b/cui/source/options/connpoolsettings.cxx
@@ -39,13 +39,6 @@ namespace offapp
//= DriverPooling
//====================================================================
//--------------------------------------------------------------------
- DriverPooling::DriverPooling()
- :bEnabled(sal_False)
- ,nTimeoutSeconds(0)
- {
- }
-
- //--------------------------------------------------------------------
DriverPooling::DriverPooling( const String& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout )
:sName(_rName)
,bEnabled(_bEnabled)
diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx
index 666b74742190..4a835d15a728 100644
--- a/cui/source/options/connpoolsettings.hxx
+++ b/cui/source/options/connpoolsettings.hxx
@@ -46,7 +46,6 @@ namespace offapp
sal_Bool bEnabled;
sal_Int32 nTimeoutSeconds;
- DriverPooling();
DriverPooling( const String& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout );
sal_Bool operator == (const DriverPooling& _rR) const;
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index 7d488c263bad..ad34722ae246 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -92,9 +92,3 @@ INT32 SvxJSearchOptionsDialog::GetTransliterationFlags() const
{
return pPage->GetTransliterationFlags();
}
-
-
-void SvxJSearchOptionsDialog::SetTransliterationFlags( INT32 nSettings )
-{
- pPage->SetTransliterationFlags( nSettings );
-}
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index c617a3e4c515..7bfc72d1181e 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -425,60 +425,6 @@ void DbRegistrationOptionsPage::insertNewEntry( const ::rtl::OUString& _sName,co
}
// -----------------------------------------------------------------------------
-String DbRegistrationOptionsPage::getFileLocation(const String& _sLocation)
-{
- try
- {
- rtl::OUString aService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) );
- Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
- Reference < XFilePicker > xFilePicker( xFactory->createInstance( aService ), UNO_QUERY );
- OSL_ENSURE(xFilePicker.is() ,"Could create file picker service!");
- Reference < XFilterManager> xFilterManager(xFilePicker,UNO_QUERY);
- static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)");
- const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType);
- if ( pFilter )
- {
- xFilterManager->appendFilter( pFilter->GetUIName(),pFilter->GetDefaultExtension());
- xFilterManager->setCurrentFilter(pFilter->GetUIName());
- }
-
- INetURLObject aURL( _sLocation, INET_PROT_FILE );
- xFilePicker->setMultiSelectionMode(sal_False);
- xFilePicker->setDisplayDirectory( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
- short nRet = xFilePicker->execute();
-
- if ( ExecutableDialogResults::OK == nRet )
- {
-
- // old path is an URL?
- INetURLObject aObj( _sLocation );
- FASTBOOL bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID );
- Sequence< ::rtl::OUString > aFiles = xFilePicker->getFiles();
- INetURLObject aNewObj( aFiles[0] );
- aNewObj.removeFinalSlash();
-
- // then the new path also an URL else system path
- String sNewLocation = bURL ? rtl::OUString(aFiles[0]) : aNewObj.getFSysPath( INetURLObject::FSYS_DETECT );
-
- if (
-#ifdef UNX
- // Unix is case sensitive
- ( sNewLocation != _sLocation )
-#else
- ( sNewLocation.CompareIgnoreCaseToAscii( _sLocation ) != COMPARE_EQUAL )
-#endif
- )
- return sNewLocation;
- }
- }
- catch( Exception& )
- {
- DBG_ERRORFILE( "DbRegistrationOptionsPage::EditLocationHdl: exception from folder picker" );
- }
-
- return String();
-}
-// -----------------------------------------------------------------------------
void DbRegistrationOptionsPage::openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvLBoxEntry* _pEntry)
{
ODocumentLinkDialog aDlg(this,_pEntry == NULL);
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 1c76da9212c1..c9ee53ca13fb 100644..100755
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -168,6 +168,7 @@ IMPL_LINK( SvxNewDictionaryDialog, OKHdl_Impl, Button *, EMPTYARG )
String aURL( linguistic::GetWritableDictionaryURL( sDict ) );
xNewDic = Reference< XDictionary > (
xDicList->createDictionary( sDict, aLocale, eType, aURL ) , UNO_QUERY );
+ xNewDic->setActive( sal_True );
}
DBG_ASSERT(xNewDic.is(), "NULL pointer");
}
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index b9a181a28438..06d1c46af3df 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1159,51 +1159,6 @@ void OfaViewTabPage::Reset( const SfxItemSet& )
LINK( this, OfaViewTabPage, OnAntialiasingToggled ).Call( NULL );
#endif
}
-/* -----------------------------23.11.00 14:55--------------------------------
-
- ---------------------------------------------------------------------------*/
-class LangConfigItem_Impl : public ConfigItem
-{
- Any aValue;
- OUString aPropertyName;
-public:
- LangConfigItem_Impl(const OUString& rTree, const OUString& rProperty);
- ~LangConfigItem_Impl();
-
- virtual void Commit();
-
- const Any& GetValue() const {return aValue;}
- void SetValue(Any& rValue) {aValue = rValue; SetModified();}
-};
-/* -----------------------------23.11.00 15:06--------------------------------
-
- ---------------------------------------------------------------------------*/
-LangConfigItem_Impl::LangConfigItem_Impl(
- const OUString& rTree, const OUString& rProperty) :
- ConfigItem(rTree),
- aPropertyName(rProperty)
-{
- Sequence<OUString> aNames(1);
- aNames.getArray()[0] = aPropertyName;
- Sequence<Any> aValues = GetProperties(aNames);
- aValue = aValues.getConstArray()[0];
-}
-/* -----------------------------23.11.00 15:06--------------------------------
-
- ---------------------------------------------------------------------------*/
-LangConfigItem_Impl::~LangConfigItem_Impl()
-{}
-/* -----------------------------23.11.00 15:10--------------------------------
-
- ---------------------------------------------------------------------------*/
-void LangConfigItem_Impl::Commit()
-{
- Sequence<OUString> aNames(1);
- aNames.getArray()[0] = aPropertyName;
- Sequence<Any> aValues(1);
- aValues.getArray()[0] = aValue;
- PutProperties(aNames, aValues);
-}
/* -----------------22.07.2003 10:33-----------------
--------------------------------------------------*/
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index e42b825e9868..d6fa0ec1fdf3 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -70,26 +70,6 @@ struct GeneralTabPage_Impl
// -----------------------------------------------------------------------
-// kommt aus adritem.cxx
-//CHINA001 extern String ConvertToStore_Impl( const String& );
-//copy from adritem.cxx, since it will leave in svx.
-String ConvertToStore_Impl( const String& rText )
-{
- String sRet;
- USHORT i = 0;
-
- while ( i < rText.Len() )
- {
- if ( rText.GetChar(i) == '\\' || rText.GetChar(i) == '#' )
- sRet += '\\';
- sRet += rText.GetChar(i++);
- }
- return sRet;
-}
-
-
-// -----------------------------------------------------------------------
-
SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSet ) :
SfxTabPage( pParent, CUI_RES(RID_SFXPAGE_GENERAL), rCoreSet ),
diff --git a/cui/source/options/optimprove.cxx b/cui/source/options/optimprove.cxx
index 32aa6a6a3280..b1eb055e9b1a 100644
--- a/cui/source/options/optimprove.cxx
+++ b/cui/source/options/optimprove.cxx
@@ -197,31 +197,3 @@ IMPL_LINK( SvxImprovementDialog, HandleOK, OKButton*, EMPTYARG )
EndDialog( RET_OK );
return 0;
}
-
-// class SvxInfoWindow ---------------------------------------------------
-
-SvxInfoWindow::SvxInfoWindow( Window* pParent, const ResId& rResId ) :
- Window( pParent, rResId ),
- m_aInfoText( this )
-{
- m_aInfoText.SetPosSizePixel( Point( 10, 10 ), Size( 150, 10 ) );
-
- const StyleSettings& rSettings = GetSettings().GetStyleSettings();
- Wallpaper aWall( rSettings.GetWindowColor() );
- SetBackground( aWall );
- Font aNewFont( m_aInfoText.GetFont() );
- aNewFont.SetTransparent( TRUE );
- m_aInfoText.SetFont( aNewFont );
- m_aInfoText.SetBackground( aWall );
- m_aInfoText.SetControlForeground( rSettings.GetWindowTextColor() );
-}
-
-void SvxInfoWindow::SetInfoText( const String& rText )
-{
- m_aInfoText.SetText( rText );
- Size aSize = m_aInfoText.CalcMinimumSize();
- Size aWinSize = GetSizePixel();
- Point aPos( ( aWinSize.Width() - aSize.Width() ) / 2, ( aWinSize.Height() - aSize.Height() ) / 2 );
- m_aInfoText.SetPosSizePixel( aPos, aSize );
-}
-
diff --git a/cui/source/options/optimprove2.cxx b/cui/source/options/optimprove2.cxx
index 29ef718a6c74..0078c0e77551 100644
--- a/cui/source/options/optimprove2.cxx
+++ b/cui/source/options/optimprove2.cxx
@@ -61,16 +61,6 @@ namespace uno = ::com::sun::star::uno;
namespace util = ::com::sun::star::util;
using namespace com::sun::star::system;
-// class SvxEmptyPage ----------------------------------------------------
-
-SvxEmptyPage::SvxEmptyPage( Window* pParent ) :
-
- TabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ) )
-
-{
- FreeResource();
-}
-
// class SvxImprovementOptionsPage ---------------------------------------
SvxImprovementOptionsPage::SvxImprovementOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
@@ -164,11 +154,6 @@ SfxTabPage* SvxImprovementOptionsPage::Create( Window* pParent, const SfxItemSet
return new SvxImprovementOptionsPage( pParent, rSet );
}
-sal_uInt16* SvxImprovementOptionsPage::GetRanges()
-{
- return NULL;
-}
-
sal_Bool SvxImprovementOptionsPage::FillItemSet( SfxItemSet& /*rSet*/ )
{
uno::Reference< lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index b360a5cedfde..c8fa0b9b5f48 100755..100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -136,47 +136,6 @@ const char* SEARCHENGINE_GROUP = "SearchEngines-$(vlang)";
// -----------------------------------------------------------------------
-String lcl_MakeTabEntry(const SfxFilter* pFilter)
-{
- String sEntry(pFilter->GetMimeType());
- sEntry += '\t';
- sEntry += pFilter->GetWildcard().GetWildCard();
- sEntry += '\t';
- sEntry += pFilter->GetName();
-#if defined(OS2)
- sEntry += '\t';
- sEntry += pFilter->GetTypeName();
-#endif
- return sEntry;
-}
-
-// -----------------------------------------------------------------------
-
-BOOL IsJavaInstalled_Impl( /*!!!SfxIniManager* pIniMgr*/ )
-{
- BOOL bRet = FALSE;
-/*!!! (pb) needs new implementation
- String aIniEntry;
- String aFullName = Config::GetConfigName( pIniMgr->Get( SFX_KEY_USERCONFIG_PATH ),
- String::CreateFromAscii("java") );
- INetURLObject aIniFileObj( aFullName, INET_PROT_FILE );
- String aIniPath = aIniFileObj.getName();
- if ( pIniMgr->SearchFile( aIniPath ) )
- {
- Config aJavaCfg( aIniPath );
- aJavaCfg.SetGroup( "Java" );
- ByteString sTemp = aJavaCfg.ReadKey( ByteString(::rtl::OUStringToOString(pIniMgr->GetKeyName( SFX_KEY_JAVA_SYSTEMCLASSPATH ),RTL_TEXTENCODING_UTF8)) );
- String aJavaSystemClassPath = ::rtl::OStringToOUString(sTemp,RTL_TEXTENCODING_UTF8);
- String aJavaRuntimeLib = ::rtl::OStringToOUString(aJavaCfg.ReadKey( "RuntimeLib" ),RTL_TEXTENCODING_UTF8);
- if ( aJavaSystemClassPath.Len() && aJavaRuntimeLib.Len() )
- bRet = TRUE;
- }
-*/
- return bRet;
-}
-
-// -----------------------------------------------------------------------
-
void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent )
{
if ( bOnlyNumeric )
@@ -1130,146 +1089,6 @@ IMPL_LINK( SvxSearchTabPage, SearchPartHdl_Impl, RadioButton *, EMPTYARG )
return 0;
}
-// -----------------------------------------------------------------------
-
-/********************************************************************/
-/********************************************************************/
-/* */
-/* SvxOtherTabPage */
-/* */
-/********************************************************************/
-/********************************************************************/
-
-/*-----------------15.05.97 09:51-------------------
-
---------------------------------------------------*/
-/*
-SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) :
-
- PatternField( pParent, rResId ),
-
- sMsg233 ( ResId( ST_MSG_233 ) ),
- sMsg255 ( ResId( ST_MSG_255 ) )
-
-{
- FreeResource();
- SelectFixedFont();
-} */
-
-/*-----------------15.05.97 09:51-------------------
-
---------------------------------------------------*/
-
-/*void SvxPatternField::KeyInput( const KeyEvent& rKEvt )
-{
- PatternField::KeyInput( rKEvt );
- BOOL bDelete = ( rKEvt.GetKeyCode().GetCode() == KEY_DELETE );
- String sEntry( GetText() );
- sEntry[(USHORT)3] = '.';
- sEntry[(USHORT)7] = '.';
- sEntry[(USHORT)11] = '.';
- Selection aSelection( GetSelection() );
- String sPart( sEntry.GetToken( 0, '.' ) );
- USHORT i, nPart( sPart.EraseLeadingChars() );
- BOOL bSet = FALSE;
-
- if ( sPart.Len() && ( !nPart || nPart > 255 ) )
- {
- // der erste Part darf nicht 0 und nicht gr"osser 255 sein
- String sMsg( sPart );
- sMsg += ' ';
- sMsg += sMsg233;
- InfoBox( this, sMsg ).Execute();
-
- if ( nPart == 0 )
- sPart = " 1";
- else
- sPart = "255";
- sEntry.SetToken( 0, '.', sPart );
- bSet = TRUE;
- };
-
- for ( i = 1; i < 4; i++ )
- {
- // die anderen Parts d"urfen nicht gr"osser 255 sein
- sPart = sEntry.GetToken( i, '.' );
- nPart = sPart.EraseLeadingChars();
-
- if ( nPart > 255 )
- {
- String sMsg( sPart );
- sMsg += ' ';
- sMsg += sMsg255;
- InfoBox( this, sMsg ).Execute();
-
- if ( nPart == 0 )
- sPart = " 1";
- else
- sPart = "255";
- sEntry.SetToken( i, '.', sPart );
- bSet = TRUE;
- };
- }
-
- if ( bSet )
- {
- SetText( sEntry );
- SetSelection( aSelection );
- }
-}
-*/
-// -----------------------------------------------------------------------
-#if 0
-long SvxPatternField::Notify( NotifyEvent& rNEvt )
-{
- return PatternField::Notify( rNEvt );
-/*! long nHandled = 0;
-
- if ( rNEvt.GetType() == EVENT_KEYUP )
- {
- const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
- KeyInput( *pKEvt );
- nHandled = 1;
- }
- return nHandled;*/
-}
-#endif
-
-// class JavaScriptDisableQueryBox_Impl --------------------------------------
-
-class JavaScriptDisableQueryBox_Impl : public ModalDialog
-{
-private:
- FixedImage aImage;
- FixedText aWarningFT;
- CheckBox aDisableCB;
- OKButton aYesBtn;
- CancelButton aNoBtn;
-
-public:
- JavaScriptDisableQueryBox_Impl( Window* pParent );
-
- BOOL IsWarningDisabled() const { return aDisableCB.IsChecked(); }
-};
-
-JavaScriptDisableQueryBox_Impl::JavaScriptDisableQueryBox_Impl( Window* pParent ) :
-
- ModalDialog( pParent, CUI_RES( RID_SVXDLG_OPT_JAVASCRIPT_DISABLE ) ),
-
- aImage ( this, CUI_RES( IMG_JSCPT_WARNING ) ),
- aWarningFT ( this, CUI_RES( FT_JSCPT_WARNING ) ),
- aDisableCB ( this, CUI_RES( CB_JSCPT_DISABLE ) ),
- aYesBtn ( this, CUI_RES( BTN_JSCPT_YES ) ),
- aNoBtn ( this, CUI_RES( BTN_JSCPT_NO ) )
-
-{
- FreeResource();
-
- aYesBtn.SetText( Button::GetStandardText( BUTTON_YES ) );
- aNoBtn.SetText( Button::GetStandardText( BUTTON_NO ) );
- aImage.SetImage( WarningBox::GetStandardImage() );
-}
-
//#98647#----------------------------------------------
void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt )
{ // try to show tips just like as on toolbars
@@ -1645,25 +1464,6 @@ int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet )
namespace
{
-/* bool Enable( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, Control& _rCtrl, FixedImage& _rImg )
- {
- bool b = _rOpt.IsOptionEnabled( _eOpt );
- _rCtrl.Enable( b );
- _Img.Show( !b );
- return b;
- }
-*/
- bool EnableAndSet( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt,
- CheckBox& _rCtrl, FixedImage& _rImg )
- {
-// bool b = Enable( _rOpt, _eOpt, _rCtrl, _rImg );
- bool b = _rOpt.IsOptionEnabled( _eOpt );
- _rCtrl.Enable( b );
- _rImg.Show( !b );
- _rCtrl.Check( _rOpt.IsOptionSet( _eOpt ) );
- return b;
- }
-
bool CheckAndSave( SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, const bool _bIsChecked, bool& _rModfied )
{
bool bModified = false;
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 31a40f2cd221..2a043f6846a7 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -65,56 +65,6 @@ using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
-// class SvxJavaTable ----------------------------------------------------
-
-SvxJavaTable::SvxJavaTable( Window* _pParent, const ResId& _rId ) :
-
- SvxSimpleTable( _pParent, _rId )
-
-{
-}
-
-SvxJavaTable::~SvxJavaTable()
-{
-}
-
-void SvxJavaTable::SetTabs()
-{
- SvxSimpleTable::SetTabs();
-/*
- USHORT nAdjust = SV_LBOXTAB_ADJUST_RIGHT | SV_LBOXTAB_ADJUST_LEFT |
- SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_ADJUST_NUMERIC | SV_LBOXTAB_FORCE;
- if ( aTabs.Count() > 0 )
- {
- SvLBoxTab* pTab = (SvLBoxTab*)aTabs.GetObject(0);
- pTab->nFlags &= ~nAdjust;
- pTab->nFlags |= SV_LBOXTAB_PUSHABLE | SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_FORCE;
- }
-*/
-}
-
-void SvxJavaTable::MouseButtonUp( const MouseEvent& _rMEvt )
-{
- m_aCurMousePoint = _rMEvt.GetPosPixel();
- SvxSimpleTable::MouseButtonUp( _rMEvt );
-}
-
-void SvxJavaTable::KeyInput( const KeyEvent& rKEvt )
-{
- if ( !rKEvt.GetKeyCode().GetModifier() && KEY_SPACE == rKEvt.GetKeyCode().GetCode() )
- {
- SvLBoxEntry* pEntry = FirstSelected();
- if ( GetCheckButtonState( pEntry ) == SV_BUTTON_UNCHECKED )
- {
- SetCheckButtonState( pEntry, SV_BUTTON_CHECKED );
- GetCheckButtonHdl().Call( NULL );
- return ;
- }
- }
-
- SvxSimpleTable::KeyInput( rKEvt );
-}
-
// -----------------------------------------------------------------------
bool areListsEqual( const Sequence< ::rtl::OUString >& rListA, const Sequence< ::rtl::OUString >& rListB )
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 4bbd56906708..09eeb4ad9896 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -47,27 +47,6 @@ typedef struct _JavaInfo JavaInfo;
class SvxJavaParameterDlg;
class SvxJavaClassPathDlg;
-// class SvxJavaTable ----------------------------------------------------
-
-class SvxJavaTable : public SvxSimpleTable
-{
- using SvxSimpleTable::SetTabs;
-private:
- Point m_aCurMousePoint;
-
-protected:
- virtual void SetTabs();
- virtual void MouseButtonUp( const MouseEvent& _rMEvt );
- virtual void KeyInput( const KeyEvent& rKEvt );
-
-public:
- SvxJavaTable( Window* _pParent, const ResId& _rId );
- ~SvxJavaTable();
-
-
- inline Point GetCurMousePoint() { return m_aCurMousePoint; }
-};
-
// class SvxJavaOptionsPage ----------------------------------------------
class SvxJavaOptionsPage : public SfxTabPage
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 70ef2d682941..d9849050247e 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -78,37 +78,6 @@ using rtl::OUString;
#define WININDEX_AUTOSAVE ((USHORT)6)
#define WININDEX_SAVEURL_RELFSYS ((USHORT)9)
-// -------------------- --------------------------------------------------
-class FilterWarningDialog_Impl : public ModalDialog
-{
- OKButton aOk;
- CancelButton aCancel;
- FixedImage aImage;
- FixedInfo aFilterWarningFT;
-
- public:
- FilterWarningDialog_Impl(Window* pParent);
-
- void SetFilterName(const String& rFilterUIName);
-};
-// ----------------------------------------------------------------------
-FilterWarningDialog_Impl::FilterWarningDialog_Impl(Window* pParent) :
- ModalDialog(pParent, CUI_RES( RID_SVXDLG_FILTER_WARNING ) ),
- aOk( this, CUI_RES(PB_OK )),
- aCancel( this, CUI_RES(PB_CANCEL )),
- aImage( this, CUI_RES(IMG_WARNING )),
- aFilterWarningFT( this, CUI_RES(FT_FILTER_WARNING ))
-{
- FreeResource();
- aImage.SetImage(WarningBox::GetStandardImage());
-}
-// ----------------------------------------------------------------------
-void FilterWarningDialog_Impl::SetFilterName(const String& rFilterUIName)
-{
- String sTmp(aFilterWarningFT.GetText());
- sTmp.SearchAndReplaceAscii("%1", rFilterUIName);
- aFilterWarningFT.SetText(sTmp);
-}
// ----------------------------------------------------------------------
#ifdef FILTER_WARNING_ENABLED
class SvxAlienFilterWarningConfig_Impl : public utl::ConfigItem
@@ -324,23 +293,6 @@ SfxTabPage* SfxSaveTabPage::Create( Window* pParent,
return ( new SfxSaveTabPage( pParent, rAttrSet ) );
}
-/* -----------------------------05.04.01 13:10--------------------------------
-
- ---------------------------------------------------------------------------*/
-OUString lcl_ExtractUIName(const Sequence<PropertyValue> rProperties)
-{
- OUString sRet;
- const PropertyValue* pProperties = rProperties.getConstArray();
- for(int nProp = 0; nProp < rProperties.getLength(); nProp++)
- {
- if(!pProperties[nProp].Name.compareToAscii("UIName"))
- {
- pProperties[nProp].Value >>= sRet;
- break;
- }
- }
- return sRet;
-}
// -----------------------------------------------------------------------
bool SfxSaveTabPage::AcceptFilter( USHORT nPos )
{
diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx
index 7613978bee32..0408c5ecabe3 100644
--- a/cui/source/options/sdbcdriverenum.cxx
+++ b/cui/source/options/sdbcdriverenum.cxx
@@ -115,13 +115,6 @@ namespace offapp
{
return m_pImpl->getDriverImplNames().end();
}
-
- //--------------------------------------------------------------------
- sal_Int32 ODriverEnumeration::size() const throw()
- {
- return m_pImpl->getDriverImplNames().size();
- }
-
//........................................................................
} // namespace offapp
//........................................................................
diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx
index b1dd5651cf35..4c5471f2280d 100644
--- a/cui/source/options/sdbcdriverenum.hxx
+++ b/cui/source/options/sdbcdriverenum.hxx
@@ -64,7 +64,6 @@ namespace offapp
const_iterator begin() const throw();
const_iterator end() const throw();
- sal_Int32 size() const throw();
};
//........................................................................
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 880f8d263c6b..581ab33ad467 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -40,6 +40,7 @@
#include <com/sun/star/frame/XLoadable.hpp>
#include <tools/rcid.h>
#include <tools/shl.hxx>
+#include <tools/urlobj.hxx>
#include <comphelper/processfactory.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -2709,22 +2710,6 @@ short OfaTreeOptionsDialog::Execute()
// class ExtensionsTabPage -----------------------------------------------
ExtensionsTabPage::ExtensionsTabPage(
- Window* pParent, const ResId& rResId, const rtl::OUString& rPageURL,
- const rtl::OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) :
-
- TabPage( pParent, rResId ),
-
- m_sPageURL ( rPageURL ),
- m_sEventHdl ( rEvtHdl ),
- m_xWinProvider