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
0d2797fd
Kaydet (Commit)
0d2797fd
authored
Eki 19, 2016
tarafından
Eike Rathke
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Resolves: tdf#85553 intern SharedString of cached external references result
Change-Id: I13f19b5bd5f2897eb48af69742be885803cca066
üst
8c4fdffb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
xilink.cxx
sc/source/filter/excel/xilink.cxx
+7
-5
No files found.
sc/source/filter/excel/xilink.cxx
Dosyayı görüntüle @
0d2797fd
...
...
@@ -71,7 +71,8 @@ public:
/** Reads a CRN record (external referenced cell) at the specified address. */
void
ReadCrn
(
XclImpStream
&
rStrm
,
const
XclAddress
&
rXclPos
);
void
LoadCachedValues
(
const
ScExternalRefCache
::
TableTypeRef
&
pCacheTable
);
void
LoadCachedValues
(
const
ScExternalRefCache
::
TableTypeRef
&
pCacheTable
,
svl
::
SharedStringPool
&
rPool
);
private
:
typedef
std
::
shared_ptr
<
XclImpCrn
>
XclImpCrnRef
;
...
...
@@ -574,7 +575,8 @@ void XclImpSupbookTab::ReadCrn( XclImpStream& rStrm, const XclAddress& rXclPos )
maCrnList
.
push_back
(
crnRef
);
}
void
XclImpSupbookTab
::
LoadCachedValues
(
const
ScExternalRefCache
::
TableTypeRef
&
pCacheTable
)
void
XclImpSupbookTab
::
LoadCachedValues
(
const
ScExternalRefCache
::
TableTypeRef
&
pCacheTable
,
svl
::
SharedStringPool
&
rPool
)
{
if
(
maCrnList
.
empty
())
return
;
...
...
@@ -608,8 +610,8 @@ void XclImpSupbookTab::LoadCachedValues(const ScExternalRefCache::TableTypeRef&
break
;
case
EXC_CACHEDVAL_STRING
:
{
const
OUString
&
rStr
=
pCrn
->
GetString
(
);
ScExternalRefCache
::
TokenRef
pToken
(
new
formula
::
FormulaStringToken
(
svl
::
SharedString
(
rStr
)));
// string not interned
svl
::
SharedString
aSS
(
rPool
.
intern
(
pCrn
->
GetString
())
);
ScExternalRefCache
::
TokenRef
pToken
(
new
formula
::
FormulaStringToken
(
aSS
));
pCacheTable
->
setCell
(
rAddr
.
mnCol
,
rAddr
.
mnRow
,
pToken
,
0
,
false
);
}
break
;
...
...
@@ -753,7 +755,7 @@ void XclImpSupbook::LoadCachedValues()
{
const
OUString
&
rTabName
=
(
*
itTab
)
->
GetTabName
();
ScExternalRefCache
::
TableTypeRef
pCacheTable
=
pRefMgr
->
getCacheTable
(
nFileId
,
rTabName
,
true
);
(
*
itTab
)
->
LoadCachedValues
(
pCacheTable
);
(
*
itTab
)
->
LoadCachedValues
(
pCacheTable
,
GetSharedStringPool
()
);
pCacheTable
->
setWholeTableCached
();
}
}
...
...
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