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
4be657d5
Kaydet (Commit)
4be657d5
authored
Nis 10, 2012
tarafından
Kohei Yoshida
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Removed duplicated methods.
üst
8b2fb88b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
15 deletions
+17
-15
recursionhelper.hxx
sc/inc/recursionhelper.hxx
+2
-10
cell.cxx
sc/source/core/data/cell.cxx
+3
-3
recursionhelper.cxx
sc/source/core/tool/recursionhelper.cxx
+12
-2
No files found.
sc/inc/recursionhelper.hxx
Dosyayı görüntüle @
4be657d5
...
@@ -83,14 +83,6 @@ public:
...
@@ -83,14 +83,6 @@ public:
void
Insert
(
ScFormulaCell
*
p
,
bool
bOldRunning
,
const
ScFormulaResult
&
rRes
);
void
Insert
(
ScFormulaCell
*
p
,
bool
bOldRunning
,
const
ScFormulaResult
&
rRes
);
ScFormulaRecursionList
::
iterator
GetStart
()
{
return
aRecursionFormulas
.
begin
();
}
ScFormulaRecursionList
::
iterator
GetEnd
()
{
return
aRecursionFormulas
.
end
();
}
bool
IsInIterationReturn
()
const
{
return
bInIterationReturn
;
}
bool
IsInIterationReturn
()
const
{
return
bInIterationReturn
;
}
void
SetInIterationReturn
(
bool
b
);
void
SetInIterationReturn
(
bool
b
);
bool
IsDoingIteration
()
const
{
return
nIteration
>
0
;
}
bool
IsDoingIteration
()
const
{
return
nIteration
>
0
;
}
...
@@ -102,8 +94,8 @@ public:
...
@@ -102,8 +94,8 @@ public:
void
EndIteration
();
void
EndIteration
();
ScFormulaRecursionList
::
iterator
GetLastIterationStart
()
{
return
aLastIterationStart
;
}
ScFormulaRecursionList
::
iterator
GetLastIterationStart
()
{
return
aLastIterationStart
;
}
ScFormulaRecursionList
::
iterator
GetIterationStart
()
{
return
GetStart
();
}
ScFormulaRecursionList
::
iterator
GetIterationStart
()
;
ScFormulaRecursionList
::
iterator
GetIterationEnd
()
{
return
GetEnd
();
}
ScFormulaRecursionList
::
iterator
GetIterationEnd
()
;
/** Any return, recursion or iteration, iteration is always coupled with
/** Any return, recursion or iteration, iteration is always coupled with
recursion. */
recursion. */
bool
IsInReturn
()
const
{
return
bInRecursionReturn
;
}
bool
IsInReturn
()
const
{
return
bInRecursionReturn
;
}
...
...
sc/source/core/data/cell.cxx
Dosyayı görüntüle @
4be657d5
...
@@ -1390,9 +1390,9 @@ void ScFormulaCell::Interpret()
...
@@ -1390,9 +1390,9 @@ void ScFormulaCell::Interpret()
{
{
rRecursionHelper
.
SetInRecursionReturn
(
false
);
rRecursionHelper
.
SetInRecursionReturn
(
false
);
for
(
ScFormulaRecursionList
::
const_iterator
aIter
(
for
(
ScFormulaRecursionList
::
const_iterator
aIter
(
rRecursionHelper
.
GetStart
());
rRecursionHelper
.
Get
Iteration
Start
());
!
rRecursionHelper
.
IsInReturn
()
&&
aIter
!=
!
rRecursionHelper
.
IsInReturn
()
&&
aIter
!=
rRecursionHelper
.
GetEnd
();
++
aIter
)
rRecursionHelper
.
Get
Iteration
End
();
++
aIter
)
{
{
ScFormulaCell
*
pCell
=
(
*
aIter
).
pCell
;
ScFormulaCell
*
pCell
=
(
*
aIter
).
pCell
;
if
(
pCell
->
IsDirtyOrInTableOpDirty
())
if
(
pCell
->
IsDirtyOrInTableOpDirty
())
...
@@ -1412,7 +1412,7 @@ void ScFormulaCell::Interpret()
...
@@ -1412,7 +1412,7 @@ void ScFormulaCell::Interpret()
else
if
(
bResumeIteration
||
else
if
(
bResumeIteration
||
rRecursionHelper
.
IsDoingIteration
())
rRecursionHelper
.
IsDoingIteration
())
rRecursionHelper
.
GetList
().
erase
(
rRecursionHelper
.
GetList
().
erase
(
rRecursionHelper
.
GetStart
(),
rRecursionHelper
.
Get
Iteration
Start
(),
rRecursionHelper
.
GetLastIterationStart
());
rRecursionHelper
.
GetLastIterationStart
());
else
else
rRecursionHelper
.
Clear
();
rRecursionHelper
.
Clear
();
...
...
sc/source/core/tool/recursionhelper.cxx
Dosyayı görüntüle @
4be657d5
...
@@ -32,13 +32,13 @@ void ScRecursionHelper::Init()
...
@@ -32,13 +32,13 @@ void ScRecursionHelper::Init()
{
{
nRecursionCount
=
0
;
nRecursionCount
=
0
;
bInRecursionReturn
=
bDoingRecursion
=
bInIterationReturn
=
false
;
bInRecursionReturn
=
bDoingRecursion
=
bInIterationReturn
=
false
;
aInsertPos
=
GetEnd
();
aInsertPos
=
Get
Iteration
End
();
ResetIteration
();
ResetIteration
();
}
}
void
ScRecursionHelper
::
ResetIteration
()
void
ScRecursionHelper
::
ResetIteration
()
{
{
aLastIterationStart
=
GetEnd
();
aLastIterationStart
=
Get
Iteration
End
();
nIteration
=
0
;
nIteration
=
0
;
bConverging
=
false
;
bConverging
=
false
;
}
}
...
@@ -90,6 +90,16 @@ void ScRecursionHelper::EndIteration()
...
@@ -90,6 +90,16 @@ void ScRecursionHelper::EndIteration()
ResetIteration
();
ResetIteration
();
}
}
ScFormulaRecursionList
::
iterator
ScRecursionHelper
::
GetIterationStart
()
{
return
aRecursionFormulas
.
begin
();
}
ScFormulaRecursionList
::
iterator
ScRecursionHelper
::
GetIterationEnd
()
{
return
aRecursionFormulas
.
end
();
}
void
ScRecursionHelper
::
Clear
()
void
ScRecursionHelper
::
Clear
()
{
{
aRecursionFormulas
.
clear
();
aRecursionFormulas
.
clear
();
...
...
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