[Libreoffice-commits] core.git: basic/source chart2/source forms/source include/basic include/svl include/svtools include/unotools include/vcl l10ntools/inc l10ntools/source sc/inc sc/source sd/inc sd/source slideshow/source svl/source svtools/source sw/source unotools/source vcl/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Nov 17 13:11:31 UTC 2016
basic/source/basmgr/basmgr.cxx | 24 +-
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 5
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx | 7
chart2/source/controller/main/ChartController_Insert.cxx | 14 -
chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 2
chart2/source/inc/ErrorBar.hxx | 8
chart2/source/inc/RegressionCurveHelper.hxx | 8
chart2/source/inc/StatisticsHelper.hxx | 1
chart2/source/model/inc/DataSeries.hxx | 3
chart2/source/model/main/ChartModel.cxx | 2
chart2/source/model/main/DataSeries.cxx | 8
chart2/source/model/main/PageBackground.cxx | 10 -
chart2/source/model/main/PageBackground.hxx | 4
chart2/source/model/template/BubbleDataInterpreter.cxx | 2
chart2/source/model/template/DataInterpreter.cxx | 2
chart2/source/model/template/StockDataInterpreter.cxx | 2
chart2/source/model/template/XYDataInterpreter.cxx | 2
chart2/source/tools/ErrorBar.cxx | 13 -
chart2/source/tools/RegressionCurveHelper.cxx | 25 +--
chart2/source/tools/RegressionCurveModel.cxx | 81 ++++------
chart2/source/tools/RegressionCurveModel.hxx | 48 +----
chart2/source/tools/StatisticsHelper.cxx | 3
forms/source/component/GroupManager.cxx | 6
forms/source/component/GroupManager.hxx | 1
include/basic/basmgr.hxx | 3
include/svl/style.hxx | 1
include/svtools/ivctrl.hxx | 5
include/unotools/confignode.hxx | 2
include/vcl/accel.hxx | 1
l10ntools/inc/xmlparse.hxx | 3
l10ntools/source/xmlparse.cxx | 9 -
sc/inc/dpobject.hxx | 1
sc/source/core/data/dpobject.cxx | 3
sd/inc/cusshow.hxx | 10 -
sd/source/core/cusshow.cxx | 9 -
sd/source/filter/ppt/pptin.cxx | 2
sd/source/filter/ppt/propread.cxx | 11 -
sd/source/filter/ppt/propread.hxx | 3
sd/source/ui/dlg/custsdlg.cxx | 2
sd/source/ui/unoidl/unocpres.cxx | 4
slideshow/source/inc/listenercontainer.hxx | 22 --
svl/source/items/style.cxx | 2
svtools/source/contnr/ivctrl.cxx | 2
sw/source/core/doc/tblrwcl.cxx | 5
unotools/source/config/confignode.cxx | 4
vcl/source/window/accel.cxx | 2
46 files changed, 122 insertions(+), 265 deletions(-)
New commits:
commit bb674aa5503ff40a5619d1fb4c9f310da5f5c983
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Nov 17 13:16:30 2016 +0200
loplugin:unusedfields
Change-Id: Id2dbbf384637223db3d334d95332251832918003
Reviewed-on: https://gerrit.libreoffice.org/30927
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 157eed0..10efa07 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -332,15 +332,13 @@ void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( const container::Cont
}
}
-BasicError::BasicError( sal_uInt64 nId, BasicErrorReason nR, const OUString& rErrStr ) :
- aErrStr( rErrStr )
+BasicError::BasicError( sal_uInt64 nId, BasicErrorReason nR )
{
nErrorId = nId;
nReason = nR;
}
-BasicError::BasicError( const BasicError& rErr ) :
- aErrStr( rErr.aErrStr )
+BasicError::BasicError( const BasicError& rErr )
{
nErrorId = rErr.nErrorId;
nReason = rErr.nReason;
@@ -654,7 +652,7 @@ void BasicManager::ImpMgrNotLoaded( const OUString& rStorageName )
// pErrInf is only destroyed if the error os processed by an
// ErrorHandler
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_MGROPEN, rStorageName, ERRCODE_BUTTON_OK );
- aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENMGRSTREAM, rStorageName));
+ aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENMGRSTREAM));
// Create a stdlib otherwise we crash!
BasicLibInfo* pStdLibInfo = CreateLibInfo();
@@ -794,7 +792,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
if (!ImplLoadBasic( *xManagerStream, mpImpl->aLibs.front()->GetLibRef() ))
{
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_MGROPEN, aStorName, ERRCODE_BUTTON_OK );
- aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENMGRSTREAM, aStorName));
+ aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENMGRSTREAM));
// and it proceeds ...
}
xManagerStream->Seek( nBasicEndOff+1 ); // +1: 0x00 as separator
@@ -842,7 +840,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
else
{
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD, aStorName, ERRCODE_BUTTON_OK );
- aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::STORAGENOTFOUND, aStorName));
+ aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::STORAGENOTFOUND));
}
}
}
@@ -925,7 +923,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora
if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
{
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_MGROPEN, xStorage->GetName(), ERRCODE_BUTTON_OK );
- aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENLIBSTORAGE, pLibInfo->GetLibName()));
+ aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENLIBSTORAGE));
}
else
{
@@ -934,7 +932,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora
if ( !xBasicStream.Is() || xBasicStream->GetError() )
{
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD , pLibInfo->GetLibName(), ERRCODE_BUTTON_OK );
- aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENLIBSTREAM, pLibInfo->GetLibName()));
+ aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENLIBSTREAM));
}
else
{
@@ -957,7 +955,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora
if ( !bLoaded )
{
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD, pLibInfo->GetLibName(), ERRCODE_BUTTON_OK );
- aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::BASICLOADERROR, pLibInfo->GetLibName()));
+ aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::BASICLOADERROR));
}
else
{
@@ -1141,7 +1139,7 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage )
if( !nLib || nLib < mpImpl->aLibs.size() )
{
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_REMOVELIB, OUString(), ERRCODE_BUTTON_OK );
- aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::STDLIB, OUString()));
+ aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::STDLIB));
return false;
}
@@ -1177,7 +1175,7 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage )
if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
{
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_REMOVELIB, OUString(), ERRCODE_BUTTON_OK );
- aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENLIBSTORAGE, (*itLibInfo)->GetLibName()));
+ aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::OPENLIBSTORAGE));
}
else if (xBasicStorage->IsStream((*itLibInfo)->GetLibName()))
{
@@ -1312,7 +1310,7 @@ bool BasicManager::LoadLib( sal_uInt16 nLib )
else
{
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD, OUString(), ERRCODE_BUTTON_OK );
- aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::LIBNOTFOUND, OUString::number(nLib)));
+ aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::LIBNOTFOUND));
}
return bDone;
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index f240aa8..957a346 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -187,8 +187,7 @@ protected:
xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties;
if( !xErrorBarProperties.is() )
{
- // todo: use a valid context
- xErrorBarProperties = ::chart::createErrorBar( uno::Reference< uno::XComponentContext >() );
+ xErrorBarProperties = new ::chart::ErrorBar;
//default in new and old api are different
xErrorBarProperties->setPropertyValue( "ShowPositiveError" , uno::makeAny(false) );
xErrorBarProperties->setPropertyValue( "ShowNegativeError" , uno::makeAny(false) );
@@ -345,7 +344,7 @@ void WrappedMeanValueProperty::setValueToSeries( const Reference< beans::XProper
if( xRegCnt.is() )
{
if(aNewValue)
- RegressionCurveHelper::addMeanValueLine( xRegCnt, nullptr, nullptr );
+ RegressionCurveHelper::addMeanValueLine( xRegCnt, nullptr );
else
RegressionCurveHelper::removeMeanValueLine( xRegCnt );
}
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 921f033..433b736 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -70,9 +70,7 @@ uno::Reference< beans::XPropertySet > lcl_GetErrorBar(
uno::Reference< beans::XPropertySet > lcl_GetDefaultErrorBar()
{
- // todo: use a valid context
- return uno::Reference< beans::XPropertySet >(
- ::chart::createErrorBar( uno::Reference< uno::XComponentContext >()));
+ return uno::Reference< beans::XPropertySet >( new ::chart::ErrorBar );
}
void lcl_getErrorValues( const uno::Reference< beans::XPropertySet > & xErrorBarProp,
@@ -273,8 +271,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
if( ! bNewHasMeanValueLine )
RegressionCurveHelper::removeMeanValueLine( xRegCnt );
else
- RegressionCurveHelper::addMeanValueLine(
- xRegCnt, uno::Reference< uno::XComponentContext >(), GetPropertySet() );
+ RegressionCurveHelper::addMeanValueLine( xRegCnt, GetPropertySet() );
bChanged = true;
}
}
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 78a97fa..7d3a5a6 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -68,15 +68,14 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-void lcl_InsertMeanValueLine( const uno::Reference< uno::XComponentContext > & xContext,
- const uno::Reference< chart2::XDataSeries > & xSeries )
+void lcl_InsertMeanValueLine( const uno::Reference< chart2::XDataSeries > & xSeries )
{
uno::Reference< chart2::XRegressionCurveContainer > xRegCurveCnt(
xSeries, uno::UNO_QUERY );
if( xRegCurveCnt.is())
{
::chart::RegressionCurveHelper::addMeanValueLine(
- xRegCurveCnt, xContext, uno::Reference< beans::XPropertySet >( xSeries, uno::UNO_QUERY ));
+ xRegCurveCnt, uno::Reference< beans::XPropertySet >( xSeries, uno::UNO_QUERY ));
}
}
@@ -308,8 +307,7 @@ void ChartController::executeDispatch_InsertMeanValue()
ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::ActionType::Insert, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )),
m_xUndoManager );
- lcl_InsertMeanValueLine( m_xCC,
- ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(),
+ lcl_InsertMeanValueLine( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(),
getModel() ) );
aUndoGuard.commit();
}
@@ -326,7 +324,7 @@ void ChartController::executeDispatch_InsertMenu_MeanValues()
if( xSeries.is() )
{
//if a series is selected insert mean value only for that series:
- lcl_InsertMeanValueLine( m_xCC, xSeries );
+ lcl_InsertMeanValueLine( xSeries );
}
else
{
@@ -334,7 +332,7 @@ void ChartController::executeDispatch_InsertMenu_MeanValues()
DiagramHelper::getDataSeriesFromDiagram( ChartModelHelper::findDiagram( getModel() )));
for( const auto& xSrs : aSeries )
- lcl_InsertMeanValueLine( m_xCC, xSrs );
+ lcl_InsertMeanValueLine( xSrs );
}
aUndoGuard.commit();
}
@@ -429,7 +427,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError )
// add error bars with standard deviation
uno::Reference< beans::XPropertySet > xErrorBarProp(
- StatisticsHelper::addErrorBars( xSeries, m_xCC,
+ StatisticsHelper::addErrorBars( xSeries,
css::chart::ErrorBarStyle::STANDARD_DEVIATION,
bYError));
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 5ef6a5a..f8832e0 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -199,7 +199,7 @@ void setErrorBarVisible(const css::uno::Reference<css::frame::XModel>&
if (bVisible)
{
- StatisticsHelper::addErrorBars( xSeries, comphelper::getProcessComponentContext(),
+ StatisticsHelper::addErrorBars( xSeries,
css::chart::ErrorBarStyle::STANDARD_DEVIATION,
bYError);
}
diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx
index 107d2ab..565e93d 100644
--- a/chart2/source/inc/ErrorBar.hxx
+++ b/chart2/source/inc/ErrorBar.hxx
@@ -45,9 +45,6 @@
namespace chart
{
-OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::beans::XPropertySet > createErrorBar(
- const css::uno::Reference< css::uno::XComponentContext > & xContext );
-
namespace impl
{
typedef ::cppu::WeakImplHelper<
@@ -82,7 +79,7 @@ private:
sal_Int32 meStyle;
public:
- explicit ErrorBar( const css::uno::Reference< css::uno::XComponentContext > & xContext );
+ OOO_DLLPUBLIC_CHARTTOOLS explicit ErrorBar();
virtual ~ErrorBar() override;
/// XServiceInfo declarations
@@ -154,9 +151,6 @@ protected:
throw (css::uno::RuntimeException, std::exception) override;
private:
- css::uno::Reference< css::uno::XComponentContext >
- m_xContext;
-
typedef ::std::vector< css::uno::Reference<
css::chart2::data::XLabeledDataSequence > > tDataSequenceContainer;
tDataSequenceContainer m_aDataSequences;
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx
index 4c89c23..46ee61e 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -38,14 +38,11 @@ namespace chart
namespace RegressionCurveHelper
{
/// returns a model mean-value line
- css::uno::Reference<css::chart2::XRegressionCurve>
- createMeanValueLine(const css::uno::Reference<css::uno::XComponentContext> & xContext );
+ css::uno::Reference<css::chart2::XRegressionCurve> createMeanValueLine();
/// returns a model regression curve
css::uno::Reference<css::chart2::XRegressionCurve>
- createRegressionCurveByServiceName(
- const css::uno::Reference<css::uno::XComponentContext> & xContext,
- const OUString& aServiceName );
+ createRegressionCurveByServiceName( const OUString& aServiceName );
OOO_DLLPUBLIC_CHARTTOOLS bool hasMeanValueLine(
const css::uno::Reference<css::chart2::XRegressionCurveContainer> & xRegCnt );
@@ -64,7 +61,6 @@ namespace RegressionCurveHelper
*/
OOO_DLLPUBLIC_CHARTTOOLS void addMeanValueLine(
css::uno::Reference<css::chart2::XRegressionCurveContainer>& xRegCnt,
- const css::uno::Reference<css::uno::XComponentContext>& xContext,
const css::uno::Reference<css::beans::XPropertySet>& xSeriesProp );
OOO_DLLPUBLIC_CHARTTOOLS void removeMeanValueLine(
diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx
index 675f478..f641093 100644
--- a/chart2/source/inc/StatisticsHelper.hxx
+++ b/chart2/source/inc/StatisticsHelper.hxx
@@ -73,7 +73,6 @@ namespace StatisticsHelper
OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::beans::XPropertySet >
addErrorBars(
const css::uno::Reference< css::chart2::XDataSeries > & xDataSeries,
- const css::uno::Reference< css::uno::XComponentContext > & xContext,
sal_Int32 nStyle,
bool bYError = true );
diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx
index 27b9513..7cac997 100644
--- a/chart2/source/model/inc/DataSeries.hxx
+++ b/chart2/source/model/inc/DataSeries.hxx
@@ -67,7 +67,7 @@ class DataSeries :
public ::property::OPropertySet
{
public:
- explicit DataSeries( const css::uno::Reference< css::uno::XComponentContext > & xContext );
+ explicit DataSeries();
virtual ~DataSeries() override;
/// XServiceInfo declarations
@@ -176,7 +176,6 @@ protected:
void fireModifyEvent();
private:
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
typedef ::std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > tDataSequenceContainer;
tDataSequenceContainer m_aDataSequences;
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 1997c56..6d3b817 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -103,7 +103,7 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext)
, m_aVisualAreaSize( ChartModelHelper::getDefaultPageSize() )
, m_xDataProvider( nullptr )
, m_xInternalDataProvider( nullptr )
- , m_xPageBackground( new PageBackground( m_xContext ) )
+ , m_xPageBackground( new PageBackground )
, m_xXMLNamespaceMap( createNameContainer( ::cppu::UnoType<OUString>::get(),
"com.sun.star.xml.NamespaceMap", "com.sun.star.comp.chart.XMLNameSpaceMap" ), uno::UNO_QUERY)
, mnStart(0)
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 3f60181..7d88338 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -123,9 +123,8 @@ void lcl_CloneAttributedDataPoints(
namespace chart
{
-DataSeries::DataSeries( const uno::Reference< uno::XComponentContext > & xContext ) :
+DataSeries::DataSeries() :
::property::OPropertySet( m_aMutex ),
- m_xContext( xContext ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
{
}
@@ -134,7 +133,6 @@ DataSeries::DataSeries( const DataSeries & rOther ) :
MutexContainer(),
impl::DataSeries_Base(),
::property::OPropertySet( rOther, m_aMutex ),
- m_xContext( rOther.m_xContext ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
{
if( ! rOther.m_aDataSequences.empty())
@@ -581,10 +579,10 @@ css::uno::Sequence< OUString > SAL_CALL DataSeries::getSupportedServiceNames()
} // namespace chart
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_chart_DataSeries_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart_DataSeries_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ::chart::DataSeries(context));
+ return cppu::acquire(new ::chart::DataSeries );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index 117eafb..0252c8c 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -110,9 +110,8 @@ struct StaticPageBackgroundInfo : public rtl::StaticAggregate< uno::Reference< b
namespace chart
{
-PageBackground::PageBackground( const uno::Reference< uno::XComponentContext > & xContext ) :
- ::property::OPropertySet( m_aMutex ),
- m_xContext( xContext ),
+PageBackground::PageBackground() :
+ ::property::OPropertySet( m_aMutex ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
{}
@@ -120,7 +119,6 @@ PageBackground::PageBackground( const PageBackground & rOther ) :
MutexContainer(),
impl::PageBackground_Base(),
::property::OPropertySet( rOther, m_aMutex ),
- m_xContext( rOther.m_xContext ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
{}
@@ -233,10 +231,10 @@ IMPLEMENT_FORWARD_XINTERFACE2( PageBackground, PageBackground_Base, ::property::
} // namespace chart
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_chart2_PageBackground_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart2_PageBackground_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ::chart::PageBackground(context));
+ return cppu::acquire(new ::chart::PageBackground );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx
index 99abf81..280ff9b 100644
--- a/chart2/source/model/main/PageBackground.hxx
+++ b/chart2/source/model/main/PageBackground.hxx
@@ -48,7 +48,7 @@ class PageBackground :
public ::property::OPropertySet
{
public:
- explicit PageBackground( const css::uno::Reference< css::uno::XComponentContext > & xContext );
+ explicit PageBackground();
virtual ~PageBackground() override;
/// XServiceInfo declarations
@@ -104,8 +104,6 @@ protected:
using OPropertySet::disposing;
private:
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
-
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
};
diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx
index b2abf8e..ac29630 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -144,7 +144,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource(
if( nSeriesIndex < aSeriesToReUse.getLength())
xSeries.set( aSeriesToReUse[nSeriesIndex] );
else
- xSeries.set( new DataSeries( GetComponentContext() ) );
+ xSeries.set( new DataSeries );
OSL_ASSERT( xSeries.is() );
Reference< data::XDataSink > xSink( xSeries, uno::UNO_QUERY );
OSL_ASSERT( xSink.is() );
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index 9d106da..6ed1547 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -120,7 +120,7 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource(
if( nSeriesIndex < aSeriesToReUse.getLength())
xSeries.set( aSeriesToReUse[nSeriesIndex] );
else
- xSeries.set( new DataSeries( GetComponentContext() ));
+ xSeries.set( new DataSeries );
OSL_ASSERT( xSeries.is() );
Reference< data::XDataSink > xSink( xSeries, uno::UNO_QUERY );
OSL_ASSERT( xSink.is() );
diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx
index d92ee28..cbd77c7 100644
--- a/chart2/source/model/template/StockDataInterpreter.cxx
+++ b/chart2/source/model/template/StockDataInterpreter.cxx
@@ -239,7 +239,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource(
if( nReUsedSeriesIdx < rSeriesToReUse.getLength())
xSeries.set( rSeriesToReUse[nReUsedSeriesIdx] );
else
- xSeries.set( new DataSeries( GetComponentContext() ) );
+ xSeries.set( new DataSeries );
OSL_ASSERT( xSeries.is() );
Reference< data::XDataSink > xSink( xSeries, uno::UNO_QUERY_THROW );
OSL_ASSERT( xSink.is() );
diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx
index c64f54b..c008a1e 100644
--- a/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/chart2/source/model/template/XYDataInterpreter.cxx
@@ -128,7 +128,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource(
if( nSeriesIndex < aSeriesToReUse.getLength())
xSeries.set( aSeriesToReUse[nSeriesIndex] );
else
- xSeries.set( new DataSeries( GetComponentContext() ) );
+ xSeries.set( new DataSeries );
OSL_ASSERT( xSeries.is() );
Reference< data::XDataSink > xSink( xSeries, uno::UNO_QUERY );
OSL_ASSERT( xSink.is() );
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index ee4c228..aa4573d 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -81,12 +81,7 @@ const SfxItemPropertySet* GetErrorBarPropertySet()
namespace chart
{
-uno::Reference< beans::XPropertySet > createErrorBar( const uno::Reference< uno::XComponentContext > & xContext )
-{
- return new ErrorBar( xContext );
-}
-
-ErrorBar::ErrorBar( uno::Reference< uno::XComponentContext > const & xContext ) :
+ErrorBar::ErrorBar() :
mnLineWidth(0),
meLineStyle(drawing::LineStyle_SOLID),
maLineColor(0),
@@ -98,7 +93,6 @@ ErrorBar::ErrorBar( uno::Reference< uno::XComponentContext > const & xContext )
mfNegativeError(0),
mfWeight(1),
meStyle(css::chart::ErrorBarStyle::NONE),
- m_xContext( xContext ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
{}
@@ -118,7 +112,6 @@ ErrorBar::ErrorBar( const ErrorBar & rOther ) :
mfNegativeError(rOther.mfNegativeError),
mfWeight(rOther.mfWeight),
meStyle(rOther.meStyle),
- m_xContext( rOther.m_xContext ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
{
if( ! rOther.m_aDataSequences.empty())
@@ -502,10 +495,10 @@ using impl::ErrorBar_Base;
} // namespace chart
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_chart2_ErrorBar_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart2_ErrorBar_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ::chart::ErrorBar(context));
+ return cppu::acquire(new ::chart::ErrorBar);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 084cc2f..abd80a3 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -84,15 +84,12 @@ OUString lcl_getServiceNameForType(SvxChartRegress eType)
namespace chart
{
-Reference< XRegressionCurve > RegressionCurveHelper::createMeanValueLine(
- const Reference< XComponentContext > & xContext )
+Reference< XRegressionCurve > RegressionCurveHelper::createMeanValueLine()
{
- return Reference< XRegressionCurve >(
- new MeanValueRegressionCurve( xContext ));
+ return Reference< XRegressionCurve >( new MeanValueRegressionCurve );
}
Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServiceName(
- const Reference< XComponentContext > & xContext,
const OUString& aServiceName )
{
Reference< XRegressionCurve > xResult;
@@ -100,27 +97,27 @@ Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServ
// todo: use factory methods with service name
if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" )
{
- xResult.set( new LinearRegressionCurve( xContext ) );
+ xResult.set( new LinearRegressionCurve );
}
else if( aServiceName == "com.sun.star.chart2.LogarithmicRegressionCurve" )
{
- xResult.set( new LogarithmicRegressionCurve( xContext ) );
+ xResult.set( new LogarithmicRegressionCurve );
}
else if( aServiceName == "com.sun.star.chart2.ExponentialRegressionCurve" )
{
- xResult.set( new ExponentialRegressionCurve( xContext ) );
+ xResult.set( new ExponentialRegressionCurve );
}
else if( aServiceName == "com.sun.star.chart2.PotentialRegressionCurve" )
{
- xResult.set( new PotentialRegressionCurve( xContext ) );
+ xResult.set( new PotentialRegressionCurve );
}
else if( aServiceName == "com.sun.star.chart2.PolynomialRegressionCurve" )
{
- xResult.set( new PolynomialRegressionCurve( xContext ) );
+ xResult.set( new PolynomialRegressionCurve );
}
else if( aServiceName == "com.sun.star.chart2.MovingAverageRegressionCurve" )
{
- xResult.set( new MovingAverageRegressionCurve( xContext ) );
+ xResult.set( new MovingAverageRegressionCurve );
}
return xResult;
@@ -299,7 +296,6 @@ uno::Reference< chart2::XRegressionCurve >
void RegressionCurveHelper::addMeanValueLine(
uno::Reference< XRegressionCurveContainer > & xRegCnt,
- const uno::Reference< XComponentContext > & xContext,
const uno::Reference< XPropertySet > & xSeriesProp )
{
if( !xRegCnt.is() ||
@@ -307,7 +303,7 @@ void RegressionCurveHelper::addMeanValueLine(
return;
// todo: use a valid context
- uno::Reference< XRegressionCurve > xCurve( createMeanValueLine( xContext ));
+ uno::Reference< XRegressionCurve > xCurve( createMeanValueLine() );
xRegCnt->addRegressionCurve( xCurve );
if( xSeriesProp.is())
@@ -372,8 +368,7 @@ uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::addRegressionC
if( !aServiceName.isEmpty())
{
// todo: use a valid context
- xCurve.set( createRegressionCurveByServiceName(
- uno::Reference< uno::XComponentContext >(), aServiceName ));
+ xCurve.set( createRegressionCurveByServiceName( aServiceName ) );
if( xEquationProperties.is())
xCurve->setEquationProperties( xEquationProperties );
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index addd33a..bce0d50 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -176,14 +176,11 @@ struct StaticRegressionCurveInfo : public rtl::StaticAggregate< uno::Reference<
namespace chart
{
-RegressionCurveModel::RegressionCurveModel(
- uno::Reference< uno::XComponentContext > const & xContext,
- tCurveType eCurveType ) :
- ::property::OPropertySet( m_aMutex ),
- m_xContext( xContext ),
+RegressionCurveModel::RegressionCurveModel( tCurveType eCurveType ) :
+ ::property::OPropertySet( m_aMutex ),
m_eRegressionCurveType( eCurveType ),
- m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()),
- m_xEquationProperties( new RegressionEquation )
+ m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()),
+ 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
@@ -193,10 +190,9 @@ RegressionCurveModel::RegressionCurveModel(
}
RegressionCurveModel::RegressionCurveModel( const RegressionCurveModel & rOther ) :
- MutexContainer(),
- impl::RegressionCurveModel_Base(),
- ::property::OPropertySet( rOther, m_aMutex ),
- m_xContext( rOther.m_xContext ),
+ MutexContainer(),
+ impl::RegressionCurveModel_Base(),
+ ::property::OPropertySet( rOther, m_aMutex ),
m_eRegressionCurveType( rOther.m_eRegressionCurveType ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
{
@@ -345,9 +341,8 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( RegressionCurveModel, RegressionCurveModel_Bas
// implementations
-MeanValueRegressionCurve::MeanValueRegressionCurve(
- const uno::Reference< uno::XComponentContext > & xContext )
- : RegressionCurveModel( xContext, RegressionCurveModel::CURVE_TYPE_MEAN_VALUE )
+MeanValueRegressionCurve::MeanValueRegressionCurve()
+ : RegressionCurveModel( RegressionCurveModel::CURVE_TYPE_MEAN_VALUE )
{}
MeanValueRegressionCurve::MeanValueRegressionCurve(
const MeanValueRegressionCurve & rOther ) :
@@ -380,9 +375,8 @@ uno::Reference< util::XCloneable > SAL_CALL MeanValueRegressionCurve::createClon
return uno::Reference< util::XCloneable >( new MeanValueRegressionCurve( *this ));
}
-LinearRegressionCurve::LinearRegressionCurve(
- const uno::Reference< uno::XComponentContext > & xContext )
- : RegressionCurveModel( xContext, RegressionCurveModel::CURVE_TYPE_LINEAR )
+LinearRegressionCurve::LinearRegressionCurve()
+ : RegressionCurveModel( RegressionCurveModel::CURVE_TYPE_LINEAR )
{}
LinearRegressionCurve::LinearRegressionCurve(
const LinearRegressionCurve & rOther ) :
@@ -415,9 +409,8 @@ uno::Reference< util::XCloneable > SAL_CALL LinearRegressionCurve::createClone()
return uno::Reference< util::XCloneable >( new LinearRegressionCurve( *this ));
}
-LogarithmicRegressionCurve::LogarithmicRegressionCurve(
- const uno::Reference< uno::XComponentContext > & xContext )
- : RegressionCurveModel( xContext, RegressionCurveModel::CURVE_TYPE_LOGARITHM )
+LogarithmicRegressionCurve::LogarithmicRegressionCurve()
+ : RegressionCurveModel( RegressionCurveModel::CURVE_TYPE_LOGARITHM )
{}
LogarithmicRegressionCurve::LogarithmicRegressionCurve(
const LogarithmicRegressionCurve & rOther ) :
@@ -450,9 +443,8 @@ uno::Reference< util::XCloneable > SAL_CALL LogarithmicRegressionCurve::createCl
return uno::Reference< util::XCloneable >( new LogarithmicRegressionCurve( *this ));
}
-ExponentialRegressionCurve::ExponentialRegressionCurve(
- const uno::Reference< uno::XComponentContext > & xContext )
- : RegressionCurveModel( xContext, RegressionCurveModel::CURVE_TYPE_EXPONENTIAL )
+ExponentialRegressionCurve::ExponentialRegressionCurve()
+ : RegressionCurveModel( RegressionCurveModel::CURVE_TYPE_EXPONENTIAL )
{}
ExponentialRegressionCurve::ExponentialRegressionCurve(
const ExponentialRegressionCurve & rOther ) :
@@ -485,9 +477,8 @@ uno::Reference< util::XCloneable > SAL_CALL ExponentialRegressionCurve::createCl
return uno::Reference< util::XCloneable >( new ExponentialRegressionCurve( *this ));
}
-PotentialRegressionCurve::PotentialRegressionCurve(
- const uno::Reference< uno::XComponentContext > & xContext )
- : RegressionCurveModel( xContext, RegressionCurveModel::CURVE_TYPE_POWER )
+PotentialRegressionCurve::PotentialRegressionCurve()
+ : RegressionCurveModel( RegressionCurveModel::CURVE_TYPE_POWER )
{}
PotentialRegressionCurve::PotentialRegressionCurve(
const PotentialRegressionCurve & rOther ) :
@@ -520,9 +511,8 @@ uno::Reference< util::XCloneable > SAL_CALL PotentialRegressionCurve::createClon
return uno::Reference< util::XCloneable >( new PotentialRegressionCurve( *this ));
}
-PolynomialRegressionCurve::PolynomialRegressionCurve(
- const uno::Reference< uno::XComponentContext > & xContext )
- : RegressionCurveModel( xContext, RegressionCurveModel::CURVE_TYPE_POLYNOMIAL )
+PolynomialRegressionCurve::PolynomialRegressionCurve()
+ : RegressionCurveModel( RegressionCurveModel::CURVE_TYPE_POLYNOMIAL )
{}
PolynomialRegressionCurve::PolynomialRegressionCurve(
const PolynomialRegressionCurve & rOther ) :
@@ -555,9 +545,8 @@ uno::Reference< util::XCloneable > SAL_CALL PolynomialRegressionCurve::createClo
return uno::Reference< util::XCloneable >( new PolynomialRegressionCurve( *this ));
}
-MovingAverageRegressionCurve::MovingAverageRegressionCurve(
- const uno::Reference< uno::XComponentContext > & xContext )
- : RegressionCurveModel( xContext, RegressionCurveModel::CURVE_TYPE_MOVING_AVERAGE )
+MovingAverageRegressionCurve::MovingAverageRegressionCurve()
+ : RegressionCurveModel( RegressionCurveModel::CURVE_TYPE_MOVING_AVERAGE )
{}
MovingAverageRegressionCurve::MovingAverageRegressionCurve(
const MovingAverageRegressionCurve & rOther ) :
@@ -593,52 +582,52 @@ uno::Reference< util::XCloneable > SAL_CALL MovingAverageRegressionCurve::create
} // namespace chart
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_chart2_ExponentialRegressionCurve_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart2_ExponentialRegressionCurve_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ::chart::ExponentialRegressionCurve(context));
+ return cppu::acquire(new ::chart::ExponentialRegressionCurve );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_chart2_LinearRegressionCurve_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart2_LinearRegressionCurve_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ::chart::LinearRegressionCurve(context));
+ return cppu::acquire(new ::chart::LinearRegressionCurve );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_chart2_LogarithmicRegressionCurve_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart2_LogarithmicRegressionCurve_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ::chart::LogarithmicRegressionCurve(context));
+ return cppu::acquire(new ::chart::LogarithmicRegressionCurve );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_chart2_MeanValueRegressionCurve_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart2_MeanValueRegressionCurve_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ::chart::MeanValueRegressionCurve(context));
+ return cppu::acquire(new ::chart::MeanValueRegressionCurve );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_chart2_PotentialRegressionCurve_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart2_PotentialRegressionCurve_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ::chart::PotentialRegressionCurve(context));
+ return cppu::acquire(new ::chart::PotentialRegressionCurve );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_chart2_PolynomialRegressionCurve_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart2_PolynomialRegressionCurve_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ::chart::PolynomialRegressionCurve(context));
+ return cppu::acquire(new ::chart::PolynomialRegressionCurve );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
-com_sun_star_comp_chart2_MovingAverageRegressionCurve_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart2_MovingAverageRegressionCurve_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ::chart::MovingAverageRegressionCurve(context));
+ return cppu::acquire(new ::chart::MovingAverageRegressionCurve );
}
diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx
index db13524..4e7191a 100644
--- a/chart2/source/tools/RegressionCurveModel.hxx
+++ b/chart2/source/tools/RegressionCurveModel.hxx
@@ -65,8 +65,7 @@ public:
CURVE_TYPE_MOVING_AVERAGE
};
- RegressionCurveModel( css::uno::Reference< css::uno::XComponentContext > const & xContext,
- tCurveType eCurveType );
+ RegressionCurveModel( tCurveType eCurveType );
RegressionCurveModel( const RegressionCurveModel & rOther );
virtual ~RegressionCurveModel() override;
@@ -127,9 +126,6 @@ protected:
void fireModifyEvent();
private:
- css::uno::Reference< css::uno::XComponentContext >
- m_xContext;
-
const tCurveType m_eRegressionCurveType;
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
@@ -141,8 +137,7 @@ private:
class MeanValueRegressionCurve : public RegressionCurveModel
{
public:
- explicit MeanValueRegressionCurve(
- const css::uno::Reference< css::uno::XComponentContext > & xContext );
+ explicit MeanValueRegressionCurve();
explicit MeanValueRegressionCurve(
const MeanValueRegressionCurve & rOther );
virtual ~MeanValueRegressionCurve() override;
@@ -163,11 +158,8 @@ public:
class LinearRegressionCurve : public RegressionCurveModel
{
public:
- explicit LinearRegressionCurve(
- const css::uno::Reference<
- css::uno::XComponentContext > & xContext );
- explicit LinearRegressionCurve(
- const LinearRegressionCurve & rOther );
+ explicit LinearRegressionCurve();
+ explicit LinearRegressionCurve( const LinearRegressionCurve & rOther );
virtual ~LinearRegressionCurve() override;
// ____ XCloneable ____
@@ -186,11 +178,8 @@ public:
class LogarithmicRegressionCurve : public RegressionCurveModel
{
public:
- explicit LogarithmicRegressionCurve(
- const css::uno::Reference<
- css::uno::XComponentContext > & xContext );
- explicit LogarithmicRegressionCurve(
- const LogarithmicRegressionCurve & rOther );
+ explicit LogarithmicRegressionCurve();
+ explicit LogarithmicRegressionCurve( const LogarithmicRegressionCurve & rOther );
virtual ~LogarithmicRegressionCurve() override;
// ____ XCloneable ____
@@ -209,10 +198,8 @@ public:
class ExponentialRegressionCurve : public RegressionCurveModel
{
public:
- explicit ExponentialRegressionCurve(
- const css::uno::Reference< css::uno::XComponentContext > & xContext );
- explicit ExponentialRegressionCurve(
- const ExponentialRegressionCurve & rOther );
+ explicit ExponentialRegressionCurve();
+ explicit ExponentialRegressionCurve( const ExponentialRegressionCurve & rOther );
virtual ~ExponentialRegressionCurve() override;
// ____ XCloneable ____
@@ -231,11 +218,8 @@ public:
class PotentialRegressionCurve : public RegressionCurveModel
{
public:
- explicit PotentialRegressionCurve(
- const css::uno::Reference<
- css::uno::XComponentContext > & xContext );
- explicit PotentialRegressionCurve(
- const PotentialRegressionCurve & rOther );
+ explicit PotentialRegressionCurve();
+ explicit PotentialRegressionCurve( const PotentialRegressionCurve & rOther );
virtual ~PotentialRegressionCurve() override;
// ____ XCloneable ____
@@ -254,10 +238,8 @@ public:
class PolynomialRegressionCurve : public RegressionCurveModel
{
public:
- explicit PolynomialRegressionCurve(
- const css::uno::Reference< css::uno::XComponentContext > & xContext );
- explicit PolynomialRegressionCurve(
- const PolynomialRegressionCurve & rOther );
+ explicit PolynomialRegressionCurve();
+ explicit PolynomialRegressionCurve( const PolynomialRegressionCurve & rOther );
virtual ~PolynomialRegressionCurve() override;
// ____ XCloneable ____
@@ -276,10 +258,8 @@ public:
class MovingAverageRegressionCurve : public RegressionCurveModel
{
public:
- explicit MovingAverageRegressionCurve(
- const css::uno::Reference< css::uno::XComponentContext > & xContext );
- explicit MovingAverageRegressionCurve(
- const MovingAverageRegressionCurve & rOther );
+ explicit MovingAverageRegressionCurve();
+ explicit MovingAverageRegressionCurve( const MovingAverageRegressionCurve & rOther );
virtual ~MovingAverageRegressionCurve() override;
// ____ XCloneable ____
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index 5ea07e4..378d0f8 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -297,7 +297,6 @@ void StatisticsHelper::setErrorDataSequence(
Reference< beans::XPropertySet > StatisticsHelper::addErrorBars(
const Reference< chart2::XDataSeries > & xDataSeries,
- const Reference< uno::XComponentContext > & xContext,
sal_Int32 nStyle,
bool bYError /* = true */ )
{
@@ -311,7 +310,7 @@ Reference< beans::XPropertySet > StatisticsHelper::addErrorBars(
if( !( xSeriesProp->getPropertyValue( aPropName ) >>= xErrorBar ) ||
!xErrorBar.is())
{
- xErrorBar.set( createErrorBar( xContext ));
+ xErrorBar.set( new ErrorBar );
}
OSL_ASSERT( xErrorBar.is());
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index 1ff40b5..e90de94 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -83,8 +83,7 @@ OGroupComp::OGroupComp()
}
OGroupComp::OGroupComp(const OGroupComp& _rSource)
- :m_aName( _rSource.m_aName )
- ,m_xComponent( _rSource.m_xComponent )
+ :m_xComponent( _rSource.m_xComponent )
,m_xControlModel(_rSource.m_xControlModel)
,m_nPos( _rSource.m_nPos )
,m_nTabIndex( _rSource.m_nTabIndex )
@@ -92,8 +91,7 @@ OGroupComp::OGroupComp(const OGroupComp& _rSource)
}
OGroupComp::OGroupComp(const Reference<XPropertySet>& rxSet, sal_Int32 nInsertPos )
- : m_aName( OGroupManager::GetGroupName( rxSet ) )
- , m_xComponent( rxSet )
+ : m_xComponent( rxSet )
, m_xControlModel(rxSet,UNO_QUERY)
, m_nPos( nInsertPos )
, m_nTabIndex(0)
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index 470925f..3ede11f 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -88,7 +88,6 @@ namespace frm
class OGroupComp
{
- OUString m_aName;
css::uno::Reference< css::beans::XPropertySet> m_xComponent;
css::uno::Reference< css::awt::XControlModel> m_xControlModel;
sal_Int32 m_nPos;
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index baf6d56..3a132eb 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -48,11 +48,10 @@ class BASIC_DLLPUBLIC BasicError
private:
sal_uInt64 nErrorId;
BasicErrorReason nReason;
- OUString aErrStr;
public:
BasicError( const BasicError& rErr );
- BasicError( sal_uInt64 nId, BasicErrorReason nR, const OUString& rErrStr );
+ BasicError( sal_uInt64 nId, BasicErrorReason nR );
sal_uInt64 GetErrorId() const { return nErrorId; }
};
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 59fd6cf..6e0b0b9 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -193,7 +193,6 @@ friend class SfxStyleSheetBase;
protected:
SfxStyleSheetIterator& GetIterator_Impl();
- OUString aAppName;
SfxItemPool& rPool;
SfxStyleFamily nSearchFamily;
sal_uInt16 nMask;
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 023e270..75ecace 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -138,14 +138,11 @@ public:
class SvxIconChoiceCtrlColumnInfo
{
- OUString aColText;
- Image aColImage;
long nWidth;
- sal_uInt16 nSubItem;
public:
SvxIconChoiceCtrlColumnInfo() :
- nWidth( 100 ), nSubItem( 0 ) {}
+ nWidth( 100 ) {}
SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& );
void SetWidth( long nWd ) { nWidth = nWd; }
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index 45cd4fb..a59e304 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
@@ -56,8 +56,6 @@ namespace utl
m_xContainerAccess; /// modifying set nodes (optional interface of our UNO object)
bool m_bEscapeNames; /// escape names before accessing children ?
- OUString m_sCompletePath;
-
OConfigurationNode insertNode(const OUString& _rName,const css::uno::Reference< css::uno::XInterface >& _xNode) const throw();
protected:
diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx
index ad5ad56..ce846c0 100644
--- a/include/vcl/accel.hxx
+++ b/include/vcl/accel.hxx
@@ -36,7 +36,6 @@ class VCL_DLLPUBLIC Accelerator : public Resource
private:
ImplAccelData* mpData;
- OUString maHelpStr;
Link<Accelerator&,void> maActivateHdl;
Link<Accelerator&,void> maSelectHdl;
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 235afdb..8329496 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -202,11 +202,8 @@ class XMLElement : public XMLParentNode
private:
OString m_sElementName;
std::unique_ptr<XMLAttributeList> m_pAttributes;
- OString m_sProject;
- OString m_sFilename;
OString m_sId;
OString m_sOldRef;
- OString m_sResourceType;
OString m_sLanguageId;
int m_nPos;
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 30f8278..b3d8c1d 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -555,11 +555,8 @@ XMLElement::XMLElement(
)
: XMLParentNode( pParent )
, m_sElementName( rName )
- , m_sProject(OString())
- , m_sFilename(OString())
, m_sId(OString())
, m_sOldRef(OString())
- , m_sResourceType(OString())
, m_sLanguageId(OString())
, m_nPos(0)
{
@@ -568,11 +565,8 @@ XMLElement::XMLElement(
XMLElement::XMLElement(const XMLElement& rObj)
: XMLParentNode( rObj )
, m_sElementName( rObj.m_sElementName )
- , m_sProject( rObj.m_sProject )
- , m_sFilename( rObj.m_sFilename )
, m_sId( rObj.m_sId )
, m_sOldRef( rObj.m_sOldRef )
- , m_sResourceType( rObj.m_sResourceType )
, m_sLanguageId( rObj.m_sLanguageId )
, m_nPos( rObj.m_nPos )
{
@@ -590,11 +584,8 @@ XMLElement& XMLElement::operator=(const XMLElement& rObj)
{
XMLParentNode::operator=(rObj);
m_sElementName = rObj.m_sElementName;
- m_sProject = rObj.m_sProject;
- m_sFilename = rObj.m_sFilename;
m_sId = rObj.m_sId;
m_sOldRef = rObj.m_sOldRef;
- m_sResourceType = rObj.m_sResourceType;
m_sLanguageId = rObj.m_sLanguageId;
m_nPos = rObj.m_nPos;
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 753df75..befd323 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -94,7 +94,6 @@ private:
// cached data
css::uno::Reference<css::sheet::XDimensionsSupplier> xSource;
ScDPOutput* pOutput;
- sal_uInt16 mnAutoFormatIndex;
long nHeaderRows; // page fields plus filter button
bool mbHeaderLayout:1; // true : grid, false : standard
bool bAllowMove:1;
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 4c07fb1..22d8744 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -312,7 +312,6 @@ ScDPObject::ScDPObject( ScDocument* pD ) :
pServDesc( nullptr ),
mpTableData(static_cast<ScDPTableData*>(nullptr)),
pOutput( nullptr ),
- mnAutoFormatIndex( 65535 ),
nHeaderRows( 0 ),
mbHeaderLayout(false),
bAllowMove(false),
@@ -332,7 +331,6 @@ ScDPObject::ScDPObject(const ScDPObject& r) :
pServDesc( nullptr ),
mpTableData(static_cast<ScDPTableData*>(nullptr)),
pOutput( nullptr ),
- mnAutoFormatIndex( r.mnAutoFormatIndex ),
nHeaderRows( r.nHeaderRows ),
mbHeaderLayout( r.mbHeaderLayout ),
bAllowMove(false),
@@ -363,7 +361,6 @@ ScDPObject& ScDPObject::operator= (const ScDPObject& r)
aTableName = r.aTableName;
aTableTag = r.aTableTag;
aOutRange = r.aOutRange;
- mnAutoFormatIndex = r.mnAutoFormatIndex;
nHeaderRows = r.nHeaderRows;
mbHeaderLayout = r.mbHeaderLayout;
bAllowMove = false;
diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx
index d0509ad..a4ab36d 100644
--- a/sd/inc/cusshow.hxx
+++ b/sd/inc/cusshow.hxx
@@ -33,19 +33,15 @@ public:
typedef ::std::vector<const SdPage*> PageVec;
private:
- PageVec maPages;
+ PageVec maPages;
OUString aName;
- SdDrawDocument* pDoc;
// this is a weak reference to a possible living api wrapper for this custom show
css::uno::WeakReference< css::uno::XInterface > mxUnoCustomShow;
- SdCustomShow() = delete;
-
public:
- // single argument ctors shall be explicit
- explicit SdCustomShow(SdDrawDocument* pDrawDoc);
- SdCustomShow(SdDrawDocument* pDrawDoc, css::uno::Reference< css::uno::XInterface > const & xShow );
+ SdCustomShow();
+ SdCustomShow(css::uno::Reference< css::uno::XInterface > const & xShow );
~SdCustomShow();
diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx
index 8f67ca9..c96db30 100644
--- a/sd/source/core/cusshow.cxx
+++ b/sd/source/core/cusshow.cxx
@@ -34,9 +34,8 @@ using namespace ::com::sun::star;
|* Ctor
|*
\************************************************************************/
-SdCustomShow::SdCustomShow(SdDrawDocument* pDrawDoc)
- : maPages(),
- pDoc(pDrawDoc)
+SdCustomShow::SdCustomShow()
+ : maPages()
{
}
@@ -49,12 +48,10 @@ SdCustomShow::SdCustomShow( const SdCustomShow& rShow )
: maPages(rShow.maPages)
{
aName = rShow.GetName();
- pDoc = rShow.pDoc;
}
-SdCustomShow::SdCustomShow(SdDrawDocument* pDrawDoc, css::uno::Reference< css::uno::XInterface > const & xShow )
+SdCustomShow::SdCustomShow(css::uno::Reference< css::uno::XInterface > const & xShow )
: maPages(),
- pDoc(pDrawDoc),
mxUnoCustomShow( xShow )
{
}
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 3b22b8c..78b5e27 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1305,7 +1305,7 @@ bool ImplSdPPTImport::Import()
SdCustomShowList* pList = mpDoc->GetCustomShowList( true );
if ( pList )
{
- SdCustomShow* pSdCustomShow = new SdCustomShow( mpDoc );
+ SdCustomShow* pSdCustomShow = new SdCustomShow;
pSdCustomShow->SetName( aCuShow );
sal_uInt32 nFound = 0;
for ( sal_uInt32 nS = 0; nS < nSCount; nS++ )
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index c76e60f..383f403 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -23,10 +23,9 @@
#include <osl/diagnose.h>
#include <o3tl/make_unique.hxx>
-PropEntry::PropEntry( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize, sal_uInt16 nTextEnc ) :
+PropEntry::PropEntry( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize ) :
mnId ( nId ),
mnSize ( nBufSize ),
- mnTextEnc ( nTextEnc ),
mpBuf ( new sal_uInt8[ nBufSize ] )
{
memcpy( static_cast<void*>(mpBuf), static_cast<void const *>(pBuf), nBufSize );
@@ -35,7 +34,6 @@ PropEntry::PropEntry( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize
PropEntry::PropEntry( const PropEntry& rProp ) :
mnId ( rProp.mnId ),
mnSize ( rProp.mnSize ),
- mnTextEnc ( rProp.mnTextEnc ),
mpBuf ( new sal_uInt8[ mnSize ] )
{
memcpy( static_cast<void*>(mpBuf), static_cast<void const *>(rProp.mpBuf), mnSize );
@@ -48,7 +46,6 @@ PropEntry& PropEntry::operator=(const PropEntry& rPropEntry)
delete[] mpBuf;
mnId = rPropEntry.mnId;
mnSize = rPropEntry.mnSize;
- mnTextEnc = rPropEntry.mnTextEnc;
mpBuf = new sal_uInt8[ mnSize ];
memcpy( static_cast<void*>(mpBuf), static_cast<void const *>(rPropEntry.mpBuf), mnSize );
}
@@ -260,15 +257,15 @@ void Section::AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBu
for ( iter = maEntries.begin(); iter != maEntries.end(); ++iter )
{
if ( (*iter)->mnId == nId )
- (*iter).reset(new PropEntry( nId, pBuf, nBufSize, mnTextEnc ));
+ (*iter).reset(new PropEntry( nId, pBuf, nBufSize ));
else if ( (*iter)->mnId > nId )
- maEntries.insert( iter, o3tl::make_unique<PropEntry>( nId, pBuf, nBufSize, mnTextEnc ));
+ maEntries.insert( iter, o3tl::make_unique<PropEntry>( nId, pBuf, nBufSize ));
else
continue;
return;
}
- maEntries.push_back( o3tl::make_unique<PropEntry>( nId, pBuf, nBufSize, mnTextEnc ) );
+ maEntries.push_back( o3tl::make_unique<PropEntry>( nId, pBuf, nBufSize ) );
}
void Section::GetDictionary(Dictionary& rDict)
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index 682076d..04c619a 100644
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -87,10 +87,9 @@ struct PropEntry
{
sal_uInt32 mnId;
sal_uInt32 mnSize;
- sal_uInt16 mnTextEnc;
sal_uInt8* mpBuf;
- PropEntry( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize, sal_uInt16 nTextEnc );
+ PropEntry( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize );
PropEntry( const PropEntry& rProp );
~PropEntry() { delete[] mpBuf; } ;
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 1fce442..8c66730 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -338,7 +338,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( vcl::Window* pWindow,
}
else
{
- rpCustomShow = new SdCustomShow( &rDoc );
+ rpCustomShow = new SdCustomShow;
m_pEdtName->SetText( OUString( SdResId( STR_NEW_CUSTOMSHOW ) ) );
m_pEdtName->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
rpCustomShow->SetName( m_pEdtName->GetText() );
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index c2d7bd5..61cddf6 100644
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -108,7 +108,7 @@ void SAL_CALL SdXCustomPresentation::insertByIndex( sal_Int32 Index, const uno::
mpModel = pPage->GetModel();
if( nullptr != mpModel && nullptr == mpSdCustomShow && mpModel->GetDoc() )
- mpSdCustomShow = new SdCustomShow( mpModel->GetDoc() );
+ mpSdCustomShow = new SdCustomShow;
mpSdCustomShow->PagesVector().insert(mpSdCustomShow->PagesVector().begin() + Index,
static_cast<SdPage*>(pPage->GetSdrPage()));
@@ -349,7 +349,7 @@ void SAL_CALL SdXCustomPresentationAccess::insertByName( const OUString& aName,
SdCustomShow* pShow = pXShow->GetSdCustomShow();
if( nullptr == pShow )
{
- pShow = new SdCustomShow( mrModel.GetDoc(), xContainer );
+ pShow = new SdCustomShow( xContainer );
pXShow->SetSdCustomShow( pShow );
}
else
diff --git a/slideshow/source/inc/listenercontainer.hxx b/slideshow/source/inc/listenercontainer.hxx
index c16fa89..e99daf5 100644
--- a/slideshow/source/inc/listenercontainer.hxx
+++ b/slideshow/source/inc/listenercontainer.hxx
@@ -40,12 +40,6 @@ struct EmptyBase
typedef EmptyClearableGuard ClearableGuard;
};
-class MutexBase
-{
-public:
- mutable osl::Mutex maMutex;
-};
-
template< typename result_type, typename ListenerTargetT > struct FunctionApply
{
template<typename FuncT> static bool apply(
@@ -406,22 +400,6 @@ private:
};
-/** ListenerContainer variant that serialized access
-
- This ListenerContainer is safe to use in a multi-threaded
- context. It serializes access to the object, and avoids
- dead-locking by releasing the object mutex before calling
- listeners.
- */
-template< typename ListenerT,
- typename ContainerT=std::vector<ListenerT> >
-class ThreadSafeListenerContainer : public ListenerContainerBase<ListenerT,
- MutexBase,
- ContainerT>
-{
-};
-
-
/** ListenerContainer variant that does not serialize access
This ListenerContainer version is not safe to use in a
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index b4e8fe5..63842fd 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -576,7 +576,6 @@ SfxStyleSheetIterator& SfxStyleSheetBasePool::GetIterator_Impl()
SfxStyleSheetBasePool::SfxStyleSheetBasePool( SfxItemPool& r ) :
pImpl(new SfxStyleSheetBasePool_Impl),
- aAppName(r.GetName()),
rPool(r),
nSearchFamily(SfxStyleFamily::Para),
nMask(SFXSTYLEBIT_ALL)
@@ -590,7 +589,6 @@ SfxStyleSheetBasePool::SfxStyleSheetBasePool( const SfxStyleSheetBasePool& r ) :
SfxBroadcaster( r ),
comphelper::OWeakTypeObject(),
pImpl(new SfxStyleSheetBasePool_Impl),
- aAppName(r.aAppName),
rPool(r.rPool),
nSearchFamily(r.nSearchFamily),
nMask( r.nMask )
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 032345a..7a09698 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -55,10 +55,8 @@ OUString SvxIconChoiceCtrlEntry::GetDisplayText() const
SvxIconChoiceCtrlColumnInfo::SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& rInfo )
- : aColText( rInfo.aColText ), aColImage( rInfo.aColImage )
{
nWidth = rInfo.nWidth;
- nSubItem = rInfo.nSubItem;
}
/*****************************************************************************
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 1efc141..9a33004 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -100,7 +100,6 @@ struct CpyTabFrame
struct CR_SetBoxWidth
{
SwSelBoxes m_Boxes;
- std::map<SwTableLine*, sal_uInt16> m_LineWidthMap;
SwShareBoxFormats aShareFormats;
SwTableNode* pTableNd;
SwUndoTableNdsChg* pUndo;
@@ -122,9 +121,7 @@ struct CR_SetBoxWidth
nMode = pTableNd->GetTable().GetTableChgMode();
}
CR_SetBoxWidth( const CR_SetBoxWidth& rCpy )
- : m_LineWidthMap(rCpy.m_LineWidthMap)
- ,
- pTableNd( rCpy.pTableNd ),
+ : pTableNd( rCpy.pTableNd ),
pUndo( rCpy.pUndo ),
nDiff( rCpy.nDiff ), nSide( rCpy.nSide ),
nMaxSize( rCpy.nMaxSize ), nLowerDiff( 0 ),
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx
index 9342658..c0dc004 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.cxx
@@ -84,7 +84,6 @@ namespace utl
, m_xReplaceAccess(_rSource.m_xReplaceAccess)
, m_xContainerAccess(_rSource.m_xContainerAccess)
, m_bEscapeNames(_rSource.m_bEscapeNames)
- , m_sCompletePath(_rSource.m_sCompletePath)
{
Reference< XComponent > xConfigNodeComp(m_xDirectAccess, UNO_QUERY);
if (xConfigNodeComp.is())
@@ -98,7 +97,6 @@ namespace utl
, m_xReplaceAccess(std::move(_rSource.m_xReplaceAccess))
, m_xContainerAccess(std::move(_rSource.m_xContainerAccess))
, m_bEscapeNames(std::move(_rSource.m_bEscapeNames))
- , m_sCompletePath(std::move(_rSource.m_sCompletePath))
{
Reference< XComponent > xConfigNodeComp(m_xDirectAccess, UNO_QUERY);
if (xConfigNodeComp.is())
@@ -114,7 +112,6 @@ namespace utl
m_xContainerAccess = _rSource.m_xContainerAccess;
m_xReplaceAccess = _rSource.m_xReplaceAccess;
m_bEscapeNames = _rSource.m_bEscapeNames;
- m_sCompletePath = _rSource.m_sCompletePath;
Reference< XComponent > xConfigNodeComp(m_xDirectAccess, UNO_QUERY);
if (xConfigNodeComp.is())
@@ -132,7 +129,6 @@ namespace utl
m_xContainerAccess = std::move(_rSource.m_xContainerAccess);
m_xReplaceAccess = std::move(_rSource.m_xReplaceAccess);
m_bEscapeNames = std::move(_rSource.m_bEscapeNames);
- m_sCompletePath = std::move(_rSource.m_sCompletePath);
Reference< XComponent > xConfigNodeComp(m_xDirectAccess, UNO_QUERY);
if (xConfigNodeComp.is())
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index d2a33b0..64b2588 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -234,7 +234,6 @@ Accelerator::Accelerator()
Accelerator::Accelerator( const Accelerator& rAccel ) :
Resource(),
- maHelpStr( rAccel.maHelpStr ),
maCurKeyCode( rAccel.maCurKeyCode )
{
@@ -299,7 +298,6 @@ Accelerator& Accelerator::operator=( const Accelerator& rAccel )
{
// assign new data
- maHelpStr = rAccel.maHelpStr;
maCurKeyCode = vcl::KeyCode();
mnCurId = 0;
mnCurRepeat = 0;
More information about the Libreoffice-commits
mailing list