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
eef31e9f
Kaydet (Commit)
eef31e9f
authored
Ock 05, 2015
tarafından
Matteo Casalin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Cleanup whitespaces, remove unneeded local scopes
Change-Id: I664d33c544bdb9685154a8dd433458e30d29f315
üst
6f142389
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
55 additions
and
60 deletions
+55
-60
accportions.cxx
sw/source/core/access/accportions.cxx
+55
-60
No files found.
sw/source/core/access/accportions.cxx
Dosyayı görüntüle @
eef31e9f
...
@@ -156,25 +156,21 @@ void SwAccessiblePortionData::Special(
...
@@ -156,25 +156,21 @@ void SwAccessiblePortionData::Special(
break
;
break
;
case
POR_GRFNUM
:
case
POR_GRFNUM
:
case
POR_BULLET
:
case
POR_BULLET
:
break
;
break
;
case
POR_FLD
:
case
POR_FLD
:
case
POR_HIDDEN
:
case
POR_HIDDEN
:
case
POR_COMBINED
:
case
POR_COMBINED
:
case
POR_ISOREF
:
case
POR_ISOREF
:
{
// When the filed content is empty, input a special character.
//When the filed content is empty, input a special character.
if
(
rText
.
isEmpty
())
if
(
rText
.
isEmpty
())
sDisplay
=
OUString
(
sal_Unicode
(
0xfffc
));
sDisplay
=
OUString
(
sal_Unicode
(
0xfffc
));
else
else
sDisplay
=
rText
;
sDisplay
=
rText
;
aFieldPosition
.
push_back
(
aBuffer
.
getLength
());
aFieldPosition
.
push_back
(
aBuffer
.
getLength
());
aFieldPosition
.
push_back
(
aBuffer
.
getLength
()
+
rText
.
getLength
());
aFieldPosition
.
push_back
(
aBuffer
.
getLength
()
+
rText
.
getLength
());
break
;
break
;
}
case
POR_FTNNUM
:
case
POR_FTNNUM
:
{
break
;
break
;
}
case
POR_FTN
:
case
POR_FTN
:
{
{
sDisplay
=
rText
;
sDisplay
=
rText
;
...
@@ -192,10 +188,8 @@ void SwAccessiblePortionData::Special(
...
@@ -192,10 +188,8 @@ void SwAccessiblePortionData::Special(
// #i111768# - apply patch from kstribley:
// #i111768# - apply patch from kstribley:
// Include the control characters.
// Include the control characters.
case
POR_CONTROLCHAR
:
case
POR_CONTROLCHAR
:
{
sDisplay
=
OUString
(
rText
)
+
OUString
(
pTxtNode
->
GetTxt
()[
nModelPosition
]
);
sDisplay
=
OUString
(
rText
)
+
OUString
(
pTxtNode
->
GetTxt
()[
nModelPosition
]
);
break
;
break
;
}
default
:
default
:
sDisplay
=
OUString
(
rText
);
sDisplay
=
OUString
(
rText
);
break
;
break
;
...
@@ -302,7 +296,7 @@ bool SwAccessiblePortionData::IsGrayPortionType( sal_uInt16 nType ) const
...
@@ -302,7 +296,7 @@ bool SwAccessiblePortionData::IsGrayPortionType( sal_uInt16 nType ) const
case
POR_HIDDEN
:
case
POR_HIDDEN
:
bGray
=
!
pViewOptions
->
IsPagePreview
()
&&
bGray
=
!
pViewOptions
->
IsPagePreview
()
&&
!
pViewOptions
->
IsReadonly
()
&&
SwViewOption
::
IsFieldShadings
();
!
pViewOptions
->
IsReadonly
()
&&
SwViewOption
::
IsFieldShadings
();
break
;
break
;
case
POR_TAB
:
bGray
=
pViewOptions
->
IsTab
();
break
;
case
POR_TAB
:
bGray
=
pViewOptions
->
IsTab
();
break
;
case
POR_SOFTHYPH
:
bGray
=
pViewOptions
->
IsSoftHyph
();
break
;
case
POR_SOFTHYPH
:
bGray
=
pViewOptions
->
IsSoftHyph
();
break
;
case
POR_BLANK
:
bGray
=
pViewOptions
->
IsHardBlank
();
break
;
case
POR_BLANK
:
bGray
=
pViewOptions
->
IsHardBlank
();
break
;
...
@@ -493,47 +487,47 @@ void SwAccessiblePortionData::GetSentenceBoundary(
...
@@ -493,47 +487,47 @@ void SwAccessiblePortionData::GetSentenceBoundary(
if
(
pSentences
==
NULL
)
if
(
pSentences
==
NULL
)
{
{
OSL_ENSURE
(
g_pBreakIt
!=
NULL
,
"We always need a break."
);
OSL_ENSURE
(
g_pBreakIt
!=
NULL
,
"We always need a break."
);
OSL_ENSURE
(
g_pBreakIt
->
GetBreakIter
().
is
(),
"No break-iterator."
);
OSL_ENSURE
(
g_pBreakIt
->
GetBreakIter
().
is
(),
"No break-iterator."
);
if
(
g_pBreakIt
->
GetBreakIter
().
is
()
)
if
(
g_pBreakIt
->
GetBreakIter
().
is
()
)
{
{
pSentences
=
new
Positions_t
();
pSentences
=
new
Positions_t
();
pSentences
->
reserve
(
10
);
pSentences
->
reserve
(
10
);
// use xBreak->endOfSentence to iterate over all words; store
// use xBreak->endOfSentence to iterate over all words; store
// positions in pSentences
// positions in pSentences
sal_Int32
nCurrent
=
0
;
sal_Int32
nCurrent
=
0
;
sal_Int32
nLength
=
sAccessibleString
.
getLength
();
sal_Int32
nLength
=
sAccessibleString
.
getLength
();
do
do
{
{
pSentences
->
push_back
(
nCurrent
);
pSentences
->
push_back
(
nCurrent
);
const
sal_Int32
nModelPos
=
GetModelPosition
(
nCurrent
);
const
sal_Int32
nModelPos
=
GetModelPosition
(
nCurrent
);
sal_Int32
nNew
=
g_pBreakIt
->
GetBreakIter
()
->
endOfSentence
(
sal_Int32
nNew
=
g_pBreakIt
->
GetBreakIter
()
->
endOfSentence
(
sAccessibleString
,
nCurrent
,
sAccessibleString
,
nCurrent
,
g_pBreakIt
->
GetLocale
(
pTxtNode
->
GetLang
(
nModelPos
))
)
+
1
;
g_pBreakIt
->
GetLocale
(
pTxtNode
->
GetLang
(
nModelPos
))
)
+
1
;
if
(
(
nNew
<
0
)
&&
(
nNew
>
nLength
)
)
if
(
(
nNew
<
0
)
&&
(
nNew
>
nLength
)
)
nNew
=
nLength
;
nNew
=
nLength
;
else
if
(
nNew
<=
nCurrent
)
else
if
(
nNew
<=
nCurrent
)
nNew
=
nCurrent
+
1
;
// ensure forward progress
nNew
=
nCurrent
+
1
;
// ensure forward progress
nCurrent
=
nNew
;
nCurrent
=
nNew
;
}
}
while
(
nCurrent
<
nLength
);
while
(
nCurrent
<
nLength
);
// finish with two terminators
// finish with two terminators
pSentences
->
push_back
(
nLength
);
pSentences
->
push_back
(
nLength
);
pSentences
->
push_back
(
nLength
);
pSentences
->
push_back
(
nLength
);
}
}
else
else
{
{
// no break iterator -> empty word
// no break iterator -> empty word
rBound
.
startPos
=
0
;
rBound
.
startPos
=
0
;
rBound
.
endPos
=
0
;
rBound
.
endPos
=
0
;
return
;
return
;
}
}
}
}
FillBoundary
(
rBound
,
*
pSentences
,
FindBreak
(
*
pSentences
,
nPos
)
);
FillBoundary
(
rBound
,
*
pSentences
,
FindBreak
(
*
pSentences
,
nPos
)
);
...
@@ -679,7 +673,8 @@ sal_Int32 SwAccessiblePortionData::FillSpecialPos(
...
@@ -679,7 +673,8 @@ sal_Int32 SwAccessiblePortionData::FillSpecialPos(
bool
SwAccessiblePortionData
::
FillBoundaryIFDateField
(
com
::
sun
::
star
::
i18n
::
Boundary
&
rBound
,
const
sal_Int32
nPos
)
bool
SwAccessiblePortionData
::
FillBoundaryIFDateField
(
com
::
sun
::
star
::
i18n
::
Boundary
&
rBound
,
const
sal_Int32
nPos
)
{
{
if
(
aFieldPosition
.
size
()
<
2
)
return
false
;
if
(
aFieldPosition
.
size
()
<
2
)
return
false
;
for
(
size_t
i
=
0
;
i
<
aFieldPosition
.
size
()
-
1
;
i
+=
2
)
for
(
size_t
i
=
0
;
i
<
aFieldPosition
.
size
()
-
1
;
i
+=
2
)
{
{
if
(
nPos
<
aFieldPosition
[
i
+
1
]
&&
nPos
>=
aFieldPosition
[
i
]
)
if
(
nPos
<
aFieldPosition
[
i
+
1
]
&&
nPos
>=
aFieldPosition
[
i
]
)
...
@@ -739,7 +734,7 @@ bool SwAccessiblePortionData::GetEditableRange(
...
@@ -739,7 +734,7 @@ bool SwAccessiblePortionData::GetEditableRange(
nStartPortion
=
nLastPortion
+
1
;
nStartPortion
=
nLastPortion
+
1
;
}
}
for
(
size_t
nPor
=
nStartPortion
;
nPor
<=
nLastPortion
;
nPor
++
)
for
(
size_t
nPor
=
nStartPortion
;
nPor
<=
nLastPortion
;
nPor
++
)
{
{
bIsEditable
&=
!
IsReadOnlyPortion
(
nPor
);
bIsEditable
&=
!
IsReadOnlyPortion
(
nPor
);
}
}
...
...
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