subject:"\[Libreoffice\-commits\] core.git\: ios\/experimental"

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

2017-09-24 Thread jan Iversen

 ios/experimental/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj | 
 306 ++
 ios/experimental/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.h  | 
   8 
 ios/experimental/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.mm | 
  59 +
 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 
   6 
 4 files changed, 377 insertions(+), 2 deletions(-)

New commits:
commit 3f19b593019a62d97c8739e38c32902d7e19d790
Author: jan Iversen 
Date:   Sun Sep 24 19:59:28 2017 +0200

iOS, static library.

First attempt to prelink all LO libraries into 1 static library.

With all libraries directly linking to the swift module, link time
is about 12 minutes.

Experiments let to be believe this can be reduced to 1-2 minutes
by doing prelinking, which will solve all symbols between the
libraries.

Because work will continue on the swift module, while the LoKit
is a pretty stable interface, this will save much developer time

Change-Id: I69b63481fc657f2188476f53c5b4d49abe59c5f6

diff --git 
a/ios/experimental/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
new file mode 100644
index ..ccff1022393c
--- /dev/null
+++ b/ios/experimental/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
@@ -0,0 +1,306 @@
+// !$*UTF8*$!
+{
+   archiveVersion = 1;
+   classes = {
+   };
+   objectVersion = 46;
+   objects = {
+
+/* Begin PBXBuildFile section */
+   39B5D21A1F78130F008FB162 /* LibreOfficeKit.mm in Sources */ = 
{isa = PBXBuildFile; fileRef = 39B5D2191F78130F008FB162 /* LibreOfficeKit.mm 
*/; };
+   39B5D21B1F78130F008FB162 /* LibreOfficeKit.h in CopyFiles */ = 
{isa = PBXBuildFile; fileRef = 39B5D2181F78130F008FB162 /* LibreOfficeKit.h */; 
};
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+   39B5D2131F78130F008FB162 /* CopyFiles */ = {
+   isa = PBXCopyFilesBuildPhase;
+   buildActionMask = 2147483647;
+   dstPath = "include/$(PRODUCT_NAME)";
+   dstSubfolderSpec = 16;
+   files = (
+   39B5D21B1F78130F008FB162 /* LibreOfficeKit.h in 
CopyFiles */,
+   );
+   runOnlyForDeploymentPostprocessing = 0;
+   };
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+   3969A8CA1F7826EB006F06A9 /* lo.xcconfig */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = 
lo.xcconfig; path = ../../ioswork/ios/generated/lo.xcconfig; sourceTree = 
""; };
+   39B5D2151F78130F008FB162 /* libLibreOfficeKit.a */ = {isa = 
PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = 
libLibreOfficeKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
+   39B5D2181F78130F008FB162 /* LibreOfficeKit.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LibreOfficeKit.h; 
sourceTree = ""; };
+   39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
LibreOfficeKit.mm; sourceTree = ""; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+   39B5D2121F78130F008FB162 /* Frameworks */ = {
+   isa = PBXFrameworksBuildPhase;
+   buildActionMask = 2147483647;
+   files = (
+   );
+   runOnlyForDeploymentPostprocessing = 0;
+   };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+   3969A8C91F782610006F06A9 /* Support files */ = {
+   isa = PBXGroup;
+   children = (
+   3969A8CA1F7826EB006F06A9 /* lo.xcconfig */,
+   );
+   name = "Support files";
+   sourceTree = "";
+   };
+   39B5D20C1F78130F008FB162 = {
+   isa = PBXGroup;
+   children = (
+   39B5D2171F78130F008FB162 /* LibreOfficeKit */,
+   39B5D2161F78130F008FB162 /* Products */,
+   3969A8C91F782610006F06A9 /* Support files */,
+   );
+   sourceTree = "";
+   };
+   39B5D2161F78130F008FB162 /* Products */ = {
+   isa = PBXGroup;
+   children = (
+   39B5D2151F78130F008FB162 /* libLibreOfficeKit.a 
*/,
+   );
+   name = Products;
+   sourceTree = "";

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

2017-09-24 Thread jan Iversen

 ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj 
| 2419 --
 ios/experimental/Prototype/Prototype/AppDelegate.h 
|   19 
 ios/experimental/Prototype/Prototype/AppDelegate.m 
|  128 
 
ios/experimental/Prototype/Prototype/Assets.xcassets/AppIcon.appiconset/Contents.json
  |   53 
 
ios/experimental/Prototype/Prototype/Assets.xcassets/LaunchImage.launchimage/Contents.json
 |   36 
 ios/experimental/Prototype/Prototype/Info.plist
|   41 
 ios/experimental/Prototype/Prototype/Prefix.pch
|   22 
 ios/experimental/Prototype/Prototype/ViewController.h  
|   15 
 ios/experimental/Prototype/Prototype/ViewController.m  
|   29 
 ios/experimental/Prototype/Prototype/en.lproj/InfoPlist.strings
|2 
 ios/experimental/Prototype/Prototype/lo.h  
|   21 
 ios/experimental/Prototype/Prototype/lo.mm 
|   99 
 ios/experimental/Prototype/Prototype/main.m
|   20 
 13 files changed, 2904 deletions(-)

New commits:
commit b97181e07a2adae0eb063f2192a256bcf75325e5
Author: jan Iversen 
Date:   Sun Sep 24 13:39:10 2017 +0200

iOS, removed outdated prototype

removed experiments prototype.

Change-Id: I691c82dca79c652d9a7c6078f2c69dada9034a36

diff --git a/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj 
b/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj
deleted file mode 100644
index 4f8816ae3035..
--- a/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,2419 +0,0 @@
-// !$*UTF8*$!
-{
-   archiveVersion = 1;
-   classes = {
-   };
-   objectVersion = 48;
-   objects = {
-
-/* Begin PBXBuildFile section */
-   399857461E56322300F2DA60 /* InfoPlist.strings in Resources */ = 
{isa = PBXBuildFile; fileRef = 399857441E56322300F2DA60 /* InfoPlist.strings 
*/; };
-   BE82BD7618218E2E00A447B5 /* Foundation.framework in Frameworks 
*/ = {isa = PBXBuildFile; fileRef = BE82BD7518218E2E00A447B5 /* 
Foundation.framework */; };
-   BE82BD7818218E2E00A447B5 /* CoreGraphics.framework in 
Frameworks */ = {isa = PBXBuildFile; fileRef = BE82BD7718218E2E00A447B5 /* 
CoreGraphics.framework */; };
-   BE82BD7A18218E2E00A447B5 /* UIKit.framework in Frameworks */ = 
{isa = PBXBuildFile; fileRef = BE82BD7918218E2E00A447B5 /* UIKit.framework */; 
};
-   BE82BD8018218E2E00A447B5 /* InfoPlist.strings in Resources */ = 
{isa = PBXBuildFile; fileRef = BE82BD7E18218E2E00A447B5 /* InfoPlist.strings 
*/; };
-   BE82BD8218218E2E00A447B5 /* main.m in Sources */ = {isa = 
PBXBuildFile; fileRef = BE82BD8118218E2E00A447B5 /* main.m */; };
-   BE82BD8618218E2E00A447B5 /* AppDelegate.m in Sources */ = {isa 
= PBXBuildFile; fileRef = BE82BD8518218E2E00A447B5 /* AppDelegate.m */; };
-   BE82BD8C18218E2E00A447B5 /* ViewController.m in Sources */ = 
{isa = PBXBuildFile; fileRef = BE82BD8B18218E2E00A447B5 /* ViewController.m */; 
};
-   BE82BD8E18218E2E00A447B5 /* Assets.xcassets in Resources */ = 
{isa = PBXBuildFile; fileRef = BE82BD8D18218E2E00A447B5 /* Assets.xcassets */; 
};
-   BECAB372186054DE00F814F9 /* lo.mm in Sources */ = {isa = 
PBXBuildFile; fileRef = BECAB371186054DE00F814F9 /* lo.mm */; };
-   BED2593F18F6B87900C94C72 /* ImageIO.framework in Frameworks */ 
= {isa = PBXBuildFile; fileRef = BED2593E18F6B87900C94C72 /* ImageIO.framework 
*/; };
-   BED2594118F6B89000C94C72 /* MobileCoreServices.framework in 
Frameworks */ = {isa = PBXBuildFile; fileRef = BED2594018F6B89000C94C72 /* 
MobileCoreServices.framework */; };
-   BEEE02D11860ABDB00FBDE67 /* program in Resources */ = {isa = 
PBXBuildFile; fileRef = BEEE02CE1860ABB700FBDE67 /* program */; };
-   BEEE02D21860ABDB00FBDE67 /* share in Resources */ = {isa = 
PBXBuildFile; fileRef = BEEE02CF1860ABB700FBDE67 /* share */; };
-   BEEE02D31860ABDB00FBDE67 /* services in Resources */ = {isa = 
PBXBuildFile; fileRef = BEEE02D01860ABB700FBDE67 /* services */; };
-   BEEEFE011860A89100FBDE67 /* fundamentalrc in Resources */ = 
{isa = PBXBuildFile; fileRef = BEEEF96D1860A82900FBDE67 /* fundamentalrc */; };
-   BEEEFE021860A89100FBDE67 /* offapi.rdb in Resources */ = {isa = 
PBXBuildFile; fileRef = BEEEF96E1860A82900FBDE67 /* offapi.rdb */; };
-   BEEEFE031860A89100FBDE67 /* oovbaapi.rdb in Resources */ = {isa 
= PBXBuildFile; fileRef = BEEEF96F1860A82900FBDE67 /* oovbaapi.rdb */; };
-

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

2017-06-22 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift |  
 85 ++-
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard |  
108 ++
 2 files changed, 95 insertions(+), 98 deletions(-)

New commits:
commit fc50502af935d6d551fcc74712cf32f2fcdce6a4
Author: jan Iversen 
Date:   Mon Jun 19 08:27:25 2017 +0200

iOS, update menus for menu picker

Change-Id: Idb4ee77ed83c17f8040cf1a5852ae1ac8fa855d6

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
index 4016bfc1d81c..b9cdc1e12e55 100755
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
@@ -11,15 +11,24 @@ import UIKit
 
 class DocumentController: UIViewController, MenuDelegate, 
UIDocumentPickerDelegate
 {
+var currentDocumentName : String?
+var currentCloudUrl : URL?
+
+
 public func documentPicker(_ controller: UIDocumentPickerViewController, 
didPickDocumentAt url: URL)
 {
+currentCloudUrl = url
+currentDocumentName = url.lastPathComponent
 }
 
 func documentPickerWasCancelled(_ controller: 
UIDocumentPickerViewController)
 {
+currentCloudUrl = nil
+currentDocumentName = nil
 }
 
 
+@IBOutlet weak var janTest: UILabel!
 
 
 // Show sidemenu (part of documentcontroller)
@@ -76,6 +85,13 @@ class DocumentController: UIViewController, MenuDelegate, 
UIDocumentPickerDelega
 
 
 
+func actionName(_ name : String)
+{
+currentDocumentName = name
+}
+
+
+
 func actionMenuSelected(_ tag : Int)
 {
 switch tag
@@ -93,30 +109,29 @@ class DocumentController: UIViewController, MenuDelegate, 
UIDocumentPickerDelega
 print("menu Save to be done")
 
 case 4: // Save as...
-print("menu Save as... to be done")
+let vc = storyboard?.instantiateViewController(withIdentifier: 
"setNameAction") as! setNameAction
+vc.modalPresentationStyle = .popover
+vc.delegate = self
+let popover = vc.popoverPresentationController!
+popover.delegate = self as? 
UIPopoverPresentationControllerDelegate
+popover.permittedArrowDirections = .up
+popover.sourceView = janTest
+popover.sourceRect = janTest.bounds
+present(vc, animated: true, completion: nil)
 
+print("menu Save as... to be done")
 case 5: // Save as PDF...
 print("menu Save as PDF... to be done")
 
 case 6: // Print...
 print("menu Print... to be done")
 
-case 7: // Copy TO iPad
-print("menu Copy TO iPad to be done")
-
-case 8: // Delete FROM iPad
-print("menu Delete FROM iPad to be done")
-
-case 9: // Move FROM iPad
-print("menu Move FROM iPad to be done")
-
 default: // should not happen
 print("unknown menu" + String(tag))
 }
 }
 
 
-
 override func viewDidLoad()
 {
 super.viewDidLoad()
@@ -142,6 +157,7 @@ class DocumentController: UIViewController, MenuDelegate, 
UIDocumentPickerDelega
 protocol MenuDelegate
 {
 func actionMenuSelected(_ tag : Int)
+func actionName(_ name : String)
 }
 
 
@@ -159,13 +175,9 @@ class DocumentActions: UITableViewController
 @IBOutlet weak var buttonSaveAs: UIButton!
 @IBOutlet weak var buttonSaveAsPDF: UIButton!
 @IBOutlet weak var buttonPrint: UIButton!
-@IBOutlet weak var buttonCopyTOiPad: UIButton!
-@IBOutlet weak var buttonDeleteFROMiPad: UIButton!
-@IBOutlet weak var buttonMoveFROMiPad: UIButton!
 
 
 
-// Actions
 @IBAction func actionMenuSelect(_ sender: UIButton)
 {
 dismiss(animated: false)
@@ -176,7 +188,6 @@ class DocumentActions: UITableViewController
 override func viewDidLoad()
 {
 super.viewDidLoad()
-buttonDeleteFROMiPad.isEnabled = isDocActive
 buttonSave.isEnabled = isDocActive
 buttonSaveAs.isEnabled = isDocActive
 buttonSaveAsPDF.isEnabled = isDocActive
@@ -184,3 +195,45 @@ class DocumentActions: UITableViewController
 }
 }
 
+
+
+class setNameAction: UIViewController
+{
+// Pointer to callback class
+var delegate  : MenuDelegate?
+var didEdit : Bool = false
+
+// reference to new name
+@IBOutlet weak var editText: UITextField!
+
+
+// continue "save as..." with new name
+@IBAction func actionOK(_ sender: UIButton)
+{
+dismiss(animated: false)
+if didEdit && editText.text != "" {
+delegate?.actionName(editText.text!)
+}
+}
+
+
+@IBAction func actionStartEdit(_ sender: UITextField)
+{

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

2017-06-07 Thread jan Iversen

 dev/null   
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/base_app.dataset/Contents.json
 |   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/calc_app.dataset/Contents.json
 |   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/database.dataset/Contents.json
 |   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/draw_app.dataset/Contents.json
 |   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/impress_app.dataset/Contents.json
  |   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/math_app.dataset/Contents.json
 |   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-empty-document.dataset/Contents.json
 |   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oasis-empty-template.dataset/Contents.json
 |   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/ooo3_base_app.dataset/Contents.json
|   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/ooo3_calc_app.dataset/Contents.json
|   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/ooo3_draw_app.dataset/Contents.json
|   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/ooo3_impress_app.dataset/Contents.json
 |   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/ooo3_main_app.dataset/Contents.json
|   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/ooo3_math_app.dataset/Contents.json
|   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/ooo3_open.dataset/Contents.json
|   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/ooo3_writer_app.dataset/Contents.json
  |   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/oxt-extension.dataset/Contents.json
|   12 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/writer_app.dataset/Contents.json
   |   12 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist  
  |  142 +++---
 20 files changed, 53 insertions(+), 305 deletions(-)

New commits:
commit 1e30c98eec13b988617332d9f147046c9f80f956
Author: jan Iversen 
Date:   Tue Jun 6 18:22:32 2017 +0200

iOS, clean up document types to support.

Icons removed, which will be unused

Change-Id: Ibfd4be71ea3ae22bea8be61f7151312c5864429c

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/base_app.dataset/Contents.json
 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/base_app.dataset/Contents.json
deleted file mode 100644
index ce1f8383bd4b..
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/base_app.dataset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "info" : {
-"version" : 1,
-"author" : "xcode"
-  },
-  "data" : [
-{
-  "idiom" : "universal",
-  "filename" : "base_app.ico"
-}
-  ]
-}
\ No newline at end of file
diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/base_app.dataset/base_app.ico
 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/base_app.dataset/base_app.ico
deleted file mode 100644
index 97b6110b3451..
Binary files 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/base_app.dataset/base_app.ico
 and /dev/null differ
diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/calc_app.dataset/Contents.json
 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/calc_app.dataset/Contents.json
deleted file mode 100644
index 0cc61edd5dd6..
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/calc_app.dataset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "info" : {
-"version" : 1,
-"author" : "xcode"
-  },
-  "data" : [
-{
-  "idiom" : "universal",
-  "filename" : "calc_app.ico"
-}
-  ]
-}
\ No newline at end of file
diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.icons/calc_app.dataset/calc_app.ico

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

2017-06-06 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 
   4 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist| 
1591 +-
 2 files changed, 1528 insertions(+), 67 deletions(-)

New commits:
commit 8d998ae06a742033d4a343e6daae7285a2a3207b
Author: jan Iversen 
Date:   Tue Jun 6 16:14:45 2017 +0200

iOS added all known document types.

Update Info.plist to contain the same document types as
used for osX

Change-Id: I3338ca0159c39ef8bd31466e3d9b9a73808b86b8

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 9cedf95931b5..5fd944e6ce64 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -24,7 +24,6 @@
3992D85A1E5B762A00BEA987 /* DocumentController.swift in Sources 
*/ = {isa = PBXBuildFile; fileRef = 3992D8591E5B762A00BEA987 /* 
DocumentController.swift */; };
3992D85D1E5B764A00BEA987 /* SideMenu.swift in Sources */ = {isa 
= PBXBuildFile; fileRef = 3992D85B1E5B764A00BEA987 /* SideMenu.swift */; };
399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 399648461E5B87DC00E73E83 /* 
ViewProperties.swift */; };
-   39A3A88F1EE6D424007C05E1 /* default-5...@2x.png in Resources */ 
= {isa = PBXBuildFile; fileRef = 39A3A88E1EE6D424007C05E1 /* 
default-5...@2x.png */; };
39B08B9D1E5F0BB600682A59 /* fundamentalrc in Resources */ = 
{isa = PBXBuildFile; fileRef = 39B084E51E5F0BB400682A59 /* fundamentalrc */; };
39B08B9E1E5F0BB600682A59 /* offapi.rdb in Resources */ = {isa = 
PBXBuildFile; fileRef = 39B084E61E5F0BB400682A59 /* offapi.rdb */; };
39B08B9F1E5F0BB600682A59 /* oovbaapi.rdb in Resources */ = {isa 
= PBXBuildFile; fileRef = 39B084E71E5F0BB400682A59 /* oovbaapi.rdb */; };
@@ -76,7 +75,6 @@
3992D8591E5B762A00BEA987 /* DocumentController.swift */ = {isa 
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; 
name = DocumentController.swift; path = 
LibreOfficeLight/DocumentController.swift; sourceTree = SOURCE_ROOT; };
3992D85B1E5B764A00BEA987 /* SideMenu.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= SideMenu.swift; path = LibreOfficeLight/SideMenu.swift; sourceTree = 
SOURCE_ROOT; };
399648461E5B87DC00E73E83 /* ViewProperties.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewProperties.swift; path = LibreOfficeLight/ViewProperties.swift; 
sourceTree = SOURCE_ROOT; };
-   39A3A88E1EE6D424007C05E1 /* default-5...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = "default-5...@2x.png"; 
sourceTree = ""; };
39B084E21E5F0A9600682A59 /* lo.xcconfig */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = 
lo.xcconfig; path = ../../ioswork/ios/generated/lo.xcconfig; sourceTree = 
SOURCE_ROOT; };
39B084E51E5F0BB400682A59 /* fundamentalrc */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = 
fundamentalrc; path = ../../ioswork/ios/resources/fundamentalrc; sourceTree = 
SOURCE_ROOT; };
39B084E61E5F0BB400682A59 /* offapi.rdb */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = offapi.rdb; path = 
../../ioswork/ios/resources/offapi.rdb; sourceTree = SOURCE_ROOT; };
@@ -137,7 +135,6 @@
397E08F11E597BD8001374E0 = {
isa = PBXGroup;
children = (
-   39A3A88E1EE6D424007C05E1 /* default-5...@2x.png 
*/,
39B084E41E5F0B5200682A59 /* Resources */,
3911D89F1E5993600050D6BC /* Support files */,
397E08FC1E597BD8001374E0 /* LibreOfficeLight */,
@@ -334,7 +331,6 @@
39022C1B1EDC2A0E00100066 /* program in 
Resources */,
39022C1D1EDC2A2C00100066 /* services in 
Resources */,
397868D61E59A3EA007F9248 /* LaunchScreen.xib in 
Resources */,
-   39A3A88F1EE6D424007C05E1 /* default-5...@2x.png 
in Resources */,
396F92F71E7AE62400A28C82 /* Settings.bundle in 
Resources */,
39B08B9F1E5F0BB600682A59 /* oovbaapi.rdb in 
Resources */,
39B08B9D1E5F0BB600682A59 /* fundamentalrc in 
Resources */,
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist

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

2017-06-03 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 
  12 +++---
 ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift | 
  10 ++--
 ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist| 
   4 +--
 3 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit a318fc479cf7255a7fdf12f578b8c3199eda5367
Author: jan Iversen 
Date:   Tue May 30 14:15:27 2017 +0200

iOS, prepare for arm architecture

Need arm46, armv7 and i386

Change-Id: Idd72ca070c98974cc31833839e8eaf64ab5ced03

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 78b070b5ef71..8162ef593d64 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -442,6 +442,7 @@
baseConfigurationReference = 39B084E21E5F0A9600682A59 
/* lo.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+   ARCHS = "$(ARCHS_STANDARD)";
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
@@ -509,6 +510,7 @@
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TARGETED_DEVICE_FAMILY = "1,2";
+   VALID_ARCHS = "$(ARCHS_STANDARD)";
};
name = Debug;
};
@@ -517,6 +519,7 @@
baseConfigurationReference = 39B084E21E5F0A9600682A59 
/* lo.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+   ARCHS = "$(ARCHS_STANDARD)";
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
@@ -536,7 +539,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone 
Developer";
COPY_PHASE_STRIP = NO;
-   DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+   DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -578,6 +581,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
+   VALID_ARCHS = "$(ARCHS_STANDARD)";
};
name = Release;
};
@@ -585,6 +589,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 39B084E21E5F0A9600682A59 
/* lo.xcconfig */;
buildSettings = {
+   ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
@@ -603,7 +608,7 @@
SWIFT_OBJC_BRIDGING_HEADER = 
"LibreOfficeLight/lokit-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
-   VALID_ARCHS = i386;
+   VALID_ARCHS = "$(ARCHS_STANDARD)";
};
name = Debug;
};
@@ -611,6 +616,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 39B084E21E5F0A9600682A59 
/* lo.xcconfig */;
buildSettings = {
+   ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
@@ -629,7 +635,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = 
"LibreOfficeLight/lokit-Bridging-Header.h";
SWIFT_VERSION = 3.0;
-   VALID_ARCHS = i386;
+

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

2017-06-03 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift|  
  7 +
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard |  
  8 +++---
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.mm |  
 12 +-
 3 files changed, 8 insertions(+), 19 deletions(-)

New commits:
commit 73e64e295d97d16e6e63e3182a5ad336969f7866
Author: jan Iversen 
Date:   Tue May 30 07:53:44 2017 +0200

iOS, upgrade and moved LOKit_init.

Upgrade to new version of frameworks.

Moved LOKit_init to "didFinishLaunching" to "DidBecomeActive"

Change-Id: I2f805c4a9d21b049362fec1ec5258496b9505260

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
index 97693370478a..a1e97161d873 100644
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
@@ -23,9 +23,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate
 
 func application(_ application: UIApplication, 
didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: 
Any]?) -> Bool
 {
-// start LibreOfficeKit
-BridgeLOkit_Init(Bundle.main.bundlePath)
-
 // Get version info
 let appInfo = Bundle.main.infoDictionary! as 
Dictionary
 let applicationVersion = (appInfo["CFBundleShortVersionString"] as! 
String) + "." +
@@ -75,8 +72,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate
 
 func applicationDidBecomeActive(_ application: UIApplication)
 {
-// Restart any tasks that were paused (or not yet started) while the 
application was inactive.
-// If the application was previously in the background, optionally 
refresh the user interface.
+// start LibreOfficeKit
+BridgeLOkit_Init(Bundle.main.bundlePath)
 }
 
 
diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
index 7bf3f6963421..bae2722a17fa 100755
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 
-
+
 
 
 
 
 
-
+
 
 
 
@@ -741,7 +741,7 @@
 
 
 
-
-
+
+
 
 
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.mm 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.mm
index e3ba0ac91432..a0c9c0b6eedd 100755
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.mm
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.mm
@@ -36,16 +36,8 @@ extern "C" int BridgeLOkit_Init(const char *path)
 strcpy(bufUserPath + strlen(path), "/user");
 
 // Initialize LibreOfficeKit
-kit = lok_init_2(path, bufUserPath);
-
-udata_setCommonData(NULL, NULL);
-ucnv_open("iso-8859-3", NULL);
-
-ucnv_getName(NULL,NULL);
-ucnv_close(NULL);
-osl_setCommandArgs(8, NULL);
-kit->pClass->documentLoad(kit, NULL);
-document->pClass->initializeForRendering(document, "");
+if (!kit)
+  kit = lok_init_2(path, bufUserPath);
 return 0;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-05-29 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj  
|   38 +-
 ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift  
|2 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/InfoPlist.strings 
|2 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h
|4 -
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.mm   
|   28 ++-
 5 files changed, 48 insertions(+), 26 deletions(-)

New commits:
commit 30da68bc7b42a960ac0bcb38ed5b82cce9af1ef0
Author: jan Iversen 
Date:   Mon May 29 11:06:59 2017 +0200

iOS, LOkit link problems solved

.swift -> .c -> LibreOfficeKit
does not work (LOkit is compiled with C++)
changed to
.swift -> .mm -> LibreOfficeKit

Change-Id: I4d4684876ca21534389189a431fcaadbbac78d3f

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 2b395c08a596..31a667b88560 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
objects = {
 
 /* Begin PBXBuildFile section */
+   39022C181EDC142F00100066 /* lokit.mm in Sources */ = {isa = 
PBXBuildFile; fileRef = 39022C171EDC142F00100066 /* lokit.mm */; };
392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources 
*/ = {isa = PBXBuildFile; fileRef = 392ED9B21E5E4B03005C8435 /* 
ViewPrintManager.swift */; };
396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */ = 
{isa = PBXBuildFile; fileRef = 396F92F61E7AE62400A28C82 /* Settings.bundle */; 
};
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = 
{isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; 
};
@@ -19,8 +20,6 @@
3992D85D1E5B764A00BEA987 /* SideMenu.swift in Sources */ = {isa 
= PBXBuildFile; fileRef = 3992D85B1E5B764A00BEA987 /* SideMenu.swift */; };
3992D85E1E5B764A00BEA987 /* FileManagerController.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = 3992D85C1E5B764A00BEA987 /* 
FileManagerController.swift */; };
399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 399648461E5B87DC00E73E83 /* 
ViewProperties.swift */; };
-   39A83A8F1E5F471D00D0C683 /* lokit.c in Sources */ = {isa = 
PBXBuildFile; fileRef = 39A83A8E1E5F471D00D0C683 /* lokit.c */; };
-   39B084E31E5F0A9600682A59 /* lo.xcconfig in Resources */ = {isa 
= PBXBuildFile; fileRef = 39B084E21E5F0A9600682A59 /* lo.xcconfig */; };
39B08B9D1E5F0BB600682A59 /* fundamentalrc in Resources */ = 
{isa = PBXBuildFile; fileRef = 39B084E51E5F0BB400682A59 /* fundamentalrc */; };
39B08B9E1E5F0BB600682A59 /* offapi.rdb in Resources */ = {isa = 
PBXBuildFile; fileRef = 39B084E61E5F0BB400682A59 /* offapi.rdb */; };
39B08B9F1E5F0BB600682A59 /* oovbaapi.rdb in Resources */ = {isa 
= PBXBuildFile; fileRef = 39B084E71E5F0BB400682A59 /* oovbaapi.rdb */; };
@@ -48,6 +47,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+   39022C171EDC142F00100066 /* lokit.mm */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; 
path = lokit.mm; sourceTree = ""; };
+   39022C191EDC14D300100066 /* lokit-Bridging-Header.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
"lokit-Bridging-Header.h"; sourceTree = ""; };
392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift; 
sourceTree = SOURCE_ROOT; };
396F92F61E7AE62400A28C82 /* Settings.bundle */ = {isa = 
PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = 
Settings.bundle; sourceTree = ""; };
397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */ = 
{isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = 
LibreOfficeLight.entitlements; sourceTree = ""; };
@@ -67,8 +68,6 @@
3992D85B1E5B764A00BEA987 /* SideMenu.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= SideMenu.swift; path = LibreOfficeLight/SideMenu.swift; sourceTree = 
SOURCE_ROOT; };
3992D85C1E5B764A00BEA987 /* FileManagerController.swift */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.swift; name = FileManagerController.swift; path = 
LibreOfficeLight/FileManagerController.swift; sourceTree = SOURCE_ROOT; };
399648461E5B87DC00E73E83 /*

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

2017-05-03 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 
   8 
 ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj   | 
   8 
 2 files changed, 16 deletions(-)

New commits:
commit 9632aa6372174a66c5d8789192d264fb335307b5
Author: jan Iversen 
Date:   Wed May 3 16:28:32 2017 +0200

iOS update due to new icu

The new icu version does not have the .dat file

Change-Id: Ia48f4f9dc9564c309bc8afd86c4c0babc35e1a8a

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index e7209f726fa7..2b395c08a596 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -28,8 +28,6 @@
39B08BD91E5F0BB600682A59 /* services.rdb in Resources */ = {isa 
= PBXBuildFile; fileRef = 39B085241E5F0BB400682A59 /* services.rdb */; };
39B091CD1E5F0BB800682A59 /* udkapi.rdb in Resources */ = {isa = 
PBXBuildFile; fileRef = 39B08B9B1E5F0BB600682A59 /* udkapi.rdb */; };
39B091CE1E5F0BB800682A59 /* unorc in Resources */ = {isa = 
PBXBuildFile; fileRef = 39B08B9C1E5F0BB600682A59 /* unorc */; };
-   39B091D01E5F102E00682A59 /* test1.odt in Resources */ = {isa = 
PBXBuildFile; fileRef = 39B091CF1E5F102E00682A59 /* test1.odt */; };
-   39B091D21E5F109A00682A59 /* icudt58l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = 39B091D11E5F109A00682A59 /* icudt58l.dat */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -79,8 +77,6 @@
39B085241E5F0BB400682A59 /* services.rdb */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = 
services.rdb; path = "../../../../ios-work/workdir/ios/resources/services.rdb"; 
sourceTree = SOURCE_ROOT; };
39B08B9B1E5F0BB600682A59 /* udkapi.rdb */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = udkapi.rdb; path = 
"../../../../ios-work/workdir/ios/resources/udkapi.rdb"; sourceTree = 
SOURCE_ROOT; };
39B08B9C1E5F0BB600682A59 /* unorc */ = {isa = PBXFileReference; 
fileEncoding = 4; lastKnownFileType = text; name = unorc; path = 
"../../../../ios-work/workdir/ios/resources/unorc"; sourceTree = SOURCE_ROOT; };
-   39B091CF1E5F102E00682A59 /* test1.odt */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = test1.odt; path = 
../../../odk/examples/java/DocumentHandling/test/test1.odt; sourceTree = 
SOURCE_ROOT; };
-   39B091D11E5F109A00682A59 /* icudt58l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt58l.dat; path = 
"../../../../ios-work/workdir/UnpackedTarball/icu/source/data/in/icudt58l.dat"; 
sourceTree = ""; };
39B092501E5F3DEA00682A59 /* LibreOfficeLight-Prefix.pch */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; 
path = "LibreOfficeLight-Prefix.pch"; sourceTree = ""; };
 /* End PBXFileReference section */
 
@@ -198,8 +194,6 @@
39B085241E5F0BB400682A59 /* services.rdb */,
39B08B9B1E5F0BB600682A59 /* udkapi.rdb */,
39B08B9C1E5F0BB600682A59 /* unorc */,
-   39B091CF1E5F102E00682A59 /* test1.odt */,
-   39B091D11E5F109A00682A59 /* icudt58l.dat */,
);
name = Resources;
sourceTree = SOURCE_ROOT;
@@ -320,7 +314,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
-   39B091D21E5F109A00682A59 /* icudt58l.dat in 
Resources */,
397E09081E597BD8001374E0 /* Assets.xcassets in 
Resources */,
39B08BD71E5F0BB600682A59 /* rc in Resources */,
39B08B9E1E5F0BB600682A59 /* offapi.rdb in 
Resources */,
@@ -331,7 +324,6 @@
39B08B9D1E5F0BB600682A59 /* fundamentalrc in 
Resources */,
39B091CD1E5F0BB800682A59 /* udkapi.rdb in 
Resources */,
39B08BD91E5F0BB600682A59 /* services.rdb in 
Resources */,
-   39B091D01E5F102E00682A59 /* test1.odt in 
Resources */,
39B091CE1E5F0BB800682A59 /* unorc in Resources 
*/,
397E09031E597BD8001374E0 /* Main.storyboard in 
Resources */,
);
diff --git a/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj 
b/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj
index b18259fcd1ec..de64d4b9c8aa 100644
---

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

2017-04-05 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 
  14 +++---
 ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj   | 
  10 +++
 2 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 12df2eed431b89a2e77d5f5d577daabb04f81edc
Author: jan Iversen 
Date:   Wed Apr 5 09:30:51 2017 +0200

iOS make build work with 10.3 and simulator

Solved architecture problem

Change-Id: Ibc6bc5864da5585388862dd92a6039db16c9ccf2

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 69d042885342..e7209f726fa7 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -561,7 +561,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 39B084E21E5F0A9600682A59 
/* lo.xcconfig */;
buildSettings = {
-   ARCHS = "$(ARCHS_STANDARD)";
+   ARCHS = (
+   "$(ARCHS_STANDARD)",
+   i386,
+   );
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
@@ -579,7 +582,7 @@
SWIFT_OBJC_BRIDGING_HEADER = 
"LibreOfficeLight/lokit-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
-   "VALID_ARCHS[sdk=*]" = arm64;
+   VALID_ARCHS = "i386 $(ARCHS_STANDARD)";
};
name = Debug;
};
@@ -587,7 +590,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 39B084E21E5F0A9600682A59 
/* lo.xcconfig */;
buildSettings = {
-   ARCHS = "$(ARCHS_STANDARD)";
+   ARCHS = (
+   "$(ARCHS_STANDARD)",
+   i386,
+   );
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
@@ -605,7 +611,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = 
"LibreOfficeLight/lokit-Bridging-Header.h";
SWIFT_VERSION = 3.0;
-   "VALID_ARCHS[sdk=*]" = arm64;
+   VALID_ARCHS = "i386 $(ARCHS_STANDARD)";
};
name = Release;
};
diff --git a/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj 
b/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj
index 3ff4146ef291..b18259fcd1ec 100644
--- a/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj
+++ b/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj
@@ -2365,6 +2365,10 @@
BE82BDA518218E2E00A447B5 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+   ARCHS = (
+   i386,
+   "$(ARCHS_STANDARD)",
+   );
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = 
LaunchImage;
ENABLE_BITCODE = NO;
@@ -2372,6 +2376,7 @@
GCC_PREFIX_HEADER = Prototype/Prefix.pch;
INFOPLIST_FILE = Prototype/Info.plist;
PRODUCT_NAME = "$(TARGET_NAME)";
+   VALID_ARCHS = "i386 $(ARCHS_STANDARD)";
WRAPPER_EXTENSION = app;
};
name = Debug;
@@ -2379,6 +2384,10 @@
BE82BDA618218E2E00A447B5 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+   ARCHS = (
+   i386,
+   "$(ARCHS_STANDARD)",
+   );
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

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

2017-04-02 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj   
|   17 --
 ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift   
|7 ++--
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/.xccurrentversion
 |5 --
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h 
|4 +-
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c 
|4 +-
 5 files changed, 9 insertions(+), 28 deletions(-)

New commits:
commit a52f3310a6d84fcfffcc49016bbec35bfb6ee5e8
Author: jan Iversen 
Date:   Wed Mar 22 16:32:02 2017 +0100

iOS LibreOfficeLight Activate LibreOfficeKit

Prepare for viewing functionality.

Change-Id: I4960938fdc7bf6955096c96cc7f56792c64c6641

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index cf301c36063e..69d042885342 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -12,7 +12,6 @@
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = 
{isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; 
};
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift 
*/; };
397E09031E597BD8001374E0 /* Main.storyboard in Resources */ = 
{isa = PBXBuildFile; fileRef = 397E09011E597BD8001374E0 /* Main.storyboard */; 
};
-   397E09061E597BD8001374E0 /* LibreOfficeLight.xcdatamodeld in 
Sources */ = {isa = PBXBuildFile; fileRef = 397E09041E597BD8001374E0 /* 
LibreOfficeLight.xcdatamodeld */; };
397E09081E597BD8001374E0 /* Assets.xcassets in Resources */ = 
{isa = PBXBuildFile; fileRef = 397E09071E597BD8001374E0 /* Assets.xcassets */; 
};
397E09161E597BD8001374E0 /* LibreOfficeLightTests.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = 397E09151E597BD8001374E0 /* 
LibreOfficeLightTests.swift */; };
397E09211E597BD8001374E0 /* LibreOfficeLightUITests.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = 397E09201E597BD8001374E0 /* 
LibreOfficeLightUITests.swift */; };
@@ -58,7 +57,6 @@
397E08FA1E597BD8001374E0 /* LibreOfficeLight.app */ = {isa = 
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; 
path = LibreOfficeLight.app; sourceTree = BUILT_PRODUCTS_DIR; };
397E08FD1E597BD8001374E0 /* AppDelegate.swift */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.swift; name = 
AppDelegate.swift; path = LibreOfficeLight/AppDelegate.swift; sourceTree = 
SOURCE_ROOT; };
397E09021E597BD8001374E0 /* en */ = {isa = PBXFileReference; 
lastKnownFileType = file.storyboard; name = en; path = 
en.lproj/Main.storyboard; sourceTree = ""; };
-   397E09051E597BD8001374E0 /* LibreOfficeLight.xcdatamodel */ = 
{isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = 
LibreOfficeLight.xcdatamodel; sourceTree = ""; };
397E09071E597BD8001374E0 /* Assets.xcassets */ = {isa = 
PBXFileReference; lastKnownFileType = folder.assetcatalog; name = 
Assets.xcassets; path = LibreOfficeLight/Assets.xcassets; sourceTree = 
SOURCE_ROOT; };
397E090C1E597BD8001374E0 /* Info.plist */ = {isa = 
PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = 
LibreOfficeLight/Info.plist; sourceTree = SOURCE_ROOT; };
397E09111E597BD8001374E0 /* LibreOfficeLightTests.xctest */ = 
{isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 
0; path = LibreOfficeLightTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -118,7 +116,6 @@
397275391E77D9F1006ACDCC /* 
LibreOfficeLight.entitlements */,
39B084E21E5F0A9600682A59 /* lo.xcconfig */,
397E09071E597BD8001374E0 /* Assets.xcassets */,
-   397E09041E597BD8001374E0 /* 
LibreOfficeLight.xcdatamodeld */,
397E090C1E597BD8001374E0 /* Info.plist */,
396F92F61E7AE62400A28C82 /* Settings.bundle */,
);
@@ -362,7 +359,6 @@
buildActionMask = 2147483647;
files = (
392ED9B31E5E4B03005C8435 /* 
ViewPrintManager.swift in Sources */,
-   397E09061E597BD8001374E0 /* 
LibreOfficeLight.xcdatamodeld in Sources */,
3992D85D1E5B764A00BEA987 /* SideMenu.swift in 
Sources

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

2017-03-27 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist| 
 293 +-
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/LaunchScreen.xib | 
   4 
 2 files changed, 289 insertions(+), 8 deletions(-)

New commits:
commit 5df2465c2c1b15363e46d4a67cd810c7d1f661f2
Author: jan Iversen 
Date:   Mon Mar 20 18:21:30 2017 +0100

iOS LibreOfficeLight "open in"

Added pdf, microsoft to know document types.

Created new UTI for ODF documents.

Change-Id: I8037724e6575756bd586c490618cba6954d9fb31

diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist
index 416af5951632..b65394198954 100755
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist
@@ -8,14 +8,122 @@


CFBundleTypeName
-   ODF-Document
+   DOCX Microsoft Word
+   CFBundleTypeRole
+   Editor
LSHandlerRank
Owner
LSItemContentTypes

-   com.odf.doc
-   com.odf.calc
-   com.odf.impress
+   com.jani.Editors.docx
+   
+   
+   
+   CFBundleTypeName
+   DOC Microsoft Word
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+   LSItemContentTypes
+   
+   com.jani.Editors.doc
+   
+   
+   
+   CFBundleTypeName
+   XLSX Microsoft Excel
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+   LSItemContentTypes
+   
+   com.jani.Editors.xlsx
+   
+   
+   
+   CFBundleTypeName
+   XLS Microsoft Excel
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+   LSItemContentTypes
+   
+   com.jani.Editors.xls
+   
+   
+   
+   CFBundleTypeName
+   PPTX Microsoft PowerPoint
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+   LSItemContentTypes
+   
+   com.jani.Editors.pptx
+   
+   
+   
+   CFBundleTypeName
+   PPT Microsoft PowerPoint
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+   LSItemContentTypes
+   
+   com.jani.Editors.ppt
+   
+   
+   
+   CFBundleTypeName
+   PDF Adobe pdf
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+   LSItemContentTypes
+   
+   com.jani.Editors.pdf
+   
+   
+   
+   CFBundleTypeName
+   ODT LibreOffice writer
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+   LSItemContentTypes
+   
+   com.jani.Editors.odt
+   
+   
+   
+   CFBundleTypeName
+   ODS LibreOffice calc
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+   LSItemContentTypes
+   
+   com.jani.Editors.ods
+   
+   
+   
+   CFBundleTypeName
+   ODP LibeOffice Impress
+   CFBundleTypeRole
+   Editor
+   LSHandlerRank
+   Owner
+

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

2017-03-27 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift 
|   12 --
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
|4 +--
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 6f968f00b1534406a2943be374fab924c3396482
Author: jan Iversen 
Date:   Mon Mar 20 12:42:01 2017 +0100

iOS LibreOfficeLight FileManager title

Show current directory as title, together with info
whether it is local or iCloud

Change-Id: Icb4d68e5c21589456ea276e9e11d191dd3714d14

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
index 03003fd699b2..49fdf41ae1ed 100755
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
@@ -92,6 +92,15 @@ private class FileStorage
 
 
 
+func getDirectory() -> String
+{
+let myCurDir = currentDir.path
+let myLen= currentDocPath!.path.endIndex
+return (myLen == myCurDir.endIndex) ? "/" : myCurDir.substring(from: 
myLen)
+}
+
+
+
 func createDirectory(_ name: String)
 {
 let newDir = currentDir.appendingPathComponent(name)
@@ -331,10 +340,9 @@ class FileManagerController : UITableViewController, 
FileActionsControlDelegate
 // Support function
 func reloadData()
 {
-selectedRow = nil
+title = (fileData.selectStorage(false) ? "Local - " : "iCloud - ") + 
fileData.getDirectory()
 tableView.reloadData()
 }
-
 }
 
 
diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
index 01a75ba0292f..7bf3f6963421 100755
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
@@ -48,7 +48,7 @@
 
 
 
-
+
 
 
 
@@ -93,7 +93,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-26 Thread jan Iversen

 dev/null   
  |binary
 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj   
  |8 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift   
  |   10 -
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
  |   91 +++--
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/pdf.imageset/Contents.json
|   23 --
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/print.imageset/Contents.json
  |   23 --
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/properties.imageset/Contents.json
 |   23 --
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/save.imageset/Contents.json
   |   23 --
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/saveas.imageset/Contents.json
 |   23 --
 ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
  |   48 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist  
  |4 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/LO.swift
  |   40 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/SideMenu.swift  
  |   30 +--
 ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewController.swift
  |   99 --
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
  |   67 +++---
 15 files changed, 178 insertions(+), 334 deletions(-)

New commits:
commit 595e3971b130addbc6e5b749f53fc681fa6bc031
Author: jan Iversen 
Date:   Sun Mar 19 19:22:30 2017 +0100

iOS LibreOfficeLight reactivate sidemenu

Reactivate side menu in DocumentController
removed unused png files

Change-Id: Ib7da718f53370d6a8a3c82d6850817ea7bc12abc
Reviewed-on: https://gerrit.libreoffice.org/35675
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 6fe0b9801a43..cf301c36063e 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -16,12 +16,10 @@
397E09081E597BD8001374E0 /* Assets.xcassets in Resources */ = 
{isa = PBXBuildFile; fileRef = 397E09071E597BD8001374E0 /* Assets.xcassets */; 
};
397E09161E597BD8001374E0 /* LibreOfficeLightTests.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = 397E09151E597BD8001374E0 /* 
LibreOfficeLightTests.swift */; };
397E09211E597BD8001374E0 /* LibreOfficeLightUITests.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = 397E09201E597BD8001374E0 /* 
LibreOfficeLightUITests.swift */; };
-   3992D8581E5B761700BEA987 /* ViewController.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 3992D8571E5B761700BEA987 /* 
ViewController.swift */; };
3992D85A1E5B762A00BEA987 /* DocumentController.swift in Sources 
*/ = {isa = PBXBuildFile; fileRef = 3992D8591E5B762A00BEA987 /* 
DocumentController.swift */; };
3992D85D1E5B764A00BEA987 /* SideMenu.swift in Sources */ = {isa 
= PBXBuildFile; fileRef = 3992D85B1E5B764A00BEA987 /* SideMenu.swift */; };
3992D85E1E5B764A00BEA987 /* FileManagerController.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = 3992D85C1E5B764A00BEA987 /* 
FileManagerController.swift */; };
399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 399648461E5B87DC00E73E83 /* 
ViewProperties.swift */; };
-   399648491E5C4E5500E73E83 /* LO.swift in Sources */ = {isa = 
PBXBuildFile; fileRef = 399648481E5C4E5500E73E83 /* LO.swift */; };
39A83A8F1E5F471D00D0C683 /* lokit.c in Sources */ = {isa = 
PBXBuildFile; fileRef = 39A83A8E1E5F471D00D0C683 /* lokit.c */; };
39B084E31E5F0A9600682A59 /* lo.xcconfig in Resources */ = {isa 
= PBXBuildFile; fileRef = 39B084E21E5F0A9600682A59 /* lo.xcconfig */; };
39B08B9D1E5F0BB600682A59 /* fundamentalrc in Resources */ = 
{isa = PBXBuildFile; fileRef = 39B084E51E5F0BB400682A59 /* fundamentalrc */; };
@@ -69,12 +67,10 @@
397E091C1E597BD8001374E0 /* LibreOfficeLightUITests.xctest */ = 
{isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 
0; path = LibreOfficeLightUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
397E09201E597BD8001374E0 /* LibreOfficeLightUITests.swift */ = 
{isa =

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

2017-03-24 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
|  163 ++
 ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift 
|  668 +-
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
|   90 -
 3 files changed, 531 insertions(+), 390 deletions(-)

New commits:
commit f7eab4dbb8046103df08176e11e0844371e0d20a
Author: jan Iversen 
Date:   Sun Mar 19 11:55:52 2017 +0100

iOS LibreOfficeLight, document actions

added action menu in Document viewer

Change-Id: Ia7c796f7806e363769a5932ce774f33bb4ae8bd2
Reviewed-on: https://gerrit.libreoffice.org/35666
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
index 9c6cd1b9fb82..1b61f6bb2f2b 100755
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
@@ -9,8 +9,87 @@ import UIKit
 
 
 
-class DocumentController: UIViewController
+class DocumentController: UIViewController, DocumentActionsControlDelegate
 {
+@IBAction func returned(segue: UIStoryboardSegue)
+{
+print("I returned")
+}
+
+
+
+// Last stop before displaying popover
+override func prepare(for segue: UIStoryboardSegue, sender: Any?)
+{
+if segue.identifier == "showActions" {
+let vc = segue.destination as! DocumentActions
+vc.delegate = self
+
+// JIX, TO BE CHANGED
+vc.isDocActive = true
+}
+}
+
+
+
+func actionNew(_ name : String)
+{
+// JIX Close active documents if any
+// Start new (with default name
+
+// Only interact with DocumentBrowser
+
+}
+
+
+
+func actionOpen()
+{
+// JIX Close active documents if any
+// Present FileManager
+performSegue(withIdentifier: "showFileManager", sender: self)
+
+// start DocumentBrowser with new document
+}
+
+
+
+func actionDelete()
+{
+// JIX Close active documents if any
+// Delete document
+}
+
+
+
+func actionSave()
+{
+// call save in DocumentBrowser
+
+}
+
+
+
+func actionSaveAs(_ name : String)
+{
+// call saveas in DocumentBrowser
+
+}
+
+
+
+func actionPDF()
+{
+// call savePDF in documentBrowser
+}
+
+
+
+func actionPrint()
+{
+// call print in DocumentBrowser
+}
+
 
 
 override func viewDidLoad()
@@ -20,49 +99,105 @@ class DocumentController: UIViewController
 }
 
 
-@IBAction func returned(segue: UIStoryboardSegue) {
-print("I returned")
-}
 
 override func didReceiveMemoryWarning()
 {
 super.didReceiveMemoryWarning()
 // Dispose of any resources that can be recreated.
 }
+}
+
 
 
+// Protocol for action popover callback
+protocol DocumentActionsControlDelegate
+{
+func actionNew(_ name : String)
+func actionOpen()
+func actionDelete()
+func actionSave()
+func actionSaveAs(_ name : String)
+func actionPDF()
+func actionPrint()
 }
 
 
 
 class DocumentActions: UITableViewController
 {
+// Pointer to callback class
+var delegate  : DocumentActionsControlDelegate?
+var isDocActive : Bool = false
+
+// Calling class might enable/disable each button
+@IBOutlet weak var buttonNew: UIButton!
+@IBOutlet weak var buttonOpen: UIButton!
+@IBOutlet weak var buttonDelete: UIButton!
+@IBOutlet weak var buttonSave: UIButton!
+@IBOutlet weak var buttonSaveAs: UIButton!
+@IBOutlet weak var buttonPDF: UIButton!
+@IBOutlet weak var buttonPrint: UIButton!
+
+
+// Actions
+@IBAction func doOpen(_ sender: UIButton)
+{
+delegate?.actionOpen()
+dismiss(animated: false)
+}
+
+
 
-@IBAction func doOpen(_ sender: UIButton) {
+@IBAction func doDelete(_ sender: UIButton)
+{
+delegate?.actionDelete()
+dismiss(animated: false)
 }
 
-@IBAction func doNew(_ sender: UIButton) {
+
+
+@IBAction func doSave(_ sender: UIButton)
+{
+delegate?.actionSave()
+dismiss(animated: false)
 }
 
-@IBAction func doSave(_ sender: UIButton) {
+
+
+@IBAction func doPDF(_ sender: UIButton)
+{
+delegate?.actionPDF()
+dismiss(animated: false)
 }
 
-@IBAction func doPDF(_ sender: UIButton) {
+
+
+@IBAction func doPrint(_ sender: UIButton)
+{
+delegate?.actionPrint()
+dismiss(animated: false)
 }
+
+
+
 override func viewDidLoad()
 {
 super.viewDidLoad()
-// Do any additional setup after loading the view.
+buttonDelete.isEnabled = isDocActive
+

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

2017-03-24 Thread jan Iversen

 dev/null   
|binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
|   94 -
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/Contents.json
 |   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/back.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/b...@2x.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/back.imageset/b...@3x.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/Contents.json
  |   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/iCloudDrive.png
|binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/iclouddr...@2x.png
 |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/iclouddr...@3x.png
 |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/Contents.json
   |   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/iPhone.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/iph...@2x.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/iph...@3x.png
   |binary
 ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
|   51 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift 
|  880 +-
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
|  181 +-
 17 files changed, 664 insertions(+), 611 deletions(-)

New commits:
commit 3691457e9abde8af74db9c3b85e5494b2f9d7840
Author: jan Iversen 
Date:   Fri Mar 17 15:13:42 2017 +0100

iOS LibreOfficeLight filemanager

Update to filemanager to act as an
overlay to documentView
updated appIcon to include only required
added setName dialog (used for rename/create directory/save as)

Removed trailing whitespace

Change-Id: I1c8a8cd7ef4eb76687f40e806a14884a1e396bc5
Reviewed-on: https://gerrit.libreoffice.org/35612
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
index c5f125791449..2f6bc9bc4eff 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,107 +1,29 @@
 {
   "images" : [
 {
-  "idiom" : "iphone",
-  "size" : "20x20",
-  "scale" : "2x",
-  "filename" : "LibreOffice-40.png"
-},
-{
-  "idiom" : "iphone",
-  "size" : "20x20",
-  "scale" : "3x",
-  "filename" : "LibreOffice-60.png"
-},
-{
-  "idiom" : "iphone",
-  "size" : "29x29",
+  "idiom" : "ipad",
+  "size" : "83.5x83.5",
   "scale" : "2x",
-  "filename" : "LibreOffice-58.png"
-},
-{
-  "idiom" : "iphone",
-  "size" : "29x29",
-  "scale" : "3x",
-  "filename" : "LibreOffice-87.png"
+  "filename" : "libreoffice-83.5x8...@2x.png"
 },
 {
-  "idiom" : "iphone",
-  "size" : "40x40",
+  "idiom" : "ipad",
+  "size" : "76x76",
   "scale" : "2x",
-  "filename" : "LibreOffice-80.png"
-},
-{
-  "idiom" : "iphone",
-  "size" : "40x40",
-  "scale" : "3x",
-  "filename" : "LibreOffice-120.png"
+  "filename" : "libreoffice-76...@2x.png"
 },
 {
   "idiom" : "iphone",
   "size" : "60x60",
   "scale" : "2x",
-  "filename" : "LibreOffice-120.png"
+  "filename" : "libreoffice-60...@2x.png"
 },
 {
   "idiom" : "iphone",
-  "size" : "60x60",
-  "scale" : "3x",
-  "filename" : "LibreOffice-180.png"
-},
-{
-  "idiom" : "ipad",
-  "size" : "20x20",
-  "scale" : "1x",
-  "filename" : "LibreOffice-20.png"
-},
-{
-  "idiom" : "ipad",
-  "size" : "20x20",
-  "scale" : "2x",
-  "filename" : "LibreOffice-40.png"
-},
-{
-  "idiom" : "ipad",
-  "size" : "29x29",
-  "scale" : "1x",
-  "filename" : "LibreOffice-29.png"
-},
-{
-  "idiom" : "ipad",
   "size" : "29x29",
   "scale" : "2x",
-  "filename" :

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

2017-03-22 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift 
|   12 +
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
|   66 +-
 2 files changed, 43 insertions(+), 35 deletions(-)

New commits:
commit 7a46166beb714a3357f7fb04111ba98f6325065f
Author: jan Iversen 
Date:   Fri Mar 17 12:37:31 2017 +0100

iOS LibreOfficeLight Document as root

changed DocumentView to be root view
FileManagerView is started from DocumentView

Change-Id: I43d2a2fab3ff37983c242bce15bdb94c8cc7d4be
Reviewed-on: https://gerrit.libreoffice.org/35536
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
index 94f4106edf1a..2fee4804b4f2 100755
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
@@ -199,11 +199,13 @@ class FileManagerController : UITableViewController, 
actionsControlDelegate
 // Last stop before displaying popover
 override func prepare(for segue: UIStoryboardSegue, sender: Any?)
 {
-let vc = segue.destination as! FileManagerActions
-vc.delegate = self
-vc.inFileSelect = (selectedRow != nil)
-vc.inSubDirectory = fileData.isSubDirectory()
-vc.useCloud = fileData.iCloudEnabled()
+if segue.identifier == "doShowFileManagerActions" {
+let vc = segue.destination as! FileManagerActions
+vc.delegate = self
+vc.inFileSelect = (selectedRow != nil)
+vc.inSubDirectory = fileData.isSubDirectory()
+vc.useCloud = fileData.iCloudEnabled()
+}
 }
 
 
diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
index d7589a64ea2d..06935c3708d6 100755
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
@@ -31,13 +31,20 @@
 
 
 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -118,7 +125,7 @@
 
 
 
-
+
 
 
 
@@ -320,8 +327,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -509,6 +516,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
@@ -520,7 +536,7 @@
 
 
 
-
+
 
 
 
@@ -538,7 +554,7 @@
 
 
 
-
+
 
 
 
@@ -556,7 +572,7 @@

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

2017-03-22 Thread jan Iversen

 dev/null 
|binary
 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 
   4 
 2 files changed, 4 deletions(-)

New commits:
commit f1d3ec857551d2e09b05b9661473957d14d4a50d
Author: jan Iversen 
Date:   Fri Mar 17 11:41:59 2017 +0100

iOS LibreOfficeLight removed start icon

Xcode decided to add an empty launch icon, removed.

Change-Id: I62405114e49d176c16e452d05ec9d872c70d7880

diff --git a/ios/experimental/LibreOfficeLight/default-5...@2x.png 
b/ios/experimental/LibreOfficeLight/default-5...@2x.png
deleted file mode 100644
index 0891b7aabfcf..
Binary files a/ios/experimental/LibreOfficeLight/default-5...@2x.png and 
/dev/null differ
diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 0fc86878429d..6fe0b9801a43 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -9,7 +9,6 @@
 /* Begin PBXBuildFile section */
392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources 
*/ = {isa = PBXBuildFile; fileRef = 392ED9B21E5E4B03005C8435 /* 
ViewPrintManager.swift */; };
396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */ = 
{isa = PBXBuildFile; fileRef = 396F92F61E7AE62400A28C82 /* Settings.bundle */; 
};
-   397275401E782CDC006ACDCC /* default-5...@2x.png in Resources */ 
= {isa = PBXBuildFile; fileRef = 3972753F1E782CDC006ACDCC /* 
default-5...@2x.png */; };
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = 
{isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; 
};
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift 
*/; };
397E09031E597BD8001374E0 /* Main.storyboard in Resources */ = 
{isa = PBXBuildFile; fileRef = 397E09011E597BD8001374E0 /* Main.storyboard */; 
};
@@ -57,7 +56,6 @@
392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift; 
sourceTree = SOURCE_ROOT; };
396F92F61E7AE62400A28C82 /* Settings.bundle */ = {isa = 
PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = 
Settings.bundle; sourceTree = ""; };
397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */ = 
{isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = 
LibreOfficeLight.entitlements; sourceTree = ""; };
-   3972753F1E782CDC006ACDCC /* default-5...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = "default-5...@2x.png"; 
sourceTree = ""; };
397868D71E59A3EA007F9248 /* en */ = {isa = PBXFileReference; 
lastKnownFileType = file.xib; name = en; path = en.lproj/LaunchScreen.xib; 
sourceTree = ""; };
397E08FA1E597BD8001374E0 /* LibreOfficeLight.app */ = {isa = 
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; 
path = LibreOfficeLight.app; sourceTree = BUILT_PRODUCTS_DIR; };
397E08FD1E597BD8001374E0 /* AppDelegate.swift */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.swift; name = 
AppDelegate.swift; path = LibreOfficeLight/AppDelegate.swift; sourceTree = 
SOURCE_ROOT; };
@@ -142,7 +140,6 @@
397E08F11E597BD8001374E0 = {
isa = PBXGroup;
children = (
-   3972753F1E782CDC006ACDCC /* default-5...@2x.png 
*/,
39B084E41E5F0B5200682A59 /* Resources */,
3911D89F1E5993600050D6BC /* Support files */,
397E08FC1E597BD8001374E0 /* LibreOfficeLight */,
@@ -337,7 +334,6 @@
39B08BD71E5F0BB600682A59 /* rc in Resources */,
39B08B9E1E5F0BB600682A59 /* offapi.rdb in 
Resources */,
39B084E31E5F0A9600682A59 /* lo.xcconfig in 
Resources */,
-   397275401E782CDC006ACDCC /* default-5...@2x.png 
in Resources */,
397868D61E59A3EA007F9248 /* LaunchScreen.xib in 
Resources */,
396F92F71E7AE62400A28C82 /* Settings.bundle in 
Resources */,
39B08B9F1E5F0BB600682A59 /* oovbaapi.rdb in 
Resources */,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-22 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 
   2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4c2e1708afd5cc015c541b4945b261129d27fab4
Author: jan Iversen 
Date:   Fri Mar 17 07:49:43 2017 +0100

iOS LibreOfficeLight moved entitlements

Moved entitlements to correct group

Change-Id: I6ab95b823fc4a4b8781b27d51ecb8d994f477dca

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 0735eae1b850..0fc86878429d 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -121,6 +121,7 @@
isa = PBXGroup;
children = (
39B092501E5F3DEA00682A59 /* 
LibreOfficeLight-Prefix.pch */,
+   397275391E77D9F1006ACDCC /* 
LibreOfficeLight.entitlements */,
39B084E21E5F0A9600682A59 /* lo.xcconfig */,
397E09071E597BD8001374E0 /* Assets.xcassets */,
397E09041E597BD8001374E0 /* 
LibreOfficeLight.xcdatamodeld */,
@@ -165,7 +166,6 @@
397E08FC1E597BD8001374E0 /* LibreOfficeLight */ = {
isa = PBXGroup;
children = (
-   397275391E77D9F1006ACDCC /* 
LibreOfficeLight.entitlements */,
39A83A8E1E5F471D00D0C683 /* lokit.c */,
397E08FD1E597BD8001374E0 /* AppDelegate.swift 
*/,
3992D8571E5B761700BEA987 /* 
ViewController.swift */,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-22 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj   
  |4 +
 ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift   
  |9 ++
 ios/experimental/LibreOfficeLight/LibreOfficeLight/Settings.bundle/Root.plist  
  |   38 ++
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Settings.bundle/en.lproj/Root.strings
 |binary
 4 files changed, 51 insertions(+)

New commits:
commit 02bccbe0d59e50a7fd987c81c4d15b2fd4d24538
Author: jan Iversen 
Date:   Thu Mar 16 16:47:31 2017 +0100

IOS LibreOfficeLight settings support

Adding support for using IOS Settings
The idea is to move the LO settings into here, and let the
user manipulate some of the fields.

Change-Id: Ifbd1adc6aa395d7822bcec968f267bb85929bff3
Reviewed-on: https://gerrit.libreoffice.org/35528
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 8cd983ccb6ec..0735eae1b850 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources 
*/ = {isa = PBXBuildFile; fileRef = 392ED9B21E5E4B03005C8435 /* 
ViewPrintManager.swift */; };
+   396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */ = 
{isa = PBXBuildFile; fileRef = 396F92F61E7AE62400A28C82 /* Settings.bundle */; 
};
397275401E782CDC006ACDCC /* default-5...@2x.png in Resources */ 
= {isa = PBXBuildFile; fileRef = 3972753F1E782CDC006ACDCC /* 
default-5...@2x.png */; };
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = 
{isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; 
};
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift 
*/; };
@@ -54,6 +55,7 @@
 
 /* Begin PBXFileReference section */
392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift; 
sourceTree = SOURCE_ROOT; };
+   396F92F61E7AE62400A28C82 /* Settings.bundle */ = {isa = 
PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = 
Settings.bundle; sourceTree = ""; };
397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */ = 
{isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = 
LibreOfficeLight.entitlements; sourceTree = ""; };
3972753F1E782CDC006ACDCC /* default-5...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = "default-5...@2x.png"; 
sourceTree = ""; };
397868D71E59A3EA007F9248 /* en */ = {isa = PBXFileReference; 
lastKnownFileType = file.xib; name = en; path = en.lproj/LaunchScreen.xib; 
sourceTree = ""; };
@@ -123,6 +125,7 @@
397E09071E597BD8001374E0 /* Assets.xcassets */,
397E09041E597BD8001374E0 /* 
LibreOfficeLight.xcdatamodeld */,
397E090C1E597BD8001374E0 /* Info.plist */,
+   396F92F61E7AE62400A28C82 /* Settings.bundle */,
);
name = "Support files";
path = LibreOfficeLight;
@@ -336,6 +339,7 @@
39B084E31E5F0A9600682A59 /* lo.xcconfig in 
Resources */,
397275401E782CDC006ACDCC /* default-5...@2x.png 
in Resources */,
397868D61E59A3EA007F9248 /* LaunchScreen.xib in 
Resources */,
+   396F92F71E7AE62400A28C82 /* Settings.bundle in 
Resources */,
39B08B9F1E5F0BB600682A59 /* oovbaapi.rdb in 
Resources */,
39B08B9D1E5F0BB600682A59 /* fundamentalrc in 
Resources */,
39B091CD1E5F0BB800682A59 /* udkapi.rdb in 
Resources */,
diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
index b100ed05875d..d4dc897b7adc 100644
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift
@@ -6,6 +6,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
 import UIKit
+import Foundation
 
 
 
@@ -24,6 +25,14 @@ class AppDelegate: UIResponder,

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

2017-03-21 Thread jan Iversen

 ios/experimental/LibreOfficeLight/default-5...@2x.png  
  |binary
 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj   
  |   43 +++-
 ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift   
  |2 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift 
  |   39 +--
 ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist  
  |   51 +-
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.entitlements
 |   18 +++
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/LaunchScreen.xib   
  |8 -
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
  |   31 +++---
 8 files changed, 152 insertions(+), 40 deletions(-)

New commits:
commit 46a71fa01a2268a0a6e02ed04ece3094153ab247
Author: jan Iversen 
Date:   Tue Mar 14 09:08:00 2017 +0100

ios LibreOfficeLight iCloud support

Added iCloud document support to fileManager

Change-Id: I7c8f78b6b148926398b170ee8a32d3c09413205f
Reviewed-on: https://gerrit.libreoffice.org/35503
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/ios/experimental/LibreOfficeLight/default-5...@2x.png 
b/ios/experimental/LibreOfficeLight/default-5...@2x.png
new file mode 100644
index ..0891b7aabfcf
Binary files /dev/null and 
b/ios/experimental/LibreOfficeLight/default-5...@2x.png differ
diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 82f9ed2c73a9..8cd983ccb6ec 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources 
*/ = {isa = PBXBuildFile; fileRef = 392ED9B21E5E4B03005C8435 /* 
ViewPrintManager.swift */; };
+   397275401E782CDC006ACDCC /* default-5...@2x.png in Resources */ 
= {isa = PBXBuildFile; fileRef = 3972753F1E782CDC006ACDCC /* 
default-5...@2x.png */; };
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = 
{isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; 
};
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift 
*/; };
397E09031E597BD8001374E0 /* Main.storyboard in Resources */ = 
{isa = PBXBuildFile; fileRef = 397E09011E597BD8001374E0 /* Main.storyboard */; 
};
@@ -53,6 +54,8 @@
 
 /* Begin PBXFileReference section */
392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift; 
sourceTree = SOURCE_ROOT; };
+   397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */ = 
{isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = 
LibreOfficeLight.entitlements; sourceTree = ""; };
+   3972753F1E782CDC006ACDCC /* default-5...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = "default-5...@2x.png"; 
sourceTree = ""; };
397868D71E59A3EA007F9248 /* en */ = {isa = PBXFileReference; 
lastKnownFileType = file.xib; name = en; path = en.lproj/LaunchScreen.xib; 
sourceTree = ""; };
397E08FA1E597BD8001374E0 /* LibreOfficeLight.app */ = {isa = 
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; 
path = LibreOfficeLight.app; sourceTree = BUILT_PRODUCTS_DIR; };
397E08FD1E597BD8001374E0 /* AppDelegate.swift */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.swift; name = 
AppDelegate.swift; path = LibreOfficeLight/AppDelegate.swift; sourceTree = 
SOURCE_ROOT; };
@@ -125,15 +128,24 @@
path = LibreOfficeLight;
sourceTree = SOURCE_ROOT;
};
+   3972753A1E77D9F7006ACDCC /* Frameworks */ = {
+   isa = PBXGroup;
+   children = (
+   );
+   name = Frameworks;
+   sourceTree = "";
+   };
397E08F11E597BD8001374E0 = {
isa = PBXGroup;
children = (
+   3972753F1E782CDC006ACDCC /* default-5...@2x.png 
*/,
39B084E41E5F0B5200682A59 /* Resources */,
3911D89F1E5993600050D6BC /* Support files */,
397E08FC1E597BD8001374E0 /* LibreOfficeLight */,

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

2017-03-21 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift 
|  188 +++---
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
|   33 +
 2 files changed, 172 insertions(+), 49 deletions(-)

New commits:
commit 4e26af2df9d26aba83f61ba7ea0fbe876d4ed288
Author: jan Iversen 
Date:   Mon Mar 13 13:03:40 2017 +0100

ios LibreOfficeLight FileManager actions

Adding dialogue handling for filemanager

Change-Id: I9db782e04f80f18421be23e158034a80497d8b12
Reviewed-on: https://gerrit.libreoffice.org/35489
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
index e0328549380b..e5b1df3d1ac8 100755
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
@@ -17,7 +17,7 @@ private class FileStorage
 // Start path for the 2 storage locations
 private let baseLocalDocPath : URL
 private let baseCloudDocPath : URL?
-private var currrentDocPath  : URL? {
+private var currentDocPath  : URL? {
 get {
 return storageIsLocal ? baseLocalDocPath : baseCloudDocPath
 }
@@ -54,11 +54,18 @@ private class FileStorage
 }
 
 
+func isSubDirectory() -> Bool
+{
+return currentDir != currentDocPath
+}
+
+
 
 func selectStorage(_ doSwitch : Bool) -> Bool
 {
 if doSwitch {
 storageIsLocal = !storageIsLocal
+buildFileList()
 }
 return storageIsLocal
 }
@@ -77,7 +84,7 @@ private class FileStorage
 func leaveDirectory()
 {
 // step up for active storage, and only if not in root
-if currentDir != currrentDocPath {
+if isSubDirectory() {
 currentDir = currentDir.deletingLastPathComponent()
 buildFileList()
 }
@@ -89,7 +96,8 @@ private class FileStorage
 {
 let newDir = currentDir.appendingPathComponent(name)
 try! filemgr.createDirectory(at: newDir, withIntermediateDirectories: 
true, attributes: nil)
-enterDirectory(name + "/")
+currentDir = currentDir.appendingPathComponent(name)
+buildFileList()
 }
 
 
@@ -122,6 +130,7 @@ private class FileStorage
 {
 try! filemgr.moveItem(at: currentDir.appendingPathComponent(name),
   to: (storageIsLocal ? localDir : 
cloudDir).appendingPathComponent(name))
+buildFileList()
 }
 
 
@@ -150,6 +159,8 @@ private class FileStorage
 baseLocalDocPath = filemgr.urls(for: .documentDirectory, in: 
.userDomainMask)[0]
 baseCloudDocPath = nil
 localDir = baseLocalDocPath
+
+// JIX, fix add support for iCloud
 cloudDir = baseLocalDocPath
 buildFileList()
 }
@@ -157,47 +168,84 @@ private class FileStorage
 
 
 
-class FileManagerController : UITableViewController
+class FileManagerController : UITableViewController, actionsControlDelegate
 
 {
+// Housekeeping variables
 private var fileData = FileStorage()
+private var selectedRow : IndexPath?
 
-
-func showFiles()
+
+// Toogle between local and cloud storage
+@IBAction func doSelectStorage(_ sender: UIBarButtonItem)
 {
-
+sender.title = fileData.selectStorage(true) ? "iCloud" : "iPad"
+reloadData()
 }
 
 
 
-@IBAction func doSelectStorage(_ sender: UIBarButtonItem)
+// Last stop before displaying popover
+override func prepare(for segue: UIStoryboardSegue, sender: Any?)
 {
-if fileData.selectStorage(true) {
-sender.title = "iCloud"
-}
-else {
-sender.title = "iPad"
+let vc = segue.destination as! FileManagerActions
+vc.delegate = self
+vc.inFileSelect = (selectedRow != nil)
+vc.inSubDirectory = fileData.isSubDirectory()
+}
+
+
+
+func actionOpen()
+{
+if selectedRow != nil {
+let currentCell = tableView.cellForRow(at: selectedRow!) as! 
FileManagerCell
+if currentCell.isDirectory {
+fileData.enterDirectory(currentCell.fileName)
+reloadData()
+} else {
+// JIX delegate to Document
+}
 }
-showFiles()
 }
 
 
 
-override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-
-if segue.identifier == "ShowAttractionDetails" {
-
-//let detailViewController = segue.destination
-//as! AttractionDetailViewController
-
-//let myIndexPath =

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

2017-03-20 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj   
|   20 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
|   91 +
 ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift 
|  284 +
 ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewController.swift
|   23 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewDocument.swift  
|   13 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewFileManager.swift   
|   13 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewPrintManager.swift  
|   18 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewProperties.swift
|   21 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/WebView.swift   
|   14 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
|  482 --
 10 files changed, 861 insertions(+), 118 deletions(-)

New commits:
commit ffeb6227aebef6e9ed81d468d31f9ae8dc3462ba
Author: jan Iversen 
Date:   Tue Mar 7 16:57:40 2017 +0100

ios LibreOfficeLight, FileManager

Online consist in reality of an independent FileManager
and a DocumentViewer. Adding a FileManager that "knows"
ios specific fileHandling.

Added UI dialog (storyboard)

FileManager consist of 2 parts, a FileManagement class
connecting to IOS (will later handle differencies between
local storage and iCloud) and a FileManagerViewer giving
the user a UI to select files.

Change-Id: I30b4eafe48a3396c100e7475ba7118f0ee2de73d
Reviewed-on: https://gerrit.libreoffice.org/35451
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 44d84f4028e9..82f9ed2c73a9 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -16,12 +16,11 @@
397E09161E597BD8001374E0 /* LibreOfficeLightTests.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = 397E09151E597BD8001374E0 /* 
LibreOfficeLightTests.swift */; };
397E09211E597BD8001374E0 /* LibreOfficeLightUITests.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = 397E09201E597BD8001374E0 /* 
LibreOfficeLightUITests.swift */; };
3992D8581E5B761700BEA987 /* ViewController.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 3992D8571E5B761700BEA987 /* 
ViewController.swift */; };
-   3992D85A1E5B762A00BEA987 /* ViewDocument.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = 3992D8591E5B762A00BEA987 /* ViewDocument.swift 
*/; };
+   3992D85A1E5B762A00BEA987 /* DocumentController.swift in Sources 
*/ = {isa = PBXBuildFile; fileRef = 3992D8591E5B762A00BEA987 /* 
DocumentController.swift */; };
3992D85D1E5B764A00BEA987 /* SideMenu.swift in Sources */ = {isa 
= PBXBuildFile; fileRef = 3992D85B1E5B764A00BEA987 /* SideMenu.swift */; };
-   3992D85E1E5B764A00BEA987 /* ViewFileManager.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 3992D85C1E5B764A00BEA987 /* 
ViewFileManager.swift */; };
+   3992D85E1E5B764A00BEA987 /* FileManagerController.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = 3992D85C1E5B764A00BEA987 /* 
FileManagerController.swift */; };
399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 399648461E5B87DC00E73E83 /* 
ViewProperties.swift */; };
399648491E5C4E5500E73E83 /* LO.swift in Sources */ = {isa = 
PBXBuildFile; fileRef = 399648481E5C4E5500E73E83 /* LO.swift */; };
-   399BA3721E6881FC003D74A6 /* WebView.swift in Sources */ = {isa 
= PBXBuildFile; fileRef = 399BA3711E6881FC003D74A6 /* WebView.swift */; };
39A83A8F1E5F471D00D0C683 /* lokit.c in Sources */ = {isa = 
PBXBuildFile; fileRef = 39A83A8E1E5F471D00D0C683 /* lokit.c */; };
39B084E31E5F0A9600682A59 /* lo.xcconfig in Resources */ = {isa 
= PBXBuildFile; fileRef = 39B084E21E5F0A9600682A59 /* lo.xcconfig */; };
39B08B9D1E5F0BB600682A59 /* fundamentalrc in Resources */ = 
{isa = PBXBuildFile; fileRef = 39B084E51E5F0BB400682A59 /* fundamentalrc */; };
@@ -68,12 +67,11 @@
397E09201E597BD8001374E0 /* LibreOfficeLightUITests.swift */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = 
LibreOfficeLightUITests.swift; path = 
LibreOfficeLightUITests/LibreOfficeLightUITests.swift; sourceTree = 
SOURCE_ROOT; };
397E09221E597BD8001374E0 /* Info.plist */ = {isa = 
PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = 
LibreOfficeLightUITests/Info.plist; sourceTree =

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

2017-03-20 Thread Tor Lillqvist

 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 
   2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2609f36ec58f1b5910bb621d963d1be72e5bf9ca
Author: Tor Lillqvist 
Date:   Mon Mar 20 00:16:10 2017 +0200

Don't hardcode the basename of BUILDDIR as "ios-work"

Change-Id: Ie74c3bdb9a83ab4310b7f7d02bf9c60601fc0494

diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index cffc1e3c50dd..ca5e1dff547e 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -850,7 +850,7 @@
BED5316F193738D800830918 /* polypolyaction.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
polypolyaction.cxx; path = 
../../../cppcanvas/source/mtfrenderer/polypolyaction.cxx; sourceTree = 
SOURCE_ROOT; };
BED53170193738D800830918 /* textaction.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
textaction.cxx; path = ../../../cppcanvas/source/mtfrenderer/textaction.cxx; 
sourceTree = SOURCE_ROOT; };
BED53171193738D800830918 /* transparencygroupaction.cxx */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
transparencygroupaction.cxx; path = 
../../../cppcanvas/source/mtfrenderer/transparencygroupaction.cxx; sourceTree = 
SOURCE_ROOT; };
-   BEDB0F08185B7537009A6F26 /* lo.xcconfig */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = 
lo.xcconfig; path = "../../../../ios-work/workdir/ios/generated/lo.xcconfig"; 
sourceTree = SOURCE_ROOT; };
+   BEDB0F08185B7537009A6F26 /* lo.xcconfig */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = 
lo.xcconfig; path = "../../../workdir/ios/generated/lo.xcconfig"; sourceTree = 
SOURCE_ROOT; };
BEEE02CE1860ABB700FBDE67 /* program */ = {isa = 
PBXFileReference; lastKnownFileType = folder; name = program; path = 
../../ioswork/ios/resources/program; sourceTree = SOURCE_ROOT; };
BEEE02CF1860ABB700FBDE67 /* share */ = {isa = PBXFileReference; 
lastKnownFileType = folder; name = share; path = 
../../ioswork/ios/resources/share; sourceTree = SOURCE_ROOT; };
BEEE02D01860ABB700FBDE67 /* services */ = {isa = 
PBXFileReference; lastKnownFileType = folder; name = services; path = 
../../ioswork/ios/resources/services; sourceTree = SOURCE_ROOT; };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-20 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c |  235 -
 1 file changed, 235 deletions(-)

New commits:
commit d66eeb502c4b393229c0b53f72df1b6ef4554490
Author: jan Iversen 
Date:   Mon Mar 20 09:23:52 2017 +0100

ios LibreOfficeLight lokit

Moved protocol comments away from the source file
base on a suggestion in IRC.

Change-Id: I4d6939c267a33b0d782278a80a3cf116075588e2

diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c
index 94143d1cfdd7..748c601f268e 100755
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c
@@ -119,376 +119,141 @@ extern "C" void lo_initialize(NSString *documentPath)
 // CLIENT COMMAND INTERFACE
 static bool client_canceltiles(const char *args[])
 {
-// command:   canceltiles
-// arguments: NONE
-// description:
-// All outstanding tile messages from the client to the server are
-// dropped and will not be handled, except tile messages with an id
-// parameter. There is no guarantee of exactly which tile: messages
-// might still be sent back to the client.
-//
 return true;
 }
 
 static bool client_clientvisiblearea(const char *args[])
 {
-// command:   clientvisiblearea
-// arguments: x=
-//y=
-//width=
-//height=
-
-// JIX MISSING CODE
 return true;
 }
 
 static bool client_closedocument(const char *args[])
 {
-// command:   closedocument
-// arguments: None
-// description:
-// This gives document owners the ability to terminate all sessions
-// currently having that document opened. This functionality is enabled
-// only in case WOPI. host mentions 'EnableOwnerTermination' flag in
-// its CheckFileInfo response
-
-// JIX MISSING CODE
 return true;
 }
 
 static bool client_commandvalues(const char *args[])
 {
-// command:   commandvalues
-// arguments: None
-
-// JIX MISSING CODE
 return true;
 }
 
 static bool client_downloadas(const char *args[])
 {
-// command:   downloadas
-// arguments: name=
-//id=
-//format=
-//options=
-// description:
-// Exports the current document to the desired format and returns a
-// download URL. The id identifies the request on the client. id can
-// take following values:
-// * 'print': When request for download is basically for print 
purposes
-// * 'slideshow': When request for download is for showing 
slideshow
-// * 'export': Just a simple download
-
-// JIX MISSING CODE
 return true;
 }
 
 static bool client_getchildid(const char *args[])
 {
-// command:   getchildid
-// arguments: None
-// description:
-// Requests the child id so that it knows where the files needs to be 
sent
-// when it is inserted in the document
 return true;
 }
 
 static bool client_gettextselection(const char *args[])
 {
-// command:   gettextselection
-// arguments: None
-// description:
-// Request selection's content
-
-// JIX MISSING CODE
 return true;
 }
 
 static bool client_insertfile(const char *args[])
 {
-// command:   insertfile
-// arguments: name=
-//type=
-// description:
-// Inserts the file with the name  into the document,
-// we currently support type = 'graphic'
-
-// JIX MISSING CODE
 return true;
 }
 
 static bool client_key(const char *args[])
 {
-// command:   key
-// arguments: type=
-//char=
-//key=
-// description:
-//  is 'input' or 'up',  and  are numbers.
-
-// JIX MISSING CODE
 return true;
 }
 
 static bool client_load(const char *args[])
 {
-// command:   load
-// arguments: [part=]
-// url=
-//[timestamp=]
-//.   [options=]
-// description:
-// part is an optional parameter.  is a number.
-// timestamp is an optional parameter.  is provided in
-// microseconds since the Unix epoch - midnight, January 1, 1970.
-// options are the whole rest of the line, not URL-encoded,
-// and must be valid JSON.
-
-// JIX MISSING CODE
 return true;
 }
 
 static bool client_loolclient(const char *args[])
 {
-// command:   loolclient
-// arguments: 
-// description:
-// Upon connection, a client must announce the version number it 
supports.
-// Major: an integer that must always match between client and server,
-// otherwise there are no guarantees of any sensible compatibility.
-// This is bumped when API changes.
-// Minor: an integer is more flexible and

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

2017-03-19 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 
   4 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/LO.swift  | 
  10 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/WebView.swift | 
  14 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard  | 
  17 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h   | 
   4 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c   | 
 205 ++
 6 files changed, 173 insertions(+), 81 deletions(-)

New commits:
commit 941ef397e9267f7ca7fac8b2133272f3655ec460
Author: jan Iversen 
Date:   Thu Mar 2 16:38:41 2017 +0100

ios LibreOfficeLight, tokenize

Add general tokenizer for parameters.
and WebWiew to host JS from online

Change-Id: I5bb419c18d239d6d88fa17078c079420aac58931
Reviewed-on: https://gerrit.libreoffice.org/35438
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index ab3e6af22da1..44d84f4028e9 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -21,6 +21,7 @@
3992D85E1E5B764A00BEA987 /* ViewFileManager.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 3992D85C1E5B764A00BEA987 /* 
ViewFileManager.swift */; };
399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 399648461E5B87DC00E73E83 /* 
ViewProperties.swift */; };
399648491E5C4E5500E73E83 /* LO.swift in Sources */ = {isa = 
PBXBuildFile; fileRef = 399648481E5C4E5500E73E83 /* LO.swift */; };
+   399BA3721E6881FC003D74A6 /* WebView.swift in Sources */ = {isa 
= PBXBuildFile; fileRef = 399BA3711E6881FC003D74A6 /* WebView.swift */; };
39A83A8F1E5F471D00D0C683 /* lokit.c in Sources */ = {isa = 
PBXBuildFile; fileRef = 39A83A8E1E5F471D00D0C683 /* lokit.c */; };
39B084E31E5F0A9600682A59 /* lo.xcconfig in Resources */ = {isa 
= PBXBuildFile; fileRef = 39B084E21E5F0A9600682A59 /* lo.xcconfig */; };
39B08B9D1E5F0BB600682A59 /* fundamentalrc in Resources */ = 
{isa = PBXBuildFile; fileRef = 39B084E51E5F0BB400682A59 /* fundamentalrc */; };
@@ -72,6 +73,7 @@
3992D85C1E5B764A00BEA987 /* ViewFileManager.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewFileManager.swift; path = LibreOfficeLight/ViewFileManager.swift; 
sourceTree = SOURCE_ROOT; };
399648461E5B87DC00E73E83 /* ViewProperties.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewProperties.swift; path = LibreOfficeLight/ViewProperties.swift; 
sourceTree = SOURCE_ROOT; };
399648481E5C4E5500E73E83 /* LO.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= LO.swift; path = LibreOfficeLight/LO.swift; sourceTree = SOURCE_ROOT; };
+   399BA3711E6881FC003D74A6 /* WebView.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= WebView.swift; sourceTree = ""; };
39A83A8D1E5F471C00D0C683 /* lokit-Bridging-Header.h */ = {isa = 
PBXFileReference; explicitFileType = sourcecode.cpp.h; name = 
"lokit-Bridging-Header.h"; path = "LibreOfficeLight/lokit-Bridging-Header.h"; 
sourceTree = SOURCE_ROOT; };
39A83A8E1E5F471D00D0C683 /* lokit.c */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = 
lokit.c; path = LibreOfficeLight/lokit.c; sourceTree = SOURCE_ROOT; };
39B084E21E5F0A9600682A59 /* lo.xcconfig */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = 
lo.xcconfig; path = "../../../../ios-work/workdir/ios/generated/lo.xcconfig"; 
sourceTree = SOURCE_ROOT; };
@@ -162,6 +164,7 @@
397E09011E597BD8001374E0 /* Main.storyboard */,
397868D81E59A3EA007F9248 /* LaunchScreen.xib */,
39A83A8D1E5F471C00D0C683 /* 
lokit-Bridging-Header.h */,
+   399BA3711E6881FC003D74A6 /* WebView.swift */,
);
path = LibreOfficeLight;
sourceTree = SOURCE_ROOT;
@@ -354,6 +357,7 @@
39A83A8F1E5F471D00D0C683 /* lokit.c in Sources 
*/,
399648491E5C4E5500E73E83 /* LO.swift in Sources 
*/,
3992D8581E5B761700BEA987 /* 
ViewController.swift in Sources */,
+

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

2017-03-19 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 
  19 +-
 ios/experimental/LibreOfficeLight/LibreOfficeLight/LO.swift  | 
   2 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h   | 
   4 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c   | 
  78 +-
 4 files changed, 57 insertions(+), 46 deletions(-)

New commits:
commit 6aa9d41a0d0c45346cfe84cf903057d812815c20
Author: jan Iversen 
Date:   Tue Feb 28 19:27:11 2017 +0100

ios LibreOfficeLight clientCommands added

Add connection between client commands and LOKit.

Change-Id: I2593b3c0b7a82612924bf63c3be85963f5a20d32
Reviewed-on: https://gerrit.libreoffice.org/35434
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 73e789d2311b..ab3e6af22da1 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -52,7 +52,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-   392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= ViewPrintManager.swift; sourceTree = ""; };
+   392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift; 
sourceTree = SOURCE_ROOT; };
397868D71E59A3EA007F9248 /* en */ = {isa = PBXFileReference; 
lastKnownFileType = file.xib; name = en; path = en.lproj/LaunchScreen.xib; 
sourceTree = ""; };
397E08FA1E597BD8001374E0 /* LibreOfficeLight.app */ = {isa = 
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; 
path = LibreOfficeLight.app; sourceTree = BUILT_PRODUCTS_DIR; };
397E08FD1E597BD8001374E0 /* AppDelegate.swift */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.swift; name = 
AppDelegate.swift; path = LibreOfficeLight/AppDelegate.swift; sourceTree = 
SOURCE_ROOT; };
@@ -66,13 +66,13 @@
397E091C1E597BD8001374E0 /* LibreOfficeLightUITests.xctest */ = 
{isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 
0; path = LibreOfficeLightUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
397E09201E597BD8001374E0 /* LibreOfficeLightUITests.swift */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = 
LibreOfficeLightUITests.swift; path = 
LibreOfficeLightUITests/LibreOfficeLightUITests.swift; sourceTree = 
SOURCE_ROOT; };
397E09221E597BD8001374E0 /* Info.plist */ = {isa = 
PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = 
LibreOfficeLightUITests/Info.plist; sourceTree = SOURCE_ROOT; };
-   3992D8571E5B761700BEA987 /* ViewController.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= ViewController.swift; sourceTree = ""; };
-   3992D8591E5B762A00BEA987 /* ViewDocument.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= ViewDocument.swift; sourceTree = ""; };
-   3992D85B1E5B764A00BEA987 /* SideMenu.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= SideMenu.swift; sourceTree = ""; };
-   3992D85C1E5B764A00BEA987 /* ViewFileManager.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= ViewFileManager.swift; sourceTree = ""; };
-   399648461E5B87DC00E73E83 /* ViewProperties.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= ViewProperties.swift; sourceTree = ""; };
-   399648481E5C4E5500E73E83 /* LO.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= LO.swift; sourceTree = ""; };
-   39A83A8D1E5F471C00D0C683 /* lokit-Bridging-Header.h */ = {isa = 
PBXFileReference; explicitFileType = sourcecode.cpp.h; path = 
"lokit-Bridging-Header.h"; sourceTree = ""; };
+   3992D8571E5B761700BEA987 /* ViewController.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewController.swift; path = LibreOfficeLight/ViewController.swift; 
sourceTree = SOURCE_ROOT; };
+   3992D8591E5B762A00BEA987 /* ViewDocument.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
=

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

2017-03-19 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj   
|  581 ++
 ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift   
|   79 +
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
|  110 +
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-120.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-152.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-167.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-180.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-20.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-29.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-40.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-58.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-60.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-76.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-80.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-87.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.imageset/Contents.json
 |   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.imageset/Document.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/Contents.json
|   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/intro.png
|binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/Contents.json
 |   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/menu.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/m...@2x.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/m...@3x.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/pdf.imageset/Contents.json
  |   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/pdf.imageset/pdf.png
|binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/print.imageset/Contents.json
|   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/print.imageset/print.png
|binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/properties.imageset/Contents.json
   |   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/properties.imageset/properties.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/save.imageset/Contents.json
 |   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/save.imageset/save.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/saveas.imageset/Contents.json
   |   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/saveas.imageset/saveas.png
  |binary
 ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist  
|   40 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/LO.swift
|   34 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/.xccurrentversion
 |8 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/LibreOfficeLight.xcdatamodel/contents
 |4 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/SideMenu.swift  
|   99 +

[Libreoffice-commits] core.git: ios/experimental ios/lo.xcconfig.in

2017-02-16 Thread jan Iversen

 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj   
 |2 -
 
ios/experimental/TiledLibreOffice/TiledLibreOffice/Images.xcassets/AppIcon.appiconset/Contents.json
 |   15 ++
 ios/lo.xcconfig.in 
 |1 
 3 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit b7ee370c8e9528f1a3891540165d6d1b49f48fb0
Author: jan Iversen 
Date:   Sat Feb 11 11:25:38 2017 +0100

ios BUILDDIR != SRCDIR now works

Added SYMROOT to xcconfig, and change project.pbxproj
to allow BUILDDIR != SRCDIR

moved part of build output to BUILDDIR

The contents.json change is done by Xcode.

Change-Id: I0594f862781d41b87429f020f059f12e76f7f7f9
Reviewed-on: https://gerrit.libreoffice.org/34147
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 057d4c7..6b4a78d 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -39,7 +39,7 @@
 
 /* Begin PBXFileReference section */
BE03BF9118F9648F00620DC7 /* udata.cpp */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = udata.cpp; 
path = ../../../workdir/UnpackedTarball/icu/source/common/udata.cpp; sourceTree 
= ""; };
-   BE03BF9218F9A7CC00620DC7 /* icudt58l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt58l.dat; path = 
../../../../workdir/UnpackedTarball/icu/source/data/in/icudt58l.dat; sourceTree 
= ""; };
+   BE03BF9218F9A7CC00620DC7 /* icudt58l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt58l.dat; path = 
../../../workdir/UnpackedTarball/icu/source/data/in/icudt58l.dat; sourceTree = 
BUILT_PRODUCTS_DIR; };
BE03BF9518FC1A1C00620DC7 /* xdictionary.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
xdictionary.cxx; path = ../../../i18npool/source/breakiterator/xdictionary.cxx; 
sourceTree = ""; };
BE0898E81860D42B0021A679 /* brand.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = brand.cxx; 
path = ../../../vcl/source/app/brand.cxx; sourceTree = ""; };
BE0898E91860D42B0021A679 /* dbggui.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbggui.cxx; 
path = ../../../vcl/source/app/dbggui.cxx; sourceTree = ""; };
diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice/Images.xcassets/AppIcon.appiconset/Contents.json
 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/Images.xcassets/AppIcon.appiconset/Contents.json
index a4645e6..abd908f 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice/Images.xcassets/AppIcon.appiconset/Contents.json
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -2,6 +2,16 @@
   "images" : [
 {
   "idiom" : "ipad",
+  "size" : "20x20",
+  "scale" : "1x"
+},
+{
+  "idiom" : "ipad",
+  "size" : "20x20",
+  "scale" : "2x"
+},
+{
+  "idiom" : "ipad",
   "size" : "29x29",
   "scale" : "1x"
 },
@@ -29,6 +39,11 @@
   "idiom" : "ipad",
   "size" : "76x76",
   "scale" : "2x"
+},
+{
+  "idiom" : "ipad",
+  "size" : "83.5x83.5",
+  "scale" : "2x"
 }
   ],
   "info" : {
diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in
index 21fdc15..6147789 100644
--- a/ios/lo.xcconfig.in
+++ b/ios/lo.xcconfig.in
@@ -29,3 +29,4 @@ DEBUG_INFORMATION_FORMAT=@XCODE_DEBUG_INFORMATION_FORMAT@
 LINK_LDFLAGS =
 OTHER_CFLAGS =
 OTHER_CPLUSPLUSFLAGS =
+SYMROOT = @BUILDDIR@/ios/TiledLibreOffice
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-03 Thread Tor Lillqvist

 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 
   4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9b970120fe66a6671f8965919d34fe75baedd886
Author: Tor Lillqvist 
Date:   Mon Oct 3 23:17:32 2016 +0300

Bump IPHONEOS_DEPLOYMENT_TARGET

Change-Id: Ic65e248b4a7f99ebb354dad87157e35cf3e55424

diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 6c9960e..f7ec7ef 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -2387,7 +2387,7 @@

"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",

"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
);
-   IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+   IPHONEOS_DEPLOYMENT_TARGET = 9.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
SDKROOT = iphoneos;
@@ -2430,7 +2430,7 @@

"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",

"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
);
-   IPHONEOS_DEPLOYMENT_TARGET = 8.4;
+   IPHONEOS_DEPLOYMENT_TARGET = 9.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
SDKROOT = iphoneos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-09-19 Thread Tor Lillqvist

 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 
   2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f626b886d03f882fc72589db846f24df5290bb03
Author: Tor Lillqvist 
Date:   Sat Sep 19 10:41:27 2015 +0300

We don't want bitcode at least for now

Change-Id: I54c6a9f665957fb8ff67cce96b5718d5afbb

diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index c5d9a6c2..55828d5 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -2444,6 +2444,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = 
LaunchImage;
+   ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = 
"TiledLibreOffice/TiledLibreOffice-Prefix.pch";
INFOPLIST_FILE = 
"TiledLibreOffice/TiledLibreOffice-Info.plist";
@@ -2457,6 +2458,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = 
LaunchImage;
+   ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = 
"TiledLibreOffice/TiledLibreOffice-Prefix.pch";
INFOPLIST_FILE = 
"TiledLibreOffice/TiledLibreOffice-Info.plist";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-29 Thread Tor Lillqvist

 ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m |   12 
--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit dbab3b56694d2a66c40fc145a24b3db9df1693db
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Jan 29 22:49:13 2015 +0200

Only list documents directly in NSDocumentDirectory

Change-Id: Ibaaa9ce5e5469b960d2b3dee1d40c536e5ae0739

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m
index 8bad26b..17fa433 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m
@@ -41,8 +41,16 @@
 [documents addObject:test1];
 
 while ((document = [dirEnumerator nextObject])) {
-nDocs++;
-[documents addObject:[documentsDirectory 
stringByAppendingPathComponent:document]];
+NSString *fullPath = [documentsDirectory 
stringByAppendingPathComponent:document];
+BOOL isDirectory;
+if ([fileManager fileExistsAtPath:fullPath isDirectory:isDirectory]) {
+if (isDirectory)
+[dirEnumerator skipDescendants];
+else {
+nDocs++;
+[documents addObject:fullPath];
+}
+}
 }
 
 if (nDocs == 0) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-20 Thread Tor Lillqvist

 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 
   8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6446688fc9965fa55bf8cd253f0476b9fffe1dc3
Author: Tor Lillqvist t...@collabora.com
Date:   Sat Dec 20 11:25:25 2014 +0200

Bump ICU version

Change-Id: I7e871a6a4f538598d0af8bf3e5638292034c7349

diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 1805751..1b418bb 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
objects = {
 
 /* Begin PBXBuildFile section */
