summaryrefslogtreecommitdiff
path: root/sfx2/source/appl
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/appl')
-rw-r--r--sfx2/source/appl/appbas.cxx2
-rw-r--r--sfx2/source/appl/appopen.cxx22
-rw-r--r--sfx2/source/appl/appserv.cxx11
-rw-r--r--sfx2/source/appl/appuno.cxx12
-rw-r--r--sfx2/source/appl/lnkbase2.cxx2
-rw-r--r--sfx2/source/appl/newhelp.cxx2
-rw-r--r--sfx2/source/appl/sfxhelp.cxx4
7 files changed, 27 insertions, 28 deletions
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 3ff93a293f47..833a99b0e3e0 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -141,7 +141,7 @@ SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject,
(void) eClassType;
return 0;
#else
- SbxVariable *pVar = pBas->Make( String::CreateFromAscii(pName), eClassType, eType ); //SbxCLASS_PROPERTY
+ SbxVariable *pVar = pBas->Make( rtl::OUString::createFromAscii(pName), eClassType, eType ); //SbxCLASS_PROPERTY
pVar->SetUserData( nSID );
pVar->SetFlag( SBX_DONTSTORE );
pObject->StartListening( pVar->GetBroadcaster() );
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index f8d13aaf800c..7a105a34e2a6 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -435,8 +435,8 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String
DBG_ASSERT( !xDoc.Is(), "Sorry, not implemented!" );
delete pSet;
SfxStringItem aName( SID_FILE_NAME, rFileName );
- SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii("private:user") );
- SfxStringItem aFlags( SID_OPTIONS, String::CreateFromAscii("T") );
+ SfxStringItem aReferer( SID_REFERER, rtl::OUString("private:user") );
+ SfxStringItem aFlags( SID_OPTIONS, rtl::OUString("T") );
SfxBoolItem aHidden( SID_HIDDEN, sal_True );
const SfxPoolItem *pRet = GetDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, &aName, &aHidden, &aReferer, &aFlags, 0L );
const SfxObjectItem *pObj = PTR_CAST( SfxObjectItem, pRet );
@@ -537,11 +537,11 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq )
SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, GetPool() );
- String aFact = String::CreateFromAscii("private:factory/");
+ String aFact = rtl::OUString("private:factory/");
aFact += aFactName;
aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aFact ) );
aReq.AppendItem( SfxFrameItem( SID_DOCFRAME, GetFrame() ) );
- aReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii( "_default" ) ) );
+ aReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString( "_default" ) ) );
// TODO/LATER: Should the other arguments be transfered as well?
SFX_REQUEST_ARG( rReq, pDefaultPathItem, SfxStringItem, SID_DEFAULTFILEPATH, sal_False);
@@ -769,8 +769,8 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
rReq.SetArgs( *(SfxAllItemSet*)pSet );
if (aFilter.Len() >0 )
rReq.AppendItem( SfxStringItem( SID_FILTER_NAME, aFilter ) );
- rReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_default") ) );
- rReq.AppendItem( SfxStringItem( SID_REFERER, String::CreateFromAscii(SFX_REFERER_USER) ) );
+ rReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_default") ) );
+ rReq.AppendItem( SfxStringItem( SID_REFERER, rtl::OUString(SFX_REFERER_USER) ) );
delete pSet;
if(!pURLList.empty())
@@ -965,7 +965,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
{
// don't dispatch mailto hyperlink to desktop dispatcher
rReq.RemoveItem( SID_TARGETNAME );
- rReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_self") ) );
+ rReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_self") ) );
}
else if ( aINetProtocol == INET_PROT_FTP ||
aINetProtocol == INET_PROT_HTTP ||
@@ -1043,7 +1043,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
catch ( ::com::sun::star::system::SystemShellExecuteException& )
{
rReq.RemoveItem( SID_TARGETNAME );
- rReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_default") ) );
+ rReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_default") ) );
bLoadInternal = sal_True;
}
}
@@ -1062,7 +1062,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
{
// hyperlink document must be loaded into a new frame
rReq.RemoveItem( SID_TARGETNAME );
- rReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_default") ) );
+ rReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_default") ) );
}
}
}
@@ -1137,12 +1137,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
{
SFX_REQUEST_ARG( rReq, pNewViewItem, SfxBoolItem, SID_OPEN_NEW_VIEW, sal_False );
if ( pNewViewItem && pNewViewItem->GetValue() )
- aTarget = String::CreateFromAscii("_blank" );
+ aTarget = rtl::OUString("_blank" );
}
if ( bHidden )
{
- aTarget = String::CreateFromAscii("_blank");
+ aTarget = rtl::OUString("_blank");
DBG_ASSERT( rReq.IsSynchronCall() || pLinkItem, "Hidden load process must be done synchronously!" );
}
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index fb69193344b3..084a2d65ccd0 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -288,8 +288,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
return;
}
- String aName = String::CreateFromAscii("vnd.sun.star.cmd:logout");
- SfxStringItem aNameItem( SID_FILE_NAME, aName );
+ SfxStringItem aNameItem( SID_FILE_NAME, rtl::OUString("vnd.sun.star.cmd:logout") );
SfxStringItem aReferer( SID_REFERER, DEFINE_CONST_UNICODE( "private/user" ) );
pAppData_Impl->pAppDispat->Execute( SID_OPENDOC, SFX_CALLMODE_SLOT, &aNameItem, &aReferer, 0L );
return;
@@ -464,7 +463,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
Help* pHelp = Application::GetHelp();
if ( pHelp )
{
- pHelp->Start( String::CreateFromAscii(".uno:HelpIndex"), NULL ); // show start page
+ pHelp->Start( rtl::OUString(".uno:HelpIndex"), NULL ); // show start page
bDone = true;
}
break;
@@ -1374,9 +1373,9 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
case SID_COMP_BIBLIOGRAPHY:
{
- SfxStringItem aURL(SID_FILE_NAME, String::CreateFromAscii(".component:Bibliography/View1"));
- SfxStringItem aRef(SID_REFERER, String::CreateFromAscii("private:user"));
- SfxStringItem aTarget(SID_TARGETNAME, String::CreateFromAscii("_blank"));
+ SfxStringItem aURL(SID_FILE_NAME, rtl::OUString(".component:Bibliography/View1"));
+ SfxStringItem aRef(SID_REFERER, rtl::OUString("private:user"));
+ SfxStringItem aTarget(SID_TARGETNAME, rtl::OUString("_blank"));
SfxViewFrame::Current()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, &aURL, &aRef, &aTarget, 0L);
}
break;
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index ca36ecf2323d..9a07f83625b0 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1283,7 +1283,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
sal_uInt16 nSubCount = pType->nAttribs;
if ( !nSubCount )
{
- pValue[nActProp].Name = String( String::CreateFromAscii( pSlot->pUnoName ) ) ;
+ pValue[nActProp].Name = rtl::OUString::createFromAscii(pSlot->pUnoName) ;
if ( !pItem->QueryValue( pValue[nActProp].Value ) )
{
rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
@@ -1302,9 +1302,9 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
nSubId |= CONVERT_TWIPS;
DBG_ASSERT(( pType->aAttrib[n-1].nAID ) <= 127, "Member ID out of range" );
- String aName( String::CreateFromAscii( pSlot->pUnoName ) ) ;
+ String aName( rtl::OUString::createFromAscii( pSlot->pUnoName ) ) ;
aName += '.';
- aName += String( String::CreateFromAscii( pType->aAttrib[n-1].pName ) ) ;
+ aName += rtl::OUString::createFromAscii( pType->aAttrib[n-1].pName ) ;
pValue[nActProp].Name = aName;
if ( !pItem->QueryValue( pValue[nActProp++].Value, nSubId ) )
{
@@ -1336,7 +1336,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
sal_uInt16 nSubCount = rArg.pType->nAttribs;
if ( !nSubCount )
{
- pValue[nActProp].Name = String( String::CreateFromAscii( rArg.pName ) ) ;
+ pValue[nActProp].Name = rtl::OUString::createFromAscii( rArg.pName ) ;
if ( !pItem->QueryValue( pValue[nActProp++].Value ) )
{
rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
@@ -1355,9 +1355,9 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
nSubId |= CONVERT_TWIPS;
DBG_ASSERT((rArg.pType->aAttrib[n-1].nAID) <= 127, "Member ID out of range" );
- String aName( String::CreateFromAscii( rArg.pName ) ) ;
+ String aName( rtl::OUString::createFromAscii( rArg.pName ) ) ;
aName += '.';
- aName += String( String::CreateFromAscii( rArg.pType->aAttrib[n-1].pName ) ) ;
+ aName += rtl::OUString::createFromAscii( rArg.pType->aAttrib[n-1].pName ) ;
pValue[nActProp].Name = aName;
if ( !pItem->QueryValue( pValue[nActProp++].Value, nSubId ) )
{
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 842a83ec0fa8..21ed30a178ce 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -590,7 +590,7 @@ void ImplDdeItem::AdviseLoop( sal_Bool bOpen )
// A connection is re-established
if( OBJECT_DDE_EXTERN == pLink->GetObjType() )
{
- pLink->GetObj()->AddDataAdvise( pLink, String::CreateFromAscii( "text/plain;charset=utf-16" ), ADVISEMODE_NODATA );
+ pLink->GetObj()->AddDataAdvise( pLink, rtl::OUString("text/plain;charset=utf-16"), ADVISEMODE_NODATA );
pLink->GetObj()->AddConnectAdvise( pLink );
}
}
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 2af76a236f98..d9e5f8a1d36e 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2238,7 +2238,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText )
{
// set module name in checkbox text
String sText( aOnStartupText );
- sText.SearchAndReplace( String::CreateFromAscii( "%MODULENAME" ), sModuleName );
+ sText.SearchAndReplace( rtl::OUString("%MODULENAME"), sModuleName );
aOnStartupCB.SetText( sText );
// and show it
aOnStartupCB.Show();
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 62030ef3dc44..77a30465b4fb 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -529,11 +529,11 @@ String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rM
if ( aModuleName.Len() == 0 )
aModuleName = getDefaultModule_Impl();
- aHelpURL = String::CreateFromAscii("vnd.sun.star.help://");
+ aHelpURL = rtl::OUString("vnd.sun.star.help://");
aHelpURL += aModuleName;
if ( !aCommandURL.Len() )
- aHelpURL += String::CreateFromAscii("/start");
+ aHelpURL += rtl::OUString("/start");
else
{
aHelpURL += '/';
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 10:38:17 +0000