config_host.mk.in | 9 --------- configure.ac | 23 ----------------------- svx/source/gallery2/galobj.cxx | 2 -- 3 files changed, 34 deletions(-)
New commits: commit c909d7a7ee3b193af69546a6f0e98860cd4877bf Author: Tor Lillqvist <t...@iki.fi> Date: Wed May 15 09:09:13 2013 +0300 Fix warning: unused variable 'aWhite' [loplugin] Change-Id: Ic25f9e6b2cfc902745cbef97b3164f33c6e03f9a diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 29791da..462d8cc 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -66,8 +66,6 @@ sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic ) if( aBmpSize.Width() && aBmpSize.Height() ) { - const Color aWhite( COL_WHITE ); - if( aBmpEx.GetPrefMapMode().GetMapUnit() != MAP_PIXEL && aBmpEx.GetPrefSize().Width() > 0 && aBmpEx.GetPrefSize().Height() > 0 ) commit 49ff95f0c1d0ee20bfccba648cfd7c1db47158a3 Author: Tor Lillqvist <t...@iki.fi> Date: Wed May 15 08:41:30 2013 +0300 LIBMGR_X64_BINARY is unused Change-Id: Ic3ea17a66d8cc045088ce2a625a79569c8fec431 diff --git a/config_host.mk.in b/config_host.mk.in index 1011dd3..ada0151b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -291,7 +291,6 @@ export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@ export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@ export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@ export LIBLOADER_JAR=@LIBLOADER_JAR@ -export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@ export LIBO_THIS_YEAR=@LIBO_THIS_YEAR@ export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@ export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@ diff --git a/configure.ac b/configure.ac index 5f89212..31e07e4 100644 --- a/configure.ac +++ b/configure.ac @@ -3164,7 +3164,6 @@ if test "$_os" = "WINNT"; then BUILD_X64= CXX_X64_BINARY= LINK_X64_BINARY= - LIBMGR_X64_BINARY= if test "$BITNESS_OVERRIDE" = ""; then AC_MSG_CHECKING([for a x64 compiler and libraries for 64-bit Explorer extensions]) @@ -3175,12 +3174,10 @@ if test "$_os" = "WINNT"; then BUILD_X64=TRUE CXX_X64_BINARY="$VC_PRODUCT_DIR/bin/amd64/cl.exe" LINK_X64_BINARY="$VC_PRODUCT_DIR/bin/amd64/link.exe" - LIBMGR_X64_BINARY="$VC_PRODUCT_DIR/bin/amd64/lib.exe" elif "$VC_PRODUCT_DIR/bin/x86_amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then BUILD_X64=TRUE CXX_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/cl.exe" LINK_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/link.exe" - LIBMGR_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/lib.exe" fi fi if test "$BUILD_X64" = TRUE; then @@ -3195,8 +3192,6 @@ if test "$_os" = "WINNT"; then # These are passed to the environment and then used in gbuild/platform/com_MSC_class.mk AC_SUBST(CXX_X64_BINARY) AC_SUBST(LINK_X64_BINARY) - AC_SUBST(LIBMGR_X64_BINARY) - else AC_MSG_CHECKING([the compiler is MinGW]) MACHINE_PREFIX=`$CC -dumpmachine` commit 8906309a363c53b72f90ef904a49e8eaf12bdb3b Author: Tor Lillqvist <t...@iki.fi> Date: Wed May 15 08:33:55 2013 +0300 JAVACISKAFFE is unused Change-Id: Id3bc14b65e761dc230491dd8cf4c3785a0eaa37e diff --git a/config_host.mk.in b/config_host.mk.in index 4c9beb9..1011dd3 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -250,7 +250,6 @@ export INSTDIR=@INSTDIR@ export INSTALLDIR=@INSTALLDIR@ export INSTALLDIRNAME=@INSTALLDIRNAME@ export JAVACISGCJ=@JAVACISGCJ@ -export JAVACISKAFFE=@JAVACISKAFFE@ export JAVACOMPILER=@JAVACOMPILER@ export JAVADOC=@JAVADOC@ export JAVADOCISGJDOC=@JAVADOCISGJDOC@ diff --git a/configure.ac b/configure.ac index 2abcefa..5f89212 100644 --- a/configure.ac +++ b/configure.ac @@ -6289,17 +6289,6 @@ if test "$SOLAR_JAVA" != ""; then fi AC_SUBST(JAVACISGCJ) -JAVACISKAFFE="" -dnl =================================================================== -dnl Checks that javac is kaffe -dnl =================================================================== -if test "$SOLAR_JAVA" != ""; then - if test `$JAVACOMPILER -version 2>&1 | $GREP -c "Kaffe"` -gt 0; then - JAVACISKAFFE="yes" - fi -fi -AC_SUBST(JAVACISKAFFE) - dnl =================================================================== dnl Checks for javadoc dnl =================================================================== commit 9922ec862ece36eef9c2a8576ba785326b93a021 Author: Tor Lillqvist <t...@iki.fi> Date: Wed May 15 08:29:19 2013 +0300 DYNAMIC_CRT is unused Change-Id: Iabeec6542d18f773a0ae5781214ec7d4ce02b3ab diff --git a/config_host.mk.in b/config_host.mk.in index ed82869..4c9beb9 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -103,7 +103,6 @@ export DOCDIR=@DOCDIR@ export DOXYGEN=@DOXYGEN@ export DO_FETCH_TARBALLS=@DO_FETCH_TARBALLS@ export DPKG=@DPKG@ -export DYNAMIC_CRT=@DYNAMIC_CRT@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@ export ENABLE_CORETEXT=@ENABLE_CORETEXT@ export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@ diff --git a/configure.ac b/configure.ac index 5cbeecc..2abcefa 100644 --- a/configure.ac +++ b/configure.ac @@ -442,7 +442,6 @@ cygwin*|interix*|mingw32*) test_fontconfig=no _os=WINNT use_shl_version="TRUE" - DYNAMIC_CRT="TRUE" DLLPOST=".dll" LINKFLAGSNOUNDEFS= @@ -617,7 +616,6 @@ if test "$_os" = "AIX"; then fi AC_SUBST(use_shl_version) -AC_SUBST(DYNAMIC_CRT) AC_SUBST(WITH_MINGW) AC_SUBST(OSVERSION) commit 71b68d4cf2a888cff225cd2f6055d12b20f50adc Author: Tor Lillqvist <t...@iki.fi> Date: Wed May 15 08:27:30 2013 +0300 DIRECTXSDK_LIB is not used outside configure.ac Change-Id: I2cdd158528197630ec54873bd164077a8765542e diff --git a/config_host.mk.in b/config_host.mk.in index 289d0cc..ed82869 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -87,7 +87,6 @@ export DEFAULT_TO_ENGLISH_FOR_PACKING=yes export DEVINSTALLDIR=@DEVINSTALLDIR@ export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@ export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@ -export DIRECTXSDK_LIB=@DIRECTXSDK_LIB@ export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@ export DISABLE_ATL=@DISABLE_ATL@ export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@ diff --git a/configure.ac b/configure.ac index f7d1527..5cbeecc 100644 --- a/configure.ac +++ b/configure.ac @@ -9079,7 +9079,6 @@ if test -n "$ENABLE_DIRECTX" -a "$_os" = "WINNT"; then fi fi AC_SUBST(DIRECTXSDK_HOME) -AC_SUBST(DIRECTXSDK_LIB) dnl *************************************** dnl Checking for bison and flex commit 2ede3d02976859347e4381b88d420f056d9caf9b Author: Tor Lillqvist <t...@iki.fi> Date: Wed May 15 08:00:17 2013 +0300 CC_FOR_BUILD is not used outside configure.ac Change-Id: I6031f20452183449b2087ce6904c83d8bdbeddfd diff --git a/config_host.mk.in b/config_host.mk.in index 2f5c03b..289d0cc 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -44,7 +44,6 @@ export BUILD_X64=@BUILD_X64@ export CAIRO_CFLAGS=$(gb_SPACE)@CAIRO_CFLAGS@ export CAIRO_LIBS=$(gb_SPACE)@CAIRO_LIBS@ export CC=@CC@ -export CC_FOR_BUILD=@CC_FOR_BUILD@ export CDR_CFLAGS=$(gb_SPACE)@CDR_CFLAGS@ export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@ @x_CFLAGS@ export CFLAGS=@CFLAGS@ diff --git a/configure.ac b/configure.ac index 98b8fbbc..f7d1527 100644 --- a/configure.ac +++ b/configure.ac @@ -4180,7 +4180,6 @@ else WORKDIR_FOR_BUILD="$WORKDIR" fi AC_SUBST(OS_FOR_BUILD) -AC_SUBST(CC_FOR_BUILD) AC_SUBST(INPATH_FOR_BUILD) AC_SUBST(OUTDIR_FOR_BUILD) AC_SUBST(WORKDIR_FOR_BUILD) commit 3fb7b2f3e3761f28579aa5c28a92d634d980da1b Author: Tor Lillqvist <t...@iki.fi> Date: Wed May 15 07:57:32 2013 +0300 CXX_FOR_BUILD is not used outside configure.ac Change-Id: I02c55ccd0a137a0d7a3a131dd0576a8a85afe24a diff --git a/config_host.mk.in b/config_host.mk.in index 47f362d..2f5c03b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -75,7 +75,6 @@ export CURL_LIBS=$(gb_SPACE)@CURL_LIBS@ export CUSTOM_BRAND_DIR=@CUSTOM_BRAND_DIR@ export CUSTOM_BRAND_IMAGES=@CUSTOM_BRAND_IMAGES@ export CXX=@CXX@ -export CXX_FOR_BUILD=@CXX_FOR_BUILD@ export CXX_X64_BINARY=@CXX_X64_BINARY@ @x_CXXFLAGS@ export CXXFLAGS=@CXXFLAGS@ export CXXFLAGS_CXX11=@CXXFLAGS_CXX11@ diff --git a/configure.ac b/configure.ac index ec2455a..98b8fbbc 100644 --- a/configure.ac +++ b/configure.ac @@ -4181,7 +4181,6 @@ else fi AC_SUBST(OS_FOR_BUILD) AC_SUBST(CC_FOR_BUILD) -AC_SUBST(CXX_FOR_BUILD) AC_SUBST(INPATH_FOR_BUILD) AC_SUBST(OUTDIR_FOR_BUILD) AC_SUBST(WORKDIR_FOR_BUILD) commit 25c2e2a3780b2ed11965130c849d4d81197ea1da Author: Tor Lillqvist <t...@iki.fi> Date: Wed May 15 07:56:27 2013 +0300 COMP_ENV is unused Change-Id: Ic1cb9f1c855bd93ba1b0625e5c0d0565a0eb4567 diff --git a/config_host.mk.in b/config_host.mk.in index c74f502..47f362d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -63,7 +63,6 @@ export COMMONS_LANG_JAR=@COMMONS_LANG_JAR@ export COMMONS_LOGGING_JAR=@COMMONS_LOGGING_JAR@ export COMPATH=@COMPATH@ export COMPILER_PLUGINS=@COMPILER_PLUGINS@ -export COMP_ENV=@OUTPATH@ export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ commit ad6897540643d691576ee1b241b2fefafe4d8386 Author: Tor Lillqvist <t...@iki.fi> Date: Wed May 15 07:48:40 2013 +0300 ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR is not used outside configure.ac Change-Id: Ic55f27516a6d34c20593eba07808d371901a1d67 diff --git a/config_host.mk.in b/config_host.mk.in index d02b149..c74f502 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -18,7 +18,6 @@ export ALL_LANGS=@ALL_LANGS@ export ANCIENT_BISON=@ANCIENT_BISON@ export ANDROID_APP_ABI=@ANDROID_APP_ABI@ export ANDROID_NDK_GDBSERVER=@ANDROID_NDK_GDBSERVER@ -export ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=@ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR@ export ANDROID_SDK_HOME=@ANDROID_SDK_HOME@ export ANT=@ANT@ export ANT_HOME=@ANT_HOME@ diff --git a/configure.ac b/configure.ac index add157e..ec2455a 100644 --- a/configure.ac +++ b/configure.ac @@ -329,7 +329,6 @@ if test -n "$with_android_ndk"; then esac fi fi -AC_SUBST(ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR) AC_SUBST(ANDROID_NDK_GDBSERVER) AC_SUBST(ANDROID_APP_ABI) commit d5dcd61f07632e7771947e26adea5d41d984c3ce Author: Tor Lillqvist <t...@iki.fi> Date: Wed May 15 07:47:37 2013 +0300 ANDROID_NDK_HOME is not used outside configure.ac Change-Id: I67b4ffa9c6cfe5558a9340495baad924aa16e11a diff --git a/config_host.mk.in b/config_host.mk.in index dd27847..d02b149 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -18,7 +18,6 @@ export ALL_LANGS=@ALL_LANGS@ export ANCIENT_BISON=@ANCIENT_BISON@ export ANDROID_APP_ABI=@ANDROID_APP_ABI@ export ANDROID_NDK_GDBSERVER=@ANDROID_NDK_GDBSERVER@ -export ANDROID_NDK_HOME=@ANDROID_NDK_HOME@ export ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=@ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR@ export ANDROID_SDK_HOME=@ANDROID_SDK_HOME@ export ANT=@ANT@ diff --git a/configure.ac b/configure.ac index 60b0e9c..add157e 100644 --- a/configure.ac +++ b/configure.ac @@ -329,7 +329,6 @@ if test -n "$with_android_ndk"; then esac fi fi -AC_SUBST(ANDROID_NDK_HOME) AC_SUBST(ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR) AC_SUBST(ANDROID_NDK_GDBSERVER) AC_SUBST(ANDROID_APP_ABI) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits