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
19f64ccc
Kaydet (Commit)
19f64ccc
authored
Ara 03, 2015
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
chart2: replace boost::ptr_map with std::map
Change-Id: I07a8b2eaa11ca29e3303d323060c3a4c52823967
üst
f46327e6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
10 deletions
+9
-10
precompiled_chartcore.hxx
chart2/inc/pch/precompiled_chartcore.hxx
+0
-1
3DChartObjects.hxx
chart2/source/view/inc/3DChartObjects.hxx
+4
-3
3DChartObjects.cxx
chart2/source/view/main/3DChartObjects.cxx
+5
-6
No files found.
chart2/inc/pch/precompiled_chartcore.hxx
Dosyayı görüntüle @
19f64ccc
...
...
@@ -38,7 +38,6 @@
#include <vector>
#include <boost/checked_delete.hpp>
#include <boost/intrusive_ptr.hpp>
#include <boost/ptr_container/ptr_map.hpp>
#include <osl/conditn.hxx>
#include <osl/diagnose.h>
#include <osl/doublecheckedlocking.h>
...
...
chart2/source/view/inc/3DChartObjects.hxx
Dosyayı görüntüle @
19f64ccc
...
...
@@ -17,9 +17,10 @@
#include <vcl/opengl/OpenGLContext.hxx>
#include "GL3DRenderer.hxx"
#include <boost/ptr_container/ptr_map.hpp>
#include <boost/shared_array.hpp>
#include <map>
namespace
chart
{
namespace
opengl3D
{
...
...
@@ -39,9 +40,9 @@ class TextCache
public
:
const
TextCacheItem
&
getText
(
OUString
const
&
rText
,
bool
bIs3dText
=
false
);
private
:
typedef
boost
::
ptr_
map
<
OUString
const
,
TextCacheItem
>
TextCacheType
;
typedef
std
::
map
<
OUString
const
,
TextCacheItem
>
TextCacheType
;
TextCacheType
m
a
TextCache
;
TextCacheType
m
_
TextCache
;
};
class
Renderable3DObject
...
...
chart2/source/view/main/3DChartObjects.cxx
Dosyayı görüntüle @
19f64ccc
...
...
@@ -72,9 +72,9 @@ void Line::setLineColor(const Color& rColor)
const
TextCacheItem
&
TextCache
::
getText
(
OUString
const
&
rText
,
bool
bIs3dText
)
{
TextCacheType
::
const_iterator
itr
=
ma
TextCache
.
find
(
rText
);
if
(
itr
!=
ma
TextCache
.
end
())
return
*
itr
->
second
;
TextCacheType
::
const_iterator
const
itr
=
m_
TextCache
.
find
(
rText
);
if
(
itr
!=
m_
TextCache
.
end
())
return
itr
->
second
;
ScopedVclPtrInstance
<
VirtualDevice
>
pDevice
(
*
Application
::
GetDefaultDevice
(),
DeviceFormat
::
DEFAULT
,
DeviceFormat
::
DEFAULT
);
...
...
@@ -105,10 +105,9 @@ const TextCacheItem& TextCache::getText(OUString const & rText, bool bIs3dText)
long
nBmpHeight
=
aText
.
GetSizePixel
().
Height
();
sal_uInt8
*
pBitmapBuf
(
new
sal_uInt8
[
3
*
nBmpWidth
*
nBmpHeight
]);
memcpy
(
pBitmapBuf
,
buf
,
3
*
nBmpWidth
*
nBmpHeight
);
TextCacheItem
*
pItem
=
new
TextCacheItem
(
pBitmapBuf
,
aText
.
GetSizePixel
());
maTextCache
.
insert
(
rText
,
pItem
);
m_TextCache
.
insert
(
std
::
make_pair
(
rText
,
TextCacheItem
(
pBitmapBuf
,
aText
.
GetSizePixel
())));
Bitmap
::
ReleaseAccess
(
pAcc
);
return
*
ma
TextCache
.
find
(
rText
)
->
second
;
return
m_
TextCache
.
find
(
rText
)
->
second
;
}
Text
::
Text
(
OpenGL3DRenderer
*
pRenderer
,
TextCache
&
rTextCache
,
const
OUString
&
rStr
,
sal_uInt32
nId
)
:
...
...
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