GNOME.org
 

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

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

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

	* patches/dev300/layout-plugin-toolkit.diff: Update from GIT: plugin
	example now works.


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 09:11:00 2008
@@ -61,10 +61,10 @@
  #define SW_RES(i)               ResId(i,SWDIALOG_MGR())
  
 diff --git a/inc/layout/layout-pre.hxx b/inc/layout/layout-pre.hxx
-index 8d4983c..11a6b13 100644
+index 8d4983c..f1ff571 100644
 --- a/inc/layout/layout-pre.hxx
 +++ toolkit/inc/layout/layout-pre.hxx
-@@ -49,63 +49,78 @@
+@@ -49,63 +49,80 @@
  //typedef layout::FixedLine FixedLine;
  
  #define AdvancedButton layout::AdvancedButton
@@ -117,6 +117,8 @@
  
  #define Window ::Window
  
++#define LAYOUT_DIALOG_PARENT\
++    VCLXWindow::GetImplementation( uno::Reference <awt::XWindow> ( GetPeer(), uno::UNO_QUERY ) )->GetWindow()
 +
  #undef SVX_RES
  #define SVX_RES(x) #x
@@ -155,7 +157,7 @@
  #define _SVX_ZOOM_HRC
  #endif /* _SVX_ZOOM_CXX */
  
-@@ -113,7 +128,7 @@
+@@ -113,7 +130,7 @@
  
  #else /* !ENABLE_LAYOUT */
  
@@ -165,7 +167,7 @@
  #endif /* !ENABLE_LAYOUT */
  
 diff --git a/inc/layout/layout.hxx b/inc/layout/layout.hxx
-index e2d0403..c308387 100644
+index e2d0403..ecbf73c 100644
 --- a/inc/layout/layout.hxx
 +++ toolkit/inc/layout/layout.hxx
 @@ -49,8 +49,9 @@
@@ -179,7 +181,7 @@
  
  namespace layout
  {
-@@ -516,6 +517,16 @@ public:
+@@ -516,6 +517,17 @@ public:
      VBox( sal_Int32 nBorder, bool bHomogeneous );
  };
  
@@ -190,6 +192,7 @@
 +    DECL_GET_IMPL( Plugin );
 +    //DECL_CONSTRUCTORS( Plugin, Control, 0 );
 +public:
++    ::Control *mpPlugin;
 +    Plugin( Context *pCtx, char const* pId, ::Control *plugin );
 +};
 +
@@ -210,10 +213,10 @@
  	$(SLO)/vclxtabcontrol.obj
 diff --git a/source/awt/vclxplugin.cxx b/source/awt/vclxplugin.cxx
 new file mode 100644
-index 0000000..1506828
+index 0000000..4c3091a
 --- /dev/null
 +++ toolkit/source/awt/vclxplugin.cxx
-@@ -0,0 +1,78 @@
+@@ -0,0 +1,91 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -252,9 +255,12 @@
 +#include "vclxplugin.hxx"
 +
 +#include <com/sun/star/awt/PosSize.hpp>
++#include <toolkit/helper/property.hxx>
 +
 +#include "forward.hxx"
 +
++#include <vcl/ctrl.hxx>
++
 +namespace layoutimpl
 +{
 +
@@ -263,8 +269,8 @@
 +VCLXPlugin::VCLXPlugin( Window *p, WinBits b )
 +    : VCLXWindow()
 +    , mpWindow( p )
++    , mpPlugin( 0 )
 +    , mStyle( b )
-+    , mSize()
 +{
 +}
 +
@@ -284,20 +290,30 @@
 +    VCLXWindow::dispose();
 +}
 +
++void VCLXPlugin::SetPlugin( ::Control *p )
++{
++    mpPlugin = p;
++}
++
 +awt::Size SAL_CALL VCLXPlugin::getMinimumSize()
 +    throw(::com::sun::star::uno::RuntimeException)
 +{
 +    ::vos::OClearableGuard aGuard( GetMutex() );
-+    return mSize;
++    if ( mpPlugin )
++    {
++        Size s = mpPlugin->GetSizePixel();
++        return awt::Size( s.Width(), s.Height() );
++    }
++    return awt::Size();
 +}
 +
 +} // namespace layoutimpl
 diff --git a/source/awt/vclxplugin.hxx b/source/awt/vclxplugin.hxx
 new file mode 100644
-index 0000000..81e5bcb
+index 0000000..b6a7f04
 --- /dev/null
 +++ toolkit/source/awt/vclxplugin.hxx
