From 1231e74a6d5c17f91d235b1564251497fa2e3f72 Mon Sep 17 00:00:00 2001 From: Gert Faller Date: Sat, 27 Nov 2010 17:20:30 +0100 Subject: RTL_CONSTASCII_USTRINGPARAM in components 2 (build problem in sal ?) --- UnoControls/source/base/basecontrol.cxx | 2 +- UnoControls/source/base/registercontrols.cxx | 4 ++-- UnoControls/source/controls/framecontrol.cxx | 4 ++-- UnoControls/source/controls/progressmonitor.cxx | 16 ++++++++-------- UnoControls/source/controls/statusindicator.cxx | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'UnoControls/source') diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx index bc1433d3af63..f26250bed987 100644 --- a/UnoControls/source/base/basecontrol.cxx +++ b/UnoControls/source/base/basecontrol.cxx @@ -934,7 +934,7 @@ WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindo WindowDescriptor* pDescriptor = new WindowDescriptor ; pDescriptor->Type = WindowClass_SIMPLE ; - pDescriptor->WindowServiceName = OUString(RTL_CONSTASCII_USTRINGPARAM("window")) ; + pDescriptor->WindowServiceName = OUString::createFromAscii( "window" ) ; pDescriptor->ParentIndex = -1 ; pDescriptor->Parent = xParentPeer ; pDescriptor->Bounds = getPosSize () ; diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx index 62e2e23ccc16..e8f58b8fa7f2 100644 --- a/UnoControls/source/base/registercontrols.cxx +++ b/UnoControls/source/base/registercontrols.cxx @@ -107,9 +107,9 @@ using namespace ::com::sun::star::registry ; { \ AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txkey is valid ...\n" ) \ /* Build new keyname */ \ - sKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/")) ; \ + sKeyName = OUString::createFromAscii( "/" ) ; \ sKeyName += CLASS::impl_getStaticImplementationName() ; \ - sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); \ + sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); \ \ /* Create new key with new name. */ \ xNewKey = xKey->createKey( sKeyName ); \ diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx index bf87339cc86b..9987478b7b56 100644 --- a/UnoControls/source/controls/framecontrol.cxx +++ b/UnoControls/source/controls/framecontrol.cxx @@ -509,7 +509,7 @@ void FrameControl::impl_createFrame( const Reference< XWindowPeer >& xPee xOldFrame = m_xFrame ; } - xNewFrame = Reference< XFrame > ( impl_getMultiServiceFactory()->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")) ), UNO_QUERY ) ; + xNewFrame = Reference< XFrame > ( impl_getMultiServiceFactory()->createInstance ( OUString::createFromAscii( "com.sun.star.frame.Frame" ) ), UNO_QUERY ) ; Reference< XDispatchProvider > xDSP ( xNewFrame, UNO_QUERY ) ; if (xDSP.is()) @@ -520,7 +520,7 @@ void FrameControl::impl_createFrame( const Reference< XWindowPeer >& xPee // option //xFrame->setName( "WhatYouWant" ); - Reference< XURLTransformer > xTrans ( impl_getMultiServiceFactory()->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ), UNO_QUERY ) ; + Reference< XURLTransformer > xTrans ( impl_getMultiServiceFactory()->createInstance ( OUString::createFromAscii( "com.sun.star.util.URLTransformer" ) ), UNO_QUERY ) ; if(xTrans.is()) { // load file diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx index 2f73787e4bba..bf6dc153a933 100644 --- a/UnoControls/source/controls/progressmonitor.cxx +++ b/UnoControls/source/controls/progressmonitor.cxx @@ -897,9 +897,9 @@ void ProgressMonitor::impl_rebuildFixedText () { IMPL_TextlistItem* pSearchItem = m_pTextlist_Top->GetObject (n) ; aCollectString += pSearchItem->sTopic ; - aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\n")) ; + aCollectString += OUString::createFromAscii("\n") ; } - aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\0")) ; // It's better :-) + aCollectString += OUString::createFromAscii("\0") ; // It's better :-) m_xTopic_Top->setText ( aCollectString ) ; } @@ -915,9 +915,9 @@ void ProgressMonitor::impl_rebuildFixedText () { IMPL_TextlistItem* pSearchItem = m_pTextlist_Top->GetObject (n) ; aCollectString += pSearchItem->sText ; - aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\n")) ; + aCollectString += OUString::createFromAscii("\n") ; } - aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\0")) ; // It's better :-) + aCollectString += OUString::createFromAscii("\0") ; // It's better :-) m_xText_Top->setText ( aCollectString ) ; } @@ -935,9 +935,9 @@ void ProgressMonitor::impl_rebuildFixedText () { IMPL_TextlistItem* pSearchItem = m_pTextlist_Bottom->GetObject (n) ; aCollectString += pSearchItem->sTopic ; - aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\n")) ; + aCollectString += OUString::createFromAscii("\n") ; } - aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\0")) ; // It's better :-) + aCollectString += OUString::createFromAscii("\0") ; // It's better :-) m_xTopic_Bottom->setText ( aCollectString ) ; } @@ -953,9 +953,9 @@ void ProgressMonitor::impl_rebuildFixedText () { IMPL_TextlistItem* pSearchItem = m_pTextlist_Bottom->GetObject (n) ; aCollectString += pSearchItem->sText ; - aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\n")) ; + aCollectString += OUString::createFromAscii("\n") ; } - aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\0")) ; // It's better :-) + aCollectString += OUString::createFromAscii("\0") ; // It's better :-) m_xText_Bottom->setText ( aCollectString ) ; } diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx index ffe1c7c3eb05..70b195931c18 100644 --- a/UnoControls/source/controls/statusindicator.cxx +++ b/UnoControls/source/controls/statusindicator.cxx @@ -459,7 +459,7 @@ WindowDescriptor* StatusIndicator::impl_getWindowDescriptor( const Reference< XW WindowDescriptor* pDescriptor = new WindowDescriptor ; pDescriptor->Type = WindowClass_SIMPLE ; - pDescriptor->WindowServiceName = OUString(RTL_CONSTASCII_USTRINGPARAM("floatingwindow")) ; + pDescriptor->WindowServiceName = OUString::createFromAscii( "floatingwindow" ) ; pDescriptor->ParentIndex = -1 ; pDescriptor->Parent = xParentPeer ; pDescriptor->Bounds = getPosSize () ; -- cgit v1.2.3