diff options
Diffstat (limited to 'dbaccess/source/core/misc/sdbcoretools.cxx')
| -rw-r--r-- | dbaccess/source/core/misc/sdbcoretools.cxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx index 70de1d1944ef..7856a1484591 100644 --- a/dbaccess/source/core/misc/sdbcoretools.cxx +++ b/dbaccess/source/core/misc/sdbcoretools.cxx @@ -27,19 +27,16 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/embed/ElementModes.hpp> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <comphelper/interaction.hxx> #include <rtl/ref.hxx> -#include <rtl/ustrbuf.hxx> namespace dbaccess { using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::com::sun::star::io; - using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::task; @@ -80,8 +77,8 @@ namespace dbaccess ::rtl::Reference pRequest( new ::comphelper::OInteractionRequest( _rError ) ); ::rtl::Reference pApprove( new ::comphelper::OInteractionApprove ); - pRequest->addContinuation( pApprove.get() ); - Optional< OUString > aMessage = xStringResolver->getStringFromInformationalRequest( pRequest.get() ); + pRequest->addContinuation( pApprove ); + Optional< OUString > aMessage = xStringResolver->getStringFromInformationalRequest( pRequest ); if ( aMessage.IsPresent ) sDisplayMessage = aMessage.Value; } @@ -95,12 +92,9 @@ namespace dbaccess Exception aExcept; _rError >>= aExcept; - OUStringBuffer aBuffer; - aBuffer.append( _rError.getValueTypeName() ); - aBuffer.append( ":\n" ); - aBuffer.append( aExcept.Message ); - - sDisplayMessage = aBuffer.makeStringAndClear(); + sDisplayMessage = _rError.getValueTypeName() + + ":\n" + + aExcept.Message; } return sDisplayMessage; |