[Libreoffice-commits] core.git: 3 commits - avmedia/source dbaccess/source editeng/source sw/source
Caolán McNamara
caolanm at redhat.com
Sun May 3 01:34:43 PDT 2015
avmedia/source/framework/mediaitem.cxx | 2 +-
avmedia/source/gstreamer/gstframegrabber.hxx | 2 +-
avmedia/source/gstreamer/gstmanager.hxx | 2 +-
avmedia/source/gstreamer/gstplayer.hxx | 2 +-
avmedia/source/opengl/oglframegrabber.hxx | 2 +-
avmedia/source/opengl/oglmanager.hxx | 2 +-
avmedia/source/viewer/mediaevent_impl.hxx | 4 ++--
avmedia/source/viewer/mediawindow_impl.hxx | 6 +++---
avmedia/source/vlc/vlcmanager.hxx | 2 +-
avmedia/source/vlc/wrapper/Player.hxx | 2 +-
avmedia/source/win/framegrabber.hxx | 4 ++--
avmedia/source/win/manager.hxx | 2 +-
avmedia/source/win/player.hxx | 4 ++--
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 5 ++---
editeng/source/editeng/impedit4.cxx | 6 ------
sw/source/core/crsr/callnk.hxx | 2 +-
16 files changed, 21 insertions(+), 28 deletions(-)
New commits:
commit 311e6dcf94490c075558cf848d955b84a9cf68a8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun May 3 09:33:59 2015 +0100
drop useless temp debugging strings
Change-Id: I8a11a3d20fc5bde984586cb7046b174568315620
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 20c411e..934fada 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2802,9 +2802,6 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
nCurrentEnd = aCurWordBndry.endPos;
sal_Int32 nLen = nCurrentEnd - nCurrentStart;
DBG_ASSERT( nLen > 0, "invalid word length of 0" );
-#if OSL_DEBUG_LEVEL > 1
- OUString aText(aNodeStr.copy(nCurrentStart, nLen) );
-#endif
Sequence< sal_Int32 > aOffsets;
OUString aNewText( aTransliterationWrapper.transliterate(aNodeStr,
@@ -2890,9 +2887,6 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
{
const sal_Int32 nLen = nCurrentEnd - nCurrentStart;
DBG_ASSERT( nLen > 0, "invalid word length of 0" );
-#if OSL_DEBUG_LEVEL > 1
- OUString aText( aNodeStr.copy( nCurrentStart, nLen ) );
-#endif
Sequence< sal_Int32 > aOffsets;
OUString aNewText( aTransliterationWrapper.transliterate( aNodeStr,
commit 47687ccb9d487a0f7e58ef4c956f6fba77261e02
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat May 2 17:18:16 2015 +0100
cppcheck: variableScope
Change-Id: Ice10ca4fdecfb446fa3f7680e89ea0d7dd2c1cb7
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 8c8ab55..a42e8e6 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -719,9 +719,6 @@ namespace
OTableFields& _rFieldList,
bool bMulti )
{
- // * must not contain a filter : have I already shown the correct warning ?
- bool bCritsOnAsterikWarning = false; // ** TMFS **
-
OUString aFieldName,aCriteria,aWhereStr,aHavingStr,aWork/*,aOrderStr*/;
// print line by line joined with AND
sal_uInt16 nMaxCriteria = 0;
@@ -739,6 +736,8 @@ namespace
const Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData();
const OUString aQuote = xMetaData->getIdentifierQuoteString();
const IParseContext& rContext = static_cast<OQueryController&>(_pView->getController()).getParser().getContext();
+ // * must not contain a filter : have I already shown the correct warning ?
+ bool bCritsOnAsterikWarning = false; // ** TMFS **
for (sal_uInt16 i=0 ; i < nMaxCriteria ; i++)
{
commit 8c7d151e7a8a54b0fed8dfbcc957d435b73afa51
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat May 2 17:12:54 2015 +0100
cppcheck: noExplicitConstructor
Change-Id: I4eb86c5a03b55e5946fe11848ca009f7ca112658
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 2543df5..bf85b48 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -61,7 +61,7 @@ struct MediaItem::Impl
bool m_bMute;
::com::sun::star::media::ZoomLevel m_eZoom;
- Impl(AVMediaSetMask nMaskSet)
+ explicit Impl(AVMediaSetMask nMaskSet)
: m_nMaskSet( nMaskSet )
, m_eState( MEDIASTATE_STOP )
, m_fTime( 0.0 )
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index 87a3f23..6c849c8 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -53,7 +53,7 @@ public:
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- FrameGrabber( const OUString &aURL );
+ explicit FrameGrabber( const OUString &aURL );
};
} // namespace gst
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index 507ee7d..65af873 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -35,7 +35,7 @@ class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManag
{
public:
- Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+ explicit Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
virtual ~Manager();
// XManager
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index f1be5d2..c5fc4f6 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -43,7 +43,7 @@ class Player : public ::cppu::BaseMutex,
{
public:
- Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+ explicit Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
virtual ~Player();
void preparePlaybin( const OUString& rURL, GstElement *pSink );
diff --git a/avmedia/source/opengl/oglframegrabber.hxx b/avmedia/source/opengl/oglframegrabber.hxx
index 5beb15b..db8a926 100644
--- a/avmedia/source/opengl/oglframegrabber.hxx
+++ b/avmedia/source/opengl/oglframegrabber.hxx
@@ -25,7 +25,7 @@ class OGLFrameGrabber : public FrameGrabber_BASE
{
public:
- OGLFrameGrabber( libgltf::glTFHandle& rHandle );
+ explicit OGLFrameGrabber( libgltf::glTFHandle& rHandle );
virtual ~OGLFrameGrabber();
// XFrameGrabber
diff --git a/avmedia/source/opengl/oglmanager.hxx b/avmedia/source/opengl/oglmanager.hxx
index 5151588..d4ccf1f 100644
--- a/avmedia/source/opengl/oglmanager.hxx
+++ b/avmedia/source/opengl/oglmanager.hxx
@@ -22,7 +22,7 @@ class OGLManager : public ::cppu::WeakImplHelper2 < com::sun::star::media::XMana
{
public:
- OGLManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rMgr );
+ explicit OGLManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rMgr );
virtual ~OGLManager();
// XManager
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index 27676c7..2db8ba0 100644
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
@@ -42,8 +42,8 @@ namespace avmedia
{
public:
- MediaEventListenersImpl( vcl::Window& rNotifyWindow );
- virtual ~MediaEventListenersImpl();
+ explicit MediaEventListenersImpl( vcl::Window& rNotifyWindow );
+ virtual ~MediaEventListenersImpl();
void cleanUp();
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index 755de29..11a95d8 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -48,7 +48,7 @@ namespace avmedia
{
public:
- MediaWindowControl( vcl::Window* pParent );
+ explicit MediaWindowControl( vcl::Window* pParent );
protected:
@@ -64,8 +64,8 @@ namespace avmedia
{
public:
- MediaChildWindow( vcl::Window* pParent );
- MediaChildWindow( vcl::Window* pParent, SystemWindowData* pData );
+ explicit MediaChildWindow( vcl::Window* pParent );
+ MediaChildWindow( vcl::Window* pParent, SystemWindowData* pData );
protected:
diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx
index f9b1a1c..3473e51 100644
--- a/avmedia/source/vlc/vlcmanager.hxx
+++ b/avmedia/source/vlc/vlcmanager.hxx
@@ -33,7 +33,7 @@ class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManag
std::unique_ptr<wrapper::Instance> mInstance;
wrapper::EventHandler mEventHandler;
public:
- Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+ explicit Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
virtual ~Manager();
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/avmedia/source/vlc/wrapper/Player.hxx b/avmedia/source/vlc/wrapper/Player.hxx
index 018c5eb..e8058a8 100644
--- a/avmedia/source/vlc/wrapper/Player.hxx
+++ b/avmedia/source/vlc/wrapper/Player.hxx
@@ -31,7 +31,7 @@ namespace wrapper
{
public:
static bool LoadSymbols();
- Player( Media& media );
+ explicit Player( Media& media );
Player( const Player& other );
Player& operator=( const Player& other );
virtual ~Player();
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 841da8f..ac62d56 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -37,8 +37,8 @@ class FrameGrabber : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::X
{
public:
- FrameGrabber( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
- ~FrameGrabber();
+ explicit FrameGrabber( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+ ~FrameGrabber();
bool create( const OUString& rURL );
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index 9bd7f25..23337d4 100644
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
@@ -35,7 +35,7 @@ class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManag
{
public:
- Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+ explicit Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
~Manager();
// XManager
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index 38ff12a..f8c1036 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -54,8 +54,8 @@ class Player : public cppu::BaseMutex,
{
public:
- Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
- ~Player();
+ explicit Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+ ~Player();
bool create( const OUString& rURL );
diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx
index 384201e..85e9799 100644
--- a/sw/source/core/crsr/callnk.hxx
+++ b/sw/source/core/crsr/callnk.hxx
@@ -36,7 +36,7 @@ public:
long nLeftFrmPos;
bool bHasSelection;
- SwCallLink( SwCrsrShell & rSh );
+ explicit SwCallLink( SwCrsrShell & rSh );
SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, sal_Int32 nAktCntnt,
sal_uInt8 nAktNdTyp, long nLRPos,
bool bAktSelection );
More information about the Libreoffice-commits
mailing list