From 9ce98add53128716524ec06dd1f90548326adce0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 28 Mar 2012 22:19:30 +0100 Subject: remove static OUStrings from static_initialization_and_destruction chain --- comphelper/source/misc/numberedcollection.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'comphelper/source') 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); -- cgit v1.2.3