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
9eb55c2b
Kaydet (Commit)
9eb55c2b
authored
Şub 12, 2014
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sal_Bool->bool
Change-Id: I57a93e4f64be03e8cc3482d1c05acea1f4751840
üst
e5b10c94
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
rtfparse.hxx
sc/source/filter/inc/rtfparse.hxx
+4
-4
rtfparse.cxx
sc/source/filter/rtf/rtfparse.cxx
+5
-5
No files found.
sc/source/filter/inc/rtfparse.hxx
Dosyayı görüntüle @
9eb55c2b
...
@@ -61,16 +61,16 @@ private:
...
@@ -61,16 +61,16 @@ private:
ScRTFCellDefault
*
pInsDefault
;
ScRTFCellDefault
*
pInsDefault
;
ScRTFCellDefault
*
pActDefault
;
ScRTFCellDefault
*
pActDefault
;
ScRTFCellDefault
*
pDefMerge
;
ScRTFCellDefault
*
pDefMerge
;
sal_uLong
nStartAdjust
;
sal_uLong
nStartAdjust
;
sal_uInt16
nLastWidth
;
sal_uInt16
nLastWidth
;
sal_B
ool
bNewDef
;
b
ool
bNewDef
;
DECL_LINK
(
RTFImportHdl
,
ImportInfo
*
);
DECL_LINK
(
RTFImportHdl
,
ImportInfo
*
);
inline
void
NextRow
();
inline
void
NextRow
();
void
EntryEnd
(
ScEEParseEntry
*
,
const
ESelection
&
);
void
EntryEnd
(
ScEEParseEntry
*
,
const
ESelection
&
);
void
ProcToken
(
ImportInfo
*
);
void
ProcToken
(
ImportInfo
*
);
void
ColAdjust
();
void
ColAdjust
();
sal_B
ool
SeekTwips
(
sal_uInt16
nTwips
,
SCCOL
*
pCol
);
b
ool
SeekTwips
(
sal_uInt16
nTwips
,
SCCOL
*
pCol
);
void
NewCellRow
(
ImportInfo
*
);
void
NewCellRow
(
ImportInfo
*
);
public
:
public
:
...
...
sc/source/filter/rtf/rtfparse.cxx
Dosyayı görüntüle @
9eb55c2b
...
@@ -112,26 +112,26 @@ inline void ScRTFParser::NextRow()
...
@@ -112,26 +112,26 @@ inline void ScRTFParser::NextRow()
}
}
sal_B
ool
ScRTFParser
::
SeekTwips
(
sal_uInt16
nTwips
,
SCCOL
*
pCol
)
b
ool
ScRTFParser
::
SeekTwips
(
sal_uInt16
nTwips
,
SCCOL
*
pCol
)
{
{
ScRTFColTwips
::
const_iterator
it
=
pColTwips
->
find
(
nTwips
);
ScRTFColTwips
::
const_iterator
it
=
pColTwips
->
find
(
nTwips
);
sal_Bool
bFound
=
it
!=
pColTwips
->
end
();
sal_Bool
bFound
=
it
!=
pColTwips
->
end
();
sal_uInt16
nPos
=
it
-
pColTwips
->
begin
();
sal_uInt16
nPos
=
it
-
pColTwips
->
begin
();
*
pCol
=
static_cast
<
SCCOL
>
(
nPos
);
*
pCol
=
static_cast
<
SCCOL
>
(
nPos
);
if
(
bFound
)
if
(
bFound
)
return
sal_T
rue
;
return
t
rue
;
sal_uInt16
nCount
=
pColTwips
->
size
();
sal_uInt16
nCount
=
pColTwips
->
size
();
if
(
!
nCount
)
if
(
!
nCount
)
return
false
;
return
false
;
SCCOL
nCol
=
*
pCol
;
SCCOL
nCol
=
*
pCol
;
// nCol is insertion position; the next one higher up is there (or not)
// nCol is insertion position; the next one higher up is there (or not)
if
(
nCol
<
static_cast
<
SCCOL
>
(
nCount
)
&&
(((
*
pColTwips
)[
nCol
]
-
SC_RTFTWIPTOL
)
<=
nTwips
)
)
if
(
nCol
<
static_cast
<
SCCOL
>
(
nCount
)
&&
(((
*
pColTwips
)[
nCol
]
-
SC_RTFTWIPTOL
)
<=
nTwips
)
)
return
sal_T
rue
;
return
t
rue
;
// Not smaller than everything else? Then compare with the next lower one
// Not smaller than everything else? Then compare with the next lower one
else
if
(
nCol
!=
0
&&
(((
*
pColTwips
)[
nCol
-
1
]
+
SC_RTFTWIPTOL
)
>=
nTwips
)
)
else
if
(
nCol
!=
0
&&
(((
*
pColTwips
)[
nCol
-
1
]
+
SC_RTFTWIPTOL
)
>=
nTwips
)
)
{
{
(
*
pCol
)
--
;
(
*
pCol
)
--
;
return
sal_T
rue
;
return
t
rue
;
}
}
return
false
;
return
false
;
}
}
...
@@ -317,7 +317,7 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo )
...
@@ -317,7 +317,7 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo )
break
;
break
;
case
RTF_CELLX
:
// closes cell default
case
RTF_CELLX
:
// closes cell default
{
{
bNewDef
=
sal_T
rue
;
bNewDef
=
t
rue
;
pInsDefault
->
nCol
=
nColCnt
;
pInsDefault
->
nCol
=
nColCnt
;
pInsDefault
->
nTwips
=
pInfo
->
nTokenValue
;
// Right cell border
pInsDefault
->
nTwips
=
pInfo
->
nTokenValue
;
// Right cell border
maDefaultList
.
push_back
(
pInsDefault
);
maDefaultList
.
push_back
(
pInsDefault
);
...
...
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