basic/source/classes/sbunoobj.cxx | 2 +- chart2/source/view/main/GL3DRenderer.cxx | 4 ++-- dbaccess/source/ui/browser/brwctrlr.cxx | 4 ++-- forms/source/component/Button.hxx | 2 +- forms/source/component/CheckBox.hxx | 2 +- forms/source/component/ComboBox.hxx | 2 +- forms/source/component/Currency.hxx | 2 +- forms/source/component/Date.hxx | 2 +- forms/source/component/Edit.hxx | 2 +- forms/source/component/File.hxx | 2 +- forms/source/component/FixedText.hxx | 2 +- forms/source/component/FormattedField.hxx | 2 +- forms/source/component/Grid.hxx | 2 +- forms/source/component/GroupBox.hxx | 2 +- forms/source/component/Hidden.hxx | 2 +- forms/source/component/ImageButton.hxx | 2 +- forms/source/component/ImageControl.hxx | 2 +- forms/source/component/ListBox.hxx | 2 +- forms/source/component/Numeric.hxx | 2 +- forms/source/component/Pattern.hxx | 2 +- forms/source/component/RadioButton.hxx | 2 +- forms/source/component/Time.hxx | 2 +- forms/source/component/navigationbar.hxx | 2 +- forms/source/component/refvaluecomponent.hxx | 2 +- forms/source/component/scrollbar.hxx | 2 +- forms/source/component/spinbutton.hxx | 2 +- forms/source/inc/FormComponent.hxx | 15 +++------------ forms/source/richtext/richtextmodel.hxx | 2 +- 28 files changed, 32 insertions(+), 41 deletions(-)
New commits: commit 70c8b4567fc6a5ccb8fb5a6bdcbc26f267f5af4d Author: Thomas Arnhold <[email protected]> Date: Wed Jun 4 08:24:26 2014 +0200 WaE: warning C4101: 'e' : unreferenced local variable Change-Id: Ib5aa5f401eabedfdaebea1dea8f48f284dbccdd5 diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index fd19148..e715493 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -605,7 +605,7 @@ void SbaXDataBrowserController::onStartLoading( const Reference< XLoadable >& _r { xWarnings->clearWarnings(); } - catch(const SQLException& e) + catch(const SQLException& ) { DBG_UNHANDLED_EXCEPTION(); } @@ -673,7 +673,7 @@ bool SbaXDataBrowserController::reloadForm( const Reference< XLoadable >& _rxLoa impl_checkForCannotSelectUnfiltered( aInfo ); } } - catch(const SQLException& e) + catch(const SQLException& ) { DBG_UNHANDLED_EXCEPTION(); } commit 92edd9b39cf3be1d82b32dcfa17e15d7905faf2f Author: Thomas Arnhold <[email protected]> Date: Wed Jun 4 08:22:21 2014 +0200 WaE: warning C4305: 'argument' : truncation from 'double' to 'GLfloat' Change-Id: I8afe523cfe1be28bc5427c5e5852bea0be2aaea3 diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index 55ed103..fa793d0 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -1699,11 +1699,11 @@ void OpenGL3DRenderer::ClearBuffer() glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glBegin (GL_QUADS); - glColor3f(0.3,0.3,0.3); + glColor3f (0.3f, 0.3f, 0.3f); glVertex3f (-1.0f, -1.0f, -1.0f); glVertex3f (1.0f, -1.0f, -1.0f); - glColor3f(0.0,0.0,0.0); + glColor3f (0.0f, 0.0f, 0.0f); glVertex3f (1.0f, 1.0f, -1.0f); glVertex3f (-1.0f, 1.0f, -1.0f); glEnd (); commit dd8f09594012dd1062ea87e492bfef0baf291a5c Author: Thomas Arnhold <[email protected]> Date: Wed Jun 4 00:13:09 2014 +0200 WaE: warning C4101: 'ex' : unreferenced local variable Change-Id: Ib8b71b50fe52a7cc4e261626549ac3e067851797 diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 086445a..a994937 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -2443,7 +2443,7 @@ void SbUnoObject::doIntrospection( void ) { xIntrospection = theIntrospection::get(xContext); } - catch ( const css::uno::DeploymentException& ex ) + catch ( const css::uno::DeploymentException& ) { } commit 28ac97dce1750fdc2a4c8e8d4d03f7a81668b0f9 Author: Thomas Arnhold <[email protected]> Date: Tue Jun 3 23:01:07 2014 +0200 forms: expand DECLARE_XCLONEABLE Change-Id: I2a468e40489797e33935b79a27459ab408558124 diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index b127713..0e10752 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -86,7 +86,7 @@ public: virtual void SAL_CALL disposing() SAL_OVERRIDE; protected: - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void impl_resetNoBroadcast_nothrow(); diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx index b13cc93..276992a 100644 --- a/forms/source/component/CheckBox.hxx +++ b/forms/source/component/CheckBox.hxx @@ -52,7 +52,7 @@ public: ) const SAL_OVERRIDE; protected: - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OBoundControlModel overridables virtual ::com::sun::star::uno::Any diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx index 22f983a..af3518d 100644 --- a/forms/source/component/ComboBox.hxx +++ b/forms/source/component/ComboBox.hxx @@ -138,7 +138,7 @@ protected: protected: void loadData( bool _bForce ); - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class OComboBoxControl : public OBoundControl diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx index c1574be..23a2ee8 100644 --- a/forms/source/component/Currency.hxx +++ b/forms/source/component/Currency.hxx @@ -61,7 +61,7 @@ protected: virtual void resetNoBroadcast() SAL_OVERRIDE; protected: - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; void implConstruct(); }; diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx index 4ffb43b..5942e7e 100644 --- a/forms/source/component/Date.hxx +++ b/forms/source/component/Date.hxx @@ -86,7 +86,7 @@ protected: virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ) SAL_OVERRIDE; protected: - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: /** translates the control value (the VCL-internal integer representation of a date) into diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index 2d66743..66af4a0 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -109,7 +109,7 @@ protected: protected: virtual sal_uInt16 getPersistenceFlags() const SAL_OVERRIDE; - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: bool implActsAsRichText( ) const; diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx index fa9eea1..5c47c53 100644 --- a/forms/source/component/File.hxx +++ b/forms/source/component/File.hxx @@ -80,7 +80,7 @@ public: protected: virtual void _reset(); - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx index a948131..f733fa3 100644 --- a/forms/source/component/FixedText.hxx +++ b/forms/source/component/FixedText.hxx @@ -49,7 +49,7 @@ public: ) const SAL_OVERRIDE; protected: - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index 6939b2a..7c9c261 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -135,7 +135,7 @@ class OFormattedModel virtual void onDisconnectedDbColumn() SAL_OVERRIDE; private: - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; void implConstruct(); diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx index 99e5004..3c03911 100644 --- a/forms/source/component/Grid.hxx +++ b/forms/source/component/Grid.hxx @@ -171,7 +171,7 @@ public: using OControlModel::getFastPropertyValue; protected: - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual void approveNewElement( diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx index ceac40b..1fd1777 100644 --- a/forms/source/component/GroupBox.hxx +++ b/forms/source/component/GroupBox.hxx @@ -49,7 +49,7 @@ public: ) const SAL_OVERRIDE; protected: - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx index 1a343e6..358c71c 100644 --- a/forms/source/component/Hidden.hxx +++ b/forms/source/component/Hidden.hxx @@ -62,7 +62,7 @@ public: using OControlModel::getFastPropertyValue; protected: - DECLARE_XCLONEABLE( ); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_FORMS_SOURCE_COMPONENT_HIDDEN_HXX diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx index 5a6e776..645bb88 100644 --- a/forms/source/component/ImageButton.hxx +++ b/forms/source/component/ImageButton.hxx @@ -48,7 +48,7 @@ public: ) const SAL_OVERRIDE; protected: - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; typedef ::cppu::ImplHelper1< ::com::sun::star::awt::XMouseListener> OImageButtonControl_BASE; diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx index add837d..2e85a59 100644 --- a/forms/source/component/ImageControl.hxx +++ b/forms/source/component/ImageControl.hxx @@ -125,7 +125,7 @@ protected: virtual void resetNoBroadcast() SAL_OVERRIDE; protected: - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; void implConstruct(); diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx index 68e22d8..991627c 100644 --- a/forms/source/component/ListBox.hxx +++ b/forms/source/component/ListBox.hxx @@ -204,7 +204,7 @@ protected: virtual void refreshInternalEntryList() SAL_OVERRIDE; protected: - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; void init(); ::com::sun::star::uno::Any getCurrentSingleValue() const; diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx index 54b7f90..3d37a96 100644 --- a/forms/source/component/Numeric.hxx +++ b/forms/source/component/Numeric.hxx @@ -60,7 +60,7 @@ protected: virtual void resetNoBroadcast() SAL_OVERRIDE; protected: - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class ONumericControl: public OBoundControl diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx index e973f84..8b2504d 100644 --- a/forms/source/component/Pattern.hxx +++ b/forms/source/component/Pattern.hxx @@ -69,7 +69,7 @@ protected: virtual void resetNoBroadcast() SAL_OVERRIDE; protected: - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class OPatternControl: public OBoundControl diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx index 02d6ff2..fbdacad 100644 --- a/forms/source/component/RadioButton.hxx +++ b/forms/source/component/RadioButton.hxx @@ -65,7 +65,7 @@ protected: protected: void SetSiblingPropsTo(const OUString& rPropName, const ::com::sun::star::uno::Any& rValue); - DECLARE_XCLONEABLE( ); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: /** sets the given value as new State at the aggregate diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx index 7adf8dc..76aadfb 100644 --- a/forms/source/component/Time.hxx +++ b/forms/source/component/Time.hxx @@ -86,7 +86,7 @@ protected: virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ) SAL_OVERRIDE; protected: - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: /** translates the control value (the VCL-internal integer representation of a date) into diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx index 2aceb22..0f6637b 100644 --- a/forms/source/component/navigationbar.hxx +++ b/forms/source/component/navigationbar.hxx @@ -112,7 +112,7 @@ namespace frm using OControlModel::getFastPropertyValue; protected: - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void implInitPropertyContainer(); diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx index 8350f64..50af8b2 100644 --- a/forms/source/component/scrollbar.hxx +++ b/forms/source/component/scrollbar.hxx @@ -43,7 +43,7 @@ namespace frm DECLARE_XPERSISTOBJECT() // XCloneable - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const SAL_OVERRIDE; diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx index 808c89d..0cd4ee4 100644 --- a/forms/source/component/spinbutton.hxx +++ b/forms/source/component/spinbutton.hxx @@ -43,7 +43,7 @@ namespace frm DECLARE_XPERSISTOBJECT() // XCloneable - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const SAL_OVERRIDE; diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index f63e9da..374d4ad 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -564,10 +564,6 @@ public: virtual ~classname() \ -// XCloneable -#define DECLARE_XCLONEABLE( ) \ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - #define IMPLEMENT_DEFAULT_CLONING( classname ) \ ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL classname::createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ { \ diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx index 16a6fb7..1df1bc4 100644 --- a/forms/source/richtext/richtextmodel.hxx +++ b/forms/source/richtext/richtextmodel.hxx @@ -116,7 +116,7 @@ namespace frm DECLARE_XTYPEPROVIDER() // XCloneable - DECLARE_XCLONEABLE(); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; commit 2091d5a4d37961969b270590a6906260415884cb Author: Thomas Arnhold <[email protected]> Date: Tue Jun 3 22:53:53 2014 +0200 forms: expand DECLARE_DEFAULT_DTOR Change-Id: I52b091402ec23f9c5eb87ae2212cc5b4986c6435 diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx index 09c42c9..7afdd98 100644 --- a/forms/source/component/refvaluecomponent.hxx +++ b/forms/source/component/refvaluecomponent.hxx @@ -57,7 +57,7 @@ namespace frm bool _bSupportNoCheckRefValue = false ); DECLARE_DEFAULT_CLONE_CTOR( OReferenceValueComponent ) - DECLARE_DEFAULT_DTOR( OReferenceValueComponent ); + virtual ~OReferenceValueComponent(); // OPropertySet and friends virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index abd4b02..f63e9da 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -523,11 +523,6 @@ public: getInstanceMutex() { return m_aMutex; } }; - -// simple destructor -#define DECLARE_DEFAULT_DTOR( classname ) \ - virtual ~classname() - // constructor for cloning a class #define DECLARE_DEFAULT_CLONE_CTOR( classname ) \ classname( \ @@ -543,7 +538,7 @@ public: const OUString& _rDefault \ ); \ DECLARE_DEFAULT_CLONE_CTOR( classname ) \ - DECLARE_DEFAULT_DTOR( classname ) \ + virtual ~classname() \ // all xtors for an inner class of the object hierarchy which is *bound* #define DECLARE_DEFAULT_BOUND_XTOR( classname ) \ @@ -555,7 +550,7 @@ public: const bool _bSupportsValidation \ ); \ DECLARE_DEFAULT_CLONE_CTOR( classname ) \ - DECLARE_DEFAULT_DTOR( classname ) \ + virtual ~classname() \ // all xtors for a leas class of the object hierarchy #define DECLARE_DEFAULT_LEAF_XTOR( classname ) \ @@ -566,7 +561,7 @@ public: const classname* _pOriginal, \ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory \ ); \ - DECLARE_DEFAULT_DTOR( classname ) \ + virtual ~classname() \ // XCloneable _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
