diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-26 19:37:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-26 19:37:38 +0000 |
| commit | 3540c653730c3d05c8878f9d8a9f5f4d82bbe4c3 (patch) | |
| tree | 2ab6fd7b8f595c57188dbb077ae566a296dc19a9 /framework | |
| parent | e8fddfa2a14c54d017e163796b11eb36fdfd4614 (diff) | |
INTEGRATION: CWS storagechange01 (1.9.36); FILE MERGED
2004/11/01 11:49:35 mav 1.9.36.1: #i26882# use filesystem storage implementation
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uiconfiguration/uiconfigurationmanager.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 623c21d26c63..4c8adb50be3e 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: uiconfigurationmanager.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2004-09-20 10:09:23 $ + * last change: $Author: hr $ $Date: 2004-11-26 20:37:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -521,7 +521,8 @@ void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage >& x // commit element type storage Reference< XTransactedObject > xTransactedObject( xStorage, UNO_QUERY ); - xTransactedObject->commit(); + if ( xTransactedObject.is() ) + xTransactedObject->commit(); // mark UIElementType as not modified if we store to our own storage if ( bResetModifyState ) @@ -804,7 +805,8 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt if ( bCommitSubStorage ) { Reference< XTransactedObject > xTransactedObject( xSubStorage, UNO_QUERY ); - xTransactedObject->commit(); + if ( xTransactedObject.is() ) + xTransactedObject->commit(); } } } @@ -1319,7 +1321,8 @@ void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exce m_bModified = false; Reference< XTransactedObject > xTransactedObject( m_xDocConfigStorage, UNO_QUERY ); - xTransactedObject->commit(); + if ( xTransactedObject.is() ) + xTransactedObject->commit(); } } @@ -1351,7 +1354,8 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage } Reference< XTransactedObject > xTransactedObject( Storage, UNO_QUERY ); - xTransactedObject->commit(); + if ( xTransactedObject.is() ) + xTransactedObject->commit(); } } |