diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-09-02 15:10:20 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-09-02 15:11:16 +0300 |
| commit | 7dca33cc74cd7704273faf2158ec0ea27debae4d (patch) | |
| tree | 11ba6c0478b21edb24ca4fc1322370d2adb52136 /ucb | |
| parent | b50d3727cf336bb536efe7bf067f484ddf864e9a (diff) | |
WaE: implicit conversion of NULL constant to 'boost::detail::sp_nullptr_t'
Change-Id: I556d03a5bbd74faa26d73a8e84147c9743c20507
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_content.cxx | 6 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_repo_content.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 1ba5a86451db..03bfd55a0b9f 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -285,7 +285,7 @@ namespace cmis if ( authProvider.authenticationQuery( rUsername, rPassword ) ) { // 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 ) oauth2Data.reset( new libcmis::OAuth2Data( GDRIVE_AUTH_URL, GDRIVE_TOKEN_URL, @@ -1106,7 +1106,7 @@ namespace cmis { } - if ( pFolder != NULL ) + if ( pFolder != 0 ) { libcmis::ObjectPtr object; map< string, libcmis::PropertyPtr >::iterator it = m_pObjectProps.find( "cmis:name" ); @@ -1790,7 +1790,7 @@ namespace cmis SAL_INFO( "cmisucp", "Content::getChildren() " << m_sURL ); 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 try diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index c15d958841a0..bf72a66688ab 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -148,7 +148,7 @@ namespace cmis try { // Create a session to get repositories - libcmis::OAuth2DataPtr oauth2Data = NULL; + libcmis::OAuth2DataPtr oauth2Data = 0; libcmis::Session* session = libcmis::SessionFactory::createSession( OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ), |