ooo-build r12104 - in trunk: . patches/src680
- From: jannieuw svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12104 - in trunk: . patches/src680
- Date: Fri, 4 Apr 2008 10:56:35 +0100 (BST)
Author: jannieuw
Date: Fri Apr 4 10:56:35 2008
New Revision: 12104
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12104&view=rev
Log:
2008-04-04 Jan Nieuwenhuizen <janneke gnu org>
* patches/src680/cws-layout-config_office.diff:
* patches/src680/cws-layout-toolkit.diff: Latest bits from
integrated layout CWS. This prepares for layoutdialogs CWS
patches to be shared between dev300 and src680.
Modified:
trunk/ChangeLog
trunk/patches/src680/cws-layout-config_office.diff
trunk/patches/src680/cws-layout-toolkit.diff
Modified: trunk/patches/src680/cws-layout-config_office.diff
==============================================================================
--- trunk/patches/src680/cws-layout-config_office.diff (original)
+++ trunk/patches/src680/cws-layout-config_office.diff Fri Apr 4 10:56:35 2008
@@ -1,4 +1,3 @@
-cvs diff: Diffing config_office
Index: config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
@@ -38,10 +37,10 @@
===================================================================
RCS file: /cvs/tools/config_office/makefile.rc,v
retrieving revision 1.52
-retrieving revision 1.52.338.2
-diff -p -u -u -p -b -w -B -r1.52 -r1.52.338.2
+retrieving revision 1.52.338.3
+diff -p -u -u -p -b -w -B -r1.52 -r1.52.338.3
--- config_office/makefile.rc 6 Jan 2006 11:17:31 -0000 1.52
-+++ config_office/makefile.rc 13 Feb 2008 10:38:27 -0000 1.52.338.2
++++ config_office/makefile.rc 19 Feb 2008 09:59:21 -0000 1.52.338.3
@@ -42,6 +42,8 @@ MAKEFILERC=true
build_all : build_instsetoo_native
@@ -68,7 +67,7 @@
+ LOCAL_COMMON_OUT=$(INPATH)\
+ DEFAULT_TO_ENGLISH_FOR_PACKING=1\
+ PYTHONPATH=$(SOLARVER)/$(INPATH)/bin:$(SOLARVER)/$(INPATH)/lib:$(PYTHONPATH) \
-+ $(PERL) $(SOLARENV)/bin/make_installer.pl -f openoffice.lst -l en-US,de,nl -p OpenOffice -buildid 0 -simple $(DESTDIR)$(prefix)
++ $(PERL) $(SOLARENV)/bin/make_installer.pl -f openoffice.lst -l $(WITH_LANG:f:t",") -p OpenOffice -buildid 0 -simple $(DESTDIR)$(prefix)
+
#*************************************************************************
Modified: trunk/patches/src680/cws-layout-toolkit.diff
==============================================================================
--- trunk/patches/src680/cws-layout-toolkit.diff (original)
+++ trunk/patches/src680/cws-layout-toolkit.diff Fri Apr 4 10:56:35 2008
@@ -3075,14 +3075,16 @@
RCS file: toolkit/source/awt/vclxbutton.cxx
diff -N toolkit/source/awt/vclxbutton.cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ toolkit/source/awt/vclxbutton.cxx 8 Feb 2008 18:44:42 -0000 1.1.2.1
-@@ -0,0 +1,128 @@
++++ toolkit/source/awt/vclxbutton.cxx 18 Feb 2008 15:24:45 -0000 1.1.2.2
+@@ -0,0 +1,130 @@
+#include "vclxbutton.hxx"
+
+#include "layoutcore.hxx"
+#include <com/sun/star/awt/ImagePosition.hpp>
+#include <vcl/button.hxx>
+
++namespace css = com::sun::star;
++
+IconButton::IconButton( css::uno::Reference< css::uno::XInterface > xButton,
+ rtl::OUString aDefaultLabel, const char *pGraphName )
+ : VCLXProxy( xButton )
@@ -3210,8 +3212,8 @@
RCS file: toolkit/source/awt/vclxbutton.hxx
diff -N toolkit/source/awt/vclxbutton.hxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ toolkit/source/awt/vclxbutton.hxx 8 Feb 2008 18:44:42 -0000 1.1.2.1
-@@ -0,0 +1,103 @@
++++ toolkit/source/awt/vclxbutton.hxx 18 Feb 2008 15:24:45 -0000 1.1.2.2
+@@ -0,0 +1,69 @@
+#ifndef LAYOUT_AWT_VCLXBUTTON_HXX
+#define LAYOUT_AWT_VCLXBUTTON_HXX
+
@@ -3222,98 +3224,64 @@
+class IconButton : public VCLXProxy
+{
+protected:
-+ IconButton( css::uno::Reference< css::uno::XInterface > xButton,
++ IconButton( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xButton,
+ rtl::OUString aDefaultLabel, const char *pGraphName );
+};
+
-+//FIXME: this does not work, see alerthbox.cxx
-+//#define VCL_RTTI 1
-+#if VCL_RTTI
-+class VCLXOKButton;
-+::com::sun::star::uno::Type const & SAL_CALL getCppuType(const ::com::sun::star::uno::Reference< VCLXOKButton > *) SAL_THROW(());
-+#endif
-+
+class VCLXOKButton : public IconButton
+{
+public:
-+ VCLXOKButton( css::uno::Reference< css::uno::XInterface > xButton );
-+#if VCL_RTTI
-+ static ::com::sun::star::uno::Type const& static_type( void * p=0 )
-+ {
-+ ( void )p;
-+ return ::getCppuType( static_cast< ::com::sun::star::uno::Reference< VCLXOKButton > * >( 0 ) );
-+ }
-+#endif
++ VCLXOKButton( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xButton );
+};
+
-+#if VCL_RTTI
-+inline ::com::sun::star::uno::Type const & SAL_CALL getCppuType( com::sun::star::uno::Reference< VCLXOKButton > const *) SAL_THROW( () )
-+{
-+ return ::cppu::UnoType< VCLXOKButton >::get();
-+}
-+#endif
-+
-+inline ::com::sun::star::uno::Type const & cppu_detail_getUnoType( VCLXOKButton const * )
-+{
-+ static typelib_TypeDescriptionReference *the_type = 0;
-+ if ( !the_type )
-+ {
-+ typelib_static_type_init( &the_type, typelib_TypeClass_INTERFACE, "VCLXOKButton" );
-+ }
-+ return * reinterpret_cast< ::com::sun::star::uno::Type * >( &the_type );
-+}
-+
+class VCLXCancelButton : public IconButton
+{
+public:
-+ VCLXCancelButton( css::uno::Reference< css::uno::XInterface > xButton );
++ VCLXCancelButton( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xButton );
+};
+
+class VCLXYesButton : public IconButton
+{
+public:
-+ VCLXYesButton( css::uno::Reference< css::uno::XInterface > xButton );
++ VCLXYesButton( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xButton );
+};
+
+class VCLXNoButton : public IconButton
+{
+public:
-+ VCLXNoButton( css::uno::Reference< css::uno::XInterface > xButton );
++ VCLXNoButton( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xButton );
+};
+
+class VCLXRetryButton : public IconButton
+{
+public:
-+ VCLXRetryButton( css::uno::Reference< css::uno::XInterface > xButton );
++ VCLXRetryButton( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xButton );
+};
+
+class VCLXIgnoreButton : public IconButton
+{
+public:
-+ VCLXIgnoreButton( css::uno::Reference< css::uno::XInterface > xButton );
++ VCLXIgnoreButton( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xButton );
+};
+
+class VCLXResetButton : public IconButton
+{
+public:
-+ VCLXResetButton( css::uno::Reference< css::uno::XInterface > xButton );
++ VCLXResetButton( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xButton );
+};
+
+class VCLXApplyButton : public IconButton
+{
+public:
-+ VCLXApplyButton( css::uno::Reference< css::uno::XInterface > xButton );
++ VCLXApplyButton( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xButton );
+};
+
+class VCLXHelpButton : public IconButton
+{
+public:
-+ VCLXHelpButton( css::uno::Reference< css::uno::XInterface > xButton );
++ VCLXHelpButton( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xButton );
+};
+
-+
-+
-+
+#endif // LAYOUT_AWT_VCLXBUTTON_HXX
Index: toolkit/source/awt/vclxdialog.cxx
===================================================================
@@ -3803,7 +3771,7 @@
RCS file: toolkit/source/awt/vclxfixedline.cxx
diff -N toolkit/source/awt/vclxfixedline.cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ toolkit/source/awt/vclxfixedline.cxx 8 Feb 2008 18:44:42 -0000 1.1.2.1
++++ toolkit/source/awt/vclxfixedline.cxx 19 Feb 2008 13:36:27 -0000 1.1.2.2
@@ -0,0 +1,122 @@
+#include "vclxfixedline.hxx"
+#ifndef _TOOLKIT_HELPER_PROPERTY_HXX_
@@ -3841,7 +3809,7 @@
+VCLXFixedLine::VCLXFixedLine()
+: VCLXWindow()
+{
-+ DBG_CTOR( VCLXPane, NULL );
++ DBG_CTOR( VCLXFixedLine, NULL );
+}
+
+//--------------------------------------------------------------------
@@ -4465,8 +4433,8 @@
RCS file: toolkit/source/awt/vclxproxy.hxx
diff -N toolkit/source/awt/vclxproxy.hxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ toolkit/source/awt/vclxproxy.hxx 8 Feb 2008 18:44:42 -0000 1.1.2.1
-@@ -0,0 +1,206 @@
++++ toolkit/source/awt/vclxproxy.hxx 18 Feb 2008 15:24:45 -0000 1.1.2.2
+@@ -0,0 +1,204 @@
+#ifndef LAYOUT_AWT_VCLXPROXY_HXX
+#define LAYOUT_AWT_VCLXPROXY_HXX
+
@@ -4493,183 +4461,181 @@
+
+#include <cppuhelper/weak.hxx>
+
-+namespace css = com::sun::star;
-+
+// This is a generic proxy class - override it to wrap &
+// extend these interfaces
+// Warning: this is of course not complete ...
+class VCLXProxy :
+ // VCLXDevice
-+ public css::awt::XDevice,
-+ public css::lang::XTypeProvider,
-+ public css::lang::XUnoTunnel,
++ public com::sun::star::awt::XDevice,
++ public com::sun::star::lang::XTypeProvider,
++ public com::sun::star::lang::XUnoTunnel,
+ // VCLXWindow
-+ public css::awt::XWindow2,
-+ public css::awt::XVclWindowPeer,
-+ public css::awt::XLayoutConstrains,
-+ public css::awt::XView,
-+ public css::awt::XDockableWindow,
-+ public css::accessibility::XAccessible,
-+ public css::lang::XEventListener,
-+ public css::beans::XPropertySetInfo,
++ public com::sun::star::awt::XWindow2,
++ public com::sun::star::awt::XVclWindowPeer,
++ public com::sun::star::awt::XLayoutConstrains,
++ public com::sun::star::awt::XView,
++ public com::sun::star::awt::XDockableWindow,
++ public com::sun::star::accessibility::XAccessible,
++ public com::sun::star::lang::XEventListener,
++ public com::sun::star::beans::XPropertySetInfo,
+ // VCLXImageConsumer
-+ public css::awt::XImageConsumer,
++ public com::sun::star::awt::XImageConsumer,
+ // VCLXButton
-+ public css::awt::XButton,
-+ public css::awt::XToggleButton,
++ public com::sun::star::awt::XButton,
++ public com::sun::star::awt::XToggleButton,
+ public ::cppu::OWeakObject
+{
+ // VCLXDevice
-+ css::uno::Reference< css::awt::XDevice > mxDevice;
-+ css::uno::Reference< css::lang::XTypeProvider > mxTypeProvider;
-+ css::uno::Reference< css::lang::XUnoTunnel > mxUnoTunnel;
++ com::sun::star::uno::Reference< com::sun::star::awt::XDevice > mxDevice;
++ com::sun::star::uno::Reference< com::sun::star::lang::XTypeProvider > mxTypeProvider;
++ com::sun::star::uno::Reference< com::sun::star::lang::XUnoTunnel > mxUnoTunnel;
+
+ // VCLXWindow
-+ css::uno::Reference< css::lang::XComponent > mxComponent;
-+ css::uno::Reference< css::awt::XWindow > mxWindow;
-+ css::uno::Reference< css::awt::XWindow2 > mxWindow2;
-+ css::uno::Reference< css::awt::XWindowPeer > mxWindowPeer;
-+ css::uno::Reference< css::awt::XVclWindowPeer > mxVclWindowPeer;
-+ css::uno::Reference< css::awt::XLayoutConstrains > mxLayoutConstrains;
-+ css::uno::Reference< css::awt::XView > mxView;
-+ css::uno::Reference< css::awt::XDockableWindow > mxDockableWindow;
-+ css::uno::Reference< css::accessibility::XAccessible > mxAccessible;
-+ css::uno::Reference< css::lang::XEventListener > mxEventListener;
-+ css::uno::Reference< css::beans::XPropertySetInfo > mxPropertySetInfo;
-+ css::uno::Reference< css::awt::XItemEventBroadcaster > mxItemEventBroadcaster;
++ com::sun::star::uno::Reference< com::sun::star::lang::XComponent > mxComponent;
++ com::sun::star::uno::Reference< com::sun::star::awt::XWindow > mxWindow;
++ com::sun::star::uno::Reference< com::sun::star::awt::XWindow2 > mxWindow2;
++ com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > mxWindowPeer;
++ com::sun::star::uno::Reference< com::sun::star::awt::XVclWindowPeer > mxVclWindowPeer;
++ com::sun::star::uno::Reference< com::sun::star::awt::XLayoutConstrains > mxLayoutConstrains;
++ com::sun::star::uno::Reference< com::sun::star::awt::XView > mxView;
++ com::sun::star::uno::Reference< com::sun::star::awt::XDockableWindow > mxDockableWindow;
++ com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible > mxAccessible;
++ com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > mxEventListener;
++ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > mxPropertySetInfo;
++ com::sun::star::uno::Reference< com::sun::star::awt::XItemEventBroadcaster > mxItemEventBroadcaster;
+
+ // VCLXImageConsumer
-+ css::uno::Reference< css::awt::XImageConsumer > mxImageConsumer;
++ com::sun::star::uno::Reference< com::sun::star::awt::XImageConsumer > mxImageConsumer;
+
+ // VCLXButton
-+ css::uno::Reference< css::awt::XButton > mxButton;
-+ css::uno::Reference< css::awt::XToggleButton > mxToggleButton;
++ com::sun::star::uno::Reference< com::sun::star::awt::XButton > mxButton;
++ com::sun::star::uno::Reference< com::sun::star::awt::XToggleButton > mxToggleButton;
+
+public:
-+ VCLXProxy( css::uno::Reference< css::uno::XInterface > xObject );
++ VCLXProxy( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xObject );
+
+ // XInterface
+ virtual void SAL_CALL acquire() throw() { ::cppu::OWeakObject::acquire(); }
+ virtual void SAL_CALL release() throw() { ::cppu::OWeakObject::release(); }
-+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw (css::uno::RuntimeException);
++ virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & rType ) throw (com::sun::star::uno::RuntimeException);
+
+ // lang::XComponent
-+ virtual void SAL_CALL dispose() throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException);
++ virtual void SAL_CALL dispose() throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) throw (com::sun::star::uno::RuntimeException);
+
+ // awt::XWindowPeer
-+ virtual css::uno::Reference< css::awt::XToolkit > SAL_CALL getToolkit() throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setPointer( const css::uno::Reference< css::awt::XPointer >& Pointer ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setBackground( ::sal_Int32 Color ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL invalidate( ::sal_Int16 Flags ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL invalidateRect( const css::awt::Rectangle& Rect, ::sal_Int16 Flags ) throw (css::uno::RuntimeException);
++ virtual com::sun::star::uno::Reference< com::sun::star::awt::XToolkit > SAL_CALL getToolkit() throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setPointer( const com::sun::star::uno::Reference< com::sun::star::awt::XPointer >& Pointer ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setBackground( ::sal_Int32 Color ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL invalidate( ::sal_Int16 Flags ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL invalidateRect( const com::sun::star::awt::Rectangle& Rect, ::sal_Int16 Flags ) throw (com::sun::star::uno::RuntimeException);
+
+ // awt::XDevice
-+ virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL createGraphics() throw (css::uno::RuntimeException);
-+ virtual css::uno::Reference< css::awt::XDevice > SAL_CALL createDevice( ::sal_Int32 nWidth, ::sal_Int32 nHeight ) throw (css::uno::RuntimeException);
-+ virtual css::awt::DeviceInfo SAL_CALL getInfo() throw (css::uno::RuntimeException);
-+ virtual css::uno::Sequence< css::awt::FontDescriptor > SAL_CALL getFontDescriptors() throw (css::uno::RuntimeException);
-+ virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( const css::awt::FontDescriptor& aDescriptor ) throw (css::uno::RuntimeException);
-+ virtual css::uno::Reference< css::awt::XBitmap > SAL_CALL createBitmap( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight ) throw (css::uno::RuntimeException);
-+ virtual css::uno::Reference< css::awt::XDisplayBitmap > SAL_CALL createDisplayBitmap( const css::uno::Reference< css::awt::XBitmap >& Bitmap ) throw (css::uno::RuntimeException);
++ virtual com::sun::star::uno::Reference< com::sun::star::awt::XGraphics > SAL_CALL createGraphics() throw (com::sun::star::uno::RuntimeException);
++ virtual com::sun::star::uno::Reference< com::sun::star::awt::XDevice > SAL_CALL createDevice( ::sal_Int32 nWidth, ::sal_Int32 nHeight ) throw (com::sun::star::uno::RuntimeException);
++ virtual com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw (com::sun::star::uno::RuntimeException);
++ virtual com::sun::star::uno::Sequence< com::sun::star::awt::FontDescriptor > SAL_CALL getFontDescriptors() throw (com::sun::star::uno::RuntimeException);
++ virtual com::sun::star::uno::Reference< com::sun::star::awt::XFont > SAL_CALL getFont( const com::sun::star::awt::FontDescriptor& aDescriptor ) throw (com::sun::star::uno::RuntimeException);
++ virtual com::sun::star::uno::Reference< com::sun::star::awt::XBitmap > SAL_CALL createBitmap( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight ) throw (com::sun::star::uno::RuntimeException);
++ virtual com::sun::star::uno::Reference< com::sun::star::awt::XDisplayBitmap > SAL_CALL createDisplayBitmap( const com::sun::star::uno::Reference< com::sun::star::awt::XBitmap >& Bitmap ) throw (com::sun::star::uno::RuntimeException);
+
+ // lang::XTypeProvider
-+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException);
-+ virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException);
++ virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException);
++ virtual com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException);
+
+ // lang::XUnoTunnel
-+ virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException);
++ virtual ::sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) throw (com::sun::star::uno::RuntimeException);
+
+ // awt::XWindow2
-+ virtual void SAL_CALL setOutputSize( const css::awt::Size& aSize ) throw (css::uno::RuntimeException);
-+ virtual css::awt::Size SAL_CALL getOutputSize() throw (css::uno::RuntimeException);
-+ virtual ::sal_Bool SAL_CALL isVisible() throw (css::uno::RuntimeException);
-+ virtual ::sal_Bool SAL_CALL isActive() throw (css::uno::RuntimeException);
-+ virtual ::sal_Bool SAL_CALL isEnabled() throw (css::uno::RuntimeException);
-+ virtual ::sal_Bool SAL_CALL hasFocus() throw (css::uno::RuntimeException);
++ virtual void SAL_CALL setOutputSize( const com::sun::star::awt::Size& aSize ) throw (com::sun::star::uno::RuntimeException);
++ virtual com::sun::star::awt::Size SAL_CALL getOutputSize() throw (com::sun::star::uno::RuntimeException);
++ virtual ::sal_Bool SAL_CALL isVisible() throw (com::sun::star::uno::RuntimeException);
++ virtual ::sal_Bool SAL_CALL isActive() throw (com::sun::star::uno::RuntimeException);
++ virtual ::sal_Bool SAL_CALL isEnabled() throw (com::sun::star::uno::RuntimeException);
++ virtual ::sal_Bool SAL_CALL hasFocus() throw (com::sun::star::uno::RuntimeException);
+
+ // awt::XWindow
-+ virtual void SAL_CALL setPosSize( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int16 Flags ) throw (css::uno::RuntimeException);
-+ virtual css::awt::Rectangle SAL_CALL getPosSize() throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setVisible( ::sal_Bool Visible ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setEnable( ::sal_Bool Enable ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setFocus() throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException);
++ virtual void SAL_CALL setPosSize( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int16 Flags ) throw (com::sun::star::uno::RuntimeException);
++ virtual com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setVisible( ::sal_Bool Visible ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setEnable( ::sal_Bool Enable ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setFocus() throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addWindowListener( const com::sun::star::uno::Reference< com::sun::star::awt::XWindowListener >& xListener ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeWindowListener( const com::sun::star::uno::Reference< com::sun::star::awt::XWindowListener >& xListener ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addFocusListener( const com::sun::star::uno::Reference< com::sun::star::awt::XFocusListener >& xListener ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeFocusListener( const com::sun::star::uno::Reference< com::sun::star::awt::XFocusListener >& xListener ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addKeyListener( const com::sun::star::uno::Reference< com::sun::star::awt::XKeyListener >& xListener ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeKeyListener( const com::sun::star::uno::Reference< com::sun::star::awt::XKeyListener >& xListener ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addMouseListener( const com::sun::star::uno::Reference< com::sun::star::awt::XMouseListener >& xListener ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeMouseListener( const com::sun::star::uno::Reference< com::sun::star::awt::XMouseListener >& xListener ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addMouseMotionListener( const com::sun::star::uno::Reference< com::sun::star::awt::XMouseMotionListener >& xListener ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeMouseMotionListener( const com::sun::star::uno::Reference< com::sun::star::awt::XMouseMotionListener >& xListener ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addPaintListener( const com::sun::star::uno::Reference< com::sun::star::awt::XPaintListener >& xListener ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removePaintListener( const com::sun::star::uno::Reference< com::sun::star::awt::XPaintListener >& xListener ) throw (com::sun::star::uno::RuntimeException);
+
+ // awt::XVclWindowPeer
-+ virtual ::sal_Bool SAL_CALL isChild( const css::uno::Reference< css::awt::XWindowPeer >& Peer ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setDesignMode( ::sal_Bool bOn ) throw (css::uno::RuntimeException);
-+ virtual ::sal_Bool SAL_CALL isDesignMode() throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL enableClipSiblings( ::sal_Bool bClip ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setForeground( ::sal_Int32 Color ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setControlFont( const css::awt::FontDescriptor& aFont ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL getStyles( ::sal_Int16 nType, css::awt::FontDescriptor& Font, ::sal_Int32& ForegroundColor, ::sal_Int32& BackgroundColor ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const css::uno::Any& Value ) throw (css::uno::RuntimeException);
-+ virtual css::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw (css::uno::RuntimeException);
++ virtual ::sal_Bool SAL_CALL isChild( const com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer >& Peer ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setDesignMode( ::sal_Bool bOn ) throw (com::sun::star::uno::RuntimeException);
++ virtual ::sal_Bool SAL_CALL isDesignMode() throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL enableClipSiblings( ::sal_Bool bClip ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setForeground( ::sal_Int32 Color ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setControlFont( const com::sun::star::awt::FontDescriptor& aFont ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL getStyles( ::sal_Int16 nType, com::sun::star::awt::FontDescriptor& Font, ::sal_Int32& ForegroundColor, ::sal_Int32& BackgroundColor ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const com::sun::star::uno::Any& Value ) throw (com::sun::star::uno::RuntimeException);
++ virtual com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw (com::sun::star::uno::RuntimeException);
+
+ // awt::XLayoutConstrains
-+ virtual css::awt::Size SAL_CALL getMinimumSize() throw (css::uno::RuntimeException);
-+ virtual css::awt::Size SAL_CALL getPreferredSize() throw (css::uno::RuntimeException);
-+ virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw (css::uno::RuntimeException);
++ virtual com::sun::star::awt::Size SAL_CALL getMinimumSize() throw (com::sun::star::uno::RuntimeException);
++ virtual com::sun::star::awt::Size SAL_CALL getPreferredSize() throw (com::sun::star::uno::RuntimeException);
++ virtual com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const com::sun::star::awt::Size& aNewSize ) throw (com::sun::star::uno::RuntimeException);
+
+ // awt::XView
-+ virtual ::sal_Bool SAL_CALL setGraphics( const css::uno::Reference< css::awt::XGraphics >& aDevice ) throw (css::uno::RuntimeException);
-+ virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics() throw (css::uno::RuntimeException);
-+ virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL draw( ::sal_Int32 nX, ::sal_Int32 nY ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setZoom( float fZoomX, float fZoomY ) throw (css::uno::RuntimeException);
++ virtual ::sal_Bool SAL_CALL setGraphics( const com::sun::star::uno::Reference< com::sun::star::awt::XGraphics >& aDevice ) throw (com::sun::star::uno::RuntimeException);
++ virtual com::sun::star::uno::Reference< com::sun::star::awt::XGraphics > SAL_CALL getGraphics() throw (com::sun::star::uno::RuntimeException);
++ virtual com::sun::star::awt::Size SAL_CALL getSize() throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL draw( ::sal_Int32 nX, ::sal_Int32 nY ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setZoom( float fZoomX, float fZoomY ) throw (com::sun::star::uno::RuntimeException);
+
+ // awt::XDockableWindow
-+ virtual void SAL_CALL addDockableWindowListener( const css::uno::Reference< css::awt::XDockableWindowListener >& xListener ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL removeDockableWindowListener( const css::uno::Reference< css::awt::XDockableWindowListener >& xListener ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL enableDocking( ::sal_Bool bEnable ) throw (css::uno::RuntimeException);
-+ virtual ::sal_Bool SAL_CALL isFloating() throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setFloatingMode( ::sal_Bool bFloating ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL lock() throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL unlock() throw (css::uno::RuntimeException);
-+ virtual ::sal_Bool SAL_CALL isLocked() throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL startPopupMode( const css::awt::Rectangle& WindowRect ) throw (css::uno::RuntimeException);
-+ virtual ::sal_Bool SAL_CALL isInPopupMode() throw (css::uno::RuntimeException);
++ virtual void SAL_CALL addDockableWindowListener( const com::sun::star::uno::Reference< com::sun::star::awt::XDockableWindowListener >& xListener ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeDockableWindowListener( const com::sun::star::uno::Reference< com::sun::star::awt::XDockableWindowListener >& xListener ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL enableDocking( ::sal_Bool bEnable ) throw (com::sun::star::uno::RuntimeException);
++ virtual ::sal_Bool SAL_CALL isFloating() throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setFloatingMode( ::sal_Bool bFloating ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL lock() throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL unlock() throw (com::sun::star::uno::RuntimeException);
++ virtual ::sal_Bool SAL_CALL isLocked() throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL startPopupMode( const com::sun::star::awt::Rectangle& WindowRect ) throw (com::sun::star::uno::RuntimeException);
++ virtual ::sal_Bool SAL_CALL isInPopupMode() throw (com::sun::star::uno::RuntimeException);
+
+ // accessibility::XAccessible
-+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() throw (css::uno::RuntimeException);
++ virtual com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() throw (com::sun::star::uno::RuntimeException);
+
+ // lang::XEventListener
-+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException);
++ virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw (com::sun::star::uno::RuntimeException);
+
+ // beans::XPropertySetInfo
-+ virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() throw (css::uno::RuntimeException);
-+ virtual css::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
-+ virtual ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException);
++ virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > SAL_CALL getProperties() throw (com::sun::star::uno::RuntimeException);
++ virtual com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::uno::RuntimeException);
++ virtual ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) throw (com::sun::star::uno::RuntimeException);
+
+ // awt::XImageConsumer
-+ virtual void SAL_CALL init( ::sal_Int32 Width, ::sal_Int32 Height ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setColorModel( ::sal_Int16 BitCount, const css::uno::Sequence< ::sal_Int32 >& RGBAPal, ::sal_Int32 RedMask, ::sal_Int32 GreenMask, ::sal_Int32 BlueMask, ::sal_Int32 AlphaMask ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setPixelsByBytes( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, const css::uno::Sequence< ::sal_Int8 >& aProducerData, ::sal_Int32 nOffset, ::sal_Int32 nScanSize ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setPixelsByLongs( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, const css::uno::Sequence< ::sal_Int32 >& aProducerData, ::sal_Int32 nOffset, ::sal_Int32 nScanSize ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL complete( ::sal_Int32 Status, const css::uno::Reference< css::awt::XImageProducer >& xProducer ) throw (css::uno::RuntimeException);
++ virtual void SAL_CALL init( ::sal_Int32 Width, ::sal_Int32 Height ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setColorModel( ::sal_Int16 BitCount, const com::sun::star::uno::Sequence< ::sal_Int32 >& RGBAPal, ::sal_Int32 RedMask, ::sal_Int32 GreenMask, ::sal_Int32 BlueMask, ::sal_Int32 AlphaMask ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setPixelsByBytes( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, const com::sun::star::uno::Sequence< ::sal_Int8 >& aProducerData, ::sal_Int32 nOffset, ::sal_Int32 nScanSize ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setPixelsByLongs( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, const com::sun::star::uno::Sequence< ::sal_Int32 >& aProducerData, ::sal_Int32 nOffset, ::sal_Int32 nScanSize ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL complete( ::sal_Int32 Status, const com::sun::star::uno::Reference< com::sun::star::awt::XImageProducer >& xProducer ) throw (com::sun::star::uno::RuntimeException);
+
+ // awt::XButton
-+ virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setLabel( const ::rtl::OUString& Label ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setActionCommand( const ::rtl::OUString& Command ) throw (css::uno::RuntimeException);
++ virtual void SAL_CALL addActionListener( const com::sun::star::uno::Reference< com::sun::star::awt::XActionListener >& l ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeActionListener( const com::sun::star::uno::Reference< com::sun::star::awt::XActionListener >& l ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setLabel( const ::rtl::OUString& Label ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setActionCommand( const ::rtl::OUString& Command ) throw (com::sun::star::uno::RuntimeException);
+
+ // awt::XItemEventBroadcaster
-+ virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException);
++ virtual void SAL_CALL addItemListener( const com::sun::star::uno::Reference< com::sun::star::awt::XItemListener >& l ) throw (com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeItemListener( const com::sun::star::uno::Reference< com::sun::star::awt::XItemListener >& l ) throw (com::sun::star::uno::RuntimeException);
+};
+
+#endif // LAYOUT_AWT_VCLXPROXY_HXX
@@ -18462,7 +18428,7 @@
RCS file: toolkit/workben/layout/makefile.mk
diff -N toolkit/workben/layout/makefile.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ toolkit/workben/layout/makefile.mk 14 Feb 2008 15:26:29 -0000 1.1.2.4
++++ toolkit/workben/layout/makefile.mk 18 Feb 2008 15:23:56 -0000 1.1.2.5
@@ -0,0 +1,95 @@
+PRJ=../..
+PRJNAME=toolkit
@@ -22846,8 +22812,8 @@
RCS file: toolkit/workben/layout/test.cxx
diff -N toolkit/workben/layout/test.cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ toolkit/workben/layout/test.cxx 12 Feb 2008 11:05:47 -0000 1.1.2.2
-@@ -0,0 +1,296 @@
++++ toolkit/workben/layout/test.cxx 19 Feb 2008 09:58:53 -0000 1.1.2.3
+@@ -0,0 +1,286 @@
+#include <vcl/svapp.hxx>
+//#include <transex3/vosapp.hxx>
+
@@ -22917,7 +22883,7 @@
+
+class LayoutTest : public Application
+{
-+ Reference< XComponentContext > mxContext;
++ Reference< XComponentContext > mxContext;
+ Reference< lang::XMultiServiceFactory > mxMSF;
+ OUString mInstallDir;
+ OUString mTestDialog;
@@ -22930,7 +22896,7 @@
+ void RunEditor();
+ void RunFiles();
+ void ExceptionalMain();
-+ void Init();
++ void IInit();
+ void InitUCB();
+ void LoadFile( OUString const &aName );
+ void Main();
@@ -23000,10 +22966,9 @@
+ + OUStringToOString( installDir, RTL_TEXTENCODING_UTF8 ); \
+ putenv( (char *)aBaseInst.getStr() ); \
+
-+void LayoutTest::Init()
++void LayoutTest::IInit()
+{
+ INIT_ENV_VOODOO( mInstallDir );
-+
+ mxContext = createInitialComponentContext( mInstallDir );
+ mxMSF = new UnoBootstrapLayout( Reference< lang::XMultiServiceFactory >( mxContext->getServiceManager(), UNO_QUERY ) );
+ ::comphelper::setProcessServiceFactory( mxMSF );
@@ -23086,7 +23051,7 @@
+void LayoutTest::ExceptionalMain()
+{
+ ParseCommandLine();
-+ Init();
++ IInit();
+ INIT_ENV_VOODOO( mInstallDir );
+
+ if ( mTestDialog.getLength() )
@@ -23134,16 +23099,7 @@
+{
+}
+
-+#if 0
-+SAL_IMPLEMENT_MAIN()
-+{
-+ LayoutTest lt( "/usr/local/lib/ooo" );
-+ lt.Main();
-+ return 0;
-+}
-+#else
+LayoutTest lt( "/usr/local/lib/ooo" );
-+#endif
Index: toolkit/workben/layout/test.xml
===================================================================
RCS file: toolkit/workben/layout/test.xml
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
