Commits

Anonymous committed 21b6d27

CWS-TOOLING: integrate CWS automation006
2009-05-26 13:25:30 +0200 jsk r272296 : #i102088# - final cosmetic touch
2009-05-25 14:40:06 +0200 jsk r272244 : #i102202# - quite a chunk.
2009-05-25 05:29:48 +0200 jsk r272215 : #i102202# - Cleanup, code refactored, indention and headers fixed
2009-05-25 04:55:58 +0200 jsk r272214 : #i102088# - update .bas-files to load call GetOLEDefaultNames from external file
2009-05-20 12:55:18 +0200 jsk r272116 : #i102088# Replace old OLE stuff, get it from API, localized

  • Participants
  • Parent commits 37443cc

Comments (0)

Files changed (147)

File testautomation/framework/optional/f_ole.bas

     use "global\system\includes\gvariabl.inc"
    
     use "global\tools\includes\optional\t_filetools.inc"
+    use "global\tools\includes\optional\t_ole.inc"
     use "global\tools\includes\optional\t_docfuncs.inc"
     use "global\tools\includes\optional\t_stringtools.inc"
    

File testautomation/framework/optional/includes/ole_2.inc

    Dim iCount, sCount as Integer
    
    call ClosePresentationfloat()
-   call GetOLEDefaultNames()
+   GetOLEDefaultNames()
 
    for i=1 to 5
    
       Kontext "OLEObjektEinfuegen"
       if ( not OLEObjektEinfuegen.exists() ) then
         warnlog( "cannot access the OLE object dialog" )
+        goto endsub
       endif
       
       '///+select 'create new'
       NeuErstellen.Check
-      Sleep (1)
+      WaitSlot()
       
       '///+check all names in the list with a comparison list in [TesttoolPath]\global\input\olenames\ole_[lang-code].txt
       for j=1 to ObjektTyp.GetItemCount
                             ListAppend ( lListSoll (), gOLEMath )
       end select
       
-      if gPlatgroup = "w95" then 
+      if ( gPlatgroup = "w95" ) then 
          ListAppend ( lListSoll (), gOLEOthers )
          endif
          

File testautomation/framework/optional/includes/ole_tools.inc

         Kontext "DocumentMasterDoc"
         DocumentMasterDoc.MouseDown( 50 , 50 , 1 )
         DocumentMasterDoc.MouseUp( 50 , 50 , 1 )
-        EditObjectEdit
+        hUseAsyncSlot( "EditObjectEdit" )
         sleep( ICWAIT )
             case else
     warnlog( "Invalid gApplication: " & gApplication )
             active.SetPage TabType
             Kontext "TabType"
             TabType.Cancel()
-            sleep( ICWAIT )
-            EditObjectEdit
+            hUseAsyncSlot( "EditObjectEdit" )
         catch
             warnlog "Can't activate object"
         endcatch
             Active.SetPage TabType
             Kontext "TabType"
             TabType.Cancel
-            Sleep ( ICWAIT )
-            EditObjectEdit
+            hUseAsyncSlot( "EditObjectEdit" )
         catch
             qaerrorlog( "The object is not selected after reload." )
         endcatch
             active.SetPage TabType
             Kontext "TabType"
             TabType.Cancel
-            sleep( ICWAIT )
-            EditObjectEdit
+            hUseAsyncSlot( "EditObjectEdit" )
         catch
             warnlog "Can't activate object"
         endcatch
             active.SetPage( TabType )
             Kontext "TabType"
             TabType.Cancel()
-            sleep( ICWAIT )
-            EditObjectEdit
+            hUseAsyncSlot( "EditObjectEdit" )
         catch
             qaerrorlog( "The object is not selected after reload." )
         endcatch

File testautomation/global/input/officeinfo.txt

+[Current program versions]
+StarOffice=9
+StarSuite=9
+OpenOffice.org=3.1
+BrOffice.org=3.1
+

File testautomation/global/input/olenames/BrOffice.org/ole_55.txt

-CALC=Planilha do BrOffice.org 2.2
-CHART=Gráfico do BrOffice.org 2.2
-DRAW=Desenho do BrOffice.org 2.2
-IMPRESS=Apresentação do BrOffice.org 2.2
-MATH=Fórmula do BrOffice.org 2.2
-WRITER=Texto do BrOffice.org 2.2
-OTHER=

File testautomation/global/input/olenames/OpenOffice.org/ole_1.txt

-CALC=OpenOffice.org 2.3 Spreadsheet
-CHART=OpenOffice.org 2.3 Chart
-DRAW=OpenOffice.org 2.3 Drawing
-IMPRESS=OpenOffice.org 2.3 Presentation
-MATH=OpenOffice.org 2.3 Formula
-WRITER=OpenOffice.org 2.3 Text
-OTHER=Further objects
-

File testautomation/global/input/olenames/OpenOffice.org/ole_44.txt

-CALC=OpenOffice.org 2.3 Spreadsheet
-CHART=OpenOffice.org 2.3 Chart
-DRAW=OpenOffice.org 2.3 Drawing
-IMPRESS=OpenOffice.org 2.3 Presentation
-MATH=OpenOffice.org 2.3 Formula
-WRITER=OpenOffice.org 2.3 Text
-OTHER=Further objects

File testautomation/global/input/olenames/OpenOffice.org/ole_45.txt

-CALC=OpenOffice.org 2.3-regneark
-CHART=OpenOffice.org 2.3-diagram
-DRAW=OpenOffice.org 2.3-tegning
-IMPRESS=OpenOffice.org 2.3-præsentation
-MATH=OpenOffice.org 2.3-formel
-WRITER=OpenOffice.org 2.3-tekst
-OTHER=

File testautomation/global/input/olenames/OpenOffice.org/ole_49.txt

-CALC=OpenOffice.org 2.3 Tabelle
-CHART=OpenOffice.org 2.3 Diagramm
-DRAW=OpenOffice.org 2.3 Zeichnung
-IMPRESS=OpenOffice.org 2.3 Präsentation
-MATH=OpenOffice.org 2.3 Formel
-WRITER=OpenOffice.org 2.3 Text
-OTHER=Weitere Objekte

File testautomation/global/input/olenames/OpenOffice.org/ole_50.txt

-CALC=Preglednica OpenOffice.org 2.3
-CHART=Grafikon OpenOffice.org 2.3
-DRAW=Risba OpenOffice.org 2.3
-IMPRESS=Predstavitev OpenOffice.org 2.3
-MATH=Formula OpenOffice.org 2.3
-WRITER=Besedilo OpenOffice.org 2.3
-OTHER=Dodatni predmeti

File testautomation/global/input/olenames/OpenOffice.org/ole_81.txt

-CALC=OpenOffice.org 2.3 の表計算ドキュメント
-CHART=OpenOffice.org 2.3 のグラフ
-DRAW=OpenOffice.org 2.3 の図形描画
-IMPRESS=OpenOffice.org 2.3 のプレゼンテーション
-MATH=OpenOffice.org 2.3 の数式
-WRITER=OpenOffice.org 2.3 のテキスト
-OTHER=その他のオブジェクト

File testautomation/global/input/olenames/OpenOffice.org/ole_84.txt

-CALC=Bảng tính OpenOffice.org 2.3
-CHART=Đồ thị OpenOffice.org 2.3
-DRAW=Bản vẽ OpenOffice.org 2.3
-IMPRESS=Trình diễn OpenOffice.org 2.3
-MATH=Công thức OpenOffice.org 2.3
-WRITER=Văn bản OpenOffice.org 2.3
-OTHER=Đối tượng thêm nữa

File testautomation/global/input/olenames/OpenOffice.org/ole_88.txt

-CALC=OpenOffice.org 2.3 工作表文件
-CHART=OpenOffice.org 2.3 圖表
-DRAW=OpenOffice.org 2.3 繪圖
-IMPRESS=OpenOffice.org 2.3 簡報
-MATH=OpenOffice.org 2.3 公式
-WRITER=OpenOffice.org 2.3 文字
-OTHER=其他的物件

File testautomation/global/input/olenames/StarOffice/ole_1.txt

-CALC=StarOffice 9 Spreadsheet
-CHART=StarOffice 9 Chart
-DRAW=StarOffice 9 Drawing
-IMPRESS=StarOffice 9 Presentation
-MATH=StarOffice 9 Formula
-WRITER=StarOffice 9 Text
-OTHER=Further objects

File testautomation/global/input/olenames/StarOffice/ole_3.txt

-CALC=Folha de cálculo do StarOffice 9
-CHART=Gráfico do StarOffice 9
-DRAW=Desenho do StarOffice 9
-IMPRESS=Apresentação do StarOffice 9
-MATH=Fórmula do StarOffice 9
-WRITER=Texto do StarOffice 9
-OTHER=Outros objectos

File testautomation/global/input/olenames/StarOffice/ole_31.txt

-CALC=StarOffice 9-werkblad
-CHART=StarOffice 9 Chart
-DRAW=StarOffice 9-tekening
-IMPRESS=StarOffice 9-presentatie
-MATH=StarOffice 9-formule
-WRITER=StarOffice 9-tekst
-OTHER=Overige objecten

File testautomation/global/input/olenames/StarOffice/ole_33.txt

-CALC=Classeur StarOffice 9
-CHART=Diagramme StarOffice 9
-DRAW=Dessin StarOffice 9
-IMPRESS=Présentation StarOffice 9
-MATH=Formule StarOffice 9
-WRITER=Texte StarOffice 9
-OTHER=Autres objets

File testautomation/global/input/olenames/StarOffice/ole_34.txt

-CALC=StarOffice 9 Hoja de cálculo
-CHART=StarOffice 9 Gráfico
-DRAW=StarOffice 9 Dibujo
-IMPRESS=StarOffice 9 Presentación
-MATH=StarOffice 9 Fórmula
-WRITER=StarOffice 9 Texto
-OTHER=Otros objetos

File testautomation/global/input/olenames/StarOffice/ole_36.txt

-CALC=StarOffice 9-munkafüzet
-CHART=StarOffice 9-diagram
-DRAW=StarOffice 9-rajz
-IMPRESS=StarOffice 9-bemutató
-MATH=StarOffice 9-képlet
-WRITER=StarOffice 9-szöveg
-OTHER=További objektumok

File testautomation/global/input/olenames/StarOffice/ole_39.txt

-CALC=StarOffice 9 - Foglio elettronico
-CHART=StarOffice 9 - Diagramma
-DRAW=StarOffice 9 - Disegno
-IMPRESS=StarOffice 9 - Presentazione
-MATH=StarOffice 9 - Formula
-WRITER=StarOffice 9 - Testo
-OTHER=Altri oggetti

File testautomation/global/input/olenames/StarOffice/ole_46.txt

-CALC=StarOffice 9-tabelldokument
-CHART=StarOffice 9-diagram
-DRAW=StarOffice 9-teckning
-IMPRESS=StarOffice 9-presentation
-MATH=StarOffice 9-formel
-WRITER=StarOffice 9-text
-OTHER=Ytterligare objekt

File testautomation/global/input/olenames/StarOffice/ole_48.txt

-CALC=StarOffice 9 Arkusz kalkulacyjny
-CHART=StarOffice 9 Wykres
-DRAW=StarOffice 9 Rysunek
-IMPRESS=StarOffice 9 Prezentacja
-MATH=StarOffice 9 Formuła
-WRITER=StarOffice 9 Dokument tekstowy
-OTHER=Dodatkowe obiekty

File testautomation/global/input/olenames/StarOffice/ole_49.txt

-CALC=StarOffice 9 Tabelle
-CHART=StarOffice 9 Diagramm
-DRAW=StarOffice 9 Zeichnung
-IMPRESS=StarOffice 9 Präsentation
-MATH=StarOffice 9 Formel
-WRITER=StarOffice 9 Text
-OTHER=Weitere Objekte

File testautomation/global/input/olenames/StarOffice/ole_55.txt

-CALC=Planilha do StarOffice 9
-CHART=Gráfico do StarOffice 9
-DRAW=Desenho do StarOffice 9
-IMPRESS=Apresentação do StarOffice 9
-MATH=Fórmula do StarOffice 9
-WRITER=Texto do StarOffice 9
-OTHER=Objetos adicionais

File testautomation/global/input/olenames/StarOffice/ole_7.txt

-CALC=StarOffice 9 Spreadsheet
-CHART=StarOffice 9 Chart
-DRAW=StarOffice 9 Drawing
-IMPRESS=Презентация StarOffice 9
-MATH=StarOffice 9 Formula
-WRITER=Текст StarOffice 9
-OTHER=Дополнительные объекты

File testautomation/global/input/olenames/StarOffice/ole_81.txt

-sc=StarSuite 7 表計算
-sh=StarSuite 7 グラフ
-sd=StarSuite 7 図形描画
-si=StarSuite 7 プレゼンテーション
-sm=StarSuite 7 数式
-sw=StarSuite 7 文書
-ot=その他のオブジェクト
-

File testautomation/global/input/olenames/StarOffice/ole_82.txt

-sc=StarSuite 7 스프레드시트
-sh=StarSuite 7 차트
-sd=StarSuite 7 그리기
-si=StarSuite 7 프레젠테이션
-sm=StarSuite 7 수식
-sw=StarSuite 7 텍스트
-ot=기타 개체

File testautomation/global/input/olenames/StarOffice/ole_86.txt

-sc=StarSuite 7 工作表
-sh=StarSuite 7 图表
-sd=StarSuite 7 绘图
-si=StarSuite 7 演示文稿
-sm=StarSuite 7 公式
-sw=StarSuite 7 文本文档
-ot=其他的对象

File testautomation/global/input/olenames/StarOffice/ole_88.txt

-sc=StarSuite 7 工作表
-sh=StarSuite 7 圖表
-sd=StarSuite 7 繪圖
-si=StarSuite 7 簡報
-sm=StarSuite 7 公式
-sw=StarSuite 7 文字
-ot=其他的物件

File testautomation/global/input/olenames/StarOffice/ole_96.txt

-sc=StarOffice 7 ?�?�?�?�
-sh=StarOffice 7 ?�?�?� ?�???�?�??
-sd=StarOffice 7 ?�?�?�?�
-si=StarOffice 7 ?�?�?� ???�?�???�??
-sm=StarOffice 7 ?�?????�
-sw=StarOffice 7 ?�?�
-ot=?????? ????

File testautomation/global/input/olenames/StarSuite/ole_1.txt

-CALC=StarSuite 9 Spreadsheet
-CHART=StarSuite 9 Chart
-DRAW=StarSuite 9 Drawing
-IMPRESS=StarSuite 9 Presentation
-MATH=StarSuite 9 Formula
-WRITER=StarSuite 9 Text
-OTHER=Further objects

File testautomation/global/input/olenames/StarSuite/ole_36.txt

-CALC=StarSuite 9-munkafüzet
-CHART=StarSuite 9-diagram
-DRAW=StarSuite 9-rajz
-IMPRESS=StarSuite 9-bemutató
-MATH=StarSuite 9-képlet
-WRITER=StarSuite 9-szöveg
-OTHER=További objektumok

File testautomation/global/input/olenames/StarSuite/ole_81.txt

-CALC=StarSuite 9 の表計算ドキュメント
-CHART=StarSuite 9 のグラフ
-DRAW=StarSuite 9 の図形描画
-IMPRESS=StarSuite 9 のプレゼンテーション
-MATH=StarSuite 9 の数式
-WRITER=StarSuite 9 のテキスト
-OTHER=その他のオブジェクト

File testautomation/global/input/olenames/StarSuite/ole_82.txt

-CALC=StarSuite 9 스프레드시트
-CHART=StarSuite 9 차트
-DRAW=StarSuite 9 그리기
-IMPRESS=StarSuite 9 프레젠테이션
-MATH=StarSuite 9 수식
-WRITER=StarSuite 9 텍스트
-OTHER=그밖의 개체

File testautomation/global/input/olenames/StarSuite/ole_86.txt

-CALC=StarSuite 9 电子表格
-CHART=StarSuite 9 图表
-DRAW=StarSuite 9 绘图
-IMPRESS=StarSuite 9 演示文稿
-MATH=StarSuite 9 公式
-WRITER=StarSuite 9 文本
-OTHER=其他的对象

File testautomation/global/input/olenames/StarSuite/ole_88.txt

-CALC=StarSuite 9 工作表文件
-CHART=StarSuite 9 圖表
-DRAW=StarSuite 9 繪圖
-IMPRESS=StarSuite 9 簡報
-MATH=StarSuite 9 公式
-WRITER=StarSuite 9 文字
-OTHER=其他的物件

File testautomation/global/system/includes/gvariabl.inc

 Global gAccessibility as Boolean    '///+ gAccessibility => If an accessibility tool is detected (gnome, JAWS)
 Global gProductName as string        '///+ gProductName => Name of the product (StarOffice, OpenOffice.org, ...)
 Global gMacroSecurityLevel as integer'///+ gMacroSecurityLevel => Macro Security Level (0: Low ... 3: Very High) 
+Global gOfficeVersion as string     '///+ gOfficeVersion => The version number of the office like 3.1, 9.0 ...
 
 '/// - global OLE-objectnames
 global gOLEWriter as String         '///+ gOLEWriter       => OLE-object-name for Writer

File testautomation/global/tools/getnames.bas

