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
7e9d2ccd
Kaydet (Commit)
7e9d2ccd
authored
Ock 26, 2017
tarafından
Tomaž Vajngerl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
chart2: remove typedef for std::vector, remove commented code
Change-Id: I62c4cbd0f1ed3d7ea0715475d58e0ee130f3ca00
üst
85295504
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
8 deletions
+4
-8
VLegend.cxx
chart2/source/view/main/VLegend.cxx
+4
-8
No files found.
chart2/source/view/main/VLegend.cxx
Dosyayı görüntüle @
7e9d2ccd
...
...
@@ -56,8 +56,6 @@ namespace
typedef
::
std
::
pair
<
::
chart
::
tNameSequence
,
::
chart
::
tAnySequence
>
tPropertyValues
;
typedef
::
std
::
vector
<
ViewLegendEntry
>
tViewLegendEntryContainer
;
double
lcl_CalcViewFontSize
(
const
Reference
<
beans
::
XPropertySet
>
&
xProp
,
const
awt
::
Size
&
rReferenceSize
)
...
...
@@ -146,7 +144,7 @@ void lcl_getProperties(
}
awt
::
Size
lcl_createTextShapes
(
const
tViewLegendEntryContainer
&
rEntries
,
const
std
::
vector
<
ViewLegendEntry
>
&
rEntries
,
const
Reference
<
lang
::
XMultiServiceFactory
>
&
xShapeFactory
,
const
Reference
<
drawing
::
XShapes
>
&
xTarget
,
::
std
::
vector
<
Reference
<
drawing
::
XShape
>
>
&
rOutTextShapes
,
...
...
@@ -155,7 +153,7 @@ awt::Size lcl_createTextShapes(
awt
::
Size
aResult
;
AbstractShapeFactory
*
pShapeFactory
=
AbstractShapeFactory
::
getOrCreateShapeFactory
(
xShapeFactory
);
for
(
tViewLegendEntryContainer
::
const_iterator
aIt
(
rEntries
.
begin
());
for
(
std
::
vector
<
ViewLegendEntry
>
::
const_iterator
aIt
(
rEntries
.
begin
());
aIt
!=
rEntries
.
end
();
++
aIt
)
{
try
...
...
@@ -262,7 +260,7 @@ sal_Int32 lcl_getTextLineHeight( const std::vector< sal_Int32 >& aRowHeights, co
//returns resulting legend size
awt
::
Size
lcl_placeLegendEntries
(
tViewLegendEntryContainer
&
rEntries
,
std
::
vector
<
ViewLegendEntry
>
&
rEntries
,
css
::
chart
::
ChartLegendExpansion
eExpansion
,
bool
bSymbolsLeftSide
,
double
fViewFontSize
,
...
...
@@ -279,11 +277,9 @@ awt::Size lcl_placeLegendEntries(
// #i109336# Improve auto positioning in chart
sal_Int32
nXPadding
=
static_cast
<
sal_Int32
>
(
std
::
max
(
100.0
,
fViewFontSize
*
0.33
)
);
//sal_Int32 nXPadding = static_cast< sal_Int32 >( std::max( 200.0, fViewFontSize * 0.33 ) );
sal_Int32
nXOffset
=
static_cast
<
sal_Int32
>
(
std
::
max
(
100.0
,
fViewFontSize
*
0.66
)
);
sal_Int32
nYPadding
=
static_cast
<
sal_Int32
>
(
std
::
max
(
100.0
,
fViewFontSize
*
0.2
)
);
sal_Int32
nYOffset
=
static_cast
<
sal_Int32
>
(
std
::
max
(
100.0
,
fViewFontSize
*
0.2
)
);
//sal_Int32 nYOffset = static_cast< sal_Int32 >( std::max( 230.0, fViewFontSize * 0.45 ) );
const
sal_Int32
nSymbolToTextDistance
=
static_cast
<
sal_Int32
>
(
std
::
max
(
100.0
,
fViewFontSize
*
0.22
)
);
//minimum 1mm
const
sal_Int32
nSymbolPlusDistanceWidth
=
rMaxSymbolExtent
.
Width
+
nSymbolToTextDistance
;
...
...
@@ -882,7 +878,7 @@ void VLegend::createShapes(
}
awt
::
Size
aMaxSymbolExtent
(
nSymbolWidth
,
nSymbolHeight
);
tViewLegendEntryContainer
aViewEntries
;
std
::
vector
<
ViewLegendEntry
>
aViewEntries
;
for
(
LegendEntryProvider
*
pLegendEntryProvider
:
m_aLegendEntryProviderList
)
{
if
(
pLegendEntryProvider
)
...
...
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