[ooo-build-commit] .: patches/dev300 patches/vba

[Noel Power]

 patches/dev300/apply                                |    2 
 patches/vba/fix-containercontrols-wizardresize.diff |   69 ++++++++++++++++++++
 2 files changed, 71 insertions(+)

New commits:
commit 82bf79a9815ce0be538047d3f4b3e3f1c3b087f0
Author: Noel Power <noel.power at novell.com>
Date:   Thu Apr 8 13:41:36 2010 +0100

    fix for n#591768, strange wizard size truncation problem
    
    * patches/dev300/apply:
    * patches/vba/fix-containercontrols-wizardresize.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8e73909..6c57473 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1842,6 +1842,8 @@ vba-ctb-fix-looponload.diff, n#589794, n#590359
 # import vba project from xlsm document ( experimental )
 # FATE # 309162
 vba-import-xlsm.diff
+# fix weird wizard truncation
+fix-containercontrols-wizardresize.diff, n#591768
 
 [ VBAUntested ]
 SectionOwner => noelpwer
diff --git a/patches/vba/fix-containercontrols-wizardresize.diff b/patches/vba/fix-containercontrols-wizardresize.diff
new file mode 100644
index 0000000..ceadf57
--- /dev/null
+++ b/patches/vba/fix-containercontrols-wizardresize.diff
@@ -0,0 +1,69 @@
+diff --git toolkit/inc/toolkit/controls/dialogcontrol.hxx toolkit/inc/toolkit/controls/dialogcontrol.hxx
+index 9ae8442..13ccc1a 100644
+--- toolkit/inc/toolkit/controls/dialogcontrol.hxx
++++ toolkit/inc/toolkit/controls/dialogcontrol.hxx
+@@ -233,6 +233,8 @@ typedef ::cppu::ImplHelper2	< ::com::sun::star::container::XContainerListener
+ class UnoDialogContainerControl : public UnoControlContainer, public UnoDialogContainerControl_IBase
+ {
+ protected:
++    bool                                                                        mbSizeModified;
++    bool                                                                        mbPosModified;
+     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >	mxTabController;
+     void		ImplInsertControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel, const ::rtl::OUString& rName );
+     void		ImplRemoveControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel );
+@@ -283,8 +285,6 @@ private:
+     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar >			mxMenuBar;
+     TopWindowListenerMultiplexer	                                            maTopWindowListeners;
+     bool                                                                        mbWindowListener;
+-    bool                                                                        mbSizeModified;
+-    bool                                                                        mbPosModified;
+     ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj;
+     ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > mxListener;
+  
+diff --git toolkit/source/controls/dialogcontrol.cxx toolkit/source/controls/dialogcontrol.cxx
+index e9f24e6..92d510d 100644
+--- toolkit/source/controls/dialogcontrol.cxx
++++ toolkit/source/controls/dialogcontrol.cxx
+@@ -2181,7 +2181,9 @@ uno::Reference< beans::XPropertySetInfo > UnoFrameModel::getPropertySetInfo(  )
+ //	----------------------------------------------------
+ //	class DialogContainerControl
+ //	----------------------------------------------------
+-UnoDialogContainerControl::UnoDialogContainerControl()
++UnoDialogContainerControl::UnoDialogContainerControl() :
++    mbSizeModified(false),
++    mbPosModified(false)
+ {
+ 	maComponentInfos.nWidth = 280;
+ 	maComponentInfos.nHeight = 400;
+@@ -2254,7 +2256,6 @@ void UnoDialogContainerControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
+     xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PositionY" ) ) ) >>= nY;
+     xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) ) >>= nWidth;
+     xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) >>= nHeight;
+-
+ 	MapMode aMode( MAP_APPFONT );
+ 	sal_Bool bVBAForm = sal_False;
+ 	Reference< XPropertySet > xDlgModelProps( getModel(), UNO_QUERY );
+@@ -2484,9 +2485,12 @@ void UnoDialogContainerControl::ImplModelPropertiesChanged( const Sequence< Prop
+             {
+                 if ( bOwnModel )
+                 {
++                    if ( !mbPosModified && !mbSizeModified )
++                    {
+                         // Don't set new pos/size if we get new values from window listener
+                         Reference< XControl > xThis( (XAggregation*)(::cppu::OWeakAggObject*)this, UNO_QUERY );
+                         ImplSetPosSize( xThis );
++                    }
+                 }
+                 else
+                 {
+@@ -2554,9 +2558,7 @@ void SAL_CALL UnoDialogContainerControl::changesOccurred( const ChangesEvent& )
+ 
+ UnoDialogControl::UnoDialogControl() :
+     maTopWindowListeners( *this ),
+-    mbWindowListener(false),
+-    mbSizeModified(false),
+-    mbPosModified(false)
++    mbWindowListener(false)
+ {
+     maComponentInfos.nWidth = 300;
+     maComponentInfos.nHeight = 450;