summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
authorÁdám Csaba Király <kiraly.adam.csaba@gmail.com>2013-03-05 10:35:52 +0100
committerMuthu Subramanian K <muthusuba@gmail.com>2013-03-05 12:48:36 +0000
commit10bb5b8e24b90f881ac0ef758bb11a0bbd531a67 (patch)
tree267abbb4d2fa1bcb47e2defccea21cef67dacb0a /basctl
parentde02e1e546a2141567afd8a90e54bcde72550ab1 (diff)
fdo#38838, replacement of String with OUString
Replaced String with OUString in mediawindow.cxx, basdoc.cxx, basdoc.hxx and bastype3.cxx. In other files I only replaced, what was necessary for the changes in basdoc to work. Change-Id: I1ad0e7e262f8becdf57f182853aaa914a88895a4 Reviewed-on: https://gerrit.libreoffice.org/2554 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Tested-by: Muthu Subramanian K <muthusuba@gmail.com>
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/basicide/basdoc.cxx2
-rw-r--r--basctl/source/basicide/basdoc.hxx6
-rw-r--r--basctl/source/basicide/bastype3.cxx20
3 files changed, 14 insertions, 14 deletions
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index 119657cf7c56..d682f4e92216 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -70,7 +70,7 @@ void DocShell::SetPrinter( SfxPrinter* pPr )
pPrinter.reset(pPr);
}
-void DocShell::FillClass( SvGlobalName*, sal_uInt32*, String*, String*, String*, sal_Int32, sal_Bool bTemplate) const
+void DocShell::FillClass( SvGlobalName*, sal_uInt32*, OUString*, OUString*, OUString*, sal_Int32, sal_Bool bTemplate) const
{
(void)bTemplate;
DBG_ASSERT( !bTemplate, "No template for Basic" );
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index 19a0ae6e7555..e4715458dc83 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -41,9 +41,9 @@ protected:
sal_uInt16 nAspect = ASPECT_CONTENT );
virtual void FillClass( SvGlobalName * pClassName,
sal_uInt32 * pFormat,
- String * pAppName,
- String * pFullTypeName,
- String * pShortTypeName,
+ OUString * pAppName,
+ OUString * pFullTypeName,
+ OUString * pShortTypeName,
sal_Int32 nVersion,
sal_Bool bTemplate = false ) const;
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index c734642ddc26..54c5507c830c 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -204,7 +204,7 @@ SbxVariable* TreeListBox::FindVariable( SvTreeListEntry* pEntry )
DBG_ASSERT( pLE, "Can not find entry in array" );
Entry* pBE = static_cast<Entry*>(pLE->GetUserData());
DBG_ASSERT( pBE, "The data in the entry not found!" );
- String aName( GetEntryText( pLE ) );
+ OUString aName( GetEntryText( pLE ) );
switch ( pBE->GetType() )
{
@@ -221,8 +221,8 @@ SbxVariable* TreeListBox::FindVariable( SvTreeListEntry* pEntry )
// extract the module name from the string like "Sheet1 (Example1)"
if( bDocumentObjects )
{
- sal_uInt16 nIndex = 0;
- aName = aName.GetToken( 0, ' ', nIndex );
+ sal_Int32 nIndex = 0;
+ aName = aName.getToken( 0, ' ', nIndex );
}
pVar = static_cast<StarBASIC*>(pVar)->FindModule( aName );
break;
@@ -261,10 +261,10 @@ EntryDescriptor TreeListBox::GetEntryDescriptor( SvTreeListEntry* pEntry )
{
ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() );
LibraryLocation eLocation = LIBRARY_LOCATION_UNKNOWN;
- String aLibName;
- String aLibSubName;
- String aName;
- String aMethodName;
+ OUString aLibName;
+ OUString aLibSubName;
+ OUString aName;
+ OUString aMethodName;
EntryType eType = OBJ_TYPE_UNKNOWN;
if ( !pEntry )
@@ -380,9 +380,9 @@ bool TreeListBox::IsValidEntry( SvTreeListEntry* pEntry )
EntryDescriptor aDesc( GetEntryDescriptor( pEntry ) );
ScriptDocument aDocument( aDesc.GetDocument() );
LibraryLocation eLocation( aDesc.GetLocation() );
- String aLibName( aDesc.GetLibName() );
- String aName( aDesc.GetName() );
- String aMethodName( aDesc.GetMethodName() );
+ OUString aLibName( aDesc.GetLibName() );
+ OUString aName( aDesc.GetName() );
+ OUString aMethodName( aDesc.GetMethodName() );
EntryType eType( aDesc.GetType() );
switch ( eType )