[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sal/android
sal/android/libreofficekit-jni.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 8756beb31ce7cf5c2e54963c6c29594c47de26b9
Author: Jan Holesovsky
AuthorDate: Wed Jun 19 20:29:02 2019 +0200
Commit: Michael Meeks
CommitDate: Wed Jun 19 22:20:25 2019 +0200
android: Fix type of a C string to be const char[].
With the wrong type, we were measusing the sizeof() wrongly, leading to
a hard to catch crash at start that appeared only from time to time.
Improve the concatenation too when at that.
Change-Id: I4a4ab2909124281aac99118d66c62d669294d5f7
Reviewed-on: https://gerrit.libreoffice.org/74375
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/sal/android/libreofficekit-jni.c b/sal/android/libreofficekit-jni.c
index 0f66fdc44fe0..1307ab6a5fbb 100644
--- a/sal/android/libreofficekit-jni.c
+++ b/sal/android/libreofficekit-jni.c
@@ -75,7 +75,8 @@ jboolean libreofficekit_initialize(JNIEnv* env,
const char *cacheDirPath;
const char *apkFilePath;
-const char *fontsConf = "/etc/fonts/fonts.conf";
+size_t data_dir_len;
+const char fontsConf[] = "/etc/fonts/fonts.conf";
char *fontsConfPath;
setenv("OOO_DISABLE_RECOVERY", "1", 1);
@@ -93,9 +94,10 @@ jboolean libreofficekit_initialize(JNIEnv* env,
// TMPDIR is used by osl_getTempDirURL()
setenv("TMPDIR", cache_dir, 1);
-fontsConfPath = malloc(strlen(data_dir) + sizeof(fontsConf));
-strcpy(fontsConfPath, data_dir);
-strcat(fontsConfPath, fontsConf);
+data_dir_len = strlen(data_dir);
+fontsConfPath = malloc(data_dir_len + sizeof(fontsConf));
+strncpy(fontsConfPath, data_dir, data_dir_len);
+strncpy(fontsConfPath + data_dir_len, fontsConf, sizeof(fontsConf));
fd = open(fontsConfPath, O_RDONLY);
if (fd != -1) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin
solenv/bin/native-code.py |6 ++ 1 file changed, 6 insertions(+) New commits: commit 05eca1ba63a2eca5e6d6be0b7a05bb6f53354ec6 Author: Jan Holesovsky AuthorDate: Tue Jun 18 09:54:00 2019 +0200 Commit: Andras Timar CommitDate: Tue Jun 18 12:39:03 2019 +0200 android: Add the sidebar-related constructors to liblo-native-code.so. Change-Id: I25acb8965d190fc443d75357352e4d02c9b03cc2 Reviewed-on: https://gerrit.libreoffice.org/74265 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index af43b0672e66..77e7bf85a009 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -227,11 +227,16 @@ core_constructor_list = [ "com_sun_star_graphic_GraphicObject_get_implementation", "com_sun_star_comp_graphic_GraphicProvider_get_implementation", # svx/util/svx.component +"com_sun_star_comp_svx_NumberingToolBoxControl_get_implementation", "com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation", "com_sun_star_drawing_SvxShapeCollection_get_implementation", +"com_sun_star_svx_FontHeightToolBoxController_get_implementation", +"org_apache_openoffice_comp_svx_sidebar_PanelFactory_get_implementation", # svx/util/svxcore.component "com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation", "com_sun_star_comp_Draw_GraphicExporter_get_implementation", +"com_sun_star_comp_svx_ColorToolBoxControl_get_implementation", +"com_sun_star_comp_svx_FontNameToolBoxControl_get_implementation", "com_sun_star_comp_Svx_GraphicExportHelper_get_implementation", "com_sun_star_comp_Svx_GraphicImportHelper_get_implementation", # toolkit/util/tk.component @@ -277,6 +282,7 @@ edit_factory_list = [ edit_constructor_list = [ # framework/util/fwk.component "com_sun_star_comp_framework_GlobalAcceleratorConfiguration_get_implementation", +"com_sun_star_comp_framework_UICommandDescription_get_implementation", # i18npool/util/i18npool.component "com_sun_star_i18n_InputSequenceChecker_get_implementation", "com_sun_star_i18n_OrdinalSuffix_get_implementation", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/source
vcl/source/image/ImplImageTree.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 7b9ec19bc2447389d7648401aa40ff8797e0c6af
Author: Jan Holesovsky
AuthorDate: Tue Jun 18 10:43:16 2019 +0200
Commit: Andras Timar
CommitDate: Tue Jun 18 12:39:41 2019 +0200
[cp] android: Default to colibre.
Not ideal to use an ifdef, but I don't want to affect anything other
than Android; and there is no need to up-stream this either, colibre is
the default in master already.
Change-Id: I3b1a29b69cfda89c8615586a5afc78fd1eca8c3e
Reviewed-on: https://gerrit.libreoffice.org/74266
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/vcl/source/image/ImplImageTree.cxx
b/vcl/source/image/ImplImageTree.cxx
index 1a41d175a0b1..65a9b5562114 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -258,6 +258,12 @@ OUString ImplImageTree::fallbackStyle(const OUString&
rsStyle)
{
OUString sResult;
+#ifdef ANDROID
+if (rsStyle == "colibre")
+return "";
+else
+return "colibre";
+#else
if (rsStyle == "galaxy")
sResult = "";
else if (rsStyle == "industrial" || rsStyle == "tango" || rsStyle ==
"breeze")
@@ -272,6 +278,7 @@ OUString ImplImageTree::fallbackStyle(const OUString&
rsStyle)
sResult = "tango";
return sResult;
+#endif
}
bool ImplImageTree::loadImage(OUString const & rName, OUString const & rStyle,
BitmapEx & rBitmap, bool localized,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/CustomTarget_lo_android.mk
android/CustomTarget_lo_android.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f362a3d8cc164bad7a61c9fd2191e3a80d5fd030 Author: Jan Holesovsky AuthorDate: Mon Jun 17 10:04:44 2019 +0200 Commit: Jan Holesovsky CommitDate: Tue Jun 18 12:31:10 2019 +0200 android: Fix non-debug build. Change-Id: If8bb944417da9a0aa6343d7dc87e7a1931689f1f Reviewed-on: https://gerrit.libreoffice.org/74149 Tested-by: Jenkins Reviewed-by: Jan Holesovsky diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk index 3f80fe86be3a..4badb659612e 100644 --- a/android/CustomTarget_lo_android.mk +++ b/android/CustomTarget_lo_android.mk @@ -20,7 +20,7 @@ $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNa # still looks for the .apk, and we want fresh daily builds to be uploaded. # Us "foo" instead of the old INPATH mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \ - cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if $(ENABLE_ANDROID_EDITING),Editing)/debug/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin + cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if $(ENABLE_ANDROID_EDITING),Editing)/$(if $(ENABLE_RELEASE_BUILD),release/*-release-unsigned.apk,debug/*-debug.apk) $(BUILDDIR)/instsetoo_native/foo/bin $(call gb_CustomTarget_get_clean_target,android/loandroid3) : $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - configure.ac distro-configs/LibreOfficeAndroidAarch64.conf distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX8
configure.ac |1 - distro-configs/LibreOfficeAndroid.conf|1 + distro-configs/LibreOfficeAndroidAarch64.conf |1 + distro-configs/LibreOfficeAndroidX86.conf |1 + 4 files changed, 3 insertions(+), 1 deletion(-) New commits: commit fe8e38a8dd07ae490064c7736e7ed904f59e1647 Author: Jan Holesovsky AuthorDate: Mon Jun 17 21:35:48 2019 +0200 Commit: Andras Timar CommitDate: Tue Jun 18 09:52:22 2019 +0200 android: Define the icon theme in distro-configs and switch to colibre. No need to reinvent the wheel and hardcode it in configure.ac. Change-Id: Idb08ea0e5ce228bb0758dbdf023f3aee44da76eb Reviewed-on: https://gerrit.libreoffice.org/74247 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/configure.ac b/configure.ac index eb510df19335..a58403b3b611 100644 --- a/configure.ac +++ b/configure.ac @@ -760,7 +760,6 @@ linux-android*) enable_odk=no enable_postgresql_sdbc=no enable_python=no -with_theme="tango" test_cups=no test_dbus=no test_fontconfig=no diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf index 9cc574909d66..2b4081b72c09 100644 --- a/distro-configs/LibreOfficeAndroid.conf +++ b/distro-configs/LibreOfficeAndroid.conf @@ -9,3 +9,4 @@ --without-helppack-integration --without-junit --disable-largefile +--with-theme=colibre diff --git a/distro-configs/LibreOfficeAndroidAarch64.conf b/distro-configs/LibreOfficeAndroidAarch64.conf index 4f3d2f44c5fc..4dbafba466d6 100644 --- a/distro-configs/LibreOfficeAndroidAarch64.conf +++ b/distro-configs/LibreOfficeAndroidAarch64.conf @@ -8,3 +8,4 @@ --without-export-validation --without-helppack-integration --without-junit +--with-theme=colibre diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf index 7a2586989391..6b4aa2aff796 100644 --- a/distro-configs/LibreOfficeAndroidX86.conf +++ b/distro-configs/LibreOfficeAndroidX86.conf @@ -9,3 +9,4 @@ --without-helppack-integration --without-junit --disable-largefile +--with-theme=colibre ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - android/CustomTarget_lo_android.mk
android/CustomTarget_lo_android.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 483e8d00dc0ad7753016a007e71a7412ac7fa952 Author: Jan Holesovsky AuthorDate: Mon Jun 17 10:04:44 2019 +0200 Commit: Andras Timar CommitDate: Tue Jun 18 09:51:26 2019 +0200 android: Fix non-debug build. Change-Id: If8bb944417da9a0aa6343d7dc87e7a1931689f1f Reviewed-on: https://gerrit.libreoffice.org/74147 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk index 3f80fe86be3a..4badb659612e 100644 --- a/android/CustomTarget_lo_android.mk +++ b/android/CustomTarget_lo_android.mk @@ -20,7 +20,7 @@ $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNa # still looks for the .apk, and we want fresh daily builds to be uploaded. # Us "foo" instead of the old INPATH mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \ - cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if $(ENABLE_ANDROID_EDITING),Editing)/debug/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin + cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if $(ENABLE_ANDROID_EDITING),Editing)/$(if $(ENABLE_RELEASE_BUILD),release/*-release-unsigned.apk,debug/*-debug.apk) $(BUILDDIR)/instsetoo_native/foo/bin $(call gb_CustomTarget_get_clean_target,android/loandroid3) : $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - desktop/source
desktop/source/lib/init.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 38f614746318913305fcce5a678d9cd26e52013c
Author: Jan Holesovsky
AuthorDate: Fri Jun 14 18:38:51 2019 +0200
Commit: Jan Holesovsky
CommitDate: Mon Jun 17 07:00:33 2019 +0200
android: Unregistering in runLoop() is important even on Android.
Otherwise we get crashes in online Kit when attempting to shutdown
reasonably cleanly and the poll kicks in.
Change-Id: I9a1744b42fec9f8ffddc6094773bda943caedf2a
Reviewed-on: https://gerrit.libreoffice.org/74056
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 4ab1f67d7e68..8cfa28881d90 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4825,7 +4825,7 @@ static void lo_runLoop(LibreOfficeKit* /*pThis*/,
LibreOfficeKitWakeCallback pWakeCallback,
void* pData)
{
-#ifdef IOS // Maybe ANDROID, too?
+#if defined(IOS) || defined(ANDROID)
Application::GetSolarMutex().acquire();
#endif
@@ -4836,7 +4836,7 @@ static void lo_runLoop(LibreOfficeKit* /*pThis*/,
Application::UpdateMainThread();
soffice_main();
}
-#ifdef IOS // ANDROID, too?
+#if defined(IOS) || defined(ANDROID)
vcl::lok::unregisterPollCallbacks();
Application::ReleaseSolarMutex();
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/lib/init.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0abdf307eae9bca36b3bdc26199e208ae2c1b5fa
Author: Jan Holesovsky
AuthorDate: Fri Jun 14 18:38:51 2019 +0200
Commit: Jan Holesovsky
CommitDate: Mon Jun 17 07:00:20 2019 +0200
android: Unregistering in runLoop() is important even on Android.
Otherwise we get crashes in online Kit when attempting to shutdown
reasonably cleanly and the poll kicks in.
Change-Id: I9a1744b42fec9f8ffddc6094773bda943caedf2a
Reviewed-on: https://gerrit.libreoffice.org/74064
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 64e3c5456aa9..23205bb7afa7 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4692,7 +4692,7 @@ static void lo_runLoop(LibreOfficeKit* /*pThis*/,
LibreOfficeKitWakeCallback pWakeCallback,
void* pData)
{
-#ifdef IOS // Maybe ANDROID, too?
+#if defined(IOS) || defined(ANDROID)
Application::GetSolarMutex().acquire();
#endif
@@ -4703,7 +4703,7 @@ static void lo_runLoop(LibreOfficeKit* /*pThis*/,
Application::UpdateMainThread();
soffice_main();
}
-#ifdef IOS // ANDROID, too?
+#if defined(IOS) || defined(ANDROID)
vcl::lok::unregisterPollCallbacks();
Application::ReleaseSolarMutex();
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/animations/SlideTransitionPane.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 2e01334881212ba9adfb99a3113adc1bae63d1d7 Author: Jan Holesovsky AuthorDate: Fri May 24 23:19:53 2019 +0200 Commit: Jan Holesovsky CommitDate: Fri Jun 14 20:23:10 2019 +0200 Transition sidebar: Apply the transition duration right away. In the desktop version, the value that is entered there always ends up applied. In the Online, there was a scenario when it did not: enter a value and switch slide by clicking the slide sorter. There is no harm to apply the value right away when the user edits, because in the desktop version, there was no way to avoid applying the value anyway. Change-Id: I519423d60f682735aeb1d471b3397ff9671c15fd Reviewed-on: https://gerrit.libreoffice.org/72924 Reviewed-by: Jan Holesovsky Tested-by: Jenkins diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 64de1149578e..e7b3442b6b1d 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -1105,6 +1105,8 @@ IMPL_LINK_NOARG(SlideTransitionPane, DurationModifiedHdl, Edit&, void) mpCBX_duration->SetValue(0); else mpCBX_duration->SetValue(duration_value); + +applyToSelectedPages(); } IMPL_LINK_NOARG(SlideTransitionPane, DurationLoseFocusHdl, Control&, void) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/unoctitm.cxx |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 3db9a5838cb83a06e4538f2be90e17d1091b0199
Author: Jan Holesovsky
AuthorDate: Mon Jun 3 12:50:01 2019 +0200
Commit: Andras Timar
CommitDate: Wed Jun 12 14:57:24 2019 +0200
lok: Fix status of InsertPage, DeletePage and DuplicatePage.
Status true / false means checked, status enabled / disabled means the
visibility (enablement) of the uno command.
Change-Id: Ib2671984f59ffd5e6f1823a65ea42b33bdfe67d6
Reviewed-on: https://gerrit.libreoffice.org/73384
Reviewed-by: Szymon Kłos
Tested-by: Szymon Kłos
(cherry picked from commit 0a8eefb55a2cd473bb7f07f19e23051d3e3a22c1)
Reviewed-on: https://gerrit.libreoffice.org/73865
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 94cc07839585..aba1357b0ddc 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1064,6 +1064,9 @@ static void InterceptLOKStateChangeEvent(const
SfxViewFrame* pViewFrame, const c
aEvent.FeatureURL.Path == "InsertColumnsBefore" ||
aEvent.FeatureURL.Path == "InsertColumnsAfter" ||
aEvent.FeatureURL.Path == "InsertSymbol" ||
+ aEvent.FeatureURL.Path == "InsertPage" ||
+ aEvent.FeatureURL.Path == "DeletePage" ||
+ aEvent.FeatureURL.Path == "DuplicatePage" ||
aEvent.FeatureURL.Path == "DeleteRows" ||
aEvent.FeatureURL.Path == "DeleteColumns" ||
aEvent.FeatureURL.Path == "DeleteTable" ||
@@ -1088,12 +1091,6 @@ static void InterceptLOKStateChangeEvent(const
SfxViewFrame* pViewFrame, const c
{
aBuffer.append(aEvent.IsEnabled ? OUString("enabled") :
OUString("disabled"));
}
-else if (aEvent.FeatureURL.Path == "InsertPage" ||
- aEvent.FeatureURL.Path == "DeletePage" ||
- aEvent.FeatureURL.Path == "DuplicatePage")
-{
-aBuffer.append(OUString::boolean(aEvent.IsEnabled));
-}
else if (aEvent.FeatureURL.Path == "AssignLayout" ||
aEvent.FeatureURL.Path == "StatusSelectionMode" ||
aEvent.FeatureURL.Path == "Signature" ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - loleaflet/js loleaflet/src
loleaflet/js/toolbar.js | 19 ++-
loleaflet/src/control/Control.Menubar.js | 13 +
2 files changed, 31 insertions(+), 1 deletion(-)
New commits:
commit 368ec07dcee9e25dec0bd305cbf305f9dbff9090
Author: Jan Holesovsky
AuthorDate: Mon Jun 3 14:25:30 2019 +0200
Commit: Andras Timar
CommitDate: Wed Jun 12 10:12:36 2019 +0200
Show the state of the Delete Slide.
When there is only one slide, it cannot be deleted. Use the information
from the core to enable or disable the state of the "Delete Slide"
button in the slide sorter and the menu entry.
Change-Id: I549d4c09b6fd999b14e281976320d1b6f63d64b7
Reviewed-on: https://gerrit.libreoffice.org/73383
Reviewed-by: Szymon Kłos
Tested-by: Szymon Kłos
(cherry picked from commit 3a1f68dc84dddf252cdd222ab14b2a4635f39251)
Reviewed-on: https://gerrit.libreoffice.org/73863
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index bae578585..cce5b6991 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1952,6 +1952,9 @@ function onCommandStateChanged(e) {
if (_inMobileMode()) {
toolbarUp = statusbar;
}
+ if (map.getDocType() === 'presentation' && (id === 'deletepage'
|| id === 'insertpage' || id === 'duplicatepage')) {
+ toolbarUp = w2ui['presentation-toolbar'];
+ }
if (state === 'enabled') {
toolbarUp.enable(id);
} else {
@@ -2184,7 +2187,21 @@ function onUpdatePermission(e) {
toolbar = w2ui['presentation-toolbar'];
presentationButtons.forEach(function(id) {
- toolbar.enable(id);
+ if (id === 'deletepage') {
+ var itemState =
map['stateChangeHandler'].getItemValue('.uno:DeletePage');
+ } else if (id === 'insertpage') {
+ itemState =
map['stateChangeHandler'].getItemValue('.uno:InsertPage');
+ } else if (id === 'duplicatepage') {
+ itemState =
map['stateChangeHandler'].getItemValue('.uno:DuplicatePage');
+ } else {
+ itemState = 'enabled';
+ }
+
+ if (itemState === 'enabled') {
+ toolbar.enable(id);
+ } else {
+ toolbar.disable(id);
+ }
});
toolbar = w2ui['actionbar'];
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 1ba848f07..32591f830 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -685,6 +685,19 @@ L.Control.Menubar = L.Control.extend({
if (index > 0) {
self.options.allowedViewModeActions.splice(index, 1);
}
+ } else if (self._map.getDocType() ===
'presentation' && (id === 'deletepage' || id === 'insertpage' || id ===
'duplicatepage')) {
+ if (id === 'deletepage') {
+ itemState =
self._map['stateChangeHandler'].getItemValue('.uno:DeletePage');
+ } else if (id === 'insertpage')
{
+ itemState =
self._map['stateChangeHandler'].getItemValue('.uno:InsertPage');
+ } else {
+ itemState =
self._map['stateChangeHandler'].getItemValue('.uno:DuplicatePage');
+ }
+ if (itemState === 'disabled') {
+
$(aItem).addClass('disabled');
+ } else {
+
$(aItem).removeClass('disabled');
+ }
} else {
$(aItem).removeClass('disabled');
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0-29' - sfx2/source
sfx2/source/control/unoctitm.cxx |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 2b66842e21b11b8e363b3493f2462d4dc07f9dd3
Author: Jan Holesovsky
AuthorDate: Mon Jun 3 12:50:01 2019 +0200
Commit: Andras Timar
CommitDate: Wed Jun 12 10:10:51 2019 +0200
lok: Fix status of InsertPage, DeletePage and DuplicatePage.
Status true / false means checked, status enabled / disabled means the
visibility (enablement) of the uno command.
Change-Id: Ib2671984f59ffd5e6f1823a65ea42b33bdfe67d6
Reviewed-on: https://gerrit.libreoffice.org/73384
Reviewed-by: Szymon Kłos
Tested-by: Szymon Kłos
(cherry picked from commit 0a8eefb55a2cd473bb7f07f19e23051d3e3a22c1)
Reviewed-on: https://gerrit.libreoffice.org/73864
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 357fd4be74a2..7390a3328fa3 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1078,6 +1078,9 @@ static void InterceptLOKStateChangeEvent(const
SfxViewFrame* pViewFrame, const c
aEvent.FeatureURL.Path == "InsertColumnsBefore" ||
aEvent.FeatureURL.Path == "InsertColumnsAfter" ||
aEvent.FeatureURL.Path == "InsertSymbol" ||
+ aEvent.FeatureURL.Path == "InsertPage" ||
+ aEvent.FeatureURL.Path == "DeletePage" ||
+ aEvent.FeatureURL.Path == "DuplicatePage" ||
aEvent.FeatureURL.Path == "DeleteRows" ||
aEvent.FeatureURL.Path == "DeleteColumns" ||
aEvent.FeatureURL.Path == "DeleteTable" ||
@@ -1102,12 +1105,6 @@ static void InterceptLOKStateChangeEvent(const
SfxViewFrame* pViewFrame, const c
{
aBuffer.append(aEvent.IsEnabled ? OUString("enabled") :
OUString("disabled"));
}
-else if (aEvent.FeatureURL.Path == "InsertPage" ||
- aEvent.FeatureURL.Path == "DeletePage" ||
- aEvent.FeatureURL.Path == "DuplicatePage")
-{
-aBuffer.append(OUString::boolean(aEvent.IsEnabled));
-}
else if (aEvent.FeatureURL.Path == "AssignLayout" ||
aEvent.FeatureURL.Path == "StatusSelectionMode" ||
aEvent.FeatureURL.Path == "Signature" ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - include/vcl vcl/source
include/vcl/aboutdialog.hxx |3 +++
vcl/source/app/salvtables.cxx |6 +++---
vcl/source/window/aboutdialog.cxx |1 +
vcl/source/window/builder.cxx |2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 8bb5da0d676cfe041dcb2ffe41a1f9cd35697510
Author: Jan Holesovsky
AuthorDate: Thu Jun 6 17:23:26 2019 +0200
Commit: Caolán McNamara
CommitDate: Fri Jun 7 20:48:51 2019 +0200
android: Fix build after welding AboutDialog.
Without this, the vcl's AboutDialog conflicts with the AboutDialog from
cui during linking of liblo-native-code.so.
Change-Id: Ie6e5ddd52bb7bdee1c7d53c37ea566d7ce6c9385
Reviewed-on: https://gerrit.libreoffice.org/73613
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
(cherry picked from commit e9660591f8997c7696a55731a9ae81d26a9d452a)
Reviewed-on: https://gerrit.libreoffice.org/73656
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/aboutdialog.hxx b/include/vcl/aboutdialog.hxx
index 4126f9519a1b..8a620a004c5a 100644
--- a/include/vcl/aboutdialog.hxx
+++ b/include/vcl/aboutdialog.hxx
@@ -17,6 +17,8 @@
#include
#include
+namespace vcl
+{
class AboutDialog : public Dialog
{
private:
@@ -54,6 +56,7 @@ public:
OUString GetWebsiteLabel() const { return m_xBuildIdLink->GetText(); }
};
+}
#endif
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 166a5133feb0..b6c5dfde1b68 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1384,9 +1384,9 @@ public:
class SalInstanceAboutDialog : public SalInstanceDialog, public virtual
weld::AboutDialog
{
private:
-VclPtr<::AboutDialog> m_xAboutDialog;
+VclPtr m_xAboutDialog;
public:
-SalInstanceAboutDialog(::AboutDialog* pDialog, SalInstanceBuilder*
pBuilder, bool bTakeOwnership)
+SalInstanceAboutDialog(vcl::AboutDialog* pDialog, SalInstanceBuilder*
pBuilder, bool bTakeOwnership)
: SalInstanceDialog(pDialog, pBuilder, bTakeOwnership)
, m_xAboutDialog(pDialog)
{
@@ -5082,7 +5082,7 @@ public:
virtual std::unique_ptr weld_about_dialog(const OString
, bool bTakeOwnership) override
{
-AboutDialog* pAboutDialog = m_xBuilder->get(id);
+vcl::AboutDialog* pAboutDialog = m_xBuilder->get(id);
std::unique_ptr pRet(pAboutDialog ? new
SalInstanceAboutDialog(pAboutDialog, this, false) : nullptr);
if (bTakeOwnership && pAboutDialog)
{
diff --git a/vcl/source/window/aboutdialog.cxx
b/vcl/source/window/aboutdialog.cxx
index 1a563dfd367d..b8a8aa595982 100644
--- a/vcl/source/window/aboutdialog.cxx
+++ b/vcl/source/window/aboutdialog.cxx
@@ -43,6 +43,7 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star;
+using namespace vcl;
AboutDialog::AboutDialog(vcl::Window* pParent, WinBits nStyle,
Dialog::InitFlag eFlag)
: Dialog(pParent, nStyle, eFlag)
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 61df46ffe9b7..72d7ec18a1c0 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1654,7 +1654,7 @@ VclPtr VclBuilder::makeObject(vcl::Window
*pParent, const OString &
if (extractResizable(rMap))
nBits |= WB_SIZEABLE;
if (name == "GtkAboutDialog")
-xWindow = VclPtr::Create(pParent, nBits, !pParent ?
Dialog::InitFlag::NoParent : Dialog::InitFlag::Default);
+xWindow = VclPtr::Create(pParent, nBits,
!pParent ? Dialog::InitFlag::NoParent : Dialog::InitFlag::Default);
else
xWindow = VclPtr::Create(pParent, nBits, !pParent ?
Dialog::InitFlag::NoParent : Dialog::InitFlag::Default);
#if HAVE_FEATURE_DESKTOP
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/aboutdialog.hxx |3 +++
vcl/source/app/salvtables.cxx |6 +++---
vcl/source/window/aboutdialog.cxx |1 +
vcl/source/window/builder.cxx |2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit e9660591f8997c7696a55731a9ae81d26a9d452a
Author: Jan Holesovsky
AuthorDate: Thu Jun 6 17:23:26 2019 +0200
Commit: Jan Holesovsky
CommitDate: Fri Jun 7 13:41:05 2019 +0200
android: Fix build after welding AboutDialog.
Without this, the vcl's AboutDialog conflicts with the AboutDialog from
cui during linking of liblo-native-code.so.
Change-Id: Ie6e5ddd52bb7bdee1c7d53c37ea566d7ce6c9385
Reviewed-on: https://gerrit.libreoffice.org/73613
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/include/vcl/aboutdialog.hxx b/include/vcl/aboutdialog.hxx
index 4126f9519a1b..8a620a004c5a 100644
--- a/include/vcl/aboutdialog.hxx
+++ b/include/vcl/aboutdialog.hxx
@@ -17,6 +17,8 @@
#include
#include
+namespace vcl
+{
class AboutDialog : public Dialog
{
private:
@@ -54,6 +56,7 @@ public:
OUString GetWebsiteLabel() const { return m_xBuildIdLink->GetText(); }
};
+}
#endif
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 166a5133feb0..b6c5dfde1b68 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1384,9 +1384,9 @@ public:
class SalInstanceAboutDialog : public SalInstanceDialog, public virtual
weld::AboutDialog
{
private:
-VclPtr<::AboutDialog> m_xAboutDialog;
+VclPtr m_xAboutDialog;
public:
-SalInstanceAboutDialog(::AboutDialog* pDialog, SalInstanceBuilder*
pBuilder, bool bTakeOwnership)
+SalInstanceAboutDialog(vcl::AboutDialog* pDialog, SalInstanceBuilder*
pBuilder, bool bTakeOwnership)
: SalInstanceDialog(pDialog, pBuilder, bTakeOwnership)
, m_xAboutDialog(pDialog)
{
@@ -5082,7 +5082,7 @@ public:
virtual std::unique_ptr weld_about_dialog(const OString
, bool bTakeOwnership) override
{
-AboutDialog* pAboutDialog = m_xBuilder->get(id);
+vcl::AboutDialog* pAboutDialog = m_xBuilder->get(id);
std::unique_ptr pRet(pAboutDialog ? new
SalInstanceAboutDialog(pAboutDialog, this, false) : nullptr);
if (bTakeOwnership && pAboutDialog)
{
diff --git a/vcl/source/window/aboutdialog.cxx
b/vcl/source/window/aboutdialog.cxx
index 1a563dfd367d..b8a8aa595982 100644
--- a/vcl/source/window/aboutdialog.cxx
+++ b/vcl/source/window/aboutdialog.cxx
@@ -43,6 +43,7 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star;
+using namespace vcl;
AboutDialog::AboutDialog(vcl::Window* pParent, WinBits nStyle,
Dialog::InitFlag eFlag)
: Dialog(pParent, nStyle, eFlag)
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 61df46ffe9b7..72d7ec18a1c0 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1654,7 +1654,7 @@ VclPtr VclBuilder::makeObject(vcl::Window
*pParent, const OString &
if (extractResizable(rMap))
nBits |= WB_SIZEABLE;
if (name == "GtkAboutDialog")
-xWindow = VclPtr::Create(pParent, nBits, !pParent ?
Dialog::InitFlag::NoParent : Dialog::InitFlag::Default);
+xWindow = VclPtr::Create(pParent, nBits,
!pParent ? Dialog::InitFlag::NoParent : Dialog::InitFlag::Default);
else
xWindow = VclPtr::Create(pParent, nBits, !pParent ?
Dialog::InitFlag::NoParent : Dialog::InitFlag::Default);
#if HAVE_FEATURE_DESKTOP
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: android/app
android/app/src/main/java/org/libreoffice/androidapp/LibreOfficeApplication.java
|4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit e0a5b522e34fd34da3f2c274bf5e5502dea1
Author: Jan Holesovsky
AuthorDate: Thu Jun 6 22:12:26 2019 +0200
Commit: Jan Holesovsky
CommitDate: Fri Jun 7 12:58:25 2019 +0200
android: Create the handler on demand.
Somehow I've seen situation when the activity tried to read it before it
was even initialized...
Change-Id: Iafa2f5bebfb7005db9d38bd4832f2027373cd950
diff --git
a/android/app/src/main/java/org/libreoffice/androidapp/LibreOfficeApplication.java
b/android/app/src/main/java/org/libreoffice/androidapp/LibreOfficeApplication.java
index 8ae751e6f..22594f665 100644
---
a/android/app/src/main/java/org/libreoffice/androidapp/LibreOfficeApplication.java
+++
b/android/app/src/main/java/org/libreoffice/androidapp/LibreOfficeApplication.java
@@ -18,10 +18,12 @@ public class LibreOfficeApplication extends Application {
private static Handler mainHandler;
public LibreOfficeApplication() {
-mainHandler = new Handler();
}
public static Handler getMainHandler() {
+if (mainHandler == null)
+mainHandler = new Handler();
+
return mainHandler;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: scripts/git-cherry-gerrit
scripts/git-cherry-gerrit |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 317f9b2c09375609306fd7c8ed53b7cb53b1b16b
Author: Jan Holesovsky
AuthorDate: Wed Jun 5 13:31:20 2019 +0200
Commit: Jan Holesovsky
CommitDate: Wed Jun 5 13:31:20 2019 +0200
git-cherry-gerrit: Fix typo preventing finding the merge-base correctly.
Without this, it all worked when you were switched to the right branch;
but otherwise was generating empty lists.
Change-Id: If18c31652aa3ffe75c896e5302e89f1621e96aec
diff --git a/scripts/git-cherry-gerrit b/scripts/git-cherry-gerrit
index f1f6e76..5dc7ebb 100755
--- a/scripts/git-cherry-gerrit
+++ b/scripts/git-cherry-gerrit
@@ -21,7 +21,7 @@ fi
merge_base=$(git merge-base $cherry_from $cherry_to)
if [ -z "$branch_point" ] ; then
-branch_point=${merge_mase}
+branch_point=${merge_base}
fi
: > /tmp/tohashes
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-6-3' - wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 6ddc1dc94fd82b573058e3b28b9e1d950864b941
Author: Jan Holesovsky
AuthorDate: Tue Jun 4 14:45:26 2019 +0200
Commit: Michael Meeks
CommitDate: Wed Jun 5 11:08:58 2019 +0200
Answer 404 when the file to download does not exist.
This gives a better idea what has happened to those using the
Download_As postMessage. Without this, the attempted download just gets
stuck.
Change-Id: Ic23bbca3761d795251664cf09956468fab13ed80
Reviewed-on: https://gerrit.libreoffice.org/73450
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
(cherry picked from commit 230aa62d17e4237e344fcf7d95491dbbd97ec660)
Reviewed-on: https://gerrit.libreoffice.org/73530
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 28c91dbdf..0e0fe6098 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2542,7 +2542,6 @@ private:
+ JAILED_DOCUMENT_ROOT + tokens[4] + "/" +
fileName);
const std::string filePathAnonym =
LOOLWSD::anonymizeUrl(filePath.toString());
LOG_INF("HTTP request for: " << filePathAnonym);
-bool responded = false;
if (filePath.isAbsolute() && File(filePath).exists())
{
const Poco::URI postRequestUri(request.getURI());
@@ -2567,7 +2566,6 @@ private:
try
{
HttpHelper::sendFile(socket, filePath.toString(),
contentType, response);
-responded = true;
}
catch (const Exception& exc)
{
@@ -2580,8 +2578,15 @@ private:
else
{
LOG_ERR("Download file [" << filePathAnonym << "] not found.");
+std::ostringstream oss;
+oss << "HTTP/1.1 404 Not Found\r\n"
+<< "Date: " <<
Poco::DateTimeFormatter::format(Poco::Timestamp(),
Poco::DateTimeFormat::HTTP_FORMAT) << "\r\n"
+<< "User-Agent: " << HTTP_AGENT_STRING << "\r\n"
+<< "Content-Length: 0\r\n"
+<< "\r\n";
+socket->send(oss.str());
+socket->shutdown();
}
-(void)responded;
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 230aa62d17e4237e344fcf7d95491dbbd97ec660
Author: Jan Holesovsky
AuthorDate: Tue Jun 4 14:45:26 2019 +0200
Commit: Jan Holesovsky
CommitDate: Tue Jun 4 14:55:08 2019 +0200
Answer 404 when the file to download does not exist.
This gives a better idea what has happened to those using the
Download_As postMessage. Without this, the attempted download just gets
stuck.
Change-Id: Ic23bbca3761d795251664cf09956468fab13ed80
Reviewed-on: https://gerrit.libreoffice.org/73448
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
(cherry picked from commit 00c02138645c89560130be759500cfa0dad86fa8)
Reviewed-on: https://gerrit.libreoffice.org/73450
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 80f657b22..01780a86a 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2540,7 +2540,6 @@ private:
+ JAILED_DOCUMENT_ROOT + tokens[4] + "/" +
fileName);
const std::string filePathAnonym =
LOOLWSD::anonymizeUrl(filePath.toString());
LOG_INF("HTTP request for: " << filePathAnonym);
-bool responded = false;
if (filePath.isAbsolute() && File(filePath).exists())
{
const Poco::URI postRequestUri(request.getURI());
@@ -2565,7 +2564,6 @@ private:
try
{
HttpHelper::sendFile(socket, filePath.toString(),
contentType, response);
-responded = true;
}
catch (const Exception& exc)
{
@@ -2578,8 +2576,15 @@ private:
else
{
LOG_ERR("Download file [" << filePathAnonym << "] not found.");
+std::ostringstream oss;
+oss << "HTTP/1.1 404 Not Found\r\n"
+<< "Date: " <<
Poco::DateTimeFormatter::format(Poco::Timestamp(),
Poco::DateTimeFormat::HTTP_FORMAT) << "\r\n"
+<< "User-Agent: " << HTTP_AGENT_STRING << "\r\n"
+<< "Content-Length: 0\r\n"
+<< "\r\n";
+socket->send(oss.str());
+socket->shutdown();
}
-(void)responded;
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/reference.html loleaflet/src wsd/DocumentBroker.cpp wsd/reference.md wsd/Storage.cpp wsd/Storage.hpp
loleaflet/reference.html | 18 ++
loleaflet/src/layer/tile/TileLayer.js |5 -
loleaflet/src/map/handler/Map.WOPI.js |2 ++
wsd/DocumentBroker.cpp|1 +
wsd/Storage.cpp |4 +++-
wsd/Storage.hpp |6 ++
wsd/reference.md |7 +++
7 files changed, 41 insertions(+), 2 deletions(-)
New commits:
commit 3c45a0abab883dadc8d1733f24bff36150648c88
Author: Jan Holesovsky
AuthorDate: Tue Jun 4 13:57:53 2019 +0200
Commit: Jan Holesovsky
CommitDate: Tue Jun 4 14:54:36 2019 +0200
Introduce Download_As postmessage & a CheckFileInfo entry to enables that.
The Download_As is emitted when the user chooses 'Print' or 'Show
slideshow' or 'Download As [some type'] and the integration indicates
via DownloadAsPostMessage in the CheckFileInfo that it wants to handle
the downloading of pdf for printing or svg for slideshows or experted
document.
This is particularly useful in situations when the integration cannot
rely on browser's support for downloading like in mobile apps that use
the Online in a WebView.
Change-Id: Iefdf214937c0c0dafd7462340a1c5e88df94e716
Reviewed-on: https://gerrit.libreoffice.org/73449
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index b0f62caaf..27f969bfd 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -3240,6 +3240,24 @@ Note that they usually don't change but there is no
guarantee that they are stab
+ Download_As
+
+ Type: 'print'|'slideshow'|'export'
+ URL: string
+
+
+ This event is emitted when the user chooses 'Print' or 'Show
+ slideshow' or 'Download As [some type'] and the integration
+ indicates via DownloadAsPostMessage in the CheckFileInfo that
it
+ wants to handle the downloading of pdf for printing or svg for
+ slideshows or experted document.
+
+ This is in situations when the integration cannot rely on
browser's
+ support for downloading like in mobile apps that use the
Online in
+ a WebView.
+
+
+
UI_CreateFile
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 6dc66544e..b936cad94 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -583,7 +583,10 @@ L.TileLayer = L.GridLayer.extend({
encodeURIComponent(this._map.options.doc) + '/' +
command.jail + '/' + command.dir + '/' + command.name + wopiSrc;
this._map.hideBusy();
- if (command.id === 'print') {
+ if (this._map['wopi'].DownloadAsPostMessage) {
+ this._map.fire('postMessage', {msgId: 'Download_As',
args: {Type: command.id, URL: url}});
+ }
+ else if (command.id === 'print') {
if (L.Browser.gecko || L.Browser.edge ||
this._map.options.print === false) {
// the print dialog doesn't work well on firefox
// due to a pdf.js issue -
https://github.com/mozilla/pdf.js/issues/5397
diff --git a/loleaflet/src/map/handler/Map.WOPI.js
b/loleaflet/src/map/handler/Map.WOPI.js
index bff0a062f..97b4c7176 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -19,6 +19,7 @@ L.Map.WOPI = L.Handler.extend({
DisableExport: false,
DisableCopy: false,
DisableInactiveMessages: false,
+ DownloadAsPostMessage: false,
UserCanNotWriteRelative: true,
EnableInsertRemoteImage: false,
EnableShare: false,
@@ -83,6 +84,7 @@ L.Map.WOPI = L.Handler.extend({
this.DisableExport = !!wopiInfo['DisableExport'];
this.DisableCopy = !!wopiInfo['DisableCopy'];
this.DisableInactiveMessages =
!!wopiInfo['DisableInactiveMessages'];
+ this.DownloadAsPostMessage =
!!wopiInfo['DownloadAsPostMessage'];
this.UserCanNotWriteRelative =
!!wopiInfo['UserCanNotWriteRelative'];
this.EnableInsertRemoteImage =
!!wopiInfo['EnableInsertRemoteImage'];
this.SupportsRename = !!wopiInfo['SupportsRename'];
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index fefe15ccd..e45f6bff0 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -570,6 +570,7 @@ bool DocumentBroker::load(const
std::shared_ptr& session, const s
wopiInfo->set("DisableExport", wopifileinfo->getDisableExport())
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sfx2/source
sfx2/source/control/unoctitm.cxx |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 0a8eefb55a2cd473bb7f07f19e23051d3e3a22c1
Author: Jan Holesovsky
AuthorDate: Mon Jun 3 12:50:01 2019 +0200
Commit: Szymon Kłos
CommitDate: Mon Jun 3 18:20:05 2019 +0200
lok: Fix status of InsertPage, DeletePage and DuplicatePage.
Status true / false means checked, status enabled / disabled means the
visibility (enablement) of the uno command.
Change-Id: Ib2671984f59ffd5e6f1823a65ea42b33bdfe67d6
Reviewed-on: https://gerrit.libreoffice.org/73384
Reviewed-by: Szymon Kłos
Tested-by: Szymon Kłos
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 357fd4be74a2..7390a3328fa3 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1078,6 +1078,9 @@ static void InterceptLOKStateChangeEvent(const
SfxViewFrame* pViewFrame, const c
aEvent.FeatureURL.Path == "InsertColumnsBefore" ||
aEvent.FeatureURL.Path == "InsertColumnsAfter" ||
aEvent.FeatureURL.Path == "InsertSymbol" ||
+ aEvent.FeatureURL.Path == "InsertPage" ||
+ aEvent.FeatureURL.Path == "DeletePage" ||
+ aEvent.FeatureURL.Path == "DuplicatePage" ||
aEvent.FeatureURL.Path == "DeleteRows" ||
aEvent.FeatureURL.Path == "DeleteColumns" ||
aEvent.FeatureURL.Path == "DeleteTable" ||
@@ -1102,12 +1105,6 @@ static void InterceptLOKStateChangeEvent(const
SfxViewFrame* pViewFrame, const c
{
aBuffer.append(aEvent.IsEnabled ? OUString("enabled") :
OUString("disabled"));
}
-else if (aEvent.FeatureURL.Path == "InsertPage" ||
- aEvent.FeatureURL.Path == "DeletePage" ||
- aEvent.FeatureURL.Path == "DuplicatePage")
-{
-aBuffer.append(OUString::boolean(aEvent.IsEnabled));
-}
else if (aEvent.FeatureURL.Path == "AssignLayout" ||
aEvent.FeatureURL.Path == "StatusSelectionMode" ||
aEvent.FeatureURL.Path == "Signature" ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sd/source
sd/source/ui/animations/SlideTransitionPane.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 5eea8c955b7632414c1d6c3ec0cbcf86c558efc6 Author: Jan Holesovsky AuthorDate: Fri May 24 23:19:53 2019 +0200 Commit: Michael Meeks CommitDate: Fri May 24 23:33:09 2019 +0200 Transition sidebar: Apply the transition duration right away. In the desktop version, the value that is entered there always ends up applied. In the Online, there was a scenario when it did not: enter a value and switch slide by clicking the slide sorter. There is no harm to apply the value right away when the user edits, because in the desktop version, there was no way to avoid applying the value anyway. Change-Id: I519423d60f682735aeb1d471b3397ff9671c15fd Reviewed-on: https://gerrit.libreoffice.org/72923 Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index f08c171a3ae5..cc7fdec56e63 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -1125,6 +1125,8 @@ IMPL_LINK_NOARG(SlideTransitionPane, DurationModifiedHdl, Edit&, void) mpCBX_duration->SetValue(0); else mpCBX_duration->SetValue(duration_value); + +applyToSelectedPages(); } IMPL_LINK_NOARG(SlideTransitionPane, DurationLoseFocusHdl, Control&, void) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source svx/sdi
sd/source/ui/view/drviewse.cxx |4 svx/sdi/svx.sdi|2 +- 2 files changed, 5 insertions(+), 1 deletion(-) New commits: commit 935f6199d030fb77ce799c5193ad3d8a927bc3cf Author: Jan Holesovsky AuthorDate: Thu May 23 15:23:25 2019 +0200 Commit: Jan Holesovsky CommitDate: Fri May 24 23:26:25 2019 +0200 Add a parameter to insert a text box directly. This is useful for the Online, where we want to insert the text box directly into the document so that it is visible right away. Change-Id: I09ab2efba758aac077fa37ddfd20b1486b35b3ef Reviewed-on: https://gerrit.libreoffice.org/72912 Tested-by: Jenkins Reviewed-by: Jan Holesovsky diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index d00f125a23eb..0c9ee3867fec 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -255,6 +255,10 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) ImpAddPrintableCharactersToTextEdit(rReq, GetView()); rReq.Done(); + +const SfxItemSet* pArgs = rReq.GetArgs(); +if (pArgs && pArgs->HasItem(FN_PARAM_1)) +bCreateDirectly = static_cast(pArgs->Get(FN_PARAM_1)).GetValue(); } break; diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 62f7fc78f857..3c63477df04e 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -8295,7 +8295,7 @@ SfxBoolItem TestMode SID_DIALOG_TESTMODE SfxBoolItem Text SID_ATTR_CHAR - +(SfxBoolItem CreateDirectly FN_PARAM_1) [ AutoUpdate = TRUE, FastCall = FALSE, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sd/source svx/sdi
sd/source/ui/view/drviewse.cxx |4 svx/sdi/svx.sdi|2 +- 2 files changed, 5 insertions(+), 1 deletion(-) New commits: commit 34807c652e9367fda26b8f66207ef448e024ca69 Author: Jan Holesovsky AuthorDate: Thu May 23 15:23:25 2019 +0200 Commit: Miklos Vajna CommitDate: Fri May 24 17:52:33 2019 +0200 Add a parameter to insert a text box directly. This is useful for the Online, where we want to insert the text box directly into the document so that it is visible right away. Change-Id: I09ab2efba758aac077fa37ddfd20b1486b35b3ef Reviewed-on: https://gerrit.libreoffice.org/72911 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 93c3b0f9cb16..332e7abaefcb 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -255,6 +255,10 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) ImpAddPrintableCharactersToTextEdit(rReq, GetView()); rReq.Done(); + +const SfxItemSet* pArgs = rReq.GetArgs(); +if (pArgs && pArgs->HasItem(FN_PARAM_1)) +bCreateDirectly = static_cast(pArgs->Get(FN_PARAM_1)).GetValue(); } break; diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index f929e6625276..e979a8a7057e 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -8265,7 +8265,7 @@ SfxBoolItem TestMode SID_DIALOG_TESTMODE SfxBoolItem Text SID_ATTR_CHAR - +(SfxBoolItem CreateDirectly FN_PARAM_1) [ AutoUpdate = TRUE, FastCall = FALSE, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/headless
vcl/headless/svpgdi.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit ad9d2faff8ccb216c85e617d4d86464a91f317e0
Author: Jan Holesovsky
AuthorDate: Wed May 15 12:25:26 2019 +0200
Commit: Andras Timar
CommitDate: Wed May 15 17:22:37 2019 +0200
Attempt to load the theme when LibreOfficeKit is active.
Change-Id: Ie8640b7179a96cb40fb774ede097ca7b3640edd8
Reviewed-on: https://gerrit.libreoffice.org/72349
Reviewed-by: Andras Timar
Tested-by: Andras Timar
(cherry picked from commit 7d55c2b8886ae00a60aa469503f596ee488c25c0)
Reviewed-on: https://gerrit.libreoffice.org/72353
Tested-by: Jenkins
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 74c27e9ba960..0f6fda87fd5b 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -594,9 +594,10 @@ SvpSalGraphics::SvpSalGraphics()
, m_ePaintMode(PaintMode::Over)
, m_aTextRenderImpl(*this)
{
-if (!initWidgetDrawBackends())
+bool bLOKActive = comphelper::LibreOfficeKit::isActive();
+if (!initWidgetDrawBackends(bLOKActive))
{
-if (comphelper::LibreOfficeKit::isActive())
+if (bLOKActive)
m_pWidgetDraw.reset(new vcl::CustomWidgetDraw(*this));
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .gitreview
.gitreview |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a3e649c3384d19a5ad540c3d65d5f79b66fd9090 Author: Jan Holesovsky AuthorDate: Wed May 15 12:30:34 2019 +0200 Commit: Jan Holesovsky CommitDate: Wed May 15 15:13:47 2019 +0200 git-review: Use the hostname instead of alias. Change-Id: Ibbcb29b411bf413bf110c7d734ff8dc2763b2708 Reviewed-on: https://gerrit.libreoffice.org/72351 Tested-by: Jenkins Reviewed-by: Jan Holesovsky diff --git a/.gitreview b/.gitreview index 094c974be145..199752b8b09e 100644 --- a/.gitreview +++ b/.gitreview @@ -1,5 +1,5 @@ [gerrit] -host=logerrit +host=gerrit.libreoffice.org port=29418 project=core defaultremote=logerrit ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.0-31'
Tag 'cp-6.0-31' created by Andras Timar at 2019-05-15 11:45 + cp-6.0-31 Changes since cp-6.0-30-51: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - .gitreview
.gitreview |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9e571fc2e84a31554958ed6929bd9d604d9a5e8d Author: Jan Holesovsky AuthorDate: Wed May 15 12:30:34 2019 +0200 Commit: Miklos Vajna CommitDate: Wed May 15 12:43:19 2019 +0200 git-review: Use the hostname instead of alias. Change-Id: Ibbcb29b411bf413bf110c7d734ff8dc2763b2708 Reviewed-on: https://gerrit.libreoffice.org/72350 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/.gitreview b/.gitreview index 46c9ae9716d3..8e97f61b4543 100644 --- a/.gitreview +++ b/.gitreview @@ -1,5 +1,5 @@ [gerrit] -host=logerrit +host=gerrit.libreoffice.org port=29418 project=core defaultremote=logerrit ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/headless
vcl/headless/svpgdi.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 7d55c2b8886ae00a60aa469503f596ee488c25c0
Author: Jan Holesovsky
AuthorDate: Wed May 15 12:25:26 2019 +0200
Commit: Andras Timar
CommitDate: Wed May 15 12:42:38 2019 +0200
Attempt to load the theme when LibreOfficeKit is active.
Change-Id: Ie8640b7179a96cb40fb774ede097ca7b3640edd8
Reviewed-on: https://gerrit.libreoffice.org/72349
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 11c6fc1d9589..db62e92585a2 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -562,9 +562,10 @@ SvpSalGraphics::SvpSalGraphics()
, m_ePaintMode(PaintMode::Over)
, m_aTextRenderImpl(*this)
{
-if (!initWidgetDrawBackends())
+bool bLOKActive = comphelper::LibreOfficeKit::isActive();
+if (!initWidgetDrawBackends(bLOKActive))
{
-if (comphelper::LibreOfficeKit::isActive())
+if (bLOKActive)
m_pWidgetDraw.reset(new vcl::CustomWidgetDraw(*this));
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Android Viewer(Online) - Weekly report [7 May - 10 May]
Hi Kaishu, Kaishu Sahu píše v Po 13. 05. 2019 v 03:20 +0530: > This week (from 7th May to 10th May): > 1. I have added a feature in the document viewer to insert image in a > document from the phone's internal/external storage(Task#01). The > task of image insertion is handled by the browser i.e. the process of > taking an image from the disk and uploading but in the case of > Android Viewer, there wasn't any implementation in the webView. > 2. I have tried to understand Loleaflet's(javascript part) internal > working. Very good - thank you! > Addition of sidebar or changes in the document viewer may require > some understanding of Loleaflet. Actually Florin (CC'd) is actually already working on the sidebar support in parallel, so most probably it'll be done by the time you get to that; so you don't have to worry about that, most probably you'll just skip it, there's a lot of other stuff to work on :-) All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sc/source
sc/source/ui/app/inputhdl.cxx | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
New commits:
commit 4a226f94f506dc87fcb34486b6a00cfa2f4f0e35
Author: Jan Holesovsky
AuthorDate: Thu Nov 15 11:51:42 2018 +0100
Commit: Aron Budea
CommitDate: Mon May 6 15:36:36 2019 +0200
lok sc: Fix the formula input bar and address bar notifications.
Apparently we did not have the pInputWin living in the background; but
now we have. There is no reason to treat it in an 'else' branch, these
checks should be separate either way.
Change-Id: Ibb8d92fb1e2803942460d2063847917d082fcb2e
Reviewed-on: https://gerrit.libreoffice.org/71863
Reviewed-by: Aron Budea
Tested-by: Aron Budea
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 2077b42d2433..3c65a12295fc 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3692,11 +3692,9 @@ void ScInputHandler::NotifyChange( const
ScInputHdlState* pState,
if ( pInputWin )
pInputWin->SetTextString(aString);
-else if (comphelper::LibreOfficeKit::isActive())
-{
-if (pActiveViewSh)
-
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA,
aString.toUtf8().getStr());
-}
+
+if (comphelper::LibreOfficeKit::isActive() &&
pActiveViewSh)
+
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA,
aString.toUtf8().getStr());
}
if ( pInputWin || comphelper::LibreOfficeKit::isActive())
// Named range input
@@ -3734,10 +3732,9 @@ void ScInputHandler::NotifyChange( const
ScInputHdlState* pState,
pInputWin->SetAccessibilityEventsSuppressed(bIsSuppressed);
pInputWin->SetSumAssignMode();
}
-else if (pActiveViewSh)
-{
+
+if (comphelper::LibreOfficeKit::isActive() &&
pActiveViewSh)
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_ADDRESS,
aPosStr.toUtf8().getStr());
-}
}
if (bStopEditing)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/LibreOfficeKit libreofficekit/qa
include/LibreOfficeKit/LibreOfficeKit.hxx |2 +-
libreofficekit/qa/tilebench/tilebench.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a6d146074dce236f84e0194539413e7d551b5065
Author: Jan Holesovsky
AuthorDate: Thu May 2 11:14:40 2019 +0200
Commit: Michael Meeks
CommitDate: Thu May 2 11:39:30 2019 +0200
lok: We changed the (unstable) ABI, but let's allow the older C++ API.
Helps building the Online before the appropriate patch gets merged.
Change-Id: I9983d546bb0cb7fb472806622a0a10e3a4d3ab87
Reviewed-on: https://gerrit.libreoffice.org/71665
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 47983e68fa27..64aac1b361c5 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -188,7 +188,7 @@ public:
*
* @param nWindowid
*/
-void postWindow(unsigned nWindowId, int nAction, const char* pData)
+void postWindow(unsigned nWindowId, int nAction, const char* pData =
nullptr)
{
return mpDoc->pClass->postWindow(mpDoc, nWindowId, nAction, pData);
}
diff --git a/libreofficekit/qa/tilebench/tilebench.cxx
b/libreofficekit/qa/tilebench/tilebench.cxx
index d0fc87283d35..61d337f6c518 100644
--- a/libreofficekit/qa/tilebench/tilebench.cxx
+++ b/libreofficekit/qa/tilebench/tilebench.cxx
@@ -286,7 +286,7 @@ static void testDialog( Document *pDocument, const char
*uno_cmd )
}
aTimes.emplace_back("post close dialog");
-pDocument->postWindow(nDialogId, LOK_WINDOW_CLOSE, nullptr);
+pDocument->postWindow(nDialogId, LOK_WINDOW_CLOSE);
aTimes.emplace_back();
pDocument->destroyView(view);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/LibreOfficeKit libreofficekit/qa
include/LibreOfficeKit/LibreOfficeKit.hxx |2 +-
libreofficekit/qa/tilebench/tilebench.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 237aa2fe367d3369265b0f935f7521560bc2c61a
Author: Jan Holesovsky
AuthorDate: Thu May 2 11:14:40 2019 +0200
Commit: Michael Meeks
CommitDate: Thu May 2 11:22:19 2019 +0200
lok: We changed the (unstable) ABI, but let's allow the older C++ API.
Helps building the Online before the appropriate patch gets merged.
Change-Id: I9983d546bb0cb7fb472806622a0a10e3a4d3ab87
Reviewed-on: https://gerrit.libreoffice.org/71664
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index f52e96332b7f..235053fa0adb 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -188,7 +188,7 @@ public:
*
* @param nWindowid
*/
-void postWindow(unsigned nWindowId, int nAction, const char* pData)
+void postWindow(unsigned nWindowId, int nAction, const char* pData =
nullptr)
{
return mpDoc->pClass->postWindow(mpDoc, nWindowId, nAction, pData);
}
diff --git a/libreofficekit/qa/tilebench/tilebench.cxx
b/libreofficekit/qa/tilebench/tilebench.cxx
index 6cda7348ccaf..4cb76dd1366e 100644
--- a/libreofficekit/qa/tilebench/tilebench.cxx
+++ b/libreofficekit/qa/tilebench/tilebench.cxx
@@ -278,7 +278,7 @@ void testDialog( Document *pDocument, const char *uno_cmd )
}
aTimes.emplace_back("post close dialog");
-pDocument->postWindow(nDialogId, LOK_WINDOW_CLOSE, nullptr);
+pDocument->postWindow(nDialogId, LOK_WINDOW_CLOSE);
aTimes.emplace_back();
pDocument->destroyView(view);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sd/source
sd/source/ui/unoidl/unomodel.cxx | 11 ---
1 file changed, 11 deletions(-)
New commits:
commit 7e291eedbad335bf8bbc8a17cc3d633bf66d0e90
Author: Jan Holesovsky
AuthorDate: Thu Apr 25 05:54:15 2019 +0200
Commit: Jan Holesovsky
CommitDate: Thu Apr 25 14:26:36 2019 +0200
sd lok: Remove the .uno:LeftPaneImpress call from sd lok initialization.
According to my testing, this makes no difference and the moving of
slides and multiple selection behaves the same way with or without this.
So let's return to not activating the SlideSorterBar, because otherwise
we are doing a lot of pixel bashing behind the scenes unnecessarily.
Having said that, if we want to activate it at some stage, it is better
to do something like the following (+ remove the explicit LOK-only if's
from svtools/source/config/slidesorterbaropt.cxx):
SvtSlideSorterBarOptions().SetVisibleImpressView(true);
instead (and potentially we can also make it floating not to occupy the
space in the main view by
GetWindow()->SetFloatingMode(true);
in the LOK case in sd/source/ui/dlg/PaneChildWindows.cxxi).
Change-Id: I86b23b484674ad4c6a75246ee6186ad9b828931f
Reviewed-on: https://gerrit.libreoffice.org/71271
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 96ba362c3c7b..fe0c82d9309a 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -32,7 +32,6 @@
#include
-#include
#include
#include
#include
@@ -2512,16 +2511,6 @@ void
SdXImpressDocument::initializeForTiledRendering(const css::uno::Sequence
aPropertyValuesVector({aSynchronMode});
-
-// Create the SlideSorter which is used for multiselection and reordering.
-static const OUString aLeftPaneCommand(".uno:LeftPaneImpress");
-comphelper::dispatchCommand(aLeftPaneCommand,
comphelper::containerToSequence(aPropertyValuesVector));
}
void SdXImpressDocument::postKeyEvent(int nType, int nCharCode, int nKeyCode)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - desktop/qa sd/qa
desktop/qa/desktop_lib/test_desktop_lib.cxx |2
sd/qa/unit/tiledrendering/tiledrendering.cxx | 118 ---
2 files changed, 6 insertions(+), 114 deletions(-)
New commits:
commit 5fd55f1e9fb37c3e0ac84823ff089906cd47aca2
Author: Jan Holesovsky
AuthorDate: Thu Apr 25 06:06:19 2019 +0200
Commit: Ashod Nakashian
CommitDate: Thu Apr 25 14:15:29 2019 +0200
Revert "disable unreliable SdTiledRenderingTest::testPasteTextOnSlide"
This shouldn't be necessary after the patch that removes the
.uno:LeftPaneImpress and revert of the unit test changs.
This reverts commit 23b03b5e21d936d1fdb2096c1c57b932a1c6f9e3.
Change-Id: Ie056d66b1d88c317e1b44ebe290313c307d807ae
Reviewed-on: https://gerrit.libreoffice.org/71273
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index c80ea10db842..1765db27be7d 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -2081,7 +2081,6 @@ void SdTiledRenderingTest::testTdf115783()
void SdTiledRenderingTest::testPasteTextOnSlide()
{
-#if 0
// Load the document.
comphelper::LibreOfficeKit::setActive();
SdXImpressDocument* pXImpressDocument =
createDoc("paste_text_onslide.odp");
@@ -2143,7 +2142,6 @@ void SdTiledRenderingTest::testPasteTextOnSlide()
CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast(7393), aPos.getY(), 100);
comphelper::LibreOfficeKit::setActive(false);
-#endif
}
void SdTiledRenderingTest::testTdf115873()
commit 59e8d4679a2104e329ca562d6c4ad5a2b7113793
Author: Jan Holesovsky
AuthorDate: Wed Apr 24 22:16:52 2019 +0200
Commit: Ashod Nakashian
CommitDate: Thu Apr 25 14:15:18 2019 +0200
Revert "sd: fix unittest failures due to enabling slide-sorter"
At the moment, the commit that was supposed to fix the unit tests is
actually breaking them for me, so let's revert.
This reverts commit 72da60a4fac5657de69c0651dd8e0a94fcc49b97.
Change-Id: I8ea636985de12ea19ad32a6064ece2d90589b7f9
Reviewed-on: https://gerrit.libreoffice.org/71272
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index ef83adc8f3e3..a952dcd0a0a0 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -1896,6 +1896,8 @@ void DesktopLOKTest::testPaintPartTile()
//CPPUNIT_ASSERT(aView1.m_bTilesInvalidated);
mxComponent.clear();
+
+comphelper::LibreOfficeKit::setActive(false);
}
void DesktopLOKTest::testWriterCommentInsertCursor()
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index b2f6a59f43cd..c80ea10db842 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -2087,55 +2087,6 @@ void SdTiledRenderingTest::testPasteTextOnSlide()
SdXImpressDocument* pXImpressDocument =
createDoc("paste_text_onslide.odp");
CPPUNIT_ASSERT(pXImpressDocument);
-// Drain events.
-Scheduler::ProcessEventsToIdle();
-
-pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN,
- convertMm100ToTwip(0),
convertMm100ToTwip(0),
- 1, MOUSE_LEFT, 0);
-pXImpressDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP,
- convertMm100ToTwip(0),
convertMm100ToTwip(0),
- 1, MOUSE_LEFT, 0);
-Scheduler::ProcessEventsToIdle();
-
-// select second text object
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::TAB);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::TAB);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::TAB);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::TAB);
-Scheduler::ProcessEventsToIdle();
-
-// step into text editing
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, '1', 0);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, '1', 0);
-Scheduler::ProcessEventsToIdle();
-
-// select full text
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_LEFT |
KEY_SHIFT);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_LEFT |
KEY_SHIFT);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_LEFT |
KEY_SHIFT);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_LEFT |
KEY_SHIFT);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_LEFT |
KEY_SHIFT);
-pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_LEFT |
KEY_SHIFT);
-pXImpressDocument->
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/sfiltdlg.cxx | 40
sc/source/ui/inc/filtdlg.hxx|9 -
2 files changed, 28 insertions(+), 21 deletions(-)
New commits:
commit c618b8eae79b8d87ad5002466ef59c5694d4cea0
Author: Jan Holesovsky
AuthorDate: Wed Apr 17 18:22:46 2019 +0200
Commit: Jan Holesovsky
CommitDate: Fri Apr 19 11:23:08 2019 +0200
sc: Get rid of the Idle hack in the Special Filter Dialog.
The problem is that with LOK, the creation of Idle here causes a
deadlock when the dialog is being opened and its first paint is
requested.
No real idea what change now causes the problem (this used to work), but
given that the use of the Idle is a hack in the first place, let's use
the GetFocus/LoseFocus handlers instead, and act accordingly only when
the focus of the interesting controls changes.
Change-Id: Ib6c0267a064cb31438544e47fe3e0869b575ef7c
Reviewed-on: https://gerrit.libreoffice.org/70948
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index a32e776b6140..6bfed89324e5 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -89,14 +89,19 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB,
SfxChildWindow* pCW, we
m_xRbCopyArea->SetReferences(this, m_xEdCopyArea.get());
Init( rArgSet );
-m_xEdFilterArea->GrabFocus();
-// hack: control of RefInput
-pIdle.reset( new Idle("Special Filter Dialog") );
-// FIXME: this is an abomination
-pIdle->SetPriority( TaskPriority::LOWEST );
-pIdle->SetInvokeHandler( LINK( this, ScSpecialFilterDlg, TimeOutHdl ) );
-pIdle->Start();
+Link aLinkEdit = LINK(this,
ScSpecialFilterDlg, RefInputEditHdl);
+Link aLinkButton = LINK(this,
ScSpecialFilterDlg, RefInputButtonHdl);
+m_xEdCopyArea->SetGetFocusHdl(aLinkEdit);
+m_xRbCopyArea->SetGetFocusHdl(aLinkButton);
+m_xEdFilterArea->SetGetFocusHdl(aLinkEdit);
+m_xRbFilterArea->SetGetFocusHdl(aLinkButton);
+m_xEdCopyArea->SetLoseFocusHdl(aLinkEdit);
+m_xRbCopyArea->SetLoseFocusHdl(aLinkButton);
+m_xEdFilterArea->SetLoseFocusHdl(aLinkEdit);
+m_xRbFilterArea->SetLoseFocusHdl(aLinkButton);
+
+m_xEdFilterArea->GrabFocus();
}
ScSpecialFilterDlg::~ScSpecialFilterDlg()
@@ -104,10 +109,6 @@ ScSpecialFilterDlg::~ScSpecialFilterDlg()
pOptionsMgr.reset();
pOutItem.reset();
-
-// hack: control of RefInput
-pIdle->Stop();
-pIdle.reset();
}
void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
@@ -358,10 +359,19 @@ IMPL_LINK(ScSpecialFilterDlg, EndDlgHdl, weld::Button&,
rBtn, void)
}
}
-IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pIdle, void )
+IMPL_LINK_NOARG(ScSpecialFilterDlg, RefInputEditHdl, formula::WeldRefEdit&,
void)
{
-// every 50ms check whether RefInputMode is still true
-if (_pIdle == pIdle.get() && m_xDialog->has_toplevel_focus())
+RefInputHdl();
+}
+
+IMPL_LINK_NOARG(ScSpecialFilterDlg, RefInputButtonHdl,
formula::WeldRefButton&, void)
+{
+RefInputHdl();
+}
+
+void ScSpecialFilterDlg::RefInputHdl()
+{
+if (m_xDialog->has_toplevel_focus())
{
if( m_xEdCopyArea->GetWidget()->has_focus() ||
m_xRbCopyArea->GetWidget()->has_focus() )
{
@@ -379,8 +389,6 @@ IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pIdle,
void )
bRefInputMode = false;
}
}
-
-pIdle->Start();
}
IMPL_LINK(ScSpecialFilterDlg, FilterAreaSelHdl, weld::ComboBox&, rLb, void)
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index a33d0b91f823..a84a5289ab70 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -184,9 +184,6 @@ private:
boolbRefInputMode;
-// Hack: RefInput control
-std::unique_ptr pIdle;
-
formula::WeldRefEdit* m_pRefInputEdit;
std::unique_ptr m_xLbFilterArea;
@@ -222,8 +219,10 @@ private:
DECL_LINK( FilterAreaModHdl, formula::WeldRefEdit&, void );
DECL_LINK( EndDlgHdl, weld::Button&, void );
-// Hack: RefInput control
-DECL_LINK( TimeOutHdl, Timer*, void );
+// RefInput control
+DECL_LINK( RefInputEditHdl, formula::WeldRefEdit&, void );
+DECL_LINK( RefInputButtonHdl, formula::WeldRefButton&, void );
+void RefInputHdl();
};
#endif // INCLUDED_SC_SOURCE_UI_INC_FILTDLG_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sc/source
sc/source/ui/dbgui/sfiltdlg.cxx | 33 ++---
sc/source/ui/inc/filtdlg.hxx|7 ++-
2 files changed, 16 insertions(+), 24 deletions(-)
New commits:
commit 9bb32c6629b068c18d1f7df63a86d1cab66856eb
Author: Jan Holesovsky
AuthorDate: Wed Apr 17 18:22:46 2019 +0200
Commit: Aron Budea
CommitDate: Thu Apr 18 13:52:40 2019 +0200
sc: Get rid of the Idle hack in the Special Filter Dialog.
The problem is that with LOK, the creation of Idle here causes a
deadlock when the dialog is being opened and its first paint is
requested.
No real idea what change now causes the problem (this used to work), but
given that the use of the Idle is a hack in the first place, let's use
the GetFocus/LoseFocus handlers instead, and act accordingly only when
the focus of the interesting controls changes.
Change-Id: Ib6c0267a064cb31438544e47fe3e0869b575ef7c
Reviewed-on: https://gerrit.libreoffice.org/70917
Reviewed-by: Aron Budea
Tested-by: Aron Budea
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index fe441db8bd16..2366af951e5e 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -57,8 +57,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB,
SfxChildWindow* pCW, vc
pViewData ( nullptr ),
pDoc( nullptr ),
pRefInputEdit ( nullptr ),
-bRefInputMode ( false ),
-pIdle ( nullptr )
+bRefInputMode ( false )
{
get(pLbFilterArea,"lbfilterarea");
get(pEdFilterArea,"edfilterarea");
@@ -83,14 +82,18 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB,
SfxChildWindow* pCW, vc
get(pExpander,"more");
Init( rArgSet );
-pEdFilterArea->GrabFocus();
-// hack: control of RefInput
-pIdle = new Idle("Special Filter Dialog");
-// FIXME: this is an abomination
-pIdle->SetPriority( TaskPriority::LOWEST );
-pIdle->SetInvokeHandler( LINK( this, ScSpecialFilterDlg, TimeOutHdl ) );
-pIdle->Start();
+Link aLink = LINK(this, ScSpecialFilterDlg,
RefInputControlHdl);
+pEdCopyArea->SetGetFocusHdl(aLink);
+pRbCopyArea->SetGetFocusHdl(aLink);
+pEdFilterArea->SetGetFocusHdl(aLink);
+pRbFilterArea->SetGetFocusHdl(aLink);
+pEdCopyArea->SetLoseFocusHdl(aLink);
+pRbCopyArea->SetLoseFocusHdl(aLink);
+pEdFilterArea->SetLoseFocusHdl(aLink);
+pRbFilterArea->SetLoseFocusHdl(aLink);
+
+pEdFilterArea->GrabFocus();
}
ScSpecialFilterDlg::~ScSpecialFilterDlg()
@@ -109,10 +112,6 @@ void ScSpecialFilterDlg::dispose()
delete pOutItem;
-// hack: control of RefInput
-pIdle->Stop();
-delete pIdle;
-
pLbFilterArea.clear();
pEdFilterArea.clear();
pRbFilterArea.clear();
@@ -389,11 +388,9 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn,
void )
}
}
-IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pIdle, void )
+IMPL_LINK_NOARG(ScSpecialFilterDlg, RefInputControlHdl, Control&, void)
{
-// every 50ms check whether RefInputMode is still true
-
-if( (_pIdle == pIdle) && IsActive() )
+if (IsActive())
{
if( pEdCopyArea->HasFocus() || pRbCopyArea->HasFocus() )
{
@@ -411,8 +408,6 @@ IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pIdle,
void )
bRefInputMode = false;
}
}
-
-pIdle->Start();
}
IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox&, rLb, void )
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 1505a0bec22f..829cb0b2c7fa 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -206,9 +206,6 @@ private:
VclPtr pRefInputEdit;
boolbRefInputMode;
-// Hack: RefInput control
-Idle* pIdle;
-
private:
voidInit( const SfxItemSet& rArgSet );
ScQueryItem*GetOutputItem( const ScQueryParam& rParam,
@@ -219,8 +216,8 @@ private:
DECL_LINK( FilterAreaModHdl, Edit&, void );
DECL_LINK( EndDlgHdl, Button*, void );
-// Hack: RefInput control
-DECL_LINK( TimeOutHdl, Timer*, void );
+// RefInput control
+DECL_LINK( RefInputControlHdl, Control&, void );
};
#endif // INCLUDED_SC_SOURCE_UI_INC_FILTDLG_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source sal/android
desktop/source/lib/init.cxx | 18 +++---
sal/android/libreofficekit-jni.c |6 ++
2 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit 34d012a128dfa959aa345672ebf4f9de80253b63
Author: Jan Holesovsky
AuthorDate: Fri Apr 12 17:50:52 2019 +0200
Commit: Jan Holesovsky
CommitDate: Sat Apr 13 08:13:06 2019 +0200
android: Make the tiled rendering from the loolwsd actually work.
Not to break the 'old' Android app, introduce a bool that can indicate
if we are using the LOK from the 'old' (LOK-via-JNI-based) or from the
'new' (loolwsd-based) app.
Change-Id: I38bd665cc1d5bc88018574171443ecabc46763df
Reviewed-on: https://gerrit.libreoffice.org/70678
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6830aa698e79..d82a44dd09f5 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2349,6 +2349,13 @@ static void doc_setPartMode(LibreOfficeKitDocument*
pThis,
}
}
+#if defined(ANDROID)
+/// For the distinction if the LOK is used for the 'old' (JNI-based) or the
+/// 'new' (loolwsd-based) app. Default to the 'new', ie. not used from JNI as
+/// implemented in sal/android/libreofficekit-jni.c.
+bool android_lok_from_jni = false;
+#endif
+
static void doc_paintTile(LibreOfficeKitDocument* pThis,
unsigned char* pBuffer,
const int nCanvasWidth, const int nCanvasHeight,
@@ -2403,10 +2410,15 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
#else
ScopedVclPtrInstance< VirtualDevice > pDevice(nullptr, Size(1, 1),
DeviceFormat::DEFAULT) ;
-#if !defined(ANDROID)
-// Set background to transparent by default.
-pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
+#if defined(ANDROID)
+if (!android_lok_from_jni)
#endif
+{
+// Set background to transparent by default.
+// [Unless it is the 'old' (JNI-based) Android app - no idea why it
+// needs avoiding this.]
+pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
+}
pDevice->SetOutputSizePixelScaleOffsetAndBuffer(
Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(),
diff --git a/sal/android/libreofficekit-jni.c b/sal/android/libreofficekit-jni.c
index edd56a2fec37..0f66fdc44fe0 100644
--- a/sal/android/libreofficekit-jni.c
+++ b/sal/android/libreofficekit-jni.c
@@ -37,6 +37,7 @@ extern const char* data_dir;
extern const char* cache_dir;
extern void* apk_file;
extern int apk_file_size;
+extern bool android_lok_from_jni; ///< for the distinction if the LOK is used
for the 'old' (JNI-based) or the 'new' (loolwsd-based) app
AAssetManager* native_asset_manager;
extern void Java_org_libreoffice_android_Bootstrap_putenv(JNIEnv* env, jobject
clazz, jstring string);
@@ -157,6 +158,11 @@ jboolean
Java_org_libreoffice_kit_LibreOfficeKit_initializeNative
size_t data_dir_len;
(void) clazz;
+
+// the 'old' app needs to avoid setting the virtual device to transparent
+// in paintTile(), so indicate we are using the 'old' app
+android_lok_from_jni = true;
+
libreofficekit_initialize(env, dataDir, cacheDir, apkFile, assetManager);
// LibreOfficeKit expects a path to the program/ directory
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/graphite
external/graphite/StaticLibrary_graphite.mk |9 + 1 file changed, 9 insertions(+) New commits: commit 86c1b5ff8f66747a3d4cebe6e2e0d1892db9ba9a Author: Jan Holesovsky AuthorDate: Thu Apr 11 21:17:43 2019 +0200 Commit: Jan Holesovsky CommitDate: Thu Apr 11 21:23:47 2019 +0200 graphite: Force optimization on Android. The Pass.cpp triggers an infinite loop in clang when not optimizing (ie. with the debugging buildls), at least with this version: > ~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ --version Android (5058415 based on r339409) clang version 8.0.2 (https://android.googlesource.com/toolchain/clang 40173bab62ec746213857d083c0e8b0abb568790) (https://android.googlesource.com/toolchain/llvm 7a6618d69e7e8111e1d49dc9e7813767c5ca756a) (based on LLVM 8.0.2svn) Target: x86_64-unknown-linux-gnu Thread model: posix InstalledDir: /local/home/kendy/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin Change-Id: Ib4984f8838fc733be6da4e24eb10915d3efbf79e diff --git a/external/graphite/StaticLibrary_graphite.mk b/external/graphite/StaticLibrary_graphite.mk index 9eeff041dc28..a8f8bce7cc6f 100644 --- a/external/graphite/StaticLibrary_graphite.mk +++ b/external/graphite/StaticLibrary_graphite.mk @@ -32,6 +32,15 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,graphite,\ endif endif +ifeq ($(OS),ANDROID) +# Force optimizations on Android, because otherwise Pass.cpp triggers an +# infinite loop in clang, at least in this version: +# Android (5058415 based on r339409) clang version 8.0.2 (https://android.googlesource.com/toolchain/clang 40173bab62ec746213857d083c0e8b0abb568790) (https://android.googlesource.com/toolchain/llvm 7a6618d69e7e8111e1d49dc9e7813767c5ca756a) (based on LLVM 8.0.2svn) +$(eval $(call gb_StaticLibrary_add_cxxflags,graphite,\ + -Os \ +)) +endif + $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,graphite,cpp)) $(eval $(call gb_StaticLibrary_add_generated_exception_objects,graphite,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/source
vcl/source/gdi/pdfwriter_impl.cxx |6 +++---
vcl/source/gdi/pdfwriter_impl.hxx |2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 053de02e5c3dab5395618c869765bc02dd14d50e
Author: Jan Holesovsky
AuthorDate: Tue Apr 2 23:07:59 2019 +0200
Commit: Jan Holesovsky
CommitDate: Wed Apr 10 11:24:17 2019 +0200
Embedded PDF: It is a shared_ptr, no need to copy.
Change-Id: Iedb31bbe0e81dc9568e84858d8d26eac03c47ffb
Reviewed-on: https://gerrit.libreoffice.org/70208
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 0b5b74e21d3c..818412d734dc 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -4948,12 +4948,12 @@ bool PDFWriterImpl::emitEmbeddedFiles()
aLine.append(rEmbeddedFile.m_nObject);
aLine.append(" 0 obj\n");
aLine.append("<< /Type /EmbeddedFile /Length ");
-aLine.append(static_cast(rEmbeddedFile.m_aData.size()));
+aLine.append(static_cast(rEmbeddedFile.m_pData->size()));
aLine.append(" >>\nstream\n");
CHECK_RETURN(writeBuffer(aLine.getStr(), aLine.getLength()));
aLine.setLength(0);
-CHECK_RETURN(writeBuffer(rEmbeddedFile.m_aData.data(),
rEmbeddedFile.m_aData.size()));
+CHECK_RETURN(writeBuffer(rEmbeddedFile.m_pData->data(),
rEmbeddedFile.m_pData->size()));
aLine.append("\nendstream\nendobj\n\n");
CHECK_RETURN(writeBuffer(aLine.getStr(), aLine.getLength()));
@@ -9708,7 +9708,7 @@ void PDFWriterImpl::createEmbeddedFile(const Graphic&
rGraphic, ReferenceXObject
// Store the original PDF data as an embedded file.
m_aEmbeddedFiles.emplace_back();
m_aEmbeddedFiles.back().m_nObject = createObject();
-m_aEmbeddedFiles.back().m_aData = *rGraphic.getPdfData();
+m_aEmbeddedFiles.back().m_pData = rGraphic.getPdfData();
rEmit.m_nEmbeddedObject = m_aEmbeddedFiles.back().m_nObject;
}
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx
b/vcl/source/gdi/pdfwriter_impl.hxx
index e28896000963..6a84156b6401 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -452,7 +452,7 @@ public:
/// ID of the file.
sal_Int32 m_nObject;
/// Contents of the file.
-std::vector m_aData;
+std::shared_ptr> m_pData;
PDFEmbeddedFile()
: m_nObject(0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 10 commits - include/svx include/vcl sd/source svtools/qa svtools/source svx/source vcl/inc vcl/source
include/svx/svdograf.hxx |2
include/vcl/graph.hxx |5
include/vcl/pdfread.hxx | 34 +
sd/source/filter/pdf/sdpdffilter.cxx | 41 ++
svtools/qa/unit/GraphicObjectTest.cxx |4
svtools/source/graphic/grfcache.cxx | 16 ++
svx/source/svdraw/svdograf.cxx|2
svx/source/svdraw/svdpdf.cxx |4
svx/source/svdraw/svdpdf.hxx |4
svx/source/xml/xmlgrhlp.cxx |4
svx/source/xoutdev/_xoutbmp.cxx |4
vcl/inc/impgraph.hxx | 11 -
vcl/source/filter/graphicfilter.cxx |2
vcl/source/filter/ipdf/pdfread.cxx| 217 +++---
vcl/source/gdi/graph.cxx | 14 +-
vcl/source/gdi/impgraph.cxx | 99 ++-
vcl/source/gdi/pdfextoutdevdata.cxx |2
vcl/source/gdi/pdfwriter_impl.cxx | 10 -
vcl/source/gdi/pdfwriter_impl.hxx |4
19 files changed, 324 insertions(+), 155 deletions(-)
New commits:
commit 9d5c868c04f53ac4d3c369e7596bdcfa512e289b
Author: Jan Holesovsky
AuthorDate: Tue Apr 2 23:03:01 2019 +0200
Commit: Jan Holesovsky
CommitDate: Wed Apr 3 17:54:02 2019 +0200
pdfium: Returning a const std::shared_ptr<...>& is not recommended.
Change-Id: Iff6acef712c5b95c8cc222fc5293c9304b1c03ec
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 4f5108b3f2ce..cb7b04e2aa4a 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -230,7 +230,7 @@ public:
const VectorGraphicDataPtr& getVectorGraphicData() const;
void setPdfData(const std::shared_ptr>& rPdfData);
-const std::shared_ptr>& getPdfData() const;
+std::shared_ptr> getPdfData() const;
bool hasPdfData() const;
/// Set the page number of the multi-page source this Graphic is rendered
from.
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index cdbda1db341c..9631c1c52f0c 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -558,7 +558,7 @@ bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString&
rPictureStorageName,
// vcl::ImportPDF() possibly downgraded the PDF data from a
// higher PDF version, while aGfxLink still contains the
// original data provided by the user.
-std::shared_ptr> pPdfData =
aGraphic.getPdfData();
+std::shared_ptr>
pPdfData(aGraphic.getPdfData());
pStream->WriteBytes(pPdfData->data(), pPdfData->size());
// put into cache
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 63687c3a8313..34cdaab26473 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -192,7 +192,7 @@ ErrCode XOutBitmap::WriteGraphic( const Graphic& rGraphic,
OUString& rFileName,
SfxMedium
aMedium(aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE),
StreamMode::WRITE|StreamMode::SHARE_DENYNONE|StreamMode::TRUNC);
if (SvStream* pOutStream = aMedium.GetOutStream())
{
-const std::shared_ptr>& rPdfData =
rGraphic.getPdfData();
+const std::shared_ptr>
rPdfData(rGraphic.getPdfData());
pOutStream->WriteBytes(rPdfData->data(), rPdfData->size());
aMedium.Commit();
if (!aMedium.GetError())
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index a80e780d00f6..fdae47ced329 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -174,7 +174,7 @@ private:
const VectorGraphicDataPtr& getVectorGraphicData() const { return
maVectorGraphicData; }
-const std::shared_ptr>& getPdfData() const;
+std::shared_ptr> getPdfData() const;
void setPdfData(const std::shared_ptr>& rPdfData);
};
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index bf8da62b15cf..2e6b70e10f53 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -617,14 +617,14 @@ void Graphic::setPdfData(const
std::shared_ptr>& rPdfData)
mxImpGraphic->setPdfData(rPdfData);
}
-const std::shared_ptr>& Graphic::getPdfData() const
+std::shared_ptr> Graphic::getPdfData() const
{
return mxImpGraphic->getPdfData();
}
bool Graphic::hasPdfData() const
{
-std::shared_ptr> pPdfData = getPdfData();
+std::shared_ptr> pPdfData(getPdfData());
return pPdfData && !pPdfData->empty();
}
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 48f10e30a917..cd3d5b9a0c32 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -357,7 +357,7 @@ void ImpGraphic::setPdfData(const
std::shared_ptr>& rPdfDa
mpPdfData = rPdfData;
}
-const std::shared_ptr>& ImpGraphic:
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 5 commits - include/vcl sd/source vcl/inc vcl/source
include/vcl/graph.hxx|1
include/vcl/pdfread.hxx |5 -
sd/source/filter/pdf/sdpdffilter.cxx |5 -
vcl/inc/impgraph.hxx |3
vcl/source/filter/graphicfilter.cxx |2
vcl/source/filter/ipdf/pdfread.cxx | 125 +++
vcl/source/gdi/graph.cxx |6 -
vcl/source/gdi/impgraph.cxx | 82 +++---
vcl/source/gdi/pdfextoutdevdata.cxx |2
9 files changed, 87 insertions(+), 144 deletions(-)
New commits:
commit bb4f5258a221dd6c429d94686f1641377d61b951
Author: Jan Holesovsky
AuthorDate: Thu Mar 28 09:07:13 2019 +0100
Commit: Jan Holesovsky
CommitDate: Thu Mar 28 09:07:13 2019 +0100
Revert "vcl: share GfxLink"
This reverts commit c8f81dbb30e89a19bb7a82f8b52cc02b9049e717.
diff --git a/sd/source/filter/pdf/sdpdffilter.cxx
b/sd/source/filter/pdf/sdpdffilter.cxx
index a4747456123b..26d7c70bdd54 100644
--- a/sd/source/filter/pdf/sdpdffilter.cxx
+++ b/sd/source/filter/pdf/sdpdffilter.cxx
@@ -111,8 +111,7 @@ bool SdPdfFilter::Import()
const size_t nGraphicContentSize = aPdfData.getLength();
std::unique_ptr pGraphicContent(new
sal_uInt8[nGraphicContentSize]);
memcpy(pGraphicContent.get(), aPdfData.get(), nGraphicContentSize);
-std::shared_ptr pGfxLink(std::make_shared(
-std::move(pGraphicContent), nGraphicContentSize,
GfxLinkType::NativePdf));
+GfxLink aGfxLink(std::move(pGraphicContent), nGraphicContentSize,
GfxLinkType::NativePdf);
auto pPdfData = std::make_shared>(aPdfData);
mrDocument.CreateFirstPages();
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index c462dc2c67ac..1a8563e95db0 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -45,7 +45,7 @@ private:
std::unique_ptr mpAnimation;
std::shared_ptr mpContext;
std::shared_ptr mpSwapFile;
-std::shared_ptr mpGfxLink;
+std::unique_ptr mpGfxLink;
GraphicType meType;
mutable sal_uLongmnSizeBytes;
bool mbSwapOut;
@@ -160,7 +160,7 @@ private:
boolImplIsSwapOut() const { return mbSwapOut;}
boolImplIsDummyContext() const { return mbDummyContext; }
-voidImplSetLink( const std::shared_ptr& );
+voidImplSetLink( const GfxLink& );
GfxLink ImplGetLink();
boolImplIsLink() const;
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index 7a869a7aee4b..e7f86486d792 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1854,7 +1854,7 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic,
const OUString& rPath,
}
if( nStatus == ERRCODE_NONE )
{
-rGraphic.SetLink(GfxLink(std::move(pGraphicContent),
nGraphicContentSize, eLinkType));
+rGraphic.SetLink( GfxLink( std::move(pGraphicContent),
nGraphicContentSize, eLinkType ) );
}
}
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 2d73357ec43d..8027d0d85b1d 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -115,7 +115,6 @@ ImpGraphic::ImpGraphic(const ImpGraphic& rImpGraphic)
, maSwapInfo(rImpGraphic.maSwapInfo)
, mpContext(rImpGraphic.mpContext)
, mpSwapFile(rImpGraphic.mpSwapFile)
-, mpGfxLink(rImpGraphic.mpGfxLink)
, meType(rImpGraphic.meType)
, mnSizeBytes(rImpGraphic.mnSizeBytes)
, mbSwapOut(rImpGraphic.mbSwapOut)
@@ -125,6 +124,9 @@ ImpGraphic::ImpGraphic(const ImpGraphic& rImpGraphic)
, maGraphicExternalLink(rImpGraphic.maGraphicExternalLink)
, mnPageNumber(rImpGraphic.mnPageNumber)
{
+if( rImpGraphic.mpGfxLink )
+mpGfxLink = o3tl::make_unique( *rImpGraphic.mpGfxLink );
+
if( rImpGraphic.mpAnimation )
{
mpAnimation = o3tl::make_unique( *rImpGraphic.mpAnimation );
@@ -237,7 +239,10 @@ ImpGraphic& ImpGraphic::operator=( const ImpGraphic&
rImpGraphic )
mbSwapOut = rImpGraphic.mbSwapOut;
mpSwapFile = rImpGraphic.mpSwapFile;
-mpGfxLink = rImpGraphic.mpGfxLink;
+mpGfxLink.reset();
+
+if( rImpGraphic.mpGfxLink )
+mpGfxLink = o3tl::make_unique( *rImpGraphic.mpGfxLink );
maVectorGraphicData = rImpGraphic.maVectorGraphicData;
mpPdfData = rImpGraphic.mpPdfData;
@@ -1365,11 +1370,11 @@ bool ImpGraphic::ImplSwapIn( SvStream* xIStm )
return bRet;
}
-void ImpGraphic::ImplSetLink(const GfxLink& rGfxLink)
+void ImpGraphic::ImplSetLink( const GfxLink& rGfxLink )
{
-mpGfxLink = rGfxLink;
+mpGfxLink = o3tl::make_unique( rGfxLink );
-if (mpGfxLink && mpGfxLink->IsNative())
+if( mpGfxLink->IsNative() )
mpGfxLink->SwapOut();
}
@@ -1484,7 +14
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/vcl vcl/source
include/vcl/pdfread.hxx|5 +
vcl/source/filter/ipdf/pdfread.cxx | 121 +++--
vcl/source/gdi/impgraph.cxx| 40 +++-
3 files changed, 93 insertions(+), 73 deletions(-)
New commits:
commit 6a96ea6378986ad7a8951dde583ae590edae1a65
Author: Jan Holesovsky
AuthorDate: Fri Jun 22 00:44:44 2018 +0200
Commit: Jan Holesovsky
CommitDate: Tue Mar 26 13:56:08 2019 +0100
pdfium: Keep the PDF data in memory, so that we can really share them.
Otherwise the swap out / swap in creates new copy of the underlying PDF
stream.
Change-Id: I88a16a69143783a998201e183bea1a9553e337bd
Reviewed-on: https://gerrit.libreoffice.org/56266
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
Reviewed-on: https://gerrit.libreoffice.org/69626
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/include/vcl/pdfread.hxx b/include/vcl/pdfread.hxx
index 1a1ff0d680cb..c491f50ef34b 100644
--- a/include/vcl/pdfread.hxx
+++ b/include/vcl/pdfread.hxx
@@ -16,6 +16,11 @@
namespace vcl
{
+/// Fills the rBitmaps vector with rendered pages.
+VCL_DLLPUBLIC size_t RenderPDFBitmaps(const void* pBuffer, int nSize,
std::vector& rBitmaps,
+ const size_t nFirstPage = 0, int nPages
= 1,
+ const double fResolutionDPI = 96.);
+
/// Imports a PDF stream into rGraphic as a GDIMetaFile.
VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Bitmap& rBitmap, size_t
nPageIndex,
css::uno::Sequence& rPdfData,
diff --git a/vcl/source/filter/ipdf/pdfread.cxx
b/vcl/source/filter/ipdf/pdfread.cxx
index ab70a0451d9d..16cb902e2476 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -63,68 +63,12 @@ size_t generatePreview(SvStream& rStream,
std::vector& rBitmaps,
const size_t nFirstPage = 0, int nPages = 1,
const double fResolutionDPI = 96.)
{
-FPDF_LIBRARY_CONFIG aConfig;
-aConfig.version = 2;
-aConfig.m_pUserFontPaths = nullptr;
-aConfig.m_pIsolate = nullptr;
-aConfig.m_v8EmbedderSlot = 0;
-FPDF_InitLibraryWithConfig();
-
// Read input into a buffer.
SvMemoryStream aInBuffer;
rStream.Seek(nPos);
aInBuffer.WriteStream(rStream, nSize);
-// Load the buffer using pdfium.
-FPDF_DOCUMENT pPdfDocument = FPDF_LoadMemDocument(aInBuffer.GetData(),
aInBuffer.GetSize(), /*password=*/nullptr);
-if (!pPdfDocument)
-return 0;
-
-const int nPageCount = FPDF_GetPageCount(pPdfDocument);
-if (nPages <= 0)
-nPages = nPageCount;
-const size_t nLastPage = std::min(nPageCount, nFirstPage + nPages) -
1;
-for (size_t nPageIndex = nFirstPage; nPageIndex <= nLastPage; ++nPageIndex)
-{
-// Render next page.
-FPDF_PAGE pPdfPage = FPDF_LoadPage(pPdfDocument, nPageIndex);
-if (!pPdfPage)
-break;
-
-// Returned unit is points, convert that to pixel.
-const size_t nPageWidth = pointToPixel(FPDF_GetPageWidth(pPdfPage),
fResolutionDPI);
-const size_t nPageHeight = pointToPixel(FPDF_GetPageHeight(pPdfPage),
fResolutionDPI);
-FPDF_BITMAP pPdfBitmap = FPDFBitmap_Create(nPageWidth, nPageHeight,
/*alpha=*/1);
-if (!pPdfBitmap)
-break;
-
-const FPDF_DWORD nColor = FPDFPage_HasTransparency(pPdfPage) ?
0x : 0x;
-FPDFBitmap_FillRect(pPdfBitmap, 0, 0, nPageWidth, nPageHeight, nColor);
-FPDF_RenderPageBitmap(pPdfBitmap, pPdfPage, /*start_x=*/0,
/*start_y=*/0, nPageWidth, nPageHeight, /*rotate=*/0, /*flags=*/0);
-
-// Save the buffer as a bitmap.
-Bitmap aBitmap(Size(nPageWidth, nPageHeight), 24);
-{
-Bitmap::ScopedWriteAccess pWriteAccess(aBitmap);
-const auto pPdfBuffer =
static_cast(FPDFBitmap_GetBuffer(pPdfBitmap));
-const int nStride = FPDFBitmap_GetStride(pPdfBitmap);
-for (size_t nRow = 0; nRow < nPageHeight; ++nRow)
-{
-ConstScanline pPdfLine = pPdfBuffer + (nStride * nRow);
-// pdfium byte order is BGRA.
-pWriteAccess->CopyScanline(nRow, pPdfLine,
ScanlineFormat::N32BitTcBgra, nStride);
-}
-}
-
-rBitmaps.emplace_back(std::move(aBitmap));
-FPDFBitmap_Destroy(pPdfBitmap);
-FPDF_ClosePage(pPdfPage);
-}
-
-FPDF_CloseDocument(pPdfDocument);
-FPDF_DestroyLibrary();
-
-return rBitmaps.size();
+return vcl::RenderPDFBitmaps(aInBuffer.GetData(), aInBuffer.GetSize(),
rBitmaps, nFirstPage, nPages, fResolutionDPI);
}
/// Decide if PDF data is old enough to be compatible.
@@ -211,6 +155,69 @@ bool getCompatibleStream(SvStream& rInStream, SvStream&
rOutStream,
namespace vcl
{
+size_t RenderPDFBitmaps(const void
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/vcl sd/source vcl/inc vcl/source
include/vcl/graph.hxx|1 +
sd/source/filter/pdf/sdpdffilter.cxx |2 +-
vcl/inc/impgraph.hxx |3 ++-
vcl/source/gdi/graph.cxx |6 ++
vcl/source/gdi/impgraph.cxx | 31 ---
5 files changed, 38 insertions(+), 5 deletions(-)
New commits:
commit 62654a8c29b945d00afe9f32e87b44ba0d8b84a2
Author: Jan Holesovsky
AuthorDate: Thu Jun 21 21:33:56 2018 +0200
Commit: Jan Holesovsky
CommitDate: Tue Mar 26 12:01:58 2019 +0100
pdfium: Share the GfxLink for PDF files.
Partially based on work by Ashod Nakashian, thanks!
Reviewed-on: https://gerrit.libreoffice.org/56265
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
Change-Id: Id7e8c4543368b0caf3e459abaff8c53997779c83
Reviewed-on: https://gerrit.libreoffice.org/69625
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 45268462155a..881abda221e4 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -216,6 +216,7 @@ private:
public:
voidSetLink( const GfxLink& );
+voidSetSharedLink(const std::shared_ptr& pGfxLink);
GfxLink GetLink() const;
boolIsLink() const;
diff --git a/sd/source/filter/pdf/sdpdffilter.cxx
b/sd/source/filter/pdf/sdpdffilter.cxx
index a4747456123b..95daaeb479f1 100644
--- a/sd/source/filter/pdf/sdpdffilter.cxx
+++ b/sd/source/filter/pdf/sdpdffilter.cxx
@@ -128,7 +128,7 @@ bool SdPdfFilter::Import()
Graphic aGraphic(aBitmap);
aGraphic.setPdfData(pPdfData);
aGraphic.setPageNumber(nPageNumber);
-aGraphic.SetLink(aGfxLink);
+aGraphic.SetSharedLink(pGfxLink);
aGraphic.setOriginURL(aFileName);
// Create the page and insert the Graphic.
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index c462dc2c67ac..3d998ec94ac5 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -160,7 +160,8 @@ private:
boolImplIsSwapOut() const { return mbSwapOut;}
boolImplIsDummyContext() const { return mbDummyContext; }
-voidImplSetLink( const std::shared_ptr& );
+voidImplSetLink( const GfxLink& );
+voidImplSetSharedLink(const std::shared_ptr&
pGfxLink);
GfxLink ImplGetLink();
boolImplIsLink() const;
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 1fc7897ac90b..04e567e44d5d 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -569,6 +569,12 @@ void Graphic::SetLink( const GfxLink& rGfxLink )
mxImpGraphic->ImplSetLink( rGfxLink );
}
+void Graphic::SetSharedLink(const std::shared_ptr& pGfxLink)
+{
+ImplTestRefCount();
+mxImpGraphic->ImplSetSharedLink(pGfxLink);
+}
+
GfxLink Graphic::GetLink() const
{
return mxImpGraphic->ImplGetLink();
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 2d73357ec43d..6e837c979e78 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -125,6 +125,14 @@ ImpGraphic::ImpGraphic(const ImpGraphic& rImpGraphic)
, maGraphicExternalLink(rImpGraphic.maGraphicExternalLink)
, mnPageNumber(rImpGraphic.mnPageNumber)
{
+if( rImpGraphic.mpGfxLink )
+{
+if (rImpGraphic.mpGfxLink->GetType() == GfxLinkType::NativePdf)
+mpGfxLink = rImpGraphic.mpGfxLink;
+else
+mpGfxLink = std::make_shared(*rImpGraphic.mpGfxLink);
+}
+
if( rImpGraphic.mpAnimation )
{
mpAnimation = o3tl::make_unique( *rImpGraphic.mpAnimation );
@@ -237,9 +245,18 @@ ImpGraphic& ImpGraphic::operator=( const ImpGraphic&
rImpGraphic )
mbSwapOut = rImpGraphic.mbSwapOut;
mpSwapFile = rImpGraphic.mpSwapFile;
-mpGfxLink = rImpGraphic.mpGfxLink;
+if (rImpGraphic.mpGfxLink)
+{
+if (rImpGraphic.mpGfxLink->GetType() == GfxLinkType::NativePdf)
+mpGfxLink = rImpGraphic.mpGfxLink;
+else
+{
+mpGfxLink.reset();
+
+mpGfxLink = std::make_shared(*rImpGraphic.mpGfxLink);
+}
+}
-maVectorGraphicData = rImpGraphic.maVectorGraphicData;
mpPdfData = rImpGraphic.mpPdfData;
}
@@ -1367,7 +1384,15 @@ bool ImpGraphic::ImplSwapIn( SvStream* xIStm )
void ImpGraphic::ImplSetLink(const GfxLink& rGfxLink)
{
-mpGfxLink = rGfxLink;
+mpGfxLink = std::make_shared( rGfxLink );
+
+if( mpGfxLink->IsNative() )
+mpGfxLink->SwapOut();
+}
+
+void ImpGraphic::ImplSetSharedLink(const std::shared_ptr& pGfxLink)
+{
+mpGfxLink = pGfxLink;
if (mpGfxLink && mpGfxLink->IsNative())
mpGfxLink->SwapOut();
__
[Libreoffice-commits] core.git: desktop/source
desktop/source/lib/init.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit cc4228b028d969a9bb49a5d2451eaa88aa400eae
Author: Jan Holesovsky
AuthorDate: Thu Mar 21 14:18:35 2019 +0100
Commit: Jan Holesovsky
CommitDate: Fri Mar 22 14:40:17 2019 +0100
lok: Keep the temporary user profile set during the entire preload.
Otherwise the core likes to crash due to the keyboard accellerators
being read, but the configuration is missing.
Change-Id: I94193f47462227b5975a49ce11709d7bf415a519
Reviewed-on: https://gerrit.libreoffice.org/69508
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 84d9b4b59976..a83af85d4441 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4392,9 +4392,6 @@ static void preloadData()
}
std::cerr << "\n";
-// Set user profile's path back to the original one
-rtl::Bootstrap::set("UserInstallation", sUserPath);
-
css::uno::Reference< css::ui::XAcceleratorConfiguration > xGlobalCfg;
xGlobalCfg = css::ui::GlobalAcceleratorConfiguration::create(
comphelper::getProcessComponentContext());
@@ -4434,6 +4431,9 @@ static void preloadData()
nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale,
false), COMPLEX);
OutputDevice::GetDefaultFont(DefaultFontType::CTL_SPREADSHEET, nLang,
GetDefaultFontFlags::OnlyOne);
}
+
+// Set user profile's path back to the original one
+rtl::Bootstrap::set("UserInstallation", sUserPath);
}
static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const
char* pUserProfileUrl)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Minutes of ESC call: 2019-02-21
* Present: + Eike, Thorsten, Kendy, Sophie, Miklos, Gabriel, Heiko, Christian, Michael W., Michael S., Caolán, Stephan, Heiko, Olivier * Completed Action Items: + send code pointers to Olivier on UNO commands ↔ UI XML mapping (Kendy) [ Olivier will poke Kendy when needed ] * Pending Action Items: + review/update GSOC ideas page! (Mentors) + https://wiki.documentfoundation.org/Development/GSoC/Ideas + deadline: early next week + disable popups for development-build only in 6.2/.3 (Justin L) https://bugs.documentfoundation.org/show_bug.cgi?id=123270 [ sent some code pointers ] * Release Engineering update (Christian) + 6.2.1 rc2 status + due this week, not tagged yet + Will tag later today or tomorrow. + 6.1.6 rc1: April 9 + 6.3 alpha1: early May + The plan is in the wiki now + hard freeze: July; feature freeze end of May + UI + string freeze in between - June (Cloph) + if distros have special needs, please let Cloph know + Remotes + Android viewer + Online * Documentation (Olivier) + New Help + Fixes in logic for main help entry (olivier) + fix in Help build (sberg) + Fix of Help button (Caolán) + CSS improvements (fistoshido) + Helpcontents2 + More pages in python (libreofficiant) + upgrades in pages (olivier, kompilainen, buovjaga) + Guides + Migration to NextCloud + LOOL + Resuming update of Calc book + new team members + welcome! :-) - from the US + considering updating the meeting time to fit the Americas better * UX Update (Heiko) + Bugzilla (topicUI) statistics 248(248) (topicUI) bugs open, 266(266) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week1 month3 months 12 months added 7(-3) 17(-5) 37(-6) 97(-5) commented 36(-15) 138(-38) 411(-11) 1425(-15) removed 0(0) 0(-2) 7(-2) 14(-1) resolved 4(-1) 20(-3) 42(0) 122(0) + top 10 contributors: Tietze, Heiko made 52 changes in 1 month, and 550 changes in 1 year Cor Nouws made 31 changes in 1 month, and 101 changes in 1 year Kainz, Andreas made 30 changes in 1 month, and 170 changes in 1 year Xisco Faulí made 28 changes in 1 month, and 304 changes in 1 year dieterp made 27 changes in 1 month, and 147 changes in 1 year Roman Kuznetsov made 27 changes in 1 month, and 110 changes in 1 year Foote, V Stuart made 21 changes in 1 month, and 222 changes in 1 year Telesto made 16 changes in 1 month, and 67 changes in 1 year BogdanB made 12 changes in 1 month, and 29 changes in 1 year Alex ARNAUD made 10 changes in 1 month, and 17 changes in 1 year New needsUXEval between Feb/14-21 * Windows 10 Notebookbar doesn't display personalized themes + https://bugs.documentfoundation.org/show_bug.cgi?id=123254 => dup * Setting a Hyperlink to a Bookmark in a W-Document should Become Easier + https://bugs.documentfoundation.org/show_bug.cgi?id=123514 * Should be possible to customise menu/toolbars delivered with an extension + https://bugs.documentfoundation.org/show_bug.cgi?id=123590 -> * New wizard for filling bank checks + https://bugs.documentfoundation.org/show_bug.cgi?id=123599 => in discussion * Accessibility: No keyboard shortcut to open a HYPERLINK in Calc cells + https://bugs.documentfoundation.org/show_bug.cgi?id=123159 * Sidebar content panel title's "more optns" btn not accessible w shift tab + https://bugs.documentfoundation.org/show_bug.cgi?id=102140 -> * I Want an Acoustic plus an Optical Signal when Wrap Around happens when Searching or Searching and Replacing + https://bugs.documentfoundation.org/show_bug.cgi?id=123565 => new + could we use the Beep() similar to what is in BASIC? (Miklos) + not really, the ideal would be to use the system sounds + system settings -> * Allow User to Select External Image Editing Tool + https://bugs.documentfoundation.org/show_bug.cgi?id=51096 -> * Add opportunity to open Autofilter window uses shortcut + https://bugs.documentfoundation.org/show_bug.cgi?id=123560 -> * NAVIGATOR, "copy outline to clipboard" should be avail in context menu + https://bugs.documentfoundation.org/show_bug.cgi?id=123395 => easyhack/needsdeveval * Crash Testing (Caolan) + 1(+0) import failure, 4(+0) export failures - redline-relate + coverity issues - coverity is back up - but we now need c++17, which isn’t working yet - asked coverity, and “new version will be deployed in the coming few months”
[Libreoffice-qa] Minutes of ESC call: 2019-02-21
* Present: + Eike, Thorsten, Kendy, Sophie, Miklos, Gabriel, Heiko, Christian, Michael W., Michael S., Caolán, Stephan, Heiko, Olivier * Completed Action Items: + send code pointers to Olivier on UNO commands ↔ UI XML mapping (Kendy) [ Olivier will poke Kendy when needed ] * Pending Action Items: + review/update GSOC ideas page! (Mentors) + https://wiki.documentfoundation.org/Development/GSoC/Ideas + deadline: early next week + disable popups for development-build only in 6.2/.3 (Justin L) https://bugs.documentfoundation.org/show_bug.cgi?id=123270 [ sent some code pointers ] * Release Engineering update (Christian) + 6.2.1 rc2 status + due this week, not tagged yet + Will tag later today or tomorrow. + 6.1.6 rc1: April 9 + 6.3 alpha1: early May + The plan is in the wiki now + hard freeze: July; feature freeze end of May + UI + string freeze in between - June (Cloph) + if distros have special needs, please let Cloph know + Remotes + Android viewer + Online * Documentation (Olivier) + New Help + Fixes in logic for main help entry (olivier) + fix in Help build (sberg) + Fix of Help button (Caolán) + CSS improvements (fistoshido) + Helpcontents2 + More pages in python (libreofficiant) + upgrades in pages (olivier, kompilainen, buovjaga) + Guides + Migration to NextCloud + LOOL + Resuming update of Calc book + new team members + welcome! :-) - from the US + considering updating the meeting time to fit the Americas better * UX Update (Heiko) + Bugzilla (topicUI) statistics 248(248) (topicUI) bugs open, 266(266) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week1 month3 months 12 months added 7(-3) 17(-5) 37(-6) 97(-5) commented 36(-15) 138(-38) 411(-11) 1425(-15) removed 0(0) 0(-2) 7(-2) 14(-1) resolved 4(-1) 20(-3) 42(0) 122(0) + top 10 contributors: Tietze, Heiko made 52 changes in 1 month, and 550 changes in 1 year Cor Nouws made 31 changes in 1 month, and 101 changes in 1 year Kainz, Andreas made 30 changes in 1 month, and 170 changes in 1 year Xisco Faulí made 28 changes in 1 month, and 304 changes in 1 year dieterp made 27 changes in 1 month, and 147 changes in 1 year Roman Kuznetsov made 27 changes in 1 month, and 110 changes in 1 year Foote, V Stuart made 21 changes in 1 month, and 222 changes in 1 year Telesto made 16 changes in 1 month, and 67 changes in 1 year BogdanB made 12 changes in 1 month, and 29 changes in 1 year Alex ARNAUD made 10 changes in 1 month, and 17 changes in 1 year New needsUXEval between Feb/14-21 * Windows 10 Notebookbar doesn't display personalized themes + https://bugs.documentfoundation.org/show_bug.cgi?id=123254 => dup * Setting a Hyperlink to a Bookmark in a W-Document should Become Easier + https://bugs.documentfoundation.org/show_bug.cgi?id=123514 * Should be possible to customise menu/toolbars delivered with an extension + https://bugs.documentfoundation.org/show_bug.cgi?id=123590 -> * New wizard for filling bank checks + https://bugs.documentfoundation.org/show_bug.cgi?id=123599 => in discussion * Accessibility: No keyboard shortcut to open a HYPERLINK in Calc cells + https://bugs.documentfoundation.org/show_bug.cgi?id=123159 * Sidebar content panel title's "more optns" btn not accessible w shift tab + https://bugs.documentfoundation.org/show_bug.cgi?id=102140 -> * I Want an Acoustic plus an Optical Signal when Wrap Around happens when Searching or Searching and Replacing + https://bugs.documentfoundation.org/show_bug.cgi?id=123565 => new + could we use the Beep() similar to what is in BASIC? (Miklos) + not really, the ideal would be to use the system sounds + system settings -> * Allow User to Select External Image Editing Tool + https://bugs.documentfoundation.org/show_bug.cgi?id=51096 -> * Add opportunity to open Autofilter window uses shortcut + https://bugs.documentfoundation.org/show_bug.cgi?id=123560 -> * NAVIGATOR, "copy outline to clipboard" should be avail in context menu + https://bugs.documentfoundation.org/show_bug.cgi?id=123395 => easyhack/needsdeveval * Crash Testing (Caolan) + 1(+0) import failure, 4(+0) export failures - redline-relate + coverity issues - coverity is back up - but we now need c++17, which isn’t working yet - asked coverity, and “new version will be deployed in the coming few months”
LibreOffice ESC call, Thur - 16:00 central European (local) time
Hi everyone, Prototype agenda below, bug metrics also at the link below; extra items appreciated as last-week: https://demo.collaboracloudsuite.com/tdf/ Lets use the new TDF jitsi goodness this week at: http://jitsi.documentfoundation.org/esc All the best, Kendy * Completed Action Items: + * Pending Action Items: + review/update GSOC ideas page! (Mentors) + https://wiki.documentfoundation.org/Development/GSoC/Ideas + disable popups for development-build only in 6.2/.3 (Justin L) https://bugs.documentfoundation.org/show_bug.cgi?id=123270 [ sent some code pointers ] + send code pointers to Olivier on UNO commands ↔ UI XML mapping (Kendy) [ best to connection IRC to remind Kendy ] * Release Engineering update (Christian) + 6.2.1 rc2 status + + 6.1.6 rc1: April 9 + 6.3 alpha1: early April + Remotes + Android viewer + Online * Documentation (Olivier) + * UX Update (Heiko) + Bugzilla (topicUI) statistics 248(248) (topicUI) bugs open, 266(266) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week1 month3 months 12 months added 7(-3) 17(-5) 37(-6) 97(-5) commented 36(-15) 138(-38) 411(-11) 1425(-15) removed 0(0) 0(-2) 7(-2) 14(-1) resolved 4(-1) 20(-3) 42(0) 122(0) + top 10 contributors: Tietze, Heiko made 52 changes in 1 month, and 550 changes in 1 year Cor Nouws made 31 changes in 1 month, and 101 changes in 1 year Kainz, Andreas made 30 changes in 1 month, and 170 changes in 1 year Xisco Faulí made 28 changes in 1 month, and 304 changes in 1 year dieterp made 27 changes in 1 month, and 147 changes in 1 year Roman Kuznetsov made 27 changes in 1 month, and 110 changes in 1 year Foote, V Stuart made 21 changes in 1 month, and 222 changes in 1 year Telesto made 16 changes in 1 month, and 67 changes in 1 year BogdanB made 12 changes in 1 month, and 29 changes in 1 year Alex ARNAUD made 10 changes in 1 month, and 17 changes in 1 year + New needsUXEval * Crash Testing (Caolan) + 1(+0) import failure, 4(+0) export failures + ??? coverity issues + Google / ossfuzz: ?? fuzzers active now + ForcePoint, round 9 + + CVE issues + + CNA process + have an appointment for on-boarding video: ~22nd. * Crash Reporting (Xisco) + * Hackfests & Events (Thorsten) + this year hackfests coming up: + Tirana perhaps in March/April + https://forum.openlabs.cc/t/libreoffice-hackfest-tirana-2019/1658 + no definitive dates here; reply on the post perhaps (Xisco) + Paris in summer + discuss timing – end of June or sometime July + please let Sophie know your preferences if you like to attend + tentative Dresden: late autumn (past mid-October, for having students) + hope to have one each quarter. * GSOC 2019 (Thorsten, Xisco) + https://opensource.googleblog.com/2018/11/google-summer-of-code-15-years-strong.html + application is in; waiting for: + list of accepted orgs published on February 26th + all mentors to update list of ideas. * C++ lectures (Xisco) + https://wiki.documentfoundation.org/Events/C%2B%2BLectures + NEXT SESSION: 28th February * mentoring/easyhack update committer... 1 week 1 month 3 months 12 months open 55(-30)105(-21) 109(-24) 123(-23) reviews 1227(2) 4833(-456) 13532(-151) 41751(471) merged 275(31)1171(-76) 3655(6) 14699(-64) abandoned7(-5) 59(-5) 146(-10) 831(-8) own commits 292(89)1051(54) 3305(-114) 14763(-22) review commits 69(17) 306(-9) 1030(-43) 3855(-2) contributor... 1 week 1 month3 months 12 months open 28(7) 45(2) 47(0)48(0) reviews 58(5)212(-2)542(3) 11420(-765) merged 28(-3) 124(-4)420(-22)1802(-20) abandoned 5(-6)27(2) 74(4) 314(2) own commits 29(-1) 149(-19) 510(-21)1681(-18) review commits 0(0) 0(0) 0(0) 0(0) + easyHack statistics: needsDevEval 84(84) needsUXEval 4(4) cleanup_comments 258(258) total 320(320) assigned 23(23) open 205(205) + top 10 contributors: Gelmini, Andrea made 46 patches in 1 month, and 544 patches in 1 year LibreOfficiant made 16 patches in 1 month, and 28 patches in 1 year Illarionov, Arkadiy made 12 patches in 1 month, and
Re: Libre Office Online - dialog translations
Hi Irina, Irina Bulciu píše v St 20. 02. 2019 v 14:59 +: > Is there any way of loading the dialogs inside Libre Office Online in > other language than English ? Where could we make this change to load > a different language ? Yes, there is; the code where I've implemented that was: https://cgit.freedesktop.org/libreoffice/core/commit/?id=e16852cd1bc5d9e0646ae4183bc13a7bce19df7f and https://cgit.freedesktop.org/libreoffice/core/commit/?id=101a79cc4d13a1f566c1b97c1329813eb7c61bcf for the core part (but in the meantime that changed a bit after migrating to the gettext usage, instead of ResMgr), and https://cgit.freedesktop.org/libreoffice/online/commit/?id=525284e32d1a565c2521532fce9bea6c3d27c260 for the online part. Does that help? :-) All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-qa] Minutes of ESC call: 2018-08-16
* Present: + Kendy, Olivier, Xisco, Stephan, Sophie, Eike, Heiko, Caolan, Cloph, Thorsten * Completed Action Items: * Pending Action Items: + get download numbers for 32bit Linux (Christian) + default bitergia filter for master + libreoffice-* (Christian) * Release Engineering update (Christian) + 6.0.7 - in October + we might consider 6.0.8 too, between the 6.0.7 and 6.2.0 (?) + 6.1.1 RC1 update + not releasesed yet, some stuff still needed to sort out + numbertext data missing, waiting to be patched + Remotes + Android viewer + not updated yet in the end + Online + release plan for 6.2 missing at the wiki (Heiko) + actually only missing in the overview, but otherwise it is there (Cloph) https://wiki.documentfoundation.org/ReleasePlan/6.2 AI: + add it to the overview (Cloph) * Documentation (Olivier) +New Help + Refactoring HTML and JS of help pages (Kendy) + housekeeping (ohallot, kendy) + bookmarks patches committed to 6.1 branch (cloph) + Help + Fix typos (A Gelmini, fitoshido) + Guides: + More chapters reviewed for Getting Started + Book assembly on the way. * UX Update (Heiko) + Bugzilla (topicUI) statistics 246(246) (topicUI) bugs open, 288(288) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week 1 month 3 months 12 months added 8(4) 15(5) 26(8) 91(5) commented 38(6)166(21) 308(29)1714(16) removed 0(0) 0(0) 1(0)9(0) resolved 2(-2)15(-1)28(2) 152(-2) + top 10 contributors: Tietze, Heiko made 57 changes in 1 month, and 621 changes in 1 year Foote, V Stuart made 44 changes in 1 month, and 270 changes in 1 year Xisco Faulí made 27 changes in 1 month, and 324 changes in 1 year Kaganski, Mike made 26 changes in 1 month, and 73 changes in 1 year Faure, Jean-Baptiste made 17 changes in 1 month, and 57 changes in 1 year Timur made 16 changes in 1 month, and 66 changes in 1 year Nabet, Julien made 15 changes in 1 month, and 26 changes in 1 year Telesto made 12 changes in 1 month, and 94 changes in 1 year Buovjaga made 11 changes in 1 month, and 187 changes in 1 year Kainz, Andreas made 9 changes in 1 month, and 44 changes in 1 year New needsUXEval from Aug/07-Aug/16: * "Application Colors" should be transferred from Options (how it works) to Customize (how it looks) + https://bugs.documentfoundation.org/show_bug.cgi?id=119277 * Wrong paper size B5, instead of A4 + https://bugs.documentfoundation.org/show_bug.cgi?id=116386 + default to "Fit to printable page"? and c12 * Improve anchor of images + https://bugs.documentfoundation.org/show_bug.cgi?id=117329 + WFM * Right-click section title to expand this section and collapse all other sections + https://bugs.documentfoundation.org/show_bug.cgi?id=119275 + WFM * UI Consistency (of insert rows) + https://bugs.documentfoundation.org/show_bug.cgi?id=119293 + terminology above/below vs. before/after + Add color customization for sheet tabs and title in Calc * https://bugs.documentfoundation.org/show_bug.cgi?id=88840 * use system color for selected objects + dup/rep of https://bugs.documentfoundation.org/show_bug.cgi?id=104564 * Feature request: mark comments as resolved + https://bugs.documentfoundation.org/show_bug.cgi?id=119228 * Associate a character style to cross-reference fields + https://bugs.documentfoundation.org/show_bug.cgi?id=119048 + use case not perfectly clear to me * The Track changes toolbar and the Table toolbar appear at the same place + https://bugs.documentfoundation.org/show_bug.cgi?id=119167 * LibreOffice hangs reopening the "Select Firefox Theme" for a second time + https://bugs.documentfoundation.org/show_bug.cgi?id=119127 + dup of "Personas not found again" + https://bugs.documentfoundation.org/show_activity.cgi?id=118881 * Replace Quickstarter by taking advantage of the Windows native "always running" startup method + https://bugs.documentfoundation.org/show_bug.cgi?id=116694 + needsDevAdvice * Discussion about gen plugin on the dev ML + seems to be missing icons but all remaining should have been moved from Galaxy to Tango + icon theme issue + Heiko looking into this * Discussion to change the templates site layout on the design ML + Andreas M. created a playground though no clear plan yet * Crash Reporting (Caolan) + 1 import failure, 1 export failures + much improved, re-running to see if it is really so + 0 coverity issues + Google / ossfuzz: down for a while, build fixed again - 15 issues, 5 series - build fixed
Minutes of ESC call: 2018-08-16
* Present: + Kendy, Olivier, Xisco, Stephan, Sophie, Eike, Heiko, Caolan, Cloph, Thorsten * Completed Action Items: * Pending Action Items: + get download numbers for 32bit Linux (Christian) + default bitergia filter for master + libreoffice-* (Christian) * Release Engineering update (Christian) + 6.0.7 - in October + we might consider 6.0.8 too, between the 6.0.7 and 6.2.0 (?) + 6.1.1 RC1 update + not releasesed yet, some stuff still needed to sort out + numbertext data missing, waiting to be patched + Remotes + Android viewer + not updated yet in the end + Online + release plan for 6.2 missing at the wiki (Heiko) + actually only missing in the overview, but otherwise it is there (Cloph) https://wiki.documentfoundation.org/ReleasePlan/6.2 AI: + add it to the overview (Cloph) * Documentation (Olivier) +New Help + Refactoring HTML and JS of help pages (Kendy) + housekeeping (ohallot, kendy) + bookmarks patches committed to 6.1 branch (cloph) + Help + Fix typos (A Gelmini, fitoshido) + Guides: + More chapters reviewed for Getting Started + Book assembly on the way. * UX Update (Heiko) + Bugzilla (topicUI) statistics 246(246) (topicUI) bugs open, 288(288) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week 1 month 3 months 12 months added 8(4) 15(5) 26(8) 91(5) commented 38(6)166(21) 308(29)1714(16) removed 0(0) 0(0) 1(0)9(0) resolved 2(-2)15(-1)28(2) 152(-2) + top 10 contributors: Tietze, Heiko made 57 changes in 1 month, and 621 changes in 1 year Foote, V Stuart made 44 changes in 1 month, and 270 changes in 1 year Xisco Faulí made 27 changes in 1 month, and 324 changes in 1 year Kaganski, Mike made 26 changes in 1 month, and 73 changes in 1 year Faure, Jean-Baptiste made 17 changes in 1 month, and 57 changes in 1 year Timur made 16 changes in 1 month, and 66 changes in 1 year Nabet, Julien made 15 changes in 1 month, and 26 changes in 1 year Telesto made 12 changes in 1 month, and 94 changes in 1 year Buovjaga made 11 changes in 1 month, and 187 changes in 1 year Kainz, Andreas made 9 changes in 1 month, and 44 changes in 1 year New needsUXEval from Aug/07-Aug/16: * "Application Colors" should be transferred from Options (how it works) to Customize (how it looks) + https://bugs.documentfoundation.org/show_bug.cgi?id=119277 * Wrong paper size B5, instead of A4 + https://bugs.documentfoundation.org/show_bug.cgi?id=116386 + default to "Fit to printable page"? and c12 * Improve anchor of images + https://bugs.documentfoundation.org/show_bug.cgi?id=117329 + WFM * Right-click section title to expand this section and collapse all other sections + https://bugs.documentfoundation.org/show_bug.cgi?id=119275 + WFM * UI Consistency (of insert rows) + https://bugs.documentfoundation.org/show_bug.cgi?id=119293 + terminology above/below vs. before/after + Add color customization for sheet tabs and title in Calc * https://bugs.documentfoundation.org/show_bug.cgi?id=88840 * use system color for selected objects + dup/rep of https://bugs.documentfoundation.org/show_bug.cgi?id=104564 * Feature request: mark comments as resolved + https://bugs.documentfoundation.org/show_bug.cgi?id=119228 * Associate a character style to cross-reference fields + https://bugs.documentfoundation.org/show_bug.cgi?id=119048 + use case not perfectly clear to me * The Track changes toolbar and the Table toolbar appear at the same place + https://bugs.documentfoundation.org/show_bug.cgi?id=119167 * LibreOffice hangs reopening the "Select Firefox Theme" for a second time + https://bugs.documentfoundation.org/show_bug.cgi?id=119127 + dup of "Personas not found again" + https://bugs.documentfoundation.org/show_activity.cgi?id=118881 * Replace Quickstarter by taking advantage of the Windows native "always running" startup method + https://bugs.documentfoundation.org/show_bug.cgi?id=116694 + needsDevAdvice * Discussion about gen plugin on the dev ML + seems to be missing icons but all remaining should have been moved from Galaxy to Tango + icon theme issue + Heiko looking into this * Discussion to change the templates site layout on the design ML + Andreas M. created a playground though no clear plan yet * Crash Reporting (Caolan) + 1 import failure, 1 export failures + much improved, re-running to see if it is really so + 0 coverity issues + Google / ossfuzz: down for a while, build fixed again - 15 issues, 5 series - build fixed
[Libreoffice-qa] Minutes of ESC call: 2018-08-08
* Present: + Heiko, Cloph, Olivier, Xisco, Michael W., Stephan, Kendy, Thorsten * Completed Action Items: * Pending Action Items: + get download numbers for 32bit Linux (Christian) + default bitergia filter for master + libreoffice-* (Christian) * Release Engineering update (Christian) + 6.0.7 - in October + we might consider 6.0.8 too, between the 6.0.7 and 6.2.0 (?) + 6.1.0 RC3 update + created as final today + Remotes + Android viewer + building a new release – to be released on weekend (Christian) + Online * Documentation (Olivier) + New Help + Online New features video updated to 6.1 (ohallot) + redirections and sitemaps for 6.1 (online) (ohallot) + some patches still in 6-1 branches to approve + do not affect the translations + Online help editor + Initial upload to git dev-tools (M. Saunders) + based on CodeMirror (M. Saunders) + Added ~20 XHP snippets for ease of content insert (ohallot) + for creating paragraphs including the unique ID etc. + very encouraging! (Kendy) + Help Content + Fix contents, typos (M. Kaganski, A. Gelmini, fitoshido) + Guides + writer Guide 6.0 released (Jean Weber) + Getting Started 6.0 still under review/assembling * UX Update (Heiko) + Bugzilla (topicUI) statistics 247(247) (topicUI) bugs open, 280(280) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week1 month 3 months 12 months added 4(3) 10(1) 18(0) 86(0) commented 32(-17) 145(-3) 279(-3)1698(11) removed 0(0) 0(-1) 1(0)9(-1) resolved 4(-4) 16(3) 26(2) 154(-3) + top 10 contributors: Tietze, Heiko made 53 changes in 1 month, and 650 changes in 1 year Foote, V Stuart made 52 changes in 1 month, and 277 changes in 1 year Xisco Faulí made 22 changes in 1 month, and 316 changes in 1 year Buovjaga made 21 changes in 1 month, and 192 changes in 1 year Kaganski, Mike made 20 changes in 1 month, and 64 changes in 1 year Timur made 16 changes in 1 month, and 60 changes in 1 year Nabet, Julien made 12 changes in 1 month, and 23 changes in 1 year Telesto made 11 changes in 1 month, and 90 changes in 1 year Faure, Jean-Baptiste made 10 changes in 1 month, and 50 changes in 1 year Kainz, Andreas made 9 changes in 1 month, and 42 changes in 1 year + 119088 - Calc should show overwrite warning on clipboard paste to cell with text + 119085 – Bundling a new Garamond font + 2.5M, by Google + 119065 – Last bullet of the bullet list is disappearing + 119063 - wontfix * Crash Reporting (Caolan) + 9(+6) import failure, 11(+3) export failures + ??? coverity issues + Google / ossfuzz: ?? fuzzers active now * Crash Reporting (Xisco) + http://crashreport.libreoffice.org/stats/version/5.4.7.2 + 547 (last 7 days) (+27) + http://crashreport.libreoffice.org/stats/version/6.0.4.2 + 758 (last 7 days) (+38) + http://crashreport.libreoffice.org/stats/version/6.0.5.2 + 1287 (last 7 days) (-113) + http://crashreport.libreoffice.org/stats/version/6.0.6.2 + 307 (last 7 days) (+307) * GSoC schedule (Heiko) + Coding: May 14 - August 6 + Students Submit Code and Final Evaluations: August 6 – 14 + 1 URL that is not modifiable, with all the artifacts + push your student to do that!!! + Mentors Submit Final Evaluations: August 14 - 21 + Results Announced: August 22 + https://wiki.documentfoundation.org/Development/GSoC/2018 * Hackfests & Events + Akademy in Vienna Aug 11-17th + maybe Bubli… (Thorsten) + FrOScon in Bonn: Aug 25 + Bubli, Thorsten, perhaps Cloph. + maybe Munich (Thorsten) + Conference – September + potentially one in Bern / Switzerland - October 19th. + working on a Munich event October 26-28th (Thorsten) + an Open Gov’t meeting from the City of Munich + good to have a hack-fest back-to-back there. + moving slowly here … * mentoring/easyhack update committer... 1 week 1 month 3 months 12 months open 109(1) 190(41) 190(40) 201(41) reviews 1279(-374) 5185(-580) 10986(401) 24632(506) merged 231(-197) 1237(-83) 3759(-28) 14253(12) abandoned8(-2) 43(-9) 259(-2) 966(-4) own commits 206(-162) 1073(-38) 3529(-76) 15485(181) review commits 95(31) 322(12) 957(16) 3736(84) contributor... 1 week1 month3 months 12 months open
Minutes of ESC call: 2018-08-08
* Present: + Heiko, Cloph, Olivier, Xisco, Michael W., Stephan, Kendy, Thorsten * Completed Action Items: * Pending Action Items: + get download numbers for 32bit Linux (Christian) + default bitergia filter for master + libreoffice-* (Christian) * Release Engineering update (Christian) + 6.0.7 - in October + we might consider 6.0.8 too, between the 6.0.7 and 6.2.0 (?) + 6.1.0 RC3 update + created as final today + Remotes + Android viewer + building a new release – to be released on weekend (Christian) + Online * Documentation (Olivier) + New Help + Online New features video updated to 6.1 (ohallot) + redirections and sitemaps for 6.1 (online) (ohallot) + some patches still in 6-1 branches to approve + do not affect the translations + Online help editor + Initial upload to git dev-tools (M. Saunders) + based on CodeMirror (M. Saunders) + Added ~20 XHP snippets for ease of content insert (ohallot) + for creating paragraphs including the unique ID etc. + very encouraging! (Kendy) + Help Content + Fix contents, typos (M. Kaganski, A. Gelmini, fitoshido) + Guides + writer Guide 6.0 released (Jean Weber) + Getting Started 6.0 still under review/assembling * UX Update (Heiko) + Bugzilla (topicUI) statistics 247(247) (topicUI) bugs open, 280(280) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week1 month 3 months 12 months added 4(3) 10(1) 18(0) 86(0) commented 32(-17) 145(-3) 279(-3)1698(11) removed 0(0) 0(-1) 1(0)9(-1) resolved 4(-4) 16(3) 26(2) 154(-3) + top 10 contributors: Tietze, Heiko made 53 changes in 1 month, and 650 changes in 1 year Foote, V Stuart made 52 changes in 1 month, and 277 changes in 1 year Xisco Faulí made 22 changes in 1 month, and 316 changes in 1 year Buovjaga made 21 changes in 1 month, and 192 changes in 1 year Kaganski, Mike made 20 changes in 1 month, and 64 changes in 1 year Timur made 16 changes in 1 month, and 60 changes in 1 year Nabet, Julien made 12 changes in 1 month, and 23 changes in 1 year Telesto made 11 changes in 1 month, and 90 changes in 1 year Faure, Jean-Baptiste made 10 changes in 1 month, and 50 changes in 1 year Kainz, Andreas made 9 changes in 1 month, and 42 changes in 1 year + 119088 - Calc should show overwrite warning on clipboard paste to cell with text + 119085 – Bundling a new Garamond font + 2.5M, by Google + 119065 – Last bullet of the bullet list is disappearing + 119063 - wontfix * Crash Reporting (Caolan) + 9(+6) import failure, 11(+3) export failures + ??? coverity issues + Google / ossfuzz: ?? fuzzers active now * Crash Reporting (Xisco) + http://crashreport.libreoffice.org/stats/version/5.4.7.2 + 547 (last 7 days) (+27) + http://crashreport.libreoffice.org/stats/version/6.0.4.2 + 758 (last 7 days) (+38) + http://crashreport.libreoffice.org/stats/version/6.0.5.2 + 1287 (last 7 days) (-113) + http://crashreport.libreoffice.org/stats/version/6.0.6.2 + 307 (last 7 days) (+307) * GSoC schedule (Heiko) + Coding: May 14 - August 6 + Students Submit Code and Final Evaluations: August 6 – 14 + 1 URL that is not modifiable, with all the artifacts + push your student to do that!!! + Mentors Submit Final Evaluations: August 14 - 21 + Results Announced: August 22 + https://wiki.documentfoundation.org/Development/GSoC/2018 * Hackfests & Events + Akademy in Vienna Aug 11-17th + maybe Bubli… (Thorsten) + FrOScon in Bonn: Aug 25 + Bubli, Thorsten, perhaps Cloph. + maybe Munich (Thorsten) + Conference – September + potentially one in Bern / Switzerland - October 19th. + working on a Munich event October 26-28th (Thorsten) + an Open Gov’t meeting from the City of Munich + good to have a hack-fest back-to-back there. + moving slowly here … * mentoring/easyhack update committer... 1 week 1 month 3 months 12 months open 109(1) 190(41) 190(40) 201(41) reviews 1279(-374) 5185(-580) 10986(401) 24632(506) merged 231(-197) 1237(-83) 3759(-28) 14253(12) abandoned8(-2) 43(-9) 259(-2) 966(-4) own commits 206(-162) 1073(-38) 3529(-76) 15485(181) review commits 95(31) 322(12) 957(16) 3736(84) contributor... 1 week1 month3 months 12 months open
LibreOffice ESC call, Wed - 18:00 central European (local) time
Hi, I believe this week the ESC is really on Wednesday - ie. today! Sorry for sending the agenda this late. Prototype agenda below, bug metrics also at the link below; extra items appreciated as last-week: https://demo.collaboracloudsuite.com/tdf/ Let's use the new TDF jitsi goodness this week at: http://jitsi.documentfoundation.org/esc All the best, Kendy * Pending Action Items: + get download numbers for 32bit Linux (Christian) + default bitergia filter for master + libreoffice-* (Christian) * Release Engineering update (Christian) + 6.0.7 - in October + 6.1.0 RC3 update + Remotes + Android viewer + Online * Documentation (Olivier) * UX Update (Heiko) + Bugzilla (topicUI) statistics 247(247) (topicUI) bugs open, 280(280) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week1 month 3 months 12 months added 4(3) 10(1) 18(0) 86(0) commented 32(-17) 145(-3) 279(-3)1698(11) removed 0(0) 0(-1) 1(0)9(-1) resolved 4(-4) 16(3) 26(2) 154(-3) + top 10 contributors: Tietze, Heiko made 53 changes in 1 month, and 650 changes in 1 year Foote, V Stuart made 52 changes in 1 month, and 277 changes in 1 year Xisco Faulí made 22 changes in 1 month, and 316 changes in 1 year Buovjaga made 21 changes in 1 month, and 192 changes in 1 year Kaganski, Mike made 20 changes in 1 month, and 64 changes in 1 year Timur made 16 changes in 1 month, and 60 changes in 1 year Nabet, Julien made 12 changes in 1 month, and 23 changes in 1 year Telesto made 11 changes in 1 month, and 90 changes in 1 year Faure, Jean-Baptiste made 10 changes in 1 month, and 50 changes in 1 year Kainz, Andreas made 9 changes in 1 month, and 42 changes in 1 year * Crash Reporting (Caolan) + 9(+6) import failure, 11(+3) export failures + ??? coverity issues + Google / ossfuzz: ?? fuzzers active now * Crash Reporting (Xisco) * GSoC schedule (Heiko) + Coding: May 14 - August 6 + Students Submit Code and Final Evaluations: August 6 - 14 + Mentors Submit Final Evaluations: August 14 - 21 + Results Announced: August 22 + https://wiki.documentfoundation.org/Development/GSoC/2018 * Hackfests & Events + Akademy in Vienna Aug 11-17th + Thorsten? + FrOScon in Bonn: Aug 25 + Bubli, Thorsten, perhaps Cloph. + Conference – September + potentially one in Bern / Switzerland - October 19th. + working on a Munich event October 26-28th (Thorsten) + an Open Gov’t meeting from the City of Munich + good to have a hack-fest back-to-back there. + moving slowly here … * mentoring/easyhack update committer... 1 week 1 month 3 months 12 months open 109(1) 190(41) 190(40) 201(41) reviews 1279(-374) 5185(-580) 10986(401) 24632(506) merged 231(-197) 1237(-83) 3759(-28) 14253(12) abandoned8(-2) 43(-9) 259(-2) 966(-4) own commits 206(-162) 1073(-38) 3529(-76) 15485(181) review commits 95(31) 322(12) 957(16) 3736(84) contributor... 1 week1 month3 months 12 months open 27(9) 58(-18) 62(-15) 65(-16) reviews 51(-30) 255(-48) 3118(-577) 27801(-382) merged 45(26)156(-17)396(15) 1750(28) abandoned 3(0) 23(-10) 83(-5) 344(1) own commits 71(49)184(17) 447(42) 1492(68) review commits 0(0) 0(0)0(0) 0(0) + easyHack statistics: needsDevEval 53(53) needsUXEval 2(2) cleanup_comments 217(217) total 266(266) assigned 26(26) open 184(184) + top 5 contributors: Gelmini, Andrea made 58 patches in 1 month, and 465 patches in 1 year Sophia Schröder made 52 patches in 1 month, and 137 patches in 1 year Tümer, Mert made 9 patches in 1 month, and 11 patches in 1 year Vikas Mahato made 8 patches in 1 month, and 14 patches in 1 year Rizal Muttaqin made 7 patches in 1 month, and 16 patches in 1 year + top 5 reviewers: Pootle bot made 2955 review comments in 1 month, and 5453 in 1 year Rathke, Eike made 179 review comments in 1 month, and 1121 in 1 year Pootle bot made 177 review comments in 1 month, and 1936 in 1 year Adolfo Jayme Barrientos made 164 review comments in 1 month, and 908 in 1 year Holešovský, Jan made 163 review comments in 1 month, and 1231 in 1 year + big CONGRATULATIONS to contributors who have at least
Re: New Windows Tinderbox Needed
Hi Luke, Luke Benes píše v Pá 03. 08. 2018 v 19:05 +: > Currently all Windows tinderboxes that generated the daily builds are > down: @39, @42, and @62 Sorry about the @39 tinderbox bad shape - the builds got broken there during my vacation, and I still did not get to fixing that :-( > I have neither the computing resources nor time to constantly run > builds to find breaking commits. I fear the biggest problem is the people's time it takes to keep the Windows tinderboxes running. I have hard times finding that recently - so I'd be happy to send you the @39 box in case you had a place for that & could run it. Of course, that is if you live somewhere in the EU - sending it overseas would be a problem on its own I fear. Would you be able to run the box, please? All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-qa] Minutes of ESC call: 2018-08-02
* Present: + Olivier, Michael S, Xisco, Kendy, Sophie, Stephan, Miklos, Caolan, Cloph * Completed Action Items: + ask RH internally wrt. 32bit Developer Toolset bits (Stephan) [ Luke responded with link to a copr - shouldn’t be a blocker ] * Pending Action Items: + get download numbers for 32bit Linux (Christian) [ pending ] + default bitergia filter for master + libreoffice-* (Christian) [ pending – bypassing gerrit not covered ] * Release Engineering update (Christian) + 6.0.6 status + released as final + 6.1.0 RC3 update + will be released this evening + some patches were pending, review appreciated! + Remotes + Android viewer + some patches were submitted, but did not review yet (Cloph) + Online * Documentation (Olivier) + New Help + Several updates in the implementation (bookmarking) (ohallot) + Would be nice to have them in 6-1 (no impact on strings) + Help content + more XHP tweaks from SophiaS + Updates in contents (M. Kaganski, G. Kelemen) + Online help editor + initial spin by Mike Saunders + using CodeMirror editor + some XHP snippets for easy editing (ohallot + M Saunders) + Upload to dev-tools/help3/ (ohallot) + Guides + writer Guide 6.0 published (J. Weber) + Download website updated accordingly (ohallot) + More work in Getting Started Guide (D. Barton, D. Jensen) + discussion on using LOOL for book editing (doc team) * UX Update (Heiko) + Bugzilla (topicUI) statistics 248(248) (topicUI) bugs open, 280(280) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week1 month3 months 12 months added 1(-4) 9(-7) 18(-6) 86(-6) commented 49(-11) 148(-12) 282(-29) 1687(-8) removed 0(0) 1(0) 1(0) 10(0) resolved 8(6) 13(4) 24(5) 157(2) + top 10 contributors: Foote, V Stuart made 60 changes in 1 month, and 284 changes in 1 year Tietze, Heiko made 57 changes in 1 month, and 667 changes in 1 year Buovjaga made 27 changes in 1 month, and 198 changes in 1 year Kaganski, Mike made 21 changes in 1 month, and 65 changes in 1 year Xisco Faulí made 21 changes in 1 month, and 312 changes in 1 year Timur made 13 changes in 1 month, and 47 changes in 1 year Nabet, Julien made 12 changes in 1 month, and 23 changes in 1 year Harald Koester made 9 changes in 1 month, and 14 changes in 1 year peter josvai made 9 changes in 1 month, and 10 changes in 1 year Faure, Jean-Baptiste made 7 changes in 1 month, and 43 changes in 1 year + tdf#119055 “add export to uno commands” + new UNO command(s) to export a drawing to PNG, JPG, SVG requested + perhaps override the file after it was exported the first time + tdf#118979, tdf#118969, tdf#118980 “clear styles” (like direct formatting) + rejected because of side-effects (nested styles, direct formatting) and less benefit + patch for lists submitted + decided to keep the status quo + tdf#118961 “customize the MENU (Form, Tables, and Styles)” + rejected (to change default menus such as removing Forms the user needs to “hack” the xml file) + tdf#118993 “Calc: Old Insert Special Symbol” + similar to Writer, patch submitted + for 6.2 * Fuzz / Crash Testing (Caolan) + 8(+5) import failures, 19(+11) export failures + fix for Calc submitted + coverity + 5 (+5, -7) + forcepoint round #9 + 38 issues, 15 fixed + large amount this time... + oss-fuzz 9 (-1), 0 major, 10 minor + stable in general * Crash Reporting (Xisco) + http://crashreport.libreoffice.org/stats/version/5.4.7.2 + 520 (last 7 days) (-15) + http://crashreport.libreoffice.org/stats/version/6.0.4.2 + 720 (last 7 days) (-131) + http://crashreport.libreoffice.org/stats/version/6.0.5.2 + 1400 (last 7 days) (+40) + we’ll see what the new release brings the next week... * GSoC schedule (Heiko) + Coding: May 14 - August 6 + Students Submit Code and Final Evaluations: August 6 - 14 + Mentors Submit Final Evaluations: August 14 - 21 + Results Announced: August 22 + https://wiki.documentfoundation.org/Development/GSoC/2018 * Hackfests & Events + Akademy in Vienna Aug 11-17th + Thorsten? + FrOScon in Bonn: Aug 25 + Bubli, Thorsten, perhaps Cloph. + Conference – September + potentially one in Bern / Switzerland - October 19th. + working on a Munich event October 26-28th (Thorsten) + an Open Gov’t meeting from the City of Munich + good to have a hack-fest back-to-back there.
Minutes of ESC call: 2018-08-02
* Present: + Olivier, Michael S, Xisco, Kendy, Sophie, Stephan, Miklos, Caolan, Cloph * Completed Action Items: + ask RH internally wrt. 32bit Developer Toolset bits (Stephan) [ Luke responded with link to a copr - shouldn’t be a blocker ] * Pending Action Items: + get download numbers for 32bit Linux (Christian) [ pending ] + default bitergia filter for master + libreoffice-* (Christian) [ pending – bypassing gerrit not covered ] * Release Engineering update (Christian) + 6.0.6 status + released as final + 6.1.0 RC3 update + will be released this evening + some patches were pending, review appreciated! + Remotes + Android viewer + some patches were submitted, but did not review yet (Cloph) + Online * Documentation (Olivier) + New Help + Several updates in the implementation (bookmarking) (ohallot) + Would be nice to have them in 6-1 (no impact on strings) + Help content + more XHP tweaks from SophiaS + Updates in contents (M. Kaganski, G. Kelemen) + Online help editor + initial spin by Mike Saunders + using CodeMirror editor + some XHP snippets for easy editing (ohallot + M Saunders) + Upload to dev-tools/help3/ (ohallot) + Guides + writer Guide 6.0 published (J. Weber) + Download website updated accordingly (ohallot) + More work in Getting Started Guide (D. Barton, D. Jensen) + discussion on using LOOL for book editing (doc team) * UX Update (Heiko) + Bugzilla (topicUI) statistics 248(248) (topicUI) bugs open, 280(280) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week1 month3 months 12 months added 1(-4) 9(-7) 18(-6) 86(-6) commented 49(-11) 148(-12) 282(-29) 1687(-8) removed 0(0) 1(0) 1(0) 10(0) resolved 8(6) 13(4) 24(5) 157(2) + top 10 contributors: Foote, V Stuart made 60 changes in 1 month, and 284 changes in 1 year Tietze, Heiko made 57 changes in 1 month, and 667 changes in 1 year Buovjaga made 27 changes in 1 month, and 198 changes in 1 year Kaganski, Mike made 21 changes in 1 month, and 65 changes in 1 year Xisco Faulí made 21 changes in 1 month, and 312 changes in 1 year Timur made 13 changes in 1 month, and 47 changes in 1 year Nabet, Julien made 12 changes in 1 month, and 23 changes in 1 year Harald Koester made 9 changes in 1 month, and 14 changes in 1 year peter josvai made 9 changes in 1 month, and 10 changes in 1 year Faure, Jean-Baptiste made 7 changes in 1 month, and 43 changes in 1 year + tdf#119055 “add export to uno commands” + new UNO command(s) to export a drawing to PNG, JPG, SVG requested + perhaps override the file after it was exported the first time + tdf#118979, tdf#118969, tdf#118980 “clear styles” (like direct formatting) + rejected because of side-effects (nested styles, direct formatting) and less benefit + patch for lists submitted + decided to keep the status quo + tdf#118961 “customize the MENU (Form, Tables, and Styles)” + rejected (to change default menus such as removing Forms the user needs to “hack” the xml file) + tdf#118993 “Calc: Old Insert Special Symbol” + similar to Writer, patch submitted + for 6.2 * Fuzz / Crash Testing (Caolan) + 8(+5) import failures, 19(+11) export failures + fix for Calc submitted + coverity + 5 (+5, -7) + forcepoint round #9 + 38 issues, 15 fixed + large amount this time... + oss-fuzz 9 (-1), 0 major, 10 minor + stable in general * Crash Reporting (Xisco) + http://crashreport.libreoffice.org/stats/version/5.4.7.2 + 520 (last 7 days) (-15) + http://crashreport.libreoffice.org/stats/version/6.0.4.2 + 720 (last 7 days) (-131) + http://crashreport.libreoffice.org/stats/version/6.0.5.2 + 1400 (last 7 days) (+40) + we’ll see what the new release brings the next week... * GSoC schedule (Heiko) + Coding: May 14 - August 6 + Students Submit Code and Final Evaluations: August 6 - 14 + Mentors Submit Final Evaluations: August 14 - 21 + Results Announced: August 22 + https://wiki.documentfoundation.org/Development/GSoC/2018 * Hackfests & Events + Akademy in Vienna Aug 11-17th + Thorsten? + FrOScon in Bonn: Aug 25 + Bubli, Thorsten, perhaps Cloph. + Conference – September + potentially one in Bern / Switzerland - October 19th. + working on a Munich event October 26-28th (Thorsten) + an Open Gov’t meeting from the City of Munich + good to have a hack-fest back-to-back there.
LibreOffice ESC call, Thu - 16:00 central European (local) time
Hi all, Apparently it was on Wednesday the last week, people on the IRC agreed that it should be on Thursday this week, and nobody (but me) appeared in the call today - so let's try tomorrow ;-) All the best, Kendy Michael Meeks píše v Út 31. 07. 2018 v 12:08 +0100: > Hi guys, > > I won't be around for the next couple of weeks - so, someone > to build the next set of bug stats and of course to run the meeting > much appreciated. > > Prototype agenda below, bug metrics also at the link below; > extra items appreciated as last-week: > > https://demo.collaboracloudsuite.com/tdf/ > > Lets use the new TDF jitsi goodness this week at: > > http://jitsi.documentfoundation.org/esc > > ATB, > > Michael. > > * Pending Action Items: > + ask RH internally wrt. 32bit Developer Toolset bits (Stephan) > + get download numbers for 32bit Linux (Christian) > + default bitergia filter for master + libreoffice-* (Christian) > > * Release Engineering update (Christian) > + 6.0.6 status > + 6.1.0 RC3 update > + Remotes > + Android viewer > + Online > > * Documentation (Olivier) > > * UX Update (Heiko) > + Bugzilla (topicUI) statistics > 248(248) (topicUI) bugs open, 280(280) (needsUXEval) needs to > be evaluated by the UXteam > + Updates: > BZ changes 1 week1 month3 months 12 months > added 1(-4) 9(-7) 18(-6) 86(-6) > commented 49(-11) 148(-12) 282(-29) 1687(-8) >removed 0(0) 1(0) 1(0) 10(0) > resolved 8(6) 13(4) 24(5) 157(2) > + top 10 contributors: > Foote, V Stuart made 60 changes in 1 month, and 284 changes > in 1 year > Tietze, Heiko made 57 changes in 1 month, and 667 changes > in 1 year > Buovjaga made 27 changes in 1 month, and 198 changes in 1 > year > Kaganski, Mike made 21 changes in 1 month, and 65 changes > in 1 year > Xisco Faulí made 21 changes in 1 month, and 312 changes in > 1 year > Timur made 13 changes in 1 month, and 47 changes in 1 year > Nabet, Julien made 12 changes in 1 month, and 23 changes in > 1 year > Harald Koester made 9 changes in 1 month, and 14 changes in > 1 year > peter josvai made 9 changes in 1 month, and 10 changes in 1 > year > Faure, Jean-Baptiste made 7 changes in 1 month, and 43 > changes in 1 year > * Fuzz / Crash Testing (Caolan) > + 3(-14) import failures, 8(-106) export failures > + coverity > + ?? 0 (+0, -17) > + forcepoint round #8 > + ?? > + oss-fuzz 10 (-3), 0 major, 10 minor > + ?? > > * Crash Reporting (Xisco) > + http://crashreport.libreoffice.org/stats/version/5.4.7.2 > + 535 (last 7 days) (+1) > + http://crashreport.libreoffice.org/stats/version/6.0.4.2 > + 851 (last 7 days) (-116) > + http://crashreport.libreoffice.org/stats/version/6.0.5.2 > + 1360 (last 7 days) (+68) > > * GSoC schedule (Heiko) >+ Coding: May 14 - August 6 >+ Evaluation 2: July 9 – 13 >+ Students Submit Code and Final Evaluations: August 6 - 14 >+ Mentors Submit Final Evaluations: August 14 - 21 >+ Results Announced: August 22 >+ https://wiki.documentfoundation.org/Development/GSoC/2018 > > * Hackfests & Events >+ Akademy in Vienna Aug 11-17th > + Thorsten? >+ FrOScon in Bonn: Aug 25 > + Bubli, Thorsten, perhaps Cloph. >+ Conference – September >+ potentially one in Bern / Switzerland - October 19th. >+ working on a Munich event October 26-28th (Thorsten) > + an Open Gov’t meeting from the City of Munich > + good to have a hack-fest back-to-back there. > + moving slowly here … > > * mentoring/easyhack update > committer... 1 week 1 month 3 months 12 > months > open 108(10) 149(-8) 150(- > 9) 160(-9) >reviews 1653(283) 5765(138) 10585(1016) 2412 > 6(1087) > merged 428(180) 1320(34) 3787(181)1424 > 1(243) > abandoned 10(1) 52(-2) 261(- > 5) 970(-11) >own > commits 368(164) (82) 3605(108)15304(355) > review commits 64(-21)310(- > 10) 941(2) 3652(61) > contributor... 1 week1 month3 months 12 > months > open 18(1) 76(8) 77(7) 81(8) > >reviews 81(35)303(-4)3695(-477) 28183(- > 383) > merged 19(-37) 173(- > 5) 381(2) 1722(2) > abandoned 3(-1) 33(-5) 88(-6) 343(- > 2) >own commits 22(-38) 167(-10)405(- > 2) 1424(18) > review > commits 0(0) 0(0)0(0)
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - debian/changelog loolwsd.spec.in
debian/changelog |8 +++-
loolwsd.spec.in |2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 5098848517f5aa441c75ab77fc6f027a8746be1d
Author: Jan Holesovsky
Date: Thu Jul 19 13:53:50 2018 +0200
Bump package version to 3.2.2-8
Change-Id: Iaba6cf235f0ba9cefdaa51f50d03f8d292b1ba0a
diff --git a/debian/changelog b/debian/changelog
index a971ae98f..0d06be9f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
+loolwsd (3.2.2-8) unstable; urgency=medium
+
+ * see the git log: http://col.la/coolcd32
+
+ -- Jan Holesovsky Thu, 19 Jul 2018 14:00:00 +0200
+
loolwsd (3.2.2-7) unstable; urgency=medium
* see the git log: http://col.la/coolcd32
- -- Jan Holesovsky Fri, 18 Jul 2018 14:30:00 +0200
+ -- Jan Holesovsky Wed, 18 Jul 2018 14:30:00 +0200
loolwsd (3.2.2-6) unstable; urgency=medium
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 11d1b1264..6fa38b6e7 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version:@PACKAGE_VERSION@
-Release:7%{?dist}
+Release:8%{?dist}
%if 0%{?suse_version} == 1110
Group: Productivity/Office/Suite
BuildRoot: %{_tmppath}/%{name}-%{version}-build
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/cd-3.2.2-8'
Tag 'cd-3.2.2-8' created by Jan Holesovsky at 2018-07-19 11:55 + cd-3.2.2-8 Changes since cd-3.2.2-7-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/cd-3.2.2-7'
Tag 'cd-3.2.2-7' created by Jan Holesovsky at 2018-07-18 14:23 + cd-3.2.2-7 Changes since cd-3.2.2-6-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - common/Util.hpp
common/Util.hpp | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 3e121eac09653639ccbe359423a08def29fe9c96
Author: Jan Holesovsky
Date: Wed Jul 18 16:18:03 2018 +0200
wsd: safer string splitting
Change-Id: I88b82a3754c4f5e280f00be8e27614c3fe49eff8
Reviewed-on: https://gerrit.libreoffice.org/57644
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/common/Util.hpp b/common/Util.hpp
index 719a1081c..d6e030264 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -278,7 +278,13 @@ namespace Util
std::pair split(const char* s, const int length,
const char delimeter = ' ', bool removeDelim = true)
{
const auto size = getDelimiterPosition(s, length, delimeter);
-return std::make_pair(std::string(s, size),
std::string(s+size+removeDelim));
+
+std::string after;
+int after_pos = size + (removeDelim? 1: 0);
+if (after_pos < length)
+after = std::string(s + after_pos, length - after_pos);
+
+return std::make_pair(std::string(s, size), after);
}
/// Split a string in two at the delimeter, removing it.
@@ -293,7 +299,13 @@ namespace Util
std::pair splitLast(const char* s, const int
length, const char delimeter = ' ', bool removeDelim = true)
{
const auto size = getLastDelimiterPosition(s, length, delimeter);
-return std::make_pair(std::string(s, size),
std::string(s+size+removeDelim));
+
+std::string after;
+int after_pos = size + (removeDelim? 1: 0);
+if (after_pos < length)
+after = std::string(s + after_pos, length - after_pos);
+
+return std::make_pair(std::string(s, size), after);
}
/// Split a string in two at the delimeter, removing it.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/cd-3.2.2-7'
Tag 'cd-3.2.2-7' created by Jan Holesovsky at 2018-07-18 12:35 + cd-3.2.2-7 Changes since cd-3.2.2-6-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - debian/changelog loolwsd.spec.in
debian/changelog |6 ++
loolwsd.spec.in |2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit c7fd420e0c7e53b7d2aa21640fe81da910d9a7af
Author: Jan Holesovsky
Date: Wed Jul 18 14:34:18 2018 +0200
Bump package version to 3.2.2-7
Change-Id: I591833bdaa56837625d342b6b6ea8acee36d85b1
diff --git a/debian/changelog b/debian/changelog
index 8b56842b3..a971ae98f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.2.2-7) unstable; urgency=medium
+
+ * see the git log: http://col.la/coolcd32
+
+ -- Jan Holesovsky Fri, 18 Jul 2018 14:30:00 +0200
+
loolwsd (3.2.2-6) unstable; urgency=medium
* see the git log: http://col.la/coolcd32
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index c8405c3b7..11d1b1264 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version:@PACKAGE_VERSION@
-Release:6%{?dist}
+Release:7%{?dist}
%if 0%{?suse_version} == 1110
Group: Productivity/Office/Suite
BuildRoot: %{_tmppath}/%{name}-%{version}-build
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - wsd/Storage.cpp
wsd/Storage.cpp |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 9bab03070140227f850112716277c82f2fc41424
Author: Jan Holesovsky
Date: Tue Jul 17 20:22:06 2018 +0200
wsd: Don't try to anonymize the /contents at the end.
Change-Id: Ib3737f4afc6d708b7d06acb36f4044df9f5fbe84
Reviewed-on: https://gerrit.libreoffice.org/57586
Reviewed-by: Aron Budea
Tested-by: Aron Budea
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 17b207f84..89e44162d 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -555,7 +555,10 @@ std::string WopiStorage::loadStorageFileToLocal(const
Authorization& auth)
Poco::URI uriObject(_uri);
uriObject.setPath(uriObject.getPath() + "/contents");
auth.authorizeURI(uriObject);
-const std::string uriAnonym = LOOLWSD::anonymizeUrl(uriObject.toString());
+
+Poco::URI uriObjectAnonym(_uri);
+uriObjectAnonym.setPath(LOOLWSD::anonymizeUrl(uriObjectAnonym.getPath()) +
"/contents");
+const std::string uriAnonym = uriObjectAnonym.toString();
LOG_DBG("Wopi requesting: " << uriAnonym);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [cz-lokalizace] Notebookbar a jeho varianty
Ahoj, Stanislav Horáček píše v Ne 15. 07. 2018 v 21:41 +0200: > Takhle mi to připadá použitelné a poměrně srozumitelné, ale pokud by > vás > napadlo něco lepšího, neváhejte se ozvat:)) > Zní to super, nic lepšího mě nenapadá :-) Měj se, Kendy -- For unsubscribe instructions e-mail to: lokalizace+unsubscr...@cz.libreoffice.org Problems? https://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: https://wiki.documentfoundation.org/Netiquette List archive: https://listarchives.libreoffice.org/cz/lokalizace/ Privacy Policy: https://www.documentfoundation.org/privacy
[Libreoffice-commits] core.git: Changes to 'refs/tags/cd-5.3-49'
Tag 'cd-5.3-49' created by Jan Holesovsky at 2018-07-12 22:53 + cd-5.3-49 Changes since cd-5.3-48-12: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - loleaflet/Makefile.am
loleaflet/Makefile.am |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2fad1aaec63fd8804edc12d0c385c0f3ac83f499 Author: Jan Holesovsky Date: Fri Jul 13 00:26:24 2018 +0200 Fix a packaging problem. Change-Id: Ie41ff717c77d58943502afc932440bb150866636 Reviewed-on: https://gerrit.libreoffice.org/57376 Reviewed-by: Aron Budea Tested-by: Aron Budea diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 495cd47d5..02d42b8be 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -29,7 +29,7 @@ node_modules: npm-shrinkwrap.json dist/$(JQUERY_UI_IMAGE_PATH)/%.png: $(JQUERY_UI_IMAGE_PATH)/%.png mkdir -p dist/$(JQUERY_UI_IMAGE_PATH) - cp -a $(JQUERY_UI_IMAGE_PATH)/* dist/$(JQUERY_UI_IMAGE_PATH)/ + cp -a $< dist/$(JQUERY_UI_IMAGE_PATH)/ dist/l10n/%.json: po/%.po @util/po2json.py $< -o $@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - debian/changelog debian/control loolwsd.spec.in
debian/changelog |6 ++
debian/control |2 +-
loolwsd.spec.in |4 ++--
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit db7cb6857d70bfeeced5c80f0c7db399e419baef
Author: Jan Holesovsky
Date: Fri Jul 13 00:04:38 2018 +0200
Bump package version to 3.2.2-6
Change-Id: I49ebae7281baab96e5a754270fba8393142ee5b1
diff --git a/debian/changelog b/debian/changelog
index c9d77adb1..8b56842b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.2.2-6) unstable; urgency=medium
+
+ * see the git log: http://col.la/coolcd32
+
+ -- Jan Holesovsky Fri, 13 Jul 2018 00:01:00 +0200
+
loolwsd (3.2.2-5) unstable; urgency=medium
* see the git log: http://col.la/coolcd32
diff --git a/debian/control b/debian/control
index 0b4610669..3881b500c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6,
libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libcurl3-gnutls, cpio,
libcap2-bin, libexpat1, libicu55, libjpeg-turbo8, libnss3, libpng12-0,
libpoppler58, libxcb-render0, libxcb-shm0, libxml2, libxslt1.1,
collaboraofficebasis5.3-calc (>= 5.3.10.48), collaboraofficebasis5.3-core (>=
5.3.10.48), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.48),
collaboraofficebasis5.3-images (>= 5.3.10.48), collaboraofficebasis5.3-impress
(>= 5.3.10.48), collaboraofficebasis5.3-ooofonts (>= 5.3.10.48),
collaboraofficebasis5.3-writer (>= 5.3.10.48), collaboraoffice5.3 (>=
5.3.10.48), collaboraoffice5.3-ure (>= 5.3.10.48),
collaboraofficebasis5.3-en-us (>= 5.3.10.48),
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.48),
collaboraofficebasis5.3-en-us-res (>= 5.3.10.48),
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.48), collaboraofficebasis5.3-draw
(>= 5.3.10.48), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.48)
, collaboraofficebasis5.3-filter-data (>= 5.3.10.48),
collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.48)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6,
libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libcurl3-gnutls, cpio,
libcap2-bin, libexpat1, libicu55, libjpeg-turbo8, libnss3, libpng12-0,
libpoppler58, libxcb-render0, libxcb-shm0, libxml2, libxslt1.1,
collaboraofficebasis5.3-calc (>= 5.3.10.49), collaboraofficebasis5.3-core (>=
5.3.10.49), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.49),
collaboraofficebasis5.3-images (>= 5.3.10.49), collaboraofficebasis5.3-impress
(>= 5.3.10.49), collaboraofficebasis5.3-ooofonts (>= 5.3.10.49),
collaboraofficebasis5.3-writer (>= 5.3.10.49), collaboraoffice5.3 (>=
5.3.10.49), collaboraoffice5.3-ure (>= 5.3.10.49),
collaboraofficebasis5.3-en-us (>= 5.3.10.49),
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.49),
collaboraofficebasis5.3-en-us-res (>= 5.3.10.49),
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.49), collaboraofficebasis5.3-draw
(>= 5.3.10.49), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.49)
, collaboraofficebasis5.3-filter-data (>= 5.3.10.49),
collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.49)
Conflicts: collaboraofficebasis5.3-gnome-integration,
collaboraofficebasis5.3-kde-integration
Description: LibreOffice Online WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index a6df23195..c8405c3b7 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version:@PACKAGE_VERSION@
-Release:5%{?dist}
+Release:6%{?dist}
%if 0%{?suse_version} == 1110
Group: Productivity/Office/Suite
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -38,7 +38,7 @@ BuildRequires: libcap-progs linux-glibc-devel
systemd-rpm-macros
BuildRequires: libcap-progs
%endif
-Requires: collaboraoffice5.3 >= 5.3.10.48 collaboraoffice5.3-ure >=
5.3.10.48 collaboraofficebasis5.3-core >= 5.3.10.48
collaboraofficebasis5.3-writer >= 5.3.10.48 collaboraofficebasis5.3-impress >=
5.3.10.48 collaboraofficebasis5.3-graphicfilter >= 5.3.10.48
collaboraofficebasis5.3-en-US >= 5.3.10.48 collaboraofficebasis5.3-calc >=
5.3.10.48 collaboraofficebasis5.3-en-US-res >= 5.3.10.48
collaboraofficebasis5.3-en-US-calc >= 5.3.10.48
collaboraofficebasis5.3-ooofonts >= 5.3.10.48 collaboraofficebasis5.3-images >=
5.3.10.48 collaboraofficebasis5.3-noto-fonts >= 5.3.10.48
collaboraofficebasis5.3-draw >= 5.3.10.48
collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.48
collaboraofficebasis5.3-filter-data >= 5.3.10.48
collaboraofficebasis5.3-ooolinguistic >= 5.3.10.48
+Requires: collaboraoffice5.3 >= 5.3.10.49
[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.2' - 2 commits - configure.ac desktop/source
configure.ac|2 -
desktop/source/lib/init.cxx | 50 ++--
2 files changed, 27 insertions(+), 25 deletions(-)
New commits:
commit 9247187ea846ca956d48330708a43932559c7be6
Author: Jan Holesovsky
Date: Thu Jul 12 23:14:19 2018 +0200
Bump version 5.3-49
Change-Id: I27cbc26e1623123ad522ceefdaf9aaa9b235bd25
diff --git a/configure.ac b/configure.ac
index 6d93aa49f500..daa8073287b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([Collabora Office],[5.3.10.48],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.49],[],[],[https://collaboraoffice.com/])
AC_PREREQ([2.59])
commit 0efaa14cda8fa607a57c465052a32dc1a9960931
Author: Ashod Nakashian
Date: Fri Jul 6 16:49:29 2018 -0400
desktop: move font initialization into preloadData
Change-Id: I66840512b45e987cc7b08b07b65bdb24f2023a41
Reviewed-on: https://gerrit.libreoffice.org/57160
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 72b441709be5..e63653507093 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3638,9 +3638,35 @@ static void preloadData()
images.getImageUrl("forcefed.png", "style", "FO_oo");
std::cerr << "Preload languages\n";
+
// force load language singleton
SvtLanguageTable::HasLanguageType(LANGUAGE_SYSTEM);
LanguageTag::isValidBcp47("foo");
+
+std::cerr << "Preload fonts\n";
+
+// Initialize fonts.
+css::uno::Reference xLangSrv =
css::linguistic2::LinguServiceManager::create(xContext);
+if (xLangSrv.is())
+{
+css::uno::Reference
xSpell(xLangSrv->getSpellChecker(), css::uno::UNO_QUERY);
+css::uno::Reference
xLocales(xSpell, css::uno::UNO_QUERY);
+if (xLocales.is())
+aLocales = xLocales->getLocales();
+}
+
+for (const auto& aLocale : aLocales)
+{
+//TODO: Add more types and cache more aggessively. For now this
initializes the fontcache.
+using namespace ::com::sun::star::i18n::ScriptType;
+LanguageType nLang;
+nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale,
false), LATIN);
+OutputDevice::GetDefaultFont(DefaultFontType::LATIN_SPREADSHEET,
nLang, GetDefaultFontFlags::OnlyOne);
+nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale,
false), ASIAN);
+OutputDevice::GetDefaultFont(DefaultFontType::CJK_SPREADSHEET, nLang,
GetDefaultFontFlags::OnlyOne);
+nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale,
false), COMPLEX);
+OutputDevice::GetDefaultFont(DefaultFontType::CTL_SPREADSHEET, nLang,
GetDefaultFontFlags::OnlyOne);
+}
}
static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const
char* pUserProfileUrl)
@@ -3760,30 +3786,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
preloadData();
-// Initialize fonts.
-css::uno::Sequence< css::lang::Locale > aLocales;
-css::uno::Reference
xLangSrv = css::linguistic2::LinguServiceManager::create(xContext);
-if (xLangSrv.is())
-{
-css::uno::Reference
xSpell(xLangSrv->getSpellChecker(), css::uno::UNO_QUERY);
-css::uno::Reference
xLocales(xSpell, css::uno::UNO_QUERY);
-if (xLocales.is())
-aLocales = xLocales->getLocales();
-}
-
-for (const auto& aLocale : aLocales)
-{
-//TODO: Add more types and cache more aggessively. For now
this initializes the fontcache.
-using namespace ::com::sun::star::i18n::ScriptType;
-LanguageType nLang;
-nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale,
false), LATIN);
-
OutputDevice::GetDefaultFont(DefaultFontType::LATIN_SPREADSHEET, nLang,
GetDefaultFontFlags::OnlyOne);
-nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale,
false), ASIAN);
-
OutputDevice::GetDefaultFont(DefaultFontType::CJK_SPREADSHEET, nLang,
GetDefaultFontFlags::OnlyOne);
-nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale,
false), COMPLEX);
-
[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.2' - 9 commits - basic/source desktop/source editeng/source sc/qa sc/source svtools/source sw/source
basic/source/comp/scanner.cxx |2 +-
desktop/source/lib/init.cxx | 26 ++
editeng/source/editeng/eerdll.cxx | 12 +++-
sc/qa/unit/data/xls/forcepoint-pivot-1.xls |binary
sc/source/filter/excel/xipivot.cxx |8
sc/source/ui/view/output2.cxx | 13 +++--
svtools/source/misc/embedhlp.cxx| 12 +++-
sw/source/core/doc/DocumentTimerManager.cxx | 26 +++---
sw/source/core/inc/DocumentTimerManager.hxx |6 ++
sw/source/uibase/misc/swruler.cxx |3 +++
10 files changed, 92 insertions(+), 16 deletions(-)
New commits:
commit 4a35ac3122705577807df831af51dee92beebf2b
Author: Jan Holesovsky
Date: Thu Jun 28 16:12:30 2018 +0200
lok: Don't even try to paint the ruler via LibreOfficeKit.
But we need to have it behind the scenes, otherwise the Online's ruler
does not get notifications.
Change-Id: I72bef28cb15c462572b511449d538b067f7cb141
Reviewed-on: https://gerrit.libreoffice.org/56598
Reviewed-by: Andras Timar
Tested-by: Andras Timar
(cherry picked from commit ee6e6bd5b853aa68c9721f53b5892384e7403eec)
diff --git a/sw/source/uibase/misc/swruler.cxx
b/sw/source/uibase/misc/swruler.cxx
index 7eabce4b9109..74ddc6a14724 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -96,6 +96,9 @@ void SwCommentRuler::dispose()
void SwCommentRuler::Paint(vcl::RenderContext& rRenderContext, const
Rectangle& rRect)
{
+if (comphelper::LibreOfficeKit::isActive())
+return; // no need to waste time on startup
+
SvxRuler::Paint(rRenderContext, rRect);
// Don't draw if there is not any note
commit 159d3b1b7286d8e037b6637ed107bb811e93f276
Author: Ashod Nakashian
Date: Thu Jun 28 01:02:49 2018 -0400
sw lok: delay processing idle jobs to let LOK finish initialization
When loading document, LOK needs to setup the client view, register
callbacks, get document size and type, etc. All of these need
to take SolarMutex, which is taken by the idle jobs immediately
after loading, blocking LOK from finishing initialization
and rendering the first tiles for the user. This gives the
user the impression that the document is loading for far
longer than it actually is, due to lack of interactivity
(or indeed any activity on the screen besides the spinning wheel).
By delaying the idle jobs, we allow time for LOK to finish
initialization and render the first tiles before the idle
jobs kick in and hog SolarMutex.
Change-Id: Ic6f437bfd6f43dfed2aaa1a9d3510d43f5ec30ae
Reviewed-on: https://gerrit.libreoffice.org/56572
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
(cherry picked from commit 1056640a6e1fd044cb61f5bf5ee85dfec3cbeb7c)
diff --git a/sw/source/core/doc/DocumentTimerManager.cxx
b/sw/source/core/doc/DocumentTimerManager.cxx
index 4a0176b2811d..ce4af8b3353c 100644
--- a/sw/source/core/doc/DocumentTimerManager.cxx
+++ b/sw/source/core/doc/DocumentTimerManager.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
namespace sw
{
@@ -45,6 +46,10 @@ DocumentTimerManager::DocumentTimerManager( SwDoc& i_rSwdoc
) : m_rDoc( i_rSwdoc
maIdle.SetPriority( SchedulerPriority::LOWEST );
maIdle.SetIdleHdl( LINK( this, DocumentTimerManager, DoIdleJobs) );
maIdle.SetDebugName( "sw::DocumentTimerManager maIdle" );
+
+maFireIdleJobsTimer.SetTimeoutHdl(LINK(this, DocumentTimerManager,
FireIdleJobsTimeout));
+maFireIdleJobsTimer.SetTimeout(1000); // Enough time for LOK to render the
first tiles.
+maFireIdleJobsTimer.SetDebugName("sw::DocumentTimerManager
maFireIdleJobsTimer");
}
void DocumentTimerManager::StartIdling()
@@ -75,9 +80,24 @@ void DocumentTimerManager::UnblockIdling()
void DocumentTimerManager::StartBackgroundJobs()
{
-// Trigger DoIdleJobs(), asynchronously.
-if (!maIdle.IsActive()) //fdo#73165 if the timer is already running don't
restart from 0
-maIdle.Start();
+if (comphelper::LibreOfficeKit::isActive())
+{
+/// Reset the timer to fire after the last StartBackgroundJobs.
+maFireIdleJobsTimer.Start();
+StopIdling();
+}
+else
+{
+// Trigger DoIdleJobs(), asynchronously.
+if (!maIdle.IsActive()) //fdo#73165 if the timer is already running
don't restart from 0
+maIdle.Start();
+}
+}
+
+IMPL_LINK( DocumentTimerManager, FireIdleJobsTimeout, Timer *, pTimer, void )
+{
+(void)pTimer;
+StartIdling();
}
IMPL_LINK( DocumentTimerManager, DoIdleJobs, Idle*, pIdle, void )
diff --git a/sw/source/core/inc/DocumentTimerManager.hxx
b/sw/source/core/inc/DocumentTimerManager.hxx
index b8575192eba3..d744392b79f2 100644
--- a/sw/source/core/inc/DocumentTimerManager.hxx
+++ b/sw/source/core/inc/D
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/source
sw/source/uibase/misc/swruler.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit ef180a1c08a82e3e27828194ffa8c6a7da156e2d
Author: Jan Holesovsky
Date: Thu Jun 28 16:12:30 2018 +0200
lok: Don't even try to paint the ruler via LibreOfficeKit.
But we need to have it behind the scenes, otherwise the Online's ruler
does not get notifications.
Change-Id: I72bef28cb15c462572b511449d538b067f7cb141
Reviewed-on: https://gerrit.libreoffice.org/56598
Reviewed-by: Andras Timar
Tested-by: Andras Timar
(cherry picked from commit ee6e6bd5b853aa68c9721f53b5892384e7403eec)
Reviewed-on: https://gerrit.libreoffice.org/56600
diff --git a/sw/source/uibase/misc/swruler.cxx
b/sw/source/uibase/misc/swruler.cxx
index 21f2470bc2f7..b663ade391f0 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -96,6 +96,9 @@ void SwCommentRuler::dispose()
void SwCommentRuler::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect)
{
+if (comphelper::LibreOfficeKit::isActive())
+return; // no need to waste time on startup
+
SvxRuler::Paint(rRenderContext, rRect);
// Don't draw if there is not any note
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist
loleaflet/dist/toolbar.css|2 ++
loleaflet/dist/toolbar/toolbar.js |5 -
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit d532125d936631899fcf3acc81b1ce80b20bf444
Author: Jan Holesovsky
Date: Thu Jun 28 21:33:34 2018 +0200
Cell borders: Implement the 'More...' button.
Change-Id: I3551cec69cf1e4dca02c0fcdbee23a4e06b1e36a
Reviewed-on: https://gerrit.libreoffice.org/56634
Reviewed-by: Michael Meeks
Tested-by: Ashod Nakashian
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 4ebcb4a90..b730bb829 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -269,6 +269,8 @@ button.leaflet-control-search-next
.w2ui-icon.frame10 { background: url('../images/fr010.svg') no-repeat center
!important; }
.w2ui-icon.frame11 { background: url('../images/fr011.svg') no-repeat center
!important; }
.w2ui-icon.frame12 { background: url('../images/fr012.svg') no-repeat center
!important; }
+.w2ui-icon.frame13 { width: 108px !important; }
+#div-frame13 { width: 102px; height: 18px; text-align: center; display:
table-cell; vertical-align: middle; cursor: default; }
#setborderstyle-grid tr td {
box-sizing: border-box;
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index de360832b..a042289dc 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -272,6 +272,8 @@ function setBorders(left, right, bottom, top, horiz, vert) {
function setBorderStyle(num) {
switch (num) {
+ case 0: map.sendUnoCommand('.uno:FormatCellBorders'); break;
+
case 1: setBorders(0, 0, 0, 0, 0, 0); break;
case 2: setBorders(1, 0, 0, 0, 0, 0); break;
case 3: setBorders(0, 1, 0, 0, 0, 0); break;
@@ -464,7 +466,8 @@ $(function () {
'' +
'' +
'' +
- ''
+ '' +
+ '' +
_('More...') + ''
},
{type: 'drop', id: 'conditionalformaticonset', img:
'conditionalformatdialog', hint: _UNO('.uno:ConditionalFormatMenu',
'spreadsheet', true),
html: '' +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/js
loleaflet/css/toolbar.css |2 ++
loleaflet/js/toolbar.js |5 -
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 46b4c62139fd031d0504447c82c0e640e0552e29
Author: Jan Holesovsky
Date: Thu Jun 28 21:33:34 2018 +0200
Cell borders: Implement the 'More...' button.
Change-Id: I3551cec69cf1e4dca02c0fcdbee23a4e06b1e36a
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 788dc4e10..d733fe095 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -410,6 +410,8 @@ button.leaflet-control-search-next
.w2ui-icon.frame10 { background: url('images/fr010.svg') no-repeat center
!important; }
.w2ui-icon.frame11 { background: url('images/fr011.svg') no-repeat center
!important; }
.w2ui-icon.frame12 { background: url('images/fr012.svg') no-repeat center
!important; }
+.w2ui-icon.frame13 { width: 108px !important; }
+#div-frame13 { width: 102px; height: 18px; text-align: center; display:
table-cell; vertical-align: middle; cursor: default; }
.w2ui-icon.accepttrackedchanges{ background:
url('images/lc_accepttrackedchanges.svg') no-repeat center !important; }
.w2ui-icon.alignblock{ background: url('images/lc_alignblock.svg') no-repeat
center !important; }
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index b336171b3..34382ea36 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -278,6 +278,8 @@ function setBorders(left, right, bottom, top, horiz, vert) {
function setBorderStyle(num) {
switch (num) {
+ case 0: map.sendUnoCommand('.uno:FormatCellBorders'); break;
+
case 1: setBorders(0, 0, 0, 0, 0, 0); break;
case 2: setBorders(1, 0, 0, 0, 0, 0); break;
case 3: setBorders(0, 1, 0, 0, 0, 0); break;
@@ -642,7 +644,8 @@ function createToolbar() {
'' +
'' +
'' +
- ''
+ '' +
+ '' +
_('More...') + ''
},
{type: 'drop', id: 'insertshapes', img:
'basicshapes_ellipse', hint: _('Insert shapes'), overlay: {onShow:
insertShapes},
html: ''},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/misc/swruler.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 37cf47dabf742ab8ca4852d3aa298a36d169302c
Author: Jan Holesovsky
Date: Thu Jun 28 16:12:30 2018 +0200
lok: Don't even try to paint the ruler via LibreOfficeKit.
But we need to have it behind the scenes, otherwise the Online's ruler
does not get notifications.
Change-Id: I72bef28cb15c462572b511449d538b067f7cb141
Reviewed-on: https://gerrit.libreoffice.org/56598
Reviewed-by: Andras Timar
Tested-by: Andras Timar
(cherry picked from commit ee6e6bd5b853aa68c9721f53b5892384e7403eec)
Reviewed-on: https://gerrit.libreoffice.org/56601
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/sw/source/uibase/misc/swruler.cxx
b/sw/source/uibase/misc/swruler.cxx
index c208c9eeb353..1784ac20dbcd 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -96,6 +96,9 @@ void SwCommentRuler::dispose()
void SwCommentRuler::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect)
{
+if (comphelper::LibreOfficeKit::isActive())
+return; // no need to waste time on startup
+
SvxRuler::Paint(rRenderContext, rRect);
// Don't draw if there is not any note
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.3-51'
Tag 'cp-5.3-51' created by Andras Timar at 2018-06-28 14:20 + cp-5.3-51 Changes since cp-5.3-50-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/source
sw/source/uibase/misc/swruler.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit ee6e6bd5b853aa68c9721f53b5892384e7403eec
Author: Jan Holesovsky
Date: Thu Jun 28 16:12:30 2018 +0200
lok: Don't even try to paint the ruler via LibreOfficeKit.
But we need to have it behind the scenes, otherwise the Online's ruler
does not get notifications.
Change-Id: I72bef28cb15c462572b511449d538b067f7cb141
Reviewed-on: https://gerrit.libreoffice.org/56598
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sw/source/uibase/misc/swruler.cxx
b/sw/source/uibase/misc/swruler.cxx
index 7eabce4b9109..74ddc6a14724 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -96,6 +96,9 @@ void SwCommentRuler::dispose()
void SwCommentRuler::Paint(vcl::RenderContext& rRenderContext, const
Rectangle& rRect)
{
+if (comphelper::LibreOfficeKit::isActive())
+return; // no need to waste time on startup
+
SvxRuler::Paint(rRenderContext, rRect);
// Don't draw if there is not any note
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice ESC call, Wed - 18:00 central European (local) time
Hi, NB - Wednesday (today) not Thursday! Prototype agenda below, bug metrics also at the link below; extra items appreciated as last-week: https://demo.collaboracloudsuite.com/tdf/ Lets persevere with the jitsi goodness this week too at: https://meet.jit.si/TDFESC All the best, Kendy * Completed Action Items: * Pending Action Items: + enable new help for tinderboxes (Christian) + Commit access for Martin and Ilhan (Thorsten) + disable HSQLDB auto-migration for now except for experimental (Tamas B) [ ongoing ] + Budget ranking by next week (All) * Release Engineering update (Christian) + no releases planned this week. + 6.0.5 – RC2 status + + 6.1.0 RC1 + + 6.1 late features + calc threading default / fixing (Michael) + + writer – red-lining re-factoring (Michael S) + + Help format (Stephan/Olivier) + + Remotes + Android viewer + Online * Documentation (Olivier) + * UX Update (Heiko) + Bugzilla (topicUI) statistics 247(247) (topicUI) bugs open, 288(288) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week 1 month 3 months 12 months added 5(0) 8(3) 22(1) 84(-3) commented 38(15) 68(20)318(3) 1689(-5) removed 0(0) 0(0) 0(-1) 10(0) resolved 3(2) 6(2) 24(0) 172(0) + top 10 contributors: Buovjaga made 28 changes in 1 month, and 177 changes in 1 year Tietze, Heiko made 26 changes in 1 month, and 733 changes in 1 year Kainz, Andreas made 15 changes in 1 month, and 34 changes in 1 year Xisco Faulí made 11 changes in 1 month, and 319 changes in 1 year kompilainenn made 10 changes in 1 month, and 30 changes in 1 year Foote, V Stuart made 10 changes in 1 month, and 240 changes in 1 year *UNKNOWN* made 6 changes in 1 month, and 8 changes in 1 year Raal made 6 changes in 1 month, and 17 changes in 1 year *UNKNOWN* made 5 changes in 1 month, and 5 changes in 1 year Thomas Lendo made 5 changes in 1 month, and 263 changes in 1 year * Fuzz / Crash Testing (Caolan) + 76(+64) import failure, 2(-3) export failures + coverity + ?? + forcepoint ?? + + oss-fuzz ?? (?? outstanding, ?? minor) * Crash Reporting (Xisco) + * Budget ranking (Thorsten) + on ESC share - “Budget2018” - add your ranking. + please rank stuff … before next week. * GSoC schedule (Heiko) + Coding: May 14 - August 6 + please tell students to send a weekly status update. + Evaluation 1: June 11 – 15 + all the students passed the first evaluation + most mentors good or above. + one ambivalent evaluation, clearly communicated & accepted. + Evaluation 2: July 9 – 13 + coming up soon (Thorsten) + Students Submit Code and Final Evaluations: August 6 - 14 + Mentors Submit Final Evaluations: August 14 - 21 + Results Announced: August 22 + https://wiki.documentfoundation.org/Development/GSoC/2018 * Hackfests & Events + Conference - September + call for papers for the LibreOffice Conference still ongoing! (Sophie) + deadline: mid-July + potentially one in Bern / Switzerland - October 19th. + working on a Munich event ~November 23-25th (Thorsten) + an Open Gov’t meeting from the City of Munich + good to have a hack-fest back-to-back there. + moving slowly here ... * mentoring/easyhack update committer... 1 week 1 month 3 months12 months open 90(-9) 150(15) 161(17) 165(18) reviews 1548(953)2800(1102) 5740(908) 19079(1070) merged 342(88) 1202(98) 3455(-17) 13499(145) abandoned 27(11) 77(-71) 276(8) 983(22) own commits 241(-191) 1328(-45)3657(-87) 14024(200) review commits 66(-44) 334(14) 949(-1) 3249(62) contributor... 1 week 1 month 3 months 12 months open 35(-16) 85(-2) 88(-4)92(-4) reviews 112(-807) 2284(-660) 7323(-908) 31170(-605) merged 27(-5) 126(14) 367(-7) 1716(-12) abandoned 4(0)25(-8) 105(2)388(-2) own commits 31(-4) 139(17) 374(10) 1239(32) review commits 0(0) 0(0) 0(0) 0(0) + easyHack statistics: needsDevEval 50(50) needsUXEval 2(2) cleanup_comments 214(214) total 263(263) assigned 26(26) open 185(185) + top 5 contributors: Gelmini, Andrea made 43 patches in
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist loleaflet/unocommands.js
loleaflet/dist/images/icon-set-bars-empty.svg|1 loleaflet/dist/images/icon-set-bars-full.svg |1 loleaflet/dist/images/icon-set-bars-half.svg |1 loleaflet/dist/images/icon-set-bars-one-quarter.svg |1 loleaflet/dist/images/icon-set-bars-three-quarters.svg |1 loleaflet/dist/images/icon-set-circles1-gray.svg |1 loleaflet/dist/images/icon-set-circles1-green.svg|1 loleaflet/dist/images/icon-set-circles1-red.svg |1 loleaflet/dist/images/icon-set-circles1-yellow.svg |1 loleaflet/dist/images/icon-set-circles2-dark-gray.svg|1 loleaflet/dist/images/icon-set-circles2-dark-red.svg |1 loleaflet/dist/images/icon-set-circles2-light-gray.svg |1 loleaflet/dist/images/icon-set-circles2-light-red.svg|1 loleaflet/dist/images/icon-set-colorarrows-down.svg |1 loleaflet/dist/images/icon-set-colorarrows-same.svg |1 loleaflet/dist/images/icon-set-colorarrows-slightly-down.svg |1 loleaflet/dist/images/icon-set-colorarrows-slightly-up.svg |1 loleaflet/dist/images/icon-set-colorarrows-up.svg|1 loleaflet/dist/images/icon-set-flags-green.svg |1 loleaflet/dist/images/icon-set-flags-red.svg |1 loleaflet/dist/images/icon-set-flags-yellow.svg |1 loleaflet/dist/images/icon-set-grayarrows-down.svg |1 loleaflet/dist/images/icon-set-grayarrows-same.svg |1 loleaflet/dist/images/icon-set-grayarrows-slightly-down.svg |1 loleaflet/dist/images/icon-set-grayarrows-slightly-up.svg|1 loleaflet/dist/images/icon-set-grayarrows-up.svg |1 loleaflet/dist/images/icon-set-negative-red-smilie.svg |1 loleaflet/dist/images/icon-set-negative-yellow-smilie.svg|1 loleaflet/dist/images/icon-set-neutral-yellow-smilie.svg |1 loleaflet/dist/images/icon-set-pies-empty.svg|7 loleaflet/dist/images/icon-set-pies-full.svg |7 loleaflet/dist/images/icon-set-pies-half.svg |7 loleaflet/dist/images/icon-set-pies-one-quarter.svg |7 loleaflet/dist/images/icon-set-pies-three-quarters.svg |7 loleaflet/dist/images/icon-set-positive-green-smilie.svg |1 loleaflet/dist/images/icon-set-positive-yellow-smilie.svg|1 loleaflet/dist/images/icon-set-shapes-circle.svg |1 loleaflet/dist/images/icon-set-shapes-diamond.svg|1 loleaflet/dist/images/icon-set-shapes-triangle.svg |1 loleaflet/dist/images/icon-set-squares-empty.svg |1 loleaflet/dist/images/icon-set-squares-full.svg |1 loleaflet/dist/images/icon-set-squares-half.svg |1 loleaflet/dist/images/icon-set-squares-one-quarter.svg |1 loleaflet/dist/images/icon-set-squares-three-quarters.svg|1 loleaflet/dist/images/icon-set-stars-empty.svg |7 loleaflet/dist/images/icon-set-stars-full.svg|1 loleaflet/dist/images/icon-set-stars-half.svg|7 loleaflet/dist/images/icon-set-symbols1-check.svg|7 loleaflet/dist/images/icon-set-symbols1-cross.svg|7 loleaflet/dist/images/icon-set-symbols1-exclamation-mark.svg |7 loleaflet/dist/images/icon-set-trafficlights-green.svg |1 loleaflet/dist/images/icon-set-trafficlights-red.svg |1 loleaflet/dist/images/icon-set-trafficlights-yellow.svg |1 loleaflet/dist/images/icon-set-triangles-down.svg|8 loleaflet/dist/images/icon-set-triangles-same.svg|8 loleaflet/dist/images/icon-set-triangles-up.svg |8 loleaflet/dist/images/lc_conditionalformatdialog.svg | 10 + loleaflet/dist/toolbar.css | 104 +++ loleaflet/dist/toolbar/toolbar.js| 32 +++ loleaflet/unocommands.js |1 60 files changed, 281 insertions(+), 3 deletions(-) New commits: commit cb900759be62ab9656ef35bbf3f22088e3701efe Author: Jan Holesovsky Date: Wed Jun 27 00:29:58 2018 +0200 Conditional formatting: Add toolbar button for the icon sets. Change-Id: Ifa07f357d490de8b92e50d34d4124f90b1d9e304 Reviewed-on: https://gerrit.libreoffice.org/56505 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/loleaflet/dist/images/icon-set-bars-empty.svg b/loleaflet/dist/images/icon-set-bars-empty.svg new file mode 100644 index 0..edccacb2a --- /dev/null +++ b/loleaflet/dist/images/icon-set-bars-empty.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;>/ \ No newline at end of file diff --git a/loleaflet/dist/images/icon-set-bars-full.svg
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - desktop/source sc/inc sc/sdi sc/source
desktop/source/lib/init.cxx|2
sc/inc/colorscale.hxx |6 +-
sc/sdi/scalc.sdi |2
sc/source/core/data/colorscale.cxx |4 -
sc/source/ui/view/cellsh1.cxx | 92 ++---
5 files changed, 73 insertions(+), 33 deletions(-)
New commits:
commit 5e3365e88c94450e6db687eb46425e07db6997f5
Author: Jan Holesovsky
Date: Mon Jun 25 22:58:30 2018 +0200
Conditional formatting: Allow to set the icon set CF via .uno: command.
When .uno:IconSetFormatDialog gets a parameter, it directly creates the
icon set conditional formatting with pre-selected values.
Change-Id: I75dda90e5ea9c191254acc24c564cda7b27243a5
Reviewed-on: https://gerrit.libreoffice.org/56429
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b0079d0f5f16..c8593b96859b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -335,6 +335,8 @@ std::vector
desktop::jsonToPropertyValuesVector(const char
aValue.Value <<= OString(rValue.c_str()).toFloat();
else if (rType == "long")
aValue.Value <<= OString(rValue.c_str()).toInt32();
+else if (rType == "short")
+aValue.Value <<=
static_cast(OString(rValue.c_str()).toInt32());
else if (rType == "unsigned short")
aValue.Value <<=
static_cast(OString(rValue.c_str()).toUInt32());
else if (rType == "[]any")
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 840b6824963d..8ae03f419b18 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -51,7 +51,7 @@ private:
ScColorScaleEntryType meType;
public:
-ScColorScaleEntry(double nVal, const Color& rCol);
+ScColorScaleEntry(double nVal, const Color& rCol, ScColorScaleEntryType
eType = COLORSCALE_VALUE);
ScColorScaleEntry();
ScColorScaleEntry(const ScColorScaleEntry& rEntry);
ScColorScaleEntry(ScDocument* pDoc, const ScColorScaleEntry& rEntry);
@@ -329,8 +329,8 @@ struct ScIconSetFormatData
// std..pair::second == -1 means no image
std::vector > maCustomVector;
-ScIconSetFormatData():
-eIconSetType(IconSet_3Arrows),
+ScIconSetFormatData(ScIconSetType eType = IconSet_3Arrows):
+eIconSetType(eType),
mbShowValue(true),
mbReverse(false),
mbCustom(false)
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 544655e5fe4f..56d68d0799fd 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -829,7 +829,7 @@ SfxVoidItem DataBarFormatDialog SID_OPENDLG_DATABAR
SfxVoidItem IconSetFormatDialog SID_OPENDLG_ICONSET
-()
+(SfxInt16Item IconSet FN_PARAM_1)
[
AutoUpdate = FALSE,
FastCall = FALSE,
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index cb7599e0db53..7c6bb46aa8a2 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -158,10 +158,10 @@ ScColorScaleEntry::ScColorScaleEntry():
{
}
-ScColorScaleEntry::ScColorScaleEntry(double nVal, const Color& rCol):
+ScColorScaleEntry::ScColorScaleEntry(double nVal, const Color& rCol,
ScColorScaleEntryType eType):
mnVal(nVal),
maColor(rCol),
-meType(COLORSCALE_VALUE)
+meType(eType)
{
}
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index e8a5fecaf609..efe07dbccd94 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -48,6 +48,7 @@
#include
#include "cellsh.hxx"
+#include
#include "sc.hrc"
#include "document.hxx"
#include "patattr.hxx"
@@ -77,6 +78,7 @@
#include "cliputil.hxx"
#include "markdata.hxx"
#include "docpool.hxx"
+#include
#include "condformatdlg.hxx"
#include "attrib.hxx"
#include "condformatdlgitem.hxx"
@@ -100,6 +102,7 @@
#include
#include
+#include
#include
using namespace ::com::sun::star;
@@ -1984,15 +1987,16 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
aRangeList.push_back(pRange);
}
+// try to find an existing conditional format
const ScConditionalFormat* pCondFormat = nullptr;
const ScPatternAttr* pPattern = pDoc->GetPattern(aPos.Col(),
aPos.Row(), aPos.Tab());
+ScConditionalFormatList* pList =
pDoc->GetCondFormList(aPos.Tab());
const std::vector& rCondFormats =
static_cast(pPattern->GetItem(ATTR_CONDITIONAL)).GetCondFormatData();
bool bContainsCondFormat = !rCondFormats.empty();
bool bCondFormatDlg = false;
+bool bContainsExistingCondFormat = false;
[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.2' - sd/source vcl/source
sd/source/filter/pdf/sdpdffilter.cxx |5 ++---
vcl/source/filter/ipdf/pdfread.cxx | 12 +---
2 files changed, 7 insertions(+), 10 deletions(-)
New commits:
commit 3d2b4942214f586f22640e84f6d48fee475521fb
Author: Jan Holesovsky
Date: Fri Jun 22 10:28:42 2018 +0200
pdfium: Avoid unnecessary copying + some warning fixes.
Change-Id: I114fa6b2d3dda86c55eb245d31ca3a1019197ae9
Reviewed-on: https://gerrit.libreoffice.org/56285
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/sd/source/filter/pdf/sdpdffilter.cxx
b/sd/source/filter/pdf/sdpdffilter.cxx
index 62dbc3964f35..e157bef79de8 100644
--- a/sd/source/filter/pdf/sdpdffilter.cxx
+++ b/sd/source/filter/pdf/sdpdffilter.cxx
@@ -108,7 +108,7 @@ bool SdPdfFilter::Import()
// Add as many pages as we need up-front.
mrDocument.CreateFirstPages();
-for (int i = 0; i < aGraphics.size() - 1; ++i)
+for (size_t i = 0; i < aGraphics.size() - 1; ++i)
{
mrDocument.DuplicatePage(0);
}
@@ -119,8 +119,7 @@ bool SdPdfFilter::Import()
const Size& aSize = aPair.second;
const sal_Int32 nPageNumber = aGraphic.getPageNumber();
-if (nPageNumber < 0 || nPageNumber >= aGraphics.size())
-continue; // Page is out of range
+assert(nPageNumber >= 0 && nPageNumber <
static_cast(aGraphics.size()));
// Create the page and insert the Graphic.
SdPage* pPage = mrDocument.GetSdPage(nPageNumber, PageKind::Standard);
diff --git a/vcl/source/filter/ipdf/pdfread.cxx
b/vcl/source/filter/ipdf/pdfread.cxx
index e92b0c7b54a3..53008ea5e958 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -317,19 +317,17 @@ size_t ImportPDFUnloaded(const OUString& rURL,
std::vector aPdfData;
aMemoryStream.Seek(STREAM_SEEK_TO_END);
-aPdfData = css::uno::Sequence(aMemoryStream.Tell());
+auto pPdfData =
std::make_shared>(aMemoryStream.Tell());
aMemoryStream.Seek(STREAM_SEEK_TO_BEGIN);
-aMemoryStream.ReadBytes(aPdfData.getArray(), aPdfData.getLength());
+aMemoryStream.ReadBytes(pPdfData->getArray(), pPdfData->getLength());
// Prepare the link with the PDF stream.
-const size_t nGraphicContentSize = aPdfData.getLength();
+const size_t nGraphicContentSize = pPdfData->getLength();
std::unique_ptr pGraphicContent(new
sal_uInt8[nGraphicContentSize]);
-memcpy(pGraphicContent.get(), aPdfData.get(), nGraphicContentSize);
+memcpy(pGraphicContent.get(), pPdfData->get(), nGraphicContentSize);
std::shared_ptr pGfxLink(std::make_shared(
std::move(pGraphicContent), nGraphicContentSize,
GfxLinkType::NativePdf));
-auto pPdfData = std::make_shared>(aPdfData);
FPDF_LIBRARY_CONFIG aConfig;
aConfig.version = 2;
@@ -340,7 +338,7 @@ size_t ImportPDFUnloaded(const OUString& rURL,
std::vectorgetArray(), pPdfData->getLength(),
/*password=*/nullptr);
if (!pPdfDocument)
return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.2' - sd/source svtools/source vcl/source
sd/source/filter/pdf/sdpdffilter.cxx | 14 ++
svtools/source/graphic/grfcache.cxx | 10 ++
vcl/source/filter/ipdf/pdfread.cxx | 11 ---
vcl/source/gdi/impgraph.cxx |7 ---
4 files changed, 28 insertions(+), 14 deletions(-)
New commits:
commit 89626f5f52a80e719cb0fdbf533a4b21697db66a
Author: Jan Holesovsky
Date: Fri Jun 22 12:58:12 2018 +0200
pdfium: Delay the swap out.
If we swap out too early, the constructor of GraphicObject forces a swap
in, so we'd render everything during the load anyway.
Change-Id: I0ea1a755242fd57ef28d082ce4bf534a32199f87
Reviewed-on: https://gerrit.libreoffice.org/56286
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/sd/source/filter/pdf/sdpdffilter.cxx
b/sd/source/filter/pdf/sdpdffilter.cxx
index e157bef79de8..fab51f432060 100644
--- a/sd/source/filter/pdf/sdpdffilter.cxx
+++ b/sd/source/filter/pdf/sdpdffilter.cxx
@@ -115,15 +115,15 @@ bool SdPdfFilter::Import()
for (std::pair& aPair : aGraphics)
{
-const Graphic& aGraphic = aPair.first;
+const Graphic& rGraphic = aPair.first;
const Size& aSize = aPair.second;
-const sal_Int32 nPageNumber = aGraphic.getPageNumber();
+const sal_Int32 nPageNumber = rGraphic.getPageNumber();
assert(nPageNumber >= 0 && nPageNumber <
static_cast(aGraphics.size()));
// Create the page and insert the Graphic.
SdPage* pPage = mrDocument.GetSdPage(nPageNumber, PageKind::Standard);
-Size aGrfSize(OutputDevice::LogicToLogic(aSize,
aGraphic.GetPrefMapMode(),
+Size aGrfSize(OutputDevice::LogicToLogic(aSize,
rGraphic.GetPrefMapMode(),
MapMode(MapUnit::Map100thMM)));
// Resize to original size based on 72 dpi to preserve page size.
@@ -134,7 +134,13 @@ bool SdPdfFilter::Import()
pPage->SetSize(aGrfSize);
Point aPos(0, 0);
-pPage->InsertObject(new SdrGrafObj(aGraphic, Rectangle(aPos,
aGrfSize)));
+SdrGrafObj* pSdrGrafObj = new SdrGrafObj(rGraphic, Rectangle(aPos,
aGrfSize));
+pPage->InsertObject(pSdrGrafObj);
+
+// we know that the initial bitmap we provided was just a placeholder,
+// we need to swap it out, so that on the next swap in, we render the
+// correct one
+const_cast(pSdrGrafObj->GetGraphicObject()).SwapOut();
}
return true;
diff --git a/svtools/source/graphic/grfcache.cxx
b/svtools/source/graphic/grfcache.cxx
index 8def38eca49f..ec6bc39457b8 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -83,6 +83,16 @@ GraphicID::GraphicID( const GraphicObject& rObj )
mnID3 = basegfx::fround(rRange.getHeight());
mnID4 = vcl_get_checksum(0,
rSvgDataPtr->getSvgDataArray().getConstArray(),
rSvgDataPtr->getSvgDataArrayLength());
}
+else if (rGraphic.hasPdfData())
+{
+std::shared_ptr> pPdfData =
rGraphic.getPdfData();
+const BitmapEx& rBmpEx = rGraphic.GetBitmapEx();
+
+mnID1 |= (rGraphic.getPageNumber() & 0x0fff);
+mnID2 = rBmpEx.GetSizePixel().Width();
+mnID3 = rBmpEx.GetSizePixel().Height();
+mnID4 = vcl_get_checksum(0, pPdfData->getConstArray(),
pPdfData->getLength());
+}
else if( rGraphic.IsAnimated() )
{
const Animation aAnimation( rGraphic.GetAnimation() );
diff --git a/vcl/source/filter/ipdf/pdfread.cxx
b/vcl/source/filter/ipdf/pdfread.cxx
index 53008ea5e958..da36c3433350 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -346,6 +346,9 @@ size_t ImportPDFUnloaded(const OUString& rURL,
std::vector(nPageCount);
++nPageIndex)
{
double fPageWidth = 0;
@@ -357,9 +360,11 @@ size_t ImportPDFUnloaded(const OUString& rURL,
std::vector& pGfxLink)
mpGfxLink = pGfxLink;
if (mpGfxLink->IsNative())
-{
mpGfxLink->SwapOut();
-
-// Swap out the graphic as well.
-//FIXME: move to own function, such as SetPrepared().
-meType = GraphicType::Bitmap;
-ImplSwapOut();
-}
}
GfxLink ImpGraphic::ImplGetLink()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.2' - include/vcl vcl/source
include/vcl/pdfread.hxx|5 +
vcl/source/filter/ipdf/pdfread.cxx | 121 +++--
vcl/source/gdi/impgraph.cxx| 40 +++-
3 files changed, 93 insertions(+), 73 deletions(-)
New commits:
commit f2ea104c48965ff2c3dbc6fd9d3e231c4c4b1459
Author: Jan Holesovsky
Date: Fri Jun 22 00:44:44 2018 +0200
pdfium: Keep the PDF data in memory, so that we can really share them.
Otherwise the swap out / swap in creates new copy of the underlying PDF
stream.
Change-Id: I88a16a69143783a998201e183bea1a9553e337bd
Reviewed-on: https://gerrit.libreoffice.org/56266
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/include/vcl/pdfread.hxx b/include/vcl/pdfread.hxx
index 5d79c6d38146..c31251bfaf53 100644
--- a/include/vcl/pdfread.hxx
+++ b/include/vcl/pdfread.hxx
@@ -16,6 +16,11 @@
namespace vcl
{
+/// Fills the rBitmaps vector with rendered pages.
+VCL_DLLPUBLIC size_t RenderPDFBitmaps(const void* pBuffer, int nSize,
std::vector& rBitmaps,
+ const size_t nFirstPage = 0, int nPages
= 1,
+ const double fResolutionDPI = 96.);
+
/// Imports a PDF stream into rGraphic as a GDIMetaFile.
VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Bitmap ,
size_t nPageIndex,
diff --git a/vcl/source/filter/ipdf/pdfread.cxx
b/vcl/source/filter/ipdf/pdfread.cxx
index af8f3ab38c06..2e9d7c4909d7 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -69,68 +69,12 @@ size_t generatePreview(SvStream& rStream,
std::vector& rBitmaps,
const size_t nFirstPage = 0, int nPages = 1,
const double fResolutionDPI = 96.)
{
-FPDF_LIBRARY_CONFIG aConfig;
-aConfig.version = 2;
-aConfig.m_pUserFontPaths = nullptr;
-aConfig.m_pIsolate = nullptr;
-aConfig.m_v8EmbedderSlot = 0;
-FPDF_InitLibraryWithConfig();
-
// Read input into a buffer.
SvMemoryStream aInBuffer;
rStream.Seek(nPos);
aInBuffer.WriteStream(rStream, nSize);
-// Load the buffer using pdfium.
-FPDF_DOCUMENT pPdfDocument = FPDF_LoadMemDocument(aInBuffer.GetData(),
aInBuffer.GetSize(), /*password=*/nullptr);
-if (!pPdfDocument)
-return 0;
-
-const int nPageCount = FPDF_GetPageCount(pPdfDocument);
-if (nPages <= 0)
-nPages = nPageCount;
-const size_t nLastPage = std::min(nPageCount, nFirstPage + nPages) -
1;
-for (size_t nPageIndex = nFirstPage; nPageIndex <= nLastPage; ++nPageIndex)
-{
-// Render next page.
-FPDF_PAGE pPdfPage = FPDF_LoadPage(pPdfDocument, nPageIndex);
-if (!pPdfPage)
-break;
-
-// Returned unit is points, convert that to pixel.
-const size_t nPageWidth = pointToPixel(FPDF_GetPageWidth(pPdfPage),
fResolutionDPI);
-const size_t nPageHeight = pointToPixel(FPDF_GetPageHeight(pPdfPage),
fResolutionDPI);
-FPDF_BITMAP pPdfBitmap = FPDFBitmap_Create(nPageWidth, nPageHeight,
/*alpha=*/1);
-if (!pPdfBitmap)
-break;
-
-const FPDF_DWORD nColor = FPDFPage_HasTransparency(pPdfPage) ?
0x : 0x;
-FPDFBitmap_FillRect(pPdfBitmap, 0, 0, nPageWidth, nPageHeight, nColor);
-FPDF_RenderPageBitmap(pPdfBitmap, pPdfPage, /*start_x=*/0,
/*start_y=*/0, nPageWidth, nPageHeight, /*rotate=*/0, /*flags=*/0);
-
-// Save the buffer as a bitmap.
-Bitmap aBitmap(Size(nPageWidth, nPageHeight), 24);
-{
-Bitmap::ScopedWriteAccess pWriteAccess(aBitmap);
-const auto pPdfBuffer =
static_cast(FPDFBitmap_GetBuffer(pPdfBitmap));
-const int nStride = FPDFBitmap_GetStride(pPdfBitmap);
-for (size_t nRow = 0; nRow < nPageHeight; ++nRow)
-{
-ConstScanline pPdfLine = pPdfBuffer + (nStride * nRow);
-// pdfium byte order is BGRA.
-pWriteAccess->CopyScanline(nRow, pPdfLine,
ScanlineFormat::N32BitTcBgra, nStride);
-}
-}
-
-rBitmaps.emplace_back(std::move(aBitmap));
-FPDFBitmap_Destroy(pPdfBitmap);
-FPDF_ClosePage(pPdfPage);
-}
-
-FPDF_CloseDocument(pPdfDocument);
-FPDF_DestroyLibrary();
-
-return rBitmaps.size();
+return vcl::RenderPDFBitmaps(aInBuffer.GetData(), aInBuffer.GetSize(),
rBitmaps, nFirstPage, nPages, fResolutionDPI);
}
/// Decide if PDF data is old enough to be compatible.
@@ -231,6 +175,69 @@ bool getCompatibleStream(SvStream& rInStream, SvStream&
rOutStream,
namespace vcl
{
+size_t RenderPDFBitmaps(const void* pBuffer, int nSize, std::vector&
rBitmaps,
+const size_t nFirstPage, int nPages,
+const double fResolutionDPI)
+{
+FPDF_LIBRARY_CONFIG aConfig;
+aConfig.version = 2;
[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.2' - include/vcl sd/source vcl/inc vcl/source
include/vcl/graph.hxx|1 +
sd/source/filter/pdf/sdpdffilter.cxx |4 ++--
vcl/inc/impgraph.hxx |3 ++-
vcl/source/gdi/graph.cxx |6 ++
vcl/source/gdi/impgraph.cxx | 30 +-
5 files changed, 36 insertions(+), 8 deletions(-)
New commits:
commit 121052be218f15d81772a1cbb2208189563a8aa6
Author: Jan Holesovsky
Date: Thu Jun 21 21:33:56 2018 +0200
pdfium: Share the GfxLink for PDF files.
Partially based on work by Ashod Nakashian, thanks!
Change-Id: Id7e8c4543368b0caf3e459abaff8c53997779c83
Reviewed-on: https://gerrit.libreoffice.org/56265
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 1902da49d60f..e7e1708e5c26 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -211,6 +211,7 @@ private:
public:
voidSetLink( const GfxLink& );
+voidSetSharedLink(const std::shared_ptr& pGfxLink);
GfxLink GetLink() const;
boolIsLink() const;
diff --git a/sd/source/filter/pdf/sdpdffilter.cxx
b/sd/source/filter/pdf/sdpdffilter.cxx
index 01e6ee5623de..8ca237fd6345 100644
--- a/sd/source/filter/pdf/sdpdffilter.cxx
+++ b/sd/source/filter/pdf/sdpdffilter.cxx
@@ -111,7 +111,7 @@ bool SdPdfFilter::Import()
const size_t nGraphicContentSize = aPdfData.getLength();
std::unique_ptr pGraphicContent(new
sal_uInt8[nGraphicContentSize]);
memcpy(pGraphicContent.get(), aPdfData.get(), nGraphicContentSize);
-GfxLink aGfxLink(std::move(pGraphicContent), nGraphicContentSize,
GfxLinkType::NativePdf);
+std::shared_ptr pGfxLink =
std::make_shared(std::move(pGraphicContent), nGraphicContentSize,
GfxLinkType::NativePdf);
auto pPdfData = std::make_shared>(aPdfData);
mrDocument.CreateFirstPages();
@@ -127,7 +127,7 @@ bool SdPdfFilter::Import()
Graphic aGraphic(aBitmap);
aGraphic.setPdfData(pPdfData);
aGraphic.setPageNumber(nPageNumber);
-aGraphic.SetLink(aGfxLink);
+aGraphic.SetSharedLink(pGfxLink);
aGraphic.setOriginURL(aFileName);
// Create the page and insert the Graphic.
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 33b591a81a6c..80a12e20d124 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -45,7 +45,7 @@ private:
std::unique_ptr mpAnimation;
std::shared_ptr mpContext;
std::shared_ptr mpSwapFile;
-std::unique_ptr mpGfxLink;
+std::shared_ptr mpGfxLink;
GraphicType meType;
mutable sal_uLongmnSizeBytes;
bool mbSwapOut;
@@ -158,6 +158,7 @@ private:
boolImplIsSwapOut() const { return mbSwapOut;}
boolImplIsDummyContext() const { return mbDummyContext; }
voidImplSetLink( const GfxLink& );
+voidImplSetSharedLink(const std::shared_ptr&
pGfxLink);
GfxLink ImplGetLink();
boolImplIsLink() const;
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index cbdf5df56ea5..cbf28e755c8f 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -552,6 +552,12 @@ void Graphic::SetLink( const GfxLink& rGfxLink )
mxImpGraphic->ImplSetLink( rGfxLink );
}
+void Graphic::SetSharedLink(const std::shared_ptr& pGfxLink)
+{
+ImplTestRefCount();
+mxImpGraphic->ImplSetSharedLink(pGfxLink);
+}
+
GfxLink Graphic::GetLink() const
{
return mxImpGraphic->ImplGetLink();
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 798b7c85f745..9332af115ece 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -125,7 +125,12 @@ ImpGraphic::ImpGraphic(const ImpGraphic& rImpGraphic)
, mnPageNumber(rImpGraphic.mnPageNumber)
{
if( rImpGraphic.mpGfxLink )
-mpGfxLink = o3tl::make_unique( *rImpGraphic.mpGfxLink );
+{
+if (rImpGraphic.mpGfxLink->GetType() == GfxLinkType::NativePdf)
+mpGfxLink = rImpGraphic.mpGfxLink;
+else
+mpGfxLink = std::make_shared(*rImpGraphic.mpGfxLink);
+}
if( rImpGraphic.mpAnimation )
{
@@ -239,10 +244,17 @@ ImpGraphic& ImpGraphic::operator=( const ImpGraphic&
rImpGraphic )
mbSwapOut = rImpGraphic.mbSwapOut;
mpSwapFile = rImpGraphic.mpSwapFile;
-mpGfxLink.reset();
+if (rImpGraphic.mpGfxLink)
+{
+if (rImpGraphic.mpGfxLink->GetType() == GfxLinkType::NativePdf)
+mpGfxLink = rImpGraphic.mpGfxLink;
+else
+{
+mpGfxLink.reset();
-if( rImpGraphic.mpGfxLink )
-mpGfxLink = o3tl::make_unique( *rImpGraphic.mpGfxLink );
+mpGfxLink = std::make_shared(*rImpGraphic.mpGf
[Libreoffice-commits] core.git: Changes to 'ref/for/distro/collabora/cd-5.3-3.2'
New branch 'ref/for/distro/collabora/cd-5.3-3.2' available with the following commits: commit 599f960fffe85e336e1d8faacfe9e7062979fd26 Author: Jan Holesovsky Date: Fri Jun 22 00:44:44 2018 +0200 pdfium: Keep the PDF data in memory, so that we can really share them. Otherwise the swap out / swap in creates new copy of the underlying PDF stream. Change-Id: I88a16a69143783a998201e183bea1a9553e337bd commit 1171f15a7003d2765e15d63028c4aa3c63bd70cf Author: Jan Holesovsky Date: Thu Jun 21 21:33:56 2018 +0200 pdfium: Share the GfxLink for PDF files. Partially based on work by Ashod Nakashian, thanks! Change-Id: Id7e8c4543368b0caf3e459abaff8c53997779c83 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - desktop/CppunitTest_desktop_lokinit.mk desktop/qa
desktop/CppunitTest_desktop_lokinit.mk |2
desktop/qa/unit/desktop-lok-init.cxx | 99 -
2 files changed, 98 insertions(+), 3 deletions(-)
New commits:
commit 740e204b481a3d742ef7c240e081a9ddc45a11a2
Author: Jan Holesovsky
Date: Tue Jun 19 01:18:08 2018 +0200
lok: Unit test for passing table borders via jsonToPropertyValuesVector.
Change-Id: Iadc0d76a1903d76fcd84f316d4796cc1dec13277
Reviewed-on: https://gerrit.libreoffice.org/56150
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
(cherry picked from commit f6b9e4a8d95f2987386e55f244a7f6ea00995b74)
Reviewed-on: https://gerrit.libreoffice.org/56205
Tested-by: Jan Holesovsky
diff --git a/desktop/CppunitTest_desktop_lokinit.mk
b/desktop/CppunitTest_desktop_lokinit.mk
index fb9e71bccfe2..502f0807075b 100644
--- a/desktop/CppunitTest_desktop_lokinit.mk
+++ b/desktop/CppunitTest_desktop_lokinit.mk
@@ -19,6 +19,8 @@ $(eval $(call
gb_CppunitTest_use_external,desktop_lok_init,boost_headers))
$(eval $(call gb_CppunitTest_use_sdk_api,desktop_lok_init))
+$(eval $(call gb_CppunitTest_use_ure,desktop_lok_init))
+
$(eval $(call gb_CppunitTest_set_include,desktop_lok_init,\
-I$(SRCDIR)/desktop/source/inc \
-I$(SRCDIR)/desktop/inc \
diff --git a/desktop/qa/unit/desktop-lok-init.cxx
b/desktop/qa/unit/desktop-lok-init.cxx
index fa751bb64eaa..180b95c33a6a 100644
--- a/desktop/qa/unit/desktop-lok-init.cxx
+++ b/desktop/qa/unit/desktop-lok-init.cxx
@@ -18,12 +18,13 @@
#include
#include
-#include
-#include
-#include
+#include
#include
+#include
+#include
+
using namespace css;
/// Unit tests for desktop/source/lib/init.cxx internals.
@@ -33,9 +34,11 @@ public:
LOKInitTest() {}
void testJsonToPropertyValues();
+void testJsonToPropertyValuesBorder();
CPPUNIT_TEST_SUITE(LOKInitTest);
CPPUNIT_TEST(testJsonToPropertyValues);
+CPPUNIT_TEST(testJsonToPropertyValuesBorder);
CPPUNIT_TEST_SUITE_END();
};
@@ -71,6 +74,96 @@ void LOKInitTest::testJsonToPropertyValues()
aArgs,
comphelper::containerToSequence(desktop::jsonToPropertyValuesVector(arguments)));
}
+void LOKInitTest::testJsonToPropertyValuesBorder()
+{
+const char arguments[]
+= "{"
+ "\"OuterBorder\": {"
+ "\"type\" : \"[]any\","
+ "\"value\" : ["
+ "{ \"type\" : \"com.sun.star.table.BorderLine2\", \"value\" : {
\"Color\" : { \"type\" : "
+ "\"com.sun.star.util.Color\", \"value\" : 0 }, \"InnerLineWidth\" :
{ \"type\" : "
+ "\"short\", \"value\" : 0 }, \"OuterLineWidth\" : { \"type\" :
\"short\", \"value\" : 1 "
+ "}, \"LineDistance\" : { \"type\" : \"short\", \"value\" : 0 },
\"LineStyle\" : { "
+ "\"type\" : \"short\", \"value\" : 0 }, \"LineWidth\" : { \"type\" :
\"unsigned long\", "
+ "\"value\" : 1 } } },"
+ "{ \"type\" : \"com.sun.star.table.BorderLine2\", \"value\" : {
\"Color\" : { \"type\" : "
+ "\"com.sun.star.util.Color\", \"value\" : 0 }, \"InnerLineWidth\" :
{ \"type\" : "
+ "\"short\", \"value\" : 0 }, \"OuterLineWidth\" : { \"type\" :
\"short\", \"value\" : 1 "
+ "}, \"LineDistance\" : { \"type\" : \"short\", \"value\" : 0 },
\"LineStyle\" : { "
+ "\"type\" : \"short\", \"value\" : 0 }, \"LineWidth\" : { \"type\" :
\"unsigned long\", "
+ "\"value\" : 1 } } },"
+ "{ \"type\" : \"com.sun.star.table.BorderLine2\", \"value\" : {
\"Color\" : { \"type\" : "
+ "\"com.sun.star.util.Color\", \"value\" : 0 }, \"InnerLineWidth\" :
{ \"type\" : "
+ "\"short\", \"value\" : 0 }, \"OuterLineWidth\" : { \"type\" :
\"short\", \"value\" : 1 "
+ "}, \"LineDistance\" : { \"type\" : \"short\", \"value\" : 0 },
\"LineStyle\" : { "
+ "\"type\" : \"short\", \"value\" : 0 }, \"LineWidth\" : { \"type\" :
\"unsigned long\", "
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - desktop/CppunitTest_desktop_lokinit.mk desktop/inc desktop/Module_desktop.mk desktop/qa desktop/source
desktop/CppunitTest_desktop_lokinit.mk | 47 +++
desktop/Module_desktop.mk |1
desktop/inc/lib/init.hxx |6 ++
desktop/qa/unit/desktop-lok-init.cxx | 78 +
desktop/source/lib/init.cxx|2
5 files changed, 133 insertions(+), 1 deletion(-)
New commits:
commit fc5e70050a6a9abf4eec1688eae7d53db6816483
Author: Jan Holesovsky
Date: Tue Jun 19 00:00:05 2018 +0200
lok: Unit test for jsonToPropertyValuesVector.
Change-Id: I3e0623cc68838c650edbd03cc89bf3fcb8098ff8
Reviewed-on: https://gerrit.libreoffice.org/56149
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
(cherry picked from commit 666edd059b360b38add0acd959ea7e2ab5c7c5fd)
Reviewed-on: https://gerrit.libreoffice.org/56204
Tested-by: Jan Holesovsky
diff --git a/desktop/CppunitTest_desktop_lokinit.mk
b/desktop/CppunitTest_desktop_lokinit.mk
new file mode 100644
index ..fb9e71bccfe2
--- /dev/null
+++ b/desktop/CppunitTest_desktop_lokinit.mk
@@ -0,0 +1,47 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# 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/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,desktop_lok_init))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,desktop_lok_init, \
+desktop/qa/unit/desktop-lok-init \
+))
+
+$(eval $(call gb_CppunitTest_use_external,desktop_lok_init,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,desktop_lok_init))
+
+$(eval $(call gb_CppunitTest_set_include,desktop_lok_init,\
+-I$(SRCDIR)/desktop/source/inc \
+-I$(SRCDIR)/desktop/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,desktop_lok_init, \
+comphelper \
+cppu \
+sal \
+sofficeapp \
+vcl \
+$(gb_UWINAPI) \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_CppunitTest_add_libs,desktop_lok_init,\
+-lm \
+-ldl \
+-lpthread \
+))
+endif
+
+$(eval $(call gb_CppunitTest_use_configuration,desktop_lok_init))
+
+# vim: set noet sw=4 ts=4:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index e18b23126dff..12c5e53e0a1e 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -137,6 +137,7 @@ $(eval $(call gb_Module_add_check_targets,desktop, \
ifeq ($(OS),LINUX)
$(eval $(call gb_Module_add_check_targets,desktop, \
CppunitTest_desktop_lib \
+CppunitTest_desktop_lokinit \
))
endif
diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index 78b3437f4ef4..cb8afa899b76 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -16,9 +16,11 @@
#include
#include
+#include
#include
#include
#include
+#include
#include
#include
@@ -98,6 +100,10 @@ namespace desktop {
/// comma, like: Name1=Value1,Name2=Value2,Name3=Value3.
/// @param rOptions When extracted, the Param=Value is removed from it.
DESKTOP_DLLPUBLIC OUString extractParameter(OUString& aOptions, const
OUString& rName);
+
+/// Helper function to convert JSON to a vector of PropertyValues.
+/// Public to be unit-test-able.
+DESKTOP_DLLPUBLIC std::vector
jsonToPropertyValuesVector(const char* pJSON);
}
#endif
diff --git a/desktop/qa/unit/desktop-lok-init.cxx
b/desktop/qa/unit/desktop-lok-init.cxx
new file mode 100644
index ..fa751bb64eaa
--- /dev/null
+++ b/desktop/qa/unit/desktop-lok-init.cxx
@@ -0,0 +1,78 @@
+/* -*- 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
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+#include
+
+using namespace css;
+
+/// Unit tests for desktop/source/lib/init.cxx internals.
+class LOKInitTest : public ::CppUnit::TestFixture
+{
+public:
+LOKInitTest() {}
+
+void testJsonToPropertyValues();
+
+CPPUNIT_TEST_SUITE(LOKInitTest);
+CPPUNIT_TEST(testJsonToPropertyValues);
+CPPUNIT_TEST_SUITE_END();
+};
+
+namespace
+{
+void assertSequencesEqual(const uno::Sequence& expected,
+ const uno::Sequence& actual)
+{
+CPPUNIT_ASSERT_EQUAL_MESSAGE("The sequences should have the same length",
expected.getLength(),
+ actual.getLength());
+for (int i = 0; i &
[Libreoffice-commits] core.git: desktop/CppunitTest_desktop_lokinit.mk desktop/qa
desktop/CppunitTest_desktop_lokinit.mk |2
desktop/qa/unit/desktop-lok-init.cxx | 99 -
2 files changed, 98 insertions(+), 3 deletions(-)
New commits:
commit f6b9e4a8d95f2987386e55f244a7f6ea00995b74
Author: Jan Holesovsky
Date: Tue Jun 19 01:18:08 2018 +0200
lok: Unit test for passing table borders via jsonToPropertyValuesVector.
Change-Id: Iadc0d76a1903d76fcd84f316d4796cc1dec13277
Reviewed-on: https://gerrit.libreoffice.org/56150
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/desktop/CppunitTest_desktop_lokinit.mk
b/desktop/CppunitTest_desktop_lokinit.mk
index fb9e71bccfe2..502f0807075b 100644
--- a/desktop/CppunitTest_desktop_lokinit.mk
+++ b/desktop/CppunitTest_desktop_lokinit.mk
@@ -19,6 +19,8 @@ $(eval $(call
gb_CppunitTest_use_external,desktop_lok_init,boost_headers))
$(eval $(call gb_CppunitTest_use_sdk_api,desktop_lok_init))
+$(eval $(call gb_CppunitTest_use_ure,desktop_lok_init))
+
$(eval $(call gb_CppunitTest_set_include,desktop_lok_init,\
-I$(SRCDIR)/desktop/source/inc \
-I$(SRCDIR)/desktop/inc \
diff --git a/desktop/qa/unit/desktop-lok-init.cxx
b/desktop/qa/unit/desktop-lok-init.cxx
index fa751bb64eaa..180b95c33a6a 100644
--- a/desktop/qa/unit/desktop-lok-init.cxx
+++ b/desktop/qa/unit/desktop-lok-init.cxx
@@ -18,12 +18,13 @@
#include
#include
-#include
-#include
-#include
+#include
#include
+#include
+#include
+
using namespace css;
/// Unit tests for desktop/source/lib/init.cxx internals.
@@ -33,9 +34,11 @@ public:
LOKInitTest() {}
void testJsonToPropertyValues();
+void testJsonToPropertyValuesBorder();
CPPUNIT_TEST_SUITE(LOKInitTest);
CPPUNIT_TEST(testJsonToPropertyValues);
+CPPUNIT_TEST(testJsonToPropertyValuesBorder);
CPPUNIT_TEST_SUITE_END();
};
@@ -71,6 +74,96 @@ void LOKInitTest::testJsonToPropertyValues()
aArgs,
comphelper::containerToSequence(desktop::jsonToPropertyValuesVector(arguments)));
}
+void LOKInitTest::testJsonToPropertyValuesBorder()
+{
+const char arguments[]
+= "{"
+ "\"OuterBorder\": {"
+ "\"type\" : \"[]any\","
+ "\"value\" : ["
+ "{ \"type\" : \"com.sun.star.table.BorderLine2\", \"value\" : {
\"Color\" : { \"type\" : "
+ "\"com.sun.star.util.Color\", \"value\" : 0 }, \"InnerLineWidth\" :
{ \"type\" : "
+ "\"short\", \"value\" : 0 }, \"OuterLineWidth\" : { \"type\" :
\"short\", \"value\" : 1 "
+ "}, \"LineDistance\" : { \"type\" : \"short\", \"value\" : 0 },
\"LineStyle\" : { "
+ "\"type\" : \"short\", \"value\" : 0 }, \"LineWidth\" : { \"type\" :
\"unsigned long\", "
+ "\"value\" : 1 } } },"
+ "{ \"type\" : \"com.sun.star.table.BorderLine2\", \"value\" : {
\"Color\" : { \"type\" : "
+ "\"com.sun.star.util.Color\", \"value\" : 0 }, \"InnerLineWidth\" :
{ \"type\" : "
+ "\"short\", \"value\" : 0 }, \"OuterLineWidth\" : { \"type\" :
\"short\", \"value\" : 1 "
+ "}, \"LineDistance\" : { \"type\" : \"short\", \"value\" : 0 },
\"LineStyle\" : { "
+ "\"type\" : \"short\", \"value\" : 0 }, \"LineWidth\" : { \"type\" :
\"unsigned long\", "
+ "\"value\" : 1 } } },"
+ "{ \"type\" : \"com.sun.star.table.BorderLine2\", \"value\" : {
\"Color\" : { \"type\" : "
+ "\"com.sun.star.util.Color\", \"value\" : 0 }, \"InnerLineWidth\" :
{ \"type\" : "
+ "\"short\", \"value\" : 0 }, \"OuterLineWidth\" : { \"type\" :
\"short\", \"value\" : 1 "
+ "}, \"LineDistance\" : { \"type\" : \"short\", \"value\" : 0 },
\"LineStyle\" : { "
+ "\"type\" : \"short\", \"value\" : 0 }, \"LineWidth\" : { \"type\" :
\"unsigned long\", "
+ "\"value\" : 1 } } },"
+ "{ \"type\" : \"com.sun.star.table.BorderLine2\", \"value\"
[Libreoffice-commits] core.git: desktop/CppunitTest_desktop_lokinit.mk desktop/inc desktop/Module_desktop.mk desktop/qa desktop/source
desktop/CppunitTest_desktop_lokinit.mk | 47 +++
desktop/Module_desktop.mk |1
desktop/inc/lib/init.hxx |6 ++
desktop/qa/unit/desktop-lok-init.cxx | 78 +
desktop/source/lib/init.cxx|2
5 files changed, 133 insertions(+), 1 deletion(-)
New commits:
commit 666edd059b360b38add0acd959ea7e2ab5c7c5fd
Author: Jan Holesovsky
Date: Tue Jun 19 00:00:05 2018 +0200
lok: Unit test for jsonToPropertyValuesVector.
Change-Id: I3e0623cc68838c650edbd03cc89bf3fcb8098ff8
Reviewed-on: https://gerrit.libreoffice.org/56149
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/desktop/CppunitTest_desktop_lokinit.mk
b/desktop/CppunitTest_desktop_lokinit.mk
new file mode 100644
index ..fb9e71bccfe2
--- /dev/null
+++ b/desktop/CppunitTest_desktop_lokinit.mk
@@ -0,0 +1,47 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# 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/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,desktop_lok_init))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,desktop_lok_init, \
+desktop/qa/unit/desktop-lok-init \
+))
+
+$(eval $(call gb_CppunitTest_use_external,desktop_lok_init,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,desktop_lok_init))
+
+$(eval $(call gb_CppunitTest_set_include,desktop_lok_init,\
+-I$(SRCDIR)/desktop/source/inc \
+-I$(SRCDIR)/desktop/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,desktop_lok_init, \
+comphelper \
+cppu \
+sal \
+sofficeapp \
+vcl \
+$(gb_UWINAPI) \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_CppunitTest_add_libs,desktop_lok_init,\
+-lm \
+-ldl \
+-lpthread \
+))
+endif
+
+$(eval $(call gb_CppunitTest_use_configuration,desktop_lok_init))
+
+# vim: set noet sw=4 ts=4:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 878febd603fb..086e51e6ea26 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -139,6 +139,7 @@ $(eval $(call gb_Module_add_check_targets,desktop, \
ifeq ($(OS),LINUX)
$(eval $(call gb_Module_add_check_targets,desktop, \
CppunitTest_desktop_lib \
+CppunitTest_desktop_lokinit \
))
endif
diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index 78b3437f4ef4..cb8afa899b76 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -16,9 +16,11 @@
#include
#include
+#include
#include
#include
#include
+#include
#include
#include
@@ -98,6 +100,10 @@ namespace desktop {
/// comma, like: Name1=Value1,Name2=Value2,Name3=Value3.
/// @param rOptions When extracted, the Param=Value is removed from it.
DESKTOP_DLLPUBLIC OUString extractParameter(OUString& aOptions, const
OUString& rName);
+
+/// Helper function to convert JSON to a vector of PropertyValues.
+/// Public to be unit-test-able.
+DESKTOP_DLLPUBLIC std::vector
jsonToPropertyValuesVector(const char* pJSON);
}
#endif
diff --git a/desktop/qa/unit/desktop-lok-init.cxx
b/desktop/qa/unit/desktop-lok-init.cxx
new file mode 100644
index ..fa751bb64eaa
--- /dev/null
+++ b/desktop/qa/unit/desktop-lok-init.cxx
@@ -0,0 +1,78 @@
+/* -*- 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
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+#include
+
+using namespace css;
+
+/// Unit tests for desktop/source/lib/init.cxx internals.
+class LOKInitTest : public ::CppUnit::TestFixture
+{
+public:
+LOKInitTest() {}
+
+void testJsonToPropertyValues();
+
+CPPUNIT_TEST_SUITE(LOKInitTest);
+CPPUNIT_TEST(testJsonToPropertyValues);
+CPPUNIT_TEST_SUITE_END();
+};
+
+namespace
+{
+void assertSequencesEqual(const uno::Sequence& expected,
+ const uno::Sequence& actual)
+{
+CPPUNIT_ASSERT_EQUAL_MESSAGE("The sequences should have the same length",
expected.getLength(),
+ actual.getLength());
+for (int i = 0; i < expected.getLength(); ++i)
+{
+CPPUNIT_ASSERT_EQUAL(expected[i].Name, actual[i].Name);
+CPPUNIT_ASSERT_EQUAL(comphelper::
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |2 --
1 file changed, 2 deletions(-)
New commits:
commit 0507e53a9d124064165cb7484ea26547aeaaed2f
Author: Jan Holesovsky
Date: Wed Jun 20 17:12:59 2018 +0200
Revert "borders: This has to be global in order to have the event working."
Actually this has nothing to do in the branch, sorry.
This reverts commit 62134df0c54c3837eb5461863b0cfe2e92ab8366.
Change-Id: Iaa62da6b5c232b40fbd4ec4b517fc2aa95c14e05
Reviewed-on: https://gerrit.libreoffice.org/56169
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index fe3b8fd6c..e3848825e 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -299,8 +299,6 @@ function setBorderStyle(num) {
map.focus();
}
-global.setBorderStyle = setBorderStyle;
-
function insertTable() {
var rows = 10;
var cols = 10;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 62134df0c54c3837eb5461863b0cfe2e92ab8366
Author: Jan Holesovsky
Date: Wed Jun 20 13:29:44 2018 +0200
borders: This has to be global in order to have the event working.
Change-Id: I7a1f52c825905f4fe0ba33fdfd16cf979e3d378d
Reviewed-on: https://gerrit.libreoffice.org/56156
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index e3848825e..fe3b8fd6c 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -299,6 +299,8 @@ function setBorderStyle(num) {
map.focus();
}
+global.setBorderStyle = setBorderStyle;
+
function insertTable() {
var rows = 10;
var cols = 10;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 5 commits - loleaflet/css loleaflet/images loleaflet/js
loleaflet/css/toolbar.css | 27 +++
loleaflet/images/fr01.svg |7 +++
loleaflet/images/fr010.svg | 10
loleaflet/images/fr011.svg | 10
loleaflet/images/fr012.svg |6 ++
loleaflet/images/fr02.svg |6 ++
loleaflet/images/fr03.svg |6 ++
loleaflet/images/fr04.svg |6 ++
loleaflet/images/fr05.svg |6 ++
loleaflet/images/fr06.svg |6 ++
loleaflet/images/fr07.svg |6 ++
loleaflet/images/fr08.svg |6 ++
loleaflet/images/fr09.svg |6 ++
loleaflet/images/lc_setborderstyle.svg | 10
loleaflet/js/toolbar.js| 75 +++--
15 files changed, 190 insertions(+), 3 deletions(-)
New commits:
commit 9d4469a79bbfa8c5815935838af8b55e08ae3c11
Author: Jan Holesovsky
Date: Wed Jun 20 13:29:44 2018 +0200
borders: This has to be global in order to have the event working.
Change-Id: I7a1f52c825905f4fe0ba33fdfd16cf979e3d378d
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 7a1dc6d19..b336171b3 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -305,6 +305,8 @@ function setBorderStyle(num) {
map.focus();
}
+global.setBorderStyle = setBorderStyle;
+
function insertTable() {
var rows = 10;
var cols = 10;
commit a2a6c5990c1b736300126530e89758a6c5870161
Author: Andras Timar
Date: Wed Jun 20 08:09:47 2018 +0200
fix indentation issues
Change-Id: I565fe5e46daa5c41d7ee0dc6921fd7d2039c4287
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index fe02a87a1..7a1dc6d19 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -249,51 +249,51 @@ function onClick(e, id, item, subItem) {
function setBorders(left, right, bottom, top, horiz, vert) {
var params = {
-OuterBorder: {
-type : '[]any',
-value : [
-{ type : 'com.sun.star.table.BorderLine2', value : { Color : {
type : 'com.sun.star.util.Color', value : 0 }, InnerLineWidth : { type :
'short', value : 0 }, OuterLineWidth : { type : 'short', value : left },
LineDistance : { type : 'short', value : 0 }, LineStyle : { type : 'short',
value : 0 }, LineWidth : { type : 'unsigned long', value : 0 } } },
-{ type : 'com.sun.star.table.BorderLine2', value : { Color : {
type : 'com.sun.star.util.Color', value : 0 }, InnerLineWidth : { type :
'short', value : 0 }, OuterLineWidth : { type : 'short', value : right },
LineDistance : { type : 'short', value : 0 }, LineStyle : { type : 'short',
value : 0 }, LineWidth : { type : 'unsigned long', value : 0 } } },
-{ type : 'com.sun.star.table.BorderLine2', value : { Color : {
type : 'com.sun.star.util.Color', value : 0 }, InnerLineWidth : { type :
'short', value : 0 }, OuterLineWidth : { type : 'short', value : bottom },
LineDistance : { type : 'short', value : 0 }, LineStyle : { type : 'short',
value : 0 }, LineWidth : { type : 'unsigned long', value : 0 } } },
-{ type : 'com.sun.star.table.BorderLine2', value : { Color : {
type : 'com.sun.star.util.Color', value : 0 }, InnerLineWidth : { type :
'short', value : 0 }, OuterLineWidth : { type : 'short', value : top },
LineDistance : { type : 'short', value : 0 }, LineStyle : { type : 'short',
value : 0 }, LineWidth : { type : 'unsigned long', value : 0 } } },
-{ type : 'long', value : 0 },
-{ type : 'long', value : 0 },
-{ type : 'long', value : 0 },
-{ type : 'long', value : 0 },
-{ type : 'long', value : 0 }
-]
-},
-InnerBorder: {
-type : '[]any',
-value : [
-{ type : 'com.sun.star.table.BorderLine2', value : { Color : {
type : 'com.sun.star.util.Color', value : 0 }, InnerLineWidth : { type :
'short', value : 0 }, OuterLineWidth : { type : 'short', value : horiz },
LineDistance : { type : 'short', value : 0 }, LineStyle : { type : 'short',
value : 0 }, LineWidth : { type : 'unsigned long', value : 0 } } },
-{ type : 'com.sun.star.table.BorderLine2', value : { Color : {
type : 'com.sun.star.util.Color', value : 0 }, InnerLineWidth : { type :
'short', value : 0 }, OuterLineWidth : { type : 'short', value : vert },
LineDistance : { type : 'short', value : 0 }, LineStyle : { type : 'short',
value : 0 }, LineWidth : { type : 'unsigned long', value : 0 } } },
-{ type : 'short', value : 0 },
-{ type : 'short', value : 127 },
-{ type : 'long', value : 0 }
-]
-}};
+ OuterBorder: {
+ type : '[]any',
+ value : [
+ { type : 'com.sun.star.table.BorderLine2',
value
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js | 90 --
1 file changed, 67 insertions(+), 23 deletions(-)
New commits:
commit bec0781550bb5e0798971ee631bbdb4967867d3c
Author: Jan Holesovsky
Date: Tue Jun 19 13:53:56 2018 +0200
borders: Send .uno:SetBorderStyle with the appropriate params to the core.
Change-Id: I703dda35d3b412ff60602a6802b260d8709762fd
Reviewed-on: https://gerrit.libreoffice.org/56093
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index f47b120b9..ac547d55e 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -241,16 +241,62 @@ function onClick(e, id, item, subItem) {
}
}
-function insertBorder() {
- var $grid = $('#setborderstyle-grid');
+function setBorders(left, right, bottom, top, horiz, vert) {
+ var params = {
+OuterBorder: {
+type : '[]any',
+value : [
+{ type : 'com.sun.star.table.BorderLine2', value : { Color : {
type : 'com.sun.star.util.Color', value : 0 }, InnerLineWidth : { type :
'short', value : 0 }, OuterLineWidth : { type : 'short', value : left },
LineDistance : { type : 'short', value : 0 }, LineStyle : { type : 'short',
value : 0 }, LineWidth : { type : 'unsigned long', value : 0 } } },
+{ type : 'com.sun.star.table.BorderLine2', value : { Color : {
type : 'com.sun.star.util.Color', value : 0 }, InnerLineWidth : { type :
'short', value : 0 }, OuterLineWidth : { type : 'short', value : right },
LineDistance : { type : 'short', value : 0 }, LineStyle : { type : 'short',
value : 0 }, LineWidth : { type : 'unsigned long', value : 0 } } },
+{ type : 'com.sun.star.table.BorderLine2', value : { Color : {
type : 'com.sun.star.util.Color', value : 0 }, InnerLineWidth : { type :
'short', value : 0 }, OuterLineWidth : { type : 'short', value : bottom },
LineDistance : { type : 'short', value : 0 }, LineStyle : { type : 'short',
value : 0 }, LineWidth : { type : 'unsigned long', value : 0 } } },
+{ type : 'com.sun.star.table.BorderLine2', value : { Color : {
type : 'com.sun.star.util.Color', value : 0 }, InnerLineWidth : { type :
'short', value : 0 }, OuterLineWidth : { type : 'short', value : top },
LineDistance : { type : 'short', value : 0 }, LineStyle : { type : 'short',
value : 0 }, LineWidth : { type : 'unsigned long', value : 0 } } },
+{ type : 'long', value : 0 },
+{ type : 'long', value : 0 },
+{ type : 'long', value : 0 },
+{ type : 'long', value : 0 },
+{ type : 'long', value : 0 }
+]
+},
+InnerBorder: {
+type : '[]any',
+value : [
+{ type : 'com.sun.star.table.BorderLine2', value : { Color : {
type : 'com.sun.star.util.Color', value : 0 }, InnerLineWidth : { type :
'short', value : 0 }, OuterLineWidth : { type : 'short', value : horiz },
LineDistance : { type : 'short', value : 0 }, LineStyle : { type : 'short',
value : 0 }, LineWidth : { type : 'unsigned long', value : 0 } } },
+{ type : 'com.sun.star.table.BorderLine2', value : { Color : {
type : 'com.sun.star.util.Color', value : 0 }, InnerLineWidth : { type :
'short', value : 0 }, OuterLineWidth : { type : 'short', value : vert },
LineDistance : { type : 'short', value : 0 }, LineStyle : { type : 'short',
value : 0 }, LineWidth : { type : 'unsigned long', value : 0 } } },
+{ type : 'short', value : 0 },
+{ type : 'short', value : 127 },
+{ type : 'long', value : 0 }
+]
+}};
+ map.sendUnoCommand('.uno:SetBorderStyle', params);
+}
- $grid.on({
- click: function() {
- // TODO send map.sendUnoCommand('.uno:
com.sun.star.table.BorderLine2' );
- $().w2overlay({ name: 'toolbar-up' });
- console.log('click border');
- }
- });
+function setBorderStyle(num) {
+ switch (num) {
+ case 1: setBorders(0, 0, 0, 0, 0, 0); break;
+ case 2: setBorders(1, 0, 0, 0, 0, 0); break;
+ case 3: setBorders(0, 1, 0, 0, 0, 0); break;
+ case 4: setBorders(1, 1, 0, 0, 0, 0); break;
+
+ case 5: setBorders(0, 0, 0, 1, 0, 0); break;
+ case 6: setBorders(0, 0, 1, 0, 0, 0); break;
+ case 7: setBorders(0, 0, 1, 1, 0, 0); break;
+ case 8: setBorders(1, 1, 1, 1, 0, 0); break;
+
+ case 9: setBorders(0, 0, 1, 1, 1, 0); break;
+ case 10: setBorders(1, 1, 1, 1, 1, 0); break;
+ case 11: setBorders(1, 1, 1, 1, 0, 1); break;
+ case 12: setBorders(1, 1, 1, 1, 1, 1); break;
+
+ default: console.log('ignored
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist
loleaflet/dist/toolbar.css| 15 ++-
loleaflet/dist/toolbar/toolbar.js |8
2 files changed, 14 insertions(+), 9 deletions(-)
New commits:
commit 4468f7a26e0a170f774d18a770c270f5d48da183
Author: Jan Holesovsky
Date: Tue Jun 19 11:29:33 2018 +0200
borders: Improve the look.
Change-Id: Ib7ca90285bb012a09f5fd2d867a3d588e831ec3a
Reviewed-on: https://gerrit.libreoffice.org/56092
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 0ea6834a0..23bd74115 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -270,12 +270,17 @@ button.leaflet-control-search-next
.w2ui-icon.frame11 { background: url('../images/fr011.svg') no-repeat center
!important; }
.w2ui-icon.frame12 { background: url('../images/fr012.svg') no-repeat center
!important; }
-#insertborder-grid tr td {
-border-style: inset;
+#setborderstyle-grid tr td {
+box-sizing: border-box;
+background: rgba(255, 255, 255, 0.5);
+position: relative;
+padding: 2px;
+border: 1px solid #ccc;
+overflow: auto; /* child margins otherwise don't expand *this* element
(parent) */
}
-#insertborder-grid tr td:hover {
-border-style: solid;
+#setborderstyle-grid td:hover {
+border: 1px solid #888;
}
.w2ui-icon.accepttrackedchanges{ background:
url('../images/lc_accepttrackedchanges.svg') no-repeat center !important; }
@@ -302,7 +307,7 @@ button.leaflet-control-search-next
.w2ui-icon.italic{ background: url('../images/lc_italic.svg') no-repeat center
!important; }
.w2ui-icon.insertgraphic{ background: url('../images/lc_gallery.svg')
no-repeat center !important; }
.w2ui-icon.inserttable{ background: url('../images/lc_inserttable.svg')
no-repeat center !important; }
-.w2ui-icon.insertborder{ background: url('../images/lc_setborderstyle.svg')
no-repeat center !important; }
+.w2ui-icon.setborderstyle{ background: url('../images/lc_setborderstyle.svg')
no-repeat center !important; }
.w2ui-icon.next{ background: url('../images/lc_downsearch.svg') no-repeat
center !important; }
.w2ui-icon.numbering{ background: url('../images/lc_defaultnumbering.svg')
no-repeat center !important; }
.w2ui-icon.presentation{ background: url('../images/lc_dia.svg') no-repeat
center !important; }
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index f232ebce3..f47b120b9 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -242,7 +242,7 @@ function onClick(e, id, item, subItem) {
}
function insertBorder() {
- var $grid = $('#insertborder-grid');
+ var $grid = $('#setborderstyle-grid');
$grid.on({
click: function() {
@@ -883,9 +883,9 @@ map.on('doclayerinit', function () {
switch (docType) {
case 'spreadsheet':
toolbarUp.remove('inserttable', 'styles', 'justifypara',
'defaultbullet', 'defaultnumbering', 'break-numbering');
- toolbarUp.insert('insertshapes',
- {type: 'drop', id: 'insertborder', img:
'insertborder', hint: _('Borders'), overlay: {onShow: insertBorder},
- html: '' +
+ toolbarUp.insert('setborderstyle',
+ {type: 'drop', id: 'setborderstyle', img:
'setborderstyle', hint: _('Borders'), overlay: {onShow: insertBorder},
+ html: '' +
'' +
'' +
'' +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 3 commits - desktop/CppunitTest_desktop_lokinit.mk desktop/inc desktop/Module_desktop.mk desktop/qa desktop/source
desktop/CppunitTest_desktop_lokinit.mk | 49 +++
desktop/Module_desktop.mk |1
desktop/inc/lib/init.hxx |6 +
desktop/qa/unit/desktop-lok-init.cxx | 140 +
desktop/source/lib/init.cxx| 83 ++-
5 files changed, 275 insertions(+), 4 deletions(-)
New commits:
commit 749780c9b5e2922417a7686efc3e4f609bb20264
Author: Jan Holesovsky
Date: Tue Jun 19 01:18:08 2018 +0200
lok: Unit test for passing table borders via jsonToPropertyValuesVector.
Change-Id: Iadc0d76a1903d76fcd84f316d4796cc1dec13277
diff --git a/desktop/CppunitTest_desktop_lokinit.mk
b/desktop/CppunitTest_desktop_lokinit.mk
index 91493dee4530..07d235861d90 100644
--- a/desktop/CppunitTest_desktop_lokinit.mk
+++ b/desktop/CppunitTest_desktop_lokinit.mk
@@ -19,6 +19,8 @@ $(eval $(call
gb_CppunitTest_use_external,desktop_lok_init,boost_headers))
$(eval $(call gb_CppunitTest_use_sdk_api,desktop_lok_init))
+$(eval $(call gb_CppunitTest_use_ure,desktop_lok_init))
+
$(eval $(call gb_CppunitTest_set_include,desktop_lok_init,\
-I$(SRCDIR)/desktop/source/inc \
-I$(SRCDIR)/desktop/inc \
diff --git a/desktop/qa/unit/desktop-lok-init.cxx
b/desktop/qa/unit/desktop-lok-init.cxx
index 07abe887ccfd..69c209e9055e 100644
--- a/desktop/qa/unit/desktop-lok-init.cxx
+++ b/desktop/qa/unit/desktop-lok-init.cxx
@@ -20,10 +20,13 @@
#include
#include
-#include
+#include
#include
+#include
+#include
+
using namespace css;
/// Unit tests for desktop/source/lib/init.cxx internals.
@@ -35,9 +38,11 @@ public:
}
void testJsonToPropertyValues();
+void testJsonToPropertyValuesBorder();
CPPUNIT_TEST_SUITE(LOKInitTest);
CPPUNIT_TEST(testJsonToPropertyValues);
+CPPUNIT_TEST(testJsonToPropertyValuesBorder);
CPPUNIT_TEST_SUITE_END();
};
@@ -70,6 +75,64 @@ void LOKInitTest::testJsonToPropertyValues()
assertSequencesEqual(aArgs,
comphelper::containerToSequence(desktop::jsonToPropertyValuesVector(arguments)));
}
+void LOKInitTest::testJsonToPropertyValuesBorder()
+{
+const char arguments[] = "{"
+"\"OuterBorder\": {"
+"\"type\" : \"[]any\","
+"\"value\" : ["
+"{ \"type\" : \"com.sun.star.table.BorderLine2\", \"value\" :
{ \"Color\" : { \"type\" : \"com.sun.star.util.Color\", \"value\" : 0 },
\"InnerLineWidth\" : { \"type\" : \"short\", \"value\" : 0 },
\"OuterLineWidth\" : { \"type\" : \"short\", \"value\" : 1 }, \"LineDistance\"
: { \"type\" : \"short\", \"value\" : 0 }, \"LineStyle\" : { \"type\" :
\"short\", \"value\" : 0 }, \"LineWidth\" : { \"type\" : \"unsigned long\",
\"value\" : 1 } } },"
+"{ \"type\" : \"com.sun.star.table.BorderLine2\", \"value\" :
{ \"Color\" : { \"type\" : \"com.sun.star.util.Color\", \"value\" : 0 },
\"InnerLineWidth\" : { \"type\" : \"short\", \"value\" : 0 },
\"OuterLineWidth\" : { \"type\" : \"short\", \"value\" : 1 }, \"LineDistance\"
: { \"type\" : \"short\", \"value\" : 0 }, \"LineStyle\" : { \"type\" :
\"short\", \"value\" : 0 }, \"LineWidth\" : { \"type\" : \"unsigned long\",
\"value\" : 1 } } },"
+"{ \"type\" : \"com.sun.star.table.BorderLine2\", \"value\" :
{ \"Color\" : { \"type\" : \"com.sun.star.util.Color\", \"value\" : 0 },
\"InnerLineWidth\" : { \"type\" : \"short\", \"value\" : 0 },
\"OuterLineWidth\" : { \"type\" : \"short\", \"value\" : 1 }, \"LineDistance\"
: { \"type\" : \"short\", \"value\" : 0 }, \"LineStyle\" : { \"type\" :
\"short\", \"value\" : 0 }, \"LineWidth\" : { \"type\" : \"unsigned long\",
\"value\" : 1 } } },"
+"{ \"type\" : \"com.sun.star.table.BorderLine2\", \"value\" :
{ \"Color\" : { \"type\" : \"com.sun.star.util.Color\", \"value\" : 0 },
\"InnerLineWidth\" : { \"type\" : \"short\", \"value\" : 0 },
\"OuterLineWidth\" : { \"type\" : \"short\", \
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - include/sfx2 officecfg/registry sfx2/source
include/sfx2/strings.hrc |2 +
include/sfx2/viewfrm.hxx |3 +
officecfg/registry/schema/org/openoffice/Setup.xcs |6 +++
sfx2/source/view/viewfrm.cxx | 42 +
4 files changed, 52 insertions(+), 1 deletion(-)
New commits:
commit 5e58b203e03fbcf6ca1399954bc01871474c973e
Author: Jan Holesovsky
Date: Wed Jun 13 16:25:47 2018 +0200
Implement infobar encouraging the community involvement.
Change-Id: I06128ed7d28d17fa9a395878efaef4b890f5dbe0
Reviewed-on: https://gerrit.libreoffice.org/55760
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
(cherry picked from commit c3fa7a82b7657b00f30394df59e2ffc610350686)
Reviewed-on: https://gerrit.libreoffice.org/55880
Reviewed-by: Adolfo Jayme Barrientos
Reviewed-by: Thorsten Behrens
Reviewed-by: Stephan Bergmann
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index 325cc509e2e7..6d871b648d4f 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -243,6 +243,8 @@
#define STR_QUERY_OPENASTEMPLATE_OPEN_BTN
NC_("STR_QUERY_OPENASTEMPLATE_OPEN_BTN", "~Open")
#define STR_REPAIREDDOCUMENTNC_("STR_REPAIREDDOCUMENT", "
(repaired document)")
#define STR_NONCHECKEDOUT_DOCUMENT
NC_("STR_NONCHECKEDOUT_DOCUMENT", "This document is not checked out on the
server.")
+#define STR_GET_INVOLVED_TEXT NC_("STR_GET_INVOLVED_TEXT",
"Help us make %PRODUCTNAME even better!")
+#define STR_GET_INVOLVED_BUTTON NC_("STR_GET_INVOLVED_BUTTON",
"Get involved")
#define STR_READONLY_DOCUMENT NC_("STR_READONLY_DOCUMENT",
"This document is open in read-only mode.")
#define STR_READONLY_PDFNC_("STR_READONLY_PDF", "This
PDF is open in read-only mode to allow signing the existing file.")
#define STR_CLASSIFIED_DOCUMENT NC_("STR_CLASSIFIED_DOCUMENT",
"The classification label of this document is %1.")
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index ef3892b3e30d..3fafd9e1762d 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -76,7 +76,8 @@ private:
protected:
virtual voidNotify( SfxBroadcaster& rBC, const SfxHint& rHint
) override;
-DECL_LINK( SwitchReadOnlyHandler, Button*, void );
+DECL_LINK(GetInvolvedHandler, Button*, void);
+DECL_LINK(SwitchReadOnlyHandler, Button*, void);
DECL_LINK(SignDocumentHandler, Button*, void);
SAL_DLLPRIVATE void KillDispatcher_Impl();
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs
b/officecfg/registry/schema/org/openoffice/Setup.xcs
index 31db1eca9af4..3adfefa2d1fd 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -289,6 +289,12 @@
+
+
+ The last time when the Get Involved infobar was
shown.
+
+ 0
+
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 16634c0dd5e2..4c37fa546543 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -106,6 +107,7 @@ using ::com::sun::star::container::XIndexContainer;
#include
#include
#include
+#include
#include
#include
#include
@@ -1214,6 +1216,35 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/,
const SfxHint& rHint )
rBind.Invalidate( SID_RELOAD );
rBind.Invalidate( SID_EDITDOC );
+// inform about the community involvement
+const sal_Int64 nLastShown =
officecfg::Setup::Product::LastTimeGetInvolvedShown::get();
+const sal_Int64 nNow =
std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count();
+const sal_Int64 nPeriodSec(60 * 60 * 24 * 30); // 30 days in
seconds
+bool bUpdateLastTimeGetInvolvedShown = false;
+
+if (nLastShown == 0)
+bUpdateLastTimeGetInvolvedShown = true;
+else if (nPeriodSec < nNow && nLastShown < nNow - nPeriodSec)
+{
+bUpdateLastTimeGetInvolvedShown = true;
+
+VclPtr pInfoBar =
AppendInfoBar("getinvolved", SfxResId(STR_GET_INVOLVED_TEXT),
InfoBarType::Info);
+
+VclPtrInstance
xGetInvolvedButton(());
+
xGetInvolvedButton->SetText(SfxResId(STR_GET_INVOLVED_BUTTON));
+
xGetInvolvedButton->SetSiz
[Libreoffice-commits] core.git: include/sfx2 officecfg/registry sfx2/source
include/sfx2/strings.hrc |2 +
include/sfx2/viewfrm.hxx |3 +
officecfg/registry/schema/org/openoffice/Setup.xcs |6 +++
sfx2/source/view/viewfrm.cxx | 42 +
4 files changed, 52 insertions(+), 1 deletion(-)
New commits:
commit c3fa7a82b7657b00f30394df59e2ffc610350686
Author: Jan Holesovsky
Date: Wed Jun 13 16:25:47 2018 +0200
Implement infobar encouraging the community involvement.
Change-Id: I06128ed7d28d17fa9a395878efaef4b890f5dbe0
Reviewed-on: https://gerrit.libreoffice.org/55760
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index 325cc509e2e7..6d871b648d4f 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -243,6 +243,8 @@
#define STR_QUERY_OPENASTEMPLATE_OPEN_BTN
NC_("STR_QUERY_OPENASTEMPLATE_OPEN_BTN", "~Open")
#define STR_REPAIREDDOCUMENTNC_("STR_REPAIREDDOCUMENT", "
(repaired document)")
#define STR_NONCHECKEDOUT_DOCUMENT
NC_("STR_NONCHECKEDOUT_DOCUMENT", "This document is not checked out on the
server.")
+#define STR_GET_INVOLVED_TEXT NC_("STR_GET_INVOLVED_TEXT",
"Help us make %PRODUCTNAME even better!")
+#define STR_GET_INVOLVED_BUTTON NC_("STR_GET_INVOLVED_BUTTON",
"Get involved")
#define STR_READONLY_DOCUMENT NC_("STR_READONLY_DOCUMENT",
"This document is open in read-only mode.")
#define STR_READONLY_PDFNC_("STR_READONLY_PDF", "This
PDF is open in read-only mode to allow signing the existing file.")
#define STR_CLASSIFIED_DOCUMENT NC_("STR_CLASSIFIED_DOCUMENT",
"The classification label of this document is %1.")
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index ef3892b3e30d..3fafd9e1762d 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -76,7 +76,8 @@ private:
protected:
virtual voidNotify( SfxBroadcaster& rBC, const SfxHint& rHint
) override;
-DECL_LINK( SwitchReadOnlyHandler, Button*, void );
+DECL_LINK(GetInvolvedHandler, Button*, void);
+DECL_LINK(SwitchReadOnlyHandler, Button*, void);
DECL_LINK(SignDocumentHandler, Button*, void);
SAL_DLLPRIVATE void KillDispatcher_Impl();
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs
b/officecfg/registry/schema/org/openoffice/Setup.xcs
index 31db1eca9af4..3adfefa2d1fd 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -289,6 +289,12 @@
+
+
+ The last time when the Get Involved infobar was
shown.
+
+ 0
+
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 0bfe4aeb019e..a31652baee40 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -105,6 +106,7 @@ using ::com::sun::star::container::XIndexContainer;
#include
#include
#include
+#include
#include
#include
#include
@@ -1213,6 +1215,35 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/,
const SfxHint& rHint )
rBind.Invalidate( SID_RELOAD );
rBind.Invalidate( SID_EDITDOC );
+// inform about the community involvement
+const sal_Int64 nLastShown =
officecfg::Setup::Product::LastTimeGetInvolvedShown::get();
+const sal_Int64 nNow =
std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count();
+const sal_Int64 nPeriodSec(60 * 60 * 24 * 30); // 30 days in
seconds
+bool bUpdateLastTimeGetInvolvedShown = false;
+
+if (nLastShown == 0)
+bUpdateLastTimeGetInvolvedShown = true;
+else if (nPeriodSec < nNow && nLastShown < nNow - nPeriodSec)
+{
+bUpdateLastTimeGetInvolvedShown = true;
+
+VclPtr pInfoBar =
AppendInfoBar("getinvolved", SfxResId(STR_GET_INVOLVED_TEXT),
InfoBarType::Info);
+
+VclPtrInstance
xGetInvolvedButton(());
+
xGetInvolvedButton->SetText(SfxResId(STR_GET_INVOLVED_BUTTON));
+
xGetInvolvedButton->SetSizePixel(xGetInvolvedButton->GetOptimalSize());
+xGetInvolvedButton->SetClickHdl(LINK(this, SfxViewFrame,
GetInvolvedHandler));
+pInfoBar->addButton(xGetInvolvedButton);
+}
+
+if (bUpdateLastTimeG
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - 25 commits - common/Log.cpp common/Log.hpp common/Seccomp.cpp common/Seccomp.hpp common/Session.cpp common/Session
Makefile.am| 14 +++
common/Log.cpp | 35 ++---
common/Log.hpp | 137 ++-
common/Seccomp.cpp |7 +
common/Seccomp.hpp |3
common/Session.cpp | 69 +++---
common/Session.hpp | 16 +++-
common/Util.cpp| 78 +---
common/Util.hpp| 21 +
configure.ac | 22 +
kit/ChildSession.cpp | 32
kit/ChildSession.hpp |2
kit/ForKit.cpp | 27 ++-
kit/Kit.cpp| 124 ++--
kit/Kit.hpp|6 +
kit/KitHelper.hpp |2
loolwsd.xml.in |4 +
net/Socket.cpp |9 +-
test/WhiteBoxTests.cpp |2
wsd/Admin.cpp |2
wsd/AdminModel.cpp |9 +-
wsd/ClientSession.cpp | 18 ++--
wsd/DocumentBroker.cpp | 141 +++-
wsd/DocumentBroker.hpp |4 -
wsd/LOOLWSD.cpp| 187 +
wsd/LOOLWSD.hpp| 15 +++
wsd/Storage.cpp| 170 +++-
wsd/Storage.hpp| 10 +-
wsd/TileCache.cpp |8 +-
29 files changed, 818 insertions(+), 356 deletions(-)
New commits:
commit 8442d7896271f16101d90c5f79286cf40ca33417
Author: Jan Holesovsky
Date: Fri Jun 15 16:31:22 2018 +0200
anonymization: Anonymize docKey's in adminmodel.
Change-Id: Ibbefb93aa378f6faecbdb8b8c4f59013696b73c7
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index ba24004ec..c1a7133ea 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -453,7 +453,7 @@ void Admin::rmDoc(const std::string& docKey, const
std::string& sessionId)
void Admin::rmDoc(const std::string& docKey)
{
-LOG_INF("Removing complete doc [" << docKey << "] from Admin.");
+LOG_INF("Removing complete doc [" << LOOLWSD::anonymizeUrl(docKey) << "]
from Admin.");
addCallback([=]{ _model.removeDocument(docKey); });
}
diff --git a/wsd/AdminModel.cpp b/wsd/AdminModel.cpp
index 843ce1271..7d31b6196 100644
--- a/wsd/AdminModel.cpp
+++ b/wsd/AdminModel.cpp
@@ -179,7 +179,7 @@ void AdminModel::assertCorrectThread() const
AdminModel::~AdminModel()
{
-LOG_DBG("History:\n\n" << getAllHistory() << '\n');
+LOG_TRC("History:\n\n" << getAllHistory() << '\n');
LOG_INF("AdminModel dtor.");
}
@@ -470,7 +470,7 @@ void AdminModel::addDocument(const std::string& docKey,
Poco::Process::PID pid,
const auto ret = _documents.emplace(docKey, Document(docKey, pid,
filename));
ret.first->second.takeSnapshot();
ret.first->second.addView(sessionId, userName, userId);
-LOG_DBG("Added admin document [" << docKey << "].");
+LOG_DBG("Added admin document [" << LOOLWSD::anonymizeUrl(docKey) << "].");
std::string encodedUsername;
std::string encodedFilename;
@@ -554,7 +554,7 @@ void AdminModel::removeDocument(const std::string& docKey)
docIt->second.expireView(pair.first);
}
-LOG_DBG("Removed admin document [" << docKey << "].");
+LOG_DBG("Removed admin document [" << LOOLWSD::anonymizeUrl(docKey) <<
"].");
_expiredDocuments.emplace(*docIt);
_documents.erase(docIt);
}
commit ecb339e53203f5763716a1d712ad42b7967daf82
Author: Jan Holesovsky
Date: Fri Jun 15 16:28:55 2018 +0200
anonymization: Anonymize uri's in the tilecache.
Change-Id: I927d05e0329e3b2375f8d04f23b4356f2fd31764
diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index 5689084a7..4a183fdd9 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -51,10 +51,12 @@ TileCache::TileCache(const std::string& docURL,
_docURL(docURL),
_cacheDir(cacheDir)
{
-LOG_INF("TileCache ctor for uri [" << _docURL <<
+#ifndef BUILDING_TESTS
+LOG_INF("TileCache ctor for uri [" << LOOLWSD::anonymizeUrl(_docURL) <<
"], cacheDir: [" << _cacheDir <<
"], modifiedTime=" << (modifiedTime.raw()/100) <<
" getLastModified()=" << (getLastModified().raw()/100));
+#endif
File directory(_cacheDir);
std::string unsaved;
if (directory.exists() &&
@@ -73,7 +75,9 @@ TileCache::TileCache(const std::string& docURL,
TileCache::~TileCache()
{
_owner = std::thread::id(0);
-LOG_INF("~TileCache dtor for uri [" << _docURL << "].");
+#ifndef BUILDING_TESTS
+LOG_INF("~TileCache dtor for uri [" << LOOLWSD::anonymizeUrl(_docURL) <<
"].");
+#endif
}
void TileCache::completeCle
[Libreoffice-commits] online.git: wsd/ClientSession.cpp
wsd/ClientSession.cpp |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit b65894b28777505c611156a11e6b6377a04ead91
Author: Jan Holesovsky
Date: Wed Apr 25 13:46:23 2018 +0200
Avoid crash in the non-wopi case.
Change-Id: I87aff462dab4abca0235622493f720eacbc39f03
Reviewed-on: https://gerrit.libreoffice.org/53448
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 70ee741fa..337221f1d 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -750,9 +750,9 @@ bool ClientSession::handleKitToClientMessage(const char*
buffer, const int lengt
if (unoStatePair.first == ".uno:TrackChanges")
{
if ((unoStatePair.second == "true" &&
- _wopiFileInfo->_disableChangeTrackingRecord ==
WopiStorage::WOPIFileInfo::TriState::True) ||
+ _wopiFileInfo &&
_wopiFileInfo->_disableChangeTrackingRecord ==
WopiStorage::WOPIFileInfo::TriState::True) ||
(unoStatePair.second == "false" &&
- _wopiFileInfo->_disableChangeTrackingRecord ==
WopiStorage::WOPIFileInfo::TriState::False))
+ _wopiFileInfo &&
_wopiFileInfo->_disableChangeTrackingRecord ==
WopiStorage::WOPIFileInfo::TriState::False))
{
// Toggle the TrackChanges state.
LOG_DBG("Forcing " << unoStatePair.first << " toggle
per user settings.");
@@ -762,9 +762,9 @@ bool ClientSession::handleKitToClientMessage(const char*
buffer, const int lengt
else if (unoStatePair.first == ".uno:ShowTrackedChanges")
{
if ((unoStatePair.second == "true" &&
- _wopiFileInfo->_disableChangeTrackingShow ==
WopiStorage::WOPIFileInfo::TriState::True) ||
+ _wopiFileInfo &&
_wopiFileInfo->_disableChangeTrackingShow ==
WopiStorage::WOPIFileInfo::TriState::True) ||
(unoStatePair.second == "false" &&
- _wopiFileInfo->_disableChangeTrackingShow ==
WopiStorage::WOPIFileInfo::TriState::False))
+ _wopiFileInfo &&
_wopiFileInfo->_disableChangeTrackingShow ==
WopiStorage::WOPIFileInfo::TriState::False))
{
// Toggle the ShowTrackChanges state.
LOG_DBG("Forcing " << unoStatePair.first << " toggle
per user settings.");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist
loleaflet/dist/toolbar.css |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 92d9fae1a1b084361193c8f5fdd194fce823dd07
Author: Jan Holesovsky
Date: Thu Jun 7 22:05:13 2018 +0200
Make sure we have enough space for the insert table grid.
Change-Id: I9c6cf2b038663bc68098b6abf4c7c69599ebe070
Reviewed-on: https://gerrit.libreoffice.org/55447
Reviewed-by: Tamás Zolnai
Tested-by: Tamás Zolnai
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 6492ac7d4..9d04ed1bc 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -346,11 +346,12 @@ button.leaflet-control-search-next
position: relative;
padding: 2px;
display: block;
-height: 232px;
+width: 243px;
}
.inserttable-grid .row {
height: 20px;
+margin: 3px;
}
.inserttable-grid .col {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/toolbar.css |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 814d266eca01b38e69b6467a4a413421954e83a0
Author: Jan Holesovsky
Date: Thu Jun 7 22:05:13 2018 +0200
Make sure we have enough space for the insert table grid.
Change-Id: I9c6cf2b038663bc68098b6abf4c7c69599ebe070
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 2eed67d4c..437be143a 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -475,11 +475,12 @@ button.leaflet-control-search-next
position: relative;
padding: 2px;
display: block;
-height: 232px;
+width: 243px;
}
.inserttable-grid .row {
height: 20px;
+margin: 3px;
}
.inserttable-grid .col {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
