[Libreoffice-commits] core.git: 11 commits - bin/findunusedcode framework/inc framework/source include/cppuhelper oovbaapi/ooo package/source sc/source svtools/source sw/source vcl/source
Caolán McNamara
caolanm at redhat.com
Mon Jul 14 01:21:39 PDT 2014
bin/findunusedcode | 36 +++++++++++++++---------------
framework/inc/services/desktop.hxx | 2 -
framework/source/services/desktop.cxx | 2 -
include/cppuhelper/propshlp.hxx | 3 +-
oovbaapi/ooo/vba/excel/XWorkbook.idl | 2 -
oovbaapi/ooo/vba/word/XDocument.idl | 2 -
package/source/xstor/owriteablestream.cxx | 29 ++++++++++++++++++++----
package/source/xstor/xstorage.cxx | 14 ++++++++---
sc/source/ui/vba/vbaworkbook.cxx | 2 -
sc/source/ui/vba/vbaworkbook.hxx | 2 -
svtools/source/graphic/descriptor.cxx | 13 ----------
svtools/source/graphic/descriptor.hxx | 6 ++---
sw/source/filter/ww8/ww8scan.cxx | 8 +++++-
sw/source/ui/vba/vbacolumns.cxx | 2 -
sw/source/ui/vba/vbacolumns.hxx | 2 -
sw/source/ui/vba/vbarows.cxx | 2 -
sw/source/ui/vba/vbarows.hxx | 2 -
vcl/source/edit/vclmedit.cxx | 11 ---------
18 files changed, 75 insertions(+), 65 deletions(-)
New commits:
commit e477175eee9ec206d409d0ebcc732100049d1aaa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 14 08:50:22 2014 +0100
coverity#704062 Unchecked return value
Change-Id: I6f9b9a2a4d5a6bf92428645df1226d9354f47210
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index a8bd5fe..bbf74a0 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -3250,7 +3250,13 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
*/
WW8_CP nCpStart, nCpEnd;
void* pData=NULL;
- pPieceIter->Get(nCpStart, nCpEnd, pData);
+ bool bOk = pPieceIter->Get(nCpStart, nCpEnd, pData);
+
+ if (!bOk)
+ {
+ pPieceIter->SetIdx(nOldPos);
+ return;
+ }
WW8_FC nLimitFC = SVBT32ToUInt32( ((WW8_PCD*)pData)->fc );
WW8_FC nBeginLimitFC = nLimitFC;
commit c4d33c5f8f9fe55d5891c4fbbf8295b3aad8987f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 14 08:42:51 2014 +0100
coverity#738457 Uncaught exception
Change-Id: I152f105e7bd363528d9fa4e365d32d12c00b0a44
diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx
index aedad5b..6b27ccf 100644
--- a/sw/source/ui/vba/vbarows.cxx
+++ b/sw/source/ui/vba/vbarows.cxx
@@ -315,7 +315,7 @@ void SAL_CALL SwVbaRows::Select( ) throw (uno::RuntimeException, std::exception
return ( mnEndRowIndex - mnStartRowIndex + 1 );
}
-uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException)
+uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
sal_Int32 nIndex = 0;
if( ( Index1 >>= nIndex ) )
diff --git a/sw/source/ui/vba/vbarows.hxx b/sw/source/ui/vba/vbarows.hxx
index 6a14a89..80cb70f 100644
--- a/sw/source/ui/vba/vbarows.hxx
+++ b/sw/source/ui/vba/vbarows.hxx
@@ -62,7 +62,7 @@ public:
//XCollection
virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE;
- virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) SAL_OVERRIDE;
// XEnumerationAccess
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE;
commit 346419a018dd7f6d7d6945412eda8fa54f3c2271
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 14 08:41:03 2014 +0100
coverity#738452 Uncaught exception
Change-Id: I25f63c07103f55066f634fdd99411523425a9de1
diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx
index ac78b08..edf01b0 100644
--- a/sw/source/ui/vba/vbacolumns.cxx
+++ b/sw/source/ui/vba/vbacolumns.cxx
@@ -97,7 +97,7 @@ void SAL_CALL SwVbaColumns::Select( ) throw (uno::RuntimeException, std::except
return ( mnEndColumnIndex - mnStartColumnIndex + 1 );
}
-uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException)
+uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
sal_Int32 nIndex = 0;
if( ( Index1 >>= nIndex ) )
diff --git a/sw/source/ui/vba/vbacolumns.hxx b/sw/source/ui/vba/vbacolumns.hxx
index 74533ad..65f73d5 100644
--- a/sw/source/ui/vba/vbacolumns.hxx
+++ b/sw/source/ui/vba/vbacolumns.hxx
@@ -50,7 +50,7 @@ public:
//XCollection
virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE;
- virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException ) SAL_OVERRIDE;
// XEnumerationAccess
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE;
commit ae1a8b38de47b0ceea65896f2be443d265c6f1ae
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 14 08:32:54 2014 +0100
coverity#706576 Uncaught exception
Change-Id: I818049d10f0ac69eb528e72329bb798c56fcf424
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index bab645f..f9ddbd6 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -4629,7 +4629,7 @@ void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::Nam
m_pImpl->AddLog( THROW_WHERE "Rethrow" );
uno::Any aCaught( ::cppu::getCaughtException() );
- throw lang::WrappedTargetException( THROW_WHERE "Can not open package!",
+ throw lang::WrappedTargetRuntimeException( THROW_WHERE "Can not open package!",
static_cast< OWeakObject* >( this ),
aCaught );
}
commit 415e04894f909710e0f1dd4d03e6ba9f550afaea
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 14 08:28:45 2014 +0100
coverity#706574 Uncaught exception
and
coverity#706575 Uncaught exception
Change-Id: I91f036d81deff31e47365c37445eb6b4cfcd992b
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index b21edb2..bab645f 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -4651,7 +4651,10 @@ void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::Nam
m_pImpl->AddLog( aException.Message );
m_pImpl->AddLog( THROW_WHERE "Rethrow" );
- throw io::IOException( THROW_WHERE );
+ uno::Any aCaught( ::cppu::getCaughtException() );
+ throw lang::WrappedTargetRuntimeException( THROW_WHERE "Can not open package!",
+ static_cast< OWeakObject* >( this ),
+ aCaught );
}
}
}
@@ -4689,7 +4692,7 @@ uno::Sequence< beans::NamedValue > SAL_CALL OStorage::getEncryptionAlgorithms()
m_pImpl->AddLog( THROW_WHERE "Rethrow" );
uno::Any aCaught( ::cppu::getCaughtException() );
- throw lang::WrappedTargetException( THROW_WHERE "Can not open package!",
+ throw lang::WrappedTargetRuntimeException( THROW_WHERE "Can not open package!",
static_cast< OWeakObject* >( this ),
aCaught );
}
@@ -4710,7 +4713,10 @@ uno::Sequence< beans::NamedValue > SAL_CALL OStorage::getEncryptionAlgorithms()
m_pImpl->AddLog( aException.Message );
m_pImpl->AddLog( THROW_WHERE "Rethrow" );
- throw io::IOException( THROW_WHERE );
+ uno::Any aCaught( ::cppu::getCaughtException() );
+ throw lang::WrappedTargetRuntimeException( THROW_WHERE "Can not open package!",
+ static_cast< OWeakObject* >( this ),
+ aCaught );
}
}
commit 0fc759c6f0f41fddaf043c7659aeaad25970c146
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 14 08:25:40 2014 +0100
fix higher debug level build
Change-Id: I5bfa022c3c9fe8d24726989d9068fce7273e3f2d
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 7274890..ddb2c9a 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1423,17 +1423,6 @@ bool VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt )
{
bool nDone = false;
-#if (OSL_DEBUG_LEVEL > 1) && defined(DBG_UTIL)
- if( rNEvt.GetType() == EVENT_KEYINPUT )
- {
- const KeyEvent& rKEvent = *rNEvt.GetKeyEvent();
- if ( ( rKEvent.GetKeyCode().GetCode() == KEY_W ) && rKEvent.GetKeyCode().IsMod1() && rKEvent.GetKeyCode().IsMod2() )
- {
- SetRightToLeft( !IsRightToLeft() );
- }
- }
-#endif
-
if( ( rNEvt.GetType() == EVENT_KEYINPUT ) && ( !GetTextView()->IsCursorEnabled() ) )
{
const KeyEvent& rKEvent = *rNEvt.GetKeyEvent();
commit 2d11ddeb7cd3c94b9c7acede816912754465f4ef
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 13 20:39:24 2014 +0100
coverity#707036 Uncaught exception
Change-Id: If4e5fdad7261ba6b92a04e615e28d2b474ad4234
diff --git a/oovbaapi/ooo/vba/excel/XWorkbook.idl b/oovbaapi/ooo/vba/excel/XWorkbook.idl
index 5f286d5..9efbf6c 100644
--- a/oovbaapi/ooo/vba/excel/XWorkbook.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbook.idl
@@ -44,7 +44,7 @@ interface XWorkbook
[attribute] boolean PrecisionAsDisplayed;
any Worksheets( [in] any Index );
- any Styles( [in] any Index );
+ any Styles( [in] any Index ) raises (com::sun::star::script::BasicErrorException);
any Sheets( [in] any Index );
any Windows( [in] any Index );
void ResetColors() raises (com::sun::star::script::BasicErrorException);
diff --git a/oovbaapi/ooo/vba/word/XDocument.idl b/oovbaapi/ooo/vba/word/XDocument.idl
index dd2751e..1dde907 100644
--- a/oovbaapi/ooo/vba/word/XDocument.idl
+++ b/oovbaapi/ooo/vba/word/XDocument.idl
@@ -42,7 +42,7 @@ interface XDocument : com::sun::star::script::XInvocation
any Bookmarks( [in] any Index );
any Variables( [in] any Index );
any Paragraphs( [in] any Index );
- any Styles( [in] any Index );
+ any Styles( [in] any Index ) raises (com::sun::star::script::BasicErrorException);
any Tables( [in] any Index );
any Fields( [in] any Index );
any Shapes( [in] any Index );
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index a72abd3..1883e29 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -354,7 +354,7 @@ ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, con
}
css::uno::Any SAL_CALL
-ScVbaWorkbook::Styles( const uno::Any& Item ) throw (uno::RuntimeException, std::exception)
+ScVbaWorkbook::Styles( const uno::Any& Item ) throw (::script::BasicErrorException, uno::RuntimeException, std::exception)
{
// quick look and Styles object doesn't seem to have a valid parent
// or a least the object browser just shows an object that has no
diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx
index bf57680..61c8bcb 100644
--- a/sc/source/ui/vba/vbaworkbook.hxx
+++ b/sc/source/ui/vba/vbaworkbook.hxx
@@ -54,7 +54,7 @@ public:
virtual void SAL_CALL SaveAs( const css::uno::Any& FileName, const css::uno::Any& FileFormat, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& ReadOnlyRecommended, const css::uno::Any& CreateBackup, const css::uno::Any& AccessMode, const css::uno::Any& ConflictResolution, const css::uno::Any& AddToMru, const css::uno::Any& TextCodepage, const css::uno::Any& TextVisualLayout, const css::uno::Any& Local ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& Item ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& Item ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL ResetColors( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Any SAL_CALL Colors( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::sal_Int32 SAL_CALL getFileFormat( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
commit b166135056a784be4700b1c1d83975289b7f99ea
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 13 20:35:09 2014 +0100
coverity#983698 Uncaught exception
Change-Id: I3f597643c1f743314ca17346901f11dc4f1f7302
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index eb4b75d..22e21d2 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -2587,12 +2587,33 @@ sal_Bool SAL_CALL OWriteStream::hasEncryptionData()
::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
if (!m_pImpl)
- return sal_False;
+ return false;
+
+ bool bRet = false;
- bool bRet = m_pImpl->IsEncrypted();
+ try
+ {
+ bRet = m_pImpl->IsEncrypted();
- if (!bRet && m_pImpl->m_bUseCommonEncryption && m_pImpl->m_pParent)
- bRet = m_pImpl->m_pParent->m_bHasCommonEncryptionData;
+ if (!bRet && m_pImpl->m_bUseCommonEncryption && m_pImpl->m_pParent)
+ bRet = m_pImpl->m_pParent->m_bHasCommonEncryptionData;
+ }
+ catch( const uno::RuntimeException& rRuntimeException )
+ {
+ m_pImpl->AddLog( rRuntimeException.Message );
+ m_pImpl->AddLog( "Rethrow" );
+ throw;
+ }
+ catch( const uno::Exception& rException )
+ {
+ m_pImpl->AddLog( rException.Message );
+ m_pImpl->AddLog( "Rethrow" );
+
+ uno::Any aCaught( ::cppu::getCaughtException() );
+ throw lang::WrappedTargetRuntimeException( "Problems on hasEncryptionData!",
+ static_cast< ::cppu::OWeakObject* >( this ),
+ aCaught );
+ }
return bRet;
}
commit dd9a1bae7c40b9441e640206e2b330a63fa23515
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 13 20:28:42 2014 +0100
coverity#983902 Uncaught exception
Change-Id: Ic4e7413ac0c4c6c8eda9808e88572926e6b00be5
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 1114923..2ea8773 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -63,25 +63,17 @@ GraphicDescriptor::GraphicDescriptor() :
{
}
-
-
GraphicDescriptor::~GraphicDescriptor()
throw()
{
}
-
-
void GraphicDescriptor::init( const ::Graphic& rGraphic )
- throw()
{
mpGraphic = &rGraphic;
}
-
-
void GraphicDescriptor::init( const OUString& rURL )
- throw()
{
boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rURL, STREAM_READ ));
@@ -89,10 +81,7 @@ void GraphicDescriptor::init( const OUString& rURL )
implCreate( *pIStm, &rURL );
}
-
-
void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const OUString& rURL )
- throw()
{
boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rxIStm ));
@@ -100,8 +89,6 @@ void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm,
implCreate( *pIStm, &rURL );
}
-
-
void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL )
{
OUString aURL;
diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx
index e43464c..53dfaca 100644
--- a/svtools/source/graphic/descriptor.hxx
+++ b/svtools/source/graphic/descriptor.hxx
@@ -70,9 +70,9 @@ public:
GraphicDescriptor();
virtual ~GraphicDescriptor() throw();
- void init( const ::Graphic& rGraphic ) throw();
- void init( const OUString& rURL ) throw();
- void init( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxIStm, const OUString& rURL ) throw();
+ void init( const ::Graphic& rGraphic );
+ void init( const OUString& rURL );
+ void init( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxIStm, const OUString& rURL );
static OUString getImplementationName_Static() throw();
static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw();
commit 594a5e20f751e1fb8f9b4f3fb53851c3dfb671e6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 13 20:24:29 2014 +0100
coverity#1224998 Uncaught exception
Change-Id: I96db9ab47b9494a1d71259e93ad393bd70c39d97
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 57e0bdb..19a6df5 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -309,7 +309,7 @@ class Desktop : private cppu::BaseMutex,
virtual sal_Bool SAL_CALL convertFastPropertyValue ( css::uno::Any& aConvertedValue ,
css::uno::Any& aOldValue ,
sal_Int32 nHandle ,
- const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException ) SAL_OVERRIDE;
+ const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle ,
const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception ) SAL_OVERRIDE;
using cppu::OPropertySetHelper::getFastPropertyValue;
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index a62c649..10bb545 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -1316,7 +1316,7 @@ OUString SAL_CALL Desktop::getUntitledPrefix()
sal_Bool SAL_CALL Desktop::convertFastPropertyValue( css::uno::Any& aConvertedValue ,
css::uno::Any& aOldValue ,
sal_Int32 nHandle ,
- const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException )
+ const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx
index cc462c1..89a88bd 100644
--- a/include/cppuhelper/propshlp.hxx
+++ b/include/cppuhelper/propshlp.hxx
@@ -575,7 +575,8 @@ protected:
::com::sun::star::uno::Any & rOldValue,
sal_Int32 nHandle,
const ::com::sun::star::uno::Any& rValue )
- throw (::com::sun::star::lang::IllegalArgumentException) = 0;
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) = 0;
/** The same as setFastProperyValue; nHandle is always valid.
The changes must not be broadcasted in this method.
commit a5db1906b41cff4acebfa6c382f4096298883a4c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 13 20:16:28 2014 +0100
fix grep and configure line for callcatcher
Change-Id: I8ceb9d815f616afe42ce31a96bc2699438603e43
diff --git a/bin/findunusedcode b/bin/findunusedcode
index 664ac8a..8485f44 100755
--- a/bin/findunusedcode
+++ b/bin/findunusedcode
@@ -11,23 +11,23 @@ mkdir -p ${SRCDIR}/callcatcher
cd ${SRCDIR}/callcatcher
echo "--without-doxygen
- --enable-verbose
- --enable-gio
- --enable-packagekit
- --disable-gnome-vfs
- --enable-extension-integration
- --enable-graphite
- --enable-evolution2
- --enable-lockdown
- --enable-online-update
- --enable-dbgutil
- --enable-werror
- --enable-gtk3
- --enable-kde4
- --enable-dbus
- --enable-gstreamer
- --disable-gstreamer-0-10"
- > autogen.input
+--enable-verbose
+--enable-gio
+--enable-packagekit
+--disable-gnome-vfs
+--enable-extension-integration
+--enable-graphite
+--enable-evolution2
+--enable-lockdown
+--enable-online-update
+--enable-dbgutil
+--enable-werror
+--enable-gtk3
+--enable-kde4
+--enable-dbus
+--enable-gstreamer
+--disable-gstreamer-0-10" \
+ > autogen.input
export CC="callcatcher ${CC:-gcc}"
export CXX="callcatcher ${CXX:-g++}"
@@ -91,5 +91,5 @@ grep ::.*\( unusedcode.all \
| grep -v ^CPhysicalCamera:: \
| grep -v ^RenderScene:: \
| grep -v ^ShaderProgram:: \
- | grep -v ^Texture:::: \
+ | grep -v ^Texture:: \
> ../unusedcode.easy
More information about the Libreoffice-commits
mailing list