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
be053a75
Kaydet (Commit)
be053a75
authored
Haz 14, 2016
tarafından
Eike Rathke
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
intern SharedString
Change-Id: Ic8e6d3595002094792462b585d427f58c5c84156
üst
25a60d19
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
tokenarray.hxx
sc/inc/tokenarray.hxx
+1
-1
token.cxx
sc/source/core/tool/token.cxx
+5
-5
No files found.
sc/inc/tokenarray.hxx
Dosyayı görüntüle @
be053a75
...
@@ -129,7 +129,7 @@ public:
...
@@ -129,7 +129,7 @@ public:
* @param rPos position of the cell to determine if the reference is in the copied area
* @param rPos position of the cell to determine if the reference is in the copied area
* @param bRangeName set for range names, range names have special handling for absolute sheet ref + relative col/row ref
* @param bRangeName set for range names, range names have special handling for absolute sheet ref + relative col/row ref
*/
*/
void
ReadjustAbsolute3DReferences
(
const
ScDocument
*
pOldDoc
,
const
ScDocument
*
pNewDoc
,
const
ScAddress
&
rPos
,
bool
bRangeName
=
false
);
void
ReadjustAbsolute3DReferences
(
const
ScDocument
*
pOldDoc
,
ScDocument
*
pNewDoc
,
const
ScAddress
&
rPos
,
bool
bRangeName
=
false
);
/**
/**
* Make all absolute references pointing to the copied range if the range is copied too
* Make all absolute references pointing to the copied range if the range is copied too
...
...
sc/source/core/tool/token.cxx
Dosyayı görüntüle @
be053a75
...
@@ -2383,7 +2383,7 @@ void AdjustSingleRefData( ScSingleRefData& rRef, const ScAddress& rOldPos, const
...
@@ -2383,7 +2383,7 @@ void AdjustSingleRefData( ScSingleRefData& rRef, const ScAddress& rOldPos, const
}
}
void
ScTokenArray
::
ReadjustAbsolute3DReferences
(
const
ScDocument
*
pOldDoc
,
const
ScDocument
*
pNewDoc
,
const
ScAddress
&
rPos
,
bool
bRangeName
)
void
ScTokenArray
::
ReadjustAbsolute3DReferences
(
const
ScDocument
*
pOldDoc
,
ScDocument
*
pNewDoc
,
const
ScAddress
&
rPos
,
bool
bRangeName
)
{
{
for
(
sal_uInt16
j
=
0
;
j
<
nLen
;
++
j
)
for
(
sal_uInt16
j
=
0
;
j
<
nLen
;
++
j
)
{
{
...
@@ -2403,8 +2403,8 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const ScDocument* pOldDoc, cons
...
@@ -2403,8 +2403,8 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const ScDocument* pOldDoc, cons
OUString
aTabName
;
OUString
aTabName
;
sal_uInt16
nFileId
;
sal_uInt16
nFileId
;
GetExternalTableData
(
pOldDoc
,
pNewDoc
,
rRef1
.
Tab
(),
aTabName
,
nFileId
);
GetExternalTableData
(
pOldDoc
,
pNewDoc
,
rRef1
.
Tab
(),
aTabName
,
nFileId
);
ReplaceToken
(
j
,
new
ScExternalDoubleRefToken
(
nFileId
,
svl
::
SharedString
(
aTabName
),
rRef
)
,
ReplaceToken
(
j
,
new
ScExternalDoubleRefToken
(
nFileId
,
CODE_AND_RPN
);
// string not interned (pNewDoc would have to be non-const)
pNewDoc
->
GetSharedStringPool
().
intern
(
aTabName
),
rRef
),
CODE_AND_RPN
);
// ATTENTION: rRef can't be used after this point
// ATTENTION: rRef can't be used after this point
}
}
}
}
...
@@ -2421,8 +2421,8 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const ScDocument* pOldDoc, cons
...
@@ -2421,8 +2421,8 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const ScDocument* pOldDoc, cons
OUString
aTabName
;
OUString
aTabName
;
sal_uInt16
nFileId
;
sal_uInt16
nFileId
;
GetExternalTableData
(
pOldDoc
,
pNewDoc
,
rRef
.
Tab
(),
aTabName
,
nFileId
);
GetExternalTableData
(
pOldDoc
,
pNewDoc
,
rRef
.
Tab
(),
aTabName
,
nFileId
);
ReplaceToken
(
j
,
new
ScExternalSingleRefToken
(
nFileId
,
svl
::
SharedString
(
aTabName
),
rRef
)
,
ReplaceToken
(
j
,
new
ScExternalSingleRefToken
(
nFileId
,
CODE_AND_RPN
);
// string not interned (pNewDoc would have to be non-const)
pNewDoc
->
GetSharedStringPool
().
intern
(
aTabName
),
rRef
),
CODE_AND_RPN
);
// ATTENTION: rRef can't be used after this point
// ATTENTION: rRef can't be used after this point
}
}
}
}
...
...
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