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
10579fcd
Kaydet (Commit)
10579fcd
authored
Eki 08, 2013
tarafından
Kohei Yoshida
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Use the document's string pool rather than a separate one for the formula.
Change-Id: Id13bca1ed493328fb0b8a664275af8c98e3f46c8
üst
543dfbad
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
formulagroup.hxx
sc/inc/formulagroup.hxx
+0
-1
column2.cxx
sc/source/core/data/column2.cxx
+6
-6
No files found.
sc/inc/formulagroup.hxx
Dosyayı görüntüle @
10579fcd
...
@@ -33,7 +33,6 @@ struct FormulaGroupContext : boost::noncopyable
...
@@ -33,7 +33,6 @@ struct FormulaGroupContext : boost::noncopyable
typedef
boost
::
ptr_vector
<
NumArrayType
>
NumArrayStoreType
;
typedef
boost
::
ptr_vector
<
NumArrayType
>
NumArrayStoreType
;
typedef
boost
::
ptr_vector
<
StrArrayType
>
StrArrayStoreType
;
typedef
boost
::
ptr_vector
<
StrArrayType
>
StrArrayStoreType
;
svl
::
SharedStringPool
maStrPool
;
NumArrayStoreType
maNumArrays
;
NumArrayStoreType
maNumArrays
;
StrArrayStoreType
maStrArrays
;
StrArrayStoreType
maStrArrays
;
};
};
...
...
sc/source/core/data/column2.cxx
Dosyayı görüntüle @
10579fcd
...
@@ -2167,11 +2167,11 @@ bool appendDouble(
...
@@ -2167,11 +2167,11 @@ bool appendDouble(
}
}
bool
appendStrings
(
bool
appendStrings
(
sc
::
FormulaGroupContext
&
rCxt
,
ScDocument
*
pDoc
,
ScDocument
*
pDoc
,
sc
::
FormulaGroupContext
::
StrArrayType
&
rArray
,
sc
::
FormulaGroupContext
::
StrArrayType
&
rArray
,
size_t
nLen
,
size_t
nLen
,
sc
::
CellStoreType
::
iterator
it
,
const
sc
::
CellStoreType
::
iterator
&
itEnd
)
sc
::
CellStoreType
::
iterator
it
,
const
sc
::
CellStoreType
::
iterator
&
itEnd
)
{
{
size_t
nLenRemain
=
nLen
;
size_t
nLenRemain
=
nLen
;
svl
::
SharedStringPool
&
rPool
=
pDoc
->
GetCellStringPool
();
for
(;
it
!=
itEnd
;
++
it
)
for
(;
it
!=
itEnd
;
++
it
)
{
{
...
@@ -2194,7 +2194,7 @@ bool appendStrings(
...
@@ -2194,7 +2194,7 @@ bool appendStrings(
for
(;
itData
!=
itDataEnd
;
++
itData
)
for
(;
itData
!=
itDataEnd
;
++
itData
)
{
{
OUString
aStr
=
ScEditUtil
::
GetString
(
**
itData
,
pDoc
);
OUString
aStr
=
ScEditUtil
::
GetString
(
**
itData
,
pDoc
);
rArray
.
push_back
(
r
Cxt
.
maStr
Pool
.
intern
(
aStr
).
getData
());
rArray
.
push_back
(
rPool
.
intern
(
aStr
).
getData
());
}
}
}
}
break
;
break
;
...
@@ -2219,7 +2219,7 @@ bool appendStrings(
...
@@ -2219,7 +2219,7 @@ bool appendStrings(
return
false
;
return
false
;
}
}
rArray
.
push_back
(
r
Cxt
.
maStr
Pool
.
intern
(
aStr
).
getData
());
rArray
.
push_back
(
rPool
.
intern
(
aStr
).
getData
());
}
}
}
}
break
;
break
;
...
@@ -2380,7 +2380,7 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray( sc::FormulaGroupContext&
...
@@ -2380,7 +2380,7 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray( sc::FormulaGroupContext&
// Fill the remaining array with values from the following blocks.
// Fill the remaining array with values from the following blocks.
++
aPos
.
first
;
++
aPos
.
first
;
if
(
!
appendStrings
(
rCxt
,
pDocument
,
rArray
,
nLenRequested
-
nLen
,
aPos
.
first
,
maCells
.
end
()))
if
(
!
appendStrings
(
pDocument
,
rArray
,
nLenRequested
-
nLen
,
aPos
.
first
,
maCells
.
end
()))
return
formula
::
VectorRefArray
();
return
formula
::
VectorRefArray
();
return
formula
::
VectorRefArray
(
&
rArray
[
0
]);
return
formula
::
VectorRefArray
(
&
rArray
[
0
]);
...
...
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