android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml
| 36 ----------
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
| 8 --
config_host.mk.in
| 1
configure.ac
| 11 +++
sw/source/core/layout/pagechg.cxx
| 6 +
5 files changed, 17 insertions(+), 45 deletions(-)
New commits:
commit e4dad4933b2b5d3b3e4b16bc8a067e1be9b4e9d3
Author: Jan Holesovsky <ke...@collabora.com>
Date: Sat Feb 7 18:11:30 2015 +0100
Allow setting ICECC_VERSION in the autogen.input.
That way you can avoid having to set ICECC_VERSION in every shell where you
want to use icecream with cross-compilation. See
http://holesovsky.blogspot.cz/2015/02/using-icecream-to-speed-up-libreoffice.html
for details.
Change-Id: I1adf67934c2687f0fca1b73e7793b72120eeedab
diff --git a/config_host.mk.in b/config_host.mk.in
index ac811c9..c058339 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -268,6 +268,7 @@ export HUNSPELL_LIBS=$(gb_SPACE)@HUNSPELL_LIBS@
export HYPHEN_LIB=$(gb_SPACE)@HYPHEN_LIB@
export HYPH_SYSTEM_DIR=@HYPH_SYSTEM_DIR@
export ICECREAM_RUN=@ICECREAM_RUN@
+@x_ICECC_VERSION@ export ICECC_VERSION=@ICECC_VERSION@
export ICU_CFLAGS=$(gb_SPACE)@ICU_CFLAGS@
export ICU_LIBS=$(gb_SPACE)@ICU_LIBS@
export ICU_MAJOR=@ICU_MAJOR@
diff --git a/configure.ac b/configure.ac
index 048bbfc..7eeaaa1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12606,6 +12606,17 @@ fi
AC_SUBST(ICECREAM_RUN)
dnl ===================================================================
+dnl Setup the ICECC_VERSION for the build the same way it was set for
+dnl configure, so that CC/CXX and ICECC_VERSION are in sync
+dnl ===================================================================
+x_ICECC_VERSION=[\#]
+if test -n "$ICECC_VERSION" ; then
+ x_ICECC_VERSION=
+fi
+AC_SUBST(x_ICECC_VERSION)
+AC_SUBST(ICECC_VERSION)
+
+dnl ===================================================================
AC_MSG_CHECKING([MPL subset])
MPL_SUBSET=
commit 742175d28474da5a0577a9d460f2d3fe5595df0c
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 5 16:25:04 2015 +0000
don't relatively move FAR_AWAY things away from FAR_AWAY
to avoid the dread 64bit
vcl/source/outdev/map.cxx:391: long int ImplLogicToPixel(long int, long
int, long int, long int, long int): Assertion `std::abs(n) <
std::numeric_limits<long>::max() / nMapNum / nDPI'
assert on executing...
soffice.bin abi10619-1.doc --convert-to pdf
Change-Id: Id81d8e7eb9a962a5bc7f50d9c02da052cee24da1
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index 9360a01..0c8d112 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1817,7 +1817,11 @@ static void lcl_MoveAllLowers( SwFrm* pFrm, const Point&
rOffset )
const SwRect aFrm( pFrm->Frm() );
// first move the current frame
- pFrm->Frm().Pos() += rOffset;
+ Point &rPoint = pFrm->Frm().Pos();
+ if (rPoint.X() != FAR_AWAY)
+ rPoint.X() += rOffset.X();
+ if (rPoint.Y() != FAR_AWAY)
+ rPoint.Y() += rOffset.Y();
// Don't forget accessibility:
if( pFrm->IsAccessibleFrm() )
commit eb15ef18b518ebbdccb7d9ecfc24bcd19171e720
Author: Jacobo Aragunde Pérez <jaragu...@igalia.com>
Date: Tue Feb 3 18:19:32 2015 +0000
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..0000000
--- 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 22f7b9b..13e8732 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
@@ -98,14 +98,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[position].getName());
- return gridView;
}
else
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
