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
05dcb073
Kaydet (Commit)
05dcb073
authored
Ock 03, 2015
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Use std::make_shared
Change-Id: I27281dfbb95c410c2725ec7ce93b91eed41061e2
üst
b739e6ae
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
rtfdocumentimpl.cxx
writerfilter/source/rtftok/rtfdocumentimpl.cxx
+0
-0
rtfsdrimport.cxx
writerfilter/source/rtftok/rtfsdrimport.cxx
+4
-4
rtfsprm.cxx
writerfilter/source/rtftok/rtfsprm.cxx
+2
-2
No files found.
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Dosyayı görüntüle @
05dcb073
This diff is collapsed.
Click to expand it.
writerfilter/source/rtftok/rtfsdrimport.cxx
Dosyayı görüntüle @
05dcb073
...
@@ -733,9 +733,9 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
...
@@ -733,9 +733,9 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
}
}
while
(
nI
>=
0
);
while
(
nI
>=
0
);
RTFSprms
aPathAttributes
;
RTFSprms
aPathAttributes
;
aPathAttributes
.
set
(
NS_ooxml
::
LN_CT_Point2D_x
,
RTFValue
::
Pointer_t
(
new
RTFValue
(
*
oX
)
));
aPathAttributes
.
set
(
NS_ooxml
::
LN_CT_Point2D_x
,
std
::
make_shared
<
RTFValue
>
(
*
oX
));
aPathAttributes
.
set
(
NS_ooxml
::
LN_CT_Point2D_y
,
RTFValue
::
Pointer_t
(
new
RTFValue
(
*
oY
)
));
aPathAttributes
.
set
(
NS_ooxml
::
LN_CT_Point2D_y
,
std
::
make_shared
<
RTFValue
>
(
*
oY
));
aPolygonSprms
.
set
(
NS_ooxml
::
LN_CT_WrapPath_lineTo
,
RTFValue
::
Pointer_t
(
new
RTFValue
(
aPathAttributes
)
),
RTFOverwrite
::
NO_APPEND
);
aPolygonSprms
.
set
(
NS_ooxml
::
LN_CT_WrapPath_lineTo
,
std
::
make_shared
<
RTFValue
>
(
aPathAttributes
),
RTFOverwrite
::
NO_APPEND
);
}
}
}
}
while
(
nCharIndex
>=
0
);
while
(
nCharIndex
>=
0
);
...
@@ -890,7 +890,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
...
@@ -890,7 +890,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
if
(
m_rImport
.
isInBackground
())
if
(
m_rImport
.
isInBackground
())
{
{
RTFSprms
aAttributes
;
RTFSprms
aAttributes
;
aAttributes
.
set
(
NS_ooxml
::
LN_CT_Background_color
,
RTFValue
::
Pointer_t
(
new
RTFValue
(
xPropertySet
->
getPropertyValue
(
"FillColor"
).
get
<
sal_Int32
>
()
)));
aAttributes
.
set
(
NS_ooxml
::
LN_CT_Background_color
,
std
::
make_shared
<
RTFValue
>
(
xPropertySet
->
getPropertyValue
(
"FillColor"
).
get
<
sal_Int32
>
(
)));
writerfilter
::
Reference
<
Properties
>::
Pointer_t
const
pProperties
(
new
RTFReferenceProperties
(
aAttributes
));
writerfilter
::
Reference
<
Properties
>::
Pointer_t
const
pProperties
(
new
RTFReferenceProperties
(
aAttributes
));
m_rImport
.
Mapper
().
props
(
pProperties
);
m_rImport
.
Mapper
().
props
(
pProperties
);
...
...
writerfilter/source/rtftok/rtfsprm.cxx
Dosyayı görüntüle @
05dcb073
...
@@ -144,7 +144,7 @@ static RTFValue::Pointer_t getDefaultSPRM(Id const id)
...
@@ -144,7 +144,7 @@ static RTFValue::Pointer_t getDefaultSPRM(Id const id)
case
NS_ooxml
:
:
LN_CT_Spacing_before
:
case
NS_ooxml
:
:
LN_CT_Spacing_before
:
case
NS_ooxml
:
:
LN_CT_Spacing_after
:
case
NS_ooxml
:
:
LN_CT_Spacing_after
:
case
NS_ooxml
:
:
LN_EG_RPrBase_b
:
case
NS_ooxml
:
:
LN_EG_RPrBase_b
:
return
RTFValue
::
Pointer_t
(
new
RTFValue
(
0
)
);
return
std
::
make_shared
<
RTFValue
>
(
0
);
default
:
default
:
return
RTFValue
::
Pointer_t
();
return
RTFValue
::
Pointer_t
();
...
@@ -193,7 +193,7 @@ RTFSprms RTFSprms::cloneAndDeduplicate(RTFSprms& rReference) const
...
@@ -193,7 +193,7 @@ RTFSprms RTFSprms::cloneAndDeduplicate(RTFSprms& rReference) const
RTFSprms
().
cloneAndDeduplicate
(
i
->
second
->
getAttributes
()));
RTFSprms
().
cloneAndDeduplicate
(
i
->
second
->
getAttributes
()));
if
(
!
sprms
.
empty
()
||
!
attributes
.
empty
())
if
(
!
sprms
.
empty
()
||
!
attributes
.
empty
())
{
{
ret
.
set
(
i
->
first
,
RTFValue
::
Pointer_t
(
new
RTFValue
(
attributes
,
sprms
)
));
ret
.
set
(
i
->
first
,
std
::
make_shared
<
RTFValue
>
(
attributes
,
sprms
));
}
}
}
}
}
}
...
...
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