[Libreoffice-commits] core.git: android/experimental README.cross
README.cross | 16 android/experimental/DocumentLoader/AndroidManifest.xml | 23 android/experimental/DocumentLoader/Makefile | 37 android/experimental/DocumentLoader/build.xml | 84 android/experimental/DocumentLoader/fonts.conf | 154 - android/experimental/DocumentLoader/jni/Android.mk |8 android/experimental/DocumentLoader/project.properties | 14 android/experimental/DocumentLoader/res/menu/option.xml |5 android/experimental/DocumentLoader/res/values/strings.xml |4 android/experimental/DocumentLoader/src/com/polites/android/Animation.java | 28 android/experimental/DocumentLoader/src/com/polites/android/Animator.java | 91 android/experimental/DocumentLoader/src/com/polites/android/FlingAnimation.java | 70 android/experimental/DocumentLoader/src/com/polites/android/FlingAnimationListener.java | 24 android/experimental/DocumentLoader/src/com/polites/android/GestureImageView.java | 718 -- android/experimental/DocumentLoader/src/com/polites/android/GestureImageViewListener.java | 26 android/experimental/DocumentLoader/src/com/polites/android/GestureImageViewTouchListener.java | 565 android/experimental/DocumentLoader/src/com/polites/android/MathUtils.java | 76 android/experimental/DocumentLoader/src/com/polites/android/MoveAnimation.java | 102 android/experimental/DocumentLoader/src/com/polites/android/MoveAnimationListener.java | 22 android/experimental/DocumentLoader/src/com/polites/android/VectorF.java | 63 android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimation.java | 162 - android/experimental/DocumentLoader/src/com/polites/android/ZoomAnimationListener.java | 21 android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java | 1140 -- 23 files changed, 4 insertions(+), 3449 deletions(-) New commits: commit 1b53066433d1db9c3bfc3c6e6618565c15642b59 Author: Tor Lillqvist t...@collabora.com Date: Thu May 21 16:54:28 2015 +0100 Bin the 'DocumentLoader' Android test app It is the wrong approach, from the time before tiled rendering, and has not been built for a long time. diff --git a/README.cross b/README.cross index efaa8c2..ad1475a 100644 --- a/README.cross +++ b/README.cross @@ -352,18 +352,10 @@ And here is an (quite old) autogen.input for Android on X86: --enable-ccache --with-distro=LibreOfficeAndroidX86 -There are a couple of (more or less) interactive apps that you can run -on the emulator or on a device that use LibreOffice code. Look in -android/experimental. DocumentLoader is just a testbench, really for -code to load a document (just Writer ones so far) and display one page -at a time. LibreOffice4Android is what resulted from a Google Summer -of Code project in 2012, a document viewer. desktop is a totally -different app, where the actual LibreOffice desktop GUI is present. -Note that none of these apps in any way are claimed to be ready for -end-users. No beta testing offers needed, it is painfully obvious -what problems they have. - -To run some of the apps, do make install followed by either make run or +A LibreOffice app for Android is being developed progress in the +android/experimental/LOAndroid3 directory. + +To run the app, do make install followed by either make run or starting it from Android itself. You most likely want to have an adb logcat running in another window. To debug, run make debugrun. diff --git a/android/experimental/DocumentLoader/AndroidManifest.xml b/android/experimental/DocumentLoader/AndroidManifest.xml deleted file mode 100644 index 366a1c9..000 --- a/android/experimental/DocumentLoader/AndroidManifest.xml +++ /dev/null @@ -1,23 +0,0 @@ -?xml version=1.0 encoding=utf-8? !-- -*- indent-tabs-mode: nil -*- -- -manifest xmlns:android=http://schemas.android.com/apk/res/android; - package=org.libreoffice.android.examples - android:installLocation=preferExternal - android:versionCode=1 - android:versionName=1.0 -uses-sdk android:minSdkVersion=15 - android:targetSdkVersion=15/ -application android:label=LO Experimental DocumentLoader - android:debuggable=true - android:largeHeap=true - android:hardwareAccelerated=true -activity android:name=.DocumentLoader -
[Libreoffice-commits] core.git: android/experimental
android/experimental/.gitignore |2 -- 1 file changed, 2 deletions(-) New commits: commit 97b096275af7054aed6cc8715e5cb968d7e5163f Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu May 21 17:51:37 2015 +0100 android: leftover gitignore Change-Id: I45a709d805e8706a2f186fd44b4f467d173bc61e diff --git a/android/experimental/.gitignore b/android/experimental/.gitignore deleted file mode 100644 index e63eb4a..000 --- a/android/experimental/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*/jni/Application.mk -*/liblo-native-code.map ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/AndroidManifest.xml.in |5 android/experimental/LOAndroid3/res/menu/main.xml | 78 +- android/experimental/LOAndroid3/res/menu/view_menu.xml |3 android/experimental/LOAndroid3/res/values/strings.xml |6 android/experimental/LOAndroid3/res/xml/libreoffice_preferences.xml | 49 +++--- android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java |2 android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java | 22 ++ android/experimental/LOAndroid3/src/java/org/libreoffice/SettingsActivity.java | 37 android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java |6 android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |4 10 files changed, 156 insertions(+), 56 deletions(-) New commits: commit e7473c692cad4c19f1d9eadd2547df4a50875baf Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue May 5 22:20:47 2015 +0200 editing/experimental mode as user-preference (Android Viewer) also exposes the other preferences (default document filter, default sorting) in a default settings dialog Change-Id: I7a4080f70f5727bfb2fabe8d8f57cb5b8337481f Reviewed-on: https://gerrit.libreoffice.org/15638 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in b/android/experimental/LOAndroid3/AndroidManifest.xml.in index 040246da..9364ea8 100644 --- a/android/experimental/LOAndroid3/AndroidManifest.xml.in +++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in @@ -90,6 +90,11 @@ /intent-filter /activity +activity +android:name=.SettingsActivity +android:label=@string/app_name_settings +/activity + !-- Document Browser Activity -- activity android:name=.ui.LibreOfficeUIActivity android:label=@string/app_name diff --git a/android/experimental/LOAndroid3/res/menu/main.xml b/android/experimental/LOAndroid3/res/menu/main.xml index 1ab1ef1..bf19105 100644 --- a/android/experimental/LOAndroid3/res/menu/main.xml +++ b/android/experimental/LOAndroid3/res/menu/main.xml @@ -3,46 +3,52 @@ xmlns:tools=http://schemas.android.com/tools; tools:context=org.libreoffice.MainActivity - -item android:id=@+id/action_bold - android:title=@string/action_bold - android:icon=@drawable/action_bold - android:orderInCategory=100 - app:showAsAction=always/ - -item android:id=@+id/action_italic - android:title=@string/action_italic - android:icon=@drawable/action_italic - android:orderInCategory=100 - app:showAsAction=always/ - -item android:id=@+id/action_underline - android:title=@string/action_underline - android:icon=@drawable/action_underline - android:orderInCategory=100 - app:showAsAction=always/ - -item android:id=@+id/action_strikeout - android:title=@string/action_strikeout - android:icon=@drawable/action_strikeout - android:orderInCategory=100 - app:showAsAction=always/ - -item android:id=@+id/action_keyboard - android:title=@string/action_keyboard - android:icon=@drawable/ic_format_keyboard_grey600_24dp - android:orderInCategory=100 - app:showAsAction=always/ - -item android:id=@+id/action_save -android:title=@string/action_save -android:orderInCategory=100 / +group android:id=@+id/group_edit_actions + android:visible=false +item android:id=@+id/action_bold + android:title=@string/action_bold + android:icon=@drawable/action_bold + android:orderInCategory=100 + app:showAsAction=always/ + +item android:id=@+id/action_italic + android:title=@string/action_italic + android:icon=@drawable/action_italic + android:orderInCategory=100 + app:showAsAction=always/ + +item android:id=@+id/action_underline + android:title=@string/action_underline + android:icon=@drawable/action_underline + android:orderInCategory=100 + app:showAsAction=always/ + +item android:id=@+id/action_strikeout + android:title=@string/action_strikeout + android:icon=@drawable/action_strikeout + android:orderInCategory=100 + app:showAsAction=always/ + +item android:id=@+id/action_keyboard + android:title=@string/action_keyboard +
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/res/values/themes.xml |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit a229089527b64e2e7a929cf980ff7a0eef293787 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Apr 29 19:34:27 2015 +0200 fix theme with AppCompat 22.1 or later AppCompat 22.1 is stricter in regards to what flags it it accepts Change-Id: If9b77e59604147cb7050b5721380ab213fcdb9a6 Reviewed-on: https://gerrit.libreoffice.org/15571 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com diff --git a/android/experimental/LOAndroid3/res/values/themes.xml b/android/experimental/LOAndroid3/res/values/themes.xml index 2b9e9f1..3b86511 100644 --- a/android/experimental/LOAndroid3/res/values/themes.xml +++ b/android/experimental/LOAndroid3/res/values/themes.xml @@ -2,9 +2,8 @@ resources style name=LibreOfficeTheme parent=LibreOfficeTheme.Base/ -style name=LibreOfficeTheme.Base parent=Theme.AppCompat.Light +style name=LibreOfficeTheme.Base parent=Theme.AppCompat.Light.NoActionBar item name=android:windowNoTitletrue/item -item name=windowActionBarfalse/item /style style name=BrowserTheme parent=Theme.AppCompat.Light.NoActionBar ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
|4 ++-
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
| 13 +-
2 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 02432d6ef24c4af957ab0d52307fef8ba6428306
Author: Jan Holesovsky ke...@collabora.com
Date: Mon Apr 20 09:58:06 2015 +0200
viewer: Enable taps to be able to handle hyperlinks.
Change-Id: I0b735d8db3204dc826c2b5fa9a568a5b425353e4
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
index a58e2dd..a22c5fd 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
@@ -41,7 +41,9 @@ public class InvalidationHandler implements
Document.MessageCallback {
@Override
public void messageRetrieved(int messageID, String payload) {
if (!LOKitShell.isEditingEnabled()) {
-return;
+// enable handling of hyperlinks even in the Viewer
+if (messageID != Document.CALLBACK_INVALIDATE_TILES messageID
!= Document.CALLBACK_HYPERLINK_CLICKED)
+return;
}
switch (messageID) {
case Document.CALLBACK_INVALIDATE_TILES:
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index cc21840..0da9681 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -293,13 +293,14 @@ public class LOKitThread extends Thread {
* Processes touch events.
*/
private void touch(String touchType, PointF documentCoordinate) {
-if (!LOKitShell.isEditingEnabled()) {
-return;
-}
if (mTileProvider == null) {
return;
}
-if (touchType.equals(LongPress)) {
+
+// to handle hyperlinks, enable single tap even in the Viewer
+boolean editing = LOKitShell.isEditingEnabled();
+
+if (touchType.equals(LongPress) editing) {
mInvalidationHandler.changeStateTo(InvalidationHandler.OverlayState.TRANSITION);
mTileProvider.mouseButtonDown(documentCoordinate, 1);
mTileProvider.mouseButtonUp(documentCoordinate, 1);
@@ -309,9 +310,9 @@ public class LOKitThread extends Thread {
mInvalidationHandler.changeStateTo(InvalidationHandler.OverlayState.TRANSITION);
mTileProvider.mouseButtonDown(documentCoordinate, 1);
mTileProvider.mouseButtonUp(documentCoordinate, 1);
-} else if (touchType.equals(GraphicSelectionStart)) {
+} else if (touchType.equals(GraphicSelectionStart) editing) {
mTileProvider.setGraphicSelectionStart(documentCoordinate);
-} else if (touchType.equals(GraphicSelectionEnd)) {
+} else if (touchType.equals(GraphicSelectionEnd) editing) {
mTileProvider.setGraphicSelectionEnd(documentCoordinate);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
|2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 47f82250ac18c8553f95428fefdd472ba9fc72e8
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Apr 21 14:44:43 2015 +0200
android: typo in InvalidationHandler documentation
Change-Id: Ibd6a53f358c1ae844d458440947d10d3c514948a
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
index bd4da2c..a58e2dd 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
@@ -416,7 +416,7 @@ public class InvalidationHandler implements
Document.MessageCallback {
}
/**
- * A key event happend (i.e. user started typing.
+ * A key event happend (i.e. user started typing).
*/
public void keyEvent() {
mKeyEvent = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
|6 +++
android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
|3 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
|4 +-
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
|3 -
android/experimental/LOAndroid3/src/java/org/libreoffice/ThumbnailCreator.java
|3 +
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElementImplRequirement.java
|4 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CommonCanvasElement.java
| 13 +++
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/Cursor.java
| 18 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
|6 +++
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java
|2 -
android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/DocumentOverlayView.java
| 16
11 files changed, 73 insertions(+), 5 deletions(-)
New commits:
commit c92ceb544c0c48902b604eccd8748b139480fcca
Author: Tomaž Vajngerl tomaz.vajng...@collabora.co.uk
Date: Tue Apr 14 18:07:07 2015 +0900
android: add comments
Change-Id: I30f8180dd9cf9c94eedca61926ab706f241142df
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
index 26ab856..bd4da2c 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
@@ -415,10 +415,16 @@ public class InvalidationHandler implements
Document.MessageCallback {
return mState;
}
+/**
+ * A key event happend (i.e. user started typing.
+ */
public void keyEvent() {
mKeyEvent = true;
}
+/**
+ * The states the overlay.
+ */
public enum OverlayState {
/**
* State where the overlay is empty
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
index c4f628c..111ad10 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
@@ -12,6 +12,9 @@ import android.widget.TextView;
import java.io.File;
+/**
+ * The about dialog.
+ */
public class LOAbout {
private static final String DEFAULT_DOC_PATH = /assets/example.odt;
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
index d9a20d8..d76e672 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
@@ -21,7 +21,9 @@ import org.libreoffice.canvas.SelectionHandle;
import org.mozilla.gecko.gfx.ComposedTileLayer;
import org.mozilla.gecko.gfx.LayerView;
-
+/**
+ * Common static LOKit functions, functions to send events.
+ */
public class LOKitShell {
private static final String LOGTAG = LOKitShell.class.getSimpleName();
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 1a8c970..e0d4098 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -19,7 +19,6 @@ import android.widget.ListView;
import android.widget.Toast;
import org.libreoffice.overlay.DocumentOverlay;
-
import org.mozilla.gecko.ZoomConstraints;
import org.mozilla.gecko.gfx.GeckoLayerClient;
import org.mozilla.gecko.gfx.LayerView;
@@ -178,8 +177,6 @@ public class LibreOfficeMainActivity extends
ActionBarActivity {
// create TextCursorLayer
mDocumentOverlay = new DocumentOverlay(mAppContext, layerView);
-
-
}
private boolean copyFileToTemp() {
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ThumbnailCreator.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ThumbnailCreator.java
index 142877b..5532d7f 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ThumbnailCreator.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ThumbnailCreator.java
@@ -16,6 +16,9 @@ import android.widget.ImageView;
import java.lang.ref.WeakReference;
+/**
+ * Create thumbnails for the parts of the
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/res/values/strings.xml
|3 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
| 17 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
| 13 +++
3 files changed, 27 insertions(+), 6 deletions(-)
New commits:
commit bbfe124bfb37ac6b99f4016da02bd105c26177d0
Author: Siqi Liu m...@siqi.fr
Date: Tue Apr 14 15:10:15 2015 +0200
disable saving on .tmp files.
Change-Id: I80af505d0dd9a71eda5d640dd336a034288a574d
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml
b/android/experimental/LOAndroid3/res/values/strings.xml
index ffce3d8..d7a430e 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -8,6 +8,7 @@
string name=app_descriptionLibreOffice Viewer is a document viewer
based on LibreOffice./string
string name=app_creditshttp://www.libreoffice.org/string
string name=app_vendorThis release was supplied by $VENDOR./string
+string name=temp_file_saving_disabledThis file is read-only, saving is
disabled./string
string name=about_licenseShow License/string
string name=about_noticeShow Notice/string
@@ -34,6 +35,8 @@
!-- Document provider names --
string name=local_documentsLocal documents/string
string name=local_file_systemLocal file system/string
+
+!-- Edit action names --
string name=action_boldBold/string
string name=action_underlineUnderline/string
string name=action_italicItalic/string
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index e0d4098..8f4e480 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -70,6 +70,11 @@ public class LibreOfficeMainActivity extends
ActionBarActivity {
// Inflate the menu; this adds items to the action bar if it is
present.
getMenuInflater().inflate(R.menu.main, menu);
mToolbarController.setOptionMenu(menu);
+
+if (mTempFile != null) {
+mToolbarController.disableMenuItem(R.id.action_save, true);
+Toast.makeText(this,
getString(R.string.temp_file_saving_disabled), Toast.LENGTH_LONG).show();
+}
return super.onCreateOptionsMenu(menu);
}
@@ -124,6 +129,12 @@ public class LibreOfficeMainActivity extends
ActionBarActivity {
mMainHandler = new Handler();
+setContentView(R.layout.activity_main);
+
+Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+setSupportActionBar(toolbar);
+mToolbarController = new ToolbarController(this,
getSupportActionBar(), toolbar);
+
if (getIntent().getData() != null) {
if
(getIntent().getData().getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
if (copyFileToTemp() mTempFile != null) {
@@ -138,12 +149,6 @@ public class LibreOfficeMainActivity extends
ActionBarActivity {
mInputFile = DEFAULT_DOC_PATH;
}
-setContentView(R.layout.activity_main);
-
-Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-setSupportActionBar(toolbar);
-mToolbarController = new ToolbarController(this,
getSupportActionBar(), toolbar);
-
toolbar.setNavigationOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
index 1201b40..dde1a61 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
@@ -38,6 +38,19 @@ public class ToolbarController {
switchToViewMode();
}
+public void disableMenuItem(final int menuItemId, final boolean disabled) {
+LOKitShell.getMainHandler().post(new Runnable() {
+public void run() {
+MenuItem menuItem = mOptionsMenu.findItem(menuItemId);
+if (menuItem != null) {
+menuItem.setEnabled(!disabled);
+} else {
+Log.e(LOGTAG, MenuItem not found.);
+}
+}
+});
+}
+
public void onToggleStateChanged(int type, boolean pressed) {
MenuItem menuItem = null;
Bitmap icon = null;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
|2 +-
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6cdd02a7fd582af7b10c8ffc4d88589e77d1228d
Author: Michael Meeks michael.me...@collabora.com
Date: Fri Feb 20 11:42:25 2015 +
android: protect against a crash with an empty sdcard.
If you mis-configure your emulator - that's what you get.
Unfortunate that this affects 2x places.
Change-Id: I0b281d96b22ec3ac793c687ee7f3ba1a78784ace
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
index 9307851..fd4d7b2 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
@@ -62,7 +62,7 @@ public class GridItemAdapter extends BaseAdapter {
}
public int getCount() {
-return filePaths.size();
+return filePaths != null ? filePaths.size() : 0;
}
public Object getItem(int position) {
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 9435c092..e12141b 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -602,7 +602,7 @@ public class LibreOfficeUIActivity extends LOAbout
implements ActionBar.OnNaviga
}
public int getCount() {
-return filePaths.size();
+return filePaths != null ? filePaths.size() : 0;
}
public Object getItem(int arg0) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
| 30 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
|5 -
2 files changed, 31 insertions(+), 4 deletions(-)
New commits:
commit 5654e0f6afd93b371954456523460397564b4602
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date: Tue Feb 10 18:42:40 2015 +0100
Android: fix share feature for .odp/.odt files
Added our own map of MIME types because we cannot rely on Android's.
Change-Id: I11d4b639f42d30aa8adb0ea092797fb30b4fc8b9
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
index f658d92..118eded 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
@@ -18,6 +18,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Comparator;
import android.util.Log;
+import android.webkit.MimeTypeMap;
public class FileUtilities {
static final int ALL = -1;
@@ -42,6 +43,7 @@ public class FileUtilities {
static final int SORT_SMALLEST = 5;
private static final MapString,Integer mExtnMap = new
HashMapString,Integer();
+private static final MapString, String extensionToMimeTypeMap = new
HashMapString, String();
static {
// Please keep this in sync with AndroidManifest.xml
@@ -97,6 +99,22 @@ public class FileUtilities {
mExtnMap.put(.svm, DRAWING);
mExtnMap.put(.wmf, DRAWING);
mExtnMap.put(.svg, DRAWING);
+
+// Some basic MIME types
+// Android's MimeTypeMap lacks some types that we need
+extensionToMimeTypeMap.put(odb,
application/vnd.oasis.opendocument.database);
+extensionToMimeTypeMap.put(odf,
application/vnd.oasis.opendocument.formula);
+extensionToMimeTypeMap.put(odg,
application/vnd.oasis.opendocument.graphics);
+extensionToMimeTypeMap.put(otg,
application/vnd.oasis.opendocument.graphics-template);
+extensionToMimeTypeMap.put(odi,
application/vnd.oasis.opendocument.image);
+extensionToMimeTypeMap.put(odp,
application/vnd.oasis.opendocument.presentation);
+extensionToMimeTypeMap.put(otp,
application/vnd.oasis.opendocument.presentation-template);
+extensionToMimeTypeMap.put(ods,
application/vnd.oasis.opendocument.spreadsheet);
+extensionToMimeTypeMap.put(ots,
application/vnd.oasis.opendocument.spreadsheet-template);
+extensionToMimeTypeMap.put(odt,
application/vnd.oasis.opendocument.text);
+extensionToMimeTypeMap.put(odm,
application/vnd.oasis.opendocument.text-master);
+extensionToMimeTypeMap.put(ott,
application/vnd.oasis.opendocument.text-template);
+extensionToMimeTypeMap.put(oth,
application/vnd.oasis.opendocument.text-web);
}
private static final String getExtension(String filename)
@@ -124,6 +142,18 @@ public class FileUtilities {
return type;
}
+static String getMimeType(String filename)
+{
+String extension = MimeTypeMap.getFileExtensionFromUrl(filename);
+String mime = extensionToMimeTypeMap.get(extension);
+if(mime == null) {
+//fallback to Android's MimeTypeMap
+mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(
+extension);
+}
+return mime;
+}
+
// Filter by mode, and/or in future by filename/wildcard
static private boolean doAccept(String filename, int byMode, String
byFilename)
{
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 25870c0..24cff82 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -54,7 +54,6 @@ import android.view.View;
import android.view.View.OnLongClickListener;
import android.view.ViewGroup;
import android.view.View.OnClickListener;
-import android.webkit.MimeTypeMap;
import android.widget.AdapterView;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.AdapterView.OnItemClickListener;
@@ -321,9 +320,7 @@ public class LibreOfficeUIActivity extends LOAbout
implements ActionBar.OnNaviga
File file = filePaths.get(position).getDocument();
Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
Uri uri = Uri.fromFile(file);
-String extension = MimeTypeMap.getFileExtensionFromUrl(uri.toString());
-sharingIntent.setType(MimeTypeMap.getSingleton()
-.getMimeTypeFromExtension(extension));
+
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml
| 36 --
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
|8 --
2 files changed, 44 deletions(-)
New commits:
commit f3eccc655387b47fb0986558b8835588eee2898d
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date: Tue Feb 3 18:19:32 2015 +
tdf#87432: normal icons for folders in android doc browser
The code used to draw a black circle and populate it with thumbnails
of the documents inside the folder, but they are always empty because
we are not generating any thumbnails.
Change-Id: Id0b63f7e901525b5a962d12441cda84dfeb59d52
diff --git
a/android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml
b/android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml
deleted file mode 100644
index 4271ac4..000
--- a/android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-?xml version=1.0 encoding=utf-8?
-!--
- This file is part of the LibreOffice project.
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
- --
-LinearLayout xmlns:android=http://schemas.android.com/apk/res/android;
-android:layout_width=match_parent
-android:layout_height=match_parent
-android:orientation=vertical
-
-org.libreoffice.ui.FolderIconView
-android:id=@+id/folder_icon
-android:layout_width=100dp
-android:layout_height=142dp
-android:paddingTop=15dp
-android:paddingBottom=10dp
-android:layout_gravity=center
-/org.libreoffice.ui.FolderIconView
-
-TextView
-android:id=@+id/grid_item_label
-android:layout_width=wrap_content
-android:layout_height=wrap_content
-android:text=@+id/label
-android:paddingLeft=10dp
-android:paddingRight=10dp
-android:layout_gravity=center
-android:textSize=15dp
-android:textStyle=bold
-android:textColor=@android:color/secondary_text_light
-android:maxLines=2
-/TextView
-
-/LinearLayout
\ No newline at end of file
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
index 621ccef..9307851 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
@@ -101,14 +101,6 @@ public class GridItemAdapter extends BaseAdapter {
{
// Default view is a generic folder icon.
imageView.setImageResource(R.drawable.folder);
-// How should we handle empty folders / folders with no
thumbnails? - new files
-gridView = inflater.inflate(R.layout.file_explorer_folder_icon,
null);
-org.libreoffice.ui.FolderIconView icon =
-
(org.libreoffice.ui.FolderIconView)gridView.findViewById(R.id.folder_icon);
-// icon.setDir( filePaths[position]);
-textView = (TextView) gridView.findViewById(R.id.grid_item_label);
-textView.setText(filePaths.get(position).getName());
-return gridView;
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
| 11 +-
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
|6 +
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
|2 -
3 files changed, 17 insertions(+), 2 deletions(-)
New commits:
commit 6f5eb643ead93c441566507f4dc4eac2d85e701b
Author: Tomaž Vajngerl tomaz.vajng...@collabora.co.uk
Date: Mon Dec 22 14:35:34 2014 +0900
fdo#87098 invalidate zoom change by triggering animatedZoomTo
Change-Id: Ie5734d8999a214a1df544579a7bfb32cc9f035eb
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 8bf8239..2b83738 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -1,9 +1,14 @@
package org.libreoffice;
+import android.graphics.PointF;
+import android.graphics.RectF;
+import android.util.Log;
+
import org.mozilla.gecko.gfx.CairoImage;
import org.mozilla.gecko.gfx.ComposedTileLayer;
import org.mozilla.gecko.gfx.GeckoLayerClient;
import org.mozilla.gecko.gfx.ImmutableViewportMetrics;
+import org.mozilla.gecko.gfx.JavaPanZoomController;
import org.mozilla.gecko.gfx.SubTile;
import java.util.concurrent.PriorityBlockingQueue;
@@ -40,7 +45,8 @@ public class LOKitThread extends Thread {
mLayerClient.setPageRect(0, 0, mTileProvider.getPageWidth(),
mTileProvider.getPageHeight());
mViewportMetrics = mLayerClient.getViewportMetrics();
-
mLayerClient.setViewportMetrics(mViewportMetrics.setZoomFactor(mViewportMetrics.getWidth()
/ mViewportMetrics.getPageWidth()));
+mLayerClient.setViewportMetrics(mViewportMetrics);
+mLayerClient.zoomToPageWidth(mTileProvider.getPageWidth());
mLayerClient.forceRedraw();
}
@@ -53,6 +59,8 @@ public class LOKitThread extends Thread {
private void changePart(int partIndex) {
LOKitShell.showProgressSpinner();
mTileProvider.changePart(partIndex);
+mViewportMetrics = mLayerClient.getViewportMetrics();
+mLayerClient.setViewportMetrics(mViewportMetrics.scaleTo(0.9f, new
PointF()));
refresh();
LOKitShell.hideProgressSpinner();
}
@@ -99,6 +107,7 @@ public class LOKitThread extends Thread {
closeDocument();
break;
case LOEvent.SIZE_CHANGED:
+Log.i(LOGTAG, Size change event!);
redraw();
break;
case LOEvent.CHANGE_PART:
diff --git
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
index c3535e5..934d19a 100644
---
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
+++
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
@@ -460,6 +460,12 @@ public class GeckoLayerClient implements PanZoomTarget,
LayerView.Listener {
return mContext;
}
+public void zoomToPageWidth(int pageWidth) {
+if (mPanZoomController instanceof JavaPanZoomController) {
+((JavaPanZoomController) mPanZoomController).animatedZoomTo(new
RectF(0, 0, pageWidth, 0));
+}
+}
+
private class AdjustRunnable implements Runnable {
public void run() {
mPendingViewportAdjust = false;
diff --git
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
index af47136..afab17d 100644
---
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
+++
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
@@ -915,7 +915,7 @@ public class JavaPanZoomController
* While we usually use device pixels, @zoomToRect must be specified in CSS
* pixels.
*/
-private boolean animatedZoomTo(RectF zoomToRect) {
+public boolean animatedZoomTo(RectF zoomToRect) {
final float startZoom = getMetrics().zoomFactor;
RectF viewport = getMetrics().getViewport();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
| 22 --
android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java
| 12 -
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
|7
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
|4
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
|4
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
| 10
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
|7
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
|2
android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
| 13 +
android/experimental/LOAndroid3/src/java/org/libreoffice/ThumbnailCreator.java
| 108 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
|2
11 files changed, 158 insertions(+), 33 deletions(-)
New commits:
commit c6fd07e0e46fa6ecba38cf7bd2f0e0312eaf7600
Author: Tomaž Vajngerl tomaz.vajng...@collabora.co.uk
Date: Mon Dec 22 21:07:39 2014 +0900
fdo#85849 on-demand create thumbnails of tiles in the sidebar
Change-Id: I0bef7bff0553c24b9d699845e70fbb128301a0fe
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
index c5f6e33..768b4af 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
@@ -1,27 +1,11 @@
package org.libreoffice;
-
-import android.graphics.Bitmap;
-
public class DocumentPartView {
-private final int partIndex;
-private final String partName;
-private final Bitmap thumbnail;
+public final int partIndex;
+public final String partName;
-public DocumentPartView(int partIndex, String partName, Bitmap thumbnail) {
+public DocumentPartView(int partIndex, String partName) {
this.partIndex = partIndex;
this.partName = partName;
-this.thumbnail = thumbnail;
-}
-
-public String getPartName() {
-return partName;
-}
-
-public int getPartIndex() {
-return partIndex;
-}
-public Bitmap getThumbnail() {
-return thumbnail;
}
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java
index d25cccb..0dbc9cd 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java
@@ -1,7 +1,6 @@
package org.libreoffice;
import android.app.Activity;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -15,10 +14,12 @@ public class DocumentPartViewListAdapter extends
ArrayAdapterDocumentPartView
private static final String LOGTAG =
DocumentPartViewListAdapter.class.getSimpleName();
private final Activity activity;
+private final ThumbnailCreator thumbnailCollector;
public DocumentPartViewListAdapter(Activity activity, int resource,
ListDocumentPartView objects) {
super(activity, resource, objects);
this.activity = activity;
+this.thumbnailCollector = new ThumbnailCreator();
}
@Override
@@ -30,15 +31,10 @@ public class DocumentPartViewListAdapter extends
ArrayAdapterDocumentPartView
DocumentPartView documentPartView = getItem(position);
TextView textView = (TextView) view.findViewById(R.id.text);
-textView.setText(documentPartView.getPartName());
-Log.i(LOGTAG, getView - + documentPartView.getPartName());
+textView.setText(documentPartView.partName);
ImageView imageView = (ImageView) view.findViewById(R.id.image);
-if (documentPartView.getThumbnail() != null) {
-imageView.setImageBitmap(documentPartView.getThumbnail());
-} else {
-imageView.setImageResource(R.drawable.writer);
-}
+thumbnailCollector.createThumbnail(position, imageView);
return view;
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
index ced5ebd..cb71bb5 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
@@ -12,10 +12,12 @@ public class LOEvent implements ComparableLOEvent {
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/res/values/arrays.xml
|9 ++---
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
|9 ++---
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
|4 ++--
3 files changed, 14 insertions(+), 8 deletions(-)
New commits:
commit 0897aae2c7759015a5b71d705240ac00ce5ddedd
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Dec 19 09:38:42 2014 +0100
android doc browser: hide Calc filter, add Draw filter
Hide Calc filter, as ATM Calc documents are not supported. Draw filter
was just missing, add it.
Change-Id: I88b9e48319e584f1c86de1b970badcdd695f30ed
diff --git a/android/experimental/LOAndroid3/res/values/arrays.xml
b/android/experimental/LOAndroid3/res/values/arrays.xml
index 0d698c7..2263b47 100644
--- a/android/experimental/LOAndroid3/res/values/arrays.xml
+++ b/android/experimental/LOAndroid3/res/values/arrays.xml
@@ -30,13 +30,16 @@
item 1/item
/string-array
-!-- Preference Name Arrays --
+!-- Preference Name Arrays
+ This has to be in sync with FileUtilities.java. --
string-array name=file_view_modes
item EVERYTHING/item
item DOCUMENTS/item
-item SPREADSHEETS/item
+!-- itemSPREADSHEETS/item --
item PRESENTATIONS/item
+itemDRAWINGS/item
/string-array
+
string-array name=FilterTypeNames
item Everything/item
item Documents/item
@@ -53,4 +56,4 @@
/string-array
-/resources
\ No newline at end of file
+/resources
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
index baff933..3c67947 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
@@ -21,10 +21,13 @@ import android.util.Log;
public class FileUtilities {
static final int ALL = -1;
+
+// These have to be in sync with the file_view_modes resource.
static final int DOC = 0;
-static final int CALC = 1;
-static final int IMPRESS = 2;
-static final int DRAWING = 3;
+// static final int CALC = 1;
+static final int IMPRESS = 1;
+static final int DRAWING = 2;
+
static final int UNKNOWN = 10;
static final int SORT_AZ = 0;
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
index 22f7b9b..d0470e7 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
@@ -127,9 +127,9 @@ public class GridItemAdapter extends BaseAdapter {
}
imageView.setImageResource(R.drawable.writer);
break;
-case FileUtilities.CALC:
+/*case FileUtilities.CALC:
imageView.setImageResource(R.drawable.calc);
-break;
+break;*/
case FileUtilities.DRAWING: // FIXME: only for now ...
case FileUtilities.IMPRESS:
imageView.setImageResource(R.drawable.impress);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/res/values/strings.xml
|1 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
|9 +
2 files changed, 10 insertions(+)
New commits:
commit 64eb2123d41e09639568cfed1e0e49de5a2deda4
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Dec 17 09:28:05 2014 +0100
android: make the 'more info' document accessible from the about dialog
Now that the default activity is not the viewer, but the document
browser, there is no way to show the introduction document. Add a button
to the about dialog to still show it.
Change-Id: I9252064aaaf4c49da519e17b651e0d290bc17c04
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml
b/android/experimental/LOAndroid3/res/values/strings.xml
index 857b00c..ea505d7 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -9,6 +9,7 @@
string name=about_licenseShow License/string
string name=about_noticeShow Notice/string
+string name=about_moreinfoMore Info/string
string name=browser_app_nameLibreOffice Browser/string
string name=menu_searchSearch/string
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 16d0edf..ff7bb43 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -218,6 +218,15 @@ public class LibreOfficeMainActivity extends Activity {
}
});
+builder.setNeutralButton(R.string.about_moreinfo, new
DialogInterface.OnClickListener() {
+@Override
+public void onClick(DialogInterface dialog, int id) {
+LOKitShell.sendEvent(LOEventFactory.close());
+LOKitShell.sendEvent(LOEventFactory.load(DEFAULT_DOC_PATH));
+dialog.dismiss();
+}
+});
+
AlertDialog dialog = builder.create();
dialog.show();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/AndroidManifest.xml.in | 3 +-- android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml | 1 + android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 7bb1c7397076d9085c62f828cc8868777cd29a94 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Dec 17 11:45:13 2014 +0100 android: fix unreadable text in doc browser's about dialog There were two inconsistencies here: - The doc browser activity had an explicit android:theme, but the viewer does not, so remove it to be consistent, this fixes the about dialog's black text on black background problem. - Now the doc browser had white text on white background: the about dialog explicitly uses android:textColor for the strings which should be readable on a bright background, do the same in file_explorer_folder_icon and file_explorer_grid_item, that makes doc browser text readable as well. Change-Id: Iae9103556ca7c32c9ac8ea02d9e5d5fa6dfb72b5 diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in b/android/experimental/LOAndroid3/AndroidManifest.xml.in index c3a6b31..0c659d8 100644 --- a/android/experimental/LOAndroid3/AndroidManifest.xml.in +++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in @@ -82,8 +82,7 @@ /activity !-- Document Browser Activity -- activity android:name=.ui.LibreOfficeUIActivity - android:label=@string/app_name - android:theme=@android:style/Theme.Holo + android:label=@string/app_name intent-filter action android:name=android.intent.action.MAIN / category android:name=android.intent.category.LAUNCHER / diff --git a/android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml b/android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml index 60dd9b9..4271ac4 100644 --- a/android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml +++ b/android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml @@ -29,6 +29,7 @@ android:layout_gravity=center android:textSize=15dp android:textStyle=bold +android:textColor=@android:color/secondary_text_light android:maxLines=2 /TextView diff --git a/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml b/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml index e4569e0..6e269c8 100644 --- a/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml +++ b/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml @@ -30,6 +30,7 @@ android:layout_gravity=center android:textSize=15dp android:textStyle=bold +android:textColor=@android:color/secondary_text_light android:maxLines=2 /TextView ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java
| 45 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdpater.java
| 45 --
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
|2
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
| 14 +--
android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
|4
5 files changed, 55 insertions(+), 55 deletions(-)
New commits:
commit 1816bdd1965a8395e8878462e5c7693591327888
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Dec 16 11:41:07 2014 +0100
android: Adpater - Adapter
Change-Id: If5297d641b4a596f20bdde8203f199d8efcb92fe
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdpater.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java
similarity index 85%
rename from
android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdpater.java
rename to
android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java
index 067d44d..d25cccb 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdpater.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java
@@ -11,12 +11,12 @@ import android.widget.TextView;
import java.util.List;
-public class DocumentPartViewListAdpater extends
ArrayAdapterDocumentPartView {
-private static final String LOGTAG =
DocumentPartViewListAdpater.class.getSimpleName();
+public class DocumentPartViewListAdapter extends
ArrayAdapterDocumentPartView {
+private static final String LOGTAG =
DocumentPartViewListAdapter.class.getSimpleName();
private final Activity activity;
-public DocumentPartViewListAdpater(Activity activity, int resource,
ListDocumentPartView objects) {
+public DocumentPartViewListAdapter(Activity activity, int resource,
ListDocumentPartView objects) {
super(activity, resource, objects);
this.activity = activity;
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index b61c6ca..82908e1 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -91,7 +91,7 @@ public class LOKitTileProvider implements TileProvider {
LOKitShell.getMainHandler().post(new Runnable() {
@Override
public void run() {
-
LibreOfficeMainActivity.mAppContext.getDocumentPartViewListAdpater().notifyDataSetChanged();
+
LibreOfficeMainActivity.mAppContext.getDocumentPartViewListAdapter().notifyDataSetChanged();
}
});
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 991a153..ccb864b 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -40,7 +40,7 @@ public class LibreOfficeMainActivity extends Activity {
private RelativeLayout mGeckoLayout;
private ListView mDrawerList;
private ListDocumentPartView mDocumentPartView = new
ArrayListDocumentPartView();
-private DocumentPartViewListAdpater mDocumentPartViewListAdpater;
+private DocumentPartViewListAdapter mDocumentPartViewListAdapter;
private String mInputFile;
public static GeckoLayerClient getLayerClient() {
@@ -106,11 +106,11 @@ public class LibreOfficeMainActivity extends Activity {
mGeckoLayout = (RelativeLayout) findViewById(R.id.gecko_layout);
mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
-if (mDocumentPartViewListAdpater == null) {
+if (mDocumentPartViewListAdapter == null) {
mDrawerList = (ListView) findViewById(R.id.left_drawer);
-mDocumentPartViewListAdpater = new
DocumentPartViewListAdpater(this, R.layout.document_part_list_layout,
mDocumentPartView);
-mDrawerList.setAdapter(mDocumentPartViewListAdpater);
+mDocumentPartViewListAdapter = new
DocumentPartViewListAdapter(this, R.layout.document_part_list_layout,
mDocumentPartView);
+mDrawerList.setAdapter(mDocumentPartViewListAdapter);
mDrawerList.setOnItemClickListener(new
DocumentPartClickListener());
}
@@ -169,8 +169,8 @@ public class LibreOfficeMainActivity extends Activity {
return mDocumentPartView;
}
-public
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
|5 ++-
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
| 14 +-
2 files changed, 17 insertions(+), 2 deletions(-)
New commits:
commit 450647a8a2e6f1e9f7474e1a5d82834e0d6cb594
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Dec 16 16:14:54 2014 +0100
android: disable navigation drawer for Writer
Writer documents currently always have one part, so it's not possible to
switch to an other part anyway. Also hide the matching menu item
accordingly.
Change-Id: Ic634d46c4ff307416b2878e5bc8a590b22a827a0
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index 82908e1..848ec7b 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -71,7 +71,8 @@ public class LOKitTileProvider implements TileProvider {
LibreOfficeMainActivity.mAppContext.getDocumentPartView().clear();
-if (parts 1) {
+// Writer documents always have one part, so hide the navigation
drawer.
+if (mDocument.getDocumentType() != Document.DOCTYPE_TEXT) {
for (int i = 0; i parts; i++) {
String partName = mDocument.getPartName(i);
if (partName.isEmpty()) {
@@ -84,6 +85,8 @@ public class LOKitTileProvider implements TileProvider {
final DocumentPartView partView = new DocumentPartView(i,
partName, thumbnail(128));
LibreOfficeMainActivity.mAppContext.getDocumentPartView().add(partView);
}
+} else {
+LibreOfficeMainActivity.mAppContext.disableNavigationDrawer();
}
mDocument.setPart(0);
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index ccb864b..16d0edf 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -72,7 +72,9 @@ public class LibreOfficeMainActivity extends Activity {
public boolean onPrepareOptionsMenu(Menu menu) {
// If the nav drawer is open, hide action items related to the content
view
boolean isDrawerOpen = mDrawerLayout.isDrawerOpen(mDrawerList);
-menu.findItem(R.id.action_parts).setVisible(!isDrawerOpen);
+// Do the same in case the drawer is locked.
+boolean isDrawerLocked = mDrawerLayout.getDrawerLockMode(mDrawerList)
!= DrawerLayout.LOCK_MODE_UNLOCKED;
+menu.findItem(R.id.action_parts).setVisible(!isDrawerOpen
!isDrawerLocked);
return super.onPrepareOptionsMenu(menu);
}
@@ -169,6 +171,16 @@ public class LibreOfficeMainActivity extends Activity {
return mDocumentPartView;
}
+public void disableNavigationDrawer() {
+// Only the original thread that created mDrawerLayout should touch
its views.
+LOKitShell.getMainHandler().post(new Runnable() {
+@Override
+public void run() {
+
mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED,
mDrawerList);
+}
+});
+}
+
public DocumentPartViewListAdapter getDocumentPartViewListAdapter() {
return mDocumentPartViewListAdapter;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/AndroidManifest.xml.in | 10 ++ 1 file changed, 2 insertions(+), 8 deletions(-) New commits: commit 6d7f67eadf7cae75ec0ede5596c55b6585d73872 Author: Jacobo Aragunde Pérez jaragu...@igalia.com Date: Wed Oct 15 19:39:29 2014 +0200 android: Show document browser back in the menu Related with commit c7c2b4b54d8ab81150e9b71433970c2f338ed063. There is nothing wrong with having several activities; in fact Android development encourages using one activity per use case. After this patch we have: * One menu item that opens LibreOffice document browser. It covers the use case open LibreOffice without documents. * The viewer activity does not have a menu item but it responds to open intents triggered by any applications like file explorers, including the document browser. Change-Id: Ie08b96e52d3a6a79aed3354620302705d7689381 Reviewed-on: https://gerrit.libreoffice.org/12108 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in b/android/experimental/LOAndroid3/AndroidManifest.xml.in index 119046a8..c3a6b31 100644 --- a/android/experimental/LOAndroid3/AndroidManifest.xml.in +++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in @@ -17,15 +17,12 @@ android:label=@string/app_name android:hardwareAccelerated=true android:theme=@style/AppTheme +!-- Viewer Activity -- activity android:name=org.libreoffice.LibreOfficeMainActivity android:label=@string/app_name android:configChanges=orientation|keyboard|keyboardHidden|screenLayout|uiMode|screenSize|smallestScreenSize intent-filter -action android:name=android.intent.action.MAIN / -category android:name=android.intent.category.LAUNCHER / -/intent-filter -intent-filter action android:name=android.intent.action.VIEW / action android:name=android.intent.action.EDIT / action android:name=android.intent.action.PICK / @@ -84,17 +81,14 @@ /intent-filter /activity !-- Document Browser Activity -- -!-- Disable it here so that we don't present two icons. - TODO Probably merge the two activities, so that the browser opens when LibreOffice is started with no document. activity android:name=.ui.LibreOfficeUIActivity - android:label=@string/browser_app_name + android:label=@string/app_name android:theme=@android:style/Theme.Holo intent-filter action android:name=android.intent.action.MAIN / category android:name=android.intent.category.LAUNCHER / /intent-filter /activity --- /application /manifest ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 8c68463dae09e123bae9fc5947329cfa1f314ad3 Author: Jacobo Aragunde Pérez jaragu...@igalia.com Date: Fri Nov 28 10:15:48 2014 + Android: browse documents anywhere in the sdcard Change-Id: I9e52489e13ed0eaeb5926347168de926cd9178b0 Reviewed-on: https://gerrit.libreoffice.org/13277 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java index 02eddb3..a9d17f8 100644 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -131,8 +131,7 @@ public class LibreOfficeUIActivity extends Activity implements ActionBar.OnNavig super.onCreate(savedInstanceState); Log.d(tag, onCreate - tweaked - meeks !); //Set the home - top level - directory. -homeDirectory = new File(Environment.getExternalStorageDirectory(),LibreOffice); -homeDirectory.mkdirs(); +homeDirectory = Environment.getExternalStorageDirectory(); currentDirectory = homeDirectory; //Load default settings ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java
|4
1 file changed, 4 insertions(+)
New commits:
commit c13a1c2e5ce6ea0b78e46f314c1980a4f0c7a2f4
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date: Tue Dec 2 17:34:01 2014 +
Android: prevent NPE due to lack of permissions on a directory
Change-Id: Ia2f4c04ad4c524e8b72870acb0735793624f0916
Reviewed-on: https://gerrit.libreoffice.org/13278
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java
index 5960e5e..723e361 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java
@@ -83,6 +83,10 @@ public class FolderIconView extends View{
if( dir == null )
return;//TODO
File[] contents = dir.listFiles();//TODO consider filtering thumbs to
match grid.
+if( contents == null )
+// dir is not a directory,
+// or user does not have permissions to read it
+return;
StackBitmap thumbs = new StackBitmap();
BitmapFactory factory = new BitmapFactory();
for( File file : contents ){
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/res/layout/file_grid.xml |1 - 1 file changed, 1 deletion(-) New commits: commit 1177f4dc061d945863a30d5c60123f2ec3d74cd4 Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Dec 16 17:35:54 2014 +0100 android doc browser: avoid explicit background color without a foreground one E.g. on my device the foreground color was white, the explicit light background color made the filenames almost unreadable. Change-Id: I64e361447ef9af4f3998afeb4a938907b6ca7eb3 diff --git a/android/experimental/LOAndroid3/res/layout/file_grid.xml b/android/experimental/LOAndroid3/res/layout/file_grid.xml index 42b745b..6b41977 100644 --- a/android/experimental/LOAndroid3/res/layout/file_grid.xml +++ b/android/experimental/LOAndroid3/res/layout/file_grid.xml @@ -19,7 +19,6 @@ android:verticalSpacing=10dp android:horizontalSpacing=10dp android:stretchMode=columnWidth -android:background=#ffee android:gravity=center /GridView ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/android/DocumentLoader.java
| 1257 --
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
|1
2 files changed, 1258 deletions(-)
New commits:
commit 1ab295ba09cf4c83c24f792f4ac5b9daaa1814cc
Author: Tor Lillqvist t...@collabora.com
Date: Tue Dec 16 20:43:52 2014 +0200
org.libreoffice.android.DocumentLoader is not used for anything in
LOAndroid3
Change-Id: Ib7d55a90935a9d2c42196b04119db1c5ea7f30f4
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/android/DocumentLoader.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/android/DocumentLoader.java
deleted file mode 100644
index 5efdcc0..000
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/android/DocumentLoader.java
+++ /dev/null
@@ -1,1257 +0,0 @@
-// -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-//
-// This file is part of the LibreOffice project.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// This is just a testbed for ideas and implementations. (Still, it might turn
-// out to be somewhat useful as such while waiting for real apps.)
-
-// Important points:
-
-// Everything that might take a long time should be done asynchronously:
-// - loading the document (loadComponentFromURL())
-// - counting number of pages (getRendererCount())
-// - rendering a page (render())
-
-// Unclear whether pages can be rendered in parallel. Probably best to
-// serialize all the above in the same worker thread, for instance using
-// AsyncTask.SERIAL_EXECUTOR.
-
-// While a page is loading ideally should display some animated spinner (but
-// for now just a static please wait text).
-
-// Just three views are used for the pages: For the current page being viewed,
-// the previous, and the next. This could be bumped higher, need to make the
-// 3 into a parameter below.
-
-package org.libreoffice.android;
-
-import org.libreoffice.R;
-
-import android.app.Activity;
-import android.graphics.PointF;
-import android.graphics.Bitmap;
-import android.graphics.Matrix;
-import android.graphics.Color;
-import android.graphics.BitmapFactory;
-import android.graphics.BlurMaskFilter;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.util.FloatMath;
-import android.util.Log;
-import android.view.GestureDetector;
-import android.view.Gravity;
-import android.view.MotionEvent;
-import android.view.View.OnTouchListener;
-import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.AnimationSet;
-import android.view.animation.TranslateAnimation;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.ImageView.ScaleType;
-import android.widget.ViewFlipper;
-import android.widget.ViewSwitcher;
-import android.view.MenuItem;
-import android.content.Intent;
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.BaseAdapter;
-import android.view.View.OnClickListener;
-// Obsolete?
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.GridView;
-import android.widget.AdapterView;
-import android.widget.ProgressBar;
-
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.LinearLayout.LayoutParams;
-import android.graphics.BitmapFactory;
-
-import com.polites.android.GestureImageView;
-
-import com.sun.star.awt.Size;
-import com.sun.star.awt.XBitmap;
-import com.sun.star.awt.XControl;
-import com.sun.star.awt.XDevice;
-import com.sun.star.awt.XToolkitExperimental;
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.frame.XComponentLoader;
-import com.sun.star.frame.XController;
-import com.sun.star.frame.XFrame;
-import com.sun.star.frame.XModel;
-import com.sun.star.lang.XEventListener;
-import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.lang.XTypeProvider;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.view.XRenderable;
-
-import java.io.*;
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-import java.nio.ByteOrder;
-import java.util.ArrayList;
-
-import org.libreoffice.android.Bootstrap;
-import org.libreoffice.ui.LibreOfficeUIActivity;
-
-public class DocumentLoader
-extends Activity
-{
-private static final String TAG = DocumentLoader;
-
-// Size of a small virtual (bitmap) device used to find out page count and
-// page sizes
-private static final int SMALLSIZE = 128;
-
-// We pre-render this
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
| 22 +++---
1 file changed, 16 insertions(+), 6 deletions(-)
New commits:
commit 37280590cdb0a0654a6c618eb06f67aa48b27f31
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Dec 9 16:03:29 2014 +0100
Related: fdo#85286 android: show error message given by LOK on the UI
Change-Id: Ide8e6bc7e719968bacf86572036b15c4ef834761
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index ec6d1d1..81de8ba 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -123,22 +123,30 @@ public class LOKitTileProvider implements TileProvider {
}
private boolean checkDocument() {
+String error = null;
+boolean ret;
+
if (mDocument == null || !mOffice.getError().isEmpty()) {
-Log.e(LOGTAG, Error at loading: + mOffice.getError());
-return false;
+error = Cannot open + mInputFile + : + mOffice.getError();
+ret = false;
+} else {
+ret = resetDocumentSize();
+if (!ret) {
+error = Document returned an invalid size or the document is
empty!;
+}
}
-boolean result = resetDocumentSize();
-if (!result) {
+if (!ret) {
+final String message = error;
LOKitShell.getMainHandler().post(new Runnable() {
@Override
public void run() {
-
LibreOfficeMainActivity.mAppContext.showAlertDialog(Document returned an
invalid size or the document is empty!);
+
LibreOfficeMainActivity.mAppContext.showAlertDialog(message);
}
});
}
-return result;
+return ret;
}
private boolean resetDocumentSize() {
@@ -247,3 +255,5 @@ public class LOKitTileProvider implements TileProvider {
resetDocumentSize();
}
}
+
+// vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental configure.ac
android/experimental/LOAndroid3/AndroidManifest.xml.in |2 - configure.ac | 22 ++--- 2 files changed, 14 insertions(+), 10 deletions(-) New commits: commit 02119a79c176f08aebd7a3068e5fa05eaded1f7a Author: Jan Holesovsky ke...@collabora.com Date: Mon Oct 13 10:19:25 2014 +0200 android: When debugging, the installLocation must be internalOnly. Otherwise the gdbserver ends up with run-as: exec failed for /data/data/org.libreoffice/lib/gdbserver Error:Permission denied (you need to run ndk-gdb with --verbose to see that). Change-Id: Iccdf0ff268c20d2fb5abc1e93404375fa51c1cf1 diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in b/android/experimental/LOAndroid3/AndroidManifest.xml.in index 989a43c..8eb4dbb 100644 --- a/android/experimental/LOAndroid3/AndroidManifest.xml.in +++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in @@ -1,7 +1,7 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice -android:installLocation=preferExternal +@ANDROID_INSTALL_LOCATION@ android:versionCode=1 android:versionName=1.0 diff --git a/configure.ac b/configure.ac index f05034d..2572e96 100644 --- a/configure.ac +++ b/configure.ac @@ -3751,24 +3751,28 @@ AC_MSG_CHECKING([whether to do a debug build]) if test -n $enable_debug test $enable_debug != yes test $enable_debug != no; then AC_MSG_ERROR([--enable-debug now accepts only yes or no, use --enable-selective-debuginfo]) fi -if test -n $ENABLE_DBGUTIL; then -if test $enable_debug = no; then -AC_MSG_ERROR([--disable-debug cannot be used with --enable-dbgutil]) -fi -ENABLE_DEBUG=TRUE -ANDROID_DEBUGGABLE='android:debuggable=true' -AC_MSG_RESULT([yes (dbgutil)]) -elif test -n $enable_debug test $enable_debug != no; then +if test -n $ENABLE_DBGUTIL -a $enable_debug = no; then +AC_MSG_ERROR([--disable-debug cannot be used with --enable-dbgutil]) +fi + +if test -n $ENABLE_DBGUTIL -o \( -n $enable_debug -a $enable_debug != no \) ; then ENABLE_DEBUG=TRUE ANDROID_DEBUGGABLE='android:debuggable=true' -AC_MSG_RESULT([yes]) +ANDROID_INSTALL_LOCATION='android:installLocation=internalOnly' +if test -n $ENABLE_DBGUTIL ; then +AC_MSG_RESULT([yes (dbgutil)]) +else +AC_MSG_RESULT([yes]) +fi else ENABLE_DEBUG= ANDROID_DEBUGGABLE= +ANDROID_INSTALL_LOCATION='android:installLocation=preferExternal' AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_DEBUG) AC_SUBST(ANDROID_DEBUGGABLE) +AC_SUBST(ANDROID_INSTALL_LOCATION) dnl Selective debuginfo ENABLE_DEBUGINFO_FOR= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java |
25 +++---
1 file changed, 18 insertions(+), 7 deletions(-)
New commits:
commit eadc132d5fa339b6fe5b2f8bb482ed30dbd23147
Author: Jan Holesovsky ke...@collabora.com
Date: Mon Oct 13 07:01:26 2014 +0200
android: When rotating, we also need to update the viewport geometry.
Change-Id: I04502c56b1e1d16cf65cbeb47632c508ef9889d0
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 4c91542..4c5509a 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -45,20 +45,32 @@ public class LOKitThread extends Thread {
return true;
}
-private void refresh() {
-Bitmap bitmap = mTileProvider.thumbnail(1000);
-if (bitmap != null) {
-
mApplication.getLayerController().getView().changeCheckerboardBitmap(bitmap,
mTileProvider.getPageWidth(), mTileProvider.getPageHeight());
+/** Handle the geometry change + draw. */
+private void redraw() {
+if (mController == null || mTileProvider == null) {
+// called too early...
+return;
}
-mLayerClient.clearAndResetlayers();
draw();
+
RectF rect = new RectF(0, 0, mTileProvider.getPageWidth(),
mTileProvider.getPageHeight());
mController.setPageRect(rect, rect);
mController.setViewportMetrics(mController.getViewportMetrics());
mController.setForceRedraw();
}
+/** Invalidate everything + handle the geometry change + draw. */
+private void refresh() {
+Bitmap bitmap = mTileProvider.thumbnail(1000);
+if (bitmap != null) {
+
mApplication.getLayerController().getView().changeCheckerboardBitmap(bitmap,
mTileProvider.getPageWidth(), mTileProvider.getPageHeight());
+}
+
+mLayerClient.clearAndResetlayers();
+redraw();
+}
+
private void changePart(int partIndex) {
LOKitShell.showProgressSpinner();
mTileProvider.changePart(partIndex);
@@ -119,8 +131,7 @@ public class LOKitThread extends Thread {
draw();
break;
case LOEvent.SIZE_CHANGED:
-// re-draw when the size has changed
-draw();
+redraw();
break;
case LOEvent.CHANGE_PART:
changePart(event.getPartIndex());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GLThread.java
| 178 --
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
| 45 +-
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java
| 143
3 files changed, 165 insertions(+), 201 deletions(-)
New commits:
commit 774dd532684e644c3c046d52f8ddf6dda65f62c0
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Sat Oct 4 18:06:39 2014 +0200
android: Rewrite GLThread to trash objects as little as possible
Change-Id: I6a0042e2a1b5d98fbf5aa8c64b67a9422f8956a3
diff --git
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GLThread.java
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GLThread.java
deleted file mode 100644
index a80ea82..000
---
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GLThread.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * * BEGIN LICENSE BLOCK *
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an AS IS basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Android code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011-2012
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Patrick Walton pcwal...@mozilla.com
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the GPL), or
- * the GNU Lesser General Public License Version 2.1 or later (the LGPL),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * * END LICENSE BLOCK * */
-
-package org.mozilla.gecko.gfx;
-
-import android.opengl.GLSurfaceView;
-
-import java.util.concurrent.LinkedBlockingQueue;
-
-import javax.microedition.khronos.opengles.GL10;
-
-// A GL thread managed by Java. It is not necessary to use this class to use
the
-// FlexibleGLSurfaceView, but it can be helpful, especially if the GL
rendering is to be done
-// entirely in Java.
-class GLThread extends Thread {
-private LinkedBlockingQueueRunnable mQueue;
-private GLController mController;
-private boolean mRenderQueued;
-
-public GLThread(GLController controller) {
-mQueue = new LinkedBlockingQueueRunnable();
-mController = controller;
-}
-
-@Override
-public void run() {
-while (true) {
-Runnable runnable;
-try {
-runnable = mQueue.take();
-} catch (InterruptedException e) {
-throw new RuntimeException(e);
-}
-
-runnable.run();
-if (runnable instanceof ShutdownMessage) {
-break;
-}
-}
-}
-
-public void recreateSurface() {
-mQueue.add(new RecreateSurfaceMessage());
-}
-
-public void renderFrame() {
-// Make sure there's only one render event in the queue at a time.
-synchronized (this) {
-if (!mRenderQueued) {
-mQueue.add(new RenderFrameMessage());
-mRenderQueued = true;
-}
-}
-}
-
-public void shutdown() {
-mQueue.add(new ShutdownMessage());
-}
-
-public void surfaceChanged(int width, int height) {
-mQueue.add(new SizeChangedMessage(width, height));
-}
-
-public void surfaceCreated() {
-mQueue.add(new SurfaceCreatedMessage());
-}
-
-public void surfaceDestroyed() {
-mQueue.add(new SurfaceDestroyedMessage());
-}
-
-private void doRecreateSurface() {
-mController.disposeGLContext();
-mController.initGLContext();
-}
-
-private GLSurfaceView.Renderer getRenderer() {
-return mController.getView().getRenderer();
-}
-
-private
[Libreoffice-commits] core.git: android/experimental configure.ac
android/experimental/LOAndroid3/AndroidManifest.xml| 84 - android/experimental/LOAndroid3/AndroidManifest.xml.in | 84 + configure.ac |8 + 3 files changed, 91 insertions(+), 85 deletions(-) New commits: commit 25b110cd13b63310a41d5edbda36a8871349858d Author: Jan Holesovsky ke...@collabora.com Date: Wed Oct 1 17:01:59 2014 +0200 android: android:debuggable setting now depends on configure options. Change-Id: I12d9c05fb05e4cf202c5c0d7b7e87c145d163fea diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml b/android/experimental/LOAndroid3/AndroidManifest.xml.in similarity index 99% rename from android/experimental/LOAndroid3/AndroidManifest.xml rename to android/experimental/LOAndroid3/AndroidManifest.xml.in index 83608b8..cfd369a 100644 --- a/android/experimental/LOAndroid3/AndroidManifest.xml +++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in @@ -11,7 +11,7 @@ uses-permission android:name=android.permission.WRITE_EXTERNAL_STORAGE/ application -android:debuggable=true +@ANDROID_DEBUGGABLE@ android:allowBackup=true android:icon=@drawable/main android:label=@string/app_name diff --git a/configure.ac b/configure.ac index 93fc825..4e2eec9 100644 --- a/configure.ac +++ b/configure.ac @@ -3760,15 +3760,19 @@ if test -n $ENABLE_DBGUTIL; then AC_MSG_ERROR([--disable-debug cannot be used with --enable-dbgutil]) fi ENABLE_DEBUG=TRUE +ANDROID_DEBUGGABLE='android:debuggable=true' AC_MSG_RESULT([yes (dbgutil)]) elif test -n $enable_debug test $enable_debug != no; then ENABLE_DEBUG=TRUE +ANDROID_DEBUGGABLE='android:debuggable=true' AC_MSG_RESULT([yes]) else ENABLE_DEBUG= +ANDROID_DEBUGGABLE= AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_DEBUG) +AC_SUBST(ANDROID_DEBUGGABLE) dnl Selective debuginfo ENABLE_DEBUGINFO_FOR= @@ -4419,6 +4423,7 @@ if test $cross_compiling = yes; then bin/get_config_variables \ solenv/bin/getcompver.awk \ solenv/inc/langlist.mk \ +android/experimental/LOAndroid3/AndroidManifest.xml.in \ config_host.mk.in \ Makefile.in \ lo.xcent.in \ @@ -12779,7 +12784,8 @@ if test -f config_host.mk; then config_md5=`$MD5SUM config_host.mk | sed s/ .*//` fi -AC_CONFIG_FILES([config_host.mk +AC_CONFIG_FILES([android/experimental/LOAndroid3/AndroidManifest.xml + config_host.mk Makefile lo.xcent instsetoo_native/util/openoffice.lst ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
| 18 ++
1 file changed, 5 insertions(+), 13 deletions(-)
New commits:
commit 966fe14af2c8782d7f16f732a73761a60b345bb1
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date: Fri Sep 12 13:32:00 2014 +0200
Android browser: open documents with the new viewer
Change-Id: Iae63a8ec591df912938e74d67cb173f591c2a93d
Reviewed-on: https://gerrit.libreoffice.org/11488
Reviewed-by: Tomaž Vajngerl qui...@gmail.com
Tested-by: Tomaž Vajngerl qui...@gmail.com
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 96e4251..feb74b3 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -228,19 +228,11 @@ public class LibreOfficeUIActivity extends Activity
implements ActionBar.OnNavig
}
public void open(File file) {
- /*
- Intent i = new Intent( this , WriterViewerActivity.class );
- i.putExtra( CURRENT_DIRECTORY_KEY , currentDirectory.getAbsolutePath()
);
- i.putExtra( FILTER_MODE_KEY , filterMode );
- i.putExtra( EXPLORER_VIEW_TYPE_KEY , viewMode );
- startActivity( i );
- */
- Intent i = new Intent( this , DocumentLoader.class );
-i.putExtra(input, file.getAbsolutePath() );
- i.putExtra( CURRENT_DIRECTORY_KEY , currentDirectory.getAbsolutePath()
);
- i.putExtra( FILTER_MODE_KEY , filterMode );
- i.putExtra( EXPLORER_VIEW_TYPE_KEY , viewMode );
- startActivity( i );
+Intent i = new Intent(Intent.ACTION_VIEW, Uri.fromFile(file));
+i.setComponent(new ComponentName(
+org.libreoffice,
+org.libreoffice.LibreOfficeMainActivity));
+startActivity(i);
}
@Override
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LibreOffice4Android/res/drawable-hdpi/bg_striped.xml |6 -- android/experimental/LibreOffice4Android/res/drawable-hdpi/bg_striped_split.xml |6 -- android/experimental/LibreOffice4Android/res/drawable-ldpi/bg_striped.xml |6 -- android/experimental/LibreOffice4Android/res/drawable-ldpi/bg_striped_split.xml |6 -- android/experimental/LibreOffice4Android/res/drawable-mdpi/bg_striped.xml |6 -- android/experimental/LibreOffice4Android/res/drawable-mdpi/bg_striped_split.xml |6 -- android/experimental/LibreOffice4Android/res/drawable-xhdpi/bg_striped.xml |6 -- android/experimental/LibreOffice4Android/res/drawable-xhdpi/bg_striped_split.xml |6 -- android/experimental/LibreOffice4Android/res/drawable/base.png |binary android/experimental/LibreOffice4Android/res/drawable/calc.png |binary android/experimental/LibreOffice4Android/res/drawable/draw.png |binary android/experimental/LibreOffice4Android/res/drawable/dummy_page.png |binary android/experimental/LibreOffice4Android/res/drawable/folder.png |binary android/experimental/LibreOffice4Android/res/drawable/impress.png |binary android/experimental/LibreOffice4Android/res/drawable/writer.png |binary dev/null |binary 16 files changed, 48 deletions(-) New commits: commit 0eaeb9270745aaf8344f3eb35971cbc4bbb85f9e Author: Jacobo Aragunde Pérez jaragu...@igalia.com Date: Fri Sep 12 11:12:32 2014 +0200 LibreOffice4Android: Reorganize resources. Removed several copies of repeated resources and moved one of each to the drawable directory. There is no need to place several identical resources in drawable-* directories, it's enough placing one copy in drawable. Change-Id: I72a9cecab5db7cdb461fcd7f89c783817746385b diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/bg_striped.xml b/android/experimental/LibreOffice4Android/res/drawable-hdpi/bg_striped.xml deleted file mode 100644 index 77e0aab..000 --- a/android/experimental/LibreOffice4Android/res/drawable-hdpi/bg_striped.xml +++ /dev/null @@ -1,6 +0,0 @@ -?xml version=1.0 encoding=utf-8? - -bitmap xmlns:android=http://schemas.android.com/apk/res/android; -android:src=@drawable/bg_striped_img -android:tileMode=repeat -android:dither=true / \ No newline at end of file diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/bg_striped_split.xml b/android/experimental/LibreOffice4Android/res/drawable-hdpi/bg_striped_split.xml deleted file mode 100644 index 9b0e313..000 --- a/android/experimental/LibreOffice4Android/res/drawable-hdpi/bg_striped_split.xml +++ /dev/null @@ -1,6 +0,0 @@ -?xml version=1.0 encoding=utf-8? - -bitmap xmlns:android=http://schemas.android.com/apk/res/android; -android:src=@drawable/bg_striped_split_img -android:tileMode=repeat -android:dither=true / \ No newline at end of file diff --git a/android/experimental/LibreOffice4Android/res/drawable-ldpi/base.png b/android/experimental/LibreOffice4Android/res/drawable-ldpi/base.png deleted file mode 100644 index 729dbcd..000 Binary files a/android/experimental/LibreOffice4Android/res/drawable-ldpi/base.png and /dev/null differ diff --git a/android/experimental/LibreOffice4Android/res/drawable-ldpi/bg_striped.xml b/android/experimental/LibreOffice4Android/res/drawable-ldpi/bg_striped.xml deleted file mode 100644 index 77e0aab..000 --- a/android/experimental/LibreOffice4Android/res/drawable-ldpi/bg_striped.xml +++ /dev/null @@ -1,6 +0,0 @@ -?xml version=1.0 encoding=utf-8? - -bitmap xmlns:android=http://schemas.android.com/apk/res/android; -android:src=@drawable/bg_striped_img -android:tileMode=repeat -android:dither=true / \ No newline at end of file diff --git a/android/experimental/LibreOffice4Android/res/drawable-ldpi/bg_striped_split.xml b/android/experimental/LibreOffice4Android/res/drawable-ldpi/bg_striped_split.xml deleted file mode 100644 index 9b0e313..000 --- a/android/experimental/LibreOffice4Android/res/drawable-ldpi/bg_striped_split.xml +++ /dev/null @@ -1,6 +0,0 @@ -?xml version=1.0 encoding=utf-8? - -bitmap xmlns:android=http://schemas.android.com/apk/res/android; -android:src=@drawable/bg_striped_split_img -android:tileMode=repeat -android:dither=true / \ No newline at end of file diff --git a/android/experimental/LibreOffice4Android/res/drawable-ldpi/calc.png b/android/experimental/LibreOffice4Android/res/drawable-ldpi/calc.png deleted file mode 100644 index a3f5fd4..000 Binary files a/android/experimental/LibreOffice4Android/res/drawable-ldpi/calc.png and /dev/null differ diff --git
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
|6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit cba65fe064e33dd3da2f70dd9d0b9ea62543b188
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Jul 1 09:55:52 2014 +0200
android: Attempt to load the test file we have in the .apk.
Change-Id: Ib438e8d7de90c202a3be6ad01bd8b7a8341527c1
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 2345aea..cda333e 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -82,11 +82,11 @@ public class LibreOfficeMainActivity extends Activity {
LibreOfficeKit.putenv(SAL_LOG=+WARN+INFO-INFO.legacy.osl);
LibreOfficeKit.init(this);
-Log.w(LOGTAG, LOK Handle: + handle);
Office office = new
Office(LibreOfficeKit.getLibreOfficeKitHandle());
-File file =
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
-String input = file.getPath() + /test.odt;
+//File file =
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+//String input = file.getPath() + /test.odt;
+String input = /assets/test1.odt;
Document document = office.documentLoad(input);
if (document == null) {
Log.w(LOGTAG, LOK Document error: + office.getErrorNative());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
|2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e2ca2f842b2147943e414ea746933d2a38e37850
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Jul 1 10:10:15 2014 +0200
android: i18nlangtag is too verbose, and we don't need the info.
Change-Id: Ifc59351913fd2194b23511330d1a90f40d3e158e
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index cda333e..dc5242e 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -79,7 +79,7 @@ public class LibreOfficeMainActivity extends Activity {
try {
// enable debugging messages as the first thing
-LibreOfficeKit.putenv(SAL_LOG=+WARN+INFO-INFO.legacy.osl);
+
LibreOfficeKit.putenv(SAL_LOG=+WARN+INFO-INFO.legacy.osl-INFO.i18nlangtag);
LibreOfficeKit.init(this);
Office office = new
Office(LibreOfficeKit.getLibreOfficeKitHandle());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/desktop/Makefile |1 + 1 file changed, 1 insertion(+) New commits: commit 1e9b5f17f8ba551e40795392121a90075d804fcb Author: Jan Holesovsky ke...@collabora.com Date: Mon Jun 30 19:34:57 2014 +0200 android: Add missing mkdir. Change-Id: I9c06a1a2efcb3c436287a3aac15d976fcafbd19d diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index 2c30fc4..3a7f6ba 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -23,6 +23,7 @@ BOOTSTRAP=org.libreoffice.android.Bootstrap copy-stuff-desktop: # tango artwork / icons + mkdir -p assets/share/config cp -R $(INSTDIR)/$(LIBO_SHARE_FOLDER)/config/images_tango.zip assets/share/config # shell / splash images mkdir -p assets/program ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental ios/CustomTarget_MobileLibreOffice_app.mk ios/CustomTarget_TiledLibreOffice_app.mk ios/Executable_LibreOffice.mk solenv/bin
android/experimental/DocumentLoader/Makefile |3 -- android/experimental/LibreOffice4Android/Makefile |4 +-- ios/CustomTarget_MobileLibreOffice_app.mk |1 ios/CustomTarget_TiledLibreOffice_app.mk |1 ios/Executable_LibreOffice.mk |1 solenv/bin/native-code.py | 29 +- 6 files changed, 5 insertions(+), 34 deletions(-) New commits: commit 4be366de5833c284f21393e99fb7b11199f4b0ff Author: Matúš Kukan matus.ku...@collabora.com Date: Thu Jan 2 13:26:31 2014 +0100 native code generator: Do not use single_component_map anymore. Put cui and spl into extended_code and ignore the rest. Also change DocumentLoader and LibreOffice4Android to use only extended_core and writer as all the ios apps do, without knowing what is really needed there. Change-Id: Ic6a256ea47cc96132c0e7658d6ef2838b295ca71 diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 092292d..74c497a 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -13,8 +13,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py $ \ - -g extended_core -g base_core -g calc_core -g draw_core -g math -g writer \ - -s protocolhandler -s sb \ + -g extended_core -g writer \ $@ copy-stuff: diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index 4eadb65..33a7e55 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -13,8 +13,8 @@ BOOTSTRAPDIR=../../Bootstrap include $(BOOTSTRAPDIR)/Makefile.shared native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py - $ -g extended_core -g base_core -g calc_core -g draw_core -g math -g writer \ - -s dlgprov -s protocolhandler -s scriptframe -s sb -s stringresource -s vbaswobj -s vbaevents \ + $ \ + -g extended_core -g writer \ $@ copy-stuff: diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk b/ios/CustomTarget_MobileLibreOffice_app.mk index cb25385..ec59df0 100644 --- a/ios/CustomTarget_MobileLibreOffice_app.mk +++ b/ios/CustomTarget_MobileLibreOffice_app.mk @@ -35,7 +35,6 @@ $(call gb_CustomTarget_get_target,ios/MobileLibreOffice): $(call gb_CustomTarget $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2) $(SRCDIR)/solenv/bin/native-code.py \ -g extended_core -g writer \ - -s cui -s spl \ $(SRCDIR)/ios/shared/ios_sharedlo/cxx/native-code.mm $(call MobileLibreOfficeXcodeBuild, clean build) diff --git a/ios/CustomTarget_TiledLibreOffice_app.mk b/ios/CustomTarget_TiledLibreOffice_app.mk index 5097f0d..95e7fbd 100644 --- a/ios/CustomTarget_TiledLibreOffice_app.mk +++ b/ios/CustomTarget_TiledLibreOffice_app.mk @@ -30,7 +30,6 @@ $(call gb_CustomTarget_get_target,ios/TiledLibreOffice): $(call gb_CustomTarget_ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2) $(SRCDIR)/solenv/bin/native-code.py \ -g extended_core -g writer \ - -s cui -s spl \ $(SRCDIR)/ios/experimental/TiledLibreOffice/TiledLibreOffice/native-code.mm $(call TiledLibreOfficeXcodeBuild, clean build) diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk index f35b9cb..ccf69c7 100644 --- a/ios/Executable_LibreOffice.mk +++ b/ios/Executable_LibreOffice.mk @@ -29,7 +29,6 @@ $(call gb_CustomTarget_get_workdir,ios/LibreOffice)/native-code.cxx : mkdir -p `dirname $@` $(SRCDIR)/solenv/bin/native-code.py \ -g extended_core -g writer \ - -s cui -s spl \ $@ $(eval $(call gb_Executable_add_objcxxobjects,LibreOffice,\ diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 065772e..ba8ebc2 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -64,10 +64,12 @@ extended_core_factory_list = core_factory_list + [ (libanimcorelo.a, animcore_component_getFactory), (libavmedialo.a, avmedia_component_getFactory), (libchartcorelo.a, chartcore_component_getFactory), +(libcuilo.a, cui_component_getFactory), (libfilterconfiglo.a, filterconfig1_component_getFactory), (libfrmlo.a, frm_component_getFactory), (libfwklo.a, fwk_component_getFactory), (libfwmlo.a, fwm_component_getFactory), +(libspllo.a, spl_component_getFactory), (libsvxcorelo.a, svxcore_component_getFactory), (libtextfdlo.a, textfd_component_getFactory), (libtklo.a, tk_component_getFactory), @@ -138,26 +140,9 @@ core_constructor_list = [
[Libreoffice-commits] core.git: android/experimental solenv/bin
android/experimental/DocumentLoader/Makefile |2 android/experimental/LibreOffice4Android/Makefile |2 android/experimental/desktop/Makefile |2 solenv/bin/native-code.py | 216 ++ 4 files changed, 189 insertions(+), 33 deletions(-) New commits: commit 3f47635b86ac34a0dc42d93e77bb1a3ca26f6f79 Author: Matúš Kukan matus.ku...@collabora.com Date: Mon Dec 23 17:44:57 2013 +0100 Improve native-code generator for (not only) Android. Group logic from include/osl/detail/component-mapping.h has been duplicated here for now. The plan is to reuse this for iOS too if possible. We don't need component-declarations.h now, which is good because the list of implementation constructors is going to grow a lot over time. Also, something needs to be done to avoid component-defines.h. --constructor parameter was removed because it was not used and also does not make sense. __attribute__ ((visibility(default))) is removed too. Change-Id: I5e3f988800303d31e1d78220cbd25339bcbc482a diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 5295c80..092292d 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -13,7 +13,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py $ \ - -f EXTENDED_CORE -f BASE_CORE -f CALC_CORE -f DRAW_CORE -f MATH -f WRITER \ + -g extended_core -g base_core -g calc_core -g draw_core -g math -g writer \ -s protocolhandler -s sb \ $@ diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index 92f0668..4eadb65 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -13,7 +13,7 @@ BOOTSTRAPDIR=../../Bootstrap include $(BOOTSTRAPDIR)/Makefile.shared native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py - $ -f EXTENDED_CORE -f BASE_CORE -f CALC_CORE -f DRAW_CORE -f MATH -f WRITER \ + $ -g extended_core -g base_core -g calc_core -g draw_core -g math -g writer \ -s dlgprov -s protocolhandler -s scriptframe -s sb -s stringresource -s vbaswobj -s vbaevents \ $@ diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index 610bf87..a661825 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -13,7 +13,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py $ -j \ - -f EXTENDED_CORE -f BASE_CORE -f CALC_CORE -f DRAW_CORE -f MATH -f WRITER \ + -g extended_core -g base_core -g calc_core -g draw_core -g math -g writer \ -s basprov -s dlgprov -s cui -s protocolhandler -s scriptframe -s sb -s spl -s stringresource -s uui -s vbaswobj -s vbaevents \ $@ diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 99cefb8..ebdd5db 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -8,46 +8,205 @@ from __future__ import print_function from optparse import OptionParser +# foo_component_getFactory functions are split into groups, so that you could +# choose e.g. 'extended_core' and 'writer' functionality and through factory_map, +# relevant function sections will be referenced in lo_get_factory_map(). +# That prevents garbage collector to ignore them as unused. + +# We need the same groups for new constructor functions, started in +# ae3a0c8da50b36db395984637f5ad74d3b4887bc +# For now, there are only constructor functions for implementations in 'core' +# group, so no need for other groups, core_constructor_list is enough. +# (These functions are referenced in lo_get_constructor_map().) + +core_factory_list = [ +(libembobj.a, embobj_component_getFactory), +(libemboleobj.a, emboleobj_component_getFactory), +(libintrospectionlo.a, introspection_component_getFactory), +(libreflectionlo.a, reflection_component_getFactory), +(libstocserviceslo.a, stocservices_component_getFactory), +(libcomphelper.a, comphelp_component_getFactory), +(libconfigmgrlo.a, configmgr_component_getFactory), +(libdeployment.a, deployment_component_getFactory), +(libevtattlo.a, evtatt_component_getFactory), +(libfilterconfiglo.a, filterconfig1_component_getFactory), +(libfsstoragelo.a, fsstorage_component_getFactory), +(libfwklo.a, fwk_component_getFactory), +(libfwllo.a, fwl_component_getFactory), +(libhyphenlo.a, hyphen_component_getFactory), +(libi18npoollo.a, i18npool_component_getFactory), +(liblnglo.a, lng_component_getFactory), +(liblnthlo.a, lnth_component_getFactory), +(liblocalebe1lo.a,
[Libreoffice-commits] core.git: android/experimental android/.gitignore solenv/bin
android/.gitignore |3
android/experimental/DocumentLoader/Makefile |6 +
android/experimental/DocumentLoader/native-code.cxx | 45 ---
android/experimental/LibreOffice4Android/Makefile|5
android/experimental/LibreOffice4Android/native-code.cxx | 51 -
android/experimental/desktop/Makefile|6 +
android/experimental/desktop/native-code.cxx | 64 ---
solenv/bin/native-code.py| 85 +++
8 files changed, 104 insertions(+), 161 deletions(-)
New commits:
commit a17c0950c04693411cc7e46a21c65d45216d8c52
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu Dec 19 15:32:54 2013 +0100
Add tool to generate native-code.cxx for Android.
Should be extended to be helpfull for iOS too.
Change-Id: I862731b6386d5f9cbb508e0c138f45fbe1cb3f46
diff --git a/android/.gitignore b/android/.gitignore
index 9034b98..dca2c57 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -3,4 +3,5 @@ bin
gen
libs
obj
-local.properties
\ No newline at end of file
+local.properties
+native-code.cxx
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 49b2895..5295c80 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -11,6 +11,12 @@ APP_PACKAGE=org.libreoffice.android.examples
BOOTSTRAPDIR=../../Bootstrap
include $(BOOTSTRAPDIR)/Makefile.shared
+native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
+ $ \
+ -f EXTENDED_CORE -f BASE_CORE -f CALC_CORE -f DRAW_CORE -f MATH
-f WRITER \
+ -s protocolhandler -s sb \
+$@
+
copy-stuff:
# Then assets. Let the directory structure under assets mimic
# that under solver for now.
diff --git a/android/experimental/DocumentLoader/native-code.cxx
b/android/experimental/DocumentLoader/native-code.cxx
deleted file mode 100644
index 7cba377..000
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include osl/detail/android-bootstrap.h
-
-extern C
-__attribute__ ((visibility(default)))
-const lib_to_factory_mapping *
-lo_get_factory_map(void)
-{
-static lib_to_factory_mapping map[] = {
-LO_EXTENDED_CORE_FACTORY_MAP
-LO_BASE_CORE_FACTORY_MAP
-LO_CALC_CORE_FACTORY_MAP
-LO_DRAW_CORE_FACTORY_MAP
-LO_MATH_FACTORY_MAP
-LO_WRITER_FACTORY_MAP
-{ libprotocolhandlerlo.a, protocolhandler_component_getFactory },
-{ libsblo.a, sb_component_getFactory },
-{ NULL, NULL }
-};
-
-return map;
-}
-
-extern C
-__attribute__ ((visibility(default)))
-const lib_to_constructor_mapping *
-lo_get_constructor_map(void)
-{
-static lib_to_constructor_mapping map[] = {
-NON_APP_SPECIFIC_CONSTRUCTOR_MAP
-{ NULL, NULL }
-};
-
-return map;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index 9f8dcce..92f0668 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -12,6 +12,11 @@ APP_PACKAGE=org.libreoffice
BOOTSTRAPDIR=../../Bootstrap
include $(BOOTSTRAPDIR)/Makefile.shared
+native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
+ $ -f EXTENDED_CORE -f BASE_CORE -f CALC_CORE -f DRAW_CORE -f MATH -f
WRITER \
+ -s dlgprov -s protocolhandler -s scriptframe -s sb -s
stringresource -s vbaswobj -s vbaevents \
+$@
+
copy-stuff:
# Then assets. Let the directory structure under assets mimic
# that under solver for now.
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx
b/android/experimental/LibreOffice4Android/native-code.cxx
deleted file mode 100644
index 44cb862..000
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include osl/detail/android-bootstrap.h
-
-extern C
-__attribute__ ((visibility(default)))
-const lib_to_factory_mapping *
-lo_get_factory_map(void)
-{
-static lib_to_factory_mapping map[] = {
-
[Libreoffice-commits] core.git: android/experimental include/osl ios/experimental ios/shared
android/experimental/DocumentLoader/native-code.cxx | 13 --
android/experimental/LibreOffice4Android/native-code.cxx | 18 ---
android/experimental/desktop/native-code.cxx | 18 ---
include/osl/detail/component-mapping.h | 18 +++
ios/experimental/LibreOffice/LibreOffice/lo.mm | 18 ---
ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm | 18 ---
ios/shared/ios_sharedlo/cxx/mlo.mm | 12 +-
7 files changed, 20 insertions(+), 95 deletions(-)
New commits:
commit ad4e451070bc3aa2d1c6c4c582d66d5cb34bec59
Author: Matúš Kukan matus.ku...@collabora.com
Date: Wed Dec 18 17:54:33 2013 +0100
Deduplicate a lot of common components.
Change-Id: Ic3eb95119eed7a691c9cd0c677f28c87395b9415
diff --git a/android/experimental/DocumentLoader/native-code.cxx
b/android/experimental/DocumentLoader/native-code.cxx
index 2eb7cce..50bec62 100644
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ b/android/experimental/DocumentLoader/native-code.cxx
@@ -20,17 +20,10 @@ lo_get_factory_map(void)
{ libavmedialo.a, avmedia_component_getFactory },
{ libdbalo.a, dba_component_getFactory },
{ libdbaxmllo.a, dbaxml_component_getFactory },
-{ libevtattlo.a, evtatt_component_getFactory },
{ libfrmlo.a, frm_component_getFactory },
-{ libfsstoragelo.a, fsstorage_component_getFactory },
{ libfwklo.a, fwk_component_getFactory },
-{ libfwllo.a, fwl_component_getFactory },
{ libfwmlo.a, fwm_component_getFactory },
{ libhwplo.a, hwp_component_getFactory },
-{ libhyphenlo.a, hyphen_component_getFactory },
-{ liblnglo.a, lng_component_getFactory },
-{ liblnthlo.a, lnth_component_getFactory },
-{ libooxlo.a, oox_component_getFactory },
{ libprotocolhandlerlo.a, protocolhandler_component_getFactory },
{ libscdlo.a, scd_component_getFactory },
{ libscfiltlo.a, scfilt_component_getFactory },
@@ -40,20 +33,14 @@ lo_get_factory_map(void)
{ libsdlo.a, sd_component_getFactory },
{ libsmdlo.a, smd_component_getFactory },
{ libsmlo.a, sm_component_getFactory },
-{ libspelllo.a, spell_component_getFactory },
{ libsvgfilterlo.a, svgfilter_component_getFactory },
{ libswdlo.a, swd_component_getFactory },
{ libswlo.a, sw_component_getFactory },
{ libt602filterlo.a, t602filter_component_getFactory },
{ libtextfdlo.a, textfd_component_getFactory },
-{ libunordflo.a, unordf_component_getFactory },
-{ libunoxmllo.a, unoxml_component_getFactory },
{ libwpftdrawlo.a, wpftdraw_component_getFactory },
{ libwpftwriterlo.a, wpftwriter_component_getFactory },
{ libxmlfdlo.a, xmlfd_component_getFactory },
-{ libxmlsecurity.a, xmlsecurity_component_getFactory },
-{ libxoflo.a, xof_component_getFactory },
-{ libxolo.a, xo_component_getFactory },
{ NULL, NULL }
};
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx
b/android/experimental/LibreOffice4Android/native-code.cxx
index 747e816..02ceaec 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -23,20 +23,11 @@ lo_get_factory_map(void)
{ libdlgprov.uno.a, dlgprov_component_getFactory },
{ libdbalo.a, dba_component_getFactory },
{ libdbaxmllo.a, dbaxml_component_getFactory },
-{ libembobj.a, embobj_component_getFactory },
-{ libemboleobj.a, emboleobj_component_getFactory },
-{ libevtattlo.a, evtatt_component_getFactory },
{ libfilterconfiglo.a, filterconfig1_component_getFactory },
{ libfrmlo.a, frm_component_getFactory },
-{ libfsstoragelo.a, fsstorage_component_getFactory },
{ libfwklo.a, fwk_component_getFactory },
-{ libfwllo.a, fwl_component_getFactory },
{ libfwmlo.a, fwm_component_getFactory },
{ libhwplo.a, hwp_component_getFactory },
-{ libhyphenlo.a, hyphen_component_getFactory },
-{ liblnglo.a, lng_component_getFactory },
-{ liblnthlo.a, lnth_component_getFactory },
-{ libooxlo.a, oox_component_getFactory },
{ libprotocolhandlerlo.a, protocolhandler_component_getFactory },
{ libscdlo.a, scd_component_getFactory },
{ libscfiltlo.a, scfilt_component_getFactory },
@@ -47,13 +38,9 @@ lo_get_factory_map(void)
{ libsdlo.a, sd_component_getFactory },
{ libsmdlo.a, smd_component_getFactory },
{ libsmlo.a, sm_component_getFactory },
-{ libsotlo.a, sot_component_getFactory },
-{ libspelllo.a, spell_component_getFactory },
{ libscriptframe.a, scriptframe_component_getFactory },
{ libstringresource.uno.a,
[Libreoffice-commits] core.git: android/experimental chart2/CppunitTest_chart2_export.mk chart2/CppunitTest_chart2_import.mk cppuhelper/source dbaccess/CppunitTest_dbaccess_dialog_save.mk dbaccess/Cpp
Repository.mk|1 android/experimental/LibreOffice4Android/native-code.cxx |2 android/experimental/desktop/native-code.cxx |2 chart2/CppunitTest_chart2_export.mk |1 chart2/CppunitTest_chart2_import.mk |1 cppuhelper/source/shlib.cxx |2 dbaccess/CppunitTest_dbaccess_dialog_save.mk |1 dbaccess/CppunitTest_dbaccess_macros_test.mk |1 ios/experimental/LibreOffice/LibreOffice/lo.mm |2 ios/qa/sc/Makefile |4 - ios/qa/sc/filters-test.m |1 ios/shared/ios_sharedlo/cxx/mlo.mm |3 oox/Library_oox.mk |2 postprocess/Rdb_services.mk |1 sax/CppunitTest_sax_parser.mk|2 sax/Library_expwrap.mk | 14 +++- sax/Library_fastsax.mk | 48 --- sax/Module_sax.mk|2 sax/StaticLibrary_sax_shared.mk | 23 --- sax/source/expatwrap/expwrap.component |3 sax/source/expatwrap/sax_expat.cxx | 18 + sax/source/fastparser/fastparser.cxx | 35 -- sax/source/fastparser/fastsax.component | 25 --- sc/CppunitTest_sc_annotationobj.mk |1 sc/CppunitTest_sc_annotationshapeobj.mk |1 sc/CppunitTest_sc_annotationsobj.mk |1 sc/CppunitTest_sc_cellrangeobj.mk|1 sc/CppunitTest_sc_chart_regression_test.mk |1 sc/CppunitTest_sc_databaserangeobj.mk|1 sc/CppunitTest_sc_datapilotfieldobj.mk |1 sc/CppunitTest_sc_datapilottableobj.mk |1 sc/CppunitTest_sc_editfieldobj_cell.mk |1 sc/CppunitTest_sc_editfieldobj_header.mk |1 sc/CppunitTest_sc_filters_test.mk|1 sc/CppunitTest_sc_macros_test.mk |1 sc/CppunitTest_sc_modelobj.mk|1 sc/CppunitTest_sc_namedrangeobj.mk |1 sc/CppunitTest_sc_namedrangesobj.mk |1 sc/CppunitTest_sc_opencl_test.mk |1 sc/CppunitTest_sc_outlineobj.mk |1 sc/CppunitTest_sc_rangelst_test.mk |1 sc/CppunitTest_sc_subsequent_export_test.mk |1 sc/CppunitTest_sc_subsequent_filters_test.mk |1 sc/CppunitTest_sc_tableautoformatfield.mk|1 sc/CppunitTest_sc_tablesheetobj.mk |1 sc/CppunitTest_sc_tablesheetsobj.mk |1 sd/CppunitTest_sd_filters_test.mk|1 sd/CppunitTest_sd_import_tests.mk|1 sw/CppunitTest_sw_filters_test.mk|1 sw/CppunitTest_sw_htmlexport.mk |1 sw/CppunitTest_sw_layout_test.mk |1 sw/CppunitTest_sw_macros_test.mk |1 sw/CppunitTest_sw_odfexport.mk |1 sw/CppunitTest_sw_ooxmlexport.mk |1 sw/CppunitTest_sw_ooxmlimport.mk |1 55 files changed, 34 insertions(+), 192 deletions(-) New commits: commit eebc1e9a8a5c7fd04b795c62791a70eed65995e4 Author: Marcos Paulo de Souza marcos.souza@gmail.com Date: Wed Dec 11 12:01:21 2013 -0200 fdo#60698: Merge fastsax and sax_shared into expwrap Change-Id: I6f8c6827c00db50184a46f39968f882b944d18d4 Reviewed-on: https://gerrit.libreoffice.org/6967 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: LibreOffice gerrit bot ger...@libreoffice.org diff --git a/Repository.mk b/Repository.mk index 5405d69..d4a103c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -253,7 +253,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ evtatt \ exp \ expwrap \ - fastsax \ flat \ file \ filterconfig \ diff --git a/android/experimental/LibreOffice4Android/native-code.cxx b/android/experimental/LibreOffice4Android/native-code.cxx index 00fec00..9e65d8d 100644 --- a/android/experimental/LibreOffice4Android/native-code.cxx +++ b/android/experimental/LibreOffice4Android/native-code.cxx @@ -22,7 +22,6 @@ extern C extern void * emboleobj_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * evtatt_component_getFactory( const char *
[Libreoffice-commits] core.git: android/experimental config_host.mk.in configure.ac download.lst external/afms external/Module_external.mk Makefile.fetch scp2/source
Makefile.fetch |1 android/experimental/desktop/Makefile |2 - config_host.mk.in |1 configure.ac| 21 download.lst|1 external/Module_external.mk |1 external/afms/ExternalPackage_fontunxafm.mk | 46 external/afms/Makefile |7 external/afms/Module_afms.mk| 17 -- external/afms/README|1 external/afms/UnpackedTarball_afms.mk | 14 scp2/source/ooo/directory_ooo.scp |9 - scp2/source/ooo/file_extra_ooo.scp | 13 --- 13 files changed, 1 insertion(+), 133 deletions(-) New commits: commit 0b9d8c678ce06d74a9211e4857def48a9eabc36b Author: Khaled Hosny khaledho...@eglug.org Date: Tue Nov 26 17:16:04 2013 +0200 Those AFM files are not used anymore They were used to build metrics for printer built in fonts, which was dropped in the previous commit. Change-Id: Id9fb3108facec61eb6de0a2d16546f1187465e50 Reviewed-on: https://gerrit.libreoffice.org/6861 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/Makefile.fetch b/Makefile.fetch index ae76cf7..5b3f501 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -88,7 +88,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,VISIO,VISIO_TARBALL) \ ,$(call fetch_Download_item_special,http://dev-www.libreoffice.org/src,$(item))) $(foreach item, \ - $(call fetch_Optional,AFMS,$(AFMS_TARBALL)) \ $(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_CODEC_TARBALL)) \ $(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_HTTPCLIENT_TARBALL)) \ $(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_LANG_TARBALL)) \ diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index bd75e51..145a9fb 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -117,7 +117,7 @@ copy-stuff: cp -r $(SRC_ROOT)/icon-themes/galaxy/brand/* assets/program # presets - becomes the users home directory, .stamp forces .zip dir creation for D in $(strip autocorr autotext backup basic config gallery \ -psprint/driver psprint/fontmetric template \ +psprint/driver template \ uno_packages/cache wordbook); do \ mkdir -p assets/presets/$$D ; \ echo content assets/presets/$$D/stamp; \ diff --git a/config_host.mk.in b/config_host.mk.in index 49977f1..e517785 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -577,7 +577,6 @@ export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@ export WINDOWS_SDK_WILANGID=@WINDOWS_SDK_WILANGID@ export WINDRES=@WINDRES@ export WINEGCC=@WINEGCC@ -export WITHOUT_AFMS=@WITHOUT_AFMS@ export WITHOUT_PPDS=@WITHOUT_PPDS@ export WITH_COMPAT_OOWRAPPERS=@WITH_COMPAT_OOWRAPPERS@ export WITH_EXTENSION_INTEGRATION=@WITH_EXTENSION_INTEGRATION@ diff --git a/configure.ac b/configure.ac index 3f9b913..3b9abe9 100644 --- a/configure.ac +++ b/configure.ac @@ -1396,13 +1396,6 @@ AC_ARG_WITH(ppds, PPDs are known to be already available (every recent distro with CUPS backend).]), ,) -AC_ARG_WITH(afms, -AS_HELP_STRING([--without-afms], -[Removes bitmap font files from LibreOffice installation set, for people - building for specific distributions where AFM files or TrueType Fonts - are known to be available.]), -,) - AC_ARG_WITH(epm, AS_HELP_STRING([--with-epm], [Decides which epm to use. Default is to use the one from the system if @@ -11483,20 +11476,6 @@ fi AC_SUBST(WITHOUT_PPDS) dnl === -dnl Test whether to include afms -dnl === -AC_MSG_CHECKING([whether to include AFMs]) -if test $with_afms != no; then -AC_MSG_RESULT([yes]) -BUILD_TYPE=$BUILD_TYPE AFMS -else -AC_MSG_RESULT([no]) -WITHOUT_AFMS=YES -SCPDEFS=$SCPDEFS -DWITHOUT_AFMS -fi -AC_SUBST(WITHOUT_AFMS) - -dnl === dnl Test whether to include extra galleries dnl === AC_MSG_CHECKING([whether to include extra galleries]) diff --git a/download.lst b/download.lst index 03fe799..74ff6f1 100644 --- a/download.lst +++ b/download.lst @@ -25,7 +25,6 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 export LIBEOT_TARBALL := libeot-0.01.tar.bz2 -export AFMS_TARBALL :=
[Libreoffice-commits] core.git: android/experimental forms/source lotuswordpro/source
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FolderIconView.java
| 18 +++
forms/source/richtext/richtextimplcontrol.hxx
|2
lotuswordpro/source/filter/lwpparastyle.cxx
|6 +-
lotuswordpro/source/filter/xfilter/xfborders.cxx
| 24 +-
lotuswordpro/source/filter/xfilter/xfborders.hxx
| 10 ++--
lotuswordpro/source/filter/xfilter/xfdefs.hxx
|2
lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
|4 -
7 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit ea6f3c09cf76932ce567e8d3250e0f665ca42c99
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Nov 23 22:40:38 2013 +0100
outter - outer (also when outter is inside another word)
Change-Id: I0290d57f1c27a82a34a7dba56d88d51ec6d0bd9e
diff --git
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FolderIconView.java
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FolderIconView.java
index 4f518ed..5960e5e 100644
---
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FolderIconView.java
+++
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FolderIconView.java
@@ -68,15 +68,15 @@ public class FolderIconView extends View{
float height = (float)this.getHeight();
float centerX = width*0.5f;// centered on horz axis
float centerY = height*0.5f;
-float outterRadius = 0.8f*0.5f* width;
+float outerRadius = 0.8f*0.5f* width;
float innerRadius = 0.7f*0.5f* width;
-float thumbHeight = outterRadius*1.25f;
+float thumbHeight = outerRadius*1.25f;
float thumbWidth = thumbHeight*(float)(1/Math.sqrt(2));
-float DZx = 0.2f*outterRadius;
-float DZy = 0.2f*outterRadius;
+float DZx = 0.2f*outerRadius;
+float DZy = 0.2f*outerRadius;
//Bitmap blankPage = BitmapFactory.decodeResource( getResources() ,
R.drawable.page );
Log.i( TAG , Float.toString( width ) + X + Float.toString( height
) );
-canvas.drawCircle( centerX , centerY , outterRadius , mPaintGray );
+canvas.drawCircle( centerX , centerY , outerRadius , mPaintGray );
canvas.drawCircle( centerX , centerY , innerRadius , mPaintBlack );
//Either get thumbs from directory or use generic page images
//For now just get the first 4 thumbs - add some checks later
@@ -103,8 +103,8 @@ public class FolderIconView extends View{
// Show a generic blank page icon
if( thumbs.isEmpty() )
return;
-/*float left = centerX ;//+ 0.25f*outterRadius;
-float top = centerY - 0.5f*outterRadius;
+/*float left = centerX ;//+ 0.25f*outerRadius;
+float top = centerY - 0.5f*outerRadius;
float right = left + thumbs.get(0).getWidth()*0.4f;
float bottom = top + thumbs.get(0).getHeight()*0.4f;
RectF dest = new RectF( left, top , right , bottom );
@@ -114,8 +114,8 @@ public class FolderIconView extends View{
for( int i = 1 ; i = size ; i++ ){
canvas.drawRect( shadowBox , mPaintShadow);
canvas.drawBitmap( thumbs.pop() , null , dest , null);
-dest.offset( -outterRadius*0.2f , outterRadius*0.1f );
-shadowBox.offset( -outterRadius*0.2f , outterRadius*0.1f );
+dest.offset( -outerRadius*0.2f , outerRadius*0.1f );
+shadowBox.offset( -outerRadius*0.2f , outerRadius*0.1f );
}*/
float left;
float top;
diff --git a/forms/source/richtext/richtextimplcontrol.hxx
b/forms/source/richtext/richtextimplcontrol.hxx
index c953185..f9f5c87 100644
--- a/forms/source/richtext/richtextimplcontrol.hxx
+++ b/forms/source/richtext/richtextimplcontrol.hxx
@@ -104,7 +104,7 @@ namespace frm
There are some attributes which are script dependent, e.g. the
CharPosture. This means
that in real, there are 3 attributes for this, one for every
possible script type (latin,
asian, complex). However, to the out world, we behave as if there
is only one attribute:
-E.g., if the outter world asks for the state of the CharPosture
attribute, we return
+E.g., if the outer world asks for the state of the CharPosture
attribute, we return
the state of either CharPostureLatin, CharPostureAsian, or
CharPostureComplex, depending
on the script type of the current selection. (In real, it may be
more complex since
the current selection may contain more than one script type.)
diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx
b/lotuswordpro/source/filter/lwpparastyle.cxx
index e00ac2c..5a4ec67 100644
--- a/lotuswordpro/source/filter/lwpparastyle.cxx
+++
[Libreoffice-commits] core.git: android/experimental
android/experimental/DocumentLoader/Makefile |4 ++--
android/experimental/LibreOffice4Android/Makefile |4 ++--
android/experimental/desktop/Makefile |5 ++---
3 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 01a13519e2a12e1e9b61bab1437d340e389e44bf
Author: Tor Lillqvist t...@collabora.com
Date: Fri Oct 25 10:50:54 2013 +0300
Fix bit-rot
Change-Id: Iae6aa3c1326456dde7261f471ba7d963058f20a7
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 034b14f..63104dd 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -38,8 +38,8 @@ copy-stuff:
assets
cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component
assets/ComponentTarget/i18npool/util
#
- cp -R $(INSTDIR)/share/registry assets/share
mkdir -p assets/share/config
+ cp -R $(INSTDIR)/share/registry assets/share
cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config
#
# Set up rc, the inifile. See BootstrapMap::getBaseIni(). As this app
@@ -60,7 +60,7 @@ copy-stuff:
echo LO_LIB_DIR=file:$(APP_DATA_PATH)/lib/
assets/program/fundamentalrc
echo URE_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/fundamentalrc # checkme - is this used to find configs ?
echo 'BRAND_BASE_DIR=file:///assets' assets/program/fundamentalrc
- echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
module:$${BRAND_BASE_DIR}/share/registry/modules
res:$${BRAND_BASE_DIR}/share/registry' assets/program/fundamentalrc
+ echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
res:$${BRAND_BASE_DIR}/share/registry' assets/program/fundamentalrc
echo
'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway'
assets/program/fundamentalrc
echo 'URE_MORE_TYPES=file://$(APP_DATA_PATH)/program/offapi.rdb
file://$(APP_DATA_PATH)/program/oovbaapi.rdb' assets/program/fundamentalrc
echo 'URE_MORE_SERVICES=file:///assets/program/services/services.rdb'
assets/program/fundamentalrc
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index fee5198..ee3325d 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -38,8 +38,8 @@ copy-stuff:
assets
cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component
assets/ComponentTarget/i18npool/util
#
- cp -R $(INSTDIR)/share/registry assets/share
mkdir -p assets/share/config
+ cp -R $(INSTDIR)/share/registry assets/share
cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config
#
# Set up rc, the inifile. See BootstrapMap::getBaseIni(). As this app
@@ -60,7 +60,7 @@ copy-stuff:
echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/'
assets/program/fundamentalrc
echo 'URE_LIB_DIR=file://$$APP_DATA_DIR/lib/'
assets/program/fundamentalrc # checkme - is this used to find configs ?
echo 'BRAND_BASE_DIR=file:///assets' assets/program/fundamentalrc
- echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
module:$${BRAND_BASE_DIR}/share/registry/modules
res:$${BRAND_BASE_DIR}/share/registry' assets/program/fundamentalrc
+ echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
res:$${BRAND_BASE_DIR}/share/registry' assets/program/fundamentalrc
echo
'URE_BIN_DIR=file:///assets/ure/bin/dir/nothing-here/we-can/exec-anyway'
assets/program/fundamentalrc
#
# Set up unorc
diff --git a/android/experimental/desktop/Makefile
b/android/experimental/desktop/Makefile
index a42b716..7a00e7e 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -39,8 +39,8 @@ copy-stuff:
assets
cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component
assets/ComponentTarget/i18npool/util
#
- cp -R $(INSTDIR)/share/registry assets/share
mkdir -p assets/share/config
+ cp -R $(INSTDIR)/share/registry assets/share
cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config
#
# Set up rc, the inifile. See BootstrapMap::getBaseIni(). As this app
@@ -61,7 +61,7 @@ copy-stuff:
echo LO_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/fundamentalrc
echo URE_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/fundamentalrc # checkme - is this used to find configs ?
echo 'BRAND_BASE_DIR=file:///assets' assets/program/fundamentalrc
- echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
module:$${BRAND_BASE_DIR}/share/registry/modules
res:$${BRAND_BASE_DIR}/share/registry' assets/program/fundamentalrc
+ echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
res:$${BRAND_BASE_DIR}/share/registry'
[Libreoffice-commits] core.git: android/experimental
android/experimental/DocumentLoader/Makefile | 18 +-
android/experimental/LibreOffice4Android/Makefile | 18 +-
2 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 6db1f5f4c62afc644d59c9cada59cd483b4c7653
Author: Tor Lillqvist t...@collabora.com
Date: Fri Oct 25 14:21:28 2013 +0300
Fix fallout from 30fc3d6cff15ceabea6e1f9c4683cd383c322d72
Change-Id: If97dc13e63986a7c9534f46673cfa8541893269a
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 63104dd..1aa743b 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -113,15 +113,15 @@ build-ant: android_version_setup copy-stuff link-so
properties
#
# Copy jar files we need
#
- for F in $(strip \
- java_uno \
- juh \
- jurt \
- ridl \
- unoil \
- unoloader \
- ); do \
- $(call COPYJAR,$(OUTDIR)/bin/$${F}.jar); \
+ for F in java_uno \
+juh \
+jurt \
+ridl \
+unoloader; do \
+ $(call COPYJAR,$(INSTDIR)/$(LIBO_URE_SHARE_JAVA_FOLDER)/$${F}.jar);
\
+ done
+ for F in unoil; do \
+ $(call COPYJAR,$(INSTDIR)/$(LIBO_SHARE_JAVA_FOLDER)/$${F}.jar); \
done
#
unset JAVA_HOME $(ANT) -quiet debug
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index ee3325d..e15d30b 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -116,15 +116,15 @@ build-ant: android_version_setup copy-stuff link-so
properties
#
# Copy jar files we need
#
- for F in $(strip \
- java_uno \
- juh \
- jurt \
- ridl \
- unoil \
- unoloader \
- ); do \
- $(call COPYJAR,$(OUTDIR)/bin/$${F}.jar); \
+ for F in java_uno \
+juh \
+jurt \
+ridl \
+unoloader; do \
+ $(call COPYJAR,$(INSTDIR)/$(LIBO_URE_SHARE_JAVA_FOLDER)/$${F}.jar);
\
+ done
+ for F in unoil; do \
+ $(call COPYJAR,$(INSTDIR)/$(LIBO_SHARE_JAVA_FOLDER)/$${F}.jar); \
done
#
unset JAVA_HOME $(ANT) -quiet debug
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/LibreOffice4Android/native-code.cxx |2 --
android/experimental/desktop/native-code.cxx |2 --
2 files changed, 4 deletions(-)
New commits:
commit e13af24d2b985261afa80e36edd3021a70887253
Author: Tor Lillqvist t...@collabora.com
Date: Sat Oct 19 11:03:13 2013 +0300
fileacc is not a separate component any more
Change-Id: I47f3dd29aba16aa2d8a5e3746c447288d2066b23
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx
b/android/experimental/LibreOffice4Android/native-code.cxx
index 3fe4435..00fec00 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -23,7 +23,6 @@ extern C
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 );
@@ -89,7 +88,6 @@ lo_get_libmap(void)
{ libevtattlo.a, evtatt_component_getFactory },
{ libexpwrap.uno.a, expwrap_component_getFactory },
{ libfastsax.uno.a, fastsax_component_getFactory },
-{ libfileacc.a, fileacc_component_getFactory },
{ libfilterconfiglo.a, filterconfig1_component_getFactory },
{ libfrmlo.a, frm_component_getFactory },
{ libfsstoragelo.a, fsstorage_component_getFactory },
diff --git a/android/experimental/desktop/native-code.cxx
b/android/experimental/desktop/native-code.cxx
index 9321124..54d9130 100644
--- a/android/experimental/desktop/native-code.cxx
+++ b/android/experimental/desktop/native-code.cxx
@@ -24,7 +24,6 @@ extern C
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 );
@@ -94,7 +93,6 @@ lo_get_libmap(void)
{ libevtattlo.a, evtatt_component_getFactory },
{ libexpwraplo.a, expwrap_component_getFactory },
{ libfastsaxlo.a, fastsax_component_getFactory },
-{ libfileacc.a, fileacc_component_getFactory },
{ libfilterconfiglo.a, filterconfig1_component_getFactory },
{ libfrmlo.a, frm_component_getFactory },
{ libfsstoragelo.a, fsstorage_component_getFactory },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental ios/experimental
android/experimental/DocumentLoader/native-code.cxx |2 --
ios/experimental/LibreOffice/LibreOffice/lo.mm |2 --
2 files changed, 4 deletions(-)
New commits:
commit 9b966d0dc882a40bc3c3fb450c0da0e6bb5ae20b
Author: Tor Lillqvist t...@collabora.com
Date: Sat Oct 19 11:18:50 2013 +0300
fileacc is not a separate component any more
Change-Id: I59eac660accfc362766bc3744655e2ba2d66ddd6
diff --git a/android/experimental/DocumentLoader/native-code.cxx
b/android/experimental/DocumentLoader/native-code.cxx
index e7ee9f3..0697ed6 100644
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ b/android/experimental/DocumentLoader/native-code.cxx
@@ -16,7 +16,6 @@ extern C
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 * evtatt_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
-extern void * fileacc_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 );
@@ -63,7 +62,6 @@ lo_get_libmap(void)
{ libdbalo.a, dba_component_getFactory },
{ libdbaxmllo.a, dbaxml_component_getFactory },
{ libevtattlo.a, evtatt_component_getFactory },
-{ libfileacc.a, fileacc_component_getFactory },
{ libfrmlo.a, frm_component_getFactory },
{ libfsstoragelo.a, fsstorage_component_getFactory },
{ libfwklo.a, fwk_component_getFactory },
diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm
b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index d1c0f2d..16d0752 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -30,7 +30,6 @@ extern C {
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 );
@@ -94,7 +93,6 @@ lo_get_libmap(void)
{ libevtattlo.a, evtatt_component_getFactory },
{ libexpwraplo.a, expwrap_component_getFactory },
{ libfastsaxlo.a, fastsax_component_getFactory },
-{ libfileacc.a, fileacc_component_getFactory },
{ libfilterconfiglo.a, filterconfig1_component_getFactory },
{ libfrmlo.a, frm_component_getFactory },
{ libfsstoragelo.a, fsstorage_component_getFactory },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/DocumentLoader/Makefile |6 ++ android/experimental/LibreOffice4Android/Makefile |6 ++ android/experimental/desktop/Makefile |6 ++ 3 files changed, 6 insertions(+), 12 deletions(-) New commits: commit e30a34f7d7aa3bee338e2cb0323fa153de12f098 Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 3 07:36:37 2013 +0300 Fix up Android app makefiles Change-Id: I885c2bf3dd04b18850d983ab34199074bd41c175 diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 8410fb3..034b14f 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -38,11 +38,9 @@ copy-stuff: assets cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util # - mkdir -p assets/ure/share/misc assets/share/registry/res assets/share/config - cp -R $(OUTDIR)/xml/*.xcd assets/share/registry - mv assets/share/registry/fcfg_langpack_en-US.xcd assets/share/registry/res + cp -R $(INSTDIR)/share/registry assets/share + mkdir -p assets/share/config cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config - cp -R $(OUTDIR)/xml/registry/* assets/share/registry # # Set up rc, the inifile. See BootstrapMap::getBaseIni(). As this app # doesn't use soffice_main() (at least I think it shouldn't), the diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index 1149499..fee5198 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -38,11 +38,9 @@ copy-stuff: assets cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util # - mkdir -p assets/ure/share/misc assets/share/registry/res assets/share/config - cp -R $(OUTDIR)/xml/*.xcd assets/share/registry - mv assets/share/registry/fcfg_langpack_en-US.xcd assets/share/registry/res + cp -R $(INSTDIR)/share/registry assets/share + mkdir -p assets/share/config cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config - cp -R $(OUTDIR)/xml/registry/* assets/share/registry # # Set up rc, the inifile. See BootstrapMap::getBaseIni(). As this app # doesn't use soffice_main() (at least I think it shouldn't), the diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index 98b2f23..a42b716 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -39,11 +39,9 @@ copy-stuff: assets cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util # - mkdir -p assets/ure/share/misc assets/share/registry/res assets/share/config - cp -R $(OUTDIR)/xml/*.xcd assets/share/registry - mv assets/share/registry/fcfg_langpack_en-US.xcd assets/share/registry/res + cp -R $(INSTDIR)/share/registry assets/share + mkdir -p assets/share/config cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config - cp -R $(OUTDIR)/xml/registry/* assets/share/registry # # Set up rc, the inifile. See BootstrapMap::getBaseIni(). As this app # doesn't use soffice_main() (at least I think it shouldn't), the ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/DocumentLoader/AndroidManifest.xml |1 + android/experimental/LibreOffice4Android/AndroidManifest.xml |1 + 2 files changed, 2 insertions(+) New commits: commit 015e1b84446077df9c226cf87c19bef056dcf3b7 Author: Miklos Vajna vmik...@suse.cz Date: Fri Jun 28 09:48:41 2013 +0200 android: prefer external storage in DocumentLoader / LibreOffice4Android With this, these apps can be used even if /data is something like 128MB, e.g. on normal phones, not tablets / emulators. Change-Id: I7c8f2787b6395e98e8065e2e207aa09d9a2f39b3 Acked-by: Tor Lillqvist t...@iki.fi diff --git a/android/experimental/DocumentLoader/AndroidManifest.xml b/android/experimental/DocumentLoader/AndroidManifest.xml index f88f1ec..65f223b 100644 --- a/android/experimental/DocumentLoader/AndroidManifest.xml +++ b/android/experimental/DocumentLoader/AndroidManifest.xml @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=utf-8? !-- -*- indent-tabs-mode: nil -*- -- manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice.android.examples + android:installLocation=preferExternal android:versionCode=1 android:versionName=1.0 uses-sdk android:minSdkVersion=9 diff --git a/android/experimental/LibreOffice4Android/AndroidManifest.xml b/android/experimental/LibreOffice4Android/AndroidManifest.xml index c0f689e..068b04c 100644 --- a/android/experimental/LibreOffice4Android/AndroidManifest.xml +++ b/android/experimental/LibreOffice4Android/AndroidManifest.xml @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice + android:installLocation=preferExternal android:versionCode=1 android:versionName=1.0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
|8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 19efe68b1ece039027b08139e032b4ce483c113b
Author: Ptyl p...@cloudon.com
Date: Thu May 9 15:16:00 2013 +0300
Imrove scrolling in the Android Desktop app
I got scrolling to respond to the JNI scroll method call. (This is not yet
the gesture I want to implement (scroll by pixels), but at least itâs a
start.)
At first I tried to do some hacking in the C++ part, then found the problem
was in the Java parameters, which set the mouse whell delta too big. When
passed the value 1 or -1 to the Y value of AppSupport.scroll(int x, int y),
the scrolling is reasonable.
Change-Id: Id8fa0ada1a035760b7b05bf21325d0e51ef28fdc
diff --git
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
index b24b0d7..b84333b 100644
---
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
+++
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
@@ -52,6 +52,12 @@ public class Desktop
BootstrapContext bootstrapContext;
+private static final Integer ZERO = 0;
+
+private static int normalize(Number value) {
+return ZERO.compareTo(-value.intValue());
+}
+
private void initBootstrapContext()
{
bootstrapContext = new BootstrapContext();
@@ -293,7 +299,7 @@ public class Desktop
// the scroll must have ended.
if (scrollInProgress) {
-AppSupport.scroll((int) translateX, (int) translateY);
+AppSupport.scroll(normalize(translateX),
normalize(translateY));
translateX = translateY = 0;
scrollInProgress = false;
scrollJustEnded = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental cppuhelper/source
android/experimental/DocumentLoader/native-code.cxx |2 -
android/experimental/LibreOffice4Android/native-code.cxx |2 -
android/experimental/desktop/native-code.cxx |2 -
cppuhelper/source/shlib.cxx | 20 +--
4 files changed, 10 insertions(+), 16 deletions(-)
New commits:
commit 802a87e181dc8b372f247dd5ca7138bd6bd875a1
Author: Tor Lillqvist t...@iki.fi
Date: Thu May 2 10:28:44 2013 +0300
Adapt to library name changes for Android, too
Change-Id: I6da1f38c5a9693c13ef841442cbef017d388416a
diff --git a/android/experimental/DocumentLoader/native-code.cxx
b/android/experimental/DocumentLoader/native-code.cxx
index 3961e00..e7ee9f3 100644
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ b/android/experimental/DocumentLoader/native-code.cxx
@@ -65,7 +65,7 @@ lo_get_libmap(void)
{ libevtattlo.a, evtatt_component_getFactory },
{ libfileacc.a, fileacc_component_getFactory },
{ libfrmlo.a, frm_component_getFactory },
-{ libfsstorage.uno.a, fsstorage_component_getFactory },
+{ libfsstoragelo.a, fsstorage_component_getFactory },
{ libfwklo.a, fwk_component_getFactory },
{ libfwllo.a, fwl_component_getFactory },
{ libfwmlo.a, fwm_component_getFactory },
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx
b/android/experimental/LibreOffice4Android/native-code.cxx
index aebe61b..3fe4435 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -92,7 +92,7 @@ lo_get_libmap(void)
{ libfileacc.a, fileacc_component_getFactory },
{ libfilterconfiglo.a, filterconfig1_component_getFactory },
{ libfrmlo.a, frm_component_getFactory },
-{ libfsstorage.uno.a, fsstorage_component_getFactory },
+{ libfsstoragelo.a, fsstorage_component_getFactory },
{ libfwklo.a, fwk_component_getFactory },
{ libfwllo.a, fwl_component_getFactory },
{ libfwmlo.a, fwm_component_getFactory },
diff --git a/android/experimental/desktop/native-code.cxx
b/android/experimental/desktop/native-code.cxx
index b4b71b0..9321124 100644
--- a/android/experimental/desktop/native-code.cxx
+++ b/android/experimental/desktop/native-code.cxx
@@ -97,7 +97,7 @@ lo_get_libmap(void)
{ libfileacc.a, fileacc_component_getFactory },
{ libfilterconfiglo.a, filterconfig1_component_getFactory },
{ libfrmlo.a, frm_component_getFactory },
-{ libfsstorage.uno.a, fsstorage_component_getFactory },
+{ libfsstoragelo.a, fsstorage_component_getFactory },
{ libfwklo.a, fwk_component_getFactory },
{ libfwllo.a, fwl_component_getFactory },
{ libfwmlo.a, fwm_component_getFactory },
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index f53a672..db741ad 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -533,38 +533,32 @@ Reference XInterface SAL_CALL
loadSharedLibComponentFactory(
{ bootstrap.uno.a, bootstrap_component_getFactory },
{ libbootstrap.uno.a, bootstrap_component_getFactory },
-// The .uno ones seems to consistently have a lib prefix now for
Android,
+// The .uno ones seem to consistently have a lib prefix now for
Android,
// but not iOS, hmm.
#ifdef ANDROID
-{ libconfigmgr.uno.a, configmgr_component_getFactory },
-{ libexpwrap.uno.a, expwrap_component_getFactory },
-{ libfastsax.uno.a, fastsax_component_getFactory },
-{ libi18npool.uno.a, i18npool_component_getFactory },
{ libintrospection.uno.a, introspection_component_getFactory },
-{ liblocalebe1.uno.a, localebe1_component_getFactory },
{ libreflection.uno.a, reflection_component_getFactory },
{ libstocservices.uno.a, stocservices_component_getFactory },
-{ libucpexpand1.uno.a, ucpexpand1_component_getFactory },
#else
-{ libconfigmgrlo.a, configmgr_component_getFactory },
-{ libexpwraplo.a, expwrap_component_getFactory },
-{ libfastsaxlo.a, fastsax_component_getFactory },
-{ libi18npoollo.a, i18npool_component_getFactory },
{ introspection.uno.a, introspection_component_getFactory },
-{ liblocalebe1lo.a, localebe1_component_getFactory },
{ reflection.uno.a, reflection_component_getFactory },
{ stocservices.uno.a, stocservices_component_getFactory },
-{ libucpexpand1lo.a, ucpexpand1_component_getFactory },
#endif
{ libcomphelper.a, comphelp_component_getFactory },
+{ libconfigmgrlo.a, configmgr_component_getFactory },
{ libdeployment.a, deployment_component_getFactory },
+{ libexpwraplo.a, expwrap_component_getFactory },
+{ libfastsaxlo.a, fastsax_component_getFactory },
{ libfilterconfiglo.a, filterconfig1_component_getFactory
[Libreoffice-commits] core.git: android/experimental
android/experimental/desktop/Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7d528592ac756f5495b2fb300f4302cce89ca017 Author: Tor Lillqvist t...@iki.fi Date: Thu May 2 15:23:44 2013 +0300 android: Keep the images_tango.zip name as is Not sure why I used to store it as images.zip. Probably just a mistake. The code uses the images_tango.name.zip when trying to open it. Sure, no toolbar with images is displayed currently anyway, so having this file in the .apk is pointless, but there has been talk of reverting the disabling of toolbars, sigh. Change-Id: I12dfd3abe8f329d660b518f6b37904aa00423bc2 diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index 4993776..4d4fe6d 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -114,7 +114,7 @@ copy-stuff: # Pieces not from DocumentLoader # tango artwork / icons mkdir -p assets/share/config - cp -R $(OUTDIR)/bin/images_tango.zip assets/share/config/images.zip + cp -R $(OUTDIR)/bin/images_tango.zip assets/share/config # shell / splash images mkdir -p assets/program cp -r $(SRC_ROOT)/icon-themes/galaxy/brand/* assets/program ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/DocumentLoader/Makefile |5 ++---
android/experimental/LibreOffice4Android/Makefile |5 ++---
android/experimental/desktop/Makefile |5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 5a15474709cb7bc047a9a89d6b5bffa79a45acbe
Author: Tor Lillqvist t...@iki.fi
Date: Wed Apr 24 12:44:08 2013 +0300
Adapt to changes in type rdb file locations and names
The old bin/ure/types.rdb was just a duplicate of bin/udkapi.rdb. There is
no
bin/types.rdb any more either. We have just udkapi.rdb, offapi.rdb and
oovbaapi.rdb now.
Change-Id: Idd0911f1d4d48f172af159b852918d429f17cc92
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 123042f..759cf65 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -25,8 +25,7 @@ copy-stuff:
mkdir -p assets/gz.unpack/program/ure assets/lib assets/program
assets/xml/ure assets/ComponentTarget/i18npool/util
gzip -9 $(OUTDIR)/bin/offapi.rdb assets/gz.unpack/program/offapi.rdb
gzip -9 $(OUTDIR)/bin/oovbaapi.rdb
assets/gz.unpack/program/oovbaapi.rdb
- gzip -9 $(OUTDIR)/bin/types.rdb assets/gz.unpack/program/types.rdb
- gzip -9 $(OUTDIR)/bin/ure/types.rdb
assets/gz.unpack/program/ure/types.rdb
+ gzip -9 $(OUTDIR)/bin/udkapi.rdb assets/gz.unpack/program/udkapi.rdb
# For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it
expands to empty!?
# So just hardcode the known APP_DATA_PATH for now...
for F in xml/services xml/ure/services; do \
@@ -71,7 +70,7 @@ copy-stuff:
# Set up unorc
echo '[Bootstrap]' assets/program/unorc
echo URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/unorc
- echo 'UNO_TYPES=file://$(APP_DATA_PATH)/program/ure/types.rdb
file://$(APP_DATA_PATH)/program/types.rdb $${URE_MORE_TYPES}'
assets/program/unorc
+ echo 'UNO_TYPES=file://$(APP_DATA_PATH)/program/udkapi.rdb
$${URE_MORE_TYPES}' assets/program/unorc
echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb
$${URE_MORE_SERVICES}' assets/program/unorc
#
# Set up bootstraprc
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index 598cc6a..e523a4d 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -26,8 +26,7 @@ copy-stuff:
mkdir -p assets/gz.unpack/program/ure assets/lib assets/program
assets/xml/ure assets/ComponentTarget/i18npool/util
gzip -9 $(OUTDIR)/bin/offapi.rdb assets/gz.unpack/program/offapi.rdb
gzip -9 $(OUTDIR)/bin/oovbaapi.rdb
assets/gz.unpack/program/oovbaapi.rdb
- gzip -9 $(OUTDIR)/bin/types.rdb assets/gz.unpack/program/types.rdb
- gzip -9 $(OUTDIR)/bin/ure/types.rdb
assets/gz.unpack/program/ure/types.rdb
+ gzip -9 $(OUTDIR)/bin/udkapi.rdb assets/gz.unpack/program/udkapi.rdb
# For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it
expands to empty!?
for F in xml/services xml/ure/services; do \
sed -e
's!uri=vnd.sun.star.expand:$$LO_LIB_DIR/!uri=file://$$APP_DATA_DIR/lib/!g'
$(OUTDIR)/$$F.rdb assets/$$F.rdb; \
@@ -69,7 +68,7 @@ copy-stuff:
# Set up unorc
echo '[Bootstrap]' assets/program/unorc
echo 'URE_INTERNAL_LIB_DIR=file://$$APP_DATA_DIR/lib/'
assets/program/unorc
- echo 'UNO_TYPES=file://$$APP_DATA_DIR/program/ure/types.rdb
file://$$APP_DATA_DIR/program/types.rdb
file://$$APP_DATA_DIR/program/offapi.rdb
file://$$APP_DATA_DIR/program/oovbaapi.rdb' assets/program/unorc
+ echo 'UNO_TYPES=file://$$APP_DATA_DIR/program/udkapi.rdb
file://$$APP_DATA_DIR/program/offapi.rdb
file://$$APP_DATA_DIR/program/oovbaapi.rdb' assets/program/unorc
echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb
file:///assets/xml/services.rdb $$BRAND_BASE_DIR/program/services*'
assets/program/unorc
#
# Set up bootstraprc
diff --git a/android/experimental/desktop/Makefile
b/android/experimental/desktop/Makefile
index 86935f3..4993776 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -26,8 +26,7 @@ copy-stuff:
mkdir -p assets/gz.unpack/program/ure assets/lib assets/program
assets/xml/ure assets/ComponentTarget/i18npool/util
gzip -9 $(OUTDIR)/bin/offapi.rdb assets/gz.unpack/program/offapi.rdb
gzip -9 $(OUTDIR)/bin/oovbaapi.rdb
assets/gz.unpack/program/oovbaapi.rdb
- gzip -9 $(OUTDIR)/bin/types.rdb assets/gz.unpack/program/types.rdb
- gzip -9 $(OUTDIR)/bin/ure/types.rdb
assets/gz.unpack/program/ure/types.rdb
+ gzip -9 $(OUTDIR)/bin/udkapi.rdb assets/gz.unpack/program/udkapi.rdb
# For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it
expands to empty!?
# So just hardcode the
[Libreoffice-commits] core.git: android/experimental
android/experimental/DocumentLoader/Makefile |2 +- android/experimental/LibreOffice4Android/Makefile |2 +- android/experimental/desktop/Makefile |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 1c0e3ea7a0f02251b6a1876ba2eec7ed5cd83246 Author: David Tardon dtar...@redhat.com Date: Sun Apr 14 15:00:05 2013 +0200 fix android build Change-Id: I97903559e1f6ef48476a74a674c0832d9cb44640 diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 9336ba5..123042f 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -102,7 +102,7 @@ copy-stuff: # vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is # set to the app's data dir above. mkdir -p assets/gz.unpack/user/fonts - for F in $(OUTDIR)/pck/Liberation*.ttf $(OUTDIR)/pck/Gen*.ttf $(OUTDIR)/pck/opens___.ttf; do \ + for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf $(INSTDIR)/share/fonts/truetype/Gen*.ttf $(INSTDIR)/share/fonts/truetype/opens___.ttf; do \ gzip -9 $$F assets/gz.unpack/user/fonts/`basename $$F`; \ done # diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index 4e63b69..598cc6a 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -100,7 +100,7 @@ copy-stuff: # vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is # set to the app's data dir above. mkdir -p assets/gz.unpack/user/fonts - for F in $(OUTDIR)/pck/Liberation*.ttf $(OUTDIR)/pck/Gen*.ttf $(OUTDIR)/pck/opens___.ttf; do \ + for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf $(INSTDIR)/share/fonts/truetype/Gen*.ttf $(INSTDIR)/share/fonts/truetype/opens___.ttf; do \ gzip -9 $$F assets/gz.unpack/user/fonts/`basename $$F`; \ done # diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index f63abc0..86935f3 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -103,7 +103,7 @@ copy-stuff: # vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is # set to the app's data dir above. mkdir -p assets/gz.unpack/user/fonts - for F in $(OUTDIR)/pck/Liberation*.ttf $(OUTDIR)/pck/Gen*.ttf $(OUTDIR)/pck/opens___.ttf; do \ + for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf $(INSTDIR)/share/fonts/truetype/Gen*.ttf $(INSTDIR)/share/fonts/truetype/opens___.ttf; do \ gzip -9 $$F assets/gz.unpack/user/fonts/`basename $$F`; \ done # ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/desktop/native-code.cxx | 36 +++ 1 file changed, 36 insertions(+) New commits: commit f3c4b5606d4a697efbe3041530fc7f7d5a3a47b0 Author: Michael Meeks michael.me...@suse.com Date: Fri Apr 12 19:03:15 2013 +0300 Add more components Change-Id: I3ea18b4a075516f3c098fad5d63466f20bf0b494 diff --git a/android/experimental/desktop/native-code.cxx b/android/experimental/desktop/native-code.cxx index 117a2ba..ca80bdf 100644 --- a/android/experimental/desktop/native-code.cxx +++ b/android/experimental/desktop/native-code.cxx @@ -14,10 +14,18 @@ extern C 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 * cui_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); +extern void * basprov_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); +extern void * chartcore_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 * dlgprov_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 ); @@ -34,24 +42,34 @@ extern C 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 * scriptframe_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); +extern void * sot_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 * 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 * spl_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * spell_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); +extern void * stringresource_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * svgfilter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * sw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * svx_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * swd_component_getFactory(
[Libreoffice-commits] core.git: android/experimental
android/experimental/DocumentLoader/res/values/string.xml |4 android/experimental/DocumentLoader/res/values/strings.xml |4 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 7640fa315e41395baf169cb864e30a94a6d6e42a Author: Zolnai Tamás zolnaitamas2...@gmail.com Date: Tue Apr 2 21:27:04 2013 +0200 Typo: string.xml-strings.xml To make available for localization Change-Id: I5469549422c7a2d2618ed9e836895f6698328b17 diff --git a/android/experimental/DocumentLoader/res/values/string.xml b/android/experimental/DocumentLoader/res/values/string.xml deleted file mode 100644 index 148461b..000 --- a/android/experimental/DocumentLoader/res/values/string.xml +++ /dev/null @@ -1,4 +0,0 @@ -?xml version=1.0 encoding=utf-8? -resources -string name=go_to_pageGo to page/string -/resources diff --git a/android/experimental/DocumentLoader/res/values/strings.xml b/android/experimental/DocumentLoader/res/values/strings.xml new file mode 100644 index 000..148461b --- /dev/null +++ b/android/experimental/DocumentLoader/res/values/strings.xml @@ -0,0 +1,4 @@ +?xml version=1.0 encoding=utf-8? +resources +string name=go_to_pageGo to page/string +/resources ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/DocumentLoader/Makefile |2 +- android/experimental/LibreOffice4Android/Makefile |2 +- android/experimental/desktop/Makefile |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit de8d12acf122322af8412ef1a90e13fe34fcdbcd Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 27 14:34:24 2013 +0200 Use proper version numbers Change-Id: Ib0284c3fe63636e42b2e72ab76b02a8197c837e0 diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 40fd6dc..9977215 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -77,7 +77,7 @@ copy-stuff: # Set up bootstraprc echo '[Bootstrap]' assets/program/bootstraprc echo 'InstallMode=installmode' assets/program/bootstraprc - echo 'ProductKey=LibreOffice 3.6' assets/program/bootstraprc + echo 'ProductKey=LibreOffice $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)' assets/program/bootstraprc echo UserInstallation=file://$(APP_DATA_PATH) assets/program/bootstraprc # # Set up versionrc diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index 7984be4..9b1aaa2 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -75,7 +75,7 @@ copy-stuff: # Set up bootstraprc echo '[Bootstrap]' assets/program/bootstraprc echo 'InstallMode=installmode' assets/program/bootstraprc - echo 'ProductKey=LibreOffice 3.6' assets/program/bootstraprc + echo 'ProductKey=LibreOffice $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)' assets/program/bootstraprc echo 'UserInstallation=file://$$APP_DATA_DIR' assets/program/bootstraprc # # Set up versionrc diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index 273aca6..db35879 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -78,7 +78,7 @@ copy-stuff: # Set up bootstraprc echo '[Bootstrap]' assets/program/bootstraprc echo 'InstallMode=installmode' assets/program/bootstraprc - echo 'ProductKey=LibreOffice 3.6' assets/program/bootstraprc + echo 'ProductKey=LibreOffice $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)' assets/program/bootstraprc echo UserInstallation=file://$(APP_DATA_PATH) assets/program/bootstraprc # # Set up versionrc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
| 40 --
1 file changed, 17 insertions(+), 23 deletions(-)
New commits:
commit 0b10d7cf5059d6a8868864fd7625c4e58eda612c
Author: Tor Lillqvist t...@iki.fi
Date: Tue Mar 5 21:24:59 2013 +0200
Rework scaling once more
Don't ask the LO code to zoom while scaling in progress. That is way too
slow. Return to the idea of just scaling the already rendered bitmap
containing the top-level window from LO's perspective, UI elements and
all. (Obviously if we continue to work on thie demo app, the desktop style
UI
elements need to disappear from the sides of the LO window, so that the
only
thing LO renders is the actual viewport of the document contents.)
This time, instead of scaling the View, which for some reason causes
horrible
flickering glitches at least on my device, draw the bitmap scaled in
onDraw. Much smoother for some reason.
Of course when we then in onScaleEnd() ask LO to do the actual zoom, what
eventually results (remember that the LO code runs asynchronously in a
separate thread, and the zoom request only gets posted to that thread) is
not
at all the same as what just drawing the bitmap at scale produced.
(Especially
not as there is no way yet to have LO zoom centred on a specific pivot
point.)
Change-Id: Id80576c99a03f5f8bf0d8039c6c7406322581956
diff --git
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
index b30f74d..065220a 100644
---
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
+++
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
@@ -131,10 +131,14 @@ public class Desktop
{
Bitmap mBitmap;
boolean renderedOnce;
-boolean scalingInProgress;
+
GestureDetector gestureDetector;
ScaleGestureDetector scaleDetector;
+boolean scalingInProgress;
+float accumulatedScale = 1;
+float pivotX = 0, pivotY = 0;
+
public BitmapView()
{
super(Desktop.this);
@@ -156,46 +160,33 @@ public class Desktop
}
});
-// Is this sane? It is rather slow to ask LO to zoom
-// continuously while the scaling gesture is in progress.
-
-// What we used to do was while a scale gesture was in
-// progress to just scale the bitmap view (UI elements
-// too, which of course was a bit silly).
-
scaleDetector =
new ScaleGestureDetector(Desktop.this,
new
ScaleGestureDetector.SimpleOnScaleGestureListener() {
- long lastGestureEventTime;
@Override public boolean
onScaleBegin(ScaleGestureDetector detector)
{
scalingInProgress = true;
- lastGestureEventTime =
System.currentTimeMillis();
return true;
}
@Override public boolean
onScale(ScaleGestureDetector detector)
{
- long now =
System.currentTimeMillis();
- if (now -
lastGestureEventTime 100)
- return false;
- float scale =
detector.getScaleFactor();
- if (scale 0.95 scale
1.05)
- return false;
- Log.i(TAG, onScale: +
scale);
- lastGestureEventTime = now;
- Desktop.zoom(scale, (int)
detector.getFocusX(), (int) detector.getFocusY());
+ accumulatedScale *=
detector.getScaleFactor();;
+ pivotX = detector.getFocusX();
+ pivotY = detector.getFocusY();
+ invalidate();
return true;
}
@Override public void
onScaleEnd(ScaleGestureDetector detector)
{
-
[Libreoffice-commits] core.git: android/experimental vcl/android
android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
| 21 +++---
vcl/android/androidinst.cxx
| 10 +---
2 files changed, 12 insertions(+), 19 deletions(-)
New commits:
commit 4ceb66d86f508629bd663d16563809524398551e
Author: Tor Lillqvist t...@iki.fi
Date: Wed Mar 6 09:27:04 2013 +0200
Drop unused timestamp parameters
Change-Id: I1d825c39cde67c204110b4a787b3ffb290331fe5
diff --git
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
index 065220a..6d66926 100644
---
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
+++
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
@@ -47,8 +47,8 @@ public class Desktop
/* implementend by vcl */
public static native void renderVCL(Bitmap bitmap);
public static native void setViewSize(int width, int height);
-public static native void key(char c, short timestamp);
-public static native void touch(int action, int x, int y, short timestamp);
+public static native void key(char c);
+public static native void touch(int action, int x, int y);
public static native void zoom(float scale, int x, int y);
/**
@@ -121,11 +121,6 @@ public class Desktop
}
}
-static short getTimestamp()
-{
-return (short) (System.currentTimeMillis() % Short.MAX_VALUE);
-}
-
class BitmapView
extends View
{
@@ -222,16 +217,16 @@ public class Desktop
case KeyEvent.KEYCODE_7:
case KeyEvent.KEYCODE_8:
case KeyEvent.KEYCODE_9:
-Desktop.key((char) ('0' + keyCode - KeyEvent.KEYCODE_0),
Desktop.getTimestamp());
+Desktop.key((char) ('0' + keyCode - KeyEvent.KEYCODE_0));
return true;
case KeyEvent.KEYCODE_DEL:
-Desktop.key((char) Key.BACKSPACE, Desktop.getTimestamp());
+Desktop.key((char) Key.BACKSPACE);
return true;
case KeyEvent.KEYCODE_ENTER:
-Desktop.key((char) Key.RETURN, Desktop.getTimestamp());
+Desktop.key((char) Key.RETURN);
return true;
case KeyEvent.KEYCODE_TAB:
-Desktop.key((char) Key.TAB, Desktop.getTimestamp());
+Desktop.key((char) Key.TAB);
return true;
default:
return false;
@@ -272,7 +267,7 @@ public class Desktop
case MotionEvent.ACTION_DOWN:
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_MOVE:
-Desktop.touch(event.getActionMasked(), (int) event.getX(),
(int) event.getY(), Desktop.getTimestamp());
+Desktop.touch(event.getActionMasked(), (int) event.getX(),
(int) event.getY());
break;
}
@@ -302,7 +297,7 @@ public class Desktop
@Override public boolean commitText(CharSequence text, int
newCursorPosition) {
for (int i = 0; i text.length(); i++) {
-Desktop.key(text.charAt(i), Desktop.getTimestamp());
+Desktop.key(text.charAt(i));
}
return true;
}
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 85ae77c..f742c1b 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -916,12 +916,11 @@
Java_org_libreoffice_experimental_desktop_Desktop_setViewSize(JNIEnv * /* env */
viewHeight = height;
}
-// public static native void key(char c, short timestamp);
+// public static native void key(char c);
extern C SAL_JNI_EXPORT void JNICALL
Java_org_libreoffice_experimental_desktop_Desktop_key(JNIEnv * /* env */,
jobject /* clazz */,
- jchar c,
- jshort /* timestamp */)
+ jchar c)
{
SalFrame *pFocus = AndroidSalInstance::getInstance()-getFocusFrame();
if (pFocus) {
@@ -933,14 +932,13 @@
Java_org_libreoffice_experimental_desktop_Desktop_key(JNIEnv * /* env */,
LOGW(No focused frame to emit event on);
}
-// public static native void touch(int action, int x, int y, short timestamp);
+// public static native void touch(int action, int x, int y);
extern C SAL_JNI_EXPORT void JNICALL
Java_org_libreoffice_experimental_desktop_Desktop_touch(JNIEnv * /* env */,
jobject /* clazz */,
jint action,
jint x,
-jint
[Libreoffice-commits] core.git: android/experimental
android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
| 38 --
1 file changed, 3 insertions(+), 35 deletions(-)
New commits:
commit 70e8c341af0c6c6f2568a75326b6ee1d3df8145a
Author: Tor Lillqvist t...@iki.fi
Date: Sun Mar 3 23:35:01 2013 +0200
Android desktop app: Simplify bootstrapping on the Java side
No need to call defaultBootstrap_InitialComponentContext() etc on the Java
side in this app. The full SVMain() etc will do all that anyway.
Change-Id: I555ccd8efbd0260a72fa5904bb6dcd255eed37d4
diff --git
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
index baa36dc..8b46be7 100644
---
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
+++
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
@@ -33,8 +33,6 @@ import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager;
import com.sun.star.awt.Key;
-import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.uno.XComponentContext;
import org.libreoffice.android.Bootstrap;
@@ -59,47 +57,17 @@ public class Desktop
*/
class BootstrapContext
{
-public long timingOverhead;
-public XComponentContext componentContext;
-public XMultiComponentFactory mcf;
}
BootstrapContext bootstrapContext;
-Bundle extras;
-
-// FIXME: we should prolly manage a bitmap buffer here and give it to
-// VCL to render into ... and pull the WM/stacking pieces up into the Java
...
-// [ perhaps ;-]
-// how can we get an event to create a window - need a JNI callback I
guess ...
private void initBootstrapContext()
{
-try
-{
-bootstrapContext = new BootstrapContext();
-
-long t0 = System.currentTimeMillis();
-long t1 = System.currentTimeMillis();
-bootstrapContext.timingOverhead = t1 - t0;
-
-Bootstrap.setup(this);
-
-// Avoid all the old style OSL_TRACE calls especially in vcl
-Bootstrap.putenv(SAL_LOG=+WARN+INFO);
-
-bootstrapContext.componentContext =
com.sun.star.comp.helper.Bootstrap.defaultBootstrap_InitialComponentContext();
+bootstrapContext = new BootstrapContext();
-Log.i(TAG, context is + (bootstrapContext.componentContext!=null
? not : ) + null);
+Bootstrap.setup(this);
-bootstrapContext.mcf =
bootstrapContext.componentContext.getServiceManager();
-
-Log.i(TAG, mcf is + (bootstrapContext.mcf!=null ? not : ) +
null);
-}
-catch (Exception e)
-{
-e.printStackTrace(System.err);
-finish();
-}
+Bootstrap.putenv(SAL_LOG=+WARN+INFO);
}
@Override public void onCreate(Bundle savedInstanceState)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental vcl/android
android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
| 35 +++-
vcl/android/androidinst.cxx
| 43 +-
2 files changed, 74 insertions(+), 4 deletions(-)
New commits:
commit 3cf4f1a13b61592b1af8040692029216d9c90d4c
Author: Tor Lillqvist t...@iki.fi
Date: Thu Feb 28 00:24:33 2013 +0200
Handle touch events
Change-Id: I9c9d200731df9ba48ee61f7c97692ed9b9f06648
diff --git
a/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
index 5c54330..ba3d6da 100644
---
a/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
+++
b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
@@ -23,6 +23,7 @@ import android.os.Bundle;
import android.text.InputType;
import android.util.Log;
import android.view.MotionEvent;
+import android.view.ScaleGestureDetector;
import android.view.View;
import android.view.inputmethod.BaseInputConnection;
import android.view.inputmethod.EditorInfo;
@@ -46,6 +47,7 @@ public class Desktop
public static native void renderVCL(Bitmap bitmap);
public static native void setViewSize(int width, int height);
public static native void key(char c, short timestamp);
+public static native void touch(int action, int x, int y, short timestamp);
/**
* This class contains the state that is initialized once and never changes
@@ -152,11 +154,21 @@ public class Desktop
{
Bitmap mBitmap;
boolean renderedOnce;
+ScaleGestureDetector gestureDetector;
public BitmapView()
{
super(Desktop.this);
setFocusableInTouchMode(true);
+gestureDetector =
+new ScaleGestureDetector(Desktop.this,
+ new
ScaleGestureDetector.SimpleOnScaleGestureListener() {
+ @Override public boolean
onScale(ScaleGestureDetector detector)
+ {
+ Log.i(TAG, onScale: +
detector.getScaleFactor());
+ return true;
+ }
+ });
}
@Override protected void onDraw(Canvas canvas)
@@ -182,13 +194,32 @@ public class Desktop
return super.onTouchEvent(event);
super.onTouchEvent(event);
-Log.d(TAG, onTOUCH);
-if (event.getAction() == MotionEvent.ACTION_UP) {
+Log.d(TAG, onTouch ( + event.getX() + , + event.getY() + ));
+
+// Just temporary hack. We should not show the keyboard
+// unconditionally on a ACTION_UP event here. The LO level
+// should callback to us requesting showing the keyboard
+// if the user taps in a text area. Also, if the device
+// has a hardware keyboard, we probably should not show
+// the soft one unconditionally? But what if the user
+// wants to input in another script than what the hardware
+// keyboard covers?
+if (event.getActionMasked() == MotionEvent.ACTION_UP) {
// show the keyboard so we can enter text
InputMethodManager imm = (InputMethodManager) getContext()
.getSystemService(Context.INPUT_METHOD_SERVICE);
imm.showSoftInput(this, InputMethodManager.SHOW_FORCED);
}
+
+switch (event.getActionMasked()) {
+case MotionEvent.ACTION_DOWN:
+case MotionEvent.ACTION_UP:
+case MotionEvent.ACTION_MOVE:
+short timestamp = (short) (System.currentTimeMillis() %
Short.MAX_VALUE);
+Desktop.touch(event.getActionMasked(), (int) event.getX(),
(int) event.getY(), timestamp);
+break;
+}
+
return true;
}
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index b94855d..2773cd3 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -900,10 +900,10 @@ int AndroidSalSystem::ShowNativeDialog( const
rtl::OUString rTitle,
return 0;
}
-// Render everything
+// public static native void renderVCL(Bitmap bitmap);
extern C SAL_JNI_EXPORT void JNICALL
Java_org_libreoffice_experimental_desktop_Desktop_renderVCL(JNIEnv *env,
-jobject /* dummy
*/,
+jobject /* clazz
*/,
jobject bitmap)
{
if (!bHitIdle)
@@ -963,6 +963,7 @@ typedef struct
[Libreoffice-commits] core.git: android/experimental
android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
| 42 +-
1 file changed, 38 insertions(+), 4 deletions(-)
New commits:
commit 2769264989fb5ad210d271bf6c3b5586aeb8769b
Author: Tor Lillqvist t...@iki.fi
Date: Thu Feb 28 01:31:45 2013 +0200
Some keys need special handling
Change-Id: Ic2d2d3889d1facbf0042a946fdaf9acd472d0f94
diff --git
a/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
index ba3d6da..aebcfdf 100644
---
a/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
+++
b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
@@ -22,6 +22,7 @@ import android.graphics.Rect;
import android.os.Bundle;
import android.text.InputType;
import android.util.Log;
+import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.ScaleGestureDetector;
import android.view.View;
@@ -30,6 +31,7 @@ import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager;
+import com.sun.star.awt.Key;
import com.sun.star.lang.XMultiComponentFactory;
import com.sun.star.uno.XComponentContext;
@@ -149,6 +151,11 @@ public class Desktop
}
}
+static short getTimestamp()
+{
+return (short) (System.currentTimeMillis() % Short.MAX_VALUE);
+}
+
class BitmapView
extends View
{
@@ -188,6 +195,35 @@ public class Desktop
invalidate();
}
+@Override public boolean onKeyDown(int keyCode, KeyEvent event)
+{
+switch (keyCode) {
+case KeyEvent.KEYCODE_0:
+case KeyEvent.KEYCODE_1:
+case KeyEvent.KEYCODE_2:
+case KeyEvent.KEYCODE_3:
+case KeyEvent.KEYCODE_4:
+case KeyEvent.KEYCODE_5:
+case KeyEvent.KEYCODE_6:
+case KeyEvent.KEYCODE_7:
+case KeyEvent.KEYCODE_8:
+case KeyEvent.KEYCODE_9:
+Desktop.key((char) ('0' + keyCode - KeyEvent.KEYCODE_0),
Desktop.getTimestamp());
+return true;
+case KeyEvent.KEYCODE_DEL:
+Desktop.key((char) Key.BACKSPACE, Desktop.getTimestamp());
+return true;
+case KeyEvent.KEYCODE_ENTER:
+Desktop.key((char) Key.RETURN, Desktop.getTimestamp());
+return true;
+case KeyEvent.KEYCODE_TAB:
+Desktop.key((char) Key.TAB, Desktop.getTimestamp());
+return true;
+default:
+return false;
+}
+}
+
@Override public boolean onTouchEvent(MotionEvent event)
{
if (!renderedOnce)
@@ -215,8 +251,7 @@ public class Desktop
case MotionEvent.ACTION_DOWN:
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_MOVE:
-short timestamp = (short) (System.currentTimeMillis() %
Short.MAX_VALUE);
-Desktop.touch(event.getActionMasked(), (int) event.getX(),
(int) event.getY(), timestamp);
+Desktop.touch(event.getActionMasked(), (int) event.getX(),
(int) event.getY(), Desktop.getTimestamp());
break;
}
@@ -249,9 +284,8 @@ public class Desktop
@Override public boolean commitText(CharSequence text, int
newCursorPosition) {
Log.i(TAG, commitText( + text + , + newCursorPosition + ));
-short timestamp = (short) (System.currentTimeMillis() %
Short.MAX_VALUE);
for (int i = 0; i text.length(); i++) {
-Desktop.key(text.charAt(i), timestamp);
+Desktop.key(text.charAt(i), Desktop.getTimestamp());
}
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
| 295 --
android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
| 295 ++
2 files changed, 295 insertions(+), 295 deletions(-)
New commits:
commit 664a49160c927f1d6ad740455a7e27c7f352cbae
Author: Tor Lillqvist t...@iki.fi
Date: Thu Feb 28 01:43:13 2013 +0200
Use more logial directory structure
The package is org.libreoffice.experimental.desktop so put the source file
in
src/org/libreoffice/experimental/desktop.
Change-Id: I08660962dbd44eb48da0c966e218f49287ab5ca7
diff --git
a/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
deleted file mode 100644
index aebcfdf..000
---
a/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
+++ /dev/null
@@ -1,295 +0,0 @@
-// -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-//
-// This file is part of the LibreOffice project.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// This is just a testbed for ideas and implementations. (Still, it might turn
-// out to be somewhat useful as such while waiting for real apps.)
-
-package org.libreoffice.experimental.desktop;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Point;
-import android.graphics.Rect;
-import android.os.Bundle;
-import android.text.InputType;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.ScaleGestureDetector;
-import android.view.View;
-import android.view.inputmethod.BaseInputConnection;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputConnection;
-import android.view.inputmethod.InputMethodManager;
-
-import com.sun.star.awt.Key;
-import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.uno.XComponentContext;
-
-import org.libreoffice.android.Bootstrap;
-
-public class Desktop
-extends Activity
-{
-private static final String TAG = LODesktop;
-
-/* implementend by desktop */
-private static native void spawnMain();
-
-/* implementend by vcl */
-public static native void renderVCL(Bitmap bitmap);
-public static native void setViewSize(int width, int height);
-public static native void key(char c, short timestamp);
-public static native void touch(int action, int x, int y, short timestamp);
-
-/**
- * This class contains the state that is initialized once and never changes
- * (not specific to a document or a view).
- */
-class BootstrapContext
-{
-public long timingOverhead;
-public XComponentContext componentContext;
-public XMultiComponentFactory mcf;
-}
-
-BootstrapContext bootstrapContext;
-Bundle extras;
-
-// FIXME: we should prolly manage a bitmap buffer here and give it to
-// VCL to render into ... and pull the WM/stacking pieces up into the Java
...
-// [ perhaps ;-]
-// how can we get an event to create a window - need a JNI callback I
guess ...
-
-private void initBootstrapContext()
-{
-try
-{
-bootstrapContext = new BootstrapContext();
-
-long t0 = System.currentTimeMillis();
-long t1 = System.currentTimeMillis();
-bootstrapContext.timingOverhead = t1 - t0;
-
-Bootstrap.setup(this);
-
-// Avoid all the old style OSL_TRACE calls especially in vcl
-Bootstrap.putenv(SAL_LOG=+WARN+INFO);
-
-bootstrapContext.componentContext =
com.sun.star.comp.helper.Bootstrap.defaultBootstrap_InitialComponentContext();
-
-Log.i(TAG, context is + (bootstrapContext.componentContext!=null
? not : ) + null);
-
-bootstrapContext.mcf =
bootstrapContext.componentContext.getServiceManager();
-
-Log.i(TAG, mcf is + (bootstrapContext.mcf!=null ? not : ) +
null);
-}
-catch (Exception e)
-{
-e.printStackTrace(System.err);
-finish();
-}
-}
-
-@Override public void onCreate(Bundle savedInstanceState)
-{
-super.onCreate(savedInstanceState);
-
-Log.i(TAG, onCreate);
-
-try {
-String input;
-//input = getIntent().getStringExtra(input);
-//if (input == null)
-//input = /assets/test1.odt;
-input = -writer;
-
-// We need to fake up an argv, and the argv[0] even needs to
-
[Libreoffice-commits] core.git: android/experimental vcl/android
android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
|8 +++--
vcl/android/androidinst.cxx
| 16 ++
2 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit eb37322f14e6ed12a0db0f7fad1af81114a2ed80
Author: Tor Lillqvist t...@iki.fi
Date: Mon Feb 25 18:08:01 2013 +0200
Temporary (one hopes) hack to get the actual view size down to SvpSalFrame
Change-Id: I0c2a2301de1b0de71fc6724ff2af73fbf6b406ef
diff --git
a/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
index 8d5b97d..58fe555 100644
---
a/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
+++
b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
@@ -132,6 +132,7 @@ public class Desktop
/* implementend by vcl */
public static native void renderVCL(Bitmap bitmap);
+public static native void setViewSize(int width, int height);
/**
* This class contains the state that is initialized once and never changes
@@ -278,15 +279,15 @@ public class Desktop
if (bootstrapContext == null)
initBootstrapContext();
+Log.i(TAG, onCreate - set content view\n);
+setContentView(new BitmapView());
+
spawnMain();
}
catch (Exception e) {
e.printStackTrace(System.err);
finish();
}
-
-Log.i(TAG, onCreate - set content view\n);
-setContentView(new BitmapView());
}
class BitmapView extends android.view.View
@@ -305,6 +306,7 @@ public class Desktop
if (mBitmap == null) {
Log.i(TAG, calling Bitmap.createBitmap( + getWidth() + ,
+ getHeight() + , Bitmap.Config.ARGB_));
mBitmap = Bitmap.createBitmap(getWidth(), getHeight(),
Bitmap.Config.ARGB_);
+setViewSize(getWidth(), getHeight());
}
renderVCL(mBitmap);
canvas.drawBitmap(mBitmap, 0, 0, null);
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 2ed1585..8bd285f 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -43,6 +43,9 @@
static bool bHitIdle = false;
+// Horrible hack
+static int viewWidth = 1, viewHeight = 1;
+
class AndroidSalData : public SalGenericData
{
public:
@@ -735,6 +738,8 @@ public:
pSysParent )
{
enableDamageTracker();
+if (pParent == NULL viewWidth 1 viewHeight 1)
+SetPosSize(0, 0, viewWidth, viewHeight, SAL_FRAME_POSSIZE_WIDTH |
SAL_FRAME_POSSIZE_HEIGHT);
}
virtual void GetWorkArea( Rectangle rRect )
@@ -962,4 +967,15 @@ typedef struct ANativeWindow_Buffer {
AndroidBitmap_unlockPixels(env, bitmap);
}
+extern C SAL_JNI_EXPORT void JNICALL
+Java_org_libreoffice_experimental_desktop_Desktop_setViewSize(JNIEnv * /* env
*/,
+ jobject /*
object */,
+ jint width,
+ jint height)
+{
+// Horrible
+viewWidth = width;
+viewHeight = height;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
| 13 +++---
1 file changed, 5 insertions(+), 8 deletions(-)
New commits:
commit 754bd309dd346f9930a6ede418ab01fcfa5f74f9
Author: Tor Lillqvist t...@iki.fi
Date: Fri Feb 22 20:46:27 2013 +0200
BitmapView can be a member class
Change-Id: I172cfc0bcad780e99469ac01c9ba7467befe53de
diff --git
a/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
index 6087528..3bf2da9 100644
---
a/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
+++
b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
@@ -287,31 +287,28 @@ public class Desktop
}
Log.i(TAG, onCreate - set content view\n);
-setContentView(new BitmapView(this, this));
+setContentView(new BitmapView());
}
-}
class BitmapView extends android.view.View
{
-Desktop mDesktop;
Bitmap mBitmap;
-public BitmapView(Context context, Desktop desktop)
+public BitmapView()
{
-super(context);
-mDesktop = desktop;
+super(Desktop.this);
mBitmap = Bitmap.createBitmap(1000, 600, Bitmap.Config.ARGB_);
}
@Override protected void onDraw(Canvas canvas) {
//canvas.drawColor(0xFF1ABCDD);
-mDesktop.renderVCL(mBitmap);
+renderVCL(mBitmap);
canvas.drawBitmap(mBitmap, 0, 0, null);
// re-call ourselves a bit later ...
invalidate();
}
}
-
+}
// vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental android/qa
android/experimental/DocumentLoader/Makefile |4 ++--
android/experimental/LibreOffice4Android/Makefile |2 +-
android/qa/desktop/Makefile |6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit f6991262cbaca21f576483b6ded35c532cda90e1
Author: Tor Lillqvist t...@iki.fi
Date: Thu Feb 21 11:25:41 2013 +0200
UNO_TYPES and UNO_MORE_TYPES must contain file: URLs, not pathnames
Apparently it (by accident?) used to work to use pathnames.
Change-Id: Icebda427cef645ed53594e179c211d2a9d020583
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 7ac9b1c..c0e9ca8 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -63,13 +63,13 @@ copy-stuff:
echo 'BRAND_BASE_DIR=file:///assets' assets/program/fundamentalrc
echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
module:$${BRAND_BASE_DIR}/share/registry/modules
res:$${BRAND_BASE_DIR}/share/registry' assets/program/fundamentalrc
echo
'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway'
assets/program/fundamentalrc
- echo 'URE_MORE_TYPES=$(APP_DATA_PATH)/program/offapi.rdb
$(APP_DATA_PATH)/program/oovbaapi.rdb' assets/program/fundamentalrc
+ echo 'URE_MORE_TYPES=file://$(APP_DATA_PATH)/program/offapi.rdb
file://$(APP_DATA_PATH)/program/oovbaapi.rdb' assets/program/fundamentalrc
echo 'URE_MORE_SERVICES=file:///assets/xml/services.rdb
$$BRAND_BASE_DIR/program/services*' assets/program/fundamentalrc
#
# Set up unorc
echo '[Bootstrap]' assets/program/unorc
echo URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/unorc
- echo 'UNO_TYPES=$(APP_DATA_PATH)/program/ure/types.rdb
$(APP_DATA_PATH)/program/types.rdb $${URE_MORE_TYPES}' assets/program/unorc
+ echo 'UNO_TYPES=file://$(APP_DATA_PATH)/program/ure/types.rdb
file://$(APP_DATA_PATH)/program/types.rdb $${URE_MORE_TYPES}'
assets/program/unorc
echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb
$${URE_MORE_SERVICES}' assets/program/unorc
#
# Set up bootstraprc
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index 24ebbe5..d0ae325 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -67,7 +67,7 @@ copy-stuff:
# Set up unorc
echo '[Bootstrap]' assets/program/unorc
echo 'URE_INTERNAL_LIB_DIR=file://$$APP_DATA_DIR/lib/'
assets/program/unorc
- echo 'UNO_TYPES=$$APP_DATA_DIR/program/ure/types.rdb
$$APP_DATA_DIR/program/types.rdb $$APP_DATA_DIR/program/offapi.rdb
$$APP_DATA_DIR/program/oovbaapi.rdb' assets/program/unorc
+ echo 'UNO_TYPES=file://$$APP_DATA_DIR/program/ure/types.rdb
file://$$APP_DATA_DIR/program/types.rdb
file://$$APP_DATA_DIR/program/offapi.rdb
file://$$APP_DATA_DIR/program/oovbaapi.rdb' assets/program/unorc
echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb
file:///assets/xml/services.rdb $$BRAND_BASE_DIR/program/services*'
assets/program/unorc
#
# Set up bootstraprc
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index c7581a2..685e584 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -63,18 +63,18 @@ copy-stuff:
#
# Set up fundamentalrc
echo '[Bootstrap]' assets/program/fundamentalrc
- echo LO_LIB_DIR=file:$(APP_DATA_PATH)/lib/
assets/program/fundamentalrc
+ echo LO_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/fundamentalrc
echo URE_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/fundamentalrc # checkme - is this used to find configs ?
echo 'BRAND_BASE_DIR=file:///assets' assets/program/fundamentalrc
echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
module:$${BRAND_BASE_DIR}/share/registry/modules
res:$${BRAND_BASE_DIR}/share/registry' assets/program/fundamentalrc
echo
'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway'
assets/program/fundamentalrc
- echo 'URE_MORE_TYPES=$(APP_DATA_PATH)/program/offapi.rdb
$(APP_DATA_PATH)/program/oovbaapi.rdb' assets/program/fundamentalrc
+ echo 'URE_MORE_TYPES=file://$(APP_DATA_PATH)/program/offapi.rdb
file://$(APP_DATA_PATH)/program/oovbaapi.rdb' assets/program/fundamentalrc
echo 'URE_MORE_SERVICES=file:///assets/xml/services.rdb
$$BRAND_BASE_DIR/program/services*' assets/program/fundamentalrc
#
# Set up unorc
echo '[Bootstrap]' assets/program/unorc
echo URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/unorc
- echo 'UNO_TYPES=$(APP_DATA_PATH)/program/ure/types.rdb
$(APP_DATA_PATH)/program/types.rdb $${URE_MORE_TYPES}' assets/program/unorc
+ echo
