[Libreoffice-commits] core.git: avmedia/source basctl/source canvas/source chart2/source comphelper/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue May 22 09:17:17 UTC 2018
avmedia/source/vlc/vlcplayer.cxx | 3 +--
avmedia/source/vlc/vlcplayer.hxx | 1 -
basctl/source/dlged/dlged.cxx | 2 +-
basctl/source/inc/dlged.hxx | 1 -
canvas/source/opengl/ogl_spritedevicehelper.cxx | 4 +---
chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx | 5 ++---
chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx | 3 +--
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 3 +--
chart2/source/controller/dialogs/res_ErrorBar.cxx | 3 +--
chart2/source/controller/inc/dlg_InsertDataLabel.hxx | 2 --
chart2/source/controller/inc/dlg_InsertErrorBars.hxx | 2 --
chart2/source/controller/inc/dlg_ObjectProperties.hxx | 1 -
chart2/source/controller/inc/res_ErrorBar.hxx | 2 --
chart2/source/inc/MediaDescriptorHelper.hxx | 7 -------
chart2/source/model/inc/BaseCoordinateSystem.hxx | 1 -
chart2/source/model/inc/StockBar.hxx | 1 -
chart2/source/model/main/BaseCoordinateSystem.cxx | 7 +------
chart2/source/model/main/StockBar.cxx | 4 +---
chart2/source/tools/MediaDescriptorHelper.cxx | 11 -----------
chart2/source/view/axes/Tickmarks_Dates.cxx | 8 --------
chart2/source/view/axes/Tickmarks_Dates.hxx | 4 ----
chart2/source/view/charttypes/GL3DBarChart.cxx | 4 +---
chart2/source/view/main/DummyXShape.cxx | 3 +--
chart2/source/view/main/DummyXShape.hxx | 1 -
comphelper/source/misc/logging.cxx | 6 ++----
25 files changed, 14 insertions(+), 75 deletions(-)
New commits:
commit 51b49228ee7d3bb9788b7ff44e2c1737caa63818
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu May 17 09:32:21 2018 +0200
loplugin:unusedfields in avmedia..comphelper
Change-Id: I74f125103b67c506d9bb67537e4c4cd3f8f871da
Reviewed-on: https://gerrit.libreoffice.org/54641
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index ec109eaa23dd..a36064030921 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -43,9 +43,8 @@ VLCPlayer::VLCPlayer( const rtl::OUString& url,
wrapper::Instance& instance,
wrapper::EventHandler& eh )
: VLC_Base( m_aMutex )
- , mInstance( instance )
, mEventHandler( eh )
- , mMedia( url, mInstance )
+ , mMedia( url, instance )
, mPlayer( mMedia )
, mEventManager( mPlayer, mEventHandler )
, mUrl( url )
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index a3d555842862..8e5298175bc8 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -39,7 +39,6 @@ typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer,
class VLCPlayer : public ::cppu::BaseMutex,
public VLC_Base
{
- wrapper::Instance& mInstance;
wrapper::EventHandler& mEventHandler;
wrapper::Media mMedia;
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index f3755414bfb3..5588752c4054 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -190,7 +190,6 @@ DlgEditor::DlgEditor (
,eMode( DlgEditor::SELECT )
,eActObj( OBJ_DLG_PUSHBUTTON )
,bFirstDraw(false)
- ,aGridSize( 100, 100 ) // 100TH_MM
,bCreateOK(true)
,bDialogModelChanged(false)
,aMarkIdle("basctl DlgEditor Mark")
@@ -227,6 +226,7 @@ DlgEditor::DlgEditor (
pDlgEdView->SetMoveSnapOnlyTopLeft(true);
pDlgEdView->SetWorkArea( tools::Rectangle( Point( 0, 0 ), pDlgEdPage->GetSize() ) );
+ Size aGridSize( 100, 100 ); // 100TH_MM
pDlgEdView->SetGridCoarse( aGridSize );
pDlgEdView->SetSnapGridWidth(Fraction(aGridSize.Width(), 1), Fraction(aGridSize.Height(), 1));
pDlgEdView->SetGridSnap( true );
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index d844255c837b..6654b454a42d 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -126,7 +126,6 @@ private:
Mode eMode;
sal_uInt16 eActObj;
bool bFirstDraw;
- Size aGridSize;
bool bCreateOK;
tools::Rectangle aPaintRect;
bool bDialogModelChanged;
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index bab170e37d24..08ab90564c68 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -515,7 +515,6 @@ namespace oglcanvas
class BufferContextImpl : public IBufferContext
{
- ::basegfx::B2IVector maSize;
GLuint mnFrambufferId;
GLuint mnDepthId;
GLuint mnTextureId;
@@ -537,12 +536,11 @@ namespace oglcanvas
public:
explicit BufferContextImpl(const ::basegfx::B2IVector& rSize) :
- maSize(rSize),
mnFrambufferId(0),
mnDepthId(0),
mnTextureId(0)
{
- OpenGLHelper::createFramebuffer(maSize.getX(), maSize.getY(), mnFrambufferId,
+ OpenGLHelper::createFramebuffer(rSize.getX(), rSize.getY(), mnFrambufferId,
mnDepthId, mnTextureId, false);
}
diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
index 490ca57ed761..646ba40b8699 100644
--- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
@@ -27,11 +27,10 @@ DataLabelsDialog::DataLabelsDialog(vcl::Window* pWindow, const SfxItemSet& rInAt
ModalDialog(pWindow
,"dlg_DataLabels"
,"modules/schart/ui/dlg_DataLabel.ui"),
- m_apDataLabelResources( new DataLabelResources(this, this, rInAttrs) ),
- m_rInAttrs(rInAttrs)
+ m_apDataLabelResources( new DataLabelResources(this, this, rInAttrs) )
{
m_apDataLabelResources->SetNumberFormatter( pFormatter );
- m_apDataLabelResources->Reset(m_rInAttrs);
+ m_apDataLabelResources->Reset(rInAttrs);
}
DataLabelsDialog::~DataLabelsDialog() = default;
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index a866ada4a8d6..e70a22f5e717 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -44,9 +44,8 @@ InsertErrorBarsDialog::InsertErrorBarsDialog(
ModalDialog( pParent
,"dlg_InsertErrorBars"
,"modules/schart/ui/dlg_InsertErrorBars.ui"),
- rInAttrs( rMyAttrs ),
m_apErrorBarResources( new ErrorBarResources(
- this, this, rInAttrs,
+ this, this, rMyAttrs,
/* bNoneAvailable = */ true, eType ))
{
ObjectType objType = eType == ErrorBarResources::ERROR_BAR_Y ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X;
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 9d6df50719c6..f4a511aa52fd 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -325,7 +325,6 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
const uno::Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier
)
: SfxTabDialog(pParent, "AttributeDialog", "modules/schart/ui/attributedialog.ui", pAttr)
- , eObjectType(pDialogParameter->getObjectType())
, nDlgType(nNoArrowNoShadowDlg)
, m_pParameter( pDialogParameter )
, m_pViewElementListProvider( pViewElementListProvider )
@@ -342,7 +341,7 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
SvtCJKOptions aCJKOptions;
- switch (eObjectType)
+ switch (pDialogParameter->getObjectType())
{
case OBJECTTYPE_TITLE:
AddTabPage(RID_SVXPAGE_LINE, SchResId(STR_PAGE_BORDER));
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 654cb794ddb2..6600108b8bf6 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -86,7 +86,6 @@ ErrorBarResources::ErrorBarResources( VclBuilderContainer* pParent, Dialog * pPa
m_bIndicatorUnique( true ),
m_bRangePosUnique( true ),
m_bRangeNegUnique( true ),
- m_bNoneAvailable( bNoneAvailable ),
m_eErrorBarType( eType ),
m_nConstDecimalDigits( 1 ),
m_nConstSpinSize( 1 ),
@@ -126,7 +125,7 @@ ErrorBarResources::ErrorBarResources( VclBuilderContainer* pParent, Dialog * pPa
pParent->get(m_pUIStringNeg, "STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS");
pParent->get(m_pUIStringRbRange, "STR_CONTROLTEXT_ERROR_BARS_FROM_DATA");
- if( m_bNoneAvailable )
+ if( bNoneAvailable )
m_pRbNone->SetClickHdl( LINK( this, ErrorBarResources, CategoryChosen ));
else
m_pRbNone->Hide();
diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
index 43a67490648f..c1660dc20fda 100644
--- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
+++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
@@ -38,8 +38,6 @@ private:
// HelpButton m_aBtnHelp;
std::unique_ptr < DataLabelResources > m_apDataLabelResources;
- const SfxItemSet& m_rInAttrs;
-
public:
DataLabelsDialog(vcl::Window* pParent, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter);
virtual ~DataLabelsDialog() override;
diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
index 584033a45584..796b0dc46888 100644
--- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
+++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
@@ -48,8 +48,6 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
private:
- const SfxItemSet & rInAttrs;
-
std::unique_ptr< ErrorBarResources > m_apErrorBarResources;
};
diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
index d8702f689191..afa83bc6f56c 100644
--- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
+++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
@@ -106,7 +106,6 @@ class ViewElementListProvider;
class SchAttribTabDlg : public SfxTabDialog
{
private:
- ObjectType eObjectType;
sal_uInt16 nDlgType;
const ObjectPropertiesDialogParameter * const m_pParameter;
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index e5ade413f9a4..a2688c288da4 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -106,8 +106,6 @@ private:
bool m_bRangePosUnique;
bool m_bRangeNegUnique;
- bool m_bNoneAvailable;
-
tErrorBarType m_eErrorBarType;
sal_uInt16 m_nConstDecimalDigits;
sal_Int64 m_nConstSpinSize;
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx
index be9d258d9ae0..73e1b3fe4c91 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -58,15 +58,10 @@ public:
css::uno::Sequence< css::beans::PropertyValue >
m_aDeprecatedProperties; //these are properties which are described in service com.sun.star.document.MediaDescriptor but are marked as deprecated
- css::uno::Sequence< css::beans::PropertyValue >
- m_aAdditionalProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor
-
//properties which should be given to a model are additionally stored in this sequence (not documented properties and deprecated properties are not included!)
css::uno::Sequence< css::beans::PropertyValue >
m_aModelProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor
- css::uno::Any ComponentData;
- css::uno::Any FilterData;
OUString FilterName; //internal filter name.
bool ISSET_FilterName;
@@ -84,8 +79,6 @@ public:
OUString URL;// FileName, URL of the document.
bool ISSET_URL;
- css::uno::Any ViewData;
-
// new framework objects
css::uno::Reference< css::embed::XStorage >
Storage;
diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx
index 06955837a955..76ad85aa597f 100644
--- a/chart2/source/model/inc/BaseCoordinateSystem.hxx
+++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx
@@ -119,7 +119,6 @@ private:
sal_Int32 m_nDimensionCount;
typedef std::vector< std::vector< css::uno::Reference< css::chart2::XAxis > > > tAxisVecVecType;
tAxisVecVecType m_aAllAxis; //outer sequence is the dimension; inner sequence is the axis index that indicates main or secondary axis
- css::uno::Sequence< css::uno::Any > m_aOrigin;
std::vector< css::uno::Reference< css::chart2::XChartType > > m_aChartTypes;
};
diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx
index ed3afcf20a99..b1247e584a63 100644
--- a/chart2/source/model/inc/StockBar.hxx
+++ b/chart2/source/model/inc/StockBar.hxx
@@ -85,7 +85,6 @@ private:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
- const bool m_bRisingCourse;
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
};
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 04782bde3757..dabba0889268 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -144,10 +144,6 @@ BaseCoordinateSystem::BaseCoordinateSystem(
xAxis->setScaleData( aScaleData );
}
- m_aOrigin.realloc( m_nDimensionCount );
- for( sal_Int32 i = 0; i < m_nDimensionCount; ++i )
- m_aOrigin[ i ] <<= 0.0;
-
setFastPropertyValue_NoBroadcast( PROP_COORDINATESYSTEM_SWAPXANDYAXIS, uno::Any( false ));
}
@@ -158,8 +154,7 @@ BaseCoordinateSystem::BaseCoordinateSystem(
MutexContainer(),
::property::OPropertySet( rSource, m_aMutex ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()),
- m_nDimensionCount( rSource.m_nDimensionCount ),
- m_aOrigin( rSource.m_aOrigin )
+ m_nDimensionCount( rSource.m_nDimensionCount )
{
m_aAllAxis.resize(rSource.m_aAllAxis.size());
tAxisVecVecType::size_type nN=0;
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index a9b2ff2cc8a2..2f7a534b23ce 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -111,10 +111,9 @@ namespace chart
StockBar::StockBar( bool bRisingCourse ) :
::property::OPropertySet( m_aMutex ),
- m_bRisingCourse( bRisingCourse ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
{
- if( ! m_bRisingCourse )
+ if( ! bRisingCourse )
{
setFastPropertyValue_NoBroadcast(
::chart::FillProperties::PROP_FILL_COLOR,
@@ -129,7 +128,6 @@ StockBar::StockBar( const StockBar & rOther ) :
MutexContainer(),
impl::StockBar_Base(),
::property::OPropertySet( rOther, m_aMutex ),
- m_bRisingCourse( rOther.m_bRisingCourse ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
{}
diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx
index d95ddf18bc44..7ae409976dd6 100644
--- a/chart2/source/tools/MediaDescriptorHelper.cxx
+++ b/chart2/source/tools/MediaDescriptorHelper.cxx
@@ -28,13 +28,11 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
beans::PropertyValue > & rMediaDescriptor )
: m_aRegularProperties(rMediaDescriptor.getLength())
, m_aDeprecatedProperties(rMediaDescriptor.getLength())
- , m_aAdditionalProperties(rMediaDescriptor.getLength())
, m_aModelProperties(rMediaDescriptor.getLength())
{
impl_init();
sal_Int32 nRegularCount = 0;
sal_Int32 nDeprecatedCount = 0;
- sal_Int32 nAdditionalCount = 0;
sal_Int32 nModelCount = 0;
auto addRegularProp = [this, &nRegularCount](const beans::PropertyValue& rRegularProp)
@@ -77,7 +75,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
}
else if (rProp.Name == "ComponentData")
{
- ComponentData = rProp.Value;
addModelProp(rProp);
}
else if (rProp.Name == "FileName")
@@ -86,7 +83,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
}
else if (rProp.Name == "FilterData")
{
- FilterData = rProp.Value;
addModelProp(rProp);
}
else if (rProp.Name == "FilterName")
@@ -223,7 +219,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
}
else if (rProp.Name == "ViewData")
{
- ViewData = rProp.Value;
addModelProp(rProp);
}
else if (rProp.Name == "ViewId")
@@ -234,16 +229,10 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
{
addDepreciatedProp(rProp);
}
- else
- {
- m_aAdditionalProperties[nAdditionalCount]=rProp;
- nAdditionalCount++;
- }
}
m_aRegularProperties.realloc(nRegularCount);
m_aDeprecatedProperties.realloc(nDeprecatedCount);
- m_aAdditionalProperties.realloc(nAdditionalCount);
m_aModelProperties.realloc(nModelCount);
}
diff --git a/chart2/source/view/axes/Tickmarks_Dates.cxx b/chart2/source/view/axes/Tickmarks_Dates.cxx
index d1daac59ebfe..b9442374a737 100644
--- a/chart2/source/view/axes/Tickmarks_Dates.cxx
+++ b/chart2/source/view/axes/Tickmarks_Dates.cxx
@@ -44,14 +44,6 @@ DateTickFactory::DateTickFactory(
m_xInverseScaling = m_aScale.Scaling->getInverseScaling();
OSL_ENSURE( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
}
-
- m_fScaledVisibleMin = m_aScale.Minimum;
- if( m_xInverseScaling.is() )
- m_fScaledVisibleMin = m_aScale.Scaling->doScaling(m_fScaledVisibleMin);
-
- m_fScaledVisibleMax = m_aScale.Maximum;
- if( m_xInverseScaling.is() )
- m_fScaledVisibleMax = m_aScale.Scaling->doScaling(m_fScaledVisibleMax);
}
DateTickFactory::~DateTickFactory()
diff --git a/chart2/source/view/axes/Tickmarks_Dates.hxx b/chart2/source/view/axes/Tickmarks_Dates.hxx
index ac121d02924b..2e4e3b35b58a 100644
--- a/chart2/source/view/axes/Tickmarks_Dates.hxx
+++ b/chart2/source/view/axes/Tickmarks_Dates.hxx
@@ -43,10 +43,6 @@ private: //member
ExplicitIncrementData m_aIncrement;
css::uno::Reference< css::chart2::XScaling >
m_xInverseScaling;
-
- //minimum and maximum of the visible range after scaling
- double m_fScaledVisibleMin;
- double m_fScaledVisibleMax;
};
} //namespace chart
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 86d4fb3e6d5c..60309d08ad2a 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -82,16 +82,14 @@ double findMaxValue(const std::vector<std::unique_ptr<VDataSeries> >& rDataSerie
class SharedResourceAccess
{
private:
- osl::Condition& mrCond1;
osl::Condition& mrCond2;
public:
SharedResourceAccess(osl::Condition& rCond1, osl::Condition& rCond2):
- mrCond1(rCond1),
mrCond2(rCond2)
{
- mrCond1.set();
+ rCond1.set();
}
~SharedResourceAccess()
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 71cd47206b2d..035353dbd795 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -758,7 +758,6 @@ private:
DummyText::DummyText(const OUString& rText, const tNameSequence& rNames,
const tAnySequence& rValues, const uno::Any& rTrans, uno::Reference< drawing::XShapes > const & xTarget, double nRotation ):
- maText(rText),
maTrans(rTrans),
mnRotation(nRotation)
{
@@ -768,7 +767,7 @@ DummyText::DummyText(const OUString& rText, const tNameSequence& rNames,
DummyChart* pChart = getRootShape();
TextCache& rCache = pChart->getTextCache();
TextCache::TextCacheKey aKey;
- aKey.maText = maText;
+ aKey.maText = rText;
aKey.maProperties = maProperties;
int bmpWidth;
int bmpHeight;
diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx
index bd15c8450523..30e29239c0d4 100644
--- a/chart2/source/view/main/DummyXShape.hxx
+++ b/chart2/source/view/main/DummyXShape.hxx
@@ -314,7 +314,6 @@ public:
private:
void setTransformatAsProperty(const css::drawing::HomogenMatrix3& rMatrix);
- OUString maText;
css::uno::Any maTrans;
BitmapEx maBitmap;
double mnRotation;
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index e08d9d540a99..55bfefef4bbe 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -41,7 +41,6 @@ namespace comphelper
{
private:
Reference< XComponentContext > m_aContext;
- OUString m_sLoggerName;
Reference< XLogger > m_xLogger;
public:
@@ -53,13 +52,12 @@ namespace comphelper
EventLogger_Impl::EventLogger_Impl( const Reference< XComponentContext >& _rxContext, const OUString& _rLoggerName )
:m_aContext( _rxContext )
- ,m_sLoggerName( _rLoggerName )
{
try
{
Reference< XLoggerPool > xPool( LoggerPool::get( m_aContext ) );
- if ( !m_sLoggerName.isEmpty() )
- m_xLogger = xPool->getNamedLogger( m_sLoggerName );
+ if ( !_rLoggerName.isEmpty() )
+ m_xLogger = xPool->getNamedLogger( _rLoggerName );
else
m_xLogger = xPool->getDefaultLogger();
}
More information about the Libreoffice-commits
mailing list