[Libreoffice-commits] .: patches/vba

[Tor Lillqvist]

 patches/vba/vba-container-controls.diff |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit ee26034ddd86cc436c21f20ab91b1ad49d957a24
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Oct 15 11:24:35 2010 +0300

    Make vba-container-controls.diff apply again

diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index 1ff9689..197ea59 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -2011,7 +2011,7 @@ index a1725f2..f13a018 100644
  
      // XModifyListener
      virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
-@@ -316,11 +344,151 @@ public:
+@@ -316,13 +344,153 @@ public:
  protected:
      virtual void ImplModelPropertiesChanged( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& rEvents ) throw(::com::sun::star::uno::RuntimeException);
      virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc );
@@ -2165,6 +2165,8 @@ index a1725f2..f13a018 100644
 +};
 +
  #endif // TOOLKIT_DIALOG_CONTROL_HXX
+ 
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git toolkit/inc/toolkit/controls/unocontrolcontainer.hxx toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
 index d85d3f0..d59825e 100644
 --- toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
@@ -2857,7 +2859,7 @@ index 1e1aa1d..9597a20 100644
  //	----------------------------------------------------
  //  class VCLXFixedHyperlink
  //	----------------------------------------------------
-@@ -6183,4 +6499,98 @@ VCLXToolBox::~VCLXToolBox()
+@@ -6183,5 +6499,99 @@ VCLXToolBox::~VCLXToolBox()
  {
      return getAccessibleFactory().createAccessibleContext( this );
  }
@@ -2956,6 +2958,7 @@ index 1e1aa1d..9597a20 100644
 +    VCLXContainer::ProcessWindowEvent( rVclWindowEvent );
 +}
  
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git toolkit/source/controls/dialogcontrol.cxx toolkit/source/controls/dialogcontrol.cxx
 index 1fe21d2..b5d4679 100644
 --- toolkit/source/controls/dialogcontrol.cxx