diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-10 11:49:18 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-10 16:43:54 +0100 |
commit | d55495daf9b412eacc271860788ad822e99e57c1 (patch) | |
tree | d0acb298707e4f3776ffed1192fed7bdb9aa434d /framework/source/uiconfiguration/uiconfigurationmanager.cxx | |
parent | e034b0323c7e5494a01abc0d1deab4fb2727bd9f (diff) |
Do not throw if AcceleratorConfigurations are missing.
Which can happen on mobile platforms if we don't want them.
Change-Id: I53639ccc75886708850d2d3a01eec76104b7f2c9
Diffstat (limited to 'framework/source/uiconfiguration/uiconfigurationmanager.cxx')
-rw-r--r-- | framework/source/uiconfiguration/uiconfigurationmanager.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index f34e7cb3dcd8..b3f30787ff5d 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -1178,9 +1178,16 @@ Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShort // SAFE -> ResetableGuard aGuard( m_aLock ); - if (!m_xAccConfig.is()) + if (!m_xAccConfig.is()) try + { m_xAccConfig = DocumentAcceleratorConfiguration:: createWithDocumentRoot(m_xContext, m_xDocConfigStorage); + } + catch ( const css::uno::DeploymentException& ) + { + SAL_WARN("fwk.uiconfiguration", "DocumentAcceleratorConfiguration" + " not available. This should happen only on mobile platforms."); + } return m_xAccConfig; } |