[Libreoffice-commits] core.git: 2 commits - comphelper/source ucb/source

[Tor Lillqvist]

 comphelper/source/misc/mediadescriptor.cxx |   18 ------------------
 ucb/source/ucp/cmis/cmis_content.cxx       |    6 +++---
 ucb/source/ucp/cmis/cmis_repo_content.cxx  |    2 +-
 3 files changed, 4 insertions(+), 22 deletions(-)

New commits:
commit 7dca33cc74cd7704273faf2158ec0ea27debae4d
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Sep 2 15:10:20 2013 +0300

    WaE: implicit conversion of NULL constant to 'boost::detail::sp_nullptr_t'
    
    Change-Id: I556d03a5bbd74faa26d73a8e84147c9743c20507

diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 1ba5a86..03bfd55 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 c15d958..bf72a66 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( ) ),
commit b50d3727cf336bb536efe7bf067f484ddf864e9a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Sep 2 15:05:35 2013 +0300

    WaE: unused function 'removeFragment'
    
    Change-Id: I9f62a2eef5113e0ab1c06f818b2a64ad84c06b84

diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index 3d327af..7fd7d5f 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -47,24 +47,6 @@
 
 namespace comphelper{
 
-namespace {
-
-OUString removeFragment(OUString const & uri) {
-    css::uno::Reference< css::uri::XUriReference > ref(
-        css::uri::UriReferenceFactory::create(
-            comphelper::getProcessComponentContext())->
-        parse(uri));
-    if (ref.is()) {
-        ref->clearFragment();
-        return ref->getUriReference();
-    } else {
-        SAL_WARN("comphelper", "cannot parse <" << uri << ">");
-        return uri;
-    }
-}
-
-}
-
 const OUString& MediaDescriptor::PROP_ABORTED()
 {
     static const OUString sProp("Aborted");