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
781b17a5
Kaydet (Commit)
781b17a5
authored
Şub 15, 2014
tarafından
Matteo Casalin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sal_Bool to bool
Change-Id: I98da667e406aef18e0f8b8bdb9b380cf76b36952
üst
54cbd46d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
txtfrm.hxx
sw/source/core/inc/txtfrm.hxx
+1
-1
txthyph.cxx
sw/source/core/text/txthyph.cxx
+6
-6
No files found.
sw/source/core/inc/txtfrm.hxx
Dosyayı görüntüle @
781b17a5
...
@@ -344,7 +344,7 @@ public:
...
@@ -344,7 +344,7 @@ public:
// Wir formatieren eine Zeile fuer die interaktive Trennung
// Wir formatieren eine Zeile fuer die interaktive Trennung
// Return: found
// Return: found
sal_B
ool
Hyphenate
(
SwInterHyphInfo
&
rInf
);
b
ool
Hyphenate
(
SwInterHyphInfo
&
rInf
);
// Probegrow
// Probegrow
inline
SwTwips
GrowTst
(
const
SwTwips
nGrow
);
inline
SwTwips
GrowTst
(
const
SwTwips
nGrow
);
...
...
sw/source/core/text/txthyph.cxx
Dosyayı görüntüle @
781b17a5
...
@@ -61,19 +61,19 @@ Reference< XHyphenatedWord > SwTxtFormatInfo::HyphWord(
...
@@ -61,19 +61,19 @@ Reference< XHyphenatedWord > SwTxtFormatInfo::HyphWord(
* Wir formatieren eine Zeile fuer die interaktive Trennung
* Wir formatieren eine Zeile fuer die interaktive Trennung
*************************************************************************/
*************************************************************************/
sal_B
ool
SwTxtFrm
::
Hyphenate
(
SwInterHyphInfo
&
rHyphInf
)
b
ool
SwTxtFrm
::
Hyphenate
(
SwInterHyphInfo
&
rHyphInf
)
{
{
OSL_ENSURE
(
!
IsVertical
()
||
!
IsSwapped
(),
"swapped frame at SwTxtFrm::Hyphenate"
);
OSL_ENSURE
(
!
IsVertical
()
||
!
IsSwapped
(),
"swapped frame at SwTxtFrm::Hyphenate"
);
if
(
!
g_pBreakIt
->
GetBreakIter
().
is
()
)
if
(
!
g_pBreakIt
->
GetBreakIter
().
is
()
)
return
sal_F
alse
;
return
f
alse
;
// Wir machen den Laden erstmal dicht:
// Wir machen den Laden erstmal dicht:
OSL_ENSURE
(
!
IsLocked
(),
"SwTxtFrm::Hyphenate: this is locked"
);
OSL_ENSURE
(
!
IsLocked
(),
"SwTxtFrm::Hyphenate: this is locked"
);
// 4935: Der frame::Frame muss eine gueltige SSize haben!
// 4935: Der frame::Frame muss eine gueltige SSize haben!
Calc
();
Calc
();
GetFormatted
();
GetFormatted
();
sal_Bool
bRet
=
sal_F
alse
;
bool
bRet
=
f
alse
;
if
(
!
IsEmpty
()
)
if
(
!
IsEmpty
()
)
{
{
// Wir muessen die Trennung immer einschalten.
// Wir muessen die Trennung immer einschalten.
...
@@ -230,7 +230,7 @@ bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
...
@@ -230,7 +230,7 @@ bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
Boundary
aBound
=
Boundary
aBound
=
g_pBreakIt
->
GetBreakIter
()
->
getWordBoundary
(
rInf
.
GetTxt
(),
nWrdStart
,
g_pBreakIt
->
GetBreakIter
()
->
getWordBoundary
(
rInf
.
GetTxt
(),
nWrdStart
,
g_pBreakIt
->
GetLocale
(
rInf
.
GetFont
()
->
GetLanguage
()
),
WordType
::
DICTIONARY_WORD
,
sal_T
rue
);
g_pBreakIt
->
GetLocale
(
rInf
.
GetFont
()
->
GetLanguage
()
),
WordType
::
DICTIONARY_WORD
,
t
rue
);
nWrdStart
=
aBound
.
startPos
;
nWrdStart
=
aBound
.
startPos
;
nLen
=
aBound
.
endPos
-
nWrdStart
;
nLen
=
aBound
.
endPos
-
nWrdStart
;
if
(
nLen
==
0
)
if
(
nLen
==
0
)
...
@@ -481,12 +481,12 @@ void SwSoftHyphPortion::Paint( const SwTxtPaintInfo &rInf ) const
...
@@ -481,12 +481,12 @@ void SwSoftHyphPortion::Paint( const SwTxtPaintInfo &rInf ) const
* Fall 1: "Au-to"
* Fall 1: "Au-to"
* 1) {Au}{-}{to}, {to} passt nicht mehr => Underflow
* 1) {Au}{-}{to}, {to} passt nicht mehr => Underflow
* 2) {-} ruft Hyphenate => keine Alternative
* 2) {-} ruft Hyphenate => keine Alternative
* 3) FormatEOL() und bFull =
sal_T
rue
* 3) FormatEOL() und bFull =
t
rue
*
*
* Fall 2: "Zuc-ker"
* Fall 2: "Zuc-ker"
* 1) {Zuc}{-}{ker}, {ker} passt nicht mehr => Underflow
* 1) {Zuc}{-}{ker}, {ker} passt nicht mehr => Underflow
* 2) {-} ruft Hyphenate => Alternative!
* 2) {-} ruft Hyphenate => Alternative!
* 3) Underflow() und bFull =
sal_T
rue
* 3) Underflow() und bFull =
t
rue
* 4) {Zuc} ruft Hyphenate => {Zuk}{-}{ker}
* 4) {Zuc} ruft Hyphenate => {Zuk}{-}{ker}
*/
*/
...
...
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