diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-03-10 18:50:54 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-03-10 21:01:23 +0100 |
| commit | 235136c17868627412db8dda148d3c4103907c0c (patch) | |
| tree | cc2e1663078126cccd4c9cdc7b8c86e5a2c12983 /sc/source | |
| parent | 83de4879c3cd416c423dd147be6511a1d074c8c9 (diff) | |
sc lok: Don't interact with the user during .uno:SortAscending or Descending.
Change-Id: Ib3679413ba59e86438dac83abfa9b624e291e5a9
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/ui/view/cellsh2.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 1ab82abb7c3d..789f29763320 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -20,6 +20,7 @@ #include <config_features.h> #include "scitems.hxx" +#include <comphelper/lok.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx> #include <sfx2/request.hxx> @@ -165,8 +166,10 @@ static bool lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam ) aExternalRange.aEnd.SetRow( nEndRow ); aExternalRange.aEnd.SetCol( nEndCol ); - if(( rSortParam.nCol1 == rSortParam.nCol2 && aExternalRange.aStart.Col() != aExternalRange.aEnd.Col() ) || - ( rSortParam.nRow1 == rSortParam.nRow2 && aExternalRange.aStart.Row() != aExternalRange.aEnd.Row() ) ) + // with LibreOfficeKit, don't try to interact with the user + if (!comphelper::LibreOfficeKit::isActive() && + ((rSortParam.nCol1 == rSortParam.nCol2 && aExternalRange.aStart.Col() != aExternalRange.aEnd.Col()) || + (rSortParam.nRow1 == rSortParam.nRow2 && aExternalRange.aStart.Row() != aExternalRange.aEnd.Row()))) { sal_uInt16 nFmt = SCA_VALID; |