diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-02-28 11:54:23 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-02-28 11:54:23 +0000 |
| commit | 9810dcec33c423f8457be0d32e2477d9736102f3 (patch) | |
| tree | 62184723f539f7e018e64f1de7c2cfa070f68c76 /sfx2 | |
| parent | 11a4a45d72c7efc46728d28a299acd0017d49f91 (diff) | |
INTEGRATION: CWS formkeyconfig (1.28.150); FILE MERGED
2006/02/27 10:43:16 fs 1.28.150.1: #i62548# InitAccCfg: use externally-provided XFrame, preferred over Desktop's ActiveFrame
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/acccfg.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sfx2/source/dialog/acccfg.cxx b/sfx2/source/dialog/acccfg.cxx index 3a0be9115cb5..21d4ff01bad8 100644 --- a/sfx2/source/dialog/acccfg.cxx +++ b/sfx2/source/dialog/acccfg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: acccfg.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: hr $ $Date: 2005-09-30 10:23:04 $ + * last change: $Author: kz $ $Date: 2006-02-28 12:54:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -591,8 +591,12 @@ void SfxAcceleratorConfigPage::InitAccCfg() // get the current active frame, which should be our "parent" // for this session - css::uno::Reference< css::frame::XFramesSupplier > xDesktop(m_xSMGR->createInstance(SERVICE_DESKTOP), css::uno::UNO_QUERY_THROW); - m_xFrame = xDesktop->getActiveFrame(); + m_xFrame = GetFrame(); + if ( !m_xFrame.is() ) + { + css::uno::Reference< css::frame::XFramesSupplier > xDesktop(m_xSMGR->createInstance(SERVICE_DESKTOP), css::uno::UNO_QUERY_THROW); + m_xFrame = xDesktop->getActiveFrame(); + } // identify module css::uno::Reference< css::frame::XModuleManager > xModuleManager (m_xSMGR->createInstance(SERVICE_MODULEMANAGER), css::uno::UNO_QUERY_THROW); |