[Libreoffice-commits] core.git: 9 commits - canvas/source chart2/qa chart2/source config.guess config.sub connectivity/inc connectivity/source dbaccess/source include/comphelper include/connectivity include/sfx2 reportdesign/inc reportdesign/source sfx2/source sw/qa

Wed Jun 18 02:27:24 PDT 2014

canvas/source/cairo/cairo_canvasfont.hxx                 |    6 
 canvas/source/cairo/cairo_textlayout.cxx                 |    4 
 canvas/source/directx/dx_canvasfont.hxx                  |    6 
 canvas/source/directx/dx_textlayout.cxx                  |    8 
 canvas/source/opengl/ogl_canvasfont.hxx                  |    6 
 canvas/source/opengl/ogl_textlayout.cxx                  |    4 
 canvas/source/vcl/canvasfont.hxx                         |    6 
 canvas/source/vcl/textlayout.cxx                         |    4 
 chart2/qa/extras/chart2export.cxx                        |   15 
 chart2/source/controller/main/ShapeToolbarController.cxx |   31 -
 chart2/source/controller/main/ShapeToolbarController.hxx |    4 
 chart2/source/view/inc/VCoordinateSystem.hxx             |    1 
 config.guess                                             |  360 +++++----------
 config.sub                                               |  144 +++---
 connectivity/inc/pch/precompiled_dbtools.hxx             |    1 
 connectivity/source/commontools/TTableHelper.cxx         |   12 
 dbaccess/source/core/dataaccess/ComponentDefinition.cxx  |    6 
 dbaccess/source/core/dataaccess/ComponentDefinition.hxx  |    4 
 include/comphelper/implementationreference.hxx           |  267 -----------
 include/connectivity/parameters.hxx                      |    1 
 include/sfx2/tbxctrl.hxx                                 |   21 
 reportdesign/inc/RptObject.hxx                           |    4 
 reportdesign/source/core/inc/ReportEngineJFree.hxx       |    4 
 reportdesign/source/core/inc/Section.hxx                 |    4 
 reportdesign/source/core/sdr/RptObject.cxx               |    4 
 reportdesign/source/ui/inc/ReportController.hxx          |    1 
 reportdesign/source/ui/inc/toolboxcontroller.hxx         |    4 
 reportdesign/source/ui/misc/toolboxcontroller.cxx        |   39 -
 sfx2/source/toolbox/tbxitem.cxx                          |   21 
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx                 |   16 
 30 files changed, 318 insertions(+), 690 deletions(-)

New commits:
commit 3379a4d028a77de5a50e305175d80f65560d5688
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 18 10:22:21 2014 +0200

    Update config.{guess,sub}
    
    ...to latest versions from <http://git.savannah.gnu.org/gitweb/?p=config.git;
    a=blob_plain;f=config.guess;hb=HEAD> and <http://git.savannah.gnu.org/gitweb/?
    p=config.git;a=blob_plain;f=config.sub;hb=HEAD>, for aarch64 support.
    
    Change-Id: If4ed1a6ced85947ee5b1b923fd09b4d679140145

diff --git a/config.guess b/config.guess
old mode 100755
new mode 100644
index f7dd69e..1f5c50c
--- a/config.guess
+++ b/config.guess
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2011-08-20'
+timestamp='2014-03-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -17,26 +15,22 @@ timestamp='2011-08-20'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches at gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,9 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -140,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -202,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -304,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -803,9 +820,15 @@ EOF
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    *:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
 	# uname -m includes "-pc" on this system.
 	echo ${UNAME_MACHINE}-mingw32
@@ -851,15 +874,22 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -871,56 +901,54 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -939,54 +967,63 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1190,6 +1227,9 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1216,19 +1256,31 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1245,7 +1297,7 @@ EOF
     NEO-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1314,158 +1366,10 @@ EOF
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
+esac
 
 cat >&2 <<EOF
 $0: unable to guess system type
diff --git a/config.sub b/config.sub
old mode 100755
new mode 100644
index 0d2cddec..d654d03
--- a/config.sub
+++ b/config.sub
@@ -1,38 +1,31 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2011-09-09'
+timestamp='2014-05-01'
 
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program 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 General Public License for more details.
+# This program 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
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches at gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches at gnu.org.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -75,9 +68,7 @@ Report bugs and patches to <config-patches at gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -125,13 +116,17 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -154,7 +149,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
@@ -223,6 +218,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -247,23 +248,28 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -277,24 +283,26 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
-	| or32 \
+	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -318,8 +326,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -332,7 +339,10 @@ case $basic_machine in
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
-
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
@@ -355,15 +365,16 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -372,11 +383,13 @@ case $basic_machine in
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -390,23 +403,27 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -718,7 +735,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -776,11 +792,15 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze)
+	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -815,6 +835,10 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i686-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -1003,7 +1027,11 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1330,21 +1358,21 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1352,7 +1380,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1476,9 +1504,6 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1527,6 +1552,12 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;
@@ -1554,9 +1585,6 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
commit 5106c5fdca42ada2bb5496ac89ab2692919494c1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 18 10:21:48 2014 +0200

    Remove newly unused comphelper::ImplementationReference
    
    Change-Id: If272d5025e08fcf5e67de30ffdf177383ef59370

