diff options
9 files changed, 4 insertions, 22 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx index 8241b179355b..95eb19b1e152 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx @@ -537,12 +537,6 @@ void UpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, cons } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > UpdateableResultSet::getMetaData( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) -{ - return m_meta; -} - Sequence< Type > UpdateableResultSet::getStaticTypes( bool updateable ) throw( com::sun::star::uno::RuntimeException ) { diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx index 247bd50e6b1b..c07c1407a5b9 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx @@ -70,7 +70,6 @@ class UpdateableResultSet : OUString m_table; com::sun::star::uno::Sequence< OUString > m_primaryKey; UpdateableFieldVector m_updateableField; - com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSetMetaData > m_meta; bool m_insertRow; protected: @@ -164,10 +163,7 @@ public: // XRowUpdate virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -public: // XResultSetMetaDataSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - +public: static com::sun::star::uno::Sequence< com::sun::star::uno::Type > getStaticTypes( bool updateable ) throw( com::sun::star::uno::RuntimeException ); diff --git a/forms/source/xforms/submission/submission_get.hxx b/forms/source/xforms/submission/submission_get.hxx index c8689e91dd04..0941f0c7c845 100644 --- a/forms/source/xforms/submission/submission_get.hxx +++ b/forms/source/xforms/submission/submission_get.hxx @@ -26,8 +26,6 @@ class CSubmissionGet : public CSubmission { -private: - css::uno::Reference< css::uno::XComponentContext > m_xContext; public: CSubmissionGet(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment); virtual SubmissionResult submit(const css::uno::Reference< css::task::XInteractionHandler >& aInteractionHandler) SAL_OVERRIDE; diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx index bf33064a561e..80e312e9db56 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.hxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx @@ -29,7 +29,6 @@ namespace rptxml class OXMLCell; class OXMLSubDocument : public OXMLReportElementBase, public IMasterDetailFieds { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xComponent; ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xFake; ::std::vector< OUString> m_aMasterFields; ::std::vector< OUString> m_aDetailFields; 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 ) ); |