[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/optional-outplace-ole.diff |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

New commits:
commit f86ef4c3de87a018555940ddc03b883a13255a5f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 14 12:19:30 2009 +0300

    Adapt optional-outplace-ole.diff for dev300-m54
    
    * patches/dev300/optional-outplace-ole.diff: Adapt for dev300-m54.

diff --git a/patches/dev300/optional-outplace-ole.diff b/patches/dev300/optional-outplace-ole.diff
index ea33f40..133b40c 100644
--- a/patches/dev300/optional-outplace-ole.diff
+++ b/patches/dev300/optional-outplace-ole.diff
@@ -260,23 +260,23 @@
  }
  
  //------------------------------------------------------------------
---- sd/inc/app.hrc.old	2009-04-06 16:42:18.000000000 +0000
-+++ sd/inc/app.hrc	2009-04-06 16:42:20.000000000 +0000
+--- sd/inc/app.hrc
++++ sd/inc/app.hrc
 @@ -460,11 +460,13 @@
- #define SID_DISPLAY_MASTER_OBJECTS          (SID_SD_START+437)
  #define SID_INSERTPAGE_LAYOUT_MENU          (SID_SD_START+438)
- #define SID_OUTLINE_TEXT_AUTOFIT            (SID_SD_START+439)
-+#define SID_INPLACE_OBJECT				    (SID_SD_START+440)
-+#define SID_OUTPLACE_OBJECT				(SID_SD_START+441)
+ #define SID_TP_EDIT_MASTER					(SID_SD_START+439)
+ #define SID_OUTLINE_TEXT_AUTOFIT            (SID_SD_START+440)
++#define SID_INPLACE_OBJECT				    (SID_SD_START+441)
++#define SID_OUTPLACE_OBJECT				(SID_SD_START+442)
  
  // Add companion for the SID_HIDE_SLIDE (that is defined in svx)
--#define SID_SHOW_SLIDE                      (SID_SD_START+440)
-+#define SID_SHOW_SLIDE                      (SID_SD_START+442)
+-#define SID_SHOW_SLIDE                      (SID_SD_START+441)
++#define SID_SHOW_SLIDE                      (SID_SD_START+443)
  
--#define SID_ADD_MOTION_PATH					(SID_SD_START+441)
--#define SID_TABLE_TOOLBOX					(SID_SD_START+442)
-+#define SID_ADD_MOTION_PATH					(SID_SD_START+443)
-+#define SID_TABLE_TOOLBOX					(SID_SD_START+444)
+-#define SID_ADD_MOTION_PATH					(SID_SD_START+442)
+-#define SID_TABLE_TOOLBOX					(SID_SD_START+443)
++#define SID_ADD_MOTION_PATH					(SID_SD_START+444)
++#define SID_TABLE_TOOLBOX					(SID_SD_START+445)
  
  #endif
 --- sd/sdi/_drvwsh.sdi.old	2009-04-06 16:42:18.000000000 +0000
@@ -540,13 +540,13 @@
  				{
  					Rectangle aVisArea( GetVisArea() );
  					aVisArea.nBottom = nHeight + aVisArea.nTop - 1;
---- sfx2/source/view/topfrm.cxx.old	2009-04-02 10:44:00.000000000 +0000
-+++ sfx2/source/view/topfrm.cxx	2009-04-06 16:42:20.000000000 +0000
+--- sfx2/source/view/topfrm.cxx
++++ sfx2/source/view/topfrm.cxx
 @@ -963,7 +963,7 @@ sal_Bool SfxTopFrame::InsertDocument( Sf
  
      if ( !pImp->bHidden )
  	{
--        if ( pDoc->IsHelpDocument() || pPluginItem && pPluginItem->GetValue() == 2 )
+-        if ( pDoc->IsHelpDocument() || (pPluginItem && pPluginItem->GetValue() == 2) )
 +        if ( pDoc->IsHelpDocument() )
              pFrame->GetDispatcher()->HideUI( TRUE );
          else