[Libreoffice-commits] core.git: 2 commits - include/sal ucb/source
Michael Stahl
mstahl at redhat.com
Mon Sep 2 08:02:28 PDT 2013
include/sal/log-areas.dox | 5 ++-
ucb/source/ucp/cmis/cmis_content.cxx | 44 ++++++++++++++---------------
ucb/source/ucp/cmis/cmis_repo_content.cxx | 16 +++++-----
ucb/source/ucp/ext/ucpext_content.cxx | 6 +--
ucb/source/ucp/ext/ucpext_datasupplier.cxx | 2 -
ucb/source/ucp/ftp/ftpurl.cxx | 3 +
6 files changed, 40 insertions(+), 36 deletions(-)
New commits:
commit 24a076337a38d904725176314c83dbac35f874f4
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Sep 2 16:58:33 2013 +0200
ucb: rename "cmisucp" log area for consistency
Change-Id: Ie9ef3324bb7a9e954db57548d7862a90b070ebd3
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 97b5865..c1d8cf7 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -276,10 +276,10 @@ certain functionality.
@section ucb
- at li @c cmisucp
@li @c ucb
@li @c ucb.core
@li @c ucb.ucp
+ at li @c ucb.ucp.cmis
@li @c ucb.ucp.ext
@li @c ucb.ucp.ftp
@li @c ucb.ucp.gio
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 4abd22b..1d5d8dd 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -225,7 +225,7 @@ namespace cmis
m_bTransient( false ),
m_bIsFolder( false )
{
- SAL_INFO( "cmisucp", "Content::Content() " << m_sURL );
+ SAL_INFO( "ucb.ucp.cmis", "Content::Content() " << m_sURL );
m_sObjectPath = m_aURL.getObjectPath( );
m_sObjectId = m_aURL.getObjectId( );
@@ -243,7 +243,7 @@ namespace cmis
m_bTransient( true ),
m_bIsFolder( bIsFolder )
{
- SAL_INFO( "cmisucp", "Content::Content() " << m_sURL );
+ SAL_INFO( "ucb.ucp.cmis", "Content::Content() " << m_sURL );
m_sObjectPath = m_aURL.getObjectPath( );
m_sObjectId = m_aURL.getObjectId( );
@@ -433,7 +433,7 @@ namespace cmis
}
catch ( const libcmis::Exception& e )
{
- SAL_INFO( "cmisucp", "Unexpected libcmis exception: " << e.what( ) );
+ SAL_INFO( "ucb.ucp.cmis", "Unexpected libcmis exception: " << e.what( ) );
ucbhelper::cancelCommandExecution(
ucb::IOErrorCode_GENERAL,
uno::Sequence< uno::Any >( 0 ),
@@ -473,7 +473,7 @@ namespace cmis
}
catch ( const libcmis::Exception& e )
{
- SAL_INFO( "cmisucp", "Unexpected libcmis exception: "<< e.what( ) );
+ SAL_INFO( "ucb.ucp.cmis", "Unexpected libcmis exception: "<< e.what( ) );
}
return updateObj;
@@ -811,7 +811,7 @@ namespace cmis
}
}
else
- SAL_INFO( "cmisucp", "Looking for unsupported property " << rProp.Name );
+ SAL_INFO( "ucb.ucp.cmis", "Looking for unsupported property " << rProp.Name );
}
catch (const libcmis::Exception&)
{
@@ -875,7 +875,7 @@ namespace cmis
// Note: rOpenCommand.Sink may contain an XStream
// implementation. Support for this type of
// sink is optional...
- SAL_INFO( "cmisucp", "Failed to copy data to sink" );
+ SAL_INFO( "ucb.ucp.cmis", "Failed to copy data to sink" );
ucbhelper::cancelCommandExecution(
uno::makeAny (ucb::UnsupportedDataSinkException
@@ -885,7 +885,7 @@ namespace cmis
}
}
else
- SAL_INFO( "cmisucp", "Open falling through ..." );
+ SAL_INFO( "ucb.ucp.cmis", "Open falling through ..." );
return aRet;
}
@@ -979,7 +979,7 @@ namespace cmis
}
catch ( const libcmis::Exception& e )
{
- SAL_INFO( "cmisucp", "Unexpected libcmis exception: " << e.what( ) );
+ SAL_INFO( "ucb.ucp.cmis", "Unexpected libcmis exception: " << e.what( ) );
ucbhelper::cancelCommandExecution(
ucb::IOErrorCode_GENERAL,
uno::Sequence< uno::Any >( 0 ),
@@ -1045,7 +1045,7 @@ namespace cmis
}
catch ( const libcmis::Exception& e )
{
- SAL_INFO( "cmisucp", "Unexpected libcmis exception: " << e.what( ) );
+ SAL_INFO( "ucb.ucp.cmis", "Unexpected libcmis exception: " << e.what( ) );
ucbhelper::cancelCommandExecution(
ucb::IOErrorCode_GENERAL,
uno::Sequence< uno::Any >( 0 ),
@@ -1075,7 +1075,7 @@ namespace cmis
}
}
- SAL_INFO( "cmisucp", "TODO - Content::transfer()" );
+ SAL_INFO( "ucb.ucp.cmis", "TODO - Content::transfer()" );
}
void Content::insert( const uno::Reference< io::XInputStream > & xInputStream,
@@ -1256,7 +1256,7 @@ namespace cmis
}
catch ( const libcmis::Exception& e )
{
- SAL_INFO( "cmisucp", "Unexpected libcmis exception: " << e.what( ) );
+ SAL_INFO( "ucb.ucp.cmis", "Unexpected libcmis exception: " << e.what( ) );
ucbhelper::cancelCommandExecution(
ucb::IOErrorCode_GENERAL,
uno::Sequence< uno::Any >( 0 ),
@@ -1308,7 +1308,7 @@ namespace cmis
}
else
{
- SAL_INFO( "cmisucp", "Couln't set property: " << rValue.Name );
+ SAL_INFO( "ucb.ucp.cmis", "Couln't set property: " << rValue.Name );
lang::IllegalAccessException e ( OUString("Property is read-only!"),
static_cast< cppu::OWeakObject* >( this ) );
aRet[ n ] <<= e;
@@ -1324,7 +1324,7 @@ namespace cmis
}
catch ( const libcmis::Exception& e )
{
- SAL_INFO( "cmisucp", "Unexpected libcmis exception: " << e.what( ) );
+ SAL_INFO( "ucb.ucp.cmis", "Unexpected libcmis exception: " << e.what( ) );
ucbhelper::cancelCommandExecution(
ucb::IOErrorCode_GENERAL,
uno::Sequence< uno::Any >( 0 ),
@@ -1367,7 +1367,7 @@ namespace cmis
}
catch ( const libcmis::Exception& e )
{
- SAL_INFO( "cmisucp", "Unexpected libcmis exception: " << e.what( ) );
+ SAL_INFO( "ucb.ucp.cmis", "Unexpected libcmis exception: " << e.what( ) );
ucbhelper::cancelCommandExecution(
ucb::IOErrorCode_GENERAL,
uno::Sequence< uno::Any >( 0 ),
@@ -1492,7 +1492,7 @@ namespace cmis
{
OUString sRet;
- SAL_INFO( "cmisucp", "Content::getParentURL()" );
+ SAL_INFO( "ucb.ucp.cmis", "Content::getParentURL()" );
OUString parentUrl = OUString( "/" );
if ( m_sObjectPath == "/" )
return parentUrl;
@@ -1551,7 +1551,7 @@ namespace cmis
const uno::Reference< ucb::XCommandEnvironment >& xEnv )
throw( uno::Exception, ucb::CommandAbortedException, uno::RuntimeException )
{
- SAL_INFO( "cmisucp", "Content::execute( ) - " << aCommand.Name );
+ SAL_INFO( "ucb.ucp.cmis", "Content::execute( ) - " << aCommand.Name );
uno::Any aRet;
if ( aCommand.Name == "getPropertyValues" )
@@ -1626,7 +1626,7 @@ namespace cmis
}
catch ( const libcmis::Exception& e )
{
- SAL_INFO( "cmisucp", "Unexpected libcmis exception: " << e.what( ) );
+ SAL_INFO( "ucb.ucp.cmis", "Unexpected libcmis exception: " << e.what( ) );
ucbhelper::cancelCommandExecution(
ucb::IOErrorCode_GENERAL,
uno::Sequence< uno::Any >( 0 ),
@@ -1657,7 +1657,7 @@ namespace cmis
}
else
{
- SAL_INFO( "cmisucp", "Unknown command to execute" );
+ SAL_INFO( "ucb.ucp.cmis", "Unknown command to execute" );
ucbhelper::cancelCommandExecution
( uno::makeAny( ucb::UnsupportedCommandException
@@ -1671,7 +1671,7 @@ namespace cmis
void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) throw( uno::RuntimeException )
{
- SAL_INFO( "cmisucp", "TODO - Content::abort()" );
+ SAL_INFO( "ucb.ucp.cmis", "TODO - Content::abort()" );
// TODO Implement me
}
@@ -1692,7 +1692,7 @@ namespace cmis
create_document = false;
else
{
- SAL_INFO( "cmisucp", "Unknown type of content to create" );
+ SAL_INFO( "ucb.ucp.cmis", "Unknown type of content to create" );
return uno::Reference< ucb::XContent >();
}
@@ -1787,7 +1787,7 @@ namespace cmis
list< uno::Reference< ucb::XContent > > Content::getChildren( )
{
list< uno::Reference< ucb::XContent > > results;
- SAL_INFO( "cmisucp", "Content::getChildren() " << m_sURL );
+ SAL_INFO( "ucb.ucp.cmis", "Content::getChildren() " << m_sURL );
libcmis::FolderPtr pFolder = boost::dynamic_pointer_cast< libcmis::Folder >( getObject( uno::Reference< ucb::XCommandEnvironment >() ) );
if ( 0 != pFolder )
@@ -1819,7 +1819,7 @@ namespace cmis
}
catch ( const libcmis::Exception& e )
{
- SAL_INFO( "cmisucp", "Exception thrown: " << e.what() );
+ SAL_INFO( "ucb.ucp.cmis", "Exception thrown: " << e.what() );
}
}
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index f9f7ce0..44ef278 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -51,7 +51,7 @@ namespace cmis
{
// Split the URL into bits
OUString sURL = m_xIdentifier->getContentIdentifier( );
- SAL_INFO( "cmisucp", "RepoContent::RepoContent() " << sURL );
+ SAL_INFO( "ucb.ucp.cmis", "RepoContent::RepoContent() " << sURL );
m_sRepositoryId = m_aURL.getObjectPath( );
if ( m_sRepositoryId[0] == '/' )
@@ -107,7 +107,7 @@ namespace cmis
else
{
xRow->appendVoid( rProp );
- SAL_INFO( "cmisucp", "Looking for unsupported property " << rProp.Name );
+ SAL_INFO( "ucb.ucp.cmis", "Looking for unsupported property " << rProp.Name );
}
}
catch (const libcmis::Exception&)
@@ -164,7 +164,7 @@ namespace cmis
}
catch (const libcmis::Exception& e)
{
- SAL_INFO( "cmisucp", "Error getting repositories: " << e.what() );
+ SAL_INFO( "ucb.ucp.cmis", "Error getting repositories: " << e.what() );
}
}
else
@@ -256,7 +256,7 @@ namespace cmis
{
OUString sRet;
- SAL_INFO( "cmisucp", "RepoContent::getParentURL()" );
+ SAL_INFO( "ucb.ucp.cmis", "RepoContent::getParentURL()" );
// TODO Implement me
@@ -304,7 +304,7 @@ namespace cmis
const uno::Reference< ucb::XCommandEnvironment >& xEnv )
throw( uno::Exception, ucb::CommandAbortedException, uno::RuntimeException )
{
- SAL_INFO( "cmisucp", "RepoContent::execute( ) - " << aCommand.Name );
+ SAL_INFO( "ucb.ucp.cmis", "RepoContent::execute( ) - " << aCommand.Name );
uno::Any aRet;
@@ -333,7 +333,7 @@ namespace cmis
}
else
{
- SAL_INFO( "cmisucp", "Command not allowed" );
+ SAL_INFO( "ucb.ucp.cmis", "Command not allowed" );
}
return aRet;
@@ -341,7 +341,7 @@ namespace cmis
void SAL_CALL RepoContent::abort( sal_Int32 /*CommandId*/ ) throw( uno::RuntimeException )
{
- SAL_INFO( "cmisucp", "TODO - RepoContent::abort()" );
+ SAL_INFO( "ucb.ucp.cmis", "TODO - RepoContent::abort()" );
// TODO Implement me
}
@@ -366,7 +366,7 @@ namespace cmis
list< uno::Reference< ucb::XContent > > result;
// TODO Cache the results somehow
- SAL_INFO( "cmisucp", "RepoContent::getChildren" );
+ SAL_INFO( "ucb.ucp.cmis", "RepoContent::getChildren" );
if ( m_sRepositoryId.isEmpty( ) )
{
commit b9ac217b4adbc8681ecbf05419cb4a15a2ddae97
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Sep 2 16:55:33 2013 +0200
ucb: add missing ucb.core log area, and ftp/ext too
Change-Id: Ifa2df0e2dcc193ae02202687c0d6b7ab930db58f
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 99ceb69..97b5865 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -278,7 +278,10 @@ certain functionality.
@li @c cmisucp
@li @c ucb
+ at li @c ucb.core
@li @c ucb.ucp
+ at li @c ucb.ucp.ext
+ at li @c ucb.ucp.ftp
@li @c ucb.ucp.gio
@li @c ucb.ucp.gvfs
@li @c ucb.ucp.webdav
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 750da29..317a953 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -345,7 +345,7 @@ namespace ucb { namespace ucp { namespace ext
// cut the root URL
if ( !sURL.match( sRootURL, 0 ) )
{
- SAL_INFO( "ucb.ucp", "illegal URL structure - no root" );
+ SAL_INFO( "ucb.ucp.ext", "illegal URL structure - no root" );
break;
}
@@ -355,7 +355,7 @@ namespace ucb { namespace ucp { namespace ext
const OUString sSeparatedExtensionId( encodeIdentifier( m_sExtensionId ) + OUString( sal_Unicode( '/' ) ) );
if ( !sRelativeURL.match( sSeparatedExtensionId ) )
{
- SAL_INFO( "ucb.ucp", "illegal URL structure - no extension ID" );
+ SAL_INFO( "ucb.ucp.ext", "illegal URL structure - no extension ID" );
break;
}
@@ -364,7 +364,7 @@ namespace ucb { namespace ucp { namespace ext
// cut the final slash (if any)
if ( sRelativeURL.isEmpty() )
{
- SAL_INFO( "ucb.ucp", "illegal URL structure - ExtensionContent should have a level below the extension ID" );
+ SAL_INFO( "ucb.ucp.ext", "illegal URL structure - ExtensionContent should have a level below the extension ID" );
break;
}
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
index a06b712..20a73c8 100644
--- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
@@ -153,7 +153,7 @@ namespace ucb { namespace ucp { namespace ext
{
if ( pExtInfo->getLength() <= 0 )
{
- SAL_WARN( "ucb.ucp", "illegal extension info" );
+ SAL_WARN( "ucb.ucp.ext", "illegal extension info" );
continue;
}
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index bf2c523..70c15c4 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -413,7 +413,8 @@ oslFileHandle FTPURL::open()
if(err == CURLE_OK)
{
oslFileError rc = osl_setFilePos( res, osl_Pos_Absolut, 0 );
- SAL_WARN_IF(rc != osl_File_E_None, "ucb", "osl_setFilePos failed");
+ SAL_WARN_IF(rc != osl_File_E_None, "ucb.ucp.ftp",
+ "osl_setFilePos failed");
}
else {
osl_closeFile(res),res = 0;
More information about the Libreoffice-commits
mailing list