diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-31 15:54:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-02 14:53:48 +0100 |
| commit | ae9219769106648ac35d594fc07c83103a62ecbe (patch) | |
| tree | dbc21e302fe1808fc798c15156ad3a96418f5f45 /framework/source/fwi | |
| parent | 437f93ec8d1cb0f1486c69b863cb509aea4dac65 (diff) | |
remove static objects from static_initialization_and_destruction chain
Diffstat (limited to 'framework/source/fwi')
| -rw-r--r-- | framework/source/fwi/uielement/constitemcontainer.cxx | 6 | ||||
| -rw-r--r-- | framework/source/fwi/uielement/rootitemcontainer.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 5f7cbed7ac73..150481e410f0 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -46,7 +46,7 @@ const char WRONG_TYPE_EXCEPTION[] = "Type must be com::sun::star::uno::Sequence< const int PROPHANDLE_UINAME = 1; const int PROPCOUNT = 1; -const rtl::OUString PROPNAME_UINAME( RTL_CONSTASCII_USTRINGPARAM( "UIName" )); +const char PROPNAME_UINAME[] = "UIName"; namespace framework { @@ -350,7 +350,7 @@ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::bean Any SAL_CALL ConstItemContainer::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { - if ( PropertyName.equals( PROPNAME_UINAME )) + if (PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROPNAME_UINAME))) return makeAny( m_aUIName ); throw UnknownPropertyException(); @@ -431,7 +431,7 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > ConstItem const com::sun::star::beans::Property pProperties[] = { - com::sun::star::beans::Property( PROPNAME_UINAME, PROPHANDLE_UINAME , + com::sun::star::beans::Property( rtl::OUString(PROPNAME_UINAME), PROPHANDLE_UINAME , ::getCppuType((const rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) }; diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index 667850693342..d52e7c4f624f 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -50,7 +50,7 @@ const char WRONG_TYPE_EXCEPTION[] = "Type must be com::sun::star::uno::Sequence< const int PROPHANDLE_UINAME = 1; const int PROPCOUNT = 1; -const rtl::OUString PROPNAME_UINAME( RTL_CONSTASCII_USTRINGPARAM( "UIName" )); +const char PROPNAME_UINAME[] = "UIName"; namespace framework { @@ -397,7 +397,7 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > RootItemC const com::sun::star::beans::Property pProperties[] = { - com::sun::star::beans::Property( PROPNAME_UINAME, PROPHANDLE_UINAME , + com::sun::star::beans::Property( rtl::OUString(PROPNAME_UINAME), PROPHANDLE_UINAME , ::getCppuType((const rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ) }; |