[Libreoffice-commits] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/optional-outplace-ole.diff |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit d83c71f6bf8846f32b82334b74e1064487207259
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Nov 3 08:42:26 2010 +0200

    Make optional-outplace-ole.diff apply again
    
    For some reason this had been reverted, why? As far as I can see the
    change to the diff for sw/inc/cmdid.h is needed, In git a meaningless
    // <-- comment in that file has been cleaned away.

diff --git a/patches/dev300/optional-outplace-ole.diff b/patches/dev300/optional-outplace-ole.diff
index b1c62bb..d12017d 100644
--- a/patches/dev300/optional-outplace-ole.diff
+++ b/patches/dev300/optional-outplace-ole.diff
@@ -2260,15 +2260,16 @@ index 0000000..4f19337
 +}
 --- sw/inc/cmdid.h.old	2010-11-02 16:47:34.000000000 +0100
 +++ sw/inc/cmdid.h	2010-11-02 17:12:51.000000000 +0100
-@@ -1262,6 +1262,8 @@ Achtung: Ab sofort sind in diesem File k
+@@ -1262,6 +1262,9 @@ Achtung: Ab sofort sind in diesem File k
+ #define FN_UNO_TITLE                    (FN_FRAME + 19)
  #define FN_UNO_DESCRIPTION              (FN_FRAME + 20)
- // <--
  
 +#define FN_INPLACE_OLE                  (FN_FRAME + 21) 
 +#define FN_OUTPLACE_OLE                 (FN_FRAME + 22) 
- 
++ 
  //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