[Libreoffice-commits] core.git: chart2/source
Stephan Bergmann
sbergman at redhat.com
Wed Jan 29 02:42:54 PST 2014
chart2/source/view/inc/AbstractShapeFactory.hxx | 2 +-
chart2/source/view/inc/DummyXShape.hxx | 9 ++++-----
chart2/source/view/inc/OpenglShapeFactory.hxx | 2 +-
chart2/source/view/inc/ShapeFactory.hxx | 2 +-
chart2/source/view/main/DummyXShape.cxx | 11 +++++------
chart2/source/view/main/OpenglShapeFactory.cxx | 5 ++---
chart2/source/view/main/ShapeFactory.cxx | 2 +-
7 files changed, 15 insertions(+), 18 deletions(-)
New commits:
commit 4613f593a83811e81520ae2f40f8c33870bdf2f6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 29 11:42:30 2014 +0100
Pass Reference<XPropertySet> by const&
Change-Id: I8d7307b2a2d78cab737a710de33fe31a0798c555
diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx b/chart2/source/view/inc/AbstractShapeFactory.hxx
index 9107bc2..1ff07c0 100644
--- a/chart2/source/view/inc/AbstractShapeFactory.hxx
+++ b/chart2/source/view/inc/AbstractShapeFactory.hxx
@@ -208,7 +208,7 @@ public:
const com::sun::star::awt::Point& rPosition,
com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::chart2::XFormattedString > >& xFormattedString,
const com::sun::star::uno::Reference<
- com::sun::star::beans::XPropertySet > xTextProperties,
+ com::sun::star::beans::XPropertySet > & xTextProperties,
double nRotation, const OUString& aName ) = 0;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
diff --git a/chart2/source/view/inc/DummyXShape.hxx b/chart2/source/view/inc/DummyXShape.hxx
index 66b5225..fc70cba 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -192,7 +192,7 @@ class DummyCube : public DummyXShape
{
public:
DummyCube(const drawing::Position3D &rPos, const drawing::Direction3D& rSize,
- const uno::Reference< beans::XPropertySet > xPropSet,
+ const uno::Reference< beans::XPropertySet > & xPropSet,
const tPropertyNameMap& rPropertyNameMap );
};
@@ -206,7 +206,7 @@ class DummyPyramid : public DummyXShape
{
public:
DummyPyramid(const drawing::Position3D& rPosition, const drawing::Direction3D& rSize,
- uno::Reference< beans::XPropertySet > xPropSet,
+ const uno::Reference< beans::XPropertySet > & xPropSet,
const tPropertyNameMap& rPropertyNameMap );
};
@@ -247,7 +247,7 @@ private:
class DummyStripe : public DummyXShape
{
public:
- DummyStripe(const Stripe& rStripe, uno::Reference< beans::XPropertySet > xPropSet,
+ DummyStripe(const Stripe& rStripe, const uno::Reference< beans::XPropertySet > & xPropSet,
const tPropertyNameMap& rPropertyNameMap );
private:
@@ -357,8 +357,7 @@ class DummyFormattedText : public DummyXShape
{
public:
DummyFormattedText(uno::Sequence< uno::Reference<
- chart2::XFormattedString > >& rFormattedString,
- uno::Reference< beans::XPropertySet > xPropSet);
+ chart2::XFormattedString > >& rFormattedString);
private:
com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
diff --git a/chart2/source/view/inc/OpenglShapeFactory.hxx b/chart2/source/view/inc/OpenglShapeFactory.hxx
index 03a4894..2735f8d 100644
--- a/chart2/source/view/inc/OpenglShapeFactory.hxx
+++ b/chart2/source/view/inc/OpenglShapeFactory.hxx
@@ -154,7 +154,7 @@ public:
const com::sun::star::awt::Point& rPosition,
com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::chart2::XFormattedString > >& xFormattedString,
const com::sun::star::uno::Reference<
- com::sun::star::beans::XPropertySet > xTextProperties,
+ com::sun::star::beans::XPropertySet > & xTextProperties,
double nRotation, const OUString& aName );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx
index 2551bcf..b4b3672 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -166,7 +166,7 @@ public:
const com::sun::star::awt::Point& rPosition,
com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::chart2::XFormattedString > >& xFormattedString,
const com::sun::star::uno::Reference<
- com::sun::star::beans::XPropertySet > xTextProperties,
+ com::sun::star::beans::XPropertySet > & xTextProperties,
double nRotation, const OUString& aName );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 5e5eb59..44da917 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -279,7 +279,7 @@ void DummyXShape::render()
namespace {
-void setProperties( uno::Reference< beans::XPropertySet > xPropSet, const tPropertyNameMap& rPropertyNameMap,
+void setProperties( const uno::Reference< beans::XPropertySet > & xPropSet, const tPropertyNameMap& rPropertyNameMap,
std::map<OUString, uno::Any>& rTargetMap)
{
tNameSequence aNames;
@@ -307,7 +307,7 @@ void setProperties( const tNameSequence& rNames, const tAnySequence& rValues,
}
DummyCube::DummyCube(const drawing::Position3D &rPos, const drawing::Direction3D& rSize,
- const uno::Reference< beans::XPropertySet > xPropSet,
+ const uno::Reference< beans::XPropertySet > & xPropSet,
const tPropertyNameMap& rPropertyNameMap )
{
setPosition(Position3DToAWTPoint(rPos));
@@ -322,7 +322,7 @@ DummyCylinder::DummyCylinder(const drawing::Position3D& rPos, const drawing::Dir
}
DummyPyramid::DummyPyramid(const drawing::Position3D& rPos, const drawing::Direction3D& rSize,
- uno::Reference< beans::XPropertySet > xPropSet,
+ const uno::Reference< beans::XPropertySet > & xPropSet,
const tPropertyNameMap& rPropertyNameMap)
{
setPosition(Position3DToAWTPoint(rPos));
@@ -385,7 +385,7 @@ DummyPieSegment::DummyPieSegment(
{
}
-DummyStripe::DummyStripe(const Stripe& rStripe, uno::Reference< beans::XPropertySet > xPropSet,
+DummyStripe::DummyStripe(const Stripe& rStripe, const uno::Reference< beans::XPropertySet > & xPropSet,
const tPropertyNameMap& rPropertyNameMap ):
maStripe(rStripe)
{
@@ -788,8 +788,7 @@ void DummyText::setPropertyValue( const OUString& rName, const uno::Any& rValue)
}
DummyFormattedText::DummyFormattedText(uno::Sequence< uno::Reference<
- chart2::XFormattedString > >& rFormattedString,
- uno::Reference< beans::XPropertySet >):
+ chart2::XFormattedString > >& rFormattedString):
maFormattedString(rFormattedString)
{
}
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx b/chart2/source/view/main/OpenglShapeFactory.cxx
index 062e987..c2ae65d 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -411,11 +411,10 @@ uno::Reference< drawing::XShape >
OpenglShapeFactory::createText( const uno::Reference< drawing::XShapes >& xTarget,
const awt::Size& rSize, const awt::Point& rPos,
uno::Sequence< uno::Reference< chart2::XFormattedString > >& rFormattedString,
- const uno::Reference< beans::XPropertySet > xPropSet,
+ const uno::Reference< beans::XPropertySet > &,
double, const OUString& rName)
{
- dummy::DummyFormattedText* pText = new dummy::DummyFormattedText( rFormattedString,
- xPropSet );
+ dummy::DummyFormattedText* pText = new dummy::DummyFormattedText( rFormattedString );
pText->setPosition(rPos);
pText->setSize(rSize);
pText->setName(rName);
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index 2f7afb8..99bd2fc 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -2138,7 +2138,7 @@ uno::Reference< drawing::XShape >
const awt::Point& rPos,
uno::Sequence< uno::Reference< chart2::XFormattedString > >& xFormattedString,
const uno::Reference<
- beans::XPropertySet > xTextProperties,
+ beans::XPropertySet > & xTextProperties,
double nRotation, const OUString& aName )
{
//create shape and add to page
More information about the Libreoffice-commits
mailing list