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
e0b82caf
Kaydet (Commit)
e0b82caf
authored
Haz 22, 2012
tarafından
Noel Grandin
Kaydeden (comit)
Michael Stahl
Haz 25, 2012
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Convert local variable from Svptrarr to std::vector
Change-Id: I1fc34aa0beffd487c80313e3fed2db158578a6ad
üst
4055b68f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
11 deletions
+10
-11
paintfrm.cxx
sw/source/core/layout/paintfrm.cxx
+10
-11
No files found.
sw/source/core/layout/paintfrm.cxx
Dosyayı görüntüle @
e0b82caf
...
@@ -641,7 +641,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
...
@@ -641,7 +641,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
static
const
long
nAdd
=
20
;
static
const
long
nAdd
=
20
;
SvPtrarr
aCheck
(
64
)
;
std
::
vector
<
SwLineRect
*>
aCheck
;
for
(
size_t
i
=
0
;
i
<
this
->
size
();
++
i
)
for
(
size_t
i
=
0
;
i
<
this
->
size
();
++
i
)
{
{
...
@@ -649,7 +649,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
...
@@ -649,7 +649,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
if
(
!
rL1
.
GetTab
()
||
rL1
.
IsPainted
()
||
rL1
.
IsLocked
()
)
if
(
!
rL1
.
GetTab
()
||
rL1
.
IsPainted
()
||
rL1
.
IsLocked
()
)
continue
;
continue
;
aCheck
.
Remove
(
0
,
aCheck
.
Count
()
);
aCheck
.
clear
(
);
const
sal_Bool
bVert
=
rL1
.
Height
()
>
rL1
.
Width
();
const
sal_Bool
bVert
=
rL1
.
Height
()
>
rL1
.
Width
();
long
nL1a
,
nL1b
,
nL1c
,
nL1d
;
long
nL1a
,
nL1b
,
nL1c
,
nL1d
;
...
@@ -692,23 +692,22 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
...
@@ -692,23 +692,22 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
(
nL1c
>=
nL2c
&&
nL1b
-
nAdd
<
nL2c
)
||
(
nL1c
>=
nL2c
&&
nL1b
-
nAdd
<
nL2c
)
||
(
nL1b
<=
nL2b
&&
nL1c
+
nAdd
>
nL2b
))
)
(
nL1b
<=
nL2b
&&
nL1c
+
nAdd
>
nL2b
))
)
{
{
SwLineRect
*
pMSC
=
&
rL2
;
aCheck
.
push_back
(
&
rL2
);
aCheck
.
Insert
(
pMSC
,
aCheck
.
Count
()
);
}
}
}
}
if
(
aCheck
.
Count
()
<
2
)
if
(
aCheck
.
size
()
<
2
)
continue
;
continue
;
sal_Bool
bRemove
=
sal_False
;
sal_Bool
bRemove
=
sal_False
;
// For each line test all following ones.
// For each line test all following ones.
for
(
sal_uInt16
k
=
0
;
!
bRemove
&&
k
<
aCheck
.
Count
();
++
k
)
for
(
sal_uInt16
k
=
0
;
!
bRemove
&&
k
<
aCheck
.
size
();
++
k
)
{
{
SwLineRect
&
rR1
=
(
SwLineRect
&
)
*
(
SwLineRect
*
)
aCheck
[
k
];
SwLineRect
&
rR1
=
*
aCheck
[
k
];
for
(
sal_uInt16
k2
=
k
+
1
;
!
bRemove
&&
k2
<
aCheck
.
Count
();
++
k2
)
for
(
sal_uInt16
k2
=
k
+
1
;
!
bRemove
&&
k2
<
aCheck
.
size
();
++
k2
)
{
{
SwLineRect
&
rR2
=
(
SwLineRect
&
)
*
(
SwLineRect
*
)
aCheck
[
k2
];
SwLineRect
&
rR2
=
*
aCheck
[
k2
];
if
(
bVert
)
if
(
bVert
)
{
{
SwLineRect
*
pLA
=
0
;
SwLineRect
*
pLA
=
0
;
...
@@ -738,7 +737,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
...
@@ -738,7 +737,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
if
(
isFull
()
)
if
(
isFull
()
)
{
{
--
i
;
--
i
;
k
=
aCheck
.
Count
();
k
=
aCheck
.
size
();
break
;
break
;
}
}
}
}
...
@@ -778,7 +777,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
...
@@ -778,7 +777,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
if
(
isFull
()
)
if
(
isFull
()
)
{
{
--
i
;
--
i
;
k
=
aCheck
.
Count
();
k
=
aCheck
.
size
();
break
;
break
;
}
}
}
}
...
...
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