diff --git a/include/comphelper/implementationreference.hxx b/include/comphelper/implementationreference.hxx
deleted file mode 100644
index fa35d61..0000000
--- a/include/comphelper/implementationreference.hxx
+++ /dev/null
@@ -1,267 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
-#define INCLUDED_COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
-
-namespace comphelper
-{
-
-    /** Holds a uno::Reference alongside a C++ implementation pointer
-
-        This template is useful to accomplish the following task: the
-        client needs an implementation pointer to an object providing
-        UNO interfaces. It is unsafe to simply store a C++ pointer,
-        because of the automatic UNO lifetime control. It is
-        inconvenient to always cast the UNO interface to the C++
-        implementation, and what's more, it's mostly unclear to the
-        casual code reader.
-
-        Thus, this template nicely encapsulate the stated intention,
-        by holding a uno::Reference internally, and providing simple
-        C++ pointer semantics to the outside. As a differentiator to
-        ::rtl::Reference, this template features a getRef() method,
-        giving you friction-less access to the internal UNO interface,
-        without extra querying.
-
-        By the way, the pointer semantic of this template include
-        transitive constness. That means, if this template's instance
-        is const (e.g. because it is a member of a class which is
-        accessed in a const method), the pointer returned is also
-        const.
-
-        As this template is geared towards fast, internal pointer
-        access, validity of the UNO reference is _not_ checked for
-        every pointer access. The client of this template is
-        responsible to check that, wherever necessary, via the is()
-        method.
-
-        @tpl CppType
-        The C++ type this class should mimick a pointer to (not the
-        pointer type itself!).
-
-        @tpl UnoType
-        The UNO interface type of the object (a uno::Reference to this
-        type is held internally).
-
-        @tpl XIfType
-        An unambiguous derivative of UnoType. This is defaulted to
-        the second template parameter (UnoType), which should normally
-        just work, since one typically has only single inheritance in
-        UNO.<p>
-        Alternatively, when using the
-        ImplementationReference::createFromQuery() method to create an
-        instance, this type can serve a different need: if the
-        provided CppType only derives from XInterface (generally
-        speaking, derives from a UNO interface above UnoType in the
-        class hierarchy), then the default XIfType constitutes a
-        possibly invalid downcast to UnoType. Setting XIfType equal to
-        CppTypes's most derived UNO interface type then solves this
-        problem (which is not as arcane as it seems to be. Just
-        imagine you're providing a C++ abstract interface, which must
-        provide UNO reference semantics. Naturally, you will derive
-        this C++ interface only from XInterface, to reduce the number
-        of ambiguous classes. Even more naturally, it is reasonable to
-        have UnoType be something different from XInterface, governed
-        by the usage of the C++ interface)
-
-        @sample ImplementationReference< MyCppType, XMyInterface >
-
-        @sample ImplementationReference< MyAbstractCppType, XMyInterface, XInterface >
-        for an abstract C++ class
-
-        @see ::rtl::Reference
-
-     */
-    template < class CppType,
-               class UnoType,
-               class XIfType=UnoType > class ImplementationReference
-    {
-    public:
-
-        typedef UnoType UnoInterfaceType;
-        typedef CppType ImplementationType;
-        typedef XIfType UnambiguousXInterfaceType;
-
-        /** Default-construct an ImplementationReference
-
-            Uno reference will be invalid, implementation pointer will
-            be NULL.
-         */
-        ImplementationReference() :
-            mxRef(),
-            mpImpl( NULL )
-        {
-        }
-
-        /** Create an ImplementationReference from C++ pointer.
-
-            This constructor does not perform an explicit
-            QueryInterface on the provided implementation object, but
-            constructs the UNO reference directly from the given
-            pointer. This is the fastest, and most often the best way
-            to create an ImplementationReference. If the conversion
-            between the implementation object and the required UNO
-            interface is ambiguous, provide the third template
-            parameter with a type that can be unambiguously upcasted
-            to the UNO interface (the second template parameter).
-
-            There are cases, however, where performing a
-            QueryInterface is the better, albeit slower choice. In
-            these cases, createFromQuery() should be used.
-
-            @param pImpl
-            Pointer to the C++ implementation type
-
-            @see createFromQuery()
-        */
-        explicit ImplementationReference( ImplementationType* pImpl ) :
-            mxRef( static_cast<UnambiguousXInterfaceType*>(pImpl) ),
-            mpImpl( pImpl )
-        {
-        }
-
-        struct CreateFromQuery { };
-        /** Create an ImplementationReference from C++ pointer
-
-            @param pImpl
-            The pointer to the C++ implementation type, which is
-            queried for the template-parameterized UNO type.
-
-            @param dummy
-            Dummy parameter, to distinguish this contructor from the
-            default unary one (which does not perform a
-            QueryInterface)
-         */
-        ImplementationReference( ImplementationType* pImpl, CreateFromQuery ) :
-            mxRef( static_cast<UnambiguousXInterfaceType*>(pImpl),
-                   ::com::sun::star::uno::UNO_QUERY ),
-            mpImpl( pImpl )
-        {
-        }
-
-        /** Factory method to create an ImplementationReference from
-            C++ pointer.
-
-            This is a static version of the constructor which creates
-            an instance of an implementation type which is explicitly
-            queried for the ImplementationReference's
-            template-parameterized UNO type.
-
-            @sample
-                mpRef = mpRef.createFromQuery( new ImplementationType );
-        */
-        static ImplementationReference createFromQuery( ImplementationType* pImpl )
-        {
-            return ImplementationReference( pImpl, CreateFromQuery() );
-        }
-
-        /** Query whether the pointer is still valid.
-
-            Hands off also from the implementation pointer if this
-            returns false!
-         */
-        bool is() const { return mxRef.is(); }
-
-        /** Get a pointer to the implementation object
-
-            Compatibility method to get an auto_ptr-compatible
-            interface
-         */
-        ImplementationType*         get() { return mpImpl; }
-        const ImplementationType*   get() const { return mpImpl; }
-
-        /** Release all references
-
-            Compatibility method to get an auto_ptr-compatible
-            interface
-         */
-        void                        reset() { dispose(); }
-
-        /** Release all references
-
-            This method releases the UNO interface reference, and
-            clears the C++ pointer to NULL.
-         */
-        void                        dispose() { mxRef = NULL; mpImpl=NULL; }
-
-        ImplementationType*         operator->() { return mpImpl; }
-        const ImplementationType*   operator->() const { return mpImpl; }
-
-        ImplementationType&         operator*() { return *mpImpl; }
-        const ImplementationType&   operator*() const { return *mpImpl; }
-
-        /// Access to the underlying UNO reference, without extra querying
-        ::com::sun::star::uno::Reference< UnoInterfaceType > getRef() { return mxRef; }
-
-        /// Access to the underlying UNO reference, without extra querying
-        const ::com::sun::star::uno::Reference< UnoInterfaceType >& getRef() const { return mxRef; }
-
-        // default destructor, copy constructor and assignment will do
-        // ~ImplementationReference();
-        // ImplementationReference( const ImplementationReference& );
-        // ImplementationReference& operator= ( const ImplementationReference& );
-
-        /** Comparison operator
-
-            Object identity is defined to be identity of the
-            implementation pointers. This is in general invalid when
-            comparing pointers to UNO objects (ambiguous class
-            hierarchies, optimizations in the bridges, etc.), but okay
-            for raw C++ pointers (which is what's compared herein).
-        */
-        bool operator==( const ImplementationReference& rhs ) const
-        {
-            return mpImpl == rhs.mpImpl;
-        }
-
-        /** less-than operator
-
-            Object order is defined to be the ordering of the
-            implementation pointers. This is in general invalid when
-            comparing pointers to UNO objects (ambiguous class
-            hierarchies, optimizations in the bridges, etc.), but okay
-            for raw C++ pointers (which is what's used herein).
-
-            This ordering complies with STL's strict weak ordering
-            concept.
-        */
-        bool operator<( const ImplementationReference& rhs ) const
-        {
-            return mpImpl < rhs.mpImpl;
-        }
-
-    private:
-
-        // the interface, hard reference to prevent object from vanishing
-        ::com::sun::star::uno::Reference< UnoInterfaceType >    mxRef;
-
-        // the c++ object, for our internal stuff
-        ImplementationType*                                     mpImpl;
-
-    };
-
-}
-
-#endif // INCLUDED_COMPHELPER_IMPLEMENTATIONREFERENCE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 94546ae88d26facac1809a47a89a1bff866694e6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 18 10:21:13 2014 +0200

    rtl::Reference fits just fine here
    
    Change-Id: I354b546654e665607d9be0d65f6327fabb5694de

diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 443f533..d9c8ea44 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -32,8 +32,6 @@
 #include <svx/svdocirc.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdoashp.hxx>
-#include <comphelper/implementationreference.hxx>
-
 
 namespace rptui
 {
@@ -72,7 +70,7 @@ class OPropertyMediator;
 class REPORTDESIGN_DLLPUBLIC OObjectBase
 {
 public:
-    typedef ::comphelper::ImplementationReference<OPropertyMediator,::com::sun::star::beans::XPropertyChangeListener> TMediator;
+    typedef rtl::Reference<OPropertyMediator> TMediator;
 
 protected:
     mutable TMediator                                                                           m_xMediator;
diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx
index 3beeb25e..62a03dd 100644
--- a/reportdesign/source/core/inc/ReportEngineJFree.hxx
+++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx
@@ -32,8 +32,8 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <comphelper/stl_types.hxx>
-#include <comphelper/implementationreference.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <rtl/ref.hxx>
 
 namespace reportdesign
 {
@@ -78,7 +78,7 @@ namespace reportdesign
 
         virtual ~OReportEngineJFree();
     public:
-        typedef ::comphelper::ImplementationReference< OReportEngineJFree   ,::com::sun::star::report::XReportEngine,::com::sun::star::uno::XWeak > TReportEngine;
+        typedef rtl::Reference<OReportEngineJFree> TReportEngine;
 
         OReportEngineJFree(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context);
 
diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx
index b0de3ec..0e11517 100644
--- a/reportdesign/source/core/inc/Section.hxx
+++ b/reportdesign/source/core/inc/Section.hxx
@@ -30,9 +30,9 @@
 #include <com/sun/star/drawing/XShapeGrouper.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/form/XFormsSupplier2.hpp>
-#include <comphelper/implementationreference.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <rtl/ref.hxx>
 
 namespace reportdesign
 {
@@ -127,7 +127,7 @@ namespace reportdesign
 
         virtual void SAL_CALL disposing() SAL_OVERRIDE;
     public:
-        typedef ::comphelper::ImplementationReference< OSection ,::com::sun::star::report::XSection,::com::sun::star::uno::XWeak > TSection;
+        typedef rtl::Reference<OSection> TSection;
 
     private:
         OSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& xParentDef
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 6c2287c..45ade69 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -324,7 +324,7 @@ OObjectBase::OObjectBase(const OUString& _sComponentName)
 
 OObjectBase::~OObjectBase()
 {
-    m_xMediator.reset();
+    m_xMediator.clear();
     if ( isListening() )
         EndListening();
     m_xReportComponent.clear();
@@ -898,7 +898,7 @@ void OUnoObject::CreateMediator(bool _bReverse)
 
         Reference<XPropertySet> xControlModel(GetUnoControlModel(),uno::UNO_QUERY);
         if ( !m_xMediator.is() && m_xReportComponent.is() && xControlModel.is() )
-            m_xMediator = TMediator::createFromQuery(new OPropertyMediator(m_xReportComponent.get(),xControlModel,getPropertyNameMap(GetObjIdentifier()),_bReverse));
+            m_xMediator = new OPropertyMediator(m_xReportComponent.get(),xControlModel,getPropertyNameMap(GetObjIdentifier()),_bReverse);
         OObjectBase::StartListening();
     }
 }
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index fd69b24..8e9b426 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -44,7 +44,6 @@
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 
-#include <comphelper/implementationreference.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/propertystatecontainer.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx
index b005b42..8127988 100644
--- a/reportdesign/source/ui/inc/toolboxcontroller.hxx
+++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx
@@ -23,19 +23,19 @@
 
 #include <map>
 
+#include <rtl/ref.hxx>
 #include <svtools/toolboxcontroller.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/frame/XSubToolbarController.hpp>
 #include <cppuhelper/implbase2.hxx>
-#include <comphelper/implementationreference.hxx>
 
 class SfxToolBoxControl;
 namespace rptui
 {
     typedef ::cppu::ImplHelper2 <   ::com::sun::star::lang::XServiceInfo,
                                     ::com::sun::star::frame::XSubToolbarController> TToolboxController_BASE;
-    typedef ::comphelper::ImplementationReference<SfxToolBoxControl,::com::sun::star::frame::XToolbarController> TToolbarHelper;
+    typedef rtl::Reference<SfxToolBoxControl> TToolbarHelper;
 
     class OToolboxController : public ::svt::ToolboxController
                               ,public TToolboxController_BASE
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index 66335da..18588de 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -143,48 +143,48 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments
         if ( m_aCommandURL == ".uno:BasicShapes" )
         {
             m_aStates.insert(TCommandState::value_type(OUString(".uno:BasicShapes"),sal_True));
-            m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_BASIC,m_nToolBoxId,*pToolBox));
+            m_pToolbarController = new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_BASIC,m_nToolBoxId,*pToolBox);
         }
         else if ( m_aCommandURL == ".uno:SymbolShapes" )
         {
             m_aStates.insert(TCommandState::value_type(OUString(".uno:SymbolShapes"),sal_True));
-            m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_SYMBOL,m_nToolBoxId,*pToolBox));
+            m_pToolbarController = new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_SYMBOL,m_nToolBoxId,*pToolBox);
         }
         else if ( m_aCommandURL == ".uno:ArrowShapes" )
         {
             m_aStates.insert(TCommandState::value_type(OUString(".uno:ArrowShapes"),sal_True));
-            m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_ARROW,m_nToolBoxId,*pToolBox));
+            m_pToolbarController = new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_ARROW,m_nToolBoxId,*pToolBox);
         }
         else if ( m_aCommandURL == ".uno:FlowChartShapes" )
         {
             m_aStates.insert(TCommandState::value_type(OUString(".uno:FlowChartShapes"),sal_True));
-            m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_FLOWCHART,m_nToolBoxId,*pToolBox));
+            m_pToolbarController = new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_FLOWCHART,m_nToolBoxId,*pToolBox);
         }
         else if ( m_aCommandURL == ".uno:CalloutShapes" )
         {
             m_aStates.insert(TCommandState::value_type(OUString(".uno:CalloutShapes"),sal_True));
-            m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_CALLOUT,m_nToolBoxId,*pToolBox));
+            m_pToolbarController = new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_CALLOUT,m_nToolBoxId,*pToolBox);
         }
         else if ( m_aCommandURL == ".uno:StarShapes" )
         {
             m_aStates.insert(TCommandState::value_type(OUString(".uno:StarShapes"),sal_True));
-            m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_STAR,m_nToolBoxId,*pToolBox));
+            m_pToolbarController = new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_STAR,m_nToolBoxId,*pToolBox);
         }
         else if ( m_aCommandURL == ".uno:CharFontName" )
         {
             m_aStates.insert(TCommandState::value_type(OUString(".uno:CharFontName"),sal_True));
-            m_pToolbarController = TToolbarHelper::createFromQuery(new SvxFontNameToolBoxControl/*SvxStyleToolBoxControl*/(m_nSlotId = SID_ATTR_CHAR_FONT,m_nToolBoxId,*pToolBox));
+            m_pToolbarController = new SvxFontNameToolBoxControl/*SvxStyleToolBoxControl*/(m_nSlotId = SID_ATTR_CHAR_FONT,m_nToolBoxId,*pToolBox);
         }
         else if ( m_aCommandURL == ".uno:FontColor" || m_aCommandURL == ".uno:Color" )
         {
             m_aStates.insert(TCommandState::value_type(OUString(".uno:FontColor"),sal_True));
             m_aStates.insert(TCommandState::value_type(OUString(".uno:Color"),sal_True));
-            m_pToolbarController = TToolbarHelper::createFromQuery(new SvxColorToolBoxControl(m_nSlotId = SID_ATTR_CHAR_COLOR2,m_nToolBoxId,*pToolBox));
+            m_pToolbarController = new SvxColorToolBoxControl(m_nSlotId = SID_ATTR_CHAR_COLOR2,m_nToolBoxId,*pToolBox);
         }
         else
         {
             m_aStates.insert(TCommandState::value_type(OUString(".uno:BackgroundColor"),sal_True));
-            m_pToolbarController = TToolbarHelper::createFromQuery(new SvxColorToolBoxControl(m_nSlotId = SID_BACKGROUND_COLOR,m_nToolBoxId,*pToolBox));
+            m_pToolbarController = new SvxColorToolBoxControl(m_nSlotId = SID_BACKGROUND_COLOR,m_nToolBoxId,*pToolBox);
         }
 
         TCommandState::iterator aIter = m_aStates.begin();
