[Libreoffice-commits] .: boost/boost.7551.unusedvars.patch boost/UnpackedTarball_boost.mk sal/inc tools/source ucb/source unotools/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Oct 22 01:12:05 PDT 2012
boost/UnpackedTarball_boost.mk | 2 ++
boost/boost.7551.unusedvars.patch | 10 ++++++++++
sal/inc/sal/log-areas.dox | 5 +++++
tools/source/stream/strmunx.cxx | 4 ++--
ucb/source/ucp/gvfs/gvfs_content.cxx | 12 +++++-------
unotools/source/i18n/localedatawrapper.cxx | 6 +++---
unotools/source/i18n/transliterationwrapper.cxx | 4 ++--
7 files changed, 29 insertions(+), 14 deletions(-)
New commits:
commit 9d2cfee5e9e3ac82fab2e920730d04f23593ec10
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 22 09:10:55 2012 +0100
some more clang warnings
Change-Id: I4359784279875dc9dac99bc4d2db95dccf094b20
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 584d479..b7ebd67 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -24,6 +24,8 @@ boost_patches += boost.6369.warnings.patch
boost_patches += boost.6397.warnings.patch
#backport from boost 1.48.0 fix for "opcode not supported on this processor"
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.vc2012.patch
diff --git a/boost/boost.7551.unusedvars.patch b/boost/boost.7551.unusedvars.patch
new file mode 100644
index 0000000..839f925
--- /dev/null
+++ b/boost/boost.7551.unusedvars.patch
@@ -0,0 +1,10 @@
+--- 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());
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 5ecfd39..91b1e8d 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -130,6 +130,7 @@ certain functionality.
@li @c svx.dialog
@li @c svx.form
+ at li @c svx.tbxcrtls
@section tools
@@ -175,6 +176,10 @@ certain functionality.
@li @c xmloff.chart
@li @c xmloff.style
+ at section xmlsecurity
+
+ at li @c xmlsecurity.dialogs - xml security dialogs
+
@section other
@li @c accessibility
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index c059ae8..ec3c871 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -110,14 +110,14 @@ sal_Bool InternalStreamLock::LockFile( sal_Size nStart, sal_Size nEnd, SvFileStr
osl::DirectoryItem aItem;
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;
}
osl::FileStatus aStatus( osl_FileStatus_Mask_Type );
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;
}
if( aStatus.getFileType() == osl::FileStatus::Directory )
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index 6ae71a8..d3b3083 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -504,7 +504,7 @@ Content::createNewContent( const ucb::ContentInfo& Info )
g_warning( "createNewContent (%d)", (int) create_document );
#endif
- rtl::OUString aURL = getOUURI();
+ rtl::OUString aURL = getOUURI();
if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
aURL += rtl::OUString("/");
@@ -513,14 +513,14 @@ Content::createNewContent( const ucb::ContentInfo& Info )
// This looks problematic to me cf. webdav
aURL += rtl::OUString::createFromAscii( name );
- uno::Reference< ucb::XContentIdentifier > xId
+ uno::Reference< ucb::XContentIdentifier > xId
( new ::ucbhelper::ContentIdentifier( m_xSMgr, aURL ) );
- try {
+ try {
return new ::gvfs::Content( m_xSMgr, m_pProvider, xId, !create_document );
} catch ( ucb::ContentCreationException & ) {
return uno::Reference< ucb::XContent >();
- }
+ }
}
rtl::OUString Content::getParentURL()
@@ -1031,8 +1031,6 @@ void Content::destroy( sal_Bool bDeletePhysical )
throw( uno::Exception )
{
// @@@ take care about bDeletePhysical -> trashcan support
- rtl::OUString aURL = getOUURI();
-
uno::Reference< ucb::XContent > xThis = this;
deleted();
@@ -1397,7 +1395,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
rtl::OUString
Content::getOUURI ()
{
- osl::Guard< osl::Mutex > aGuard( m_aMutex );
+ osl::Guard< osl::Mutex > aGuard( m_aMutex );
return m_xIdentifier->getContentIdentifier();
}
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index d6dee74..bdeb2d6 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -353,7 +353,7 @@ const rtl::OUString& LocaleDataWrapper::getOneLocaleItem( sal_Int16 nItem ) cons
::utl::ReadWriteGuard aGuard( aMutex );
if ( nItem >= LocaleItem::COUNT )
{
- SAL_WARN( "unotools", "getOneLocaleItem: bounds" );
+ SAL_WARN( "unotools.i18n", "getOneLocaleItem: bounds" );
return aLocaleItem[0];
}
if (aLocaleItem[nItem].isEmpty())
@@ -426,7 +426,7 @@ void LocaleDataWrapper::getOneLocaleItemImpl( sal_Int16 nItem )
aLocaleItem[nItem] = aLocaleDataItem.LongDateYearSeparator;
break;
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
::utl::ReadWriteGuard aGuard( aMutex );
if ( nWord < 0 || nWord >= reservedWords::COUNT )
{
- SAL_WARN( "unotools", "getOneReservedWord: bounds" );
+ SAL_WARN( "unotools.i18n", "getOneReservedWord: bounds" );
nWord = reservedWords::FALSE_WORD;
}
if (aReservedWord[nWord].isEmpty())
diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx
index 90ef263..f663752 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.cxx
@@ -66,7 +66,7 @@ String TransliterationWrapper::transliterate(
}
catch( Exception& )
{
- SAL_WARN( "unotools", "transliterate: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "transliterate: Exception caught!" );
}
}
return sRet;
@@ -90,7 +90,7 @@ String TransliterationWrapper::transliterate(
}
catch( Exception& )
{
- SAL_WARN( "unotools", "transliterate: Exception caught!" );
+ SAL_WARN( "unotools.i18n", "transliterate: Exception caught!" );
}
}
return sRet;
More information about the Libreoffice-commits
mailing list