connectivity/source/drivers/macab/MacabColumns.cxx | 10 ++++---- connectivity/source/drivers/macab/MacabTable.cxx | 4 +-- connectivity/source/drivers/macab/MacabTables.hxx | 2 - shell/source/backends/macbe/macbackend.hxx | 2 - slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx | 12 +++++----- vcl/inc/quartz/salgdi.h | 2 - vcl/osx/DragSourceContext.hxx | 2 - vcl/osx/clipboard.hxx | 2 - 8 files changed, 18 insertions(+), 18 deletions(-)
New commits: commit 4ffb0830ad0a3ee2b596f771423b4a8438e74357 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Apr 1 21:24:56 2014 +0200 loplugin:literaltoboolconversion Change-Id: I90f590a64f6004aecf7da5253db158e382a5b801 diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx index 713ff04..2556e21 100644 --- a/connectivity/source/drivers/macab/MacabColumns.cxx +++ b/connectivity/source/drivers/macab/MacabColumns.cxx @@ -62,10 +62,10 @@ sdbcx::ObjectType MacabColumns::createObject(const OUString& _rName) xRow->getInt(7), xRow->getInt(9), xRow->getInt(5), - sal_False, - sal_False, - sal_False, - sal_True, + false, + false, + false, + true, sCatalogName, sSchemaName, sTableName); @@ -86,7 +86,7 @@ void MacabColumns::impl_refresh() throw(RuntimeException) MacabColumns::MacabColumns( MacabTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector) - : sdbcx::OCollection(*_pTable, sal_True, _rMutex, _rVector), + : sdbcx::OCollection(*_pTable, true, _rMutex, _rVector), m_pTable(_pTable) { } diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx index 26c83eb..f0f4291 100644 --- a/connectivity/source/drivers/macab/MacabTable.cxx +++ b/connectivity/source/drivers/macab/MacabTable.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::lang; MacabTable::MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection) - : MacabTable_TYPEDEF(_pTables, sal_True), + : MacabTable_TYPEDEF(_pTables, true), m_pConnection(_pConnection) { construct(); @@ -48,7 +48,7 @@ MacabTable::MacabTable( sdbcx::OCollection* _pTables, const OUString& _Description , const OUString& _SchemaName, const OUString& _CatalogName - ) : MacabTable_TYPEDEF(_pTables,sal_True, + ) : MacabTable_TYPEDEF(_pTables,true, _Name, _Type, _Description, diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx index 160312e..e177b30 100644 --- a/connectivity/source/drivers/macab/MacabTables.hxx +++ b/connectivity/source/drivers/macab/MacabTables.hxx @@ -41,7 +41,7 @@ namespace connectivity ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector) - : sdbcx::OCollection(_rParent,sal_True,_rMutex,_rVector), + : sdbcx::OCollection(_rParent,true,_rMutex,_rVector), m_xMetaData(_rMetaData) { } commit 6a3b0b7cc45b7aab2611331476decfd06211a73d Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Apr 1 21:22:51 2014 +0200 Explicitly mark overriding destructors as "virtual," Mac OS X redux Change-Id: Ib7ab02bc3cdadbdfe0e0787560d1dd562eb85be9 diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx index 33687e8..75d3288 100644 --- a/shell/source/backends/macbe/macbackend.hxx +++ b/shell/source/backends/macbe/macbackend.hxx @@ -123,7 +123,7 @@ protected: MacOSXBackend(); /** Destructor */ - ~MacOSXBackend(void); + virtual ~MacOSXBackend(void); }; #endif // INCLUDED_SHELL_SOURCE_BACKENDS_MACBE_MACBACKEND_HXX diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx index ef0d6ea..d747550 100644 --- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx +++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx @@ -349,7 +349,7 @@ public: */ SRotate(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle,bool bInter, double T0, double T1); - ~SRotate(){} + virtual ~SRotate(){} private: /** axis to rotate CCW about */ @@ -391,7 +391,7 @@ public: */ SScale(const basegfx::B3DVector& Scale, const basegfx::B3DVector& Origin,bool bInter, double T0, double T1); - ~SScale(){} + virtual ~SScale(){} private: basegfx::B3DVector scale; basegfx::B3DVector origin; @@ -421,7 +421,7 @@ public: */ STranslate(const basegfx::B3DVector& Vector,bool bInter, double T0, double T1); - ~STranslate(){} + virtual ~STranslate(){} private: /** vector to translate by */ @@ -452,7 +452,7 @@ public: */ SEllipseTranslate(double dWidth, double dHeight, double dStartPosition, double dEndPosition, bool bInter, double T0, double T1); - ~SEllipseTranslate(){} + virtual ~SEllipseTranslate(){} private: /** width and length of the ellipse */ @@ -473,7 +473,7 @@ public: RotateAndScaleDepthByWidth* clone() SAL_OVERRIDE; RotateAndScaleDepthByWidth(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle,bool bInter, double T0, double T1); - ~RotateAndScaleDepthByWidth(){} + virtual ~RotateAndScaleDepthByWidth(){} private: basegfx::B3DVector axis; basegfx::B3DVector origin; @@ -489,7 +489,7 @@ public: RotateAndScaleDepthByHeight* clone() SAL_OVERRIDE; RotateAndScaleDepthByHeight(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle,bool bInter, double T0, double T1); - ~RotateAndScaleDepthByHeight(){} + virtual ~RotateAndScaleDepthByHeight(){} private: basegfx::B3DVector axis; basegfx::B3DVector origin; diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 722d368..28999b4 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -65,7 +65,7 @@ class CoreTextFontData : public PhysicalFontFace public: CoreTextFontData( const ImplDevFontAttributes&, sal_IntPtr nFontID ); - ~CoreTextFontData(); + virtual ~CoreTextFontData(); PhysicalFontFace* Clone() const SAL_OVERRIDE; ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE; diff --git a/vcl/osx/DragSourceContext.hxx b/vcl/osx/DragSourceContext.hxx index 826c583..41ed086 100644 --- a/vcl/osx/DragSourceContext.hxx +++ b/vcl/osx/DragSourceContext.hxx @@ -39,7 +39,7 @@ class DragSourceContext: public cppu::BaseMutex, { public: DragSourceContext(); - ~DragSourceContext(); + virtual ~DragSourceContext(); virtual sal_Int32 SAL_CALL getCurrentCursor( ) throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/vcl/osx/clipboard.hxx b/vcl/osx/clipboard.hxx index d03e766..bcacc63 100644 --- a/vcl/osx/clipboard.hxx +++ b/vcl/osx/clipboard.hxx @@ -84,7 +84,7 @@ public: AquaClipboard(NSPasteboard* pasteboard = NULL, bool bUseSystemClipboard = true); - ~AquaClipboard(); + virtual ~AquaClipboard(); // XClipboard _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits