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

[jannieuw svn gnome org]

Author: jannieuw
Date: Thu Jan  8 10:22:42 2009
New Revision: 15026
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15026&view=rev

Log:
2009-01-08  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/layout-plugin-toolkit.diff: Remove whitespace
	fixes / adapt for whitespace fixes now also in upstream.
	* patches/dev300/apply (LayoutDialogs): Re-enable it.


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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jan  8 10:22:42 2009
@@ -2312,8 +2312,7 @@
 
 [ LayoutDialogs ]
 # use old style widgets as plugin in a layout dialog
-# FIXME 2008-11-26: doesn't apply to dev300-m35
-#layout-plugin-toolkit.diff
+layout-plugin-toolkit.diff
 
 # use one or more layout tabpages in old .src tabbed dialog
 # FIXME 2008-11-26: doesn't apply to dev300-m35

Modified: trunk/patches/dev300/layout-plugin-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-plugin-toolkit.diff	(original)
+++ trunk/patches/dev300/layout-plugin-toolkit.diff	Thu Jan  8 10:22:42 2009
@@ -389,36 +389,6 @@
 +} // namespace layoutimpl
 +
 +#endif /* LAYOUT_AWT_VCLXPLUGIN_HXX */
-diff --git a/source/layout/box.cxx b/source/layout/box.cxx
-index 50326f1..9b07939 100644
---- toolkit/source/layout/box.cxx
-+++ toolkit/source/layout/box.cxx
-@@ -47,17 +47,17 @@ namespace layoutimpl
- using namespace css;
- 
- Box::ChildProps::ChildProps( Box::ChildData *pData )
--    {
--        addProp( RTL_CONSTASCII_USTRINGPARAM( "Expand" ),
--                 ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
-+{
-+    addProp( RTL_CONSTASCII_USTRINGPARAM( "Expand" ),
-+             ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
-              &(pData->mbExpand) );
--        addProp( RTL_CONSTASCII_USTRINGPARAM( "Fill" ),
--                 ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
-+    addProp( RTL_CONSTASCII_USTRINGPARAM( "Fill" ),
-+             ::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
-              &(pData->mbFill) );
--        addProp( RTL_CONSTASCII_USTRINGPARAM( "Padding" ),
--                 ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
-+    addProp( RTL_CONSTASCII_USTRINGPARAM( "Padding" ),
-+             ::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
-              &(pData->mnPadding) );
--    }
-+}
- 
- Box::ChildData::ChildData( uno::Reference< awt::XLayoutConstrains > const& xChild )
-     : Box_Base::ChildData( xChild )
 diff --git a/source/layout/dialogbuttonhbox.cxx b/source/layout/dialogbuttonhbox.cxx
 index 7d2a2bc..fff1bce 100644
 --- toolkit/source/layout/dialogbuttonhbox.cxx
@@ -565,17 +535,6 @@
  
  #include <com/sun/star/awt/WindowAttribute.hpp>
  #include <com/sun/star/awt/XMessageBox.hpp>
-@@ -191,8 +191,8 @@ void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArgument
- 
-     try
-     {
--    xParser->parseStream( source );
--}
-+        xParser->parseStream( source );
-+    }
-     catch ( xml::sax::SAXParseException& e )
-     {
-         OUString c = OUString::createFromAscii( ":" );
 diff --git a/source/layout/root.hxx b/source/layout/root.hxx
 index e385256..61b0bee 100644
 --- toolkit/source/layout/root.hxx
@@ -621,19 +580,6 @@
      return aXMLFile;
  }
  
-diff --git a/source/vclcompat/wbutton.cxx b/source/vclcompat/wbutton.cxx
-index 5757ebc..17c2142 100644
---- toolkit/source/vclcompat/wbutton.cxx
-+++ toolkit/source/vclcompat/wbutton.cxx
-@@ -452,7 +452,7 @@ protected:
-         parent->Invalidate( r, INVALIDATE_CHILDREN | INVALIDATE_NOCHILDREN );
-         parent->SetPosSizePixel( 0, 0, r.nRight - r.nLeft, r.nBottom - r.nTop,
-                                  awt::PosSize::SIZE );
--}
-+    }
- 
- public:
-     AdvancedButtonImpl( Context *pCtx, PeerHandle const& xPeer, Window *pWindow )
 diff --git a/source/vclcompat/wrapper.cxx b/source/vclcompat/wrapper.cxx
 index e88a2bb..6188ac1 100644
 --- toolkit/source/vclcompat/wrapper.cxx
@@ -1082,7 +1028,7 @@
  
  // This works and was used before for standalone test, not sure why
  // we'd want it.
-@@ -42,28 +41,29 @@
+@@ -42,29 +41,30 @@
  #include "uno.hxx"
  
  #include <cstdio>
@@ -1106,6 +1052,7 @@
  
 -#include "wordcountdialog.hxx"
 -#undef _LAYOUT_POST_HXX
+ 
 -#include "zoom.hxx"
 +#include "plugin.hxx"
  #undef _LAYOUT_POST_HXX