[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/netbook-window-decoration-update.diff |   34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 12a75a09382158a2e110211c9d20b84457288eb6
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 15 15:40:23 2011 +0200

    fix netbook-window-decoration-update.diff to apply

diff --git a/patches/dev300/netbook-window-decoration-update.diff b/patches/dev300/netbook-window-decoration-update.diff
index a7a9b7e..a6630ee 100644
--- a/patches/dev300/netbook-window-decoration-update.diff
+++ b/patches/dev300/netbook-window-decoration-update.diff
@@ -2,11 +2,11 @@ diff -rup vcl-orig/inc/vcl/salframe.hxx vcl/inc/vcl/salframe.hxx
 --- vcl-orig/inc/vcl/salframe.hxx	2010-08-09 17:36:47.000000000 +0200
 +++ vcl/inc/vcl/salframe.hxx	2010-08-09 17:37:17.000000000 +0200
 @@ -294,7 +294,7 @@ public:
-     long						CallCallback( USHORT nEvent, const void* pEvent ) const
+     long						CallCallback( sal_uInt16 nEvent, const void* pEvent ) const
      { return m_pProc ? m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent ) : 0; }
  
--    virtual BOOL GetSmallScreenMode() { return FALSE; }
-+    virtual BOOL IsInSmallScreenMode() { return FALSE; }
+-    virtual sal_Bool GetSmallScreenMode() { return sal_False; }
++    virtual sal_Bool IsInSmallScreenMode() { return sal_False; }
  };
  
  
@@ -22,7 +22,7 @@ diff -rup vcl-orig/inc/vcl/salsys.hxx vcl/inc/vcl/salsys.hxx
 +    
 +        @returns whether we are in small screen mode
 +    */
-+    virtual bool IsInSmallScreenMode() { return false; }
++    virtual sal_Bool IsInSmallScreenMode() { return sal_False; }
 +
      /*  Gets the number of active screens attached to the display
      
@@ -34,7 +34,7 @@ diff -rup vcl-orig/inc/vcl/svapp.hxx vcl/inc/vcl/svapp.hxx
      static void                 SetDisplayName( const UniString& rDisplayName );
      static UniString            GetDisplayName();
      
-+    static bool                 IsInSmallScreenMode();
++    static sal_Bool             IsInSmallScreenMode();
      static unsigned int         GetScreenCount();
      // IsMultiDisplay returns:
      //        true:  different screens are separate and windows cannot be moved
@@ -45,10 +45,10 @@ diff -rup vcl-orig/source/app/svapp.cxx vcl/source/app/svapp.cxx
  
  // -----------------------------------------------------------------------
  
-+bool Application::IsInSmallScreenMode()
++sal_Bool Application::IsInSmallScreenMode()
 +{
 +    SalSystem* pSys = ImplGetSalSystem();
-+    return pSys ? pSys->IsInSmallScreenMode() : false;
++    return pSys ? pSys->IsInSmallScreenMode() : sal_False;
 +}
 +
  unsigned int Application::GetScreenCount()
@@ -114,14 +114,14 @@ diff -rup vcl-orig/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
  }
 -}
  
- BOOL GtkSalFrame::GetWindowState( SalFrameState* pState )
+ sal_Bool GtkSalFrame::GetWindowState( SalFrameState* pState )
  {
 @@ -3776,9 +3780,9 @@ gboolean GtkSalFrame::IMHandler::signalI
-     return FALSE;
+     return sal_False;
  }
  
--BOOL GtkSalFrame::GetSmallScreenMode()
-+BOOL GtkSalFrame::IsInSmallScreenMode()
+-sal_Bool GtkSalFrame::GetSmallScreenMode()
++sal_Bool GtkSalFrame::IsInSmallScreenMode()
  {
 -    return getDisplay()->getWMAdaptor()->getSmallScreen();
 +    return getDisplay()->getWMAdaptor()->isInSmallScreenMode();
@@ -135,8 +135,8 @@ diff -rup vcl-orig/unx/inc/plugins/gtk/gtkframe.hxx vcl/unx/inc/plugins/gtk/gtkf
  
      static GtkSalFrame         *getFromWindow( GtkWindow *pWindow );
  
--    virtual BOOL GetSmallScreenMode();
-+    virtual BOOL IsInSmallScreenMode();
+-    virtual sal_Bool GetSmallScreenMode();
++    virtual sal_Bool IsInSmallScreenMode();
  };
  
  
@@ -147,7 +147,7 @@ diff -rup vcl-orig/unx/inc/salsys.h vcl/unx/inc/salsys.h
      virtual ~X11SalSystem();
      
      // overload pure virtual methods
-+	virtual bool IsInSmallScreenMode();
++    virtual sal_Bool IsInSmallScreenMode();
      virtual unsigned int GetDisplayScreenCount();
      virtual bool IsMultiDisplay();
      virtual unsigned int GetDefaultDisplayNumber();
@@ -178,7 +178,7 @@ diff -rup vcl-orig/unx/source/app/salsys.cxx vcl/unx/source/app/salsys.cxx
  {
  }
  
-+bool X11SalSystem::IsInSmallScreenMode()
++sal_Bool X11SalSystem::IsInSmallScreenMode()
 +{
 +    return GetX11SalData()->GetDisplay()->getWMAdaptor()->isInSmallScreenMode();
 +}
@@ -248,7 +248,7 @@ diff -rup framework-orig/source/services/taskcreatorsrv.cxx framework/source/ser
 +        xContainerWindow = implts_createContainerWindow(xParentWindow, aPosSize, bCreateTopWindow, bDocumentWindow);
      }
      
-     //------------------->
+     // #i53630#
 @@ -190,8 +195,9 @@ css::uno::Reference< css::uno::XInterfac
                                                  (  xDesktop.is()     )
                                              )
@@ -331,7 +331,7 @@ diff -rup vcl-orig-1/source/window/window3.cxx vcl/source/window/window3.cxx
 +++ vcl/source/window/window3.cxx	2010-08-09 18:30:45.000000000 +0200
 @@ -84,7 +84,7 @@ void Window::ImplAdjustNWFSizes()
  
- BOOL Window::GetSmallScreenMode()
+ sal_Bool Window::GetSmallScreenMode()
  {
 -    return ImplGetFrame()->GetSmallScreenMode();
 +    return ImplGetFrame()->IsInSmallScreenMode();