[Libreoffice-commits] .: Branch 'integration/dev300_m98' - bridges/source cppu/qa

[Norbert Thiebaud]

 bridges/source/remote/urp/urp_job.hxx |    2 +-
 cppu/qa/test_any.cxx                  |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9dbe9bc7c3fcc470f792fd11bc54e06eecf4cb48
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Feb 14 23:31:21 2011 -0600

    mismerge: occured->occurred and there is no testshl module

diff --git a/bridges/source/remote/urp/urp_job.hxx b/bridges/source/remote/urp/urp_job.hxx
index 80104eb..03e3c49 100644
--- a/bridges/source/remote/urp/urp_job.hxx
+++ b/bridges/source/remote/urp/urp_job.hxx
@@ -304,7 +304,7 @@ inline ClientJob::ClientJob(
     uno_Any **ppException )
     : Job(
         pEnvRemote, pContext, pBridgeImpl, ::bridges_remote::RTC_HOLDENVWEAK )
-    , m_bExceptionOccured( false )
+    , m_bExceptionOccurred( false )
     , m_ppArgs( ppArgs )
     , m_pReturn( pReturn )
     , m_pInterfaceType( pInterfaceType ) // weak 
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index 7d12b63..3d62d89 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -64,7 +64,6 @@
 #include "com/sun/star/uno/Sequence.hxx"
 #include "com/sun/star/uno/Type.hxx"
 #include "com/sun/star/uno/XInterface.hpp"
-#include "testshl/simpleheader.hxx"
 #include "osl/diagnose.h"
 #include "osl/interlck.h"
 #include "rtl/string.h"