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
70e8e4f7
Kaydet (Commit)
70e8e4f7
authored
Haz 21, 2013
tarafından
Andre Fischer
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
121256: Remember Any by value not by pointer before using it in outer scope.
üst
1cf0f678
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
8 deletions
+14
-8
escherex.cxx
filter/source/msfilter/escherex.cxx
+14
-8
No files found.
filter/source/msfilter/escherex.cxx
Dosyayı görüntüle @
70e8e4f7
...
@@ -2707,8 +2707,10 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
...
@@ -2707,8 +2707,10 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
const
rtl
::
OUString
sHandles
(
RTL_CONSTASCII_USTRINGPARAM
(
"Handles"
)
);
const
rtl
::
OUString
sHandles
(
RTL_CONSTASCII_USTRINGPARAM
(
"Handles"
)
);
const
rtl
::
OUString
sAdjustmentValues
(
RTL_CONSTASCII_USTRINGPARAM
(
"AdjustmentValues"
)
);
const
rtl
::
OUString
sAdjustmentValues
(
RTL_CONSTASCII_USTRINGPARAM
(
"AdjustmentValues"
)
);
const
beans
::
PropertyValue
*
pAdjustmentValuesProp
=
NULL
;
bool
bHasAdjustmentValuesProp
=
false
;
const
beans
::
PropertyValue
*
pPathCoordinatesProp
=
NULL
;
uno
::
Any
aAdjustmentValuesProp
;
bool
bHasPathCoordinatesProp
=
false
;
uno
::
Any
aPathCoordinatesProp
;
sal_Int32
nAdjustmentsWhichNeedsToBeConverted
=
0
;
sal_Int32
nAdjustmentsWhichNeedsToBeConverted
=
0
;
uno
::
Sequence
<
beans
::
PropertyValues
>
aHandlesPropSeq
;
uno
::
Sequence
<
beans
::
PropertyValues
>
aHandlesPropSeq
;
sal_Bool
bPredefinedHandlesUsed
=
sal_True
;
sal_Bool
bPredefinedHandlesUsed
=
sal_True
;
...
@@ -3157,7 +3159,10 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
...
@@ -3157,7 +3159,10 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
else
if
(
rrProp
.
Name
.
equals
(
sPathCoordinates
)
)
else
if
(
rrProp
.
Name
.
equals
(
sPathCoordinates
)
)
{
{
if
(
!
bIsDefaultObject
)
if
(
!
bIsDefaultObject
)
pPathCoordinatesProp
=
&
rrProp
;
{
aPathCoordinatesProp
=
rrProp
.
Value
;
bHasPathCoordinatesProp
=
true
;
}
}
}
else
if
(
rrProp
.
Name
.
equals
(
sPathGluePoints
)
)
else
if
(
rrProp
.
Name
.
equals
(
sPathGluePoints
)
)
{
{
...
@@ -3785,13 +3790,14 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
...
@@ -3785,13 +3790,14 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
{
{
// it is required, that the information which handle is polar has already be read,
// it is required, that the information which handle is polar has already be read,
// so we are able to change the polar value to a fixed float
// so we are able to change the polar value to a fixed float
pAdjustmentValuesProp
=
&
rProp
;
aAdjustmentValuesProp
=
rProp
.
Value
;
bHasAdjustmentValuesProp
=
true
;
}
}
}
}
if
(
p
AdjustmentValuesProp
)
if
(
bHas
AdjustmentValuesProp
)
{
{
uno
::
Sequence
<
com
::
sun
::
star
::
drawing
::
EnhancedCustomShapeAdjustmentValue
>
aAdjustmentSeq
;
uno
::
Sequence
<
com
::
sun
::
star
::
drawing
::
EnhancedCustomShapeAdjustmentValue
>
aAdjustmentSeq
;
if
(
pAdjustmentValuesProp
->
Value
>>=
aAdjustmentSeq
)
if
(
aAdjustmentValuesProp
>>=
aAdjustmentSeq
)
{
{
if
(
bPredefinedHandlesUsed
)
if
(
bPredefinedHandlesUsed
)
LookForPolarHandles
(
eShapeType
,
nAdjustmentsWhichNeedsToBeConverted
);
LookForPolarHandles
(
eShapeType
,
nAdjustmentsWhichNeedsToBeConverted
);
...
@@ -3802,10 +3808,10 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
...
@@ -3802,10 +3808,10 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
AddOpt
(
(
sal_uInt16
)(
DFF_Prop_adjustValue
+
k
),
(
sal_uInt32
)
nValue
);
AddOpt
(
(
sal_uInt16
)(
DFF_Prop_adjustValue
+
k
),
(
sal_uInt32
)
nValue
);
}
}
}
}
if
(
p
PathCoordinatesProp
)
if
(
bHas
PathCoordinatesProp
)
{
{
com
::
sun
::
star
::
uno
::
Sequence
<
com
::
sun
::
star
::
drawing
::
EnhancedCustomShapeParameterPair
>
aCoordinates
;
com
::
sun
::
star
::
uno
::
Sequence
<
com
::
sun
::
star
::
drawing
::
EnhancedCustomShapeParameterPair
>
aCoordinates
;
if
(
pPathCoordinatesProp
->
Value
>>=
aCoordinates
)
if
(
aPathCoordinatesProp
>>=
aCoordinates
)
{
{
// creating the vertices
// creating the vertices
if
(
(
sal_uInt16
)
aCoordinates
.
getLength
()
)
if
(
(
sal_uInt16
)
aCoordinates
.
getLength
()
)
...
...
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