summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-02 09:23:34 +0200
committerNoel Grandin <noel@peralex.com>2015-03-02 10:25:49 +0200
commita3646d5572b770c74b7b8be80b1091c37a05abc6 (patch)
treebec0aaebc966c0d752b0fb7374a1695ae4c7f5da /sdext
parent302f413eec4da8c8572911d08e939186c5ac57cf (diff)
cppcheck: duplicate inherited member
Change-Id: Iee20ca4523739eb082ea1fa8c1145891c0caed29
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/minimizer/informationdialog.cxx3
-rw-r--r--sdext/source/minimizer/informationdialog.hxx2
-rw-r--r--sdext/source/minimizer/optimizerdialog.cxx1
-rw-r--r--sdext/source/minimizer/optimizerdialog.hxx3
-rw-r--r--sdext/source/minimizer/optimizerdialogcontrols.cxx2
5 files changed, 3 insertions, 8 deletions
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 059215462d24..2aebca091c89 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -265,7 +265,7 @@ void InformationDialog::InitDialog()
OUString aTitle;
if ( !maSaveAsURL.isEmpty() )
{
- Reference< XURLTransformer > xURLTransformer( URLTransformer::create(mxContext) );
+ Reference< XURLTransformer > xURLTransformer( URLTransformer::create(UnoDialog::mxContext) );
util::URL aURL, aPresentationURL;
aURL.Complete = maSaveAsURL;
xURLTransformer->parseSmart( aURL, OUString() );
@@ -315,7 +315,6 @@ void InformationDialog::InitDialog()
InformationDialog::InformationDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame, const OUString& rSaveAsURL, bool& rbOpenNewDocument, const sal_Int64& rSourceSize, const sal_Int64& rDestSize, const sal_Int64& rApproxSize ) :
UnoDialog( rxContext, rxFrame ),
ConfigurationAccess( rxContext, NULL ),
- mxContext( rxContext ),
mxFrame( rxFrame ),
mxActionListener( new OKActionListener( *this ) ),
mnSourceSize( rSourceSize ),
diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx
index 761bf07bb70d..d674e08986c5 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -55,7 +55,6 @@ public :
private :
- css::uno::Reference< css::uno::XComponentContext > mxContext;
css::uno::Reference< css::frame::XFrame > mxFrame;
css::uno::Reference< css::io::XStream > mxTempFile;
@@ -72,7 +71,6 @@ private :
public :
css::uno::Reference< css::frame::XFrame>& GetFrame() { return mxFrame; };
- const css::uno::Reference< css::uno::XComponentContext >& GetComponentContext() { return mxContext; };
};
class OKActionListener : public ::cppu::WeakImplHelper1< css::awt::XActionListener >
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index d7c56cb18571..0a37e6b3e670 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -210,7 +210,6 @@ OptimizerDialog::OptimizerDialog( const Reference< XComponentContext > &rxContex
ConfigurationAccess( rxContext, NULL ),
mnCurrentStep( 0 ),
mnTabIndex( 0 ),
- mxContext( rxContext ),
mxFrame( rxFrame ),
mxItemListener( new ItemListener( *this ) ),
mxActionListener( new ActionListener( *this ) ),
diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx
index 512c0f31344d..cfd280cceb18 100644
--- a/sdext/source/minimizer/optimizerdialog.hxx
+++ b/sdext/source/minimizer/optimizerdialog.hxx
@@ -71,7 +71,6 @@ public :
bool mbIsReadonly;
private :
- css::uno::Reference< css::uno::XComponentContext > mxContext;
css::uno::Reference< css::frame::XFrame > mxFrame;
css::uno::Reference< css::uno::XInterface > mxRoadmapControl;
@@ -123,7 +122,7 @@ public :
OUString GetSelectedString( OUString const & token );
css::uno::Reference< css::frame::XDispatch >& GetStatusDispatcher() { return mxStatusDispatcher; };
css::uno::Reference< css::frame::XFrame>& GetFrame() { return mxFrame; };
- const css::uno::Reference< css::uno::XComponentContext >& GetComponentContext() { return mxContext; };
+ const css::uno::Reference< css::uno::XComponentContext >& GetComponentContext() { return UnoDialog::mxContext; };
};
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index 6461e252c495..c86fcc45f90c 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -747,7 +747,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
sal_Int32 nImageResolution( GetConfigProperty( TK_ImageResolution, (sal_Int32)0 ) );
GraphicSettings aGraphicSettings( bJPEGCompression, nJPEGQuality, GetConfigProperty( TK_RemoveCropArea, false ),
nImageResolution, GetConfigProperty( TK_EmbedLinkedGraphics, true ) );
- GraphicCollector::CountGraphics( mxContext, mxController->getModel(), aGraphicSettings, nGraphics );
+ GraphicCollector::CountGraphics( UnoDialog::mxContext, mxController->getModel(), aGraphicSettings, nGraphics );
if ( nGraphics > 1 )
{
OUString aStr( getString( STR_OPTIMIZE_IMAGES ) );