@@ -271,7 +271,7 @@ Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw
 
     Reference< awt::XWindow > xRet;
     if ( m_pToolbarController.is() )
-        xRet = m_pToolbarController.getRef()->createPopupWindow();
+        xRet = m_pToolbarController->createPopupWindow();
 
     return xRet;
 }
@@ -279,7 +279,7 @@ Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw
 void SAL_CALL OToolboxController::execute( sal_Int16 KeyModifier ) throw (uno::RuntimeException, std::exception)
 {
     if ( m_pToolbarController.is() )
-        m_pToolbarController.getRef()->execute( KeyModifier );
+        m_pToolbarController->execute( KeyModifier );
 }
 
 sal_Bool SAL_CALL OToolboxController::opensSubToolbar() throw (uno::RuntimeException, std::exception)
@@ -296,9 +296,8 @@ OUString SAL_CALL OToolboxController::getSubToolbarName() throw (uno::RuntimeExc
 {
     SolarMutexGuard aSolarMutexGuard;
     ::osl::MutexGuard aGuard(m_aMutex);
-    uno::Reference< frame::XSubToolbarController> xSub(m_pToolbarController.getRef(),uno::UNO_QUERY);
-    if ( xSub.is() )
-        return xSub->getSubToolbarName();
+    if ( m_pToolbarController.is() )
+        return m_pToolbarController->getSubToolbarName();
     return OUString();
 }
 
@@ -306,11 +305,9 @@ void SAL_CALL OToolboxController::functionSelected( const OUString& rCommand ) t
 {
     SolarMutexGuard aSolarMutexGuard;
     ::osl::MutexGuard aGuard(m_aMutex);
-
-    uno::Reference< frame::XSubToolbarController> xSub(m_pToolbarController.getRef(),uno::UNO_QUERY);
-    if ( xSub.is() )
+    if ( m_pToolbarController.is() )
     {
-        xSub->functionSelected(m_aCommandURL = rCommand);
+        m_pToolbarController->functionSelected(m_aCommandURL = rCommand);
     }
 }
 
@@ -318,10 +315,8 @@ void SAL_CALL OToolboxController::updateImage(  ) throw (uno::RuntimeException,
 {
     SolarMutexGuard aSolarMutexGuard;
     ::osl::MutexGuard aGuard(m_aMutex);
-
-    uno::Reference< frame::XSubToolbarController> xSub(m_pToolbarController.getRef(),uno::UNO_QUERY);
-    if ( xSub.is() )
-        xSub->updateImage();
+    if ( m_pToolbarController.is() )
+        m_pToolbarController->updateImage();
 }
 
 uno::Reference< awt::XWindow > SAL_CALL OToolboxController::createItemWindow( const uno::Reference< awt::XWindow >& _xParent)
commit 32694db4bf90d58ed35987f3c56793a1530fb3d2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 18 10:21:00 2014 +0200

    rtl::Reference fits just fine here
    
    Change-Id: I14cdcab307f1d2edcebb9fd4aa3009daa32bc7d1

diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index d96b6d8..f4e6725 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -103,7 +103,7 @@ void OComponentDefinition::initialize( const Sequence< Any >& aArguments ) throw
 
 void OComponentDefinition::registerProperties()
 {
-    m_xColumnPropertyListener = ::comphelper::ImplementationReference<OColumnPropertyListener,XPropertyChangeListener>(new OColumnPropertyListener(this));
+    m_xColumnPropertyListener = new OColumnPropertyListener(this);
     OComponentDefinition_Impl& rDefinition( getDefinition() );
     ODataSettings::registerPropertiesFor( &rDefinition );
 
@@ -194,7 +194,7 @@ void SAL_CALL OComponentDefinition::disposing()
     if ( m_pColumns.get() )
         m_pColumns->disposing();
     m_xColumnPropertyListener->clear();
-    m_xColumnPropertyListener.dispose();
+    m_xColumnPropertyListener.clear();
 }
 
 IPropertyArrayHelper& OComponentDefinition::getInfoHelper()
@@ -251,7 +251,7 @@ OColumn* OComponentDefinition::createColumn(const OUString& _rName) const
     OComponentDefinition_Impl::const_iterator aFind = rDefinition.find( _rName );
     if ( aFind != rDefinition.end() )
     {
-        aFind->second->addPropertyChangeListener(OUString(),m_xColumnPropertyListener.getRef());
+        aFind->second->addPropertyChangeListener(OUString(),m_xColumnPropertyListener.get());
         return new OTableColumnWrapper( aFind->second, aFind->second, true );
     }
     OSL_FAIL( "OComponentDefinition::createColumn: is this a valid case?" );
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index 25b2e1e..e801d1d 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
@@ -33,7 +33,6 @@
 #include "ContentHelper.hxx"
 #include "apitools.hxx"
 #include <column.hxx>
-#include <comphelper/implementationreference.hxx>
 
 #include <memory>
 namespace dbaccess
@@ -90,8 +89,7 @@ class OComponentDefinition  :public OContentHelper
 
 protected:
     ::std::auto_ptr< OColumns >     m_pColumns;
-    ::comphelper::ImplementationReference< OColumnPropertyListener,::com::sun::star::beans::XPropertyChangeListener>
-                                    m_xColumnPropertyListener;
+    rtl::Reference<OColumnPropertyListener> m_xColumnPropertyListener;
     bool                        m_bTable;
 
     virtual ~OComponentDefinition();
commit 03a1c4214319049e663e7d50d416edbf2e5edbd3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 18 10:20:49 2014 +0200

    rtl::Reference fits just fine here
    
    Change-Id: Ib48999c7fe532b2a8bf5222ef27d8d4929937e3b

diff --git a/connectivity/inc/pch/precompiled_dbtools.hxx b/connectivity/inc/pch/precompiled_dbtools.hxx
index 7c16205..6c9ed75 100644
--- a/connectivity/inc/pch/precompiled_dbtools.hxx
+++ b/connectivity/inc/pch/precompiled_dbtools.hxx
@@ -123,7 +123,6 @@
 #include <comphelper/enumhelper.hxx>
 #include <comphelper/evtlistenerhlp.hxx>
 #include <comphelper/extract.hxx>
-#include <comphelper/implementationreference.hxx>
 #include <comphelper/interaction.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/numbers.hxx>
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 75a4766..4bf877a 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -28,7 +28,6 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
-#include <comphelper/implementationreference.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
@@ -112,8 +111,7 @@ namespace connectivity
 
         Reference< ::com::sun::star::sdbc::XDatabaseMetaData >      m_xMetaData;
         Reference< ::com::sun::star::sdbc::XConnection >            m_xConnection;
-        ::comphelper::ImplementationReference< OTableContainerListener,XContainerListener>
-                                    m_xTablePropertyListener;
+        rtl::Reference<OTableContainerListener> m_xTablePropertyListener;
         ::std::vector< ColumnDesc > m_aColumnDesc;
         OTableHelperImpl(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection)
             : m_xConnection(_xConnection)
@@ -177,9 +175,9 @@ void SAL_CALL OTableHelper::disposing()
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( m_pImpl->m_xTablePropertyListener.is() )
     {
-        m_pTables->removeContainerListener(m_pImpl->m_xTablePropertyListener.getRef());
+        m_pTables->removeContainerListener(m_pImpl->m_xTablePropertyListener.get());
         m_pImpl->m_xTablePropertyListener->clear();
-        m_pImpl->m_xTablePropertyListener.dispose();
+        m_pImpl->m_xTablePropertyListener.clear();
     }
     OTable_TYPEDEF::disposing();
 
@@ -403,8 +401,8 @@ void OTableHelper::refreshForeignKeys(TStringVector& _rNames)
                     if ( m_pTables->hasByName(sReferencedName) )
                     {
                         if ( !m_pImpl->m_xTablePropertyListener.is() )
-                            m_pImpl->m_xTablePropertyListener = ::comphelper::ImplementationReference< OTableContainerListener,XContainerListener>( new OTableContainerListener(this) );
-                        m_pTables->addContainerListener(m_pImpl->m_xTablePropertyListener.getRef());
+                            m_pImpl->m_xTablePropertyListener = new OTableContainerListener(this);
+                        m_pTables->addContainerListener(m_pImpl->m_xTablePropertyListener.get());
                         m_pImpl->m_xTablePropertyListener->add(sReferencedName);
                     } // if ( m_pTables->hasByName(sReferencedName) )
                     sOldFKName = sFkName;
diff --git a/include/connectivity/parameters.hxx b/include/connectivity/parameters.hxx
index f39cf08..1904fbf 100644
--- a/include/connectivity/parameters.hxx
+++ b/include/connectivity/parameters.hxx
@@ -35,7 +35,6 @@
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/paramwrapper.hxx>
 #include <unotools/sharedunocomponent.hxx>
-#include <comphelper/implementationreference.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 
 
commit b67f325a265d3372bcf211a964a5c0adcfb1ce0e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 18 10:20:28 2014 +0200

    rtl::Reference fits just fine here
    
    Change-Id: I65499ac299fb474e581245c5237a0b184f1f2b60

diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx
index 08fa8ca..856f6ca 100644
--- a/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -126,37 +126,37 @@ void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments
         {
             m_aStates.insert( TCommandState::value_type( ".uno:BasicShapes", sal_True ) );
             m_nSlotId = SID_DRAWTBX_CS_BASIC;
-            m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
+            m_pToolbarController = new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox );
         }
         else if ( m_aCommandURL == ".uno:SymbolShapes" )
         {
             m_aStates.insert( TCommandState::value_type( ".uno:SymbolShapes", sal_True ) );
             m_nSlotId = SID_DRAWTBX_CS_SYMBOL;
-            m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
+            m_pToolbarController = new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox );
         }
         else if ( m_aCommandURL == ".uno:ArrowShapes" )
         {
             m_aStates.insert( TCommandState::value_type( ".uno:ArrowShapes", sal_True ) );
             m_nSlotId = SID_DRAWTBX_CS_ARROW;
-            m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox) );
+            m_pToolbarController = new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox);
         }
         else if ( m_aCommandURL == ".uno:FlowChartShapes" )
         {
             m_aStates.insert( TCommandState::value_type( ".uno:FlowChartShapes", sal_True ) );
             m_nSlotId = SID_DRAWTBX_CS_FLOWCHART;
-            m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
+            m_pToolbarController = new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox );
         }
         else if ( m_aCommandURL == ".uno:CalloutShapes" )
         {
             m_aStates.insert( TCommandState::value_type( ".uno:CalloutShapes", sal_True ) );
             m_nSlotId = SID_DRAWTBX_CS_CALLOUT;
-            m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
+            m_pToolbarController = new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox );
         }
         else if ( m_aCommandURL == ".uno:StarShapes" )
         {
             m_aStates.insert( TCommandState::value_type( ".uno:StarShapes" , sal_True ) );
             m_nSlotId = SID_DRAWTBX_CS_STAR;
-            m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
+            m_pToolbarController = new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox );
         }
 
         for ( TCommandState::iterator aIter( m_aStates.begin() ); aIter != m_aStates.end(); ++aIter )