-@@ -0,0 +1,77 @@
+@@ -0,0 +1,75 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -339,6 +355,7 @@
 +#include <toolkit/awt/vclxwindow.hxx>
 +#include <vcl/wintypes.hxx>
 +
++class Control;
 +namespace layoutimpl
 +{
 +
@@ -348,15 +365,12 @@
 +{
 +public:
 +    Window *mpWindow;
++    ::Control *mpPlugin;
 +    WinBits mStyle;
 +
-+    //Rectangle mPosSize;  // Rectangle as member: BOOM
-+    css::awt::Size mSize;
-+
 +    VCLXPlugin( Window *p, WinBits b );
 +
-+    //void SetPosSize( Rectangle const& r ) { mPosSize = r; }
-+    void SetSize( css::awt::Size const& s ) { mSize = s; }
++    void SetPlugin( ::Control *p );
 +
 +protected:
 +    ~VCLXPlugin();
@@ -375,10 +389,62 @@
 +} // namespace layoutimpl
 +
 +#endif /* LAYOUT_AWT_VCLXPLUGIN_HXX */
+diff --git a/source/layout/box.cxx b/source/layout/box.cxx
+index 50326f1..9b07939 100644
+--- a/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
+--- a/source/layout/dialogbuttonhbox.cxx
++++ toolkit/source/layout/dialogbuttonhbox.cxx
+@@ -43,7 +43,7 @@
+ #include "proplist.hxx"
+ 
+ #if TEST_LAYOUT && !defined( DBG_UTIL )
+-#include <stdio.h>
++#include <cstdio>
+ #undef DBG_ERROR
+ #define DBG_ERROR printf
+ #undef DBG_ERROR1
 diff --git a/source/layout/helper.cxx b/source/layout/helper.cxx
-index 5cfddf6..b40f7dd 100644
+index 5cfddf6..5aada5f 100644
 --- a/source/layout/helper.cxx
 +++ toolkit/source/layout/helper.cxx
+@@ -46,7 +46,7 @@
+ #include "layout/layoutcore.hxx"
+ 
+ #if TEST_LAYOUT && !defined( DBG_UTIL )
+-#include <stdio.h>
++#include <cstdio>
+ #undef DBG_ERROR
+ #define DBG_ERROR printf
+ #undef DBG_ERROR1
 @@ -352,6 +352,7 @@ PropHelper::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::
  #include <awt/vclxscroller.hxx>
  #include <awt/vclxsplitter.hxx>
@@ -431,10 +497,46 @@
              b->setOrdering ( aOrdering );
  
  #ifdef IMPORT_RADIOGROUP
+diff --git a/source/layout/import.hxx b/source/layout/import.hxx
+index 4974950..3026e15 100644
+--- a/source/layout/import.hxx
++++ toolkit/source/layout/import.hxx
+@@ -38,6 +38,7 @@
+ 
+ #include <map>
+ #include <list>
++#define _BACKWARD_BACKWARD_WARNING_H 1
+ #include <hash_map>
+ 
+ #include <com/sun/star/xml/input/XRoot.hpp>
+diff --git a/source/layout/proplist.cxx b/source/layout/proplist.cxx
+index 889dbac..3e85aee 100644
+--- a/source/layout/proplist.cxx
++++ toolkit/source/layout/proplist.cxx
+@@ -46,7 +46,7 @@
+ #include "layout/layoutcore.hxx"
+ 
+ #if TEST_LAYOUT && !defined( DBG_UTIL )
+-#include <stdio.h>
++#include <cstdio>
+ #undef DBG_ERROR
+ #define DBG_ERROR printf
+ #undef DBG_ERROR1
 diff --git a/source/layout/root.cxx b/source/layout/root.cxx
-index 25c4463..48f72ed 100644
+index 25c4463..3cec64e 100644
 --- a/source/layout/root.cxx
 +++ toolkit/source/layout/root.cxx
+@@ -35,8 +35,8 @@
+ 
+ #include "root.hxx"
+ 
+-#include <assert.h>
+-#include <stdio.h>
++#include <cassert>
++#include <cstdio>
+ 
+ #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
@@ -447,10 +549,18 @@
      {
          OUString c = OUString::createFromAscii( ":" );
 diff --git a/source/layout/root.hxx b/source/layout/root.hxx
-index e385256..9946956 100644
+index e385256..61b0bee 100644
 --- a/source/layout/root.hxx
 +++ toolkit/source/layout/root.hxx
-@@ -46,6 +46,7 @@
+@@ -36,6 +36,7 @@
+ #ifndef CORE_ROOT_HXX
+ #define CORE_ROOT_HXX
+ 
++#define _BACKWARD_BACKWARD_WARNING_H 1
+ #include <hash_map>
+ 
+ #include <com/sun/star/awt/XLayoutRoot.hpp>
+@@ -46,6 +47,7 @@
  #include <com/sun/star/lang/XInitialization.hpp>
  #include <cppuhelper/implbase3.hxx>
  #include <cppuhelper/interfacecontainer.h>
@@ -458,7 +568,7 @@
  
  #include "proplist.hxx"
  
-@@ -70,7 +71,7 @@ css::uno::Reference< css::io::XInputStream > getFileAsStream( const rtl::OUStrin
+@@ -70,7 +72,7 @@ css::uno::Reference< css::io::XInputStream > getFileAsStream( const rtl::OUStrin
  
  class LayoutWidget;
  
@@ -467,7 +577,7 @@
      css::awt::XLayoutRoot,
      css::lang::XInitialization,
      css::lang::XComponent>
-@@ -130,7 +131,7 @@ public:
+@@ -130,7 +132,7 @@ public:
      virtual LayoutWidget *create( rtl::OUString id, const rtl::OUString unoName, long attrbs, css::uno::Reference< css::awt::XLayoutContainer > xParent );
  };
  
@@ -476,6 +586,19 @@
  {
      friend class LayoutRoot;
  
+diff --git a/source/layout/translate.cxx b/source/layout/translate.cxx
+index 7eac2ba..0f87022 100644
+--- a/source/layout/translate.cxx
++++ toolkit/source/layout/translate.cxx
+@@ -37,7 +37,7 @@
+ 
+ #include <list>
+ #if TEST_LAYOUT
+-#include <stdio.h>
++#include <cstdio>
+ #endif
+ 
+ #include <osl/process.h>
 diff --git a/source/vclcompat/wbutton.cxx b/source/vclcompat/wbutton.cxx
 index 5757ebc..17c2142 100644
 --- a/source/vclcompat/wbutton.cxx
@@ -490,26 +613,44 @@
  public:
      AdvancedButtonImpl( Context *pCtx, PeerHandle const& xPeer, Window *pWindow )
 diff --git a/source/vclcompat/wrapper.cxx b/source/vclcompat/wrapper.cxx
-index 20f961c..67d6cf5 100644
+index 20f961c..a078227 100644
 --- a/source/vclcompat/wrapper.cxx
 +++ toolkit/source/vclcompat/wrapper.cxx
-@@ -50,6 +50,11 @@
+@@ -35,21 +35,22 @@
+ 
+ #include "wrapper.hxx"
+ 
+-#include <com/sun/star/graphic/XGraphic.hpp>
+-#include <com/sun/star/awt/XFixedText.hpp>
++#include <awt/vclxplugin.hxx>
++#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
++#include <com/sun/star/awt/WindowAttribute.hpp>
+ #include <com/sun/star/awt/XDialog2.hpp>
++#include <com/sun/star/awt/XFixedText.hpp>
+ #include <com/sun/star/awt/XProgressBar.hpp>
+-#include <com/sun/star/awt/WindowAttribute.hpp>
+-#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
++#include <com/sun/star/graphic/XGraphic.hpp>
+ #include <comphelper/processfactory.hxx>
+-#include <vcl/window.hxx>
+-#include <toolkit/awt/vclxwindow.hxx>
+-
+-#include <layout/layoutcore.hxx>
+ #include <layout/factory.hxx>
++#include <layout/layoutcore.hxx>
  #include <layout/root.hxx>
++#include <toolkit/awt/vclxwindow.hxx>
++#include <vcl/ctrl.hxx>
  #include <vcl/image.hxx>
+ #include <stdio.h>
++#include <vcl/window.hxx>
  
-+#include <vcl/ctrl.hxx>
-+#include <awt/vclxplugin.hxx>
-+#include <com/sun/star/awt/PosSize.hpp>
-+#include <typeinfo>
-+
  using namespace ::com::sun::star;
  
- namespace layout
-@@ -570,4 +575,61 @@ sal_Int32 ProgressBar::GetValue()
+@@ -570,4 +571,36 @@ sal_Int32 ProgressBar::GetValue()
      return getImpl().mxProgressBar->getValue();
  }
  
-+
 +class PluginImpl: public ControlImpl
 +{
 +public:
@@ -519,48 +660,24 @@
 +        : ControlImpl( pCtx, xPeer, pWindow )
 +        , mpPlugin( plugin )
 +    {
-+        uno::Reference<lang::XUnoTunnel> unoTunnel( mxWindow, uno::UNO_QUERY );
-+        if ( unoTunnel.is() )
-+        {
-+            layoutimpl::VCLXPlugin *vcl
-+                = reinterpret_cast<layoutimpl::VCLXPlugin*>
-+                ( unoTunnel->getSomething( VCLXWindow::GetUnoTunnelId() ) );
-+            if ( vcl )
-+            {
-+
-+                ::Window *parent = vcl->mpWindow->GetParent();
-+                
-+                printf( "\n\n***********************\n" );
-+                printf( "\n%s: plugin=%p (%s)\n", __FUNCTION__, plugin, typeid( *plugin ).name() );
-+                printf( "%s: vcl=%p (%s)\n", __FUNCTION__, vcl, typeid( *vcl ).name() );
-+                
-+                printf( "%s: parent=%p (%s)\n", __FUNCTION__, parent, typeid( *parent ).name() );
-+
-+                vcl->SetWindow( plugin );
-+                plugin->SetStyle( vcl->mStyle );
-+                plugin->SetCreatedWithToolkit( TRUE );
-+                plugin->SetComponentInterface( vcl );
-+                plugin->SetParent( parent );
-+                plugin->Show();
-+
-+                Size s = plugin->GetSizePixel();
-+                vcl->SetSize( awt::Size( s.Width(), s.Height() ) );
-+                vcl->setPosSize( 0, 0, s.Width(), s.Height(), awt::PosSize::SIZE );
-+                printf( "\n***********************\n\n" );
-+            }
-+        }
++        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->SetComponentInterface( vcl );
++        plugin->Show();
 +    }
 +};
 +
-+//DECL_CONSTRUCTOR_IMPLS( Plugin, Control, "plugin" );
-+
-+//Plugin::Plugin( Context *pCtx, char const *pId, sal_uInt32 nId )
 +Plugin::Plugin( Context *pCtx, char const *pId, ::Control *plugin )
 +    : Control( new PluginImpl( pCtx, pCtx->GetPeerHandle( pId, 0 ), this, plugin ) )
++    , mpPlugin( plugin )
 +{
-+    (void) plugin;
-+    printf( "%s: name=%s\n", __PRETTY_FUNCTION__, pId );
-+    printf( "%s: context=%p\n", __PRETTY_FUNCTION__, pCtx );
 +}
 +
 +DECL_GET_IMPL_IMPL( Plugin )
@@ -613,6 +730,55 @@
  };
  
  inline WindowImpl &Window::getImpl() const
+diff --git a/workben/layout/editor.cxx b/workben/layout/editor.cxx
+index 1089288..a13030e 100644
+--- a/workben/layout/editor.cxx
++++ toolkit/workben/layout/editor.cxx
+@@ -36,30 +36,28 @@
+ #include "editor.hxx"
+ 
+ #undef NDEBUG
+-#include <assert.h>
+-#include <stdio.h>
+-
+-#include <vector>
++#include <cassert>
++#include <cstdio>
++#include <cstring>
+ #include <list>
+-#include <rtl/strbuf.hxx>
+-#include <rtl/ustrbuf.hxx>
+-
+-using namespace layout::css;
+-
+-using rtl::OUString;
++#include <vector>
+ 
+-#include <com/sun/star/awt/XWindow.hpp>
+-#include <com/sun/star/awt/XWindowPeer.hpp>
+-#include <com/sun/star/awt/XVclWindowPeer.hpp>
++#include <com/sun/star/awt/WindowAttribute.hpp>
+ #include <com/sun/star/awt/XLayoutConstrains.hpp>
+ #include <com/sun/star/awt/XLayoutContainer.hpp>
+-#include <com/sun/star/awt/WindowAttribute.hpp>
+-
+ #include <com/sun/star/awt/XToolkit.hpp>
++#include <com/sun/star/awt/XVclWindowPeer.hpp>
++#include <com/sun/star/awt/XWindow.hpp>
++#include <com/sun/star/awt/XWindowPeer.hpp>
++#include <rtl/strbuf.hxx>
++#include <rtl/ustrbuf.hxx>
+ #include <toolkit/helper/property.hxx>
+-
+ #include <vcl/lstbox.h>
+ 
++using namespace layout::css;
++
++using rtl::OUString;
++
+ // FIXME:
+ //#define FILEDLG
+ 
 diff --git a/workben/layout/makefile.mk b/workben/layout/makefile.mk
 index fc8fb2c..d7303af 100644
 --- a/workben/layout/makefile.mk
@@ -645,10 +811,10 @@
  all: $(svtools) ALLTAR
 diff --git a/workben/layout/plugin.cxx b/workben/layout/plugin.cxx
 new file mode 100644
-index 0000000..4a8c859
+index 0000000..0c5a881
 --- /dev/null
 +++ toolkit/workben/layout/plugin.cxx
-@@ -0,0 +1,67 @@
+@@ -0,0 +1,73 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -685,6 +851,9 @@
 + ************************************************************************/
 +
 +#include <com/sun/star/awt/XDialog2.hpp>
++#include <toolkit/awt/vclxwindow.hxx>
++
++using namespace com::sun::star;
 +
 +#include "dialcontrol.hxx"
 +
@@ -699,18 +868,21 @@
 +#undef ModalDialog
 +#define ModalDialog( pParent, LAYOUT_RES_RID ) Dialog( pParent, "plugin.xml", "RID_DLG_PLUGIN" )
 +
-+
 +PluginDialog::PluginDialog( Window* pParent )
 +    : ModalDialog( pParent, LAYOUT_RES( RID_DLG_PLUGIN ) )
 +    , aHeaderImage( this, SVX_RES( FI_HEADER ) )
 +    , aHeaderText( this, LAYOUT_RES( FT_HEADER ) )
 +    , aHeaderLine( this, LAYOUT_RES( FL_HEADER ) )
 +    , aPlugin( this, LAYOUT_RES( PL_DIAL ),
-+               new svx::DialControl( pParent, Size( 80, 80 ), 0 ) )
++// 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 ) )
 +    , 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 );
 +}
 +
 +PluginDialog::~PluginDialog()
