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
bc8dcb2b
Kaydet (Commit)
bc8dcb2b
authored
Kas 26, 2015
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
-Werror,-Wunused-private-field
Change-Id: I70e753b1532fe465d378b8b4b0bbd2b7582130fe
üst
e65233ab
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
49 deletions
+11
-49
DummyXShape.cxx
chart2/source/view/main/DummyXShape.cxx
+1
-16
DummyXShape.hxx
chart2/source/view/main/DummyXShape.hxx
+3
-25
OpenglShapeFactory.cxx
chart2/source/view/main/OpenglShapeFactory.cxx
+7
-8
No files found.
chart2/source/view/main/DummyXShape.cxx
Dosyayı görüntüle @
bc8dcb2b
...
@@ -453,13 +453,6 @@ void DummyPieSegment2D::render()
...
@@ -453,13 +453,6 @@ void DummyPieSegment2D::render()
}
}
DummyPieSegment
::
DummyPieSegment
(
const
drawing
::
Direction3D
&
rOffset
,
const
drawing
::
HomogenMatrix
&
rUnitCircleToScene
)
:
maOffset
(
rOffset
),
maUnitCircleToScene
(
rUnitCircleToScene
)
{
}
DummyStripe
::
DummyStripe
(
const
Stripe
&
rStripe
,
const
uno
::
Reference
<
beans
::
XPropertySet
>
&
xPropSet
,
DummyStripe
::
DummyStripe
(
const
Stripe
&
rStripe
,
const
uno
::
Reference
<
beans
::
XPropertySet
>
&
xPropSet
,
const
tPropertyNameMap
&
rPropertyNameMap
)
:
const
tPropertyNameMap
&
rPropertyNameMap
)
:
maStripe
(
rStripe
)
maStripe
(
rStripe
)
...
@@ -467,11 +460,6 @@ DummyStripe::DummyStripe(const Stripe& rStripe, const uno::Reference< beans::XPr
...
@@ -467,11 +460,6 @@ DummyStripe::DummyStripe(const Stripe& rStripe, const uno::Reference< beans::XPr
setProperties
(
xPropSet
,
rPropertyNameMap
,
maProperties
);
setProperties
(
xPropSet
,
rPropertyNameMap
,
maProperties
);
}
}
DummyArea3D
::
DummyArea3D
(
const
drawing
::
PolyPolygonShape3D
&
rShape
)
:
maShapes
(
rShape
)
{
}
DummyArea2D
::
DummyArea2D
(
const
drawing
::
PointSequenceSequence
&
rShape
)
:
DummyArea2D
::
DummyArea2D
(
const
drawing
::
PointSequenceSequence
&
rShape
)
:
maShapes
(
rShape
)
maShapes
(
rShape
)
{
{
...
@@ -505,8 +493,6 @@ void DummyArea2D::render()
...
@@ -505,8 +493,6 @@ void DummyArea2D::render()
DummySymbol2D
::
DummySymbol2D
(
const
drawing
::
Position3D
&
rPos
,
const
drawing
::
Direction3D
&
rSize
,
DummySymbol2D
::
DummySymbol2D
(
const
drawing
::
Position3D
&
rPos
,
const
drawing
::
Direction3D
&
rSize
,
sal_Int32
nStandardSymbol
,
sal_Int32
nFillColor
)
:
sal_Int32
nStandardSymbol
,
sal_Int32
nFillColor
)
:
mrPosition
(
rPos
),
mrSize
(
rSize
),
mnStandardSymbol
(
nStandardSymbol
),
mnStandardSymbol
(
nStandardSymbol
),
mnFillColor
(
nFillColor
)
mnFillColor
(
nFillColor
)
{
{
...
@@ -592,8 +578,7 @@ void setProperties( const VLineProperties& rLineProperties, std::map<OUString, u
...
@@ -592,8 +578,7 @@ void setProperties( const VLineProperties& rLineProperties, std::map<OUString, u
}
}
DummyLine3D
::
DummyLine3D
(
const
drawing
::
PolyPolygonShape3D
&
rPoints
,
const
VLineProperties
&
rLineProperties
)
:
DummyLine3D
::
DummyLine3D
(
const
VLineProperties
&
rLineProperties
)
maPoints
(
rPoints
)
{
{
setProperties
(
rLineProperties
,
maProperties
);
setProperties
(
rLineProperties
,
maProperties
);
}
}
...
...
chart2/source/view/main/DummyXShape.hxx
Dosyayı görüntüle @
bc8dcb2b
...
@@ -44,7 +44,6 @@
...
@@ -44,7 +44,6 @@
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/drawing/PolyPolygonShape3D.hpp>
#include <com/sun/star/drawing/Direction3D.hpp>
#include <com/sun/star/drawing/Direction3D.hpp>
#include <com/sun/star/drawing/Position3D.hpp>
#include <com/sun/star/drawing/Position3D.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
...
@@ -227,16 +226,7 @@ private:
...
@@ -227,16 +226,7 @@ private:
css
::
drawing
::
HomogenMatrix
maUnitCircleToScene
;
css
::
drawing
::
HomogenMatrix
maUnitCircleToScene
;
};
};
class
DummyPieSegment
:
public
DummyXShape
class
DummyPieSegment
:
public
DummyXShape
{};
{
public
:
DummyPieSegment
(
const
css
::
drawing
::
Direction3D
&
rOffset
,
const
css
::
drawing
::
HomogenMatrix
&
rUnitCircleToScene
);
private
:
css
::
drawing
::
Direction3D
maOffset
;
css
::
drawing
::
HomogenMatrix
maUnitCircleToScene
;
};
class
DummyStripe
:
public
DummyXShape
class
DummyStripe
:
public
DummyXShape
{
{
...
@@ -248,14 +238,7 @@ private:
...
@@ -248,14 +238,7 @@ private:
Stripe
maStripe
;
Stripe
maStripe
;
};
};
class
DummyArea3D
:
public
DummyXShape
class
DummyArea3D
:
public
DummyXShape
{};
{
public
:
explicit
DummyArea3D
(
const
css
::
drawing
::
PolyPolygonShape3D
&
rShape
);
private
:
css
::
drawing
::
PolyPolygonShape3D
maShapes
;
};
class
DummyArea2D
:
public
DummyXShape
class
DummyArea2D
:
public
DummyXShape
{
{
...
@@ -275,8 +258,6 @@ public:
...
@@ -275,8 +258,6 @@ public:
sal_Int32
nStandardSymbol
,
sal_Int32
nFillColor
);
sal_Int32
nStandardSymbol
,
sal_Int32
nFillColor
);
void
render
()
override
;
void
render
()
override
;
private
:
private
:
css
::
drawing
::
Position3D
mrPosition
;
css
::
drawing
::
Direction3D
mrSize
;
sal_Int32
mnStandardSymbol
;
sal_Int32
mnStandardSymbol
;
sal_Int32
mnFillColor
;
sal_Int32
mnFillColor
;
};
};
...
@@ -302,10 +283,7 @@ public:
...
@@ -302,10 +283,7 @@ public:
class
DummyLine3D
:
public
DummyXShape
class
DummyLine3D
:
public
DummyXShape
{
{
public
:
public
:
DummyLine3D
(
const
css
::
drawing
::
PolyPolygonShape3D
&
rPoints
,
const
VLineProperties
&
rProperties
);
DummyLine3D
(
const
VLineProperties
&
rProperties
);
private
:
css
::
drawing
::
PolyPolygonShape3D
maPoints
;
};
};
class
DummyLine2D
:
public
DummyXShape
class
DummyLine2D
:
public
DummyXShape
...
...
chart2/source/view/main/OpenglShapeFactory.cxx
Dosyayı görüntüle @
bc8dcb2b
...
@@ -205,12 +205,11 @@ uno::Reference< drawing::XShape >
...
@@ -205,12 +205,11 @@ uno::Reference< drawing::XShape >
const
uno
::
Reference
<
drawing
::
XShapes
>&
xTarget
const
uno
::
Reference
<
drawing
::
XShapes
>&
xTarget
,
double
,
double
,
double
,
double
,
double
,
double
,
double
,
double
,
const
drawing
::
Direction3D
&
rOffset
,
const
drawing
::
Direction3D
&
,
const
drawing
::
HomogenMatrix
&
rUnitCircleToScene
,
const
drawing
::
HomogenMatrix
&
,
double
)
,
double
)
{
{
dummy
::
DummyPieSegment
*
pSegment
=
new
dummy
::
DummyPieSegment
(
dummy
::
DummyPieSegment
*
pSegment
=
new
dummy
::
DummyPieSegment
;
rOffset
,
rUnitCircleToScene
);
xTarget
->
add
(
pSegment
);
xTarget
->
add
(
pSegment
);
return
pSegment
;
return
pSegment
;
...
@@ -233,10 +232,10 @@ uno::Reference< drawing::XShape >
...
@@ -233,10 +232,10 @@ uno::Reference< drawing::XShape >
uno
::
Reference
<
drawing
::
XShape
>
uno
::
Reference
<
drawing
::
XShape
>
OpenglShapeFactory
::
createArea3D
(
const
uno
::
Reference
<
drawing
::
XShapes
>&
xTarget
OpenglShapeFactory
::
createArea3D
(
const
uno
::
Reference
<
drawing
::
XShapes
>&
xTarget
,
const
drawing
::
PolyPolygonShape3D
&
rPolyPolygon
,
const
drawing
::
PolyPolygonShape3D
&
,
double
)
,
double
)
{
{
dummy
::
DummyArea3D
*
pArea
=
new
dummy
::
DummyArea3D
(
rPolyPolygon
)
;
dummy
::
DummyArea3D
*
pArea
=
new
dummy
::
DummyArea3D
;
xTarget
->
add
(
pArea
);
xTarget
->
add
(
pArea
);
return
pArea
;
return
pArea
;
}
}
...
@@ -323,10 +322,10 @@ uno::Reference< drawing::XShape >
...
@@ -323,10 +322,10 @@ uno::Reference< drawing::XShape >
uno
::
Reference
<
drawing
::
XShape
>
uno
::
Reference
<
drawing
::
XShape
>
OpenglShapeFactory
::
createLine3D
(
const
uno
::
Reference
<
drawing
::
XShapes
>&
xTarget
OpenglShapeFactory
::
createLine3D
(
const
uno
::
Reference
<
drawing
::
XShapes
>&
xTarget
,
const
drawing
::
PolyPolygonShape3D
&
rPoints
,
const
drawing
::
PolyPolygonShape3D
&
,
const
VLineProperties
&
rLineProperties
)
,
const
VLineProperties
&
rLineProperties
)
{
{
dummy
::
DummyLine3D
*
pLine
=
new
dummy
::
DummyLine3D
(
r
Points
,
r
LineProperties
);
dummy
::
DummyLine3D
*
pLine
=
new
dummy
::
DummyLine3D
(
rLineProperties
);
xTarget
->
add
(
pLine
);
xTarget
->
add
(
pLine
);
return
pLine
;
return
pLine
;
}
}
...
...
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