summaryrefslogtreecommitdiff
path: root/odk
AgeCommit message (Collapse)Author
2013-09-30API CHANGE: Remove osl_getEthernetAddress and osl/util.h .Arnaud Versini
Also move osl/util.c on Unix systems to osl/system.c. Change-Id: Ifff79d9f4f89ecbb4e0e1652b40ab46b7d569adf Reviewed-on: https://gerrit.libreoffice.org/6065 Tested-by: Arnaud Versini <arnaud.versini@libreoffice.org> Reviewed-by: Arnaud Versini <arnaud.versini@libreoffice.org>
2013-09-26typo fixes in commentsAndras Timar
Change-Id: Iaadec33715f8e0e0c6595c5e684606905274fdab
2013-09-25drop worthless _VECTOR_/_MAP_ header guardsCaolán McNamara
Change-Id: I54be19847b8fb609f0b08a528cc06dbae9f579d5
2013-09-23Fixes for cross-compilation on OS X (to iOS)Tor Lillqvist
Introduce SDKDIRNAME as a configury variable and use it instead of the gbuild gb_Package_SDKDIRNAME. Then we can easily construct the SDKDIRNAME_FOR_BUILD variant that is needed to find the specially named SDK in instdir on OS X when cross-compiling. Move the version number section in configure.ac earlier. Change-Id: Iee3db1a50ad4c7a9f91bbc5e0d0b01d76a76f701
2013-09-22add mode lines to new files (and idls) since last runCaolán McNamara
Change-Id: Id1e74f18c90e69d1a781c8f02e30dc3c005ed4fd
2013-09-22gbuild: remove static libraries from OUTDIRMichael Stahl
Refactor to find and link static libraries directly in WORKDIR. - gb_StaticLibrary_get_target is now same as the gb_LinkTarget_get_target - fix the StaticLibrary clean target Change-Id: Icf29d32d6487747a2e39d4599ceebccfead04667
2013-09-22odk: remove Package_bin, instead auto-install executablesMichael Stahl
This is somewhat annoying since it requires re-introducing stupid directories in scp2, but if the executables should be put in INSTDIR directly then the Package_bin needs to go. Change-Id: I893694c7f9d4cb5b9ef8ec4a3d30e08536223740
2013-09-22gbuild: remove libraries from OUTDIR and WORKDIRMichael Stahl
Refactor everything to find and link libraries directly in INSTDIR. - add gb_LinkTarget_get_linksearchpath_for_layer, and use it to set up -L paths for T_LDFLAGS in such a way that only allowed libraries can be linked against; i.e. it's not possible to link URE linktargets against OOO or not-installed libraries - gb_Library_get_target is now same as the gb_LinkTarget_get_target (TODO: this needs cleanup) - since a pattern rule won't work for linking libraries in INSTDIR, add a separate per-file rule for every INSTDIR lib - pattern rule can't find link target in the clean target any more so add a LINKTARGET variable - disable gb_Library_add_auxtarget, no auxtargets need to be copied - tweak the call to gb_Library_Library_platform to pass in a path in sdk/lib for the versioned URE libs - fix the Library clean target - add LAYER parameter to gb_LinkTarget_LinkTarget - adjust platform link commands - MSVC link command now uses explicit -manifestfile and -pdb parameters to keep misc. files out of INSTDIR - remove gb_Helper_OUTDIR_FOR_BUILDLIBDIR - adjust Extension, CppunitTest, JunitTest, PythonTest, Gallery, various CustomTargets to search INSTDIR - remove SDK library symlinks and import libs from odk/Package_lib - on Mac OS X, put .dylib symlinks into sdk/lib even though those are not packaged and would be created by the SDK configury; we need these to be somewhere for linking anyway - add a (unfortunately cyclic) dependency on Package ure_install to sal Change-Id: I70d88742f8c8232ad7b9521416275c67b64fe6cf
2013-09-22odk: remove cli_cppuhelper from Package_cliMichael Stahl
It is actually installed by scp2/source/ooo/ure.scp already. Change-Id: I0ca538e3d6c52b1e228f1b1191778d8fb5d84954
2013-09-22unowinreg.dll is not in OOO layerMichael Stahl
Change-Id: Ib22fcbe5e9427750196f11c512fd4d3134108731
2013-09-22gbuild: make the versioned library the linktarget on UnixesMichael Stahl
If there is a SOVERSION then the versioned library is a real file and the unversioned one just a symlink; better to have the real file be the target. - add gb_Library_UDK_MAJORVER variable for SOVERSION - remove version parameter of gb_Library_set_soversion_script; instead hardcode the SOVERSION since it must be included in the file name in gb_Library_FILENAMES anyway - store the unversioned symlink in the ILIBTARGET variable - via new gb_Library_get_workdir_target_versionlink function - removed gb_Helper_install call that resulted in both versioned and unversioned libs in instdir Change-Id: I2c6f1698f0e39fdb2c07964d43ed9485cbca0b30
2013-09-22gbuild: make the DLL the LinkTarget of Library and CppunitTestMichael Stahl
... instead of the import lib. If the DLL is an auxtarget, it cannot be deleted without annoying errors, and we want to be able to rm -r $(INSTIDR) and build incrementally from there. - replace DLLTARGET -> ILIBTARGET - replace gb_Library_DLLFILENAMES -> gb_Library_FILENAMES - replace gb_Library_FILENAMES -> gb_Library_ILIBFILENAMES - replace gb_Library_get_dllname -> gb_Library_get_filename - replace gb_Library_get_filename -> gb_Library_get_ilibfilename - replace gb_CppunitTest_get_libfilename -> gb_CppunitTest_get_ilibfilename - replace gb_LinkTarget_set_dlltarget -> gb_LinkTarget_set_ilibtarget Change-Id: I92a2f061a653b9b5941f3232d729987b1317b6f8
2013-09-19Spurious reference to cppu InternalUnoApiStephan Bergmann
Change-Id: I8d4adbbfd8b62e77b6e2bb0cdd3905785039287a
2013-09-11odk: move files out of the confusing "pack" directory to better homesMichael Stahl
Change-Id: I46f4954ef07f60e1f7824a47f0617f8612ea9505
2013-09-11odk: remove addsym-macosx.shMichael Stahl
This was added in commit 66eedcee026459b2827a46d8ebc73749e3c71453 but has apparently never actually been used in the bundled SDK makefiles. Change-Id: Ifa6cab95be6575ac26840250ad717d94e15bea66
2013-09-11Towards a working instdir for Mac OS XStephan Bergmann
Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X, where it is $(INSTDIR)/LibreOffice.app/Contents. Most stuff ends up there (so most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK- related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME). (And GeneratedPackage needed to be made more flexible, to allow for packages that go into either of those two places.) For Android and iOS, gb_INSTROOT probably still needs to be set. The most obvious missing thing yet to make instdir work for Mac OS X is the instdir/*/LibreOffice.app/Contents/ure/ vs. instdir/*/LibreOffice.app/Contents/ure-link/ split. Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
2013-09-09restore gid_Dir_Sdkoo_Root which is apparently still needed on WNTMichael Stahl
also odk: better use gb_Library_get_runtime_filename than manually Change-Id: Ibbded4e8279b5dcb452f0d90be755edee1d2b63f
2013-09-09install whole sdk using filelistsMatúš Kukan
Change-Id: I9d8d0a20d776740c4701ec9a1facded9f4bde77a
2013-09-09odk: make error reporting less mysteriousMichael Stahl
Change-Id: I9e3c58fe65b902bb8b6b30449008bd1d71ed2180
2013-09-07s/wiki.services.openoffice.org/wiki.openoffice.org/gAndras Timar
Change-Id: I059fbee385a109069c70f3869021c8e2ee48fee1
2013-08-29[API CHANGE] Remove obsolete com.sun.star.comp.helper.UnoInfoStephan Bergmann
It had originally been used in the SDK's "Simple Bootstrap" for Java, com.sun.star.lib.loader.Loader class, but only left in there for backwards compatibility with pre--three-layer OOo versions (i.e., < OOo 3) when that Loader was switched to use the unoinfo executable with the fix for #i88687# "C++/Java Simple Bootstrap broken" in e2b7ea631a5e7297346ec826527a019e2baca020 "INTEGRATION: CWS sb87 (1.5.10); FILE MERGED: 2008/05/07 11:34:25 sb 1.5.10.1: #i88687# let Loader call new unoinfo instead of old juh.jar UnoInfo.getJars." Recent work in AOO to undo three-layer caused AOO to now accidentally use the backwards-compatibility code, so AOO ran into a problem that they solved with a change to com.sun.star.comp.helper.UnoInfo that LO erroneously merged in as 95ada2d65f6d999920f2a04599ac132fa632d66d "Related: #i122483# set correct classpath, include unoil.jar." The better approach is to get rid of that backwards-compatibility code and remove the obsolete UnoInfo class. While this is nominally incompatible, in practice no other client code but the SDK's com.sun.star.lib.loader.Loader should ever have used it (it should have been designed as a private interface for just that one client from the start, anyway). Java applications using "Simple Bootstrap" and built against old versions of the SDK (post the fix for #i88687# and its introduction of the unoinfo exectuable in OOo 3) will continue to work against new LO versions (as the backwards-compatibility code that would call the removed UnoInfo class will not be triggered anyway; and even if it were, all resulting exceptions would be caught and the new code path using the unoinfo executable be chosen then). Likewise, Java applications using "Simple Bootstrap" and built against the new SDK will continue to work against old OOo/LO/AOO vesions as far back as the fix for #i88687# and its introduction of the unoinfo exectuable in OOo 3. Change-Id: I64824ed002c3ccdf6912eab67499beb0c423081e
2013-08-26unodevtools: drop support for skeletonmaker --java4 parameterMichael Stahl
Minimum requirement has been Java 1.5 for years now. Change-Id: Id512507db1fc12c92d8f7662505eda6866da2fc6
2013-08-26uno-skeletonmaker has -l, does not need -env:UNO_TYPESStephan Bergmann
Change-Id: I08ba8a9e84582a50a7893625139e43408be77278
2013-08-20[TOOD|TOODO]->TODOCaolán McNamara
Change-Id: I3444b1788e3246503e2460051e8ddbf38aa3de86
2013-08-19Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVATor Lillqvist
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
2013-08-12Mark as constTakeshi Abe
Change-Id: I9277052ee9c6197cef7a46bd8f3ab9c5515c2502
2013-08-09odk doc cleanup.Michael Meeks
Change-Id: Ibc5998e665b0f81cdf805e128065e253c46594ab
2013-08-04fdo#67235 adapt form control code to time nanosecond API change, step 3Lionel Elie Mamane
Change-Id: I4899c89ee5b2a54c9c05b531ab284365f1558e3d Reviewed-on: https://gerrit.libreoffice.org/5270 Tested-by: Lionel Elie Mamane <lionel@mamane.lu> Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
2013-08-03fdo#67235 adapt form control code to time nanosecond API change, step 2Lionel Elie Mamane
Change-Id: I6ed48b506bdd7b3908ce8c7dba1b74093a3ac202
2013-07-25odk: let configure find the office path by default on dev-installMiklos Vajna
Change-Id: I50a698a16b8487945b4928d2c0e1c33c00c7641d
2013-07-24fdo#66691: Revert fix for i#121577 Allow setting toolbar name in Addons.xcuStephan Bergmann
...which incompatibly changed Addons.xcs and breaks extensions (and LibreLogo, which adds to Addons.xcu even though it is not an extension). See the mail thread starting at <http://lists.freedesktop.org/archives/libreoffice/2013-July/054612.html> "[Libreoffice-commits] core.git: #i121577# Allow setting toolbar name in Addons.xcu" for details. This reverts commit 85f072ef33ef47b5e3e0bcd51acb5c4179cde2c2 "Resolves: #i121577# Allow setting toolbar name in Addons.xcu" plus follow-up af572d9fbb744c9691abe465815d7927a9d11510 "Related: #i121577# Allow setting toolbar name in Addons.xcu," f13f9b5cc5267a7a5606b1a89db91b6d7aef5f9c "various .xcus are gone now," and 37d9921797a3ad3be8257fbfee11326549fcd987 "odk/examples/python/toolpanel/CalcWindowState.xcu is still in use," plus those parts of f97ca6f65182efc6542c53ac5e973b3ff398a5d1 "Resolves: #i116455# Make toolbar style settings persistent" that apparently belong to the fix for i#121577 rather than i#116455. Change-Id: Ib744566f3d8da7d9008d7dad8bec60f1bf32e743
2013-07-18Resolves: #i122767# disallow pre-standard C++ for-scopeHerbert Dürr
(cherry picked from commit 197b1ac3007b870e6c51ae9c767ad4f2a340e799) Conflicts: odk/settings/settings.mk solenv/gbuild/platform/windows.mk solenv/inc/set_wntx64.mk solenv/inc/wntmsci11.mk Change-Id: I266a0d7672839b4568e76b7223aae15d82cd9a63
2013-07-11Adapt example to use retrofitted UNO service ctorsStephan Bergmann
Change-Id: I85bf8e3fe76ff107cc3e611cc1103ca1f27fc00f
2013-07-11odk/examples/python/toolpanel/CalcWindowState.xcu is still in useStephan Bergmann
...contrary to what f13f9b5cc5267a7a5606b1a89db91b6d7aef5f9c "various .xcus are gone now" claims (thought it might ask for clean-up in light of af572d9fbb744c9691abe465815d7927a9d11510 "Related: #i121577# Allow setting toolbar name in Addons.xcu"). Change-Id: I4ff75c3ddf5bce28330f7b99282d8e2e081de48b
2013-07-11Resolves: #i121544# - Clean-up MessageBox APIAriel Constenla-Haile
(cherry picked from commit 27cfcb1e9d103b3e49c1263b1fa59fee8b187b21) Conflicts: desktop/test/deployment/active/active_native.cxx desktop/test/deployment/passive/Dispatch.java desktop/test/deployment/passive/passive_native.cxx odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java odk/examples/DevelopersGuide/GUI/MessageBox.java odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx odk/examples/java/Inspector/Inspector.java offapi/com/sun/star/awt/MessageBoxButtons.idl offapi/com/sun/star/awt/MessageBoxResults.idl offapi/com/sun/star/awt/XMessageBox.idl offapi/com/sun/star/awt/XMessageBoxFactory.idl offapi/com/sun/star/awt/makefile.mk offapi/type_reference/types.rdb sdext/source/minimizer/unodialog.cxx toolkit/inc/toolkit/awt/vclxtoolkit.hxx toolkit/source/awt/vclxtoolkit.cxx toolkit/source/layout/core/root.cxx Change-Id: I170b494fb96362bb25ba8d0f2518d4e46934dd67 Related: #i121544# - Clean-up MessageBox API (post fix) (cherry picked from commit c9f7a06e7798bcd5253844c49d210ea9345bd4b8) Conflicts: sw/inc/pch/precompiled_sw.hxx Change-Id: Ib8b1e7aaac769feff5206fcdd238c487a6130dd1 Related: #i121544# - Fix header guards Found by: Tsutomu Uchino (cherry picked from commit 82194a19ff4f29c8451c8e6ab6fe4f1b9d08df27) Conflicts: offapi/com/sun/star/awt/MessageBoxType.idl Change-Id: Ide8ba697fbc80395d2f30a068a0820a6afa3332f
2013-06-29remove OUString wrap for string literalsThomas Arnhold
For some functions and all kinds of Exceptions. CannotConvertException CloseVetoException DisposedException EmptyUndoStackException ErrorCodeIOException Exception GridInvalidDataException GridInvalidModelException IOException IllegalAccessException IllegalArgumentException IllegalTypeException IndexOutOfBoundsException NoMasterException NoSuchElementException NoSupportException PropertyVetoException RuntimeException SAXException ScannerException StorageWrappedTargetException UnsupportedFlavorException VetoException WrappedTargetException ZipIOException throwGenericSQLException throwIllegallArgumentException createInstance createInstanceWithContext forName getByName getPackageManager getPropertyValue getUnpackedValueOrDefault getValueByName hasPropertyByName openKey setName setPropertyValue supportsService bash command: for i in `cat list`; do git grep "$i\s*(\s*OUString(\s*\"" -- '*.[hc]xx' | cut -d ':' -f1 | sort -u | xargs sed -i -e "s/\(\<$i\s*(\)\s*OUString(\s*\(\"[^\")\\]*\"\)\s*)\s*/\1\2/g" -e "s/\($i.*\)\"+ /\1\" + /g"; done Change-Id: Iaf8e641b0abf28c082906014f87a183517630535 Reviewed-on: https://gerrit.libreoffice.org/4624 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-06-29reduce some spacingThomas Arnhold
Change-Id: I72d494b1c0ff5ed3c52ae6a078815f497e4dd647
2013-06-27Related: #i122356# quote rdb path, windows spaces in pathsJürgen Schmidt
(cherry picked from commit 65ef7b5de4d5fa7b8b440a73329b088917f77957) Conflicts: odk/settings/std.mk Change-Id: I73e62097456ab8dbe601f557a4f5b65f9b7aba6b
2013-06-26Related: #i121442# Add sed and cat as dependencies to odkAriel Constenla-Haile
(cherry picked from commit 0a78e6e85d8e921705b7ea90038f822d47fb58ab) Conflicts: odk/cfgWin.js odk/configure.pl odk/docs/install.html odk/setsdkenv_unix.sh.in odk/setsdkenv_windows.template odk/settings/std.mk Change-Id: Ie124ffbb857e796923981e13dc3116c7af341056
2013-06-24various .xcus are gone nowCaolán McNamara
Change-Id: Ia9596b15b45ae16bab7f1904f6b1cb31ba3d87a8
2013-06-24Related: #i121577# Allow setting toolbar name in Addons.xcuAriel Constenla-Haile
(cherry picked from commit 96cd87ec89e5ebe9d174c90b0f2cab96b3772732) Conflicts: odk/examples/cpp/complextoolbarcontrols/CalcWindowState.xcu odk/examples/cpp/complextoolbarcontrols/WriterWindowState.xcu odk/examples/java/Inspector/Inspector.java Change-Id: I6a0c1a657c6084df4efd8e150dc252155b32ba0b
2013-06-23Resolves: #i121542# Unify the Menu APIAriel Constenla-Haile
(cherry picked from commit 399946b82f5efec19cd82d1c320d5aa9295d235d) Conflicts: chart2/source/controller/main/ChartController_Window.cxx framework/source/uielement/langselectionmenucontroller.cxx framework/source/uielement/popupmenucontroller.cxx framework/source/uielement/recentfilesmenucontroller.cxx framework/source/uielement/toolbarsmenucontroller.cxx odk/examples/DevelopersGuide/GUI/UnoMenu.java odk/examples/DevelopersGuide/GUI/UnoMenu2.java odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/SelectionModeStatusbarController.cxx offapi/com/sun/star/awt/MenuBar.idl offapi/com/sun/star/awt/MenuEvent.idl offapi/com/sun/star/awt/MenuItemStyle.idl offapi/com/sun/star/awt/MenuItemType.idl offapi/com/sun/star/awt/MenuLogo.idl offapi/com/sun/star/awt/PopupMenu.idl offapi/com/sun/star/awt/PopupMenuDirection.idl offapi/com/sun/star/awt/XMenu.idl offapi/com/sun/star/awt/XMenuBar.idl offapi/com/sun/star/awt/XMenuBarExtended.idl offapi/com/sun/star/awt/XMenuExtended.idl offapi/com/sun/star/awt/XMenuExtended2.idl offapi/com/sun/star/awt/XMenuListener.idl offapi/com/sun/star/awt/XPopupMenu.idl offapi/com/sun/star/awt/XPopupMenuExtended.idl offapi/com/sun/star/awt/makefile.mk offapi/type_reference/types.rdb svtools/inc/svtools/popupmenucontrollerbase.hxx svtools/source/uno/popupmenucontrollerbase.cxx svx/source/tbxctrls/extrusioncontrols.cxx toolkit/inc/pch/precompiled_toolkit.hxx toolkit/inc/toolkit/awt/vclxmenu.hxx toolkit/inc/toolkit/helper/listenermultiplexer.hxx toolkit/source/awt/vclxmenu.cxx Change-Id: I3d9a1e109b9ff35901a3075b44a4c27e7c12b5c7 Related: #i121542# css::awt::XPopupMenu::execute() needs a Rectangle (cherry picked from commit c01a6f4f370b72f0751cf4f5c11310682e2b3248) Conflicts: odk/examples/DevelopersGuide/GUI/UnoMenu2.java offapi/type_reference/types.rdb toolkit/inc/toolkit/awt/vclxmenu.hxx Change-Id: I2cccc95086fe3d1522d03346e3c577fb2f21f621
2013-06-19Missing importStephan Bergmann
Regression introduced with 64e85a4cc8259a7d80c781e6698a8f30e7e0151d "Java cleanup, remove unused imports." Change-Id: I843cf651e20d2dd410f481222aca5206e0166a30
2013-06-19Remove unused, broken ruleStephan Bergmann
That rule was broken as it did not quote $@ which could be a pathname containing "$", but it is unused anyway since 41efa1535827b3dfef66ed4ce6c20e85081fe060 "use GeneratedPackage to deliver uno loader classes." Change-Id: I4e5a15be8e4acca3d5be0c1b228f6c324d12331c
2013-06-19use GeneratedPackage to deliver uno loader classesDavid Tardon
This is a workaround for problems with file names containing $ in gbuild. And it does not matter much in this case, because the classes are never used during build, so there is no need to have exact dependencies. Change-Id: Ibeb30257a62ed13744dc4fe987830d1e5a4102b0
2013-06-15odk - Fix reading OOVERSION from settings/dk.mkAriel Constenla-Haile
(cherry picked from commit decff1733c9cdeca40fc0438a1333de236c954cd) Conflicts: odk/setsdkenv_unix Change-Id: I4d78ebbb9f7b6d188dcba2140f26a17a8c17732f
2013-06-14odk - Add support for extension platformAriel Constenla-Haile
(cherry picked from commit d84324ff612c652b0f6e7a91863808db4425c316) Conflicts: odk/pack/copying/makefile.mk Change-Id: I04c004b1ea2c6c05a18f48db553141e2cf32f06d
2013-06-13Introduce O[U]String::toUInt32Stephan Bergmann
...which has become necessary since bd60d41176da540b01d7583cfe00637431967f39 "Handle oveflow in O(U)String::toInt() functions" reduces values in the range (SAL_MAX_INT32 .. SAL_MAX_UINT32] to zero, but some calls of toInt32(16) relied on getting a correct (unsigned) value for the whole input range ["0" .. "FFFFFFFF"] (see libreoffice-4-1 commit 9bf6c83367cedb7be81bf67f30d2147d26c7a8c3 "Revert overflow checks in O[U]String::toInt{32,64} again"). Audited all uses of toInt32/64 with non-decimal radix. (There is still a TODO comment in oox/source/helper/attributelist.cxx, and stoc/source/typeconv/convert.cxx will still need some love and test code.) Change-Id: Iadaca1c0e41dab553687d0ce41c20c10cd657a95
2013-06-11Related: #i122483# correct library pathJürgen Schmidt
(cherry picked from commit f6c713b7e38d4de5afdf508b8d6bfc6d1d27e000) Change-Id: I327d9946d139aaf3347c42e8b565a8de635b5ed1
2013-06-06Fix breaker when compiled with DEBUG=yesAriel Constenla-Haile
(cherry picked from commit 07c6343beaea37e8e6254e0f988e19f1eccf38ce) Conflicts: odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx Change-Id: I75278282efc80f3e9c31c413842392030beeb265
generated by cgit (git 2.34.1) at 2024-07-02 07:36:17 +0000