diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-08-31 15:22:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-08-31 15:24:07 +0200 |
| commit | e601a2cf161a833a74ac02bb431cfde8ad965fa1 (patch) | |
| tree | 1e780c49d5b4fe87899ee2d8faa37b96d3c5dc0f /sc/source/ui/vba | |
| parent | 3d1bb76ebf5c51141018cfd76eccdb63472de8de (diff) | |
Fix silent merge conflict
Change-Id: I8879560850b4cf94984e3b3657800273b276fcdb
Diffstat (limited to 'sc/source/ui/vba')
| -rw-r--r-- | sc/source/ui/vba/vbarange.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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 ) { |