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

[Petr Mladek]

 patches/dev300/vcl-netbook-export-small-screen-mode.diff |   20 +++++++--------
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit b6151ac0b66e9fdd8e36601cab947b3da78e55c7
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 15 15:13:03 2011 +0200

    fix vcl-netbook-export-small-screen-mode.diff to apply

diff --git a/patches/dev300/vcl-netbook-export-small-screen-mode.diff b/patches/dev300/vcl-netbook-export-small-screen-mode.diff
index 36ba893..804b4ac 100644
--- a/patches/dev300/vcl-netbook-export-small-screen-mode.diff
+++ b/patches/dev300/vcl-netbook-export-small-screen-mode.diff
@@ -12,10 +12,10 @@ index 4e40b3e..0aec41a 100644
 +++ vcl/inc/vcl/salframe.hxx
 @@ -293,6 +293,8 @@ public:
      // (e.g. input methods, printer update handlers).
-     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 sal_Bool GetSmallScreenMode() { return sal_False; }
  };
  
  
@@ -28,10 +28,10 @@ index b7b5ad4..f6faf3e 100644
      virtual XubString GetSurroundingText() const;
      virtual Selection GetSurroundingTextSelection() const;
 +
-+    BOOL GetSmallScreenMode();
- };
- 
- 
++    sal_Bool GetSmallScreenMode();
+     
+     // ExtImpl
+     
 diff --git vcl/source/window/window3.cxx vcl/source/window/window3.cxx
 index 15d8d17..8918436 100644
 --- vcl/source/window/window3.cxx
@@ -49,7 +49,7 @@ index 15d8d17..8918436 100644
      }
  }
 +
-+BOOL Window::GetSmallScreenMode()
++sal_Bool Window::GetSmallScreenMode()
 +{
 +    return ImplGetFrame()->GetSmallScreenMode();
 +}
@@ -78,10 +78,10 @@ index c26d85c..6426611 100644
      else {
      if( (pState->mnMask & SAL_FRAMESTATE_MASK_STATE) &&
 @@ -3776,6 +3776,11 @@ gboolean GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pCon
-     return FALSE;
+     return sal_False;
  }
  
-+BOOL GtkSalFrame::GetSmallScreenMode()
++sal_Bool GtkSalFrame::GetSmallScreenMode()
 +{
 +    return getDisplay()->getWMAdaptor()->getSmallScreen();
 +}
@@ -98,7 +98,7 @@ index 1da7d0f..534bf9f 100644
  
      static GtkSalFrame         *getFromWindow( GtkWindow *pWindow );
 +
-+    virtual BOOL GetSmallScreenMode();
++    virtual sal_Bool GetSmallScreenMode();
  };