@@ -225,7 +225,7 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno
     Reference< awt::XWindow > xRet;
     if ( m_pToolbarController.is() )
     {
-        xRet = m_pToolbarController.getRef()->createPopupWindow();
+        xRet = m_pToolbarController->createPopupWindow();
     }
 
     return xRet;
@@ -254,10 +254,9 @@ OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeExceptio
 {
     SolarMutexGuard aSolarMutexGuard;
     ::osl::MutexGuard aGuard(m_aMutex);
-    uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY );
-    if ( xSub.is() )
+    if ( m_pToolbarController.is() )
     {
-        return xSub->getSubToolbarName();
+        return m_pToolbarController->getSubToolbarName();
     }
     return OUString();
 }
@@ -266,12 +265,10 @@ void ShapeToolbarController::functionSelected( const OUString& rCommand ) throw
 {
     SolarMutexGuard aSolarMutexGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
-
-    uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY );
-    if ( xSub.is() )
+    if ( m_pToolbarController.is() )
     {
         m_aCommandURL = rCommand;
-        xSub->functionSelected( rCommand );
+        m_pToolbarController->functionSelected( rCommand );
     }
 }
 
@@ -279,11 +276,9 @@ void ShapeToolbarController::updateImage() throw (uno::RuntimeException, std::ex
 {
     SolarMutexGuard aSolarMutexGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
-
-    uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY );
-    if ( xSub.is() )
+    if ( m_pToolbarController.is() )
     {
-        xSub->updateImage();
+        m_pToolbarController->updateImage();
     }
 }
 
diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx
index 1d1de1d..2fecaa8 100644
--- a/chart2/source/controller/main/ShapeToolbarController.hxx
+++ b/chart2/source/controller/main/ShapeToolbarController.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/frame/XSubToolbarController.hpp>
 
 #include <cppuhelper/implbase2.hxx>
-#include <comphelper/implementationreference.hxx>
+#include <rtl/ref.hxx>
 #include <svtools/toolboxcontroller.hxx>
 
 class SfxToolBoxControl;
@@ -39,7 +39,7 @@ namespace chart
 typedef ::cppu::ImplHelper2 < ::com::sun::star::lang::XServiceInfo,
                               ::com::sun::star::frame::XSubToolbarController> ShapeToolbarController_Base;
 
-typedef ::comphelper::ImplementationReference< SfxToolBoxControl, ::com::sun::star::frame::XToolbarController > TToolbarHelper;
+typedef rtl::Reference<SfxToolBoxControl> TToolbarHelper;
 
 class ShapeToolbarController : public ::svt::ToolboxController
                               ,public ShapeToolbarController_Base
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx
index 18c8c50..4b5bc9f 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -26,7 +26,6 @@
 #include "chartview/ExplicitScaleValues.hxx"
 
 #include <com/sun/star/chart2/XCoordinateSystem.hpp>
-#include "comphelper/implementationreference.hxx"
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/drawing/HomogenMatrix.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
commit 0b978f24c7d2fcbd0e777ec26b1cb7492845a30c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 18 10:20:15 2014 +0200

    rtl::Reference fits just fine here
    
    Change-Id: I268f6d2577b727c6aa072ee766b3f5f41bdb131b

diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx
index 4469f59..420e11b 100644
--- a/canvas/source/cairo/cairo_canvasfont.hxx
+++ b/canvas/source/cairo/cairo_canvasfont.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
 