@@ -784,10 +956,10 @@
 +
 diff --git a/workben/layout/plugin.xml b/workben/layout/plugin.xml
 new file mode 100644
-index 0000000..96baa96
+index 0000000..f630e72
 --- /dev/null
 +++ toolkit/workben/layout/plugin.xml
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,29 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!-- This is a template.  i18n translation is not performed in-place;
 +     i18n translated xml files are generated from this template by
@@ -804,7 +976,10 @@
 +	    <fixedtext id="FT_HEADER" _label="Plugin Test"/>
 +	</hbox>
 +	<fixedline id="FL_HEADER"/>
-+	<plugin id="PL_DIAL" width="80" height="80"/>
++	<hbox>
++	  <flow cnt:padding="80"/>
++	  <plugin id="PL_DIAL" width="80" height="80"/>
++	</hbox>
 +	<dialogbuttonhbox border="5" spacing="5">
 +	    <flow/>
 +	    <okbutton id="BTN_OK"/>
@@ -814,6 +989,28 @@
 +    </vbox>
 +</modaldialog>
 +
+diff --git a/workben/layout/simple-paragraph.cxx b/workben/layout/simple-paragraph.cxx
+index 5a1de5d..206863d 100644
+--- a/workben/layout/simple-paragraph.cxx
++++ toolkit/workben/layout/simple-paragraph.cxx
+@@ -41,7 +41,7 @@
+ 
+ // include ---------------------------------------------------------------
+ 
+-#include <stdio.h>
++#include <cstdio>
+ 
+ #ifndef _SHL_HXX
+ #include <tools/shl.hxx>
+@@ -53,7 +53,7 @@
+ #include <vcl/msgbox.hxx>
+ #endif
+ 
+-#include <stdio.h>
++#include <cstdio>
+ 
+ namespace SVX {
+ #include <svx/paraprev.hxx>        // Preview
 diff --git a/workben/layout/test.cxx b/workben/layout/test.cxx
 index 5a059ee..4049e60 100644
 --- a/workben/layout/test.cxx
@@ -849,6 +1046,19 @@
      else if ( name.equalsAscii( "recover" ) )
      {
          SvxRecoverDialog recover ( 0 );
+diff --git a/workben/layout/uno.hxx b/workben/layout/uno.hxx
+index 6e1f837..63d170f 100644
+--- a/workben/layout/uno.hxx
++++ toolkit/workben/layout/uno.hxx
+@@ -36,7 +36,7 @@
+ #ifndef _LAYOUT_UNO_HXX
+ #define _LAYOUT_UNO_HXX
+ 
+-#include <stdio.h>
++#include <cstdio>
+ #include <com/sun/star/lang/XComponent.hpp>
+ #include <com/sun/star/lang/XInitialization.hpp>
+ #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 diff --git a/workben/layout/zoom.cxx b/workben/layout/zoom.cxx
 index b3c8344..0ac57f2 100644
 --- a/workben/layout/zoom.cxx
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]