[Libreoffice-commits] core.git: 3 commits - android/experimental
android/experimental/LOAndroid3/res/menu/view_menu.xml
|3
android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
| 95 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
| 52 -
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
| 10 -
4 files changed, 112 insertions(+), 48 deletions(-)
New commits:
commit 4588558789a2bb987d484183535d64c31e30a87b
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Dec 17 10:09:12 2014 +0100
android: fix loading documents from doc browser's about dialog
- LibreOfficeUIActivity needs to start a new activity
- LibreOfficeMainActivity is enough to send a new event
Change-Id: I3a7532a07b37a16bdb49f81072132aa57c2c52e8
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
index 01d2cb2..2b3bf31 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
@@ -3,6 +3,7 @@ package org.libreoffice;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
+import android.content.ComponentName;
import android.os.Bundle;
import android.os.Handler;
import android.support.v4.widget.DrawerLayout;
@@ -16,14 +17,37 @@ import android.widget.AdapterView;
import android.widget.ListView;
import android.widget.RelativeLayout;
import android.widget.TextView;
+import android.content.Intent;
+import android.net.Uri;
import java.util.ArrayList;
import java.util.List;
+import java.io.File;
public abstract class LOAbout extends Activity {
private static final String DEFAULT_DOC_PATH = /assets/example.odt;
+private boolean mNewActivity;
+
+public LOAbout(boolean newActivity) {
+super();
+mNewActivity = newActivity;
+}
+
+private void loadFromAbout(String input) {
+if (mNewActivity) {
+Intent i = new Intent(Intent.ACTION_VIEW, Uri.fromFile(new
File(input)));
+i.setComponent(new ComponentName(
+org.libreoffice,
+org.libreoffice.LibreOfficeMainActivity));
+startActivity(i);
+} else {
+LOKitShell.sendEvent(LOEventFactory.close());
+LOKitShell.sendEvent(LOEventFactory.load(input));
+}
+}
+
protected void showAbout() {
// Inflate the about message contents
View messageView = getLayoutInflater().inflate(R.layout.about, null,
false);
@@ -42,8 +66,7 @@ public abstract class LOAbout extends Activity {
builder.setNegativeButton(R.string.about_license, new
DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
-LOKitShell.sendEvent(LOEventFactory.close());
-
LOKitShell.sendEvent(LOEventFactory.load(/assets/license.txt));
+loadFromAbout(/assets/license.txt);
dialog.dismiss();
}
});
@@ -51,8 +74,7 @@ public abstract class LOAbout extends Activity {
builder.setPositiveButton(R.string.about_notice, new
DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
-LOKitShell.sendEvent(LOEventFactory.close());
-
LOKitShell.sendEvent(LOEventFactory.load(/assets/notice.txt));
+loadFromAbout(/assets/notice.txt);
dialog.dismiss();
}
});
@@ -60,8 +82,7 @@ public abstract class LOAbout 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));
+loadFromAbout(DEFAULT_DOC_PATH);
dialog.dismiss();
}
});
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index cb30f4d..062f44c 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -43,6 +43,10 @@ public class LibreOfficeMainActivity extends LOAbout {
private DocumentPartViewListAdapter mDocumentPartViewListAdapter;
private String mInputFile;
+public LibreOfficeMainActivity() {
+super(/*newActivity=*/false);
+}
+
public static GeckoLayerClient
[Libreoffice-commits] core.git: 3 commits - android/experimental
android/experimental/LOAndroid/.gitignore |4 android/experimental/LOAndroid/.idea/.name |1 android/experimental/LOAndroid/.idea/compiler.xml | 23 android/experimental/LOAndroid/.idea/copyright/profiles_settings.xml |3 android/experimental/LOAndroid/.idea/encodings.xml |5 android/experimental/LOAndroid/.idea/gradle.xml | 18 android/experimental/LOAndroid/.idea/libraries/appcompat_v7_19_1_0.xml | 10 android/experimental/LOAndroid/.idea/libraries/support_v4_19_1_0.xml | 11 android/experimental/LOAndroid/.idea/misc.xml | 146 android/experimental/LOAndroid/.idea/modules.xml | 10 android/experimental/LOAndroid/.idea/scopes/scope_settings.xml |5 android/experimental/LOAndroid/.idea/vcs.xml |7 android/experimental/LOAndroid/LOAndroid.iml | 12 android/experimental/LOAndroid/app/.gitignore |1 android/experimental/LOAndroid/app/app.iml | 77 android/experimental/LOAndroid/app/build.gradle | 24 android/experimental/LOAndroid/app/proguard-rules.txt | 17 android/experimental/LOAndroid/app/src/main/AndroidManifest.xml | 25 android/experimental/LOAndroid/app/src/main/java/org/libreoffice/LOKitShell.java | 22 android/experimental/LOAndroid/app/src/main/java/org/libreoffice/MainActivity.java | 36 android/experimental/LOAndroid/app/src/main/java/org/libreoffice/MainLayerView.java | 26 android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/TouchEventInterceptor.java | 14 android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/ZoomConstraints.java | 46 android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/Axis.java | 420 -- android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/BitmapUtils.java | 368 -- android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/BufferedCairoImage.java | 69 android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/CairoGLInfo.java | 35 android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/CairoImage.java | 28 android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/CairoUtils.java | 51 android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java | 777 - android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java | 78 android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/DrawTimingQueue.java | 95 android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/FloatSize.java | 54 android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/GLController.java | 354 -- android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/GeckoLayerClient.java | 1000 -- android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java | 374 -- android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/InputConnectionHandler.java | 22 android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/IntSize.java | 91 android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/JavaPanZoomController.java | 1461 -- android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/Layer.java | 207 - android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/LayerMarginsAnimator.java | 324 -- android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/LayerRenderer.java | 722 android/experimental/LOAndroid/app/src/main/java/org/mozilla/gecko/gfx/LayerView.java | 692
[Libreoffice-commits] core.git: 3 commits - android/experimental
android/experimental/LOAndroid3/res/layout/about.xml
| 22 --
android/experimental/LOAndroid3/res/values/strings.xml
|5 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
|6 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
|4 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
| 19 +++--
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
| 34 --
6 files changed, 42 insertions(+), 48 deletions(-)
New commits:
commit 83386129f5be002f2649db81bba4c468c7f6e4de
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Oct 9 20:50:35 2014 +0200
android: Fix the application lifecycle.
Now onStart() loads the file, and onStop() closes it again. Fixes the case
when the user leaves the app by pressing Home, and starts it again;
previously, this caused a race.
Change-Id: I493a76eaf5e8ca8a68b53f70c7acd09b638f7e11
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
index 3f39257..d9f3219 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
@@ -13,7 +13,8 @@ public class LOEvent {
public static final int DRAW = 4;
public static final int CHANGE_PART = 5;
public static final int LOAD = 6;
-public static final int REDRAW = 7;
+public static final int CLOSE = 7;
+public static final int REDRAW = 8;
public int mType;
private ImmutableViewportMetrics mViewportMetrics;
@@ -58,6 +59,9 @@ public class LOEvent {
}
public String getTypeString() {
+if (mTypeString == null) {
+return Event type: + mType;
+}
return mTypeString;
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
index 90a3582..a63b5db 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
@@ -31,6 +31,10 @@ public class LOEventFactory {
return new LOEvent(LOEvent.LOAD, inputFile);
}
+public static LOEvent close() {
+return new LOEvent(LOEvent.CLOSE);
+}
+
public static LOEvent redraw() {
return new LOEvent(LOEvent.REDRAW);
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 528f419..e5765e6 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -61,7 +61,7 @@ public class LOKitThread extends Thread {
LOKitShell.hideProgressSpinner();
}
-private boolean load(String filename) {
+private boolean loadDocument(String filename) {
if (mApplication == null) {
mApplication = LibreOfficeMainActivity.mAppContext;
}
@@ -69,10 +69,6 @@ public class LOKitThread extends Thread {
mController = mApplication.getLayerController();
mLayerClient = mApplication.getLayerClient();
-if (mTileProvider != null) {
-mTileProvider.close();
-}
-
mTileProvider = TileProviderFactory.create(mController, filename);
boolean isReady = mTileProvider.isReady();
if (isReady) {
@@ -82,9 +78,16 @@ public class LOKitThread extends Thread {
refresh();
LOKitShell.hideProgressSpinner();
}
+
return isReady;
}
+public void closeDocument() {
+if (mTileProvider != null) {
+mTileProvider.close();
+}
+}
+
public void run() {
try {
while (true) {
@@ -95,9 +98,13 @@ public class LOKitThread extends Thread {
}
private void processEvent(LOEvent event) {
+Log.i(LOGTAG, processEvent: + event.getTypeString());
switch (event.mType) {
case LOEvent.LOAD:
-load(event.getFilename());
+loadDocument(event.getFilename());
+break;
+case LOEvent.CLOSE:
+closeDocument();
break;
case LOEvent.VIEWPORT:
mViewportMetrics = event.getViewport();
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 1778e35..6ca7b4d 100644
---
[Libreoffice-commits] core.git: 3 commits - android/experimental
android/experimental/LibreOffice4Android/AndroidManifest.xml
|4
android/experimental/LibreOffice4Android/Makefile
|5
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
| 52 --
3 files changed, 27 insertions(+), 34 deletions(-)
New commits:
commit 085c6ebc14bd9670cd23a732b905d3c2379a9185
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date: Thu Sep 11 20:39:37 2014 +0200
LibreOffice4Android: Fix NullPointerException
The member fileNames was being correctly set in createUI() but it was
being reset at openDirectory(). The only purpose of this member was
sending the file name to open() method, but we can rewrite open() to
accept File objects so fileNames became useless and was removed.
Change-Id: I944be8ff13d221573a5a7accf0081c30872c62f0
diff --git
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
index 63371f4..96e4251 100644
---
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
+++
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -21,6 +21,7 @@ import java.util.Date;
import java.util.prefs.Preferences;
import android.graphics.drawable.BitmapDrawable;
+import android.net.Uri;
import android.os.Build;
import android.graphics.Shader.TileMode;
import android.graphics.BlurMaskFilter;
@@ -34,6 +35,7 @@ import android.app.Activity;
import android.os.AsyncTask;
import android.graphics.Bitmap;
import android.graphics.Matrix;
+import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -93,7 +95,6 @@ public class LibreOfficeUIActivity extends Activity
implements ActionBar.OnNavig
FileFilter fileFilter;
FilenameFilter filenameFilter;
- private String[] fileNames;
private File[] filePaths;
@@ -173,17 +174,15 @@ public class LibreOfficeUIActivity extends Activity
implements ActionBar.OnNavig
// code to make a grid view
setContentView(R.layout.file_grid);
gv = (GridView)findViewById(R.id.file_explorer_grid_view);
- fileNames = currentDirectory.list(
FileUtilities.getFilenameFilter( filterMode ) );
filePaths = currentDirectory.listFiles(
FileUtilities.getFileFilter( filterMode ) );
gv.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView? parent, View view,
int position, long id) {
File file = filePaths[position];
if(!file.isDirectory()){
- open(fileNames[position]);
+open(file);
}else{
- file = new File( currentDirectory,
file.getName() );
- openDirectory( file );
+openDirectory( file );
}
}
@@ -194,7 +193,6 @@ public class LibreOfficeUIActivity extends Activity
implements ActionBar.OnNavig
setContentView(R.layout.file_list);
lv = (ListView)findViewById( R.id.file_explorer_list_view);
lv.setClickable(true);
- fileNames = currentDirectory.list(
FileUtilities.getFilenameFilter( filterMode ) );
filePaths = currentDirectory.listFiles(
FileUtilities.getFileFilter( filterMode ) );
lv.setAdapter( new ListItemAdapter(getApplicationContext(),
filePaths) );
actionBar.setSelectedNavigationItem( filterMode + 1 );
@@ -212,7 +210,6 @@ public class LibreOfficeUIActivity extends Activity
implements ActionBar.OnNavig
actionBar.setDisplayHomeAsUpEnabled( false );
}
filePaths = currentDirectory.listFiles( FileUtilities.getFileFilter(
filterMode ) );
- fileNames = new String[ filePaths.length ];
FileUtilities.sortFiles( filePaths, sortMode );
/*
for( int i = 0; i fileNames.length; i++){
@@ -230,7 +227,7 @@ public class LibreOfficeUIActivity extends Activity
implements ActionBar.OnNavig
}
}
-public void open(String file){
+public void open(File file) {
/*
Intent i = new Intent( this , WriterViewerActivity.class );
i.putExtra( CURRENT_DIRECTORY_KEY , currentDirectory.getAbsolutePath()
);
@@ -239,7 +236,7 @@ public class LibreOfficeUIActivity extends Activity
implements ActionBar.OnNavig
startActivity( i );
*/
Intent i = new Intent( this , DocumentLoader.class );
-
[Libreoffice-commits] core.git: 3 commits - android/experimental ios/CustomTarget_MobileLibreOffice_app.mk ios/CustomTarget_TiledLibreOffice_app.mk ios/Executable_LibreOffice.mk solenv/bin
android/experimental/DocumentLoader/Makefile |2
android/experimental/LibreOffice4Android/Makefile |2
android/experimental/desktop/Makefile |2
ios/CustomTarget_MobileLibreOffice_app.mk |2
ios/CustomTarget_TiledLibreOffice_app.mk |2
ios/Executable_LibreOffice.mk |2
solenv/bin/native-code.py | 92 --
7 files changed, 23 insertions(+), 81 deletions(-)
New commits:
commit 18ea4fea4f4843c64e05827443f76122c1aed90e
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu Mar 6 14:23:57 2014 +0100
Add components needed for editing a document in android/desktop app.
As new 'edit' group because they are not needed in view-only
TiledLibreOffice_app. Although, probably there are more components
in 'core' which should be in 'edit' too, who knows, sigh.
Change-Id: I1efebc9884662a5d25744a3414717aa410350ef4
diff --git a/android/experimental/desktop/Makefile
b/android/experimental/desktop/Makefile
index 3419eb1..df9a24f 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 \
- -g core -g writer \
+ -g core -g edit -g writer \
$@
# The name of the Bootstrap activity class
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 56c0c71..4bd729b 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -108,6 +108,16 @@ core_constructor_list = [
XMLVersionListPersistence_get_implementation,
]
+# edit group for apps, where you can edit documents
+edit_factory_list = [
+]
+
+edit_constructor_list = [
+
com_sun_star_comp_framework_GlobalAcceleratorConfiguration_get_implementation,
+com_sun_star_i18n_InputSequenceChecker_get_implementation,
+com_sun_star_i18n_OrdinalSuffix_get_implementation,
+]
+
calc_factory_list = [
(libscdlo.a, scd_component_getFactory),
(libscfiltlo.a, scfilt_component_getFactory),
@@ -138,6 +148,7 @@ writer_constructor_list = [
factory_map = {
'core' : core_factory_list,
+'edit' : edit_factory_list,
'calc' : calc_factory_list,
'draw' : draw_factory_list,
'writer' : writer_factory_list,
@@ -145,6 +156,7 @@ factory_map = {
constructor_map = {
'core' : core_constructor_list,
+'edit' : edit_constructor_list,
'calc' : calc_constructor_list,
'draw' : draw_constructor_list,
'writer' : writer_constructor_list,
commit b0ac763d13369f41b90d789287b375f57c744eff
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu Mar 6 13:46:02 2014 +0100
native-code: Remove foo_core groups, now only 'core' and 'writer' are used.
Also remove extended_core group. If something from there will be
needed, we will add it another way.
Currently only android/experimental/desktop/Makefile and
ios/CustomTarget_TiledLibreOffice_app.mk are known to do something.
Change-Id: I99936075e35ce98d684581838c0a19dccd83f942
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index c928664..14de6fe 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
$ \
- -g extended_core -g writer \
+ -g core -g writer \
$@
copy-stuff:
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index 3a66f71..9bcfc18 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -14,7 +14,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared
native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
$ \
- -g extended_core -g writer \
+ -g core -g writer \
$@
copy-stuff:
diff --git a/android/experimental/desktop/Makefile
b/android/experimental/desktop/Makefile
index d75b8f7..3419eb1 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 \
- -g core -g writer_core \
+ -g core -g writer \
$@
# The name of the Bootstrap activity class
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk
b/ios/CustomTarget_MobileLibreOffice_app.mk
index ec59df0..2e4b6db 100644
--- a/ios/CustomTarget_MobileLibreOffice_app.mk
+++ b/ios/CustomTarget_MobileLibreOffice_app.mk
@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,ios/MobileLibreOffice):
$(call gb_CustomTarget
[Libreoffice-commits] core.git: 3 commits - android/experimental oovbaapi/ooo oovbaapi/UnoApi_oovbaapi.mk solenv/gbuild
android/experimental/DocumentLoader/Makefile | 12 +-
android/experimental/LibreOffice4Android/Makefile | 10 +-
android/experimental/desktop/Makefile | 12 +-
oovbaapi/UnoApi_oovbaapi.mk |4
oovbaapi/ooo/vba/excel/Buttons.idl| 40
oovbaapi/ooo/vba/excel/SheetObjects.idl | 98 --
oovbaapi/ooo/vba/excel/XDrawings.idl | 48 ++
oovbaapi/ooo/vba/excel/XLineObjects.idl | 54
solenv/gbuild/platform/IOS_ARM_GCC.mk |3
9 files changed, 165 insertions(+), 116 deletions(-)
New commits:
commit 419d5631a5612122f3a84f7e73d7aec26885e9db
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Sep 11 10:23:04 2013 +0200
Put every UNOIDL entity into an .idl file of its own
...so that future type manager mechanisms to access entities directly from
.idl
files can work.
Generation of C++ headers for XDrawings and XLineObjects was also
(inadvertently?) missing.
Change-Id: I1a1a9cc39302eede2143742e03838a83d1e3a948
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index ff32f15..3f8918a 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -48,7 +48,7 @@ $(eval $(call
gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba,\
))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/excel,\
Button \
- SheetObjects \
+ Buttons \
))
$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\
@@ -241,6 +241,7 @@ $(eval $(call
gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\
XDataLabels \
XDialog \
XDialogs \
+ XDrawings \
XFont \
XFormat \
XFormatCondition \
@@ -252,6 +253,7 @@ $(eval $(call
gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\
XHyperlink \
XHyperlinks \
XInterior \
+ XLineObjects \
XlApplicationInternational \
XlApplyNamesOrder \
XlArabicModes \
diff --git a/oovbaapi/ooo/vba/excel/Buttons.idl
b/oovbaapi/ooo/vba/excel/Buttons.idl
new file mode 100644
index 000..7166ac1
--- /dev/null
+++ b/oovbaapi/ooo/vba/excel/Buttons.idl
@@ -0,0 +1,40 @@
+/*
+ * 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 file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef __ooo_vba_excel_Buttons_idl__
+#define __ooo_vba_excel_Buttons_idl__
+
+#include ooo/vba/XCollection.idl
+#include ooo/vba/excel/XGraphicObjects.idl
+
+module ooo { module vba { module excel {
+
+/** Represents the collection of drawing button controls in a spreadsheet.
+
+pThis service is now deprecated in VBA but kept for compatibility with
old
+VBA scripts./p
+*/
+service Buttons
+{
+interface ooo::vba::XCollection;
+interface XGraphicObjects;
+};
+
+}; }; };
+
+#endif
diff --git a/oovbaapi/ooo/vba/excel/SheetObjects.idl
b/oovbaapi/ooo/vba/excel/SheetObjects.idl
deleted file mode 100644
index 4d88ab1..000
--- a/oovbaapi/ooo/vba/excel/SheetObjects.idl
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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 file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __ooo_vba_excel_SheetObjects_idl__
-#define __ooo_vba_excel_SheetObjects_idl__
-
-#include ooo/vba/XCollection.idl
-#include ooo/vba/excel/XGraphicObjects.idl
-
-//=
-
-/* Note: This file collects all compatibility interfaces
[Libreoffice-commits] core.git: 3 commits - android/experimental
android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
| 26 +++---
1 file changed, 19 insertions(+), 7 deletions(-)
New commits:
commit 41d6003e87b580dc435a423863f92b7c0c20647e
Author: Tor Lillqvist t...@iki.fi
Date: Thu Apr 18 17:25:06 2013 +0300
Make the use of SAL_LOG=+WARN+INFO optional
Change-Id: I6af17a7745f4de88b4933e93b77eda1050760794
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 02845d3..59e5994 100644
---
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
+++
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
@@ -68,7 +68,12 @@ public class Desktop
Bootstrap.setup(this);
-Bootstrap.putenv(SAL_LOG=+WARN+INFO);
+// To enable the putenv below, which turns on all SAL_INFO
+// logging, do: adb shell setprop log.tag.LODesktopLogging
+// VERBOSE.
+
+if (Log.isLoggable(LODesktopLogging, Log.VERBOSE))
+Bootstrap.putenv(SAL_LOG=+WARN+INFO);
}
// This sucks, we need to experiment and think, can an app process
commit 9e7c73d54cc6a33689cb7bf65bcc6274acc748ad
Author: Tor Lillqvist t...@iki.fi
Date: Thu Apr 18 15:51:05 2013 +0300
Minor comment change
Change-Id: I14e9b86c23ff000df2339a37ba78a11cc319f27c
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 5e3f15b..02845d3 100644
---
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
+++
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
@@ -312,11 +312,14 @@ public class Desktop
// 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 the user taps in a text area. Unfortunately it seems
+// less than obvious where the correct place to insert
+// such a request is.
+
+// 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 (!scrollJustEnded
event.getPointerCount() == 1
event.getActionMasked() == MotionEvent.ACTION_UP) {
commit bf2a1812a4e4233c08f9432ce765f87d1b57727e
Author: Tor Lillqvist t...@iki.fi
Date: Thu Apr 18 15:49:48 2013 +0300
Attempt to avoid popping up keyboard after panning
Change-Id: Ie5639ea5a2c50e54ab880ac850287de07ff69959
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 5fb59f2..5e3f15b 100644
---
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
+++
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
@@ -282,6 +282,7 @@ public class Desktop
@Override public boolean onTouchEvent(MotionEvent event)
{
+boolean scrollJustEnded = false;
if (event.getPointerCount() == 1
gestureDetector.onTouchEvent(event)) {
return true;
@@ -298,6 +299,7 @@ public class Desktop
Desktop.scroll((int) translateX, (int) translateY);
translateX = translateY = 0;
scrollInProgress = false;
+scrollJustEnded = true;
invalidate();
} else if (event.getPointerCount() == 2
scaleDetector.onTouchEvent(event)
@@ -315,7 +317,9 @@ public class Desktop
// 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) {
+if (!scrollJustEnded
+event.getPointerCount() == 1
+event.getActionMasked() == MotionEvent.ACTION_UP) {
// show the keyboard so we can enter text
InputMethodManager imm = (InputMethodManager) getContext()
.getSystemService(Context.INPUT_METHOD_SERVICE);
[Libreoffice-commits] core.git: 3 commits - android/experimental sw/source
android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
|3 ++-
sw/source/core/inc/rootfrm.hxx
|2 --
sw/source/core/layout/calcmove.cxx
|2 --
sw/source/core/layout/newfrm.cxx
|1 -
sw/source/core/layout/pagechg.cxx
|9 +++--
sw/source/core/layout/trvlfrm.cxx
|1 -
sw/source/core/layout/wsfrm.cxx
|1 -
sw/source/ui/uiview/view2.cxx
|4
sw/source/ui/uiview/viewport.cxx
| 10 +-
sw/source/ui/uiview/viewtab.cxx
|3 ---
10 files changed, 14 insertions(+), 22 deletions(-)
New commits:
commit 21fbbee5418e898a9cf0c1787c28b8a9c433af87
Author: Tor Lillqvist t...@iki.fi
Date: Mon Mar 4 12:44:10 2013 +0200
Bin pointless PAGES01 comments
Change-Id: I08b9bafa91c5bc7b7b6ca601ab91607b3143d590
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index ad31308..320dc57 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -62,7 +62,6 @@ class SwRootFrm: public SwLayoutFrm
friend void _FrmInit(); //erzeugt pVout
friend void _FrmFinit();//loescht pVout
-// PAGES01
std::vectorSwRect maPageRects;// returns the current rectangle for each
page frame
// the rectangle is extended to the
top/bottom/left/right
// for pages located at the outer borders
@@ -349,7 +348,6 @@ public:
*/
SwPageFrm* GetPageByPageNum( sal_uInt16 _nPageNum ) const;
-// -- PAGES01
void CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVisArea
);
bool IsLeftToRightViewLayout() const;
const SwRect GetPagesArea() const { return maPagesArea; }
diff --git a/sw/source/core/layout/calcmove.cxx
b/sw/source/core/layout/calcmove.cxx
index b9ddf6c..4405961 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -690,7 +690,6 @@ void SwPageFrm::MakeAll()
{
if ( !mbValidPos )
{
-// PAGES01
mbValidPos = sal_True; // positioning of the pages is taken care
of by the root frame
}
@@ -814,7 +813,6 @@ void SwPageFrm::MakeAll()
} //while ( !mbValidPos || !mbValidSize || !mbValidPrtArea )
delete pAccess;
-// PAGES01
if ( Frm() != aOldRect GetUpper() )
static_castSwRootFrm*(GetUpper())-CheckViewLayout( 0, 0 );
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 5e41e2d..6c982fc 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -466,7 +466,6 @@ void InitCurrShells( SwRootFrm *pRoot )
SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) :
SwLayoutFrm( pFmt-GetDoc()-MakeFrmFmt(
rtl::OUString(Root), pFmt ), 0 ),
-// -- PAGES01
maPagesArea(),
mnViewWidth( -1 ),
mnColumns( 0 ),
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index 949d13f..fb81f2d 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -663,7 +663,6 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const
SfxPoolItem *pNew,
Frm().Height( Max( rSz.GetHeight(), long(MINLAY) ) );
Frm().Width ( Max( rSz.GetWidth(), long(MINLAY) ) );
-// PAGES01
if ( GetUpper() )
static_castSwRootFrm*(GetUpper())-CheckViewLayout( 0, 0
);
}
@@ -885,7 +884,6 @@ inline void SetLastPage( SwPageFrm *pPage )
|*/
void SwPageFrm::Cut()
{
-// PAGES01
//AdjustRootSize( CHG_CUTPAGE, 0 );
ViewShell *pSh = getRootFrm()-GetCurrShell();
@@ -943,7 +941,6 @@ void SwPageFrm::Cut()
// Alle Verbindungen kappen.
Remove();
-// PAGES01
if ( pRootFrm )
static_castSwRootFrm*(pRootFrm)-CheckViewLayout( 0, 0 );
}
@@ -993,7 +990,7 @@ void SwPageFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
ViewShell *pSh = getRootFrm()-GetCurrShell();
if ( pSh )
pSh-SetFirstVisPageInvalid();
-// PAGES01
+
getRootFrm()-CheckViewLayout( 0, 0 );
}
@@ -1963,7 +1960,7 @@ void SwRootFrm::UnoRestoreAllActions()
} while ( pSh != GetCurrShell() );
}
-// PAGES01: Helper functions for SwRootFrm::CheckViewLayout
+// Helper functions for SwRootFrm::CheckViewLayout
static void lcl_MoveAllLowers( SwFrm* pFrm, const Point rOffset );
static void lcl_MoveAllLowerObjs(
[Libreoffice-commits] core.git: 3 commits - android/experimental sc/source sw/source vcl/inc vcl/source
android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
| 52 +++---
sc/source/ui/view/tabview.cxx
| 18 ++-
sw/source/ui/uiview/viewport.cxx
|6 +
vcl/inc/vcl/cmdevt.hxx
|1
vcl/source/window/winproc.cxx
| 26 +
5 files changed, 63 insertions(+), 40 deletions(-)
New commits:
commit 6339bf132518130d4093869f9913df5b103bf5d3
Author: Tor Lillqvist t...@iki.fi
Date: Sun Mar 3 22:23:54 2013 +0200
Android desktop app: More hacking on scaling
Added a new mode for the CommandWheelData, COMMAND_WHEEL_ZOOM_SCALE, where
the delta is the scale percentage to multiply the curent zoom factor
with. Implement in Writer and Calc.
But actually, I am more and more startng to think that live scaling of the
document view during the pinch/spread gesture will never perform fast
enough. Need to go back to the (simple) trick to just scale the BitmapView,
and do the actual LO re-zoom only when the gesture finishes. But in order
for
that to look nicer, need to get rid of the LO UI element clutter around the
document, scrollbars, buttons etc. Plus of course need to make sure the LO
zooming happens around the gesture center position.
Change-Id: I20dfcb4c2a97aacbf7e5b6ea5c24816b237fe687
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 d01c323..baa36dc 100644
---
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
+++
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
@@ -166,7 +166,7 @@ public class Desktop
boolean scalingInProgress;
GestureDetector gestureDetector;
ScaleGestureDetector scaleDetector;
-float scale = 1;
+long lastGestureEventTime;
public BitmapView()
{
@@ -201,27 +201,31 @@ public class Desktop
new
ScaleGestureDetector.SimpleOnScaleGestureListener() {
@Override public boolean
onScaleBegin(ScaleGestureDetector detector)
{
- Log.i(TAG, onScaleBegin:
pivot=( + detector.getFocusX() + , + detector.getFocusY() + ));
scalingInProgress = true;
+ lastGestureEventTime =
System.currentTimeMillis();
return true;
}
@Override public boolean
onScale(ScaleGestureDetector detector)
{
- float s =
detector.getScaleFactor();
- if (s 0.95 s 1.05)
+ long now =
System.currentTimeMillis();
+ if (now -
lastGestureEventTime 100)
return false;
- scale *= s;
- Log.i(TAG, onScale: + s +
= + scale);
+ 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());
return true;
}
@Override public void
onScaleEnd(ScaleGestureDetector detector)
{
+ float scale =
detector.getScaleFactor();
Log.i(TAG, onScaleEnd: +
scale);
- Desktop.zoom(scale, (int)
detector.getFocusX(), (int) detector.getFocusY());
- scale = 1;
+ if (!(scale 0.95 scale
1.05))
+ Desktop.zoom(scale, (int)
detector.getFocusX(), (int)
