[Libreoffice-commits] .: Branch 'feature/gnumake4' - 154 commits - .gitignore qadevOOo/build.xml qadevOOo/JunitTest_qadevOOo_unoapi.mk qadevOOo/Makefile qadevOOo/makefile.mk qadevOOo/Module_qadevOOo.mk qadevOOo/prj qadevOOo/qa qadevOOo/runner qadevOOo/testdocs qadevOOo/tests smoketestdoc/com smoketestdoc/data smoketestdoc/prj smoketestoo_native/makefile.mk smoketestoo_native/prj smoketestoo_native/smoketest.cxx testautomation/chart2 testautomation/dbaccess testautomation/extensions testautomation/framework testautomation/global testautomation/graphics testautomation/math testautomation/prj testautomation/spreadsheet testautomation/writer testautomation/xml testgraphical/prechecks testgraphical/prj testgraphical/source testgraphical/ui test/inc test/prj test/source testtools/com testtools/inc testtools/prj testtools/source
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Mon Jun 20 01:23:28 PDT 2011
.gitignore | 18
dev/null |binary
qadevOOo/JunitTest_qadevOOo_unoapi.mk | 49
qadevOOo/Makefile | 38
qadevOOo/Module_qadevOOo.mk | 34
qadevOOo/build.xml | 4
qadevOOo/makefile.mk | 2
qadevOOo/prj/build.lst | 2
qadevOOo/prj/d.lst | 2
qadevOOo/qa/complex/junitskeleton/Skeleton.java | 6
qadevOOo/qa/complex/junitskeleton/TestDocument.java | 2
qadevOOo/runner/basicrunner/makefile.mk | 2
qadevOOo/runner/convwatch/BuildID.java | 2
qadevOOo/runner/convwatch/ReportDesignerTest.java | 2
qadevOOo/runner/graphical/BuildID.java | 2
qadevOOo/runner/graphical/IniFile.java | 2
qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java | 2
qadevOOo/runner/helper/ProcessHandler.java | 2
qadevOOo/runner/helper/URLHelper.java | 3
qadevOOo/runner/lib/MultiPropertyTest.java | 2
qadevOOo/runner/share/DescEntry.java | 2
qadevOOo/runner/stats/SQLExecution.java | 10
qadevOOo/runner/util/RegistryTools.java | 2
qadevOOo/runner/util/ValueChanger.java | 4
qadevOOo/runner/util/ValueComparer.java | 2
qadevOOo/runner/util/XMLTools.java | 2
qadevOOo/runner/util/dbg.java | 2
qadevOOo/runner/util/utils.java | 2
qadevOOo/testdocs/StrikeThrough.odt |binary
qadevOOo/testdocs/ttt.sda |binary
qadevOOo/testdocs/ttt.sdc |binary
qadevOOo/testdocs/ttt.sdd |binary
qadevOOo/testdocs/ttt.sdw |binary
qadevOOo/tests/basic/ifc/beans/XPropertyState/beans_XPropertyState.xba | 2
qadevOOo/tests/basic/ifc/io/XMarkableStream/io_XMarkableStream.xba | 4
qadevOOo/tests/basic/ifc/sdbc/XCloseable/sdbc_XCloseable.xba | 2
qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java | 6
qadevOOo/tests/java/ifc/awt/_XButton.java | 4
qadevOOo/tests/java/ifc/awt/_XComboBox.java | 2
qadevOOo/tests/java/ifc/awt/_XCurrencyField.java | 16
qadevOOo/tests/java/ifc/awt/_XDateField.java | 16
qadevOOo/tests/java/ifc/awt/_XDialog.java | 2
qadevOOo/tests/java/ifc/awt/_XFixedText.java | 4
qadevOOo/tests/java/ifc/awt/_XImageConsumer.java | 10
qadevOOo/tests/java/ifc/awt/_XImageProducer.java | 4
qadevOOo/tests/java/ifc/awt/_XListBox.java | 12
qadevOOo/tests/java/ifc/awt/_XNumericField.java | 16
qadevOOo/tests/java/ifc/awt/_XPatternField.java | 6
qadevOOo/tests/java/ifc/awt/_XRadioButton.java | 4
qadevOOo/tests/java/ifc/awt/_XSpinField.java | 4
qadevOOo/tests/java/ifc/awt/_XTimeField.java | 14
qadevOOo/tests/java/ifc/awt/_XToolkit.java | 4
qadevOOo/tests/java/ifc/awt/_XTopWindow.java | 2
qadevOOo/tests/java/ifc/awt/_XWindow.java | 4
qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java | 12
qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java | 12
qadevOOo/tests/java/ifc/beans/_XPropertySet.java | 50
qadevOOo/tests/java/ifc/beans/_XPropertyState.java | 12
qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java | 4
qadevOOo/tests/java/ifc/connection/_XAcceptor.java | 8
qadevOOo/tests/java/ifc/connection/_XConnector.java | 6
qadevOOo/tests/java/ifc/container/_XChild.java | 2
qadevOOo/tests/java/ifc/container/_XContainer.java | 8
qadevOOo/tests/java/ifc/container/_XContainerQuery.java | 8
qadevOOo/tests/java/ifc/container/_XContentEnumerationAccess.java | 2
qadevOOo/tests/java/ifc/container/_XEnumeration.java | 2
qadevOOo/tests/java/ifc/datatransfer/_XMimeContentTypeFactory.java | 2
qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardEx.java | 2
qadevOOo/tests/java/ifc/datatransfer/clipboard/_XFlushableClipboard.java | 2
qadevOOo/tests/java/ifc/document/_LinkTarget.java | 2
qadevOOo/tests/java/ifc/document/_XActionLockable.java | 8
qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java | 4
qadevOOo/tests/java/ifc/document/_XExporter.java | 2
qadevOOo/tests/java/ifc/document/_XFilter.java | 4
qadevOOo/tests/java/ifc/document/_XImporter.java | 2
qadevOOo/tests/java/ifc/document/_XStandaloneDocumentInfo.java | 4
qadevOOo/tests/java/ifc/drawing/_GenericDrawPage.java | 8
qadevOOo/tests/java/ifc/drawing/_LineShapeDescriptor.java | 2
qadevOOo/tests/java/ifc/drawing/_ShapeDescriptor.java | 4
qadevOOo/tests/java/ifc/drawing/_Text.java | 2
qadevOOo/tests/java/ifc/drawing/_XDrawPageDuplicator.java | 6
qadevOOo/tests/java/ifc/drawing/_XDrawView.java | 6
qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java | 2
qadevOOo/tests/java/ifc/form/_XFormController.java | 2
qadevOOo/tests/java/ifc/form/_XGrid.java | 2
qadevOOo/tests/java/ifc/form/_XGridColumnFactory.java | 2
qadevOOo/tests/java/ifc/form/_XGridFieldDataSupplier.java | 4
qadevOOo/tests/java/ifc/form/_XLoadable.java | 2
qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java | 2
qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java | 6
qadevOOo/tests/java/ifc/frame/_XComponentLoader.java | 4
qadevOOo/tests/java/ifc/frame/_XDispatch.java | 2
qadevOOo/tests/java/ifc/frame/_XDocumentTemplates.java | 6
qadevOOo/tests/java/ifc/frame/_XFramesSupplier.java | 12
qadevOOo/tests/java/ifc/frame/_XModel.java | 2
qadevOOo/tests/java/ifc/frame/_XStorable.java | 2
qadevOOo/tests/java/ifc/inspection/_XObjectInspector.java | 2
qadevOOo/tests/java/ifc/io/_XActiveDataControl.java | 2
qadevOOo/tests/java/ifc/io/_XActiveDataSink.java | 2
qadevOOo/tests/java/ifc/io/_XPersistObject.java | 4
qadevOOo/tests/java/ifc/lang/_XInitialization.java | 8
qadevOOo/tests/java/ifc/lang/_XMain.java | 2
qadevOOo/tests/java/ifc/lang/_XMultiComponentFactory.java | 6
qadevOOo/tests/java/ifc/lang/_XMultiServiceFactory.java | 4
qadevOOo/tests/java/ifc/lang/_XServiceInfo.java | 4
qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java | 4
qadevOOo/tests/java/ifc/lang/_XTypeProvider.java | 2
qadevOOo/tests/java/ifc/sdb/_XCompletedConnection.java | 2
qadevOOo/tests/java/ifc/sdbc/_XCloseable.java | 6
qadevOOo/tests/java/ifc/sdbc/_XColumnLocate.java | 2
qadevOOo/tests/java/ifc/sdbc/_XIsolatedConnection.java | 4
qadevOOo/tests/java/ifc/sdbc/_XParameters.java | 36
qadevOOo/tests/java/ifc/sdbc/_XResultSet.java | 40
qadevOOo/tests/java/ifc/sdbc/_XRow.java | 38
qadevOOo/tests/java/ifc/sdbc/_XRowSet.java | 2
qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java | 4
qadevOOo/tests/java/ifc/sdbcx/_XRowLocate.java | 16
qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor.java | 2
qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java | 4
qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java | 2
qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java | 4
qadevOOo/tests/java/ifc/sheet/_XDatabaseRanges.java | 4
qadevOOo/tests/java/ifc/sheet/_XNamedRanges.java | 2
qadevOOo/tests/java/ifc/sheet/_XSheetOperation.java | 4
qadevOOo/tests/java/ifc/sheet/_XSpreadsheets.java | 4
qadevOOo/tests/java/ifc/style/_CharacterProperties.java | 8
qadevOOo/tests/java/ifc/style/_ParagraphProperties.java | 8
qadevOOo/tests/java/ifc/style/_XStyle.java | 2
qadevOOo/tests/java/ifc/table/_XAutoFormattable.java | 2
qadevOOo/tests/java/ifc/text/_BaseIndex.java | 10
qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java | 12
qadevOOo/tests/java/ifc/text/_XDefaultNumberingProvider.java | 4
qadevOOo/tests/java/ifc/text/_XRelativeTextContentInsert.java | 8
qadevOOo/tests/java/ifc/text/_XText.java | 6
qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java | 10
qadevOOo/tests/java/ifc/ucb/_XDataContainer.java | 6
qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java | 32
qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java | 4
qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java | 2
qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java | 6
qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java | 6
qadevOOo/tests/java/ifc/ui/dialogs/_XFilterManager.java | 2
qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java | 2
qadevOOo/tests/java/ifc/uno/_XComponentContext.java | 2
qadevOOo/tests/java/ifc/util/_XCancellable.java | 2
qadevOOo/tests/java/ifc/util/_XChangesNotifier.java | 10
qadevOOo/tests/java/ifc/util/_XCloneable.java | 2
qadevOOo/tests/java/ifc/util/_XFlushable.java | 2
qadevOOo/tests/java/ifc/util/_XModeSelector.java | 8
qadevOOo/tests/java/ifc/util/_XModifyBroadcaster.java | 4
qadevOOo/tests/java/ifc/util/_XSearchable.java | 2
qadevOOo/tests/java/ifc/util/_XTextSearch.java | 2
qadevOOo/tests/java/ifc/view/_XControlAccess.java | 6
qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java | 6
qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java | 20
qadevOOo/tests/java/mod/_defreg/NestedRegistry.java | 4
qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java | 4
qadevOOo/tests/java/mod/_remotebridge.uno/various.java | 4
qadevOOo/tests/java/mod/_remotebridge/various.java | 4
qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java | 8
qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java | 6
qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java | 2
qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java | 8
qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java | 8
qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java | 8
qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java | 6
qadevOOo/tests/java/mod/_sc/ScCellsObj.java | 6
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java | 6
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java | 8
qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java | 6
qadevOOo/tests/java/mod/_sc/XMLContentExporter.java | 4
qadevOOo/tests/java/mod/_sc/XMLExporter.java | 4
qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java | 4
qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java | 2
qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java | 4
qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java | 2
qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java | 4
qadevOOo/tests/java/mod/_simplereg.uno/SimpleRegistry.java | 2
qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java | 2
qadevOOo/tests/java/mod/_sm/XMLExporter.java | 4
qadevOOo/tests/java/mod/_sm/XMLImporter.java | 2
qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java | 4
qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java | 2
qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java | 4
qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java | 2
qadevOOo/tests/java/mod/_sw/CharacterStyle.java | 6
qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java | 8
qadevOOo/tests/java/mod/_sw/PageStyle.java | 8
qadevOOo/tests/java/mod/_sw/ParagraphStyle.java | 8
qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java | 14
qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java | 2
qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java | 14
qadevOOo/tests/java/mod/_sw/SwXParagraph.java | 16
qadevOOo/tests/java/mod/_sw/SwXStyle.java | 8
qadevOOo/tests/java/mod/_sw/SwXTextColumns.java | 16
qadevOOo/tests/java/mod/_sw/XMLContentExporter.java | 4
qadevOOo/tests/java/mod/_sw/XMLExporter.java | 4
qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java | 4
qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java | 2
qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java | 4
qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java | 4
qadevOOo/tests/java/mod/_sw/XMLStylesImporter.java | 2
qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java | 2
qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java | 2
qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java | 4
qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java | 4
smoketestdoc/com/sun/star/comp/smoketest/TestExtension.idl | 14
smoketestdoc/com/sun/star/comp/smoketest/makefile.mk | 1
smoketestdoc/com/sun/star/comp/smoketest/manifest.xml | 3
smoketestdoc/data/Global.xml | 36
smoketestdoc/data/OptionsDlg.xml | 2
smoketestdoc/data/Test_10er.xml | 69
smoketestdoc/data/Test_DB.xml | 2
smoketestdoc/data/content.xml | 2
smoketestdoc/prj/d.lst | 6
smoketestoo_native/makefile.mk | 22
smoketestoo_native/smoketest.cxx | 7
test/inc/pch/precompiled_test.cxx | 3
test/inc/pch/precompiled_test.hxx | 3
test/inc/test/detail/testdllapi.hxx | 3
test/inc/test/officeconnection.hxx | 3
test/inc/test/oustringostreaminserter.hxx | 3
test/inc/test/toabsolutefileurl.hxx | 3
test/prj/build.lst | 2
test/prj/d.lst | 34
test/source/cpp/getargument.cxx | 3
test/source/cpp/makefile.mk | 9
test/source/cpp/officeconnection.cxx | 27
test/source/cpp/toabsolutefileurl.cxx | 3
test/source/cpp/unoexceptionprotector/makefile.mk | 9
test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx | 2
test/source/java/org/openoffice/test/OfficeConnection.java | 22
test/source/java/org/openoffice/test/UnoApiTest.java | 52
test/source/java/org/openoffice/test/makefile.mk | 6
testautomation/chart2/tools/ch_tools_axes.inc | 2
testautomation/chart2/tools/ch_tools_chart_type.inc | 2
testautomation/chart2/tools/ch_tools_data_labels.inc | 2
testautomation/chart2/tools/ch_tools_grids.inc | 2
testautomation/chart2/tools/ch_tools_legend.inc | 2
testautomation/chart2/tools/ch_tools_statistics.inc | 2
testautomation/chart2/tools/ch_tools_tab_borders_lines.inc | 2
testautomation/chart2/tools/ch_tools_tab_pages.inc | 2
testautomation/chart2/tools/ch_tools_titles.inc | 2
testautomation/dbaccess/tools/querytools.inc | 11
testautomation/dbaccess/tools/tabletools.inc | 9
testautomation/framework/optional/includes/extras_modify_objects.inc | 2
testautomation/framework/optional/includes/extras_preview.inc | 2
testautomation/framework/optional/includes/options_asia.inc | 641 ----
testautomation/framework/optional/includes/options_data.inc | 192 -
testautomation/framework/optional/includes/options_int1.inc | 286 -
testautomation/framework/optional/includes/options_lan1.inc | 894 -----
testautomation/framework/optional/input/menu/en-us_calc.txt | 2
testautomation/framework/optional/input/menu/en-us_draw.txt | 4
testautomation/framework/optional/input/menu/en-us_htmldokument.txt | 2
testautomation/framework/optional/input/menu/en-us_impress.txt | 4
testautomation/framework/optional/input/menu/en-us_masterdoc.txt | 2
testautomation/framework/optional/input/menu/en-us_writer.txt | 2
testautomation/global/input/xml_filter/word.xml | 3
testautomation/global/sid/e_all.sid | 2
testautomation/global/system/includes/iniinfo.inc | 18
testautomation/global/system/includes/master.inc | 106
testautomation/global/system/includes/sysinfo.inc | 10
testautomation/global/tools/includes/optional/t_security_tools.inc | 13
testautomation/global/tools/includes/optional/t_set_standard_controls.inc | 2
testautomation/global/tools/includes/optional/t_toolbar_writer.inc | 4
testautomation/global/tools/includes/required/t_tools2.inc | 2
testautomation/global/win/bars.win | 4
testautomation/global/win/edia_d_h.win | 2
testautomation/graphics/optional/includes/global/export_graphic_2.inc | 32
testautomation/graphics/optional/includes/global/g_mediaplayer.inc | 55
testautomation/graphics/optional/includes/impress/i_slideshow2.inc | 6
testautomation/graphics/optional/includes/impress/i_slideshow3.inc | 2
testautomation/graphics/required/includes/global/id_005.inc | 12
testautomation/graphics/required/includes/global/id_opt_1.inc | 11
testautomation/prj/d.lst | 4
testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc | 6
testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc | 2
testautomation/writer/optional/includes/stylist/w_stylist.inc | 2
testautomation/writer/optional/includes/undo/w_undo_history_1.inc | 4
testautomation/writer/optional/input/filter/lib/old/hwpreadermi.dll | 1557 ----------
testautomation/writer/optional/input/filter/lib/old/jsreadermi.dll | 130
testautomation/writer/optional/input/filter/lib/wps2star.dll | 159 -
testautomation/writer/optional/input/filter/regcomp/regcompli | 16
testautomation/writer/optional/input/filter/regcomp/regcompsi | 25
testautomation/writer/optional/input/filter/regcomp/regcompss | 57
testautomation/writer/optional/w_autocorrection.bas | 6
testautomation/writer/tools/includes/w_tools_undo.inc | 2
testautomation/xml/optional/includes/sxw7_03.inc | 8
testgraphical/prechecks/makefile.mk | 2
testgraphical/source/CallExternals.pm | 2
testgraphical/source/fill_documents_loop.pl | 2
testgraphical/ui/java/ConvwatchGUIProject/src/IniFile.java | 2
testtools/com/sun/star/comp/bridge/TestComponent.java | 19
testtools/com/sun/star/comp/bridge/makefile.mk | 13
testtools/inc/pch/precompiled_testtools.cxx | 2
testtools/inc/pch/precompiled_testtools.hxx | 2
testtools/prj/build.lst | 2
testtools/source/bridgetest/bridgetest.cxx | 63
testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx | 122
testtools/source/bridgetest/cli/cli_cs_bridgetest.cs | 2
testtools/source/bridgetest/cli/cli_cs_testobj.cs | 17
testtools/source/bridgetest/cli/cli_vb_bridgetest.vb | 2
testtools/source/bridgetest/constructors.cxx | 7
testtools/source/bridgetest/cppobj.cxx | 18
testtools/source/bridgetest/currentcontextchecker.cxx | 3
testtools/source/bridgetest/currentcontextchecker.hxx | 5
testtools/source/bridgetest/idl/bridgetest.idl | 49
testtools/source/bridgetest/idl/makefile.mk | 8
testtools/source/bridgetest/makefile.mk | 14
testtools/source/bridgetest/multi.cxx | 52
testtools/source/bridgetest/multi.hxx | 13
testtools/source/bridgetest/pyuno/makefile.mk | 13
testtools/source/cliversioning/makefile.mk | 13
testtools/source/cliversioning/old_version_libs_v2/readme.txt | 3
testtools/source/performance/pseudo.cxx | 8
testtools/source/performance/ubobject.cxx | 12
testtools/source/performance/ubtest.cxx | 18
335 files changed, 1420 insertions(+), 5068 deletions(-)
New commits:
commit dd333eccf81cebfce77a47a95f9b4a3d78fd1a38
Merge: 5dee0f0... 5b5d30e...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Jun 20 09:36:26 2011 +0200
Merge branch 'master' into feature/gnumake4
commit 5b5d30e9f6fa99d2b0c168b3cb0fa00ef3d00cc7
Author: Tor Lillqvist <tml at iki.fi>
Date: Sun Jun 12 19:25:58 2011 +0300
Bypass when cross-compiling, at least for now
diff --git a/test/source/cpp/makefile.mk b/test/source/cpp/makefile.mk
index cae88e0..62a6e2c 100644
--- a/test/source/cpp/makefile.mk
+++ b/test/source/cpp/makefile.mk
@@ -32,6 +32,12 @@ VISIBILITY_HIDDEN = TRUE
.INCLUDE: settings.mk
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
+
+# --- Files --------------------------------------------------------
CDEFS += -DOOO_DLLIMPLEMENTATION_TEST
CFLAGSCXX += $(CPPUNIT_CFLAGS)
diff --git a/test/source/cpp/unoexceptionprotector/makefile.mk b/test/source/cpp/unoexceptionprotector/makefile.mk
index 86c8bc6..d3d13e6 100644
--- a/test/source/cpp/unoexceptionprotector/makefile.mk
+++ b/test/source/cpp/unoexceptionprotector/makefile.mk
@@ -32,6 +32,12 @@ VISIBILITY_HIDDEN = TRUE
.INCLUDE: settings.mk
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
+
+# --- Files --------------------------------------------------------
DLLPRE =
CFLAGSCXX += $(CPPUNIT_CFLAGS)
commit f0c047b25a26339ddcde1287328d9ad0cde69011
Author: Tor Lillqvist <tml at iki.fi>
Date: Sun Jun 12 13:01:12 2011 +0300
Don't do anything when cross-compiling for now
diff --git a/testtools/com/sun/star/comp/bridge/makefile.mk b/testtools/com/sun/star/comp/bridge/makefile.mk
index 7083f23..0a6b9a8 100644
--- a/testtools/com/sun/star/comp/bridge/makefile.mk
+++ b/testtools/com/sun/star/comp/bridge/makefile.mk
@@ -34,6 +34,11 @@ TARGET=com_sun_star_comp_bridge
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
+
# ------------------------------------------------------------------
.IF "$(SOLAR_JAVA)" != ""
diff --git a/testtools/source/bridgetest/idl/makefile.mk b/testtools/source/bridgetest/idl/makefile.mk
index b056aec..dce276e 100644
--- a/testtools/source/bridgetest/idl/makefile.mk
+++ b/testtools/source/bridgetest/idl/makefile.mk
@@ -30,8 +30,16 @@ PRJNAME := testtools
TARGET := bridgetest_idl
.INCLUDE: settings.mk
+
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
+
.INCLUDE: target.mk
+
.IF "$(L10N_framework)"==""
+
ALLTAR: $(MISC)$/$(TARGET).cppumaker.done $(MISC)$/$(TARGET).javamaker.done
$(MISC)$/$(TARGET).cppumaker.done: $(BIN)$/bridgetest.rdb
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
index 8ce4116..3932d04 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -34,7 +34,14 @@ ENABLE_EXCEPTIONS=TRUE
LIBTARGET=NO
.INCLUDE: settings.mk
+
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
+
.IF "$(L10N_framework)"==""
+
DLLPRE = # no leading "lib" on .so files
.IF "$(GUI)"=="WNT"
diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk
index b5d90cb..b7a7294 100644
--- a/testtools/source/bridgetest/pyuno/makefile.mk
+++ b/testtools/source/bridgetest/pyuno/makefile.mk
@@ -38,6 +38,12 @@ my_components = pythonloader
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
+
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
+
# --- Files --------------------------------------------------------
.IF "$(DISABLE_PYTHON)" != "TRUE"
.IF "$(L10N_framework)"==""
diff --git a/testtools/source/cliversioning/makefile.mk b/testtools/source/cliversioning/makefile.mk
index bb9cd3d..803fda8 100644
--- a/testtools/source/cliversioning/makefile.mk
+++ b/testtools/source/cliversioning/makefile.mk
@@ -33,6 +33,12 @@ TARGET := test_climaker
PACKAGE = cliversion
.INCLUDE: settings.mk
+
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
+
.INCLUDE : $(PRJ)$/util$/makefile.pmk
.IF "$(debug)" != ""
commit 4d62313de5dd568230fa06634569e5d098bef7be
Merge: cb7dc5b... 51e73a5...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Jun 6 12:53:10 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-4'
commit cb7dc5b4050dd7f6978bcb90c9bfee943442bcda
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 3 13:28:11 2011 +0300
Drop %_EXT% which was always empty
diff --git a/qadevOOo/prj/d.lst b/qadevOOo/prj/d.lst
index e6e07e8..8615359 100644
--- a/qadevOOo/prj/d.lst
+++ b/qadevOOo/prj/d.lst
@@ -1 +1 @@
-..\%__SRC%\class\OOoRunner*.jar %_DEST%\bin%_EXT%
+..\%__SRC%\class\OOoRunner*.jar %_DEST%\bin
diff --git a/smoketestdoc/prj/d.lst b/smoketestdoc/prj/d.lst
index 618cd83..c89f0d9 100644
--- a/smoketestdoc/prj/d.lst
+++ b/smoketestdoc/prj/d.lst
@@ -1,4 +1,4 @@
-mkdir: %_DEST%\bin%_EXT%
+mkdir: %_DEST%\bin
-..\%__SRC%\bin\smoketestdoc.sxw %_DEST%\bin%_EXT%\smoketestdoc.sxw
-..\%__SRC%\bin\TestExtension.oxt %_DEST%\bin%_EXT%\TestExtension.oxt
+..\%__SRC%\bin\smoketestdoc.sxw %_DEST%\bin\smoketestdoc.sxw
+..\%__SRC%\bin\TestExtension.oxt %_DEST%\bin\TestExtension.oxt
diff --git a/test/prj/d.lst b/test/prj/d.lst
index 18a599f..29388bc 100644
--- a/test/prj/d.lst
+++ b/test/prj/d.lst
@@ -1,17 +1,17 @@
-mkdir: %_DEST%\inc%_EXT%\test
-mkdir: %_DEST%\inc%_EXT%\test\detail
-..\%__SRC%\bin\test.dll %_DEST%\bin%_EXT%\test.dll
-..\%__SRC%\bin\unoexceptionprotector.dll %_DEST%\bin%_EXT%\unoexceptionprotector.dll
-..\%__SRC%\lib\itest.lib %_DEST%\lib%_EXT%\itest.lib
-..\%__SRC%\lib\libtest.dylib %_DEST%\lib%_EXT%\libtest.dylib
-..\%__SRC%\lib\libtest.so %_DEST%\lib%_EXT%\libtest.so
-..\%__SRC%\lib\unoexceptionprotector.dylib %_DEST%\lib%_EXT%\unoexceptionprotector.dylib
-..\%__SRC%\lib\unoexceptionprotector.so %_DEST%\lib%_EXT%\unoexceptionprotector.so
-..\inc\test\detail\testdllapi.hxx %_DEST%\inc%_EXT%\test\detail\testdllapi.hxx
-..\inc\test\gettestargument.hxx %_DEST%\inc%_EXT%\test\gettestargument.hxx
-..\inc\test\officeconnection.hxx %_DEST%\inc%_EXT%\test\officeconnection.hxx
-..\inc\test\oustringostreaminserter.hxx %_DEST%\inc%_EXT%\test\oustringostreaminserter.hxx
-..\inc\test\toabsolutefileurl.hxx %_DEST%\inc%_EXT%\test\toabsolutefileurl.hxx
-..\inc\test\uniquepipename.hxx %_DEST%\inc%_EXT%\test\uniquepipename.hxx
-..\%__SRC%\class\test.jar %_DEST%\bin%_EXT%\test.jar
-..\%__SRC%\class\test-tools.jar %_DEST%\bin%_EXT%\test-tools.jar
+mkdir: %_DEST%\inc\test
+mkdir: %_DEST%\inc\test\detail
+..\%__SRC%\bin\test.dll %_DEST%\bin\test.dll
+..\%__SRC%\bin\unoexceptionprotector.dll %_DEST%\bin\unoexceptionprotector.dll
+..\%__SRC%\lib\itest.lib %_DEST%\lib\itest.lib
+..\%__SRC%\lib\libtest.dylib %_DEST%\lib\libtest.dylib
+..\%__SRC%\lib\libtest.so %_DEST%\lib\libtest.so
+..\%__SRC%\lib\unoexceptionprotector.dylib %_DEST%\lib\unoexceptionprotector.dylib
+..\%__SRC%\lib\unoexceptionprotector.so %_DEST%\lib\unoexceptionprotector.so
+..\inc\test\detail\testdllapi.hxx %_DEST%\inc\test\detail\testdllapi.hxx
+..\inc\test\gettestargument.hxx %_DEST%\inc\test\gettestargument.hxx
+..\inc\test\officeconnection.hxx %_DEST%\inc\test\officeconnection.hxx
+..\inc\test\oustringostreaminserter.hxx %_DEST%\inc\test\oustringostreaminserter.hxx
+..\inc\test\toabsolutefileurl.hxx %_DEST%\inc\test\toabsolutefileurl.hxx
+..\inc\test\uniquepipename.hxx %_DEST%\inc\test\uniquepipename.hxx
+..\%__SRC%\class\test.jar %_DEST%\bin\test.jar
+..\%__SRC%\class\test-tools.jar %_DEST%\bin\test-tools.jar
diff --git a/testautomation/prj/d.lst b/testautomation/prj/d.lst
index a2d325f..87e6004 100644
--- a/testautomation/prj/d.lst
+++ b/testautomation/prj/d.lst
@@ -1,4 +1,4 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\win
+mkdir: %COMMON_DEST%\bin\win
-..\global\win\*.win %COMMON_DEST%\bin%_EXT%\win\*.win
+..\global\win\*.win %COMMON_DEST%\bin\win\*.win
commit 79cfff0b519f6970aea23de3ee6fd7080f65b832
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Jun 1 16:43:04 2011 +0200
add debug hook for junit tests
diff --git a/test/source/java/org/openoffice/test/OfficeConnection.java b/test/source/java/org/openoffice/test/OfficeConnection.java
index 6aa164a..4cc59a2 100644
--- a/test/source/java/org/openoffice/test/OfficeConnection.java
+++ b/test/source/java/org/openoffice/test/OfficeConnection.java
@@ -62,7 +62,7 @@ public final class OfficeConnection {
description = "pipe,name=oootest" + UUID.randomUUID();
ProcessBuilder pb = new ProcessBuilder(
sofficeArg.substring("path:".length()), "--quickstart=no",
- "--nofirststartwizard", "--norestore",
+ "--nofirststartwizard", "--norestore", "--nologo",
"--accept=" + description + ";urp",
"-env:UserInstallation=" + Argument.get("user"),
"-env:UNO_JAVA_JFW_ENV_JREHOME=true",
@@ -104,6 +104,12 @@ public final class OfficeConnection {
assertNull(waitForProcess(process, 1000)); // 1 sec
}
}
+ try {
+ ProcessBuilder debugbp = new ProcessBuilder(
+ Argument.get("debugcommand").split(" "));
+ debugbp.start();
+ Thread.sleep(1000);
+ } catch(Exception e) {}
}
/** Shut down the OOo instance.
commit 51e73a5871c5d2fb2e2aeeaa9c9d08d84f0f7450
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue May 31 14:58:48 2011 +0200
use --nologo to prevent oosplash smoketest hangs
diff --git a/test/source/cpp/officeconnection.cxx b/test/source/cpp/officeconnection.cxx
index 9bdddca..9225411 100644
--- a/test/source/cpp/officeconnection.cxx
+++ b/test/source/cpp/officeconnection.cxx
@@ -76,7 +76,7 @@ void OfficeConnection::setUp() {
RTL_CONSTASCII_USTRINGPARAM("--nofirststartwizard"));
rtl::OUString norestoreArg(RTL_CONSTASCII_USTRINGPARAM("--norestore"));
//Disable use of the unix standalone splash screen app for the tests
- rtl::OUString noSplashArg(RTL_CONSTASCII_USTRINGPARAM("--no-oosplash"));
+ rtl::OUString noSplashArg(RTL_CONSTASCII_USTRINGPARAM("--nologo"));
rtl::OUString acceptArg(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--accept=")) + desc +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";urp")));
commit c414bb1dc75b3db4fa88874ff5f978e6a0d18d56
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue May 31 14:58:48 2011 +0200
use --nologo to prevent oosplash smoketest hangs
diff --git a/test/source/cpp/officeconnection.cxx b/test/source/cpp/officeconnection.cxx
index 9bdddca..9225411 100644
--- a/test/source/cpp/officeconnection.cxx
+++ b/test/source/cpp/officeconnection.cxx
@@ -76,7 +76,7 @@ void OfficeConnection::setUp() {
RTL_CONSTASCII_USTRINGPARAM("--nofirststartwizard"));
rtl::OUString norestoreArg(RTL_CONSTASCII_USTRINGPARAM("--norestore"));
//Disable use of the unix standalone splash screen app for the tests
- rtl::OUString noSplashArg(RTL_CONSTASCII_USTRINGPARAM("--no-oosplash"));
+ rtl::OUString noSplashArg(RTL_CONSTASCII_USTRINGPARAM("--nologo"));
rtl::OUString acceptArg(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--accept=")) + desc +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";urp")));
commit 2b38f83ac93584f4150cae3b5f2ba367ed379c77
Merge: 387640f... 7af9ed5...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon May 30 13:12:16 2011 +0200
Merge commit 'libreoffice-3.4.0.2'
commit 387640f31642a18988f15d1377a60e2b6018cf47
Merge: e0008d6... 45ac455...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri May 27 20:50:06 2011 +0200
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/testing
commit 45ac455618d67853fa40e54c5e4416e963224033
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 26 11:03:13 2011 +0100
make this more foolproof if run outside build env
diff --git a/smoketestdoc/data/Global.xml b/smoketestdoc/data/Global.xml
index ef178e1..42b76f4 100644
--- a/smoketestdoc/data/Global.xml
+++ b/smoketestdoc/data/Global.xml
@@ -532,7 +532,7 @@ Sub SetGlobalOptionsDialog ()
REM create dialog control
gOptionsDialog = CreateUnoDialog( oInputStreamProvider )
- if Environ("WITH_BINFILTER") = "NO" then
+ if Environ("WITH_BINFILTER") <> "YES" then
oControl = gOptionsDialog.getControl("cbOpen50Test")
oControl.Model.setPropertyValue("Enabled", FALSE)
End If
@@ -593,10 +593,10 @@ Sub GetOptions
gOptionsDialog.getControl("cbDatabaseTest").setState( -( GetUserFieldState (cUserFieldTestDatabase, gOutputDoc)))
gOptionsDialog.getControl("cbExtensionTest").setState( -( GetUserFieldState (cUserFieldTestExtension, gOutputDoc)))
gOptionsDialog.getControl("cbSaveOpenXMLTest").setState( -( GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc)))
- if Environ("WITH_BINFILTER") = "NO" then
- gOptionsDialog.getControl("cbOpen50Test").setState(0)
- else
+ if Environ("WITH_BINFILTER") = "YES" then
gOptionsDialog.getControl("cbOpen50Test").setState( -( GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)))
+ else
+ gOptionsDialog.getControl("cbOpen50Test").setState(0)
End If
gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc)))
gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc)))
@@ -615,10 +615,10 @@ Sub ReadOptions
bMakeDBTest = GetUserFieldState (cUserFieldTestDatabase, gOutputDoc)
bMakeExtensionTest = GetUserFieldState (cUserFieldTestExtension, gOutputDoc)
bMakeSaveOpenXMLTest = GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc)
- if Environ("WITH_BINFILTER") = "NO" then
- bMakeOpen50Test = false
- else
+ if Environ("WITH_BINFILTER") = "YES" then
bMakeOpen50Test = GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)
+ else
+ bMakeOpen50Test = false
End If
bMakeSaveOpen8Test = GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc)
bMakeTerminateAfterTest = GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc)
@@ -643,10 +643,10 @@ Sub SetDefaultOptions
End If
bMakeSaveOpenXMLTest = true
REM Disable StarOffice 5.0 tests in case binfilter has not been included
- if Environ("WITH_BINFILTER") = "NO" then
- bMakeOpen50Test = false
- else
+ if Environ("WITH_BINFILTER") = "YES" then
bMakeOpen50Test = true
+ else
+ bMakeOpen50Test = false
End If
bMakeSaveOpen8Test = true
bMakeTerminateAfterTest = false
commit 7af9ed55af52107da4328c2c63c64f18c8fc6f7e
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 24 19:29:14 2011 +0200
Version 3.4.0.2, tag libreoffice-3.4.0.2 (3.4.0-rc2)
commit e0008d6df85f181b98c670916a4e104615c2a6d1
Merge: 8dd9b81... 9bebed5...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue May 24 15:03:19 2011 +0200
Merge remote-tracking branch 'origin/integration/dev300_m106'
commit 8dd9b81dbefb8b8afc34153285a3e39323d2e49a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon May 23 16:01:04 2011 +0200
use links in smoketest install too
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index 31d67d7..799fe9c 100755
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -58,6 +58,6 @@ CPPTEST_LIBRARY = $(SHL1TARGETN)
localinstall :
$(RM) -r $(installationtest_instpath)
$(MKDIRHIER) $(installationtest_instpath)
- ooinstall $(installationtest_instpath)/opt
+ ooinstall -l $(installationtest_instpath)/opt
cpptest : localinstall
.END
commit 93bd6694bebaf23d1e5d0536c56ed7e1413f8778
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun May 22 10:38:49 2011 +0200
Fix bug fdo36158 UI:Find&Replace dialog "Notes" instead of "Comments"
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index 0448fcc..4c9b42b 100755
--- a/testautomation/global/win/edia_d_h.win
+++ b/testautomation/global/win/edia_d_h.win
@@ -351,7 +351,7 @@ SearchIn sym:svx:ListBox:RID_SVXDLG_SEARCH:LB_CALC_SEARCHIN
Rows sym:svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_ROWS
Columns sym:svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_COLUMNS
SearchInAllSheets sym:svx:CheckBox:RID_SVXDLG_SEARCH:CB_ALL_SHEETS
-Notes sym:svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES
+Notes sym:svx:CheckBox:RID_SVXDLG_SEARCH:CB_COMMENTS
*FormFolderNameDialog sym:DBACCESS_HID_DLG_SAVE_AS
FolderName sym:dbaccess:Edit:DLG_SAVE_AS:ET_TITLE
commit 4f83907d2020f22b89bbc7dc9e099bee7eb1c69b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu May 19 00:26:52 2011 +0200
fdo#37325: make toolkit.UnoScrollBarControl not fail headless
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
index 640365f..6d9db8d 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
@@ -76,7 +76,7 @@ public class UnoScrollBarControl extends TestCase {
XWindow xWin = xFrame.getContainerWindow();
Toolkit tk = Toolkit.getDefaultToolkit();
- Dimension dim = tk.getScreenSize();
+ Dimension dim = new Dimension(800, 600);
Rectangle newPosSize = xWin.getPosSize();
newPosSize.Width = new Double(dim.getWidth()).intValue();
commit 4a57e4bdad0ace4b5bc784a98750b7da1761e460
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu May 19 00:26:52 2011 +0200
fdo#37325: make toolkit.UnoScrollBarControl not fail headless
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
index 640365f..6d9db8d 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
@@ -76,7 +76,7 @@ public class UnoScrollBarControl extends TestCase {
XWindow xWin = xFrame.getContainerWindow();
Toolkit tk = Toolkit.getDefaultToolkit();
- Dimension dim = tk.getScreenSize();
+ Dimension dim = new Dimension(800, 600);
Rectangle newPosSize = xWin.getPosSize();
newPosSize.Width = new Double(dim.getWidth()).intValue();
commit ed35c41764c3651d831f0dd1f3ef5678f8d04a05
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu May 19 00:26:52 2011 +0200
fdo#37325: make toolkit.UnoScrollBarControl not fail headless
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
index 640365f..6d9db8d 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
@@ -76,7 +76,7 @@ public class UnoScrollBarControl extends TestCase {
XWindow xWin = xFrame.getContainerWindow();
Toolkit tk = Toolkit.getDefaultToolkit();
- Dimension dim = tk.getScreenSize();
+ Dimension dim = new Dimension(800, 600);
Rectangle newPosSize = xWin.getPosSize();
newPosSize.Width = new Double(dim.getWidth()).intValue();
commit 9ffd3013612cc1d20f04624a773f34df06132566
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu May 19 00:39:04 2011 +0300
Add the wntgcc directories
diff --git a/.gitignore b/.gitignore
index f412986..9ea0cd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@
/*/unxlng??.pro
/*/wntmsc???
/*/wntmsc???.pro
+/*/wntgcc?
+/*/wntgcc?.pro
/*/unxmac??
/*/unxmac??.pro
/*/unxios?
commit 0a61d48275abf1c43db017be097ba5f005721da1
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu May 19 00:34:13 2011 +0300
Add the unxios and unxand directories
diff --git a/.gitignore b/.gitignore
index acaf1d1..f412986 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,7 @@
/*/wntmsc???.pro
/*/unxmac??
/*/unxmac??.pro
+/*/unxios?
+/*/unxios?.pro
+/*/unxand?
+/*/unxand?.pro
commit 1a931e92e29bf1fa7aba91e27f4f16443d9c3171
Author: Christian Dywan <christian.dywan at lanedo.com>
Date: Wed May 18 16:06:52 2011 +0200
Unify Display Grid/ Grid Visible and other menu items
diff --git a/testautomation/framework/optional/input/menu/en-us_draw.txt b/testautomation/framework/optional/input/menu/en-us_draw.txt
index 7334e2e..7d13102 100755
--- a/testautomation/framework/optional/input/menu/en-us_draw.txt
+++ b/testautomation/framework/optional/input/menu/en-us_draw.txt
@@ -64,7 +64,7 @@ Status ~Bar
Input M~ethod Status
~Ruler
Gr~id
-~Guides
+~Snap Lines
~Zoom...
********** ~Insert
diff --git a/testautomation/framework/optional/input/menu/en-us_impress.txt b/testautomation/framework/optional/input/menu/en-us_impress.txt
index fdd773a..f992eca 100755
--- a/testautomation/framework/optional/input/menu/en-us_impress.txt
+++ b/testautomation/framework/optional/input/menu/en-us_impress.txt
@@ -69,7 +69,7 @@ Status ~Bar
Input M~ethod Status
~Ruler
Gr~id
-~Guides
+~Snap Lines
~Header and Footer...
~Zoom...
diff --git a/testautomation/global/tools/includes/optional/t_toolbar_writer.inc b/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
index 892dbd0..f1c4c96 100644
--- a/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
+++ b/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
@@ -217,7 +217,7 @@ function fGetObjectWriter(sToolbar as String , sObject as String) as Integer
case "Object rotation mode" : fGetObjectWriter = 14
case "Display Grid" : fGetObjectWriter = 15
case "Snap to Grid" : fGetObjectWriter = 16
- case "Guides When Moving" : fGetObjectWriter = 17
+ case "Helplines While Moving" : fGetObjectWriter = 17
'----------------- 18
case "Wrap Off" : fGetObjectWriter = 19
case "Page Wrap" : fGetObjectWriter = 20
@@ -582,7 +582,7 @@ function fGetObjectCalc(sToolbar as String , sObject as String) as Integer
Select case sObject
case "Display Grid" : fGetObjectCalc = 21
case "Snap to Grid" : fGetObjectCalc = 22
- case "Guides When Moving" : fGetObjectCalc = 23
+ case "Helplines While Moving" : fGetObjectCalc = 23
case else : QAErrorLog "The test does not support Object : " + sObject
fGetObjectCalc = 0
end select
diff --git a/testautomation/graphics/required/includes/global/id_005.inc b/testautomation/graphics/required/includes/global/id_005.inc
index cba3847..f663674 100644
--- a/testautomation/graphics/required/includes/global/id_005.inc
+++ b/testautomation/graphics/required/includes/global/id_005.inc
@@ -699,10 +699,10 @@ testcase tiFormatCaseCharacter
printlog "move curser 1 time to the left"
hTypeKeys "<left>"
- printlog "Format->Case/Characters->Uppercase"
+ printlog "Format->~Change Case->Uppercase"
FormatChangeCaseUpper
WaitSlot (1000)
- printlog "Format->Case/Characters->Lowercase"
+ printlog "Format->~Change Case->Lowercase"
FormatChangeCaseLower
WaitSlot (2000)
if bAsianLan then
@@ -711,28 +711,28 @@ testcase tiFormatCaseCharacter
end if
printlog "if asian language (81/82/86/88):"
try
- printlog "+ Format->Case/Characters->Half-width"
+ printlog "+ Format->~Change Case->Half-width"
FormatChangeCaseHalfWidth
catch
Warnlog "Format / Change Case / Half Width does not work."
endcatch
WaitSlot (1000)
try
- printlog "+ Format->Case/Characters->Full-width"
+ printlog "+ Format->~Change Case->Full-width"
FormatChangeCaseFullWidth
catch
Warnlog "Format / Change Case / Full Width does not work!"
endcatch
sleep 1
try
- printlog "+ Format->Case/Characters->Hiragana"
+ printlog "+ Format->~Change Case->Hiragana"
FormatChangeCaseHiragana
catch
Warnlog "Format / Change Case / Hiragana does not work."
endcatch
sleep 1
try
- printlog "+ Format->Case/Characters->Katatana"
+ printlog "+ Format->~Change Case->Katatana"
FormatChangeCaseKatagana
catch
Warnlog "Format / Change Case / Katagana does not work."
diff --git a/testautomation/graphics/required/includes/global/id_opt_1.inc b/testautomation/graphics/required/includes/global/id_opt_1.inc
index 35874fe..6c92749 100644
--- a/testautomation/graphics/required/includes/global/id_opt_1.inc
+++ b/testautomation/graphics/required/includes/global/id_opt_1.inc
@@ -422,7 +422,7 @@ testcase tToolsOptionsDrawView (sApplication as string)
hToolsOptions (sApplication,"View")
If LinealeSichtbar.IsChecked Then WarnLog "Rulers Visible x"
- If HilfslinienBeimBewegen.IsChecked Then WarnLog "Guides When Moving x"
+ If HilfslinienBeimBewegen.IsChecked Then WarnLog "Helplines While Moving x"
If KontrolpunkteImBezierEditor.IsChecked Then WarnLog "'All Control Points In B�zier Editor' x"
If KonturFuerIndividuelleObjekte.IsChecked Then WarnLog "'Contour of Each Individual Object' x"
@@ -441,7 +441,7 @@ testcase tToolsOptionsDrawView (sApplication as string)
hToolsOptions (sApplication,"View")
If True <> LinealeSichtbar.IsChecked Then WarnLog "Rulers Visible o"
- If True <> HilfslinienBeimBewegen.IsChecked Then WarnLog "Guides When Moving o"
+ If True <> HilfslinienBeimBewegen.IsChecked Then WarnLog "Helplines While Moving o"
If True <> KontrolpunkteImBezierEditor.IsChecked Then WarnLog "'All Control Points In B�zier Editor' o"
If True <> KonturFuerIndividuelleObjekte.IsChecked Then WarnLog "'Contour of Each Individual Object' o"
@@ -561,7 +561,7 @@ testcase tToolsOptionsDrawGrid (sApplication as string)
hToolsOptions (sApplication,"Grid")
If ( irgendwas(1) = FangrasterBenutzen.IsChecked ) Then WarnLog "Snap to Grid state changed"
- If ( irgendwas(2) = RasterSichtbar.IsChecked ) Then WarnLog "Visible Grid state changed"
+ If ( irgendwas(2) = RasterSichtbar.IsChecked ) Then WarnLog "Display Grid state changed"
' If ( irgendwas(3) = AchsenSynchronisieren.IsChecked ) Then WarnLog "Synchronize Axes state changed"
if ( AchsenSynchronisieren.IsChecked = TRUE ) Then WarnLog "Synchronize Axes state changed"
@@ -638,7 +638,7 @@ testcase tToolsOptionsDrawGrid (sApplication as string)
hToolsOptions (sApplication,"Grid")
If FangrasterBenutzen.IsChecked Then WarnLog "Snap to Grid x"
- If RasterSichtbar.IsChecked Then WarnLog "Visible Grid x"
+ If RasterSichtbar.IsChecked Then WarnLog "Display Grid x"
If AchsenSynchronisieren.IsChecked Then WarnLog "Synchronize Axes x"
@@ -702,7 +702,7 @@ testcase tToolsOptionsDrawGrid (sApplication as string)
hToolsOptions (sApplication,"Grid")
If True <> FangrasterBenutzen.IsChecked Then WarnLog "Snap to Grid o"
- If True <> RasterSichtbar.IsChecked Then WarnLog "Visible Grid o"
+ If True <> RasterSichtbar.IsChecked Then WarnLog "Display Grid o"
If True <> AchsenSynchronisieren.IsChecked Then WarnLog "Synchronize Axes o"
@@ -1044,4 +1044,4 @@ testcase tToolsOptionsDrawPrint (sApplication as string)
ExtrasOptionenDlg.OK
hCloseDocument
-endcase 'tToolsOptionsDrawPrint
\ No newline at end of file
+endcase 'tToolsOptionsDrawPrint
commit 17adc313cd4a8dd656818ddf96f4137fcd4f3226
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 20:49:49 2011 +0200
Branch libreoffice-3-4-0
This is 'libreoffice-3-4-0' - the stable branch for the 3.4.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.4.x release,
please use the 'libreoffice-3-4' branch.
If you want to build something cool, unstable, and risky, use master.
commit 0ba8fbdc14802bb7cd6f76539498cc76e585daca
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 19:55:38 2011 +0200
Version 3.4.0.1, tag libreoffice-3.4.0.1 (3.4.0-rc1)
commit 831ec52edfbee9fbf97b892178a5548881143f33
Author: Yifan <Yifan at bang.bang>
Date: Mon May 9 17:32:36 2011 +0800
remove JMF dependency in test case
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc
index f78cdf8..e3e824a 100644
--- a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc
+++ b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc
@@ -39,13 +39,9 @@ testcase g_mediaplayer
dim timevalue2
dim timevalue3
dim timecounter, iWaitIndex, timefound as integer
-
+
if iSprache <> 39 then
Printlog "- MediaPlayer"
- if gPlatgroup = "unx" then
- QaErrorLog "Solaris / Linux: Soundcard + Java Media Framework (JMF) Media-Libraries is needed."
- goto endsub
- endif
Datei$ = ConvertPath (convertPath (gTesttoolPath + "graphics\required\input\29secsound.wav"))
printlog "Open New Document"
Call hNewDocument
@@ -53,12 +49,12 @@ testcase g_mediaplayer
printlog "Check if the Media Player already exists - if so - close it"
kontext "mPlayer"
printlog "Close the MediaPlayer if it is open already"
- if mPlayer.exists then
+ if mPlayer.exists then
warnlog "The MediaPlayer was visible since some earlier test."
ToolsMediaPlayer
printlog "Closed the Media Player"
endif
-
+
printlog "Tools - MediaPlayer"
ToolsMediaPlayer
sleep 2
@@ -76,11 +72,11 @@ testcase g_mediaplayer
kontext "OeffnenDlg"
Pfad.SetText Datei$
Oeffnen.Click
-
+
printlog "This test wont work correctly under Solaris and Linux,"
printlog "unless some optional Media-libraries are installed."
printlog "Therefore we warn the tester about it if we cannot open the file."
-
+
iWaitIndex = 0
do while OeffnenDlg.Exists AND iWaitIndex < 10
sleep (1)
@@ -93,15 +89,15 @@ testcase g_mediaplayer
kontext "Mplayer"
ToolsMediaPlayer
printlog "close document"
- Call hCloseDocument
+ Call hCloseDocument
goto endsub
else
kontext "Mplayer"
if Mplayer.exists then printlog "Media Player was opened."
endif
-
+
timevalue1 = mTimeedit.GetText
-
+
printlog "Stop"
sleep 2
mStop.Click
@@ -144,7 +140,7 @@ testcase g_mediaplayer
else
Printlog "the play-button seemed to work. Good."
endif
-
+
printlog "Pause"
mPlay.Click
sleep 10
@@ -159,10 +155,10 @@ testcase g_mediaplayer
else
Printlog "the pause-button seemed to work. Good."
endif
-
+
printlog "Time"
printlog " Click Stop to get to the beginning."
- mStop.Click
+ mStop.Click
sleep 1
printlog "And make sure it's really the beginning."
timevalue1 = mTimeedit.GetText
@@ -173,13 +169,13 @@ testcase g_mediaplayer
else
printlog "Sound stopped, time-value set to 00:00:00."
endif
-
+
printlog "We press 'Play'"
printlog "Click play to get it running"
- mPlay.Click
+ mPlay.Click
sleep 5
timefound = 0
-
+
for timecounter = 1 to 50000
timevalue1 = mTimeedit.GetText
if timevalue1 = "00:00:20 / 00:00:29" then
@@ -191,7 +187,7 @@ testcase g_mediaplayer
timefound = 2
endif
next timecounter
-
+
if timefound = 1 then
Printlog "the time-counter seemed to work. Good."
elseif timefound = 2 then
@@ -199,34 +195,34 @@ testcase g_mediaplayer
elseif timefound = 0 then
warnlog "Either the time didnt change, or the test-computer is too fast."
endif
-
+
printlog "Loop"
mLoop.Click
-
+
printlog "Volume"
-
+
printlog "Mute"
mMute.Click
sleep 1
mMute.Click
-
+
printlog "Time-slider"
' mTimeslider. 'Click
'-Position slider
'Moves to a different position in the file.
-
+
printlog "Scroll-whatever"
'mZoomlistbox.
'-Zoom
'Adjusts the size of the movie playback.
-
+
printlog "Apply"
mInsert.Click
sleep 10
-
+
printlog "Close the MediaPlayer via Tools - MediaPlayer"
ToolsMediaPlayer
-
+
printlog "Check if there is an object available."
if (gApplication = "IMPRESS") then
kontext "DocumentImpress"
@@ -236,7 +232,7 @@ testcase g_mediaplayer
hTypeKeys ("<escape><tab><tab><tab>")
hOpenContextMenu()
hMenuSelectNr(1)
-
+
Kontext "TabPositionAndSize"
Kontext
Active.SetPage TabPositionAndSize
@@ -250,8 +246,8 @@ testcase g_mediaplayer
endif
sleep 2
printlog "close document"
- Call hCloseDocument
+ Call hCloseDocument
else
qaerrorLog "#74350# - Different strings in g_mediaplayer under Italian."
endif
-endcase
\ No newline at end of file
+endcase
commit 32d1ddabf96ff2b8ec09a796f7e81425581b76ec
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 10 20:01:45 2011 +0200
Version 3.3.99.5, tag libreoffice-3.3.99.5 (3.4.0-beta5)
commit e33328aa32fc942e1b3ee3cbf60e5c826e44b195
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri May 6 16:44:18 2011 +0200
Version 3.3.99.4, tag libreoffice-3.3.99.4-hotfixes1 (3.4.0-beta4-windows)
commit b6b8bb2f3afb6cec8043494a33c66380bddb26c1
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed May 4 13:40:12 2011 +0800
Click ellipse and rectangle icons using .uno.BasicShapes.
The .uno.Ellipse and .uno.Rect object in Toolbar
is not clickable now caused by the fix:
http://cgit.freedesktop.org/libreoffice/impress/commit/ \
?h=libreoffice-3-4&id=d31b6292b14546ac7b04b4f483b70f68b56412e6
Thanks Yifan Jiang <yfjiang at novell.com> for testing.
diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win
index 9bd0d25..850baef 100644
--- a/testautomation/global/win/bars.win
+++ b/testautomation/global/win/bars.win
@@ -1231,7 +1231,7 @@ DruckLayout .uno:PrintLayout
Effekt .uno:EffectWindow
Edit .uno:EditDoc
Einfuegen .uno:InsertCtrl
-Ellipsen .uno:Ellipse
+Ellipsen .uno:BasicShapes.ellipse
ExecuteBtn .uno:SbaExecuteSql
Feldbefehle .uno:InsertFieldCtrl
Filter .uno:DataFilterStandardFilter
@@ -1271,7 +1271,7 @@ OnlineLayout .uno:BrowseView
Paste .uno:Paste
Praesentation .uno:Presentation
PrintDefault .uno:PrintDefault
-Rechteck .uno:Rect
+Rechteck .uno:BasicShapes.rectangle
Rechtschreibung .uno:Spelling
RecSearch .uno:RecSearch
RecSave .uno:RecSave
commit a2e1469555348896389ab21194d4b7680abc37eb
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue May 3 23:05:18 2011 +0200
Change <file>.toURL() to <file>.toURI().toURL()
diff --git a/qadevOOo/runner/helper/URLHelper.java b/qadevOOo/runner/helper/URLHelper.java
index 587d7de..442623b 100644
--- a/qadevOOo/runner/helper/URLHelper.java
+++ b/qadevOOo/runner/helper/URLHelper.java
@@ -68,8 +68,7 @@ public class URLHelper
String sFileURL = null;
try
{
- //sFileURL = aSystemPath.toURI().toURL().toString();
- sFileURL = aSystemPath.toURL().toString();
+ sFileURL = aSystemPath.toURI().toURL().toString();
}
catch( MalformedURLException exWrong )
{
commit a5cde20ee30bfeb4f66923fa535c5a6bbf8c5d0e
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 3 20:01:38 2011 +0200
Version 3.3.99.4, tag libreoffice-3.3.99.4 (3.4.0-beta4)
commit a8b5e6b429ec1c3d7221d223ab866fec02b4c062
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Apr 30 07:58:26 2011 -0700
Ignore .getattributes & MacX work directories
diff --git a/.gitignore b/.gitignore
index 4890e11..acaf1d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,12 @@
# backup and temporary files
*~
.*.sw[op]
+.gitattributes
# the build directories
/*/unxlng??
/*/unxlng??.pro
/*/wntmsc???
/*/wntmsc???.pro
+/*/unxmac??
+/*/unxmac??.pro
commit b0d71c16932d72b2f1187e7939013daadb330ed0
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date: Thu Apr 28 08:27:16 2011 +0200
Remove OS/2 support
diff --git a/testgraphical/prechecks/makefile.mk b/testgraphical/prechecks/makefile.mk
index 13796c9..e86698f 100644
--- a/testgraphical/prechecks/makefile.mk
+++ b/testgraphical/prechecks/makefile.mk
@@ -47,7 +47,7 @@ TARGET=notargetyet
# PERLDEBUG=-d:ptkdb
ALLTAR:
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
$(PERL) $(PERLDEBUG) softwaretests.pl -printerdriver -imagemagick -ghostscript $(P_VERBOSE) $(P_JAVA6)
.ELSE
$(PERL) $(PERLDEBUG) softwaretests.pl -imagemagick -ghostscript $(P_VERBOSE) $(P_JAVA6)
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
index 0abe1ab..8ce4116 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -42,11 +42,6 @@ BATCH_SUFFIX=.bat
GIVE_EXEC_RIGHTS=@echo
MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell @$(WRAPCMD) echo $(SOLARBINDIR))))
MY_LOCAL_CLASSDIR=$(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(PWD)/$(CLASSDIR)/)))
-.ELIF "$(GUI)"=="OS2"
-BATCH_SUFFIX=.cmd
-GIVE_EXEC_RIGHTS=@echo
-MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell @$(WRAPCMD) echo $(SOLARBINDIR))))
-MY_LOCAL_CLASSDIR=$(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(PWD)/$(CLASSDIR)/)))
.ELSE
GIVE_EXEC_RIGHTS=chmod +x
MY_URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR)
diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk
index 417bdfc..b5d90cb 100644
--- a/testtools/source/bridgetest/pyuno/makefile.mk
+++ b/testtools/source/bridgetest/pyuno/makefile.mk
@@ -56,7 +56,7 @@ PYTHONPATH:=$(SOLARLIBDIR)$/pyuno:$(PWD):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$
.ENDIF # "$(GUI)"=="WNT"
.EXPORT: PYTHONPATH
-.IF "$(GUI)"!="WNT" && "$(GUI)"!="OS2"
+.IF "$(GUI)"!="WNT"
TEST_ENV=export FOO=file://$(shell @pwd)$/$(DLLDEST) \
UNO_TYPES=uno_types.rdb UNO_SERVICES=pyuno_services.rdb
.ELSE # "$(GUI)" != "WNT"
commit f9a4c99b8c826d0d218eb15aae296ef5560ed041
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 26 17:09:17 2011 +0200
Version 3.3.99.3, tag libreoffice-3.3.99.3 (3.4.0-beta3)
commit 9bebed5bb95eed61ab684bee61fa65a9f26a47df
Merge: 9913a03... 47ff553...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Apr 22 08:03:35 2011 +0200
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
commit 9913a03febb3bbdb57c8c4dad51cf4939b435b6e
Author: Marc Neumann [msc] <Marc.Neumann at oracle.com>
Date: Tue Mar 8 11:52:31 2011 +0100
cws dba34c: add new test for mysql connector
diff --git a/testautomation/dbaccess/optional/dba_db_MySQLnative.bas b/testautomation/dbaccess/optional/dba_db_MySQLnative.bas
new file mode 100644
index 0000000..adb2e79
--- /dev/null
+++ b/testautomation/dbaccess/optional/dba_db_MySQLnative.bas
@@ -0,0 +1,54 @@
+'encoding UTF-8 Do not remove or change this line!
+'**************************************************************************
+' 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.
+'
+'/************************************************************************
+'*
+'* owner : marc.neumann at oracle.com
+'*
+'* short description : MySQL Native Connector Extension Test
+'*
+'\***********************************************************************
+sub main
+ printlog "--------------------------------------------------------------"
+ printlog "--- D B A C C E S S Mysql Native Connector ---"
+ printlog "--------------------------------------------------------------"
+
+ use "dbaccess/optional/includes/db_MySQLnative.inc"
+ use "dbaccess/optional/includes/db_Relations.inc"
+
+ call hStatusIn ("dbaccess" , "dba_db_MySQLnative.bas")
+
+ call db_MySQLnative
+
+ call hStatusOut
+
+end sub
+
+sub LoadIncludeFiles
+ use "dbaccess/tools/dbinit.inc"
+ Call sDBInit
+ Call GetUseFiles
+ gApplication = "WRITER"
+end sub
diff --git a/testautomation/dbaccess/optional/includes/db_MySQLnative.inc b/testautomation/dbaccess/optional/includes/db_MySQLnative.inc
new file mode 100644
index 0000000..de80287
--- /dev/null
+++ b/testautomation/dbaccess/optional/includes/db_MySQLnative.inc
@@ -0,0 +1,206 @@
+'encoding UTF-8 Do not remove or change this line!
+'**************************************************************************
+' 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.
+'
+'/************************************************************************
+'*
+'* owner : marc.neumann at oracle.com
+'*
+'* short description : Create JDBC MySQL DS & Table & fill in Test
+'*
+'\***********************************************************************
+testcase db_MySQLnative
+
+ ' **************************************************
+ ' databases specific settings for JDBC MySQL
+ ' **************************************************
+
+ dim sDBConfigFile as string
+
+ sDBConfigFile = environ ( "VTT_DB_CONFIG_FILE" )
+
+ printlog sDBConfigFile
+
+ if (sDBConfigFile = "") then
+ qaerrorlog "settings for external databases not found. see wiki page. This test ist stopped now"
+ goto endsub
+ else
+ if Dir( sDBConfigFile ) = "" then ' the file does not exists
+ qaerrorlog "settings for external databases not found. see wiki page. This test ist stopped now"
+ else
+ ' file exists , so we can do th next step
+ endif
+
+ endif
+
+
+
+ Dim sFileName as string
+ sFileName = gOfficePath + Convertpath("user/work/TT_MYSQLnative.odb")
+
+ Dim sTableName as string
+ sTableName = "tt_test_create-table"
+
+ Dim sUser as string
+ sUser = "testtool"
+
+ Dim sPWD as string
+ sPWD = "testtool"
+
+ dim sCatalog as string
+ sCatalog = " " ' not used in this ds
+
+ dim sSchema as string
+ sSchema = " " ' not used in this ds
+
+ Dim aFieldTypeContent(30,2) as string 'database specific data matrix
+
+ aFieldTypeContent(1,1)="tt_bool"
+ aFieldTypeContent(1,2)="bool"
+
+ aFieldTypeContent(2,1)="tt_tinyint"
+ aFieldTypeContent(2,2)="tinyint"
+
+ aFieldTypeContent(3,1)="tt_bigint"
+ aFieldTypeContent(3,2)="bigint"
+
+ aFieldTypeContent(4,1)="tt_long_varbinary"
+ aFieldTypeContent(4,2)="long varbinary"
+
+ aFieldTypeContent(5,1)="tt_mediumblob"
+ aFieldTypeContent(5,2)="mediumblob"
+
+ aFieldTypeContent(6,1)="tt_longblob"
+ aFieldTypeContent(6,2)="longblob"
+
+ aFieldTypeContent(7,1)="tt_blob"
+ aFieldTypeContent(7,2)="blob"
+
+ aFieldTypeContent(8,1)="tt_tinyblob"
+ aFieldTypeContent(8,2)="tinyblob"
+
+ aFieldTypeContent(9,1)="tt_varbinary"
+ aFieldTypeContent(9,2)="varbinary"
+
+ aFieldTypeContent(10,1)="tt_binary"
+ aFieldTypeContent(10,2)="binary"
+
+ aFieldTypeContent(11,1)="tt_longvarchar"
+ aFieldTypeContent(11,2)="long varchar"
+
+ aFieldTypeContent(12,1)="tt_mediumtext"
+ aFieldTypeContent(12,2)="mediumtext"
+
+ aFieldTypeContent(13,1)="tt_longtext"
+ aFieldTypeContent(13,2)="longtext"
+
+ aFieldTypeContent(14,1)="tt_text"
+ aFieldTypeContent(14,2)="text"
+
+ aFieldTypeContent(15,1)="tt_tinytext"
+ aFieldTypeContent(15,2)="tinytext"
+
+ aFieldTypeContent(16,1)="tt_char"
+ aFieldTypeContent(16,2)="char"
+
+ aFieldTypeContent(17,1)="tt_numeric"
+ aFieldTypeContent(17,2)="numeric"
+
+ aFieldTypeContent(18,1)="tt_decimal"
+ aFieldTypeContent(18,2)="decimal"
+
+ aFieldTypeContent(19,1)="tt_integer"
+ aFieldTypeContent(19,2)="integer"
+
+ aFieldTypeContent(20,1)="tt_int"
+ aFieldTypeContent(20,2)="int"
+
+ aFieldTypeContent(21,1)="tt_mediumint"
+ aFieldTypeContent(21,2)="mediumint"
+
+ aFieldTypeContent(22,1)="tt_smallint"
+ aFieldTypeContent(22,2)="smallint"
+
+ aFieldTypeContent(23,1)="tt_float"
+ aFieldTypeContent(23,2)="float"
+
+ aFieldTypeContent(24,1)="tt_varchar"
+ aFieldTypeContent(24,2)="varchar"
+
+ aFieldTypeContent(25,1)="tt_date"
+ aFieldTypeContent(25,2)="date"
+
+ aFieldTypeContent(26,1)="tt_time"
+ aFieldTypeContent(26,2)="time"
+
+ aFieldTypeContent(27,1)="tt_datetime"
+ aFieldTypeContent(27,2)="datetime"
+
+ aFieldTypeContent(28,1)="tt_timestamp"
+ aFieldTypeContent(28,2)="timestamp"
+
+ aFieldTypeContent(29,1)="tt_bit"
+ aFieldTypeContent(29,2)="bit"
+
+
+
+ Dim aFieldContent(1,6) as string 'database specific data matrix
+
+ aFieldContent(1,1)="1"
+ aFieldContent(1,2)="<space>"
+ aFieldContent(1,3)="1"
+ aFieldContent(1,4)="1"
+ aFieldContent(1,5)="1"
+ aFieldContent(1,6)="1"
+
+ dim aDatabaseProperties(7) as string
+ aDatabaseProperties() = tools_dbtools_fgetMySQLnativeDatabaseProperties(sDBConfigFile)
+
+ dim dbok as boolean
+ dbok = false
+
+ ' if and only if no properties are defined in the environment file the test is stopped
+ if(aDatabaseProperties(1) = "no") then
+ qaerrorlog "No database properties from Mysql defiened. The Test is stopped here."
+ goto endsub
+ endif
+
+ dbok = fCreateMySQL_native_Datasource(sFileName,aDatabaseProperties(3),aDatabaseProperties(2),aDatabaseProperties(4),aDatabaseProperties(5))
+ if dbok = true then
+ call fOpendatabase(sFileName,aDatabaseProperties(6))
+ call fCreateTable( aFieldTypeContent(), sTableName)
+ call fInsertIntoTable( aFieldContent(), sTableName)
+ call fCloseDatabase
+
+ use "dbaccess/optional/includes/db_Query.inc"
+ call db_Query(sFileName,"MYSQL_JDBC",aDatabaseProperties(6))
+
+ call tRelation( sFileName, aDatabaseProperties(6), "rel1", "rel2" )
+
+ else
+ warnlog "Data Source could not be created - beyond testcases stopped"
+ endif
+
+endcase
+
diff --git a/testautomation/dbaccess/optional/includes/db_Query.inc b/testautomation/dbaccess/optional/includes/db_Query.inc
index b9d8814..798bc55 100644
--- a/testautomation/dbaccess/optional/includes/db_Query.inc
+++ b/testautomation/dbaccess/optional/includes/db_Query.inc
@@ -47,6 +47,7 @@ function db_Query( sFileName , optional sType , optional sPassword)
case "HSQLDB"
sType = "2"
case "MYSQL_JDBC"
+ case "MYSQL_NATIVE"
sType = "3"
case else
sType = "1"
diff --git a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc
index 67010e6..8743fea 100644
--- a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc
@@ -38,8 +38,8 @@ end sub
'-------------------------------------------------------------------------
testcase tNewReport
- qaerrorlog "#i92543# crash when closing report"
- goto endsub
+ ' qaerrorlog "#i92543# crash when closing report"
+ ' goto endsub
call fOpenDatabase(gOfficePath + ConvertPath("user/database/biblio.odb"))
@@ -85,34 +85,33 @@ testcase tNewReport
FinishBtn.Click
sleep(10)
- Kontext "DocumentWriter"
+ Kontext "DocumentWriter"
DocumentWriter.TypeKeys "<MOD1 SHIFT I>" , true ' EDIT / SELECT TEXT
- DocumentWriter.TypeKeys "<DOWN>" ,2, true
- DocumentWriter.TypeKeys "<SHIFT DOWN>" , true
+ DocumentWriter.TypeKeys "<DOWN>" , true
+ DocumentWriter.TypeKeys "<SHIFT END>" , true
DocumentWriter.TypeKeys "<MOD1 C>" , true
- dim s as String
- s = getClipboard
+ dim s as String
+ s = getClipboard
- if left(s,10) = "Identifier" then
- printlog "Report Table Header contains " + left(s,10) + ". -> OK"
+ if s = "Identifier" then
+ printlog "Report Table Header contains " + s + ". -> OK"
else
- warnlog "Report Table Header contains " + left(s,10) + " instead of IDENTIFIER"
+ warnlog "Report Table Header contains " + s + " instead of IDENTIFIER"
endif
- 'for windows a "new Line" are two characters
- 'so I need to start at char 13 and not on 12
- dim iFromCharacter as integer
- if gPlatGroup = "w95" then
- iFromCharacter = 13
- else
- iFromCharacter = 12
- endif
+ ' select next line and check content
+ Kontext "DocumentWriter"
+ DocumentWriter.TypeKeys "<DOWN>" , true
+ DocumentWriter.TypeKeys "<SHIFT HOME>" , true
+ DocumentWriter.TypeKeys "<MOD1 C>" , true
+
+ s = getClipboard
- if mid(s,iFromCharacter,5) = "GUR00" OR mid(s,iFromCharacter,5) = "BOR04" then
- printlog "1. record is " + mid(s,iFromCharacter,5) + ". -> OK"
+ if s = "GUR00" OR s = "BOR04" then
+ printlog "1. record is " + s + ". -> OK"
else
- warnlog "1. record is " + mid(s,iFromCharacter,5) + " instead of GUR00 OR BOR04"
+ warnlog "1. record is " + s + " instead of GUR00 OR BOR04"
endif
call fCloseForm ' should be changed to a CloseReport
diff --git a/testautomation/dbaccess/tools/dbcreatetools.inc b/testautomation/dbaccess/tools/dbcreatetools.inc
index 034b1d1..222ec47 100644
--- a/testautomation/dbaccess/tools/dbcreatetools.inc
+++ b/testautomation/dbaccess/tools/dbcreatetools.inc
@@ -238,6 +238,104 @@ function fCreateMySQL_JDBC_Datasource(sFileName,sDatabaseName,sHost,sPort,sUser,
end function
'-------------------------------------------------------------------------
+function fCreateMySQL_native_Datasource(sFileName,sDatabaseName,sHost,sPort,sUser,optional sRegister) as boolean
+ '/// create a new MySQL database via JDBC file with the given filename
+ '///+ and the given URL
+ '/// <u>parameter:</u>
+ '/// <b>sFielName:</b> the file name for the database file
+ '/// <b>sDatabaseName:</b> the name of the mysql database
+ '/// <b>sHost:</b> the host where the mysql database is running
+ '/// <b>sPort:</b> the port where the mysql database is running
+ '/// <b>sUser:</b> the user for the connection
+ '/// <b><i>optional</i> sRegister:</b> the name under which the database is be registered
+ dim bOK as boolean
+ bOK = FALSE
+
+ dim sEntry as string
+
+ ' delete the file
+ if ( app.Dir( ConvertPath(sFileName) ) ) <> "" then
+ app.kill(ConvertPath(sFileName))
+ endif
+
+ Kontext "DocumentWriter"
+ if (DocumentWriter.exists(1)) then
+ DocumentWriter.UseMenu
+ else
+ Kontext "DocumentBackground"
+ DocumentBackground.UseMenu
+ endif
+ hMenuSelectNr(1)
+ hMenuSelectNr(1)
+ hMenuSelectNr(5)
+
+ sleep(4)
+
+ Kontext "DatabaseWizard"
+ ConnectToDatabase.Check
+ sleep(1)
+ sEntry = hGetDatabaseDisplayName( "sdbc:mysqlc:*" )
+ 'cut off the (JDBC) string
+ sEntry = Left( sEntry , Instr(sEntry,"(") - 2 )
+ printlog "entry = " + sEntry
+ DatabaseType.select( sEntry )
+ sleep(1)
+ NextBtn.Click
+ sleep(1)
+ MySQLnative.Check
+ NextBtn.Click
+ sleep(1)
+ DatabaseWizard.typeKeys("<TAB>",true)
+ DatabaseWizard.typeKeys(sDatabaseName,true)
+ DatabaseWizard.typeKeys("<TAB>",true)
+ DatabaseWizard.typeKeys("<TAB>",true)
+ DatabaseWizard.typeKeys(sHost,true)
+ 'MySQLDatabaseName.setText(sDatabaseName)
+ 'MySQLHostName.setText(sHost)
+ 'MySQLPort.setText(sPort)
+
+ NextBtn.Click
+ sleep(1)
+
+ '/// add the user name
+ printlog "add the user name"
+ UserName.setText sUser
+
+ '/// check the password required checkbox
+ printlog "check the password required checkbox"
+ PasswordRequired.Check
+
+ NextBtn.Click
+ FinishBtn.Click
+
+ Kontext "SpeichernDlg"
+ Dateiname.setText ConvertPath(sFileName)
+ Speichern.click
+
+ sleep(5)
+
+ if ( IsMissing(sRegister) ) then
+ printlog "don't register datasource"
+ else
+ printlog "register datasource with name " + sRegister
+ call fRegisterDatabaseFile(ConvertPath(sFilename),sRegister)
+ end if
+
+ bOK = true
+ if bOK = true then
+ printlog "--- End of function - *** Succeed ***"
+ else
+ warnlog "--- End of function - *** Failed *** Data source was not created"
+ endif
+
+ fCreateMySQL_native_Datasource = bOK
+
+ sleep(1)
+
+ call fCloseDatabase(true)
+
+end function
+'-------------------------------------------------------------------------
function fCreateAdabasDatasource(sFileName,sURL,sUser, optional sRegister) as boolean
'/// create a new adabas database file with the given filename
'///+ and the given URL
diff --git a/testautomation/dbaccess/tools/dbtools.inc b/testautomation/dbaccess/tools/dbtools.inc
index 2e40a3f..f36438b 100644
--- a/testautomation/dbaccess/tools/dbtools.inc
+++ b/testautomation/dbaccess/tools/dbtools.inc
@@ -319,6 +319,23 @@ function tools_dbtools_fgetMySQLODBCDatabaseProperties()
end function
'-------------------------------------------------------------------------
+function tools_dbtools_fgetMySQLnativeDatabaseProperties(sDBConfigFileName as string)
+ '/// return the databaseserver properties from the environment directory
+ '/// <u>parameter:</u>
+ '/// <br>
+ '/// <u>return:</u>
+ '/// the properties as an array
+ '/// entry 1 defined (yes or no)
+ '/// entry 2 server name
+ '/// entry 3 database name
+ '/// entry 4 database port
+ '/// entry 5 database user name
+ '/// entry 6 database user password
+
+ tools_dbtools_fgetMySQLnativeDatabaseProperties = fgetGenericDatabaseProperties( sDBConfigFileName, "mysql_native" )
+
+end function
+'-------------------------------------------------------------------------
function tools_dbtools_fgetAdabasDatabaseProperties()
'/// return the databaseserver properties from the environment directory
'/// <u>parameter:</u>
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index 0448fcc..ab411b5 100755
--- a/testautomation/global/win/edia_d_h.win
+++ b/testautomation/global/win/edia_d_h.win
@@ -47,6 +47,7 @@ UserName sym:DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUS
AdabasBrowse sym:DBACCESS_HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME
MySQLODBC sym:DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC
MySQLJDBC sym:DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC
+MySQLnative sym:dbaccess:RadioButton:PAGE_DBWIZARD_MYSQL_INTRO:RB_CONNECTVIANATIVE
MySQLDatabaseName sym:DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME
MySQLODBCDSName sym:DBACCESS_HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE
MySQLHostName sym:DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER
commit 3fa76f85dbbbd9afc156369237879c0edb92b86e
Author: Marc Neumann [msc] <Marc.Neumann at oracle.com>
Date: Tue Feb 22 09:21:09 2011 +0100
cws dba34c: the celldescription control is visible at all database types
diff --git a/testautomation/dbaccess/tools/tabletools.inc b/testautomation/dbaccess/tools/tabletools.inc
index 3fcf1ef..f98889d 100644
--- a/testautomation/dbaccess/tools/tabletools.inc
+++ b/testautomation/dbaccess/tools/tabletools.inc
@@ -340,7 +340,9 @@ function fCreateTable(aFieldTypeContent(),sTableName,optional sCatalog,optional
sleep 1
FieldType.TypeKeys "<RETURN>" , TRUE
Description.TypeKeys "<RETURN>" , TRUE
- CellDescription.TypeKeys "<RETURN>" , TRUE
+ if( CellDescription.isVisible() ) then
+ CellDescription.TypeKeys "<RETURN>" , TRUE
+ endif
printlog "-------------------------------"
next
commit 11fe434a3821c66ac52230478eac257e32006fa8
Author: Wolfram Garten [wg] <Wolfram.Garten at oracle.com>
Date: Mon Feb 21 11:20:31 2011 +0100
i117035: [Automation] adapt automated testscripts to new export format svg
diff --git a/testautomation/framework/required/includes/first.inc b/testautomation/framework/required/includes/first.inc
index 35905c2..4ab2352 100644
--- a/testautomation/framework/required/includes/first.inc
+++ b/testautomation/framework/required/includes/first.inc
@@ -304,11 +304,11 @@ testcase tInFilterCountCompare()
printlog( "Check filterlist (filterstring) for graphics files" )
const FILE_NAME = "graphic_filters.txt"
- const SUFFIX_STRING_LENGTH = 178
+ const SUFFIX_STRING_LENGTH = 184
' List of filter suffixes for verification in case of error
' *.bmp;*.dxf;*.emf;*.eps;*.gif;*.jpg;*.jpeg;*.jfif;*.jif;*.met;*.pbm;*.pcd;
-' *.pct;*.pcx;*.pgm;*.png;*.ppm;*.psd;*.ras;*.sgf;*.sgv;*.svm;*.tga;*.tif;
+' *.pct;*.pcx;*.pgm;*.png;*.ppm;*.psd;*.ras;*.sgf;*.sgv;*.svg;*.svm;*.tga;*.tif;
' *.tiff;*.wmf;*.xbm;*.xpm;*.pict
dim caUIFilters( 30 ) as string
@@ -383,6 +383,8 @@ testcase tInFilterCountCompare()
endif
irc = iEnd - iBegin
+ printlog irc
+ printlog SUFFIX_STRING_LENGTH
if ( irc <> SUFFIX_STRING_LENGTH ) then
warnlog( "The list of file suffixes has changed, please verify" )
printlog( "Found: " & irc & " chars, expected " & SUFFIX_STRING_LENGTH )
commit 886f829c6b624229a06ec01f6940fd0dee12e409
Author: Wolfram Garten [wg] <Wolfram.Garten at oracle.com>
Date: Mon Feb 21 11:20:04 2011 +0100
i117035: [Automation] adapt automated testscripts to new export format svg
diff --git a/testautomation/global/input/filters/graphic_filters.txt b/testautomation/global/input/filters/graphic_filters.txt
old mode 100644
new mode 100755
index 9b63e26..e86e1bd
--- a/testautomation/global/input/filters/graphic_filters.txt
+++ b/testautomation/global/input/filters/graphic_filters.txt
@@ -18,6 +18,7 @@ PSD - Adobe Photoshop (*.psd)
RAS - Sun Raster Image (*.ras)
SGF - StarWriter Graphics Format (*.sgf)
SGV - StarDraw 2.0 (*.sgv)
+SVG - Scalable Vector Graphics (*.svg)
SVM - StarView Metafile (*.svm)
TGA - Truevision Targa (*.tga)
TIFF - Tagged Image File Format (*.tif;*.tiff)
commit 0294a0f407dc2cc59b232f302ed02b0b7cba6aff
Author: Wolfram Garten [wg] <Wolfram.Garten at oracle.com>
Date: Mon Feb 21 11:19:16 2011 +0100
i117035: [Automation] adapt automated testscripts to new export format svg
diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.svg b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.svg
new file mode 100644
index 0000000..983e570
--- /dev/null
+++ b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.svg
@@ -0,0 +1,730 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ height="800">
+ <g transform="translate(200,200)" style="fill-opacity:1; fill:none;">
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+ <path d="M-122.304 84.285C-122.304 84.285 -122.203 86.179 -123.027 86.16C-123.851 86.141 -140.305 38.066 -160.833 40.309C-160.833 40.309 -143.05 32.956 -122.304 84.285z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+ <path d="M-118.774 81.262C-118.774 81.262 -119.323 83.078 -120.092 82.779C-120.86 82.481 -119.977 31.675 -140.043 26.801C-140.043 26.801 -120.82 25.937 -118.774 81.262z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+ <path d="M-91.284 123.59C-91.284 123.59 -89.648 124.55 -90.118 125.227C-90.589 125.904 -139.763 113.102 -149.218 131.459C-149.218 131.459 -145.539 112.572 -91.284 123.59z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+ <path d="M-94.093 133.801C-94.093 133.801 -92.237 134.197 -92.471 134.988C-92.704 135.779 -143.407 139.121 -146.597 159.522C-146.597 159.522 -149.055 140.437 -94.093 133.801z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+ <path d="M-98.304 128.276C-98.304 128.276 -96.526 128.939 -96.872 129.687C-97.218 130.435 -147.866 126.346 -153.998 146.064C-153.998 146.064 -153.646 126.825 -98.304 128.276z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+ <path d="M-109.009 110.072C-109.009 110.072 -107.701 111.446 -108.34 111.967C-108.979 112.488 -152.722 86.634 -166.869 101.676C-166.869 101.676 -158.128 84.533 -109.009 110.072z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+ <path d="M-116.554 114.263C-116.554 114.263 -115.098 115.48 -115.674 116.071C-116.25 116.661 -162.638 95.922 -174.992 112.469C-174.992 112.469 -168.247 94.447 -116.554 114.263z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+ <path d="M-119.154 118.335C-119.154 118.335 -117.546 119.343 -118.036 120.006C-118.526 120.669 -167.308 106.446 -177.291 124.522C-177.291 124.522 -173.066 105.749 -119.154 118.335z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+ <path d="M-108.42 118.949C-108.42 118.949 -107.298 120.48 -107.999 120.915C-108.7 121.35 -148.769 90.102 -164.727 103.207C-164.727 103.207 -153.862 87.326 -108.42 118.949z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+ <path d="M-128.2 90C-128.2 90 -127.6 91.8 -128.4 92C-129.2 92.2 -157.8 50.2 -177.001 57.8C-177.001 57.8 -161.8 46 -128.2 90z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+ <path d="M-127.505 96.979C-127.505 96.979 -126.53 98.608 -127.269 98.975C-128.007 99.343 -164.992 64.499 -182.101 76.061C-182.101 76.061 -169.804 61.261 -127.505 96.979z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172">
+ <path d="M-127.62 101.349C-127.62 101.349 -126.498 102.88 -127.199 103.315C-127.9 103.749 -167.969 72.502 -183.927 85.607C-183.927 85.607 -173.062 69.726 -127.62 101.349z"/>
+ </g>
+ <g style="fill: #ffffff; stroke:#000000">
+ <path d="M-129.83 103.065C-129.327 109.113 -128.339 115.682 -126.6 118.801C-126.6 118.801 -130.2 131.201 -121.4 144.401C-121.4 144.401 -121.8 151.601 -120.2 154.801C-120.2 154.801 -116.2 163.201 -111.4 164.001C-107.516 164.648 -98.793 167.717 -88.932 169.121C-88.932 169.121 -71.8 183.201 -75 196.001C-75 196.001 -75.4 212.401 -79 214.001C-79 214.001 -67.4 202.801 -77 219.601L-81.4 238.401C-81.4 238.401 -55.8 216.801 -71.4 235.201L-81.4 261.201C-81.4 261.201 -61.8 242.801 -69 251.201L-72.2 260.001C-72.2 260.001 -29 232.801 -59.8 262.401C-59.8 262.401 -51.8 258.801 -47.4 261.601C-47.4 261.601 -40.6 260.401 -41.4 262.001C-41.4 262.001 -62.2 272.401 -65.8 290.801C-65.8 290.801 -57.4 280.801 -60.6 291.601L-60.2 303.201C-60.2 303.201 -56.2 281.601 -56.6 319.201C-56.6 319.201 -37.4 301.201 -49 322.001L-49 338.801C-49 338.801 -33.8 322.401 -40.2 335.201C-40.2 335.201 -30.2 326.401 -34.2 341.601C-34.2 341.601 -35 352.001 -30.6 340.801C-30.6 340.801 -14.6 310.201 -20.6 336.401C-20.6
336.401 -21.4 355.601 -16.6 340.801C-16.6 340.801 -16.2 351.201 -7 358.401C-7 358.401 -8.2 307.601 4.6 343.601L8.6 360.001C8.6 360.001 11.4 350.801 11 345.601C11 345.601 25.8 329.201 19 353.601C19 353.601 34.2 330.801 31 344.001C31 344.001 23.4 360.001 25 364.801C25 364.801 41.8 330.001 43 328.401C43 328.401 41 370.802 51.8 334.801C51.8 334.801 57.4 346.801 54.6 351.201C54.6 351.201 62.6 343.201 61.8 340.001C61.8 340.001 66.4 331.801 69.2 345.401C69.2 345.401 71 354.801 72.6 351.601C72.6 351.601 76.6 375.602 77.8 352.801C77.8 352.801 79.4 339.201 72.2 327.601C72.2 327.601 73 324.401 70.2 320.401C70.2 320.401 83.8 342.001 76.6 313.201C76.6 313.201 87.801 321.201 89.001 321.201C89.001 321.201 75.4 298.001 84.2 302.801C84.2 302.801 79 292.401 97.001 304.401C97.001 304.401 81 288.401 98.601 298.001C98.601 298.001 106.601 304.401 99.001 294.401C99.001 294.401 84.6 278.401 106.601 296.401C106.601 296.401 118.201 312.801 119.001 315.601C119.001 315.601 109.001 286.401 104.601 283.6
01C104.601 283.601 113.001 247.201 154.201 262.801C154.201 262.801 161.001 280.001 165.401 261.601C165.401 261.601 178.201 255.201 189.401 282.801C189.401 282.801 193.401 269.201 192.601 266.401C192.601 266.401 199.401 267.601 198.601 266.401C198.601 266.401 211.801 270.801 213.001 270.001C213.001 270.001 219.801 276.801 220.201 273.201C220.201 273.201 229.401 276.001 227.401 272.401C227.401 272.401 236.201 288.001 236.601 291.601L239.001 277.601L241.001 280.401C241.001 280.401 242.601 272.801 241.801 271.601C241.001 270.401 261.801 278.401 266.601 299.201L268.601 307.601C268.601 307.601 274.601 292.801 273.001 288.801C273.001 288.801 278.201 289.601 278.601 294.001C278.601 294.001 282.601 270.801 277.801 264.801C277.801 264.801 282.201 264.001 283.401 267.601L283.401 260.401C283.401 260.401 290.601 261.201 290.601 258.801C290.601 258.801 295.001 254.801 297.001 259.601C297.001 259.601 284.601 224.401 303.001 243.601C303.001 243.601 310.201 254.401 306.601 235.601C303.001 21
6.801 299.001 215.201 303.801 214.801C303.801 214.801 304.601 211.201 302.601 209.601C300.601 208.001 303.801 209.601 303.801 209.601C303.801 209.601 308.601 213.601 303.401 191.601C303.401 191.601 309.801 193.201 297.801 164.001C297.801 164.001 300.601 161.601 296.601 153.201C296.601 153.201 304.601 157.601 307.401 156.001C307.401 156.001 307.001 154.401 303.801 150.401C303.801 150.401 282.201 95.6 302.601 117.601C302.601 117.601 314.451 131.151 308.051 108.351C308.051 108.351 298.94 84.341 299.717 80.045L-129.83 103.065z"/>
+ </g>
+ <g style="fill: #cc7226; stroke:#000000">
+ <path d="M299.717 80.245C300.345 80.426 302.551 81.55 303.801 83.2C303.801 83.2 310.601 94 305.401 75.6C305.401 75.6 296.201 46.8 305.001 58C305.001 58 311.001 65.2 307.801 51.6C303.936 35.173 301.401 28.8 301.401 28.8C301.401 28.8 313.001 33.6 286.201 -6L295.001 -2.4C295.001 -2.4 275.401 -42 253.801 -47.2L245.801 -53.2C245.801 -53.2 284.201 -91.2 271.401 -128C271.401 -128 264.601 -133.2 255.001 -124C255.001 -124 248.601 -119.2 242.601 -120.8C242.601 -120.8 211.801 -119.6 209.801 -119.6C207.801 -119.6 173.001 -156.8 107.401 -139.2C107.401 -139.2 102.201 -137.2 97.801 -138.4C97.801 -138.4 79.4 -154.4 30.6 -131.6C30.6 -131.6 20.6 -129.6 19 -129.6C17.4 -129.6 14.6 -129.6 6.6 -123.2C-1.4 -116.8 -1.8 -116 -3.8 -114.4C-3.8 -114.4 -20.2 -103.2 -25 -102.4C-25 -102.4 -36.6 -96 -41 -86L-44.6 -84.8C-44.6 -84.8 -46.2 -77.6 -46.6 -76.4C-46.6 -76.4 -51.4 -72.8 -52.2 -67.2C-52.2 -67.2 -61 -61.2 -60.6 -56.8C-60.6 -56.8 -62.2 -51.6 -63 -46.8C-63 -46.8 -70.2 -42 -69.4 -39.2C-69.4 -39.2 -77
-25.2 -75.8 -18.4C-75.8 -18.4 -82.2 -18.8 -85 -16.4C-85 -16.4 -85.8 -11.6 -87.4 -11.2C-87.4 -11.2 -90.2 -10 -87.8 -6C-87.8 -6 -89.4 -3.2 -89.8 -1.6C-89.8 -1.6 -89 1.2 -93.4 6.8C-93.4 6.8 -99.8 25.6 -97.8 30.8C-97.8 30.8 -97.4 35.6 -100.2 37.2C-100.2 37.2 -103.8 36.8 -95.4 48.8C-95.4 48.8 -94.6 50 -97.8 52.4C-97.8 52.4 -115 56 -117.4 72.4C-117.4 72.4 -131 87.2 -131 92.4C-131 94.705 -130.729 97.852 -130.03 102.465C-130.03 102.465 -130.6 110.801 -103 111.601C-75.4 112.401 299.717 80.245 299.717 80.245z"/>
+ </g>
+ <g style="fill: #cc7226">
+ <path d="M-115.6 102.6C-140.6 63.2 -126.2 119.601 -126.2 119.601C-117.4 154.001 12.2 116.401 12.2 116.401C12.2 116.401 181.001 86 192.201 82C203.401 78 298.601 84.4 298.601 84.4L293.001 67.6C228.201 21.2 209.001 44.4 195.401 40.4C181.801 36.4 184.201 46 181.001 46.8C177.801 47.6 138.601 22.8 132.201 23.6C125.801 24.4 100.459 0.649 115.401 32.4C131.401 66.4 57 71.6 40.2 60.4C23.4 49.2 47.4 78.8 47.4 78.8C65.8 98.8 31.4 82 31.4 82C-3 69.2 -27 94.8 -30.2 95.6C-33.4 96.4 -38.2 99.6 -39 93.2C-39.8 86.8 -47.31 70.099 -79 96.4C-99 113.001 -112.8 91 -112.8 91L-115.6 102.6z"/>
+ </g>
+ <g style="fill: #e87f3a">
+ <path d="M133.51 25.346C127.11 26.146 101.743 2.407 116.71 34.146C133.31 69.346 58.31 73.346 41.51 62.146C24.709 50.946 48.71 80.546 48.71 80.546C67.11 100.546 32.709 83.746 32.709 83.746C-1.691 70.946 -25.691 96.546 -28.891 97.346C-32.091 98.146 -36.891 101.346 -37.691 94.946C-38.491 88.546 -45.87 72.012 -77.691 98.146C-98.927 115.492 -112.418 94.037 -112.418 94.037L-115.618 104.146C-140.618 64.346 -125.546 122.655 -125.546 122.655C-116.745 157.056 13.509 118.146 13.509 118.146C13.509 118.146 182.31 87.746 193.51 83.746C204.71 79.746 299.038 86.073 299.038 86.073L293.51 68.764C228.71 22.364 210.31 46.146 196.71 42.146C183.11 38.146 185.51 47.746 182.31 48.546C179.11 49.346 139.91 24.546 133.51 25.346z"/>
+ </g>
+ <g style="fill: #ea8c4d">
+ <path d="M134.819 27.091C128.419 27.891 103.685 3.862 118.019 35.891C134.219 72.092 59.619 75.092 42.819 63.892C26.019 52.692 50.019 82.292 50.019 82.292C68.419 102.292 34.019 85.492 34.019 85.492C-0.381 72.692 -24.382 98.292 -27.582 99.092C-30.782 99.892 -35.582 103.092 -36.382 96.692C-37.182 90.292 -44.43 73.925 -76.382 99.892C-98.855 117.983 -112.036 97.074 -112.036 97.074L-115.636 105.692C-139.436 66.692 -124.891 125.71 -124.891 125.71C-116.091 160.11 14.819 119.892 14.819 119.892C14.819 119.892 183.619 89.492 194.819 85.492C206.019 81.492 299.474 87.746 299.474 87.746L294.02 69.928C229.219 23.528 211.619 47.891 198.019 43.891C184.419 39.891 186.819 49.491 183.619 50.292C180.419 51.092 141.219 26.291 134.819 27.091z"/>
+ </g>
+ <g style="fill: #ec9961">
+ <path d="M136.128 28.837C129.728 29.637 104.999 5.605 119.328 37.637C136.128 75.193 60.394 76.482 44.128 65.637C27.328 54.437 51.328 84.037 51.328 84.037C69.728 104.037 35.328 87.237 35.328 87.237C0.928 74.437 -23.072 100.037 -26.272 100.837C-29.472 101.637 -34.272 104.837 -35.072 98.437C-35.872 92.037 -42.989 75.839 -75.073 101.637C-98.782 120.474 -111.655 100.11 -111.655 100.11L-115.655 107.237C-137.455 70.437 -124.236 128.765 -124.236 128.765C-115.436 163.165 16.128 121.637 16.128 121.637C16.128 121.637 184.928 91.237 196.129 87.237C207.329 83.237 299.911 89.419 299.911 89.419L294.529 71.092C229.729 24.691 212.929 49.637 199.329 45.637C185.728 41.637 188.128 51.237 184.928 52.037C181.728 52.837 142.528 28.037 136.128 28.837z"/>
+ </g>
+ <g style="fill: #eea575">
+ <path d="M137.438 30.583C131.037 31.383 106.814 7.129 120.637 39.383C137.438 78.583 62.237 78.583 45.437 67.383C28.637 56.183 52.637 85.783 52.637 85.783C71.037 105.783 36.637 88.983 36.637 88.983C2.237 76.183 -21.763 101.783 -24.963 102.583C-28.163 103.383 -32.963 106.583 -33.763 100.183C-34.563 93.783 -41.548 77.752 -73.763 103.383C-98.709 122.965 -111.273 103.146 -111.273 103.146L-115.673 108.783C-135.473 73.982 -123.582 131.819 -123.582 131.819C-114.782 166.22 17.437 123.383 17.437 123.383C17.437 123.383 186.238 92.983 197.438 88.983C208.638 84.983 300.347 91.092 300.347 91.092L295.038 72.255C230.238 25.855 214.238 51.383 200.638 47.383C187.038 43.383 189.438 52.983 186.238 53.783C183.038 54.583 143.838 29.783 137.438 30.583z"/>
+ </g>
+ <g style="fill: #f1b288">
+ <path d="M138.747 32.328C132.347 33.128 106.383 9.677 121.947 41.128C141.147 79.928 63.546 80.328 46.746 69.128C29.946 57.928 53.946 87.528 53.946 87.528C72.346 107.528 37.946 90.728 37.946 90.728C3.546 77.928 -20.454 103.528 -23.654 104.328C-26.854 105.128 -31.654 108.328 -32.454 101.928C-33.254 95.528 -40.108 79.665 -72.454 105.128C-98.636 125.456 -110.891 106.183 -110.891 106.183L-115.691 110.328C-133.691 77.128 -122.927 134.874 -122.927 134.874C-114.127 169.274 18.746 125.128 18.746 125.128C18.746 125.128 187.547 94.728 198.747 90.728C209.947 86.728 300.783 92.764 300.783 92.764L295.547 73.419C230.747 27.019 215.547 53.128 201.947 49.128C188.347 45.128 190.747 54.728 187.547 55.528C184.347 56.328 145.147 31.528 138.747 32.328z"/>
+ </g>
+ <g style="fill: #f3bf9c">
+ <path d="M140.056 34.073C133.655 34.873 107.313 11.613 123.255 42.873C143.656 82.874 64.855 82.074 48.055 70.874C31.255 59.674 55.255 89.274 55.255 89.274C73.655 109.274 39.255 92.474 39.255 92.474C4.855 79.674 -19.145 105.274 -22.345 106.074C-25.545 106.874 -30.345 110.074 -31.145 103.674C-31.945 97.274 -38.668 81.578 -71.145 106.874C-98.564 127.947 -110.509 109.219 -110.509 109.219L-115.709 111.874C-131.709 81.674 -122.273 137.929 -122.273 137.929C-113.473 172.329 20.055 126.874 20.055 126.874C20.055 126.874 188.856 96.474 200.056 92.474C211.256 88.474 301.22 94.437 301.22 94.437L296.056 74.583C231.256 28.183 216.856 54.874 203.256 50.874C189.656 46.873 192.056 56.474 188.856 57.274C185.656 58.074 146.456 33.273 140.056 34.073z"/>
+ </g>
+ <g style="fill: #f5ccb0">
+ <path d="M141.365 35.819C134.965 36.619 107.523 13.944 124.565 44.619C146.565 84.219 66.164 83.819 49.364 72.619C32.564 61.419 56.564 91.019 56.564 91.019C74.964 111.019 40.564 94.219 40.564 94.219C6.164 81.419 -17.836 107.019 -21.036 107.819C-24.236 108.619 -29.036 111.819 -29.836 105.419C-30.636 99.019 -37.227 83.492 -69.836 108.619C-98.491 130.438 -110.127 112.256 -110.127 112.256L-115.727 113.419C-130.128 85.019 -121.618 140.983 -121.618 140.983C-112.818 175.384 21.364 128.619 21.364 128.619C21.364 128.619 190.165 98.219 201.365 94.219C212.565 90.219 301.656 96.11 301.656 96.11L296.565 75.746C231.765 29.346 218.165 56.619 204.565 52.619C190.965 48.619 193.365 58.219 190.165 59.019C186.965 59.819 147.765 35.019 141.365 35.819z"/>
+ </g>
+ <g style="fill: #f8d8c4">
+ <path d="M142.674 37.565C136.274 38.365 108.832 15.689 125.874 46.365C147.874 85.965 67.474 85.565 50.674 74.365C33.874 63.165 57.874 92.765 57.874 92.765C76.274 112.765 41.874 95.965 41.874 95.965C7.473 83.165 -16.527 108.765 -19.727 109.565C-22.927 110.365 -27.727 113.565 -28.527 107.165C-29.327 100.765 -35.786 85.405 -68.527 110.365C-98.418 132.929 -109.745 115.293 -109.745 115.293L-115.745 114.965C-129.346 88.564 -120.963 144.038 -120.963 144.038C-112.163 178.438 22.673 130.365 22.673 130.365C22.673 130.365 191.474 99.965 202.674 95.965C213.874 91.965 302.093 97.783 302.093 97.783L297.075 76.91C232.274 30.51 219.474 58.365 205.874 54.365C192.274 50.365 194.674 59.965 191.474 60.765C188.274 61.565 149.074 36.765 142.674 37.565z"/>
+ </g>
+ <g style="fill: #fae5d7">
+ <path d="M143.983 39.31C137.583 40.11 110.529 17.223 127.183 48.11C149.183 88.91 68.783 87.31 51.983 76.11C35.183 64.91 59.183 94.51 59.183 94.51C77.583 114.51 43.183 97.71 43.183 97.71C8.783 84.91 -15.217 110.51 -18.417 111.31C-21.618 112.11 -26.418 115.31 -27.218 108.91C-28.018 102.51 -34.346 87.318 -67.218 112.11C-98.345 135.42 -109.363 118.329 -109.363 118.329L-115.764 116.51C-128.764 92.51 -120.309 147.093 -120.309 147.093C-111.509 181.493 23.983 132.11 23.983 132.11C23.983 132.11 192.783 101.71 203.983 97.71C215.183 93.71 302.529 99.456 302.529 99.456L297.583 78.074C232.783 31.673 220.783 60.11 207.183 56.11C193.583 52.11 195.983 61.71 192.783 62.51C189.583 63.31 150.383 38.51 143.983 39.31z"/>
+ </g>
+ <g style="fill: #fcf2eb">
+ <path d="M145.292 41.055C138.892 41.855 112.917 18.411 128.492 49.855C149.692 92.656 70.092 89.056 53.292 77.856C36.492 66.656 60.492 96.256 60.492 96.256C78.892 116.256 44.492 99.456 44.492 99.456C10.092 86.656 -13.908 112.256 -17.108 113.056C-20.308 113.856 -25.108 117.056 -25.908 110.656C-26.708 104.256 -32.905 89.232 -65.908 113.856C-98.273 137.911 -108.982 121.365 -108.982 121.365L-115.782 118.056C-128.582 94.856 -119.654 150.147 -119.654 150.147C-110.854 184.547 25.292 133.856 25.292 133.856C25.292 133.856 194.093 103.456 205.293 99.456C216.493 95.456 302.965 101.128 302.965 101.128L298.093 79.237C233.292 32.837 222.093 61.856 208.493 57.856C194.893 53.855 197.293 63.456 194.093 64.256C190.892 65.056 151.692 40.255 145.292 41.055z"/>
+ </g>
+ <g style="fill: #ffffff">
+ <path d="M-115.8 119.601C-128.6 97.6 -119 153.201 -119 153.201C-110.2 187.601 26.6 135.601 26.6 135.601C26.6 135.601 195.401 105.2 206.601 101.2C217.801 97.2 303.401 102.8 303.401 102.8L298.601 80.4C233.801 34 223.401 63.6 209.801 59.6C196.201 55.6 198.601 65.2 195.401 66C192.201 66.8 153.001 42 146.601 42.8C140.201 43.6 114.981 19.793 129.801 51.6C152.028 99.307 69.041 89.227 54.6 79.6C37.8 68.4 61.8 98 61.8 98C80.2 118.001 45.8 101.2 45.8 101.2C11.4 88.4 -12.6 114.001 -15.8 114.801C-19 115.601 -23.8 118.801 -24.6 112.401C-25.4 106 -31.465 91.144 -64.6 115.601C-98.2 140.401 -108.6 124.401 -108.6 124.401L-115.8 119.601z"/>
+ </g>
+ <g style="fill: #000000">
+ <path d="M-74.2 149.601C-74.2 149.601 -81.4 161.201 -60.6 174.401C-60.6 174.401 -59.2 175.801 -77.2 171.601C-77.2 171.601 -83.4 169.601 -85 159.201C-85 159.201 -89.8 154.801 -94.6 149.201C-99.4 143.601 -74.2 149.601 -74.2 149.601z"/>
+ </g>
+ <g style="fill: #cccccc">
+ <path d="M65.8 102C65.8 102 83.498 128.821 82.9 133.601C81.6 144.001 81.4 153.601 84.6 157.601C87.801 161.601 96.601 194.801 96.601 194.801C96.601 194.801 96.201 196.001 108.601 158.001C108.601 158.001 120.201 142.001 100.201 123.601C100.201 123.601 65 94.8 65.8 102z"/>
+ </g>
+ <g style="fill: #000000">
+ <path d="M-54.2 176.401C-54.2 176.401 -43 183.601 -57.4 214.801L-51 212.401C-51 212.401 -51.8 223.601 -55 226.001L-47.8 222.801C-47.8 222.801 -43 230.801 -47 235.601C-47 235.601 -30.2 243.601 -31 250.001C-31 250.001 -24.6 242.001 -28.6 235.601C-32.6 229.201 -39.8 233.201 -39 214.801L-47.8 218.001C-47.8 218.001 -42.2 209.201 -42.2 202.801L-50.2 205.201C-50.2 205.201 -34.731 178.623 -45.4 177.201C-51.4 176.401 -54.2 176.401 -54.2 176.401z"/>
+ </g>
+ <g style="fill: #cccccc">
+ <path d="M-21.8 193.201C-21.8 193.201 -19 188.801 -21.8 189.601C-24.6 190.401 -55.8 205.201 -61.8 214.801C-61.8 214.801 -27.4 190.401 -21.8 193.201z"/>
+ </g>
+ <g style="fill: #cccccc">
+ <path d="M-11.4 201.201C-11.4 201.201 -8.6 196.801 -11.4 197.601C-14.2 198.401 -45.4 213.201 -51.4 222.801C-51.4 222.801 -17 198.401 -11.4 201.201z"/>
+ </g>
+ <g style="fill: #cccccc">
+ <path d="M1.8 186.001C1.8 186.001 4.6 181.601 1.8 182.401C-1 183.201 -32.2 198.001 -38.2 207.601C-38.2 207.601 -3.8 183.201 1.8 186.001z"/>
+ </g>
+ <g style="fill: #cccccc">
+ <path d="M-21.4 229.601C-21.4 229.601 -21.4 223.601 -24.2 224.401C-27 225.201 -63 242.801 -69 252.401C-69 252.401 -27 226.801 -21.4 229.601z"/>
+ </g>
+ <g style="fill: #cccccc">
+ <path d="M-20.2 218.801C-20.2 218.801 -19 214.001 -21.8 214.801C-23.8 214.801 -50.2 226.401 -56.2 236.001C-56.2 236.001 -26.6 214.401 -20.2 218.801z"/>
+ </g>
+ <g style="fill: #cccccc">
+ <path d="M-34.6 266.401L-44.6 274.001C-44.6 274.001 -34.2 266.401 -30.6 267.601C-30.6 267.601 -37.4 278.801 -38.2 284.001C-38.2 284.001 -27.8 271.201 -22.2 271.601C-22.2 271.601 -14.6 272.001 -14.6 282.801C-14.6 282.801 -9 272.401 -5.8 272.801C-5.8 272.801 -4.6 279.201 -5.8 286.001C-5.8 286.001 -1.8 278.401 2.2 280.001C2.2 280.001 8.6 278.001 7.8 289.601C7.8 289.601 7.8 300.001 7 302.801C7 302.801 12.6 276.401 15 276.001C15 276.001 23 274.801 27.8 283.601C27.8 283.601 23.8 276.001 28.6 278.001C28.6 278.001 39.4 279.601 42.6 286.401C42.6 286.401 35.8 274.401 41.4 277.601C41.4 277.601 48.2 277.601 49.4 284.001C49.4 284.001 57.8 305.201 59.8 306.801C59.8 306.801 52.2 285.201 53.8 285.201C53.8 285.201 51.8 273.201 57 288.001C57 288.001 53.8 274.001 59.4 274.801C65 275.601 69.4 285.601 77.8 283.201C77.8 283.201 87.401 288.801 89.401 219.601L-34.6 266.401z"/>
+ </g>
+ <g style="fill: #000000">
+ <path d="M-29.8 173.601C-29.8 173.601 -15 167.601 25 173.601C25 173.601 32.2 174.001 39 165.201C45.8 156.401 72.6 149.201 79 151.201L88.601 157.601L89.401 158.801C89.401 158.801 101.801 169.201 102.201 176.801C102.601 184.401 87.801 232.401 78.2 248.401C68.6 264.401 59 276.801 39.8 274.401C39.8 274.401 19 270.401 -6.6 274.401C-6.6 274.401 -35.8 272.801 -38.6 264.801C-41.4 256.801 -27.4 241.601 -27.4 241.601C-27.4 241.601 -23 233.201 -24.2 218.801C-25.4 204.401 -25 176.401 -29.8 173.601z"/>
+ </g>
+ <g style="fill: #e5668c">
+ <path d="M-7.8 175.601C0.6 194.001 -29 259.201 -29 259.201C-31 260.801 -16.34 266.846 -6.2 264.401C4.746 261.763 45 266.001 45 266.001C68.6 250.401 81.4 206.001 81.4 206.001C81.4 206.001 91.801 182.001 74.2 178.801C56.6 175.601 -7.8 175.601 -7.8 175.601z"/>
+ </g>
+ <g style="fill: #b23259">
+ <path d="M-9.831 206.497C-6.505 193.707 -4.921 181.906 -7.8 175.601C-7.8 175.601 54.6 182.001 65.8 161.201C70.041 153.326 84.801 184.001 84.4 193.601C84.4 193.601 21.4 208.001 6.6 196.801L-9.831 206.497z"/>
+ </g>
+ <g style="fill: #a5264c">
+ <path d="M-5.4 222.801C-5.4 222.801 -3.4 230.001 -5.8 234.001C-5.8 234.001 -7.4 234.801 -8.6 235.201C-8.6 235.201 -7.4 238.801 -1.4 240.401C-1.4 240.401 0.6 244.801 3 245.201C5.4 245.601 10.2 251.201 14.2 250.001C18.2 248.801 29.4 244.801 29.4 244.801C29.4 244.801 35 241.601 43.8 245.201C43.8 245.201 46.175 244.399 46.6 240.401C47.1 235.701 50.2 232.001 52.2 230.001C54.2 228.001 63.8 215.201 62.6 214.801C61.4 214.401 -5.4 222.801 -5.4 222.801z"/>
+ </g>
+ <g style="fill: #ff727f; stroke:#000000">
+ <path d="M-9.8 174.401C-9.8 174.401 -12.6 196.801 -9.4 205.201C-6.2 213.601 -7 215.601 -7.8 219.601C-8.6 223.601 -4.2 233.601 1.4 239.601L13.4 241.201C13.4 241.201 28.6 237.601 37.8 240.401C37.8 240.401 46.794 241.744 50.2 226.801C50.2 226.801 55 220.401 62.2 217.601C69.4 214.801 76.6 173.201 72.6 165.201C68.6 157.201 54.2 152.801 38.2 168.401C22.2 184.001 20.2 167.201 -9.8 174.401z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+ <path d="M-8.2 249.201C-8.2 249.201 -9 247.201 -13.4 246.801C-13.4 246.801 -35.8 243.201 -44.2 230.801C-44.2 230.801 -51 225.201 -46.6 236.801C-46.6 236.801 -36.2 257.201 -29.4 260.001C-29.4 260.001 -13 264.001 -8.2 249.201z"/>
+ </g>
+ <g style="fill: #cc3f4c">
+ <path d="M71.742 185.229C72.401 177.323 74.354 168.709 72.6 165.201C66.154 152.307 49.181 157.695 38.2 168.401C22.2 184.001 20.2 167.201 -9.8 174.401C-9.8 174.401 -11.545 188.364 -10.705 198.376C-10.705 198.376 26.6 186.801 27.4 192.401C27.4 192.401 29 189.201 38.2 189.201C47.4 189.201 70.142 188.029 71.742 185.229z"/>
+ </g>
+ <g style="stroke:#a51926; stroke-width:2">
+ <path d="M28.6 175.201C28.6 175.201 33.4 180.001 29.8 189.601C29.8 189.601 15.4 205.601 17.4 219.601"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+ <path d="M-19.4 260.001C-19.4 260.001 -23.8 247.201 -15 254.001C-15 254.001 -10.2 256.001 -11.4 257.601C-12.6 259.201 -18.2 263.201 -19.4 260.001z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+ <path d="M-14.36 261.201C-14.36 261.201 -17.88 250.961 -10.84 256.401C-10.84 256.401 -6.419 258.849 -7.96 259.281C-12.52 260.561 -7.96 263.121 -14.36 261.201z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+ <path d="M-9.56 261.201C-9.56 261.201 -13.08 250.961 -6.04 256.401C-6.04 256.401 -1.665 258.711 -3.16 259.281C-6.52 260.561 -3.16 263.121 -9.56 261.201z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+ <path d="M-2.96 261.401C-2.96 261.401 -6.48 251.161 0.56 256.601C0.56 256.601 4.943 258.933 3.441 259.481C0.48 260.561 3.441 263.321 -2.96 261.401z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+ <path d="M3.52 261.321C3.52 261.321 0 251.081 7.041 256.521C7.041 256.521 10.881 258.121 9.921 259.401C8.961 260.681 9.921 263.241 3.52 261.321z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+ <path d="M10.2 262.001C10.2 262.001 5.4 249.601 14.6 256.001C14.6 256.001 19.4 258.001 18.2 259.601C17 261.201 18.2 264.401 10.2 262.001z"/>
+ </g>
+ <g style="stroke:#a5264c; stroke-width:2">
+ <path d="M-18.2 244.801C-18.2 244.801 -5 242.001 1 245.201C1 245.201 7 246.401 8.2 246.001C9.4 245.601 12.6 245.201 12.6 245.201"/>
+ </g>
+ <g style="stroke:#a5264c; stroke-width:2">
+ <path d="M15.8 253.601C15.8 253.601 27.8 240.001 39.8 244.401C46.816 246.974 45.8 243.601 46.6 240.801C47.4 238.001 47.6 233.801 52.6 230.801"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+ <path d="M33 237.601C33 237.601 29 226.801 26.2 239.601C23.4 252.401 20.2 256.001 18.6 258.801C18.6 258.801 18.6 264.001 27 263.601C27 263.601 37.8 263.201 38.2 260.401C38.6 257.601 37 246.001 33 237.601z"/>
+ </g>
+ <g style="stroke:#a5264c; stroke-width:2">
+ <path d="M47 244.801C47 244.801 50.6 242.401 53 243.601"/>
+ </g>
+ <g style="stroke:#a5264c; stroke-width:2">
+ <path d="M53.5 228.401C53.5 228.401 56.4 223.501 61.2 222.701"/>
+ </g>
+ <g style="fill: #b2b2b2">
+ <path d="M-25.8 265.201C-25.8 265.201 -7.8 268.401 -3.4 266.801C-3.4 266.801 5.4 266.801 -3 268.801C-3 268.801 -15.8 268.801 -23.8 267.601C-23.8 267.601 -35.4 262.001 -25.8 265.201z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+ <path d="M-11.8 172.001C-11.8 172.001 5.8 172.001 7.8 172.801C7.8 172.801 15 203.601 11.4 211.201C11.4 211.201 10.2 214.001 7.4 208.401C7.4 208.401 -11 175.601 -14.2 173.601C-17.4 171.601 -13 172.001 -11.8 172.001z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+ <path d="M-88.9 169.301C-88.9 169.301 -80 171.001 -67.4 173.601C-67.4 173.601 -62.6 196.001 -59.4 200.801C-56.2 205.601 -59.8 205.601 -63.4 202.801C-67 200.001 -81.8 186.001 -83.8 181.601C-85.8 177.201 -88.9 169.301 -88.9 169.301z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+ <path d="M-67.039 173.818C-67.039 173.818 -61.239 175.366 -60.23 177.581C-59.222 179.795 -61.432 183.092 -61.432 183.092C-61.432 183.092 -62.432 186.397 -63.634 184.235C-64.836 182.072 -67.708 174.412 -67.039 173.818z"/>
+ </g>
+ <g style="fill: #000000">
+ <path d="M-67 173.601C-67 173.601 -63.4 178.801 -59.8 178.801C-56.2 178.801 -55.818 178.388 -53 179.001C-48.4 180.001 -48.8 178.001 -42.2 179.201C-39.56 179.681 -37 178.801 -34.2 180.001C-31.4 181.201 -28.2 180.401 -27 178.401C-25.8 176.401 -21 172.201 -21 172.201C-21 172.201 -33.8 174.001 -36.6 174.801C-36.6 174.801 -59 176.001 -67 173.601z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+ <path d="M-22.4 173.801C-22.4 173.801 -28.85 177.301 -29.25 179.701C-29.65 182.101 -24 185.801 -24 185.801C-24 185.801 -21.25 190.401 -20.65 188.001C-20.05 185.601 -21.6 174.201 -22.4 173.801z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+ <path d="M-59.885 179.265C-59.885 179.265 -52.878 190.453 -52.661 179.242C-52.661 179.242 -52.104 177.984 -53.864 177.962C-59.939 177.886 -58.418 173.784 -59.885 179.265z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+ <path d="M-52.707 179.514C-52.707 179.514 -44.786 190.701 -45.422 179.421C-45.422 179.421 -45.415 179.089 -47.168 178.936C-51.915 178.522 -51.57 174.004 -52.707 179.514z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+ <path d="M-45.494 179.522C-45.494 179.522 -37.534 190.15 -38.203 180.484C-38.203 180.484 -38.084 179.251 -39.738 178.95C-43.63 178.244 -43.841 174.995 -45.494 179.522z"/>
+ </g>
+ <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5">
+ <path d="M-38.618 179.602C-38.618 179.602 -30.718 191.163 -30.37 181.382C-30.37 181.382 -28.726 180.004 -30.472 179.782C-36.29 179.042 -35.492 174.588 -38.618 179.602z"/>
+ </g>
+ <g style="fill: #e5e5b2">
+ <path d="M-74.792 183.132L-82.45 181.601C-85.05 176.601 -87.15 170.451 -87.15 170.451C-87.15 170.451 -80.8 171.451 -68.3 174.251C-68.3 174.251 -67.424 177.569 -65.952 183.364L-74.792 183.132z"/>
+ </g>
+ <g style="fill: #e5e5b2">
+ <path d="M-9.724 178.47C-11.39 175.964 -12.707 174.206 -13.357 173.8C-16.37 171.917 -12.227 172.294 -11.098 172.294C-11.098 172.294 5.473 172.294 7.356 173.047C7.356 173.047 7.88 175.289 8.564 178.68C8.564 178.68 -1.524 176.67 -9.724 178.47z"/>
+ </g>
+ <g style="fill: #cc7226">
+ <path d="M43.88 40.321C71.601 44.281 97.121 8.641 98.881 -1.04C100.641 -10.72 90.521 -22.6 90.521 -22.6C91.841 -25.68 87.001 -39.76 81.721 -49C76.441 -58.24 60.54 -57.266 43 -58.24C27.16 -59.12 8.68 -35.8 7.36 -34.04C6.04 -32.28 12.2 6.001 13.52 11.721C14.84 17.441 12.2 43.841 12.2 43.841C46.44 34.741 16.16 36.361 43.88 40.321z"/>
+ </g>
+ <g style="fill: #ea8e51">
+ <path d="M8.088 -33.392C6.792 -31.664 12.84 5.921 14.136 11.537C15.432 17.153 12.84 43.073 12.84 43.073C45.512 34.193 16.728 35.729 43.944 39.617C71.161 43.505 96.217 8.513 97.945 -0.992C99.673 -10.496 89.737 -22.16 89.737 -22.16C91.033 -25.184 86.281 -39.008 81.097 -48.08C75.913 -57.152 60.302 -56.195 43.08 -57.152C27.528 -58.016 9.384 -35.12 8.088 -33.392z"/>
+ </g>
+ <g style="fill: #efaa7c">
+ <path d="M8.816 -32.744C7.544 -31.048 13.48 5.841 14.752 11.353C16.024 16.865 13.48 42.305 13.48 42.305C44.884 33.145 17.296 35.097 44.008 38.913C70.721 42.729 95.313 8.385 97.009 -0.944C98.705 -10.272 88.953 -21.72 88.953 -21.72C90.225 -24.688 85.561 -38.256 80.473 -47.16C75.385 -56.064 60.063 -55.125 43.16 -56.064C27.896 -56.912 10.088 -34.44 8.816 -32.744z"/>
+ </g>
+ <g style="fill: #f4c6a8">
+ <path d="M9.544 -32.096C8.296 -30.432 14.12 5.761 15.368 11.169C16.616 16.577 14.12 41.537 14.12 41.537C43.556 32.497 17.864 34.465 44.072 38.209C70.281 41.953 94.409 8.257 96.073 -0.895C97.737 -10.048 88.169 -21.28 88.169 -21.28C89.417 -24.192 84.841 -37.504 79.849 -46.24C74.857 -54.976 59.824 -54.055 43.24 -54.976C28.264 -55.808 10.792 -33.76 9.544 -32.096z"/>
+ </g>
+ <g style="fill: #f9e2d3">
+ <path d="M10.272 -31.448C9.048 -29.816 14.76 5.681 15.984 10.985C17.208 16.289 14.76 40.769 14.76 40.769C42.628 31.849 18.432 33.833 44.136 37.505C69.841 41.177 93.505 8.129 95.137 -0.848C96.769 -9.824 87.385 -20.84 87.385 -20.84C88.609 -23.696 84.121 -36.752 79.225 -45.32C74.329 -53.888 59.585 -52.985 43.32 -53.888C28.632 -54.704 11.496 -33.08 10.272 -31.448z"/>
+ </g>
+ <g style="fill: #ffffff">
+ <path d="M44.2 36.8C69.4 40.4 92.601 8 94.201 -0.8C95.801 -9.6 86.601 -20.4 86.601 -20.4C87.801 -23.2 83.4 -36 78.6 -44.4C73.8 -52.8 59.346 -51.914 43.4 -52.8C29 -53.6 12.2 -32.4 11 -30.8C9.8 -29.2 15.4 5.6 16.6 10.8C17.8 16 15.4 40 15.4 40C40.9 31.4 19 33.2 44.2 36.8z"/>
+ </g>
+ <g style="fill: #cccccc">
+ <path d="M90.601 2.8C90.601 2.8 62.8 10.4 51.2 8.8C51.2 8.8 35.4 2.2 26.6 24C26.6 24 23 31.2 21 33.2C19 35.2 90.601 2.8 90.601 2.8z"/>
+ </g>
+ <g style="fill: #000000">
+ <path d="M94.401 0.6C94.401 0.6 65.4 12.8 55.4 12.4C55.4 12.4 39 7.8 30.6 22.4C30.6 22.4 22.2 31.6 19 33.2C19 33.2 18.6 34.8 25 30.8L35.4 36C35.4 36 50.2 45.6 59.8 29.6C59.8 29.6 63.8 18.4 63.8 16.4C63.8 14.4 85 8.8 86.601 8.4C88.201 8 94.801 3.8 94.401 0.6z"/>
+ </g>
+ <g style="fill: #99cc32">
+ <path d="M47 36.514C40.128 36.514 31.755 32.649 31.755 26.4C31.755 20.152 40.128 13.887 47 13.887C53.874 13.887 59.446 18.952 59.446 25.2C59.446 31.449 53.874 36.514 47 36.514z"/>
+ </g>
+ <g style="fill: #659900">
+ <path d="M43.377 19.83C38.531 20.552 33.442 22.055 33.514 21.839C35.054 17.22 41.415 13.887 47 13.887C51.296 13.887 55.084 15.865 57.32 18.875C57.32 18.875 52.004 18.545 43.377 19.83z"/>
+ </g>
+ <g style="fill: #ffffff">
+ <path d="M55.4 19.6C55.4 19.6 51 16.4 51 18.6C51 18.6 54.6 23 55.4 19.6z"/>
+ </g>
+ <g style="fill: #000000">
+ <path d="M45.4 27.726C42.901 27.726 40.875 25.7 40.875 23.2C40.875 20.701 42.901 18.675 45.4 18.675C47.9 18.675 49.926 20.701 49.926 23.2C49.926 25.7 47.9 27.726 45.4 27.726z"/>
+ </g>
+ <g style="fill: #cc7226">
+ <path d="M-58.6 14.4C-58.6 14.4 -61.8 -6.8 -59.4 -11.2C-59.4 -11.2 -48.6 -21.2 -49 -24.8C-49 -24.8 -49.4 -42.8 -50.6 -43.6C-51.8 -44.4 -59.4 -50.4 -65.4 -44C-65.4 -44 -75.8 -26 -75 -19.6L-75 -17.6C-75 -17.6 -82.6 -18 -84.2 -16C-84.2 -16 -85.4 -10.8 -86.6 -10.4C-86.6 -10.4 -89.4 -8 -87.4 -5.2C-87.4 -5.2 -89.4 -2.8 -89 1.2L-81.4 5.2C-81.4 5.2 -79.4 19.6 -68.6 24.8C-63.764 27.129 -60.6 20.4 -58.6 14.4z"/>
+ </g>
+ <g style="fill: #ffffff">
+ <path d="M-59.6 12.56C-59.6 12.56 -62.48 -6.52 -60.32 -10.48C-60.32 -10.48 -50.6 -19.48 -50.96 -22.72C-50.96 -22.72 -51.32 -38.92 -52.4 -39.64C-53.48 -40.36 -60.32 -45.76 -65.72 -40C-65.72 -40 -75.08 -23.8 -74.36 -18.04L-74.36 -16.24C-74.36 -16.24 -81.2 -16.6 -82.64 -14.8C-82.64 -14.8 -83.72 -10.12 -84.8 -9.76C-84.8 -9.76 -87.32 -7.6 -85.52 -5.08C-85.52 -5.08 -87.32 -2.92 -86.96 0.68L-80.12 4.28C-80.12 4.28 -78.32 17.24 -68.6 21.92C-64.248 24.015 -61.4 17.96 -59.6 12.56z"/>
+ </g>
+ <g style="fill: #eb955c">
+ <path d="M-51.05 -42.61C-52.14 -43.47 -59.63 -49.24 -65.48 -43C-65.48 -43 -75.62 -25.45 -74.84 -19.21L-74.84 -17.26C-74.84 -17.26 -82.25 -17.65 -83.81 -15.7C-83.81 -15.7 -84.98 -10.63 -86.15 -10.24C-86.15 -10.24 -88.88 -7.9 -86.93 -5.17C-86.93 -5.17 -88.88 -2.83 -88.49 1.07L-81.08 4.97C-81.08 4.97 -79.13 19.01 -68.6 24.08C-63.886 26.35 -60.8 19.79 -58.85 13.94C-58.85 13.94 -61.97 -6.73 -59.63 -11.02C-59.63 -11.02 -49.1 -20.77 -49.49 -24.28C-49.49 -24.28 -49.88 -41.83 -51.05 -42.61z"/>
+ </g>
+ <g style="fill: #f2b892">
+ <path d="M-51.5 -41.62C-52.48 -42.54 -59.86 -48.08 -65.56 -42C-65.56 -42 -75.44 -24.9 -74.68 -18.82L-74.68 -16.92C-74.68 -16.92 -81.9 -17.3 -83.42 -15.4C-83.42 -15.4 -84.56 -10.46 -85.7 -10.08C-85.7 -10.08 -88.36 -7.8 -86.46 -5.14C-86.46 -5.14 -88.36 -2.86 -87.98 0.94L-80.76 4.74C-80.76 4.74 -78.86 18.42 -68.6 23.36C-64.006 25.572 -61 19.18 -59.1 13.48C-59.1 13.48 -62.14 -6.66 -59.86 -10.84C-59.86 -10.84 -49.6 -20.34 -49.98 -23.76C-49.98 -23.76 -50.36 -40.86 -51.5 -41.62z"/>
+ </g>
+ <g style="fill: #f8dcc8">
+ <path d="M-51.95 -40.63C-52.82 -41.61 -60.09 -46.92 -65.64 -41C-65.64 -41 -75.26 -24.35 -74.52 -18.43L-74.52 -16.58C-74.52 -16.58 -81.55 -16.95 -83.03 -15.1C-83.03 -15.1 -84.14 -10.29 -85.25 -9.92C-85.25 -9.92 -87.84 -7.7 -85.99 -5.11C-85.99 -5.11 -87.84 -2.89 -87.47 0.81L-80.44 4.51C-80.44 4.51 -78.59 17.83 -68.6 22.64C-64.127 24.794 -61.2 18.57 -59.35 13.02C-59.35 13.02 -62.31 -6.59 -60.09 -10.66C-60.09 -10.66 -50.1 -19.91 -50.47 -23.24C-50.47 -23.24 -50.84 -39.89 -51.95 -40.63z"/>
+ </g>
+ <g style="fill: #ffffff">
+ <path d="M-59.6 12.46C-59.6 12.46 -62.48 -6.52 -60.32 -10.48C-60.32 -10.48 -50.6 -19.48 -50.96 -22.72C-50.96 -22.72 -51.32 -38.92 -52.4 -39.64C-53.16 -40.68 -60.32 -45.76 -65.72 -40C-65.72 -40 -75.08 -23.8 -74.36 -18.04L-74.36 -16.24C-74.36 -16.24 -81.2 -16.6 -82.64 -14.8C-82.64 -14.8 -83.72 -10.12 -84.8 -9.76C-84.8 -9.76 -87.32 -7.6 -85.52 -5.08C-85.52 -5.08 -87.32 -2.92 -86.96 0.68L-80.12 4.28C-80.12 4.28 -78.32 17.24 -68.6 21.92C-64.248 24.015 -61.4 17.86 -59.6 12.46z"/>
+ </g>
+ <g style="fill: #cccccc">
+ <path d="M-62.7 6.2C-62.7 6.2 -84.3 -4 -85.2 -4.8C-85.2 -4.8 -76.1 3.4 -75.3 3.4C-74.5 3.4 -62.7 6.2 -62.7 6.2z"/>
+ </g>
+ <g style="fill: #000000">
+ <path d="M-79.8 0C-79.8 0 -61.4 3.6 -61.4 8C-61.4 10.912 -61.643 24.331 -67 22.8C-75.4 20.4 -71.8 6 -79.8 0z"/>
+ </g>
+ <g style="fill: #99cc32">
+ <path d="M-71.4 3.8C-71.4 3.8 -62.422 5.274 -61.4 8C-60.8 9.6 -60.137 17.908 -65.6 19C-70.152 19.911 -72.382 9.69 -71.4 3.8z"/>
+ </g>
+ <g style="fill: #000000">
+ <path d="M14.595 46.349C14.098 44.607 15.409 44.738 17.2 44.2C19.2 43.6 31.4 39.8 32.2 37.2C33 34.6 46.2 39 46.2 39C48 39.8 52.4 42.4 52.4 42.4C57.2 43.6 63.8 44 63.8 44C66.2 45 69.6 47.8 69.6 47.8C84.2 58 96.601 50.8 96.601 50.8C116.601 44.2 110.601 27 110.601 27C107.601 18 110.801 14.6 110.801 14.6C111.001 10.8 118.201 17.2 118.201 17.2C120.801 21.4 121.601 26.4 121.601 26.4C129.601 37.6 126.201 19.8 126.201 19.8C126.401 18.8 123.601 15.2 123.601 14C123.601 12.8 121.801 9.4 121.801 9.4C118.801 6 121.201 -1 121.201 -1C123.001 -14.8 120.801 -13 120.801 -13C119.601 -14.8 110.401 -4.8 110.401 -4.8C108.201 -1.4 102.201 0.2 102.201 0.2C99.401 2 96.001 0.6 96.001 0.6C93.401 0.2 87.801 7.2 87.801 7.2C90.601 7 93.001 11.4 95.401 11.6C97.801 11.8 99.601 9.2 101.201 8.6C102.801 8 105.601 13.8 105.601 13.8C106.001 16.4 100.401 21.2 100.401 21.2C100.001 25.8 98.401 24.2 98.401 24.2C95.401 23.6 94.201 27.4 93.201 32C92.201 36.6 88.001 37 88.001 37C86.401 44.4 85.2 41.4 85.2 41.4C85 35
.8 79 41.6 79 41.6C77.8 43.6 73.2 41.4 73.2 41.4C66.4 39.4 68.8 37.4 68.8 37.4C70.6 35.2 81.8 37.4 81.8 37.4C84 35.8 76 31.8 76 31.8C75.4 30 76.4 25.6 76.4 25.6C77.6 22.4 84.4 16.8 84.4 16.8C93.801 15.6 91.001 14 91.001 14C84.801 8.8 79 16.4 79 16.4C76.8 22.6 59.4 37.6 59.4 37.6C54.6 41 57.2 34.2 53.2 37.6C49.2 41 28.6 32 28.6 32C17.038 30.807 14.306 46.549 10.777 43.429C10.777 43.429 16.195 51.949 14.595 46.349z"/>
+ </g>
+ <g style="fill: #000000">
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list