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

[jannieuw svn gnome org]

Author: jannieuw
Date: Wed May 28 15:10:51 2008
New Revision: 12686
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12686&view=rev

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

	* patches/dev300/layout-tab-toolkit.diff: Update from GIT:
	support upstream as well as ooo-build installs.  Undo .gitignore
	patching in GIT :-)


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	Wed May 28 15:10:51 2008
@@ -76,7 +76,7 @@
  #define Window ::Window
  
 diff --git a/inc/layout/layout.hxx b/inc/layout/layout.hxx
-index ecbf73c..e9d6de1 100644
+index ecbf73c..3e9e73e 100644
 --- toolkit/inc/layout/layout.hxx
 +++ toolkit/inc/layout/layout.hxx
 @@ -39,6 +39,8 @@
@@ -242,12 +242,12 @@
 +    SfxTabPage( ::Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0 );
 +#endif
 +    // SfxTabPage...
-+	enum PageAction { KEEP_PAGE, LEAVE_PAGE, REFRESH_SET };
++    enum PageAction { KEEP_PAGE, LEAVE_PAGE, REFRESH_SET };
 +
 +    bool bHasExchangeSupport;
 +    bool HasExchangeSupport() { return bHasExchangeSupport; }
 +    SfxItemSet *pSet;
-+	SfxItemSet&	GetItemSet() const { return *pSet; }
++    SfxItemSet& GetItemSet() const { return *pSet; }
 +    virtual void Reset( SfxItemSet const& r );
 +    void SetExchangeSupport( bool exchangeSupport = true ) { bHasExchangeSupport = exchangeSupport; }
 +    //static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot );
@@ -2041,10 +2041,10 @@
  XML_HEADER = '''<?xml version="1.0" encoding="UTF-8"?>
 diff --git a/workben/layout/README b/workben/layout/README
 new file mode 100644
-index 0000000..d1a9494
+index 0000000..3b83bbf
 --- /dev/null
 +++ toolkit/workben/layout/README
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,43 @@
 +Testing workbench and editor for Layout engine.
 +
 +* Configure using --enable-layout.
@@ -2061,8 +2061,9 @@
 +
 +* FIXME: New three layer install/rpath feature needs these workarounds
 +|
-+|  cp -f ../..$INPATH/lib/libtkx.so $OOO_INSTALL_PREFIX/openoffice.org/basis3.0/program
-+|  export LD_LIBRARY_PATH=$OOO_INSTALL_PREFIX/openoffice.org/basis3.0/program:$OOO_INSTALL_PREFIX/openoffice.org/ure/lib
++|  test -d $OOO_INSTALL_PREFIX/openoffice.org3 && export OOO_PREFIX_BRAND=$OOO_INSTALL_PREFIX/openoffice.org3 || export OOO_PREFIX_BRAND=$OOO_INSTALL_PREFIX
++|  cp -f ../..$INPATH/lib/libtkx.so $OOO_PREFIX/openoffice.org/basis3.0/program
++|  export LD_LIBRARY_PATH=$OOO_PREFIX_BRAND/basis-link/program:$OOO_PREFIX_BRAND/basis-link/ure-link/lib
 +|
 +|  (see source/layout/helper.cxx)
 +
@@ -2862,10 +2863,18 @@
 +    </vbox>
 +</tabdialog>
 diff --git a/workben/layout/test.cxx b/workben/layout/test.cxx
-index 0408590..e6f9387 100644
+index 0408590..da3006d 100644
 --- toolkit/workben/layout/test.cxx
 +++ toolkit/workben/layout/test.cxx
-@@ -50,6 +50,12 @@
+@@ -42,6 +42,7 @@
+ 
+ #include <cstdio>
+ #include <cstdlib>
++#include <sys/stat.h>
+ 
+ #include <com/sun/star/xml/sax/SAXException.hpp>
+ #include <comphelper/processfactory.hxx>
+@@ -50,6 +51,12 @@
  #include <ucbhelper/configurationkeys.hxx>
  #include <ucbhelper/contentbroker.hxx>
  
@@ -2878,7 +2887,7 @@
  #include "editor.hxx"
  
  #include "plugin.hxx"
-@@ -58,6 +64,11 @@
+@@ -58,6 +65,11 @@
  #include "recover.hxx"
  #undef _LAYOUT_POST_HXX
  
@@ -2890,16 +2899,40 @@
  #include "wordcountdialog.hxx"
  #undef _LAYOUT_POST_HXX
  
-@@ -163,7 +174,7 @@ void LayoutTest::Init()
+@@ -158,12 +170,30 @@ void LayoutTest::InitUCB()
+     }
+ }
+ 
++static void support_upstream_brand_prefix ()
++{
++    if ( char const* inst = getenv( "OOO_INSTALL_PREFIX" ) )
++    {
++        char const *brand_prefix = "/openoffice.org3";
++        OUString brand_dir = OUString::createFromAscii( inst )
++            + OUString::createFromAscii( brand_prefix );
++        struct stat stat_info;
++        if ( !stat ( OUSTRING_CSTR( brand_dir ), &stat_info ) )
++        {
++            OSL_TRACE( "Appending %s to OOO_INSTALL_PREFIX", brand_prefix );
++            setenv( "OOO_INSTALL_PREFIX", OUSTRING_CSTR( brand_dir ), 1 );
++        }
++    }
++}
++
+ void LayoutTest::Init()
+ {
      ParseCommandLine();
-     if (!getenv ("OOO_INSTALL_PREFIX") )
+-    if (!getenv ("OOO_INSTALL_PREFIX") )
++    if ( !getenv ("OOO_INSTALL_PREFIX") )
          setenv( "OOO_INSTALL_PREFIX", OUSTRING_CSTR( mInstallDir ), 1 );
 -    OSL_TRACE( "OOO_INSTALL_PREFIX=%s\n", getenv( "OOO_INSTALL_PREFIX" ) );
++    support_upstream_brand_prefix ();
 +    OSL_TRACE( "OOO_INSTALL_PREFIX=%s", getenv( "OOO_INSTALL_PREFIX" ) );
++
      mxContext = defaultBootstrap_InitialComponentContext();
      mxMSF = new UnoBootstrapLayout( Reference< lang::XMultiServiceFactory >( mxContext->getServiceManager(), UNO_QUERY ) );
      ::comphelper::setProcessServiceFactory( mxMSF );
-@@ -231,6 +242,15 @@ void RunDialog( ::Dialog& dialog )
+@@ -231,6 +261,15 @@ void RunDialog( ::Dialog& dialog )
      fprintf( stderr, "2nd execute exited" );
  }
  
@@ -2915,7 +2948,7 @@
  void TestDialog( OUString const& name )
  {
      if ( 0 )
-@@ -245,6 +265,14 @@ void TestDialog( OUString const& name )
+@@ -245,6 +284,14 @@ void TestDialog( OUString const& name )
          SvxRecoverDialog recover ( 0 );
          RunDialog( recover );
      }
@@ -2930,12 +2963,32 @@
      else if ( name.equalsAscii( "wordcount" ) )
      {
          SwWordCountDialog words ( 0 );
+diff --git a/workben/layout/testrc.in b/workben/layout/testrc.in
+index 15e190d..00ae5eb 100644
+--- toolkit/workben/layout/testrc.in
++++ toolkit/workben/layout/testrc.in
+@@ -1,11 +1,11 @@
+ OOO_INSTALL_PREFIX_URL=file://${OOO_INSTALL_PREFIX}
+-OOO_BASIS_URL=${OOO_INSTALL_PREFIX_URL}/openoffice.org/basis3.0
+-OOO_BASIS_BIN_URL=${OOO_INSTALL_PREFIX_URL}/openoffice.org/basis3.0/program
+-OOO_URE_URL=${OOO_INSTALL_PREFIX_URL}/openoffice.org/ure
++OOO_BASIS_URL=${OOO_INSTALL_PREFIX_URL}/basis-link
++OOO_BASIS_BIN_URL=${OOO_BASIS_URL}/program
++OOO_URE_URL=${OOO_BASIS_URL}/ure-link
+ #
+ #CFG_INIFILE=${OOO_BASIS_BIN_URL}/configmgrrc
+ #BaseInstallation=${OOO_BASIS_URL}
+-BRAND_BASE_DIR=${OOO_INSTALL_PREFIX_URL}/openoffice.org3
++BRAND_BASE_DIR=${OOO_INSTALL_PREFIX_URL}
+ OOO_BASE_DIR=${OOO_BASIS_URL}
+ #
+ UNO_TYPES=${OOO_URE_URL}/share/misc/types.rdb ${OOO_BASIS_BIN_URL}/offapi.rdb
 diff --git a/workben/layout/tpsort.cxx b/workben/layout/tpsort.cxx
 new file mode 100644
-index 0000000..7802f69
+index 0000000..94c9975
 --- /dev/null
 +++ toolkit/workben/layout/tpsort.cxx
-@@ -0,0 +1,1120 @@
+@@ -0,0 +1,1121 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -3614,9 +3667,10 @@
 +		String			theDbName	= aStrNoName;
 +		const SCTAB	nCurTab		= pViewData->GetTabNo();
 +        const ScAddress::Convention eConv = pDoc->GetAddressConvention();
-+#endif /* !TEST_LAYOUT */
 +		aLbOutPos.Clear();
++#else /* TEST_LAYOUT */
 +        aStrUndefined = rtl::OUString::createFromAscii( "- undefined -" );
++#endif /* TEST_LAYOUT */
 +		aLbOutPos.InsertEntry( aStrUndefined, 0 );
 +		aLbOutPos.Disable();
 +