[Libreoffice-commits] core.git: 2 commits - chart2/inc chart2/source comphelper/source configmgr/qa drawinglayer/source
Noel Grandin
noel at peralex.com
Tue Dec 22 23:39:23 PST 2015
chart2/inc/ChartModel.hxx | 2
chart2/source/controller/accessibility/AccessibleChartView.cxx | 4 -
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx | 5 -
chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx | 4 -
chart2/source/controller/dialogs/DataBrowserModel.cxx | 1
chart2/source/controller/dialogs/DataBrowserModel.hxx | 2
chart2/source/controller/dialogs/dlg_ChartType.cxx | 2
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 2
chart2/source/controller/dialogs/dlg_DataSource.cxx | 2
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 1
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx | 1
chart2/source/controller/dialogs/tp_ChartType.cxx | 2
chart2/source/controller/dialogs/tp_ChartType.hxx | 4 -
chart2/source/controller/dialogs/tp_DataSource.cxx | 6 -
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 1
chart2/source/controller/dialogs/tp_RangeChooser.hxx | 5 -
chart2/source/controller/inc/AccessibleChartView.hxx | 6 -
chart2/source/controller/inc/ChartController.hxx | 2
chart2/source/controller/inc/RangeSelectionHelper.hxx | 4 -
chart2/source/controller/inc/dlg_DataSource.hxx | 4 -
chart2/source/controller/main/ChartController.cxx | 2
chart2/source/controller/main/ElementSelector.cxx | 7 -
chart2/source/controller/main/ElementSelector.hxx | 8 --
chart2/source/controller/sidebar/ChartAxisPanel.cxx | 1
chart2/source/controller/sidebar/ChartAxisPanel.hxx | 2
chart2/source/controller/sidebar/ChartElementsPanel.cxx | 1
chart2/source/controller/sidebar/ChartElementsPanel.hxx | 1
chart2/source/controller/sidebar/ChartErrorBarPanel.cxx | 1
chart2/source/controller/sidebar/ChartErrorBarPanel.hxx | 2
chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 1
chart2/source/controller/sidebar/ChartSeriesPanel.hxx | 2
chart2/source/inc/DataSourceHelper.hxx | 3
chart2/source/inc/ErrorBar.hxx | 1
chart2/source/inc/LabeledDataSequence.hxx | 5 -
chart2/source/inc/Scaling.hxx | 32 ++------
chart2/source/tools/DataSourceHelper.cxx | 5 -
chart2/source/tools/LabeledDataSequence.cxx | 7 -
chart2/source/tools/RegressionCurveModel.cxx | 2
chart2/source/tools/RegressionEquation.cxx | 12 +--
chart2/source/tools/RegressionEquation.hxx | 7 -
chart2/source/tools/Scaling.cxx | 36 ++++------
chart2/source/view/charttypes/GL3DBarChart.cxx | 2
chart2/source/view/charttypes/NetChart.hxx | 2
chart2/source/view/main/DummyXShape.cxx | 9 --
chart2/source/view/main/DummyXShape.hxx | 11 ---
chart2/source/view/main/OpenglShapeFactory.cxx | 9 +-
comphelper/source/eventattachermgr/eventattachermgr.cxx | 2
comphelper/source/misc/instancelocker.cxx | 9 +-
comphelper/source/misc/instancelocker.hxx | 3
configmgr/qa/unit/test.cxx | 1
drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx | 7 +
53 files changed, 72 insertions(+), 185 deletions(-)
New commits:
commit 85e9b0f3ea017612d44a7abd7e2f854e16b6a676
Author: Noel Grandin <noel at peralex.com>
Date: Wed Dec 23 09:36:18 2015 +0200
tdf#96541 - dialog "About LibreOfficeDev" has lost its logo
regression from 58d8d8a "tdf#69977: uno::Sequence is expensive"
Change-Id: I792b5971a7a3a9532cccb36add5b558c68e397ef
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index f4adb26..202a9bc 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/supportsservice.hxx>
+#include <comphelper/sequence.hxx>
#include <com/sun/star/xml/sax/XParser.hpp>
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <comphelper/processfactory.hxx>
@@ -112,7 +113,7 @@ namespace drawinglayer
}
uno::Reference< rendering::XBitmap > XPrimitive2DRenderer::rasterize(
- const uno::Sequence< uno::Reference< graphic::XPrimitive2D > >& Primitive2DSequence,
+ const uno::Sequence< uno::Reference< graphic::XPrimitive2D > >& aPrimitive2DSequence,
const uno::Sequence< beans::PropertyValue >& aViewInformationSequence,
::sal_uInt32 DPI_X,
::sal_uInt32 DPI_Y,
@@ -121,7 +122,7 @@ namespace drawinglayer
{
uno::Reference< rendering::XBitmap > XBitmap;
- if(Primitive2DSequence.hasElements())
+ if(aPrimitive2DSequence.hasElements())
{
const basegfx::B2DRange aRange(Range.X1, Range.Y1, Range.X2, Range.Y2);
const double fWidth(aRange.getWidth());
@@ -161,7 +162,7 @@ namespace drawinglayer
const primitive2d::Primitive2DReference xEmbedRef(
new primitive2d::TransformPrimitive2D(
aEmbedding,
- primitive2d::Primitive2DContainer()));
+ comphelper::sequenceToContainer<primitive2d::Primitive2DContainer>(aPrimitive2DSequence)));
const primitive2d::Primitive2DContainer xEmbedSeq { xEmbedRef };
BitmapEx aBitmapEx(
commit c5458af9051c7c3579a381592a14af725691f88c
Author: Noel Grandin <noel at peralex.com>
Date: Wed Dec 23 09:30:48 2015 +0200
loplugin:unusedfields in chart2
Change-Id: I8203f84ad8b138932c990032e17ea5d2daf384bb
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index a698130..41c6f33 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -171,8 +171,6 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xXMLNamespaceMap;
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyListener;
-
private:
//private methods
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index d147357..73e5559 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -49,14 +49,12 @@ using osl::MutexGuard;
namespace chart
{
-AccessibleChartView::AccessibleChartView(
- const Reference< uno::XComponentContext >& xContext, SdrView* pView ) :
+AccessibleChartView::AccessibleChartView(SdrView* pView ) :
impl::AccessibleChartView_Base(
AccessibleElementInfo(), // empty for now
true, // has children
true // always transparent
),
- m_xContext( xContext ),
m_pSdrView( pView ),
m_pViewForwarder( nullptr )
{
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 541c722..aa09857 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -669,7 +669,7 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties()
aWrappedProperties.push_back( new WrappedDirectStateProperty("TryStaggeringFirst","TryStaggeringFirst") );
aWrappedProperties.push_back( new WrappedDirectStateProperty("TextBreak","TextBreak") );
aWrappedProperties.push_back( new WrappedNumberFormatProperty(m_spChart2ModelContact) );
- aWrappedProperties.push_back( new WrappedLinkNumberFormatProperty(m_spChart2ModelContact) );
+ aWrappedProperties.push_back( new WrappedLinkNumberFormatProperty );
aWrappedProperties.push_back( new WrappedProperty("StackedText","StackCharacters") );
aWrappedProperties.push_back( new WrappedDirectStateProperty("CrossoverPosition","CrossoverPosition") );
{
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index c65defc..f775bc9 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -777,7 +777,7 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope
aWrappedProperties.push_back( new WrappedAttachedAxisProperty( m_spChart2ModelContact ) );
aWrappedProperties.push_back( new WrappedNumberFormatProperty(m_spChart2ModelContact) );
- aWrappedProperties.push_back( new WrappedLinkNumberFormatProperty(m_spChart2ModelContact) );
+ aWrappedProperties.push_back( new WrappedLinkNumberFormatProperty );
}
WrappedSymbolProperties::addWrappedPropertiesForSeries( aWrappedProperties, m_spChart2ModelContact );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index 1ddeafd..058ed68 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -83,9 +83,8 @@ Any WrappedNumberFormatProperty::getPropertyDefault( const Reference< beans::XPr
return uno::makeAny( sal_Int32( 0 ) );
}
-WrappedLinkNumberFormatProperty::WrappedLinkNumberFormatProperty( const std::shared_ptr<Chart2ModelContact>& pChart2ModelContact ) :
- WrappedDirectStateProperty(CHART_UNONAME_LINK_TO_SRC_NUMFMT, CHART_UNONAME_LINK_TO_SRC_NUMFMT),
- m_pChart2ModelContact(pChart2ModelContact)
+WrappedLinkNumberFormatProperty::WrappedLinkNumberFormatProperty() :
+ WrappedDirectStateProperty(CHART_UNONAME_LINK_TO_SRC_NUMFMT, CHART_UNONAME_LINK_TO_SRC_NUMFMT)
{
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
index cf5c8b3..2e75025 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
@@ -54,7 +54,7 @@ private:
class WrappedLinkNumberFormatProperty : public WrappedDirectStateProperty
{
public:
- explicit WrappedLinkNumberFormatProperty( const std::shared_ptr<Chart2ModelContact>& pChart2ModelContact );
+ explicit WrappedLinkNumberFormatProperty();
virtual ~WrappedLinkNumberFormatProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
@@ -66,8 +66,6 @@ public:
virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override;
-private:
- std::shared_ptr<Chart2ModelContact> m_pChart2ModelContact;
};
} //namespace wrapper
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index fa7324b..599dcc3 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -260,7 +260,6 @@ DataBrowserModel::DataBrowserModel(
const Reference< chart2::XChartDocument > & xChartDoc,
const Reference< uno::XComponentContext > & xContext ) :
m_xChartDocument( xChartDoc ),
- m_xContext( xContext ),
m_apDialogModel( new DialogModel( xChartDoc, xContext ))
{
updateFromModel();
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx
index d17adf3..0ae8321 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.hxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx
@@ -155,8 +155,6 @@ private:
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > m_xChartDocument;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > m_xContext;
std::unique_ptr< DialogModel > m_apDialogModel;
struct tDataColumn;
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 2591ea7..4549b34 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -43,10 +43,8 @@ ChartTypeDialog::ChartTypeDialog( vcl::Window* pParent
, m_xCC( xContext )
{
m_pChartTypeTabPage = VclPtr<ChartTypeTabPage>::Create(
-
get_content_area(),
uno::Reference<XChartDocument>::query(m_xChartModel),
- m_xCC,
true/*live update*/,
false/*don't show title description*/);
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 8730c46..6915191 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -117,7 +117,7 @@ VclPtr<TabPage> CreationWizard::createPage(WizardState nState)
case STATE_CHARTTYPE:
{
m_aTimerTriggeredControllerLock.startTimer();
- VclPtrInstance<ChartTypeTabPage> pChartTypeTabPage(this,m_xChartModel,m_xCC,bDoLiveUpdate);
+ VclPtrInstance<ChartTypeTabPage> pChartTypeTabPage(this,m_xChartModel,bDoLiveUpdate);
pRet = pChartTypeTabPage;
m_pTemplateProvider = pChartTypeTabPage;
if (m_pDialogModel)
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 78e0b58..826faad 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -129,8 +129,6 @@ DataSourceDialog::DataSourceDialog(vcl::Window * pParent,
const Reference< uno::XComponentContext > & xContext)
: TabDialog(pParent, "DataRangeDialog",
"modules/schart/ui/datarangedialog.ui")
- , m_xChartDocument(xChartDocument)
- , m_xContext(xContext)
, m_apDocTemplateProvider(new DocumentChartTypeTemplateProvider(xChartDocument))
, m_apDialogModel(new DialogModel(xChartDocument, xContext))
, m_pTabControl(VclPtr<DataSourceTabControl>::Create(get_content_area()))
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 5e9ea4c..4ced5b8 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -224,7 +224,6 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( vcl::Window*
, m_xSceneProperties( xSceneProperties )
, m_aTimerTriggeredControllerLock( xChartModel )
, m_bInCommitToModel( false )
- , m_aModelChangeListener( LINK( this, ThreeD_SceneIllumination_TabPage, fillControlsFromModel ) )
, m_xChartModel( xChartModel )
{
get(m_pBtn_Light1, "BTN_LIGHT_1");
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
index 73aaf0a..1adad13 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
@@ -99,7 +99,6 @@ private:
bool m_bInCommitToModel;
- ModifyListenerCallBack m_aModelChangeListener;
::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > m_xChartModel;
};
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 1d9a724..b5682d5 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -681,7 +681,6 @@ IMPL_LINK_NOARG_TYPED(GeometryResourceGroup, GeometryChangeHdl, ListBox&, void)
ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent
, const uno::Reference< XChartDocument >& xChartModel
- , const uno::Reference< uno::XComponentContext >& xContext
, bool bDoLiveUpdate, bool bShowDescription)
: OWizardPage(pParent, "tp_ChartType",
"modules/schart/ui/tp_ChartType.ui")
@@ -692,7 +691,6 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent
, m_pSortByXValuesResourceGroup( new SortByXValuesResourceGroup( this ) )
, m_pGL3DResourceGroup(new GL3DResourceGroup(this))
, m_xChartModel( xChartModel )
- , m_xCC( xContext )
, m_aChartTypeDialogControllerList(0)
, m_pCurrentMainType(nullptr)
, m_nChangingCalls(0)
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index f1cedd1..62a6422 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -51,8 +51,6 @@ public:
ChartTypeTabPage( vcl::Window* pParent
, const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument >& xChartModel
- , const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext >& xContext
, bool bDoLiveUpdate, bool bShowDescription = true );
virtual ~ChartTypeTabPage();
virtual void dispose() override;
@@ -91,8 +89,6 @@ protected:
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > m_xChartModel;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > m_xCC;
::std::vector< ChartTypeDialogController* > m_aChartTypeDialogControllerList;
ChartTypeDialogController* m_pCurrentMainType;
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index aece134..b25390c 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -837,7 +837,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
// create or change categories
if( !xLabeledSeq.is())
{
- xLabeledSeq.set( DataSourceHelper::createLabeledDataSequence( Reference< uno::XComponentContext >(nullptr)));
+ xLabeledSeq.set( DataSourceHelper::createLabeledDataSequence() );
m_rDialogModel.setCategories( xLabeledSeq );
}
try
@@ -892,7 +892,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
if( ! xLabeledSeq.is())
{
// no corresponding labeled data sequence for label found
- xLabeledSeq.set( DataSourceHelper::createLabeledDataSequence( Reference< uno::XComponentContext >(nullptr)));
+ xLabeledSeq.set( DataSourceHelper::createLabeledDataSequence() );
lcl_addLSequenceToDataSource( xLabeledSeq, xSource );
}
}
@@ -956,7 +956,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
xLabeledSeq.set( lcl_findLSequenceWithOnlyLabel( xSource ));
if( ! xLabeledSeq.is())
{
- xLabeledSeq.set( DataSourceHelper::createLabeledDataSequence( Reference< uno::XComponentContext >(nullptr)));
+ xLabeledSeq.set( DataSourceHelper::createLabeledDataSequence() );
lcl_addLSequenceToDataSource( xLabeledSeq, xSource );
}
}
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 645ec8a..2aa751d 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -72,7 +72,6 @@ RangeChooserTabPage::RangeChooserTabPage( vcl::Window* pParent
,"modules/schart/ui/tp_RangeChooser.ui")
, m_nChangingControlCalls(0)
, m_bIsDirty(false)
- , m_xDataProvider( nullptr )
, m_aLastValidRangeString()
, m_xCurrentChartTypeTemplate(nullptr)
, m_pTemplateProvider(pTemplateProvider)
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index cd0804f..3979ec5 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -101,11 +101,6 @@ protected: //member
sal_Int32 m_nChangingControlCalls;
bool m_bIsDirty;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XChartDocument > m_xChartDocument;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::data::XDataProvider > m_xDataProvider;
-
OUString m_aLastValidRangeString;
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartTypeTemplate > m_xCurrentChartTypeTemplate;
diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx
index 235c22c..8037184 100644
--- a/chart2/source/controller/inc/AccessibleChartView.hxx
+++ b/chart2/source/controller/inc/AccessibleChartView.hxx
@@ -57,9 +57,7 @@ class AccessibleChartView :
public impl::AccessibleChartView_Base
{
public:
- AccessibleChartView(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext >& xContext, SdrView* pView );
+ AccessibleChartView(SdrView* pView );
virtual ~AccessibleChartView();
// ____ WeakComponentHelper (called from XComponent::dispose()) ____
@@ -115,8 +113,6 @@ private: // methods
ExplicitValueProvider* getExplicitValueProvider();
private: // members
- ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext> m_xContext;
::com::sun::star::uno::WeakReference<
::com::sun::star::view::XSelectionSupplier > m_xSelectionSupplier;
::com::sun::star::uno::WeakReference<
diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx
index ae1472c..5022573 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -485,8 +485,6 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager;
std::unique_ptr< UndoGuard > m_pTextActionUndoGuard;
- /// needed for dispatching URLs in FeatureStateEvents
- mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer;
std::unique_ptr< ::svt::AcceleratorExecute > m_apAccelExecute;
diff --git a/chart2/source/controller/inc/RangeSelectionHelper.hxx b/chart2/source/controller/inc/RangeSelectionHelper.hxx
index 7d229e3..cad411f 100644
--- a/chart2/source/controller/inc/RangeSelectionHelper.hxx
+++ b/chart2/source/controller/inc/RangeSelectionHelper.hxx
@@ -65,10 +65,6 @@ private:
m_xChartDocument;
::com::sun::star::uno::Reference<
- ::com::sun::star::sheet::XCellRangesAccess >
- m_xCellRangesAccess;
-
- ::com::sun::star::uno::Reference<
::com::sun::star::sheet::XRangeSelectionListener >
m_xRangeSelectionListener;
};
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx
index 665867b..7789d03 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -60,10 +60,6 @@ public:
virtual void setValidPage( TabPage * pTabPage ) override;
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >
- m_xChartDocument;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
- m_xContext;
::std::unique_ptr< ChartTypeTemplateProvider > m_apDocTemplateProvider;
::std::unique_ptr< DialogModel > m_apDialogModel;
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index e969b51..b781943 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1521,7 +1521,7 @@ DrawViewWrapper* ChartController::GetDrawViewWrapper()
uno::Reference< XAccessible > ChartController::CreateAccessible()
{
- uno::Reference< XAccessible > xResult = new AccessibleChartView( m_xCC, GetDrawViewWrapper() );
+ uno::Reference< XAccessible > xResult = new AccessibleChartView( GetDrawViewWrapper() );
impl_initializeAccessible( uno::Reference< lang::XInitialization >( xResult, uno::UNO_QUERY ) );
return xResult;
}
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 4d6e114..772922b 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -271,8 +271,7 @@ Sequence< OUString > ElementSelectorToolbarController::getSupportedServiceNames_
Sequence<OUString> aServices { "com.sun.star.frame.ToolbarController" };
return aServices;
}
-ElementSelectorToolbarController::ElementSelectorToolbarController( const uno::Reference< uno::XComponentContext > & xContext )
- : m_xCC( xContext )
+ElementSelectorToolbarController::ElementSelectorToolbarController()
{
}
ElementSelectorToolbarController::~ElementSelectorToolbarController()
@@ -336,10 +335,10 @@ uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::create
} // chart2
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_chart_ElementSelectorToolbarController_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart_ElementSelectorToolbarController_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new chart::ElementSelectorToolbarController(context));
+ return cppu::acquire(new chart::ElementSelectorToolbarController );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx
index 73cdfcd..e49e9ee 100644
--- a/chart2/source/controller/main/ElementSelector.hxx
+++ b/chart2/source/controller/main/ElementSelector.hxx
@@ -70,8 +70,7 @@ class ElementSelectorToolbarController : public ::svt::ToolboxController
, ElementSelectorToolbarController_BASE
{
public:
- explicit ElementSelectorToolbarController( ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > const & xContext );
+ explicit ElementSelectorToolbarController();
virtual ~ElementSelectorToolbarController();
// XServiceInfo
@@ -98,11 +97,6 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
private:
- //no default constructor
- ElementSelectorToolbarController(){}
-
-private:
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC;
VclPtr< SelectorListBox > m_apSelectorListBox;
};
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index 58fa4bb..4bcdcb9 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -215,7 +215,6 @@ ChartAxisPanel::ChartAxisPanel(
const css::uno::Reference<css::frame::XFrame>& rxFrame,
ChartController* pController)
: PanelLayout(pParent, "ChartAxisPanel", "modules/schart/ui/sidebaraxis.ui", rxFrame),
- mxFrame(rxFrame),
mxModel(pController->getModel()),
mxModifyListener(new ChartSidebarModifyListener(this)),
mxSelectionListener(new ChartSidebarSelectionListener(this, OBJECTTYPE_AXIS)),
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
index 3ea3618..d84f005 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
@@ -84,8 +84,6 @@ private:
VclPtr<MetricField> mpNFRotation;
- css::uno::Reference<css::frame::XFrame> mxFrame;
-
css::uno::Reference<css::frame::XModel> mxModel;
css::uno::Reference<css::util::XModifyListener> mxModifyListener;
css::uno::Reference<css::view::XSelectionChangeListener> mxSelectionListener;
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 223f5eb..3c914ce 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -276,7 +276,6 @@ ChartElementsPanel::ChartElementsPanel(
const css::uno::Reference<css::frame::XFrame>& rxFrame,
ChartController* pController)
: PanelLayout(pParent, "ChartElementsPanel", "modules/schart/ui/sidebarelements.ui", rxFrame),
- mxFrame(rxFrame),
maContext(),
mxModel(pController->getModel()),
mxListener(new ChartSidebarModifyListener(this)),
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
index fde3fa8..e336c82 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
@@ -98,7 +98,6 @@ private:
VclPtr<ListBox> mpLBLegendPosition;
VclPtr<VclHBox> mpBoxLegend;
- css::uno::Reference<css::frame::XFrame> mxFrame;
::sfx2::sidebar::EnumContext maContext;
css::uno::Reference<css::frame::XModel> mxModel;
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
index 77a497c..03ed6f9 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
@@ -248,7 +248,6 @@ ChartErrorBarPanel::ChartErrorBarPanel(
const css::uno::Reference<css::frame::XFrame>& rxFrame,
ChartController* pController)
: PanelLayout(pParent, "ChartErrorBarPanel", "modules/schart/ui/sidebarerrorbar.ui", rxFrame),
- mxFrame(rxFrame),
mxModel(pController->getModel()),
mxListener(new ChartSidebarModifyListener(this)),
mbModelValid(true)
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
index ed7a0e6..6beb6ae 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
@@ -80,8 +80,6 @@ private:
VclPtr<NumericField> mpMFPos;
VclPtr<NumericField> mpMFNeg;
- css::uno::Reference<css::frame::XFrame> mxFrame;
-
css::uno::Reference<css::frame::XModel> mxModel;
css::uno::Reference<css::util::XModifyListener> mxListener;
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index e88a22c..e82f716 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -289,7 +289,6 @@ ChartSeriesPanel::ChartSeriesPanel(
const css::uno::Reference<css::frame::XFrame>& rxFrame,
ChartController* pController)
: PanelLayout(pParent, "ChartSeriesPanel", "modules/schart/ui/sidebarseries.ui", rxFrame),
- mxFrame(rxFrame),
mxModel(pController->getModel()),
mxListener(new ChartSidebarModifyListener(this)),
mxSelectionListener(new ChartSidebarSelectionListener(this, OBJECTTYPE_DATA_SERIES)),
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
index 2afb077..72928b7 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
@@ -98,8 +98,6 @@ private:
VclPtr<FixedText> mpFTSeriesName;
VclPtr<FixedText> mpFTSeriesTemplate;
- css::uno::Reference<css::frame::XFrame> mxFrame;
-
css::uno::Reference<css::frame::XModel> mxModel;
css::uno::Reference<css::util::XModifyListener> mxListener;
css::uno::Reference<css::view::XSelectionChangeListener> mxSelectionListener;
diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx
index 8c698a2..c58fa25 100644
--- a/chart2/source/inc/DataSourceHelper.hxx
+++ b/chart2/source/inc/DataSourceHelper.hxx
@@ -64,8 +64,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xValues );
static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
- createLabeledDataSequence(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
+ createLabeledDataSequence();
static ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > createArguments(
diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx
index c94d17e..9f8a187 100644
--- a/chart2/source/inc/ErrorBar.hxx
+++ b/chart2/source/inc/ErrorBar.hxx
@@ -159,7 +159,6 @@ private:
tDataSequenceContainer m_aDataSequences;
::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent;
};
} // namespace chart
diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx
index 1af1c06..3a641f1 100644
--- a/chart2/source/inc/LabeledDataSequence.hxx
+++ b/chart2/source/inc/LabeledDataSequence.hxx
@@ -45,9 +45,7 @@ class LabeledDataSequence :
public impl::LabeledDataSequence_Base
{
public:
- explicit LabeledDataSequence(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > & xContext );
+ explicit LabeledDataSequence();
explicit LabeledDataSequence(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataSequence > & rValues );
@@ -99,7 +97,6 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > m_xData;
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > m_xLabel;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder;
};
diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx
index 4f7cbaa..17ebec6 100644
--- a/chart2/source/inc/Scaling.hxx
+++ b/chart2/source/inc/Scaling.hxx
@@ -40,10 +40,8 @@ class LogarithmicScaling :
{
public:
/// base is 10.0
- explicit LogarithmicScaling(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > & xContext );
- LogarithmicScaling( double fBase = 10.0 );
+ explicit LogarithmicScaling();
+ LogarithmicScaling( double fBase );
virtual ~LogarithmicScaling();
/// declare XServiceInfo methods
@@ -72,8 +70,6 @@ public:
private:
const double m_fBase;
const double m_fLogOfBase;
-
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
};
class ExponentialScaling :
@@ -85,10 +81,8 @@ class ExponentialScaling :
{
public:
/// base is 10.0
- explicit ExponentialScaling(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > & xContext );
- explicit ExponentialScaling( double fBase = 10.0 );
+ explicit ExponentialScaling();
+ explicit ExponentialScaling( double fBase );
virtual ~ExponentialScaling();
/// declare XServiceInfo methods
@@ -117,8 +111,6 @@ public:
private:
const double m_fBase;
-
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
};
class LinearScaling : public ::cppu::WeakImplHelper<
@@ -129,11 +121,9 @@ class LinearScaling : public ::cppu::WeakImplHelper<
{
public:
/// y(x) = x
- explicit LinearScaling(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > & xContext );
+ explicit LinearScaling();
/// y(x) = fSlope * x + fOffset
- LinearScaling( double fSlope = 1.0, double fOffset = 0.0 );
+ LinearScaling( double fSlope, double fOffset );
virtual ~LinearScaling();
/// declare XServiceInfo methods
@@ -162,8 +152,6 @@ public:
private:
const double m_fSlope;
const double m_fOffset;
-
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
};
class PowerScaling : public ::cppu::WeakImplHelper<
@@ -174,10 +162,8 @@ class PowerScaling : public ::cppu::WeakImplHelper<
{
public:
/// exponent 10.0
- explicit PowerScaling(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > & xContext );
- explicit PowerScaling( double fExponent = 10.0 );
+ explicit PowerScaling();
+ explicit PowerScaling( double fExponent );
virtual ~PowerScaling();
/// declare XServiceInfo methods
@@ -206,8 +192,6 @@ public:
private:
const double m_fExponent;
-
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
};
} //namespace chart
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 3413e1a..84cf5f7 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -144,10 +144,9 @@ Reference< chart2::data::XLabeledDataSequence > DataSourceHelper::createLabeledD
return new ::chart::LabeledDataSequence( xValues );
}
-Reference< chart2::data::XLabeledDataSequence > DataSourceHelper::createLabeledDataSequence(
- const Reference< uno::XComponentContext >& xContext )
+Reference< chart2::data::XLabeledDataSequence > DataSourceHelper::createLabeledDataSequence()
{
- return new ::chart::LabeledDataSequence( xContext );
+ return new ::chart::LabeledDataSequence;
}
uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments(
diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx
index 7acb72b..a407008 100644
--- a/chart2/source/tools/LabeledDataSequence.cxx
+++ b/chart2/source/tools/LabeledDataSequence.cxx
@@ -30,8 +30,7 @@ using ::com::sun::star::uno::Sequence;
namespace chart
{
-LabeledDataSequence::LabeledDataSequence( const Reference< uno::XComponentContext > & xContext ) :
- m_xContext( xContext ),
+LabeledDataSequence::LabeledDataSequence() :
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
{}
@@ -183,10 +182,10 @@ css::uno::Sequence< OUString > SAL_CALL LabeledDataSequence::getSupportedService
} // namespace chart
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_chart2_LabeledDataSequence_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart2_LabeledDataSequence_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ::chart::LabeledDataSequence(context));
+ return cppu::acquire(new ::chart::LabeledDataSequence );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index dfafae4..62489fe 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -190,7 +190,7 @@ RegressionCurveModel::RegressionCurveModel(
m_xContext( xContext ),
m_eRegressionCurveType( eCurveType ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()),
- m_xEquationProperties( new RegressionEquation( xContext ))
+ m_xEquationProperties( new RegressionEquation )
{
// set 0 line width (default) hard, so that it is always written to XML,
// because the old implementation uses different defaults
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index 5d3633c..4804c0c3 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -180,18 +180,16 @@ struct StaticRegressionEquationInfo : public rtl::StaticAggregate< uno::Referenc
namespace chart
{
-RegressionEquation::RegressionEquation( const Reference< uno::XComponentContext > & xContext ) :
+RegressionEquation::RegressionEquation() :
::property::OPropertySet( m_aMutex ),
- m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder()),
- m_xContext( xContext )
+ m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder())
{}
RegressionEquation::RegressionEquation( const RegressionEquation & rOther ) :
MutexContainer(),
impl::RegressionEquation_Base(),
::property::OPropertySet( rOther, m_aMutex ),
- m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder()),
- m_xContext( nullptr )
+ m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder())
{}
RegressionEquation::~RegressionEquation()
@@ -346,10 +344,10 @@ IMPLEMENT_FORWARD_XINTERFACE2( RegressionEquation, RegressionEquation_Base, ::pr
} // namespace chart
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_chart2_RegressionEquation_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart2_RegressionEquation_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ::chart::RegressionEquation(context));
+ return cppu::acquire(new ::chart::RegressionEquation);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx
index 054633c..d996f24 100644
--- a/chart2/source/tools/RegressionEquation.hxx
+++ b/chart2/source/tools/RegressionEquation.hxx
@@ -53,9 +53,7 @@ class RegressionEquation :
public ::property::OPropertySet
{
public:
- explicit RegressionEquation(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > & xContext );
+ explicit RegressionEquation();
virtual ~RegressionEquation();
virtual OUString SAL_CALL
@@ -137,9 +135,6 @@ private:
::com::sun::star::chart2::XFormattedString > > m_aStrings;
::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext >
- m_xContext;
};
} // namespace chart
diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx
index d61b359..cc5af4d 100644
--- a/chart2/source/tools/Scaling.cxx
+++ b/chart2/source/tools/Scaling.cxx
@@ -37,10 +37,9 @@ namespace chart
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-LogarithmicScaling::LogarithmicScaling( const uno::Reference< uno::XComponentContext > & xContext ) :
+LogarithmicScaling::LogarithmicScaling() :
m_fBase( 10.0 ),
- m_fLogOfBase( log( 10.0 ) ),
- m_xContext( xContext )
+ m_fLogOfBase( log( 10.0 ) )
{
}
@@ -107,9 +106,8 @@ css::uno::Sequence< OUString > SAL_CALL LogarithmicScaling::getSupportedServiceN
return getSupportedServiceNames_Static();
}
-ExponentialScaling::ExponentialScaling( const uno::Reference< uno::XComponentContext > & xContext ) :
- m_fBase( 10.0 ),
- m_xContext( xContext )
+ExponentialScaling::ExponentialScaling() :
+ m_fBase( 10.0 )
{
}
@@ -175,10 +173,9 @@ css::uno::Sequence< OUString > SAL_CALL ExponentialScaling::getSupportedServiceN
return getSupportedServiceNames_Static();
}
-LinearScaling::LinearScaling( const uno::Reference< uno::XComponentContext > & xContext ) :
+LinearScaling::LinearScaling() :
m_fSlope( 1.0 ),
- m_fOffset( 0.0 ),
- m_xContext( xContext )
+ m_fOffset( 0.0 )
{}
LinearScaling::LinearScaling( double fSlope, double fOffset ) :
@@ -247,9 +244,8 @@ css::uno::Sequence< OUString > SAL_CALL LinearScaling::getSupportedServiceNames(
return getSupportedServiceNames_Static();
}
-PowerScaling::PowerScaling( const uno::Reference< uno::XComponentContext > & xContext ) :
- m_fExponent( 10.0 ),
- m_xContext( xContext )
+PowerScaling::PowerScaling() :
+ m_fExponent( 10.0 )
{}
PowerScaling::PowerScaling( double fExponent ) :
@@ -321,31 +317,31 @@ css::uno::Sequence< OUString > SAL_CALL PowerScaling::getSupportedServiceNames()
} //namespace chart
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_chart2_LinearScaling_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_chart2_LinearScaling_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new chart::LinearScaling(context));
+ return cppu::acquire(new chart::LinearScaling );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_chart2_ExponentialScaling_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_chart2_ExponentialScaling_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new chart::ExponentialScaling(context));
+ return cppu::acquire(new chart::ExponentialScaling );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_chart2_LogarithmicScaling_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_chart2_LogarithmicScaling_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new chart::LogarithmicScaling(context));
+ return cppu::acquire(new chart::LogarithmicScaling );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_chart2_PowerScaling_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_chart2_PowerScaling_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new chart::PowerScaling(context));
+ return cppu::acquire(new chart::PowerScaling );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 4f92b2a..ddbe39a 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -220,8 +220,6 @@ private:
void ProcessClickFlyBack();
void AutoMoveToBar();
private:
- glm::vec3 maStartPos;
- glm::vec3 maEndPos;
bool mbAutoFlyExecuting;
bool mbExecuting;
bool mbNeedFlyBack;
diff --git a/chart2/source/view/charttypes/NetChart.hxx b/chart2/source/view/charttypes/NetChart.hxx
index 68909ac..298c91e 100644
--- a/chart2/source/view/charttypes/NetChart.hxx
+++ b/chart2/source/view/charttypes/NetChart.hxx
@@ -73,8 +73,6 @@ private: //member
::com::sun::star::drawing::XShapes > m_xSeriesTarget;
::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes > m_xTextTarget;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShapes > m_xRegressionCurveEquationTarget;
};
} //namespace chart
#endif
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index efadcbc..fee3e34 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -453,9 +453,8 @@ void DummyPieSegment2D::render()
}
-DummyStripe::DummyStripe(const Stripe& rStripe, const uno::Reference< beans::XPropertySet > & xPropSet,
- const tPropertyNameMap& rPropertyNameMap ):
- maStripe(rStripe)
+DummyStripe::DummyStripe(const uno::Reference< beans::XPropertySet > & xPropSet,
+ const tPropertyNameMap& rPropertyNameMap )
{
setProperties(xPropSet, rPropertyNameMap, maProperties);
}
@@ -997,9 +996,7 @@ void SAL_CALL DummyGroup2D::setSize( const awt::Size& )
SAL_WARN("chart2.opengl", "set size on group shape");
}
-DummyGraphic2D::DummyGraphic2D(const drawing::Position3D& rPos, const drawing::Direction3D& rSize,
- const uno::Reference< graphic::XGraphic >& rGraphic ):
- mxGraphic(rGraphic)
+DummyGraphic2D::DummyGraphic2D(const drawing::Position3D& rPos, const drawing::Direction3D& rSize)
{
setPosition(Position3DToAWTPoint(rPos));
setSize(Direction3DToAWTSize(rSize));
diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx
index 79d31c5..993b96e 100644
--- a/chart2/source/view/main/DummyXShape.hxx
+++ b/chart2/source/view/main/DummyXShape.hxx
@@ -231,11 +231,8 @@ class DummyPieSegment : public DummyXShape {};
class DummyStripe : public DummyXShape
{
public:
- DummyStripe(const Stripe& rStripe, const css::uno::Reference< css::beans::XPropertySet > & xPropSet,
+ DummyStripe(const css::uno::Reference< css::beans::XPropertySet > & xPropSet,
const tPropertyNameMap& rPropertyNameMap );
-
-private:
- Stripe maStripe;
};
class DummyArea3D : public DummyXShape {};
@@ -265,11 +262,7 @@ private:
class DummyGraphic2D : public DummyXShape
{
public:
- DummyGraphic2D(const css::drawing::Position3D& rPosition, const css::drawing::Direction3D& rSize,
- const css::uno::Reference< css::graphic::XGraphic >& rGraphic );
-
-private:
- css::uno::Reference< css::graphic::XGraphic > mxGraphic;
+ DummyGraphic2D(const css::drawing::Position3D& rPosition, const css::drawing::Direction3D& rSize );
};
class DummyCircle : public DummyXShape
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx b/chart2/source/view/main/OpenglShapeFactory.cxx
index 244855e..964adb9 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -217,14 +217,14 @@ uno::Reference< drawing::XShape >
uno::Reference< drawing::XShape >
OpenglShapeFactory::createStripe( const uno::Reference< drawing::XShapes >& xTarget
- , const Stripe& rStripe
+ , const Stripe&
, const uno::Reference< beans::XPropertySet >& xSourceProp
, const tPropertyNameMap& rPropertyNameMap
, bool
, short
, bool )
{
- dummy::DummyStripe* pStripe = new dummy::DummyStripe(rStripe,
+ dummy::DummyStripe* pStripe = new dummy::DummyStripe(
xSourceProp, rPropertyNameMap);
xTarget->add(pStripe);
return pStripe;
@@ -269,10 +269,9 @@ uno::Reference< drawing::XShape >
const uno::Reference< drawing::XShapes >& xTarget
, const drawing::Position3D& rPosition
, const drawing::Direction3D& rSize
- , const uno::Reference< graphic::XGraphic >& xGraphic )
+ , const uno::Reference< graphic::XGraphic >& )
{
- dummy::DummyGraphic2D* pGraphic = new dummy::DummyGraphic2D(rPosition, rSize,
- xGraphic);
+ dummy::DummyGraphic2D* pGraphic = new dummy::DummyGraphic2D(rPosition, rSize);
xTarget->add(pGraphic);
return pGraphic;
}
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index d782b74..0717ea1 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -87,7 +87,6 @@ class ImplEventAttacherManager
Reference< XEventAttacher2 > xAttacher;
Reference< XComponentContext > mxContext;
Reference< XIdlReflection > mxCoreReflection;
- Reference< XIntrospection > mxIntrospection;
Reference< XTypeConverter > xConverter;
sal_Int16 nVersion;
public:
@@ -361,7 +360,6 @@ ImplEventAttacherManager::ImplEventAttacherManager( const Reference< XIntrospect
const Reference< XComponentContext >& rContext )
: aScriptListeners( aLock )
, mxContext( rContext )
- , mxIntrospection( rIntrospection )
, nVersion(0)
{
if ( rContext.is() )
diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx
index 145531d..0348c3b 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.cxx
@@ -40,9 +40,8 @@ using namespace ::com::sun::star;
-OInstanceLocker::OInstanceLocker( const uno::Reference< uno::XComponentContext >& xContext )
-: m_xContext( xContext )
-, m_pLockListener( nullptr )
+OInstanceLocker::OInstanceLocker()
+: m_pLockListener( nullptr )
, m_pListenersContainer( nullptr )
, m_bDisposed( false )
, m_bInitialized( false )
@@ -224,9 +223,9 @@ OUString SAL_CALL OInstanceLocker::getImplementationName_static()
uno::Reference< uno::XInterface > SAL_CALL OInstanceLocker::Create(
- const uno::Reference< uno::XComponentContext >& rxContext )
+ const uno::Reference< uno::XComponentContext >& )
{
- return static_cast< cppu::OWeakObject * >( new OInstanceLocker( rxContext ) );
+ return static_cast< cppu::OWeakObject * >( new OInstanceLocker );
}
diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx
index ba80f6b..45986d7 100644
--- a/comphelper/source/misc/instancelocker.hxx
+++ b/comphelper/source/misc/instancelocker.hxx
@@ -43,7 +43,6 @@ class OInstanceLocker : public ::cppu::WeakImplHelper< css::lang::XComponent,
css::lang::XServiceInfo >
{
::osl::Mutex m_aMutex;
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::uno::XInterface > m_xLockListener;
OLockListener* m_pLockListener;
@@ -54,7 +53,7 @@ class OInstanceLocker : public ::cppu::WeakImplHelper< css::lang::XComponent,
bool m_bInitialized;
public:
- explicit OInstanceLocker( const css::uno::Reference< css::uno::XComponentContext >& xContext );
+ explicit OInstanceLocker();
virtual ~OInstanceLocker();
static css::uno::Sequence< OUString > SAL_CALL
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index fd8fac1..ea835c1 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -112,7 +112,6 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
- css::uno::Reference< css::uno::XComponentContext > context_;
css::uno::Reference< css::lang::XMultiServiceFactory > provider_;
};
More information about the Libreoffice-commits
mailing list