From 6265876ae9f1bb862440182d2d2c9b9b5b322668 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 9 Dec 2013 21:53:23 +0200 Subject: iOS tiled rendering work Possibly quite broken intermediate commit. But anyway, now it is possible to render the tile diretly to a CGContext. Can be seen in the MobileLibreOffice app when build in the Debug_tile_tester configuration. See touch_lo_draw_tile() in viewsh.cxx. Unfortunately the old plain LibreOffice test app is now broken, though, and displays nothing at all. This refactoring and hacking in vcl was done in a quite ugly fashion, with ifdefs etc. But trust me, I did try, several times, for many days, to get where I wanted in an elegant and clean fashion. But doing it cleanly meant not being able to actually build it for days while trying to figure ut which bits go where and which class should be split into what base and derived class(es), and it was too much for my limited brain capacity. I just couldn't juggle all the vcl class structure in my head, especially as I don't have any good understanding of the general design of it all. Change-Id: Ia59d6a9cce15a63e63f94e8d8574bef21993fb1f --- ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj | 2 ++ ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'ios') diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj index 858beb7cdc03..ce340065f7d8 100644 --- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj +++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj @@ -268,6 +268,7 @@ BE82BE4D1822D10F00A447B5 /* ctlayout.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctlayout.cxx; path = ../../vcl/quartz/ctlayout.cxx; sourceTree = ""; }; BE82BE4E1822D10F00A447B5 /* salgdi.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salgdi.cxx; path = ../../vcl/quartz/salgdi.cxx; sourceTree = ""; }; BEC9DABC1858BA39009CCCB3 /* svdpagv.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svdpagv.cxx; path = ../../svx/source/svdraw/svdpagv.cxx; sourceTree = ""; }; + BEDB0EFB185A05BE009A6F26 /* salvd.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salvd.cxx; path = ../../vcl/quartz/salvd.cxx; sourceTree = ""; }; BEE68B5D185715EE0049ECE0 /* salbmp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salbmp.cxx; path = ../../vcl/quartz/salbmp.cxx; sourceTree = ""; }; BEE68B5E185715EE0049ECE0 /* salgdicommon.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salgdicommon.cxx; path = ../../vcl/quartz/salgdicommon.cxx; sourceTree = ""; }; BEE68B5F185715EE0049ECE0 /* salgdiutils.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salgdiutils.cxx; path = ../../vcl/quartz/salgdiutils.cxx; sourceTree = ""; }; @@ -700,6 +701,7 @@ BEE68B5E185715EE0049ECE0 /* salgdicommon.cxx */, BEE68B5F185715EE0049ECE0 /* salgdiutils.cxx */, BEE68B60185715EE0049ECE0 /* salmathutils.cxx */, + BEDB0EFB185A05BE009A6F26 /* salvd.cxx */, BEE68B61185715EE0049ECE0 /* utils.cxx */, ); name = quartz; diff --git a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj index 8108649ae1d7..26b1df6542c4 100644 --- a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj +++ b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj @@ -99,6 +99,7 @@ BECB749A17185F48001BEB85 /* view0.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = view0.cxx; path = ../../../../sw/source/ui/uiview/view0.cxx; sourceTree = ""; }; BECB749B17185F48001BEB85 /* view1.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = view1.cxx; path = ../../../../sw/source/ui/uiview/view1.cxx; sourceTree = ""; }; BECB749C17185F48001BEB85 /* view2.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = view2.cxx; path = ../../../../sw/source/ui/uiview/view2.cxx; sourceTree = ""; }; + BEDB0EFA1859C206009A6F26 /* outdev2.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = outdev2.cxx; path = ../../../../vcl/source/gdi/outdev2.cxx; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -144,6 +145,7 @@ children = ( BE9A8D56181DBC70002A11AD /* cursor.cxx */, BE954A2E1704F9500040D517 /* iosinst.cxx */, + BEDB0EFA1859C206009A6F26 /* outdev2.cxx */, BEB752BD180C90D0005B5696 /* outmap.cxx */, BE96AEB7181973DA00BD1AC4 /* salbmp.cxx */, BEBF3E3A17002D0200C454AC /* svapp.cxx */, @@ -469,7 +471,7 @@ GCC_PREFIX_HEADER = "LibreOffice/LibreOffice-Prefix.pch"; INFOPLIST_FILE = "LibreOffice/LibreOffice-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 6.1; - LIBRARY_SEARCH_PATHS = "../../../workdir/LinkTarget/Library"; + LIBRARY_SEARCH_PATHS = ../../../workdir/LinkTarget/Library; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -482,7 +484,7 @@ GCC_PREFIX_HEADER = "LibreOffice/LibreOffice-Prefix.pch"; INFOPLIST_FILE = "LibreOffice/LibreOffice-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 6.1; - LIBRARY_SEARCH_PATHS = "../../../workdir/LinkTarget/Library"; + LIBRARY_SEARCH_PATHS = ../../../workdir/LinkTarget/Library; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; -- cgit