summaryrefslogtreecommitdiff
path: root/toolkit/source/awt
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/source/awt')
-rw-r--r--toolkit/source/awt/vclxaccessiblecomponent.cxx4
-rw-r--r--toolkit/source/awt/vclxbutton.cxx16
-rw-r--r--toolkit/source/awt/vclxprinter.cxx4
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx10
-rw-r--r--toolkit/source/awt/vclxwindow1.cxx4
-rw-r--r--toolkit/source/awt/vclxwindows.cxx4
6 files changed, 21 insertions, 21 deletions
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index fd77de8ba8c9..e8626333aad5 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -110,7 +110,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER3( VCLXAccessibleComponent, AccessibleExtendedCom
::rtl::OUString VCLXAccessibleComponent::getImplementationName() throw (uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleWindow" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleWindow"));
}
sal_Bool VCLXAccessibleComponent::supportsService( const ::rtl::OUString& rServiceName ) throw (uno::RuntimeException)
@@ -127,7 +127,7 @@ sal_Bool VCLXAccessibleComponent::supportsService( const ::rtl::OUString& rServi
uno::Sequence< ::rtl::OUString > VCLXAccessibleComponent::getSupportedServiceNames() throw (uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aNames(1);
- aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleWindow" );
+ aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleWindow"));
return aNames;
}
diff --git a/toolkit/source/awt/vclxbutton.cxx b/toolkit/source/awt/vclxbutton.cxx
index d201a2344fa3..6ab3221c5df0 100644
--- a/toolkit/source/awt/vclxbutton.cxx
+++ b/toolkit/source/awt/vclxbutton.cxx
@@ -45,11 +45,11 @@ VCLXIconButton::VCLXIconButton( Window *p, rtl::OUString aDefaultLabel, char con
p->SetComponentInterface( this );
setLabel( aDefaultLabel );
- setProperty( rtl::OUString::createFromAscii( "Graphic" ),
+ setProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Graphic")),
css::uno::Any( layoutimpl::loadGraphic( pGraphName ) ) );
- setProperty( rtl::OUString::createFromAscii( "ImagePosition" ),
+ setProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImagePosition")),
css::uno::Any( css::awt::ImagePosition::LeftCenter ) );
- setProperty( rtl::OUString::createFromAscii( "Align" ),
+ setProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Align")),
css::uno::Any( (sal_Int16) 1 /* magic - center */ ) );
}
@@ -63,7 +63,7 @@ VCLXOKButton::VCLXOKButton( Window *p )
VCLXCancelButton::VCLXCancelButton( Window *p )
: VCLXIconButton( p, Button::GetStandardText( BUTTON_CANCEL ),
-// : VCLXIconButton( xButton, rtl::OUString::createFromAscii( "~Cancel " ),
+// : VCLXIconButton( xButton, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Cancel ")),
"res/commandimagelist/sc_cancel.png" )
{
}
@@ -93,13 +93,13 @@ VCLXIgnoreButton::VCLXIgnoreButton( Window *p )
}
VCLXResetButton::VCLXResetButton( Window *p )
- : VCLXIconButton( p, rtl::OUString::createFromAscii( "~Reset " ),
+ : VCLXIconButton( p, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Reset ")),
"res/commandimagelist/sc_reset.png" )
{
}
VCLXApplyButton::VCLXApplyButton( Window *p )
- : VCLXIconButton( p, rtl::OUString::createFromAscii( "Apply" ),
+ : VCLXIconButton( p, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Apply")),
"res/commandimagelist/sc_apply.png" )
{
}
@@ -112,14 +112,14 @@ VCLXHelpButton::VCLXHelpButton( Window *p )
VCLXMoreButton::VCLXMoreButton( Window *p )
: VCLXIconButton( p, Button::GetStandardText( BUTTON_MORE ),
-// : VCLXIconButton( p, rtl::OUString::createFromAscii( "More " ),
+// : VCLXIconButton( p, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("More ")),
"res/commandimagelist/sc_more.png" )
{
}
VCLXAdvancedButton::VCLXAdvancedButton( Window *p )
// : VCLXIconButton( p, Button::GetStandardText( BUTTON_ADVANCED ),
- : VCLXIconButton( p, rtl::OUString::createFromAscii( "Advanced " ),
+ : VCLXIconButton( p, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Advanced ")),
"res/commandimagelist/sc_advanced.png" )
{
}
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index 093e02fc0efd..ed4d65453340 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -63,8 +63,8 @@
{
static ::com::sun::star::beans::Property __FAR_DATA aPropTable[] =
{
- ::com::sun::star::beans::Property( ::rtl::OUString::createFromAscii( "Orientation" ), PROPERTY_Orientation, ::getCppuType((const sal_Int16*)0), 0 ),
- ::com::sun::star::beans::Property( ::rtl::OUString::createFromAscii( "Horizontal" ), PROPERTY_Horizontal, ::getBooleanCppuType(), 0 )
+ ::com::sun::star::beans::Property( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Orientation")), PROPERTY_Orientation, ::getCppuType((const sal_Int16*)0), 0 ),
+ ::com::sun::star::beans::Property( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Horizontal")), PROPERTY_Horizontal, ::getBooleanCppuType(), 0 )
};
pProperties = aPropTable;
nElements = sizeof( aPropTable ) / sizeof( ::com::sun::star::beans::Property );
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 308e7f14736f..62e1714d3f72 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1002,14 +1002,14 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
break;
case WINDOW_CONTROL:
if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
- ::rtl::OUString::createFromAscii("simpleanimation") ) )
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("simpleanimation")) ) )
{
nWinBits |= WB_SCALE;
pNewWindow = new FixedImage( pParent, nWinBits );
*ppNewComp = new ::toolkit::XSimpleAnimation;
}
else if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
- ::rtl::OUString::createFromAscii("throbber") ) )
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("throbber")) ) )
{
nWinBits |= WB_SCALE;
pNewWindow = new FixedImage( pParent, nWinBits );
@@ -1328,14 +1328,14 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
{
// remember clipboard here
mxClipboard = ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > (
- xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.SystemClipboard" ) ), ::com::sun::star::uno::UNO_QUERY );
+ xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard")) ), ::com::sun::star::uno::UNO_QUERY );
}
}
return mxClipboard;
}
- else if( clipboardName.equals( ::rtl::OUString::createFromAscii("Selection") ) )
+ else if( clipboardName.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Selection")) ) )
{
return mxSelection;
}
@@ -1346,7 +1346,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
// XServiceInfo
::rtl::OUString VCLXToolkit::getImplementationName() throw(::com::sun::star::uno::RuntimeException)
{
- return rtl::OUString::createFromAscii( "stardiv.Toolkit.VCLXToolkit" );
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv.Toolkit.VCLXToolkit"));
}
sal_Bool VCLXToolkit::supportsService( const ::rtl::OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException)
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index f97f11f9320d..259b86368cc7 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -57,7 +57,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
{
::com::sun::star::uno::Exception *pException =
new ::com::sun::star::uno::RuntimeException;
- pException->Message = ::rtl::OUString::createFromAscii( "not a work window" );
+ pException->Message = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not a work window"));
throw pException;
}
@@ -88,7 +88,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
{
::com::sun::star::uno::Exception *pException =
new ::com::sun::star::uno::RuntimeException;
- pException->Message = ::rtl::OUString::createFromAscii( "incorrect window handle type" );
+ pException->Message = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("incorrect window handle type"));
throw pException;
}
// create system parent data
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 5154e769c6c3..620ee6bab0ee 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2429,7 +2429,7 @@ void SAL_CALL VCLXDialog::setVbaMethodParameter(
const ::com::sun::star::uno::Any& Value )
throw(::com::sun::star::uno::RuntimeException)
{
- if (rtl::OUString::createFromAscii( "Cancel" ) == PropertyName)
+ if (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cancel")) == PropertyName)
{
SolarMutexGuard aGuard;
if ( GetWindow() )
@@ -2970,7 +2970,7 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
sURL = pBase->GetURL();
Reference< ::com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )), uno::UNO_QUERY );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute"))), uno::UNO_QUERY );
if ( sURL.getLength() > 0 && xSystemShellExecute.is() )
{
try