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
d6824709
Kaydet (Commit)
d6824709
authored
Haz 27, 2013
tarafından
Kohei Yoshida
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Rename a variable to something more meaningful.
Change-Id: I860e5301e3fec3f06f318b28787f71b63dbaf0ab
üst
ff5d891b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
21 deletions
+21
-21
formulacell.cxx
sc/source/core/data/formulacell.cxx
+9
-9
compiler.cxx
sc/source/core/tool/compiler.cxx
+12
-12
No files found.
sc/source/core/data/formulacell.cxx
Dosyayı görüntüle @
d6824709
...
...
@@ -2100,7 +2100,7 @@ bool ScFormulaCell::UpdateReference(
if
(
pUndoDoc
)
pOldCode
.
reset
(
pCode
->
Clone
());
ScRangeData
*
p
RangeData
=
NULL
;
ScRangeData
*
p
SharedCode
=
NULL
;
bool
bValChanged
=
false
;
bool
bRangeModified
=
false
;
// any range, not only shared formula
bool
bRefSizeChanged
=
false
;
...
...
@@ -2110,7 +2110,7 @@ bool ScFormulaCell::UpdateReference(
// Update cell or range references.
ScCompiler
aComp
(
pDocument
,
aPos
,
*
pCode
);
aComp
.
SetGrammar
(
pDocument
->
GetGrammar
());
p
RangeData
=
aComp
.
UpdateReference
(
eUpdateRefMode
,
aOldPos
,
rRange
,
p
SharedCode
=
aComp
.
UpdateReference
(
eUpdateRefMode
,
aOldPos
,
rRange
,
nDx
,
nDy
,
nDz
,
bValChanged
,
bRefSizeChanged
);
bRangeModified
=
aComp
.
HasModifiedRange
();
...
...
@@ -2215,7 +2215,7 @@ bool ScFormulaCell::UpdateReference(
bHasRelName
=
HasRelNameReference
();
// Reference changed and new listening needed?
// Except in Insert/Delete without specialties.
bNewListening
=
(
bRangeModified
||
p
RangeData
||
bColRowNameCompile
bNewListening
=
(
bRangeModified
||
p
SharedCode
||
bColRowNameCompile
||
(
bValChanged
&&
(
eUpdateRefMode
!=
URM_INSDEL
||
bInDeleteUndo
||
bRefSizeChanged
))
||
(
bHasRelName
&&
eUpdateRefMode
!=
URM_COPY
))
...
...
@@ -2231,14 +2231,14 @@ bool ScFormulaCell::UpdateReference(
bool
bNeedDirty
=
false
;
// NeedDirty for changes except for Copy and Move/Insert without RelNames
if
(
bRangeModified
||
p
RangeData
||
bColRowNameCompile
||
if
(
bRangeModified
||
p
SharedCode
||
bColRowNameCompile
||
(
bValChanged
&&
eUpdateRefMode
!=
URM_COPY
&&
(
eUpdateRefMode
!=
URM_MOVE
||
bHasRelName
)
&&
(
!
bIsInsert
||
bHasRelName
||
bInDeleteUndo
||
bRefSizeChanged
))
||
bOnRefMove
)
bNeedDirty
=
true
;
if
(
pUndoDoc
&&
(
bValChanged
||
p
RangeData
||
bOnRefMove
))
if
(
pUndoDoc
&&
(
bValChanged
||
p
SharedCode
||
bOnRefMove
))
{
// Copy the cell to aUndoPos, which is its current position in the document,
// so this works when UpdateReference is called before moving the cells
...
...
@@ -2258,13 +2258,13 @@ bool ScFormulaCell::UpdateReference(
bValChanged
=
false
;
if
(
p
RangeData
)
if
(
p
SharedCode
)
{
// Replace shared formula with own formula
pDocument
->
RemoveFromFormulaTree
(
this
);
// update formula count
delete
pCode
;
pCode
=
p
RangeData
->
GetCode
()
->
Clone
();
pCode
=
p
SharedCode
->
GetCode
()
->
Clone
();
// #i18937# #i110008# call MoveRelWrap, but with the old position
ScCompiler
::
MoveRelWrap
(
*
pCode
,
pDocument
,
aOldPos
,
p
RangeData
->
GetMaxCol
(),
pRangeData
->
GetMaxRow
());
ScCompiler
::
MoveRelWrap
(
*
pCode
,
pDocument
,
aOldPos
,
p
SharedCode
->
GetMaxCol
(),
pSharedCode
->
GetMaxRow
());
ScCompiler
aComp2
(
pDocument
,
aPos
,
*
pCode
);
aComp2
.
SetGrammar
(
pDocument
->
GetGrammar
());
aComp2
.
UpdateSharedFormulaReference
(
eUpdateRefMode
,
aOldPos
,
rRange
,
...
...
@@ -2297,7 +2297,7 @@ bool ScFormulaCell::UpdateReference(
}
}
if
(
bNeedDirty
&&
(
!
(
eUpdateRefMode
==
URM_INSDEL
&&
bHasRelName
)
||
p
RangeData
)
)
if
(
bNeedDirty
&&
(
!
(
eUpdateRefMode
==
URM_INSDEL
&&
bHasRelName
)
||
p
SharedCode
)
)
{
// Cut off references, invalid or similar?
sc
::
AutoCalcSwitch
(
*
pDocument
,
false
);
SetDirty
();
...
...
sc/source/core/tool/compiler.cxx
Dosyayı görüntüle @
d6824709
...
...
@@ -4222,25 +4222,25 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
}
}
// Check for SharedFormulas.
ScRangeData
*
p
RangeData
=
NULL
;
ScRangeData
*
p
SharedCode
=
NULL
;
pArr
->
Reset
();
for
(
FormulaToken
*
j
=
pArr
->
GetNextName
();
j
&&
!
p
RangeData
;
for
(
FormulaToken
*
j
=
pArr
->
GetNextName
();
j
&&
!
p
SharedCode
;
j
=
pArr
->
GetNextName
()
)
{
if
(
j
->
GetOpCode
()
==
ocName
)
{
ScRangeData
*
pName
=
GetRangeData
(
*
j
);
if
(
pName
&&
pName
->
HasType
(
RT_SHARED
))
p
RangeData
=
pName
;
p
SharedCode
=
pName
;
}
}
// Check SharedFormulas for wraps.
if
(
p
RangeData
)
if
(
p
SharedCode
)
{
ScRangeData
*
pName
=
p
RangeData
;
p
RangeData
=
NULL
;
ScRangeData
*
pName
=
p
SharedCode
;
p
SharedCode
=
NULL
;
pArr
->
Reset
();
for
(
t
=
static_cast
<
ScToken
*>
(
pArr
->
GetNextReferenceRPN
());
t
&&
!
p
RangeData
;
for
(
t
=
static_cast
<
ScToken
*>
(
pArr
->
GetNextReferenceRPN
());
t
&&
!
p
SharedCode
;
t
=
static_cast
<
ScToken
*>
(
pArr
->
GetNextReferenceRPN
())
)
{
bool
bRelName
=
(
t
->
GetType
()
==
svSingleRef
?
...
...
@@ -4257,16 +4257,16 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
// wrapped it. Replace SharedFormula.
if
(
!
bValid
)
{
p
RangeData
=
pName
;
p
SharedCode
=
pName
;
rChanged
=
true
;
}
}
}
}
return
p
RangeData
;
return
p
SharedCode
;
}
ScRangeData
*
p
RangeData
=
NULL
;
ScRangeData
*
p
SharedCode
=
NULL
;
ScToken
*
t
;
pArr
->
Reset
();
while
(
(
t
=
static_cast
<
ScToken
*>
(
pArr
->
GetNextReferenceOrName
()))
!=
NULL
)
...
...
@@ -4276,7 +4276,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
ScRangeData
*
pName
=
GetRangeData
(
*
t
);
if
(
pName
&&
pName
->
HasType
(
RT_SHAREDMOD
))
{
p
RangeData
=
pName
;
// maybe need a replacement of shared with own code
p
SharedCode
=
pName
;
// maybe need a replacement of shared with own code
rChanged
=
true
;
}
}
...
...
@@ -4373,7 +4373,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
}
}
return
p
RangeData
;
return
p
SharedCode
;
}
bool
ScCompiler
::
UpdateNameReference
(
UpdateRefMode
eUpdateRefMode
,
...
...
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