[Libreoffice-commits] .: 357 commits - binaryurp/prj binaryurp/qa binaryurp/source bridges/inc bridges/prj bridges/source bridges/unotypes cppuhelper/inc cppuhelper/prj cppuhelper/qa cppuhelper/source cppu/inc cppu/prj cppu/source cpputools/prj cpputools/source io/prj io/source javaunohelper/com javaunohelper/prj javaunohelper/util jurt/com jurt/prj jurt/source jurt/test jvmfwk/source offapi/com offapi/prj offapi/type_reference offapi/util offuh/prj offuh/source pyuno/demo pyuno/prj pyuno/source remotebridges/prj remotebridges/source sal/cppunittester sal/inc sal/osl sal/prj sal/qa sal/rtl sal/systools sal/util stoc/prj stoc/source stoc/test stoc/util udkapi/com udkapi/prj ure/prj ure/source xmlreader/inc xmlreader/prj xmlreader/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Mar 18 08:29:26 PDT 2011
binaryurp/prj/build.lst | 3
binaryurp/prj/d.lst | 4
binaryurp/qa/makefile.mk | 77
binaryurp/qa/test-cache.cxx | 84
binaryurp/qa/test-unmarshal.cxx | 112
binaryurp/qa/version.map | 34
binaryurp/source/binaryany.cxx | 98
binaryurp/source/binaryany.hxx | 73
binaryurp/source/binaryurp.component | 34
binaryurp/source/bridge.cxx | 978 ++++
binaryurp/source/bridge.hxx | 287 +
binaryurp/source/bridgefactory.cxx | 232
binaryurp/source/bridgefactory.hxx | 144
binaryurp/source/cache.hxx | 134
binaryurp/source/currentcontext.cxx | 80
binaryurp/source/currentcontext.hxx | 49
binaryurp/source/incomingreply.hxx | 58
binaryurp/source/incomingrequest.cxx | 300 +
binaryurp/source/incomingrequest.hxx | 86
binaryurp/source/lessoperators.cxx | 71
binaryurp/source/lessoperators.hxx | 50
binaryurp/source/makefile.mk | 69
binaryurp/source/marshal.cxx | 314 +
binaryurp/source/marshal.hxx | 95
binaryurp/source/outgoingrequest.hxx | 55
binaryurp/source/outgoingrequests.cxx | 80
binaryurp/source/outgoingrequests.hxx | 65
binaryurp/source/proxy.cxx | 260 +
binaryurp/source/proxy.hxx | 92
binaryurp/source/reader.cxx | 553 ++
binaryurp/source/reader.hxx | 89
binaryurp/source/readerstate.hxx | 52
binaryurp/source/specialfunctionids.hxx | 49
binaryurp/source/unmarshal.cxx | 563 ++
binaryurp/source/unmarshal.hxx | 106
binaryurp/source/writer.cxx | 476 +
binaryurp/source/writer.hxx | 185
binaryurp/source/writerstate.hxx | 55
bridges/inc/bridges/remote/bridgeimpl.hxx | 97
bridges/inc/bridges/remote/connection.h | 70
bridges/inc/bridges/remote/context.h | 262 -
bridges/inc/bridges/remote/counter.hxx | 60
bridges/inc/bridges/remote/helper.hxx | 71
bridges/inc/bridges/remote/mapping.hxx | 72
bridges/inc/bridges/remote/proxy.hxx | 94
bridges/inc/bridges/remote/remote.h | 96
bridges/inc/bridges/remote/remote.hxx | 76
bridges/inc/bridges/remote/stub.hxx | 67
bridges/inc/pch/precompiled_bridges.hxx | 4
bridges/prj/build.lst | 3
bridges/prj/d.lst | 18
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 50
bridges/source/jni_uno/makefile.mk | 1
bridges/source/remote/context/context.cxx | 487 --
bridges/source/remote/context/exports.dxp | 5
bridges/source/remote/context/makefile.mk | 63
bridges/source/remote/context/rmcxt.map | 10
bridges/source/remote/idl/corba.idl | 88
bridges/source/remote/static/helper.cxx | 212
bridges/source/remote/static/makefile.mk | 61
bridges/source/remote/static/mapping.cxx | 221
bridges/source/remote/static/proxy.cxx | 341 -
bridges/source/remote/static/remote.cxx | 164
bridges/source/remote/static/remote_types.cxx | 99
bridges/source/remote/static/remote_types.hxx | 92
bridges/source/remote/static/stub.cxx | 339 -
bridges/source/remote/urp/makefile.mk | 78
bridges/source/remote/urp/urp_bridgeimpl.cxx | 253 -
bridges/source/remote/urp/urp_bridgeimpl.hxx | 130
bridges/source/remote/urp/urp_cache.h | 60
bridges/source/remote/urp/urp_cache.hxx | 163
bridges/source/remote/urp/urp_dispatch.cxx | 118
bridges/source/remote/urp/urp_dispatch.hxx | 80
bridges/source/remote/urp/urp_environment.cxx | 554 --
bridges/source/remote/urp/urp_job.cxx | 941 ---
bridges/source/remote/urp/urp_job.hxx | 381 -
bridges/source/remote/urp/urp_log.cxx | 150
bridges/source/remote/urp/urp_log.hxx | 53
bridges/source/remote/urp/urp_marshal.cxx | 238
bridges/source/remote/urp/urp_marshal.hxx | 345 -
bridges/source/remote/urp/urp_marshal_decl.hxx | 109
bridges/source/remote/urp/urp_property.hxx | 94
bridges/source/remote/urp/urp_propertyobject.cxx | 796 ---
bridges/source/remote/urp/urp_propertyobject.hxx | 107
bridges/source/remote/urp/urp_reader.cxx | 834 ---
bridges/source/remote/urp/urp_reader.hxx | 81
bridges/source/remote/urp/urp_replycontainer.hxx | 78
bridges/source/remote/urp/urp_threadid.cxx | 52
bridges/source/remote/urp/urp_threadid.hxx | 62
bridges/source/remote/urp/urp_unmarshal.cxx | 709 --
bridges/source/remote/urp/urp_unmarshal.hxx | 281 -
bridges/source/remote/urp/urp_writer.cxx | 271 -
bridges/source/remote/urp/urp_writer.hxx | 85
bridges/unotypes/makefile.mk | 13
cppu/inc/com/sun/star/uno/Sequence.h | 2
cppu/prj/build.lst | 2
cppu/source/threadpool/jobqueue.cxx | 4
cppu/source/typelib/typelib.cxx | 1
cppu/source/uno/data.cxx | 11
cppuhelper/inc/cppuhelper/factory.hxx | 5
cppuhelper/inc/cppuhelper/implementationentry.hxx | 6
cppuhelper/inc/cppuhelper/propshlp.hxx | 35
cppuhelper/inc/cppuhelper/shlib.hxx | 4
cppuhelper/prj/build.lst | 2
cppuhelper/qa/propertysetmixin/JavaSupplier.java | 5
cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx | 8
cppuhelper/qa/propertysetmixin/makefile.mk | 59
cppuhelper/qa/propertysetmixin/qa_propertysetmixin.cpp.component | 34
cppuhelper/qa/propertysetmixin/qa_propertysetmixin.java.component | 34
cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx | 40
cppuhelper/source/bootstrap.cxx | 10
cppuhelper/source/cc5_solaris_sparc.map | 6
cppuhelper/source/factory.cxx | 8
cppuhelper/source/gcc3.map | 6
cppuhelper/source/msvc_win32_intel.map | 6
cppuhelper/source/propshlp.cxx | 109
cppuhelper/source/servicefactory.cxx | 73
cppuhelper/source/tdmgr.cxx | 34
cpputools/prj/build.lst | 1
cpputools/prj/d.lst | 2
cpputools/source/regcomplazy/makefile.mk | 54
cpputools/source/regcomplazy/regcomplazy.cxx | 285 -
cpputools/source/unoexe/unoexe.cxx | 17
io/prj/build.lst | 2
io/prj/d.lst | 5
io/source/TextInputStream/TextInputStream.cxx | 6
io/source/TextInputStream/makefile.mk | 8
io/source/TextInputStream/textinstream.component | 34
io/source/TextOutputStream/TextOutputStream.cxx | 6
io/source/TextOutputStream/makefile.mk | 8
io/source/TextOutputStream/textoutstream.component | 34
io/source/acceptor/acc_pipe.cxx | 10
io/source/acceptor/acceptor.component | 34
io/source/acceptor/acceptor.cxx | 6
io/source/acceptor/makefile.mk | 8
io/source/connector/connector.component | 34
io/source/connector/connector.cxx | 6
io/source/connector/makefile.mk | 8
io/source/stm/factreg.cxx | 6
io/source/stm/makefile.mk | 7
io/source/stm/streams.component | 55
javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java | 17
javaunohelper/com/sun/star/lib/uno/helper/Factory.java | 38
javaunohelper/prj/build.lst | 2
javaunohelper/prj/d.lst | 1
javaunohelper/util/juh.component | 34
javaunohelper/util/makefile.mk | 5
jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java | 12
jurt/com/sun/star/comp/connections/Acceptor.java | 15
jurt/com/sun/star/comp/connections/Connector.java | 15
jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java | 14
jurt/com/sun/star/comp/connections/PipedConnection.java | 13
jurt/com/sun/star/comp/urlresolver/UrlResolver.java | 14
jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java | 15
jurt/com/sun/star/lib/connections/pipe/pipeConnector.java | 15
jurt/com/sun/star/lib/connections/socket/socketAcceptor.java | 15
jurt/com/sun/star/lib/connections/socket/socketConnector.java | 15
jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java | 13
jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java | 17
jurt/com/sun/star/lib/uno/environments/remote/IProtocol.java | 2
jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java | 6
jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java | 9
jurt/com/sun/star/lib/uno/protocols/urp/Cache.java | 2
jurt/com/sun/star/lib/uno/protocols/urp/urp.java | 16
jurt/prj/build.lst | 1
jurt/prj/d.lst | 1
jurt/source/pipe/makefile.mk | 1
jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java | 100
jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java | 17
jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java | 45
jurt/test/com/sun/star/lib/uno/protocols/urp/makefile.mk | 9
jvmfwk/source/elements.cxx | 90
jvmfwk/source/elements.hxx | 28
offapi/com/sun/star/awt/AnimatedImagesControl.idl | 58
offapi/com/sun/star/awt/AnimatedImagesControlModel.idl | 57
offapi/com/sun/star/awt/SpinningProgressControlModel.idl | 54
offapi/com/sun/star/awt/UnoControlDialog.idl | 6
offapi/com/sun/star/awt/UnoControlDialogModelProvider.idl | 55
offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl | 9
offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl | 26
offapi/com/sun/star/awt/UnoControlThrobber.idl | 9
offapi/com/sun/star/awt/UnoControlThrobberModel.idl | 10
offapi/com/sun/star/awt/XAnimatedImages.idl | 176
offapi/com/sun/star/awt/XAnimation.idl | 63
offapi/com/sun/star/awt/XDialog2.idl | 4
offapi/com/sun/star/awt/XSimpleAnimation.idl | 19
offapi/com/sun/star/awt/XThrobber.idl | 13
offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl | 15
offapi/com/sun/star/awt/grid/GridColumnEvent.idl | 10
offapi/com/sun/star/awt/grid/GridControlEvent.idl | 54
offapi/com/sun/star/awt/grid/GridDataEvent.idl | 95
offapi/com/sun/star/awt/grid/ScrollBarMode.idl | 70
offapi/com/sun/star/awt/grid/SortableGridDataModel.idl | 102
offapi/com/sun/star/awt/grid/UnoControlGridModel.idl | 113
offapi/com/sun/star/awt/grid/XGridCell.idl | 56
offapi/com/sun/star/awt/grid/XGridCellRenderer.idl | 52
offapi/com/sun/star/awt/grid/XGridColumn.idl | 110
offapi/com/sun/star/awt/grid/XGridColumnListener.idl | 25
offapi/com/sun/star/awt/grid/XGridColumnModel.idl | 86
offapi/com/sun/star/awt/grid/XGridControl.idl | 47
offapi/com/sun/star/awt/grid/XGridControlListener.idl | 49
offapi/com/sun/star/awt/grid/XGridDataListener.idl | 17
offapi/com/sun/star/awt/grid/XGridDataModel.idl | 98
offapi/com/sun/star/awt/grid/XGridSelection.idl | 48
offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl | 163
offapi/com/sun/star/awt/grid/XSortableGridData.idl | 77
offapi/com/sun/star/awt/grid/XSortableMutableGridDataModel.idl | 61
offapi/com/sun/star/awt/grid/makefile.mk | 12
offapi/com/sun/star/awt/makefile.mk | 8
offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl | 56
offapi/com/sun/star/awt/tab/UnoControlTabPage.idl | 56
offapi/com/sun/star/awt/tab/UnoControlTabPageContainer.idl | 55
offapi/com/sun/star/awt/tab/UnoControlTabPageContainerModel.idl | 55
offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl | 56
offapi/com/sun/star/awt/tab/XTabPage.idl | 52
offapi/com/sun/star/awt/tab/XTabPageContainer.idl | 109
offapi/com/sun/star/awt/tab/XTabPageContainerListener.idl | 57
offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl | 53
offapi/com/sun/star/awt/tab/XTabPageModel.idl | 87
offapi/com/sun/star/awt/tab/makefile.mk | 53
offapi/com/sun/star/awt/tree/XTreeControl.idl | 2
offapi/com/sun/star/chart/ChartAxis.idl | 43
offapi/com/sun/star/chart/ChartAxisType.idl | 57
offapi/com/sun/star/chart/ChartLegendExpansion.idl | 71
offapi/com/sun/star/chart/Diagram.idl | 12
offapi/com/sun/star/chart/TimeIncrement.idl | 67
offapi/com/sun/star/chart/TimeInterval.idl | 57
offapi/com/sun/star/chart/TimeUnit.idl | 50
offapi/com/sun/star/chart/XAxis.idl | 60
offapi/com/sun/star/chart/XAxisSupplier.idl | 61
offapi/com/sun/star/chart/XChartDocument.idl | 7
offapi/com/sun/star/chart/XDateCategories.idl | 70
offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl | 29
offapi/com/sun/star/chart/makefile.mk | 8
offapi/com/sun/star/chart2/AxisType.idl | 3
offapi/com/sun/star/chart2/Break.idl | 46
offapi/com/sun/star/chart2/CustomLegendEntry.idl | 50
offapi/com/sun/star/chart2/ExplicitIncrementData.idl | 96
offapi/com/sun/star/chart2/ExplicitScaleData.idl | 45
offapi/com/sun/star/chart2/ExplicitSubIncrement.idl | 30
offapi/com/sun/star/chart2/IncrementData.idl | 4
offapi/com/sun/star/chart2/Legend.idl | 6
offapi/com/sun/star/chart2/LegendExpansion.idl | 75
offapi/com/sun/star/chart2/LegendSymbolStyle.idl | 107
offapi/com/sun/star/chart2/ScaleData.idl | 36
offapi/com/sun/star/chart2/StandardDiagramCreationParameters.idl | 5
offapi/com/sun/star/chart2/SubIncrement.idl | 4
offapi/com/sun/star/chart2/ViewLegendEntry.idl | 58
offapi/com/sun/star/chart2/XAnyDescriptionAccess.idl | 103
offapi/com/sun/star/chart2/XAxis.idl | 26
offapi/com/sun/star/chart2/XCoordinateSystem.idl | 26
offapi/com/sun/star/chart2/XDiagram.idl | 27
offapi/com/sun/star/chart2/XLegend.idl | 33
offapi/com/sun/star/chart2/XLegendEntry.idl | 30
offapi/com/sun/star/chart2/XLegendSymbolProvider.idl | 35
offapi/com/sun/star/chart2/XPlotter.idl | 128
offapi/com/sun/star/chart2/XUndoHelper.idl | 89
offapi/com/sun/star/chart2/XUndoManager.idl | 111
offapi/com/sun/star/chart2/XUndoSupplier.idl | 57
offapi/com/sun/star/chart2/makefile.mk | 14
offapi/com/sun/star/deployment/XExtensionManager.idl | 21
offapi/com/sun/star/deployment/XPackage.idl | 8
offapi/com/sun/star/deployment/XPackageRegistry.idl | 7
offapi/com/sun/star/document/EmptyUndoStackException.idl | 51
offapi/com/sun/star/document/MediaDescriptor.idl | 29
offapi/com/sun/star/document/OfficeDocument.idl | 40
offapi/com/sun/star/document/UndoContextNotClosedException.idl | 51
offapi/com/sun/star/document/UndoFailedException.idl | 56
offapi/com/sun/star/document/UndoManagerEvent.idl | 63
offapi/com/sun/star/document/XDocumentEventBroadcaster.idl | 9
offapi/com/sun/star/document/XUndoAction.idl | 76
offapi/com/sun/star/document/XUndoManager.idl | 337 +
offapi/com/sun/star/document/XUndoManagerListener.idl | 144
offapi/com/sun/star/document/XUndoManagerSupplier.idl | 55
offapi/com/sun/star/document/makefile.mk | 8
offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl | 65
offapi/com/sun/star/embed/XHierarchicalStorageAccess2.idl | 109
offapi/com/sun/star/embed/XStorage2.idl | 165
offapi/com/sun/star/embed/makefile.mk | 3
offapi/com/sun/star/formula/FormulaProperties.idl | 8
offapi/com/sun/star/i18n/TransliterationModules.idl | 8
offapi/com/sun/star/inspection/LineDescriptor.idl | 4
offapi/com/sun/star/linguistic2/XLanguageGuessing.idl | 4
offapi/com/sun/star/script/NativeObjectWrapper.idl | 42
offapi/com/sun/star/script/makefile.mk | 3
offapi/com/sun/star/script/vba/VBAMacroResolver.idl | 49
offapi/com/sun/star/script/vba/XVBAMacroResolver.idl | 94
offapi/com/sun/star/script/vba/makefile.mk | 2
offapi/com/sun/star/sdb/XSubDocument.idl | 8
offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl | 4
offapi/com/sun/star/sheet/SheetFilterDescriptor.idl | 27
offapi/com/sun/star/sheet/SpreadsheetViewObjectsMode.idl | 61
offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl | 10
offapi/com/sun/star/sheet/TableFilterField.idl | 11
offapi/com/sun/star/sheet/TableFilterField2.idl | 12
offapi/com/sun/star/sheet/XDatabaseRange.idl | 12
offapi/com/sun/star/sheet/XSheetFilterDescriptor.idl | 14
offapi/com/sun/star/sheet/XSheetFilterDescriptor2.idl | 12
offapi/com/sun/star/sheet/makefile.mk | 1
offapi/com/sun/star/task/PDFExportException.idl | 52
offapi/com/sun/star/task/makefile.mk | 1
offapi/com/sun/star/text/DocumentSettings.idl | 10
offapi/com/sun/star/text/PrintPreviewSettings.idl | 2
offapi/com/sun/star/text/TextMarkupType.idl | 23
offapi/com/sun/star/ui/UIElementType.idl | 10
offapi/com/sun/star/util/DiskFullException.idl | 2
offapi/com/sun/star/util/FileIOException.idl | 3
offapi/com/sun/star/util/NotLockedException.idl | 50
offapi/com/sun/star/util/OfficeInstallationDirectories.idl | 6
offapi/com/sun/star/util/XBroadcaster.idl | 6
offapi/com/sun/star/util/XLockable.idl | 79
offapi/com/sun/star/util/XOfficeInstallationDirectories.idl | 7
offapi/com/sun/star/util/XTextSearch.idl | 162
offapi/com/sun/star/util/makefile.mk | 2
offapi/com/sun/star/view/XMultiSelectionSupplier.idl | 4
offapi/com/sun/star/xml/sax/XFastAttributeList.idl | 4
offapi/prj/build.lst | 3
offapi/prj/d.lst | 2
offapi/type_reference/typelibrary_history.txt | 4
offapi/type_reference/types.rdb |binary
offapi/util/makefile.mk | 1
offuh/prj/build.lst | 2
offuh/prj/d.lst | 44
offuh/source/makefile.mk | 12
pyuno/demo/pyunoenv.tcsh | 7
pyuno/prj/build.lst | 2
pyuno/prj/d.lst | 3
pyuno/source/loader/makefile.mk | 24
pyuno/source/loader/pythonloader.component | 34
pyuno/source/loader/pyuno_loader.cxx | 6
remotebridges/prj/build.lst | 6
remotebridges/prj/d.lst | 19
remotebridges/source/bridge/bridge_connection.cxx | 141
remotebridges/source/bridge/bridge_connection.hxx | 59
remotebridges/source/bridge/bridge_provider.cxx | 182
remotebridges/source/bridge/makefile.mk | 64
remotebridges/source/bridge/remote_bridge.cxx | 475 -
remotebridges/source/bridge/remote_bridge.hxx | 149
remotebridges/source/bridge/remotebridge.xml | 47
remotebridges/source/dynamicloader/dynamicloader.cxx | 434 -
remotebridges/source/dynamicloader/dynamicloader.xml | 36
remotebridges/source/dynamicloader/makefile.mk | 69
remotebridges/source/factory/brdgfctr.xml | 44
remotebridges/source/factory/bridgefactory.cxx | 501 --
remotebridges/source/factory/bridgeimpl.cxx | 273 -
remotebridges/source/factory/bridgeimpl.hxx | 108
remotebridges/source/factory/makefile.mk | 65
remotebridges/source/unourl_resolver/makefile.mk | 8
remotebridges/source/unourl_resolver/unourl_resolver.cxx | 6
remotebridges/source/unourl_resolver/uuresolver.component | 34
sal/cppunittester/makefile.mk | 7
sal/inc/osl/mutex.hxx | 1
sal/inc/osl/thread.h | 12
sal/inc/osl/thread.hxx | 5
sal/inc/rtl/malformeduriexception.hxx | 4
sal/inc/rtl/math.h | 8
sal/inc/sal/cppunit.h | 43
sal/inc/sal/types.h | 2
sal/osl/all/makefile.mk | 6
sal/osl/all/printtrace.cxx | 65
sal/osl/inc/printtrace.h | 46
sal/osl/os2/diagnose.c | 26
sal/osl/os2/system.h | 3
sal/osl/os2/thread.c | 4
sal/osl/unx/diagnose.c | 33
sal/osl/unx/nlsupport.c | 4
sal/osl/unx/pipe.c | 2
sal/osl/unx/process_impl.cxx | 4
sal/osl/unx/thread.c | 16
sal/osl/w32/diagnose.c | 36
sal/osl/w32/thread.c | 25
sal/prj/build.lst | 3
sal/qa/OStringBuffer/makefile.mk | 2
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 30
sal/qa/OStringBuffer/rtl_String_Const.h | 6
sal/qa/osl/pipe/makefile.mk | 2
sal/qa/osl/pipe/osl_Pipe.cxx | 87
sal/qa/osl/profile/makefile.mk | 1
sal/qa/osl/setthreadname/makefile.mk | 57
sal/qa/osl/setthreadname/test-setthreadname.cxx | 87
sal/qa/osl/setthreadname/version.map | 34
sal/qa/rtl/crc32/makefile.mk | 2
sal/qa/rtl/doublelock/makefile.mk | 2
sal/qa/rtl/locale/makefile.mk | 2
sal/qa/rtl/math/makefile.mk | 83
sal/qa/rtl/math/rtl_math.cxx | 2
sal/qa/rtl/math/rtl_old_testint64.cxx | 124
sal/qa/rtl/math/test-rtl-math.cxx | 76
sal/qa/rtl_strings/makefile.mk | 1
sal/rtl/source/math.cxx | 2
sal/systools/win32/uwinapi/ResolveUnicows.cpp | 5
sal/util/sal.map | 1
stoc/prj/build.lst | 2
stoc/prj/d.lst | 10
stoc/source/bootstrap/services.cxx | 6
stoc/source/corereflection/base.hxx | 3
stoc/source/corereflection/crefl.cxx | 32
stoc/source/corereflection/lrucache.hxx | 3
stoc/source/corereflection/makefile.mk | 7
stoc/source/corereflection/reflection.component | 35
stoc/source/implementationregistration/implreg.cxx | 117
stoc/source/inspect/introspection.component | 34
stoc/source/inspect/introspection.cxx | 27
stoc/source/inspect/makefile.mk | 7
stoc/source/invocation/invocation.component | 34
stoc/source/invocation/invocation.cxx | 6
stoc/source/invocation/makefile.mk | 6
stoc/source/invocation_adapterfactory/iafactory.cxx | 8
stoc/source/invocation_adapterfactory/invocadapt.component | 34
stoc/source/invocation_adapterfactory/makefile.mk | 8
stoc/source/javaloader/javaloader.component | 35
stoc/source/javaloader/javaloader.cxx | 6
stoc/source/javaloader/makefile.mk | 7
stoc/source/javavm/javavm.component | 35
stoc/source/javavm/javavm.cxx | 37
stoc/source/javavm/makefile.mk | 7
stoc/source/namingservice/makefile.mk | 7
stoc/source/namingservice/namingservice.component | 34
stoc/source/namingservice/namingservice.cxx | 6
stoc/source/proxy_factory/makefile.mk | 8
stoc/source/proxy_factory/proxyfac.component | 34
stoc/source/proxy_factory/proxyfac.cxx | 7
stoc/source/registry_tdprovider/tdprovider.cxx | 33
stoc/source/simpleregistry/makefile.mk | 3
stoc/source/simpleregistry/simpleregistry.cxx | 2386 +++++-----
stoc/source/simpleregistry/textualservices.cxx | 1228 +++++
stoc/source/simpleregistry/textualservices.hxx | 67
stoc/source/stocservices/stocservices.cxx | 6
stoc/test/uriproc/makefile.mk | 20
stoc/util/bootstrap.component | 62
stoc/util/makefile.mk | 16
stoc/util/stocservices.component | 51
udkapi/com/sun/star/script/XDirectInvocation.idl | 82
udkapi/com/sun/star/script/makefile.mk | 1
udkapi/prj/makefile.mk | 61
ure/prj/build.lst | 2
ure/prj/d.lst | 16
ure/source/README | 12
ure/source/makefile.mk | 75
xmlreader/inc/makefile.mk | 40
xmlreader/inc/pch/precompiled_xmlreader.cxx | 28
xmlreader/inc/pch/precompiled_xmlreader.hxx | 32
xmlreader/inc/xmlreader/README | 34
xmlreader/inc/xmlreader/detail/xmlreaderdllapi.hxx | 41
xmlreader/inc/xmlreader/pad.hxx | 59
xmlreader/inc/xmlreader/span.hxx | 69
xmlreader/inc/xmlreader/xmlreader.hxx | 199
xmlreader/prj/build.lst | 3
xmlreader/prj/d.lst | 10
xmlreader/source/makefile.mk | 53
xmlreader/source/pad.cxx | 85
xmlreader/source/span.cxx | 66
xmlreader/source/xmlreader.cxx | 1054 ++++
453 files changed, 17501 insertions(+), 17602 deletions(-)
New commits:
commit 20b693ec1af607c5055523a7b3d7d092ebdf7480
Merge: 980b7de... fddd331...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Mar 18 16:13:58 2011 +0100
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/ure
Conflicts:
sal/qa/rtl/math/rtl_math.cxx
sal/qa/rtl/math/test_rtl_math.cxx
diff --cc sal/qa/rtl/math/rtl_math.cxx
index 0000000,a6c4cc9..9fe5c82
mode 000000,100644..100644
--- a/sal/qa/rtl/math/rtl_math.cxx
+++ b/sal/qa/rtl/math/rtl_math.cxx
@@@ -1,0 -1,631 +1,631 @@@
+ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+ /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
++ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_sal.hxx"
+ #ifdef WIN32
+ // LLA: take a look into Microsofts math.h implementation, why this define is need
+ #define _USE_MATH_DEFINES
+ #endif
+
+ #include <math.h>
+ #include <rtl/math.h>
+ #include <rtl/string.hxx>
+
+ #include <cppunit/TestFixture.h>
+ #include <cppunit/extensions/HelperMacros.h>
+ #include <cppunit/plugin/TestPlugIn.h>
+
+ #include "valueequal.hxx"
+
+ namespace rtl_math
+ {
+
+ class test : public CppUnit::TestFixture
+ {
+ public:
+ // initialise your test code values here.
+ void setUp()
+ {
+ }
+
+ void tearDown()
+ {
+ }
+
+
+ void equalCheck(double _nResult, double _nExpect) /* throws Exception */
+ {
+ bool bEqualResult = is_double_equal(_nResult, _nExpect);
+
+ rtl::OString sError = "rtl_math_round expected result is wrong should:(";
+ sError += rtl::OString::valueOf(_nExpect);
+ sError += ") but is:(";
+ sError += rtl::OString::valueOf(_nResult);
+ sError += ")";
+
+ CPPUNIT_ASSERT_MESSAGE(sError.getStr(), bEqualResult == true);
+ }
+
+ // insert your test code here.
+ void round_000()
+ {
+ // this is demonstration code
+ // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+ double nValue = M_PI;
+ double nResult = 0.0;
+
+ nResult = rtl_math_round(nValue, 0, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(3.0));
+
+ nResult = rtl_math_round(nValue, 2, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(3.14));
+
+ nResult = rtl_math_round(nValue, 3, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(3.142));
+
+ nResult = rtl_math_round(nValue, 10, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(3.1415926536));
+ }
+
+ // insert your test code here.
+ void round_001_positiv()
+ {
+ // this is demonstration code
+ // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+ double nResult = 0.0;
+
+ nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(0.2));
+ }
+
+ void round_001_negativ()
+ {
+ // this is demonstration code
+ // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+ double nResult = 0.0;
+
+ nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_Corrected);
+ equalCheck(nResult, double(-0.2));
+ }
+ // -----------------------------------------------------------------------------
+ void round_002_positiv()
+ {
+ // this is demonstration code
+ // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+ double nResult = 0.0;
+
+ nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(0.1));
+ }
+
+ void round_002_negativ()
+ {
+ // this is demonstration code
+ // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+ double nResult = 0.0;
+
+ nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_Down);
+ equalCheck(nResult, double(-0.1));
+ }
+ // -----------------------------------------------------------------------------
+ void round_003_positiv()
+ {
+ // this is demonstration code
+ // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+ double nResult = 0.0;
+
+ nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(0.2));
+ }
+
+ void round_003_negativ()
+ {
+ // this is demonstration code
+ // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+ double nResult = 0.0;
+
+ nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_Up);
+ equalCheck(nResult, double(-0.2));
+ }
+ // -----------------------------------------------------------------------------
+ void round_004_positiv()
+ {
+ // this is demonstration code
+ // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+ double nResult = 0.0;
+
+ nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(0.1));
+ }
+
+ void round_004_negativ()
+ {
+ // this is demonstration code
+ // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+ double nResult = 0.0;
+
+ nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_Floor);
+ equalCheck(nResult, double(-0.2));
+ }
+ // -----------------------------------------------------------------------------
+ void round_005_positiv()
+ {
+ // this is demonstration code
+ // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+ double nResult = 0.0;
+
+ nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(0.2));
+ }
+
+ void round_005_negativ()
+ {
+ // this is demonstration code
+ // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+ double nResult = 0.0;
+
+ nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_Ceiling);
+ equalCheck(nResult, double(-0.1));
+ }
+ // -----------------------------------------------------------------------------
+ void round_006_positiv()
+ {
+ // this is demonstration code
+ // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+ double nResult = 0.0;
+
+ nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(0.2));
+ }
+
+ void round_006_negativ()
+ {
+ // this is demonstration code
+ // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+ double nResult = 0.0;
+
+ nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_HalfDown);
+ equalCheck(nResult, double(-0.2));
+ }
+ // -----------------------------------------------------------------------------
+ void round_007_positiv()
+ {
+ // this is demonstration code
+ // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+ double nResult = 0.0;
+
+ nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(0.1));
+
+ nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(0.2));
+
+ nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(0.2));
+ }
+
+ void round_007_negativ()
+ {
+ // this is demonstration code
+ // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
+
+ double nResult = 0.0;
+
+ nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(-0.1));
+
+ nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(-0.2));
+
+ nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_HalfUp);
+ equalCheck(nResult, double(-0.2));
+ }
+
+ // Change the following lines only, if you add, remove or rename
+ // member functions of the current class,
+ // because these macros are need by auto register mechanism.
+
+ CPPUNIT_TEST_SUITE(test);
+ CPPUNIT_TEST(round_000);
+
+ CPPUNIT_TEST(round_001_positiv);
+ CPPUNIT_TEST(round_001_negativ);
+
+ CPPUNIT_TEST(round_002_positiv);
+ CPPUNIT_TEST(round_002_negativ);
+
+ CPPUNIT_TEST(round_003_positiv);
+ CPPUNIT_TEST(round_003_negativ);
+
+ CPPUNIT_TEST(round_004_positiv);
+ CPPUNIT_TEST(round_004_negativ);
+
+ CPPUNIT_TEST(round_005_positiv);
+ CPPUNIT_TEST(round_005_negativ);
+
+ CPPUNIT_TEST(round_006_positiv);
+ CPPUNIT_TEST(round_006_negativ);
+
+ CPPUNIT_TEST(round_007_positiv);
+ CPPUNIT_TEST(round_007_negativ);
+
+ CPPUNIT_TEST_SUITE_END();
+ }; // class test
+
+ // -----------------------------------------------------------------------------
+ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_math::test);
+ } // namespace rtl_math
+
+
+ // -----------------------------------------------------------------------------
+
+ // this macro creates an empty function, which will called by the RegisterAllFunctions()
+ // to let the user the possibility to also register some functions by hand.
+ CPPUNIT_PLUGIN_IMPLEMENT();
+
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 980b7de55c897cb38f5706164a053f38c1b35d88
Merge: 2475c0b... c953ef4...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Mar 18 15:58:02 2011 +0100
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
bridges/source/remote/urp/urp_environment.cxx
bridges/source/remote/urp/urp_propertyobject.cxx
bridges/source/remote/urp/urp_reader.cxx
remotebridges/source/factory/bridgefactory.cxx
stoc/source/corereflection/crefl.cxx
stoc/source/javavm/javavm.cxx
stoc/source/simpleregistry/simpleregistry.cxx
diff --cc cppu/prj/build.lst
index 0af8b30,4ded629..8c6fa2f
--- a/cppu/prj/build.lst
+++ b/cppu/prj/build.lst
@@@ -10,5 -10,4 +10,5 @@@ cu cppu\source\UnsafeBridge nmake
cu cppu\source\AffineBridge nmake - all cu_AffineBridge cu_inc NULL
cu cppu\source\LogBridge nmake - all cu_LogBridge cu_inc NULL
cu cppu\util nmake - all cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge cu_LogBridge NULL
-cd cppu\qa nmake - all cu_qa_cppunit cu_util NULL
+cu cppu\qa nmake - all cu_qa_cppunit cu_util NULL
- cu cppu\qa\cppumaker nmake - all cu_qa_cppumaker cu_util NULL
++#cu cppu\qa\cppumaker nmake - all cu_qa_cppumaker cu_util NULL
diff --cc offapi/com/sun/star/awt/UnoControlDialog.idl
index e7f0871,0e6a73e..c3b0b17
--- a/offapi/com/sun/star/awt/UnoControlDialog.idl
+++ b/offapi/com/sun/star/awt/UnoControlDialog.idl
@@@ -35,8 -35,8 +35,8 @@@
#include <com/sun/star/awt/XTopWindow.idl>
#endif
- #ifndef __com_sun_star_awt_XDialog_idl__
- #include <com/sun/star/awt/XDialog.idl>
-#ifndef __com_sun_star_awt_XDialog2_idl__
-#include <com/sun/star/awt/XDialog2.idl>
++#ifndef __com_sun_star_awt_XDialog2_idl__
++#include <com/sun/star/awt/XDialog2.idl>
#endif
commit c953ef4b46ced010ed3ebd77c4dd11174da60dd1
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Wed Mar 16 11:52:59 2011 +0100
Corrected assignment in makefile
diff --git a/ure/source/makefile.mk b/ure/source/makefile.mk
index 040f539..c8837a6 100644
--- a/ure/source/makefile.mk
+++ b/ure/source/makefile.mk
@@ -52,8 +52,7 @@ my_components = \
.IF "$(SOLAR_JAVA)" != ""
-my_components = \
- $(my_components) \
+my_components += \
javaloader \
javavm \
juh
commit df95286c49073bd1b1b7551360d1474c19fe823a
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Tue Mar 15 23:00:35 2011 -0400
Skip the java part when --without-java.
diff --git a/ure/source/makefile.mk b/ure/source/makefile.mk
index bdd4365..040f539 100644
--- a/ure/source/makefile.mk
+++ b/ure/source/makefile.mk
@@ -41,9 +41,6 @@ my_components = \
introspection \
invocadapt \
invocation \
- javaloader \
- javavm \
- juh \
namingservice \
proxyfac \
reflection \
@@ -53,6 +50,16 @@ my_components = \
textoutstream \
uuresolver
+.IF "$(SOLAR_JAVA)" != ""
+
+my_components = \
+ $(my_components) \
+ javaloader \
+ javavm \
+ juh
+
+.ENDIF
+
.INCLUDE: settings.mk
.INCLUDE: target.mk
commit e30783d620a5f8505db37d71ea1fa547721d1e7e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Mar 12 18:51:15 2011 -0600
mis-merge we don't have pre/postextstl.h
diff --git a/sal/inc/sal/cppunit.h b/sal/inc/sal/cppunit.h
index cd6645b..d0b3e60 100644
--- a/sal/inc/sal/cppunit.h
+++ b/sal/inc/sal/cppunit.h
@@ -31,14 +31,12 @@
#include <sal/types.h>
-#include "preextstl.h"
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
#undef CPPUNIT_PLUGIN_EXPORT
#define CPPUNIT_PLUGIN_EXPORT extern "C" SAL_DLLPUBLIC_EXPORT
-#include "postextstl.h"
#endif
commit 45f5ced361e80751b2a4d3dcf4a1b185a43e44f2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Mar 12 18:50:32 2011 -0600
add a ResettableSolarGuard type
diff --git a/sal/inc/osl/mutex.hxx b/sal/inc/osl/mutex.hxx
index 70ca4dc..d4c50b8 100644
--- a/sal/inc/osl/mutex.hxx
+++ b/sal/inc/osl/mutex.hxx
@@ -272,6 +272,7 @@ namespace osl
};
typedef osl::Guard< SolarMutex > SolarGuard;
typedef osl::ClearableGuard< SolarMutex > ClearableSolarGuard;
+ typedef osl::ResettableGuard< SolarMutex > ResettableSolarGuard;
}
#endif /* __cplusplus */
commit bbada576e5f00b94f417cb4682dcd05e55e809a4
Merge: d43f555... b49ffdd...
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 8 22:29:39 2011 -0600
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (185 commits)
chart52: cleanup unused legend entry stuff in preparation of issue #i82802#
masterfix: #i10000# add missing dependency in offapi
sb138: #i115619# fix for MinGW
sb138: #i115619#, #i116038# use osl_setThreadName in binaryurp
sb138: #i115619# osl_setThreadName
gridsort: i116682: update UnoControlDialog to reflect XDialog
gridsort: minor changes to the new API: - renamed XMutableGridDataModel::setRowHeading to updateRowHeading for consistency reasons - renamed XSortableGridDataModel to XSortableGridData - actually, this is not a full-fledged model in itself.
gridsort: grid control related unit tests (first set, more to come)
sb138: #i116038# fresh implementation of binary URP bridge
chart52: #28670# make the legend within charts resizeable - part 2
gridsort: re-did the column resizing - introduced XGridColumn.Flexibility, determining to which degree the column is resized during auto-column-resizing - removed XGridColumn.PreferredWidth - there really is no need for this anymore now - documented the relationship between XGridColumn.Flexibility and XGridColumn.Resizeable - re-implemented TableControl_Impl::impl_ni_updateColumnWidths, with (hopefully) less magic
sb139: #i116530# improve Java URP bridge error notification by utilizing the java.lang.Throwable cause facility
gridsort: document the relationship between soorting the data and notifying XGridDataListeners
gridsort: introduce XGridColumn::DataModelIndex. this allows for column removal/insertion at the GridColumnModel, without the need to touch the GridDataModel
locales34: #i112431# adapt documentation to reality
gridsort: introduce XSortableGridDataModel::removeColumnSort
gridsort: #163172# added UNO API support for sorting grid data. Implementation still unfinished. Things missing in the SortableGridData implementation - add as listener to the delegator, so we're notified of changes - translate and multiplex those changes - do own notifications (XGridDataListener.dataChanged) when the sort order changed - (possibly) update the sort order when the data in the current sort-column changed
gridsort: made the row title a row heading, being an Any instead of a string
gridsort: XMutableGridData: renamed updateRow to updateRowData for consistency; introduced updateRowToolTip as shortcut for multiple updateCellToolTip calls
gridsort: updateCell->updateCellData, setCellToolTip->updateCellToolTip; in both methods, have (Col,Row) params instead of (Row,Col), for consistency reasons
...
Conflicts:
bridges/inc/bridges/remote/bridgeimpl.hxx
bridges/inc/bridges/remote/connection.h
bridges/inc/bridges/remote/context.h
bridges/inc/bridges/remote/helper.hxx
bridges/inc/bridges/remote/mapping.hxx
bridges/inc/bridges/remote/proxy.hxx
bridges/inc/bridges/remote/remote.h
bridges/inc/bridges/remote/remote.hxx
bridges/inc/bridges/remote/stub.hxx
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
bridges/source/remote/context/context.cxx
bridges/source/remote/static/helper.cxx
bridges/source/remote/static/mapping.cxx
bridges/source/remote/static/proxy.cxx
bridges/source/remote/static/remote.cxx
bridges/source/remote/static/remote_types.cxx
bridges/source/remote/static/remote_types.hxx
bridges/source/remote/static/stub.cxx
bridges/source/remote/urp/urp_bridgeimpl.cxx
bridges/source/remote/urp/urp_bridgeimpl.hxx
bridges/source/remote/urp/urp_cache.h
bridges/source/remote/urp/urp_cache.hxx
bridges/source/remote/urp/urp_dispatch.cxx
bridges/source/remote/urp/urp_dispatch.hxx
bridges/source/remote/urp/urp_environment.cxx
bridges/source/remote/urp/urp_job.cxx
bridges/source/remote/urp/urp_job.hxx
bridges/source/remote/urp/urp_log.cxx
bridges/source/remote/urp/urp_log.hxx
bridges/source/remote/urp/urp_marshal.cxx
bridges/source/remote/urp/urp_marshal.hxx
bridges/source/remote/urp/urp_marshal_decl.hxx
bridges/source/remote/urp/urp_property.hxx
bridges/source/remote/urp/urp_propertyobject.cxx
bridges/source/remote/urp/urp_propertyobject.hxx
bridges/source/remote/urp/urp_reader.cxx
bridges/source/remote/urp/urp_reader.hxx
bridges/source/remote/urp/urp_replycontainer.hxx
bridges/source/remote/urp/urp_threadid.cxx
bridges/source/remote/urp/urp_threadid.hxx
bridges/source/remote/urp/urp_unmarshal.cxx
bridges/source/remote/urp/urp_unmarshal.hxx
bridges/source/remote/urp/urp_writer.cxx
bridges/source/remote/urp/urp_writer.hxx
cppu/source/threadpool/threadpool.cxx
cppu/util/target.pmk
cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
cppuhelper/source/interfacecontainer.cxx
cpputools/source/regcomplazy/regcomplazy.cxx
jurt/prj/d.lst
jvmfwk/source/elements.cxx
offapi/com/sun/star/awt/grid/GridDataEvent.idl
offapi/com/sun/star/awt/grid/XGridColumn.idl
offapi/com/sun/star/awt/tab/makefile.mk
offapi/com/sun/star/chart2/ExplicitIncrementData.idl
offapi/com/sun/star/chart2/XPlotter.idl
offapi/com/sun/star/chart2/XUndoHelper.idl
offapi/com/sun/star/document/MediaDescriptor.idl
offapi/com/sun/star/document/makefile.mk
offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
offapi/com/sun/star/script/ModuleInfo.idl
offapi/com/sun/star/script/ModuleType.idl
offapi/com/sun/star/text/TextMarkupType.idl
offapi/com/sun/star/util/XTextSearch.idl
offapi/com/sun/star/xml/sax/XFastAttributeList.idl
pyuno/source/loader/makefile.mk
remotebridges/source/bridge/bridge_connection.cxx
remotebridges/source/bridge/bridge_connection.hxx
remotebridges/source/bridge/bridge_provider.cxx
remotebridges/source/bridge/remote_bridge.cxx
remotebridges/source/bridge/remote_bridge.hxx
remotebridges/source/dynamicloader/dynamicloader.cxx
remotebridges/source/factory/bridgefactory.cxx
remotebridges/source/factory/bridgeimpl.cxx
remotebridges/source/factory/bridgeimpl.hxx
remotebridges/source/factory/makefile.mk
sal/cppunittester/cppunittester.cxx
sal/inc/osl/diagnose.h
sal/osl/os2/system.h
sal/osl/unx/diagnose.c
sal/osl/unx/file_misc.cxx
sal/osl/unx/process_impl.cxx
sal/osl/w32/diagnose.c
sal/osl/w32/process.cxx
sal/prj/build.lst
sal/qa/rtl/math/makefile.mk
sal/qa/rtl/math/rtl_math.cxx
sal/qa/rtl/math/rtl_old_testint64.cxx
sal/qa/rtl/math/test_rtl_math.cxx
sal/systools/win32/kill/kill.cxx
sal/textenc/tencinfo.c
sal/util/sal.map
stoc/source/inspect/introspection.cxx
stoc/source/security/file_policy.cxx
stoc/source/simpleregistry/simpleregistry.cxx
diff --cc bridges/prj/build.lst
index 444e8f3,d6e6d86..9c7b2f3
--- a/bridges/prj/build.lst
+++ b/bridges/prj/build.lst
@@@ -2,17 -2,14 +2,14 @@@ br bridges : cppuhelper jurt jvmaccess
br bridges usr1 - all br_mkout NULL
br bridges\inc nmake - all br_inc NULL
br bridges\unotypes nmake - all br_unotypes NULL
- br bridges\source\remote\static nmake - all br_rem_static br_unotypes br_inc NULL
- br bridges\source\remote\urp nmake - all br_rem_urp br_rem_static br_inc NULL
- br bridges\source\remote\context nmake - all br_rcon br_unotypes br_inc NULL
br bridges\source\cpp_uno\mingw_intel nmake - w br_gcc3i br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\msvc_win32_x86-64 nmake - w br_mscx br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_intel nmake - u br_gcc3li br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_os2_intel nmake - p br_gcc3os br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_x86-64 nmake - u br_gcc3lx br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\gcc3_freebsd_x86-64 nmake - u br_gcc3fx br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_powerpc nmake - u br_gcc3lp br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_aix_powerpc nmake - u br_gcc3ap br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_powerpc64 nmake - u br_gcc3lp_64 br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_mips nmake - u br_gcc3lmips br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_m68k nmake - u br_gcc3lm68k br_cppuno_shared br_unotypes br_inc NULL
diff --cc bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index 685fea0,d2c8f33..8552858
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@@ -370,13 -385,32 +386,31 @@@ static void cpp_call
try
{
- callVirtualMethod(
- pAdjustedThisPtr, aVtableSlot.index,
- pCppReturn, pReturnTypeRef, bSimpleReturn,
- pStackStart, ( pStack - pStackStart ),
- pGPR, nGPR,
- pFPR, nFPR );
- // NO exception occurred...
+ try {
+ callVirtualMethod(
+ pAdjustedThisPtr, aVtableSlot.index,
+ pCppReturn, pReturnTypeRef, bSimpleReturn,
+ pStackStart, ( pStack - pStackStart ),
+ pGPR, nGPR,
+ pFPR, nFPR );
+ } catch (Exception &) {
+ throw;
+ } catch (std::exception & e) {
+ OUStringBuffer buf;
+ buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("C++ code threw "));
+ appendCString(buf, typeid(e).name());
+ buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(": "));
+ appendCString(buf, e.what());
+ throw RuntimeException(
+ buf.makeStringAndClear(), Reference< XInterface >());
+ } catch (...) {
+ throw RuntimeException(
+ OUString(
+ RTL_CONSTASCII_USTRINGPARAM(
+ "C++ code threw unknown exception")),
+ Reference< XInterface >());
+ }
+
- // NO exception occured...
*ppUnoExc = 0;
// reconvert temporary params
diff --cc cppu/source/typelib/typelib.cxx
index 13232a5,1745dd6..b044f88
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@@ -372,8 -346,7 +372,7 @@@ TypeDescriptor_Init_Impl::~TypeDescript
#endif
delete pCallbacks;
pCallbacks = 0;
-
+#endif // CPPU_LEAK_STATIC_DATA
-
if( pMutex )
{
delete pMutex;
diff --cc cppu/source/uno/data.cxx
index b23e12a,2d49e00..20f241b
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@@ -366,15 -365,27 +367,15 @@@ sal_Bool SAL_CALL uno_type_isAssignable
#define MAX_ALIGNMENT_4
#endif
- #define OFFSET_OF( s, m ) ((sal_Size)((char *)&((s *)16)->m -16))
+ #define OFFSET_OF( s, m ) reinterpret_cast< std::size_t >((char *)&((s *)16)->m -16)
#define BINTEST_VERIFY( c ) \
- if (! (c)) { fprintf( stderr, "### binary compatibility test failed: " #c " [line %d]!!!\n", __LINE__ ); abort(); }
+ if (! (c)) { fprintf( stderr, "### binary compatibility test failed: %s [line %d]!!!\n", #c, __LINE__ ); abort(); }
#define BINTEST_VERIFYOFFSET( s, m, n ) \
- if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", " #m ") = %d instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); }
+ if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", " #m ") = %" SAL_PRI_SIZET "u instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); }
-#if OSL_DEBUG_LEVEL > 1
-#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC) || defined(X86_64) || defined(S390))
#define BINTEST_VERIFYSIZE( s, n ) \
- fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n", sizeof(s), __alignof__ (s) ); \
if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); }
-#else // ! GNUC
-#define BINTEST_VERIFYSIZE( s, n ) \
- fprintf( stderr, "> sizeof(" #s ") = %d\n", sizeof(s) ); \
- if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); }
-#endif
-#else // ! OSL_DEBUG_LEVEL
-#define BINTEST_VERIFYSIZE( s, n ) \
- if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); }
-#endif
struct C1
{
diff --cc cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
index adf1610,c6eccec..d013941
--- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
@@@ -428,12 -427,3 +428,6 @@@ extern "C" void SAL_CALL component_getI
{
*envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
+
- extern "C" sal_Bool SAL_CALL component_writeInfo(
- void * serviceManager, void * registryKey)
- {
- return cppu::component_writeInfoHelper(
- serviceManager, registryKey, entries);
- }
+
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
++/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc jurt/prj/d.lst
index a55c9fa,74f5b60..499812e
--- a/jurt/prj/d.lst
+++ b/jurt/prj/d.lst
@@@ -2,6 -2,7 +2,7 @@@
..\%__SRC%\bin\jpipe.dll %_DEST%\bin%_EXT%\jpipe.dll
..\%__SRC%\bin\jpipx.dll %_DEST%\bin%_EXT%\jpipx.dll
..\%__SRC%\lib\libjpipe*.so %_DEST%\lib%_EXT%\libjpipe*.so
-..\%__SRC%\lib\libjpipe*.dylib %_DEST%\lib%_EXT%\libjpipe*.dylib
+..\%__SRC%\lib\libjpipe.jnilib %_DEST%\lib%_EXT%\libjpipe.jnilib
+ ..\%__SRC%\lib\libjpipe*.jnilib %_DEST%\lib%_EXT%\libjpipe*.jnilib
..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin%_EXT%\jurt_src.zip
diff --cc jvmfwk/source/elements.cxx
index 6ef51d5,fb70fb5..131f689
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@@ -730,11 -769,18 +767,17 @@@ jfw::FileStatus NodeJava::checkSettings
//that after removing the file and shortly later creating it again
//did not change the creation time. That is the newly created file
//had the creation time of the former file.
- ::TimeValue modTime = stat.getModifyTime();
- // ::TimeValue modTime = stat.getModifyTime();
::TimeValue curTime = {0,0};
+ ret = FILE_OK;
if (sal_True == ::osl_getSystemTime(& curTime))
{
- if ( curTime.Seconds - modTime.Seconds >
+ //get the modified time recorded in the <modified> element
+ sal_uInt32 modified = getModifiedTime();
+ OSL_ASSERT(modified <= curTime.Seconds);
+ //Only if modified has a valued then NodeJava::write was called,
+ //then the xml structure was filled with data.
-
++
+ if ( modified && curTime.Seconds - modified >
BootParams::getInstallDataExpiration())
{
#if OSL_DEBUG_LEVEL >=2
@@@ -1089,6 -1137,17 +1134,17 @@@ JavaInfo * CNodeJavaInfo::makeJavaInfo(
return pInfo;
}
-sal_uInt32 NodeJava::getModifiedTime() const
++sal_uInt32 NodeJava::getModifiedTime() const
+ {
+ sal_uInt32 ret = 0;
+ if (m_layer != INSTALL)
+ {
+ OSL_ASSERT(0);
+ return ret;
+ }
+ rtl::OString modTimeSeconds = getElementModified();
+ return (sal_uInt32) modTimeSeconds.toInt64();
+ }
//================================================================================
MergedSettings::MergedSettings():
diff --cc offapi/com/sun/star/awt/grid/XGridColumn.idl
index 328b9b6,dfc5dfe..dd89dc0
--- a/offapi/com/sun/star/awt/grid/XGridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl
@@@ -73,9 -100,35 +100,35 @@@ interface XGridColum
*/
[attribute] ::com::sun::star::style::HorizontalAlignment HorizontalAlign;
- /** A title is displayed in the colum header row if <method>UnoControlGridModel::ShowRowHeader</method> is set to <true/>**/
+ /** A title is displayed in the column header row if <method>UnoControlGridModel::ShowRowHeader</method> is set to <true/>**/
[attribute] string Title;
+ /** is the help text associated with the column.
+
+ <p>A grid control will usually display a column's help text as tooltip.</p>
+ */
+ [attribute] string HelpText;
+
+ /** denotes the index of the column within the grid column model it belongs to
+
+ <p>If the column is not yet part of a column model, <code>Index</code> is -1.</p>
+ */
+ [attribute, readonly] long Index;
+
+ /** denotes the index of the data column which should be used to fetch this grid column's data
+
+ <p>A grid control has a column model and a data model, both containing a possibly different number of columns.
+ The <code>DataColumnIndex</code> attribute defines the index of the column within the data model, which should
+ be used to retrieve actual data.</p>
+
+ <p>Using this, you can do runtime changes to the column model, i.e. insertion and removal of columns, without
+ necessarily needing to adjust the data model, too.</p>
+
+ <p>If <code>DataColumnIndex</code> is negative, the it will be ignored, then the column's index within its
+ column model, as determined by the <member>Index</member> attribute, will be used.</p>
+ */
+ [attribute] long DataColumnIndex;
+
/** Adds a listener for the <type>GridColumnEvent</type> posted after the grid changes.
@param Listener
the listener to add.
diff --cc offapi/com/sun/star/awt/grid/XGridSelection.idl
index a345348,def1b79..febfc6a
--- a/offapi/com/sun/star/awt/grid/XGridSelection.idl
+++ b/offapi/com/sun/star/awt/grid/XGridSelection.idl
@@@ -65,17 -54,18 +54,18 @@@ interface XGridSelectio
/** Deselects all selected rows.
*/
- [oneway] void deselectAllRows();
+ void deselectAllRows();
- /** Deselects selected rows. Selected rows, which aren't in the range remain selected.
- @param rangeOfRows
- array of rows indexes, which will be deselected.
+ /** removes the selection for a given row
+
+ @param RowIndex
+ denotes the index of the row to deselect
*/
- [oneway] void deselectRows( [in] sequence< long > rangeOfRows);
+ void deselectRow( [in] long RowIndex );
- /** Returns the indicies of all selected rows.
+ /** Returns the indices of all selected rows.
@returns
- a sequence of indicies.
+ a sequence of indices.
*/
sequence< long > getSelection();
diff --cc offapi/com/sun/star/awt/tab/makefile.mk
index 0000000,39d1e66..2497609
mode 000000,100644..100644
--- a/offapi/com/sun/star/awt/tab/makefile.mk
+++ b/offapi/com/sun/star/awt/tab/makefile.mk
@@@ -1,0 -1,54 +1,53 @@@
+ #*************************************************************************
+ #
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # Copyright 2000, 2010 Oracle and/or its affiliates.
+ #
+ # OpenOffice.org - a multi-platform office productivity suite
+ #
+ # This file is part of OpenOffice.org.
+ #
+ # OpenOffice.org is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU Lesser General Public License version 3
+ # only, as published by the Free Software Foundation.
+ #
+ # OpenOffice.org is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU Lesser General Public License version 3 for more details
+ # (a copy is included in the LICENSE file that accompanied this code).
+ #
+ # You should have received a copy of the GNU Lesser General Public License
+ # version 3 along with OpenOffice.org. If not, see
+ # <http://www.openoffice.org/license.html>
+ # for a copy of the LGPLv3 License.
+ #
+ #*************************************************************************
+
+ PRJ=..$/..$/..$/..$/..
+
+ PRJNAME=api
+
+ TARGET=cssawttab
+ PACKAGE=com$/sun$/star$/awt$/tab
+
+ # --- Settings -----------------------------------------------------
-
+ .INCLUDE : $(PRJ)$/util$/makefile.pmk
+
+ # ------------------------------------------------------------------------
+ IDLFILES=\
+ TabPageActivatedEvent.idl\
+ XTabPageContainerListener.idl\
+ XTabPageModel.idl\
+ XTabPage.idl\
+ XTabPageContainerModel.idl\
+ XTabPageContainer.idl\
+ UnoControlTabPage.idl\
+ UnoControlTabPageModel.idl\
+ UnoControlTabPageContainer.idl\
+ UnoControlTabPageContainerModel.idl
+ # ------------------------------------------------------------------
+
+ .INCLUDE : target.mk
+ .INCLUDE : $(PRJ)$/util$/target.pmk
diff --cc offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl
index 96e6639,96e6639..9f1009e
--- a/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl
+++ b/offapi/com/sun/star/chart/XSecondAxisTitleSupplier.idl
@@@ -1,24 -1,24 +1,24 @@@
--#ifndef __com_sun_star_chart_XSecondAxisTitleSupplier_idl__
--#define __com_sun_star_chart_XSecondAxisTitleSupplier_idl__
++#ifndef __com_sun_star_chart_XSecondAxisTitleSupplier_idl__
++#define __com_sun_star_chart_XSecondAxisTitleSupplier_idl__
--#ifndef __com_sun_star_uno_XInterface_idl__
--#include <com/sun/star/uno/XInterface.idl>
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
#endif
--#ifndef __com_sun_star_drawing_XShape_idl__
--#include <com/sun/star/drawing/XShape.idl>
--#endif
--
--
--module com { module sun { module star { module chart {
++#ifndef __com_sun_star_drawing_XShape_idl__
++#include <com/sun/star/drawing/XShape.idl>
++#endif
++
++
++module com { module sun { module star { module chart {
interface XSecondAxisTitleSupplier: com::sun::star::uno::XInterface
--{
-- com::sun::star::drawing::XShape getSecondXAxisTitle();
++{
++ com::sun::star::drawing::XShape getSecondXAxisTitle();
com::sun::star::drawing::XShape getSecondYAxisTitle();
--};
++};
--}; }; }; };
--
--#endif
++}; }; }; };
++
++#endif
diff --cc offapi/com/sun/star/chart2/Legend.idl
index 43044f4,2b15654..40a4c1e
--- a/offapi/com/sun/star/chart2/Legend.idl
+++ b/offapi/com/sun/star/chart2/Legend.idl
@@@ -68,9 -68,9 +68,9 @@@ service Legen
side. Use <member>LegendExpansion::WIDE</member> for a legend
that is positioned on top or the bottom.</p>
*/
- [property] LegendExpansion Expansion;
+ [property] ::com::sun::star::chart::ChartLegendExpansion Expansion;
- /** Determines, whether the legend should be redered by the view.
+ /** Determines, whether the legend should be rendered by the view.
*/
[property] boolean Show;
diff --cc offapi/com/sun/star/deployment/XPackage.idl
index 6f0ec81,f93c8de..0395a65
mode 100644,100755..100755
--- a/offapi/com/sun/star/deployment/XPackage.idl
+++ b/offapi/com/sun/star/deployment/XPackage.idl
diff --cc offapi/com/sun/star/document/OfficeDocument.idl
index 1ab2816,5c19413..90c36d1
--- a/offapi/com/sun/star/document/OfficeDocument.idl
+++ b/offapi/com/sun/star/document/OfficeDocument.idl
@@@ -192,8 -158,12 +158,12 @@@ published service OfficeDocumen
*/
[optional] interface XDocumentPropertiesSupplier;
+ /** provides access to the document's undo manager.
+ */
+ [optional] interface XUndoManagerSupplier;
+
//-------------------------------------------------------------------------
- /** controls the focus behaviour of the form controls in the document
+ /** controls the focus behavior of the form controls in the document
<p>
If this flag is set to <TRUE/>, any view belonging to the document
diff --cc offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
index 57ea29a,b74d408..61f4e49
--- a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
+++ b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
@@@ -1,6 -1,6 +1,6 @@@
/*************************************************************************
* 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
@@@ -35,11 -35,11 +35,11 @@@
#include <com/sun/star/document/DocumentEvent.idl>
#endif
--#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
++#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
#endif
--#ifndef __com_sun_star_lang_NoSupportException_idl__
++#ifndef __com_sun_star_lang_NoSupportException_idl__
#include <com/sun/star/lang/NoSupportException.idl>
#endif
@@@ -118,8 -118,8 +118,9 @@@ interface XDocumentEventBroadcaste
//=============================================================================
--}; }; }; };
++}; }; }; };
//=============================================================================
#endif
++
diff --cc offapi/com/sun/star/document/makefile.mk
index 7932c6e,1521e6b..d97c508
--- a/offapi/com/sun/star/document/makefile.mk
+++ b/offapi/com/sun/star/document/makefile.mk
@@@ -115,8 -115,14 +115,16 @@@ IDLFILES=
DocumentRevisionListPersistence.idl \
XDocumentLanguages.idl \
XCodeNameQuery.idl \
+ XCompatWriterDocProperties.idl \
+ XVbaMethodParameter.idl \
+ XUndoAction.idl \
+ XUndoManager.idl \
+ XUndoManagerListener.idl \
+ XUndoManagerSupplier.idl \
+ UndoManagerEvent.idl \
+ EmptyUndoStackException.idl \
+ UndoContextNotClosedException.idl \
+ UndoFailedException.idl \
# ------------------------------------------------------------------
diff --cc offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
index 58a77f7,35731c7..237bc4d
--- a/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
+++ b/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
@@@ -96,10 -97,11 +97,11 @@@ module com { module sun { module star
<li>ru : Russian</li>
<li>sa : Sanskrit</li>
<li>sco : Scots</li>
- <li>sh-YU : Serbian (written with Latin characters)</li>
+ <li>sh : Serbian (written with latin characters)</li>
- <li>sk-SK : Slovak (written with latin characters)</li>
+ <li>sk-SK : Slovak (written with Latin characters)</li>
<li>sl : Slovenian</li>
<li>sq : Albanian</li>
+ <li>sr : Serbian (written with cyrillic characters) (added with OOo 3.4)</li>
<li>sv : Swedish</li>
<li>sw : Swahili</li>
<li>ta : Tamil</li>
diff --cc offapi/com/sun/star/script/makefile.mk
index 8c46453,9c0a38f..53c95e9
--- a/offapi/com/sun/star/script/makefile.mk
+++ b/offapi/com/sun/star/script/makefile.mk
@@@ -48,10 -48,10 +48,11 @@@ IDLFILES=
XLibraryContainerExport.idl\
XPersistentLibraryContainer.idl\
XStorageBasedLibraryContainer.idl\
+ XLibraryQueryExecutable.idl \
ModuleSizeExceededRequest.idl\
ModuleInfo.idl\
- ModuleType.idl
+ ModuleType.idl\
+ NativeObjectWrapper.idl
# ------------------------------------------------------------------
diff --cc offapi/com/sun/star/script/vba/makefile.mk
index 4657b58,336be1b..336be1b
mode 100644,100755..100644
--- a/offapi/com/sun/star/script/vba/makefile.mk
+++ b/offapi/com/sun/star/script/vba/makefile.mk
diff --cc offapi/com/sun/star/text/PrintPreviewSettings.idl
index 37f78cd,bd6c61d..41ea682
mode 100644,100755..100755
--- a/offapi/com/sun/star/text/PrintPreviewSettings.idl
+++ b/offapi/com/sun/star/text/PrintPreviewSettings.idl
diff --cc offapi/com/sun/star/text/TextMarkupType.idl
index b6c3bb7,fe631b5..0787dfe
--- a/offapi/com/sun/star/text/TextMarkupType.idl
+++ b/offapi/com/sun/star/text/TextMarkupType.idl
@@@ -44,23 -44,28 +44,28 @@@ module com { module sun { module sta
constants TextMarkupType
{
- /// Markup originates from spell checking.
+ /** Markup originates from spell checking.
- */
++ */
const long SPELLCHECK = 1;
- /// Markup originates from proofreading
- /// @since OOo 3.0.1
+ /** Markup originates from proofreading
+ @since OOo 3.0.1
- */
++ */
const long PROOFREADING = 2;
- /// Markup originates from smart tag checking.
+ /** Markup originates from smart tag checking.
- */
++ */
const long SMARTTAG = 3;
- /// Markup originates from proofreading
- /// An invisible markup used to identify sentence boundaries.
- /// @since OOo 3.0.1
+ /** Markup originates from proofreading
+ An inivisible markup type used in proofreading API calls.
+ @since OOo 3.0.1
- */
++ */
const long SENTENCE = 4;
- /// Markups originates from change tracking.
- /// @since OOo 3.3
+ /** Markups originates from change tracking.
+ @since OOo 3.3
- */
++ */
const long TRACK_CHANGE_INSERTION = 5;
const long TRACK_CHANGE_DELETION = 6;
const long TRACK_CHANGE_FORMATCHANGE = 7;
diff --cc offapi/com/sun/star/util/XTextSearch.idl
index 950fefb,18207f2..38f44aa
--- a/offapi/com/sun/star/util/XTextSearch.idl
+++ b/offapi/com/sun/star/util/XTextSearch.idl
@@@ -35,59 -36,116 +35,112 @@@
module com { module sun { module star { module util {
- published enum SearchAlgorithms {
- ABSOLUTE, // "normal" a kind of Boyer-Moore
- REGEXP, // regular expression
- APPROXIMATE // Levenshtein distance
-//=============================================================================
-
-
+ published enum SearchAlgorithms
+ {
+ /// Literal
+ ABSOLUTE, // implemented as a kind of Boyer-Moore
+ /// Regular expression
+ REGEXP,
+ /// Weighted Levenshtein Distance
+ APPROXIMATE
};
+ /// Flags for search methods
published constants SearchFlags
{
- //Flag for all search methods
-
/**
- @deprecated : the constant ALL_IGNORE_CASE is never supported -
- it must use the transliteration flags of
- the SearchOptions.
- <p>@see TransliterationModulesNew
+ @deprecated The constant ALL_IGNORE_CASE is never supported - use
+ <const scope="com::sun::star::i18n">TransliterationModules::IGNORE_CASE</const>
+ with
+ <member>SearchOptions::transliterateFlags</member>
+ instead.
+
+ @see <type scope="com::sun::star::i18n">TransliterationModules</type>
*/
- const long ALL_IGNORE_CASE = 0x00000001;
+ const long ALL_IGNORE_CASE = 0x00000001;
- /// Flag for normal (Boyer-Moore) search
- const long NORM_WORD_ONLY = 0x00000010;
+ /** Flag for normal (Boyer-Moore) search / Search for word only. */
+ const long NORM_WORD_ONLY = 0x00000010;
- /// Flag for "regular expression" search / interpret as extended regular expression
- const long REG_EXTENDED = 0x00000100;
- /** Flag for "regular expression" search / No replace, i.e., avoid sub regular
- expressions, return true/false to match
+ /** Flag for "regular expression" search / Interpret as extended
+ regular expression.
- <!-- JRH: Check this for sense of the expression. -->
+ @deprecated The flag is currently not supported by OOo.
*/
- const long REG_NOSUB = 0x00000200;
-
- /// Flag for "regular expression" search / Special new line treatment
- const long REG_NEWLINE = 0x00000400;
-
- /** A NEWLINE character in string will not be matched by a period outside bracket
- expression or by any form of a non matching list.
- A circumflex (^) in pattern when used to specify expression anchoring
- <!-- JRH: anhoring to anchoring. -->
- will match the zero length string immediately after a newline in string,
- regardless of the setting of REG_NOTBOL
- A dollar-sign ($) in pattern when used to specify expression anchoring,
- will match zero-length string immediately before a new line in string,
- regardless of the setting of REG_NOTEOL
- */
- const long REG_NOT_BEGINOFLINE = 0x00000800;
-
- /** The first character in the string is not the beginning of the line therefore ^ will not
- match with first character of the string
+ const long REG_EXTENDED = 0x00000100;
+
+ /** Flag for "regular expression" search / No register information
+ or backreferences, i.e., avoid sub expressions. Return only
+ true/false if matched or not.
+
+ @deprecated The flag is currently not supported by OOo.
*/
- const long REG_NOT_ENDOFLINE = 0x00001000;
+ const long REG_NOSUB = 0x00000200;
+
+ /** Flag for "regular expression" search / Special new line
+ treatment.
+
+ @deprecated The flag is currently not supported by OOo.
+
+ <p> A NEWLINE character in string will not be matched by a
+ period outside bracket expression or by any form of a non
+ matching list. </p>
+ <p> A circumflex (^) in pattern when used to specify expression
+ anchoring will match the zero length string immediately after a
+ newline in string, regardless of the setting of
+ REG_NOT_BEGINOFLINE. </p>
- /// Flags for "Weight Levenshtein-Distance" search
- const long LEV_RELAXED = 0x00010000;
+ <p> A dollar-sign ($) in pattern when used to specify expression
+ anchoring, will match zero-length string immediately before a
+ new line in string, regardless of the setting of
+ REG_NOT_ENDOFLINE. </p>
+ */
+ const long REG_NEWLINE = 0x00000400;
+
+ /** The first character in the string is not the beginning of the
+ line therefore ^ will not match with first character of the
+ string.
+ */
+ const long REG_NOT_BEGINOFLINE = 0x00000800;
+
+ /** The last character in the string is not the end of the line
+ therefore $ will not match with last character of the string.
+ */
+ const long REG_NOT_ENDOFLINE = 0x00001000;
+
+ /** Flag for "Weighted Levenshtein Distance" search / Relaxed
+ checking of limit, split weigh pools.
+
+ <p> If not specified (<b>strict</b>), the search is sucessful if
+ the WLD is within a calculated limit where each insertion,
+ deletion and replacement adds a weight to a common pool of
+ weights. This is the mathematically correct WLD. </p>
+
+ <p> From a user's point of view the strict WLD is an
+ exclusive-OR of the arguments given, for example if allowed
+ insertions=2 and allowed replacements=2, the search fails if 2
+ characters had been inserted and an additional operation would
+ be needed to match. Depending on the weights it may also fail if
+ 1 character was inserted and 1 character replaced and an
+ additional operation would be needed to match. The strict
+ algorithm may match less than expected from a first glance of
+ the specified arguments, but does not return false positives. </p>
+
+ <p> If specified (<b>relaxed</b>), the search is also successful
+ if the combined pool for insertions and deletions is below a
+ doubled calculated limit and replacements are treated
+ differently. Additionally, swapped characters are counted as one
+ replacement. </p>
+
+ <p> From a user's point of view the relaxed WLD is an
+ inclusive-OR of the arguments given, for example if allowed
+ insertions=2 and allowed replacements=2, the search succeeds if
+ 2 characters had been inserted and an additional replacement is
+ needed to match. The relaxed algorithm may return false
+ positives, but meets user expectation better. </p>
+ */
+ const long LEV_RELAXED = 0x00010000;
};
diff --cc sal/inc/sal/cppunit.h
index 0000000,daaa630..cd6645b
mode 000000,100644..100644
--- a/sal/inc/sal/cppunit.h
+++ b/sal/inc/sal/cppunit.h
@@@ -1,0 -1,42 +1,45 @@@
++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+ /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+ #ifndef _SAL_CPPUNIT_H_
+ #define _SAL_CPPUNIT_H_
+
+ #include <sal/types.h>
+
+ #include "preextstl.h"
+ #include <cppunit/TestAssert.h>
+ #include <cppunit/TestFixture.h>
+ #include <cppunit/extensions/HelperMacros.h>
+ #include <cppunit/plugin/TestPlugIn.h>
+ #undef CPPUNIT_PLUGIN_EXPORT
+ #define CPPUNIT_PLUGIN_EXPORT extern "C" SAL_DLLPUBLIC_EXPORT
+ #include "postextstl.h"
+
+ #endif
++
++/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc sal/osl/all/makefile.mk
index 84edd95,5da61e8..2d1b7ec
--- a/sal/osl/all/makefile.mk
+++ b/sal/osl/all/makefile.mk
@@@ -55,14 -55,22 +55,16 @@@ SLOFILES=
$(SLO)$/utility.obj\
$(SLO)$/filepath.obj\
$(SLO)$/debugbase.obj\
- $(SLO)$/loadmodulerelative.obj
+ $(SLO)$/loadmodulerelative.obj \
+ $(SLO)/printtrace.obj
-# $(SLO)$/readline.obj\
-
-#.IF "$(UPDATER)"=="YES"
OBJFILES= \
$(OBJ)$/utility.obj\
$(OBJ)$/filepath.obj\
$(OBJ)$/debugbase.obj\
- $(OBJ)$/loadmodulerelative.obj
+ $(OBJ)$/loadmodulerelative.obj \
+ $(OBJ)/printtrace.obj
-# $(OBJ)$/readline.obj\
-#.ENDIF
-
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --cc sal/osl/os2/system.h
index 857b5f0,600eabe..f67391b
--- a/sal/osl/os2/system.h
+++ b/sal/osl/os2/system.h
@@@ -295,11 -353,10 +295,10 @@@ char *macxp_tempnam( const char *tmpdir
# include <netinet/tcp.h>
#endif
-#if !defined(_WIN32) && !defined(_WIN16) && !defined(OS2) && \
- !defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO) && \
- !defined(AIX) && !defined(HPUX) && \
+#if !defined(_WIN32) && !defined(OS2) && \
+ !defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD) && \
+ !defined(AIX) && \
- !defined(SOLARIS) && !defined(MAC) && \
- !defined(MACOSX)
+ !defined(SOLARIS) && !defined(MACOSX)
# error "Target plattform not specified !"
#endif
diff --cc sal/osl/unx/diagnose.c
index a691059,07341e1..f337bef
--- a/sal/osl/unx/diagnose.c
+++ b/sal/osl/unx/diagnose.c
@@@ -302,33 -302,9 +303,11 @@@ pfunc_osl_printDetailedDebugMessage SAL
/************************************************************************/
/* osl_trace */
/************************************************************************/
- /* comment this define to stop output thread identifier*/
- #define OSL_TRACE_THREAD 1
- void SAL_CALL osl_trace (
- const sal_Char* lpszFormat, ...)
- {
+ void osl_trace(char const * pszFormat, ...) {
va_list args;
-
- #if defined(OSL_PROFILING)
- fprintf(stderr, "Time: %06lu : ", osl_getGlobalTimer() );
- #else
- #if defined(OSL_TRACE_THREAD)
- fprintf(
- stderr, "Thread: %6lu :",
- SAL_INT_CAST(unsigned long, osl_getThreadIdentifier(NULL)));
- #else
- fprintf(stderr, "Trace Message: ");
- #endif
- #endif
-
- va_start(args, lpszFormat);
- vfprintf(stderr, lpszFormat, args);
+ va_start(args, pszFormat);
+ printTrace((unsigned long) getpid(), pszFormat, args);
va_end(args);
-
- fprintf(stderr,"\n");
- fflush(stderr);
}
+
- /************************************************************************/
-
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
++/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc sal/osl/unx/thread.c
index 0e5ccc7,76545b3..6524e4c
--- a/sal/osl/unx/thread.c
+++ b/sal/osl/unx/thread.c
@@@ -34,9 -30,14 +34,13 @@@
#include <osl/diagnose.h>
#include <osl/thread.h>
#include <osl/nlsupport.h>
-#ifndef _RTL_TEXTENC_H_
#include <rtl/textenc.h>
-#endif
+#include <sal/macros.h>
+ #if defined LINUX
+ #include <sys/prctl.h>
+ #endif
+
/****************************************************************************
* @@@ TODO @@@
*
diff --cc sal/osl/w32/diagnose.c
index 1c44fbf,97fe8d2..563c8a7
mode 100644,100755..100755
--- a/sal/osl/w32/diagnose.c
+++ b/sal/osl/w32/diagnose.c
diff --cc sal/osl/w32/thread.c
index 67b8313,6429786..fc0c5ab
mode 100644,100755..100755
--- a/sal/osl/w32/thread.c
+++ b/sal/osl/w32/thread.c
diff --cc sal/prj/build.lst
index ddbc446,b7786f6..dcbe448
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@@ -17,12 -18,7 +17,15 @@@ sa sal\cppunittester nmake - all sa_cpp
sa sal\qa\ByteSequence nmake - all sa_qa_ByteSequence sa_cppunittester sa_util NULL
sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer sa_cppunittester sa_util NULL
sa sal\qa\osl\mutex nmake - all sa_qa_osl_mutex sa_cppunittester sa_util NULL
+ sa sal\qa\osl\pipe nmake - all sa_qa_osl_pipe sa_cppunittester sa_util NULL
sa sal\qa\osl\profile nmake - all sa_qa_osl_profile sa_cppunittester sa_util NULL
+sa sal\qa\osl\file nmake - u sa_qa_osl_file sa_cppunittester sa_util NULL
+sa sal\qa\osl\module nmake - u sa_qa_osl_module sa_cppunittester sa_util NULL
+sa sal\qa\osl\condition nmake - all sa_qa_osl_condition sa_cppunittester sa_util NULL
+sa sal\qa\osl\security nmake - all sa_qa_osl_security sa_cppunittester sa_util NULL
+sa sal\qa\osl\process nmake - all sa_qa_osl_process sa_cppunittester sa_util NULL
+ sa sal\qa\osl\setthreadname nmake - all sa_qa_osl_setthreadname sa_cppunittester sa_util NULL
+ sa sal\qa\rtl\math nmake - all sa_qa_rtl_math sa_cppunittester sa_util NULL
+sa sal\qa\rtl\strings nmake - all sa_qa_rt_strings sa_cppunittester sa_util NULL
+sa sal\qa\rtl\oustringbuffer nmake - all sa_qa_rt_oustringbuffer sa_cppunittester sa_util NULL
+sa sal\qa\rtl\alloc nmake - all sa_qa_rt_alloc sa_cppunittester sa_util NULL
diff --cc sal/qa/rtl/math/makefile.mk
index a978849,59f2ecc..ffe8d64
--- a/sal/qa/rtl/math/makefile.mk
+++ b/sal/qa/rtl/math/makefile.mk
@@@ -43,54 -39,17 +39,17 @@@ ENABLE_EXCEPTIONS = TRU
CFLAGSCXX += $(CPPUNIT_CFLAGS)
- #----------------------------------- OStringBuffer -----------------------------------
-
- SHL1OBJS= \
- $(SLO)$/test_rtl_math.obj
-
- SHL1TARGET= rtl_math
- SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
-
- SHL1IMPLIB= i$(SHL1TARGET)
- # SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
- DEF1NAME =$(SHL1TARGET)
- # DEF1EXPORTFILE= export.exp
- SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-
- # --- BEGIN --------------------------------------------------------
- SHL2OBJS= \
- $(SLO)$/rtl_math.obj
- SHL2TARGET= rtl_math2
- SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
-
- SHL2IMPLIB= i$(SHL2TARGET)
- DEF2NAME= $(SHL2TARGET)
- SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
+ SHL1IMPLIB = i$(SHL1TARGET)
+ SHL1OBJS = $(SLO)/test-rtl-math.obj
+ SHL1RPATH = NONE
+ SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
+ SHL1TARGET = test-rtl-math
+ SHL1VERSIONMAP = $(PRJ)/qa/export.map
+ DEF1NAME = $(SHL1TARGET)
+ SLOFILES = $(SHL1OBJS)
-
- # # --- BEGIN --------------------------------------------------------
- # LLA: this is an old test, which seems not to work
- # sal_setInt64()
- # sal_getInt64()
- # does not exist.
- #
- # SHL3OBJS= \
- # $(SLO)$/rtl_old_testint64.obj
- # SHL3TARGET= rtl_old_testint64
- # SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB)
- #
- # SHL3IMPLIB= i$(SHL3TARGET)
- # DEF3NAME= $(SHL3TARGET)
- # SHL3VERSIONMAP = $(PRJ)$/qa$/export.map
- #
-
- #------------------------------- All object files -------------------------------
- # do this here, so we get right dependencies
- # SLOFILES=$(SHL1OBJS)
-
- # --- Targets ------------------------------------------------------
-
- .INCLUDE : target.mk
+ .INCLUDE: target.mk
-.INCLUDE: _cppunit.mk
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
+
-.END
++.END
diff --cc stoc/source/corereflection/base.hxx
index 0116bbf,faf3e56..cc69aad
--- a/stoc/source/corereflection/base.hxx
+++ b/stoc/source/corereflection/base.hxx
@@@ -56,11 -55,9 +56,8 @@@
#include <com/sun/star/reflection/XIdlField2.hpp>
#include <com/sun/star/reflection/XIdlMethod.hpp>
- #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
-
-
using namespace std;
using namespace osl;
-using namespace rtl;
using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --cc stoc/source/corereflection/crefl.cxx
index 8949d41,2ea9bb2..faab346
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@@ -29,9 -28,10 +29,8 @@@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_stoc.hxx"
#include <cppuhelper/queryinterface.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
#include <cppuhelper/implementationentry.hxx>
-#endif
- #include <com/sun/star/registry/XRegistryKey.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/reflection/XTypeDescription.hpp>
#include "com/sun/star/uno/RuntimeException.hpp"
diff --cc stoc/source/simpleregistry/simpleregistry.cxx
index 123ed41,9c6b71b..4485f69
mode 100644,100755..100755
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@@ -1,1309 -1,1320 +1,1322 @@@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
- // MARKER(update_precomp.py): autogen include statement, do not remove
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
#include "precompiled_stoc.hxx"
- #include <osl/diagnose.h>
- #include <osl/mutex.hxx>
- #include <rtl/alloc.h>
- #include <rtl/ustrbuf.hxx>
- #include <cppuhelper/queryinterface.hxx>
- #include <cppuhelper/weak.hxx>
- #include <cppuhelper/factory.hxx>
- #include <cppuhelper/implbase1.hxx>
- #include <cppuhelper/implbase2.hxx>
- #include <cppuhelper/implementationentry.hxx>
- #include <registry/registry.hxx>
-
- #include <com/sun/star/registry/XSimpleRegistry.hpp>
- #include <com/sun/star/lang/XMultiServiceFactory.hpp>
- #include <com/sun/star/lang/XServiceInfo.hpp>
- #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
- using namespace com::sun::star::uno;
- using namespace com::sun::star::registry;
- using namespace com::sun::star::lang;
- using namespace cppu;
- using namespace osl;
-
- using ::rtl::OUString;
- using ::rtl::OUStringBuffer;
- using ::rtl::OString;
- using ::rtl::OStringToOUString;
- using ::rtl::OUStringToOString;
-
- #define SERVICENAME "com.sun.star.registry.SimpleRegistry"
- #define IMPLNAME "com.sun.star.comp.stoc.SimpleRegistry"
+ #include "sal/config.h"
+
+ #include <cstdlib>
+ #include <memory>
+ #include <vector>
+
+ #include "com/sun/star/lang/XServiceInfo.hpp"
+ #include "com/sun/star/registry/InvalidRegistryException.hpp"
+ #include "com/sun/star/registry/InvalidValueException.hpp"
+ #include "com/sun/star/registry/MergeConflictException.hpp"
+ #include "com/sun/star/registry/RegistryKeyType.hpp"
+ #include "com/sun/star/registry/XRegistryKey.hpp"
+ #include "com/sun/star/registry/XSimpleRegistry.hpp"
+ #include "com/sun/star/uno/Reference.hxx"
+ #include "com/sun/star/uno/RuntimeException.hpp"
+ #include "com/sun/star/uno/XComponentContext.hpp"
+ #include "com/sun/star/uno/XInterface.hpp"
+ #include "com/sun/star/uno/Sequence.hxx"
+ #include "cppuhelper/implbase1.hxx"
+ #include "cppuhelper/implbase2.hxx"
+ #include "cppuhelper/weak.hxx"
+ #include "osl/mutex.hxx"
+ #include "registry/registry.hxx"
+ #include "registry/regtype.h"
+ #include "rtl/ref.hxx"
+ #include "rtl/string.h"
+ #include "rtl/string.hxx"
+ #include "rtl/textcvt.h"
+ #include "rtl/textenc.h"
+ #include "rtl/unload.h"
+ #include "rtl/ustring.h"
+ #include "rtl/ustring.hxx"
+ #include "sal/types.h"
+
+ #include "bootstrapservices.hxx"
+
+ #include "textualservices.hxx"
extern rtl_StandardModuleCount g_moduleCount;
- namespace stoc_bootstrap
- {
- Sequence< OUString > simreg_getSupportedServiceNames()
- {
- static Sequence < OUString > *pNames = 0;
- if( ! pNames )
- {
- MutexGuard guard( Mutex::getGlobalMutex() );
- if( !pNames )
- {
- static Sequence< OUString > seqNames(1);
- seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
- pNames = &seqNames;
- }
- }
- return *pNames;
- }
+ namespace {
- OUString simreg_getImplementationName()
- {
- static OUString *pImplName = 0;
- if( ! pImplName )
- {
- MutexGuard guard( Mutex::getGlobalMutex() );
- if( ! pImplName )
- {
- static OUString implName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) );
- pImplName = &implName;
- }
- }
- return *pImplName;
- }
- }
-
- namespace stoc_simreg {
-
- //*************************************************************************
- // class RegistryKeyImpl the implenetation of interface XRegistryKey
- //*************************************************************************
- class RegistryKeyImpl;
-
- //*************************************************************************
- // SimpleRegistryImpl
- //*************************************************************************
- class SimpleRegistryImpl : public WeakImplHelper2< XSimpleRegistry, XServiceInfo >
+ namespace css = com::sun::star;
+
+ class SimpleRegistry:
+ public cppu::WeakImplHelper2<
+ css::registry::XSimpleRegistry, css::lang::XServiceInfo >
{
public:
- SimpleRegistryImpl( const Registry& rRegistry );
-
- ~SimpleRegistryImpl();
-
- // XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException);
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException);
-
- // XSimpleRegistry
- virtual OUString SAL_CALL getURL() throw(RuntimeException);
- virtual void SAL_CALL open( const OUString& rURL, sal_Bool bReadOnly, sal_Bool bCreate ) throw(InvalidRegistryException, RuntimeException);
- virtual sal_Bool SAL_CALL isValid( ) throw(RuntimeException);
- virtual void SAL_CALL close( ) throw(InvalidRegistryException, RuntimeException);
- virtual void SAL_CALL destroy( ) throw(InvalidRegistryException, RuntimeException);
- virtual Reference< XRegistryKey > SAL_CALL getRootKey( ) throw(InvalidRegistryException, RuntimeException);
- virtual sal_Bool SAL_CALL isReadOnly( ) throw(InvalidRegistryException, RuntimeException);
- virtual void SAL_CALL mergeKey( const OUString& aKeyName, const OUString& aUrl ) throw(InvalidRegistryException, MergeConflictException, RuntimeException);
-
- friend class RegistryKeyImpl;
- protected:
- Mutex m_mutex;
- OUString m_url;
- Registry m_registry;
- };
+ SimpleRegistry() { g_moduleCount.modCnt.acquire(&g_moduleCount.modCnt); }
+ ~SimpleRegistry() { g_moduleCount.modCnt.release(&g_moduleCount.modCnt); }
- class RegistryKeyImpl : public WeakImplHelper1< XRegistryKey >
- {
+ osl::Mutex mutex_;
+
+ private:
+ virtual rtl::OUString SAL_CALL getURL() throw (css::uno::RuntimeException);
+
+ virtual void SAL_CALL open(
+ rtl::OUString const & rURL, sal_Bool bReadOnly, sal_Bool bCreate)
+ throw (
+ css::registry::InvalidRegistryException,
+ css::uno::RuntimeException);
+
+ virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException);
+
+ virtual void SAL_CALL close() throw (
+ css::registry::InvalidRegistryException, css::uno::RuntimeException);
+
+ virtual void SAL_CALL destroy() throw(
+ css::registry::InvalidRegistryException, css::uno::RuntimeException);
+
+ virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL
+ getRootKey() throw(
+ css::registry::InvalidRegistryException, css::uno::RuntimeException);
+
+ virtual sal_Bool SAL_CALL isReadOnly() throw(
+ css::registry::InvalidRegistryException, css::uno::RuntimeException);
+
+ virtual void SAL_CALL mergeKey(
+ rtl::OUString const & aKeyName, rtl::OUString const & aUrl)
+ throw (
+ css::registry::InvalidRegistryException,
+ css::registry::MergeConflictException, css::uno::RuntimeException);
+
+ virtual rtl::OUString SAL_CALL getImplementationName()
+ throw (css::uno::RuntimeException)
+ { return stoc_bootstrap::simreg_getImplementationName(); }
+
+ virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+ throw (css::uno::RuntimeException)
+ { return ServiceName == getSupportedServiceNames()[0]; }
+
+ virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+ getSupportedServiceNames() throw (css::uno::RuntimeException)
+ { return stoc_bootstrap::simreg_getSupportedServiceNames(); }
+
+ Registry registry_;
+ std::auto_ptr< stoc::simpleregistry::TextualServices > textual_;
+ };
+
+ class Key: public cppu::WeakImplHelper1< css::registry::XRegistryKey > {
public:
- RegistryKeyImpl( const RegistryKey& rKey, SimpleRegistryImpl* pRegistry );
-
- RegistryKeyImpl( const OUString& rKeyName, SimpleRegistryImpl* pRegistry );
-
- ~RegistryKeyImpl();
-
- // XRegistryKey
- virtual OUString SAL_CALL getKeyName() throw(RuntimeException);
- virtual sal_Bool SAL_CALL isReadOnly( ) throw(InvalidRegistryException, RuntimeException);
- virtual sal_Bool SAL_CALL isValid( ) throw(RuntimeException);
- virtual RegistryKeyType SAL_CALL getKeyType( const OUString& rKeyName ) throw(InvalidRegistryException, RuntimeException);
- virtual RegistryValueType SAL_CALL getValueType( ) throw(InvalidRegistryException, RuntimeException);
- virtual sal_Int32 SAL_CALL getLongValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException);
- virtual void SAL_CALL setLongValue( sal_Int32 value ) throw(InvalidRegistryException, RuntimeException);
- virtual Sequence< sal_Int32 > SAL_CALL getLongListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException);
- virtual void SAL_CALL setLongListValue( const ::com::sun::star::uno::Sequence< sal_Int32 >& seqValue ) throw(InvalidRegistryException, RuntimeException);
- virtual OUString SAL_CALL getAsciiValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException);
- virtual void SAL_CALL setAsciiValue( const OUString& value ) throw(InvalidRegistryException, RuntimeException);
- virtual Sequence< OUString > SAL_CALL getAsciiListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException);
- virtual void SAL_CALL setAsciiListValue( const ::com::sun::star::uno::Sequence< OUString >& seqValue ) throw(InvalidRegistryException, RuntimeException);
- virtual OUString SAL_CALL getStringValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException);
- virtual void SAL_CALL setStringValue( const OUString& value ) throw(InvalidRegistryException, RuntimeException);
- virtual Sequence< OUString > SAL_CALL getStringListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException);
- virtual void SAL_CALL setStringListValue( const ::com::sun::star::uno::Sequence< OUString >& seqValue ) throw(InvalidRegistryException, RuntimeException);
- virtual Sequence< sal_Int8 > SAL_CALL getBinaryValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException);
- virtual void SAL_CALL setBinaryValue( const ::com::sun::star::uno::Sequence< sal_Int8 >& value ) throw(InvalidRegistryException, RuntimeException);
- virtual Reference< XRegistryKey > SAL_CALL openKey( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException);
- virtual Reference< XRegistryKey > SAL_CALL createKey( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException);
- virtual void SAL_CALL closeKey( ) throw(InvalidRegistryException, RuntimeException);
- virtual void SAL_CALL deleteKey( const OUString& rKeyName ) throw(InvalidRegistryException, RuntimeException);
- virtual Sequence< Reference< XRegistryKey > > SAL_CALL openKeys( ) throw(InvalidRegistryException, RuntimeException);
- virtual Sequence< OUString > SAL_CALL getKeyNames( ) throw(InvalidRegistryException, RuntimeException);
- virtual sal_Bool SAL_CALL createLink( const OUString& aLinkName, const OUString& aLinkTarget ) throw(InvalidRegistryException, RuntimeException);
- virtual void SAL_CALL deleteLink( const OUString& rLinkName ) throw(InvalidRegistryException, RuntimeException);
- virtual OUString SAL_CALL getLinkTarget( const OUString& rLinkName ) throw(InvalidRegistryException, RuntimeException);
- virtual OUString SAL_CALL getResolvedName( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException);
-
- protected:
- OUString m_name;
- RegistryKey m_key;
- SimpleRegistryImpl* m_pRegistry;
- };
-
- //*************************************************************************
- RegistryKeyImpl::RegistryKeyImpl( const RegistryKey& key, SimpleRegistryImpl* pRegistry )
- : m_key(key)
- , m_pRegistry(pRegistry)
- {
- m_pRegistry->acquire();
- m_name = m_key.getName();
+ Key(
+ rtl::Reference< SimpleRegistry > const & registry,
+ RegistryKey const & key):
+ registry_(registry), key_(key) {}
+
+ private:
+ virtual rtl::OUString SAL_CALL getKeyName()
+ throw (css::uno::RuntimeException);
+
+ virtual sal_Bool SAL_CALL isReadOnly() throw (
+ css::registry::InvalidRegistryException, css::uno::RuntimeException);
+
+ virtual sal_Bool SAL_CALL isValid() throw(css::uno::RuntimeException);
+
+ virtual css::registry::RegistryKeyType SAL_CALL getKeyType(
+ rtl::OUString const & rKeyName)
+ throw (
+ css::registry::InvalidRegistryException,
+ css::uno::RuntimeException);
+
+ virtual css::registry::RegistryValueType SAL_CALL getValueType() throw(
+ css::registry::InvalidRegistryException, css::uno::RuntimeException);
+
+ virtual sal_Int32 SAL_CALL getLongValue() throw (
+ css::registry::InvalidRegistryException,
+ css::registry::InvalidValueException, css::uno::RuntimeException);
+
+ virtual void SAL_CALL setLongValue(sal_Int32 value) throw (
+ css::registry::InvalidRegistryException, css::uno::RuntimeException);
+
+ virtual css::uno::Sequence< sal_Int32 > SAL_CALL getLongListValue() throw(
+ css::registry::InvalidRegistryException,
+ css::registry::InvalidValueException, css::uno::RuntimeException);
+
+ virtual void SAL_CALL setLongListValue(
+ com::sun::star::uno::Sequence< sal_Int32 > const & seqValue)
+ throw (
+ css::registry::InvalidRegistryException,
+ css::uno::RuntimeException);
+
+ virtual rtl::OUString SAL_CALL getAsciiValue() throw (
+ css::registry::InvalidRegistryException,
+ css::registry::InvalidValueException, css::uno::RuntimeException);
+
+ virtual void SAL_CALL setAsciiValue(rtl::OUString const & value) throw (
+ css::registry::InvalidRegistryException, css::uno::RuntimeException);
+
+ virtual css::uno::Sequence< rtl::OUString > SAL_CALL getAsciiListValue()
+ throw (
+ css::registry::InvalidRegistryException,
+ css::registry::InvalidValueException, css::uno::RuntimeException);
+
+ virtual void SAL_CALL setAsciiListValue(
+ css::uno::Sequence< rtl::OUString > const & seqValue)
+ throw (
+ css::registry::InvalidRegistryException,
+ css::uno::RuntimeException);
+
+ virtual rtl::OUString SAL_CALL getStringValue() throw(
+ css::registry::InvalidRegistryException,
+ css::registry::InvalidValueException, css::uno::RuntimeException);
+
+ virtual void SAL_CALL setStringValue(rtl::OUString const & value) throw (
+ css::registry::InvalidRegistryException, css::uno::RuntimeException);
+
+ virtual css::uno::Sequence< rtl::OUString > SAL_CALL getStringListValue()
+ throw (
+ css::registry::InvalidRegistryException,
+ css::registry::InvalidValueException, css::uno::RuntimeException);
+
+ virtual void SAL_CALL setStringListValue(
+ css::uno::Sequence< rtl::OUString > const & seqValue)
+ throw (
+ css::registry::InvalidRegistryException,
+ css::uno::RuntimeException);
+
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBinaryValue() throw (
+ css::registry::InvalidRegistryException,
+ css::registry::InvalidValueException, css::uno::RuntimeException);
+
+ virtual void SAL_CALL setBinaryValue(
+ css::uno::Sequence< sal_Int8 > const & value)
+ throw (
+ css::registry::InvalidRegistryException,
+ css::uno::RuntimeException);
+
+ virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL openKey(
+ rtl::OUString const & aKeyName)
+ throw (
+ css::registry::InvalidRegistryException,
+ css::uno::RuntimeException);
+
+ virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL
+ createKey(rtl::OUString const & aKeyName) throw (
+ css::registry::InvalidRegistryException, css::uno::RuntimeException);
+
+ virtual void SAL_CALL closeKey() throw (
+ css::registry::InvalidRegistryException, css::uno::RuntimeException);
+
+ virtual void SAL_CALL deleteKey(rtl::OUString const & rKeyName) throw (
+ css::registry::InvalidRegistryException, css::uno::RuntimeException);
+
+ virtual
+ css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > >
+ SAL_CALL openKeys() throw (
+ css::registry::InvalidRegistryException, css::uno::RuntimeException);
+
+ virtual css::uno::Sequence< rtl::OUString > SAL_CALL getKeyNames() throw (
+ css::registry::InvalidRegistryException, css::uno::RuntimeException);
+
+ virtual sal_Bool SAL_CALL createLink(
+ rtl::OUString const & aLinkName, rtl::OUString const & aLinkTarget)
+ throw (
+ css::registry::InvalidRegistryException,
+ css::uno::RuntimeException);
+
+ virtual void SAL_CALL deleteLink(rtl::OUString const & rLinkName) throw (
+ css::registry::InvalidRegistryException, css::uno::RuntimeException);
+
+ virtual rtl::OUString SAL_CALL getLinkTarget(
+ rtl::OUString const & rLinkName)
+ throw (
+ css::registry::InvalidRegistryException,
+ css::uno::RuntimeException);
+
+ virtual rtl::OUString SAL_CALL getResolvedName(
+ rtl::OUString const & aKeyName)
+ throw (
+ css::registry::InvalidRegistryException,
+ css::uno::RuntimeException);
+
+ rtl::Reference< SimpleRegistry > registry_;
+ RegistryKey key_;
+ };
+
+ rtl::OUString Key::getKeyName() throw (css::uno::RuntimeException) {
+ osl::MutexGuard guard(registry_->mutex_);
+ return key_.getName();
}
- //*************************************************************************
- RegistryKeyImpl::RegistryKeyImpl( const OUString& rKeyName,
- SimpleRegistryImpl* pRegistry )
- : m_pRegistry(pRegistry)
+ sal_Bool Key::isReadOnly()
+ throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
- m_pRegistry->acquire();
-
- RegistryKey rootKey;
- if (!pRegistry->m_registry.isValid() ||
- pRegistry->m_registry.openRootKey(rootKey))
- {
- throw InvalidRegistryException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
- (OWeakObject *)this );
- } else
- {
- if ( rootKey.openKey(rKeyName, m_key) )
- {
- throw InvalidRegistryException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
- (OWeakObject *)this );
- } else
- {
- m_name = rKeyName;
- }
- }
+ osl::MutexGuard guard(registry_->mutex_);
+ return key_.isReadOnly();
}
- //*************************************************************************
- RegistryKeyImpl::~RegistryKeyImpl()
- {
- m_pRegistry->release();
+ sal_Bool Key::isValid() throw (css::uno::RuntimeException) {
+ osl::MutexGuard guard(registry_->mutex_);
+ return key_.isValid();
}
- //*************************************************************************
- OUString SAL_CALL RegistryKeyImpl::getKeyName() throw(RuntimeException)
+ css::registry::RegistryKeyType Key::getKeyType(rtl::OUString const & rKeyName)
+ throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
- Guard< Mutex > aGuard( m_pRegistry->m_mutex );
- return m_name;
- }
+ osl::MutexGuard guard(registry_->mutex_);
+ RegKeyType type;
+ RegError err = key_.getKeyType(rKeyName, &type);
+ if (err != REG_NO_ERROR) {
+ throw css::registry::InvalidRegistryException(
+ (rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.registry.SimpleRegistry key getKeyType:"
+ " underlying RegistryKey::getKeyType() = ")) +
+ rtl::OUString::valueOf(static_cast< sal_Int32 >(err))),
+ static_cast< OWeakObject * >(this));
+ }
+ switch (type) {
+ default:
+ std::abort(); // this cannot happen
+ // pseudo-fall-through to avoid warnings on MSC
+ case RG_KEYTYPE:
+ return css::registry::RegistryKeyType_KEY;
+ case RG_LINKTYPE:
+ return css::registry::RegistryKeyType_LINK;
+ }
+ }
- //*************************************************************************
- sal_Bool SAL_CALL RegistryKeyImpl::isReadOnly( )
- throw(InvalidRegistryException, RuntimeException)
+ css::registry::RegistryValueType Key::getValueType()
+ throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
- Guard< Mutex > aGuard( m_pRegistry->m_mutex );
- if (m_key.isValid())
- {
- return(m_key.isReadOnly());
- } else
- {
- throw InvalidRegistryException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("InvalidRegistryException") ),
- (OWeakObject *)this );
+ osl::MutexGuard guard(registry_->mutex_);
+ RegValueType type;
+ sal_uInt32 size;
+ RegError err = key_.getValueInfo(rtl::OUString(), &type, &size);
+ switch (err) {
+ case REG_NO_ERROR:
+ break;
+ case REG_INVALID_VALUE:
+ type = RG_VALUETYPE_NOT_DEFINED;
+ break;
+ default:
+ throw css::registry::InvalidRegistryException(
+ (rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.registry.SimpleRegistry key getValueType:"
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list