summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-12-16 10:35:35 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-12-16 14:21:25 +0100
commitfc44b7104cacc5ec76d2a0b560a9f6bbc5c252b5 (patch)
treeb9a7c8ef9b33d21d7e535c8da491c24d2a88ab0f /framework
parent51351a28ec45f7b3cb4bcca6bead9a5c2165211b (diff)
No need to pass eReason out of TransactionManager::registerTransaction
Change-Id: I0c8468219a4a9df904f34ec1363043bc46265c14
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/threadhelp/transactionguard.hxx6
-rw-r--r--framework/inc/threadhelp/transactionmanager.hxx2
-rw-r--r--framework/source/fwi/threadhelp/transactionmanager.cxx4
3 files changed, 4 insertions, 8 deletions
diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx
index 7a85e6a9fe1a..ac3aecab2882 100644
--- a/framework/inc/threadhelp/transactionguard.hxx
+++ b/framework/inc/threadhelp/transactionguard.hxx
@@ -58,11 +58,7 @@ class TransactionGuard : private boost::noncopyable
inline TransactionGuard( TransactionManager& rManager, EExceptionMode eMode )
: m_pManager( &rManager )
{
- // If exception mode is set to E_HARDEXCEPTIONS we don't need a buffer to return reason!
- // We handle it private. If a call is rejected, our manager throw some exceptions ... and the reason
- // could be ignorable ...
- ERejectReason eMyReason;
- m_pManager->registerTransaction( eMode, eMyReason );
+ m_pManager->registerTransaction( eMode );
}
/*-************************************************************************************************************
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index 393e1300f747..cc9e0b1ea549 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -121,7 +121,7 @@ class FWI_DLLPUBLIC TransactionManager: private boost::noncopyable
void setWorkingMode ( EWorkingMode eMode );
EWorkingMode getWorkingMode ( ) const;
bool isCallRejected ( ERejectReason& eReason ) const;
- void registerTransaction ( EExceptionMode eMode, ERejectReason& eReason ) throw( css::uno::RuntimeException, css::lang::DisposedException );
+ void registerTransaction ( EExceptionMode eMode ) throw( css::uno::RuntimeException, css::lang::DisposedException );
void unregisterTransaction ( ) throw( css::uno::RuntimeException, css::lang::DisposedException );
// private methods
diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx
index a6ade421260f..6639d78a4695 100644
--- a/framework/source/fwi/threadhelp/transactionmanager.cxx
+++ b/framework/source/fwi/threadhelp/transactionmanager.cxx
@@ -152,13 +152,13 @@ EWorkingMode TransactionManager::getWorkingMode() const
@seealso method unregisterTransaction()
@param "eMode" ,used to enable/disable throwing exceptions automatically for rejected calls
- @param "eReason" ,reason for rejected calls
*//*-*****************************************************************************************************/
-void TransactionManager::registerTransaction( EExceptionMode eMode, ERejectReason& eReason ) throw( css::uno::RuntimeException, css::lang::DisposedException )
+void TransactionManager::registerTransaction( EExceptionMode eMode ) throw( css::uno::RuntimeException, css::lang::DisposedException )
{
// Look for rejected calls first.
// If call was refused we throw some exceptions or do nothing!
// It depends from given parameter eMode.
+ ERejectReason eReason;
if( isCallRejected( eReason ) )
{
impl_throwExceptions( eMode, eReason );