-#include <comphelper/implementationreference.hxx>
-
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
@@ -51,9 +49,7 @@ namespace cairocanvas
                        private ::boost::noncopyable
     {
     public:
-        typedef ::comphelper::ImplementationReference<
-            CanvasFont,
-            ::com::sun::star::rendering::XCanvasFont > Reference;
+        typedef rtl::Reference<CanvasFont> Reference;
 
         CanvasFont( const ::com::sun::star::rendering::FontRequest&                                  fontRequest,
                     const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& extraFontProperties,
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 33b687c..2eb7b0c 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -125,7 +125,7 @@ namespace cairocanvas
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        mpFont.reset();
+        mpFont.clear();
         mpRefDevice.clear();
     }
 
@@ -292,7 +292,7 @@ namespace cairocanvas
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        return mpFont.getRef();
+        return mpFont.get();
     }
 
     rendering::StringContext SAL_CALL TextLayout::getText(  ) throw (uno::RuntimeException, std::exception)
diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx
index 0049d2e..ebb3d55 100644
--- a/canvas/source/directx/dx_canvasfont.hxx
+++ b/canvas/source/directx/dx_canvasfont.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASFONT_HXX
 #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASFONT_HXX
 
-#include <comphelper/implementationreference.hxx>
-
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
@@ -53,9 +51,7 @@ namespace dxcanvas
                        private ::boost::noncopyable
     {
     public:
-        typedef ::comphelper::ImplementationReference<
-            CanvasFont,
-            ::com::sun::star::rendering::XCanvasFont > ImplRef;
+        typedef rtl::Reference<CanvasFont> ImplRef;
 
         CanvasFont( const ::com::sun::star::rendering::FontRequest&                                     fontRequest,
                     const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&    extraFontProperties,
diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx
index 6ac0d70..016a330 100644
--- a/canvas/source/directx/dx_textlayout.cxx
+++ b/canvas/source/directx/dx_textlayout.cxx
@@ -52,7 +52,7 @@ namespace dxcanvas
 
     void SAL_CALL TextLayout::disposing()
     {
-        mpFont.reset();
+        mpFont.clear();
     }
 
     // XTextLayout
@@ -112,7 +112,7 @@ namespace dxcanvas
             aDrawHelper.queryTextBounds(
                 maText,
                 maLogicalAdvancements,
-                mpFont.getRef(),
+                mpFont.get(),
                 mpFont->getFontMatrix()));
 
         return aBounds;
@@ -199,7 +199,7 @@ namespace dxcanvas
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        return mpFont.getRef();
+        return mpFont.get();
     }
 
     rendering::StringContext SAL_CALL TextLayout::getText(  ) throw (uno::RuntimeException)
@@ -239,7 +239,7 @@ namespace dxcanvas
             rOutputOffset,
             maText,
             maLogicalAdvancements,
-            mpFont.getRef(),
+            mpFont.get(),
             mpFont->getFontMatrix(),
             bAlphaSurface);
 
diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx
index 7eef59b..8946413 100644
--- a/canvas/source/opengl/ogl_canvasfont.hxx
+++ b/canvas/source/opengl/ogl_canvasfont.hxx
@@ -10,8 +10,6 @@
 #ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASFONT_HXX
 #define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASFONT_HXX
 
-#include <comphelper/implementationreference.hxx>
-
 #include <cppuhelper/compbase1.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
