summaryrefslogtreecommitdiffstats
path: root/chart2/source/view
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/view')
-rw-r--r--chart2/source/view/axes/Tickmarks_Dates.cxx8
-rw-r--r--chart2/source/view/axes/Tickmarks_Dates.hxx4
-rw-r--r--chart2/source/view/charttypes/GL3DBarChart.cxx4
-rw-r--r--chart2/source/view/main/DummyXShape.cxx3
-rw-r--r--chart2/source/view/main/DummyXShape.hxx1
5 files changed, 2 insertions, 18 deletions
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;