[Libreoffice-commits] .: svx/source
David Tardon
dtardon at kemper.freedesktop.org
Sun Nov 14 21:40:35 PST 2010
svx/source/form/dbtoolsclient.cxx | 2
svx/source/form/fmPropBrw.cxx | 4 -
svx/source/form/fmdmod.cxx | 20 +++---
svx/source/form/fmobj.cxx | 4 -
svx/source/form/fmpgeimp.cxx | 2
svx/source/form/fmscriptingenv.cxx | 5 -
svx/source/form/fmshell.cxx | 2
svx/source/form/fmshimp.cxx | 30 +++++-----
svx/source/form/fmtools.cxx | 6 +-
svx/source/form/legacyformcontroller.cxx | 2
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 16 ++---
11 files changed, 46 insertions(+), 47 deletions(-)
New commits:
commit f32706af17231d5ca61f4d138410b649f6819e79
Author: Joost Eekhoorn <joost.eekhoorn at gmail.com>
Date: Mon Nov 15 06:40:20 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in svx
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index 6f8c1d3..9fbb2c4 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -122,7 +122,7 @@ namespace svxform
if (NULL != s_hDbtoolsModule)
{
// get the symbol for the method creating the factory
- const ::rtl::OUString sFactoryCreationFunc = ::rtl::OUString::createFromAscii("createDataAccessToolsFactory");
+ const ::rtl::OUString sFactoryCreationFunc( RTL_CONSTASCII_USTRINGPARAM("createDataAccessToolsFactory") );
// reinterpret_cast<createDataAccessToolsFactoryFunction>
s_pFactoryCreationFunc = (createDataAccessToolsFactoryFunction)(
osl_getFunctionSymbol(s_hDbtoolsModule, sFactoryCreationFunc.pData));
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 6f9ad0a..52bc42f 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -231,7 +231,7 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding
try
{
// create a frame wrapper for myself
- m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Frame")), UNO_QUERY);
+ m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")) ), UNO_QUERY);
if (m_xMeAsFrame.is())
{
// create an intermediate window, which is to be the container window of the frame
@@ -244,7 +244,7 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding
m_xFrameContainerWindow = VCLUnoHelper::GetInterface ( pContainerWindow );
m_xMeAsFrame->initialize( m_xFrameContainerWindow );
- m_xMeAsFrame->setName(::rtl::OUString::createFromAscii("form property browser"));
+ m_xMeAsFrame->setName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("form property browser")) );
if ( _pBindings->GetDispatcher() )
{
::com::sun::star::uno::Reference < ::com::sun::star::frame::XFramesSupplier >
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 877ea51..70aaa82 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -42,11 +42,11 @@ using namespace ::svxform;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstance(const ::rtl::OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException )
{
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRet;
- if ( ServiceSpecifier.indexOf( ::rtl::OUString::createFromAscii("com.sun.star.form.component.") ) == 0 )
+ if ( ServiceSpecifier.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.")) ) == 0 )
{
xRet = ::comphelper::getProcessServiceFactory()->createInstance(ServiceSpecifier);
}
- else if ( ServiceSpecifier == ::rtl::OUString( ::rtl::OUString::createFromAscii("com.sun.star.drawing.ControlShape") ) )
+ else if ( ServiceSpecifier == ::rtl::OUString( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")) ) )
{
SdrObject* pObj = new FmFormObj(OBJ_FM_CONTROL);
xRet = *new SvxShapeControl(pObj);
@@ -107,19 +107,19 @@ using namespace ::svxform;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRet;
sal_uInt16 nTokenCount = ServiceName.getTokenCount('.');
if (nTokenCount == 5 &&
- ServiceName.getToken( 0, '.' ) == ::rtl::OUString::createFromAscii("stardiv") &&
- ServiceName.getToken( 1, '.' ) == ::rtl::OUString::createFromAscii("one") &&
- ServiceName.getToken( 2, '.' ) == ::rtl::OUString::createFromAscii("form") &&
- ServiceName.getToken( 3, '.' ) == ::rtl::OUString::createFromAscii("component"))
+ ServiceName.getToken( 0, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv")) &&
+ ServiceName.getToken( 1, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("one")) &&
+ ServiceName.getToken( 2, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("form")) &&
+ ServiceName.getToken( 3, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("component")) )
{
xRet = ::comphelper::getProcessServiceFactory()->createInstance(ServiceName);
}
else
if (nTokenCount == 4 &&
- ServiceName.getToken( 0, '.' ) == ::rtl::OUString::createFromAscii("stardiv") &&
- ServiceName.getToken( 1, '.' ) == ::rtl::OUString::createFromAscii("one") &&
- ServiceName.getToken( 2, '.' ) == ::rtl::OUString::createFromAscii("drawing") &&
- ServiceName.getToken( 3, '.' ) == ::rtl::OUString::createFromAscii("ControlShape"))
+ ServiceName.getToken( 0, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv")) &&
+ ServiceName.getToken( 1, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("one")) &&
+ ServiceName.getToken( 2, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("drawing")) &&
+ ServiceName.getToken( 3, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlShape")) )
{
SdrObject* pObj = new FmFormObj();
xRet = *new SvxShapeControl(pObj);
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index 703a66a..236d587 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -375,7 +375,7 @@ void FmFormObj::clonedFrom(const FmFormObj* _pSource)
Reference< XInterface > xSourceContainer = xSourceAsChild->getParent();
m_xEnvironmentHistory = Reference< XIndexContainer >(
- ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.form.Forms")),
+ ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.Forms")) ),
UNO_QUERY);
DBG_ASSERT(m_xEnvironmentHistory.is(), "FmFormObj::clonedFrom : could not create a forms collection !");
@@ -581,7 +581,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface >
{
// create and insert (into the destination) a copy of the form
xCurrentDestForm.set(
- ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii( "com.sun.star.form.component.DataForm" ) ),
+ ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DataForm" )) ),
UNO_QUERY_THROW );
::comphelper::copyProperties( xCurrentSourceForm, xCurrentDestForm );
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 44f2067..eed59d1 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -335,7 +335,7 @@ const Reference< XNameContainer >& FmFormPageImpl::getForms( bool _bForceCreate
{
m_bAttemptedFormCreation = true;
- const ::rtl::OUString sFormsCollectionServiceName = ::rtl::OUString::createFromAscii("com.sun.star.form.Forms");
+ const ::rtl::OUString sFormsCollectionServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.Forms") );
m_xForms = Reference< XNameContainer > (
::comphelper::getProcessServiceFactory()->createInstance( sFormsCollectionServiceName ),
UNO_QUERY
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index af6f46a..2cd86b8 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -212,7 +212,7 @@ namespace svxform
Reference< XHierarchicalNameAccess > xTypeDescriptions( aContext.getSingleton( "com.sun.star.reflection.theTypeDescriptionManager" ), UNO_QUERY_THROW );
::rtl::OUString sMethodDescription( _rListenerType );
- sMethodDescription += ::rtl::OUString::createFromAscii( "::" );
+ sMethodDescription += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "::" ));
sMethodDescription += _rMethodName;
Reference< XInterfaceMethodTypeDescription > xMethod( xTypeDescriptions->getByHierarchicalName( sMethodDescription ), UNO_QUERY_THROW );
@@ -239,8 +239,7 @@ namespace svxform
void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException)
{
::osl::ClearableMutexGuard aGuard( m_aMutex );
- static const ::rtl::OUString vbaInterOp =
- ::rtl::OUString::createFromAscii("VBAInterop");
+ static const ::rtl::OUString vbaInterOp( RTL_CONSTASCII_USTRINGPARAM("VBAInterop") );
if ( _rEvent.ScriptType.equals(vbaInterOp) )
return; // not handled here
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 3996728..fb12f03 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -810,7 +810,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
}
if ( nRecord != -1 )
- rController->execute( nSlot, ::rtl::OUString::createFromAscii( "Position" ), makeAny( (sal_Int32)nRecord ) );
+ rController->execute( nSlot, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Position" )), makeAny( (sal_Int32)nRecord ) );
rReq.Done();
} break;
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 404ffb3..2c351ed 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -390,8 +390,8 @@ namespace
Sequence< Type> aModelListeners;
Sequence< Type> aControlListeners;
- Reference< XIntrospection> xModelIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.beans.Introspection")), UNO_QUERY);
- Reference< XIntrospection> xControlIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.beans.Introspection")), UNO_QUERY);
+ Reference< XIntrospection> xModelIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection"))), UNO_QUERY);
+ Reference< XIntrospection> xControlIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection"))), UNO_QUERY);
if (xModelIntrospection.is() && xModel.is())
{
@@ -526,8 +526,8 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun
{
switch ( (TriState)xCheckBox->getState() )
{
- case STATE_NOCHECK: *_pCurrentText = ::rtl::OUString::createFromAscii( "0" ); break;
- case STATE_CHECK: *_pCurrentText = ::rtl::OUString::createFromAscii( "1" ); break;
+ case STATE_NOCHECK: *_pCurrentText = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "0" )); break;
+ case STATE_CHECK: *_pCurrentText = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "1" )); break;
default: *_pCurrentText = ::rtl::OUString(); break;
}
}
@@ -656,7 +656,7 @@ DBG_NAME(FmXFormShell);
//------------------------------------------------------------------------
FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
:FmXFormShell_BASE(m_aMutex)
- ,FmXFormShell_CFGBASE(::rtl::OUString::createFromAscii("Office.Common/Misc"), CONFIG_MODE_DELAYED_UPDATE)
+ ,FmXFormShell_CFGBASE(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Misc")), CONFIG_MODE_DELAYED_UPDATE)
,m_eNavigate( NavigationBarMode_NONE )
,m_nInvalidationEvent( 0 )
,m_nActivationEvent( 0 )
@@ -695,7 +695,7 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
implAdjustConfigCache();
// and register for changes on this settings
Sequence< ::rtl::OUString > aNames(1);
- aNames[0] = ::rtl::OUString::createFromAscii("FormControlPilotsEnabled");
+ aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormControlPilotsEnabled"));
EnableNotification(aNames);
}
@@ -1735,7 +1735,7 @@ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n)
{
try
{
- Any aVal( xSet->getPropertyValue(::rtl::OUString::createFromAscii("TwoDigitDateStart")) );
+ Any aVal( xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TwoDigitDateStart"))) );
aVal >>= n;
return sal_True;
}
@@ -1769,7 +1769,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n)
{
Any aVal;
aVal <<= n;
- xSet->setPropertyValue(::rtl::OUString::createFromAscii("TwoDigitDateStart"), aVal);
+ xSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TwoDigitDateStart")), aVal);
}
catch(Exception&)
{
@@ -1810,7 +1810,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n)
{
Any aVal;
aVal <<= n;
- xSet->setPropertyValue(::rtl::OUString::createFromAscii("TwoDigitDateStart"), aVal);
+ xSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TwoDigitDateStart")), aVal);
}
catch(Exception&)
{
@@ -3340,7 +3340,7 @@ void FmXFormShell::CreateExternalView()
// the frame the external view is displayed in
sal_Bool bAlreadyExistent = m_xExternalViewController.is();
Reference< ::com::sun::star::frame::XFrame> xExternalViewFrame;
- ::rtl::OUString sFrameName = ::rtl::OUString::createFromAscii("_beamer");
+ ::rtl::OUString sFrameName(RTL_CONSTASCII_USTRINGPARAM("_beamer"));
sal_Int32 nSearchFlags = ::com::sun::star::frame::FrameSearchFlag::CHILDREN | ::com::sun::star::frame::FrameSearchFlag::CREATE;
Reference< runtime::XFormController > xCurrentNavController( getNavController());
@@ -3424,7 +3424,7 @@ void FmXFormShell::CreateExternalView()
URL aClearURL;
aClearURL.Complete = FMURL_GRIDVIEW_CLEARVIEW;
- Reference< ::com::sun::star::frame::XDispatch> xClear( xCommLink->queryDispatch(aClearURL, ::rtl::OUString::createFromAscii(""), 0));
+ Reference< ::com::sun::star::frame::XDispatch> xClear( xCommLink->queryDispatch(aClearURL, ::rtl::OUString(), 0));
if (xClear.is())
xClear->dispatch(aClearURL, Sequence< PropertyValue>());
}
@@ -3441,10 +3441,10 @@ void FmXFormShell::CreateExternalView()
// collect the dispatchers we will need
URL aAddColumnURL;
aAddColumnURL.Complete = FMURL_GRIDVIEW_ADDCOLUMN;
- Reference< ::com::sun::star::frame::XDispatch> xAddColumnDispatch( xCommLink->queryDispatch(aAddColumnURL, ::rtl::OUString::createFromAscii(""), 0));
+ Reference< ::com::sun::star::frame::XDispatch> xAddColumnDispatch( xCommLink->queryDispatch(aAddColumnURL, ::rtl::OUString(), 0));
URL aAttachURL;
aAttachURL.Complete = FMURL_GRIDVIEW_ATTACHTOFORM;
- Reference< ::com::sun::star::frame::XDispatch> xAttachDispatch( xCommLink->queryDispatch(aAttachURL, ::rtl::OUString::createFromAscii(""), 0));
+ Reference< ::com::sun::star::frame::XDispatch> xAttachDispatch( xCommLink->queryDispatch(aAttachURL, ::rtl::OUString(), 0));
if (xAddColumnDispatch.is() && xAttachDispatch.is())
{
@@ -3749,7 +3749,7 @@ void FmXFormShell::implAdjustConfigCache()
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmXFormShell::implAdjustConfigCache" );
// get (cache) the wizard usage flag
Sequence< ::rtl::OUString > aNames(1);
- aNames[0] = ::rtl::OUString::createFromAscii("FormControlPilotsEnabled");
+ aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormControlPilotsEnabled"));
Sequence< Any > aFlags = GetProperties(aNames);
if (1 == aFlags.getLength())
m_bUseWizards = ::cppu::any2bool(aFlags[0]);
@@ -3783,7 +3783,7 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
m_bUseWizards = _bUseThem;
Sequence< ::rtl::OUString > aNames(1);
- aNames[0] = ::rtl::OUString::createFromAscii("FormControlPilotsEnabled");
+ aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormControlPilotsEnabled"));
Sequence< Any > aValues(1);
aValues[0] = ::cppu::bool2any(m_bUseWizards);
PutProperties(aNames, aValues);
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 34df238..767e35d 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -153,10 +153,10 @@ void displayException(const Any& _rExcept, Window* _pParent)
Reference< XWindow > xParentWindow = VCLUnoHelper::GetInterface(pParentWindow);
Sequence< Any > aArgs(2);
- aArgs[0] <<= PropertyValue(::rtl::OUString::createFromAscii("SQLException"), 0, _rExcept, PropertyState_DIRECT_VALUE);
- aArgs[1] <<= PropertyValue(::rtl::OUString::createFromAscii("ParentWindow"), 0, makeAny(xParentWindow), PropertyState_DIRECT_VALUE);
+ aArgs[0] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLException")), 0, _rExcept, PropertyState_DIRECT_VALUE);
+ aArgs[1] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")), 0, makeAny(xParentWindow), PropertyState_DIRECT_VALUE);
- static ::rtl::OUString s_sDialogServiceName = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ErrorMessageDialog");
+ static ::rtl::OUString s_sDialogServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ErrorMessageDialog") );
Reference< XExecutableDialog > xErrorDialog(
::comphelper::getProcessServiceFactory()->createInstanceWithArguments(s_sDialogServiceName, aArgs), UNO_QUERY);
if (xErrorDialog.is())
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index fb7c564..64c3805 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -210,7 +210,7 @@ namespace svxform
{
Sequence< ::rtl::OUString > aServices(2);
aServices.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.FormController" ) );
- aServices.getArray()[1] = ::rtl::OUString::createFromAscii("com.sun.star.awt.control.TabController");
+ aServices.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.control.TabController") );
return aServices;
}
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 0450582..a0f5474 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -492,7 +492,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent )
SvtLinguConfig aLngCfg;
sal_Bool bValue = sal_Bool();
- Any aAny( aLngCfg.GetProperty( rtl::OUString::createFromAscii( UPN_IS_REVERSE_MAPPING ) ) );
+ Any aAny( aLngCfg.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )) ) );
if( aAny >>= bValue )
m_aCB_Reverse.Check( bValue );
@@ -511,7 +511,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent )
{
Reference< linguistic2::XConversionDictionaryList > xDictionaryList(
m_xFactory->createInstanceWithContext(
- rtl::OUString::createFromAscii("com.sun.star.linguistic2.ConversionDictionaryList")
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ConversionDictionaryList"))
, m_xContext), uno::UNO_QUERY);
if( xDictionaryList.is() )
{
@@ -520,17 +520,17 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent )
{
try
{
- rtl::OUString aNameTo_Simplified( rtl::OUString::createFromAscii("ChineseT2S") );
- rtl::OUString aNameTo_Traditional( rtl::OUString::createFromAscii("ChineseS2T") );
+ rtl::OUString aNameTo_Simplified( RTL_CONSTASCII_USTRINGPARAM("ChineseT2S") );
+ rtl::OUString aNameTo_Traditional( RTL_CONSTASCII_USTRINGPARAM("ChineseS2T") );
lang::Locale aLocale;
- aLocale.Language = rtl::OUString::createFromAscii("zh");
+ aLocale.Language = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("zh") );
if( xContainer->hasByName( aNameTo_Simplified ) )
xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >(
xContainer->getByName( aNameTo_Simplified ), UNO_QUERY );
else
{
- aLocale.Country = rtl::OUString::createFromAscii("TW");
+ aLocale.Country = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TW") );
xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >(
xDictionaryList->addNewDictionary( aNameTo_Simplified
, aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE
@@ -545,7 +545,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent )
xContainer->getByName( aNameTo_Traditional ), UNO_QUERY );
else
{
- aLocale.Country = rtl::OUString::createFromAscii("CN");
+ aLocale.Country = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CN") );
xDictionary_To_Traditional = Reference< linguistic2::XConversionDictionary >(
xDictionaryList->addNewDictionary( aNameTo_Traditional
, aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE
@@ -850,7 +850,7 @@ short ChineseDictionaryDialog::Execute()
SvtLinguConfig aLngCfg;
Any aAny;
aAny <<= sal_Bool( !!m_aCB_Reverse.IsChecked() );
- aLngCfg.SetProperty( rtl::OUString::createFromAscii( UPN_IS_REVERSE_MAPPING ), aAny );
+ aLngCfg.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )), aAny );
m_aCT_DictionaryToSimplified.save();
m_aCT_DictionaryToTraditional.save();
More information about the Libreoffice-commits
mailing list