diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-02 09:38:26 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-02 14:53:50 +0100 |
| commit | e9a467cafbffb380c54e90b24f9ee20cd4adc7e8 (patch) | |
| tree | 9a5c6d4dcfdcb4ff7b089c0219d51e58c70146fc /sd/source/ui/tools | |
| parent | e6409de0f879df204de7b07117798e2d77235458 (diff) | |
remove static objects from static_initialization_and_destruction chain
Diffstat (limited to 'sd/source/ui/tools')
| -rw-r--r-- | sd/source/ui/tools/EventMultiplexer.cxx | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index d6a2953fbed8..2de089665ba5 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -153,9 +153,6 @@ private: ::com::sun::star::drawing::framework::XConfigurationController> mxConfigurationControllerWeak; - static const ::rtl::OUString msCurrentPagePropertyName; - static const ::rtl::OUString msEditModePropertyName; - void ReleaseListeners (void); void ConnectToController (void); @@ -175,10 +172,8 @@ private: }; -const ::rtl::OUString EventMultiplexer::Implementation::msCurrentPagePropertyName ( - RTL_CONSTASCII_USTRINGPARAM("CurrentPage")); -const ::rtl::OUString EventMultiplexer::Implementation::msEditModePropertyName ( - RTL_CONSTASCII_USTRINGPARAM("IsMasterPageMode")); +const char aCurrentPagePropertyName[] = "CurrentPage"; +const char aEditModePropertyName[] = "IsMasterPageMode"; //===== EventMultiplexer ====================================================== @@ -441,7 +436,7 @@ void EventMultiplexer::Implementation::ConnectToController (void) { try { - xSet->addPropertyChangeListener(msCurrentPagePropertyName, this); + xSet->addPropertyChangeListener(rtl::OUString(aCurrentPagePropertyName), this); } catch (const beans::UnknownPropertyException&) { @@ -450,7 +445,7 @@ void EventMultiplexer::Implementation::ConnectToController (void) try { - xSet->addPropertyChangeListener(msEditModePropertyName, this); + xSet->addPropertyChangeListener(rtl::OUString(aEditModePropertyName), this); } catch (const beans::UnknownPropertyException&) { @@ -488,7 +483,7 @@ void EventMultiplexer::Implementation::DisconnectFromController (void) { try { - xSet->removePropertyChangeListener(msCurrentPagePropertyName, this); + xSet->removePropertyChangeListener(rtl::OUString(aCurrentPagePropertyName), this); } catch (const beans::UnknownPropertyException&) { @@ -497,7 +492,7 @@ void EventMultiplexer::Implementation::DisconnectFromController (void) try { - xSet->removePropertyChangeListener(msEditModePropertyName, this); + xSet->removePropertyChangeListener(rtl::OUString(aEditModePropertyName), this); } catch (const beans::UnknownPropertyException&) { @@ -560,11 +555,11 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange ( { ThrowIfDisposed(); - if (rEvent.PropertyName.equals(msCurrentPagePropertyName)) + if (rEvent.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCurrentPagePropertyName))) { CallListeners(EventMultiplexerEvent::EID_CURRENT_PAGE); } - else if (rEvent.PropertyName.equals(msEditModePropertyName)) + else if (rEvent.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aEditModePropertyName))) { bool bIsMasterPageMode (false); rEvent.NewValue >>= bIsMasterPageMode; |