|
 |
f325b2 |
From 13b160581f9f3ebdb1c21722e4e6f9783e0e0775 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Thu, 8 Oct 2015 10:07:46 +0200
|
|
|
f325b2 |
Subject: [PATCH 192/398] sc tiled rendering: no need to show this dialog
|
|
|
f325b2 |
|
|
|
f325b2 |
And it just causes problems during unit testing.
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Ie8524b726ae2709bab707df9b2984f07357e3059
|
|
|
f325b2 |
(cherry picked from commit dd7d97589bcbed22cf2dd12b574fc28baedf24af)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sc/source/ui/view/viewfun2.cxx | 3 ++-
|
|
|
f325b2 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
|
|
|
f325b2 |
index 295d3dbcbf44..555492f17538 100644
|
|
|
f325b2 |
--- a/sc/source/ui/view/viewfun2.cxx
|
|
|
f325b2 |
+++ b/sc/source/ui/view/viewfun2.cxx
|
|
|
f325b2 |
@@ -86,6 +86,7 @@
|
|
|
f325b2 |
#include <columnspanset.hxx>
|
|
|
f325b2 |
#include <rowheightcontext.hxx>
|
|
|
f325b2 |
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
|
|
|
f325b2 |
+#include <comphelper/lok.hxx>
|
|
|
f325b2 |
|
|
|
f325b2 |
#include <boost/scoped_ptr.hpp>
|
|
|
f325b2 |
#include <vector>
|
|
|
f325b2 |
@@ -1737,7 +1738,7 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
|
|
|
f325b2 |
if (nCommand == SvxSearchCmd::FIND_ALL || nCommand == SvxSearchCmd::REPLACE_ALL)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
|
|
|
f325b2 |
- if (pViewFrm)
|
|
|
f325b2 |
+ if (pViewFrm && !comphelper::LibreOfficeKit::isActive())
|
|
|
f325b2 |
{
|
|
|
f325b2 |
pViewFrm->ShowChildWindow(sc::SearchResultsDlgWrapper::GetChildWindowId(), true);
|
|
|
f325b2 |
SfxChildWindow* pWnd = pViewFrm->GetChildWindow(sc::SearchResultsDlgWrapper::GetChildWindowId());
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|