From 3aebc670e1816a8f4f0759e97d8f39b6aab05044 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sun, 17 May 2015 18:54:22 +0200 Subject: Remove include stdio (part2) Change-Id: Iae58d107d8df1c543a165086fb2b7c288e7121dd Reviewed-on: https://gerrit.libreoffice.org/15775 Reviewed-by: Julien Nabet Tested-by: Julien Nabet --- ucb/source/ucp/cmis/cmis_provider.cxx | 2 -- ucb/source/ucp/file/filglob.cxx | 1 - ucb/source/ucp/gio/gio_content.cxx | 21 +++++---------------- ucb/source/ucp/gio/gio_datasupplier.cxx | 2 -- ucb/source/ucp/gio/gio_mount.cxx | 1 - ucb/source/ucp/gio/gio_provider.cxx | 9 +-------- ucb/source/ucp/gvfs/gvfs_content.cxx | 2 -- ucb/source/ucp/webdav-neon/DateTimeHelper.cxx | 1 - ucb/source/ucp/webdav/DateTimeHelper.cxx | 1 - 9 files changed, 6 insertions(+), 34 deletions(-) (limited to 'ucb/source/ucp') diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index 7fc710e85fda..a41b52c9cf94 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -7,8 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include - #include #include #include diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index 4f8a2c19a9d5..b9c54218686b 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include "filglob.hxx" #include "filerror.hxx" #include "shell.hxx" diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index f86ee345ded5..96c7c4b96f2f 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -90,9 +90,7 @@ Content::Content( : ContentImplHelper( rxContext, pProvider, Identifier ), m_pProvider( pProvider ), mpFile (NULL), mpInfo( NULL ), mbTransient(false) { -#if OSL_DEBUG_LEVEL > 1 - fprintf(stderr, "New Content ('%s')\n", OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); -#endif + SAL_INFO("ucb.ucp.gio", "New Content ('" << m_xIdentifier->getContentIdentifier() << "')\n"); } Content::Content( @@ -104,9 +102,7 @@ Content::Content( : ContentImplHelper( rxContext, pProvider, Identifier ), m_pProvider( pProvider ), mpFile (NULL), mpInfo( NULL ), mbTransient(true) { -#if OSL_DEBUG_LEVEL > 1 - fprintf(stderr, "Create Content ('%s')\n", OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); -#endif + SAL_INFO("ucb.ucp.gio", "Create Content ('" << m_xIdentifier->getContentIdentifier() << "')\n"); mpInfo = g_file_info_new(); g_file_info_set_file_type(mpInfo, bIsFolder ? G_FILE_TYPE_DIRECTORY : G_FILE_TYPE_REGULAR); } @@ -744,9 +740,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( } else { -#ifdef DEBUG - fprintf(stderr, "Unknown property %s\n", OUStringToOString(rValue.Name, RTL_TEXTENCODING_UTF8).getStr()); -#endif + SAL_WARN("ucb.ucp.gio", "Unknown property " << rValue.Name << "\n"); aRet[ n ] <<= getReadOnlyException( static_cast< cppu::OWeakObject * >(this) ); //TODO } @@ -942,9 +936,7 @@ uno::Any SAL_CALL Content::execute( ucb::CommandAbortedException, uno::RuntimeException, std::exception ) { -#if OSL_DEBUG_LEVEL > 1 - fprintf(stderr, "Content::execute %s\n", OUStringToOString(aCommand.Name, RTL_TEXTENCODING_UTF8).getStr()); -#endif + SAL_INFO("ucb.ucp.gio", "Content::execute " << aCommand.Name << "\n"); uno::Any aRet; if ( aCommand.Name == "getPropertyValues" ) @@ -1015,10 +1007,7 @@ uno::Any SAL_CALL Content::execute( } else { -#ifdef DEBUG - fprintf(stderr, "UNKNOWN COMMAND\n"); - //TODO -#endif + SAL_WARN("ucb.ucp.gio", "Unknown command " << aCommand.Name << "\n"); ucbhelper::cancelCommandExecution ( uno::makeAny( ucb::UnsupportedCommandException diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx index 2bcc219c1b67..02c1e11df61e 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.cxx +++ b/ucb/source/ucp/gio/gio_datasupplier.cxx @@ -28,8 +28,6 @@ #include "gio_content.hxx" #include "gio_provider.hxx" -#include - using namespace com::sun::star; using namespace gio; diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx index 9b834b83965a..4ac8b2987e60 100644 --- a/ucb/source/ucp/gio/gio_mount.cxx +++ b/ucb/source/ucp/gio/gio_mount.cxx @@ -19,7 +19,6 @@ #include "gio_mount.hxx" #include -#include #include #ifdef __GNUC__ diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 4832f86e2065..527f1ef0b627 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -23,8 +23,6 @@ #include "gio_provider.hxx" #include "gio_content.hxx" -#include - using namespace com::sun::star; namespace gio @@ -36,12 +34,7 @@ ContentProvider::queryContent( throw( com::sun::star::ucb::IllegalIdentifierException, uno::RuntimeException, std::exception ) { -#if OSL_DEBUG_LEVEL > 1 - fprintf(stderr, "QueryContent: '%s'", - OUStringToOString - (Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); -#endif - + SAL_INFO("ucb.ucp.gio", "QueryContent: " << Identifier->getContentIdentifier()); osl::MutexGuard aGuard( m_aMutex ); // Check, if a content with given id already exists... diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx index 6a22e9affca8..29449f08634f 100644 --- a/ucb/source/ucp/gvfs/gvfs_content.cxx +++ b/ucb/source/ucp/gvfs/gvfs_content.cxx @@ -274,8 +274,6 @@ uno::Any Content::getBadArgExcept() -1 ) ); } -#include - uno::Any SAL_CALL Content::execute( const ucb::Command& aCommand, sal_Int32 /*CommandId*/, diff --git a/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx index 2b240eb2e74d..5765d225a563 100644 --- a/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx +++ b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx @@ -27,7 +27,6 @@ ************************************************************************/ -#include #include #include #include "DateTimeHelper.hxx" diff --git a/ucb/source/ucp/webdav/DateTimeHelper.cxx b/ucb/source/ucp/webdav/DateTimeHelper.cxx index 3bf77248deb5..961c2332e977 100644 --- a/ucb/source/ucp/webdav/DateTimeHelper.cxx +++ b/ucb/source/ucp/webdav/DateTimeHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include #include #include "DateTimeHelper.hxx" -- cgit v1.2.3