[Libreoffice-commits] .: Branch 'integration/dev300_m98' - 881 commits - bridges/source cppuhelper/inc cppuhelper/prj cppuhelper/qa cppuhelper/source cppu/inc cppu/qa 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 offuh/prj offuh/source pyuno/prj pyuno/source remotebridges/prj remotebridges/source sal/inc sal/osl sal/prj sal/qa sal/rtl sal/systools stoc/prj stoc/source stoc/test stoc/util udkapi/com ure/prj ure/source xmlreader/inc xmlreader/prj xmlreader/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Fri Feb 11 09:53:49 PST 2011
bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx | 2
bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx | 2
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 38
bridges/source/jni_uno/makefile.mk | 1
bridges/source/remote/urp/urp_job.hxx | 1
cppu/inc/com/sun/star/uno/Sequence.h | 2
cppu/qa/test_any.cxx | 1
cppu/source/threadpool/jobqueue.cxx | 4
cppuhelper/inc/cppuhelper/factory.hxx | 5
cppuhelper/inc/cppuhelper/implementationentry.hxx | 2
cppuhelper/inc/cppuhelper/propshlp.hxx | 35
cppuhelper/inc/cppuhelper/shlib.hxx | 2
cppuhelper/prj/build.lst | 2
cppuhelper/qa/propertysetmixin/JavaSupplier.java | 5
cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx | 7
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 | 28
cppuhelper/source/bootstrap.cxx | 10
cppuhelper/source/cc5_solaris_sparc.map | 5
cppuhelper/source/factory.cxx | 8
cppuhelper/source/gcc3.map | 4
cppuhelper/source/msvc_win32_intel.map | 5
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 -
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/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 | 34
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/protocols/urp/Cache.java | 2
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/makefile.mk | 9
jvmfwk/source/elements.hxx | 28
offapi/com/sun/star/awt/XDialog2.idl | 2
offapi/com/sun/star/awt/grid/UnoControlGridModel.idl | 2
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/MediaDescriptor.idl | 27
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/formula/FormulaProperties.idl | 6
offapi/com/sun/star/inspection/LineDescriptor.idl | 4
offapi/com/sun/star/script/ModuleType.idl | 42
offapi/com/sun/star/script/NativeObjectWrapper.idl | 42
offapi/com/sun/star/script/XLibraryQueryExecutable.idl | 2
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/sdb/RowsChangeEvent.idl | 2
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 | 6
offapi/com/sun/star/sheet/TableFilterField.idl | 11
offapi/com/sun/star/sheet/TableFilterField2.idl | 10
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 | 5
offapi/com/sun/star/util/OfficeInstallationDirectories.idl | 4
offapi/com/sun/star/util/XOfficeInstallationDirectories.idl | 5
offuh/prj/d.lst | 41
offuh/source/makefile.mk | 12
pyuno/prj/build.lst | 2
pyuno/prj/d.lst | 3
pyuno/source/loader/makefile.mk | 34
pyuno/source/loader/pythonloader.component | 34
pyuno/source/loader/pyuno_loader.cxx | 6
remotebridges/prj/build.lst | 2
remotebridges/prj/d.lst | 3
remotebridges/source/bridge/makefile.mk | 8
remotebridges/source/bridge/remote_bridge.cxx | 6
remotebridges/source/bridge/remotebridge.component | 36
remotebridges/source/dynamicloader/dynamicloader.cxx | 28
remotebridges/source/factory/bridgefac.component | 34
remotebridges/source/factory/bridgefactory.cxx | 6
remotebridges/source/factory/makefile.mk | 7
remotebridges/source/unourl_resolver/makefile.mk | 8
remotebridges/source/unourl_resolver/unourl_resolver.cxx | 6
remotebridges/source/unourl_resolver/uuresolver.component | 34
sal/inc/rtl/malformeduriexception.hxx | 4
sal/inc/rtl/math.h | 8
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/unx/diagnose.c | 31
sal/osl/unx/nlsupport.c | 4
sal/osl/unx/process_impl.cxx | 5
sal/osl/w32/diagnose.c | 37
sal/osl/w32/file_url.cxx | 17
sal/prj/build.lst | 1
sal/qa/ByteSequence/ByteSequence.cxx | 1
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/process/makefile.mk | 1
sal/qa/rtl/math/makefile.mk | 2
sal/qa/rtl/math/test-rtl-math.cxx | 76
sal/qa/rtl/math/test_rtl_math.cxx | 2
sal/rtl/source/math.cxx | 2
sal/systools/win32/kill/kill.cxx | 443 +
sal/systools/win32/uwinapi/ResolveUnicows.cpp | 5
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 | 4
stoc/source/corereflection/makefile.mk | 7
stoc/source/corereflection/reflection.component | 35
stoc/source/implementationregistration/implreg.cxx | 25
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 | 12
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 | 2373 +++++-----
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
ure/prj/build.lst | 2
ure/prj/d.lst | 16
ure/source/README | 2
ure/source/makefile.mk | 74
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 ++++
210 files changed, 7448 insertions(+), 2356 deletions(-)
New commits:
commit d706f43d8d8ebed88b20cab882b4f2cde7c8d794
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Feb 11 17:43:24 2011 +0000
remove merge duplicate, remove oovbaapi dep from this module
diff --git a/offapi/com/sun/star/awt/grid/XGridSelection.idl b/offapi/com/sun/star/awt/grid/XGridSelection.idl
index 5d18f29..a345348 100644
--- a/offapi/com/sun/star/awt/grid/XGridSelection.idl
+++ b/offapi/com/sun/star/awt/grid/XGridSelection.idl
@@ -73,16 +73,6 @@ interface XGridSelection
*/
[oneway] void deselectRows( [in] sequence< long > rangeOfRows);
- /** Deselects all selected rows.
- */
- [oneway] 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.
- */
- [oneway] void deselectRows( [in] sequence< long > rangeOfRows);
-
/** Returns the indices of all selected rows.
@returns
a sequence of indices.
diff --git a/offapi/com/sun/star/document/OfficeDocument.idl b/offapi/com/sun/star/document/OfficeDocument.idl
index c200772..1ab2816 100644
--- a/offapi/com/sun/star/document/OfficeDocument.idl
+++ b/offapi/com/sun/star/document/OfficeDocument.idl
@@ -193,13 +193,6 @@ published service OfficeDocument
[optional] interface XDocumentPropertiesSupplier;
//-------------------------------------------------------------------------
- /** access to the <type>DocumentProperties</type>.
-
- @since OOo 3.0
- */
- [optional] interface XDocumentPropertiesSupplier;
-
- //-------------------------------------------------------------------------
/** controls the focus behavior of the form controls in the document
<p>
diff --git a/offuh/prj/build.lst b/offuh/prj/build.lst
index e98f356..f8f8ca4 100644
--- a/offuh/prj/build.lst
+++ b/offuh/prj/build.lst
@@ -1,4 +1,4 @@
-ou offuh :: offapi oovbaapi codemaker NULL
+ou offuh :: offapi codemaker NULL
ou offuh usr1 - all ou_mkout NULL
ou offuh\prj get - all ou_prj NULL
ou offuh\source nmake - all ou_source NULL
commit a65072ad2aa675904fe0896112232adf01c30447
Merge: e236a39... 600beb2...
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Feb 11 16:27:47 2011 +0000
Merge remote branch 'stage/premerge/dev300_m98' into integration/dev300_m98
Conflicts:
bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx
bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
cppu/inc/com/sun/star/uno/Sequence.h
cppu/qa/test_any.cxx
cppu/source/threadpool/jobqueue.cxx
cppu/source/typelib/typelib.cxx
cppu/util/target.pmk
cppuhelper/inc/cppuhelper/factory.hxx
cppuhelper/inc/cppuhelper/implementationentry.hxx
cppuhelper/inc/cppuhelper/propshlp.hxx
cppuhelper/inc/cppuhelper/shlib.hxx
cppuhelper/prj/build.lst
cppuhelper/qa/propertysetmixin/JavaSupplier.java
cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
cppuhelper/qa/propertysetmixin/makefile.mk
cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
cppuhelper/source/cc5_solaris_sparc.map
cppuhelper/source/gcc3.map
cppuhelper/source/msvc_win32_intel.map
cpputools/prj/build.lst
cpputools/prj/d.lst
cpputools/source/regcomplazy/regcomplazy.cxx
io/prj/build.lst
io/prj/d.lst
javaunohelper/prj/build.lst
javaunohelper/prj/d.lst
javaunohelper/util/makefile.mk
jurt/com/sun/star/comp/connections/Acceptor.java
jurt/com/sun/star/comp/connections/Connector.java
jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
jurt/com/sun/star/comp/connections/PipedConnection.java
jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java
jurt/com/sun/star/lib/connections/pipe/pipeConnector.java
jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
jurt/com/sun/star/lib/connections/socket/socketConnector.java
jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
jurt/com/sun/star/lib/uno/protocols/urp/Cache.java
jurt/prj/build.lst
jurt/prj/d.lst
jurt/source/pipe/makefile.mk
jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java
jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java
jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java
jurt/test/com/sun/star/lib/uno/protocols/urp/makefile.mk
jvmfwk/source/elements.cxx
jvmfwk/source/elements.hxx
offapi/com/sun/star/awt/grid/GridDataEvent.idl
offapi/com/sun/star/awt/grid/XGridSelection.idl
offapi/com/sun/star/chart/XComplexDescriptionAccess.idl
offapi/com/sun/star/deployment/XExtensionManager.idl
offapi/com/sun/star/deployment/XPackage.idl
offapi/com/sun/star/document/MediaDescriptor.idl
offapi/com/sun/star/document/OfficeDocument.idl
offapi/com/sun/star/document/XCodeNameQuery.idl
offapi/com/sun/star/formula/FormulaProperties.idl
offapi/com/sun/star/inspection/LineDescriptor.idl
offapi/com/sun/star/script/ModuleType.idl
offapi/com/sun/star/script/XLibraryQueryExecutable.idl
offapi/com/sun/star/script/makefile.mk
offapi/com/sun/star/sdb/RowsChangeEvent.idl
offapi/com/sun/star/sdb/XRowsChangeListener.idl
offapi/com/sun/star/task/makefile.mk
offapi/com/sun/star/text/TextMarkupType.idl
offapi/com/sun/star/ui/UIElementType.idl
offapi/com/sun/star/util/OfficeInstallationDirectories.idl
offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
offuh/source/makefile.mk
remotebridges/prj/build.lst
remotebridges/prj/d.lst
remotebridges/source/dynamicloader/dynamicloader.cxx
sal/osl/unx/diagnose.c
sal/osl/unx/process_impl.cxx
sal/osl/w32/diagnose.c
sal/osl/w32/file_url.cxx
sal/osl/w32/file_url.h
sal/osl/w32/system.h
sal/prj/build.lst
sal/qa/ByteSequence/ByteSequence.cxx
sal/qa/OStringBuffer/makefile.mk
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
sal/qa/OStringBuffer/rtl_String_Const.h
sal/qa/osl/pipe/makefile.mk
sal/qa/osl/pipe/osl_Pipe.cxx
sal/qa/osl/process/makefile.mk
sal/qa/osl/profile/makefile.mk
sal/qa/rtl/alloc/makefile.mk
sal/qa/rtl/crc32/makefile.mk
sal/qa/rtl/doublelock/makefile.mk
sal/qa/rtl/locale/makefile.mk
sal/qa/rtl/math/makefile.mk
sal/qa/rtl_strings/makefile.mk
sal/rtl/source/alloc.c
sal/util/salalloc.list
stoc/prj/d.lst
stoc/source/bootstrap/services.cxx
stoc/source/corereflection/base.hxx
stoc/source/corereflection/crefl.cxx
stoc/source/corereflection/makefile.mk
stoc/source/implementationregistration/implreg.cxx
stoc/source/inspect/introspection.cxx
stoc/source/invocation/invocation.cxx
stoc/source/invocation/makefile.mk
stoc/source/invocation_adapterfactory/iafactory.cxx
stoc/source/invocation_adapterfactory/makefile.mk
stoc/source/javaloader/javaloader.cxx
stoc/source/javaloader/makefile.mk
stoc/source/javavm/javavm.cxx
stoc/source/javavm/makefile.mk
stoc/source/namingservice/makefile.mk
stoc/source/namingservice/namingservice.cxx
stoc/source/proxy_factory/makefile.mk
stoc/source/proxy_factory/proxyfac.cxx
stoc/source/registry_tdprovider/tdprovider.cxx
stoc/source/simpleregistry/makefile.mk
stoc/source/simpleregistry/simpleregistry.cxx
stoc/source/stocservices/stocservices.cxx
stoc/test/uriproc/makefile.mk
stoc/util/makefile.mk
udkapi/com/sun/star/script/makefile.mk
ure/prj/build.lst
ure/prj/d.lst
diff --cc bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index 685fea0,8552858..a79cd36
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@@ -370,13 -386,31 +386,31 @@@ static void cpp_call
try
{
+ try {
- callVirtualMethod(
- pAdjustedThisPtr, aVtableSlot.index,
- pCppReturn, pReturnTypeRef, bSimpleReturn,
- pStackStart, ( pStack - pStackStart ),
- pGPR, nGPR,
- pFPR, nFPR );
+ callVirtualMethod(
+ pAdjustedThisPtr, aVtableSlot.index,
+ pCppReturn, pReturnTypeRef, bSimpleReturn,
+ pStackStart, ( pStack - pStackStart ),
+ pGPR, nGPR,
+ pFPR, nFPR );
- // NO exception occurred...
+ } 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 >());
+ }
+
*ppUnoExc = 0;
// reconvert temporary params
diff --cc cppuhelper/inc/cppuhelper/shlib.hxx
index a4f52ca,a092ce3..715d246
--- a/cppuhelper/inc/cppuhelper/shlib.hxx
+++ b/cppuhelper/inc/cppuhelper/shlib.hxx
@@@ -65,7 -65,9 +65,9 @@@ SAL_CALL loadSharedLibComponentFactory
(e.g. xxx.dll). You can give parameter rPath to force lookup of the library in a specific
directory. The resulting path of the library will be checked against environment variable
CPLD_ACCESSPATH if set.
-
+
+ @obsolete component_writeInfo should no longer be used in new components
+
@param rLibName name of the library
@param rPath optional path
@param xMgr service manager to be provided to the component
diff --cc cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
index adf1610,d013941..900fc22
--- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
@@@ -429,11 -429,5 +429,4 @@@ 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 cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
index 3b05dc3,677b685..ed2e0bd
--- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
@@@ -179,7 -177,7 +177,8 @@@ class Test: public CppUnit::TestFixtur
public:
virtual void setUp();
+ void finish();
+ virtual void tearDown();
void testCppEmpty1() { testEmpty1(getCppSupplier()); }
@@@ -226,26 -223,11 +225,15 @@@ private
};
void Test::setUp() {
- // For whatever reason, on W32 it does not work to create/destroy a fresh
- // component context for each test in Test::setUp/tearDown; therefore, a
- // single component context is used for all tests and destroyed in the last
- // pseudo-test "finish":
- if (!m_context.is()) {
- css::uno::Reference< css::lang::XMultiComponentFactory > factory(
- cppu::createRegistryServiceFactory(
- getArgument(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("reg"))),
- sal_False,
- getArgument(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("path")))),
- css::uno::UNO_QUERY_THROW);
- css::uno::Reference< css::beans::XPropertySet >(
- factory, css::uno::UNO_QUERY_THROW)->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")))
- >>= m_context;
- }
+ m_context = cppu::defaultBootstrap_InitialComponentContext();
+ CPPUNIT_ASSERT(m_context.is());
}
+void Test::finish() {
++ css::uno::Reference< css::uno::XComponentContext > m_context;
++};
++
+ void Test::tearDown() {
css::uno::Reference< css::lang::XComponent >(
m_context, css::uno::UNO_QUERY_THROW)->dispose();
}
diff --cc cppuhelper/source/cc5_solaris_sparc.map
index 090f8a1,6d4c9e6..8a6c833
--- a/cppuhelper/source/cc5_solaris_sparc.map
+++ b/cppuhelper/source/cc5_solaris_sparc.map
@@@ -387,3 -387,9 +387,8 @@@ UDK_3.7 { # OOo 3.
__1cDcomDsunEstarDunoTWeakReferenceHelperFclear6M_v_;
__1cEcppubHcreateOneInstanceComponentFactory6FpFrknDcomDsunEstarDunoJReference4n0ERXComponentContext____n0EJReference4n0EKXInterface___rknDrtlIOUString_rkn0EISequence4n0K___pnQ_rtl_ModuleCount__n0EJReference4n0DElangXXSingleComponentFactory____;
} UDK_3.6;
+
+ UDK_3.8 { # OOo 3.4
+ global:
+ __1cEcppuSOPropertySetHelperbDsetDependentFastPropertyValue6MlrknDcomDsunEstarDunoDAny__v_;
+ } UDK_3.7;
-
diff --cc cppuhelper/source/factory.cxx
index 187da68,c3c951b..3df18b0
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@@ -231,7 -238,8 +238,8 @@@ Reference< XInterface > OSingleFactoryH
throw lang::IllegalArgumentException(
OUString( RTL_CONSTASCII_USTRINGPARAM("cannot pass arguments to component => no XInitialization implemented!") ),
Reference< XInterface >(), 0 );
- }
+ }
+ }
return xRet;
}
diff --cc cppuhelper/source/gcc3.map
index 88e58df,0aee996..98a5279
--- a/cppuhelper/source/gcc3.map
+++ b/cppuhelper/source/gcc3.map
@@@ -382,3 -382,9 +382,7 @@@ UDK_3.6 { # OOo 3.
_ZN4cppu33createOneInstanceComponentFactoryEPFN3com3sun4star3uno9ReferenceINS3_10XInterfaceEEERKNS4_INS3_17XComponentContextEEEERKN3rtl8OUStringERKNS3_8SequenceISE_EEP16_rtl_ModuleCount;
} UDK_3.5;
-
+ UDK_3.7 { # OOo 3.4
+ global:
+ _ZN4cppu18OPropertySetHelper29setDependentFastPropertyValueE?RKN3com3sun4star3uno3AnyE;
+ } UDK_3.6;
-
diff --cc cppuhelper/source/msvc_win32_intel.map
index 6d5a491,7069276..76d23b9
--- a/cppuhelper/source/msvc_win32_intel.map
+++ b/cppuhelper/source/msvc_win32_intel.map
@@@ -278,3 -278,9 +278,8 @@@ UDK_3.6 { # OOo 3.
?clear at WeakReferenceHelper@uno at star@sun at com@@QAAXXZ;
?createOneInstanceComponentFactory at cppu@@YA?AV?$Reference at VXSingleComponentFactory@lang at star@sun at com@@@uno at star@sun at com@@P6A?AV?$Reference at VXInterface@uno at star@sun at com@@@3456 at ABV?$Reference at VXComponentContext@uno at star@sun at com@@@3456@@ZABVOUString at rtl@@ABV?$Sequence at VOUString@rtl@@@3456 at PAU_rtl_ModuleCount@@@Z;
} UDK_3.5;
+
+ UDK_3.7 { # OOo 3.4
+ global:
+ ?setDependentFastPropertyValue at OPropertySetHelper@cppu@@IAEXJABVAny at uno@star at sun@com@@@Z;
+ } UDK_3.6;
-
diff --cc javaunohelper/com/sun/star/lib/uno/helper/Factory.java
index 0d3759f,aa67282..024b386
--- a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
@@@ -50,9 -50,33 +50,33 @@@ public class Factor
/** Creates an object factory supporting interfaces
com.sun.star.lang.XSingleComponentFactory and
com.sun.star.lang.XServiceInfo
-
+
@param impl_class
implementation class
+ @param impl_name
+ implementation name
+ @param supported_services
+ services implemented
+ @return
+ object factory
+
+ @since UDK 3.2.13
+ */
+ public static XSingleComponentFactory createComponentFactory(
+ Class impl_class, String impl_name, String supported_services [] )
+ throws com.sun.star.uno.RuntimeException
+ {
+ return new Factory( impl_class, impl_name, supported_services );
+ }
+
+ /** Creates an object factory supporting interfaces
+ com.sun.star.lang.XSingleComponentFactory and
+ com.sun.star.lang.XServiceInfo
+
+ The implementation name is the name of the implementation class.
+
+ @param impl_class
+ implementation class
@param supported_services
services implemented
@return
diff --cc jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
index 8917446,23516fe..6cfcf3c
--- a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
+++ b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
@@@ -92,20 -92,8 +92,8 @@@ public class BridgeFactory implements X
return xSingleServiceFactory;
}
-
+
/**
- * Writes the service information into the given registry key.
- * This method is called by the <code>JavaLoader</code>
- * <p>
- * @return returns true if the operation succeeded
- * @param regKey the registryKey
- * @see com.sun.star.comp.loader.JavaLoader
- */
- public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
- return FactoryHelper.writeRegistryServiceInfo(BridgeFactory.class.getName(), __serviceName, regKey);
- }
-
- /**
* Creates a remote bridge and memorizes it under <code>sName</code>.
* <p>
* @return the bridge
diff --cc jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
index d3e188f,ce64cb9..fbb14a2
--- a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
+++ b/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
@@@ -84,21 -84,7 +84,7 @@@ public class ConstantInstanceProvider i
return xSingleServiceFactory;
}
-
+
- /**
- * Writes the service information into the given registry key.
- * This method is called by the <code>JavaLoader</code>
- * <p>
- * @return returns true if the operation succeeded
- * @param regKey the registryKey
- * @see com.sun.star.comp.loader.JavaLoader
- */
- public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
- return FactoryHelper.writeRegistryServiceInfo(ConstantInstanceProvider.class.getName(), __serviceName, regKey);
- }
-
-
-
protected XMultiServiceFactory _serviceManager;
protected String _serviceName;
protected Object _instance;
diff --cc jurt/com/sun/star/comp/connections/PipedConnection.java
index ee77212,719e24b..8369440
--- a/jurt/com/sun/star/comp/connections/PipedConnection.java
+++ b/jurt/com/sun/star/comp/connections/PipedConnection.java
@@@ -84,21 -84,8 +84,8 @@@ public class PipedConnection implement
return xSingleServiceFactory;
}
-
+
/**
- * Writes the service information into the given registry key.
- * This method is called by the <code>JavaLoader</code>
- * <p>
- * @return returns true if the operation succeeded
- * @param regKey the registryKey
- * @see com.sun.star.comp.loader.JavaLoader
- */
- public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
- return FactoryHelper.writeRegistryServiceInfo(PipedConnection.class.getName(), __serviceName, regKey);
- }
-
-
- /**
* The amount of time in milliseconds, to wait to
* see check the buffers.
*/
diff --cc jurt/prj/build.lst
index 9b9b722,6ba92a9..cf47fea
--- a/jurt/prj/build.lst
+++ b/jurt/prj/build.lst
@@@ -17,3 -17,4 +17,4 @@@ ju jurt\com\sun\star\comp\urlresolver
ju jurt\source\pipe nmake - all ju_src_pipe NULL
ju jurt\source\pipe\wrapper nmake - w ju_src_pipe_wrapper NULL
ju jurt\util nmake - all ju_ut ju_brid_jrm ju_co_bfactr ju_con ju_con_sock ju_con_pipe ju_cssl_uno ju_env_java ju_prot_urp ju_servman ju_urlres ju_src_pipe ju_libutil ju_uno NULL
-ju jurt\test\com\sun\star\lib\uno\protocols\urp nmake - all ju_test_css_lib_uno_protocols_urp NULL
++ju jurt\test\com\sun\star\lib\uno\protocols\urp nmake - all ju_test_css_lib_uno_protocols_urp NULL
diff --cc offapi/com/sun/star/deployment/XExtensionManager.idl
index 2103f48,7bbff43..d9130d7
--- a/offapi/com/sun/star/deployment/XExtensionManager.idl
+++ b/offapi/com/sun/star/deployment/XExtensionManager.idl
@@@ -281,6 -281,8 +281,8 @@@ interface XExtensionManage
Added extensions will be added to the database and removed extensions
will be removed from the database.
+ The active extensions are determined. That is, shared or bundled extensions
- are not necessaryly registered (<member>XPackage::registerPackage</member>).
++ are not necessarily registered (<member>XPackage::registerPackage</member>).
@return
If true - then at least one extension was removed or added. Otherwise
diff --cc offapi/com/sun/star/deployment/XPackage.idl
index 6f0ec81,0395a65..2e18f43
mode 100644,100755..100755
--- a/offapi/com/sun/star/deployment/XPackage.idl
+++ b/offapi/com/sun/star/deployment/XPackage.idl
@@@ -262,6 -262,14 +262,14 @@@ interface XPackag
string getDescription()
raises (ExtensionRemovedException);
+ /** returns a string containing the license text.
-
++
+ @return
+ license
+ */
+ string getLicenseText()
+ raises (ExtensionRemovedException);
+
/** returns a sequence of update information URLs.
The sequence may be empty in case no update information is available.
diff --cc offapi/com/sun/star/document/MediaDescriptor.idl
index 8995193,d677066..6a21d93
--- a/offapi/com/sun/star/document/MediaDescriptor.idl
+++ b/offapi/com/sun/star/document/MediaDescriptor.idl
@@@ -164,6 -173,23 +168,23 @@@ published service MediaDescripto
[optional,property] string DocumentTitle;
//-------------------------------------------------------------------------
+ /** encryption information for encryption/decryption of documents
+
+ <p>
- It contains the necessary information for encryption/decryption of
++ It contains the necessary information for encryption/decryption of
+ a component (if necessary).
- If neither password nor encryption data is specified, loading of
++ If neither password nor encryption data is specified, loading of
+ a password protected document will fail, storing will be done without
- encryption. If both are provided, the encryption data is used
++ encryption. If both are provided, the encryption data is used
+ ( if the filter supports it ).
+ </p>
+ <p>
+ The encryption data is generated based on the password.
+ </p>
+ */
+ [optional,property] sequence< ::com::sun::star::beans::NamedValue > EncryptionData;
+
+ //-------------------------------------------------------------------------
/** same as <member>MediaDescriptor::URL</member>
<p>
@@@ -366,8 -392,10 +387,10 @@@
<p>
It contains a password for loading or storing a component (if necessary).
- If no password is specified, loading of a password protected document
- will fail, storing will be done without encryption.
- If neither password nor encryption data is specified, loading of
++ If neither password nor encryption data is specified, loading of
+ a password protected document will fail, storing will be done without
- encryption. If both are provided, the encryption data is used
++ encryption. If both are provided, the encryption data is used
+ ( if the filter supports it ).
</p>
*/
[optional,property] string Password;
diff --cc offapi/com/sun/star/formula/FormulaProperties.idl
index 6f7b827,3c03a88..0b7ccb6
--- a/offapi/com/sun/star/formula/FormulaProperties.idl
+++ b/offapi/com/sun/star/formula/FormulaProperties.idl
@@@ -338,6 -338,14 +338,12 @@@ published service FormulaPropertie
/** contains the metric value of the right margin of the formula.
*/
[property] short RightMargin;
+
+ //-------------------------------------------------------------------------
-
+ /** contains the baselines offset in respect to the top of the formula rectangle
-
+ @since OOo 3.4
+ */
+ [property, optional] short BaseLine;
};
//=============================================================================
diff --cc offapi/com/sun/star/script/makefile.mk
index 8c46453,85fae84..7405060
--- a/offapi/com/sun/star/script/makefile.mk
+++ b/offapi/com/sun/star/script/makefile.mk
@@@ -41,17 -41,18 +41,18 @@@ IDLFILES=
DocumentDialogLibraryContainer.idl\
DocumentScriptLibraryContainer.idl\
LibraryNotLoadedException.idl\
- XLibraryContainer.idl\
- XLibraryContainer2.idl\
+ XLibraryContainer.idl\
+ XLibraryContainer2.idl\
XLibraryContainer3.idl\
- XLibraryContainerPassword.idl\
- XLibraryContainerExport.idl\
- XPersistentLibraryContainer.idl\
- XStorageBasedLibraryContainer.idl\
+ XLibraryContainerPassword.idl\
+ XLibraryContainerExport.idl\
+ XPersistentLibraryContainer.idl\
+ XStorageBasedLibraryContainer.idl\
XLibraryQueryExecutable.idl \
- ModuleSizeExceededRequest.idl\
- ModuleInfo.idl\
+ ModuleSizeExceededRequest.idl\
+ ModuleInfo.idl\
- ModuleType.idl
+ ModuleType.idl\
+ NativeObjectWrapper.idl
# ------------------------------------------------------------------
diff --cc offapi/com/sun/star/sheet/makefile.mk
index 65e8d5c,3433666..9daa5cf
--- a/offapi/com/sun/star/sheet/makefile.mk
+++ b/offapi/com/sun/star/sheet/makefile.mk
@@@ -193,138 -193,139 +193,139 @@@ IDLFILES=
Solver.idl\
SolverConstraint.idl\
SolverConstraintOperator.idl\
- Spreadsheet.idl\
- SpreadsheetDocument.idl\
- SpreadsheetDocumentSettings.idl\
- SpreadsheetDrawPage.idl\
- SpreadsheetView.idl\
+ Spreadsheet.idl\
+ SpreadsheetDocument.idl\
+ SpreadsheetDocumentSettings.idl\
+ SpreadsheetDrawPage.idl\
+ SpreadsheetView.idl\
+ SpreadsheetViewObjectsMode.idl\
- SpreadsheetViewPane.idl\
- SpreadsheetViewPanesEnumeration.idl\
- SpreadsheetViewSettings.idl\
- Spreadsheets.idl\
- SpreadsheetsEnumeration.idl\
- StatusBarFunction.idl\
- SubTotalColumn.idl\
- SubTotalDescriptor.idl\
- SubTotalField.idl\
- SubTotalFieldsEnumeration.idl\
- TableAutoFormat.idl\
- TableAutoFormatEnumeration.idl\
- TableAutoFormatField.idl\
- TableAutoFormats.idl\
- TableAutoFormatsEnumeration.idl\
- TableCellStyle.idl\
- TableCellStyle.idl\
- TableConditionalEntry.idl\
- TableConditionalEntryEnumeration.idl\
- TableConditionalFormat.idl\
- TableFilterField.idl\
- TableFilterField2.idl\
- TableOperationMode.idl\
- TablePageBreakData.idl\
- TablePageStyle.idl\
- TableValidation.idl\
- TableValidationVisibility.idl\
- UniqueCellFormatRanges.idl\
- UniqueCellFormatRangesEnumeration.idl\
- ValidationAlertStyle.idl\
- ValidationType.idl\
- VolatileResult.idl\
- XActivationBroadcaster.idl\
- XActivationEventListener.idl\
- XAddIn.idl\
- XAreaLink.idl\
- XAreaLinks.idl\
- XArrayFormulaRange.idl\
- XArrayFormulaTokens.idl\
- XCalculatable.idl\
- XCellAddressable.idl\
- XCellFormatRangesSupplier.idl\
- XCellRangeAddressable.idl\
- XCellRangeData.idl\
- XCellRangeFormula.idl\
- XCellRangeMovement.idl\
- XCellRangeReferrer.idl\
- XCellRangesAccess.idl\
- XCellRangesQuery.idl\
- XCellSeries.idl\
- XCompatibilityNames.idl\
- XConsolidatable.idl\
- XConsolidationDescriptor.idl\
- XDDELink.idl\
- XDDELinkResults.idl\
- XDDELinks.idl\
- XDataPilotDataLayoutFieldSupplier.idl\
- XDataPilotDescriptor.idl\
- XDataPilotField.idl\
- XDataPilotFieldGrouping.idl\
- XDataPilotMemberResults.idl\
- XDataPilotResults.idl\
- XDataPilotTable.idl\
- XDataPilotTable2.idl\
- XDataPilotTables.idl\
- XDataPilotTablesSupplier.idl\
- XDatabaseRange.idl\
- XDatabaseRanges.idl\
- XDimensionsSupplier.idl\
- XDocumentAuditing.idl\
- XDrillDownDataSupplier.idl\
- XEnhancedMouseClickBroadcaster.idl\
- XExternalDocLink.idl\
- XExternalDocLinks.idl\
- XExternalSheetCache.idl\
- XExternalSheetName.idl\
- XFillAcrossSheet.idl\
- XFilterFormulaParser.idl\
- XFormulaOpCodeMapper.idl\
- XFormulaParser.idl\
- XFormulaQuery.idl\
- XFormulaTokens.idl\
- XFunctionAccess.idl\
- XFunctionDescriptions.idl\
- XGoalSeek.idl\
- XHeaderFooterContent.idl\
- XHierarchiesSupplier.idl\
- XLabelRange.idl\
- XLabelRanges.idl\
- XLevelsSupplier.idl\
- XMembersSupplier.idl\
- XMultiFormulaTokens.idl\
- XMultipleOperation.idl\
- XNamedRange.idl\
- XNamedRanges.idl\
- XPrintAreas.idl\
- XRangeSelection.idl\
- XRangeSelectionChangeListener.idl\
- XRangeSelectionListener.idl\
- XRecentFunctions.idl\
- XResultListener.idl\
- XScenario.idl\
- XScenarioEnhanced.idl\
- XScenarios.idl\
- XScenariosSupplier.idl\
- XSheetAnnotation.idl\
- XSheetAnnotationAnchor.idl\
- XSheetAnnotationShapeSupplier.idl\
- XSheetAnnotations.idl\
- XSheetAnnotationsSupplier.idl\
- XSheetAuditing.idl\
- XSheetCellCursor.idl\
- XSheetCellRange.idl\
- XSheetCellRangeContainer.idl\
- XSheetCellRanges.idl\
- XSheetCondition.idl\
- XSheetConditionalEntries.idl\
- XSheetConditionalEntry.idl\
- XSheetFilterDescriptor.idl\
- XSheetFilterDescriptor2.idl\
- XSheetFilterable.idl\
- XSheetFilterableEx.idl\
- XSheetLinkable.idl\
- XSheetOperation.idl\
- XSheetOutline.idl\
- XSheetPageBreak.idl\
- XSheetPastable.idl\
+ SpreadsheetViewPane.idl\
+ SpreadsheetViewPanesEnumeration.idl\
+ SpreadsheetViewSettings.idl\
+ Spreadsheets.idl\
+ SpreadsheetsEnumeration.idl\
+ StatusBarFunction.idl\
+ SubTotalColumn.idl\
+ SubTotalDescriptor.idl\
+ SubTotalField.idl\
+ SubTotalFieldsEnumeration.idl\
+ TableAutoFormat.idl\
+ TableAutoFormatEnumeration.idl\
+ TableAutoFormatField.idl\
+ TableAutoFormats.idl\
+ TableAutoFormatsEnumeration.idl\
+ TableCellStyle.idl\
+ TableCellStyle.idl\
+ TableConditionalEntry.idl\
+ TableConditionalEntryEnumeration.idl\
+ TableConditionalFormat.idl\
+ TableFilterField.idl\
+ TableFilterField2.idl\
+ TableOperationMode.idl\
+ TablePageBreakData.idl\
+ TablePageStyle.idl\
+ TableValidation.idl\
+ TableValidationVisibility.idl\
+ UniqueCellFormatRanges.idl\
+ UniqueCellFormatRangesEnumeration.idl\
+ ValidationAlertStyle.idl\
+ ValidationType.idl\
+ VolatileResult.idl\
+ XActivationBroadcaster.idl\
+ XActivationEventListener.idl\
+ XAddIn.idl\
+ XAreaLink.idl\
+ XAreaLinks.idl\
+ XArrayFormulaRange.idl\
+ XArrayFormulaTokens.idl\
+ XCalculatable.idl\
+ XCellAddressable.idl\
+ XCellFormatRangesSupplier.idl\
+ XCellRangeAddressable.idl\
+ XCellRangeData.idl\
+ XCellRangeFormula.idl\
+ XCellRangeMovement.idl\
+ XCellRangeReferrer.idl\
+ XCellRangesAccess.idl\
+ XCellRangesQuery.idl\
+ XCellSeries.idl\
+ XCompatibilityNames.idl\
+ XConsolidatable.idl\
+ XConsolidationDescriptor.idl\
+ XDDELink.idl\
+ XDDELinkResults.idl\
+ XDDELinks.idl\
+ XDataPilotDataLayoutFieldSupplier.idl\
+ XDataPilotDescriptor.idl\
+ XDataPilotField.idl\
+ XDataPilotFieldGrouping.idl\
+ XDataPilotMemberResults.idl\
+ XDataPilotResults.idl\
+ XDataPilotTable.idl\
+ XDataPilotTable2.idl\
+ XDataPilotTables.idl\
+ XDataPilotTablesSupplier.idl\
+ XDatabaseRange.idl\
+ XDatabaseRanges.idl\
+ XDimensionsSupplier.idl\
+ XDocumentAuditing.idl\
+ XDrillDownDataSupplier.idl\
+ XEnhancedMouseClickBroadcaster.idl\
+ XExternalDocLink.idl\
+ XExternalDocLinks.idl\
+ XExternalSheetCache.idl\
+ XExternalSheetName.idl\
+ XFillAcrossSheet.idl\
+ XFilterFormulaParser.idl\
+ XFormulaOpCodeMapper.idl\
+ XFormulaParser.idl\
+ XFormulaQuery.idl\
+ XFormulaTokens.idl\
+ XFunctionAccess.idl\
+ XFunctionDescriptions.idl\
+ XGoalSeek.idl\
+ XHeaderFooterContent.idl\
+ XHierarchiesSupplier.idl\
+ XLabelRange.idl\
+ XLabelRanges.idl\
+ XLevelsSupplier.idl\
+ XMembersSupplier.idl\
+ XMultiFormulaTokens.idl\
+ XMultipleOperation.idl\
+ XNamedRange.idl\
+ XNamedRanges.idl\
+ XPrintAreas.idl\
+ XRangeSelection.idl\
+ XRangeSelectionChangeListener.idl\
+ XRangeSelectionListener.idl\
+ XRecentFunctions.idl\
+ XResultListener.idl\
+ XScenario.idl\
+ XScenarioEnhanced.idl\
+ XScenarios.idl\
+ XScenariosSupplier.idl\
+ XSheetAnnotation.idl\
+ XSheetAnnotationAnchor.idl\
+ XSheetAnnotationShapeSupplier.idl\
+ XSheetAnnotations.idl\
+ XSheetAnnotationsSupplier.idl\
+ XSheetAuditing.idl\
+ XSheetCellCursor.idl\
+ XSheetCellRange.idl\
+ XSheetCellRangeContainer.idl\
+ XSheetCellRanges.idl\
+ XSheetCondition.idl\
+ XSheetConditionalEntries.idl\
+ XSheetConditionalEntry.idl\
+ XSheetFilterDescriptor.idl\
+ XSheetFilterDescriptor2.idl\
+ XSheetFilterable.idl\
+ XSheetFilterableEx.idl\
+ XSheetLinkable.idl\
+ XSheetOperation.idl\
+ XSheetOutline.idl\
+ XSheetPageBreak.idl\
+ XSheetPastable.idl\
XSolver.idl\
XSolverDescription.idl\
XSpreadsheet.idl\
diff --cc offapi/com/sun/star/task/makefile.mk
index 16b0be5,c45bd6a..7ab1e2a
--- a/offapi/com/sun/star/task/makefile.mk
+++ b/offapi/com/sun/star/task/makefile.mk
@@@ -39,50 -39,51 +39,51 @@@ PACKAGE=com$/sun$/star$/tas
# ------------------------------------------------------------------------
IDLFILES=\
- ClassifiedInteractionRequest.idl\
- DocumentMacroConfirmationRequest.idl\
- DocumentPasswordRequest.idl\
+ ClassifiedInteractionRequest.idl\
+ DocumentMacroConfirmationRequest.idl\
+ DocumentPasswordRequest.idl\
DocumentPasswordRequest2.idl\
- DocumentMSPasswordRequest.idl\
+ DocumentMSPasswordRequest.idl\
DocumentMSPasswordRequest2.idl\
- ErrorCodeRequest.idl\
- ErrorCodeIOException.idl\
- FutureDocumentVersionProductUpdateRequest.idl\
- InteractionClassification.idl\
- InteractionHandler.idl\
- JobExecutor.idl\
- Job.idl\
- AsyncJob.idl\
- MasterPasswordRequest.idl\
- NoMasterException.idl\
- PasswordContainer.idl\
- PasswordContainerInteractionHandler.idl\
- PasswordRequest.idl\
- PasswordRequestMode.idl\
+ ErrorCodeRequest.idl\
+ ErrorCodeIOException.idl\
+ FutureDocumentVersionProductUpdateRequest.idl\
+ InteractionClassification.idl\
+ InteractionHandler.idl\
+ JobExecutor.idl\
+ Job.idl\
+ AsyncJob.idl\
+ MasterPasswordRequest.idl\
+ NoMasterException.idl\
+ PasswordContainer.idl\
+ PasswordContainerInteractionHandler.idl\
+ PasswordRequest.idl\
+ PasswordRequestMode.idl\
+ PDFExportException.idl\
- OfficeRestartManager.idl\
- UnsupportedOverwriteRequest.idl\
- UrlRecord.idl\
- UserRecord.idl\
- XAsyncJob.idl\
- XInteractionApprove.idl\
- XInteractionAskLater.idl\
- XInteractionDisapprove.idl\
- XInteractionPassword.idl\
- XInteractionPassword2.idl\
- XJob.idl\
- XJobExecutor.idl\
- XJobListener.idl\
- XMasterPasswordHandling.idl\
- XMasterPasswordHandling2.idl\
- XPasswordContainer.idl\
- XRestartManager.idl\
- XStatusIndicator.idl\
- XStatusIndicatorFactory.idl\
- XStatusIndicatorSupplier.idl\
- XAbortChannel.idl\
- XInteractionRequestStringResolver.idl\
- InteractionRequestStringResolver.idl\
- XUrlContainer.idl
+ OfficeRestartManager.idl\
+ UnsupportedOverwriteRequest.idl\
+ UrlRecord.idl\
+ UserRecord.idl\
+ XAsyncJob.idl\
+ XInteractionApprove.idl\
+ XInteractionAskLater.idl\
+ XInteractionDisapprove.idl\
+ XInteractionPassword.idl\
+ XInteractionPassword2.idl\
+ XJob.idl\
+ XJobExecutor.idl\
+ XJobListener.idl\
+ XMasterPasswordHandling.idl\
+ XMasterPasswordHandling2.idl\
+ XPasswordContainer.idl\
+ XRestartManager.idl\
+ XStatusIndicator.idl\
+ XStatusIndicatorFactory.idl\
+ XStatusIndicatorSupplier.idl\
+ XAbortChannel.idl\
+ XInteractionRequestStringResolver.idl\
+ InteractionRequestStringResolver.idl\
+ XUrlContainer.idl
# ------------------------------------------------------------------
diff --cc offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
index 8da9255,d79d0cf..055006b
--- a/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
+++ b/offapi/com/sun/star/util/XOfficeInstallationDirectories.idl
@@@ -61,7 -61,8 +61,8 @@@ published interface XOfficeInstallation
//------------------------------------------------------------------------
/** returns the absolute URL containing the directory where the current
- office installation expects its user data (e.g. "file:///home/kso".)
+ office installation expects its user data (e.g.
- "file:///home/kso/.openoffice.org".)
++ "file:///home/kso/.libreoffice".)
@returns
the absolute URL containing the directory of the current office
diff --cc offuh/source/makefile.mk
index e773d7f,7ccfdd6..657329f
--- a/offuh/source/makefile.mk
+++ b/offuh/source/makefile.mk
@@@ -33,12 -33,16 +33,16 @@@ TARGET= offu
.INCLUDE : settings.mk
- # ------------------------------------------------------------------
+ # --- Targets ------------------------------------------------------
+ .INCLUDE : target.mk
+
+ ALLTAR : $(MISC)$/oovbaapi.don $(MISC)$/$(TARGET).don
$(MISC)$/$(TARGET).don : $(UNOUCRRDB)
- @@-$(RM) $@
- $(CPPUMAKER) -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOUCRRDB) && echo > $@
+ @@-$(RM) $@
+ $(CPPUMAKER) -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOUCRRDB) && echo > $@
- # --- Targets ------------------------------------------------------
-
- .INCLUDE : target.mk
+ $(MISC)$/oovbaapi.don : $(SOLARBINDIR)$/oovbaapi.rdb
+ @@-$(RM) $@
+ $(CPPUMAKER) -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+ echo $@
diff --cc pyuno/source/loader/makefile.mk
index 6f8648c,d940178..46c2703
--- a/pyuno/source/loader/makefile.mk
+++ b/pyuno/source/loader/makefile.mk
@@@ -102,11 -82,13 +82,13 @@@ ALL : ALLTAR
.INCLUDE : target.mk
.IF "$(L10N_framework)"==""
$(DLLDEST)$/%.py: %.py
- cp $? $@
+ cp $? $@
-
- $(DLLDEST)$/pyuno_services.rdb : makefile.mk $(DLLDEST)$/$(DLLPRE)$(TARGET)$(DLLPOST)
- -rm -f $@ $(DLLDEST)$/pyuno_services.tmp $(DLLDEST)$/pyuno_services.rdb
- cd $(DLLDEST) && $(REGCOMP) -register -r pyuno_services.tmp -wop $(foreach,i,$(COMPONENTS) -c $(i))
- cd $(DLLDEST) && mv pyuno_services.tmp pyuno_services.rdb
.ENDIF # L10N_framework
+ ALLTAR : $(MISC)/pythonloader.component
+
+ $(MISC)/pythonloader.component .ERRREMOVE : \
+ $(SOLARENV)/bin/createcomponent.xslt pythonloader.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ 'vnd.sun.star.expand:$$OOO_BASE_DIR/program/$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt pythonloader.component
diff --cc sal/osl/all/makefile.mk
index 0d10590,a784da4..5da61e8
--- a/sal/osl/all/makefile.mk
+++ b/sal/osl/all/makefile.mk
@@@ -52,19 -52,21 +52,21 @@@ CXXFLAGS+= $(LFS_CFLAGS
# --- Files --------------------------------------------------------
SLOFILES= \
- $(SLO)$/utility.obj\
- $(SLO)$/filepath.obj\
- $(SLO)$/debugbase.obj\
+ $(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)$/utility.obj\
+ $(OBJ)$/filepath.obj\
+ $(OBJ)$/debugbase.obj\
- $(OBJ)$/loadmodulerelative.obj
+ $(OBJ)$/loadmodulerelative.obj \
+ $(OBJ)/printtrace.obj
# $(OBJ)$/readline.obj\
#.ENDIF
diff --cc sal/osl/unx/diagnose.c
index a691059,f337bef..e27da2f
--- a/sal/osl/unx/diagnose.c
+++ b/sal/osl/unx/diagnose.c
@@@ -302,33 -303,11 +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/process_impl.cxx
index 3301f26,c335bce..fba7f4a
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@@ -424,7 -424,111 +424,6 @@@ oslProcessError SAL_CALL osl_clearEnvir
return (result);
}
--
-/***************************************
- osl_setEnvironment().
- **************************************/
-oslProcessError SAL_CALL osl_setEnvironment(rtl_uString* pustrEnvVar, rtl_uString* pustrValue)
-{
- oslProcessError result = osl_Process_E_Unknown;
- rtl_TextEncoding encoding = osl_getThreadTextEncoding();
- rtl_String* pstr_env_var = 0;
- rtl_String* pstr_val = 0;
-
- OSL_PRECOND(pustrEnvVar, "osl_setEnvironment(): Invalid parameter");
- OSL_PRECOND(pustrValue, "osl_setEnvironment(): Invalid parameter");
-
- rtl_uString2String(
- &pstr_env_var,
- rtl_uString_getStr(pustrEnvVar), rtl_uString_getLength(pustrEnvVar), encoding,
- OUSTRING_TO_OSTRING_CVTFLAGS);
-
- rtl_uString2String(
- &pstr_val,
- rtl_uString_getStr(pustrValue), rtl_uString_getLength(pustrValue), encoding,
- OUSTRING_TO_OSTRING_CVTFLAGS);
-
- if (pstr_env_var != 0 && pstr_val != 0)
- {
-#if defined (SOLARIS)
- rtl_String * pBuffer = NULL;
-
- sal_Int32 nCapacity = rtl_stringbuffer_newFromStringBuffer( &pBuffer,
- rtl_string_getLength(pstr_env_var) + rtl_string_getLength(pstr_val) + 1,
- pstr_env_var );
- rtl_stringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length, "=", 1);
- rtl_stringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length,
- rtl_string_getStr(pstr_val), rtl_string_getLength(pstr_val) );
-
- rtl_string_acquire(pBuffer); // argument to putenv must leak on success
-
- if (putenv(rtl_string_getStr(pBuffer)) == 0)
- result = osl_Process_E_None;
- else
- rtl_string_release(pBuffer);
-#else
- if (setenv(rtl_string_getStr(pstr_env_var), rtl_string_getStr(pstr_val), 1) == 0)
- result = osl_Process_E_None;
-#endif
- }
-
- if (pstr_val)
- rtl_string_release(pstr_val);
-
- if (pstr_env_var != 0)
- rtl_string_release(pstr_env_var);
-
- return (result);
-}
-
-/***************************************
- osl_clearEnvironment().
- **************************************/
-oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString* pustrEnvVar)
-{
- oslProcessError result = osl_Process_E_Unknown;
- rtl_TextEncoding encoding = osl_getThreadTextEncoding();
- rtl_String* pstr_env_var = 0;
-
- OSL_PRECOND(pustrEnvVar, "osl_setEnvironment(): Invalid parameter");
-
- rtl_uString2String(
- &pstr_env_var,
- rtl_uString_getStr(pustrEnvVar), rtl_uString_getLength(pustrEnvVar), encoding,
- OUSTRING_TO_OSTRING_CVTFLAGS);
-
- if (pstr_env_var)
- {
-#if defined (SOLARIS)
- rtl_String * pBuffer = NULL;
-
- sal_Int32 nCapacity = rtl_stringbuffer_newFromStringBuffer( &pBuffer,
- rtl_string_getLength(pstr_env_var) + 1, pstr_env_var );
- rtl_stringbuffer_insert( &pBuffer, &nCapacity, pBuffer->length, "=", 1);
-
- rtl_string_acquire(pBuffer); // argument to putenv must leak on success
-
- if (putenv(rtl_string_getStr(pBuffer)) == 0)
- result = osl_Process_E_None;
- else
- rtl_string_release(pBuffer);
-#elif defined(MACOSX)
- //MacOSX baseline is 10.4, which has an old-school void return
- //for unsetenv.
- //See: http://developer.apple.com/mac/library/documentation/Darwin/Reference/ManPages/10.4/man3/unsetenv.3.html?useVersion=10.4
- unsetenv(rtl_string_getStr(pstr_env_var));
- result = osl_Process_E_None;
-#else
- if (unsetenv(rtl_string_getStr(pstr_env_var)) == 0)
- result = osl_Process_E_None;
-#endif
- rtl_string_release(pstr_env_var);
- }
-
- return (result);
-}
-
-
/***************************************
osl_getProcessWorkingDir().
**************************************/
diff --cc sal/osl/w32/file_url.cxx
index f045705,ffe8113..f43756f
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@@ -55,7 -55,12 +55,6 @@@
#define WSTR_LONG_PATH_PREFIX L"\\\\?\\"
#define WSTR_LONG_PATH_PREFIX_UNC L"\\\\?\\UNC\\"
--
-#define WSTR_SYSTEM_ROOT_PATH L"\\\\.\\"
-#define WSTR_LONG_PATH_PREFIX L"\\\\?\\"
-#define WSTR_LONG_PATH_PREFIX_UNC L"\\\\?\\UNC\\"
-
-
//##################################################################
// FileURL functions
//##################################################################
@@@ -278,13 -283,13 +277,23 @@@ DWORD IsValidFilePath(rtl_uString *path
else if ( 2 == _tcsspn( lpszPath, CHARSET_SEPARATOR ) )
{
/* The UNC path notation */
++<<<<<<< HEAD
+ lpComponent = lpszPath + 2;
+ dwCandidatPathType = PATHTYPE_ABSOLUTE_UNC;
+ }
+ else if ( _istalpha( lpszPath[0] ) && ':' == lpszPath[1] )
+ {
+ /* Local path verification. Must start with <drive>: */
+ lpComponent = lpszPath + 2;
++=======
+ lpComponent = lpszPath + 2;
+ dwCandidatPathType = PATHTYPE_ABSOLUTE_UNC;
+ }
+ else if ( _istalpha( lpszPath[0] ) && ':' == lpszPath[1] )
+ {
+ /* Local path verification. Must start with <drive>: */
+ lpComponent = lpszPath + 2;
++>>>>>>> stage/premerge/dev300_m98
dwCandidatPathType = PATHTYPE_ABSOLUTE_LOCAL;
}
@@@ -429,9 -434,9 +438,15 @@@ static sal_Int32 PathRemoveFileSpec(LPT
_tcscpy( lpFileName, lpLastDelimiter + 1 );
*(++lpLastDelimiter) = 0;
nRemoved = nDelLen - 1;
++<<<<<<< HEAD
++ }
++ }
++ }
++=======
}
}
}
++>>>>>>> stage/premerge/dev300_m98
return nRemoved;
}
diff --cc sal/prj/build.lst
index cafca8a,3763797..3c676c0
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@@ -18,3 -18,4 +18,4 @@@ sa sal\qa\ByteSequence nmake - all sa_q
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\profile nmake - all sa_qa_osl_profile 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\math nmake - all sa_qa_rtl_math sa_cppunittester sa_util NULL
diff --cc sal/qa/osl/pipe/makefile.mk
index 6350cdb,453da4c..85452ea
--- a/sal/qa/osl/pipe/makefile.mk
+++ b/sal/qa/osl/pipe/makefile.mk
@@@ -48,10 -48,10 +48,10 @@@ CFLAGSCXX += $(CPPUNIT_CFLAGS
# BEGIN ----------------------------------------------------------------
# auto generated Target:Pipe by codegen.pl
SHL1OBJS= \
- $(SLO)$/osl_Pipe.obj
+ $(SLO)$/osl_Pipe.obj
SHL1TARGET= osl_Pipe
- SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
+ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTLIB)
SHL1IMPLIB= i$(SHL1TARGET)
# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
diff --cc sal/qa/osl/process/makefile.mk
index 6bbee03,adfbfab..b08156c
--- a/sal/qa/osl/process/makefile.mk
+++ b/sal/qa/osl/process/makefile.mk
@@@ -28,9 -28,7 +28,8 @@@ PRJ=..$/..$/.
PRJNAME=sal
TARGET=qa_osl_process
-
+# this is removed at the moment because we need some enhancements
+# TESTDIR=TRUE
-
ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
diff --cc sal/qa/rtl/math/makefile.mk
index 3b35e52,59f2ecc..cbce813
--- a/sal/qa/rtl/math/makefile.mk
+++ b/sal/qa/rtl/math/makefile.mk
@@@ -23,75 -23,33 +23,75 @@@
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
-#***********************************************************************/
+#*************************************************************************
+PRJ=..$/..$/..
+INCPRE+= $(PRJ)$/qa$/inc
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
+PRJNAME=sal
+TARGET=rtl_math
+# this is removed at the moment because we need some enhancements
+# TESTDIR=TRUE
-PRJ = ../../..
-PRJNAME = sal
-TARGET = qa_rtl_profile
+ENABLE_EXCEPTIONS=TRUE
-ENABLE_EXCEPTIONS = TRUE
+# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
+.INCLUDE : settings.mk
+
+CFLAGS+= $(LFS_CFLAGS)
+CXXFLAGS+= $(LFS_CFLAGS)
CFLAGSCXX += $(CPPUNIT_CFLAGS)
++CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(VALGRINDTOOL) $(PRJ) $(OUTPATH)$/bin$/cppunittester
+
+#----------------------------------- OStringBuffer -----------------------------------
+
+SHL1OBJS= \
+ $(SLO)$/test_rtl_math.obj
+
+SHL1TARGET= rtl_math
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+
+SHL1IMPLIB= i$(SHL1TARGET)
+# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME =$(SHL1TARGET)
+# DEF1EXPORTFILE= export.exp
+SHL1VERSIONMAP = $(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)
+# --- BEGIN --------------------------------------------------------
+SHL2OBJS= \
+ $(SLO)$/rtl_math.obj
+SHL2TARGET= rtl_math2
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+
+SHL2IMPLIB= i$(SHL2TARGET)
+DEF2NAME= $(SHL2TARGET)
+SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
+
+
+
+# # --- 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) $(TESTSHL2LIB)
+#
+# SHL3IMPLIB= i$(SHL3TARGET)
+# DEF3NAME= $(SHL3TARGET)
+# SHL3VERSIONMAP = $(PRJ)$/qa$/export.map
+#
-SLOFILES = $(SHL1OBJS)
+#------------------------------- All object files -------------------------------
+# do this here, so we get right dependencies
+# SLOFILES=$(SHL1OBJS)
-.INCLUDE: target.mk
-.INCLUDE: _cppunit.mk
+# --- Targets ------------------------------------------------------
-.END
+.INCLUDE : target.mk
+.INCLUDE : _cppunit.mk
-
diff --cc sal/qa/rtl/math/test_rtl_math.cxx
index 2dc2ffd,0000000..4339c7a
mode 100644,000000..100644
--- a/sal/qa/rtl/math/test_rtl_math.cxx
+++ b/sal/qa/rtl/math/test_rtl_math.cxx
@@@ -1,677 -1,0 +1,677 @@@
+/* -*- 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"
+
+#include "rtl/math.h"
+#include "rtl/math.hxx"
+#include "rtl/strbuf.hxx"
+#include "rtl/string.h"
+#include "rtl/string.hxx"
+#include "rtl/textenc.h"
- #include <testshl/tresstatewrapper.hxx>
++#include <cppunit.h>
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+#include <sal/macros.h>
+
+#include <stdlib.h>
+
+namespace {
+
+struct FloatTraits
+{
+ typedef float Number;
+
+ static inline char const * getPrefix() { return "float"; }
+};
+
+struct DoubleTraits
+{
+ typedef double Number;
+
+ static inline char const * getPrefix() { return "double"; }
+};
+
+struct StringTraits
+{
+ typedef rtl::OString String;
+
+ static inline char const * getPrefix() { return "OString"; }
+
+ static inline rtl::OString createFromAscii(char const * pString)
+ { return rtl::OString(pString); }
+
+ static inline void appendBuffer(rtl::OStringBuffer & rBuffer,
+ rtl::OString const & rString)
+ { rBuffer.append(rString); }
+
+ static inline rtl::OString doubleToString(double fValue,
+ rtl_math_StringFormat eFormat,
+ sal_Int32 nDecPlaces,
+ sal_Char cDecSeparator,
+ bool bEraseTrailingDecZeros)
+ {
+ return rtl::math::doubleToString(fValue, eFormat, nDecPlaces,
+ cDecSeparator, bEraseTrailingDecZeros);
+ }
+};
+
+struct UStringTraits
+{
+ typedef rtl::OUString String;
+
+ static inline char const * getPrefix() { return "OUString"; }
+
+ static inline rtl::OUString createFromAscii(char const * pString)
+ { return rtl::OUString::createFromAscii(pString); }
+
+ static inline void appendBuffer(rtl::OStringBuffer & rBuffer,
+ rtl::OUString const & rString)
+ { rBuffer.append(rtl::OUStringToOString(rString, RTL_TEXTENCODING_UTF8)); }
+
+ static inline rtl::OUString doubleToString(double fValue,
+ rtl_math_StringFormat eFormat,
+ sal_Int32 nDecPlaces,
+ sal_Unicode cDecSeparator,
+ bool bEraseTrailingDecZeros)
+ {
+ return rtl::math::doubleToUString(fValue, eFormat, nDecPlaces,
+ cDecSeparator,
+ bEraseTrailingDecZeros);
+ }
+};
+
+struct TestNumberToString
+{
+ double fValue;
+ rtl_math_StringFormat eFormat;
+ sal_Int32 nDecPlaces;
+ char cDecSeparator;
+ bool bEraseTrailingDecZeros;
+ char const * pResult;
+};
+
+template< typename StringT, typename NumberT >
+bool testNumberToString(hTestResult pTestResult,
+ TestNumberToString const & rTest)
+{
+ typename NumberT::Number fValue = static_cast< typename NumberT::Number >(rTest.fValue);
+ if (fValue != rTest.fValue)
+ return true;
+
+ // LLA: t_print("size: %d ", sizeof(fValue));
+ typename StringT::String aResult1;
+
+ aResult1 = StringT::doubleToString(fValue, rTest.eFormat, rTest.nDecPlaces,
+ rTest.cDecSeparator,
+ rTest.bEraseTrailingDecZeros);
+
+ typename StringT::String aResult2(StringT::createFromAscii(rTest.pResult));
+
+ // LLA: rtl::OStringBuffer aBuf;
+ // LLA: StringT::appendBuffer(aBuf, aResult1);
+ // LLA: t_print("aResult1: %s ", aBuf.getStr());
+ // LLA:
+ // LLA: rtl::OStringBuffer aBuf2;
+ // LLA: StringT::appendBuffer(aBuf2, aResult2);
+ // LLA: t_print("aResult2: %s\n", aBuf2.getStr());
+
+ bool bSuccess = aResult1 == aResult2;
+
+ rtl::OStringBuffer aBuffer;
+ aBuffer.append(StringT::getPrefix());
+ aBuffer.append(RTL_CONSTASCII_STRINGPARAM("/"));
+ aBuffer.append(NumberT::getPrefix());
+ aBuffer.append(RTL_CONSTASCII_STRINGPARAM(" doubleToString("));
+ aBuffer.append(fValue);
+ aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
+ aBuffer.append(static_cast< sal_Int32 >(rTest.eFormat));
+ aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
+ aBuffer.append(rTest.nDecPlaces);
+ aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
+ aBuffer.append(rTest.cDecSeparator);
+ aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
+ aBuffer.append(static_cast< sal_Int32 >(rTest.bEraseTrailingDecZeros));
+ aBuffer.append(RTL_CONSTASCII_STRINGPARAM("): "));
+ StringT::appendBuffer(aBuffer, aResult1);
+ if (!bSuccess)
+ {
+ aBuffer.append(RTL_CONSTASCII_STRINGPARAM(" != "));
+ StringT::appendBuffer(aBuffer, aResult2);
+ }
+ // call to the real test checker
+ // pTestResult->pFuncs->state_(pTestResult, bSuccess, "test_rtl_math",
+ // aBuffer.getStr(), false);
+ c_rtl_tres_state(pTestResult, bSuccess, aBuffer.getStr(), "testNumberToString");
+ return bSuccess;
+}
+
+template< typename StringT, typename NumberT >
+bool testNumberToString(hTestResult pTestResult,
+ TestNumberToString const * pTests, size_t nCount)
+{
+ bool bSuccess = true;
+ for (size_t i = 0; i < nCount; ++i)
+ bSuccess &= testNumberToString< StringT, NumberT >(pTestResult,
+ pTests[i]);
+ return bSuccess;
+}
+
+struct TestStringToNumberToString
+{
+ char const * pValue;
+ rtl_math_StringFormat eFormat;
+ sal_Int32 nDecPlaces;
+ char cDecSeparator;
+ bool bEraseTrailingDecZeros;
+ char const * pResult;
+};
+
+template< typename StringT >
+bool testStringToNumberToString(hTestResult pTestResult,
+ TestStringToNumberToString const & rTest)
+{
+ double d = rtl::math::stringToDouble(StringT::createFromAscii(rTest.pValue),
+ rTest.cDecSeparator, 0, 0, 0);
+ typename StringT::String aResult1(
+ StringT::doubleToString(d, rTest.eFormat, rTest.nDecPlaces,
+ rTest.cDecSeparator,
+ rTest.bEraseTrailingDecZeros));
+ typename StringT::String aResult2(StringT::createFromAscii(rTest.pResult));
+ bool bSuccess = aResult1 == aResult2;
+ rtl::OStringBuffer aBuffer;
+ aBuffer.append(StringT::getPrefix());
+ aBuffer.append(RTL_CONSTASCII_STRINGPARAM(
+ " doubleToString(stringToDouble("));
+ aBuffer.append(rTest.pValue);
+ aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
+ aBuffer.append(rTest.cDecSeparator);
+ aBuffer.append(RTL_CONSTASCII_STRINGPARAM("), "));
+ aBuffer.append(static_cast< sal_Int32 >(rTest.eFormat));
+ aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
+ aBuffer.append(rTest.nDecPlaces);
+ aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
+ aBuffer.append(rTest.cDecSeparator);
+ aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
+ aBuffer.append(static_cast< sal_Int32 >(rTest.bEraseTrailingDecZeros));
+ aBuffer.append(RTL_CONSTASCII_STRINGPARAM("): "));
+ StringT::appendBuffer(aBuffer, aResult1);
+ if (!bSuccess)
+ {
+ aBuffer.append(RTL_CONSTASCII_STRINGPARAM(" != "));
+ StringT::appendBuffer(aBuffer, aResult2);
+ }
+ // call to the real test checker
+ // pTestResult->pFuncs->state_(pTestResult, bSuccess, "test_rtl_math",
+ // aBuffer.getStr(), false);
+ c_rtl_tres_state(pTestResult, bSuccess, aBuffer.getStr(), "testStringToNumberToString");
+
+ return bSuccess;
+}
+
+template< typename StringT >
+bool testStringToNumberToString(hTestResult pTestResult,
+ TestStringToNumberToString const * pTests,
+ size_t nCount)
+{
+ bool bSuccess = true;
+ for (size_t i = 0; i < nCount; ++i)
+ bSuccess &= testStringToNumberToString< StringT >(pTestResult,
+ pTests[i]);
+ return bSuccess;
+}
+
+}
+
+extern "C" sal_Bool SAL_CALL test_rtl_math(hTestResult pTestResult)
+{
+ bool bReturn = true;
+
+ {
+ static TestNumberToString const aTest[]
+ = { // 1, 1+2^-1, ..., 1+2^-52
+ // Too few decimal digits are printed, so that various different
+ // double values lead to the same output:
+ { 1, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1" },
+ { 1.5, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.5" },
+ { 1.25, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.25" },
+ { 1.125, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.125" },
+ { 1.0625, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.0625" },
+ { 1.03125, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.03125" },
+ { 1.015625, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.015625" },
+ { 1.0078125, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.0078125" },
+ { 1.00390625, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.00390625" },
+ { 1.001953125, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.001953125" },
+ { 1.0009765625, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.0009765625" },
+ { 1.00048828125, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.00048828125" },
+ { 1.000244140625, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.000244140625" },
+ { 1.0001220703125, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.0001220703125" },
+ { 1.00006103515625, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.00006103515625" },
+ { 1.000030517578125, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.00003051757813" },
+ { 1.0000152587890625, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.00001525878906" },
+ { 1.00000762939453125, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.00000762939453" },
+ { 1.000003814697265625, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.00000381469727" },
+ { 1.0000019073486328125, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.00000190734863" },
+ { 1.00000095367431640625, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.00000095367432" },
+ { 1.000000476837158203125, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.00000047683716" },
+ { 1.0000002384185791015625, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.00000023841858" },
+ { 1.00000011920928955078125, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.00000011920929" },
+ { 1.000000059604644775390625, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.00000005960464" },
+ { 1.0000000298023223876953125, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.00000002980232" },
+ { 1.00000001490116119384765625, rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1.00000001490116" },
+ { 1.000000007450580596923828125,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000745058" },
+ { 1.0000000037252902984619140625,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000372529" },
+ { 1.00000000186264514923095703125,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000186265" },
+ { 1.000000000931322574615478515625,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000093132" },
+ { 1.0000000004656612873077392578125,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000046566" },
+ { 1.00000000023283064365386962890625,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000023283" },
+ { 1.000000000116415321826934814453125,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000011642" },
+ { 1.0000000000582076609134674072265625,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000005821" },
+ { 1.00000000002910383045673370361328125,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.0000000000291" },
+ { 1.000000000014551915228366851806640625,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000001455" },
+ { 1.0000000000072759576141834259033203125,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000000728" },
+ { 1.00000000000363797880709171295166015625,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000000364" },
+ { 1.000000000001818989403545856475830078125,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000000182" },
+ { 1.0000000000009094947017729282379150390625,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000000091" },
+ { 1.00000000000045474735088646411895751953125,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000000045" },
+ { 1.000000000000227373675443232059478759765625,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000000023" },
+ { 1.0000000000001136868377216160297393798828125,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000000011" },
+ { 1.00000000000005684341886080801486968994140625,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000000006" },
+ { 1.000000000000028421709430404007434844970703125,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000000003" },
+ { 1.0000000000000142108547152020037174224853515625,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000000001" },
+ { 1.00000000000000710542735760100185871124267578125,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1.00000000000001" },
+ { 1.000000000000003552713678800500929355621337890625,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1" },
+ { 1.0000000000000017763568394002504646778106689453125,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1" },
+ { 1.00000000000000088817841970012523233890533447265625,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1" },
+ { 1.000000000000000444089209850062616169452667236328125,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1" },
+ { 1.0000000000000002220446049250313080847263336181640625,
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ '.', true, "1" },
+
+ // 1, 1+2^-1, ..., 1+2^-52
+ // Too few decimal digits are printed, so that various different
+ // double values lead to the same output:
+ { 1, rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000000000000000000000000000000000000000000000" },
+ { 1.5, rtl_math_StringFormat_F, 53, '.', false,
+ "1.50000000000000000000000000000000000000000000000000000" },
+ { 1.25, rtl_math_StringFormat_F, 53, '.', false,
+ "1.25000000000000000000000000000000000000000000000000000" },
+ { 1.125, rtl_math_StringFormat_F, 53, '.', false,
+ "1.12500000000000000000000000000000000000000000000000000" },
+ { 1.0625, rtl_math_StringFormat_F, 53, '.', false,
+ "1.06250000000000000000000000000000000000000000000000000" },
+ { 1.03125, rtl_math_StringFormat_F, 53, '.', false,
+ "1.03125000000000000000000000000000000000000000000000000" },
+ { 1.015625, rtl_math_StringFormat_F, 53, '.', false,
+ "1.01562500000000000000000000000000000000000000000000000" },
+ { 1.0078125, rtl_math_StringFormat_F, 53, '.', false,
+ "1.00781250000000000000000000000000000000000000000000000" },
+ { 1.00390625, rtl_math_StringFormat_F, 53, '.', false,
+ "1.00390625000000000000000000000000000000000000000000000" },
+ { 1.001953125, rtl_math_StringFormat_F, 53, '.', false,
+ "1.00195312500000000000000000000000000000000000000000000" },
+ { 1.0009765625, rtl_math_StringFormat_F, 53, '.', false,
+ "1.00097656250000000000000000000000000000000000000000000" },
+ { 1.00048828125, rtl_math_StringFormat_F, 53, '.', false,
+ "1.00048828125000000000000000000000000000000000000000000" },
+ { 1.000244140625, rtl_math_StringFormat_F, 53, '.', false,
+ "1.00024414062500000000000000000000000000000000000000000" },
+ { 1.0001220703125, rtl_math_StringFormat_F, 53, '.', false,
+ "1.00012207031250000000000000000000000000000000000000000" },
+ { 1.00006103515625, rtl_math_StringFormat_F, 53, '.', false,
+ "1.00006103515625000000000000000000000000000000000000000" },
+ { 1.000030517578125, rtl_math_StringFormat_F, 53, '.', false,
+ "1.00003051757813000000000000000000000000000000000000000" },
+ { 1.0000152587890625, rtl_math_StringFormat_F, 53, '.', false,
+ "1.00001525878906000000000000000000000000000000000000000" },
+ { 1.00000762939453125, rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000762939453000000000000000000000000000000000000000" },
+ { 1.000003814697265625, rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000381469727000000000000000000000000000000000000000" },
+ { 1.0000019073486328125, rtl_math_StringFormat_F, 53, '.',
+ false,
+ "1.00000190734863000000000000000000000000000000000000000" },
+ { 1.00000095367431640625, rtl_math_StringFormat_F, 53, '.',
+ false,
+ "1.00000095367432000000000000000000000000000000000000000" },
+ { 1.000000476837158203125, rtl_math_StringFormat_F, 53, '.',
+ false,
+ "1.00000047683716000000000000000000000000000000000000000" },
+ { 1.0000002384185791015625, rtl_math_StringFormat_F, 53, '.',
+ false,
+ "1.00000023841858000000000000000000000000000000000000000" },
+ { 1.00000011920928955078125, rtl_math_StringFormat_F, 53, '.',
+ false,
+ "1.00000011920929000000000000000000000000000000000000000" },
+ { 1.000000059604644775390625, rtl_math_StringFormat_F, 53, '.',
+ false,
+ "1.00000005960464000000000000000000000000000000000000000" },
+ { 1.0000000298023223876953125, rtl_math_StringFormat_F, 53, '.',
+ false,
+ "1.00000002980232000000000000000000000000000000000000000" },
+ { 1.00000001490116119384765625, rtl_math_StringFormat_F, 53,
+ '.', false,
+ "1.00000001490116000000000000000000000000000000000000000" },
+ { 1.000000007450580596923828125, rtl_math_StringFormat_F, 53,
+ '.', false,
+ "1.00000000745058000000000000000000000000000000000000000" },
+ { 1.0000000037252902984619140625, rtl_math_StringFormat_F, 53,
+ '.', false,
+ "1.00000000372529000000000000000000000000000000000000000" },
+ { 1.00000000186264514923095703125, rtl_math_StringFormat_F, 53,
+ '.', false,
+ "1.00000000186265000000000000000000000000000000000000000" },
+ { 1.000000000931322574615478515625, rtl_math_StringFormat_F, 53,
+ '.', false,
+ "1.00000000093132000000000000000000000000000000000000000" },
+ { 1.0000000004656612873077392578125, rtl_math_StringFormat_F,
+ 53, '.', false,
+ "1.00000000046566000000000000000000000000000000000000000" },
+ { 1.00000000023283064365386962890625, rtl_math_StringFormat_F,
+ 53, '.', false,
+ "1.00000000023283000000000000000000000000000000000000000" },
+ { 1.000000000116415321826934814453125, rtl_math_StringFormat_F,
+ 53, '.', false,
+ "1.00000000011642000000000000000000000000000000000000000" },
+ { 1.0000000000582076609134674072265625, rtl_math_StringFormat_F,
+ 53, '.', false,
+ "1.00000000005821000000000000000000000000000000000000000" },
+ { 1.00000000002910383045673370361328125,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000002910000000000000000000000000000000000000000" },
+ { 1.000000000014551915228366851806640625,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000001455000000000000000000000000000000000000000" },
+ { 1.0000000000072759576141834259033203125,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000728000000000000000000000000000000000000000" },
+ { 1.00000000000363797880709171295166015625,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000364000000000000000000000000000000000000000" },
+ { 1.000000000001818989403545856475830078125,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000182000000000000000000000000000000000000000" },
+ { 1.0000000000009094947017729282379150390625,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000091000000000000000000000000000000000000000" },
+ { 1.00000000000045474735088646411895751953125,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000045000000000000000000000000000000000000000" },
+ { 1.000000000000227373675443232059478759765625,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000023000000000000000000000000000000000000000" },
+ { 1.0000000000001136868377216160297393798828125,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000011000000000000000000000000000000000000000" },
+ { 1.00000000000005684341886080801486968994140625,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000006000000000000000000000000000000000000000" },
+ { 1.000000000000028421709430404007434844970703125,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000003000000000000000000000000000000000000000" },
+ { 1.0000000000000142108547152020037174224853515625,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000001000000000000000000000000000000000000000" },
+ { 1.00000000000000710542735760100185871124267578125,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000001000000000000000000000000000000000000000" },
+ { 1.000000000000003552713678800500929355621337890625,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000000000000000000000000000000000000000000000" },
+ { 1.0000000000000017763568394002504646778106689453125,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000000000000000000000000000000000000000000000" },
+ { 1.00000000000000088817841970012523233890533447265625,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000000000000000000000000000000000000000000000" },
+ { 1.000000000000000444089209850062616169452667236328125,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000000000000000000000000000000000000000000000" },
+ { 1.0000000000000002220446049250313080847263336181640625,
+ rtl_math_StringFormat_F, 53, '.', false,
+ "1.00000000000000000000000000000000000000000000000000000" } };
+ size_t const nCount = SAL_N_ELEMENTS(aTest);
+
+//LLA: the float tests are wrong here, due to the fact that
+// we calculate with too less digits after the point
+
+// bReturn &= testNumberToString< StringTraits, FloatTraits >(
+// pTestResult, aTest, nCount);
+ bReturn &= testNumberToString< StringTraits, DoubleTraits >(
+ pTestResult, aTest, nCount);
+// bReturn &= testNumberToString< UStringTraits, FloatTraits >(
+// pTestResult, aTest, nCount);
+ bReturn &= testNumberToString< UStringTraits, DoubleTraits >(
+ pTestResult, aTest, nCount);
+ }
+
+ {
+ static TestStringToNumberToString const aTest[]
+ = { { "1", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1" },
+ { " 1", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1" },
+ { " 1", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1" },
+ { "\t1", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1" },
+ { "\t 1", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1" },
+ { " \t1", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "1" },
+
+ { "-1", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "-1" },
+ { " -1", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "-1" },
+ { " -1", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "-1" },
+ { "\t-1", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "-1" },
+ { "\t -1", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "-1" },
+ { " \t-1", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', true, "-1" },
+
+ { "1.#INF", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
+ { " 1.#INF", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
+ { " 1.#INF", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
+ { "\t1.#INF", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
+ { "\t 1.#INF", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
+ { " \t1.#INF", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
+
+ { "-1.#INF", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
+ { " -1.#INF", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
+ { " -1.#INF", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
+ { "\t-1.#INF", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
+ { "\t -1.#INF", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
+ { " \t-1.#INF", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
+
+ { "1.#NAN", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
+ { " 1.#NAN", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
+ { " 1.#NAN", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
+ { "\t1.#NAN", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
+ { "\t 1.#NAN", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
+ { " \t1.#NAN", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
+
+ { "-1.#NAN", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
+ { " -1.#NAN", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
+ { " -1.#NAN", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
+ { "\t-1.#NAN", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
+ { "\t -1.#NAN", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
+ { " \t-1.#NAN", rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
+
+ { "3.14E-2000", rtl_math_StringFormat_E, 4, '.', false,
+ "0.0000E+000" },
+ { "3.14E-200", rtl_math_StringFormat_E, 4, '.', false,
+ "3.1400E-200" },
+ { "3.14E-20", rtl_math_StringFormat_E, 4, '.', false,
+ "3.1400E-020" },
+ { "3.14E-2", rtl_math_StringFormat_E, 4, '.', false,
+ "3.1400E-002" },
+ { "3.14E2", rtl_math_StringFormat_E, 4, '.', false,
+ "3.1400E+002" },
+ { "3.14E20", rtl_math_StringFormat_E, 4, '.', false,
+ "3.1400E+020" },
+ { "3.14E200", rtl_math_StringFormat_E, 4, '.', false,
+ "3.1400E+200" },
+ { "3.14E2000", rtl_math_StringFormat_E, 4, '.', false,
+ "1.#INF" },
+ };
+ size_t const nCount = SAL_N_ELEMENTS(aTest);
+ bReturn &= testStringToNumberToString< StringTraits >(
+ pTestResult, aTest, nCount);
+ bReturn &= testStringToNumberToString< UStringTraits >(
+ pTestResult, aTest, nCount);
+ }
+
+ return bReturn;
+}
+
+// -----------------------------------------------------------------------------
+extern "C" void /* sal_Bool */ SAL_CALL test_rtl_math2( hTestResult hRtlTestResult )
+{
+ c_rtl_tres_state_start(hRtlTestResult, "rtl_math" );
+
+ test_rtl_math( hRtlTestResult );
+
+ c_rtl_tres_state_end(hRtlTestResult, "rtl_math" );
+}
+// -----------------------------------------------------------------------------
+void RegisterAdditionalFunctions(FktRegFuncPtr _pFunc)
+{
+ if (_pFunc)
+ {
+ (_pFunc)(&test_rtl_math2, "");
+ }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc stoc/source/corereflection/crefl.cxx
index b56a255,d39e287..19bb625
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@@ -508,35 -507,6 +507,38 @@@ void SAL_CALL component_getImplementati
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
++<<<<<<< HEAD
+sal_Bool SAL_CALL component_writeInfo(
+ void * pServiceManager, void * pRegistryKey )
+{
+ if (component_writeInfoHelper( pServiceManager, pRegistryKey, g_entries ))
+ {
+ try
+ {
+ // register singleton
+ registry::XRegistryKey * pKey =
+ reinterpret_cast< registry::XRegistryKey * >( pRegistryKey );
+ Reference< registry::XRegistryKey > xKey(
+ pKey->createKey(
+ OUSTR(IMPLNAME "/UNO/SINGLETONS/com.sun.star.reflection.theCoreReflection") ) );
+ xKey->setStringValue( OUSTR("com.sun.star.reflection.CoreReflection") );
+ return sal_True;
+ }
+ catch (Exception & exc)
+ {
+#if OSL_DEBUG_LEVEL > 0
+ OString cstr( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
+ OSL_ENSURE( 0, cstr.getStr() );
+#else
+ (void) exc; // unused
+#endif
+ }
+ }
+ return sal_False;
+}
+//==================================================================================================
++=======
++>>>>>>> stage/premerge/dev300_m98
void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --cc stoc/source/javavm/javavm.cxx
index 2e2fe51,d364c45..a7065ea
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@@ -621,34 -616,6 +616,37 @@@ component_getImplementationEnvironment(
*pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
++<<<<<<< HEAD
+extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager,
+ void * pRegistryKey)
+{
+ if (cppu::component_writeInfoHelper(pServiceManager, pRegistryKey,
+ aServiceImplementation))
+ {
+ try
+ {
+ css::uno::Reference< css::registry::XRegistryKey >(
+ reinterpret_cast< css::registry::XRegistryKey * >(
+ pRegistryKey)->
+ createKey(
+ rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.stoc.JavaVirtualMachine"
+ "/UNO/SINGLETONS/"
+ "com.sun.star.java.theJavaVirtualMachine"))))->
+ setStringValue(serviceGetServiceName());
+ return true;
+ }
+ catch (css::uno::Exception &)
+ {
+ OSL_ENSURE(false, "com.sun.star.uno.Exception caught");
+ }
+ }
+ return false;
+}
+
++=======
++>>>>>>> stage/premerge/dev300_m98
extern "C" void * SAL_CALL component_getFactory(sal_Char const * pImplName,
void * pServiceManager,
void * pRegistryKey)
diff --cc stoc/util/makefile.mk
index 4243d45,c185b28..32f229c
--- a/stoc/util/makefile.mk
+++ b/stoc/util/makefile.mk
@@@ -53,11 -53,12 +53,12 @@@ LIB1FILES= $(SLB)$/bootstrap.lib
SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
SHL1STDLIBS= \
- $(CPPULIB) \
+ $(CPPULIB) \
$(SALHELPERLIB) \
- $(CPPUHELPERLIB) \
+ $(CPPUHELPERLIB) \
$(SALLIB) \
- $(REGLIB)
+ $(REGLIB) \
+ $(XMLREADERLIB)
SHL1DEPN=
SHL1IMPLIB= i$(TARGET)
diff --cc udkapi/com/sun/star/script/makefile.mk
index e6f49a9,1d8416d..23c4178
--- a/udkapi/com/sun/star/script/makefile.mk
+++ b/udkapi/com/sun/star/script/makefile.mk
@@@ -38,49 -38,50 +38,50 @@@ PACKAGE=com$/sun$/star$/scrip
# ------------------------------------------------------------------------
IDLFILES=\
- AllEventObject.idl\
- AllListenerAdapter.idl\
- BasicErrorException.idl\
- CannotConvertException.idl\
- CannotCreateAdapterException.idl\
- ContextInformation.idl\
- Converter.idl\
- Engine.idl\
- FailReason.idl\
- FinishEngineEvent.idl\
- FinishReason.idl\
- InterruptEngineEvent.idl\
- InterruptReason.idl\
- Invocation.idl\
- InvocationAdapterFactory.idl\
- JavaScript.idl\
- ScriptEvent.idl\
- ScriptEventDescriptor.idl\
- ArrayWrapper.idl\
- XAllListener.idl\
- XAllListenerAdapterService.idl\
- XDebugging.idl\
+ AllEventObject.idl\
+ AllListenerAdapter.idl\
+ BasicErrorException.idl\
+ CannotConvertException.idl\
+ CannotCreateAdapterException.idl\
+ ContextInformation.idl\
+ Converter.idl\
+ Engine.idl\
+ FailReason.idl\
+ FinishEngineEvent.idl\
+ FinishReason.idl\
+ InterruptEngineEvent.idl\
+ InterruptReason.idl\
+ Invocation.idl\
+ InvocationAdapterFactory.idl\
+ JavaScript.idl\
+ ScriptEvent.idl\
+ ScriptEventDescriptor.idl\
+ ArrayWrapper.idl\
+ XAllListener.idl\
+ XAllListenerAdapterService.idl\
+ XDebugging.idl\
+ XDirectInvocation.idl\
- XEngine.idl\
- XEngineListener.idl\
- XEventAttacher.idl\
- XEventAttacherManager.idl\
- XInvocationAdapterFactory.idl\
- XInvocationAdapterFactory2.idl\
- XInvocation.idl\
- XInvocation2.idl\
- InvocationInfo.idl\
- MemberType.idl\
- XLibraryAccess.idl\
- XScriptListener.idl\
- XTypeConverter.idl\
- XStarBasicAccess.idl\
- XStarBasicModuleInfo.idl\
- XStarBasicDialogInfo.idl\
- XStarBasicLibraryInfo.idl\
- XScriptEventsSupplier.idl\
- XScriptEventsAttacher.idl\
- XDefaultMethod.idl\
- XDefaultProperty.idl\
+ XEngine.idl\
+ XEngineListener.idl\
+ XEventAttacher.idl\
+ XEventAttacherManager.idl\
+ XInvocationAdapterFactory.idl\
+ XInvocationAdapterFactory2.idl\
+ XInvocation.idl\
+ XInvocation2.idl\
+ InvocationInfo.idl\
+ MemberType.idl\
+ XLibraryAccess.idl\
+ XScriptListener.idl\
+ XTypeConverter.idl\
+ XStarBasicAccess.idl\
+ XStarBasicModuleInfo.idl\
+ XStarBasicDialogInfo.idl\
+ XStarBasicLibraryInfo.idl\
+ XScriptEventsSupplier.idl\
+ XScriptEventsAttacher.idl\
+ XDefaultMethod.idl\
+ XDefaultProperty.idl\
XAutomationInvocation.idl\
XErrorQuery.idl\
diff --cc xmlreader/source/makefile.mk
index 0000000,cb71e21..cbc2301
mode 000000,100644..100644
--- a/xmlreader/source/makefile.mk
+++ b/xmlreader/source/makefile.mk
@@@ -1,0 -1,53 +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 = xmlreader
+ TARGET = xmlreader
+
+ ENABLE_EXCEPTIONS = TRUE
+ VISIBILITY_HIDDEN = TRUE
+
+ .INCLUDE: settings.mk
+
+ CDEFS += -DOOO_DLLIMPLEMENTATION_XMLREADER
+
+ SLOFILES = \
+ $(SLO)/pad.obj \
+ $(SLO)/span.obj \
+ $(SLO)/xmlreader.obj
+
+ SHL1IMPLIB = i$(SHL1TARGET)
+ SHL1OBJS = $(SLOFILES)
+ SHL1RPATH = URELIB
+ SHL1STDLIBS = \
+ $(SALLIB)
+ SHL1TARGET = xmlreader
+ SHL1USE_EXPORTS = name
+ DEF1NAME = $(SHL1TARGET)
+
+ .INCLUDE: target.mk
commit 600beb2ff2d315df5ef9172715d421d46321fd06
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Feb 10 02:54:55 2011 -0600
pre-merge ooo/dev300_m98. fairly aggressive pre-merge
Conflicts:
bridges/prj/build.lst
bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx
bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx
bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.hxx
bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx
bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx
bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx
bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx
bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx
bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx
bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx
bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx
bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
bridges/source/cpp_uno/gcc3_netbsd_intel/cpp2uno.cxx
bridges/source/cpp_uno/gcc3_netbsd_intel/uno2cpp.cxx
bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx
bridges/source/cpp_uno/msvc_win32_x86-64/makefile.mk
bridges/source/cpp_uno/shared/vtablefactory.cxx
bridges/source/remote/context/context.cxx
bridges/source/remote/urp/urp_job.hxx
bridges/test/performance/makefile.mk
cli_ure/source/native/makefile.mk
codemaker/source/bonobowrappermaker/corbamaker.cxx
codemaker/source/bonobowrappermaker/corbaoptions.cxx
codemaker/source/bonobowrappermaker/corbatype.cxx
codemaker/source/bonobowrappermaker/corbatype.hxx
codemaker/source/bonobowrappermaker/makefile.mk
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list