-   BE03BF9318F9A7CC00620DC7 /* icudt53l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = BE03BF9218F9A7CC00620DC7 /* icudt53l.dat */; };
+   BE03BF9318F9A7CC00620DC7 /* icudt54l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = BE03BF9218F9A7CC00620DC7 /* icudt54l.dat */; };
BE55B06D18D87CC600950228 /* DocumentTableViewController.m in 
Sources */ = {isa = PBXBuildFile; fileRef = BE55B06C18D87CC600950228 /* 
DocumentTableViewController.m */; };
BE82BD7618218E2E00A447B5 /* Foundation.framework in Frameworks 
*/ = {isa = PBXBuildFile; fileRef = BE82BD7518218E2E00A447B5 /* 
Foundation.framework */; };
BE82BD7818218E2E00A447B5 /* CoreGraphics.framework in 
Frameworks */ = {isa = PBXBuildFile; fileRef = BE82BD7718218E2E00A447B5 /* 
CoreGraphics.framework */; };
@@ -39,7 +39,7 @@
 
 /* Begin PBXFileReference section */
BE03BF9118F9648F00620DC7 /* udata.cpp */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = udata.cpp; 
path = ../../../workdir/UnpackedTarball/icu/source/common/udata.cpp; sourceTree 
= group; };
-   BE03BF9218F9A7CC00620DC7 /* icudt53l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt53l.dat; path = 
../../../../workdir/UnpackedTarball/icu/source/data/in/icudt53l.dat; sourceTree 
= group; };
+   BE03BF9218F9A7CC00620DC7 /* icudt54l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt54l.dat; path = 
../../../../workdir/UnpackedTarball/icu/source/data/in/icudt54l.dat; sourceTree 
= group; };
BE03BF9518FC1A1C00620DC7 /* xdictionary.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
xdictionary.cxx; path = ../../../i18npool/source/breakiterator/xdictionary.cxx; 
sourceTree = group; };
BE0898E81860D42B0021A679 /* brand.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = brand.cxx; 
path = ../../../vcl/source/app/brand.cxx; sourceTree = group; };
BE0898E91860D42B0021A679 /* dbggui.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbggui.cxx; 
path = ../../../vcl/source/app/dbggui.cxx; sourceTree = group; };
@@ -2241,7 +2241,7 @@
BEEEFDFE1860A82C00FBDE67 /* unorc */,
BEEE02D01860ABB700FBDE67 /* ure */,
BEEEF9691860A25400FBDE67 /* test1.odt */,
-   BE03BF9218F9A7CC00620DC7 /* icudt53l.dat */,
+   BE03BF9218F9A7CC00620DC7 /* icudt54l.dat */,
);
name = Resources;
path = TiledLibreOffice;
@@ -2307,7 +2307,7 @@
BEEEFE041860A89100FBDE67 /* rc in Resources */,
BEEEFE051860A89100FBDE67 /* services.rdb in 
Resources */,
BEEE02D21860ABDB00FBDE67 /* share in Resources 
*/,
-   BE03BF9318F9A7CC00620DC7 /* icudt53l.dat in 
Resources */,
+   BE03BF9318F9A7CC00620DC7 /* icudt54l.dat in 
Resources */,
BEEEFE061860A89100FBDE67 /* types.rdb in 
Resources */,
BEEEFE071860A89100FBDE67 /* unorc in Resources 
*/,
BEEE02D31860ABDB00FBDE67 /* ure in Resources */,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-12 Thread Tor Lillqvist

 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 
   4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e570cd7a293ceee175949dcc9656cdf776ae3c37
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 11 17:22:11 2014 +0200

Make IPHONEOS_DEPLOYMENT_TARGET match configure.ac

Change-Id: Ie81075e1e392facfd281acdd652f6fcc6076c70e

diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 9a2a69d..1805751 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -2387,7 +2387,7 @@

$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive,

$(LO_WORKDIR)/UnpackedTarball/icu/source/common,
);
-   IPHONEOS_DEPLOYMENT_TARGET = 6.1;
+   IPHONEOS_DEPLOYMENT_TARGET = 7.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = $(LINK_LDFLAGS);
SDKROOT = iphoneos;
@@ -2430,7 +2430,7 @@

$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive,

$(LO_WORKDIR)/UnpackedTarball/icu/source/common,
);
-   IPHONEOS_DEPLOYMENT_TARGET = 6.1;
+   IPHONEOS_DEPLOYMENT_TARGET = 7.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = $(LINK_LDFLAGS);
SDKROOT = iphoneos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-23 Thread Tor Lillqvist

 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 
 116 --
 1 file changed, 97 insertions(+), 19 deletions(-)

New commits:
commit f13e5b284598ee5eb855c19bc7e02ba7e2d1af1a
Author: Tor Lillqvist t...@collabora.com
Date:   Thu May 22 15:47:43 2014 +0300

Add some more source files for debugging convenience

Change-Id: Ic058067f4114662569433801d8627e1c6fe648aa

diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 60c0e6e..3872449 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -50,7 +50,6 @@
BE0898EE1860D42B0021A679 /* salvtables.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
salvtables.cxx; path = ../../../vcl/source/app/salvtables.cxx; sourceTree = 
group; };
BE0898EF1860D42B0021A679 /* session.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = session.cxx; 
path = ../../../vcl/source/app/session.cxx; sourceTree = group; };
BE0898F01860D42B0021A679 /* settings.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = settings.cxx; 
path = ../../../vcl/source/app/settings.cxx; sourceTree = group; };
-   BE0898F11860D42B0021A679 /* solarmutex.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
solarmutex.cxx; path = ../../../vcl/source/app/solarmutex.cxx; sourceTree = 
group; };
BE0898F21860D42B0021A679 /* sound.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sound.cxx; 
path = ../../../vcl/source/app/sound.cxx; sourceTree = group; };
BE0898F31860D42B0021A679 /* stdtext.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdtext.cxx; 
path = ../../../vcl/source/app/stdtext.cxx; sourceTree = group; };
BE0898F41860D42B0021A679 /* svapp.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svapp.cxx; 
path = ../../../vcl/source/app/svapp.cxx; sourceTree = group; };
@@ -118,14 +117,6 @@
BE35B56A1886C50A001B7439 /* metric.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = metric.cxx; 
path = ../../../vcl/source/gdi/metric.cxx; sourceTree = group; };
BE35B56B1886C50A001B7439 /* octree.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = octree.cxx; 
path = ../../../vcl/source/gdi/octree.cxx; sourceTree = group; };
BE35B56C1886C50A001B7439 /* oldprintadaptor.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
oldprintadaptor.cxx; path = ../../../vcl/source/gdi/oldprintadaptor.cxx; 
sourceTree = group; };
-   BE35B56D1886C50A001B7439 /* outdev.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = outdev.cxx; 
path = ../../../vcl/source/gdi/outdev.cxx; sourceTree = group; };
-   BE35B56E1886C50A001B7439 /* outdev2.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = outdev2.cxx; 
path = ../../../vcl/source/gdi/outdev2.cxx; sourceTree = group; };
-   BE35B56F1886C50A001B7439 /* outdev3.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = outdev3.cxx; 
path = ../../../vcl/source/gdi/outdev3.cxx; sourceTree = group; };
-   BE35B5701886C50A001B7439 /* outdev4.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = outdev4.cxx; 
path = ../../../vcl/source/gdi/outdev4.cxx; sourceTree = group; };
-   BE35B5711886C50A001B7439 /* outdev5.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = outdev5.cxx; 
path = ../../../vcl/source/gdi/outdev5.cxx; sourceTree = group; };
-   BE35B5721886C50A001B7439 /* outdev6.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = outdev6.cxx; 
path = ../../../vcl/source/gdi/outdev6.cxx; sourceTree = group; };
-   BE35B5731886C50A001B7439 /* outdevnative.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
outdevnative.cxx; path = ../../../vcl/source/gdi/outdevnative.cxx; sourceTree = 
group; };
-   BE35B5741886C50A001B7439 /* outmap.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = outmap.cxx; 
path = ../../../vcl/source/gdi/outmap.cxx; sourceTree = group; };
BE35B5751886C50A001B7439 /* pdfextoutdevdata.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
pdfextoutdevdata.cxx; path = ../../../vcl/source/gdi/pdfextoutdevdata.cxx; 
sourceTree = group; };

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

2014-04-30 Thread Tor Lillqvist

 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 
   8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c1addbb684236c8ed7b4864e481daf925c10bbd0
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Apr 30 08:40:24 2014 +0300

ICU has been bumped to 53

Change-Id: I55cf9fa0364856169e9781f77c65bae047ce1ca8

diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 986da7f..60c0e6e 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
objects = {
 
 /* Begin PBXBuildFile section */
-   BE03BF9318F9A7CC00620DC7 /* icudt52l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = BE03BF9218F9A7CC00620DC7 /* icudt52l.dat */; };
+   BE03BF9318F9A7CC00620DC7 /* icudt53l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = BE03BF9218F9A7CC00620DC7 /* icudt53l.dat */; };
BE55B06D18D87CC600950228 /* DocumentTableViewController.m in 
Sources */ = {isa = PBXBuildFile; fileRef = BE55B06C18D87CC600950228 /* 
DocumentTableViewController.m */; };
BE82BD7618218E2E00A447B5 /* Foundation.framework in Frameworks 
*/ = {isa = PBXBuildFile; fileRef = BE82BD7518218E2E00A447B5 /* 
Foundation.framework */; };
BE82BD7818218E2E00A447B5 /* CoreGraphics.framework in 
Frameworks */ = {isa = PBXBuildFile; fileRef = BE82BD7718218E2E00A447B5 /* 
CoreGraphics.framework */; };
@@ -39,7 +39,7 @@
 
 /* Begin PBXFileReference section */
BE03BF9118F9648F00620DC7 /* udata.cpp */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = udata.cpp; 
path = ../../../workdir/UnpackedTarball/icu/source/common/udata.cpp; sourceTree 
= group; };
-   BE03BF9218F9A7CC00620DC7 /* icudt52l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt52l.dat; path = 
../../../../workdir/UnpackedTarball/icu/source/data/in/icudt52l.dat; sourceTree 
= group; };
+   BE03BF9218F9A7CC00620DC7 /* icudt53l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt53l.dat; path = 
../../../../workdir/UnpackedTarball/icu/source/data/in/icudt53l.dat; sourceTree 
= group; };
BE03BF9518FC1A1C00620DC7 /* xdictionary.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
xdictionary.cxx; path = ../../../i18npool/source/breakiterator/xdictionary.cxx; 
sourceTree = group; };
BE0898E81860D42B0021A679 /* brand.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = brand.cxx; 
path = ../../../vcl/source/app/brand.cxx; sourceTree = group; };
BE0898E91860D42B0021A679 /* dbggui.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbggui.cxx; 
path = ../../../vcl/source/app/dbggui.cxx; sourceTree = group; };
@@ -1743,7 +1743,7 @@
BEEEFDFE1860A82C00FBDE67 /* unorc */,
BEEE02D01860ABB700FBDE67 /* ure */,
BEEEF9691860A25400FBDE67 /* test1.odt */,
-   BE03BF9218F9A7CC00620DC7 /* icudt52l.dat */,
+   BE03BF9218F9A7CC00620DC7 /* icudt53l.dat */,
);
name = Resources;
path = TiledLibreOffice;
@@ -1809,7 +1809,7 @@
BEEEFE041860A89100FBDE67 /* rc in Resources */,
BEEEFE051860A89100FBDE67 /* services.rdb in 
Resources */,
BEEE02D21860ABDB00FBDE67 /* share in Resources 
*/,
-   BE03BF9318F9A7CC00620DC7 /* icudt52l.dat in 
Resources */,
+   BE03BF9318F9A7CC00620DC7 /* icudt53l.dat in 
Resources */,
BEEEFE061860A89100FBDE67 /* types.rdb in 
Resources */,
BEEEFE071860A89100FBDE67 /* unorc in Resources 
*/,
BEEE02D31860ABDB00FBDE67 /* ure in Resources */,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-12 Thread Tor Lillqvist

 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 
   1 +
 1 file changed, 1 insertion(+)

New commits:
commit cddf4bd65fb4ce5615ca770946707d0db657e8ec
Author: Tor Lillqvist t...@collabora.com
Date:   Sat Apr 12 23:35:37 2014 +0300

HEADER_SEARCH_PATHS is duplicated for Debug and Release

Change-Id: Ifbed4933f528342300642673d707c8189eda1e8c

diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index e8dcc42..bea8539 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -1876,6 +1876,7 @@
$LO_SRCDIR/include,

$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive,

$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive,
+   
$(LO_WORKDIR)/UnpackedTarball/icu/source/common,
);
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
ONLY_ACTIVE_ARCH = YES;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-04 Thread Tor Lillqvist

 ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m |   18 
