[Libreoffice-commits] .: patches/dev300

[Noel Power]

 patches/dev300/apply                                     |    3 ++-
 patches/dev300/netbook-window-decoration-update.diff     |    4 +++-
 patches/dev300/size-sal-textenc.diff                     |    4 +++-
 patches/dev300/vcl-netbook-export-small-screen-mode.diff |    4 +++-
 4 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit ed548761a3cc76eb23d3919afbcba02f582d0dd7
Author: Noel Power <noel.power at novell.com>
Date:   Mon Oct 18 11:43:32 2010 +0100

    keep patches applying

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 618918e..214b06c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1498,7 +1498,8 @@ sdbc-postgresql-config_office.diff
 # FIXME dev300-m77 kde4_vcl_fixes2.diff #disabled
 
 # Fix qt/qt4 moc detection
-qt-moc-detect.diff
+# FIXME ooo300-m11 qt-moc-detect.diff #disabled
+#qt-moc-detect.diff
 
 [ KDE4Experimental ]
 # Not yet ported to co-exist with the KDE3 stuff
diff --git a/patches/dev300/netbook-window-decoration-update.diff b/patches/dev300/netbook-window-decoration-update.diff
index 8acbb1a..c63fe61 100644
--- a/patches/dev300/netbook-window-decoration-update.diff
+++ b/patches/dev300/netbook-window-decoration-update.diff
@@ -329,10 +329,12 @@ diff -rup toolkit-orig/source/awt/vclxtoolkit.cxx toolkit/source/awt/vclxtoolkit
 diff -rup vcl-orig-1/source/window/window3.cxx vcl/source/window/window3.cxx
 --- vcl-orig-1/source/window/window3.cxx	2010-08-09 18:30:04.000000000 +0200
 +++ vcl/source/window/window3.cxx	2010-08-09 18:30:45.000000000 +0200
-@@ -84,5 +84,5 @@ void Window::ImplAdjustNWFSizes()
+@@ -84,7 +84,7 @@ void Window::ImplAdjustNWFSizes()
  
  BOOL Window::GetSmallScreenMode()
  {
 -    return ImplGetFrame()->GetSmallScreenMode();
 +    return ImplGetFrame()->IsInSmallScreenMode();
  }
+ 
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/patches/dev300/size-sal-textenc.diff b/patches/dev300/size-sal-textenc.diff
index f3791d1..ed4a05a 100644
--- a/patches/dev300/size-sal-textenc.diff
+++ b/patches/dev300/size-sal-textenc.diff
@@ -497,7 +497,7 @@ index 91f472e..553c75f 100644
  
  #ifndef INCLUDED_STDDEF_H
  #include <stddef.h>
-@@ -86,141 +88,69 @@ static sal_uChar const aImplA0FFSameToCharTab[SAMEA0FFCHAR_END
+@@ -86,143 +88,71 @@ static sal_uChar const aImplA0FFSameToCharTab[SAMEA0FFCHAR_END
  
  static sal_uInt16 const aImplDoubleByteIdentifierTab[1] = { 0 };
  
@@ -696,6 +696,8 @@ index 91f472e..553c75f 100644
 +    }
 +    return NULL;
  }
+ 
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git sal/util/makefile.mk sal/util/makefile.mk
 index 82ebbc8..faaa5ba 100644
 --- sal/util/makefile.mk
diff --git a/patches/dev300/vcl-netbook-export-small-screen-mode.diff b/patches/dev300/vcl-netbook-export-small-screen-mode.diff
index de8f205..36ba893 100644
--- a/patches/dev300/vcl-netbook-export-small-screen-mode.diff
+++ b/patches/dev300/vcl-netbook-export-small-screen-mode.diff
@@ -44,7 +44,7 @@ index 15d8d17..8918436 100644
  #include "vcl/button.hxx"
  
  // -----------------------------------------------------------------------
-@@ -80,3 +81,8 @@ void Window::ImplAdjustNWFSizes()
+@@ -80,5 +81,10 @@ void Window::ImplAdjustNWFSizes()
          break;
      }
  }
@@ -53,6 +53,8 @@ index 15d8d17..8918436 100644
 +{
 +    return ImplGetFrame()->GetSmallScreenMode();
 +}
+ 
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
 index c26d85c..6426611 100644
 --- vcl/unx/gtk/window/gtkframe.cxx