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

[Kohei Yoshida]

 patches/dev300/unxsplash-rework.diff   |    9 +++------
 patches/dev300/ww8-image-position.diff |    2 +-
 patches/vba/cws-vbasupportdev300.diff  |    2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 4dacd024468bcac6d6bfeceada7f71d4e55187ef
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Oct 4 14:07:50 2010 -0400

    Massaged patches to get them to apply again.

diff --git a/patches/dev300/unxsplash-rework.diff b/patches/dev300/unxsplash-rework.diff
index ad65190..e72dce7 100644
--- a/patches/dev300/unxsplash-rework.diff
+++ b/patches/dev300/unxsplash-rework.diff
@@ -2354,8 +2354,8 @@ diff --git vcl/source/window/window.cxx vcl/source/window/window.cxx
 index cf2a83f..fcad734 100644
 --- vcl/source/window/window.cxx
 +++ vcl/source/window/window.cxx
-@@ -6580,10 +6580,19 @@ void Window::Show( BOOL bVisible, USHORT nFlags )
-             mpWindowImpl->mpBorderWindow->Show( TRUE, nFlags );
+@@ -6589,10 +6589,19 @@ void Window::Show( BOOL bVisible, USHORT nFlags )
+             mpWindowImpl->mpBorderWindow->Show( true, nFlags );
          else if ( mpWindowImpl->mbFrame )
          {
 -            ImplSVData* pSVData = ImplGetSVData();
@@ -2372,10 +2372,7 @@ index cf2a83f..fcad734 100644
 +                // ... but the VCL splash is broken, and it needs this
 +                // (for ./soffice slot:5500)
                  pSVData->mpIntroWindow->Hide();
-+            }
++	    }
  
              //DBG_ASSERT( !mpWindowImpl->mbSuppressAccessibilityEvents, "Window::Show() - Frame reactivated");
              mpWindowImpl->mbSuppressAccessibilityEvents = FALSE;
--- 
-1.7.0.1
-
diff --git a/patches/dev300/ww8-image-position.diff b/patches/dev300/ww8-image-position.diff
index 30b708b..0baba71 100644
--- a/patches/dev300/ww8-image-position.diff
+++ b/patches/dev300/ww8-image-position.diff
@@ -116,7 +116,7 @@ index c9fece2..48309b1 100644
 +        delete pYRelTo;
  }
  
- /* vi:set tabstop=4 shiftwidth=4 expandtab: */
+ void SvxMSDffManager::insertShapeId( sal_Int32 nShapeId, SdrObject* pShape )
 diff --git sw/source/filter/ww8/ww8graf.cxx sw/source/filter/ww8/ww8graf.cxx
 index 6a70ac1..648f558 100644
 --- sw/source/filter/ww8/ww8graf.cxx
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index acbba42..5ebe0d9 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -41354,7 +41354,7 @@ index 4707b4a..8bf8307 100644
 +    return pImp->IsFlag( FILTERCFG_WORD_WBCTBL );
 +}
 +
- void SvtFilterOptions::SetLoadWordBasicStorage( BOOL bFlag )
+ void SvtFilterOptions::SetLoadWordBasicStorage( sal_Bool bFlag )
  {
      pImp->SetFlag( FILTERCFG_WORD_STORAGE, bFlag );
 diff --git vbahelper/inc/vbahelper/vbaaccesshelper.hxx vbahelper/inc/vbahelper/vbaaccesshelper.hxx