further impl and bugfixing

2 files changed, 30 insertions, 20 deletions

diff --git a/xmlscript/test/imexp.cxx b/xmlscript/test/imexp.cxx
index c83d1c75f756..9792d53a1578 100644
--- a/xmlscript/test/imexp.cxx
+++ b/xmlscript/test/imexp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: imexp.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: dbo $ $Date: 2001-02-27 12:45:17 $
+ *  last change: $Author: dbo $ $Date: 2001-02-28 18:22:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -194,6 +194,18 @@ Reference< lang::XMultiServiceFactory > createApplicationServiceManager()
     xReg->registerImplementation(
         OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ),
         aDllName, Reference< registry::XSimpleRegistry > () );
+#ifdef SAL_W32
+    aDllName = OUString::createFromAscii( "int" );
+    aDllName += OUString::valueOf( (sal_Int32)SUPD );
+    aDllName += OUString::createFromAscii( "mi.dll" );
+#else
+    aDllName = OUString::createFromAscii( "libint" );
+    aDllName += OUString::valueOf( (sal_Int32)SUPD );
+    aDllName += OUString::createFromAscii( ".so" );
+#endif
+    xReg->registerImplementation(
+        OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ),
+        aDllName, Reference< registry::XSimpleRegistry > () );
 
     }
 
@@ -283,15 +295,6 @@ void MyApp::Main()
         OString aParam1( OUStringToOString( OUString( GetCommandLineParam( 0 ) ), RTL_TEXTENCODING_ASCII_US ) );
         Sequence< Reference< container::XNameContainer > > models( importFile( aParam1.getStr() ) );
 
-        if (GetCommandLineParamCount() == 2)
-        {
-            // write and read again dialogs
-            OString aParam2( OUStringToOString( OUString( GetCommandLineParam( 1 ) ), RTL_TEXTENCODING_ASCII_US ) );
-            exportToFile( aParam2.getStr(), models );
-            // re-import
-            models = importFile( aParam2.getStr() );
-        }
-
         Reference< container::XNameContainer > const * pModels = models.getConstArray();
         for ( sal_Int32 nPos = 0; nPos < models.getLength(); ++nPos )
         {
@@ -302,6 +305,13 @@ void MyApp::Main()
             Reference< awt::XDialog > xD( xDlg, UNO_QUERY );
             xD->execute();
         }
+
+        if (GetCommandLineParamCount() == 2)
+        {
+            // write modified dialogs
+            OString aParam2( OUStringToOString( OUString( GetCommandLineParam( 1 ) ), RTL_TEXTENCODING_ASCII_US ) );
+            exportToFile( aParam2.getStr(), models );
+        }
     }
     catch (uno::Exception & rExc)
     {
diff --git a/xmlscript/test/test.xml b/xmlscript/test/test.xml
index 22824398205e..9834965bde50 100644
--- a/xmlscript/test/test.xml
+++ b/xmlscript/test/test.xml
@@ -4,11 +4,10 @@
 <dialogs xmlns="http://openoffice.org/2000/dialog">
 
     <window xmlns:dlg="http://openoffice.org/2000/dialog"
-        label="Test-Dialog" height="800" width="800">
+        label="Test-Dialog" height="700" width="700">
 
         <dlg:styles>
             <dlg:style style-id="bla" background-color="0xffffff" dlg:text-color="255"/>
-            <dlg:style style-id="bla2" background-color="0xff00ff" dlg:text-color="255193873"/>
             <dlg:style style-id="bla3" background-color="0" dlg:text-color="0xffffff" font-name="Arial" font-height="24"/>
             <dlg:style style-id="no_border" border="none"/>
         </dlg:styles>
@@ -48,23 +47,24 @@
                 </menupopup>
             </combobox>
             <radiogroup>
-                <radio id="radio1" value="radio1" left="50" top="250" width="100" height="20"/>
+                <radio id="radio1" value="default radio" left="50" top="250" width="100" height="20"/>
                 <radio id="radio2" value="checked" left="50" top="270" width="100" height="20" checked="true"/>
                 <radio id="radio3" value="unchecked" left="50" top="290" width="100" height="20" checked="false"/>
+                <radio id="radio4" value="dont know" left="50" top="310" width="100" height="20" tristate="true"/>
             </radiogroup>
             <titledbox id="groupbox1" left="250" top="250" width="120" height="100">
                 <title value="grouped"/>
-                <radio id="radio4" value="default radio" left="5" top="15" width="100" height="20"/>
-                <radio id="radio5" value="dontknow" left="5" top="35" width="100" height="20" tristate="true"/>
-                <radio id="radio6" value="tristate_checked" left="5" top="55" width="100" height="20" tristate="true" checked="true"/>
-                <radio id="radio7" value="checked" left="5" top="75" width="100" height="20" checked="true"/>
+                <radio id="radio5" value="default radio" left="5" top="15" width="100" height="20"/>
+                <radio id="radio6" value="dont know" left="5" top="35" width="100" height="20" tristate="true"/>
+                <radio id="radio7" value="tristate checked" left="5" top="55" width="100" height="20" tristate="true" checked="true"/>
+                <radio id="radio8" value="checked" left="5" top="75" width="100" height="20" checked="true"/>
             </titledbox>
             <text id="fixed1" left="50" top="520" width="180" height="20" value="fixed text is here..." multiline="true" align="center"/>
-            <textfield id="field1" left="250" top="520" width="50" height="40" value="edit text here..." readonly="true" vscroll="true" multiline="true" align="right" style-id="no_border"/>
+            <textfield id="field1" left="250" top="520" width="50" height="40" value="edit no text here..." readonly="true" vscroll="true" multiline="true" align="right" style-id="no_border"/>
             <textfield id="field2" left="320" top="520" width="50" height="40" value="hidden text" hscroll="true" echochar="*" align="left"/>
             <img id="image1" left="50" top="600" width="80" height="50" src="../../test/w3c.jpg"/>
             <filecontrol id="file1" left="150" top="600" width="100" height="100" value="f:\script\xmlscript\test\w3c.jpg"/>
-            <currencyfield id="currency1" left="250" top="600" width="100" height="20" value="5.6075" value-min="0.5" value-max="10.0" value-step="0.1" spin="true" thousands-separator="true" currency-symbol="$"/>
+<!--            <currencyfield id="currency1" left="250" top="600" width="100" height="20" value="5.6075" value-min="0.5" value-max="10.0" value-step="0.1" spin="true" thousands-separator="true" currency-symbol="$"/> -->
                  <numericfield id="numeric1" left="400" top="100" width="100" height="20" value="5.6075" value-min="0.5" value-max="10.0" value-step="0.1" thousands-separator="true"/>
 
         </dlg:bulletinboard>