Kaydet (Commit) 51b49228 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedfields in avmedia..comphelper

Change-Id: I74f125103b67c506d9bb67537e4c4cd3f8f871da
Reviewed-on: https://gerrit.libreoffice.org/54641Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst e129d1ae
...@@ -43,9 +43,8 @@ VLCPlayer::VLCPlayer( const rtl::OUString& url, ...@@ -43,9 +43,8 @@ VLCPlayer::VLCPlayer( const rtl::OUString& url,
wrapper::Instance& instance, wrapper::Instance& instance,
wrapper::EventHandler& eh ) wrapper::EventHandler& eh )
: VLC_Base( m_aMutex ) : VLC_Base( m_aMutex )
, mInstance( instance )
, mEventHandler( eh ) , mEventHandler( eh )
, mMedia( url, mInstance ) , mMedia( url, instance )
, mPlayer( mMedia ) , mPlayer( mMedia )
, mEventManager( mPlayer, mEventHandler ) , mEventManager( mPlayer, mEventHandler )
, mUrl( url ) , mUrl( url )
......
...@@ -39,7 +39,6 @@ typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer, ...@@ -39,7 +39,6 @@ typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer,
class VLCPlayer : public ::cppu::BaseMutex, class VLCPlayer : public ::cppu::BaseMutex,
public VLC_Base public VLC_Base
{ {
wrapper::Instance& mInstance;
wrapper::EventHandler& mEventHandler; wrapper::EventHandler& mEventHandler;
wrapper::Media mMedia; wrapper::Media mMedia;
......
...@@ -190,7 +190,6 @@ DlgEditor::DlgEditor ( ...@@ -190,7 +190,6 @@ DlgEditor::DlgEditor (
,eMode( DlgEditor::SELECT ) ,eMode( DlgEditor::SELECT )
,eActObj( OBJ_DLG_PUSHBUTTON ) ,eActObj( OBJ_DLG_PUSHBUTTON )
,bFirstDraw(false) ,bFirstDraw(false)
,aGridSize( 100, 100 ) // 100TH_MM
,bCreateOK(true) ,bCreateOK(true)
,bDialogModelChanged(false) ,bDialogModelChanged(false)
,aMarkIdle("basctl DlgEditor Mark") ,aMarkIdle("basctl DlgEditor Mark")
...@@ -227,6 +226,7 @@ DlgEditor::DlgEditor ( ...@@ -227,6 +226,7 @@ DlgEditor::DlgEditor (
pDlgEdView->SetMoveSnapOnlyTopLeft(true); pDlgEdView->SetMoveSnapOnlyTopLeft(true);
pDlgEdView->SetWorkArea( tools::Rectangle( Point( 0, 0 ), pDlgEdPage->GetSize() ) ); pDlgEdView->SetWorkArea( tools::Rectangle( Point( 0, 0 ), pDlgEdPage->GetSize() ) );
Size aGridSize( 100, 100 ); // 100TH_MM
pDlgEdView->SetGridCoarse( aGridSize ); pDlgEdView->SetGridCoarse( aGridSize );
pDlgEdView->SetSnapGridWidth(Fraction(aGridSize.Width(), 1), Fraction(aGridSize.Height(), 1)); pDlgEdView->SetSnapGridWidth(Fraction(aGridSize.Width(), 1), Fraction(aGridSize.Height(), 1));
pDlgEdView->SetGridSnap( true ); pDlgEdView->SetGridSnap( true );
......
...@@ -126,7 +126,6 @@ private: ...@@ -126,7 +126,6 @@ private:
Mode eMode; Mode eMode;
sal_uInt16 eActObj; sal_uInt16 eActObj;
bool bFirstDraw; bool bFirstDraw;
Size aGridSize;
bool bCreateOK; bool bCreateOK;
tools::Rectangle aPaintRect; tools::Rectangle aPaintRect;
bool bDialogModelChanged; bool bDialogModelChanged;
......
...@@ -515,7 +515,6 @@ namespace oglcanvas ...@@ -515,7 +515,6 @@ namespace oglcanvas
class BufferContextImpl : public IBufferContext class BufferContextImpl : public IBufferContext
{ {
::basegfx::B2IVector maSize;
GLuint mnFrambufferId; GLuint mnFrambufferId;
GLuint mnDepthId; GLuint mnDepthId;
GLuint mnTextureId; GLuint mnTextureId;
...@@ -537,12 +536,11 @@ namespace oglcanvas ...@@ -537,12 +536,11 @@ namespace oglcanvas
public: public:
explicit BufferContextImpl(const ::basegfx::B2IVector& rSize) : explicit BufferContextImpl(const ::basegfx::B2IVector& rSize) :
maSize(rSize),
mnFrambufferId(0), mnFrambufferId(0),
mnDepthId(0), mnDepthId(0),
mnTextureId(0) mnTextureId(0)
{ {
OpenGLHelper::createFramebuffer(maSize.getX(), maSize.getY(), mnFrambufferId, OpenGLHelper::createFramebuffer(rSize.getX(), rSize.getY(), mnFrambufferId,
mnDepthId, mnTextureId, false); mnDepthId, mnTextureId, false);
} }
......
...@@ -27,11 +27,10 @@ DataLabelsDialog::DataLabelsDialog(vcl::Window* pWindow, const SfxItemSet& rInAt ...@@ -27,11 +27,10 @@ DataLabelsDialog::DataLabelsDialog(vcl::Window* pWindow, const SfxItemSet& rInAt
ModalDialog(pWindow ModalDialog(pWindow
,"dlg_DataLabels" ,"dlg_DataLabels"
,"modules/schart/ui/dlg_DataLabel.ui"), ,"modules/schart/ui/dlg_DataLabel.ui"),
m_apDataLabelResources( new DataLabelResources(this, this, rInAttrs) ), m_apDataLabelResources( new DataLabelResources(this, this, rInAttrs) )
m_rInAttrs(rInAttrs)
{ {
m_apDataLabelResources->SetNumberFormatter( pFormatter ); m_apDataLabelResources->SetNumberFormatter( pFormatter );
m_apDataLabelResources->Reset(m_rInAttrs); m_apDataLabelResources->Reset(rInAttrs);
} }
DataLabelsDialog::~DataLabelsDialog() = default; DataLabelsDialog::~DataLabelsDialog() = default;
......
...@@ -44,9 +44,8 @@ InsertErrorBarsDialog::InsertErrorBarsDialog( ...@@ -44,9 +44,8 @@ InsertErrorBarsDialog::InsertErrorBarsDialog(
ModalDialog( pParent ModalDialog( pParent
,"dlg_InsertErrorBars" ,"dlg_InsertErrorBars"
,"modules/schart/ui/dlg_InsertErrorBars.ui"), ,"modules/schart/ui/dlg_InsertErrorBars.ui"),
rInAttrs( rMyAttrs ),
m_apErrorBarResources( new ErrorBarResources( m_apErrorBarResources( new ErrorBarResources(
this, this, rInAttrs, this, this, rMyAttrs,
/* bNoneAvailable = */ true, eType )) /* bNoneAvailable = */ true, eType ))
{ {
ObjectType objType = eType == ErrorBarResources::ERROR_BAR_Y ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X; ObjectType objType = eType == ErrorBarResources::ERROR_BAR_Y ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X;
......
...@@ -325,7 +325,6 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent, ...@@ -325,7 +325,6 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
const uno::Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier const uno::Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier
) )
: SfxTabDialog(pParent, "AttributeDialog", "modules/schart/ui/attributedialog.ui", pAttr) : SfxTabDialog(pParent, "AttributeDialog", "modules/schart/ui/attributedialog.ui", pAttr)
, eObjectType(pDialogParameter->getObjectType())
, nDlgType(nNoArrowNoShadowDlg) , nDlgType(nNoArrowNoShadowDlg)
, m_pParameter( pDialogParameter ) , m_pParameter( pDialogParameter )
, m_pViewElementListProvider( pViewElementListProvider ) , m_pViewElementListProvider( pViewElementListProvider )
...@@ -342,7 +341,7 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent, ...@@ -342,7 +341,7 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
SvtCJKOptions aCJKOptions; SvtCJKOptions aCJKOptions;
switch (eObjectType) switch (pDialogParameter->getObjectType())
{ {
case OBJECTTYPE_TITLE: case OBJECTTYPE_TITLE:
AddTabPage(RID_SVXPAGE_LINE, SchResId(STR_PAGE_BORDER)); AddTabPage(RID_SVXPAGE_LINE, SchResId(STR_PAGE_BORDER));
......
...@@ -86,7 +86,6 @@ ErrorBarResources::ErrorBarResources( VclBuilderContainer* pParent, Dialog * pPa ...@@ -86,7 +86,6 @@ ErrorBarResources::ErrorBarResources( VclBuilderContainer* pParent, Dialog * pPa
m_bIndicatorUnique( true ), m_bIndicatorUnique( true ),
m_bRangePosUnique( true ), m_bRangePosUnique( true ),
m_bRangeNegUnique( true ), m_bRangeNegUnique( true ),
m_bNoneAvailable( bNoneAvailable ),
m_eErrorBarType( eType ), m_eErrorBarType( eType ),
m_nConstDecimalDigits( 1 ), m_nConstDecimalDigits( 1 ),
m_nConstSpinSize( 1 ), m_nConstSpinSize( 1 ),
...@@ -126,7 +125,7 @@ ErrorBarResources::ErrorBarResources( VclBuilderContainer* pParent, Dialog * pPa ...@@ -126,7 +125,7 @@ ErrorBarResources::ErrorBarResources( VclBuilderContainer* pParent, Dialog * pPa
pParent->get(m_pUIStringNeg, "STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS"); pParent->get(m_pUIStringNeg, "STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS");
pParent->get(m_pUIStringRbRange, "STR_CONTROLTEXT_ERROR_BARS_FROM_DATA"); pParent->get(m_pUIStringRbRange, "STR_CONTROLTEXT_ERROR_BARS_FROM_DATA");
if( m_bNoneAvailable ) if( bNoneAvailable )
m_pRbNone->SetClickHdl( LINK( this, ErrorBarResources, CategoryChosen )); m_pRbNone->SetClickHdl( LINK( this, ErrorBarResources, CategoryChosen ));
else else
m_pRbNone->Hide(); m_pRbNone->Hide();
......
...@@ -38,8 +38,6 @@ private: ...@@ -38,8 +38,6 @@ private:
// HelpButton m_aBtnHelp; // HelpButton m_aBtnHelp;
std::unique_ptr < DataLabelResources > m_apDataLabelResources; std::unique_ptr < DataLabelResources > m_apDataLabelResources;
const SfxItemSet& m_rInAttrs;
public: public:
DataLabelsDialog(vcl::Window* pParent, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter); DataLabelsDialog(vcl::Window* pParent, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter);
virtual ~DataLabelsDialog() override; virtual ~DataLabelsDialog() override;
......
...@@ -48,8 +48,6 @@ public: ...@@ -48,8 +48,6 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
private: private:
const SfxItemSet & rInAttrs;
std::unique_ptr< ErrorBarResources > m_apErrorBarResources; std::unique_ptr< ErrorBarResources > m_apErrorBarResources;
}; };
......
...@@ -106,7 +106,6 @@ class ViewElementListProvider; ...@@ -106,7 +106,6 @@ class ViewElementListProvider;
class SchAttribTabDlg : public SfxTabDialog class SchAttribTabDlg : public SfxTabDialog
{ {
private: private:
ObjectType eObjectType;
sal_uInt16 nDlgType; sal_uInt16 nDlgType;
const ObjectPropertiesDialogParameter * const m_pParameter; const ObjectPropertiesDialogParameter * const m_pParameter;
......
...@@ -106,8 +106,6 @@ private: ...@@ -106,8 +106,6 @@ private:
bool m_bRangePosUnique; bool m_bRangePosUnique;
bool m_bRangeNegUnique; bool m_bRangeNegUnique;
bool m_bNoneAvailable;
tErrorBarType m_eErrorBarType; tErrorBarType m_eErrorBarType;
sal_uInt16 m_nConstDecimalDigits; sal_uInt16 m_nConstDecimalDigits;
sal_Int64 m_nConstSpinSize; sal_Int64 m_nConstSpinSize;
......
...@@ -58,15 +58,10 @@ public: ...@@ -58,15 +58,10 @@ public:
css::uno::Sequence< css::beans::PropertyValue > 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 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!) //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 > css::uno::Sequence< css::beans::PropertyValue >
m_aModelProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor 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. OUString FilterName; //internal filter name.
bool ISSET_FilterName; bool ISSET_FilterName;
...@@ -84,8 +79,6 @@ public: ...@@ -84,8 +79,6 @@ public:
OUString URL;// FileName, URL of the document. OUString URL;// FileName, URL of the document.
bool ISSET_URL; bool ISSET_URL;
css::uno::Any ViewData;
// new framework objects // new framework objects
css::uno::Reference< css::embed::XStorage > css::uno::Reference< css::embed::XStorage >
Storage; Storage;
......
...@@ -119,7 +119,6 @@ private: ...@@ -119,7 +119,6 @@ private:
sal_Int32 m_nDimensionCount; sal_Int32 m_nDimensionCount;
typedef std::vector< std::vector< css::uno::Reference< css::chart2::XAxis > > > tAxisVecVecType; 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 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; std::vector< css::uno::Reference< css::chart2::XChartType > > m_aChartTypes;
}; };
......
...@@ -85,7 +85,6 @@ private: ...@@ -85,7 +85,6 @@ private:
virtual void firePropertyChangeEvent() override; virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing; using OPropertySet::disposing;
const bool m_bRisingCourse;
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
}; };
......
...@@ -144,10 +144,6 @@ BaseCoordinateSystem::BaseCoordinateSystem( ...@@ -144,10 +144,6 @@ BaseCoordinateSystem::BaseCoordinateSystem(
xAxis->setScaleData( aScaleData ); 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 )); setFastPropertyValue_NoBroadcast( PROP_COORDINATESYSTEM_SWAPXANDYAXIS, uno::Any( false ));
} }
...@@ -158,8 +154,7 @@ BaseCoordinateSystem::BaseCoordinateSystem( ...@@ -158,8 +154,7 @@ BaseCoordinateSystem::BaseCoordinateSystem(
MutexContainer(), MutexContainer(),
::property::OPropertySet( rSource, m_aMutex ), ::property::OPropertySet( rSource, m_aMutex ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()), m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()),
m_nDimensionCount( rSource.m_nDimensionCount ), m_nDimensionCount( rSource.m_nDimensionCount )
m_aOrigin( rSource.m_aOrigin )
{ {
m_aAllAxis.resize(rSource.m_aAllAxis.size()); m_aAllAxis.resize(rSource.m_aAllAxis.size());
tAxisVecVecType::size_type nN=0; tAxisVecVecType::size_type nN=0;
......
...@@ -111,10 +111,9 @@ namespace chart ...@@ -111,10 +111,9 @@ namespace chart
StockBar::StockBar( bool bRisingCourse ) : StockBar::StockBar( bool bRisingCourse ) :
::property::OPropertySet( m_aMutex ), ::property::OPropertySet( m_aMutex ),
m_bRisingCourse( bRisingCourse ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()) m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
{ {
if( ! m_bRisingCourse ) if( ! bRisingCourse )
{ {
setFastPropertyValue_NoBroadcast( setFastPropertyValue_NoBroadcast(
::chart::FillProperties::PROP_FILL_COLOR, ::chart::FillProperties::PROP_FILL_COLOR,
...@@ -129,7 +128,6 @@ StockBar::StockBar( const StockBar & rOther ) : ...@@ -129,7 +128,6 @@ StockBar::StockBar( const StockBar & rOther ) :
MutexContainer(), MutexContainer(),
impl::StockBar_Base(), impl::StockBar_Base(),
::property::OPropertySet( rOther, m_aMutex ), ::property::OPropertySet( rOther, m_aMutex ),
m_bRisingCourse( rOther.m_bRisingCourse ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()) m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
{} {}
......
...@@ -28,13 +28,11 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< ...@@ -28,13 +28,11 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
beans::PropertyValue > & rMediaDescriptor ) beans::PropertyValue > & rMediaDescriptor )
: m_aRegularProperties(rMediaDescriptor.getLength()) : m_aRegularProperties(rMediaDescriptor.getLength())
, m_aDeprecatedProperties(rMediaDescriptor.getLength()) , m_aDeprecatedProperties(rMediaDescriptor.getLength())
, m_aAdditionalProperties(rMediaDescriptor.getLength())
, m_aModelProperties(rMediaDescriptor.getLength()) , m_aModelProperties(rMediaDescriptor.getLength())
{ {
impl_init(); impl_init();
sal_Int32 nRegularCount = 0; sal_Int32 nRegularCount = 0;
sal_Int32 nDeprecatedCount = 0; sal_Int32 nDeprecatedCount = 0;
sal_Int32 nAdditionalCount = 0;
sal_Int32 nModelCount = 0; sal_Int32 nModelCount = 0;
auto addRegularProp = [this, &nRegularCount](const beans::PropertyValue& rRegularProp) auto addRegularProp = [this, &nRegularCount](const beans::PropertyValue& rRegularProp)
...@@ -77,7 +75,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< ...@@ -77,7 +75,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
} }
else if (rProp.Name == "ComponentData") else if (rProp.Name == "ComponentData")
{ {
ComponentData = rProp.Value;
addModelProp(rProp); addModelProp(rProp);
} }
else if (rProp.Name == "FileName") else if (rProp.Name == "FileName")
...@@ -86,7 +83,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< ...@@ -86,7 +83,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
} }
else if (rProp.Name == "FilterData") else if (rProp.Name == "FilterData")
{ {
FilterData = rProp.Value;
addModelProp(rProp); addModelProp(rProp);
} }
else if (rProp.Name == "FilterName") else if (rProp.Name == "FilterName")
...@@ -223,7 +219,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< ...@@ -223,7 +219,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
} }
else if (rProp.Name == "ViewData") else if (rProp.Name == "ViewData")
{ {
ViewData = rProp.Value;
addModelProp(rProp); addModelProp(rProp);
} }
else if (rProp.Name == "ViewId") else if (rProp.Name == "ViewId")
...@@ -234,16 +229,10 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< ...@@ -234,16 +229,10 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
{ {
addDepreciatedProp(rProp); addDepreciatedProp(rProp);
} }
else
{
m_aAdditionalProperties[nAdditionalCount]=rProp;
nAdditionalCount++;
}
} }
m_aRegularProperties.realloc(nRegularCount); m_aRegularProperties.realloc(nRegularCount);
m_aDeprecatedProperties.realloc(nDeprecatedCount); m_aDeprecatedProperties.realloc(nDeprecatedCount);
m_aAdditionalProperties.realloc(nAdditionalCount);
m_aModelProperties.realloc(nModelCount); m_aModelProperties.realloc(nModelCount);
} }
......
...@@ -44,14 +44,6 @@ DateTickFactory::DateTickFactory( ...@@ -44,14 +44,6 @@ DateTickFactory::DateTickFactory(
m_xInverseScaling = m_aScale.Scaling->getInverseScaling(); m_xInverseScaling = m_aScale.Scaling->getInverseScaling();
OSL_ENSURE( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" ); 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() DateTickFactory::~DateTickFactory()
......
...@@ -43,10 +43,6 @@ private: //member ...@@ -43,10 +43,6 @@ private: //member
ExplicitIncrementData m_aIncrement; ExplicitIncrementData m_aIncrement;
css::uno::Reference< css::chart2::XScaling > css::uno::Reference< css::chart2::XScaling >
m_xInverseScaling; m_xInverseScaling;
//minimum and maximum of the visible range after scaling
double m_fScaledVisibleMin;
double m_fScaledVisibleMax;
}; };
} //namespace chart } //namespace chart
......
...@@ -82,16 +82,14 @@ double findMaxValue(const std::vector<std::unique_ptr<VDataSeries> >& rDataSerie ...@@ -82,16 +82,14 @@ double findMaxValue(const std::vector<std::unique_ptr<VDataSeries> >& rDataSerie
class SharedResourceAccess class SharedResourceAccess
{ {
private: private:
osl::Condition& mrCond1;
osl::Condition& mrCond2; osl::Condition& mrCond2;
public: public:
SharedResourceAccess(osl::Condition& rCond1, osl::Condition& rCond2): SharedResourceAccess(osl::Condition& rCond1, osl::Condition& rCond2):
mrCond1(rCond1),
mrCond2(rCond2) mrCond2(rCond2)
{ {
mrCond1.set(); rCond1.set();
} }
~SharedResourceAccess() ~SharedResourceAccess()
......
...@@ -758,7 +758,6 @@ private: ...@@ -758,7 +758,6 @@ private:
DummyText::DummyText(const OUString& rText, const tNameSequence& rNames, DummyText::DummyText(const OUString& rText, const tNameSequence& rNames,
const tAnySequence& rValues, const uno::Any& rTrans, uno::Reference< drawing::XShapes > const & xTarget, double nRotation ): const tAnySequence& rValues, const uno::Any& rTrans, uno::Reference< drawing::XShapes > const & xTarget, double nRotation ):
maText(rText),
maTrans(rTrans), maTrans(rTrans),
mnRotation(nRotation) mnRotation(nRotation)
{ {
...@@ -768,7 +767,7 @@ DummyText::DummyText(const OUString& rText, const tNameSequence& rNames, ...@@ -768,7 +767,7 @@ DummyText::DummyText(const OUString& rText, const tNameSequence& rNames,
DummyChart* pChart = getRootShape(); DummyChart* pChart = getRootShape();
TextCache& rCache = pChart->getTextCache(); TextCache& rCache = pChart->getTextCache();
TextCache::TextCacheKey aKey; TextCache::TextCacheKey aKey;
aKey.maText = maText; aKey.maText = rText;
aKey.maProperties = maProperties; aKey.maProperties = maProperties;
int bmpWidth; int bmpWidth;
int bmpHeight; int bmpHeight;
......
...@@ -314,7 +314,6 @@ public: ...@@ -314,7 +314,6 @@ public:
private: private:
void setTransformatAsProperty(const css::drawing::HomogenMatrix3& rMatrix); void setTransformatAsProperty(const css::drawing::HomogenMatrix3& rMatrix);
OUString maText;
css::uno::Any maTrans; css::uno::Any maTrans;
BitmapEx maBitmap; BitmapEx maBitmap;
double mnRotation; double mnRotation;
......
...@@ -41,7 +41,6 @@ namespace comphelper ...@@ -41,7 +41,6 @@ namespace comphelper
{ {
private: private:
Reference< XComponentContext > m_aContext; Reference< XComponentContext > m_aContext;
OUString m_sLoggerName;
Reference< XLogger > m_xLogger; Reference< XLogger > m_xLogger;
public: public:
...@@ -53,13 +52,12 @@ namespace comphelper ...@@ -53,13 +52,12 @@ namespace comphelper
EventLogger_Impl::EventLogger_Impl( const Reference< XComponentContext >& _rxContext, const OUString& _rLoggerName ) EventLogger_Impl::EventLogger_Impl( const Reference< XComponentContext >& _rxContext, const OUString& _rLoggerName )
:m_aContext( _rxContext ) :m_aContext( _rxContext )
,m_sLoggerName( _rLoggerName )
{ {
try try
{ {
Reference< XLoggerPool > xPool( LoggerPool::get( m_aContext ) ); Reference< XLoggerPool > xPool( LoggerPool::get( m_aContext ) );
if ( !m_sLoggerName.isEmpty() ) if ( !_rLoggerName.isEmpty() )
m_xLogger = xPool->getNamedLogger( m_sLoggerName ); m_xLogger = xPool->getNamedLogger( _rLoggerName );
else else
m_xLogger = xPool->getDefaultLogger(); m_xLogger = xPool->getDefaultLogger();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment