Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
066d33c7
Kaydet (Commit)
066d33c7
authored
Kas 16, 2013
tarafından
Kohei Yoshida
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
EncodeUrlMode always set to "by grammer". Remove it.
Change-Id: I7de308bbdaacc1fc60a142497acc2301c080e5dc
üst
3dab6fcb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
54 deletions
+7
-54
compiler.hxx
sc/inc/compiler.hxx
+1
-9
compiler.cxx
sc/source/core/tool/compiler.cxx
+6
-45
No files found.
sc/inc/compiler.hxx
Dosyayı görüntüle @
066d33c7
...
...
@@ -213,13 +213,6 @@ class SC_DLLPUBLIC ScCompiler : public formula::FormulaCompiler
{
public
:
enum
EncodeUrlMode
{
ENCODE_BY_GRAMMAR
,
ENCODE_ALWAYS
,
ENCODE_NEVER
,
};
enum
ExtendedErrorDetection
{
EXTENDED_ERROR_DETECTION_NONE
=
0
,
// no error on unknown symbols, default (interpreter handles it)
...
...
@@ -330,7 +323,6 @@ private:
SCsTAB
nMaxTab
;
// last sheet in document
sal_Int32
mnRangeOpPosInSymbol
;
// if and where a range operator is in symbol
const
Convention
*
pConv
;
EncodeUrlMode
meEncodeUrlMode
;
ExtendedErrorDetection
meExtendedErrorDetection
;
bool
mbCloseBrackets
;
// whether to close open brackets automatically, default TRUE
bool
mbRewind
;
// whether symbol is to be rewound to some step during lexical analysis
...
...
@@ -411,7 +403,7 @@ public:
void
SetGrammar
(
const
formula
::
FormulaGrammar
::
Grammar
eGrammar
);
void
SetNumberFormatter
(
SvNumberFormatter
*
pFormatter
);
EncodeUrlMode
GetEncodeUrlMode
()
const
;
private
:
/** Set grammar and reference convention from within SetFormulaLanguage()
or SetGrammar().
...
...
sc/source/core/tool/compiler.cxx
Dosyayı görüntüle @
066d33c7
...
...
@@ -244,11 +244,6 @@ void ScCompiler::SetNumberFormatter( SvNumberFormatter* pFormatter )
mpFormatter
=
pFormatter
;
}
ScCompiler
::
EncodeUrlMode
ScCompiler
::
GetEncodeUrlMode
()
const
{
return
meEncodeUrlMode
;
}
void
ScCompiler
::
SetFormulaLanguage
(
const
ScCompiler
::
OpCodeMapPtr
&
xMap
)
{
if
(
xMap
.
get
())
...
...
@@ -869,21 +864,7 @@ struct ConventionOOO_A1 : public Convention_A1
if
(
bODF
)
rBuffer
.
append
(
'['
);
bool
bEncodeUrl
=
true
;
switch
(
rCompiler
.
GetEncodeUrlMode
())
{
case
ScCompiler
:
:
ENCODE_BY_GRAMMAR
:
bEncodeUrl
=
bODF
;
break
;
case
ScCompiler
:
:
ENCODE_ALWAYS
:
bEncodeUrl
=
true
;
break
;
case
ScCompiler
:
:
ENCODE_NEVER
:
bEncodeUrl
=
false
;
break
;
default
:
;
}
bool
bEncodeUrl
=
bODF
;
makeExternalSingleRefStr
(
rBuffer
,
nFileId
,
rTabName
,
rRef
,
rCompiler
.
GetPos
(),
pRefMgr
,
true
,
bEncodeUrl
);
if
(
bODF
)
rBuffer
.
append
(
']'
);
...
...
@@ -905,21 +886,7 @@ struct ConventionOOO_A1 : public Convention_A1
if
(
bODF
)
rBuffer
.
append
(
'['
);
// Ensure that there's always a closing bracket, no premature returns.
bool
bEncodeUrl
=
true
;
switch
(
rCompiler
.
GetEncodeUrlMode
())
{
case
ScCompiler
:
:
ENCODE_BY_GRAMMAR
:
bEncodeUrl
=
bODF
;
break
;
case
ScCompiler
:
:
ENCODE_ALWAYS
:
bEncodeUrl
=
true
;
break
;
case
ScCompiler
:
:
ENCODE_NEVER
:
bEncodeUrl
=
false
;
break
;
default
:
;
}
bool
bEncodeUrl
=
bODF
;
do
{
...
...
@@ -1324,8 +1291,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL
if
(
!
pFullName
)
return
;
ConventionXL
::
makeExternalDocStr
(
rBuffer
,
*
pFullName
,
rCompiler
.
GetEncodeUrlMode
()
==
ScCompiler
::
ENCODE_ALWAYS
);
ConventionXL
::
makeExternalDocStr
(
rBuffer
,
*
pFullName
,
false
);
ScRangeStringConverter
::
AppendTableName
(
rBuffer
,
rTabName
);
rBuffer
.
append
(
'!'
);
...
...
@@ -1347,8 +1313,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL
ScRange
aAbsRef
=
rRef
.
toAbs
(
rCompiler
.
GetPos
());
ConventionXL
::
makeExternalDocStr
(
rBuffer
,
*
pFullName
,
rCompiler
.
GetEncodeUrlMode
()
==
ScCompiler
::
ENCODE_ALWAYS
);
ConventionXL
::
makeExternalDocStr
(
rBuffer
,
*
pFullName
,
false
);
ConventionXL
::
makeExternalTabNameRange
(
rBuffer
,
rTabName
,
aTabNames
,
aAbsRef
);
rBuffer
.
append
(
'!'
);
...
...
@@ -1521,8 +1486,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL
ScAddress
aAbsRef
=
rRef
.
toAbs
(
rCompiler
.
GetPos
());
ConventionXL
::
makeExternalDocStr
(
rBuffer
,
*
pFullName
,
rCompiler
.
GetEncodeUrlMode
()
==
ScCompiler
::
ENCODE_ALWAYS
);
ConventionXL
::
makeExternalDocStr
(
rBuffer
,
*
pFullName
,
false
);
ScRangeStringConverter
::
AppendTableName
(
rBuffer
,
rTabName
);
rBuffer
.
append
(
'!'
);
...
...
@@ -1545,8 +1509,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL
ScRange
aAbsRef
=
rRef
.
toAbs
(
rCompiler
.
GetPos
());
ConventionXL
::
makeExternalDocStr
(
rBuffer
,
*
pFullName
,
rCompiler
.
GetEncodeUrlMode
()
==
ScCompiler
::
ENCODE_ALWAYS
);
ConventionXL
::
makeExternalDocStr
(
rBuffer
,
*
pFullName
,
false
);
ConventionXL
::
makeExternalTabNameRange
(
rBuffer
,
rTabName
,
aTabNames
,
aAbsRef
);
rBuffer
.
append
(
'!'
);
...
...
@@ -1607,7 +1570,6 @@ ScCompiler::ScCompiler( ScDocument* pDocument, const ScAddress& rPos,ScTokenArra
mnPredetectedReference
(
0
),
mnRangeOpPosInSymbol
(
-
1
),
pConv
(
pConvOOO_A1
),
meEncodeUrlMode
(
ENCODE_BY_GRAMMAR
),
meExtendedErrorDetection
(
EXTENDED_ERROR_DETECTION_NONE
),
mbCloseBrackets
(
true
),
mbRewind
(
false
)
...
...
@@ -1634,7 +1596,6 @@ ScCompiler::ScCompiler( ScDocument* pDocument, const ScAddress& rPos)
mnPredetectedReference
(
0
),
mnRangeOpPosInSymbol
(
-
1
),
pConv
(
pConvOOO_A1
),
meEncodeUrlMode
(
ENCODE_BY_GRAMMAR
),
meExtendedErrorDetection
(
EXTENDED_ERROR_DETECTION_NONE
),
mbCloseBrackets
(
true
),
mbRewind
(
false
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment