CWS-TOOLING: integrate CWS qascripts02

2008-11-20 14:38:35 +0100 jsk  r264055 : #i96341#
2008-11-19 11:22:47 +0100 jsk  r263970 : #i96341
2008-11-19 11:21:33 +0100 jsk  r263969 : #i96341

15 files changed, 147 insertions, 154 deletions

diff --git a/testautomation/dbaccess/optional/dba_ctrl_TextControl.bas b/testautomation/dbaccess/optional/dba_ctrl_TextControl.bas
index 7b00f464eacf..badbe73bd1c9 100755
--- a/testautomation/dbaccess/optional/dba_ctrl_TextControl.bas
+++ b/testautomation/dbaccess/optional/dba_ctrl_TextControl.bas
@@ -54,6 +54,7 @@ end sub
 
 sub LoadIncludeFiles   
    use "dbaccess/tools/dbinit.inc"   
+   use "global\tools\includes\optional\t_ui_filters.inc"
    Call sDBInit
    Call GetUseFiles
    gApplication   = "WRITER"
diff --git a/testautomation/framework/required/f_first.bas b/testautomation/framework/required/f_first.bas
index 88e10d9c9982..0cb3da90ee8a 100755
--- a/testautomation/framework/required/f_first.bas
+++ b/testautomation/framework/required/f_first.bas
@@ -68,6 +68,7 @@ sub LoadIncludeFiles
     
     use "global\required\includes\g_option.inc"
     
+    use "global\tools\includes\optional\t_ui_filters.inc"
     use "global\tools\includes\optional\t_filetools.inc"
     use "global\tools\includes\optional\t_docfuncs.inc"
     use "global\tools\includes\optional\t_listfuncs.inc"
diff --git a/testautomation/global/system/includes/gvariabl.inc b/testautomation/global/system/includes/gvariabl.inc
index 7a3582ce54a5..30f65c97db59 100755
--- a/testautomation/global/system/includes/gvariabl.inc
+++ b/testautomation/global/system/includes/gvariabl.inc
@@ -91,15 +91,6 @@ Global gAccessibility as Boolean    '///+ gAccessibility => If an accessibility
 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 filternames for default filters
-global gWriterFilter as String      '///+ gWriterFilter    => default-filter-name for Writer
-global gCalcFilter as String        '///+ gCalcFilter      => default-filter-name for Calc
-global gImpressFilter as String     '///+ gImpressFilter   => default-filter-name for Impress
-global gMasterDocFilter as String   '///+ gMasterDocFilter => default-filter-name for MasterDoc
-global gMathFilter as String        '///+ gMathFilter      => default-filter-name for Math
-global gDrawFilter as String        '///+ gDrawFilter      => default-filter-name for Draw
-global gHTMLFilter as String        '///+ gHTMLFilter      => default-filter-name for HTML
-
 '/// - global OLE-objectnames
 global gOLEWriter as String         '///+ gOLEWriter       => OLE-object-name for Writer
 global gOLECalc as String           '///+ gOLECalc         => OLE-object-name for Calc
@@ -221,15 +212,6 @@ sub OnlyForDocuGVariables
 '///<i>gLanguage</i>: The languagename for office language
 '///<i>gMacroSecurityLevel</i>: Macro Security Level (0: Low ... 3: Very High) 
 
-'///<b>Global filternames for default filters</b>
-'///<i>gWriterFilter</i>: Default-filter-name for Writer
-'///<i>gCalcFilter</i>: Default-filter-name for Calc
-'///<i>gImpressFilter</i>: Default-filter-name for Impress
-'///<i>gMasterDocFilter</i>: Default-filter-name for MasterDoc
-'///<i>gMathFilter</i>: Default-filter-name for Math
-'///<i>gDrawFilter</i>: Default-filter-name for Draw
-'///<i>gHTMLFilter</i>: Default-filter-name for HTML
-
 '///<b>global OLE-objectnames</b>
 '///<i>gOLEWriter</i>: OLE-object-name for Writer
 '///<i>gOLECalc</i>: OLE-object-name for Calc
diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc
index e16ae353adf5..49e96f7a8ca4 100755
--- a/testautomation/global/system/includes/master.inc
+++ b/testautomation/global/system/includes/master.inc
@@ -100,7 +100,7 @@ sub GetUseFiles
         printlog "**  Quickstarter disabled         : " & bQuickstarterStatus      
     printlog    "----------------------------------------------------------------------------------------------------"
     printlog    ""
-    Call GetDefaultFilternames            '///+<li><b>GetDefaultFilternames</b>: Get the correct <u>default names for filters</u> for each application</li></ul>
+
     if (NOT gSamePC) then
         gTestToolPath = gRemotePath
     end if
diff --git a/testautomation/global/tools/includes/optional/t_ui_filters.inc b/testautomation/global/tools/includes/optional/t_ui_filters.inc
new file mode 100644
index 000000000000..1e6cdd511fae
--- /dev/null
+++ b/testautomation/global/tools/includes/optional/t_ui_filters.inc
@@ -0,0 +1,136 @@
+'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: t_filters.inc,v $
+'*
+'* $Revision: 1.1 $
+'*
+'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:10 $
+'*
+'* 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 : Get the UI names for default filters
+'*
+'\******************************************************************************
+
+global gWriterFilter    as String
+global gCalcFilter      as String
+global gImpressFilter   as String
+global gMasterDocFilter as String
+global gMathFilter      as String
+global gDrawFilter      as String
+global gHTMLFilter      as String
+
+'*******************************************************************************
+
+sub GetDefaultFilterNames()
+
+    const CFN = "global::tools::includes::optional::t_ui_filters.inc::GetDefaultFilterNames():"
+
+    dim sMatchingFile as string
+    dim sFilterArray( 100 ) as string
+    
+    const APPLICATION_COUNT = 7  
+    dim cUIFilters( APPLICATION_COUNT ) as string
+    dim cAPIFilters( APPLICATION_COUNT ) as string
+    
+    sMatchingFile = gTesttoolPath & "global\input\filters\"
+    sMatchingFile = sMatchingFile & "build_to_filter.txt"
+    sMatchingFile = convertpath( sMatchingFile )
+
+    hGetDataFileSection( sMatchingFile, sFilterArray(), "Current", "", "" )
+
+    cAPIFilters( 1 ) = hGetValueForKeyAsString( sFilterArray(), "WRITER"    )
+    cAPIFilters( 2 ) = hGetValueForKeyAsString( sFilterArray(), "CALC"      )
+    cAPIFilters( 3 ) = hGetValueForKeyAsString( sFilterArray(), "IMPRESS"   )
+    cAPIFilters( 4 ) = hGetValueForKeyAsString( sFilterArray(), "MASTERDOC" )
+    cAPIFilters( 5 ) = hGetValueForKeyAsString( sFilterArray(), "MATH"      )
+    cAPIFilters( 6 ) = hGetValueForKeyAsString( sFilterArray(), "DRAW"      )
+    cAPIFilters( 7 ) = hGetValueForKeyAsString( sFilterArray(), "HTML"      )
+    
+    hGetFilterGroup( cAPIFilters(), cUIFilters() )
+
+    gWriterFilter     = cUIFilters( 1 ) 
+    gCalcFilter       = cUIFilters( 2 )
+    gImpressFilter    = cUIFilters( 3 )
+    gMasterDocFilter  = cUIFilters( 4 )
+    gMathFilter       = cUIFilters( 5 )
+    gDrawFilter       = cUIFilters( 6 )
+    gHTMLFilter       = cUIFilters( 7 )
+    
+end sub
+
+'*******************************************************************************
+
+function hGetFilterGroup( api_filters() as string, ui_filters() as string ) 
+
+    ' This is a function designed to deliver a massive speed improvement
+    ' compared to multiple calls to hGetUIFiltername() which establish a fresh 
+    ' UNO connection on each call. This function establishes only one connection
+    ' and works with a list of API filter names which are matched to UI filter
+    ' names. This function does not wrap the UNO calls in a try...catch block
+    ' which means that if the function fails, it fails hard. Extra hard, that is.
+    ' There is no errorhandling. This function is intended for internal use only.
+    ' No returnvalue is defined at this time.
+
+    const CFN = "global::tools::includes::optional::t_ui_filters.inc::hGetFilterGroup():"
+
+    dim oUno as object
+    dim oService as object
+    dim oFilter as object
+    
+    dim iCurrentFilter as integer
+    
+    dim iFilterCount as integer
+        iFilterCount = ubound( api_filters() )
+        
+    dim iAPIfilterList as integer
+
+    oUno = hGetUNOService( true )
+    oService = oUno.createInstance("com.sun.star.document.FilterFactory")
+    
+    for iCurrentFilter = 1 to iFilterCount
+    
+        oFilter = oService.getByName( api_filters( iCurrentFilter ) )
+
+        for iAPIFilterList = 0 to ubound( oFilter )
+        
+            if ( oFilter( iAPIFilterList ).Name = "UIName" ) then
+                ui_filters( iCurrentFilter ) = oFilter( iAPIFilterList ).Value()
+                'printlog( CFN & "DEBUG: Index (iCurrentFilter): " & iCurrentFilter )
+                'printlog( CFN & "DEBUG: API Filter: " & api_filters( iCurrentFilter ) )
+                'printlog( CFN & "DEBUG: UI Filter.: " &  ui_filters( iCurrentFilter ) )
+            endif
+            
+        next iAPIFilterList
+        
+    next iCurrentFilter
+
+end function
+
+'*******************************************************************************
+
diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc
index ff3ce98782b6..559b88a8457b 100755
--- a/testautomation/global/tools/includes/required/t_files.inc
+++ b/testautomation/global/tools/includes/required/t_files.inc
@@ -39,54 +39,6 @@
 
 private const C_INFO = TRUE ' Set this to TRUE to increase verbosity of some functions
 
-function hHandleAlienWarning( sFilterName as string ) as boolean
-    
-    dim bAlienNotAllowed as boolean
-    bAlienNotAllowed = false
-    
-    const CFN = "global::toolls::inc:t_files.inc::hHandleAlienWarning()"
-    
-    
-    if ( C_INFO ) then printlog( CFN & "Testing for Alien Warning" )
-    
-    Kontext "AlienWarning"
-    if AlienWarning.Exists() then
-        
-        ' Verifying the default filter with the used filter and if it is the same and
-        ' the Alien Warning dialog occured return a warning.
-        
-        select case lcase(gApplication)
-        case "writer",  "textdokument" : 
-            if sFilterName = gWriterFilter then bAlienNotAllowed = TRUE
-        case "calc", "tabellendokument" :
-            if sFilterName = gCalcFilter then bAlienNotAllowed = TRUE
-        case "impress", "praesentation" :
-            if sFilterName = gImpressFilter then bAlienNotAllowed = TRUE
-        case "draw", "zeichnung" :
-            if sFilterName = gDrawFilter then bAlienNotAllowed = TRUE
-        case "masterdoc", "globaldokument", "globaldoc" :
-            if sFilterName = gMasterDocFilter then bAlienNotAllowed = TRUE
-        case "math", "formel" :
-            if sFilterName = gMathFilter then bAlienNotAllowed = TRUE
-        case "html", "htmldokument" :
-            if sFilterName = gHTMLFilter then bAlienNotAllowed = TRUE
-        end select
-        
-        if ( bAlienNotAllowed ) then
-            warnlog( CFN & "No alien warning expected for this documenttype" )
-        endif
-        
-        AlienWarning.OK
-        
-    endif
-    
-    hHandleAlienWarning() = bAlienNotAllowed
-    
-end function
-'
-'-------------------------------------------------------------------------------
-'
-
 function hGrafikEinfuegen  ( Grafik$ ) as Boolean
     '/// hGrafikEinfuegen hGraphicInsert
     '/// A graphic will be inserted (not linked).
diff --git a/testautomation/global/tools/includes/required/t_filters.inc b/testautomation/global/tools/includes/required/t_filters.inc
index e66e5271a069..325793f1471e 100755
--- a/testautomation/global/tools/includes/required/t_filters.inc
+++ b/testautomation/global/tools/includes/required/t_filters.inc
@@ -41,8 +41,6 @@
 ' #1 hGetFilter               ' get the filtername for a specified build-id
 ' #0 hSelectUIFilter          ' Select a filter in the UI by API filter name
 ' #0 hFindFilterPosition      ' Find the index of the filter in the file open dialog
-' #0 hGetFilterGroup          ' Speedier approach to hGetUIFilternames()
-' #1 GetDefaultFilterNames    ' read the default filternames from a reference list
 ' #1 CreateFilterNamesList    ' write the default filternames to the reference list
 ' #1 hGetValueForKeyAsString  ' find key in list, return value as string
 ' #1 hGetValueForPairAsString ' find value in list, return key and value as string
@@ -197,91 +195,6 @@ end function
 
 '*******************************************************************************
 
-function hGetFilterGroup( api_filters() as string, ui_filters() as string ) 
-
-    ' This is a function designed to deliver a massive speed improvement
-    ' compared to multiple calls to hGetUIFiltername() which establish a fresh 
-    ' UNO connection on each call. This function establishes only one connection
-    ' and works with a list of API filter names which are matched to UI filter
-    ' names. This function does not wrap the UNO calls in a try...catch block
-    ' which means that if the function fails, it fails hard. Extra hard, that is.
-    ' There is no errorhandling. This function is intended for internal use only.
-    ' No returnvalue is defined at this time.
-
-    const CFN = "global::tools::inc::t_filters.inc::hGetFilterGroup:"
-
-    dim oUno as object
-    dim oService as object
-    dim oFilter as object
-    
-    dim iCurrentFilter as integer
-    
-    dim iFilterCount as integer
-        iFilterCount = ubound( api_filters() )
-        
-    dim iAPIfilterList as integer
-
-    oUno = hGetUNOService( true )
-    oService = oUno.createInstance("com.sun.star.document.FilterFactory")
-    
-    for iCurrentFilter = 1 to iFilterCount
-    
-        oFilter = oService.getByName( api_filters( iCurrentFilter ) )
-
-        for iAPIFilterList = 0 to ubound( oFilter )
-        
-            if ( oFilter( iAPIFilterList ).Name = "UIName" ) then
-                ui_filters( iCurrentFilter ) = oFilter( iAPIFilterList ).Value()
-                'printlog( CFN & "DEBUG: Index (iCurrentFilter): " & iCurrentFilter )
-                'printlog( CFN & "DEBUG: API Filter: " & api_filters( iCurrentFilter ) )
-                'printlog( CFN & "DEBUG: UI Filter.: " &  ui_filters( iCurrentFilter ) )
-            endif
-            
-        next iAPIFilterList
-        
-    next iCurrentFilter
-
-end function
-
-'*******************************************************************************
-
-sub GetDefaultFilterNames()
-
-    dim sMatchingFile as string
-    dim sFilterArray( 100 ) as string
-    
-    const APPLICATION_COUNT = 7  
-    dim cUIFilters( APPLICATION_COUNT ) as string
-    dim cAPIFilters( APPLICATION_COUNT ) as string
-    
-    sMatchingFile = gTesttoolPath & "global\input\filters\"
-    sMatchingFile = sMatchingFile & "build_to_filter.txt"
-    sMatchingFile = convertpath( sMatchingFile )
-
-    hGetDataFileSection( sMatchingFile, sFilterArray(), "Current", "", "" )
-
-    cAPIFilters( 1 ) = hGetValueForKeyAsString( sFilterArray(), "WRITER"    )
-    cAPIFilters( 2 ) = hGetValueForKeyAsString( sFilterArray(), "CALC"      )
-    cAPIFilters( 3 ) = hGetValueForKeyAsString( sFilterArray(), "IMPRESS"   )
-    cAPIFilters( 4 ) = hGetValueForKeyAsString( sFilterArray(), "MASTERDOC" )
-    cAPIFilters( 5 ) = hGetValueForKeyAsString( sFilterArray(), "MATH"      )
-    cAPIFilters( 6 ) = hGetValueForKeyAsString( sFilterArray(), "DRAW"      )
-    cAPIFilters( 7 ) = hGetValueForKeyAsString( sFilterArray(), "HTML"      )
-    
-    hGetFilterGroup( cAPIFilters(), cUIFilters() )
-
-    gWriterFilter     = cUIFilters( 1 ) 
-    gCalcFilter       = cUIFilters( 2 )
-    gImpressFilter    = cUIFilters( 3 )
-    gMasterDocFilter  = cUIFilters( 4 )
-    gMathFilter       = cUIFilters( 5 )
-    gDrawFilter       = cUIFilters( 6 )
-    gHTMLFilter       = cUIFilters( 7 )
-    
-end sub
-
-'*******************************************************************************
-
 function hGetValueForKeyAsString( lsList() as string, sKey as string ) as string
 
     '/// This function returns the value of a key as string.
diff --git a/testautomation/graphics/optional/g_export_html.bas b/testautomation/graphics/optional/g_export_html.bas
index 6df059800468..d4ea75e7456b 100755
--- a/testautomation/graphics/optional/g_export_html.bas
+++ b/testautomation/graphics/optional/g_export_html.bas
@@ -63,6 +63,7 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
+    use "global\tools\includes\optional\t_ui_filters.inc"
     Call GetUseFiles
     gApplication = "Impress"
 end sub
diff --git a/testautomation/graphics/optional/i_pengine.bas b/testautomation/graphics/optional/i_pengine.bas
index b1b2d4c79195..1de701dcb8f8 100755
--- a/testautomation/graphics/optional/i_pengine.bas
+++ b/testautomation/graphics/optional/i_pengine.bas
@@ -79,6 +79,7 @@ end sub
 sub LoadIncludeFiles
    use "global\system\includes\master.inc"
    use "global\system\includes\gvariabl.inc"
+   use "global\tools\includes\optional\t_ui_filters.inc"
    gApplication = "Impress"
    Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/i_slideshow.bas b/testautomation/graphics/optional/i_slideshow.bas
index eedd8fbe25fc..f433fc92488f 100755
--- a/testautomation/graphics/optional/i_slideshow.bas
+++ b/testautomation/graphics/optional/i_slideshow.bas
@@ -91,6 +91,7 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
+    use "global\tools\includes\optional\t_ui_filters.inc"
     gApplication = "Impress"
     Call GetUseFiles
 end sub
diff --git a/testautomation/math/optional/m_lvl1.bas b/testautomation/math/optional/m_lvl1.bas
index a9658b251e37..f370445df68b 100755
--- a/testautomation/math/optional/m_lvl1.bas
+++ b/testautomation/math/optional/m_lvl1.bas
@@ -60,6 +60,7 @@ end sub
 sub LoadIncludeFiles
    use "global\system\includes\master.inc"
    use "global\system\includes\gvariabl.inc"
+   use "global\tools\includes\optional\t_ui_filters.inc"
    Call GetUseFiles
    gApplication = "Math"
 end sub
diff --git a/testautomation/math/required/m_updt.bas b/testautomation/math/required/m_updt.bas
index f40648e8371d..423741e79856 100755
--- a/testautomation/math/required/m_updt.bas
+++ b/testautomation/math/required/m_updt.bas
@@ -76,6 +76,7 @@ sub LoadIncludeFiles
    use "global\required\includes\g_customize.inc"
    use "global\required\includes\g_001.inc"
    use "global\required\includes\g_009.inc"
+   use "global\optional\includes\t_ui_filters.inc" ' for gMathFilter in m_001_.inc
    gApplication = "MATH"
    Call GetUseFiles
 end sub
diff --git a/testautomation/writer/optional/w_formatcharacter.bas b/testautomation/writer/optional/w_formatcharacter.bas
index 32f64878aa67..33555602251f 100755
--- a/testautomation/writer/optional/w_formatcharacter.bas
+++ b/testautomation/writer/optional/w_formatcharacter.bas
@@ -68,6 +68,7 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     use "global\tools\includes\optional\t_extension_manager_tools.inc"
+    use "global\tools\includes\optional\t_ui_filters.inc"
     Call GetUseFiles
     gApplication = "Writer"
 end sub
diff --git a/testautomation/writer/optional/w_numbering.bas b/testautomation/writer/optional/w_numbering.bas
index 0df20a90ae9c..3300321c927b 100755
--- a/testautomation/writer/optional/w_numbering.bas
+++ b/testautomation/writer/optional/w_numbering.bas
@@ -75,6 +75,7 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
+    use "global\tools\includes\optional\t_ui_filters.inc"
     Call GetUseFiles
     gApplication = "Writer"
 end sub
diff --git a/testautomation/xml/optional/w_xml_vertical_alignment.bas b/testautomation/xml/optional/w_xml_vertical_alignment.bas
index 103519e1a33f..5262b3984deb 100755
--- a/testautomation/xml/optional/w_xml_vertical_alignment.bas
+++ b/testautomation/xml/optional/w_xml_vertical_alignment.bas
@@ -56,6 +56,7 @@ end sub
 sub LoadIncludeFiles
     use "global/system/includes/master.inc"
     use "global/system/includes/gvariabl.inc"
+    use "global\tools\includes\optional\t_ui_filters.inc"
     gApplication   = "Writer"
     call getusefiles        
 end sub