@@ -37,9 +35,7 @@ namespace oglcanvas
                        private ::boost::noncopyable
     {
     public:
-        typedef ::comphelper::ImplementationReference<
-            CanvasFont,
-            ::com::sun::star::rendering::XCanvasFont > ImplRef;
+        typedef rtl::Reference<CanvasFont> ImplRef;
 
         CanvasFont( const ::com::sun::star::rendering::FontRequest&                                     fontRequest,
                     const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&    extraFontProperties,
diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx
index a155c2c..88e7ebd 100644
--- a/canvas/source/opengl/ogl_textlayout.cxx
+++ b/canvas/source/opengl/ogl_textlayout.cxx
@@ -35,7 +35,7 @@ namespace oglcanvas
 
     void SAL_CALL TextLayout::disposing()
     {
-        mpFont.reset();
+        mpFont.clear();
     }
 
     // XTextLayout
@@ -190,7 +190,7 @@ namespace oglcanvas
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        return mpFont.getRef();
+        return mpFont.get();
     }
 
     rendering::StringContext SAL_CALL TextLayout::getText(  ) throw (uno::RuntimeException, std::exception)
diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx
index cb84b91..6285e93 100644
--- a/canvas/source/vcl/canvasfont.hxx
+++ b/canvas/source/vcl/canvasfont.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX
 
-#include <comphelper/implementationreference.hxx>
-
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
@@ -53,9 +51,7 @@ namespace vclcanvas
                        private ::boost::noncopyable
     {
     public:
-        typedef ::comphelper::ImplementationReference<
-            CanvasFont,
-            ::com::sun::star::rendering::XCanvasFont > Reference;
+        typedef rtl::Reference<CanvasFont> Reference;
 
         CanvasFont( const ::com::sun::star::rendering::FontRequest&                                     fontRequest,
                     const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&    extraFontProperties,
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 9b0f898..6cbb3d5 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -97,7 +97,7 @@ namespace vclcanvas
 
         mpOutDevProvider.reset();
         mxDevice.clear();
-        mpFont.reset();
+        mpFont.clear();
     }
 
     // XTextLayout
@@ -364,7 +364,7 @@ namespace vclcanvas
     {
         SolarMutexGuard aGuard;
 
-        return mpFont.getRef();
+        return mpFont.get();
     }
 
     rendering::StringContext SAL_CALL TextLayout::getText(  ) throw (uno::RuntimeException, std::exception)
commit f512114970d42acce9a403ef68a1fd0cd35512ff
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 18 10:19:41 2014 +0200

    Use ImplInheritanceHelper
    
    Change-Id: I259bf6012684e393765cfd73e813bcf2875abd5f

diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index df4eb2b..2c7d81a 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -178,10 +178,9 @@ public:
 
 struct SfxToolBoxControl_Impl;
 class SFX2_DLLPUBLIC SfxToolBoxControl:
-                         public ::com::sun::star::awt::XDockableWindowListener,
-                         public ::com::sun::star::frame::XSubToolbarController,
-                         public svt::ToolboxController
-
+    public cppu::ImplInheritanceHelper2<
+        svt::ToolboxController, css::awt::XDockableWindowListener,
+        css::frame::XSubToolbarController>
 {
 friend class SfxToolbox;
 friend class SfxPopupWindow;
@@ -207,11 +206,12 @@ protected:
     // Must be called by subclass to set a new popup window instance
     void                       SetPopupWindow( SfxPopupWindow* pWindow );
 
-    // XInterface
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void               SAL_CALL acquire() throw() SAL_OVERRIDE;
-    virtual void               SAL_CALL release() throw() SAL_OVERRIDE;
+    // helper methods
+    void    createAndPositionSubToolBar( const OUString& rSubToolBarResName );
+    ::Size  getPersistentFloatingSize( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const OUString& rSubToolBarResName );
+    bool    hasBigImages() const;
 
+public:
     // XEventListener
     using ::cppu::OPropertySetHelper::disposing;
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
@@ -251,11 +251,6 @@ protected:
     virtual void SAL_CALL closed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    // helper methods
-    void    createAndPositionSubToolBar( const OUString& rSubToolBarResName );
-    ::Size  getPersistentFloatingSize( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const OUString& rSubToolBarResName );
-    bool    hasBigImages() const;
-
 public:
                                SFX_DECL_TOOLBOX_CONTROL();
 
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 2b4efb0..73380fd 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -224,7 +224,6 @@ SfxToolBoxControl::SfxToolBoxControl(
     sal_uInt16      nID,
     ToolBox&        rBox,
     bool            bShowStringItems     )
-:   svt::ToolboxController()
 {
     pImpl = new SfxToolBoxControl_Impl;
 
@@ -459,26 +458,6 @@ void SfxToolBoxControl::Dispatch( const OUString& aCommand, ::com::sun::star::un
     }
 }
 
-// XInterface
-Any SAL_CALL SfxToolBoxControl::queryInterface( const Type & rType )
-throw(::com::sun::star::uno::RuntimeException, std::exception)
-{
-    ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                           (static_cast< ::com::sun::star::awt::XDockableWindowListener* >(this)),
-                                        (static_cast< ::com::sun::star::frame::XSubToolbarController* >(this)));
-    return (aRet.hasValue() ? aRet : svt::ToolboxController::queryInterface( rType ));
-}
-
-void SAL_CALL SfxToolBoxControl::acquire() throw()
-{
-    OWeakObject::acquire();
-}
-
-void SAL_CALL SfxToolBoxControl::release() throw()
-{
-    OWeakObject::release();
-}
-
 void SAL_CALL SfxToolBoxControl::disposing( const ::com::sun::star::lang::EventObject& aEvent )
 throw( ::com::sun::star::uno::RuntimeException, std::exception )
 {
commit 860f543cdbf1d7ce8ddb3f9ad81c1c9aa41f02ed
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Jun 18 10:05:38 2014 +0200

    chart2, sw: remaining textbox DOCX import test preparations
    
    Ideally now all testcases handle both cases during DOCX import:
    
    - current situation, when shape with text is imported as a Writer
      TextFrame
    - future situation, when shape with text will be imported as shape with
      an assicated TextBox
    
    Change-Id: I5b95ff4672cecf39eb744f8557f967ade73404c0

diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index 21a9ece..851d674 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -14,6 +14,7 @@
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/packages/zip/ZipFileAccess.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
+#include <com/sun/star/text/XTextFramesSupplier.hpp>
 
 #include <unotools/ucbstreamhelper.hxx>
 #include <rtl/strbuf.hxx>
@@ -693,7 +694,19 @@ void Chart2ExportTest::testShapeFollowedByChart()
     CPPUNIT_ASSERT(pXmlDoc);
 
     OUString aValueOfFirstDocPR = getXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[1]/w:drawing[1]/wp:inline[1]/wp:docPr[1]", "id");
-    OUString aValueOfSecondDocPR = getXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[2]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:docPr[1]", "id");
+    OUString aValueOfSecondDocPR;
+
+    uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent, uno::UNO_QUERY);
+    uno::Reference<container::XIndexAccess> xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
+    if (xIndexAccess->getCount())
+    {
+        // TODO TextBox: remove this when TextBox is enabled by default
+        // This second run is a bug, should be the first ideally
+        aValueOfSecondDocPR = getXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[2]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:docPr[1]", "id");
+    }
+    else
+        aValueOfSecondDocPR = getXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:docPr[1]", "id");
+
     CPPUNIT_ASSERT( aValueOfFirstDocPR != aValueOfSecondDocPR );
 }
 
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index ed2a4de..a2c4997 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1483,8 +1483,20 @@ DECLARE_OOXMLIMPORT_TEST(testDefaultSectBreakCols, "default-sect-break-cols.docx
 DECLARE_OOXMLIMPORT_TEST(testFdo69636, "fdo69636.docx")
 {
     // The problem was that the mso-layout-flow-alt:bottom-to-top VML shape property wasn't handled for sw text frames.
-    uno::Reference<text::XTextRange> xFrame(getShape(1), uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(900), getProperty<sal_Int32>(getRun(getParagraphOfText(1, xFrame->getText()), 1), "CharRotation"));
+    uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent, uno::UNO_QUERY);
+    uno::Reference<container::XIndexAccess> xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
+    if (xIndexAccess->getCount())
+    {
+        // TODO TextBox: remove this when TextBox is enabled by default
+        uno::Reference<text::XTextRange> xFrame(getShape(1), uno::UNO_QUERY);
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(900), getProperty<sal_Int32>(getRun(getParagraphOfText(1, xFrame->getText()), 1), "CharRotation"));
+    }
+    else
+    {
+        uno::Reference<beans::XPropertySet> xPropertySet(getShape(1), uno::UNO_QUERY);
+        comphelper::SequenceAsHashMap aCustomShapeGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(-270), aCustomShapeGeometry["TextPreRotateAngle"].get<sal_Int32>());
+    }
 }
 
 DECLARE_OOXMLIMPORT_TEST(testChartProp, "chart-prop.docx")