-'**************************************************************************
-'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
-'* Copyright 2008 by Sun Microsystems, Inc.
-'*
-'* OpenOffice.org - a multi-platform office productivity suite
-'*
-'* $RCSfile: getnames.bas,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:06 $
-'*
-'* This file is part of OpenOffice.org.
-'*
-'* OpenOffice.org is free software: you can redistribute it and/or modify
-'* it under the terms of the GNU Lesser General Public License version 3
-'* only, as published by the Free Software Foundation.
-'*
-'* OpenOffice.org is distributed in the hope that it will be useful,
-'* but WITHOUT ANY WARRANTY; without even the implied warranty of
-'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'* GNU Lesser General Public License version 3 for more details
-'* (a copy is included in the LICENSE file that accompanied this code).
-'*
-'* You should have received a copy of the GNU Lesser General Public License
-'* version 3 along with OpenOffice.org.  If not, see
-'* <http://www.openoffice.org/license.html>
-'* for a copy of the LGPLv3 License.
-'*
-'/************************************************************************
-'*
-'* owner : helge.delfs@sun.com
-'*
-'* short description : Creates lists of language dependent filters and OLE objects
-'*
-'************************************************************************
-'*
-' #1 GetOLEObjectNames 'Gets the language dependent OLE object names (UI)
-' #0 LoadIncludeFiles  
-'*
-'\***********************************************************************
-sub main
-
-   if ( gPlatgroup = "unx" ) then
-      warnlog( "Please use a Win32 version to get ALL OLE strings" )
-      warnlog( "The <Further Objects> might not be retrieved correctly")
-   endif
-   
-   call GetOLEObjectNames ' create the OLE-object-list
-   
-end sub
-
-'-------------------------------------------------------------------------
-
-testcase GetOLEObjectNames
-
-   '///Create a list of default OLE objects for the current Office-release
-
-   dim sOLENames (20) as string
-       sOLENames( 0 ) = "0"
-   dim sPath as string
-   dim sFile as string
-
-   sPath = convertpath( gOfficePath & "user\work" )
-   sFile = convertpath( sPath & "\ole_" + iSprache + ".txt" )   
-   
-   dim sOLEItem as string
-       
-   printlog( "sPath = " & sPath )
-   printlog( "sFile = " & sFile )
-
-   '///<ul><li>Get the list for Writer and Calc application</li>      
-   ' open a new document
-   gApplication = "WRITER"
-   call hNewDocument()
-   
-   ' open dialog "Insert->Object->OLE Object"
-   InsertObjectOLEObject
-   
-   ' read the entries. Note that the order of the entries is significant,
-   ' the short names (sc, sw ...) are english only while the OLE names 
-   ' can be of any language
-   Kontext "OLEObjektEinfuegen"
-   sOLEItem = "CALC=" + Objekttyp.GetItemText(1)     ' calc
-   call ListAppend ( sOLENames (), sOLEItem )
-
-   sOLEItem = "CHART=" + Objekttyp.GetItemText(2)     ' chart
-   call ListAppend ( sOLENames (), sOLEItem )
-
-   sOLEItem = "DRAW=" + Objekttyp.GetItemText(3)     ' draw
-   call ListAppend ( sOLENames (), sOLEItem )
-
-   sOLEItem = "IMPRESS=" + Objekttyp.GetItemText(4)     ' impress
-   call ListAppend ( sOLENames (), sOLEItem )
-
-   sOLEItem = "MATH=" + Objekttyp.GetItemText(5)     ' math
-   call ListAppend ( sOLENames (), sOLEItem )
-
-   OLEObjektEinfuegen.Cancel()
-   call hCloseDocument()
-
-   ' open calc document
-   gApplication = "CALC"
-   call hNewDocument()
-   
-   ' open dialog "Insert->Object->OLE Object"
-   InsertObjectOLEObject
-   
-   ' read the entries
-   Kontext "OLEObjektEinfuegen"
-   sOLEItem = "WRITER=" + Objekttyp.GetItemText(5)     ' writer
-   call ListAppend ( sOLENames (), sOLEItem )
-   
-   sOLEItem = "OTHER=" + Objekttyp.GetItemText(6)     ' other
-   call ListAppend ( sOLENames (), sOLEItem )
-   
-   OLEObjektEinfuegen.Cancel()
-   call hCloseDocument()
-   
-   ' check if the output directory exists
-   if ( app.dir( sPath ) = "" ) then
-   
-      printlog( "Directory does not exist, trying to create it." )
-      mkdir( sPath ) 
-      
-   endif
-   
-   '///<li>write the file to ...global/input/olenames/<app-name></li></ul>
-   if ( app.dir( sPath ) <> "" ) then
-   
-      printlog( "Write list to file" )
-      call ListWrite ( sOLENames(), sFile, "utf8" )
-      
-   else
-   
-      warnlog( "Failed to write filterlist, the targetdirectory does not exist" )
-      
-   endif   
-
-   ' Warn that the file has been written.
-   warnlog ( "*** NOTE: Manual action required ***" )
-   printlog( "Please check " + sFile + " ( UTF8 encoded )!" )
-   printlog( "The file containing the newly created OLE-name-lists has to be " )
-   printlog( "checked into cvs manually. Its location is: " )
-   printlog( gTesttoolPath & "\global\input\olenames\" & gProductName & "\ole_{language-code}.txt" )
-
-endcase
-
-'-------------------------------------------------------------------------
-
-sub LoadIncludeFiles
-   use "global\system\includes\master.inc"
-   use "global\system\includes\gvariabl.inc"
-   gApplication = "WRITER"
-   call GetUseFiles
-end sub
-
-'-------------------------------------------------------------------------
-

File testautomation/global/tools/includes/optional/t_ole.inc

+'encoding UTF-8  Do not remove or change this line!
+'*******************************************************************************
+'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'* 
+'* Copyright 2008 by Sun Microsystems, Inc.
+'*
+'* OpenOffice.org - a multi-platform office productivity suite
+'*
+'* $RCSfile: basic_delete_modules.inc,v $
+'*
+'* $Revision: 1.1 $
+'*
+'* last change: $Author: jsi $ $Date: 2008-06-16 12:18:13 $
+'*
+'* This file is part of OpenOffice.org.
+'*
+'* OpenOffice.org is free software: you can redistribute it and/or modify
+'* it under the terms of the GNU Lesser General Public License version 3
+'* only, as published by the Free Software Foundation.
+'*
+'* OpenOffice.org is distributed in the hope that it will be useful,
+'* but WITHOUT ANY WARRANTY; without even the implied warranty of
+'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+'* GNU Lesser General Public License version 3 for more details
+'* (a copy is included in the LICENSE file that accompanied this code).
+'*
+'* You should have received a copy of the GNU Lesser General Public License
+'* version 3 along with OpenOffice.org.  If not, see
+'* <http://www.openoffice.org/license.html>
+'* for a copy of the LGPLv3 License.
+'*
+'/******************************************************************************
+'*
+'*  owner : joerg.skottke@sun.com
+'*
+'*  short description : Tools for OLE objects
+'*
+'\******************************************************************************
+
+private const VERBOSE = FALSE
+
+'*******************************************************************************
+
+function hGetOfficeVersion() as string
+
+    dim cPath as string
+    dim aItemList( 20 ) as string
+    
+    const CFN = "global::tools::includes::optional::t_ole.inc::hGetOfficeVersion(): "
+
+    ' Path to info file
+    cPath = convertpath( gTesttoolPath & "global/input/officeinfo.txt" )
+    if ( VERBOSE ) then printlog( CFN & "Reading: " & cPath )
+    
+    ' Read the file
+    hGetDatafileSection( cPath, aItemList(), "", "", "" )
+    
+    ' Set global variable
+    gOfficeVersion = hGetValueForKeyAsString( aItemList(), gProductName )
+    
+    ' Set returnvalue
+    hGetOfficeVersion() = gOfficeVersion
+    
+end function
+
+'*******************************************************************************
+
+function hGetOleObjectName( ObjectType as string ) as string
+
+    dim oUnoOfficeConnection as object
+    dim oUnoConfigurationAccess as object
+    dim aPropertyValue(1) as new com.sun.star.beans.PropertyValue
+    dim xViewRoot as object
+    dim cConfigString as string
+    dim cString as string
+
+    const CFN = "global::tools::includes::optional::t_ole.inc::hGetOleObjectName(): "
+    
+    ' Test function parameters. They are <> gApplication as the API is case sensitive
+    select case ObjectType
+    case "Writer"
+    case "Calc"
+    case "Impress"
+    case "Draw"
+    case "Math"
+    case "Chart"
+    case else
+        warnlog( CFN & "Invalid object type passed to function: " & ObjectType )
+        warnlog( CFN & "This function is case sensitive." )
+        warnlog( CFN & "Supported are: Writer, Calc, Impress, Draw, Math, Chart" )
+        hGetOleObjectName() = ""
+        exit function
+    end select
+    
+    if ( VERBOSE ) then printlog( CFN & "Retrieving OLE name for: " & ObjectType )
+
+    ' ...Embedding is physical path, ObjectNames the top node
+    aPropertyValue( 0 ).Name  = "nodepath"
+    aPropertyValue( 0 ).Value = "/org.openoffice.Office.Embedding/ObjectNames/" & ObjectType
+    
+    ' Connect to remote UNO
+    oUnoOfficeConnection = hGetUnoService( TRUE )
+    
+    if ( isNull( oUnoOfficeConnection )) then
+        warnlog( CFN & "Failed to establish UNO connection, hGetUnoService failed" )
+        hGetOleObjectName() = ""
+    else
+        ' Get a configuration provider
+        oUnoConfigurationAccess = oUnoOfficeConnection.createInstance( "com.sun.star.configuration.ConfigurationProvider" )
+        
+        ' Get access
+        xViewRoot = oUnoConfigurationAccess.createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", aPropertyValue() )
+        cConfigString = xViewRoot.getByName( "ObjectUIName" )
+        
+        ' The string contains placeholders %PRODUCTNAME and %PRODUCTVERSION which have to be replaced
+        if ( gOfficeVersion = "" ) then
+            warnlog( CFN & "gOOoBaseVersion is empty, run hGetOfficeVersion() first" )
+            cString = right( cConfigString, len( cConfigString ) - 29 )
+        else
+            cString = gProductName & " " & gOfficeVersion & " " & right( cConfigString, len( cConfigString ) - 29 )
+        endif
+        
+    endif
+    
+    hGetOleObjectName() = cString
+
+end function
+
+'*******************************************************************************
+
+function GetOleDefaultNames()
+
+    const CFN = "global::tools::includes::optional::t_ole.inc::GetOleDefaultNames(): "
+    if ( VERBOSE ) then printlog( CFN & "Retrieving OLE names" )
+
+    hGetOfficeVersion()
+    gOLEWriter  = hGetOleObjectName( "Writer"  )
+    gOLECalc    = hGetOleObjectName( "Calc"    )
+    gOLEChart   = hGetOleObjectName( "Chart"   )
+    gOLEImpress = hGetOleObjectName( "Impress" )
+    gOLEDraw    = hGetOleObjectName( "Draw"    )
+    gOLEMath    = hGetOleObjectName( "Math"    )    
+
+end function
+
+'*******************************************************************************

File testautomation/graphics/optional/d_export_graphic_a.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
 sub main
     Printlog "--------------------- Graphics Export Test ------------------- "
 
-    Call hStatusIn ( "Graphics","d_export_graphic_a.bas", "Graphics Export Test" )
+    Call hStatusIn ( "Graphics","d_export_graphic_a.bas" )
 
     use "graphics\tools\id_tools.inc"
     use "graphics\tools\id_tools_2.inc"
     use "graphics\optional\includes\global\export_graphic.inc"
 
-if bAsianLan then
-    qaErrorLog "#i71631# - Test deactivated with Asian languages due to bug"
-    Call hStatusOut
-    exit sub
-endif
+    if bAsianLan then
+        qaErrorLog "#i71631# - Test deactivated with Asian languages due to bug"
+        Call hStatusOut
+        exit sub
+    endif
 
     Call sFileExport 'OBSERVE - This line must run before the following testcases!
     Call tEPS   '///+-   Encapsulated PostScript            ///'

File testautomation/graphics/optional/d_export_graphic_b.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
 
 sub main
     Printlog "--------------------- Graphics Export Test ------------------- "
-    Call hStatusIn ( "Graphics","d_export_graphic_b.bas", "Graphics Export Test" )
+    Call hStatusIn ( "Graphics","d_export_graphic_b.bas" )
 
     use "graphics\tools\id_tools.inc"
     use "graphics\tools\id_tools_2.inc"
     use "graphics\optional\includes\global\export_graphic_2.inc"
 
-if bAsianLan then
-   qaErrorLog "#i71631# - Test deactivated with Asian languages due to bug"
-   Call hStatusOut
-   exit sub
-endif
+    if bAsianLan then
+        qaErrorLog "#i71631# - Test deactivated with Asian languages due to bug"
+        Call hStatusOut
+        exit sub
+    endif
 
     Call sFileExport 'OBSERVE - This line must run before the following testcases!
     Call tPNG   '///+-   Portable Network Graphic           ///'

File testautomation/graphics/optional/export_graphic_a.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
 
 sub main
     Printlog "--------------------- Graphics Export Test ------------------- "
-    Call hStatusIn ( "Graphics","export_graphic_a.bas", "Graphics Export Test A" )
+    Call hStatusIn ( "Graphics","export_graphic_a.bas" )
 
     use "graphics\tools\id_tools.inc"
     use "graphics\tools\id_tools_2.inc"
     use "graphics\optional\includes\global\export_graphic.inc"
 
-if bAsianLan then 
-   qaErrorLog "#i71631# - Test deactivated with Asian languages due to bug"
-   Call hStatusOut
-   exit sub
-endif
+    if bAsianLan then
+        qaErrorLog "#i71631# - Test deactivated with Asian languages due to bug"
+        Call hStatusOut
+        exit sub
+    endif
 
     Call sFileExport 'OBSERVE - This line must run before the following testcases!
     Call tEPS   '///+-   Encapsulated PostScript            ///'

File testautomation/graphics/optional/export_graphic_b.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
 
 sub main
     Printlog "--------------------- Graphics Export Test ------------------- "
-    Call hStatusIn ( "Graphics","export_graphic_b.bas", "Graphics Export Test B" )
+    Call hStatusIn ( "Graphics","export_graphic_b.bas" )
 
     use "graphics\tools\id_tools.inc"
     use "graphics\tools\id_tools_2.inc"
     use "graphics\optional\includes\global\export_graphic_2.inc"
 
-if bAsianLan then 
-   qaErrorLog "#i71631# - Test deactivated with Asian languages due to bug"
-   Call hStatusOut
-   exit sub
-endif
+    if bAsianLan then
+        qaErrorLog "#i71631# - Test deactivated with Asian languages due to bug"
+        Call hStatusOut
+        exit sub
+    endif
 
     Call sFileExport 'OBSERVE - This line must run before the following testcases!
     Call tPDF   '///+-   Portable Document Format           ///'
     Call tMET   '///+-   OS/2 Metafile                      ///'
     Call tWMF   '///+-   Windows Metafile                   ///'
     Call tSWF   '///+-   Macromedia Flash (SWF) (.swf)      ///'
-    
+
     Call hStatusOut
 end sub
 

File testautomation/graphics/optional/g_accessability.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
     use "graphics\optional\includes\global\g_accessability.inc"
 
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tEis1581 ' impress only
-        Call tEis1549
-        Call tEis1523
+    Call tEis1581 ' impress only
+    Call tEis1549
+    Call tEis1523
 
     gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tEis1549
-        Call tEis1523
+    Call tEis1549
+    Call tEis1523
 
     Call hStatusOut
 end sub

File testautomation/graphics/optional/g_area.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
     use "graphics\optional\includes\global\g_area.inc"
 
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tiFormatArea
-        Call tdFormatArea1
+    Call tiFormatArea
+    Call tdFormatArea1
 
     gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tiFormatArea
-        Call tdFormatArea1
+    Call tiFormatArea
+    Call tdFormatArea1
 
     Call hStatusOut
 end sub

File testautomation/graphics/optional/g_arrangealign.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
 
     gApplication = "IMPRESS"
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Datei = ConvertPath (gOfficePath + "user\work\" + "anord.odp")
-        Call tiDatei_Fuer_Anordnen_Erstellen ' is needed for the following test :-( ueber vars are set here
-        Call tdContextSendBackward
-        Call tdContextBringForward
-        Call tdContextSendToBack
-        Call tdContextBringToFront
-        Call tdContextInFrontOfObject
-        Call tdContextBehindObject
-        Call tdContextReverse
+    Datei = ConvertPath (gOfficePath + "user\work\" + "anord.odp")
+    Call tiDatei_Fuer_Anordnen_Erstellen ' is needed for the following test :-( ueber vars are set here
+    Call tdContextSendBackward
+    Call tdContextBringForward
+    Call tdContextSendToBack
+    Call tdContextBringToFront
+    Call tdContextInFrontOfObject
+    Call tdContextBehindObject
+    Call tdContextReverse
 
     gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Datei = ConvertPath (gOfficePath + "user\work\" + "anord.odg")
-        Call tiDatei_Fuer_Anordnen_Erstellen ' is needed for the following test :-( ueber vars are set here
-        Call tdContextSendBackward
-        Call tdContextBringForward
-        Call tdContextSendToBack
-        Call tdContextBringToFront
-        Call tdContextInFrontOfObject
-        Call tdContextBehindObject
-        Call tdContextReverse
+    Datei = ConvertPath (gOfficePath + "user\work\" + "anord.odg")
+    Call tiDatei_Fuer_Anordnen_Erstellen ' is needed for the following test :-( ueber vars are set here
+    Call tdContextSendBackward
+    Call tdContextBringForward
+    Call tdContextSendToBack
+    Call tdContextBringToFront
+    Call tdContextInFrontOfObject
+    Call tdContextBehindObject
+    Call tdContextReverse
 
     Call hStatusOut
 end sub

File testautomation/graphics/optional/g_autocorrection.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
     use "graphics\tools\id_tools_2.inc"
     use "graphics\optional\includes\global\g_autocorrection.inc"
 
-    GetOLEDefaultNames
     hSetLocaleStrings ( gTesttoolPath + "graphics\tools\locale_1.txt" , glLocale () )
 
     gApplication = "IMPRESS"
     PrintLog "-------------------------" + gApplication + "-------------------"
-'qaErrorLog "#i76832# - tToolsAutocorrectCustomQuotes (x4) outcommented due to Bug."
+    'qaErrorLog "#i76832# - tToolsAutocorrectCustomQuotes (x4) outcommented due to Bug."
     Call tToolsAutocorrectCustomQuotes (TRUE)
     Call tToolsAutocorrectCustomQuotes (FALSE)
     Call tToolsAutocorrectOption

File testautomation/graphics/optional/g_character.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
 
     PrintLog "-------------------------" + gApplication + "-------------------"
 
-        Call tDialogCharacter
-        Call tFormatCharacter
-        Call tSetFormatCharacter
-        Call tGetFormatCharacter
+    Call tDialogCharacter
+    Call tFormatCharacter
+    Call tSetFormatCharacter
+    Call tGetFormatCharacter
 
     gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
 
-        Call tDialogCharacter
-        Call tFormatCharacter
+    Call tDialogCharacter
+    Call tFormatCharacter
 
-        Call tSetFormatCharacter
-        Call tGetFormatCharacter
+    Call tSetFormatCharacter
+    Call tGetFormatCharacter
 
     Call hStatusOut
 end sub

File testautomation/graphics/optional/g_clipboard.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
     use "graphics\tools\id_tools_2.inc"
     use "graphics\optional\includes\global\g_clipboard.inc"
 
-    GetOLEDefaultNames
     hSetLocaleStrings ( gTesttoolPath + "graphics\tools\locale_1.txt" , glLocale () )
 
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tiEditPasteSpecial
-        Call tiEditUndo
-        Call tiEditRedo
-        Call tiEditClipboard
-        Call tiEditPasteSpecial_HTML
-        Call tdEditPasteSpecial_Text
-        Call tdEditPasteSpecial_Graphic
-        Call tdEditPasteSpecial_Circle
+    Call tiEditPasteSpecial
+    Call tiEditUndo
+    Call tiEditRedo
+    Call tiEditClipboard
+    Call tiEditPasteSpecial_HTML
+    Call tdEditPasteSpecial_Text
+    Call tdEditPasteSpecial_Graphic
+    Call tdEditPasteSpecial_Circle
 
     gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tiEditPasteSpecial
-        Call tiEditUndo
-        Call tiEditRedo
-        Call tiEditClipboard
-        Call tiEditPasteSpecial_HTML
-        Call tdEditPasteSpecial_Text
-        Call tdEditPasteSpecial_Graphic
-        Call tdEditPasteSpecial_Circle
+    Call tiEditPasteSpecial
+    Call tiEditUndo
+    Call tiEditRedo
+    Call tiEditClipboard
+    Call tiEditPasteSpecial_HTML
+    Call tdEditPasteSpecial_Text
+    Call tdEditPasteSpecial_Graphic
+    Call tdEditPasteSpecial_Circle
 
     Call hStatusOut
 end sub

File testautomation/graphics/optional/g_clipexport.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
 '\******************************************************************
 
 sub main
-   Call hStatusIn ( "Graphics","g_clipexport.bas")
+    Call hStatusIn ( "Graphics","g_clipexport.bas")
 
     use "graphics\tools\id_tools.inc"
     use "graphics\tools\id_tools_2.inc"
 
     gApplication = "IMPRESS"
     PrintLog "-------------------------" + gApplication + "-------------------"
-   Call tClipboardFromDrawTest
+    Call tClipboardFromDrawTest
 
-'TODO FHA - Find and write bugs for exporting to writer and calc.
-'    gApplication = "WRITER"
-'    PrintLog "-------------------------" + gApplication + "-------------------"
-'       Call tClipboardFromDrawTest
+    'TODO FHA - Find and write bugs for exporting to writer and calc.
+    '    gApplication = "WRITER"
+    '    PrintLog "-------------------------" + gApplication + "-------------------"
+    '       Call tClipboardFromDrawTest
 
-'    gApplication = "CALC"
-'    PrintLog "-------------------------" + gApplication + "-------------------"
-'       Call tClipboardFromDrawTest
+    '    gApplication = "CALC"
+    '    PrintLog "-------------------------" + gApplication + "-------------------"
+    '       Call tClipboardFromDrawTest
 
-   Call hStatusOut
+    Call hStatusOut
 end sub
 
 sub LoadIncludeFiles
-   use "global\system\includes\master.inc"
-   use "global\system\includes\gvariabl.inc"
-   use "global\tools\includes\required\t_menu.inc"   'Window-control
-   gApplication = "DRAW"
-   Call GetUseFiles
+    use "global\system\includes\master.inc"
+    use "global\system\includes\gvariabl.inc"
+    use "global\tools\includes\required\t_menu.inc"   'Window-control
+    gApplication = "DRAW"
+    Call GetUseFiles
 end sub

File testautomation/graphics/optional/g_convertto.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
     use "graphics\optional\includes\global\g_convertto.inc"
 
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tiModifyConvertToPolygon
-        Call tdContextConvertIntoBitmap
-        Call tiAendernUmwandelnInKurve
-        Call tiAendernUmwandelnInPolygonGrafik
-        Call tiAendernUmwandelnIn3D
-        Call tiAendernUmwandelnIn3DRotationsKoerper
-        Call tiAendernUmwandelnInMetaFile
+    Call tiModifyConvertToPolygon
+    Call tdContextConvertIntoBitmap
+    Call tiAendernUmwandelnInKurve
+    Call tiAendernUmwandelnInPolygonGrafik
+    Call tiAendernUmwandelnIn3D
+    Call tiAendernUmwandelnIn3DRotationsKoerper
+    Call tiAendernUmwandelnInMetaFile
 
     gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tiModifyConvertToPolygon
-        Call tdContextConvertIntoBitmap
-        Call tiAendernUmwandelnInKurve
-        Call tiAendernUmwandelnInPolygonGrafik
-        Call tiAendernUmwandelnIn3D
-        Call tiAendernUmwandelnIn3DRotationsKoerper
-        Call tiAendernUmwandelnInMetaFile
+    Call tiModifyConvertToPolygon
+    Call tdContextConvertIntoBitmap
+    Call tiAendernUmwandelnInKurve
+    Call tiAendernUmwandelnInPolygonGrafik
+    Call tiAendernUmwandelnIn3D
+    Call tiAendernUmwandelnIn3DRotationsKoerper
+    Call tiAendernUmwandelnInMetaFile
 
     Call hStatusOut
 end sub

File testautomation/graphics/optional/g_crossfading.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
     use "graphics\optional\includes\global\g_crossfading.inc"
 
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tCrossfading
+    Call tCrossfading
 
     gApplication = "IMPRESS"
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tCrossfading
+    Call tCrossfading
 
     Call hStatusOut
 end sub
 
 sub LoadIncludeFiles
-   use "global\system\includes\master.inc"
-   use "global\system\includes\gvariabl.inc"
-   gApplication = "DRAW"
-   Call GetUseFiles
+    use "global\system\includes\master.inc"
+    use "global\system\includes\gvariabl.inc"
+    gApplication = "DRAW"
+    Call GetUseFiles
 end sub

File testautomation/graphics/optional/g_customshapes.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
 
     gApplication = "DRAW"
     PrintLog "--------------------- " + gApplication + " -------------------"
-        Call tFormatPaintbrush
-        Call tCustomshapes
+    Call tFormatPaintbrush
+    Call tCustomshapes
 
     Call hStatusOut
 end sub

File testautomation/graphics/optional/g_demoguide.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
     call t_Introduction
     call t_Interoperability
     call t_DrawingEngine
-    
+
     Call hStatusOut
 end sub
 

File testautomation/graphics/optional/g_dimensions.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
     use "graphics\optional\includes\global\g_dimensions.inc"
 
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call testFormatDimensioning
+    Call testFormatDimensioning
 
     gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call testFormatDimensioning
+    Call testFormatDimensioning
 
     Call hStatusOut
 end sub

File testautomation/graphics/optional/g_edit.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
     GetOLEDefaultNames
 
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tEditDuplicate
-        Call tEditFields
-        Call tEditDeleteSlide
-        Call tEditLinks
-        Call tEditObjectEdit
+    Call tEditDuplicate
+    Call tEditFields
+    Call tEditDeleteSlide
+    Call tEditLinks
+    Call tEditObjectEdit
 
     gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tEditDuplicate
-        Call tEditFields
-        Call tEditDeleteSlide
-        Call tEditLinks
-        Call tdEditDeleteLayer
-        Call tEditObjectEdit
+    Call tEditDuplicate
+    Call tEditFields
+    Call tEditDeleteSlide
+    Call tEditLinks
+    Call tdEditDeleteLayer
+    Call tEditObjectEdit
 
     Call hStatusOut
 end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
+    use "global\tools\includes\optional\t_ole.inc"
     Call GetUseFiles
     gApplication = "IMPRESS"
 end sub

File testautomation/graphics/optional/g_export_html.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
     use "graphics\tools\id_tools.inc"
     use "graphics\optional\includes\global\g_export_html.inc"
 
-    GetOLEDefaultNames
     hSetLocaleStrings ( gTesttoolPath + "graphics\tools\locale_1.txt" , glLocale () )
 
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tHTMLExport
-        Call tHtmlExport_Webcast
+    Call tHTMLExport
+    Call tHtmlExport_Webcast
 
     gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tHTMLExport
+    Call tHTMLExport
 
     Call hStatusOut
 end sub

File testautomation/graphics/optional/g_findreplace.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
 public glLocale (15*20) as string
 
 sub main
-   Call hStatusIn ( "Graphics","g_findreplace.bas")
+    Call hStatusIn ( "Graphics","g_findreplace.bas")
 
     use "graphics\tools\id_tools.inc"
     use "graphics\optional\includes\global\g_find_replace.inc"
 
-   GetOLEDefaultNames
-   hSetLocaleStrings ( gTesttoolPath + "graphics\tools\locale_1.txt" , glLocale () )
+    hSetLocaleStrings ( gTesttoolPath + "graphics\tools\locale_1.txt" , glLocale () )
 
-   PrintLog "-------------------------" + gApplication + "-------------------"
-   Call tiEditSearchAndReplace
-   Call tiEditSearchAndReplaceBUGS
+    PrintLog "-------------------------" + gApplication + "-------------------"
+    Call tiEditSearchAndReplace
+    Call tiEditSearchAndReplaceBUGS
 
-   gApplication = "DRAW"
-   PrintLog "-------------------------" + gApplication + "-------------------"
-   Call tiEditSearchAndReplace
+    gApplication = "DRAW"
+    PrintLog "-------------------------" + gApplication + "-------------------"
+    Call tiEditSearchAndReplace
 
-   Call hStatusOut
+    Call hStatusOut
 end sub
 
 sub LoadIncludeFiles
-   use "global\system\includes\master.inc"
-   use "global\system\includes\gvariabl.inc"
-   gApplication = "IMPRESS"
-   Call GetUseFiles
+    use "global\system\includes\master.inc"
+    use "global\system\includes\gvariabl.inc"
+    gApplication = "IMPRESS"
+    Call GetUseFiles
 end sub

File testautomation/graphics/optional/g_format.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
     use "graphics\optional\includes\global\g_format.inc"
 
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tiFormatText
-        Call tiFormatPositionAndSize
-        Call tdFormatConnector
-        Call tiFormat3D_Effekte
-        Call tiFormatAufzaehlungszeichen
-        Call tdFormatTemplates
+    Call tiFormatText
+    Call tiFormatPositionAndSize
+    Call tdFormatConnector
+    Call tiFormat3D_Effekte
+    Call tiFormatAufzaehlungszeichen
+    Call tdFormatTemplates
 
     gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tiFormatText
-        Call tdFormatLayer
-        Call tiFormatPositionAndSize
-        Call tdFormatConnector
-        Call tiFormat3D_Effekte
-        Call tiFormatAufzaehlungszeichen
-        Call tdFormatTemplates
+    Call tiFormatText
+    Call tdFormatLayer
+    Call tiFormatPositionAndSize
+    Call tdFormatConnector
+    Call tiFormat3D_Effekte
+    Call tiFormatAufzaehlungszeichen
+    Call tdFormatTemplates
 
     Call hStatusOut
 end sub

File testautomation/graphics/optional/g_group.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
     use "graphics\optional\includes\global\g_group.inc"
 
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tiGruppierung
+    Call tiGruppierung
 
     gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tiGruppierung
+    Call tiGruppierung
 
     Call hStatusOut
 end sub

File testautomation/graphics/optional/g_imagemap.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
     use "graphics\optional\includes\global\g_imagemap.inc"
 
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tEditImageMap
-        Call tEditImageMapProperties
+    Call tEditImageMap
+    Call tEditImageMapProperties
 
     gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tEditImageMap
-        Call tEditImageMapProperties
-        
+    Call tEditImageMap
+    Call tEditImageMapProperties
+
     Call hStatusOut
 end sub
 
 sub LoadIncludeFiles
-   use "global\system\includes\master.inc"
-   use "global\system\includes\gvariabl.inc"
-   gApplication = "IMPRESS"
-   Call GetUseFiles
+    use "global\system\includes\master.inc"
+    use "global\system\includes\gvariabl.inc"
+    gApplication = "IMPRESS"
+    Call GetUseFiles
 end sub

File testautomation/graphics/optional/g_insert.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
     use "graphics\tools\id_tools_2.inc"
     use "graphics\optional\includes\global\g_insert.inc"
 
-    GetOLEDefaultNames
     hSetLocaleStrings ( gTesttoolPath + "graphics\tools\locale_1.txt" , glLocale () )
 
     PrintLog "-------------------------" + gApplication + "-------------------"
 
     Call tInsertFloatingFrame
     Call tInsertFields
-QaErrorLog "#79794 - tdInsertObjectOleObjects outcommented due to bug."
-'    Call tdInsertObjectOleObjects
+    QaErrorLog "#79794 - tdInsertObjectOleObjects outcommented due to bug."
+    '    Call tdInsertObjectOleObjects
 
     Printlog "Disabled SnappPointLine test, because of unpredictable mouse moves (07/2002 TBO)"
     'Call tdInsertSnappoint_Line
     Call tInsertObjectPlugIn               ' Doesn't exist in the VCL
     Call tInsertObjectApplet
     Call tInsertObjectFormula              ' Is in the VCL in InsertObjectOLEObject
-'    Call tInsertChart
+    '    Call tInsertChart
     Call tdInsertFile
 
     Call hStatusOut
 end sub
 
 sub LoadIncludeFiles
-   use "global\system\includes\master.inc"
-   use "global\system\includes\gvariabl.inc"
-   gApplication = "IMPRESS"
-   Call GetUseFiles
+    use "global\system\includes\master.inc"
+    use "global\system\includes\gvariabl.inc"
+    gApplication = "IMPRESS"
+    Call GetUseFiles
 end sub

File testautomation/graphics/optional/g_line.bas

 'encoding UTF-8  Do not remove or change this line!
 '**************************************************************************
 '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
+'*
 '* Copyright 2008 by Sun Microsystems, Inc.
 '*
 '* OpenOffice.org - a multi-platform office productivity suite
     use "graphics\optional\includes\global\g_line.inc"
 
     PrintLog "-------------------------" + gApplication + "-------------------"
-        Call tiFormatLine
-        Call tLineConnect
+    Call tiFormatLine
+    Call tLineConnect