[Libreoffice-commits] .: Branch 'feature/gnumake4' - 95 commits - binaryurp/prj binaryurp/source bridges/test cli_ure/prj codemaker/inc codemaker/prj codemaker/source cppuhelper/inc cppuhelper/prj cppuhelper/qa cppuhelper/source cppuhelper/test cppu/prj cpputools/prj cppu/util idlc/source io/prj io/source io/test javaunohelper/com jurt/source jvmaccess/prj jvmaccess/util jvmfwk/prj jvmfwk/source offapi/com offapi/Makefile offapi/Module_offapi.mk offapi/Package_offapi_idl.mk offapi/Package_offapi_inc.mk offapi/prj offapi/UnoApi_offapi.mk offapi/UnoApi_types.mk offapi/util offuh/prj offuh/source pyuno/prj pyuno/source rdbmaker/source registry/util remotebridges/examples remotebridges/prj remotebridges/source ridljar/prj sal/cppunittester sal/inc sal/osl sal/prj sal/qa sal/rtl sal/systools sal/test sal/util sal/workben stoc/prj stoc/source stoc/test store/prj store/util udkapi/com udkapi/Makefile udkapi/Module_udkapi.mk udkapi/Package_udkapi_idl.mk udkapi/Package_udkapi_inc.mk udkapi/prj udk api/UnoApi_udkapi.mk udkapi/UnoApi_uretypes.mk udkapi/util unoil/prj ure/source xmlreader/prj
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Thu Jul 21 10:07:19 PDT 2011
binaryurp/prj/build.lst | 2
binaryurp/source/bridgefactory.cxx | 7
bridges/test/java_uno/acquire/testacquire.cxx | 8
bridges/test/java_uno/equals/testequals.cxx | 6
bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx | 6
bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx | 6
bridges/test/java_uno/nativethreadpool/version.map | 2
cli_ure/prj/build.lst | 2
codemaker/inc/codemaker/options.hxx | 5
codemaker/prj/build.lst | 2
codemaker/source/codemaker/options.cxx | 29
codemaker/source/javamaker/classfile.cxx | 5
cppu/prj/build.lst | 2
cppu/util/makefile.mk | 4
cppuhelper/inc/cppuhelper/shlib.hxx | 28
cppuhelper/prj/build.lst | 2
cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx | 11
cppuhelper/qa/propertysetmixin/makefile.mk | 1
cppuhelper/qa/propertysetmixin/qa_propertysetmixin.cpp.component | 2
cppuhelper/source/factory.cxx | 23
cppuhelper/source/gcc3.map | 1
cppuhelper/source/gcc3os2.map | 1
cppuhelper/source/makefile.mk | 4
cppuhelper/source/msvc_win32_intel.map | 1
cppuhelper/source/shlib.cxx | 49
cppuhelper/test/cfg_test.cxx | 6
cpputools/prj/build.lst | 2
idlc/source/makefile.mk | 6
idlc/source/preproc/makefile.mk | 9
io/prj/build.lst | 2
io/source/TextInputStream/TextInputStream.cxx | 6
io/source/TextOutputStream/TextOutputStream.cxx | 6
io/source/acceptor/acceptor.cxx | 6
io/source/connector/connector.cxx | 6
io/source/stm/factreg.cxx | 6
io/test/stm/exports.dxp | 2
io/test/stm/testfactreg.cxx | 7
javaunohelper/com/sun/star/comp/helper/Bootstrap.java | 4
javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java | 2
jurt/source/pipe/wrapper/wrapper.c | 2
jvmaccess/prj/build.lst | 2
jvmaccess/prj/d.lst | 2
jvmaccess/util/makefile.mk | 4
jvmfwk/prj/d.lst | 2
jvmfwk/source/makefile.mk | 4
offapi/Makefile | 38
offapi/Module_offapi.mk | 38
offapi/Package_offapi_idl.mk | 29
offapi/Package_offapi_inc.mk | 29
offapi/UnoApi_offapi.mk | 3761 ++++++++++
offapi/UnoApi_types.mk | 45
offapi/com/sun/star/accessibility/makefile.mk | 80
offapi/com/sun/star/animations/TargetPropertiesCreator.idl | 44
offapi/com/sun/star/animations/XTargetPropertiesCreator.idl | 2
offapi/com/sun/star/animations/makefile.mk | 76
offapi/com/sun/star/auth/makefile.mk | 28
offapi/com/sun/star/awt/grid/makefile.mk | 66
offapi/com/sun/star/awt/makefile.mk | 348
offapi/com/sun/star/awt/tree/makefile.mk | 61
offapi/com/sun/star/chart/makefile.mk | 127
offapi/com/sun/star/chart2/CurveStyle.idl | 5
offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl | 49
offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl | 4
offapi/com/sun/star/chart2/data/makefile.mk | 60
offapi/com/sun/star/chart2/makefile.mk | 99
offapi/com/sun/star/configuration/backend/makefile.mk | 103
offapi/com/sun/star/configuration/backend/xml/makefile.mk | 43
offapi/com/sun/star/configuration/bootstrap/makefile.mk | 41
offapi/com/sun/star/configuration/makefile.mk | 74
offapi/com/sun/star/datatransfer/clipboard/makefile.mk | 59
offapi/com/sun/star/datatransfer/dnd/makefile.mk | 70
offapi/com/sun/star/datatransfer/makefile.mk | 59
offapi/com/sun/star/deployment/makefile.mk | 64
offapi/com/sun/star/deployment/test/makefile.mk | 41
offapi/com/sun/star/deployment/ui/makefile.mk | 43
offapi/com/sun/star/drawing/CanvasFeature.idl | 43
offapi/com/sun/star/drawing/SlideSorter.idl | 84
offapi/com/sun/star/drawing/XPresenterHelper.idl | 7
offapi/com/sun/star/drawing/XSlidePreviewCache.idl | 20
offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl | 55
offapi/com/sun/star/drawing/XSlideSorterBase.idl | 137
offapi/com/sun/star/drawing/framework/BorderType.idl | 46
offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl | 12
offapi/com/sun/star/drawing/framework/makefile.mk | 75
offapi/com/sun/star/drawing/makefile.mk | 227
offapi/com/sun/star/form/binding/makefile.mk | 69
offapi/com/sun/star/form/component/makefile.mk | 83
offapi/com/sun/star/form/control/makefile.mk | 64
offapi/com/sun/star/form/inspection/makefile.mk | 54
offapi/com/sun/star/form/makefile.mk | 104
offapi/com/sun/star/form/runtime/makefile.mk | 56
offapi/com/sun/star/form/submission/makefile.mk | 48
offapi/com/sun/star/form/validation/makefile.mk | 53
offapi/com/sun/star/formula/makefile.mk | 49
offapi/com/sun/star/frame/UntitledNumbersConst.idl | 39
offapi/com/sun/star/frame/XUntitledNumbers.idl | 5
offapi/com/sun/star/frame/makefile.mk | 166
offapi/com/sun/star/frame/status/makefile.mk | 55
offapi/com/sun/star/gallery/makefile.mk | 51
offapi/com/sun/star/geometry/makefile.mk | 59
offapi/com/sun/star/i18n/makefile.mk | 129
offapi/com/sun/star/image/makefile.mk | 50
offapi/com/sun/star/inspection/StringRepresentation.idl | 47
offapi/com/sun/star/inspection/XStringRepresentation.idl | 5
offapi/com/sun/star/inspection/makefile.mk | 66
offapi/com/sun/star/installation/makefile.mk | 55
offapi/com/sun/star/ldap/makefile.mk | 47
offapi/com/sun/star/linguistic2/makefile.mk | 101
offapi/com/sun/star/logging/makefile.mk | 55
offapi/com/sun/star/mail/makefile.mk | 58
offapi/com/sun/star/makefile.mk | 46
offapi/com/sun/star/media/makefile.mk | 50
offapi/com/sun/star/mozilla/makefile.mk | 67
offapi/com/sun/star/office/makefile.mk | 47
offapi/com/sun/star/oooimprovement/makefile.mk | 44
offapi/com/sun/star/packages/makefile.mk | 55
offapi/com/sun/star/packages/manifest/makefile.mk | 47
offapi/com/sun/star/packages/zip/makefile.mk | 51
offapi/com/sun/star/plugin/makefile.mk | 53
offapi/com/sun/star/presentation/SlideShow.idl | 39
offapi/com/sun/star/presentation/TransitionFactory.idl | 40
offapi/com/sun/star/presentation/XSlideShow.idl | 2
offapi/com/sun/star/presentation/XTransitionFactory.idl | 2
offapi/com/sun/star/presentation/makefile.mk | 96
offapi/com/sun/star/presentation/textfield/makefile.mk | 48
offapi/com/sun/star/rdf/makefile.mk | 71
offapi/com/sun/star/rendering/ARGBColor.idl | 55
offapi/com/sun/star/rendering/BitmapCanvas.idl | 57
offapi/com/sun/star/rendering/Canvas.idl | 42
offapi/com/sun/star/rendering/Color.idl | 41
offapi/com/sun/star/rendering/ColorComponent.idl | 38
offapi/com/sun/star/rendering/MtfRenderer.idl | 9
offapi/com/sun/star/rendering/RGBColor.idl | 49
offapi/com/sun/star/rendering/XBitmapCanvas.idl | 18
offapi/com/sun/star/rendering/XCanvas.idl | 5
offapi/com/sun/star/rendering/XColorSpace.idl | 41
offapi/com/sun/star/rendering/XMtfRenderer.idl | 41
offapi/com/sun/star/report/FixedLine.idl | 45
offapi/com/sun/star/report/FixedText.idl | 46
offapi/com/sun/star/report/FormatCondition.idl | 40
offapi/com/sun/star/report/FormattedField.idl | 46
offapi/com/sun/star/report/Function.idl | 43
offapi/com/sun/star/report/Group.idl | 45
offapi/com/sun/star/report/Groups.idl | 42
offapi/com/sun/star/report/ImageControl.idl | 46
offapi/com/sun/star/report/ReportControlFormat.idl | 42
offapi/com/sun/star/report/ReportControlModel.idl | 46
offapi/com/sun/star/report/ReportDefinition.idl | 44
offapi/com/sun/star/report/Section.idl | 48
offapi/com/sun/star/report/Shape.idl | 46
offapi/com/sun/star/report/XFixedLine.idl | 1
offapi/com/sun/star/report/XFixedText.idl | 1
offapi/com/sun/star/report/XFormatCondition.idl | 1
offapi/com/sun/star/report/XFormattedField.idl | 1
offapi/com/sun/star/report/XFunction.idl | 4
offapi/com/sun/star/report/XGroup.idl | 1
offapi/com/sun/star/report/XGroups.idl | 1
offapi/com/sun/star/report/XImageControl.idl | 1
offapi/com/sun/star/report/XReportControlFormat.idl | 1
offapi/com/sun/star/report/XReportControlModel.idl | 1
offapi/com/sun/star/report/XReportDefinition.idl | 1
offapi/com/sun/star/report/XSection.idl | 1
offapi/com/sun/star/report/XShape.idl | 1
offapi/com/sun/star/report/inspection/makefile.mk | 49
offapi/com/sun/star/report/makefile.mk | 69
offapi/com/sun/star/report/meta/makefile.mk | 49
offapi/com/sun/star/resource/makefile.mk | 59
offapi/com/sun/star/scanner/makefile.mk | 50
offapi/com/sun/star/script/browse/makefile.mk | 52
offapi/com/sun/star/script/provider/makefile.mk | 68
offapi/com/sun/star/sdb/application/makefile.mk | 60
offapi/com/sun/star/sdb/makefile.mk | 147
offapi/com/sun/star/sdb/tools/makefile.mk | 59
offapi/com/sun/star/sdbc/makefile.mk | 118
offapi/com/sun/star/sdbcx/makefile.mk | 97
offapi/com/sun/star/setup/InstallResponse.idl | 12
offapi/com/sun/star/setup/OSType.idl | 3
offapi/com/sun/star/setup/ResponseErrorCode.idl | 44
offapi/com/sun/star/setup/makefile.mk | 74
offapi/com/sun/star/sheet/FormulaOpCodeMapper.idl | 48
offapi/com/sun/star/sheet/NameToken.idl | 52
offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl | 4
offapi/com/sun/star/sheet/makefile.mk | 1
offapi/com/sun/star/smarttags/makefile.mk | 66
offapi/com/sun/star/style/XStyleSupplier.idl | 75
offapi/com/sun/star/svg/makefile.mk | 48
offapi/com/sun/star/sync/FilterData.idl | 41
offapi/com/sun/star/sync/SyncInfo.idl | 3
offapi/com/sun/star/sync/makefile.mk | 57
offapi/com/sun/star/sync2/makefile.mk | 39
offapi/com/sun/star/system/makefile.mk | 59
offapi/com/sun/star/table/XCell2.idl | 71
offapi/com/sun/star/table/makefile.mk | 1
offapi/com/sun/star/task/makefile.mk | 91
offapi/com/sun/star/text/fieldmaster/makefile.mk | 50
offapi/com/sun/star/text/makefile.mk | 278
offapi/com/sun/star/text/textfield/docinfo/makefile.mk | 63
offapi/com/sun/star/text/textfield/makefile.mk | 86
offapi/com/sun/star/ucb/makefile.mk | 274
offapi/com/sun/star/ucb/smart/makefile.mk | 49
offapi/com/sun/star/ui/dialogs/makefile.mk | 79
offapi/com/sun/star/ui/makefile.mk | 93
offapi/com/sun/star/util/SearchAlgorithms.idl | 52
offapi/com/sun/star/util/SearchFlags.idl | 140
offapi/com/sun/star/util/SearchOptions.idl | 86
offapi/com/sun/star/util/SearchResult.idl | 64
offapi/com/sun/star/util/XTextSearch.idl | 176
offapi/com/sun/star/util/makefile.mk | 154
offapi/com/sun/star/view/makefile.mk | 78
offapi/com/sun/star/xforms/makefile.mk | 55
offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl | 48
offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl | 64
offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl | 53
offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl | 64
offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl | 22
offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl | 46
offapi/com/sun/star/xml/crypto/sax/makefile.mk | 72
offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl | 17
offapi/com/sun/star/xml/csax/XMLAttribute.idl | 53
offapi/com/sun/star/xml/csax/makefile.mk | 48
offapi/com/sun/star/xml/dom/events/makefile.mk | 62
offapi/com/sun/star/xml/dom/makefile.mk | 75
offapi/com/sun/star/xml/dom/views/makefile.mk | 53
offapi/com/sun/star/xml/input/makefile.mk | 51
offapi/com/sun/star/xml/makefile.mk | 60
offapi/com/sun/star/xml/sax/makefile.mk | 69
offapi/com/sun/star/xml/wrapper/makefile.mk | 51
offapi/com/sun/star/xml/xpath/makefile.mk | 60
offapi/com/sun/star/xsd/makefile.mk | 58
offapi/prj/build.lst | 111
offapi/prj/makefile.mk | 40
offapi/util/makefile.mk | 2
offapi/util/makefile.pmk | 34
offapi/util/target.pmk | 33
offuh/prj/build.lst | 4
offuh/prj/d.lst | 423 -
offuh/source/makefile.mk | 48
pyuno/prj/build.lst | 2
pyuno/source/loader/pyuno_loader.cxx | 7
pyuno/source/module/makefile.mk | 4
rdbmaker/source/rdbmaker/makefile.mk | 5
registry/util/makefile.mk | 4
remotebridges/examples/exports.dxp | 1
remotebridges/examples/officeclient.cxx | 6
remotebridges/prj/build.lst | 2
remotebridges/source/unourl_resolver/unourl_resolver.cxx | 6
ridljar/prj/build.lst | 2
sal/cppunittester/cppunittester.cxx | 101
sal/cppunittester/makefile.mk | 8
sal/inc/cppunittester/protectorfactory.hxx | 22
sal/inc/osl/thread.h | 2
sal/inc/rtl/math.hxx | 8
sal/inc/rtl/strbuf.h | 16
sal/inc/rtl/strbuf.hxx | 40
sal/inc/rtl/string.hxx | 24
sal/inc/rtl/ustrbuf.h | 15
sal/inc/rtl/ustrbuf.hxx | 23
sal/inc/sal/cppunit.h | 12
sal/inc/sal/main.h | 94
sal/inc/sal/types.h | 2
sal/inc/systools/win32/AutoSystoolInit.hxx | 65
sal/inc/systools/win32/StrConvert.h | 135
sal/inc/systools/win32/SyncObjects.hxx | 113
sal/inc/systools/win32/uwinapi.h | 52
sal/osl/unx/interlck.c | 11
sal/osl/unx/makefile.mk | 6
sal/osl/unx/module.c | 3
sal/osl/unx/nlsupport.c | 6
sal/osl/unx/osxlocale.cxx | 2
sal/osl/unx/salinit.cxx | 1
sal/osl/unx/system.h | 1
sal/osl/unx/tempfile.c | 42
sal/osl/unx/thread.c | 49
sal/osl/unx/uunxapi.cxx | 2
sal/prj/build.lst | 3
sal/qa/ByteSequence/makefile.mk | 6
sal/qa/OStringBuffer/makefile.mk | 6
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 48
sal/qa/OStringBuffer/rtl_String_Utils.cxx | 386 -
sal/qa/OStringBuffer/rtl_String_Utils.hxx | 37
sal/qa/cppunit_local.mk | 4
sal/qa/makefile.mk | 4
sal/qa/osl/condition/makefile.mk | 12
sal/qa/osl/file/makefile.mk | 6
sal/qa/osl/file/osl_File.cxx | 10
sal/qa/osl/file/osl_File_Const.h | 6
sal/qa/osl/file/osl_old_test_file.cxx | 4
sal/qa/osl/file/test_cpy_wrt_file.cxx | 8
sal/qa/osl/getsystempathfromfileurl/makefile.mk | 6
sal/qa/osl/module/makefile.mk | 7
sal/qa/osl/module/osl_Module_DLL.cxx | 4
sal/qa/osl/process/makefile.mk | 15
sal/qa/osl/process/osl_Thread.cxx | 11
sal/qa/osl/process/osl_process.cxx | 13
sal/qa/osl/security/makefile.mk | 10
sal/qa/osl/security/osl_Security.cxx | 16
sal/qa/osl/security/osl_Security_Const.h | 13
sal/qa/rtl/alloc/makefile.mk | 9
sal/qa/rtl/cipher/makefile.mk | 13
sal/qa/rtl/crc32/makefile.mk | 13
sal/qa/rtl/doublelock/makefile.mk | 15
sal/qa/rtl/locale/makefile.mk | 14
sal/qa/rtl/oustringbuffer/makefile.mk | 6
sal/qa/rtl/strings/makefile.mk | 6
sal/qa/rtl_strings/rtl_String_Utils.cxx | 386 -
sal/qa/rtl_strings/rtl_String_Utils.hxx | 43
sal/qa/sal/makefile.mk | 6
sal/qa/static/makefile.mk | 68
sal/qa/static/sal_cppunittester_all.cxx | 161
sal/rtl/source/strbuf.c | 30
sal/rtl/source/ustrbuf.c | 29
sal/systools/win32/uwinapi/CheckTokenMembership.cpp | 37
sal/systools/win32/uwinapi/CommandLineToArgvW.cpp | 174
sal/systools/win32/uwinapi/CopyFileExA.cpp | 169
sal/systools/win32/uwinapi/CopyFileExW.cpp | 42
sal/systools/win32/uwinapi/DeleteVolumeMountPointA.cpp | 35
sal/systools/win32/uwinapi/DeleteVolumeMountPointW.cpp | 35
sal/systools/win32/uwinapi/DllGetVersion.cpp | 76
sal/systools/win32/uwinapi/DllMain.cpp | 238
sal/systools/win32/uwinapi/DrawStateW.cpp | 77
sal/systools/win32/uwinapi/EnumProcesses.cpp | 43
sal/systools/win32/uwinapi/FindFirstVolumeA.cpp | 32
sal/systools/win32/uwinapi/FindFirstVolumeMountPointA.cpp | 54
sal/systools/win32/uwinapi/FindFirstVolumeMountPointW.cpp | 35
sal/systools/win32/uwinapi/FindFirstVolumeW.cpp | 32
sal/systools/win32/uwinapi/FindNextVolumeA.cpp | 32
sal/systools/win32/uwinapi/FindNextVolumeMountPointA.cpp | 32
sal/systools/win32/uwinapi/FindNextVolumeMountPointW.cpp | 32
sal/systools/win32/uwinapi/FindNextVolumeW.cpp | 32
sal/systools/win32/uwinapi/FindVolumeClose.cpp | 32
sal/systools/win32/uwinapi/FindVolumeMountPointClose.cpp | 32
sal/systools/win32/uwinapi/GetDiskFreeSpaceExA.cpp | 61
sal/systools/win32/uwinapi/GetDiskFreeSpaceExW.cpp | 43
sal/systools/win32/uwinapi/GetLogicalDriveStringsW.cpp | 43
sal/systools/win32/uwinapi/GetLongPathName.cpp | 115
sal/systools/win32/uwinapi/GetLongPathNameA.cpp | 33
sal/systools/win32/uwinapi/GetLongPathNameW.cpp | 66
sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp | 55
sal/systools/win32/uwinapi/GetModuleFileNameExW.cpp | 20
sal/systools/win32/uwinapi/GetProcessId.cpp | 167
sal/systools/win32/uwinapi/GetUserDefaultUILanguage.cpp | 36
sal/systools/win32/uwinapi/GetUserDomainA.cpp | 48
sal/systools/win32/uwinapi/GetUserDomainW.cpp | 49
sal/systools/win32/uwinapi/GetUserDomain_NT.cpp | 33
sal/systools/win32/uwinapi/GetUserDomain_WINDOWS.cpp | 82
sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointA.cpp | 32
sal/systools/win32/uwinapi/GetVolumeNameForVolumeMountPointW.cpp | 32
sal/systools/win32/uwinapi/GetVolumePathNameA.cpp | 32
sal/systools/win32/uwinapi/GetVolumePathNameW.cpp | 32
sal/systools/win32/uwinapi/MCIWndCreateW.cpp | 44
sal/systools/win32/uwinapi/MoveFileExA.cpp | 100
sal/systools/win32/uwinapi/MoveFileExW.cpp | 40
sal/systools/win32/uwinapi/PathAddBackslashW.cpp | 45
sal/systools/win32/uwinapi/PathCompactPathExW.cpp | 48
sal/systools/win32/uwinapi/PathFileExistsW.cpp | 43
sal/systools/win32/uwinapi/PathFindExtensionW.cpp | 55
sal/systools/win32/uwinapi/PathFindFileNameW.cpp | 54
sal/systools/win32/uwinapi/PathIsFileSpecW.cpp | 43
sal/systools/win32/uwinapi/PathIsUNCW.cpp | 43
sal/systools/win32/uwinapi/PathRemoveExtensionW.cpp | 44
sal/systools/win32/uwinapi/PathRemoveFileSpecW.cpp | 45
sal/systools/win32/uwinapi/PathSetDlgItemPathW.cpp | 45
sal/systools/win32/uwinapi/PathStripToRootW.cpp | 45
sal/systools/win32/uwinapi/ResolveThunk.cpp | 66
sal/systools/win32/uwinapi/ResolveUnicows.cpp | 518 -
sal/systools/win32/uwinapi/SHCreateItemFromParsingName.cpp | 35
sal/systools/win32/uwinapi/SHILCreateFromPathW.cpp | 35
sal/systools/win32/uwinapi/SetVolumeMountPointA.cpp | 32
sal/systools/win32/uwinapi/SetVolumeMountPointW.cpp | 32
sal/systools/win32/uwinapi/Uwinapi.def | 22
sal/systools/win32/uwinapi/Uwinapi.h | 134
sal/systools/win32/uwinapi/macros.h | 235
sal/systools/win32/uwinapi/makefile.mk | 64
sal/systools/win32/uwinapi/toolhelp.cpp | 60
sal/systools/win32/uwinapi/unicows.dxp | 546 -
sal/systools/win32/uwinapi/unicows_mingw.dxp | 544 -
sal/systools/win32/uwinapi/uwinapi.dxp | 86
sal/systools/win32/uwinapi/uwinapi_mingw.dxp | 90
sal/systools/win32/uwinapi/win95sys.h | 350
sal/test/unloading/exports.dxp | 1
sal/test/unloading/samplelib1.cxx | 4
sal/test/unloading/samplelib2.cxx | 4
sal/util/makefile.mk | 2
sal/util/sal.map | 9
sal/workben/makefile.mk | 14
sal/workben/tgetpwnam.cxx | 250
stoc/prj/build.lst | 2
stoc/source/bootstrap/services.cxx | 6
stoc/source/corereflection/crefl.cxx | 6
stoc/source/inspect/introspection.cxx | 7
stoc/source/invocation/invocation.cxx | 6
stoc/source/invocation_adapterfactory/iafactory.cxx | 7
stoc/source/javaloader/javaloader.cxx | 9
stoc/source/javavm/javavm.cxx | 6
stoc/source/loader/dllcomponentloader.cxx | 20
stoc/source/namingservice/namingservice.cxx | 6
stoc/source/proxy_factory/proxyfac.cxx | 6
stoc/source/simpleregistry/textualservices.cxx | 47
stoc/source/stocservices/stocservices.cxx | 6
stoc/test/excomp/excomp1.cxx | 6
stoc/test/excomp/excomp2.cxx | 6
stoc/test/excomp/exports.dxp | 1
stoc/test/registry_tdprovider/testregistrytdprovider.cxx | 8
stoc/test/tdmanager/testtdmanager.cxx | 8
stoc/test/testsmgr_cpnt.cxx | 6
stoc/test/testsmgr_cpnt.map | 1
store/prj/d.lst | 1
store/util/makefile.mk | 2
udkapi/Makefile | 38
udkapi/Module_udkapi.mk | 38
udkapi/Package_udkapi_idl.mk | 29
udkapi/Package_udkapi_inc.mk | 29
udkapi/UnoApi_udkapi.mk | 468 +
udkapi/UnoApi_uretypes.mk | 34
udkapi/com/sun/star/beans/makefile.mk | 101
udkapi/com/sun/star/bridge/makefile.mk | 66
udkapi/com/sun/star/bridge/oleautomation/makefile.mk | 54
udkapi/com/sun/star/connection/makefile.mk | 56
udkapi/com/sun/star/container/makefile.mk | 83
udkapi/com/sun/star/corba/giop/makefile.mk | 43
udkapi/com/sun/star/corba/iiop/makefile.mk | 43
udkapi/com/sun/star/corba/iop/makefile.mk | 43
udkapi/com/sun/star/corba/makefile.mk | 43
udkapi/com/sun/star/io/makefile.mk | 99
udkapi/com/sun/star/java/makefile.mk | 57
udkapi/com/sun/star/lang/SystemDependent.idl | 35
udkapi/com/sun/star/lang/makefile.mk | 83
udkapi/com/sun/star/loader/makefile.mk | 51
udkapi/com/sun/star/makefile.mk | 46
udkapi/com/sun/star/reflection/makefile.mk | 93
udkapi/com/sun/star/registry/makefile.mk | 59
udkapi/com/sun/star/security/makefile.mk | 60
udkapi/com/sun/star/task/makefile.mk | 50
udkapi/com/sun/star/test/bridge/makefile.mk | 45
udkapi/com/sun/star/test/makefile.mk | 50
udkapi/com/sun/star/test/performance/makefile.mk | 45
udkapi/com/sun/star/uno/makefile.mk | 61
udkapi/com/sun/star/uri/makefile.mk | 54
udkapi/com/sun/star/util/logging/makefile.mk | 50
udkapi/com/sun/star/util/makefile.mk | 50
udkapi/prj/build.lst | 31
udkapi/prj/makefile.mk | 40
udkapi/util/makefile.mk | 75
unoil/prj/build.lst | 2
ure/source/uretest/cppmain.cc | 6
ure/source/uretest/cppserver.cc | 6
ure/source/uretest/cpptest.cc | 6
ure/source/uretest/version.map | 1
xmlreader/prj/build.lst | 2
xmlreader/prj/d.lst | 1
450 files changed, 8124 insertions(+), 17848 deletions(-)
New commits:
commit 5b5501f54ec560bf7a5e3ac1b1257b6072a69057
Merge: c523533... a6ba297...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 18:59:03 2011 +0200
resyncing to master
diff --cc xmlreader/prj/build.lst
index 7c37df8,ab60846..59b71b8
--- a/xmlreader/prj/build.lst
+++ b/xmlreader/prj/build.lst
@@@ -1,2 -1,3 +1,2 @@@
- xr xmlreader : BOOST:boost cppu offuh sal stlport NULL
+ xr xmlreader : BOOST:boost cppu offapi sal stlport NULL
-xr xmlreader\inc nmake - all xr_inc NULL
-xr xmlreader\source nmake - all xr_source xr_inc NULL
+xr xmlreader\prj nmake - all xr_prj NULL
diff --cc xmlreader/prj/d.lst
index e69de29,f850331..a4c0608
--- a/xmlreader/prj/d.lst
+++ b/xmlreader/prj/d.lst
@@@ -1,0 -1,11 +1,1 @@@
+ ..\%__SRC%\lib\libxmlreader.dll.a %_DEST%\lib\libxmlreader.dll.a
-mkdir: %_DEST%\inc\xmlreader
-mkdir: %_DEST%\inc\xmlreader\detail
-..\%__SRC%\bin\xmlreader.dll %_DEST%\bin\xmlreader.dll
-..\%__SRC%\lib\ixmlreader.lib %_DEST%\lib\ixmlreader.lib
-..\%__SRC%\lib\libxmlreader.dylib %_DEST%\lib\libxmlreader.dylib
-..\%__SRC%\lib\libxmlreader.so %_DEST%\lib\libxmlreader.so
-..\inc\xmlreader\detail\xmlreaderdllapi.hxx %_DEST%\inc\xmlreader\detail\xmlreaderdllapi.hxx
-..\inc\xmlreader\pad.hxx %_DEST%\inc\xmlreader\pad.hxx
-..\inc\xmlreader\span.hxx %_DEST%\inc\xmlreader\span.hxx
-..\inc\xmlreader\xmlreader.hxx %_DEST%\inc\xmlreader\xmlreader.hxx
commit a6ba297abbe0a78954de2b2cbd911df899dc985c
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date: Wed Jul 13 11:20:10 2011 +0200
Simplify osl_getTempDirURL()
Do not return different values depending on the platform
diff --git a/sal/osl/unx/tempfile.c b/sal/osl/unx/tempfile.c
index 862aff2..64ce56b 100644
--- a/sal/osl/unx/tempfile.c
+++ b/sal/osl/unx/tempfile.c
@@ -49,53 +49,29 @@
#include "file_url.h"
#endif
-/*****************************************************************/
-/* osl_getTempFirURL */
-/*****************************************************************/
-
oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir )
{
-#ifdef MACOSX
+ oslFileError error;
+ /* described in environ(7) */
const char *pValue = getenv( "TMPDIR" );
- /* If TMPDIR environment variable is not set, use "/tmp" instead
- of P_tmpdir because its value is "/var/tmp" and it is not
- deleted on system start up */
if ( !pValue )
- pValue = "/tmp";
-#else
-
- const char *pValue = getenv( "TEMP" );
+ pValue = getenv( "TEMP" );
if ( !pValue )
pValue = getenv( "TMP" );
-#if defined(NETBSD)
- if ( !pValue )
- pValue = _PATH_TMP;
-#else
- if ( !pValue )
- pValue = P_tmpdir;
-#endif
-
if ( !pValue )
pValue = "/tmp";
-#endif /* MACOSX */
- if ( pValue )
- {
- oslFileError error;
- rtl_uString *ustrTempPath = NULL;
+ rtl_uString *ustrTempPath = NULL;
- rtl_string2UString( &ustrTempPath, pValue, strlen( pValue ), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
- OSL_ASSERT(ustrTempPath != NULL);
- error = osl_getFileURLFromSystemPath( ustrTempPath, pustrTempDir );
- rtl_uString_release( ustrTempPath );
+ rtl_string2UString( &ustrTempPath, pValue, strlen( pValue ), osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS );
+ OSL_ASSERT(ustrTempPath != NULL);
+ error = osl_getFileURLFromSystemPath( ustrTempPath, pustrTempDir );
+ rtl_uString_release( ustrTempPath );
- return error;
- }
- else
- return osl_File_E_NOENT;
+ return error;
}
/******************************************************************
commit 17627b601a93b04a5959dc21f210fe11d8352446
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jul 15 02:03:58 2011 +0300
Android build fixes
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index e4acd65..e38da90 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -2180,7 +2180,7 @@ namespace osl_VolumeInfo
}
-#if ( defined UNX )
+#if defined(UNX) && !defined(ANDROID)
void getMaxNameLength_002( )
{
struct statvfs aStatFS;
@@ -6055,7 +6055,7 @@ namespace osl_Directory
if (tmp_x.lastIndexOf('/') != (tmp_x.getLength() - 1))
tmp_x += rtl::OString('/');
-#ifndef WNT
+#if !defined(WNT) && !defined(ANDROID)
// FIXME would be nice to create unique dir even on Windows
tmp_x += rtl::OString("XXXXXX");
char *out = mkdtemp(const_cast<char*>(tmp_x.getStr()));
diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h
index cd6f01c..88df98e 100644
--- a/sal/qa/osl/file/osl_File_Const.h
+++ b/sal/qa/osl/file/osl_File_Const.h
@@ -95,7 +95,9 @@ const sal_Char pBuffer_Blank[] = "";
# include <sys/param.h>
# include <sys/mount.h>
# endif
-# include <sys/statvfs.h>
+# if !defined(ANDROID)
+# include <sys/statvfs.h>
+# endif
# include <sys/types.h>
# define TEST_PLATFORM ""
# define TEST_PLATFORM_ROOT "/"
commit 1a798a5ebc545ca9047550db1983ea65c910293d
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jul 15 01:33:21 2011 +0300
Add values for iOS and Android, style improvements
diff --git a/udkapi/com/sun/star/lang/SystemDependent.idl b/udkapi/com/sun/star/lang/SystemDependent.idl
index 22cf548..62555a4 100644
--- a/udkapi/com/sun/star/lang/SystemDependent.idl
+++ b/udkapi/com/sun/star/lang/SystemDependent.idl
@@ -61,18 +61,16 @@ published constants SystemDependent
//-------------------------------------------------------------------------
// DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_WIN32
- /** The called interface method returns a value specified for the
- 32-bit Windows systems.
+ /** The called interface method returns a value specified for Windows.
- <p>These are Windows NT, Windows 95, Windows 98 or higher. </p>
+ <p>These are Windows XP or higher. </p>
*/
const short SYSTEM_WIN32 = 1;
//-------------------------------------------------------------------------
// DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_WIN16
- /** The called interface method returns a value specified for
- the 16-bit Windows system.
+ /** The called interface method returns a value specified for 16-bit Windows.
<p>This is Windows 3.11. </p>
*/
@@ -81,12 +79,12 @@ published constants SystemDependent
//-------------------------------------------------------------------------
// DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_JAVA
- /** The called interface method returns a value specified for the system java.
+ /** The called interface method returns a value specified for Java.
<p>These are <em>JRE 1.1</em>, <em>JRE 1.2</em>, <em>JDK 1.1</em>,
<em>JDK 1.2</em> or higher. </p>
- <p>The return should be a handle to a java object locked with
+ <p>The return should be a handle to a Java object locked with
the call <code>JavaEnvironment->NewGlobalRef( ... )</code>
by the callee. </p>
*/
@@ -95,12 +93,12 @@ published constants SystemDependent
//-------------------------------------------------------------------------
// DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_OS2
- /** The called interface method returns a value specified for the <em>OS/2</em> system.
+ /** The called interface method returns a value specified for <em>OS/2</em>.
*/
const short SYSTEM_OS2 = 4;
// DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_MAC
- /** The called interface method returns a value specified for the <em>MAC-OS</em> system.
+ /** The called interface method returns a value specified for <em>Mac OS X</em>.
*/
const short SYSTEM_MAC = 5;
@@ -110,7 +108,21 @@ published constants SystemDependent
/** The called interface method returns a value specified for the <em>X Window System</em>.
*/
const short SYSTEM_XWINDOW = 6;
-
+
+ //-------------------------------------------------------------------------
+
+ // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_IOS
+ /** The called interface method returns a value specified for <em>iOS</em>.
+ */
+ const short SYSTEM_IOS = 7;
+
+ //-------------------------------------------------------------------------
+
+ // DocMerge from idl: value com::sun::star::lang::SystemDependent::SYSTEM_ANDROID
+ /** The called interface method returns a value specified for <em>Android</em>.
+ */
+ const short SYSTEM_ANDROID = 8;
+
};
//=============================================================================
commit 1e301dd23a0f3957274dd72d3bd3b2aab7291342
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jul 14 11:19:15 2011 +0300
iOS hacking, intermediate commit
diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h
index 3ddfe0f..370cba4 100644
--- a/sal/inc/sal/main.h
+++ b/sal/inc/sal/main.h
@@ -47,31 +47,46 @@ void SAL_CALL sal_detail_deinitialize();
#import <UIKit/UIKit.h>
#include <postmac.h>
-static int sal_argc;
-static char **sal_argv;
-
#define SAL_MAIN_WITH_ARGS_IMPL \
int SAL_CALL main(int argc, char ** argv) \
{ \
- sal_argc = argc; \
- sal_argv = argv; \
sal_detail_initialize(argc, argv); \
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; \
int retVal = UIApplicationMain (argc, argv, @"UIApplication", @"salAppDelegate"); \
- \
[pool release]; \
- \
sal_detail_deinitialize(); \
return retVal; \
+} \
+ \
+static int sal_main_with_args(int argc, char **argv); \
+ \
+static int \
+sal_main(void) \
+{ \
+ char *argv[] = { NULL }; \
+ return sal_main_with_args(0, argv); \
}
#define SAL_MAIN_IMPL \
-SAL_MAIN_WITH_ARGS_IMPL \
- \
-static int \
-sal_main_with_args(int argc, char ** argv) \
+int SAL_CALL main(int argc, char ** argv) \
{ \
- return sal_main(); \
+ sal_detail_initialize(argc, argv); \
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; \
+ int retVal = UIApplicationMain (argc, argv, @"UIApplication", @"salAppDelegate"); \
+ [pool release]; \
+ sal_detail_deinitialize(); \
+ return retVal; \
+}
+
+#define SAL_MAIN_WITH_GUI_IMPL \
+int SAL_CALL main(int argc, char ** argv) \
+{ \
+ sal_detail_initialize(argc, argv); \
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; \
+ int retVal = sal_main(); \
+ [pool release]; \
+ sal_detail_deinitialize(); \
+ return retVal; \
}
@interface salAppDelegate : NSObject <UIApplicationDelegate> {
@@ -79,7 +94,7 @@ sal_main_with_args(int argc, char ** argv) \
@property (nonatomic, retain) UIWindow *window;
@end
-static int sal_main_with_args(int argc, char **argv);
+static int sal_main(void);
@implementation salAppDelegate
@@ -92,7 +107,7 @@ static int sal_main_with_args(int argc, char **argv);
self.window = uiw;
[uiw release];
- sal_main_with_args(sal_argc, sal_argv);
+ sal_main();
[self.window makeKeyAndVisible];
return YES;
@@ -122,6 +137,8 @@ int SAL_CALL main(int argc, char ** argv) \
return ret; \
}
+#define SAL_MAIN_WITH_GUI_IMPL SAL_MAIN_IMPL
+
#endif
@@ -182,6 +199,19 @@ int WINAPI WinMain( HINSTANCE _hinst, HINSTANCE _dummy, char* _cmdline, int _nsh
SAL_WIN_WinMain \
static int SAL_CALL sal_main(void)
+/* Use SAL_IMPLEMENT_MAIN_WITH_GUI in programs that actually have a
+ * VCL GUI. The difference is meaningful only for iOS support, which
+ * of course is a highly experimental work in progress. So actually,
+ * don't bother, just let developers who care for iOS take care of it
+ * when/if necessary.
+ */
+
+#define SAL_IMPLEMENT_MAIN_WITH_GUI() \
+ static int SAL_CALL sal_main(void); \
+ SAL_MAIN_WITH_GUI_IMPL \
+ SAL_WIN_WinMain \
+ static int SAL_CALL sal_main(void)
+
/*
"How to use" Examples:
commit 210ef4c12e14a97c4097f205cf8cc4c8b73ee97b
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jul 12 20:18:35 2011 +0300
Add a property for the UIWindow and show it
diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h
index fdd99ac..3ddfe0f 100644
--- a/sal/inc/sal/main.h
+++ b/sal/inc/sal/main.h
@@ -76,19 +76,26 @@ sal_main_with_args(int argc, char ** argv) \
@interface salAppDelegate : NSObject <UIApplicationDelegate> {
}
+ at property (nonatomic, retain) UIWindow *window;
@end
static int sal_main_with_args(int argc, char **argv);
@implementation salAppDelegate
+ at synthesize window=_window;
+
- (BOOL)application: (UIApplication *) application didFinishLaunchingWithOptions: (NSDictionary *) launchOptions
{
UIWindow *uiw = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
uiw.backgroundColor = [UIColor redColor];
+ self.window = uiw;
[uiw release];
sal_main_with_args(sal_argc, sal_argv);
+
+ [self.window makeKeyAndVisible];
+ return YES;
}
@end
commit 916a0a7d19d59b2a093ed3e103474013580f385c
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jul 12 17:43:23 2011 +0300
Include the rest of the active sal cppunit tests for iOS
diff --git a/sal/qa/osl/condition/makefile.mk b/sal/qa/osl/condition/makefile.mk
index 8412c68..9683f20 100644
--- a/sal/qa/osl/condition/makefile.mk
+++ b/sal/qa/osl/condition/makefile.mk
@@ -43,8 +43,6 @@ CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:Condition by codegen.pl
SHL1OBJS= \
$(SLO)$/osl_Condition.obj
diff --git a/sal/qa/osl/security/makefile.mk b/sal/qa/osl/security/makefile.mk
index 58361fb..85d9beb 100755
--- a/sal/qa/osl/security/makefile.mk
+++ b/sal/qa/osl/security/makefile.mk
@@ -43,8 +43,6 @@ CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:Security by codegen.pl
SHL1OBJS= \
$(SLO)$/osl_Security.obj
diff --git a/sal/qa/rtl/alloc/makefile.mk b/sal/qa/rtl/alloc/makefile.mk
index 5ac7a79..1a015da 100755
--- a/sal/qa/rtl/alloc/makefile.mk
+++ b/sal/qa/rtl/alloc/makefile.mk
@@ -55,8 +55,7 @@ DEF1NAME =$(SHL1TARGET)
SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
diff --git a/sal/qa/rtl/cipher/makefile.mk b/sal/qa/rtl/cipher/makefile.mk
index 15639f2..fd95355 100644
--- a/sal/qa/rtl/cipher/makefile.mk
+++ b/sal/qa/rtl/cipher/makefile.mk
@@ -46,8 +46,6 @@ CXXFLAGS+= $(LFS_CFLAGS)
CFLAGSCXX += $(CPPUNIT_CFLAGS)
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl
SHL1OBJS= \
$(SLO)$/rtl_cipher.obj
@@ -60,12 +58,9 @@ SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
# DEF2EXPORTFILE= export.exp
SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
-# auto generated Target:joblist
-# END ------------------------------------------------------------------
#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
diff --git a/sal/qa/rtl/crc32/makefile.mk b/sal/qa/rtl/crc32/makefile.mk
index c868227..3820a8c 100755
--- a/sal/qa/rtl/crc32/makefile.mk
+++ b/sal/qa/rtl/crc32/makefile.mk
@@ -44,8 +44,6 @@ CXXFLAGS+= $(LFS_CFLAGS)
CFLAGSCXX += $(CPPUNIT_CFLAGS)
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:jobfile by codegen.pl
SHL1OBJS= \
$(SLO)$/rtl_crc32.obj
@@ -58,12 +56,9 @@ SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
# DEF1EXPORTFILE= export.exp
SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
-# auto generated Target:jobfile
-# END ------------------------------------------------------------------
#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
diff --git a/sal/qa/rtl/locale/makefile.mk b/sal/qa/rtl/locale/makefile.mk
index 984cf1a..0d1c8f8 100644
--- a/sal/qa/rtl/locale/makefile.mk
+++ b/sal/qa/rtl/locale/makefile.mk
@@ -44,8 +44,6 @@ CXXFLAGS+= $(LFS_CFLAGS)
CFLAGSCXX += $(CPPUNIT_CFLAGS)
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:locale by codegen.pl
SHL1OBJS= \
$(SLO)$/rtl_locale.obj
@@ -58,13 +56,9 @@ SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
# DEF1EXPORTFILE= export.exp
SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
-# auto generated Target:locale
-# END ------------------------------------------------------------------
-
#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
diff --git a/sal/qa/static/makefile.mk b/sal/qa/static/makefile.mk
index 0762e73..71c3085 100644
--- a/sal/qa/static/makefile.mk
+++ b/sal/qa/static/makefile.mk
@@ -54,7 +54,13 @@ APP1LIBS += \
$(SLB)/qa_ostringbuffer.lib \
$(SLB)/qa_osl_condition.lib \
$(SLB)/qa_osl_file.lib \
- $(SLB)/qa_osl_security.lib
+ $(SLB)/qa_osl_security.lib \
+ $(SLB)/qa_rtl_alloc.lib \
+ $(SLB)/qa_rtl_cipher.lib \
+ $(SLB)/qa_rtl_crc32.lib \
+ $(SLB)/qa_rtl_doublelock.lib \
+ $(SLB)/qa_rtl_locale.lib \
+ $(SLB)/qa_sal.lib
APP1STDLIBS = $(CPPUNITLIB) $(SALLIB)
APP1TARGET = $(TARGET)
diff --git a/sal/qa/static/sal_cppunittester_all.cxx b/sal/qa/static/sal_cppunittester_all.cxx
index b5fb89b..4c3d942 100644
--- a/sal/qa/static/sal_cppunittester_all.cxx
+++ b/sal/qa/static/sal_cppunittester_all.cxx
@@ -119,7 +119,13 @@ extern "C" CppUnitTestPlugIn *cppunitTest_qa_ByteSequence(void),
*cppunitTest_qa_osl_File(void),
*cppunitTest_tcwf(void),
*cppunitTest_osl_old_test_file(void),
- *cppunitTest_qa_osl_security(void);
+ *cppunitTest_qa_osl_security(void),
+ *cppunitTest_qa_rtl_alloc(void),
+ *cppunitTest_qa_rtl_cipher(void),
+ *cppunitTest_qa_rtl_crc32(void),
+ *cppunitTest_qa_rtl_doublelock(void),
+ *cppunitTest_qa_rtl_locale(void),
+ *cppunitTest_qa_sal(void);
SAL_IMPLEMENT_MAIN() {
TestPlugInSignature plugs[] = {
@@ -130,6 +136,12 @@ SAL_IMPLEMENT_MAIN() {
cppunitTest_tcwf,
cppunitTest_osl_old_test_file,
cppunitTest_qa_osl_security,
+ cppunitTest_qa_rtl_alloc,
+ cppunitTest_qa_rtl_cipher,
+ cppunitTest_qa_rtl_crc32,
+ cppunitTest_qa_rtl_doublelock,
+ cppunitTest_qa_rtl_locale,
+ cppunitTest_qa_sal,
NULL
};
CppUnit::TestResult result;
commit 0e64fa4af71458361e20f7fe65132599fe17aa4e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jul 14 12:26:20 2011 +0300
Use MSVC options only with MSVC
diff --git a/sal/qa/osl/process/makefile.mk b/sal/qa/osl/process/makefile.mk
index cf78cd5..73360cb 100644
--- a/sal/qa/osl/process/makefile.mk
+++ b/sal/qa/osl/process/makefile.mk
@@ -38,10 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl
-
-.IF "$(GUI)" == "WNT"
+.IF "$(COM)" == "MSC"
CFLAGS+=/Ob1
.ENDIF
@@ -52,8 +49,6 @@ SHL1IMPLIB=i$(SHL1TARGET)
DEF1NAME=$(SHL1TARGET)
SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-# END ------------------------------------------------------------------
-
SHL2OBJS=$(SLO)$/osl_process.obj
SHL2TARGET=osl_process
SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
@@ -61,8 +56,6 @@ SHL2IMPLIB=i$(SHL2TARGET)
DEF2NAME=$(SHL2TARGET)
SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
-# END ------------------------------------------------------------------
-
OBJ3FILES=$(OBJ)$/osl_process_child.obj
APP3TARGET=osl_process_child
APP3OBJS=$(OBJ3FILES)
@@ -73,8 +66,6 @@ SHL2DEPN=$(APP3TARGETN) \
$(BIN)/batch.bat
#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-
SLOFILES=$(SHL1OBJS) $(SHL2OBJS)
# --- Targets ------------------------------------------------------
diff --git a/sal/qa/rtl/doublelock/makefile.mk b/sal/qa/rtl/doublelock/makefile.mk
index 214d8cb..a1d0356 100644
--- a/sal/qa/rtl/doublelock/makefile.mk
+++ b/sal/qa/rtl/doublelock/makefile.mk
@@ -44,10 +44,7 @@ CXXFLAGS+= $(LFS_CFLAGS)
CFLAGSCXX += $(CPPUNIT_CFLAGS)
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl
-
-.IF "$(GUI)" == "WNT"
+.IF "$(COM)" == "MSC"
CFLAGS+=/Ob1
.ENDIF
@@ -61,11 +58,7 @@ SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-# END ------------------------------------------------------------------
-
#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-
SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
commit 7abd69d6b4a0b78437704d64a8de40675b1e2f06
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jul 14 12:25:37 2011 +0300
No point building xml2cmp when cross-compiling
diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index c0e6a8a..8222001 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -1,4 +1,4 @@
-sa sal : xml2cmp external BOOST:boost CPPUNIT:cppunit NULL
+sa sal : NATIVE:xml2cmp external BOOST:boost CPPUNIT:cppunit NULL
sa sal usr1 - all sa_mkout NULL
sa sal\inc nmake - all sa_inc NULL
sa sal\typesconfig nmake - all sa_tc sa_inc NULL
commit 94a75a188cbe9c19655ba6d4f217c1b89dca1e34
Author: Miklos Vajna <vmiklos at frugalware.org>
Date: Wed Jul 13 23:33:26 2011 +0200
Remove add.diff
Probably it was added accidently.
diff --git a/offapi/add.diff b/offapi/add.diff
deleted file mode 100644
index f058773..0000000
--- a/offapi/add.diff
+++ /dev/null
@@ -1,1078 +0,0 @@
-diff --git a/offapi/Package_offapi_idl.mk b/offapi/Package_offapi_idl.mk
-new file mode 100644
---- /dev/null
-+++ b/offapi/Package_offapi_idl.mk
-@@ -0,0 +1,29 @@
-+#*************************************************************************
-+#
-+# 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.
-+#
-+#*************************************************************************
-+
-+$(eval $(call gb_UnoApiTarget_autopackage_idl,offapi))
-+
-diff --git a/offapi/Package_offapi_inc.mk b/offapi/Package_offapi_inc.mk
-new file mode 100644
---- /dev/null
-+++ b/offapi/Package_offapi_inc.mk
-@@ -0,0 +1,29 @@
-+#*************************************************************************
-+#
-+# 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.
-+#
-+#*************************************************************************
-+
-+$(eval $(call gb_UnoApiTarget_autopackage_inc,offapi))
-+
-diff --git a/offapi/UnoApi_types.mk b/offapi/UnoApi_types.mk
-new file mode 100644
---- /dev/null
-+++ b/offapi/UnoApi_types.mk
-@@ -0,0 +1,36 @@
-+#*************************************************************************
-+#
-+# 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.
-+#
-+#*************************************************************************
-+
-+$(eval $(call gb_UnoApiTarget_UnoApiTarget,types))
-+
-+$(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,types,\
-+ udkapi \
-+ offapi \
-+))
-+
-+
-+# vim: set noet sw=4 ts=4:
-diff --git a/offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl b/offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl
-new file mode 100644
---- /dev/null
-+++ b/offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl
-@@ -0,0 +1,55 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef __com_sun_star_drawing_XSlidePreviewCacheListener_idl__
-+#define __com_sun_star_drawing_XSlidePreviewCacheListener_idl__
-+
-+#ifndef __com_sun_star_uno_XInterface_idl__
-+#include <com/sun/star/uno/XInterface.idl>
-+#endif
-+
-+module com { module sun { module star { module drawing {
-+
-+/** Listener for asynchronous preview creations. Called when a slide
-+ preview has been created that was previously requested via a call to
-+ <method>XSlidePreviewCache::getSlidePreview()</method>. The
-+ implementor may then call <method>getSlidePreview()</method> a second
-+ time to get the up-to-date version of the preview.
-+*/
-+interface XSlidePreviewCacheListener
-+{
-+ /** Called by a <interface>XSlidePreviewCache</interface> object when a
-+ preview has been created for the slide with the given index.
-+ @param nSlideIndex
-+ The index of the slide for which a new preview has been created.
-+ */
-+ void notifyPreviewCreation ([in] long nSlideIndex);
-+};
-+
-+}; }; }; }; // ::com::sun::star::drawing
-+
-+#endif
-diff --git a/offapi/com/sun/star/drawing/XSlideSorterBase.idl b/offapi/com/sun/star/drawing/XSlideSorterBase.idl
-new file mode 100644
---- /dev/null
-+++ b/offapi/com/sun/star/drawing/XSlideSorterBase.idl
-@@ -0,0 +1,137 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef __com_sun_star_drawing_XSlideSorterBase_idl__
-+#define __com_sun_star_drawing_XSlideSorterBase_idl__
-+
-+#ifndef __com_sun_star_drawing_framework_XView_idl__
-+#include <com/sun/star/drawing/framework/XView.idl>
-+#endif
-+#ifndef __com_sun_star_drawing_XDrawView_idl__
-+#include <com/sun/star/drawing/XDrawView.idl>
-+#endif
-+#ifndef __com_sun_star_awt_XWindow_idl__
-+#include <com/sun/star/awt/XWindow.idl>
-+#endif
-+#ifndef __com_sun_star_container_XIndexAccess_idl__
-+#include <com/sun/star/container/XIndexAccess.idl>
-+#endif
-+#ifndef __com_sun_star_frame_XController_idl__
-+#include <com/sun/star/frame/XController.idl>
-+#endif
-+#ifndef __com_sun_star_util_Color_idl__
-+#include <com/sun/star/util/Color.idl>
-+#endif
-+
-+module com { module sun { module star { module drawing {
-+
-+/** This interface exists only because services do not directly support
-+ multiple inheritance and attributes.
-+ <p>It provides the interfaces and attributes that every object that
-+ implements the <type>SlideSorter</type> service.</p>
-+*/
-+interface XSlideSorterBase
-+{
-+ /** This interface is included to mark a <type>SlideSorter</type> object
-+ as view of the drawing framework and to provide a
-+ <type>ResourceId</type>.
-+ */
-+ interface ::com::sun::star::drawing::framework::XView;
-+
-+ /** The <type>XDrawView</type> interface is included to provide access
-+ to the current slide (especially write access).
-+ */
-+ interface ::com::sun::star::drawing::XDrawView;
-+
-+ /** The set of slides that are displayed by the implementing object.
-+ <p>The default value is the set of all slides of the document for
-+ which a slide sorter is created.</p>
-+ */
-+ [attribute] ::com::sun::star::container::XIndexAccess DocumentSlides;
-+
-+ /** Set this flag to <TRUE/> in order to have the current slide
-+ highlighted.
-+ <p>The default value is <FALSE/>.</p>
-+ */
-+ [attribute] boolean IsHighlightCurrentSlide;
-+
-+ /** Set this flag to <TRUE/> in order to visualize the selection of
-+ slides (typically a bold frame around the selected slides).
-+ <p>The default value is <TRUE/>.</p>
-+ */
-+ [attribute] boolean IsShowSelection;
-+
-+ /** Set this flag to <TRUE/> to visualize to where the focus is by
-+ showing a dotted rectangle around the focused slide.
-+ <p>The default value is <TRUE/>.</p>
-+ */
-+ [attribute] boolean IsShowFocus;
-+
-+ /** When this flag has the value <TRUE/> then every time the current
-+ slide is changed the visual area is shifted so that the new current
-+ slide is display in the center of the slide sorter window.
-+ <p>It is not always possible to move the current slide into the
-+ exact center of the window, for example when slides are located near
-+ the start or end of a document.</p>
-+ <p>The default value is <FALSE/>.
-+ */
-+ [attribute] boolean IsCenterSelection;
-+
-+ /** This flag controls whether updates of previews are created during
-+ full screen presentations (<FALSE/>) or not (<TRUE/>). The
-+ suspension of preview creations is an optimization for not slowing
-+ down a running presentation.
-+ <p>The default value is <TRUE/>.</p>
-+ */
-+ [attribute] boolean IsSuspendPreviewUpdatesDuringFullScreenPresentation;
-+
-+ /** The orientation of a slide sorter can be either vertical (<TRUE/>)
-+ or horizontal (<FALSE/>).
-+ */
-+ [attribute] boolean IsOrientationVertical;
-+
-+ /** This flag is a hint to make scrolling look smooth.
-+ */
-+ [attribute] boolean IsSmoothScrolling;
-+
-+ [attribute] ::com::sun::star::util::Color BackgroundColor;
-+ [attribute] ::com::sun::star::util::Color TextColor;
-+ [attribute] ::com::sun::star::util::Color SelectionColor;
-+ [attribute] ::com::sun::star::util::Color HighlightColor;
-+
-+ /** This flag controls whether the model can be modified by using
-+ keyboard or mouse.
-+ <p>The default value is <TRUE/>.</p>
-+ */
-+ [attribute] boolean IsUIReadOnly;
-+};
-+
-+
-+
-+}; }; }; };
-+
-+#endif
-diff --git a/offapi/com/sun/star/drawing/framework/BorderType.idl b/offapi/com/sun/star/drawing/framework/BorderType.idl
-new file mode 100644
---- /dev/null
-+++ b/offapi/com/sun/star/drawing/framework/BorderType.idl
-@@ -0,0 +1,46 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef __com_sun_star_drawing_framework_BorderType_idl__
-+#define __com_sun_star_drawing_framework_BorderType_idl__
-+
-+
-+module com { module sun { module star { module drawing { module framework {
-+
-+/** See XPaneBorderPainter and its addBorder() and removeBorder() methods
-+ for an explanation of the border type and its values.
-+*/
-+enum BorderType
-+{
-+ INNER_BORDER,
-+ OUTER_BORDER,
-+ TOTAL_BORDER
-+};
-+
-+}; }; }; }; }; // ::com::sun::star::drawing::framework
-+
-+#endif
-diff --git a/offapi/com/sun/star/frame/UntitledNumbersConst.idl b/offapi/com/sun/star/frame/UntitledNumbersConst.idl
-new file mode 100644
---- /dev/null
-+++ b/offapi/com/sun/star/frame/UntitledNumbersConst.idl
-@@ -0,0 +1,39 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __com_sun_star_frame_UntitledNumbersConst_idl__
-+#define __com_sun_star_frame_UntitledNumbersConst_idl__
-+
-+ module com { module sun { module star { module frame {
-+
-+constants UntitledNumbersConst
-+{
-+ const long INVALID_NUMBER = 0;
-+};
-+
-+}; }; }; };
-+
-+#endif
-diff --git a/offapi/com/sun/star/rendering/ARGBColor.idl b/offapi/com/sun/star/rendering/ARGBColor.idl
-new file mode 100644
---- /dev/null
-+++ b/offapi/com/sun/star/rendering/ARGBColor.idl
-@@ -0,0 +1,55 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __com_sun_star_rendering_ARGBColor_idl__
-+#define __com_sun_star_rendering_ARGBColor_idl__
-+
-+#ifndef __com_sun_star_rendering_ColorComponent_idl__
-+#include <com/sun/star/rendering/ColorComponent.idl>
-+#endif
-+
-+module com { module sun { module star { module rendering {
-+
-+/// ARGB color quad
-+struct ARGBColor
-+{
-+ /** Alpha component.<p>
-+
-+ Valid range is [0,1.0], with 0.0 denoting fully transparent,
-+ and 1.0 fully opaque.
-+ */
-+ ColorComponent Alpha;
-+ /// Red component. Valid range is [0,1.0]
-+ ColorComponent Red;
-+ /// Green component. Valid range is [0,1.0]
-+ ColorComponent Green;
-+ /// Blue component. Valid range is [0,1.0]
-+ ColorComponent Blue;
-+};
-+
-+}; }; }; };
-+
-+#endif
-diff --git a/offapi/com/sun/star/rendering/BitmapCanvas.idl b/offapi/com/sun/star/rendering/BitmapCanvas.idl
-new file mode 100644
---- /dev/null
-+++ b/offapi/com/sun/star/rendering/BitmapCanvas.idl
-@@ -0,0 +1,57 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __com_sun_star_rendering_BitmapCanvas_idl__
-+#define __com_sun_star_rendering_BitmapCanvas_idl__
-+
-+#ifndef __com_sun_star_rendering_XBitmap_idl__
-+#include <com/sun/star/rendering/XBitmap.idl>
-+#endif
-+#ifndef __com_sun_star_rendering_XBitmapCanvas_idl__
-+#include <com/sun/star/rendering/XBitmapCanvas.idl>
-+#endif
-+
-+
-+module com { module sun { module star { module rendering {
-+
-+// TODO: Multiple-inheritance interfaces
-+
-+/** This service provides the interfaces for a <type>XBitmapCanvas</type>
-+ */
-+service BitmapCanvas
-+{
-+ /** Canvas interface, to issue rendering operations.
-+ */
-+ interface XBitmapCanvas;
-+
-+ /** Bitmap interface, to directly manipulate the pixel.
-+ */
-+ interface XBitmap;
-+};
-+
-+}; }; }; };
-+
-+#endif
-diff --git a/offapi/com/sun/star/rendering/Canvas.idl b/offapi/com/sun/star/rendering/Canvas.idl
-new file mode 100644
---- /dev/null
-+++ b/offapi/com/sun/star/rendering/Canvas.idl
-@@ -0,0 +1,42 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __com_sun_star_rendering_Canvas_idl__
-+#define __com_sun_star_rendering_Canvas_idl__
-+
-+#ifndef __com_sun_star_rendering_XCanvas_idl__
-+#include <com/sun/star/rendering/XCanvas.idl>
-+#endif
-+
-+
-+module com { module sun { module star { module rendering {
-+
-+/// Service providing an <type>XCanvas</type> interface
-+service Canvas: XCanvas;
-+
-+}; }; }; };
-+
-+#endif
-diff --git a/offapi/com/sun/star/rendering/Color.idl b/offapi/com/sun/star/rendering/Color.idl
-new file mode 100644
---- /dev/null
-+++ b/offapi/com/sun/star/rendering/Color.idl
-@@ -0,0 +1,41 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __com_sun_star_rendering_Color_idl__
-+#define __com_sun_star_rendering_Color_idl__
-+
-+#ifndef __com_sun_star_rendering_ColorComponent_idl__
-+#include <com/sun/star/rendering/ColorComponent.idl>
-+#endif
-+
-+module com { module sun { module star { module rendering {
-+
-+/// Shorthand for the device-dependent color components, and easier to read
-+typedef sequence<ColorComponent> Color;
-+
-+}; }; }; };
-+
-+#endif
-diff --git a/offapi/com/sun/star/rendering/ColorComponent.idl b/offapi/com/sun/star/rendering/ColorComponent.idl
-new file mode 100644
---- /dev/null
-+++ b/offapi/com/sun/star/rendering/ColorComponent.idl
-@@ -0,0 +1,38 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef __com_sun_star_rendering_ColorComponent_idl__
-+#define __com_sun_star_rendering_ColorComponent_idl__
-+
-+module com { module sun { module star { module rendering {
-+
-+/// Shorthand for the device-dependent color components, and easier to read
-+typedef double ColorComponent;
-+
-+}; }; }; };
-+
-+#endif
-diff --git a/offapi/com/sun/star/rendering/RGBColor.idl b/offapi/com/sun/star/rendering/RGBColor.idl
-new file mode 100644
---- /dev/null
-+++ b/offapi/com/sun/star/rendering/RGBColor.idl
-@@ -0,0 +1,49 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __com_sun_star_rendering_RGBColor_idl__
-+#define __com_sun_star_rendering_RGBColor_idl__
-+
-+#ifndef __com_sun_star_rendering_ColorComponent_idl__
-+#include <com/sun/star/rendering/ColorComponent.idl>
-+#endif
-+
-+module com { module sun { module star { module rendering {
-+
-+/// RGB color triplet
-+struct RGBColor
-+{
-+ /// Red component. Valid range is [0,1.0]
-+ ColorComponent Red;
-+ /// Green component. Valid range is [0,1.0]
-+ ColorComponent Green;
-+ /// Blue component. Valid range is [0,1.0]
-+ ColorComponent Blue;
-+};
-+
-+}; }; }; };
-+
-+#endif
-diff --git a/offapi/com/sun/star/util/SearchAlgorithms.idl b/offapi/com/sun/star/util/SearchAlgorithms.idl
-new file mode 100644
---- /dev/null
-+++ b/offapi/com/sun/star/util/SearchAlgorithms.idl
-@@ -0,0 +1,50 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef __com_sun_star_lang_SearchAlgorithms_idl__
-+#define __com_sun_star_lang_SearchAlgorithms_idl__
-+
-+
-+//=============================================================================
-+
-+module com { module sun { module star { module util {
-+
-+//=============================================================================
-+
-+
-+published enum SearchAlgorithms {
-+ ABSOLUTE, // "normal" a kind of Boyer-Moore
-+ REGEXP, // regular expression
-+ APPROXIMATE // Leveinstein distance
-+};
-+
-+
-+//=============================================================================
-+}; }; }; };
-+
-+#endif
-+
-diff --git a/offapi/com/sun/star/util/SearchFlags.idl b/offapi/com/sun/star/util/SearchFlags.idl
-new file mode 100644
---- /dev/null
-+++ b/offapi/com/sun/star/util/SearchFlags.idl
-@@ -0,0 +1,94 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef __com_sun_star_lang_SearchFlags_idl__
-+#define __com_sun_star_lang_SearchFlags_idl__
-+
-+
-+//=============================================================================
-+
-+module com { module sun { module star { module util {
-+
-+//=============================================================================
-+
-+
-+
-+published constants SearchFlags
-+{
-+ //Flag for all search methods
-+
-+ /**
-+ @deprecated : the constant ALL_IGNORE_CASE is never supported -
-+ it must use the transliteration flags of
-+ the SearchOptions.
-+ <p>@see TransliterationModulesNew
-+ */
-+ const long ALL_IGNORE_CASE = 0x00000001;
-+
-+ /// Flag for normal (Boyer-Moore) search
-+ const long NORM_WORD_ONLY = 0x00000010;
-+
-+ /// Flag for "regular expression" search / interpret as extended regular expression
-+ const long REG_EXTENDED = 0x00000100;
-+ /** Flag for "regular expression" search / No replace, i.e., avoid sub regular
-+ expresions, return true/false to match
-+
-+<!-- JRH: Check this for sense of the expression. -->
-+ */
-+ const long REG_NOSUB = 0x00000200;
-+
-+ /// Flag for "regular expression" search / Special new line treatment
-+ const long REG_NEWLINE = 0x00000400;
-+
-+ /** A NEWLINE character in string will not be matched by a period outside bracket
-+ expression or by any form of a non matching list.
-+ A circumflex (^) in pattern when used to specify expression anchoring
-+<!-- JRH: anhoring to anchoring. -->
-+ will match the zero length string immediately after a newline in string,
-+ regardless of the setting of REG_NOTBOL
-+ A dollar-sign ($) in pattern when used to specify expression anchoring,
-+ will match zero-length string immediately before a new line in string,
-+ regardless of the setting of REG_NOTEOL
-+*/
-+ const long REG_NOT_BEGINOFLINE = 0x00000800;
-+
-+ /** The first character in the string is not the beginning of the line therefore ^ will not
-+ match with first character of the string
-+ */
-+ const long REG_NOT_ENDOFLINE = 0x00001000;
-+
-+
-+ /// Flags for "Weight Levenshtein-Distance" search
-+ const long LEV_RELAXED = 0x00010000;
-+};
-+
-+
-+//=============================================================================
-+}; }; }; };
-+
-+#endif
-+
-diff --git a/offapi/com/sun/star/util/SearchOptions.idl b/offapi/com/sun/star/util/SearchOptions.idl
-new file mode 100644
---- /dev/null
-+++ b/offapi/com/sun/star/util/SearchOptions.idl
-@@ -0,0 +1,85 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef __com_sun_star_lang_SearchOptions_idl__
-+#define __com_sun_star_lang_SearchOptions_idl__
-+
-+
-+#include <com/sun/star/lang/Locale.idl>
-+#include <com/sun/star/uno/XInterface.idl>
-+#include <com/sun/star/util/SearchAlgorithms.idl>
-+
-+//=============================================================================
-+
-+module com { module sun { module star { module util {
-+
-+//=============================================================================
-+
-+
-+published struct SearchOptions {
-+ //-------------------------------------------------------------------------
-+ /// search type, can be: ABSOLUTE, REGEXP, APPROXIMATE
-+ SearchAlgorithms algorithmType;
-+
-+ /** some flags - can be mixed
-+
-+ @see SearchFlags
-+ */
-+ long searchFlag;
-+
-+ /// the search text
-+ string searchString;
-+
-+ /** the replace text
-+ (is for optional replacing - SearchOption is only the data container for it)*/
-+ string replaceString;
-+
-+ /// this is the language for case insensitive search
-+ ::com::sun::star::lang::Locale Locale;
-+
-+ /** this many characters can be different between the found and search word
-+ in a "Weight Levenshtein-Distance"*/
-+ long changedChars;
-+
-+ /** this many characters can be missed in the found word
-+ in a "Weight Levenshtein-Distance"*/
-+ long deletedChars;
-+
-+ /// this many characters can be additional in the found word in a "Weight Levenshtein-Distance"
-+ long insertedChars;
-+
-+ /** asian flags for the transliteration. Same meaning as the enum of TransliteratorModule
-+
-+ @see com/sun/star/i18n/XTransliteration.idl
-+ */
-+ long transliterateFlags;
-+};
-+
-+}; }; }; };
-+
-+#endif
-+
-diff --git a/offapi/com/sun/star/util/SearchResult.idl b/offapi/com/sun/star/util/SearchResult.idl
-new file mode 100644
---- /dev/null
-+++ b/offapi/com/sun/star/util/SearchResult.idl
-@@ -0,0 +1,66 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef __com_sun_star_lang_SearchResult_idl__
-+#define __com_sun_star_lang_SearchResult_idl__
-+
-+
-+//=============================================================================
-+
-+module com { module sun { module star { module util {
-+
-+//=============================================================================
-+
-+
-+published struct SearchResult {
-+ //-------------------------------------------------------------------------
-+ /** Number of subexpressions,
-+ if it is 0, then no match found; this value is 1 for ABSOLUTE and APPROXIMATE match.
-+ The start and endOffset are always dependent on the search direction.
-+ For example:
-+ if you search "X" in the text "-X-" the offset are:
-+ for forward: start = 1, end = 2
-+ for backward: start = 2, end = 1
-+ Forward, the startOffset is inclusive, the endOffset exclusive.
-+ Backward, the startOffset is exclusive, the endOffset inclusive.
-+
-+ For regular expressions it can be greater than 1.
-+ If the value is 1, startoffset[0] and endoffset[0] points to the matching sub string
-+ if value is > 1, still startoffset[0] and endoffset[0] points to the matching substring for whole regular expression
-+ startoffset[i] and endoffset[i] points to the matching substring of i th matching substring.
-+ */
-+ long subRegExpressions;
-+ sequence<long> startOffset; // inclusive
-+ sequence<long> endOffset; // exclusive
-+};
-+
-+
-+//=============================================================================
-+}; }; }; };
-+
-+#endif
-+
-diff --git a/offapi/prj/makefile.mk b/offapi/prj/makefile.mk
-new file mode 100644
---- /dev/null
-+++ b/offapi/prj/makefile.mk
-@@ -0,0 +1,40 @@
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..
-+TARGET=prj
-+
-+.INCLUDE : settings.mk
-+
-+.IF "$(VERBOSE)"!=""
-+VERBOSEFLAG :=
-+.ELSE
-+VERBOSEFLAG := -s
-+.ENDIF
-+
-+all:
-+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
commit db7a5d3575951e4ffbec9cd7db60084af4dffe56
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 13 00:48:23 2011 +0100
unused OUString_to_std_string
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 3a34783..573a122 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -80,14 +80,6 @@
const rtl::OUString EXECUTABLE_NAME (RTL_CONSTASCII_USTRINGPARAM("osl_process_child"));
#endif
-
-//########################################
-std::string OUString_to_std_string(const rtl::OUString& oustr)
-{
- rtl::OString ostr = rtl::OUStringToOString(oustr, osl_getThreadTextEncoding());
- return std::string(ostr.getStr());
-}
-
//########################################
using namespace osl;
commit b30fd99cd69d39e2b9290be458894fe3b9e7c896
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Jul 12 16:30:06 2011 +0200
Remove component_getImplementationEnvironment
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index ebaf3d1..9421371 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -225,11 +225,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
pImplName, pServiceManager, pRegistryKey, services);
}
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
-component_getImplementationEnvironment(
- char const ** ppEnvTypeName, uno_Environment **)
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx
index f89e9f3..f0d4507 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -510,14 +510,6 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance(
return static_cast< cppu::OWeakObject * >(new Service(context));
}
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- char const ** envTypeName, uno_Environment **)
-{
- if (envTypeName != 0) {
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
- }
-}
-
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const * implName,
void * serviceManager, void *) {
void * p = 0;
diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx
index 78f7483..8f68336 100644
--- a/bridges/test/java_uno/equals/testequals.cxx
+++ b/bridges/test/java_uno/equals/testequals.cxx
@@ -162,12 +162,6 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance(
return static_cast< cppu::OWeakObject * >(new Service(rContext));
}
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- sal_Char const ** pEnvTypeName, uno_Environment **)
-{
- *pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * pImplName,
void * pServiceManager, void *)
{
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
index cab27e5..a16aebf 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
@@ -170,10 +170,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
implName, serviceManager, registryKey, entries);
}
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- char const ** envTypeName, uno_Environment **)
-{
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
index 0a7f0ae..dc5745e 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
@@ -134,10 +134,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
implName, serviceManager, registryKey, entries);
}
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- char const ** envTypeName, uno_Environment **)
-{
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/java_uno/nativethreadpool/version.map b/bridges/test/java_uno/nativethreadpool/version.map
index 39c961b..85cba00 100644
--- a/bridges/test/java_uno/nativethreadpool/version.map
+++ b/bridges/test/java_uno/nativethreadpool/version.map
@@ -28,8 +28,6 @@
UDK_3_0_0 {
global:
component_getFactory;
- component_getImplementationEnvironment;
-
local:
*;
};
diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
index 100c530..9f72fb1 100644
--- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
@@ -423,11 +423,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL mixin_component_getFactory(
implName, serviceManager, registryKey, entries);
}
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL mixin_component_getImplementationEnvironment(
- char const ** envTypeName, uno_Environment **)
-{
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx
index 3779fb7..735f7ee 100644
--- a/cppuhelper/test/cfg_test.cxx
+++ b/cppuhelper/test/cfg_test.cxx
@@ -227,12 +227,6 @@ static struct ImplementationEntry g_entries[] =
extern "C"
{
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
sal_Bool SAL_CALL component_writeInfo(
void * pServiceManager, void * pRegistryKey )
{
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index 229731d..c157bc1 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -507,12 +507,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx
index 79a06d7..6ea4d3f 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -305,12 +305,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index 65770df..8d1c1a6 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -352,12 +352,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index 67eea93..4d86512 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -264,12 +264,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx
index c0513cd..283439f 100644
--- a/io/source/stm/factreg.cxx
+++ b/io/source/stm/factreg.cxx
@@ -105,12 +105,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/io/test/stm/exports.dxp b/io/test/stm/exports.dxp
index ce95ae0..8621486 100644
--- a/io/test/stm/exports.dxp
+++ b/io/test/stm/exports.dxp
@@ -1,3 +1,2 @@
-component_getImplementationEnvironment
component_getFactory
-component_writeInfo
\ No newline at end of file
+component_writeInfo
diff --git a/io/test/stm/testfactreg.cxx b/io/test/stm/testfactreg.cxx
index d69c945..804b563 100644
--- a/io/test/stm/testfactreg.cxx
+++ b/io/test/stm/testfactreg.cxx
@@ -47,13 +47,6 @@ using namespace ::com::sun::star::lang;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-
sal_Bool SAL_CALL component_writeInfo(
void * pServiceManager, void * pRegistryKey )
{
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index b5ef002..4893a74 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -245,13 +245,6 @@ static struct cppu::ImplementationEntry g_entries[] =
extern "C"
{
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/remotebridges/examples/exports.dxp b/remotebridges/examples/exports.dxp
index 9630d7e..51703a0 100644
--- a/remotebridges/examples/exports.dxp
+++ b/remotebridges/examples/exports.dxp
@@ -1,3 +1,2 @@
-component_getImplementationEnvironment
component_writeInfo
component_getFactory
diff --git a/remotebridges/examples/officeclient.cxx b/remotebridges/examples/officeclient.cxx
index 9679936..9341fc4 100644
--- a/remotebridges/examples/officeclient.cxx
+++ b/remotebridges/examples/officeclient.cxx
@@ -278,12 +278,6 @@ using namespace remotebridges_officeclient;
extern "C"
{
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
sal_Bool SAL_CALL component_writeInfo(
void * pServiceManager, void * pRegistryKey )
{
diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index e9af6ae..d3b2f0c 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -215,12 +215,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/sal/test/unloading/exports.dxp b/sal/test/unloading/exports.dxp
index 82adf8e..9990690 100644
--- a/sal/test/unloading/exports.dxp
+++ b/sal/test/unloading/exports.dxp
@@ -1,4 +1,3 @@
-component_getImplementationEnvironment
component_writeInfo
component_getFactory
component_canUnload
diff --git a/sal/test/unloading/samplelib1.cxx b/sal/test/unloading/samplelib1.cxx
index 5d6e1a9..a7b81a5 100644
--- a/sal/test/unloading/samplelib1.cxx
+++ b/sal/test/unloading/samplelib1.cxx
@@ -136,10 +136,6 @@ static Reference<XInterface> SAL_CALL test4_createInstance(const Reference<XMult
// Standard UNO library interface -------------------------------------------------
extern "C" {
- SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv){
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
- }
-
sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void * pRegistryKey) throw()
{
if (pRegistryKey)
diff --git a/sal/test/unloading/samplelib2.cxx b/sal/test/unloading/samplelib2.cxx
index 40d3768..c7a20f7 100644
--- a/sal/test/unloading/samplelib2.cxx
+++ b/sal/test/unloading/samplelib2.cxx
@@ -126,10 +126,6 @@ static Reference<XInterface> SAL_CALL test23_createInstance(const Reference<XMul
// Standard UNO library interface -------------------------------------------------
extern "C" {
- SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv){
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
- }
-
sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void * pRegistryKey) throw()
{
if (pRegistryKey)
diff --git a/stoc/source/bootstrap/services.cxx b/stoc/source/bootstrap/services.cxx
index f529aa6..32f7a40 100644
--- a/stoc/source/bootstrap/services.cxx
+++ b/stoc/source/bootstrap/services.cxx
@@ -126,12 +126,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index 29a4710..4d24247 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -481,12 +481,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index c5ee6c4..5ada829 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -3044,13 +3044,6 @@ Reference< XInterface > SAL_CALL ImplIntrospection_CreateInstance( const Referen
extern "C"
{
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * )
{
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index ca9731b..e5b05d0 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -1222,12 +1222,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index c315709..f011c13 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -991,13 +991,6 @@ sal_Bool SAL_CALL component_canUnload(
}
//==============================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//==============================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 22452ac..b28b766 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -445,15 +445,6 @@ static struct ImplementationEntry g_entries[] =
extern "C"
{
-// NOTE: component_canUnload is not exported, as the library cannot be unloaded.
-
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index abe67d9..93c21e1 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -609,12 +609,6 @@ private:
}
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(sal_Char const ** pEnvTypeName,
- uno_Environment **)
-{
- *pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * pImplName,
void * pServiceManager,
void * pRegistryKey)
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index 39e1528..c932695 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -213,12 +213,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index cc2d4a4..84833f3 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -521,12 +521,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
return g_moduleCount.canUnload( &g_moduleCount, pTime );
}
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/stoc/source/stocservices/stocservices.cxx b/stoc/source/stocservices/stocservices.cxx
index bd78940..0a9e96c 100644
--- a/stoc/source/stocservices/stocservices.cxx
+++ b/stoc/source/stocservices/stocservices.cxx
@@ -96,12 +96,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/stoc/test/excomp/excomp1.cxx b/stoc/test/excomp/excomp1.cxx
index 03c22f1..84c075d 100644
--- a/stoc/test/excomp/excomp1.cxx
+++ b/stoc/test/excomp/excomp1.cxx
@@ -155,12 +155,6 @@ Reference<XInterface> SAL_CALL ExampleComponent1_CreateInstance( const Reference
extern "C"
{
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
sal_Bool SAL_CALL component_writeInfo(
void * /* pServiceManager */ , void * pRegistryKey )
{
diff --git a/stoc/test/excomp/excomp2.cxx b/stoc/test/excomp/excomp2.cxx
index 43235ab..f9e84ea 100644
--- a/stoc/test/excomp/excomp2.cxx
+++ b/stoc/test/excomp/excomp2.cxx
@@ -226,12 +226,6 @@ Reference<XInterface> SAL_CALL ExampleComponent2_CreateInstance( const Reference
extern "C"
{
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
sal_Bool SAL_CALL component_writeInfo(
void * /* pServiceManager */, void * pRegistryKey )
{
diff --git a/stoc/test/excomp/exports.dxp b/stoc/test/excomp/exports.dxp
index 9630d7e..51703a0 100644
--- a/stoc/test/excomp/exports.dxp
+++ b/stoc/test/excomp/exports.dxp
@@ -1,3 +1,2 @@
-component_getImplementationEnvironment
component_writeInfo
component_getFactory
diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
index c833197..bf395f1 100644
--- a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
+++ b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
@@ -882,14 +882,6 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance(
return static_cast< cppu::OWeakObject * >(new Service(context));
}
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- char const ** envTypeName, uno_Environment **)
-{
- if (envTypeName != 0) {
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
- }
-}
-
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const * implName,
void * serviceManager, void *) {
void * p = 0;
diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx
index 694a678..81353ae 100644
--- a/stoc/test/tdmanager/testtdmanager.cxx
+++ b/stoc/test/tdmanager/testtdmanager.cxx
@@ -313,14 +313,6 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance(
return static_cast< cppu::OWeakObject * >(new Service(context));
}
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- char const ** envTypeName, uno_Environment **)
-{
- if (envTypeName != 0) {
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
- }
-}
-
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const * implName,
void * serviceManager, void *) {
void * p = 0;
diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx
index 22b6a00..a16c5e0 100644
--- a/stoc/test/testsmgr_cpnt.cxx
+++ b/stoc/test/testsmgr_cpnt.cxx
@@ -292,12 +292,6 @@ extern "C" void SAL_CALL test_ServiceManager()
extern "C"
{
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
sal_Bool SAL_CALL component_writeInfo(
void * /*pServiceManager*/, void * pRegistryKey )
{
diff --git a/stoc/test/testsmgr_cpnt.map b/stoc/test/testsmgr_cpnt.map
index ab5ed35..3cfb435 100644
--- a/stoc/test/testsmgr_cpnt.map
+++ b/stoc/test/testsmgr_cpnt.map
@@ -1,6 +1,5 @@
UDK_3_0_0 {
global:
- component_getImplementationEnvironment;
component_writeInfo;
component_getFactory;
test_ServiceManager;
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index ee2ca08..816c58e 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -265,9 +265,3 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
return ::cppu::component_getFactoryHelper(
implName, serviceManager, registryKey, entries);
}
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- char const ** envTypeName, ::uno_Environment **)
-{
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc
index 68fe22e..960760c 100644
--- a/ure/source/uretest/cppserver.cc
+++ b/ure/source/uretest/cppserver.cc
@@ -117,9 +117,3 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
return ::cppu::component_getFactoryHelper(
implName, serviceManager, registryKey, entries);
}
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- char const ** envTypeName, ::uno_Environment **)
-{
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc
index 9f2c40a..e138b8d 100644
--- a/ure/source/uretest/cpptest.cc
+++ b/ure/source/uretest/cpptest.cc
@@ -117,9 +117,3 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
return cppu::component_getFactoryHelper(
implName, serviceManager, registryKey, entries);
}
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- char const ** envTypeName, uno_Environment **)
-{
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
diff --git a/ure/source/uretest/version.map b/ure/source/uretest/version.map
index 7d30577..4f37658 100644
--- a/ure/source/uretest/version.map
+++ b/ure/source/uretest/version.map
@@ -28,7 +28,6 @@
UDK_3_0_0 {
global:
component_getFactory;
- component_getImplementationEnvironment;
component_writeInfo;
_ZTI*;
commit 6d8f44b0bb27d97d679d2a6f699a25048a905951
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon Jul 11 17:41:58 2011 +0100
Default to current language binding name, if not specified.
Signed-off-by: Michael Meeks <michael.meeks at novell.com>
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 1fb136a..a979454 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -270,16 +270,13 @@ static OUString makeComponentPath(
}
//==============================================================================
-static OUString getLibEnv(OUString const & aModulePath,
- oslModule lib,
- uno::Environment * pEnv,
+static OUString getLibEnv(oslModule lib,
+ uno::Environment * pEnv,
OUString * pSourceEnv_name,
uno::Environment const & cTargetEnv,
OUString const & cImplName = OUString(),
OUString const & rPrefix = OUString())
{
- OUString aExcMsg;
-
sal_Char const * pEnvTypeName = NULL;
OUString aGetEnvNameExt = rPrefix + OUSTR(COMPONENT_GETENVEXT);
@@ -300,15 +297,10 @@ static OUString getLibEnv(OUString const & aModulePath,
if (pGetImplEnv)
pGetImplEnv(&pEnvTypeName, (uno_Environment **)pEnv);
- else
- {
- aExcMsg = aModulePath;
- aExcMsg += OUSTR(": cannot get symbol: ");
- aExcMsg += aGetEnvName;
- aExcMsg += OUSTR("- nor: ");
- }
+ else // this symbol used to be mandatory, but is no longer
+ pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-
+
if (!pEnv->is() && pEnvTypeName)
{
*pSourceEnv_name = OUString::createFromAscii(pEnvTypeName);
@@ -326,12 +318,10 @@ static OUString getLibEnv(OUString const & aModulePath,
*pSourceEnv_name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":log"));
break;
}
- } while( nIndex != -1 );
+ } while( nIndex != -1 );
}
-
}
-
- return aExcMsg;
+ return OUString();
}
extern "C" {static void s_getFactory(va_list * pParam)
@@ -389,7 +379,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
OUString aEnvTypeName;
- OUString aExcMsg = getLibEnv(aModulePath, lib, &env, &aEnvTypeName, currentEnv, rImplName, rPrefix);
+ OUString aExcMsg = getLibEnv(lib, &env, &aEnvTypeName, currentEnv, rImplName, rPrefix);
if (!aExcMsg.getLength())
{
OUString aGetFactoryName = rPrefix + OUSTR(COMPONENT_GETFACTORY);
@@ -535,7 +525,7 @@ void SAL_CALL writeSharedLibComponentInfo(
uno::Environment env;
OUString aEnvTypeName;
- OUString aExcMsg = getLibEnv(aModulePath, lib, &env, &aEnvTypeName, currentEnv);
+ OUString aExcMsg = getLibEnv(lib, &env, &aEnvTypeName, currentEnv);
if (!aExcMsg.getLength())
{
OUString aWriteInfoName = OUSTR(COMPONENT_WRITEINFO);
commit 27a81bb077daa5491761762ac18d3970ce1a7bb2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 10 01:45:26 2011 +0100
unused methods
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.cxx b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
index a7e2dc7..f6c5bb3 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.cxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
@@ -194,42 +194,6 @@ sal_Char* createName( sal_Char* dst, const sal_Char* meth, sal_uInt32 cnt )
}
//------------------------------------------------------------------------
-// testing the method compareTo( const OString & aStr )
-//------------------------------------------------------------------------
-void makeComment( char *com, const char *str1, const char *str2,
- sal_Int32 sgn )
-{
- cpystr(com, str1);
- int str1Length = AStringLen( str1 );
- const char *sign = (sgn == 0) ? " == " : (sgn > 0) ? " > " : " < " ;
- cpystr(com + str1Length, sign);
- int signLength = AStringLen(sign);
- cpystr(com + str1Length + signLength, str2);
- com[str1Length + signLength + AStringLen(str2)] = 0;
-}
-
-//------------------------------------------------------------------------
-
-sal_uInt32 UStringLen( const sal_Unicode *pUStr )
-{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list