.gitreview | 2 +- bundled/include/LibreOfficeKit/LibreOfficeKit.h | 9 --------- configure.ac | 2 +- debian/loolwsd.service | 2 +- loolwsd.service | 2 +- 5 files changed, 4 insertions(+), 13 deletions(-)
New commits: commit a48c0784de720b7f912219d154feacc025fb0d06 Author: Andras Timar <[email protected]> AuthorDate: Tue Nov 20 16:25:50 2018 +0100 Commit: Andras Timar <[email protected]> CommitDate: Tue Nov 20 16:27:13 2018 +0100 fix mismerge Change-Id: I34c002d86ca32f0dec8c04b31ec242129db20c4d diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h b/bundled/include/LibreOfficeKit/LibreOfficeKit.h index 4409e62ec..27d968c4a 100644 --- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h +++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h @@ -347,15 +347,6 @@ struct _LibreOfficeKitDocumentClass /// @see lok::Document::getSignatureState(). int (*getSignatureState) (LibreOfficeKitDocument* pThis); - /// Paints window with given id to the buffer with the give DPI scale - /// (every pixel is dpiscale-times larger). - /// @see lok::Document::paintWindow(). - void (*paintWindowDPI) (LibreOfficeKitDocument* pThis, unsigned nWindowId, - unsigned char* pBuffer, - const int x, const int y, - const int width, const int height, - const double dpiscale); - #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY }; commit de4ed0eb20885277faa549513b1656b4d469ab79 Author: Andras Timar <[email protected]> AuthorDate: Tue Nov 20 14:06:29 2018 +0100 Commit: Andras Timar <[email protected]> CommitDate: Tue Nov 20 14:06:29 2018 +0100 gitreview: Update default branch Change-Id: I452c52deee94c65cee9296f6161fa28a0cf43903 diff --git a/.gitreview b/.gitreview index fc87636e3..b89dcd89d 100644 --- a/.gitreview +++ b/.gitreview @@ -3,5 +3,5 @@ host=logerrit port=29418 project=online defaultremote=logerrit -defaultbranch=master +defaultbranch=libreoffice-6-2 commit 4859ca9e7de538d95bff5e13d0f4b62c4e648e44 Author: Andras Timar <[email protected]> AuthorDate: Mon Jan 22 23:08:49 2018 +0100 Commit: Andras Timar <[email protected]> CommitDate: Tue Nov 20 14:05:35 2018 +0100 correct file server root for LibreOffice Online 6.0 Change-Id: I407c0f69e9a001a3a86f13926f0dc303c4df6d21 Reviewed-on: https://gerrit.libreoffice.org/48366 Reviewed-by: Jan Holesovsky <[email protected]> Tested-by: Jan Holesovsky <[email protected]> (cherry picked from commit b0344acb473038418ff1a5f91c475b0e8f6d4d3b) diff --git a/debian/loolwsd.service b/debian/loolwsd.service index d43d59078..a2ae6e645 100644 --- a/debian/loolwsd.service +++ b/debian/loolwsd.service @@ -4,7 +4,7 @@ After=network.target [Service] EnvironmentFile=-/etc/sysconfig/loolwsd -ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd +ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/libreoffice-online User=lool KillMode=control-group Restart=always diff --git a/loolwsd.service b/loolwsd.service index d43d59078..a2ae6e645 100644 --- a/loolwsd.service +++ b/loolwsd.service @@ -4,7 +4,7 @@ After=network.target [Service] EnvironmentFile=-/etc/sysconfig/loolwsd -ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd +ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/libreoffice-online User=lool KillMode=control-group Restart=always commit 95a2cbe24a7ff07fe4ff1b22d3ac574be7fdea5e Author: Andras Timar <[email protected]> AuthorDate: Tue Nov 20 14:04:56 2018 +0100 Commit: Andras Timar <[email protected]> CommitDate: Tue Nov 20 14:04:56 2018 +0100 Bump version to 6.2.0.0.beta1 Change-Id: Iaec1ab790b948a0c4274a4f61d6db16ad7b32c61 diff --git a/configure.ac b/configure.ac index 39e4cf3b3..386fc1a32 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63]) -AC_INIT([loolwsd], [master], [[email protected]]) +AC_INIT([libreoffice-online], [6.2.0.0.beta1], [[email protected]]) LT_INIT([shared, disable-static, dlopen]) AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability]) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
