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
3a03dd6c
Kaydet (Commit)
3a03dd6c
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
Change-Id: I5495205d376284f2310e5dc67e897e7a9ccf010f
üst
e6f57421
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
xistyle.cxx
sc/source/filter/excel/xistyle.cxx
+5
-5
xistyle.hxx
sc/source/filter/inc/xistyle.hxx
+2
-1
No files found.
sc/source/filter/excel/xistyle.cxx
Dosyayı görüntüle @
3a03dd6c
...
@@ -561,15 +561,15 @@ const XclImpFont* XclImpFontBuffer::GetFont( sal_uInt16 nFontIndex ) const
...
@@ -561,15 +561,15 @@ const XclImpFont* XclImpFontBuffer::GetFont( sal_uInt16 nFontIndex ) const
void
XclImpFontBuffer
::
ReadFont
(
XclImpStream
&
rStrm
)
void
XclImpFontBuffer
::
ReadFont
(
XclImpStream
&
rStrm
)
{
{
XclImpFont
*
pFont
=
new
XclImpFont
(
GetRoot
(
)
);
maFontList
.
push_back
(
XclImpFont
(
GetRoot
()
)
);
pFont
->
ReadFont
(
rStrm
);
XclImpFont
&
rFont
=
maFontList
.
back
(
);
maFontList
.
push_back
(
pFont
);
rFont
.
ReadFont
(
rStrm
);
if
(
maFontList
.
size
()
==
1
)
if
(
maFontList
.
size
()
==
1
)
{
{
UpdateAppFont
(
pFont
->
GetFontData
(),
pFont
->
HasCharSet
()
);
UpdateAppFont
(
rFont
.
GetFontData
(),
rFont
.
HasCharSet
()
);
// #i71033# set text encoding from application font, if CODEPAGE is missing
// #i71033# set text encoding from application font, if CODEPAGE is missing
SetAppFontEncoding
(
pFont
->
GetFontEncoding
()
);
SetAppFontEncoding
(
rFont
.
GetFontEncoding
()
);
}
}
}
}
...
...
sc/source/filter/inc/xistyle.hxx
Dosyayı görüntüle @
3a03dd6c
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
#include <list>
#include <list>
#include <memory>
#include <memory>
#include <vector>
#include <tools/mempool.hxx>
#include <tools/mempool.hxx>
#include <boost/noncopyable.hpp>
#include <boost/noncopyable.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
...
@@ -194,7 +195,7 @@ private:
...
@@ -194,7 +195,7 @@ private:
void
UpdateAppFont
(
const
XclFontData
&
rFontData
,
bool
bHasCharSet
);
void
UpdateAppFont
(
const
XclFontData
&
rFontData
,
bool
bHasCharSet
);
private
:
private
:
boost
::
ptr_
vector
<
XclImpFont
>
maFontList
;
/// List of all FONT records in the Excel file.
std
::
vector
<
XclImpFont
>
maFontList
;
/// List of all FONT records in the Excel file.
XclFontData
maAppFont
;
/// Application font (for column width).
XclFontData
maAppFont
;
/// Application font (for column width).
XclImpFont
maFont4
;
/// Built-in font with index 4.
XclImpFont
maFont4
;
/// Built-in font with index 4.
XclImpFont
maCtrlFont
;
/// BIFF5 default form controls font (Helv,8pt,bold).
XclImpFont
maCtrlFont
;
/// BIFF5 default form controls font (Helv,8pt,bold).
...
...
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