summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-19 09:00:04 +0200
committerNoel Grandin <noel@peralex.com>2015-10-19 09:00:04 +0200
commitebd6fec73bfd77aa78a1ae92256d59d04ba999f3 (patch)
tree108b04c50177a6a36dc99dd8cfb2daac310c43a9 /sc
parent7e5bada5540662ae5bde0522bacf28da1e856589 (diff)
Revert "cppcheck:duplInheritedMember"
This reverts commit a55496a9e88ac3da821b0ae0d334866d669540c6.
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/vba/vbaformat.cxx12
-rw-r--r--sc/source/ui/vba/vbastyle.cxx13
-rw-r--r--sc/source/ui/vba/vbastyle.hxx1
3 files changed, 4 insertions, 22 deletions
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index 1896a12b521c..42aaa8f33f2b 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -50,17 +50,7 @@ using namespace ::com::sun::star;
#define LOCALE "Locale"
template< typename... Ifc >
-ScVbaFormat< Ifc... >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent,
- const uno::Reference< uno::XComponentContext > & xContext,
- const uno::Reference< beans::XPropertySet >& _xPropertySet,
- const uno::Reference< frame::XModel >& xModel,
- bool bCheckAmbiguoity ) throw ( script::BasicErrorException )
- : ScVbaFormat_BASE( xParent, xContext ),
- m_aDefaultLocale( OUString("en"), OUString( "US"), OUString() ),
- mxPropertySet( _xPropertySet ),
- mxModel( xModel ),
- mbCheckAmbiguoity( bCheckAmbiguoity ),
- mbAddIndent( false )
+ScVbaFormat< Ifc... >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( OUString("en"), OUString( "US"), OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( false )
{
try
{
diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx
index 6c960839d6f6..15f7b905d469 100644
--- a/sc/source/ui/vba/vbastyle.cxx
+++ b/sc/source/ui/vba/vbastyle.cxx
@@ -57,11 +57,7 @@ void ScVbaStyle::initialise() throw ( uno::RuntimeException, script::BasicErrorE
}
-ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent,
- const uno::Reference< uno::XComponentContext > & xContext,
- const OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel )
- throw ( script::BasicErrorException, uno::RuntimeException )
- : ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false )
+ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false ), mxModel( _xModel )
{
try
{
@@ -73,12 +69,7 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent,
}
}
-ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent,
- const uno::Reference< uno::XComponentContext > & xContext,
- const uno::Reference< beans::XPropertySet >& _xPropertySet,
- const uno::Reference< frame::XModel >& _xModel )
- throw ( script::BasicErrorException, uno::RuntimeException )
- : ScVbaStyle_BASE( xParent, xContext, _xPropertySet, _xModel, false )
+ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, _xPropertySet, _xModel, false ), mxModel( _xModel )
{
try
{
diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx
index efeed19e1ec7..0e5ea95e28bb 100644
--- a/sc/source/ui/vba/vbastyle.hxx
+++ b/sc/source/ui/vba/vbastyle.hxx
@@ -32,6 +32,7 @@ class ScVbaStyle : public ScVbaStyle_BASE
{
protected:
css::uno::Reference< css::style::XStyle > mxStyle;
+ css::uno::Reference< css::frame::XModel > mxModel;
css::uno::Reference< css::container::XNameContainer > mxStyleFamilyNameContainer;
void initialise() throw ( css::uno::RuntimeException, css::script::BasicErrorException );
public: