diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-28 22:19:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-29 12:44:23 +0100 |
| commit | 9ce98add53128716524ec06dd1f90548326adce0 (patch) | |
| tree | 5b5eba190310fa1f25b84af3f3af30b7894ae629 /comphelper | |
| parent | 37d6ff0691f7be9fa4d742779fa59883de3586d9 (diff) | |
remove static OUStrings from static_initialization_and_destruction chain
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/numberedcollection.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx index b1560dc58c7d..5abc559ae3dc 100644 --- a/comphelper/source/misc/numberedcollection.cxx +++ b/comphelper/source/misc/numberedcollection.cxx @@ -44,7 +44,7 @@ namespace css = ::com::sun::star; //_______________________________________________ // definitions -static const ::rtl::OUString ERRMSG_INVALID_COMPONENT_PARAM(RTL_CONSTASCII_USTRINGPARAM("NULL as component reference not allowed.")); +static const char ERRMSG_INVALID_COMPONENT_PARAM[] = "NULL as component reference not allowed."; //----------------------------------------------- NumberedCollection::NumberedCollection() @@ -91,7 +91,7 @@ void NumberedCollection::setUntitledPrefix(const ::rtl::OUString& sPrefix) ::osl::ResettableMutexGuard aLock(m_aMutex); if ( ! xComponent.is ()) - throw css::lang::IllegalArgumentException (ERRMSG_INVALID_COMPONENT_PARAM, m_xOwner.get(), 1); + throw css::lang::IllegalArgumentException (rtl::OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1); long pComponent = (long) xComponent.get (); TNumberedItemHash::const_iterator pIt = m_lComponents.find (pComponent); @@ -167,7 +167,7 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe ::osl::ResettableMutexGuard aLock(m_aMutex); if ( ! xComponent.is ()) - throw css::lang::IllegalArgumentException (ERRMSG_INVALID_COMPONENT_PARAM, m_xOwner.get(), 1); + throw css::lang::IllegalArgumentException (rtl::OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1); long pComponent = (long) xComponent.get (); TNumberedItemHash::iterator pIt = m_lComponents.find (pComponent); |