[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - patches/dev300 patches/vba

[Tor Lillqvist]

 patches/dev300/optional-outplace-ole.diff   |    7 ++++---
 patches/vba/vba-msvbahelper-splitbuilt.diff |    5 ++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 6ac385c6e1b579636e7d3f445f7685b072933b3b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Nov 2 15:21:53 2010 +0200

    Make optional-outplace-ole.diff apply again

diff --git a/patches/dev300/optional-outplace-ole.diff b/patches/dev300/optional-outplace-ole.diff
index 5bbdd78..e8115c0 100644
--- a/patches/dev300/optional-outplace-ole.diff
+++ b/patches/dev300/optional-outplace-ole.diff
@@ -2262,15 +2262,16 @@ diff --git sw/inc/cmdid.h sw/inc/cmdid.h
 index cb3a5bc..5c59f70 100644
 --- sw/inc/cmdid.h
 +++ sw/inc/cmdid.h
-@@ -1258,6 +1258,8 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
+@@ -1258,6 +1258,9 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
+ #define FN_UNO_TITLE                    (FN_FRAME + 19)
  #define FN_UNO_DESCRIPTION              (FN_FRAME + 20)
- // <--
  
 +#define FN_INPLACE_OLE                  (FN_FRAME + 19)
 +#define FN_OUTPLACE_OLE                 (FN_FRAME + 20)
- 
++
  //Member-Ids fuer Fill/SetVariable an Items
  #define 		MID_STYLE	    0xe0
+ #define 		MID_PWIDTH      0xe1
 diff --git sw/sdi/_frmsh.sdi sw/sdi/_frmsh.sdi
 index 82d6aff..e20e6b3 100644
 --- sw/sdi/_frmsh.sdi
commit 5b1415d92b28019a012c488a236d4dfce30f9e27
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Nov 2 14:33:58 2010 +0200

    Make vba-msvbahelper-splitbuilt.diff unapply cleanly
    
    Remove all of filter/inc/filter/msfilter/msvbahelper.hxx in the patch,
    also the Emacs and Vim mode lines.

diff --git a/patches/vba/vba-msvbahelper-splitbuilt.diff b/patches/vba/vba-msvbahelper-splitbuilt.diff
index 082daa4..e381984 100644
--- a/patches/vba/vba-msvbahelper-splitbuilt.diff
+++ b/patches/vba/vba-msvbahelper-splitbuilt.diff
@@ -3,7 +3,8 @@ deleted file mode 100644
 index 1623fd3..0000000
 --- filter/inc/filter/msfilter/msvbahelper.hxx
 +++ /dev/null
-@@ -1,56 +0,0 @@
+@@ -1,59 +0,0 @@
+-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*************************************************************************
 - *
 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,6 +61,8 @@ index 1623fd3..0000000
 -} }
 -
 -#endif
+-
+-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git filter/source/msfilter/makefile.mk filter/source/msfilter/makefile.mk
 index c59a126..b37dc7b 100644
 --- filter/source/msfilter/makefile.mk