GNOME.org
 

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

Author: jannieuw
Date: Mon Aug  4 17:56:38 2008
New Revision: 13474
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13474&view=rev

Log:
2008-08-04  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/layout-simple-dialogs-toolkit.diff: Remove
	Plugin removal.

	* patches/dev300/layout-simple-dialogs-offapi.diff: Remove patching of .rej
	file.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/layout-simple-dialogs-offapi.diff
   trunk/patches/dev300/layout-simple-dialogs-toolkit.diff

Modified: trunk/patches/dev300/layout-simple-dialogs-offapi.diff
==============================================================================
--- trunk/patches/dev300/layout-simple-dialogs-offapi.diff	(original)
+++ trunk/patches/dev300/layout-simple-dialogs-offapi.diff	Mon Aug  4 17:56:38 2008
@@ -22,35 +22,3 @@
  }; 
   
  //============================================================================= 
-diff --git a/offapi/com/sun/star/awt/XDialog2.idl.rej b/offapi/com/sun/star/awt/XDialog2.idl.rej
-new file mode 100644
-index 0000000..d7e663f
---- /dev/null
-+++ offapi/com/sun/star/awt/XDialog2.idl.rej
-@@ -0,0 +1,26 @@
-+*************** module com {  module sun {  module star {  module awt {
-+*** 12,22 ****
-+   
-+  //============================================================================= 
-+   
-+- /** Makes it possible to end a dialog.
-+   */
-+  published interface XDialog2: com::sun::star::awt::XDialog
-+  { 
-+      void endDialog ( [in] long Result );
-+  }; 
-+   
-+  //============================================================================= 
-+--- 12,23 ----
-+   
-+  //============================================================================= 
-+   
-++ /** Makes it possible to end a dialog and set a help id.
-+   */
-+  published interface XDialog2: com::sun::star::awt::XDialog
-+  { 
-+      void endDialog ( [in] long Result );
-++     void setHelpId ( [in] long Id );
-+  }; 
-+   
-+  //============================================================================= 

Modified: trunk/patches/dev300/layout-simple-dialogs-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-simple-dialogs-toolkit.diff	(original)
+++ trunk/patches/dev300/layout-simple-dialogs-toolkit.diff	Mon Aug  4 17:56:38 2008
@@ -1,7 +1,7 @@
 diff --git a/toolkit/doc/layout/TODO b/toolkit/doc/layout/TODO
 index abd717c..fbc2c85 100644
 --- a/toolkit/doc/layout/TODO
-+++ b/toolkit/doc/layout/TODO
++++ toolkit/doc/layout/TODO
 @@ -4,6 +4,11 @@
  ** Move everything & development into new layout-dialogs CWS
  
@@ -37,7 +37,7 @@
 diff --git a/toolkit/inc/layout/layout-post.hxx b/toolkit/inc/layout/layout-post.hxx
 index 54ed610..bf41277 100644
 --- a/toolkit/inc/layout/layout-post.hxx
-+++ b/toolkit/inc/layout/layout-post.hxx
++++ toolkit/inc/layout/layout-post.hxx
 @@ -34,6 +34,10 @@
  
  #if ENABLE_LAYOUT
@@ -117,7 +117,7 @@
 diff --git a/toolkit/inc/layout/layout-pre.hxx b/toolkit/inc/layout/layout-pre.hxx
 index fbbc1df..702470c 100644
 --- a/toolkit/inc/layout/layout-pre.hxx
-+++ b/toolkit/inc/layout/layout-pre.hxx
++++ toolkit/inc/layout/layout-pre.hxx
 @@ -34,15 +34,8 @@
  
  #if ENABLE_LAYOUT
@@ -231,7 +231,7 @@
 diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx
 index 62b7ffa..ee831f3 100644
 --- a/toolkit/inc/layout/layout.hxx
-+++ b/toolkit/inc/layout/layout.hxx
++++ toolkit/inc/layout/layout.hxx
 @@ -32,28 +32,32 @@
  #ifndef _LAYOUT_HXX
  #define _LAYOUT_HXX
@@ -708,7 +708,7 @@
 diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx
 index 4c250ba..41176fc 100644
 --- a/toolkit/inc/toolkit/awt/vclxwindows.hxx
-+++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx
++++ toolkit/inc/toolkit/awt/vclxwindows.hxx
 @@ -346,6 +346,8 @@ public:
  
      static void     ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
@@ -721,7 +721,7 @@
 diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst
 index 8b7ac22..1448f0d 100644
 --- a/toolkit/prj/build.lst
-+++ b/toolkit/prj/build.lst
++++ toolkit/prj/build.lst
 @@ -2,6 +2,7 @@ ti	toolkit	:	vcl NULL
  ti	toolkit									usr1	-	all	ti_mkout NULL
  ti	toolkit\prj								get		-	all	ti_prj NULL
@@ -733,7 +733,7 @@
 diff --git a/toolkit/prj/d.lst b/toolkit/prj/d.lst
 index 88ee9c8..743e2d6 100644
 --- a/toolkit/prj/d.lst
-+++ b/toolkit/prj/d.lst
++++ toolkit/prj/d.lst
 @@ -52,3 +52,5 @@ mkdir: %_DEST%\inc%_EXT%\layout
  ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
  
@@ -743,7 +743,7 @@
 diff --git a/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx
 index 98de970..02d02fc 100644
 --- a/toolkit/source/awt/vclxdialog.cxx
-+++ b/toolkit/source/awt/vclxdialog.cxx
++++ toolkit/source/awt/vclxdialog.cxx
 @@ -211,6 +211,15 @@ void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star
          pWindow->SetText( Title );
  }
@@ -763,7 +763,7 @@
 diff --git a/toolkit/source/awt/vclxdialog.hxx b/toolkit/source/awt/vclxdialog.hxx
 index 7f45718..337d780 100644
 --- a/toolkit/source/awt/vclxdialog.hxx
-+++ b/toolkit/source/awt/vclxdialog.hxx
++++ toolkit/source/awt/vclxdialog.hxx
 @@ -102,6 +102,7 @@ public:
  
      // ::com::sun::star::awt::XDialog2
@@ -775,7 +775,7 @@
 diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
 index ec4c268..e9ae5d8 100644
 --- a/toolkit/source/awt/vclxwindows.cxx
-+++ b/toolkit/source/awt/vclxwindows.cxx
++++ toolkit/source/awt/vclxwindows.cxx
 @@ -1336,6 +1336,13 @@ void VCLXRadioButton::ImplClickedOrToggled( BOOL bToggled )
  	}
  }
@@ -793,7 +793,7 @@
 diff --git a/toolkit/source/layout/helper.cxx b/toolkit/source/layout/helper.cxx
 index 1e96643..920c6d6 100644
 --- a/toolkit/source/layout/helper.cxx
-+++ b/toolkit/source/layout/helper.cxx
++++ toolkit/source/layout/helper.cxx
 @@ -378,6 +378,9 @@ PropHelper::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::
  #include <vcl/tabctrl.hxx>
  #include <vcl/tabpage.hxx>
@@ -832,7 +832,7 @@
 diff --git a/toolkit/source/layout/import.cxx b/toolkit/source/layout/import.cxx
 index 47857e6..60cf33b 100644
 --- a/toolkit/source/layout/import.cxx
-+++ b/toolkit/source/layout/import.cxx
++++ toolkit/source/layout/import.cxx
 @@ -99,7 +99,16 @@ SAL_THROW (())
      {
          OUString aTitle;
@@ -996,7 +996,7 @@
 diff --git a/toolkit/source/layout/import.hxx b/toolkit/source/layout/import.hxx
 index e6d7e51..44e4dcf 100644
 --- a/toolkit/source/layout/import.hxx
-+++ b/toolkit/source/layout/import.hxx
++++ toolkit/source/layout/import.hxx
 @@ -37,8 +37,11 @@
  #define _BACKWARD_BACKWARD_WARNING_H 1
  #include <hash_map>
@@ -1140,7 +1140,7 @@
 diff --git a/toolkit/source/layout/proplist.cxx b/toolkit/source/layout/proplist.cxx
 index c16d979..f63fba1 100644
 --- a/toolkit/source/layout/proplist.cxx
-+++ b/toolkit/source/layout/proplist.cxx
++++ toolkit/source/layout/proplist.cxx
 @@ -404,7 +404,8 @@ findAndRemove( const char *pAttr, PropList &rProps, OUString &rValue )
  
      for ( it = rProps.begin(); it != rProps.end(); it++ )
@@ -1154,7 +1154,7 @@
 diff --git a/toolkit/source/vclcompat/wbutton.cxx b/toolkit/source/vclcompat/wbutton.cxx
 index 5617f4f..f08a7f9 100644
 --- a/toolkit/source/vclcompat/wbutton.cxx
-+++ b/toolkit/source/vclcompat/wbutton.cxx
++++ toolkit/source/vclcompat/wbutton.cxx
 @@ -39,6 +39,7 @@
  #include <com/sun/star/graphic/XGraphic.hpp>
  #include <cppuhelper/implbase1.hxx>
@@ -1446,7 +1446,7 @@
 diff --git a/toolkit/source/vclcompat/wfield.cxx b/toolkit/source/vclcompat/wfield.cxx
 index 015cf63..9c86730 100644
 --- a/toolkit/source/vclcompat/wfield.cxx
-+++ b/toolkit/source/vclcompat/wfield.cxx
++++ toolkit/source/vclcompat/wfield.cxx
 @@ -40,6 +40,7 @@
  #include <cppuhelper/implbase1.hxx>
  #include <com/sun/star/awt/XActionListener.hpp>
@@ -1746,7 +1746,7 @@
 diff --git a/toolkit/source/vclcompat/wrapper.cxx b/toolkit/source/vclcompat/wrapper.cxx
 index 93f3a5f..c33e407 100644
 --- a/toolkit/source/vclcompat/wrapper.cxx
-+++ b/toolkit/source/vclcompat/wrapper.cxx
++++ toolkit/source/vclcompat/wrapper.cxx
 @@ -131,16 +131,16 @@ PeerHandle Context::getToplevel()
  }
  PeerHandle Context::getRoot()
@@ -2144,43 +2144,11 @@
  {
  }
  ProgressBar::ProgressBar( Window *pParent, WinBits nBits)
-@@ -706,46 +905,14 @@ public:
+@@ -706,14 +905,14 @@ public:
          vcl->SetPlugin( mpPlugin );
          plugin->SetParent( parent );
          plugin->SetStyle( vcl->mStyle );
 -        plugin->SetCreatedWithToolkit( TRUE );
--        plugin->SetComponentInterface( vcl );
--        plugin->Show();
--    }
--};
--
--Plugin::Plugin( Context *pCtx, char const *pId, ::Control *plugin )
--    : Control( new PluginImpl( pCtx, pCtx->GetPeerHandle( pId, 0 ), this, plugin ) )
--    , mpPlugin( plugin )
--{
--}
--
--DECL_GET_IMPL_IMPL( Plugin )
--
--
--class PluginImpl: public ControlImpl
--{
--public:
--    ::Control *mpPlugin;
--
--    PluginImpl( Context *pCtx, const PeerHandle &xPeer, Window *pWindow, :: Control *plugin )
--        : ControlImpl( pCtx, xPeer, pWindow )
--        , mpPlugin( plugin )
--    {
--        uno::Reference <awt::XWindow> ref( mxWindow, uno::UNO_QUERY );
--        layoutimpl::VCLXPlugin *vcl
--            = static_cast<layoutimpl::VCLXPlugin*>( VCLXWindow::GetImplementation( ref ) );
--        ::Window *parent = vcl->mpWindow->GetParent();
--        vcl->SetWindow( plugin );
--        vcl->SetPlugin( mpPlugin );
--        plugin->SetParent( parent );
--        plugin->SetStyle( vcl->mStyle );
--        plugin->SetCreatedWithToolkit( TRUE );
 +        plugin->SetCreatedWithToolkit( true );
          plugin->SetComponentInterface( vcl );
          plugin->Show();
@@ -2208,7 +2176,7 @@
 diff --git a/toolkit/source/vclcompat/wrapper.hxx b/toolkit/source/vclcompat/wrapper.hxx
 index 25dbd90..36a491f 100644
 --- a/toolkit/source/vclcompat/wrapper.hxx
-+++ b/toolkit/source/vclcompat/wrapper.hxx
++++ toolkit/source/vclcompat/wrapper.hxx
 @@ -112,15 +112,18 @@ inline WindowImpl &Window::getImpl() const
      { \
          return *(static_cast<t##Impl *>(mpImpl)); \
@@ -2233,7 +2201,7 @@
 new file mode 100644
 index 0000000..7b4d68d
 --- /dev/null
-+++ b/toolkit/uiconfig/layout/delzip
++++ toolkit/uiconfig/layout/delzip
 @@ -0,0 +1 @@
 +empty
 \ No newline at end of file
@@ -2241,14 +2209,14 @@
 new file mode 100644
 index 0000000..ea30561
 --- /dev/null
-+++ b/toolkit/uiconfig/layout/localize.sdf
++++ toolkit/uiconfig/layout/localize.sdf
 @@ -0,0 +1 @@
 +#empty
 diff --git a/toolkit/uiconfig/layout/makefile.mk b/toolkit/uiconfig/layout/makefile.mk
 new file mode 100644
 index 0000000..2cc6d95
 --- /dev/null
-+++ b/toolkit/uiconfig/layout/makefile.mk
++++ toolkit/uiconfig/layout/makefile.mk
 @@ -0,0 +1,57 @@
 +#*************************************************************************
 +#
@@ -2311,7 +2279,7 @@
 new file mode 100644
 index 0000000..237f549
 --- /dev/null
-+++ b/toolkit/uiconfig/layout/message-box.xml
++++ toolkit/uiconfig/layout/message-box.xml
 @@ -0,0 +1,41 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!-- This is a template.  i18n translation is not performed in-place;
@@ -2357,7 +2325,7 @@
 diff --git a/toolkit/util/makefile.pmk b/toolkit/util/makefile.pmk
 index f88a240..acf6ba4 100644
 --- a/toolkit/util/makefile.pmk
-+++ b/toolkit/util/makefile.pmk
++++ toolkit/util/makefile.pmk
 @@ -41,7 +41,5 @@ CFLAGS += -xldscope=hidden
  
  CFLAGS+=-I$(PRJ)/inc/layout
@@ -2371,7 +2339,7 @@
 new file mode 100755
 index 0000000..d6a20cb
 --- /dev/null
-+++ b/toolkit/workben/layout/TEST
++++ toolkit/workben/layout/TEST
 @@ -0,0 +1,3 @@
 +export OOO_INSTALL_PREFIX=$(cd ../../../../.. && pwd)/ooo-svn
 +test -d $OOO_INSTALL_PREFIX/openoffice.org3 && export OOO_PREFIX_BRAND=$OOO_INSTALL_PREFIX/openoffice.org3 || export OOO_PREFIX_BRAND=$OOO_INSTALL_PREFIX
@@ -2380,7 +2348,7 @@
 new file mode 100644
 index 0000000..0ce5843
 --- /dev/null
-+++ b/toolkit/workben/layout/insert-sheet.xml
++++ toolkit/workben/layout/insert-sheet.xml
 @@ -0,0 +1,57 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!-- This is a template.  i18n translation is not performed in-place;
@@ -2442,7 +2410,7 @@
 diff --git a/toolkit/workben/layout/makefile.mk b/toolkit/workben/layout/makefile.mk
 index e82e1c9..4f2a2e1 100644
 --- a/toolkit/workben/layout/makefile.mk
-+++ b/toolkit/workben/layout/makefile.mk
++++ toolkit/workben/layout/makefile.mk
 @@ -43,12 +43,10 @@ ENABLE_EXCEPTIONS=TRUE
  CFLAGS += -I$(PRJ)/source/layout
  
@@ -2501,7 +2469,7 @@
 new file mode 100644
 index 0000000..237f549
 --- /dev/null
-+++ b/toolkit/workben/layout/message-box.xml
++++ toolkit/workben/layout/message-box.xml
 @@ -0,0 +1,41 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!-- This is a template.  i18n translation is not performed in-place;
@@ -2548,7 +2516,7 @@
 new file mode 100644
 index 0000000..7d3455e
 --- /dev/null
-+++ b/toolkit/workben/layout/move-copy-sheet.xml
++++ toolkit/workben/layout/move-copy-sheet.xml
 @@ -0,0 +1,21 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!-- This is a template.  i18n translation is not performed in-place;
@@ -2574,7 +2542,7 @@
 diff --git a/toolkit/workben/layout/recover.cxx b/toolkit/workben/layout/recover.cxx
 index 706ee21..a0cc56b 100644
 --- a/toolkit/workben/layout/recover.cxx
-+++ b/toolkit/workben/layout/recover.cxx
++++ toolkit/workben/layout/recover.cxx
 @@ -55,6 +55,13 @@ using namespace com::sun::star;
  
  #include <layout/layout-pre.hxx>
@@ -2593,7 +2561,7 @@
 new file mode 100644
 index 0000000..0a59899
 --- /dev/null
-+++ b/toolkit/workben/layout/string-input.xml
++++ toolkit/workben/layout/string-input.xml
 @@ -0,0 +1,16 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!-- This is a template.  i18n translation is not performed in-place;
@@ -2614,7 +2582,7 @@
 diff --git a/toolkit/workben/layout/test.cxx b/toolkit/workben/layout/test.cxx
 index 159cbc9..cba8245 100644
 --- a/toolkit/workben/layout/test.cxx
-+++ b/toolkit/workben/layout/test.cxx
++++ toolkit/workben/layout/test.cxx
 @@ -237,19 +237,21 @@ void LayoutTest::RunEditor()
      editor.Execute();
  }
@@ -2666,7 +2634,7 @@
 diff --git a/toolkit/workben/layout/tpsort.cxx b/toolkit/workben/layout/tpsort.cxx
 index 9468c5d..4d4dfd1 100644
 --- a/toolkit/workben/layout/tpsort.cxx
-+++ b/toolkit/workben/layout/tpsort.cxx
++++ toolkit/workben/layout/tpsort.cxx
 @@ -7,7 +7,7 @@
   * OpenOffice.org - a multi-platform office productivity suite
   *
@@ -2679,7 +2647,7 @@
 diff --git a/toolkit/workben/layout/wordcountdialog.cxx b/toolkit/workben/layout/wordcountdialog.cxx
 index 64f1836..1eebbe5 100644
 --- a/toolkit/workben/layout/wordcountdialog.cxx
-+++ b/toolkit/workben/layout/wordcountdialog.cxx
++++ toolkit/workben/layout/wordcountdialog.cxx
 @@ -7,7 +7,7 @@
   * OpenOffice.org - a multi-platform office productivity suite
   *
@@ -2718,7 +2686,7 @@
 diff --git a/toolkit/workben/layout/wordcountdialog.hxx b/toolkit/workben/layout/wordcountdialog.hxx
 index 62e97bb..b0674e2 100644
 --- a/toolkit/workben/layout/wordcountdialog.hxx
-+++ b/toolkit/workben/layout/wordcountdialog.hxx
++++ toolkit/workben/layout/wordcountdialog.hxx
 @@ -7,7 +7,7 @@
   * OpenOffice.org - a multi-platform office productivity suite
   *
@@ -2731,7 +2699,7 @@
 diff --git a/toolkit/workben/layout/zoom.cxx b/toolkit/workben/layout/zoom.cxx
 index 3185c96..6d7ade8 100644
 --- a/toolkit/workben/layout/zoom.cxx
-+++ b/toolkit/workben/layout/zoom.cxx
++++ toolkit/workben/layout/zoom.cxx
 @@ -7,7 +7,7 @@
   * OpenOffice.org - a multi-platform office productivity suite
   *
@@ -2778,7 +2746,7 @@
 diff --git a/toolkit/workben/layout/zoom.hxx b/toolkit/workben/layout/zoom.hxx
 index 7dc09dc..461cd5a 100644
 --- a/toolkit/workben/layout/zoom.hxx
-+++ b/toolkit/workben/layout/zoom.hxx
++++ toolkit/workben/layout/zoom.hxx
 @@ -7,7 +7,7 @@
   * OpenOffice.org - a multi-platform office productivity suite
   *
@@ -2791,7 +2759,7 @@
 diff --git a/toolkit/workben/layout/zoom.xml b/toolkit/workben/layout/zoom.xml
 index 5ad8fcf..f6a76a4 100644
 --- a/toolkit/workben/layout/zoom.xml
-+++ b/toolkit/workben/layout/zoom.xml
++++ toolkit/workben/layout/zoom.xml
 @@ -11,30 +11,30 @@
      <vbox spacing="5" border="5">
  	<hbox spacing="0" border="0">
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]