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

Thu Aug 13 05:18:09 PDT 2009

patches/dev300/autocorrect-accidental-caps-lock-vcl.diff |   22 ++++++---------
 patches/dev300/statusbar-fancy-modified-status-sw.diff   |   12 ++------
 2 files changed, 13 insertions(+), 21 deletions(-)

New commits:
commit 5836cf89dfc3b54249e4b32aae7aeebbb0f5d687
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 13 15:16:18 2009 +0300

    Adapt statusbar-fancy-modified-status-sw.diff for dev300-m54
    
    * patches/dev300/statusbar-fancy-modified-status-sw.diff: Adapt for
      dev300-m54.

diff --git a/patches/dev300/statusbar-fancy-modified-status-sw.diff b/patches/dev300/statusbar-fancy-modified-status-sw.diff
index fb1dd5b..7bfa7e5 100644
--- a/patches/dev300/statusbar-fancy-modified-status-sw.diff
+++ b/patches/dev300/statusbar-fancy-modified-status-sw.diff
@@ -44,32 +44,28 @@ index 24ec903..f688036 100644
   <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
   <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129" statusbar:helpid="helpid:10224"/>
   <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130" statusbar:helpid="helpid:11065"/>
-diff --git sw/uiconfig/swform/statusbar/statusbar.xml sw/uiconfig/swform/statusbar/statusbar.xml
-index 58d7b18..5f9150d 100644
 --- sw/uiconfig/swform/statusbar/statusbar.xml
 +++ sw/uiconfig/swform/statusbar/statusbar.xml
 @@ -7,7 +7,7 @@
+  <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100" />
   <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="37" statusbar:helpid="helpid:10221"/>
   <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:width="30" statusbar:helpid="helpid:21185"/>
-  <statusbar:statusbaritem xlink:href=".uno:ExecHyperlinks" statusbar:align="center" statusbar:width="22" statusbar:helpid="helpid:21186"/>
 - <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="9" statusbar:helpid="helpid:5584"/>
 + <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="9" statusbar:helpid="helpid:5584"/>
   <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
   <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129" statusbar:helpid="helpid:10224"/>
- </statusbar:statusbar>
-diff --git sw/uiconfig/swreport/statusbar/statusbar.xml sw/uiconfig/swreport/statusbar/statusbar.xml
-index 58d7b18..5f9150d 100644
+  <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130" statusbar:helpid="helpid:11065"/>
 --- sw/uiconfig/swreport/statusbar/statusbar.xml
 +++ sw/uiconfig/swreport/statusbar/statusbar.xml
 @@ -7,7 +7,7 @@
+  <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100" />
   <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="37" statusbar:helpid="helpid:10221"/>
   <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:width="30" statusbar:helpid="helpid:21185"/>
-  <statusbar:statusbaritem xlink:href=".uno:ExecHyperlinks" statusbar:align="center" statusbar:width="22" statusbar:helpid="helpid:21186"/>
 - <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="9" statusbar:helpid="helpid:5584"/>
 + <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="9" statusbar:helpid="helpid:5584"/>
   <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
   <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129" statusbar:helpid="helpid:10224"/>
- </statusbar:statusbar>
+  <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130" statusbar:helpid="helpid:11065"/>
 diff --git sw/uiconfig/swriter/statusbar/statusbar.xml sw/uiconfig/swriter/statusbar/statusbar.xml
 index ed69b12..3e46300 100644
 --- sw/uiconfig/swriter/statusbar/statusbar.xml
commit 1e01b4999dc657fc3e6fb76d4107eed488d8ef98
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 13 15:11:36 2009 +0300

    Adapt autocorrect-accidental-caps-lock-vcl.diff for dev300-m54
    
    * patches/dev300/autocorrect-accidental-caps-lock-vcl.diff: Adapt for
      dev300-m54.

diff --git a/patches/dev300/autocorrect-accidental-caps-lock-vcl.diff b/patches/dev300/autocorrect-accidental-caps-lock-vcl.diff
index ea327bd..4ed4c76 100644
--- a/patches/dev300/autocorrect-accidental-caps-lock-vcl.diff
+++ b/patches/dev300/autocorrect-accidental-caps-lock-vcl.diff
@@ -31,13 +31,11 @@ diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=vcl.vpj vcl.clean/aqua/
  bool AquaSalFrame::SetPluginParent( SystemParentData* pNewParent )
  {
      // plugin parent may be killed unexpectedly by
-Only in vcl: Debug
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=vcl.vpj vcl.clean/inc/vcl/keycodes.hxx vcl/inc/vcl/keycodes.hxx
---- vcl.clean/inc/vcl/keycodes.hxx	2008-01-14 11:20:04.000000000 -0500
-+++ vcl/inc/vcl/keycodes.hxx	2008-02-28 14:28:37.000000000 -0500
+--- vcl/inc/vcl/keycodes.hxx
++++ vcl/inc/vcl/keycodes.hxx
 @@ -171,6 +171,10 @@
- #define KEY_TILDE       ((USHORT)::com::sun::star::awt::Key::TILDE)
- #define KEY_QUOTELEFT   ((USHORT)::com::sun::star::awt::Key::QUOTELEFT)
+ #define KEY_BRACKETLEFT ((USHORT)::com::sun::star::awt::Key::BRACKETLEFT)
+ #define KEY_BRACKETRIGHT ((USHORT)::com::sun::star::awt::Key::BRACKETRIGHT)
  
 +#define KEY_CAPSLOCK    ((USHORT)::com::sun::star::awt::Key::CAPSLOCK)
 +#define KEY_NUMLOCK     ((USHORT)::com::sun::star::awt::Key::NUMLOCK)
@@ -228,9 +226,8 @@ diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=vcl.vpj vcl.clean/unx/i
      // set new parent window
      virtual void                SetParent( SalFrame* pNewParent );
      // reparent window to act as a plugin; implementation
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=vcl.vpj vcl.clean/unx/inc/prex.h vcl/unx/inc/prex.h
---- vcl.clean/unx/inc/prex.h	2007-04-26 06:40:23.000000000 -0400
-+++ vcl/unx/inc/prex.h	2008-02-29 09:50:58.000000000 -0500
+--- tools/inc/tools/prex.h
++++ tools/inc/tools/prex.h
 @@ -64,6 +64,12 @@ extern "C" {
  #define __XKeyboardExtension__ 0
  #endif
@@ -268,9 +265,8 @@ diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=vcl.vpj vcl.clean/unx/i
      virtual void				SetParent( SalFrame* pNewParent );
      virtual bool				SetPluginParent( SystemParentData* pNewParent );
      virtual void                SetBackgroundBitmap( SalBitmap* pBitmap );
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=vcl.vpj vcl.clean/unx/source/app/saldisp.cxx vcl/unx/source/app/saldisp.cxx
---- vcl.clean/unx/source/app/saldisp.cxx	2008-01-29 11:22:34.000000000 -0500
-+++ vcl/unx/source/app/saldisp.cxx	2008-03-01 22:26:55.000000000 -0500
+--- vcl/unx/source/app/saldisp.cxx
++++ vcl/unx/source/app/saldisp.cxx
 @@ -86,6 +86,12 @@ Status XineramaGetInfo(Display*, int, XR
  #endif
  #endif
@@ -281,7 +277,7 @@ diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=vcl.vpj vcl.clean/unx/s
 +#include <X11/XKBlib.h>
 +#endif
 +
- #include <postx.h>
+ #include <tools/postx.h>
  
  #include <salunx.h>
 @@ -1074,6 +1078,35 @@ void SalDisplay::Beep() const
