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
1d92933d
Kaydet (Commit)
1d92933d
authored
Haz 03, 2015
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
convert B2VectorContinuity to scoped enum
Change-Id: Ifa401dd0d2d1bef8c0ae2987d2aee86100b59816
üst
397a0afd
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
30 additions
and
30 deletions
+30
-30
b2dpolygon.cxx
basegfx/source/polygon/b2dpolygon.cxx
+1
-1
b2dpolygontools.cxx
basegfx/source/polygon/b2dpolygontools.cxx
+5
-5
b2dsvgpolypolygon.cxx
basegfx/source/polygon/b2dsvgpolypolygon.cxx
+1
-1
unotools.cxx
basegfx/source/tools/unotools.cxx
+2
-2
b2dvector.cxx
basegfx/source/vector/b2dvector.cxx
+4
-4
basegfx2d.cxx
basegfx/test/basegfx2d.cxx
+1
-1
b2enums.hxx
include/basegfx/vector/b2enums.hxx
+3
-3
motionpathtag.cxx
sd/source/ui/animations/motionpathtag.cxx
+4
-4
svdpoev.cxx
svx/source/svdraw/svdpoev.cxx
+7
-7
poly.cxx
tools/source/generic/poly.cxx
+2
-2
No files found.
basegfx/source/polygon/b2dpolygon.cxx
Dosyayı görüntüle @
1d92933d
...
...
@@ -1336,7 +1336,7 @@ namespace basegfx
}
else
{
return
CONTINUITY_
NONE
;
return
B2VectorContinuity
::
NONE
;
}
}
...
...
basegfx/source/polygon/b2dpolygontools.cxx
Dosyayı görüntüle @
1d92933d
...
...
@@ -2625,7 +2625,7 @@ namespace basegfx
switch
(
eContinuity
)
{
case
CONTINUITY_
NONE
:
case
B2VectorContinuity
:
:
NONE
:
{
if
(
rCandidate
.
isPrevControlPointUsed
(
nIndex
))
{
...
...
@@ -2661,7 +2661,7 @@ namespace basegfx
break
;
}
case
CONTINUITY_
C1
:
case
B2VectorContinuity
:
:
C1
:
{
if
(
rCandidate
.
isPrevControlPointUsed
(
nIndex
)
&&
rCandidate
.
isNextControlPointUsed
(
nIndex
))
{
...
...
@@ -2714,7 +2714,7 @@ namespace basegfx
}
break
;
}
case
CONTINUITY_
C2
:
case
B2VectorContinuity
:
:
C2
:
{
if
(
rCandidate
.
isPrevControlPointUsed
(
nIndex
)
&&
rCandidate
.
isNextControlPointUsed
(
nIndex
))
{
...
...
@@ -3557,11 +3557,11 @@ namespace basegfx
{
const
B2VectorContinuity
eCont
(
rPolygon
.
getContinuityInPoint
(
a
));
if
(
CONTINUITY_
C1
==
eCont
)
if
(
B2VectorContinuity
::
C1
==
eCont
)
{
aCollectFlags
[
nStartPointIndex
]
=
com
::
sun
::
star
::
drawing
::
PolygonFlags_SMOOTH
;
}
else
if
(
CONTINUITY_
C2
==
eCont
)
else
if
(
B2VectorContinuity
::
C2
==
eCont
)
{
aCollectFlags
[
nStartPointIndex
]
=
com
::
sun
::
star
::
drawing
::
PolygonFlags_SYMMETRIC
;
}
...
...
basegfx/source/polygon/b2dsvgpolypolygon.cxx
Dosyayı görüntüle @
1d92933d
...
...
@@ -758,7 +758,7 @@ namespace basegfx
// is necessary.
const
bool
bSymmetricAtEdgeStart
(
0
!=
nIndex
&&
CONTINUITY_
C2
==
aPolygon
.
getContinuityInPoint
(
nIndex
));
&&
B2VectorContinuity
::
C2
==
aPolygon
.
getContinuityInPoint
(
nIndex
));
if
(
bDetectQuadraticBeziers
)
{
...
...
basegfx/source/tools/unotools.cxx
Dosyayı görüntüle @
1d92933d
...
...
@@ -214,11 +214,11 @@ namespace unotools
{
const
basegfx
::
B2VectorContinuity
eCont
(
rPoly
.
getContinuityInPoint
(
b
));
if
(
basegfx
::
CONTINUITY_
C1
==
eCont
)
if
(
basegfx
::
B2VectorContinuity
::
C1
==
eCont
)
{
aFlags
[
nStartPointIndex
]
=
drawing
::
PolygonFlags_SMOOTH
;
}
else
if
(
basegfx
::
CONTINUITY_
C2
==
eCont
)
else
if
(
basegfx
::
B2VectorContinuity
::
C2
==
eCont
)
{
aFlags
[
nStartPointIndex
]
=
drawing
::
PolygonFlags_SYMMETRIC
;
}
...
...
basegfx/source/vector/b2dvector.cxx
Dosyayı görüntüle @
1d92933d
...
...
@@ -168,22 +168,22 @@ namespace basegfx
{
if
(
rBackVector
.
equalZero
()
||
rForwardVector
.
equalZero
())
{
return
CONTINUITY_
NONE
;
return
B2VectorContinuity
::
NONE
;
}
if
(
fTools
::
equal
(
rBackVector
.
getX
(),
-
rForwardVector
.
getX
())
&&
fTools
::
equal
(
rBackVector
.
getY
(),
-
rForwardVector
.
getY
()))
{
// same direction and same length -> C2
return
CONTINUITY_
C2
;
return
B2VectorContinuity
::
C2
;
}
if
(
areParallel
(
rBackVector
,
rForwardVector
)
&&
rBackVector
.
scalar
(
rForwardVector
)
<
0.0
)
{
// parallel and opposite direction -> C1
return
CONTINUITY_
C1
;
return
B2VectorContinuity
::
C1
;
}
return
CONTINUITY_
NONE
;
return
B2VectorContinuity
::
NONE
;
}
}
// end of namespace basegfx
...
...
basegfx/test/basegfx2d.cxx
Dosyayı görüntüle @
1d92933d
...
...
@@ -737,7 +737,7 @@ public:
CPPUNIT_ASSERT_MESSAGE
(
"areControlPointsUsed() wrong"
,
aPoly
.
areControlPointsUsed
());
CPPUNIT_ASSERT_MESSAGE
(
"getContinuityInPoint() wrong"
,
aPoly
.
getContinuityInPoint
(
0
)
==
CONTINUITY_
C2
);
aPoly
.
getContinuityInPoint
(
0
)
==
B2VectorContinuity
::
C2
);
aPoly
.
resetControlPoints
();
CPPUNIT_ASSERT_MESSAGE
(
"resetControlPoints() did not clear"
,
...
...
include/basegfx/vector/b2enums.hxx
Dosyayı görüntüle @
1d92933d
...
...
@@ -43,13 +43,13 @@ namespace basegfx
enum
B2VectorContinuity
{
/// none
CONTINUITY_
NONE
=
0
,
NONE
=
0
,
/// mathematically negative oriented
C
ONTINUITY_C
1
,
C1
,
/// mathematically neutral, thus parallel
C
ONTINUITY_C
2
C2
};
/** Descriptor for possible line joins between two line segments
...
...
sd/source/ui/animations/motionpathtag.cxx
Dosyayı görüntüle @
1d92933d
...
...
@@ -869,7 +869,7 @@ void MotionPathTag::CheckPossibilities()
bool
bCurve
(
false
);
bool
bSmoothFuz
(
false
);
bool
bSegmFuz
(
false
);
basegfx
::
B2VectorContinuity
eSmooth
=
basegfx
::
CONTINUITY_
NONE
;
basegfx
::
B2VectorContinuity
eSmooth
=
basegfx
::
B2VectorContinuity
::
NONE
;
mrView
.
CheckPolyPossibilitiesHelper
(
mpMark
,
b1stSmooth
,
b1stSegm
,
bCurve
,
bSmoothFuz
,
bSegmFuz
,
eSmooth
);
}
...
...
@@ -1136,15 +1136,15 @@ void MotionPathTag::SetMarkedPointsSmooth(SdrPathSmoothKind eKind)
if
(
SDRPATHSMOOTH_ANGULAR
==
eKind
)
{
eFlags
=
basegfx
::
CONTINUITY_
NONE
;
eFlags
=
basegfx
::
B2VectorContinuity
::
NONE
;
}
else
if
(
SDRPATHSMOOTH_ASYMMETRIC
==
eKind
)
{
eFlags
=
basegfx
::
CONTINUITY_
C1
;
eFlags
=
basegfx
::
B2VectorContinuity
::
C1
;
}
else
if
(
SDRPATHSMOOTH_SYMMETRIC
==
eKind
)
{
eFlags
=
basegfx
::
CONTINUITY_
C2
;
eFlags
=
basegfx
::
B2VectorContinuity
::
C2
;
}
else
{
...
...
svx/source/svdraw/svdpoev.cxx
Dosyayı görüntüle @
1d92933d
...
...
@@ -72,7 +72,7 @@ void SdrPolyEditView::ImpCheckPolyPossibilities()
bool
bCurve
(
false
);
bool
bSmoothFuz
(
false
);
bool
bSegmFuz
(
false
);
basegfx
::
B2VectorContinuity
eSmooth
=
basegfx
::
CONTINUITY_
NONE
;
basegfx
::
B2VectorContinuity
eSmooth
=
basegfx
::
B2VectorContinuity
::
NONE
;
for
(
size_t
nMarkNum
=
0
;
nMarkNum
<
nMarkCount
;
++
nMarkNum
)
{
...
...
@@ -152,17 +152,17 @@ void SdrPolyEditView::CheckPolyPossibilitiesHelper( SdrMark* pM, bool& b1stSmoot
if
(
!
b1stSmooth
&&
!
bSmoothFuz
)
{
if
(
basegfx
::
CONTINUITY_
NONE
==
eSmooth
)
if
(
basegfx
::
B2VectorContinuity
::
NONE
==
eSmooth
)
{
eMarkedPointsSmooth
=
SDRPATHSMOOTH_ANGULAR
;
}
if
(
basegfx
::
CONTINUITY_
C1
==
eSmooth
)
if
(
basegfx
::
B2VectorContinuity
::
C1
==
eSmooth
)
{
eMarkedPointsSmooth
=
SDRPATHSMOOTH_ASYMMETRIC
;
}
if
(
basegfx
::
CONTINUITY_
C2
==
eSmooth
)
if
(
basegfx
::
B2VectorContinuity
::
C2
==
eSmooth
)
{
eMarkedPointsSmooth
=
SDRPATHSMOOTH_SYMMETRIC
;
}
...
...
@@ -182,15 +182,15 @@ void SdrPolyEditView::SetMarkedPointsSmooth(SdrPathSmoothKind eKind)
if
(
SDRPATHSMOOTH_ANGULAR
==
eKind
)
{
eFlags
=
basegfx
::
CONTINUITY_
NONE
;
eFlags
=
basegfx
::
B2VectorContinuity
::
NONE
;
}
else
if
(
SDRPATHSMOOTH_ASYMMETRIC
==
eKind
)
{
eFlags
=
basegfx
::
CONTINUITY_
C1
;
eFlags
=
basegfx
::
B2VectorContinuity
::
C1
;
}
else
if
(
SDRPATHSMOOTH_SYMMETRIC
==
eKind
)
{
eFlags
=
basegfx
::
CONTINUITY_
C2
;
eFlags
=
basegfx
::
B2VectorContinuity
::
C2
;
}
else
{
...
...
tools/source/generic/poly.cxx
Dosyayı görüntüle @
1d92933d
...
...
@@ -1872,11 +1872,11 @@ Polygon::Polygon(const basegfx::B2DPolygon& rPolygon)
{
const
basegfx
::
B2VectorContinuity
eCont
(
rPolygon
.
getContinuityInPoint
(
a
));
if
(
basegfx
::
CONTINUITY_
C1
==
eCont
)
if
(
basegfx
::
B2VectorContinuity
::
C1
==
eCont
)
{
mpImplPolygon
->
mpFlagAry
[
nStartPointIndex
]
=
(
sal_uInt8
)
POLY_SMOOTH
;
}
else
if
(
basegfx
::
CONTINUITY_
C2
==
eCont
)
else
if
(
basegfx
::
B2VectorContinuity
::
C2
==
eCont
)
{
mpImplPolygon
->
mpFlagAry
[
nStartPointIndex
]
=
(
sal_uInt8
)
POLY_SYMMTR
;
}
...
...
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