From e601a2cf161a833a74ac02bb431cfde8ad965fa1 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 31 Aug 2017 15:22:46 +0200
Subject: Fix silent merge conflict

Change-Id: I8879560850b4cf94984e3b3657800273b276fcdb
---
 sc/source/ui/vba/vbarange.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sc/source/ui/vba')

diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 29380216900b..7a39865446c1 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -4250,7 +4250,7 @@ static ScDBData* lcl_GetDBData_Impl( ScDocShell* pDocShell, sal_Int16 nSheet )
     return pRet;
 }
 
-static void lcl_SelectAll( const ScDocShell* pDocShell, const ScQueryParam& aParam )
+static void lcl_SelectAll( ScDocShell* pDocShell, const ScQueryParam& aParam )
 {
     if ( pDocShell )
     {
-- 
cgit