[Libreoffice-commits] .: wizards/source

[Xisco Fauli]

 wizards/source/tools/Misc.xba |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit a9eda0eb4c8d40919feb6c9d47ff106afe1879a7
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Tue Jul 12 00:59:26 2011 +0200

    fdo#37290: migrate Basic to new resource service

diff --git a/wizards/source/tools/Misc.xba b/wizards/source/tools/Misc.xba
index 7eca466..faa0f80 100644
--- a/wizards/source/tools/Misc.xba
+++ b/wizards/source/tools/Misc.xba
@@ -271,14 +271,18 @@ End Sub
 
 
 Function InitResources(Description, ShortDescription as String) as boolean
+Dim xResource as Object
+Dim aArgs(0) as String
 	On Error Goto ErrorOcurred
-	oResSrv = createUnoService( &quot;com.sun.star.resource.VclStringResourceLoader&quot; )
-	If (IsNull(oResSrv)) then
+	aArgs(0) = ShortDescription
+	oConfigProvider = createUnoService(&quot;com.sun.star.configuration.ConfigurationProvider&quot;)
+	xResource = getProcessServiceManager().createInstanceWithArguments( &quot;org.libreoffice.resource.ResourceIndexAccess&quot;, aArgs() )
+	If (IsNull(xResource)) then
 		InitResources = FALSE
-		MsgBox( Description &amp; &quot;: No resource loader found&quot;, 16, GetProductName())
+		MsgBox(&quot;could not initialize ResourceIndexAccess&quot;)
 	Else
 		InitResources = TRUE
-		oResSrv.FileName = ShortDescription
+		oResSrv = xResource.getByName( &quot;String&quot; )
 	End If
 	Exit Function
 ErrorOcurred:
@@ -294,7 +298,7 @@ End Function
 Function GetResText( nID as integer ) As string
 	On Error Goto ErrorOcurred
 	If Not IsNull(oResSrv) Then
-		GetResText = oResSrv.getString( nID )
+		GetResText = oResSrv.getByIndex( nID )
 	Else
 		GetResText = &quot;&quot;
 	End If
@@ -814,4 +818,4 @@ End Sub
 Function CalIsLeapYear(ByVal iYear as Integer) as Boolean
         CalIsLeapYear = ((iYear Mod 4 = 0) And ((iYear Mod 100 &lt;&gt; 0) Or (iYear Mod 400 = 0)))
 End Function
-</script:module>
\ No newline at end of file
+</script:module>