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

[jannieuw svn gnome org]

Author: jannieuw
Date: Thu Apr 24 11:29:43 2008
New Revision: 12320
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12320&view=rev

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

	* patches/dev300/layout-plugin-toolkit.diff: Update from GIT: base
	plugin on Window instead of Contol.


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

Modified: trunk/patches/dev300/layout-plugin-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-plugin-toolkit.diff	(original)
+++ trunk/patches/dev300/layout-plugin-toolkit.diff	Thu Apr 24 11:29:43 2008
@@ -811,7 +811,7 @@
  all: $(svtools) ALLTAR
 diff --git a/workben/layout/plugin.cxx b/workben/layout/plugin.cxx
 new file mode 100644
-index 0000000..0c5a881
+index 0000000..9ceb9d0
 --- /dev/null
 +++ toolkit/workben/layout/plugin.cxx
 @@ -0,0 +1,73 @@
@@ -850,39 +850,39 @@
 + *
 + ************************************************************************/
 +
-+#include <com/sun/star/awt/XDialog2.hpp>
-+#include <toolkit/awt/vclxwindow.hxx>
-+
-+using namespace com::sun::star;
-+
-+#include "dialcontrol.hxx"
-+
 +#define _LAYOUT_PLUGIN_CXX
 +
 +#include "plugin.hxx"
 +
++#include <com/sun/star/awt/XDialog2.hpp>
++#include <dialcontrol.hxx>
++#include <toolkit/awt/vclxwindow.hxx>
++
 +#include <layout/layout-pre.hxx>
 +
++using namespace com::sun::star;
++
 +#define LAYOUT_RES(x) #x
 +
 +#undef ModalDialog
-+#define ModalDialog( pParent, LAYOUT_RES_RID ) Dialog( pParent, "plugin.xml", "RID_DLG_PLUGIN" )
++#define ModalDialog( parent, id ) Dialog( parent, "plugin.xml", id )
 +
 +PluginDialog::PluginDialog( Window* pParent )
 +    : ModalDialog( pParent, LAYOUT_RES( RID_DLG_PLUGIN ) )
-+    , aHeaderImage( this, SVX_RES( FI_HEADER ) )
++    , aHeaderImage( this, LAYOUT_RES( FI_HEADER ) )
 +    , aHeaderText( this, LAYOUT_RES( FT_HEADER ) )
 +    , aHeaderLine( this, LAYOUT_RES( FL_HEADER ) )
 +    , aPlugin( this, LAYOUT_RES( PL_DIAL ),
 +// FIXME: width=, height=, are not recognized as properties.
 +//               new svx::DialControl( LAYOUT_DIALOG_PARENT, Size( 0, 0 ), 0 ) )
 +               new svx::DialControl( LAYOUT_DIALOG_PARENT, Size( 80, 80 ), 0 ) )
++      //, aDialControl( static_cast<svx::DialControl&> ( aPlugin.GetPlugin() ) )
++    , aDialControl( static_cast<svx::DialControl&> ( *aPlugin.mpPlugin ) )
 +    , aOKBtn( this, LAYOUT_RES( BTN_OK ) )
 +	, aCancelBtn( this, LAYOUT_RES( BTN_CANCEL ) )
 +	, aHelpBtn( this, LAYOUT_RES( BTN_HELP ) )
 +{
-+    svx::DialControl &d = static_cast<svx::DialControl&> (*aPlugin.mpPlugin);
-+    d.SetRotation( 425 );
++    aDialControl.SetRotation( 425 );
 +}
 +
 +PluginDialog::~PluginDialog()
@@ -890,10 +890,10 @@
 +}
 diff --git a/workben/layout/plugin.hxx b/workben/layout/plugin.hxx
 new file mode 100644
-index 0000000..9f1350f
+index 0000000..4fe8edf
 --- /dev/null
 +++ toolkit/workben/layout/plugin.hxx
-@@ -0,0 +1,60 @@
+@@ -0,0 +1,65 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -934,6 +934,10 @@
 +#include <layout/layout.hxx>
 +#include <layout/layout-pre.hxx>
 +
++namespace svx {
++class DialControl;
++}
++
 +class PluginDialog : public ModalDialog
 +{
 +private:
@@ -941,13 +945,14 @@
 +    FixedText aHeaderText;
 +    FixedLine aHeaderLine;
 +    Plugin aPlugin;
-+	OKButton aOKBtn;
-+	CancelButton aCancelBtn;
-+	HelpButton aHelpBtn;
++    svx::DialControl& aDialControl;
++    OKButton aOKBtn;
++    CancelButton aCancelBtn;
++    HelpButton aHelpBtn;
 +
 +public:
-+	PluginDialog( Window* pParent );
-+	~PluginDialog();
++    PluginDialog( Window* pParent );
++    ~PluginDialog();
 +};
 +
 +#include <layout/layout-post.hxx>