[Libreoffice-commits] .: toolkit/source toolkit/workben
Gert Faller
gfaller at kemper.freedesktop.org
Mon Nov 22 13:48:18 PST 2010
toolkit/source/awt/vclxaccessiblecomponent.cxx | 4 -
toolkit/source/awt/vclxbutton.cxx | 16 ++---
toolkit/source/awt/vclxprinter.cxx | 4 -
toolkit/source/awt/vclxtoolkit.cxx | 10 +--
toolkit/source/awt/vclxwindow1.cxx | 4 -
toolkit/source/awt/vclxwindows.cxx | 4 -
toolkit/source/controls/dialogcontrol.cxx | 38 ++++++-------
toolkit/source/controls/formattedcontrol.cxx | 6 +-
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx | 4 -
toolkit/source/controls/grid/gridcontrol.cxx | 6 +-
toolkit/source/controls/roadmapcontrol.cxx | 10 +--
toolkit/source/controls/roadmapentry.cxx | 14 ++---
toolkit/source/controls/stdtabcontroller.cxx | 2
toolkit/source/controls/tkscrollbar.cxx | 2
toolkit/source/controls/tksimpleanimation.cxx | 2
toolkit/source/controls/tkspinbutton.cxx | 2
toolkit/source/controls/tkthrobber.cxx | 2
toolkit/source/controls/tree/treecontrol.cxx | 2
toolkit/source/controls/unocontrol.cxx | 2
toolkit/source/controls/unocontrols.cxx | 44 ++++++++--------
toolkit/source/helper/accessibilityclient.cxx | 2
toolkit/source/helper/vclunohelper.cxx | 4 -
toolkit/source/layout/core/factory.cxx | 6 +-
toolkit/source/layout/core/helper.cxx | 4 -
toolkit/source/layout/core/import.cxx | 4 -
toolkit/source/layout/core/root.cxx | 26 ++++-----
toolkit/source/layout/core/translate.cxx | 12 ++--
toolkit/source/layout/vcl/wbutton.cxx | 4 -
toolkit/source/layout/vcl/wrapper.cxx | 2
toolkit/workben/layout/editor.cxx | 2
toolkit/workben/layout/test.cxx | 8 +-
31 files changed, 126 insertions(+), 126 deletions(-)
New commits:
commit e2b5a6de6421e0d55cb44f24b20cca6ab6d5549e
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Mon Nov 22 22:47:26 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in libs-gui 08
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index 6aaf8f8..2501aed 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 9d660fc..aa8f5c3 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 d0ddf42..ff7a9f3 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 1854127..6cad8dd 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 00d728a..1f9e395 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 f95f044..b911705 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
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index fe29c89..1fd1476 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -586,7 +586,7 @@ Reference< XInterface > UnoControlDialogModel::createInstance( const ::rtl::OUSt
Reference< XAggregation > xAgg( xCloneAccess, UNO_QUERY );
if ( xAgg.is() )
{
- if ( xSI->supportsService( ::rtl::OUString::createFromAscii( "com.sun.star.awt.UnoControlModel" ) ) )
+ if ( xSI->supportsService( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlModel")) ) )
{
// release 3 of the 4 references we have to the object
xAgg.clear();
@@ -1227,8 +1227,8 @@ void UnoControlDialogModel::implUpdateGroupStructure()
#if OSL_DEBUG_LEVEL > 1
Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
::rtl::OUString sLabel;
- if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString::createFromAscii( "Label" ) ) )
- xModelProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
+ if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) )
+ xModelProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) >>= sLabel;
aCurrentGroupLabels.push_back( sLabel );
#endif
}
@@ -1251,8 +1251,8 @@ void UnoControlDialogModel::implUpdateGroupStructure()
#if OSL_DEBUG_LEVEL > 1
Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
::rtl::OUString sLabel;
- if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString::createFromAscii( "Label" ) ) )
- xModelProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
+ if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) )
+ xModelProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) >>= sLabel;
aCurrentGroupLabels.push_back( sLabel );
#endif
}
@@ -1568,9 +1568,9 @@ UnoDialogControl::UnoDialogControl() :
sal_Bool bDecoration( sal_True );
ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration;
if ( bDecoration )
- return ::rtl::OUString::createFromAscii( "Dialog" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dialog"));
else
- return ::rtl::OUString::createFromAscii( "TabPage" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabPage"));
}
// XInterface
@@ -2275,10 +2275,10 @@ void UnoDialogControl::addingControl( const Reference< XControl >& _rxControl )
{
Sequence< ::rtl::OUString > aNames( 4 );
::rtl::OUString* pNames = aNames.getArray();
- *pNames++ = ::rtl::OUString::createFromAscii( "PositionX" );
- *pNames++ = ::rtl::OUString::createFromAscii( "PositionY" );
- *pNames++ = ::rtl::OUString::createFromAscii( "Width" );
- *pNames++ = ::rtl::OUString::createFromAscii( "Height" );
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionX"));
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionY"));
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width"));
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height"));
xProps->addPropertiesChangeListener( aNames, this );
}
@@ -2680,10 +2680,10 @@ void UnoParentControl::addingControl( const Reference< XControl >& _rxControl )
{
Sequence< ::rtl::OUString > aNames( 4 );
::rtl::OUString* pNames = aNames.getArray();
- *pNames++ = ::rtl::OUString::createFromAscii( "PositionX" );
- *pNames++ = ::rtl::OUString::createFromAscii( "PositionY" );
- *pNames++ = ::rtl::OUString::createFromAscii( "Width" );
- *pNames++ = ::rtl::OUString::createFromAscii( "Height" );
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionX"));
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionY"));
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width"));
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height"));
xProps->addPropertiesChangeListener( aNames, this );
}
@@ -2846,9 +2846,9 @@ uno::Any UnoMultiPageControl::queryAggregation( const uno::Type & rType ) throw(
sal_Bool bDecoration( sal_True );
ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration;
if ( bDecoration )
- return ::rtl::OUString::createFromAscii( "tabcontrol" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tabcontrol"));
// Hopefully we can tweak the tabcontrol to display without tabs
- return ::rtl::OUString::createFromAscii( "tabcontrolnotabs" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tabcontrolnotabs"));
}
void UnoMultiPageControl::bindPage( const uno::Reference< awt::XControl >& _rxControl )
@@ -3035,7 +3035,7 @@ UnoPageControl::~UnoPageControl()
::rtl::OUString UnoPageControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "tabpage" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tabpage"));
}
@@ -3145,7 +3145,7 @@ UnoFrameControl::~UnoFrameControl()
::rtl::OUString UnoFrameControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "frame" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("frame"));
}
void UnoFrameControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index 1c2416d..7f6860f 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -375,9 +375,9 @@ namespace toolkit
}
throw IllegalArgumentException(
- ( ::rtl::OUString::createFromAscii("Unable to convert the given value for the property ")
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to convert the given value for the property "))
+= GetPropertyName((sal_uInt16)nPropId) )
- += ::rtl::OUString::createFromAscii(" (double, integer, or string expected)."),
+ += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (double, integer, or string expected).")),
static_cast< XPropertySet* >(this),
1);
}
@@ -441,7 +441,7 @@ namespace toolkit
// -------------------------------------------------------------------
::rtl::OUString UnoFormattedFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "FormattedField" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormattedField"));
}
// -------------------------------------------------------------------
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index d6d99cf..a0eb936 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -117,14 +117,14 @@ void SAL_CALL DefaultGridColumnModel::setDefaultColumns(sal_Int32 rowElements) t
for(sal_Int32 i=0;i<rowElements;i++)
{
- Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn" ) ), UNO_QUERY );
+ Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.grid.GridColumn")) ), UNO_QUERY );
columns.push_back(xColumn);
xColumn->setIndex(i);
}
}
::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > SAL_CALL DefaultGridColumnModel::copyColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & column) throw (::com::sun::star::uno::RuntimeException)
{
- Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn" ) ), UNO_QUERY );
+ Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.grid.GridColumn")) ), UNO_QUERY );
xColumn->setColumnWidth(column->getColumnWidth());
xColumn->setPreferredWidth(column->getPreferredWidth());
xColumn->setMaxWidth(column->getMaxWidth());
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 3206260..853febd 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -162,7 +162,7 @@ UnoGridControl::UnoGridControl()
OUString UnoGridControl::GetComponentServiceName()
{
- return OUString::createFromAscii( "Grid" );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("Grid"));
}
void SAL_CALL UnoGridControl::dispose( ) throw(RuntimeException)
@@ -184,10 +184,10 @@ void UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk
Reference<XGridColumnListener> xColListener ( getPeer(), UNO_QUERY_THROW );
Reference<XPropertySet> xPropSet ( getModel(), UNO_QUERY_THROW );
- Reference<XGridDataModel> xGridDataModel ( xPropSet->getPropertyValue(OUString::createFromAscii( "GridDataModel" )), UNO_QUERY_THROW );
+ Reference<XGridDataModel> xGridDataModel ( xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("GridDataModel"))), UNO_QUERY_THROW );
if(xGridDataModel != NULL)
xGridDataModel->addDataListener(xListener);
- Reference<XGridColumnModel> xGridColumnModel ( xPropSet->getPropertyValue(OUString::createFromAscii( "ColumnModel" )), UNO_QUERY_THROW );
+ Reference<XGridColumnModel> xGridColumnModel ( xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnModel"))), UNO_QUERY_THROW );
if(xGridColumnModel != NULL)
{
for(int i = 0;i<xGridColumnModel->getColumnCount();i++)
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 0c17a58..9172928 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -196,7 +196,7 @@ static void lcl_throwIndexOutOfBoundsException( )
if ( !xRoadmapItem.is() )
lcl_throwIllegalArgumentException();
Reference< XServiceInfo > xServiceInfo( xRoadmapItem, UNO_QUERY );
- sal_Bool bIsRoadmapItem = xServiceInfo->supportsService( ::rtl::OUString::createFromAscii( "com.sun.star.awt.RoadmapItem" ) );
+ sal_Bool bIsRoadmapItem = xServiceInfo->supportsService( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.RoadmapItem")) );
if ( !bIsRoadmapItem )
lcl_throwIllegalArgumentException();
}
@@ -210,12 +210,12 @@ static void lcl_throwIndexOutOfBoundsException( )
if ( xProps.is() )
{
sal_Int32 LocID = 0;
- Any aValue = xPropertySet->getPropertyValue( ::rtl::OUString::createFromAscii( "ID" ) );
+ Any aValue = xPropertySet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")) );
aValue >>= LocID;
if (LocID < 0) // index may not be smaller than zero
{
aAny <<= GetUniqueID();
- xPropertySet->setPropertyValue( ::rtl::OUString::createFromAscii( "ID" ), aAny );
+ xPropertySet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")), aAny );
}
}
}
@@ -238,7 +238,7 @@ static void lcl_throwIndexOutOfBoundsException( )
{
CurRoadmapItem = *i;
Reference< XPropertySet > xPropertySet( CurRoadmapItem, UNO_QUERY );
- aAny = xPropertySet->getPropertyValue( ::rtl::OUString::createFromAscii( "ID" ) );
+ aAny = xPropertySet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")) );
aAny >>= n_CurItemID;
if (n_CurItemID == CurID)
{
@@ -396,7 +396,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >&
// -------------------------------------------------------------------
::rtl::OUString UnoRoadmapControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "Roadmap" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Roadmap"));
}
diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx
index c66cfb3..91635e3 100644
--- a/toolkit/source/controls/roadmapentry.cxx
+++ b/toolkit/source/controls/roadmapentry.cxx
@@ -40,22 +40,22 @@ ORoadmapEntry::ORoadmapEntry() : ORoadmapEntry_Base( )
{
// registerProperty or registerMayBeVoidProperty or registerPropertyNoMember
- registerProperty( ::rtl::OUString::createFromAscii( "Label" ), RM_PROPERTY_ID_LABEL,
+ registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), RM_PROPERTY_ID_LABEL,
::com::sun::star::beans::PropertyAttribute::BOUND |
::com::sun::star::beans::PropertyAttribute::CONSTRAINED,
& m_sLabel, ::getCppuType( &m_sLabel ) );
m_nID = -1;
- registerProperty( ::rtl::OUString::createFromAscii( "ID" ), RM_PROPERTY_ID_ID,
+ registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")), RM_PROPERTY_ID_ID,
::com::sun::star::beans::PropertyAttribute::BOUND |
::com::sun::star::beans::PropertyAttribute::CONSTRAINED,
& m_nID, ::getCppuType( &m_nID ) );
m_bEnabled = sal_True;
- registerProperty( ::rtl::OUString::createFromAscii( "Enabled" ), RM_PROPERTY_ID_ENABLED,
+ registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")), RM_PROPERTY_ID_ENABLED,
::com::sun::star::beans::PropertyAttribute::BOUND |
::com::sun::star::beans::PropertyAttribute::MAYBEDEFAULT,
& m_bEnabled, ::getCppuType( &m_bEnabled ) );
- registerProperty( ::rtl::OUString::createFromAscii( "Interactive" ), RM_PROPERTY_ID_INTERACTIVE,
+ registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Interactive")), RM_PROPERTY_ID_INTERACTIVE,
::com::sun::star::beans::PropertyAttribute::BOUND |
::com::sun::star::beans::PropertyAttribute::MAYBEDEFAULT,
& m_bInteractive, ::getCppuType( &m_bInteractive ) );
@@ -91,20 +91,20 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORoadmapEntry, ORoadmapEntry_Base, ::comphelpe
::rtl::OUString SAL_CALL ORoadmapEntry::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
{
- ::rtl::OUString aStr = ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.RoadmapItem");
+ ::rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.RoadmapItem"));
return aStr;
}
sal_Bool SAL_CALL ORoadmapEntry::supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException)
{
- return ServiceName.equals( ::rtl::OUString::createFromAscii( "com.sun.star.awt.RoadmapItem" ) );
+ return ServiceName.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.RoadmapItem")) );
}
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ORoadmapEntry::getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException)
{
::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1);
::rtl::OUString* pArray = aRet.getArray();
- pArray[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.RoadmapItem" );
+ pArray[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.RoadmapItem"));
return aRet;
}
//--------------------------------------------------------------------------
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index 50799a0..9b2278a 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -121,7 +121,7 @@ sal_Bool StdTabController::ImplCreateComponentSequence(
if ( pTabs )
{
// opt: String fuer TabStop als Konstante
- static const ::rtl::OUString aTabStopName( ::rtl::OUString::createFromAscii( "Tabstop" ) );
+ static const ::rtl::OUString aTabStopName( RTL_CONSTASCII_USTRINGPARAM("Tabstop") );
Reference< XPropertySet > xPSet( xCtrl->getModel(), UNO_QUERY );
Reference< XPropertySetInfo > xInfo = xPSet->getPropertySetInfo();
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index 75a29ae..4148084 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -104,7 +104,7 @@ namespace toolkit
::rtl::OUString UnoScrollBarControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "ScrollBar" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScrollBar"));
}
// ::com::sun::star::uno::XInterface
diff --git a/toolkit/source/controls/tksimpleanimation.cxx b/toolkit/source/controls/tksimpleanimation.cxx
index f0454e8..6831268 100644
--- a/toolkit/source/controls/tksimpleanimation.cxx
+++ b/toolkit/source/controls/tksimpleanimation.cxx
@@ -127,7 +127,7 @@ namespace toolkit
//--------------------------------------------------------------------
::rtl::OUString UnoSimpleAnimationControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "SimpleAnimation" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SimpleAnimation"));
}
//--------------------------------------------------------------------
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index 6cefd1e..d526f4f 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -146,7 +146,7 @@ namespace toolkit
//--------------------------------------------------------------------
::rtl::OUString UnoSpinButtonControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "SpinButton" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SpinButton"));
}
//--------------------------------------------------------------------
diff --git a/toolkit/source/controls/tkthrobber.cxx b/toolkit/source/controls/tkthrobber.cxx
index e408137..0f0d295 100644
--- a/toolkit/source/controls/tkthrobber.cxx
+++ b/toolkit/source/controls/tkthrobber.cxx
@@ -125,7 +125,7 @@ namespace toolkit
//--------------------------------------------------------------------
::rtl::OUString UnoThrobberControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "Throbber" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Throbber"));
}
//--------------------------------------------------------------------
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index d5d9ce3..2f411aa 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -148,7 +148,7 @@ UnoTreeControl::UnoTreeControl()
OUString UnoTreeControl::GetComponentServiceName()
{
- return OUString::createFromAscii( "Tree" );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("Tree"));
}
// -------------------------------------------------------------------
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 71df27c..eeb882f 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -1119,7 +1119,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
if ( !mxModel.is() )
{
RuntimeException aException;
- aException.Message = ::rtl::OUString::createFromAscii( "createPeer: no model!" );
+ aException.Message = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createPeer: no model!"));
aException.Context = (XAggregation*)(::cppu::OWeakAggObject*)this;
throw( aException );
}
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 98dd5b6..ec3f402 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -186,13 +186,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoEditControl, UnoControlBase, UnoEditControl
::rtl::OUString UnoEditControl::GetComponentServiceName()
{
// by default, we want a simple edit field
- ::rtl::OUString sName( ::rtl::OUString::createFromAscii( "Edit" ) );
+ ::rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Edit") );
// but maybe we are to display multi-line text?
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_MULTILINE ) );
sal_Bool b = sal_Bool();
if ( ( aVal >>= b ) && b )
- sName= ::rtl::OUString::createFromAscii( "MultiLineEdit" );
+ sName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MultiLineEdit"));
return sName;
}
@@ -524,7 +524,7 @@ UnoFileControl::UnoFileControl()
::rtl::OUString UnoFileControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "filecontrol" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filecontrol"));
}
// ----------------------------------------------------
@@ -704,7 +704,7 @@ UnoButtonControl::UnoButtonControl()
::rtl::OUString UnoButtonControl::GetComponentServiceName()
{
- ::rtl::OUString aName( ::rtl::OUString::createFromAscii( "pushbutton" ) );
+ ::rtl::OUString aName( RTL_CONSTASCII_USTRINGPARAM("pushbutton") );
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_PUSHBUTTONTYPE ) );
sal_Int16 n = sal_Int16();
if ( ( aVal >>= n ) && n )
@@ -712,11 +712,11 @@ UnoButtonControl::UnoButtonControl()
// Use PushButtonType later when available...
switch ( n )
{
- case 1 /*PushButtonType::OK*/: aName= ::rtl::OUString::createFromAscii( "okbutton" );
+ case 1 /*PushButtonType::OK*/: aName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("okbutton"));
break;
- case 2 /*PushButtonType::CANCEL*/: aName= ::rtl::OUString::createFromAscii( "cancelbutton" );
+ case 2 /*PushButtonType::CANCEL*/: aName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cancelbutton"));
break;
- case 3 /*PushButtonType::HELP*/: aName= ::rtl::OUString::createFromAscii( "helpbutton" );
+ case 3 /*PushButtonType::HELP*/: aName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("helpbutton"));
break;
default:
{
@@ -924,7 +924,7 @@ UnoImageControlControl::UnoImageControlControl()
::rtl::OUString UnoImageControlControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "fixedimage" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedimage"));
}
void UnoImageControlControl::dispose() throw(uno::RuntimeException)
@@ -1014,7 +1014,7 @@ UnoRadioButtonControl::UnoRadioButtonControl()
::rtl::OUString UnoRadioButtonControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "radiobutton" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("radiobutton"));
}
void UnoRadioButtonControl::dispose() throw(uno::RuntimeException)
@@ -1221,7 +1221,7 @@ UnoCheckBoxControl::UnoCheckBoxControl()
::rtl::OUString UnoCheckBoxControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "checkbox" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("checkbox"));
}
void UnoCheckBoxControl::dispose() throw(uno::RuntimeException)
@@ -1412,7 +1412,7 @@ UnoFixedHyperlinkControl::UnoFixedHyperlinkControl()
::rtl::OUString UnoFixedHyperlinkControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "fixedhyperlink" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedhyperlink"));
}
// uno::XInterface
@@ -1591,7 +1591,7 @@ UnoFixedTextControl::UnoFixedTextControl()
::rtl::OUString UnoFixedTextControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "fixedtext" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedtext"));
}
// uno::XInterface
@@ -1722,7 +1722,7 @@ UnoGroupBoxControl::UnoGroupBoxControl()
::rtl::OUString UnoGroupBoxControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "groupbox" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("groupbox"));
}
sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException)
@@ -2287,7 +2287,7 @@ UnoListBoxControl::UnoListBoxControl()
::rtl::OUString UnoListBoxControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "listbox" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("listbox"));
}
IMPL_SERVICEINFO_DERIVED( UnoListBoxControl, UnoControlBase, szServiceName2_UnoControlListBox )
@@ -2793,7 +2793,7 @@ IMPL_SERVICEINFO_DERIVED( UnoComboBoxControl, UnoEditControl, szServiceName2_Uno
::rtl::OUString UnoComboBoxControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "combobox" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("combobox"));
}
void UnoComboBoxControl::dispose() throw(uno::RuntimeException)
@@ -3246,7 +3246,7 @@ UnoDateFieldControl::UnoDateFieldControl()
::rtl::OUString UnoDateFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "datefield" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("datefield"));
}
// uno::XInterface
@@ -3485,7 +3485,7 @@ UnoTimeFieldControl::UnoTimeFieldControl()
::rtl::OUString UnoTimeFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "timefield" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("timefield"));
}
// uno::XInterface
@@ -3684,7 +3684,7 @@ UnoNumericFieldControl::UnoNumericFieldControl()
::rtl::OUString UnoNumericFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "numericfield" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("numericfield"));
}
// uno::XInterface
@@ -3884,7 +3884,7 @@ UnoCurrencyFieldControl::UnoCurrencyFieldControl()
::rtl::OUString UnoCurrencyFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "longcurrencyfield" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("longcurrencyfield"));
}
// uno::XInterface
@@ -4075,7 +4075,7 @@ UnoPatternFieldControl::UnoPatternFieldControl()
::rtl::OUString UnoPatternFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "patternfield" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("patternfield"));
}
void UnoPatternFieldControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const uno::Any& rVal )
@@ -4220,7 +4220,7 @@ UnoProgressBarControl::UnoProgressBarControl()
::rtl::OUString UnoProgressBarControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "ProgressBar" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ProgressBar"));
}
// uno::XInterface
@@ -4349,7 +4349,7 @@ UnoFixedLineControl::UnoFixedLineControl()
::rtl::OUString UnoFixedLineControl::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "FixedLine" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FixedLine"));
}
sal_Bool UnoFixedLineControl::isTransparent() throw(uno::RuntimeException)
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index 63982e5..c381d94 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -212,7 +212,7 @@ namespace toolkit
if ( s_hAccessibleImplementationModule != NULL )
{
const ::rtl::OUString sFactoryCreationFunc =
- ::rtl::OUString::createFromAscii( "getStandardAccessibleFactory" );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getStandardAccessibleFactory"));
s_pAccessibleFactoryFunc = (GetStandardAccComponentFactory)
osl_getFunctionSymbol( s_hAccessibleImplementationModule, sFactoryCreationFunc.pData );
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index bd95cd7..634565e 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -639,7 +639,7 @@ MapUnit /* MapModeUnit */ VCLUnoHelper::ConvertToMapModeUnit(sal_Int16 /* com.su
*/
default:
- throw ::com::sun::star::lang::IllegalArgumentException(::rtl::OUString::createFromAscii("Unsupported measure unit."), NULL, 1 );
+ throw ::com::sun::star::lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unsupported measure unit.")), NULL, 1 );
}
return eMode;
}
@@ -709,7 +709,7 @@ sal_Int16 /* com.sun.star.util.MeasureUnit.* */ VCLUnoHelper::ConvertToMeasureme
break;
*/
default:
- throw ::com::sun::star::lang::IllegalArgumentException(::rtl::OUString::createFromAscii("Unsupported MapMode unit."), NULL, 1 );
+ throw ::com::sun::star::lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unsupported MapMode unit.")), NULL, 1 );
}
return nMeasureUnit;
}
diff --git a/toolkit/source/layout/core/factory.cxx b/toolkit/source/layout/core/factory.cxx
index 30856e2..db6c995 100644
--- a/toolkit/source/layout/core/factory.cxx
+++ b/toolkit/source/layout/core/factory.cxx
@@ -88,14 +88,14 @@ sal_Bool SAL_CALL comp_Layout_component_writeInfo( void * /*serviceManager*/, vo
// Component registration
::rtl::OUString SAL_CALL LayoutFactory::impl_staticGetImplementationName()
{
- return ::rtl::OUString::createFromAscii( "com.sun.star.comp.awt.Layout" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.awt.Layout"));
}
uno::Sequence< ::rtl::OUString > SAL_CALL LayoutFactory::impl_staticGetSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > aRet(2);
- aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.awt.Layout");
- aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.awt.Layout");
+ aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Layout"));
+ aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.awt.Layout"));
return aRet;
}
diff --git a/toolkit/source/layout/core/helper.cxx b/toolkit/source/layout/core/helper.cxx
index 80013b2..0afd3a4 100644
--- a/toolkit/source/layout/core/helper.cxx
+++ b/toolkit/source/layout/core/helper.cxx
@@ -139,7 +139,7 @@ uno::Reference <awt::XLayoutConstrains> WidgetFactory::toolkitCreateWidget (uno:
VCLXWindow* parentComponent = VCLXWindow::GetImplementation( xWinParent );
if ( !parentComponent )
throw uno::RuntimeException(
- OUString::createFromAscii( "parent has no implementation" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("parent has no implementation")),
uno::Reference< uno::XInterface >() );
desc.Parent = xWinParent;
}
@@ -192,7 +192,7 @@ WidgetFactory::createWidget (uno::Reference< awt::XToolkit > xToolkit, uno::Refe
OUString tName = name;
// FIXME
if ( name.equalsAscii( "fixedinfo" ) )
- tName = OUString::createFromAscii( "fixedtext" );
+ tName = OUString(RTL_CONSTASCII_USTRINGPARAM("fixedtext"));
xPeer = toolkitCreateWidget (xToolkit, xParent, tName, properties);
#else
xPeer = toolkitCreateWidget (xToolkit, xParent, name, properties);
diff --git a/toolkit/source/layout/core/import.cxx b/toolkit/source/layout/core/import.cxx
index b4c0391..7b1cac4 100644
--- a/toolkit/source/layout/core/import.cxx
+++ b/toolkit/source/layout/core/import.cxx
@@ -174,9 +174,9 @@ WidgetElement::characters( OUString const& rChars )
if ( xDialog.is() )
xDialog->setTitle( rChars );
else if ( xButton.is() )
- mpWidget->setProperty( OUString::createFromAscii( "label" ), rChars );
+ mpWidget->setProperty( OUString(RTL_CONSTASCII_USTRINGPARAM("label")), rChars );
else
- mpWidget->setProperty( OUString::createFromAscii( "text" ), rChars );
+ mpWidget->setProperty( OUString(RTL_CONSTASCII_USTRINGPARAM("text")), rChars );
}
}
// ---- ElementBase ----
diff --git a/toolkit/source/layout/core/root.cxx b/toolkit/source/layout/core/root.cxx
index db6bedc..7ca0036 100644
--- a/toolkit/source/layout/core/root.cxx
+++ b/toolkit/source/layout/core/root.cxx
@@ -80,7 +80,7 @@ LayoutRoot::~LayoutRoot()
void ShowMessageBox( uno::Reference< lang::XMultiServiceFactory > const& xFactory, uno::Reference< awt::XToolkit > xToolkit, OUString const& aTitle, OUString const& aMessage )
{
uno::Reference< uno::XInterface > iDesktop = xFactory->createInstance
- ( OUString::createFromAscii( "com.sun.star.frame.Desktop" ) );
+ ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) );
uno::Reference< frame::XDesktop > xDesktop ( iDesktop, uno::UNO_QUERY );
uno::Reference< frame::XFrame > xFrame ( xDesktop->getCurrentFrame() );
uno::Reference< awt::XWindow > xContainerWindow( xFrame->getContainerWindow() );
@@ -90,7 +90,7 @@ void ShowMessageBox( uno::Reference< lang::XMultiServiceFactory > const& xFactor
awt::Rectangle aRectangle;
uno::Reference< awt::XMessageBox > xMessageBox
= xMessageBoxFactory->createMessageBox
- ( xWindowPeer, aRectangle, OUString::createFromAscii( "errorbox" ),
+ ( xWindowPeer, aRectangle, OUString(RTL_CONSTASCII_USTRINGPARAM("errorbox")),
awt::MessageBoxButtons::BUTTONS_OK, aTitle, aMessage );
if ( xMessageBox.is() )
@@ -104,7 +104,7 @@ void LayoutRoot::error( OUString const& message )
{
OSL_TRACE( "%s\n", OUSTRING_CSTR( message ) );
ShowMessageBox( mxFactory, mxToolkit,
- OUString::createFromAscii( "Fatal error" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Fatal error")),
message );
throw uno::RuntimeException( message, uno::Reference< uno::XInterface >() );
}
@@ -133,13 +133,13 @@ void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArgument
uno::Reference< xml::sax::XParser > xParser
( mxFactory->createInstance(
- OUString::createFromAscii( "com.sun.star.xml.sax.Parser" ) ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ),
uno::UNO_QUERY );
OSL_ASSERT( xParser.is() );
if (! xParser.is())
{
throw uno::RuntimeException(
- OUString::createFromAscii( "cannot create sax-parser component" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("cannot create sax-parser component")),
uno::Reference< uno::XInterface >() );
}
@@ -148,18 +148,18 @@ void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArgument
mxToolkit = uno::Reference< awt::XToolkit >(
mxFactory->createInstance(
- OUString::createFromAscii( "com.sun.star.awt.Toolkit" ) ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")) ),
uno::UNO_QUERY );
if ( !mxToolkit.is() )
throw uno::RuntimeException(
- OUString::createFromAscii( "failed to create toolkit!" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("failed to create toolkit!")),
uno::Reference< uno::XInterface >() );
OUString aXMLFile = readRightTranslation( aXMLName );
uno::Reference< io::XInputStream > xStream = getFileAsStream( aXMLFile );
if (! xStream.is() )
- error( OUString::createFromAscii( "Installation problem: cannot find XML file:" ) + aXMLName );
+ error( OUString(RTL_CONSTASCII_USTRINGPARAM("Installation problem: cannot find XML file:")) + aXMLName );
// error handler, entity resolver omitted
@@ -170,17 +170,17 @@ void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArgument
aArgs[0] <<= xRoot;
uno::Reference< xml::sax::XDocumentHandler > xDocHandler
(mxFactory->createInstanceWithArguments
- ( OUString::createFromAscii( "com.sun.star.xml.input.SaxDocumentHandler" ),
+ ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.input.SaxDocumentHandler")),
aArgs ), uno::UNO_QUERY );
if (! xDocHandler.is() )
- error( OUString::createFromAscii( "cannot find SAx handler for document type of:") + aXMLName );
+ error( OUString(RTL_CONSTASCII_USTRINGPARAM("cannot find SAx handler for document type of:")) + aXMLName );
xParser->setDocumentHandler( xDocHandler );
xml::sax::InputSource source;
source.aInputStream = xStream;
- source.sSystemId = OUString::createFromAscii( "virtual file" );
+ source.sSystemId = OUString(RTL_CONSTASCII_USTRINGPARAM("virtual file"));
try
{
@@ -188,11 +188,11 @@ void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArgument
}
catch ( xml::sax::SAXParseException& e )
{
- OUString c = OUString::createFromAscii( ":" );
+ OUString c(RTL_CONSTASCII_USTRINGPARAM(":"));
error( aXMLName
+ c + OUString::valueOf( e.LineNumber )
+ c + OUString::valueOf( e.ColumnNumber )
- + c + OUString::createFromAscii( "Sax parse error" ) );
+ + c + OUString(RTL_CONSTASCII_USTRINGPARAM("Sax parse error")) );
}
}
diff --git a/toolkit/source/layout/core/translate.cxx b/toolkit/source/layout/core/translate.cxx
index 916ecbf..01ba5f2 100644
--- a/toolkit/source/layout/core/translate.cxx
+++ b/toolkit/source/layout/core/translate.cxx
@@ -54,19 +54,19 @@ static std::list<OUString>
getLocaleSubdirList( lang::Locale const& rLocale )
{
std::list<OUString> aSubdirs;
- aSubdirs.push_front( OUString::createFromAscii( "." ) );
- aSubdirs.push_front( OUString::createFromAscii( "en-US" ) );
+ aSubdirs.push_front( OUString(RTL_CONSTASCII_USTRINGPARAM(".")) );
+ aSubdirs.push_front( OUString(RTL_CONSTASCII_USTRINGPARAM("en-US")) );
if ( rLocale.Language.getLength() )
aSubdirs.push_front( rLocale.Language );
if ( rLocale.Country.getLength() )
{
OUString aLocaleCountry = rLocale.Language
- + OUString::createFromAscii( "-" )
+ + OUString(RTL_CONSTASCII_USTRINGPARAM("-"))
+ rLocale.Country;
aSubdirs.push_front( aLocaleCountry );
if ( rLocale.Variant.getLength() )
aSubdirs.push_front( aLocaleCountry
- + OUString::createFromAscii( "." )
+ + OUString(RTL_CONSTASCII_USTRINGPARAM("."))
+ rLocale.Variant );
}
return aSubdirs;
@@ -84,7 +84,7 @@ static OUString
getFirstExisting( OUString const& aDir, std::list<OUString> const& aSubDirs,
OUString const& aXMLName )
{
- static OUString const aSlash = OUString::createFromAscii( "/" );
+ static OUString const aSlash(RTL_CONSTASCII_USTRINGPARAM("/"));
String aResult;
for ( std::list<OUString>::const_iterator i = aSubDirs.begin();
i != aSubDirs.end(); i++ )
@@ -118,7 +118,7 @@ readRightTranslation( OUString const& aXMLName )
{
OUString aShareUrl;
Bootstrap::locateSharedData( aShareUrl );
- OUString aXMLUrl = aShareUrl + OUString::createFromAscii( "/layout" );
+ OUString aXMLUrl = aShareUrl + OUString(RTL_CONSTASCII_USTRINGPARAM("/layout"));
String aXMLDir;
LocalFileHelper::ConvertURLToPhysicalName( aXMLUrl, aXMLDir );
aXMLFile = getFirstExisting( aXMLDir, aSubdirs, aXMLName );
diff --git a/toolkit/source/layout/vcl/wbutton.cxx b/toolkit/source/layout/vcl/wbutton.cxx
index 0a7e0e4..67573ee 100644
--- a/toolkit/source/layout/vcl/wbutton.cxx
+++ b/toolkit/source/layout/vcl/wbutton.cxx
@@ -507,8 +507,8 @@ public:
// TODO: i18n
// Button::GetStandardText( BUTTON_ADVANCED );
// Button::GetStandardText( BUTTON_SIMPLE );
- , mAdvancedLabel( rtl::OUString::createFromAscii( "Advanced..." ) )
- , mSimpleLabel( rtl::OUString::createFromAscii( "Simple..." ) )
+ , mAdvancedLabel( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Advanced...")) )
+ , mSimpleLabel( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Simple...")) )
{
}
void Click()
diff --git a/toolkit/source/layout/vcl/wrapper.cxx b/toolkit/source/layout/vcl/wrapper.cxx
index 75dd9a8..79ab361 100644
--- a/toolkit/source/layout/vcl/wrapper.cxx
+++ b/toolkit/source/layout/vcl/wrapper.cxx
@@ -81,7 +81,7 @@ public:
uno::Reference< lang::XSingleServiceFactory > xFactory(
comphelper::createProcessComponent(
- OUString::createFromAscii( "com.sun.star.awt.Layout" ) ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Layout")) ),
uno::UNO_QUERY );
if ( !xFactory.is() )
{
diff --git a/toolkit/workben/layout/editor.cxx b/toolkit/workben/layout/editor.cxx
index 10a2cdf..509cdc8 100644
--- a/toolkit/workben/layout/editor.cxx
+++ b/toolkit/workben/layout/editor.cxx
@@ -1707,7 +1707,7 @@ void EditorImpl::loadFile( const rtl::OUString &aTestFile )
/*
mxMSF->createInstance
- ( ::rtl::OUString::createFromAscii( "com.sun.star.awt.Layout" ) ),
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Layout")) ),
uno::UNO_QUERY );
*/
if ( !xRoot.is() )
diff --git a/toolkit/workben/layout/test.cxx b/toolkit/workben/layout/test.cxx
index e0adb6d..512ac10 100644
--- a/toolkit/workben/layout/test.cxx
+++ b/toolkit/workben/layout/test.cxx
@@ -150,9 +150,9 @@ void LayoutTest::InitUCB()
<<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
aArgs[1]
<<= OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
- aArgs[2] <<= OUString::createFromAscii( "PIPE" );
+ aArgs[2] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("PIPE"));
aArgs[3] <<= aEmpty;
- aArgs[4] <<= OUString::createFromAscii( "PORTAL" );
+ aArgs[4] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("PORTAL"));
aArgs[5] <<= aEmpty;
if ( !::ucbhelper::ContentBroker::initialize( mxMSF, aArgs ) )
@@ -209,7 +209,7 @@ void LayoutTest::ParseCommandLine()
}
else if ( aParam.equalsAscii( "--test" ) )
{
- mTestDialog = OUString::createFromAscii( "zoom" );
+ mTestDialog = OUString(RTL_CONSTASCII_USTRINGPARAM("zoom"));
if (i + 1 < GetCommandLineParamCount())
mTestDialog = GetCommandLineParam( ++i );
}
@@ -220,7 +220,7 @@ void LayoutTest::ParseCommandLine()
}
if ( mFiles.size() <= 0 )
- mFiles.push_back( OUString::createFromAscii( "layout.xml" ) );
+ mFiles.push_back( OUString(RTL_CONSTASCII_USTRINGPARAM("layout.xml")) );
}
void LayoutTest::RunEditor()
More information about the Libreoffice-commits
mailing list