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

[Tor Lillqvist]

 patches/dev300/calc-perf-speedup-pagebreak-update.diff |    3 ++-
 patches/dev300/mail-document-subject.diff              |    3 ++-
 patches/vba/vba-container-controls.diff                |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 6518c657bbfb6c37c8737b74fcf2ad08bbd493f3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 3 21:33:29 2010 +0200

    Defuzz three more patch hunks
    
    There must be an equal number of context lines at the start and end of
    a hunk.

diff --git a/patches/dev300/calc-perf-speedup-pagebreak-update.diff b/patches/dev300/calc-perf-speedup-pagebreak-update.diff
index fddffec..34b43ce 100644
--- a/patches/dev300/calc-perf-speedup-pagebreak-update.diff
+++ b/patches/dev300/calc-perf-speedup-pagebreak-update.diff
@@ -910,7 +910,8 @@ index 789de6d..56c7f49 100644
  
                  /*  #i94028# #i94991# If drawing objects are involved, each row
                      has to be changed for its own, because each call to
-@@ -2143,11 +2170,11 @@ BOOL ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeig
+@@ -2143,12 +2170,12 @@ BOOL ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeig
+                     for( SCROW nRow = nStartRow; nRow <= nEndRow ; ++nRow )
                      {
                          pDrawLayer->HeightChanged( nTab, nRow,
 -                             ((long) nNewHeight) - ((long) pRowHeight->GetValue( nRow )));
diff --git a/patches/dev300/mail-document-subject.diff b/patches/dev300/mail-document-subject.diff
index 90cb404..b4ea303 100644
--- a/patches/dev300/mail-document-subject.diff
+++ b/patches/dev300/mail-document-subject.diff
@@ -30,7 +30,8 @@
  #include "simplemapi.hxx"
  
  #define WIN32_LEAN_AND_MEAN
-@@ -175,6 +175,16 @@
+@@ -175,7 +175,17 @@
+ {
      ZeroMemory(pMapiMessage, sizeof(MapiMessage));
               
 -    pMapiMessage->lpszSubject = const_cast<char*>(gSubject.c_str());   
diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index f997e6a..618dddc 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -114,7 +114,8 @@ diff --git extensions/source/propctrlr/formcomponenthandler.cxx extensions/sourc
 index b12854b..b34807f 100644
 --- extensions/source/propctrlr/formcomponenthandler.cxx
 +++ extensions/source/propctrlr/formcomponenthandler.cxx
-@@ -2765,7 +2765,8 @@ namespace pcr
+@@ -2765,8 +2765,9 @@ namespace pcr
+ 
          aFileDlg.SetTitle(aStrTrans);
          // non-linked images ( e.g. those located in the document 
 -        // stream ) cannot *currently* be handled by openoffice basic dialogs.