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
d798d998
Kaydet (Commit)
d798d998
authored
Agu 06, 2018
tarafından
Matteo Casalin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Use indexed getToken()
Change-Id: Iaf52b7eee0e906d2c21982b354b69fd8d87231e3
üst
56a9903a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
16 deletions
+19
-16
viewdata.cxx
sc/source/ui/view/viewdata.cxx
+19
-16
No files found.
sc/source/ui/view/viewdata.cxx
Dosyayı görüntüle @
d798d998
...
@@ -2852,14 +2852,16 @@ void ScViewData::ReadUserData(const OUString& rData)
...
@@ -2852,14 +2852,16 @@ void ScViewData::ReadUserData(const OUString& rData)
Fraction
aZoomX
,
aZoomY
,
aPageZoomX
,
aPageZoomY
;
// evaluate (all sheets?)
Fraction
aZoomX
,
aZoomY
,
aPageZoomX
,
aPageZoomY
;
// evaluate (all sheets?)
sal_Int32
nIdx
{
0
};
OUString
aZoomStr
=
rData
.
getToken
(
0
,
';'
);
// Zoom/PageZoom/Mode
OUString
aZoomStr
=
rData
.
getToken
(
0
,
';'
);
// Zoom/PageZoom/Mode
sal_uInt16
nNormZoom
=
sal
::
static_int_cast
<
sal_uInt16
>
(
aZoomStr
.
getToken
(
0
,
'/'
).
toInt32
());
sal_uInt16
nNormZoom
=
sal
::
static_int_cast
<
sal_uInt16
>
(
aZoomStr
.
getToken
(
0
,
'/'
,
nIdx
).
toInt32
());
if
(
nNormZoom
>=
MINZOOM
&&
nNormZoom
<=
MAXZOOM
)
if
(
nNormZoom
>=
MINZOOM
&&
nNormZoom
<=
MAXZOOM
)
aZoomX
=
aZoomY
=
Fraction
(
nNormZoom
,
100
);
// "normal" zoom (always)
aZoomX
=
aZoomY
=
Fraction
(
nNormZoom
,
100
);
// "normal" zoom (always)
sal_uInt16
nPageZoom
=
sal
::
static_int_cast
<
sal_uInt16
>
(
aZoomStr
.
getToken
(
1
,
'/'
).
toInt32
());
sal_uInt16
nPageZoom
=
sal
::
static_int_cast
<
sal_uInt16
>
(
aZoomStr
.
getToken
(
0
,
'/'
,
nIdx
).
toInt32
());
if
(
nPageZoom
>=
MINZOOM
&&
nPageZoom
<=
MAXZOOM
)
if
(
nPageZoom
>=
MINZOOM
&&
nPageZoom
<=
MAXZOOM
)
aPageZoomX
=
aPageZoomY
=
Fraction
(
nPageZoom
,
100
);
// Pagebreak zoom, if set
aPageZoomX
=
aPageZoomY
=
Fraction
(
nPageZoom
,
100
);
// Pagebreak zoom, if set
sal_Unicode
cMode
=
aZoomStr
.
getToken
(
2
,
'/'
)[
0
];
// 0 or "0"/"1"
sal_Unicode
cMode
=
aZoomStr
.
getToken
(
0
,
'/'
,
nIdx
)[
0
];
// 0 or "0"/"1"
SetPagebreakMode
(
cMode
==
'1'
);
SetPagebreakMode
(
cMode
==
'1'
);
// SetPagebreakMode must always be called due to CalcPPT / RecalcPixPos()
// SetPagebreakMode must always be called due to CalcPPT / RecalcPixPos()
...
@@ -2896,32 +2898,33 @@ void ScViewData::ReadUserData(const OUString& rData)
...
@@ -2896,32 +2898,33 @@ void ScViewData::ReadUserData(const OUString& rData)
if
(
cTabSep
)
if
(
cTabSep
)
{
{
maTabData
[
nPos
]
->
nCurX
=
SanitizeCol
(
static_cast
<
SCCOL
>
(
aTabOpt
.
getToken
(
0
,
cTabSep
).
toInt32
()));
nIdx
=
0
;
maTabData
[
nPos
]
->
nCurY
=
SanitizeRow
(
aTabOpt
.
getToken
(
1
,
cTabSep
).
toInt32
());
maTabData
[
nPos
]
->
nCurX
=
SanitizeCol
(
static_cast
<
SCCOL
>
(
aTabOpt
.
getToken
(
0
,
cTabSep
,
nIdx
).
toInt32
()));
maTabData
[
nPos
]
->
eHSplitMode
=
static_cast
<
ScSplitMode
>
(
aTabOpt
.
getToken
(
2
,
cTabSep
).
toInt32
());
maTabData
[
nPos
]
->
nCurY
=
SanitizeRow
(
aTabOpt
.
getToken
(
0
,
cTabSep
,
nIdx
).
toInt32
());
maTabData
[
nPos
]
->
eVSplitMode
=
static_cast
<
ScSplitMode
>
(
aTabOpt
.
getToken
(
3
,
cTabSep
).
toInt32
());
maTabData
[
nPos
]
->
eHSplitMode
=
static_cast
<
ScSplitMode
>
(
aTabOpt
.
getToken
(
0
,
cTabSep
,
nIdx
).
toInt32
());
maTabData
[
nPos
]
->
eVSplitMode
=
static_cast
<
ScSplitMode
>
(
aTabOpt
.
getToken
(
0
,
cTabSep
,
nIdx
).
toInt32
());
if
(
maTabData
[
nPos
]
->
eHSplitMode
==
SC_SPLIT_FIX
)
if
(
maTabData
[
nPos
]
->
eHSplitMode
==
SC_SPLIT_FIX
)
{
{
maTabData
[
nPos
]
->
nFixPosX
=
SanitizeCol
(
static_cast
<
SCCOL
>
(
aTabOpt
.
getToken
(
4
,
cTabSep
).
toInt32
()));
maTabData
[
nPos
]
->
nFixPosX
=
SanitizeCol
(
static_cast
<
SCCOL
>
(
aTabOpt
.
getToken
(
0
,
cTabSep
,
nIdx
).
toInt32
()));
UpdateFixX
(
nPos
);
UpdateFixX
(
nPos
);
}
}
else
else
maTabData
[
nPos
]
->
nHSplitPos
=
aTabOpt
.
getToken
(
4
,
cTabSep
).
toInt32
();
maTabData
[
nPos
]
->
nHSplitPos
=
aTabOpt
.
getToken
(
0
,
cTabSep
,
nIdx
).
toInt32
();
if
(
maTabData
[
nPos
]
->
eVSplitMode
==
SC_SPLIT_FIX
)
if
(
maTabData
[
nPos
]
->
eVSplitMode
==
SC_SPLIT_FIX
)
{
{
maTabData
[
nPos
]
->
nFixPosY
=
SanitizeRow
(
aTabOpt
.
getToken
(
5
,
cTabSep
).
toInt32
());
maTabData
[
nPos
]
->
nFixPosY
=
SanitizeRow
(
aTabOpt
.
getToken
(
0
,
cTabSep
,
nIdx
).
toInt32
());
UpdateFixY
(
nPos
);
UpdateFixY
(
nPos
);
}
}
else
else
maTabData
[
nPos
]
->
nVSplitPos
=
aTabOpt
.
getToken
(
5
,
cTabSep
).
toInt32
();
maTabData
[
nPos
]
->
nVSplitPos
=
aTabOpt
.
getToken
(
0
,
cTabSep
,
nIdx
).
toInt32
();
maTabData
[
nPos
]
->
eWhichActive
=
static_cast
<
ScSplitPos
>
(
aTabOpt
.
getToken
(
6
,
cTabSep
).
toInt32
());
maTabData
[
nPos
]
->
eWhichActive
=
static_cast
<
ScSplitPos
>
(
aTabOpt
.
getToken
(
0
,
cTabSep
,
nIdx
).
toInt32
());
maTabData
[
nPos
]
->
nPosX
[
0
]
=
SanitizeCol
(
static_cast
<
SCCOL
>
(
aTabOpt
.
getToken
(
7
,
cTabSep
).
toInt32
()));
maTabData
[
nPos
]
->
nPosX
[
0
]
=
SanitizeCol
(
static_cast
<
SCCOL
>
(
aTabOpt
.
getToken
(
0
,
cTabSep
,
nIdx
).
toInt32
()));
maTabData
[
nPos
]
->
nPosX
[
1
]
=
SanitizeCol
(
static_cast
<
SCCOL
>
(
aTabOpt
.
getToken
(
8
,
cTabSep
).
toInt32
()));
maTabData
[
nPos
]
->
nPosX
[
1
]
=
SanitizeCol
(
static_cast
<
SCCOL
>
(
aTabOpt
.
getToken
(
0
,
cTabSep
,
nIdx
).
toInt32
()));
maTabData
[
nPos
]
->
nPosY
[
0
]
=
SanitizeRow
(
aTabOpt
.
getToken
(
9
,
cTabSep
).
toInt32
());
maTabData
[
nPos
]
->
nPosY
[
0
]
=
SanitizeRow
(
aTabOpt
.
getToken
(
0
,
cTabSep
,
nIdx
).
toInt32
());
maTabData
[
nPos
]
->
nPosY
[
1
]
=
SanitizeRow
(
aTabOpt
.
getToken
(
10
,
cTabSep
).
toInt32
());
maTabData
[
nPos
]
->
nPosY
[
1
]
=
SanitizeRow
(
aTabOpt
.
getToken
(
0
,
cTabSep
,
nIdx
).
toInt32
());
maTabData
[
nPos
]
->
eWhichActive
=
maTabData
[
nPos
]
->
SanitizeWhichActive
();
maTabData
[
nPos
]
->
eWhichActive
=
maTabData
[
nPos
]
->
SanitizeWhichActive
();
}
}
...
...
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