[Libreoffice-commits] core.git: 2 commits - ios/experimental
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 68 ++ 1 file changed, 68 insertions(+) New commits: commit 55d2f55ddfb50f8e94d8d2fd29e98de5e861 Author: Tor Lillqvist Date: Thu Jan 23 07:17:29 2014 +0200 Add objface.cxx Change-Id: I2444acf09b3108c1a79658f0954bb9481c8fad0c diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj index e2365ef..4ec246a 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj @@ -165,6 +165,7 @@ BE35B5A1188FFA88001B7439 /* typeprovider.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = typeprovider.cxx; path = ../../../cppuhelper/source/typeprovider.cxx; sourceTree = ""; }; BE35B5A2188FFA88001B7439 /* unourl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = unourl.cxx; path = ../../../cppuhelper/source/unourl.cxx; sourceTree = ""; }; BE35B5A3188FFA88001B7439 /* weak.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = weak.cxx; path = ../../../cppuhelper/source/weak.cxx; sourceTree = ""; }; + BE35B5A71890520E001B7439 /* objface.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = objface.cxx; path = ../../../sfx2/source/control/objface.cxx; sourceTree = ""; }; BE82BD7218218E2E00A447B5 /* TiledLibreOffice.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TiledLibreOffice.app; sourceTree = BUILT_PRODUCTS_DIR; }; BE82BD7518218E2E00A447B5 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; BE82BD7718218E2E00A447B5 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -430,10 +431,19 @@ name = cppuhelper; sourceTree = ""; }; + BE35B5A6189051F7001B7439 /* sfx2 */ = { + isa = PBXGroup; + children = ( + BE35B5A71890520E001B7439 /* objface.cxx */, + ); + name = sfx2; + sourceTree = ""; + }; BE82BD6918218E2E00A447B5 = { isa = PBXGroup; children = ( BE0898E61860D3CD0021A679 /* LibreOffice source files */, + BE35B5A6189051F7001B7439 /* sfx2 */, BE82BD7B18218E2E00A447B5 /* TiledLibreOffice */, BEEEF9681860A21F00FBDE67 /* Resources */, BE82BD7418218E2E00A447B5 /* Frameworks */, commit 8b9536f61ad08ff9b56b9aae790495bd14b4f81a Author: Tor Lillqvist Date: Wed Jan 22 15:23:53 2014 +0200 Add cppuhelper sources Change-Id: I47545d0592348f585c23e3c6be079e0ed664d706 diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj index 8f44c02..e2365ef 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj @@ -140,6 +140,31 @@ BE35B5871886C50A001B7439 /* textlayout.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textlayout.cxx; path = ../../../vcl/source/gdi/textlayout.cxx; sourceTree = ""; }; BE35B5881886C50A001B7439 /* virdev.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = virdev.cxx; path = ../../../vcl/source/gdi/virdev.cxx; sourceTree = ""; }; BE35B5891886C50A001B7439 /* wall.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wall.cxx; path = ../../../vcl/source/gdi/wall.cxx; sourceTree = ""; }; + BE35B58B188FFA88001B7439 /* access_control.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = access_control.cxx; path = ../../../cppuhelper/source/access_control.cxx; sourceTree = ""; }; + BE35B58C188FFA88001B7439 /* bootstrap.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bootstrap.cxx; path = ../../../cppuhelper/source/bootstrap.cxx; sourceTree = ""; }; + BE35B58D188FFA880
[Libreoffice-commits] core.git: 2 commits - ios/experimental
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 196 ++ ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m| 2 2 files changed, 197 insertions(+), 1 deletion(-) New commits: commit 6013967b394098e6c9168c4434036b45beab6d14 Author: Tor Lillqvist Date: Fri Mar 14 12:46:01 2014 +0200 Add some more source files for debugging convenience Change-Id: Ibf4f18e0e8efe0d220e087559578747b45e03942 diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj index e226f13..0ffd267 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj @@ -166,6 +166,51 @@ BE35B5A2188FFA88001B7439 /* unourl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = unourl.cxx; path = ../../../cppuhelper/source/unourl.cxx; sourceTree = ""; }; BE35B5A3188FFA88001B7439 /* weak.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = weak.cxx; path = ../../../cppuhelper/source/weak.cxx; sourceTree = ""; }; BE35B5A71890520E001B7439 /* objface.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = objface.cxx; path = ../../../sfx2/source/control/objface.cxx; sourceTree = ""; }; + BE7C277218D1DDF600C4908C /* acmplwrd.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = acmplwrd.cxx; path = ../../../sw/source/core/doc/acmplwrd.cxx; sourceTree = ""; }; + BE7C277318D1DDF600C4908C /* dbgoutsw.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbgoutsw.cxx; path = ../../../sw/source/core/doc/dbgoutsw.cxx; sourceTree = ""; }; + BE7C277418D1DDF600C4908C /* doc.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = doc.cxx; path = ../../../sw/source/core/doc/doc.cxx; sourceTree = ""; }; + BE7C277518D1DDF600C4908C /* docbasic.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docbasic.cxx; path = ../../../sw/source/core/doc/docbasic.cxx; sourceTree = ""; }; + BE7C277618D1DDF600C4908C /* docbm.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docbm.cxx; path = ../../../sw/source/core/doc/docbm.cxx; sourceTree = ""; }; + BE7C277718D1DDF600C4908C /* docchart.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docchart.cxx; path = ../../../sw/source/core/doc/docchart.cxx; sourceTree = ""; }; + BE7C277818D1DDF600C4908C /* doccomp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = doccomp.cxx; path = ../../../sw/source/core/doc/doccomp.cxx; sourceTree = ""; }; + BE7C277918D1DDF600C4908C /* doccorr.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = doccorr.cxx; path = ../../../sw/source/core/doc/doccorr.cxx; sourceTree = ""; }; + BE7C277A18D1DDF600C4908C /* docdde.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docdde.cxx; path = ../../../sw/source/core/doc/docdde.cxx; sourceTree = ""; }; + BE7C277B18D1DDF600C4908C /* docdesc.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docdesc.cxx; path = ../../../sw/source/core/doc/docdesc.cxx; sourceTree = ""; }; + BE7C277C18D1DDF600C4908C /* docdraw.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docdraw.cxx; path = ../../../sw/source/core/doc/docdraw.cxx; sourceTree = ""; }; + BE7C277D18D1DDF600C4908C /* docedt.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docedt.cxx; path = ../../../sw/source/core/doc/docedt.cxx; sourceTree = ""; }; + BE7C277E18D1DDF600C4908C /* docfld.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docfld.cxx; path = ../../../sw/source/core/doc/docfld.cxx; sourceTree = ""; }; + BE7C277F18D1DDF600C4908C /* docfly.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docfly.cxx; path = ../../../sw/source/core/doc/docfly.cxx; sourceTree = ""; }; + BE7C278018D1DDF600C4908C /* docfmt.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docfmt.cxx; path = ../../../sw/source/core/doc/docfmt.cxx; sourceTree = ""; }; + BE7C278118D1DDF600C4908C /* docftn.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docftn.cxx; path = ../../../sw/source/core/doc/docftn.cxx; sourceTree = ""; }; + BE7C278218D1DDF600C4908C /* docglbl.cxx */ = {
[Libreoffice-commits] core.git: 2 commits - ios/experimental
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 242 +- 1 file changed, 240 insertions(+), 2 deletions(-) New commits: commit 0fe02d03ac7539e9807bc336b23f17029b2a09fb Author: Tor Lillqvist Date: Thu Mar 20 10:09:23 2014 +0200 Add a few cppu source files for debugging convenience Change-Id: I9cad3f9f2a80f7915a5525855fcdf6fd5bb32d50 diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj index 46984c5..286bcec 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj @@ -315,6 +315,8 @@ BE55B10218D9AB5400950228 /* shutdowniconaqua.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = shutdowniconaqua.mm; path = ../../../sfx2/source/appl/shutdowniconaqua.mm; sourceTree = ""; }; BE55B10318D9AB5400950228 /* workwin.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = workwin.cxx; path = ../../../sfx2/source/appl/workwin.cxx; sourceTree = ""; }; BE55B10418D9AB5400950228 /* xpackcreator.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xpackcreator.cxx; path = ../../../sfx2/source/appl/xpackcreator.cxx; sourceTree = ""; }; + BE55B10618DAD89800950228 /* compat.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = compat.cxx; path = ../../../cppu/source/cppu/compat.cxx; sourceTree = ""; }; + BE55B10718DAD89800950228 /* cppu_opt.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cppu_opt.cxx; path = ../../../cppu/source/cppu/cppu_opt.cxx; sourceTree = ""; }; BE7C277218D1DDF600C4908C /* acmplwrd.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = acmplwrd.cxx; path = ../../../sw/source/core/doc/acmplwrd.cxx; sourceTree = ""; }; BE7C277318D1DDF600C4908C /* dbgoutsw.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbgoutsw.cxx; path = ../../../sw/source/core/doc/dbgoutsw.cxx; sourceTree = ""; }; BE7C277418D1DDF600C4908C /* doc.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = doc.cxx; path = ../../../sw/source/core/doc/doc.cxx; sourceTree = ""; }; @@ -656,8 +658,9 @@ isa = PBXGroup; children = ( BE82C47118CA18D70050EB79 /* drawinglayer */, - BE35B58A188FFA43001B7439 /* cppuhelper */, BE9F45F81868393D00B8BE69 /* bridges */, + BE55B10518DAD85E00950228 /* cppu */, + BE35B58A188FFA43001B7439 /* cppuhelper */, BE82C38818C752760050EB79 /* sal */, BE35B5A6189051F7001B7439 /* sfx2 */, BE82C42718CA17A60050EB79 /* svx */, @@ -1037,6 +1040,15 @@ name = appl; sourceTree = ""; }; + BE55B10518DAD85E00950228 /* cppu */ = { + isa = PBXGroup; + children = ( + BE55B10618DAD89800950228 /* compat.cxx */, + BE55B10718DAD89800950228 /* cppu_opt.cxx */, + ); + name = cppu; + sourceTree = ""; + }; BE7C277118D1DDC500C4908C /* doc */ = { isa = PBXGroup; children = ( commit fc33829dcd141e9464b7e9285828c06a8cf0d7b3 Author: Tor Lillqvist Date: Wed Mar 19 12:40:59 2014 +0200 Add some more source files for debugging convenience Change-Id: I2cfb9dd31b76d230a4c8aadc5461b7601fbc63a4 diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj index b14b523..46984c5 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj @@ -214,6 +214,107 @@ BE55B09918D96FB000950228 /* viewobjectcontactofsdrpage.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = viewobjectcontactofsdrpage.cxx; path = ../../../svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx; sourceTree = ""; }; BE55B09A18D96FB000950228 /* viewobjectcontactofunocontrol.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = viewobjectcontactofunocontrol.cxx; path = ../../../svx/source/sdr/cont
[Libreoffice-commits] core.git: 2 commits - ios/experimental
ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m | 53 +++--- 1 file changed, 38 insertions(+), 15 deletions(-) New commits: commit cde082f5f1072530cf7639eb5ce7c24dac9e6826 Author: Tor Lillqvist Date: Mon Mar 31 20:10:17 2014 +0300 Bin a few since long commented-out lines Change-Id: I4087f8f51dd6e8066818a98797c1e575ecca3442 diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m index a02fcfe..cea417a 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m @@ -110,13 +110,9 @@ static void updateTilesPerSecond(UILabel *label) CGRect bb = CGContextGetClipBoundingBox(ctx); -// double zoomScale = [(View *) [self superview] zoomScale]; -// CATiledLayer *catl = (CATiledLayer*) [self layer]; - CGContextSaveGState(ctx); CGContextTranslateCTM(ctx, bb.origin.x, bb.origin.y); -// CGContextScaleCTM(ctx, 1/zoomScale, 1/zoomScale); // CGSize tileSize = [catl tileSize]; CGSize tileSize = bb.size; commit 7c4783f6a2cb7598ecc48f20379dad9784541d5b Author: Tor Lillqvist Date: Mon Mar 31 20:06:23 2014 +0300 Add possibility to show tile numbers and render just one tile Useful for debugging. Also, make the tile border drawing optional. These three debugging features are governed by environment variales (set in Xcode before running with Alt+Product>Run...) DRAW_ONLY_TILE, DRAW_TILE_BORDERS and DRAW_TILE_NUMBERS. Change-Id: I81f952284676eafe5d204c819658e0225aabdb1c diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m index 88c3095..a02fcfe 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m @@ -6,6 +6,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. +#include + #include #import "View.h" @@ -131,22 +133,47 @@ static void updateTilesPerSecond(UILabel *label) // as needed at the current zoom levels. I keep thinking about // "pixels" incorrectly. -touch_lo_draw_tile(ctx, - tileSize.width, tileSize.height, - CGPointMake(bb.origin.x/self.scale, bb.origin.y/self.scale), - CGSizeMake(bb.size.width/self.scale, bb.size.height/self.scale)); +volatile static int number = 0; +int thisTile = number++; + +if (!getenv("DRAW_ONLY_TILE") || thisTile == atoi(getenv("DRAW_ONLY_TILE"))) +touch_lo_draw_tile(ctx, + tileSize.width, tileSize.height, + CGPointMake(bb.origin.x/self.scale, bb.origin.y/self.scale), + CGSizeMake(bb.size.width/self.scale, bb.size.height/self.scale)); +else { +CGContextSetRGBFillColor(ctx, 1, 1, 1, 1); +CGContextFillRect(ctx, CGRectMake(0, 0, bb.size.width, bb.size.height)); +} [self didRenderTile]; CGContextRestoreGState(ctx); -// I am a bit confused about what tiles exactly I am drawing, so -// make it perfectly obvious by drawing borders around the tiles -CGContextSaveGState(ctx); -CGContextSetStrokeColorWithColor(ctx, [[UIColor colorWithRed:1 green:0 blue:0 alpha:0.5] CGColor]); -CGContextSetLineWidth(ctx, 1); -CGContextStrokeRect(ctx, bb); -CGContextRestoreGState(ctx); +if (getenv("DRAW_TILE_BORDERS")) { +// I am a bit confused about what tiles exactly I am drawing, so +// make it perfectly obvious by drawing borders around the tiles +CGContextSaveGState(ctx); +CGContextSetStrokeColorWithColor(ctx, [[UIColor colorWithRed:1 green:0 blue:0 alpha:0.5] CGColor]); +CGContextSetLineWidth(ctx, 1); +CGContextStrokeRect(ctx, bb); +CGContextRestoreGState(ctx); +} + +if (getenv("DRAW_TILE_NUMBERS")) { +// Also draw the order number of the tile;) +CGContextSaveGState(ctx); +float scale = 1/[((View *) [self superview]) zoomScale]; +NSString *s = [NSString stringWithFormat:@"%d", thisTile]; +CFAttributedStringRef as = CFAttributedStringCreate(NULL, (__bridge CFStringRef)(s), NULL); +CTLineRef l = CTLineCreateWithAttributedString(as); +CGContextTranslateCTM(ctx, bb.origin.x, bb.origin.y); +CGContextScaleCTM(ctx, scale, scale); +CGContextSetTextPosition(ctx, 2, 12); +CGContextSetTextMatrix(ctx, CGAffineTransformScale(CGContextGetTextMatrix(ctx), 1, -1)); +CTLineDraw(l, ctx); +CGContextRestoreGState(ctx); +} } @end ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.fr
[Libreoffice-commits] core.git: 2 commits - ios/experimental sal/rtl
ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj | 96 -- sal/rtl/bootstrap.cxx |2 2 files changed, 79 insertions(+), 19 deletions(-) New commits: commit c2d77afdfc356c11ee27e862a38f5be150ac27dd Author: Tor Lillqvist Date: Sun Mar 31 00:11:24 2013 +0200 Must percent-escape the APP_DATA_DIR On the iOS Simulator it contains spaces, as in /Users/tml/Library/Application Support/iPhone Simulator/6.1/Applications/9A6DFE86-77AF-4B78-8FFB-93FCA6C38EE1/LibreOffice.app Change-Id: I90c76b909901c881aa51482880b1120fea19b99b diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index d3dadcb..b348c98 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -517,7 +517,7 @@ bool Bootstrap_Impl::getValue( #endif #ifdef IOS if (key == "APP_DATA_DIR") { -const char *app_data_dir = [[[NSBundle mainBundle] bundlePath] UTF8String]; +const char *app_data_dir = NSBundle mainBundle] bundlePath] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding] UTF8String]; rtl_uString_assign( value, rtl::OUString(app_data_dir, strlen(app_data_dir), RTL_TEXTENCODING_UTF8).pData); return true; commit e581dd2cdad358cbf123a44c488bb86036a00e7f Author: Tor Lillqvist Date: Sun Mar 31 00:09:14 2013 +0200 Organise the (few) source files included in the Xcode project into groups Change-Id: I01c9c26c6d282729101386266db898d759450a41 diff --git a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj index 0e03980..ee24e75 100644 --- a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj +++ b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj @@ -20,6 +20,8 @@ /* Begin PBXFileReference section */ BE08805B16FDB784000CED5C /* View.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = View.h; sourceTree = ""; }; BE08805C16FDB784000CED5C /* View.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = View.m; sourceTree = ""; }; + BE2F0A0A17077A040060FE0D /* typedescriptionprovider.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = typedescriptionprovider.cxx; path = ../../../../cppuhelper/source/typedescriptionprovider.cxx; sourceTree = ""; }; + BE2F0A121707809B0060FE0D /* unoidlprovider.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = unoidlprovider.cxx; path = ../../../../unoidl/source/unoidlprovider.cxx; sourceTree = ""; }; BE4EEE9916FF724200D475B2 /* bitmapdevice.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bitmapdevice.cxx; path = ../../../../basebmp/source/bitmapdevice.cxx; sourceTree = ""; }; BE4EEE9A16FF80B100D475B2 /* virdev.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = virdev.cxx; path = ../../../../vcl/source/gdi/virdev.cxx; sourceTree = ""; }; BE56CD651704A08E00CA5B15 /* lo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lo.h; sourceTree = ""; }; @@ -74,6 +76,76 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + BE2F0A0B17077A0F0060FE0D /* cppuhelper */ = { + isa = PBXGroup; + children = ( + BE2F0A0A17077A040060FE0D /* typedescriptionprovider.cxx */, + ); + name = cppuhelper; + sourceTree = ""; + }; + BE2F0A0C17077A2F0060FE0D /* headless */ = { + isa = PBXGroup; + children = ( + BE9086F616FF02B2004400A1 /* headlessinst.cxx */, + BE9086F716FF02B2004400A1 /* svpbmp.cxx */, + BE9086F816FF02B2004400A1 /* svpdata.cxx */, + BE9086F916FF02B2004400A1 /* svpdummies.cxx */, + BE9086FA16FF02B3004400A1 /* svpelement.cxx */, + BE9086FB16FF02B3004400A1 /* svpframe.cxx */, + BE9086FC16FF02B3004400A1 /* svpgdi.cxx */, + BE9086FD16FF02B3004400A1 /* svpinst.cxx */, + BE9086FE16FF02B3004400A1 /* svpprn.cxx */, + BE9086FF16FF02B3004400A1 /* svptext.cxx */, + BE90870016FF02B3004400A1 /* svpvd.cxx */, + ); + name = headless; + sourceTree = ""; +
[Libreoffice-commits] core.git: 2 commits - ios/experimental solenv/gbuild
ios/experimental/LibreOffice/LibreOffice/lo.mm |4 -- ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm |4 -- solenv/gbuild/Library.mk | 21 +-- 3 files changed, 19 insertions(+), 10 deletions(-) New commits: commit 5ed55393ee0778840dd4b3a316086b48bd0c61fc Author: Tor Lillqvist Date: Fri Dec 20 12:27:36 2013 +0200 Don't need Base, Calc, Draw and Math functionality here for now Change-Id: I20b9325f9c7eed1e49ea815c284f8fe1a6ed428d diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm index bfdbdc5..04760a7 100644 --- a/ios/experimental/LibreOffice/LibreOffice/lo.mm +++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm @@ -22,10 +22,6 @@ lo_get_factory_map(void) { static lib_to_factory_mapping map[] = { LO_EXTENDED_CORE_FACTORY_MAP -LO_BASE_CORE_FACTORY_MAP -LO_CALC_FACTORY_MAP -LO_DRAW_CORE_FACTORY_MAP -LO_MATH_FACTORY_MAP LO_WRITER_FACTORY_MAP { "libcuilo.a", cui_component_getFactory }, { "libspllo.a", spl_component_getFactory }, diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm index 0eaea4e..755ff1a 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm @@ -22,10 +22,6 @@ lo_get_factory_map(void) { static lib_to_factory_mapping map[] = { LO_EXTENDED_CORE_FACTORY_MAP -LO_BASE_CORE_FACTORY_MAP -LO_CALC_FACTORY_MAP -LO_DRAW_CORE_FACTORY_MAP -LO_MATH_FACTORY_MAP LO_WRITER_FACTORY_MAP { "libcuilo.a", cui_component_getFactory }, { "libspllo.a", spl_component_getFactory }, commit ea61ed8efe8d84b88754b1c6af0a85a76b3ce424 Author: Tor Lillqvist Date: Fri Dec 20 11:20:45 2013 +0200 Avoid unnecessary library re-building in the DISABLE_DYNLOADING case In the DISABLE_DYNLOADING case, a gbuild "Library" is actually a static archive, so no point in having it depend on other libraries and be re-created each time one of those have changed. This hopefully will speed up incremental rebuilds for iOS and Android nicely, especially in a debugging tree, as the creation of large static archives with debug information is quite slow. Change-Id: I17d6a8aeffa65b1e09a7a11544683659c72a50ba diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 61b5b0f..6ec8278 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -210,8 +210,6 @@ $(eval $(foreach method,\ use_internal_api \ use_internal_bootstrap_api \ use_internal_comprehensive_api \ - use_libraries \ - use_static_libraries \ use_external \ use_externals \ use_custom_headers \ @@ -231,4 +229,23 @@ $(eval $(foreach method,\ $(call gb_Library__forward_to_Linktarget,$(method))\ )) +ifeq ($(DISABLE_DYNLOADING),TRUE) + +define gb_Library_use_libraries +endef + +define gb_Library_use_static_libraries +endef + +else + +$(eval $(foreach method,\ + use_libraries \ + use_static_libraries \ +,\ + $(call gb_Library__forward_to_Linktarget,$(method))\ +)) + +endif + # vim: set noet sw=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - ios/experimental vcl/coretext
ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj | 16 +- vcl/coretext/ctlayout.cxx |6 +++ 2 files changed, 14 insertions(+), 8 deletions(-) New commits: commit 35b0a4cd274c1567cf0b8067eb01f17b82ee9f35 Author: Tor Lillqvist Date: Tue Jun 4 16:56:16 2013 +0300 Avoid crash on iOS: We need to get a valid context here Change-Id: Ib3fc01213fc6bc370a6c8b774a063f6f275ba6f2 diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx index 64728fc..a5915d9 100644 --- a/vcl/coretext/ctlayout.cxx +++ b/vcl/coretext/ctlayout.cxx @@ -417,6 +417,12 @@ void CTLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) const bool CTLayout::GetBoundRect( SalGraphics& rGraphics, Rectangle& rVCLRect ) const { AquaSalGraphics& rAquaGraphics = static_cast(rGraphics); + +#ifdef IOS +if( !rAquaGraphics.CheckContext() ) +return false; +#endif + CGRect aMacRect = CTLineGetImageBounds( mpCTLine, rAquaGraphics.mrContext ); CGPoint aMacPos = CGContextGetTextPosition( rAquaGraphics.mrContext ); aMacRect.origin.x -= aMacPos.x; commit 15e31ae2c3aa1e22e3936743fc0b9a1977e24de2 Author: Tor Lillqvist Date: Tue Jun 4 16:49:28 2013 +0300 Adapt to new CoreText code Change-Id: I6e2075894fc9b1bda7c002728d7853e8ed5910f7 diff --git a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj index 3209332..eac4d90 100644 --- a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj +++ b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj @@ -54,6 +54,10 @@ BE69AD8C1695954D001BE1CD /* i...@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "i...@2x.png"; sourceTree = ""; }; BE7B7AFF170438D0002341F4 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; BE7B7B00170438D0002341F4 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; + BE7DC4D7175E20A90005920E /* ctfonts.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ctfonts.cxx; path = ../../../../vcl/coretext/ctfonts.cxx; sourceTree = ""; }; + BE7DC4D8175E20A90005920E /* ctfonts.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ctfonts.hxx; path = ../../../../vcl/coretext/ctfonts.hxx; sourceTree = ""; }; + BE7DC4D9175E20A90005920E /* ctlayout.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ctlayout.cxx; path = ../../../../vcl/coretext/ctlayout.cxx; sourceTree = ""; }; + BE7DC4DA175E20A90005920E /* salgdi2.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = salgdi2.cxx; path = ../../../../vcl/coretext/salgdi2.cxx; sourceTree = ""; }; BE837605170E27EC007BBC3E /* vclxmenu.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vclxmenu.cxx; path = ../../../../toolkit/source/awt/vclxmenu.cxx; sourceTree = ""; }; BE9086F616FF02B2004400A1 /* headlessinst.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = headlessinst.cxx; path = ../../../../vcl/headless/headlessinst.cxx; sourceTree = ""; }; BE9086F716FF02B2004400A1 /* svpbmp.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svpbmp.cxx; path = ../../../../vcl/headless/svpbmp.cxx; sourceTree = ""; }; @@ -67,10 +71,6 @@ BE9086FF16FF02B3004400A1 /* svptext.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svptext.cxx; path = ../../../../vcl/headless/svptext.cxx; sourceTree = ""; }; BE90870016FF02B3004400A1 /* svpvd.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svpvd.cxx; path = ../../../../vcl/headless/svpvd.cxx; sourceTree = ""; }; BE954A2E1704F9500040D517 /* iosinst.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = iosinst.cxx; path = ../../../../vcl/ios/iosinst.cxx; sourceTree = ""; }; - BEA86895170B3FC20043E44B /* salcoretextfontutils.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = salcoretextfontutils.cxx; path = ../../../../vcl/coretext/salcoretextfontutils.cxx; sourceTree = ""; }; - BEA86896170B3FC20043E44B /* salcoretextlayout.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKn
[Libreoffice-commits] core.git: 2 commits - ios/experimental vcl/coretext
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 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 = ""; }; BE08805B16FDB784000CED5C /* View.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = View.h; sourceTree = ""; }; BE08805C16FDB784000CED5C /* View.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = View.m; sourceTree = ""; }; BE2F0A0A17077A040060FE0D /* typedescriptionprovider.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = typedescriptionprovider.cxx; path = ../../../../cppuhelper/source/typedescriptionprovider.cxx; sourceTree = ""; }; @@ -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 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 ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - ios/experimental sal/osl
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 70 ++ sal/osl/unx/osxlocale.cxx| 4 2 files changed, 72 insertions(+), 2 deletions(-) New commits: commit 0b5558a68de6b9d887fd76a5ad8463116e7be4bd Author: Tor Lillqvist Date: Wed Mar 5 16:05:27 2014 +0200 Add sal source files Change-Id: Id44a5bb0dca7bc6b8d97a6d5ae26ea642043e374 diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj index 4ec246a..bf29e9a 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj @@ -184,6 +184,37 @@ BE82BDAB182190E400A447B5 /* TiledView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TiledView.m; sourceTree = ""; }; BE82BDAD1821A1D000A447B5 /* View.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = View.h; sourceTree = ""; }; BE82BDAE1821A1D000A447B5 /* View.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = View.m; sourceTree = ""; }; + BE82C38918C752E20050EB79 /* backtrace.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = backtrace.c; path = ../../../sal/osl/unx/backtrace.c; sourceTree = ""; }; + BE82C38A18C752E20050EB79 /* conditn.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = conditn.cxx; path = ../../../sal/osl/unx/conditn.cxx; sourceTree = ""; }; + BE82C38B18C752E20050EB79 /* diagnose.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = diagnose.cxx; path = ../../../sal/osl/unx/diagnose.cxx; sourceTree = ""; }; + BE82C38C18C752E20050EB79 /* file_error_transl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = file_error_transl.cxx; path = ../../../sal/osl/unx/file_error_transl.cxx; sourceTree = ""; }; + BE82C38D18C752E20050EB79 /* file_misc.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = file_misc.cxx; path = ../../../sal/osl/unx/file_misc.cxx; sourceTree = ""; }; + BE82C38E18C752E20050EB79 /* file_path_helper.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = file_path_helper.cxx; path = ../../../sal/osl/unx/file_path_helper.cxx; sourceTree = ""; }; + BE82C38F18C752E20050EB79 /* file_stat.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = file_stat.cxx; path = ../../../sal/osl/unx/file_stat.cxx; sourceTree = ""; }; + BE82C39018C752E20050EB79 /* file_url.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = file_url.cxx; path = ../../../sal/osl/unx/file_url.cxx; sourceTree = ""; }; + BE82C39118C752E20050EB79 /* file_volume.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = file_volume.cxx; path = ../../../sal/osl/unx/file_volume.cxx; sourceTree = ""; }; + BE82C39218C752E20050EB79 /* file.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = file.cxx; path = ../../../sal/osl/unx/file.cxx; sourceTree = ""; }; + BE82C39318C752E20050EB79 /* interlck.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = interlck.c; path = ../../../sal/osl/unx/interlck.c; sourceTree = ""; }; + BE82C39418C752E20050EB79 /* memory.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = memory.c; path = ../../../sal/osl/unx/memory.c; sourceTree = ""; }; + BE82C39518C752E20050EB79 /* module.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = module.cxx; path = ../../../sal/osl/unx/module.cxx; sourceTree = ""; }; + BE82C39618C752E20050EB79 /* mutex.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = mutex.c; path = ../../../sal/osl/unx/mutex.c; sourceTree = ""; }; + BE82C39718C752E20050EB79 /* nlsupport.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = nlsupport.c; path = ../../../sal/osl/unx/nlsupport.c; sourceTree = ""; }; + BE82C39818C752E20050EB79 /* osxlocale.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = osxlocale.cxx; path = ../../../sal/osl/unx/osxlocale.cxx; sourceTree = ""; }; + BE82C39918C752E20050EB79 /* pipe.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pipe.c; path = ../../../sal/osl/unx/pipe.c; sourceTree = ""; }; + BE82C39A18C752E20050EB79 /* process_impl
[Libreoffice-commits] core.git: 2 commits - ios/experimental sal/inc vcl/ios
ios/experimental/LibreOffice/LibreOffice/AppDelegate.h |5 +- ios/experimental/LibreOffice/LibreOffice/AppDelegate.m | 34 + ios/experimental/LibreOffice/LibreOffice/View.h|7 ++- ios/experimental/LibreOffice/LibreOffice/View.m| 24 sal/inc/osl/detail/ios-bootstrap.h |1 vcl/ios/iosinst.cxx| 11 + 6 files changed, 47 insertions(+), 35 deletions(-) New commits: commit e3e040f671097e1675be80e2db294ad208e0b13c Author: Tor Lillqvist Date: Sun Apr 14 01:41:28 2013 +0300 Add text input to the iOS app Don't have our View class implement the UIKeyInput protocol any more. It won't work properly anyway. The docs say: "Only a small subset of the available keyboards and languages are available to classes that adopt this protocol". Instead, use a transparent UITextView on top of our View to accept keyboard input. Seems to work as expected. Change-Id: I3093ea7fbfa0ecab0dc5d0a38e5695723e8ed4ad diff --git a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.h b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.h index c5c4560..ebc7f69 100644 --- a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.h +++ b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.h @@ -10,12 +10,13 @@ #import "View.h" -@interface AppDelegate : UIResponder +@interface AppDelegate : UIResponder @property (strong, nonatomic) UIWindow *window; @property (strong, nonatomic) View *view; -- (void) threadMainMethod: (id) argument; +- (void)threadMainMethod: (id) argument; +- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text; @end diff --git a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m index 223ccf5..a12585b 100644 --- a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m +++ b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m @@ -16,7 +16,7 @@ #import "lo.h" -static UIView *theView; +static View *theView; @implementation AppDelegate @@ -41,6 +41,12 @@ static UIView *theView; vc.view = self.view; theView = self.view; +self.view->textView = [[UITextView alloc] initWithFrame: r]; +self.view->textView.autocapitalizationType = UITextAutocapitalizationTypeNone; +self.view->textView.alpha = 0; +[self.view addSubview: self.view->textView]; +self.view->textView.delegate = self; + UITapGestureRecognizer *tapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self.view action:@selector(tapGesture:)]; [self.window addGestureRecognizer: tapRecognizer]; @@ -68,6 +74,17 @@ static UIView *theView; } } +- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text +{ +NSLog(@"textView: %@ shouldChangeTextInRange:[%u,%u] replacementText:%@", textView, range.location, range.length, text); +assert(textView == theView->textView); + +for (NSUInteger i = 0; i < [text length]; i++) +lo_keyboard_input([text characterAtIndex: i]); + +return NO; +} + - (void)applicationWillResignActive:(UIApplication *)application { (void) application; @@ -101,16 +118,17 @@ static UIView *theView; [[info objectForKey:UIKeyboardFrameBeginUserInfoKey] getValue:&frameBegin]; [[info objectForKey:UIKeyboardFrameEndUserInfoKey] getValue:&frameEnd]; + +NSLog(@"keyboardWillShow: frame:%dx%d@(%d,%d)", + (int) frameEnd.size.width, (int) frameEnd.size.height, + (int) frameEnd.origin.x, (int) frameEnd.origin.y); } - (void)keyboardDidHide:(NSNotification *)note { -NSDictionary *info = [note userInfo]; -CGRect frameBegin; -CGRect frameEnd; +(void) note; -[[info objectForKey:UIKeyboardFrameBeginUserInfoKey] getValue:&frameBegin]; -[[info objectForKey:UIKeyboardFrameEndUserInfoKey] getValue:&frameEnd]; +NSLog(@"keyboardDidHide"); lo_keyboard_did_hide(); } @@ -129,14 +147,14 @@ void lo_damaged(CGRect rect) void lo_show_keyboard() { dispatch_async(dispatch_get_main_queue(), ^{ -[theView becomeFirstResponder]; +[theView->textView becomeFirstResponder]; }); } void lo_hide_keyboard() { dispatch_async(dispatch_get_main_queue(), ^{ -[theView resignFirstResponder]; +[theView->textView resignFirstResponder]; }); } diff --git a/ios/experimental/LibreOffice/LibreOffice/View.h b/ios/experimental/LibreOffice/LibreOffice/View.h index a50b8f3..b0e8394 100644 --- a/ios/experimental/LibreOffice/LibreOffice/View.h +++ b/ios/experimental/LibreOffice/LibreOffice/View.h @@ -9,8 +9,11 @@ #import -@interface View : UIView - +@interface View : UIView +{ +@public +UITextView* textView; +} - (void)drawRect:(CGRect)rect; - (void)tapGesture:(UIGestureRecognizer *)gest