Kaydet (Commit) 9d2cfee5 authored tarafından Caolán McNamara's avatar Caolán McNamara

some more clang warnings

Change-Id: I4359784279875dc9dac99bc4d2db95dccf094b20
üst ae4da42e
...@@ -24,6 +24,8 @@ boost_patches += boost.6369.warnings.patch ...@@ -24,6 +24,8 @@ boost_patches += boost.6369.warnings.patch
boost_patches += boost.6397.warnings.patch boost_patches += boost.6397.warnings.patch
#backport from boost 1.48.0 fix for "opcode not supported on this processor" #backport from boost 1.48.0 fix for "opcode not supported on this processor"
boost_patches += boost.mipsbackport.patch boost_patches += boost.mipsbackport.patch
#https://svn.boost.org/trac/boost/ticket/7551
boost_patches += boost.7551.unusedvars.patch
boost_patches += boost.windows.patch boost_patches += boost.windows.patch
boost_patches += boost.vc2012.patch boost_patches += boost.vc2012.patch
......
--- misc/boost_1_44_0/boost/date_time/tz_db_base.hpp
--- misc/build/boost_1_44_0/boost/date_time/tz_db_base.hpp
@@ -170,7 +170,6 @@
/*! May throw data_not_accessible, or bad_field_count exceptions */
void load_from_file(const std::string& pathspec)
{
- string_type in_str;
std::string buff;
std::ifstream ifs(pathspec.c_str());
...@@ -130,6 +130,7 @@ certain functionality. ...@@ -130,6 +130,7 @@ certain functionality.
@li @c svx.dialog @li @c svx.dialog
@li @c svx.form @li @c svx.form
@li @c svx.tbxcrtls
@section tools @section tools
...@@ -175,6 +176,10 @@ certain functionality. ...@@ -175,6 +176,10 @@ certain functionality.
@li @c xmloff.chart @li @c xmloff.chart
@li @c xmloff.style @li @c xmloff.style
@section xmlsecurity
@li @c xmlsecurity.dialogs - xml security dialogs
@section other @section other
@li @c accessibility @li @c accessibility
......
...@@ -110,14 +110,14 @@ sal_Bool InternalStreamLock::LockFile( sal_Size nStart, sal_Size nEnd, SvFileStr ...@@ -110,14 +110,14 @@ sal_Bool InternalStreamLock::LockFile( sal_Size nStart, sal_Size nEnd, SvFileStr
osl::DirectoryItem aItem; osl::DirectoryItem aItem;
if (osl::DirectoryItem::get( pStream->GetFileName(), aItem) != osl::FileBase::E_None ) if (osl::DirectoryItem::get( pStream->GetFileName(), aItem) != osl::FileBase::E_None )
{ {
SAL_INFO("tools", "Failed to lookup stream for locking"); SAL_INFO("tools.stream", "Failed to lookup stream for locking");
return sal_True; return sal_True;
} }
osl::FileStatus aStatus( osl_FileStatus_Mask_Type ); osl::FileStatus aStatus( osl_FileStatus_Mask_Type );
if ( aItem.getFileStatus( aStatus ) != osl::FileBase::E_None ) if ( aItem.getFileStatus( aStatus ) != osl::FileBase::E_None )
{ {
SAL_INFO("tools", "Failed to stat stream for locking"); SAL_INFO("tools.stream", "Failed to stat stream for locking");
return sal_True; return sal_True;
} }
if( aStatus.getFileType() == osl::FileStatus::Directory ) if( aStatus.getFileType() == osl::FileStatus::Directory )
......
...@@ -504,7 +504,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) ...@@ -504,7 +504,7 @@ Content::createNewContent( const ucb::ContentInfo& Info )
g_warning( "createNewContent (%d)", (int) create_document ); g_warning( "createNewContent (%d)", (int) create_document );
#endif #endif
rtl::OUString aURL = getOUURI(); rtl::OUString aURL = getOUURI();
if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
aURL += rtl::OUString("/"); aURL += rtl::OUString("/");
...@@ -513,14 +513,14 @@ Content::createNewContent( const ucb::ContentInfo& Info ) ...@@ -513,14 +513,14 @@ Content::createNewContent( const ucb::ContentInfo& Info )
// This looks problematic to me cf. webdav // This looks problematic to me cf. webdav
aURL += rtl::OUString::createFromAscii( name ); aURL += rtl::OUString::createFromAscii( name );
uno::Reference< ucb::XContentIdentifier > xId uno::Reference< ucb::XContentIdentifier > xId
( new ::ucbhelper::ContentIdentifier( m_xSMgr, aURL ) ); ( new ::ucbhelper::ContentIdentifier( m_xSMgr, aURL ) );
try { try {
return new ::gvfs::Content( m_xSMgr, m_pProvider, xId, !create_document ); return new ::gvfs::Content( m_xSMgr, m_pProvider, xId, !create_document );
} catch ( ucb::ContentCreationException & ) { } catch ( ucb::ContentCreationException & ) {
return uno::Reference< ucb::XContent >(); return uno::Reference< ucb::XContent >();
} }
} }
rtl::OUString Content::getParentURL() rtl::OUString Content::getParentURL()
...@@ -1031,8 +1031,6 @@ void Content::destroy( sal_Bool bDeletePhysical ) ...@@ -1031,8 +1031,6 @@ void Content::destroy( sal_Bool bDeletePhysical )
throw( uno::Exception ) throw( uno::Exception )
{ {
// @@@ take care about bDeletePhysical -> trashcan support // @@@ take care about bDeletePhysical -> trashcan support
rtl::OUString aURL = getOUURI();
uno::Reference< ucb::XContent > xThis = this; uno::Reference< ucb::XContent > xThis = this;
deleted(); deleted();
...@@ -1397,7 +1395,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( ...@@ -1397,7 +1395,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
rtl::OUString rtl::OUString
Content::getOUURI () Content::getOUURI ()
{ {
osl::Guard< osl::Mutex > aGuard( m_aMutex ); osl::Guard< osl::Mutex > aGuard( m_aMutex );
return m_xIdentifier->getContentIdentifier(); return m_xIdentifier->getContentIdentifier();
} }
......
...@@ -353,7 +353,7 @@ const rtl::OUString& LocaleDataWrapper::getOneLocaleItem( sal_Int16 nItem ) cons ...@@ -353,7 +353,7 @@ const rtl::OUString& LocaleDataWrapper::getOneLocaleItem( sal_Int16 nItem ) cons
::utl::ReadWriteGuard aGuard( aMutex ); ::utl::ReadWriteGuard aGuard( aMutex );
if ( nItem >= LocaleItem::COUNT ) if ( nItem >= LocaleItem::COUNT )
{ {
SAL_WARN( "unotools", "getOneLocaleItem: bounds" ); SAL_WARN( "unotools.i18n", "getOneLocaleItem: bounds" );
return aLocaleItem[0]; return aLocaleItem[0];
} }
if (aLocaleItem[nItem].isEmpty()) if (aLocaleItem[nItem].isEmpty())
...@@ -426,7 +426,7 @@ void LocaleDataWrapper::getOneLocaleItemImpl( sal_Int16 nItem ) ...@@ -426,7 +426,7 @@ void LocaleDataWrapper::getOneLocaleItemImpl( sal_Int16 nItem )
aLocaleItem[nItem] = aLocaleDataItem.LongDateYearSeparator; aLocaleItem[nItem] = aLocaleDataItem.LongDateYearSeparator;
break; break;
default: default:
SAL_WARN( "unotools", "getOneLocaleItemImpl: which one?" ); SAL_WARN( "unotools.i18n", "getOneLocaleItemImpl: which one?" );
} }
} }
...@@ -449,7 +449,7 @@ const rtl::OUString& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) co ...@@ -449,7 +449,7 @@ const rtl::OUString& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) co
::utl::ReadWriteGuard aGuard( aMutex ); ::utl::ReadWriteGuard aGuard( aMutex );
if ( nWord < 0 || nWord >= reservedWords::COUNT ) if ( nWord < 0 || nWord >= reservedWords::COUNT )
{ {
SAL_WARN( "unotools", "getOneReservedWord: bounds" ); SAL_WARN( "unotools.i18n", "getOneReservedWord: bounds" );
nWord = reservedWords::FALSE_WORD; nWord = reservedWords::FALSE_WORD;
} }
if (aReservedWord[nWord].isEmpty()) if (aReservedWord[nWord].isEmpty())
......
...@@ -66,7 +66,7 @@ String TransliterationWrapper::transliterate( ...@@ -66,7 +66,7 @@ String TransliterationWrapper::transliterate(
} }
catch( Exception& ) catch( Exception& )
{ {
SAL_WARN( "unotools", "transliterate: Exception caught!" ); SAL_WARN( "unotools.i18n", "transliterate: Exception caught!" );
} }
} }
return sRet; return sRet;
...@@ -90,7 +90,7 @@ String TransliterationWrapper::transliterate( ...@@ -90,7 +90,7 @@ String TransliterationWrapper::transliterate(
} }
catch( Exception& ) catch( Exception& )
{ {
SAL_WARN( "unotools", "transliterate: Exception caught!" ); SAL_WARN( "unotools.i18n", "transliterate: Exception caught!" );
} }
} }
return sRet; return sRet;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment