[ooo-build-commit] .: 2 commits - patches/dev300

[Fridrich Strba]

 patches/dev300/cws-koheicopyborder-sc.diff              |    6 +++---
 patches/dev300/statusbar-fancy-modified-status-svx.diff |    6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 23c89a1dfa60ff6dcc2426d52ccda944bc5b1e99
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Sep 16 13:05:20 2010 +0200

    statusbar-fancy-modified-status-svx.diff: Massage to apply

diff --git a/patches/dev300/statusbar-fancy-modified-status-svx.diff b/patches/dev300/statusbar-fancy-modified-status-svx.diff
index f3a9b5d..debe89e 100644
--- a/patches/dev300/statusbar-fancy-modified-status-svx.diff
+++ b/patches/dev300/statusbar-fancy-modified-status-svx.diff
@@ -47,14 +47,16 @@ diff --git svx/inc/svx/dialogs.hrc svx/inc/svx/dialogs.hrc
 index cb56b02..67df9fa 100755
 --- svx/inc/svx/dialogs.hrc
 +++ svx/inc/svx/dialogs.hrc
-@@ -1059,3 +1059,7 @@
- #endif
+@@ -1059,5 +1059,9 @@
+ #define SVX_OOO_BUILD_START             (RID_SVX_START + 1200)
  
  #define SID_SC_TP_FORMULA               (SVX_OOO_BUILD_START + 1)
 +#define RID_SVXBMP_DOC_MODIFIED_YES     (SVX_OOO_BUILD_START + 2)
 +#define RID_SVXBMP_DOC_MODIFIED_NO      (SVX_OOO_BUILD_START + 3)
 +#define RID_SVXSTR_DOC_MODIFIED_YES     (SVX_OOO_BUILD_START + 4)
 +#define RID_SVXSTR_DOC_MODIFIED_NO      (SVX_OOO_BUILD_START + 5)
+ 
+ #endif
 diff --git svx/source/stbctrls/makefile.mk svx/source/stbctrls/makefile.mk
 index 4e125ad..0cd8594 100644
 --- svx/source/stbctrls/makefile.mk
commit 8dc92e398e9afab16bb3b831e25924213e3e07a9
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Sep 16 13:04:49 2010 +0200

    cws-koheicopyborder-sc.diff: Massage to apply

diff --git a/patches/dev300/cws-koheicopyborder-sc.diff b/patches/dev300/cws-koheicopyborder-sc.diff
index 8955417..e2ddd1c 100644
--- a/patches/dev300/cws-koheicopyborder-sc.diff
+++ b/patches/dev300/cws-koheicopyborder-sc.diff
@@ -397,7 +397,7 @@ index feeacc8..129f4a7 100644
 +        $(SLO)$/overlayobject.obj \
          $(SLO)$/gridmerg.obj \
          $(SLO)$/invmerge.obj \
-         $(SLO)$/select.obj \
+         $(SLO)$/cellmergeoption.obj \
 @@ -147,6 +148,7 @@ EXCEPTIONSFILES= \
      $(SLO)$/gridwin.obj \
      $(SLO)$/invmerge.obj \
@@ -520,8 +520,8 @@ diff --git sc/source/ui/view/tabview2.cxx sc/source/ui/view/tabview2.cxx
 index 27c0f7d..fa99268 100644
 --- sc/source/ui/view/tabview2.cxx
 +++ sc/source/ui/view/tabview2.cxx
-@@ -411,6 +411,13 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
-         aHdrFunc.SetAnchorFlag( FALSE );
+@@ -703,6 +703,13 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
+     ExpandBlock(nAreaX, nAreaY, eMode);
  }
  
 +void ScTabView::UpdateCopySourceOverlay()