From 7c021b3126a3aab9514de359a2a07f2a4217e0d6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 13 Oct 2010 13:29:21 +0100 Subject: tweaks for AIX --- jvmfwk/distributions/OpenOfficeorg/makefile.mk | 2 +- jvmfwk/source/fwkutil.cxx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'jvmfwk') diff --git a/jvmfwk/distributions/OpenOfficeorg/makefile.mk b/jvmfwk/distributions/OpenOfficeorg/makefile.mk index a6ba7a23725a..36e8e8d6cbf5 100755 --- a/jvmfwk/distributions/OpenOfficeorg/makefile.mk +++ b/jvmfwk/distributions/OpenOfficeorg/makefile.mk @@ -43,7 +43,7 @@ $(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_mac -$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors.xml .ELIF "$(OS)"=="MACOSX" -$(COPY) javavendors_macosx.xml $(BIN)$/javavendors.xml -.ELIF "$(OS)"=="LINUX" +.ELIF "$(OS)"=="LINUX" || "$(OS)"=="AIX" -$(COPY) javavendors_linux.xml $(BIN)$/javavendors.xml .ELSE -$(COPY) javavendors_unx.xml $(BIN)$/javavendors.xml diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx index a2c56310b550..452ce5faccec 100644 --- a/jvmfwk/source/fwkutil.cxx +++ b/jvmfwk/source/fwkutil.cxx @@ -270,8 +270,10 @@ rtl::OUString findPlugin( { rtl::OUString url; #ifdef UNX -#ifdef MACOSX +#if defined(MACOSX) rtl::OUString path = rtl::OUString::createFromAscii("DYLD_LIBRARY_PATH"); +#elif defined(AIX) + rtl::OUString path = rtl::OUString::createFromAscii("LIBPATH"); #else rtl::OUString path = rtl::OUString::createFromAscii("LD_LIBRARY_PATH"); #endif -- cgit ibreoffice-6-0'>distro/cib/libreoffice-6-0 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/test/source/sheet/xdatabaserange.cxx
AgeCommit message (Collapse)Author
2019-08-15loplugin:sequenceloop in test..toolkitNoel Grandin
Change-Id: Ic8dad06c535b0af713bfe7cd46e601c8ea7ba6c7 Reviewed-on: https://gerrit.libreoffice.org/77531 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-07-01Simplify Sequence iterations in testArkadiy Illarionov
Use range-based loops or replace with STL functions Change-Id: I93efa86f49eb49dbdd3b7572dbd538bc300ded05 Reviewed-on: https://gerrit.libreoffice.org/74932 Tested-by: Jenkins Reviewed-by: Arkadiy Illarionov <qarkai@gmail.com>
2019-04-15loplugin:sequentialassign in test..toolsNoel Grandin
Change-Id: I3a6c5807c3262dde6756551e9e955c4ceae09b4f Reviewed-on: https://gerrit.libreoffice.org/70732 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-06-08look for unnecessary calls to Reference::is() after an UNO_QUERY_THROWNoel Grandin
Since the previous call would throw if there was nothing to be assigned to the value. Idea from tml. Used the following script to find places: git grep -A3 -n UNO_QUERY_THROW | grep -B3 -F 'is()' Change-Id: I36ba7b00bcd014bdf16c0455ab91056f82194969 Reviewed-on: https://gerrit.libreoffice.org/55417 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>