Kaydet (Commit) 99f376d2 authored tarafından Cédric Bosdonnat's avatar Cédric Bosdonnat

Fix broken sw unit introduced by commit a522818

Change-Id: I78a191e39dee00d31ddd773e7b49af73be3136cc
üst 103d75da
...@@ -2683,6 +2683,8 @@ void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const rtl::OUString& rMe ...@@ -2683,6 +2683,8 @@ void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const rtl::OUString& rMe
sal_Bool SfxBaseModel::getBoolPropertyValue( const rtl::OUString& rName ) throw ( uno::RuntimeException ) sal_Bool SfxBaseModel::getBoolPropertyValue( const rtl::OUString& rName ) throw ( uno::RuntimeException )
{ {
sal_Bool bValue = sal_False; sal_Bool bValue = sal_False;
if ( m_pData->m_pObjectShell )
{
SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium(); SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium();
if ( pMedium ) if ( pMedium )
{ {
...@@ -2697,9 +2699,11 @@ sal_Bool SfxBaseModel::getBoolPropertyValue( const rtl::OUString& rName ) throw ...@@ -2697,9 +2699,11 @@ sal_Bool SfxBaseModel::getBoolPropertyValue( const rtl::OUString& rName ) throw
aContent.getPropertyValue( rName ) >>= bValue; aContent.getPropertyValue( rName ) >>= bValue;
} }
} }
catch ( const uno::Exception & e ) catch ( const uno::Exception & )
{ {
throw uno::RuntimeException( e.Message, e.Context ); // Simply ignore it: it's likely the document isn't versionable in that case
bValue = sal_False;
}
} }
} }
return bValue; return bValue;
......
...@@ -1440,6 +1440,8 @@ void SfxBaseController::ShowInfoBars( ) ...@@ -1440,6 +1440,8 @@ void SfxBaseController::ShowInfoBars( )
{ {
// CMIS verifications // CMIS verifications
REFERENCE< document::XCmisDocument > xCmisDoc( m_pData->m_pViewShell->GetObjectShell()->GetModel(), uno::UNO_QUERY ); REFERENCE< document::XCmisDocument > xCmisDoc( m_pData->m_pViewShell->GetObjectShell()->GetModel(), uno::UNO_QUERY );
if ( xCmisDoc.is( ) )
{
beans::PropertyValues aCmisProperties = xCmisDoc->getCmisPropertiesValues( ); beans::PropertyValues aCmisProperties = xCmisDoc->getCmisPropertiesValues( );
if ( xCmisDoc->isVersionable( ) && aCmisProperties.hasElements( ) ) if ( xCmisDoc->isVersionable( ) && aCmisProperties.hasElements( ) )
...@@ -1468,6 +1470,7 @@ void SfxBaseController::ShowInfoBars( ) ...@@ -1468,6 +1470,7 @@ void SfxBaseController::ShowInfoBars( )
} }
} }
} }
}
} }
IMPL_LINK_NOARG ( SfxBaseController, CheckOutHandler ) IMPL_LINK_NOARG ( SfxBaseController, CheckOutHandler )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment