ooo-build r12629 - in trunk: . patches/dev300

[jannieuw svn gnome org]

Author: jannieuw
Date: Thu May 22 09:03:19 2008
New Revision: 12629
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12629&view=rev

Log:
2008-05-22  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/layout-tab-toolkit.diff: Enable sort dialog.
	Regenerate with build fix (thanks Kohei!).


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/layout-tab-toolkit.diff

Modified: trunk/patches/dev300/layout-tab-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-tab-toolkit.diff	(original)
+++ trunk/patches/dev300/layout-tab-toolkit.diff	Thu May 22 09:03:19 2008
@@ -476,8 +476,6 @@
 +} // namespace layoutimpl
 +
 +#endif /* LAYOUT_AWT_VCLXTABPAGE_HXX */
-diff --git a/source/awt/vclxwindow.cxx b/source/awt/vclxwindow.cxx
-index 44cb49f..47d2af3 100644
 diff --git a/source/layout/container.cxx b/source/layout/container.cxx
 index 22e3b08..b34bfe5 100644
 --- toolkit/source/layout/container.cxx
@@ -1483,7 +1481,7 @@
 +
 +  Start a [Writer] document and choose View/Zoom or Extra/Word count.
 diff --git a/workben/layout/makefile.mk b/workben/layout/makefile.mk
-index d7303af..b4d6a28 100644
+index d7303af..8ac422a 100644
 --- toolkit/workben/layout/makefile.mk
 +++ toolkit/workben/layout/makefile.mk
 @@ -44,10 +44,11 @@ ENABLE_EXCEPTIONS=TRUE
@@ -1520,6 +1518,14 @@
  
  svtools = $(INCCOM)/svtools
  all: $(svtools) ALLTAR
+@@ -93,6 +98,7 @@ all: $(svtools) ALLTAR
+ 
+ XML_FILES=\
+ 	recover.xml\
++	sort-options.xml\
+ 	wordcount.xml\
+ 	zoom.xml\
+ 
 diff --git a/workben/layout/sort-options.xml b/workben/layout/sort-options.xml
 new file mode 100644
 index 0000000..9a8053a
@@ -2221,7 +2227,7 @@
 +    </vbox>
 +</tabdialog>
 diff --git a/workben/layout/test.cxx b/workben/layout/test.cxx
-index 4049e60..2b7e1c3 100644
+index 4049e60..67ef4d6 100644
 --- toolkit/workben/layout/test.cxx
 +++ toolkit/workben/layout/test.cxx
 @@ -53,20 +53,29 @@
@@ -2245,7 +2251,7 @@
  #undef _LAYOUT_POST_HXX
  
 -#include "plugin.hxx"
-+//#include "sortdlg.hxx"
++#include "sortdlg.hxx"
  #undef _LAYOUT_POST_HXX
  
 -#include "recover.hxx"
@@ -2329,7 +2335,7 @@
 -    if (! ::ucbhelper::ContentBroker::initialize( mxMSF, aArgs ) )
 +    if ( !::ucbhelper::ContentBroker::initialize( mxMSF, aArgs ) )
 +    {
-+        fprintf( stderr, "Failed to init content broker\n" );
+         fprintf( stderr, "Failed to init content broker\n" );
 +        fprintf( stderr, "arg[0]: %s\n", UCB_CONFIGURATION_KEY1_LOCAL );
 +        fprintf( stderr, "arg[1]: %s\n", UCB_CONFIGURATION_KEY2_OFFICE );
 +    }
@@ -2363,7 +2369,7 @@
 +    
 +    if ( !::ucbhelper::ContentBroker::initialize( mxMSF, aArgs ) )
 +    {
-         fprintf( stderr, "Failed to init content broker\n" );
++        fprintf( stderr, "Failed to init content broker\n" );
 +        //fprintf( stderr, "arg[0]: %s\n", OUSTRING_CSTR( aArgs[0].get<OUString> ) );
 +        //fprintf( stderr, "arg[1]: %s\n", OUSTRING_CSTR( OUString( aArgs[0] ) );
 +    }
@@ -2382,7 +2388,7 @@
      putenv( (char *)aCfg.getStr() );                                    \
      /* Unless you do this, obviously you don't want your paths to be correct & \
         hence no images.zip location is possible. */                     \
-@@ -191,6 +264,25 @@ void LayoutTest::InitUCB()
+@@ -191,6 +264,24 @@ void LayoutTest::InitUCB()
                   + OUStringToOString( installDir, RTL_TEXTENCODING_UTF8 ); \
      putenv( (char *)aBaseInst.getStr() );                               \
  
@@ -2398,17 +2404,16 @@
 +    /* Unless you do this, obviously you don't want your paths to be correct & \
 +       hence no images.zip location is possible. */                     \
 +    OString aBaseInst = "BaseInstallation=file://"                      \
-+                 + OUStringToOString( installDir, RTL_TEXTENCODING_UTF8 ); \
++                 + OUStringToOString( installDir, RTL_TEXTENCODING_UTF8 ) \
++                 + "/openoffice.org/basis3.0";                          \
 +    putenv( (char *)aBaseInst.getStr() );                               \
 +
-+//                 + "/openoffice.org/basis3.0";                          \
-+
 +#endif
 +
  void LayoutTest::IInit()
  {
      INIT_ENV_VOODOO( mInstallDir );
-@@ -249,18 +341,48 @@ void RunDialog( Dialog& dialog )
+@@ -249,18 +340,48 @@ void RunDialog( Dialog& dialog )
      fprintf( stderr, "2nd execute exited" );
  }
  
@@ -2466,18 +2471,16 @@
      else if ( name.equalsAscii( "plugin" ) )
      {
          PluginDialog plugin ( 0 );
-@@ -271,6 +393,24 @@ void TestDialog( OUString const& name )
+@@ -271,6 +392,22 @@ void TestDialog( OUString const& name )
          SvxRecoverDialog recover ( 0 );
          RunDialog( recover );
      }
-+#if 0
 +    else if ( name.equalsAscii( "sort" ) )
 +    {
 +        LoadSC();
 +        ScSortDlg sort ( 0, 0 );
 +        RunDialog( sort );
 +    }
-+#endif
 +    else if ( name.equalsAscii( "wordcount" ) )
 +    {
 +        SwWordCountDialog words ( 0 );