Kaydet (Commit) 7dca33cc authored tarafından Tor Lillqvist's avatar Tor Lillqvist

WaE: implicit conversion of NULL constant to 'boost::detail::sp_nullptr_t'

Change-Id: I556d03a5bbd74faa26d73a8e84147c9743c20507
üst b50d3727
...@@ -285,7 +285,7 @@ namespace cmis ...@@ -285,7 +285,7 @@ namespace cmis
if ( authProvider.authenticationQuery( rUsername, rPassword ) ) if ( authProvider.authenticationQuery( rUsername, rPassword ) )
{ {
// Initiate a CMIS session and register it as we found nothing // Initiate a CMIS session and register it as we found nothing
libcmis::OAuth2DataPtr oauth2Data = NULL; libcmis::OAuth2DataPtr oauth2Data = 0;
if ( m_aURL.getBindingUrl( ) == GDRIVE_BASE_URL ) if ( m_aURL.getBindingUrl( ) == GDRIVE_BASE_URL )
oauth2Data.reset( new libcmis::OAuth2Data( oauth2Data.reset( new libcmis::OAuth2Data(
GDRIVE_AUTH_URL, GDRIVE_TOKEN_URL, GDRIVE_AUTH_URL, GDRIVE_TOKEN_URL,
...@@ -1106,7 +1106,7 @@ namespace cmis ...@@ -1106,7 +1106,7 @@ namespace cmis
{ {
} }
if ( pFolder != NULL ) if ( pFolder != 0 )
{ {
libcmis::ObjectPtr object; libcmis::ObjectPtr object;
map< string, libcmis::PropertyPtr >::iterator it = m_pObjectProps.find( "cmis:name" ); map< string, libcmis::PropertyPtr >::iterator it = m_pObjectProps.find( "cmis:name" );
...@@ -1790,7 +1790,7 @@ namespace cmis ...@@ -1790,7 +1790,7 @@ namespace cmis
SAL_INFO( "cmisucp", "Content::getChildren() " << m_sURL ); SAL_INFO( "cmisucp", "Content::getChildren() " << m_sURL );
libcmis::FolderPtr pFolder = boost::dynamic_pointer_cast< libcmis::Folder >( getObject( uno::Reference< ucb::XCommandEnvironment >() ) ); libcmis::FolderPtr pFolder = boost::dynamic_pointer_cast< libcmis::Folder >( getObject( uno::Reference< ucb::XCommandEnvironment >() ) );
if ( NULL != pFolder ) if ( 0 != pFolder )
{ {
// Get the children from pObject // Get the children from pObject
try try
......
...@@ -148,7 +148,7 @@ namespace cmis ...@@ -148,7 +148,7 @@ namespace cmis
try try
{ {
// Create a session to get repositories // Create a session to get repositories
libcmis::OAuth2DataPtr oauth2Data = NULL; libcmis::OAuth2DataPtr oauth2Data = 0;
libcmis::Session* session = libcmis::SessionFactory::createSession( libcmis::Session* session = libcmis::SessionFactory::createSession(
OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ), OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ),
......
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