[Libreoffice-commits] .: svx/source svx/workben
Gert Faller
gfaller at kemper.freedesktop.org
Sun Nov 21 06:27:17 PST 2010
svx/source/form/dbtoolsclient.cxx | 4 +--
svx/source/gengal/gengal.cxx | 4 +--
svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx | 12 +++++-----
svx/source/unodraw/unoshap4.cxx | 10 ++++----
svx/source/xml/xmlgrhlp.cxx | 2 -
svx/workben/msview/msview.cxx | 4 +--
6 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit e6afceedf47c50b76932cb404976d6b41b97371e
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sun Nov 21 15:25:39 2010 +0100
RRTL_CONSTASCII_USTRINGPARAM in libs core 42
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index 9fbb2c4..f97f0b2 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -111,8 +111,8 @@ namespace svxform
OSL_ENSURE(NULL == s_hDbtoolsModule, "ODbtoolsClient::registerClient: inconsistence: already have a module!");
OSL_ENSURE(NULL == s_pFactoryCreationFunc, "ODbtoolsClient::registerClient: inconsistence: already have a factory function!");
- const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii(
- SVLIBRARY( "dbtools" )
+ const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(
+ SVLIBRARY( "dbtools" ))
);
// load the dbtools library
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 0b4235a..d319914 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -263,9 +263,9 @@ void GalApp::InitUCB()
rtl::OUString aEmpty;
Sequence< Any > aArgs(6);
aArgs[0]
- <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY1_LOCAL);
+ <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY1_LOCAL));
aArgs[1]
- <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY2_OFFICE);
+ <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY2_OFFICE));
aArgs[2] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PIPE"));
aArgs[3] <<= aEmpty;
aArgs[4] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PORTAL"));
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index bda83bf..a640a6e 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -77,14 +77,14 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent )
SvtLinguConfig aLngCfg;
sal_Bool bValue = sal_Bool();
- Any aAny( aLngCfg.GetProperty( rtl::OUString::createFromAscii( UPN_IS_DIRECTION_TO_SIMPLIFIED ) ) );
+ Any aAny( aLngCfg.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_DIRECTION_TO_SIMPLIFIED )) ) );
aAny >>= bValue;
if( bValue )
m_aRB_To_Simplified.Check();
else
m_aRB_To_Traditional.Check();
- aAny = aLngCfg.GetProperty( rtl::OUString::createFromAscii( UPN_IS_USE_CHARACTER_VARIANTS ) );
+ aAny = aLngCfg.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_USE_CHARACTER_VARIANTS )) );
if( aAny >>= bValue )
m_aCB_Use_Variants.Check( bValue );
@@ -96,7 +96,7 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent )
m_aCB_Use_Variants.Enable( sal_False );
m_aCB_Use_Variants.Show( sal_False );
- aAny = aLngCfg.GetProperty( rtl::OUString::createFromAscii( UPN_IS_TRANSLATE_COMMON_TERMS ) );
+ aAny = aLngCfg.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_TRANSLATE_COMMON_TERMS )) );
if( aAny >>= bValue )
m_aCB_Translate_Commonterms.Check( bValue );
@@ -154,11 +154,11 @@ IMPL_LINK( ChineseTranslationDialog, OkHdl, void*, EMPTYARG )
SvtLinguConfig aLngCfg;
Any aAny;
aAny <<= sal_Bool( !!m_aRB_To_Simplified.IsChecked() );
- aLngCfg.SetProperty( rtl::OUString::createFromAscii( UPN_IS_DIRECTION_TO_SIMPLIFIED ), aAny );
+ aLngCfg.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_DIRECTION_TO_SIMPLIFIED )), aAny );
aAny <<= sal_Bool( !!m_aCB_Use_Variants.IsChecked() );
- aLngCfg.SetProperty( rtl::OUString::createFromAscii( UPN_IS_USE_CHARACTER_VARIANTS ), aAny );
+ aLngCfg.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_USE_CHARACTER_VARIANTS )), aAny );
aAny <<= sal_Bool( !!m_aCB_Translate_Commonterms.IsChecked() );
- aLngCfg.SetProperty( rtl::OUString::createFromAscii( UPN_IS_TRANSLATE_COMMON_TERMS ), aAny );
+ aLngCfg.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_TRANSLATE_COMMON_TERMS )), aAny );
EndDialog( RET_OK );
return 0;
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 78316db..4c16c8e 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -123,7 +123,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
{
SfxObjectShell* pPersist = mpModel->GetPersist();
::rtl::OUString aPersistName;
- Any aAny( getPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ) ) );
+ Any aAny( getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )) ) );
aAny >>= aPersistName;
//TODO/LATER: how to cope with creation failure?!
@@ -131,7 +131,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
if( xObj.is() )
{
aAny <<= aPersistName;
- setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), aAny );
+ setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )), aAny );
pOle2->SetObjRef( xObj );
Rectangle aRect = pOle2->GetLogicRect();
@@ -469,7 +469,7 @@ sal_Bool SvxOle2Shape::createObject( const SvGlobalName &aClassName )
::comphelper::IEmbeddedHelper* pPersist = mpModel->GetPersist();
::rtl::OUString aPersistName;
OUString aTmpStr;
- if( getPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ) ) >>= aTmpStr )
+ if( getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )) ) >>= aTmpStr )
aPersistName = aTmpStr;
//TODO/LATER: how to cope with creation failure?!
@@ -500,7 +500,7 @@ sal_Bool SvxOle2Shape::createObject( const SvGlobalName &aClassName )
}
// connect the object after the visual area is set
- setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), Any( aTmpStr = aPersistName ) );
+ setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )), Any( aTmpStr = aPersistName ) );
// the object is inserted during setting of PersistName property usually
if( pOle2Obj->IsEmpty() )
@@ -563,7 +563,7 @@ sal_Bool SvxOle2Shape::createLink( const ::rtl::OUString& aLinkURL )
}
// connect the object after the visual area is set
- setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), uno::makeAny( aPersistName ) );
+ setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )), uno::makeAny( aPersistName ) );
// the object is inserted during setting of PersistName property usually
if ( pOle2Obj->IsEmpty() )
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index e9e8fcd..c1e87b5 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -946,7 +946,7 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream()
if( aId.getLength() )
{
- aRet = ::rtl::OUString::createFromAscii( XML_GRAPHICOBJECT_URL_BASE );
+ aRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_GRAPHICOBJECT_URL_BASE ));
aRet += aId;
}
}
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx
index cecc242..ef1ee2e 100644
--- a/svx/workben/msview/msview.cxx
+++ b/svx/workben/msview/msview.cxx
@@ -1159,8 +1159,8 @@ void MSViewerWorkWindow::Resize()
// Init UCB
uno::Sequence< uno::Any > aArgs( 2 );
- aArgs[ 0 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
- aArgs[ 1 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+ aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
+ aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
sal_Bool bSuccess = ::ucb::ContentBroker::initialize( xMSF, aArgs );
if ( !bSuccess )
{
More information about the Libreoffice-commits
mailing list