android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 13 +++++++--- solenv/bin/native-code.py | 1 2 files changed, 11 insertions(+), 3 deletions(-)
New commits: commit 888535f1c4e8617786c1cb6151aa5ef992b0c30f Author: Christian Lohmaier <[email protected]> Date: Sun Oct 11 18:12:16 2015 +0200 tdf#90053 add svgio to Android Viewer, so display of svg works the default Impress templates also make use of it, so not having it only displays white background... Change-Id: I34ffab7389fce60941fd926673a4999d40c50190 diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 8bec1fe..819f1bb 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -275,6 +275,7 @@ calc_constructor_list = [ draw_factory_list = [ ("libsdlo.a", "sd_component_getFactory"), + ("libsvgiolo.a", "svgio_component_getFactory"), ("libsvgfilterlo.a", "svgfilter_component_getFactory"), ("libdeployment.a", "deployment_component_getFactory"), ("libemboleobj.a", "emboleobj_component_getFactory"), commit b6430ed7fd4b6d3656f70f98ea1b089e049a3847 Author: Christian Lohmaier <[email protected]> Date: Sun Oct 11 18:10:20 2015 +0200 tdf#94891 fix crash when rotating screen in docbrowser right after launch will likely also lose the current directory, but much better than crashing. Change-Id: I9ce20e1954a6f58325413046e258ded75b6c8848 diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java index 5290a50..29229e1 100644 --- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -82,6 +82,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements ActionBa private IFile currentDirectory; private static final String CURRENT_DIRECTORY_KEY = "CURRENT_DIRECTORY"; + private static final String DOC_PROIVDER_KEY = "CURRENT_DOCUMENT_PROVIDER"; private static final String FILTER_MODE_KEY = "FILTER_MODE"; public static final String EXPLORER_VIEW_TYPE_KEY = "EXPLORER_VIEW_TYPE"; public static final String EXPLORER_PREFS_KEY = "EXPLORER_PREFS"; @@ -610,8 +611,9 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements ActionBa // TODO Auto-generated method stub super.onSaveInstanceState(outState); outState.putString(CURRENT_DIRECTORY_KEY, currentDirectory.getUri().toString()); - outState.putInt(FILTER_MODE_KEY , filterMode); + outState.putInt(FILTER_MODE_KEY, filterMode); outState.putInt(EXPLORER_VIEW_TYPE_KEY , viewMode); + outState.putInt(DOC_PROIVDER_KEY, documentProvider.getId()); Log.d(LOGTAG, currentDirectory.toString() + Integer.toString(filterMode) + Integer.toString(viewMode)); //prefs.edit().putInt(EXPLORER_VIEW_TYPE, viewType).commit(); @@ -625,14 +627,19 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements ActionBa if (savedInstanceState.isEmpty()){ return; } + if (documentProvider == null) { + Log.d(LOGTAG, "onRestoreInstanceState - documentProvider is null"); + documentProvider = DocumentProviderFactory.getInstance() + .getProvider(savedInstanceState.getInt(DOC_PROIVDER_KEY)); + } try { currentDirectory = documentProvider.createFromUri(new URI( savedInstanceState.getString(CURRENT_DIRECTORY_KEY))); } catch (URISyntaxException e) { currentDirectory = documentProvider.getRootDirectory(); } - filterMode = savedInstanceState.getInt(FILTER_MODE_KEY , FileUtilities.ALL) ; - viewMode = savedInstanceState.getInt(EXPLORER_VIEW_TYPE_KEY , GRID_VIEW); + filterMode = savedInstanceState.getInt(FILTER_MODE_KEY, FileUtilities.ALL); + viewMode = savedInstanceState.getInt(EXPLORER_VIEW_TYPE_KEY, GRID_VIEW); //openDirectory(currentDirectory); Log.d(LOGTAG, "onRestoreInstanceState"); Log.d(LOGTAG, currentDirectory.toString() + Integer.toString(filterMode) + Integer.toString(viewMode)); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
