vcl/source/window/window.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
New commits: commit 32d3af216800555009c0f372615a446da54dc6e9 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Tue Jun 23 15:15:21 2020 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Jun 23 18:41:26 2020 +0200 fix commit "remove JSON node erasing" this commit 84881e32317765e7752d57fceac8d979dd801b8c Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Fri Jun 19 16:17:25 2020 +0200 remove JSON node erasing left some intermediate state behind Change-Id: I3d14b3f14c56e2e866903ac7985aa1a5c09ce471 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96947 Tested-by: Noel Grandin <noel.gran...@collabora.co.uk> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 767beda066d9..c3baf5e6547c 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -85,8 +85,6 @@ using namespace ::com::sun::star::datatransfer::dnd; namespace vcl { -static bool g_isLOKMobilePhone = false; - Window::Window( WindowType nType ) : OutputDevice(OUTDEV_WINDOW) , mpWindowImpl(new WindowImpl( nType )) @@ -3387,7 +3385,7 @@ boost::property_tree::ptree Window::DumpAsPropertyTree() // This is for the code in sc/source/ui/sidebar/AlignmentPropertyPanel.cxx. // Also see commit f27c6320e8496d690b5d341d3718430709263a1c // "lok: remove complex rotation / alignment settings" - if (g_isLOKMobilePhone && get_id() == "textorientbox") { + if (get_id() == "textorientbox") { return boost::property_tree::ptree(); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits