diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-28 11:52:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-28 13:08:57 +0100 |
| commit | 1594ed521299d14e8e5897212aa43aebbc02afdf (patch) | |
| tree | 6a57f796c19ea2165ed8deb19cdb1f351360353b /framework | |
| parent | 346a86afb3a323a34a31327aefe3b1b4b55256ed (diff) | |
remove static OUStrings from static_initialization_and_destruction chain
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/classes/fwktabwindow.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index ceb53116264e..f008fb215cdc 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -50,9 +50,9 @@ #include <vcl/image.hxx> #include <vcl/msgbox.hxx> -const ::rtl::OUString SERVICENAME_WINPROVIDER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.ContainerWindowProvider")); -const ::rtl::OUString EXTERNAL_EVENT(RTL_CONSTASCII_USTRINGPARAM("external_event")); -const ::rtl::OUString INITIALIZE_METHOD(RTL_CONSTASCII_USTRINGPARAM("initialize")); +const char SERVICENAME_WINPROVIDER[] = "com.sun.star.awt.ContainerWindowProvider"; +const char EXTERNAL_EVENT[] = "external_event"; +const char INITIALIZE_METHOD[] = "initialize"; using namespace ::com::sun::star; @@ -129,7 +129,7 @@ void FwkTabPage::CreateDialog() } } - CallMethod( INITIALIZE_METHOD ); + CallMethod( rtl::OUString(INITIALIZE_METHOD) ); } catch ( const lang::IllegalArgumentException& ) { @@ -150,7 +150,7 @@ sal_Bool FwkTabPage::CallMethod( const rtl::OUString& rMethod ) { try { - bRet = m_xEventHdl->callHandlerMethod( m_xPage, uno::makeAny( rMethod ), EXTERNAL_EVENT ); + bRet = m_xEventHdl->callHandlerMethod( m_xPage, uno::makeAny( rMethod ), rtl::OUString(EXTERNAL_EVENT) ); } catch ( const uno::Exception& ) { @@ -208,7 +208,7 @@ FwkTabWindow::FwkTabWindow( Window* pParent ) : { uno::Reference < lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); m_xWinProvider = uno::Reference < awt::XContainerWindowProvider >( - xFactory->createInstance( SERVICENAME_WINPROVIDER ), uno::UNO_QUERY ); + xFactory->createInstance( rtl::OUString(SERVICENAME_WINPROVIDER) ), uno::UNO_QUERY ); SetPaintTransparent(true); |