[Libreoffice-commits] core.git: 2 commits - ios/experimental vcl/coretext

[Tor Lillqvist]

 ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj |    2 ++
 vcl/coretext/salgdi2.cxx                                           |    4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 04d9febcefc2bb18281828a4383f9b77f2bbd3ed
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jun 5 14:59:45 2013 +0300

    Add sw/source/core/text/guess.cxx
    
    A reminder: Listing some source files in this Xcode project does *not*
    mean that Xcode would have any deeper knowledge about them. So Xcode
    (and other IDE) fans, don't get overly excited, this is *not* a start
    of making an Xcode project for all of LibreOffice or anything like
    that. I just add arbitrary source files to this project when I happen
    to want to set a breakpoint, and can't conveniently do it by going up
    the call stack until something in that particular file.
    
    Change-Id: Iac77dff17f56ec3f2826fd887cc065160b65936e

diff --git a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj
index eac4d90..97a7147 100644
--- a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj
+++ b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj
@@ -18,6 +18,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		BE02DE57175F2E2A00ED4032 /* guess.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = guess.cxx; path = ../../../../sw/source/core/text/guess.cxx; sourceTree = "<group>"; };
 		BE08805B16FDB784000CED5C /* View.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = View.h; sourceTree = "<group>"; };
 		BE08805C16FDB784000CED5C /* View.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = View.m; sourceTree = "<group>"; };
 		BE2F0A0A17077A040060FE0D /* typedescriptionprovider.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = typedescriptionprovider.cxx; path = ../../../../cppuhelper/source/typedescriptionprovider.cxx; sourceTree = "<group>"; };
@@ -270,6 +271,7 @@
 			isa = PBXGroup;
 			children = (
 				BECB749617181C92001BEB85 /* crsrsh.cxx */,
+				BE02DE57175F2E2A00ED4032 /* guess.cxx */,
 				BECB749917185F48001BEB85 /* view.cxx */,
 				BECB749A17185F48001BEB85 /* view0.cxx */,
 				BECB749B17185F48001BEB85 /* view1.cxx */,
commit 684c875ebecf561bc6726e31a1db9dbbd5fb7850
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jun 5 14:58:13 2013 +0300

    Initialise more fields, especially mfFakeDPIScale
    
    Now the iOS app displays the test document successfully again.
    
    Change-Id: I71aeacc50e51a28ba1e8b67c7da42da0c848f997

diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx
index 0ae7d1f..9180c32 100644
--- a/vcl/coretext/salgdi2.cxx
+++ b/vcl/coretext/salgdi2.cxx
@@ -290,7 +290,9 @@ AquaSalGraphics::AquaSalGraphics()
     , mbVirDev( false )
     , mbWindow( false )
 #else
-    : mpMacFontData( NULL )
+    : mrContext( NULL )
+    , mfFakeDPIScale( 1.0 )
+    , mpMacFontData( NULL )
     , mpMacTextStyle( NULL )
     , maTextColor( COL_BLACK )
     , mbNonAntialiasedText( false )