diff options
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/accelerators/acceleratorconfiguration.cxx | 4 | ||||
-rw-r--r-- | framework/source/fwe/xml/statusbardocumenthandler.cxx | 38 | ||||
-rw-r--r-- | framework/source/services/sessionlistener.cxx | 8 |
3 files changed, 25 insertions, 25 deletions
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 04017f25a783..29bbdeaceddf 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -1258,8 +1258,8 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const OUString& sPrimarySe aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD1; else if ( sToken[i] == "MOD2" ) aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD2; - else if ( sToken[i] == "MOD3" ) - aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3; + else if ( sToken[i] == "MOD3" ) + aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3; } css::uno::Reference< css::container::XNameAccess > xKey; diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index 497170750b6f..b8bf232da2ce 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -379,25 +379,25 @@ void SAL_CALL OReadStatusBarDocumentHandler::startElement( aErrorMessage += "Required attribute statusbar:url must have a value!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - else - { - Sequence< PropertyValue > aStatusbarItemProp( 6 ); - aStatusbarItemProp[0].Name = ITEM_DESCRIPTOR_COMMANDURL; - aStatusbarItemProp[1].Name = ITEM_DESCRIPTOR_HELPURL; - aStatusbarItemProp[2].Name = ITEM_DESCRIPTOR_OFFSET; - aStatusbarItemProp[3].Name = ITEM_DESCRIPTOR_STYLE; - aStatusbarItemProp[4].Name = ITEM_DESCRIPTOR_WIDTH; - aStatusbarItemProp[5].Name = ITEM_DESCRIPTOR_TYPE; - - aStatusbarItemProp[0].Value <<= aCommandURL; - aStatusbarItemProp[1].Value <<= aHelpURL; - aStatusbarItemProp[2].Value <<= nOffset; - aStatusbarItemProp[3].Value <<= nItemBits; - aStatusbarItemProp[4].Value <<= nWidth; - aStatusbarItemProp[5].Value <<= css::ui::ItemType::DEFAULT; - - m_aStatusBarItems->insertByIndex( m_aStatusBarItems->getCount(), makeAny( aStatusbarItemProp ) ); - } + else + { + Sequence< PropertyValue > aStatusbarItemProp( 6 ); + aStatusbarItemProp[0].Name = ITEM_DESCRIPTOR_COMMANDURL; + aStatusbarItemProp[1].Name = ITEM_DESCRIPTOR_HELPURL; + aStatusbarItemProp[2].Name = ITEM_DESCRIPTOR_OFFSET; + aStatusbarItemProp[3].Name = ITEM_DESCRIPTOR_STYLE; + aStatusbarItemProp[4].Name = ITEM_DESCRIPTOR_WIDTH; + aStatusbarItemProp[5].Name = ITEM_DESCRIPTOR_TYPE; + + aStatusbarItemProp[0].Value <<= aCommandURL; + aStatusbarItemProp[1].Value <<= aHelpURL; + aStatusbarItemProp[2].Value <<= nOffset; + aStatusbarItemProp[3].Value <<= nItemBits; + aStatusbarItemProp[4].Value <<= nWidth; + aStatusbarItemProp[5].Value <<= css::ui::ItemType::DEFAULT; + + m_aStatusBarItems->insertByIndex( m_aStatusBarItems->getCount(), makeAny( aStatusbarItemProp ) ); + } } break; diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index fb33eead886f..6fa345c339cd 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -264,11 +264,11 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args) void SAL_CALL SessionListener::statusChanged(const frame::FeatureStateEvent& event) { - SAL_INFO("fwk.session", "SessionListener::statusChanged"); + SAL_INFO("fwk.session", "SessionListener::statusChanged"); - SAL_INFO("fwk.session.debug", " ev.Feature = " << event.FeatureURL.Complete << - ", ev.Descript = " << event.FeatureDescriptor); - if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doSessionRestore" ) + SAL_INFO("fwk.session.debug", " ev.Feature = " << event.FeatureURL.Complete << + ", ev.Descript = " << event.FeatureDescriptor); + if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doSessionRestore" ) { if (event.FeatureDescriptor == "update") m_bRestored = true; // a document was restored |