[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/svx-ooo320-backports.diff |   19 -------------------
 1 file changed, 19 deletions(-)

New commits:
commit 962588f321d3527b2bccf94b4eafb0a35e50d73a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 14 12:54:34 2009 +0300

    svx-ooo320-backports.diff is partially upstream
    
    * patches/dev300/svx-ooo320-backports.diff: Change to
      svx/source/mnuctrls/clipboardctl.cxx is in dev300-m54.

diff --git a/patches/dev300/svx-ooo320-backports.diff b/patches/dev300/svx-ooo320-backports.diff
index ff97e9f..a825727 100644
--- a/patches/dev300/svx-ooo320-backports.diff
+++ b/patches/dev300/svx-ooo320-backports.diff
@@ -1,22 +1,3 @@
---- svx/source/mnuctrls/clipboardctl.cxx	2009-04-02 13:03:32.000000000 +0200
-+++ svx/source/mnuctrls/clipboardctl.cxx	2009-03-25 18:33:18.000000000 +0100
-@@ -143,6 +143,16 @@
-             GetToolBox().SetItemBits( GetId(), GetToolBox().GetItemBits( GetId() ) & ~TIB_DROPDOWN );
-         GetToolBox().Invalidate( GetToolBox().GetItemRect( GetId() ) );
-     }
-+    #ifdef UNIX
-+    // #b6673979# enable some slots hardly, because UNIX clipboard does not notify all changes
-+    // Can be removed if follow up task will be fixed directly within applications.
-+    else
-+    if ( SID_PASTE == nSID )
-+    {
-+        bDisabled = false;
-+        GetToolBox().EnableItem( GetId(), true );
-+    }
-+    #endif
-     else
-     {
-         // enable the item as a whole
 --- svx/source/svdraw/svdotextdecomposition.cxx	2009-04-02 13:03:00.000000000 +0200
 +++ svx/source/svdraw/svdotextdecomposition.cxx	2009-03-25 18:32:48.000000000 +0100
 @@ -206,11 +206,7 @@