[Libreoffice-commits] core.git: 4 commits - vcl/coretext vcl/ios vcl/source

[Tor Lillqvist]

 vcl/coretext/salgdi.cxx      |    6 +++---
 vcl/ios/iosinst.cxx          |   15 +++++----------
 vcl/source/window/window.cxx |   14 +++++++-------
 3 files changed, 15 insertions(+), 20 deletions(-)

New commits:
commit 59c83ffb05865a5e492c3204228e85ca006e2b5b
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Mar 24 00:22:15 2013 +0200

    Don't exit intentionally
    
    Change-Id: I1d4c7dbc8ed9254e92d097454704c811ba1532f1

diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 3ce3a65..b2178e9 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -236,21 +236,16 @@ void InitSalData()   {}
 void DeInitSalData() {}
 void InitSalMain()   {}
 
-void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
+void SalAbort( const OUString& rErrorText, bool bDumpCore )
 {
-    rtl::OUString aError( rErrorText );
-    if( aError.isEmpty() )
-        aError = rtl::OUString::createFromAscii("Unknown application error");
-
-    if( bDumpCore )
-        abort();
-    else
-        _exit(1);
+    (void) bDumpCore;
+
+    NSLog(@"SalAbort: %s", OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() );
 }
 
 const OUString& SalGetDesktopEnvironment()
 {
-    static rtl::OUString aEnv( "android" );
+    static OUString aEnv( "iOS" );
     return aEnv;
 }
 
commit d6869762a903d1614a9592508092f0721e5a4633
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Mar 24 00:10:07 2013 +0200

    Try kCGImageAlphaNoneSkipLast
    
    Change-Id: I127f450ae7c52f25033a6dbc34029545ea5ed07b

diff --git a/vcl/coretext/salgdi.cxx b/vcl/coretext/salgdi.cxx
index d2a0281..c7db660 100644
--- a/vcl/coretext/salgdi.cxx
+++ b/vcl/coretext/salgdi.cxx
@@ -285,7 +285,7 @@ bool SvpSalGraphics::CheckContext()
     basebmp::RawMemorySharedArray pixelBuffer = m_aDevice->getBuffer();
 
     mrContext = CGBitmapContextCreate(pixelBuffer.get(), size.getX(), size.getY(), 8, m_aDevice->getScanlineStride(),
-                                      CGColorSpaceCreateDeviceRGB(), kCGImageAlphaLast|kCGBitmapByteOrder32Little);
+                                      CGColorSpaceCreateDeviceRGB(), kCGImageAlphaNoneSkipLast);
 
     SAL_WARN_IF( mrContext == NULL, "vcl.ios", "CheckContext() failed" );
 
commit 9f1a3352b5cb04e877785af3110f56d2d3418eda
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Mar 23 23:22:31 2013 +0200

    Improve debugging printout a bit
    
    Change-Id: I1acc1b3f1e9d2cdcbba058b050f278e396f115c6

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 459b917..81b002f 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4223,11 +4223,11 @@ namespace
             pWindow = &i_rWindow;
 
         rtl::OStringBuffer aErrorString;
-        aErrorString.append(char(13));
+        aErrorString.append(' ');
         aErrorString.append(typeid( *pWindow ).name());
-        aErrorString.append(" (window text: '");
+        aErrorString.append(" (");
         aErrorString.append(rtl::OUStringToOString(pWindow->GetText(), RTL_TEXTENCODING_UTF8));
-        aErrorString.append("')");
+        aErrorString.append(")");
         return aErrorString.makeStringAndClear();
     }
 }
@@ -4377,7 +4377,7 @@ Window::~Window()
                 aTempStr.append("Window (");
                 aTempStr.append(rtl::OUStringToOString(GetText(),
                                                        RTL_TEXTENCODING_UTF8));
-                aTempStr.append(") with living SystemWindow(s) destroyed: ");
+                aTempStr.append(") with live SystemWindows destroyed: ");
                 aTempStr.append(aErrorStr.toString());
                 OSL_FAIL(aTempStr.getStr());
                 // abort in non-pro version, this must be fixed!
@@ -4401,7 +4401,7 @@ Window::~Window()
         {
             rtl::OStringBuffer aTempStr( "Window (" );
             aTempStr.append(rtl::OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8));
-            aTempStr.append(") with living SystemWindow(s) destroyed: ");
+            aTempStr.append(") with live SystemWindows destroyed: ");
             aTempStr.append(aErrorStr.toString());
             OSL_FAIL( aTempStr.getStr() );
             GetpApp()->Abort(rtl::OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8));   // abort in non-pro version, this must be fixed!
@@ -4411,7 +4411,7 @@ Window::~Window()
         {
             rtl::OStringBuffer aTempStr("Window (");
             aTempStr.append(rtl::OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8));
-            aTempStr.append(") with living Child(s) destroyed: ");
+            aTempStr.append(") with live children destroyed: ");
             pTempWin = mpWindowImpl->mpFirstChild;
             while ( pTempWin )
             {
@@ -4426,7 +4426,7 @@ Window::~Window()
         {
             rtl::OStringBuffer aTempStr("Window (");
             aTempStr.append(rtl::OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8));
-            aTempStr.append(") with living SystemWindow(s) destroyed: ");
+            aTempStr.append(") with live SystemWindows destroyed: ");
             pTempWin = mpWindowImpl->mpFirstOverlap;
             while ( pTempWin )
             {
commit 16498b264c8729c61b99946b4e532fdd3a8d9828
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Mar 23 23:18:23 2013 +0200

    Move SAL_WARN_IF
    
    Change-Id: If543e44a1f4aa08a38bf273a3e50a7cd7d57e84d

diff --git a/vcl/coretext/salgdi.cxx b/vcl/coretext/salgdi.cxx
index 7a064f0..d2a0281 100644
--- a/vcl/coretext/salgdi.cxx
+++ b/vcl/coretext/salgdi.cxx
@@ -281,14 +281,14 @@ void QuartzSalGraphics::SetTextColor( SalColor nSalColor )
 
 bool SvpSalGraphics::CheckContext()
 {
-    SAL_WARN_IF( mrContext == NULL, "vcl.ios", "CheckContext() failed" );
-
     basegfx::B2IVector size = m_aDevice->getSize();
     basebmp::RawMemorySharedArray pixelBuffer = m_aDevice->getBuffer();
 
     mrContext = CGBitmapContextCreate(pixelBuffer.get(), size.getX(), size.getY(), 8, m_aDevice->getScanlineStride(),
                                       CGColorSpaceCreateDeviceRGB(), kCGImageAlphaLast|kCGBitmapByteOrder32Little);
 
+    SAL_WARN_IF( mrContext == NULL, "vcl.ios", "CheckContext() failed" );
+
     return (mrContext != NULL);
 }