++
 1 file changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 561f5a875379a01f1c31a5b0226bfefe82432df2
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Apr 4 14:28:23 2014 +0300

Use tile coordinates for the DRAW_ONLY_TILE functionality

CATiledLayer does not guarantee that tiles are drawn in the same order
each time so using a tile number for DRAW_ONLY_TILE was not
perfect. Use tile coordinates instead when wanting to restrict to
showing just one tile.

Change-Id: I23f4a3ecaf47cd3392d2d950bd279260b3a7b9f4

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
index cea417a..80680dd 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
@@ -102,6 +102,15 @@ static void updateTilesPerSecond(UILabel *label)
 return [CATiledLayer class];
 }
 
+static bool tileMatches(const char *spec, CGRect bb)
+{
+int x, y;
+
+return (sscanf(spec, %d,%d, x, y) == 2 
+x == (int) (bb.origin.x / bb.size.width) 
+y == (int) (bb.origin.y / bb.size.height));
+}
+
 - (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx
 {
 // Even if I set the CATL's tileSize to 512x512 above, this is
@@ -129,10 +138,7 @@ static void updateTilesPerSecond(UILabel *label)
 // as needed at the current zoom levels. I keep thinking about
 // pixels incorrectly.
 
-volatile static int number = 0;
-int thisTile = number++;
-
-if (!getenv(DRAW_ONLY_TILE) || thisTile == 
atoi(getenv(DRAW_ONLY_TILE)))
+if (!getenv(DRAW_ONLY_TILE) || tileMatches(getenv(DRAW_ONLY_TILE), bb))
 touch_lo_draw_tile(ctx,
tileSize.width, tileSize.height,
CGPointMake(bb.origin.x/self.scale, 
bb.origin.y/self.scale),
@@ -157,10 +163,10 @@ static void updateTilesPerSecond(UILabel *label)
 }
 
 if (getenv(DRAW_TILE_NUMBERS)) {
-// Also draw the order number of the tile;)
+// Also draw the coordinates of the tile;)
 CGContextSaveGState(ctx);
 float scale = 1/[((View *) [self superview]) zoomScale];
-NSString *s = [NSString stringWithFormat:@%d, thisTile];
+NSString *s = [NSString stringWithFormat:@%d,%d, (int) (bb.origin.x 
/ bb.size.width), (int) (bb.origin.y / bb.size.height)];
 CFAttributedStringRef as = CFAttributedStringCreate(NULL, (__bridge 
CFStringRef)(s), NULL);
 CTLineRef l = CTLineCreateWithAttributedString(as);
 CGContextTranslateCTM(ctx, bb.origin.x, bb.origin.y);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-03-19 Thread Tor Lillqvist

 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 
  98 ++
 1 file changed, 98 insertions(+)

New commits:
commit 5390829bb36653ae931ff3cfd59ea089bc594ec9
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Mar 19 08:27:48 2014 +0200

Add some more source files for debugging convenience

Change-Id: I8e489354fab78e2dff35ecaca80375640c75a68d

diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index e2153dd..b14b523 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -169,6 +169,51 @@
BE35B5A71890520E001B7439 /* objface.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = objface.cxx; 
path = ../../../sfx2/source/control/objface.cxx; sourceTree = group; };
BE55B06B18D87CC600950228 /* DocumentTableViewController.h */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; 
path = DocumentTableViewController.h; sourceTree = group; };
BE55B06C18D87CC600950228 /* DocumentTableViewController.m */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.objc; path = DocumentTableViewController.m; sourceTree = 
group; };
+   BE55B06F18D96FB000950228 /* displayinfo.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
displayinfo.cxx; path = ../../../svx/source/sdr/contact/displayinfo.cxx; 
sourceTree = group; };
+   BE55B07018D96FB000950228 /* objectcontact.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
objectcontact.cxx; path = ../../../svx/source/sdr/contact/objectcontact.cxx; 
sourceTree = group; };
+   BE55B07118D96FB000950228 /* objectcontactofobjlistpainter.cxx 
*/ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
objectcontactofobjlistpainter.cxx; path = 
../../../svx/source/sdr/contact/objectcontactofobjlistpainter.cxx; sourceTree = 
group; };
+   BE55B07218D96FB000950228 /* objectcontactofpageview.cxx */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
objectcontactofpageview.cxx; path = 
../../../svx/source/sdr/contact/objectcontactofpageview.cxx; sourceTree = 
group; };
+   BE55B07318D96FB000950228 /* sdrmediawindow.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
sdrmediawindow.cxx; path = ../../../svx/source/sdr/contact/sdrmediawindow.cxx; 
sourceTree = group; };
+   BE55B07418D96FB000950228 /* viewcontact.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
viewcontact.cxx; path = ../../../svx/source/sdr/contact/viewcontact.cxx; 
sourceTree = group; };
+   BE55B07518D96FB000950228 /* viewcontactofe3d.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
viewcontactofe3d.cxx; path = 
../../../svx/source/sdr/contact/viewcontactofe3d.cxx; sourceTree = group; };
+   BE55B07618D96FB000950228 /* viewcontactofe3dcube.cxx */ = {isa 
= PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
viewcontactofe3dcube.cxx; path = 
../../../svx/source/sdr/contact/viewcontactofe3dcube.cxx; sourceTree = 
group; };
+   BE55B07718D96FB000950228 /* viewcontactofe3dextrude.cxx */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
viewcontactofe3dextrude.cxx; path = 
../../../svx/source/sdr/contact/viewcontactofe3dextrude.cxx; sourceTree = 
group; };
+   BE55B07818D96FB000950228 /* viewcontactofe3dlathe.cxx */ = {isa 
= PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
viewcontactofe3dlathe.cxx; path = 
../../../svx/source/sdr/contact/viewcontactofe3dlathe.cxx; sourceTree = 
group; };
+   BE55B07918D96FB000950228 /* viewcontactofe3dpolygon.cxx */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
viewcontactofe3dpolygon.cxx; path = 
../../../svx/source/sdr/contact/viewcontactofe3dpolygon.cxx; sourceTree = 
group; };
+   BE55B07A18D96FB000950228 /* viewcontactofe3dscene.cxx */ = {isa 
= PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
viewcontactofe3dscene.cxx; path = 
../../../svx/source/sdr/contact/viewcontactofe3dscene.cxx; sourceTree = 
group; };
+   BE55B07B18D96FB000950228 /* viewcontactofe3dsphere.cxx */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
viewcontactofe3dsphere.cxx; path = 
../../../svx/source/sdr/contact/viewcontactofe3dsphere.cxx; sourceTree = 
group; };
+   BE55B07C18D96FB000950228 /* viewcontactofgraphic.cxx */ = {isa 
= PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =

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

2014-03-10 Thread Tor Lillqvist

 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 
 356 +-
 1 file changed, 352 insertions(+), 4 deletions(-)

New commits:
commit 5133e0e0e818e0a572181ec0e18972e2c60040ea
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Mar 10 17:38:59 2014 +0200

Add more source files for convenient breakpoint setting

Change-Id: I88d6176f919de90b5014f328fdad84d017b3bb55

diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index bf29e9a..e226f13 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -215,13 +215,159 @@
BE82C3A518C752E20050EB79 /* time.c */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.c; name = time.c; path = 
../../../sal/osl/unx/time.c; sourceTree = group; };
BE82C3A618C752E20050EB79 /* uunxapi.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uunxapi.cxx; 
path = ../../../sal/osl/unx/uunxapi.cxx; sourceTree = group; };
BE82C3A718C752E20050EB79 /* uunxapi.mm */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = uunxapi.mm; 
path = ../../../sal/osl/unx/uunxapi.mm; sourceTree = group; };
+   BE82C42918CA18610050EB79 /* ActionDescriptionProvider.cxx */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
ActionDescriptionProvider.cxx; path = 
../../../svx/source/svdraw/ActionDescriptionProvider.cxx; sourceTree = 
group; };
+   BE82C42A18CA18610050EB79 /* charthelper.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
charthelper.cxx; path = ../../../svx/source/svdraw/charthelper.cxx; sourceTree 
= group; };
+   BE82C42B18CA18610050EB79 /* clonelist.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clonelist.cxx; 
path = ../../../svx/source/svdraw/clonelist.cxx; sourceTree = group; };
+   BE82C42C18CA18610050EB79 /* gradtrns.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gradtrns.cxx; 
path = ../../../svx/source/svdraw/gradtrns.cxx; sourceTree = group; };
+   BE82C42D18CA18610050EB79 /* gradtrns.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = gradtrns.hxx; 
path = ../../../svx/source/svdraw/gradtrns.hxx; sourceTree = group; };
+   BE82C42E18CA18610050EB79 /* polypolygoneditor.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
polypolygoneditor.cxx; path = ../../../svx/source/svdraw/polypolygoneditor.cxx; 
sourceTree = group; };
+   BE82C42F18CA18610050EB79 /* sdrhittesthelper.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
sdrhittesthelper.cxx; path = ../../../svx/source/svdraw/sdrhittesthelper.cxx; 
sourceTree = group; };
+   BE82C43018CA18610050EB79 /* sdrmasterpagedescriptor.cxx */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
sdrmasterpagedescriptor.cxx; path = 
../../../svx/source/svdraw/sdrmasterpagedescriptor.cxx; sourceTree = group; 
};
+   BE82C43118CA18610050EB79 /* sdrpagewindow.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
sdrpagewindow.cxx; path = ../../../svx/source/svdraw/sdrpagewindow.cxx; 
sourceTree = group; };
+   BE82C43218CA18610050EB79 /* sdrpaintwindow.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
sdrpaintwindow.cxx; path = ../../../svx/source/svdraw/sdrpaintwindow.cxx; 
sourceTree = group; };
+   BE82C43318CA18610050EB79 /* sdrundomanager.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
sdrundomanager.cxx; path = ../../../svx/source/svdraw/sdrundomanager.cxx; 
sourceTree = group; };
+   BE82C43418CA18610050EB79 /* selectioncontroller.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
selectioncontroller.cxx; path = 
../../../svx/source/svdraw/selectioncontroller.cxx; sourceTree = group; };
+   BE82C43518CA18610050EB79 /* svdattr.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svdattr.cxx; 
path = ../../../svx/source/svdraw/svdattr.cxx; sourceTree = group; };
+   BE82C43618CA18610050EB79 /* svdcrtv.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svdcrtv.cxx; 
path = ../../../svx/source/svdraw/svdcrtv.cxx; sourceTree = group; };
+   BE82C43718CA18610050EB79 /* svddrag.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svddrag.cxx; 
path = ../../../svx/source/svdraw/svddrag.cxx; sourceTree = group; };
+

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

2013-12-20 Thread Tor Lillqvist

 ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m |   47 
+-
 1 file changed, 28 insertions(+), 19 deletions(-)

New commits:
commit b8a1af35cc565248f6d103f526488fa7cc44ac38
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Dec 20 10:47:52 2013 +0200

Improve the tiles per second calculation

Avoid an implicit upper limit on the value calculated (and displayed) by
keeping a counter, too, for each slot in the array.

Also edit a comment, as I now have a better understanding of how the
tiling works.

Change-Id: I5df4076917a244f73f27b66f4983f17ce95b9df7

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
index 3756cd2..88c3095 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
@@ -22,24 +22,28 @@
 static const int NTIMESTAMPS = 100;
 static const CFTimeInterval AVERAGINGTIME = 5;
 
-static CFTimeInterval tileTimestamps[NTIMESTAMPS];
-static int curFirstTimestamp = 0;
-static int curNextTimestamp = 0;
+static struct {
+CFTimeInterval timestamp;
+int count;
+} tileTimestamps[NTIMESTAMPS];
+static int oldestTimestampIndex = 0;
+static int nextTimestampIndex = 0;
 
 static void dropOldTimestamps(CFTimeInterval now)
 {
 // Drop too old timestamps
-while (curFirstTimestamp != curNextTimestamp  now - 
tileTimestamps[curFirstTimestamp] = AVERAGINGTIME)
-curFirstTimestamp = (curFirstTimestamp + 1) % NTIMESTAMPS;
+while (oldestTimestampIndex != nextTimestampIndex  now - 
tileTimestamps[oldestTimestampIndex].timestamp = AVERAGINGTIME)
+oldestTimestampIndex = (oldestTimestampIndex + 1) % NTIMESTAMPS;
 }
 
 static void updateTilesPerSecond(UILabel *label)
 {
-int n = (curNextTimestamp  curFirstTimestamp) ?
-(NTIMESTAMPS - (curFirstTimestamp - curNextTimestamp))
-: ((curNextTimestamp - curFirstTimestamp));
+int n = 0;
 
-// NSLog(@first:%d next:%d n:%d, curFirstTimestamp, curNextTimestamp, n);
+for (int k = oldestTimestampIndex; k != nextTimestampIndex; k = (k + 1) % 
NTIMESTAMPS)
+n += tileTimestamps[k].count;
+
+// NSLog(@oldest:%d next:%d n:%d, oldestTimestampIndex, 
nextTimestampIndex, n);
 
 double tps = n/AVERAGINGTIME;
 
@@ -54,10 +58,13 @@ static void updateTilesPerSecond(UILabel *label)
 dropOldTimestamps(now);
 
 // Add new timestamp
-tileTimestamps[curNextTimestamp] = now;
+tileTimestamps[nextTimestampIndex].timestamp = now;
+tileTimestamps[nextTimestampIndex].count++;
 // Let next added replace newest if array full
-if (curFirstTimestamp != (curNextTimestamp + 1) % NTIMESTAMPS)
-curNextTimestamp = (curNextTimestamp + 1) % NTIMESTAMPS;
+if (oldestTimestampIndex != (nextTimestampIndex + 1) % NTIMESTAMPS) {
+nextTimestampIndex = (nextTimestampIndex + 1) % NTIMESTAMPS;
+tileTimestamps[nextTimestampIndex].count = 0;
+}
 
 updateTilesPerSecond(((View *) [self superview]).tpsLabel);
 }
@@ -114,13 +121,15 @@ static void updateTilesPerSecond(UILabel *label)
 
 // NSLog(@bb:%.0fx%.0f@(%.0f,%.0f) zoomScale:%.0f tile:%.0fx%.0f 
at:(%.0f,%.0f) size:%.0fx%.0f, bb.size.width, bb.size.height, bb.origin.x, 
bb.origin.y, zoomScale, tileSize.width, tileSize.height, 
bb.origin.x/self.scale, bb.origin.y/self.scale, bb.size.width/self.scale, 
bb.size.height/self.scale);
 
-// I don't really claim to fully understand all this. It does seem
-// a bit weird to be passing in a context width x height (in the
-// terminology of touch_lo_draw_tile) of 64x64, for instance, even
-// if that tile is actually going to be rendered to 128x128 actual
-// pixels. But this seems to work. Other combinations, applying
-// scaling to the CTM, etc, don't. But maybe I haven't tried hard
-// enough.
+// I don't really claim to fully understand all this. It did at
+// first seem a bit weird to be passing in a context width x
+// height (in the terminology of touch_lo_draw_tile) of 64x64,
+// for instance, even if that tile is actually going to be
+// rendered to 128x128 on-screen pixels. But what I tend to forget
+// is that this 64x64 is in the coordinate space of the initial
+// view of the document; the CGContext keeps track of scaling it
+// as needed at the current zoom levels. I keep thinking about
+// pixels incorrectly.
 
 touch_lo_draw_tile(ctx,
tileSize.width, tileSize.height,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-12-19 Thread Tor Lillqvist

 ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h |2 
 ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m |   38 
--
 ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m  |   16 +---
 3 files changed, 37 insertions(+), 19 deletions(-)

New commits:
commit 7f02e47111eba4ec45ca02f78729b35d56839c1b
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 19 21:49:25 2013 +0200

Further minor tweaks to TiledLibreOffice

Change-Id: If1c1bbaadf8866605bf1026c4a71da0a397391a4

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h
index fb42358..2b228e6 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h
@@ -10,7 +10,7 @@
 
 @interface TiledView : UIView
 
-- (id)initWithFrame:(CGRect)frame andScale:(CGFloat)scale;
+- (id)initWithFrame:(CGRect)frame scale:(CGFloat)scale maxZoom:(int)maxZoom;
 
 @end
 
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
index 0fe9c94..57a13fb 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
@@ -19,15 +19,15 @@
 
 @implementation TiledView
 
-- (id)initWithFrame:(CGRect)frame andScale:(CGFloat)scale
+- (id)initWithFrame:(CGRect)frame scale:(CGFloat)scale maxZoom:(int)maxZoom
 {
 self = [super initWithFrame:frame];
 if (self) {
 self.scale = scale;
 CATiledLayer *catl = (CATiledLayer*) [self layer];
 catl.tileSize = CGSizeMake(512, 512);
-catl.levelsOfDetail = 4;
-catl.levelsOfDetailBias = 4;
+catl.levelsOfDetail = log2(maxZoom) + 1;
+catl.levelsOfDetailBias = catl.levelsOfDetail - 1;
 }
 return self;
 }
@@ -39,22 +39,46 @@
 
 - (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx
 {
-CGContextSaveGState(ctx);
+// Even if I set the CATL's tileSize to 512x512 above, this is
+// called initially with a clip bbox of 128x128. Odd, I would have
+// expected it to be called with a bbox of 256x256.
 
 CGRect bb = CGContextGetClipBoundingBox(ctx);
+double zoomScale = [(View *) [self superview] zoomScale];
+CATiledLayer *catl = (CATiledLayer*) [self layer];
 
-// NSLog(@%.0fx%.0f@(%.0f,%.0f) %f, bb.size.width, bb.size.height, 
bb.origin.x, bb.origin.y, 1/[(View *) [self superview] zoomScale]);
+CGContextSaveGState(ctx);
 
 CGContextTranslateCTM(ctx, bb.origin.x, bb.origin.y);
+// CGContextScaleCTM(ctx, 1/zoomScale, 1/zoomScale);
+
+// CGSize tileSize = [catl tileSize];
+CGSize tileSize = bb.size;
+
+// NSLog(@bb:%.0fx%.0f@(%.0f,%.0f) zoomScale:%.0f tile:%.0fx%.0f 
at:(%.0f,%.0f) size:%.0fx%.0f, bb.size.width, bb.size.height, bb.origin.x, 
bb.origin.y, zoomScale, tileSize.width, tileSize.height, 
bb.origin.x/self.scale, bb.origin.y/self.scale, bb.size.width/self.scale, 
bb.size.height/self.scale);
 
-NSLog(@tile:%.0fx%.0f at:(%.0f,%.0f) size:%.0fx%.0f, bb.size.width, 
bb.size.height, bb.origin.x/self.scale, bb.origin.y/self.scale, 
bb.size.width/self.scale, bb.size.height/self.scale);
+// I don't really claim to fully understand all this. It does seem
+// a bit weird to be passing in a context width x height (in the
+// terminology of touch_lo_draw_tile) of 64x64, for instance, even
+// if that tile is actually going to be rendered to 128x128 actual
+// pixels. But this seems to work. Other combinations, applying
+// scaling to the CTM, etc, don't. But maybe I haven't tried hard
+// enough.
 
 touch_lo_draw_tile(ctx,
-   bb.size.width, bb.size.height,
+   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));
 
 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);
 }
 
 @end
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m
index be27c09..9291b45 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m
@@ -23,7 +23,9 @@
 {
 self = [super initWithFrame:frame];
 if (self) {
-[self setMaximumZoomScale:4];
+const int MAXZOOM = 4;
+
+[self setMaximumZoomScale:MAXZOOM];

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

2013-12-19 Thread Tor Lillqvist

 ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m |   63 
+-
 ios/experimental/TiledLibreOffice/TiledLibreOffice/View.h  |2 
 ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m  |   17 ++
 3 files changed, 80 insertions(+), 2 deletions(-)

New commits:
commit 4cae6fa29a07a238273453cef9d18e4171d430e8
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Dec 20 01:59:06 2013 +0200

Add tiles per second counter (averaged over last five seconds)

Change-Id: I11e282c1a72dbc6b41a5a89229065983b41eb65b

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
index 57a13fb..3756cd2 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
@@ -19,6 +19,60 @@
 
 @implementation TiledView
 
+static const int NTIMESTAMPS = 100;
+static const CFTimeInterval AVERAGINGTIME = 5;
+
+static CFTimeInterval tileTimestamps[NTIMESTAMPS];
+static int curFirstTimestamp = 0;
+static int curNextTimestamp = 0;
+
+static void dropOldTimestamps(CFTimeInterval now)
+{
+// Drop too old timestamps
+while (curFirstTimestamp != curNextTimestamp  now - 
tileTimestamps[curFirstTimestamp] = AVERAGINGTIME)
+curFirstTimestamp = (curFirstTimestamp + 1) % NTIMESTAMPS;
+}
+
+static void updateTilesPerSecond(UILabel *label)
+{
+int n = (curNextTimestamp  curFirstTimestamp) ?
+(NTIMESTAMPS - (curFirstTimestamp - curNextTimestamp))
+: ((curNextTimestamp - curFirstTimestamp));
+
+// NSLog(@first:%d next:%d n:%d, curFirstTimestamp, curNextTimestamp, n);
+
+double tps = n/AVERAGINGTIME;
+
+[label setText:[NSString stringWithFormat:@%.0f tiles/second, tps]];
+}
+
+- (void)didRenderTile
+{
+CFTimeInterval now = CACurrentMediaTime();
+
+@synchronized(self) {
+dropOldTimestamps(now);
+
+// Add new timestamp
+tileTimestamps[curNextTimestamp] = now;
+// Let next added replace newest if array full
+if (curFirstTimestamp != (curNextTimestamp + 1) % NTIMESTAMPS)
+curNextTimestamp = (curNextTimestamp + 1) % NTIMESTAMPS;
+
+updateTilesPerSecond(((View *) [self superview]).tpsLabel);
+}
+}
+
+- (void)updateTilesPerSecond
+{
+CFTimeInterval now = CACurrentMediaTime();
+
+@synchronized(self) {
+dropOldTimestamps(now);
+updateTilesPerSecond(((View *) [self superview]).tpsLabel);
+}
+}
+
 - (id)initWithFrame:(CGRect)frame scale:(CGFloat)scale maxZoom:(int)maxZoom
 {
 self = [super initWithFrame:frame];
@@ -28,6 +82,8 @@
 catl.tileSize = CGSizeMake(512, 512);
 catl.levelsOfDetail = log2(maxZoom) + 1;
 catl.levelsOfDetailBias = catl.levelsOfDetail - 1;
+
+[NSTimer scheduledTimerWithTimeInterval:1 target:self 
selector:@selector(updateTilesPerSecond) userInfo:nil repeats:YES];
 }
 return self;
 }
@@ -44,8 +100,9 @@
 // expected it to be called with a bbox of 256x256.
 
 CGRect bb = CGContextGetClipBoundingBox(ctx);
-double zoomScale = [(View *) [self superview] zoomScale];
-CATiledLayer *catl = (CATiledLayer*) [self layer];
+
+// double zoomScale = [(View *) [self superview] zoomScale];
+// CATiledLayer *catl = (CATiledLayer*) [self layer];
 
 CGContextSaveGState(ctx);
 
@@ -70,6 +127,8 @@
CGPointMake(bb.origin.x/self.scale, 
bb.origin.y/self.scale),
CGSizeMake(bb.size.width/self.scale, 
bb.size.height/self.scale));
 
+[self didRenderTile];
+
 CGContextRestoreGState(ctx);
 
 // I am a bit confused about what tiles exactly I am drawing, so
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.h 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.h
index 3043632..041471d 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.h
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.h
@@ -10,6 +10,8 @@
 
 @interface View : UIScrollView UIScrollViewDelegate
 
+@property UILabel *tpsLabel;
+
 @end
 
 // vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m
index 9291b45..8f4741b 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m
@@ -37,6 +37,14 @@
 
 self.subView = [[TiledView alloc] initWithFrame:CGRectMake(0, 0, 
frame.size.width, frame.size.width*docAspectRatio) scale:widthScale 
maxZoom:MAXZOOM];
 [self addSubview:self.subView];
+
+UILabel *tpsLabel = [[UILabel alloc] initWithFrame:CGRectMake(20, 20, 
300, 40)];
+[tpsLabel setFont:[UIFont systemFontOfSize:38]];
+[tpsLabel setBackgroundColor: [UIColor colorWithRed:0 green:0 blue:0 
alpha:0.3]];
+[tpsLabel setTextColor: [UIColor

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

2013-12-18 Thread Tor Lillqvist

 ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm |   74 ++-
 1 file changed, 14 insertions(+), 60 deletions(-)

New commits:
commit 2753bc1eff1bc595131a59518c1f7e131824b10d
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 19 00:16:31 2013 +0200

Adapt TiledLibreOffice to the new library name to component mapping API

Change-Id: I96e2931763c277d72ff1bb7ebdf5b71c0d6e091b

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
index d9f724c..074e472 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
@@ -16,69 +16,12 @@
 #include osl/process.h
 #include touch/touch.h
 
-extern C {
-extern void * analysis_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
-extern void * animcore_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
-extern void * avmedia_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * chartcore_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
-extern void * cui_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * date_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * dba_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * dbaxml_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * embobj_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * emboleobj_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
-extern void * evtatt_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * expwrap_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * filterconfig1_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
-extern void * frm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * fsstorage_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
-extern void * fwk_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * fwl_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * fwm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * hwp_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * hyphen_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * lng_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * lnth_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * oox_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * pricing_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * sc_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * scd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * scfilt_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * sd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * sdd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * sm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * smd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * sot_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * spell_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * spl_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * svgfilter_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
-extern void * svt_component_getFactory(

[Libreoffice-commits] core.git: ios/experimental ios/MobileLibreOffice sw/source vcl/headless vcl/inc vcl/ios vcl/Library_vcl.mk vcl/osx vcl/quartz

2013-12-13 Thread Tor Lillqvist

 ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj  |2 
 ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj |6 
 sw/source/core/view/viewsh.cxx |   27 
 vcl/Library_vcl.mk |4 
 vcl/headless/svpgdi.cxx|8 
 vcl/headless/svpinst.cxx   |   28 
 vcl/inc/headless/svpframe.hxx  |1 
 vcl/inc/headless/svpgdi.hxx|   75 ++
 vcl/inc/headless/svpinst.hxx   |4 
 vcl/inc/osx/saldata.hxx|6 
 vcl/inc/osx/salinst.h  |3 
 vcl/inc/osx/salvd.h|   85 --
 vcl/inc/quartz/salbmp.h|2 
 vcl/inc/quartz/salvd.h |   69 ++
 vcl/inc/saldatabasic.hxx   |3 
 vcl/ios/iosinst.cxx|4 
 vcl/osx/salinst.cxx|2 
 vcl/osx/salvd.cxx  |  261 
-
 vcl/quartz/salbmp.cxx  |6 
 vcl/quartz/salgdi.cxx  |   33 -
 vcl/quartz/salgdicommon.cxx|   92 ++-
 vcl/quartz/salvd.cxx   |  284 
++
 22 files changed, 562 insertions(+), 443 deletions(-)

New commits:
commit 6265876ae9f1bb862440182d2d2c9b9b5b322668
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Dec 9 21:53:23 2013 +0200

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

diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj 
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 858beb7..ce34006 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 = group; };
BE82BE4E1822D10F00A447B5 /* salgdi.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salgdi.cxx; 
path = ../../vcl/quartz/salgdi.cxx; sourceTree = group; };
BEC9DABC1858BA39009CCCB3 /* svdpagv.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svdpagv.cxx; 
path = ../../svx/source/svdraw/svdpagv.cxx; sourceTree = group; };
+   BEDB0EFB185A05BE009A6F26 /* salvd.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salvd.cxx; 
path = ../../vcl/quartz/salvd.cxx; sourceTree = group; };
BEE68B5D185715EE0049ECE0 /* salbmp.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salbmp.cxx; 
path = ../../vcl/quartz/salbmp.cxx; sourceTree = group; };
BEE68B5E185715EE0049ECE0 /* salgdicommon.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
salgdicommon.cxx; path = ../../vcl/quartz/salgdicommon.cxx; sourceTree = 
group; };
BEE68B5F185715EE0049ECE0 /* salgdiutils.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
salgdiutils.cxx; path = ../../vcl/quartz/salgdiutils.cxx; sourceTree = 
group; };
@@ -700,6 +701,7 @@
BEE68B5E185715EE0049ECE0 /* salgdicommon.cxx */,
BEE68B5F185715EE0049ECE0 /* salgdiutils.cxx

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

2013-07-23 Thread Ptyl Dragon

 ios/experimental/LibreOffice/LibreOffice/lo.mm |   36 ++---
 1 file changed, 33 insertions(+), 3 deletions(-)

New commits:
commit 70e247733e762ed7b20645c8c843e78294b38f0f
Author: Ptyl Dragon p...@cloudon.com
Date:   Tue Jul 9 13:20:00 2013 +0300

Add more components

Change-Id: I30daf067fe9a1804a55be75c040db49dfbb18d92

diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm 
b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index 53c9921..167948c 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -19,11 +19,18 @@ extern C {
 extern void * analysis_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 extern void * animcore_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 extern void * avmedia_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * dba_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * chartcore_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
+extern void * cui_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * date_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * dba_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * dbaxml_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * embobj_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * emboleobj_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 extern void * evtatt_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * expwrap_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * fastsax_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * fileacc_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * filterconfig1_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * frm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * fsstorage_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 extern void * fwk_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
@@ -42,17 +49,25 @@ extern C {
 extern void * sdd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * sm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * smd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * sot_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * spell_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * spl_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * svgfilter_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 extern void * svt_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * svx_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * svxcore_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * sw_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * swd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * t602filter_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * textfd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * unoxml_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * tk_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * ucppkg1_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void *

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

2013-05-27 Thread Tor Lillqvist

 ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9b845493125e34e6bd5e7b0df35f21853f7d240d
Author: Tor Lillqvist t...@iki.fi
Date:   Mon May 27 13:16:57 2013 +0300

Plain make hopefully works fine too

Might make it a little bit easier for new contributors.

Change-Id: If4475c1ea7f55c34971beecd7573aaaf545e7106

diff --git a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj
index eb1d1f3..3209332 100644
--- a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj
+++ b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj
@@ -368,7 +368,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
-   shellScript = cd ../../..  /opt/lo/bin/make ios;
+   shellScript = cd ../../..  make ios;
};
 /* End PBXShellScriptBuildPhase section */
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-04-06 Thread Tor Lillqvist

 ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj |   26 
++
 1 file changed, 26 insertions(+)

New commits:
commit 99bf1f244a7e09a9adbab0a9afcefc7540242a74
Author: Tor Lillqvist t...@iki.fi
Date:   Sat Apr 6 19:37:37 2013 +0300

Add some more interesting sources

Change-Id: Id0fdba93a5d3a46a79cebea8839bdfd467ef4f6f

diff --git a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj
index 4430b6c..3287eab 100644
--- a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj
+++ b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj
@@ -40,12 +40,21 @@
BE5A226D1664F87600CF01C9 /* defa...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = defa...@2x.png; 
sourceTree = group; };
BE5A226F1664F87600CF01C9 /* default-5...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = default-5...@2x.png; 
sourceTree = group; };
BE5A22771664F87600CF01C9 /* SenTestingKit.framework */ = {isa = 
PBXFileReference; lastKnownFileType = wrapper.framework; name = 
SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; 
sourceTree = DEVELOPER_DIR; };
+   BE5C5252170EB97700F33F89 /* shlib.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = shlib.cxx; path = ../../../../cppuhelper/source/shlib.cxx; sourceTree = 
group; };
+   BE5C5253170EB9C900F33F89 /* cpp2uno-arm.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = cpp2uno-arm.cxx; path = 
../../../../bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx; sourceTree = 
group; };
+   BE5C5254170EB9C900F33F89 /* cpp2uno-i386.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = cpp2uno-i386.cxx; path = 
../../../../bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx; sourceTree 
= group; };
+   BE5C5255170EB9C900F33F89 /* cpp2uno.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = cpp2uno.cxx; path = 
../../../../bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx; sourceTree = 
group; };
+   BE5C5256170EB9C900F33F89 /* except.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = except.cxx; path = 
../../../../bridges/source/cpp_uno/gcc3_ios_arm/except.cxx; sourceTree = 
group; };
+   BE5C5257170EB9C900F33F89 /* uno2cpp-arm.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = uno2cpp-arm.cxx; path = 
../../../../bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx; sourceTree = 
group; };
+   BE5C5258170EB9C900F33F89 /* uno2cpp-i386.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = uno2cpp-i386.cxx; path = 
../../../../bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx; sourceTree 
= group; };
+   BE5C5259170EB9C900F33F89 /* uno2cpp.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = uno2cpp.cxx; path = 
../../../../bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx; sourceTree = 
group; };
BE69AD87169592C4001BE1CD /* iTunesArtwork */ = {isa = 
PBXFileReference; lastKnownFileType = file; path = iTunesArtwork; sourceTree = 
group; };
BE69AD8A1695954D001BE1CD /* Icon-72.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = Icon-72.png; 
sourceTree = group; };
BE69AD8B1695954D001BE1CD /* Icon.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = 
group; };
BE69AD8C1695954D001BE1CD /* i...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = i...@2x.png; 
sourceTree = group; };
BE7B7AFF170438D0002341F4 /* ViewController.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
ViewController.h; sourceTree = group; };
BE7B7B00170438D0002341F4 /* ViewController.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= ViewController.m; sourceTree = group; };
+   BE837605170E27EC007BBC3E /* vclxmenu.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = vclxmenu.cxx; path = ../../../../toolkit/source/awt/vclxmenu.cxx; 
sourceTree = group; };
BE9086F616FF02B2004400A1 /* headlessinst.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = headlessinst.cxx; path = ../../../../vcl/headless/headlessinst.cxx; 
sourceTree = group; };
BE9086F716FF02B2004400A1 /* svpbmp.cxx */ = {isa =

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

2013-03-30 Thread Tor Lillqvist

 ios/experimental/LibreOffice/LibreOffice/lo.mm |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 003a05b2570d29caa668a75b0f9ba46d0c867cb6
Author: Tor Lillqvist t...@iki.fi
Date:   Sun Mar 31 00:14:52 2013 +0200

Must pass the test document as a file: URI because it is percent-escaped

Change-Id: I8e27f0cb4a9605a97d8120f9f4697e7f939135c1

diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm 
b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index f23bdd0..983839b 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -178,7 +178,9 @@ lo_initialize(void)
 argv[3] = [uno_services UTF8String];
 
 assert(strcmp(argv[4], placeholder-document) == 0);
-argv[4] = [[app_root_escaped stringByAppendingPathComponent: @test1.odt] 
UTF8String];
+NSString *file = @file://;
+file = [file stringByAppendingString: [app_root_escaped 
stringByAppendingPathComponent: @test1.odt]];
+argv[4] = [file UTF8String];
 
 osl_setCommandArgs(argc, (char **) argv);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-03-26 Thread Tor Lillqvist

 ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj |4 
 1 file changed, 4 insertions(+)

New commits:
commit 2672cbdd00667ecc71b3390a055ee25bb0b06d80
Author: Tor Lillqvist t...@iki.fi
Date:   Sat Mar 23 13:36:13 2013 +0200

Add LOViewerWindow.[hm] to the project

Change-Id: I50ac91fd0e803b1b2322e5c7c25f7bf682a8208d

diff --git a/ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj 
b/ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj
index 0535a2b..bef9ae0 100644
--- a/ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj
+++ b/ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj
@@ -18,6 +18,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+   BE08805B16FDB784000CED5C /* LOViewerWindow.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
LOViewerWindow.h; sourceTree = group; };
+   BE08805C16FDB784000CED5C /* LOViewerWindow.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= LOViewerWindow.m; sourceTree = group; };
BE5A22551664F87600CF01C9 /* Viewer.app */ = {isa = 
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; 
path = Viewer.app; sourceTree = BUILT_PRODUCTS_DIR; };
BE5A22591664F87600CF01C9 /* UIKit.framework */ = {isa = 
PBXFileReference; lastKnownFileType = wrapper.framework; name = 
UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = 
SDKROOT; };
BE5A225B1664F87600CF01C9 /* Foundation.framework */ = {isa = 
PBXFileReference; lastKnownFileType = wrapper.framework; name = 
Foundation.framework; path = System/Library/Frameworks/Foundation.framework; 
sourceTree = SDKROOT; };
@@ -83,6 +85,8 @@
BE69AD3716958CA0001BE1CD /* Resources */,
BE5A22681664F87600CF01C9 /* 
LOViewerAppDelegate.h */,
BE5A22691664F87600CF01C9 /* 
LOViewerAppDelegate.mm */,
+   BE08805B16FDB784000CED5C /* LOViewerWindow.h */,
+   BE08805C16FDB784000CED5C /* LOViewerWindow.m */,
BE5A22601664F87600CF01C9 /* Supporting Files */,
);
path = Viewer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

50 matches

Mail list logo