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
518d6411
Kaydet (Commit)
518d6411
authored
Şub 07, 2014
tarafından
Thomas Arnhold
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
remove germanism: bEnde -> bEnd
üst
0c4d6f58
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
21 deletions
+21
-21
autofmt.cxx
sw/source/core/edit/autofmt.cxx
+12
-12
ednumber.cxx
sw/source/core/edit/ednumber.cxx
+5
-5
sgvmain.cxx
vcl/source/filter/sgvmain.cxx
+4
-4
No files found.
sw/source/core/edit/autofmt.cxx
Dosyayı görüntüle @
518d6411
...
@@ -132,7 +132,7 @@ class SwAutoFormat
...
@@ -132,7 +132,7 @@ class SwAutoFormat
IS_ENDE
IS_ENDE
}
eStat
;
}
eStat
;
bool
bEnd
e
:
1
;
bool
bEnd
:
1
;
bool
bEmptyLine
:
1
;
bool
bEmptyLine
:
1
;
bool
bMoreLines
:
1
;
bool
bMoreLines
:
1
;
...
@@ -205,7 +205,7 @@ class SwAutoFormat
...
@@ -205,7 +205,7 @@ class SwAutoFormat
bool
CanJoin
(
const
SwTxtNode
*
pTxtNd
)
const
bool
CanJoin
(
const
SwTxtNode
*
pTxtNd
)
const
{
{
return
!
bEnd
e
&&
pTxtNd
&&
return
!
bEnd
&&
pTxtNd
&&
!
IsEmptyLine
(
*
pTxtNd
)
&&
!
IsEmptyLine
(
*
pTxtNd
)
&&
!
IsNoAlphaLine
(
*
pTxtNd
)
&&
!
IsNoAlphaLine
(
*
pTxtNd
)
&&
!
IsEnumericChar
(
*
pTxtNd
)
&&
!
IsEnumericChar
(
*
pTxtNd
)
&&
...
@@ -307,14 +307,14 @@ OUString SwAutoFormat::GoNextPara()
...
@@ -307,14 +307,14 @@ OUString SwAutoFormat::GoNextPara()
// has to be checked twice before and after incrementation
// has to be checked twice before and after incrementation
if
(
aNdIdx
.
GetIndex
()
>=
aEndNdIdx
.
GetIndex
()
)
if
(
aNdIdx
.
GetIndex
()
>=
aEndNdIdx
.
GetIndex
()
)
{
{
bEnd
e
=
true
;
bEnd
=
true
;
return
OUString
();
return
OUString
();
}
}
aNdIdx
++
;
aNdIdx
++
;
if
(
aNdIdx
.
GetIndex
()
>=
aEndNdIdx
.
GetIndex
()
)
if
(
aNdIdx
.
GetIndex
()
>=
aEndNdIdx
.
GetIndex
()
)
{
{
bEnd
e
=
true
;
bEnd
=
true
;
return
OUString
();
return
OUString
();
}
}
else
else
...
@@ -326,7 +326,7 @@ OUString SwAutoFormat::GoNextPara()
...
@@ -326,7 +326,7 @@ OUString SwAutoFormat::GoNextPara()
// EndNode : at the end, terminate
// EndNode : at the end, terminate
if
(
pNewNd
->
IsEndNode
()
)
if
(
pNewNd
->
IsEndNode
()
)
{
{
bEnd
e
=
true
;
bEnd
=
true
;
return
OUString
();
return
OUString
();
}
}
else
if
(
pNewNd
->
IsTableNode
()
)
else
if
(
pNewNd
->
IsTableNode
()
)
...
@@ -1267,7 +1267,7 @@ void SwAutoFormat::BuildIndent()
...
@@ -1267,7 +1267,7 @@ void SwAutoFormat::BuildIndent()
{
{
SetRedlineTxt
(
STR_AUTOFMTREDL_DEL_MORELINES
);
SetRedlineTxt
(
STR_AUTOFMTREDL_DEL_MORELINES
);
const
SwTxtNode
*
pNxtNd
=
GetNextNode
();
const
SwTxtNode
*
pNxtNd
=
GetNextNode
();
if
(
pNxtNd
&&
!
bEnd
e
)
if
(
pNxtNd
&&
!
bEnd
)
{
{
do
{
do
{
bBreak
=
!
IsFastFullLine
(
*
pNxtNd
)
||
bBreak
=
!
IsFastFullLine
(
*
pNxtNd
)
||
...
@@ -2133,7 +2133,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
...
@@ -2133,7 +2133,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
else
else
bEmptyLine
=
true
;
// at document beginning
bEmptyLine
=
true
;
// at document beginning
bEnd
e
=
false
;
bEnd
=
false
;
// set value for percentage display
// set value for percentage display
nEndNdIdx
=
aEndNdIdx
.
GetIndex
();
nEndNdIdx
=
aEndNdIdx
.
GetIndex
();
...
@@ -2169,14 +2169,14 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
...
@@ -2169,14 +2169,14 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
// This is the automat for autoformatting
// This is the automat for autoformatting
eStat
=
READ_NEXT_PARA
;
eStat
=
READ_NEXT_PARA
;
while
(
!
bEnd
e
)
while
(
!
bEnd
)
{
{
switch
(
eStat
)
switch
(
eStat
)
{
{
case
READ_NEXT_PARA
:
case
READ_NEXT_PARA
:
{
{
GoNextPara
();
GoNextPara
();
eStat
=
bEnd
e
?
IS_ENDE
:
TST_EMPTY_LINE
;
eStat
=
bEnd
?
IS_ENDE
:
TST_EMPTY_LINE
;
}
}
break
;
break
;
...
@@ -2422,7 +2422,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
...
@@ -2422,7 +2422,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
BuildTextIndent
();
BuildTextIndent
();
eStat
=
READ_NEXT_PARA
;
eStat
=
READ_NEXT_PARA
;
}
}
else
if
(
nLevel
&&
pNxtNd
&&
!
bEnd
e
&&
else
if
(
nLevel
&&
pNxtNd
&&
!
bEnd
&&
!
bNxtEmpty
&&
!
bNxtAlpha
&&
!
nNxtLevel
&&
!
bNxtEmpty
&&
!
bNxtAlpha
&&
!
nNxtLevel
&&
!
IsEnumericChar
(
*
pNxtNd
)
)
!
IsEnumericChar
(
*
pNxtNd
)
)
{
{
...
@@ -2448,7 +2448,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
...
@@ -2448,7 +2448,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
BuildText
();
BuildText
();
eStat
=
READ_NEXT_PARA
;
eStat
=
READ_NEXT_PARA
;
}
}
else
if
(
!
nLevel
&&
pNxtNd
&&
!
bEnd
e
&&
else
if
(
!
nLevel
&&
pNxtNd
&&
!
bEnd
&&
!
bNxtEmpty
&&
!
bNxtAlpha
&&
nNxtLevel
&&
!
bNxtEmpty
&&
!
bNxtAlpha
&&
nNxtLevel
&&
!
IsEnumericChar
(
*
pNxtNd
)
)
!
IsEnumericChar
(
*
pNxtNd
)
)
{
{
...
@@ -2521,7 +2521,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
...
@@ -2521,7 +2521,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
break
;
break
;
case
IS_ENDE
:
case
IS_ENDE
:
bEnd
e
=
true
;
bEnd
=
true
;
break
;
break
;
}
}
}
}
...
...
sw/source/core/edit/ednumber.cxx
Dosyayı görüntüle @
518d6411
...
@@ -56,9 +56,9 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
...
@@ -56,9 +56,9 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
return
;
// done, because by precondition everything is combined
return
;
// done, because by precondition everything is combined
}
}
bool
bEnd
e
;
bool
bEnd
;
do
{
do
{
bEnd
e
=
true
;
bEnd
=
true
;
// combine with predecessor?
// combine with predecessor?
if
(
nPos
>
0
)
if
(
nPos
>
0
)
...
@@ -68,7 +68,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
...
@@ -68,7 +68,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
||
rTmp
.
nEnd
+
1
==
aRg
.
nStart
)
||
rTmp
.
nEnd
+
1
==
aRg
.
nStart
)
{
{
aRg
.
nStart
=
rTmp
.
nStart
;
aRg
.
nStart
=
rTmp
.
nStart
;
bEnd
e
=
false
;
bEnd
=
false
;
erase
(
begin
()
+
--
nPos
);
// combine
erase
(
begin
()
+
--
nPos
);
// combine
}
}
// range contained in rTmp?
// range contained in rTmp?
...
@@ -83,7 +83,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
...
@@ -83,7 +83,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
rTmp
.
nStart
==
aRg
.
nEnd
+
1
)
rTmp
.
nStart
==
aRg
.
nEnd
+
1
)
{
{
aRg
.
nEnd
=
rTmp
.
nEnd
;
aRg
.
nEnd
=
rTmp
.
nEnd
;
bEnd
e
=
false
;
bEnd
=
false
;
erase
(
begin
()
+
nPos
);
// combine
erase
(
begin
()
+
nPos
);
// combine
}
}
...
@@ -91,7 +91,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
...
@@ -91,7 +91,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
else
if
(
rTmp
.
nStart
<=
aRg
.
nStart
&&
aRg
.
nEnd
<=
rTmp
.
nEnd
)
else
if
(
rTmp
.
nStart
<=
aRg
.
nStart
&&
aRg
.
nEnd
<=
rTmp
.
nEnd
)
return
;
return
;
}
}
}
while
(
!
bEnd
e
);
}
while
(
!
bEnd
);
_SwPamRanges
::
insert
(
aRg
);
_SwPamRanges
::
insert
(
aRg
);
}
}
...
...
vcl/source/filter/sgvmain.cxx
Dosyayı görüntüle @
518d6411
...
@@ -766,7 +766,7 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut )
...
@@ -766,7 +766,7 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut )
{
{
ObjkType
aObjk
;
ObjkType
aObjk
;
sal_uInt16
nGrpCnt
=
0
;
sal_uInt16
nGrpCnt
=
0
;
bool
bEnd
e
=
false
;
bool
bEnd
=
false
;
do
{
do
{
ReadObjkType
(
rInp
,
aObjk
);
ReadObjkType
(
rInp
,
aObjk
);
if
(
!
rInp
.
GetError
())
{
if
(
!
rInp
.
GetError
())
{
...
@@ -833,13 +833,13 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut )
...
@@ -833,13 +833,13 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut )
}
// if rInp
}
// if rInp
if
(
!
rInp
.
GetError
())
{
if
(
!
rInp
.
GetError
())
{
if
(
aObjk
.
Next
==
0L
)
{
if
(
aObjk
.
Next
==
0L
)
{
if
(
nGrpCnt
==
0
)
bEnd
e
=
true
;
if
(
nGrpCnt
==
0
)
bEnd
=
true
;
else
nGrpCnt
--
;
else
nGrpCnt
--
;
}
}
}
else
{
}
else
{
bEnd
e
=
true
;
// read error
bEnd
=
true
;
// read error
}
}
}
while
(
!
bEnd
e
);
}
while
(
!
bEnd
);
}
}
/*************************************************************************
/*************************************************************************
...
...
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