[Libreoffice-commits] core.git: sc/source

Eike Rathke (via logerrit) logerrit at kemper.freedesktop.org
Sat Oct 31 20:31:50 UTC 2020


 sc/source/ui/app/inputhdl.cxx |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 90ec4069e987e7d16b89dd85a3008a7c868bba1f
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Sat Oct 31 19:27:14 2020 +0100
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Sat Oct 31 21:31:10 2020 +0100

    Use ScDocument::GetSheetSeparator()
    
    Change-Id: Ib83e66f2184b32f98e01e3deae5600c2e0f2045f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105125
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index df08e89a7b19..7d17b6e0526f 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -105,13 +105,6 @@ namespace {
 // Collation may treat parentheses differently.
 const sal_Unicode cParenthesesReplacement = 0x0001;
 
-sal_Unicode lcl_getSheetSeparator(ScDocument& rDoc)
-{
-    const ScCompiler::Convention* pConv = ScCompiler::GetRefConvention(
-            FormulaGrammar::extractRefConvention( rDoc.GetGrammar()));
-    return pConv ? pConv->getSpecialSymbol( ScCompiler::Convention::SHEET_SEPARATOR) : '.';
-}
-
 ScTypedCaseStrSet::const_iterator findText(
     const ScTypedCaseStrSet& rDataSet, ScTypedCaseStrSet::const_iterator const & itPos,
     const OUString& rStart, OUString& rResult, bool bBack)
@@ -311,7 +304,7 @@ void ScInputHandler::InitRangeFinder( const OUString& rFormula )
         return;
     ScDocShell* pDocSh = pActiveViewSh->GetViewData().GetDocShell();
     ScDocument& rDoc = pDocSh->GetDocument();
-    const sal_Unicode cSheetSep = lcl_getSheetSeparator(rDoc);
+    const sal_Unicode cSheetSep = rDoc.GetSheetSeparator();
 
     OUString aDelimiters = ScEditUtil::ModifyDelimiters(" !~\"");
         // delimiters (in addition to ScEditUtil): only characters that are
@@ -1064,7 +1057,7 @@ void ScInputHandler::ShowArgumentsTip( OUString& rSelText )
 
     ScDocShell* pDocSh = pActiveViewSh->GetViewData().GetDocShell();
     const sal_Unicode cSep = ScCompiler::GetNativeSymbolChar(ocSep);
-    const sal_Unicode cSheetSep = lcl_getSheetSeparator(pDocSh->GetDocument());
+    const sal_Unicode cSheetSep = pDocSh->GetDocument().GetSheetSeparator();
     FormulaHelper aHelper(ScGlobal::GetStarCalcFunctionMgr());
     bool bFound = false;
     while( !bFound )


More information about the Libreoffice-commits mailing list