slidecopy: merged latest DEV300.m80 changes

5 files changed, 178 insertions, 1 deletions

diff --git a/testautomation/extensions/optional/e_issues.bas b/testautomation/extensions/optional/e_issues.bas
new file mode 100755
index 000000000000..549ad69b1a2e
--- /dev/null
+++ b/testautomation/extensions/optional/e_issues.bas
@@ -0,0 +1,55 @@
+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+' 
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' 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 : Extension publisher string
+'*
+'\******************************************************************************
+
+sub main
+
+    use "extensions\optional\includes\issue110083.inc"
+
+    call hStatusIn( "extensions" , "e_issues.bas" )
+    call tExtensionIssue110083()
+    call hStatusOut()
+
+end sub
+
+'*******************************************************************************
+
+sub LoadIncludeFiles
+
+    use "global\system\includes\gvariabl.inc"
+    use "global\system\includes\master.inc"
+    use "global\tools\includes\optional\t_extension_manager_tools.inc"
+    gApplication = "WRITER"
+    call GetUseFiles()
+
+end sub
+
diff --git a/testautomation/extensions/optional/includes/issue110083.inc b/testautomation/extensions/optional/includes/issue110083.inc
new file mode 100755
index 000000000000..8940f7f8274c
--- /dev/null
+++ b/testautomation/extensions/optional/includes/issue110083.inc
@@ -0,0 +1,79 @@
+'encoding UTF-8  Do not remove or change this line!
+'*******************************************************************************
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' 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 : CWS sb112 fixes a problem with configuration schemas
+'*
+'\******************************************************************************
+
+testcase tExtensionIssue110083()
+
+    printlog( "Configuration/-schema .xcu/.xcs-files which might trigger exceptions from unopkg/Extension Manager" )
+
+    const NUMBER_OF_TEST_EXTENSIONS = 2
+
+    dim cExtensionNames( NUMBER_OF_TEST_EXTENSIONS ) as string
+        cExtensionNames( 1 ) = "LoggingOptions.xcs"
+        cExtensionNames( 2 ) = "Logging.xcu"
+
+    dim cErrorIdentifier( NUMBER_OF_TEST_EXTENSIONS ) as string
+        cErrorIdentifier( 1 ) = "no component element"
+        cErrorIdentifier( 2 ) = "no component element"
+
+    dim cExtensionPath as string
+        cExtensionPath = gTesttoolPath & "extensions/optional/input/issues/"
+
+    dim cExtension as string
+
+    dim iCurrentExtension as integer
+        
+
+    for iCurrentExtension = 1 to NUMBER_OF_TEST_EXTENSIONS
+
+        cExtension = convertpath( cExtensionPath & cExtensionNames( iCurrentExtension ) )
+        hExtensionAddGUI( cExtension, "" )
+
+        kontext "Active"
+        if ( Active.exists() ) then
+            if ( instr( Active.getText, cErrorIdentifier( iCurrentExtension ) ) > 0 ) then
+                warnlog( "#i110083# - Error installing .xcs/.xcu-file: " & cExtensionNames( iCurrentExtension ) )
+                Active.ok()
+
+                kontext "PackageManager"
+                PackageManager.close()
+            else
+                warnlog( "Unexpected messagebox displayed. It cannot be handled" )
+            endif
+        else
+            hExtensionRemoveGUI( cExtensionNames( iCurrentExtension ) )
+        endif
+
+    next iCurrentExtension
+
+endcase
+
diff --git a/testautomation/extensions/optional/includes/platforms.inc b/testautomation/extensions/optional/includes/platforms.inc
index bb8bea80b12f..4f96701afd20 100755
--- a/testautomation/extensions/optional/includes/platforms.inc
+++ b/testautomation/extensions/optional/includes/platforms.inc
@@ -78,7 +78,7 @@ testcase tExtensionPlatforms
         printlog( "Current extension: " & cCurrentExtensionFile )
         iStatus = hExtensionAddGUI( cCurrentExtensionPath, "InstallForUser, NoLicense, NoUpdate, Verbose" )
         
-        if ( iStatus >= 0 ) then
+        if ( iStatus = -7 or iStatus >= 0 ) then
         
             kontext "Active"
             if ( Active.exists( 2 ) ) then
diff --git a/testautomation/extensions/optional/input/issues/Logging.xcu b/testautomation/extensions/optional/input/issues/Logging.xcu
new file mode 100755
index 000000000000..8bf0f34b6f1b
--- /dev/null
+++ b/testautomation/extensions/optional/input/issues/Logging.xcu
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Logging" oor:package="org.openoffice.Office">
+    <node oor:name="Settings">
+        <node oor:name="bw.stv.tvs.logging.DefaultLogger" oor:op="replace">
+            <prop oor:name="DefaultFormatter" oor:type="xs:string">
+                <value>com.sun.star.logging.PlainTextFormatter</value>
+            </prop>
+            <prop oor:name="DefaultHandler" oor:type="xs:string">
+                <value>bw.stv.tvs.logging.UILogHandler</value>
+            </prop>
+            <prop oor:name="LogLevel" oor:type="xs:int">
+                <value>2147483647</value>
+            </prop>
+            <node oor:name="HandlerSettings">
+                <prop oor:name="UIId" oor:type="xs:string">
+                    <value>tvs.ui</value>
+                </prop>
+                <prop oor:name="UITitle" oor:type="xs:string">
+                    <value>TVS-Logger (bw.stv.tvs.logging.DefaultLogger)</value>
+                </prop>
+            </node>
+        </node>
+    </node>
+</oor:component-data>
\ No newline at end of file
diff --git a/testautomation/extensions/optional/input/issues/LoggingOptions.xcs b/testautomation/extensions/optional/input/issues/LoggingOptions.xcs
new file mode 100644
index 000000000000..e87474bba2a2
--- /dev/null
+++ b/testautomation/extensions/optional/input/issues/LoggingOptions.xcs
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Logging" oor:package="org.openoffice.Office" xml:lang="en-US">
+  <templates>
+    <group oor:name="LoggerSettings">
+      <group oor:name="HandlerSettings" oor:extensible="true">
+        <info>
+          <desc>Enthält zusätzliche Optionen für den TVS-UILogHandler</desc>
+        </info>
+        <prop oor:name="UITitle" oor:type="xs:string">
+          <value/>
+        </prop>
+        <prop oor:name="UIId" oor:type="xs:string">
+          <value/>
+        </prop>
+      </group>
+    </group>
+  </templates>
+  <component/>
+</oor:component-schema>