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
3d85664f
Kaydet (Commit)
3d85664f
authored
Kas 12, 2015
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sc: boost::ptr_vector->std::vector<std::unique_ptr>
Change-Id: I930114dd44fadfcd98d1204d51ef271a4c556388
üst
ece92b9a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
xmlcelli.cxx
sc/source/filter/xml/xmlcelli.cxx
+3
-3
xmlcelli.hxx
sc/source/filter/xml/xmlcelli.hxx
+1
-2
No files found.
sc/source/filter/xml/xmlcelli.cxx
Dosyayı görüntüle @
3d85664f
...
...
@@ -361,8 +361,8 @@ void ScXMLTableRowCellContext::PushParagraphSpan(const OUString& rSpan, const OU
void
ScXMLTableRowCellContext
::
PushParagraphField
(
SvxFieldData
*
pData
,
const
OUString
&
rStyleName
)
{
mbHasFormatRuns
=
true
;
maFields
.
push_back
(
new
Field
(
pData
));
Field
&
rField
=
maFields
.
back
();
maFields
.
push_back
(
o3tl
::
make_unique
<
Field
>
(
pData
));
Field
&
rField
=
*
maFields
.
back
().
get
();
sal_Int32
nPos
=
maParagraph
.
getLength
();
maParagraph
.
append
(
'\1'
);
// Placeholder text for inserted field item.
...
...
@@ -1114,7 +1114,7 @@ void ScXMLTableRowCellContext::PutTextCell( const ScAddress& rCurrentPos,
{
FieldsType
::
const_iterator
it
=
maFields
.
begin
(),
itEnd
=
maFields
.
end
();
for
(;
it
!=
itEnd
;
++
it
)
mpEditEngine
->
QuickInsertField
(
SvxFieldItem
(
*
it
->
mpData
,
EE_FEATURE_FIELD
),
it
->
maSelection
);
mpEditEngine
->
QuickInsertField
(
SvxFieldItem
(
*
(
*
it
)
->
mpData
,
EE_FEATURE_FIELD
),
(
*
it
)
->
maSelection
);
}
// This edit engine uses the SfxItemPool instance returned
...
...
sc/source/filter/xml/xmlcelli.hxx
Dosyayı görüntüle @
3d85664f
...
...
@@ -28,7 +28,6 @@
#include <editeng/flditem.hxx>
#include <boost/optional.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <boost/noncopyable.hpp>
#include <memory>
#include <vector>
...
...
@@ -58,7 +57,7 @@ class ScXMLTableRowCellContext : public ScXMLImportContext
};
typedef
std
::
vector
<
std
::
unique_ptr
<
ParaFormat
>
>
ParaFormatsType
;
typedef
boost
::
ptr_vector
<
Field
>
FieldsType
;
typedef
std
::
vector
<
std
::
unique_ptr
<
Field
>
>
FieldsType
;
typedef
std
::
pair
<
OUString
,
OUString
>
FormulaWithNamespace
;
boost
::
optional
<
FormulaWithNamespace
>
maFormula
;
/// table:formula attribute
...
...
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