[Libreoffice-commits] core.git: ucbhelper/source ucb/source unodevtools/source unoidl/source unotools/inc unotools/IwyuFilter_unotools.yaml unotools/source unoxml/inc uui/source

2020-05-10 Thread Noel Grandin (via logerrit) 
 ucb/source/cacher/cachedcontentresultset.hxx   |4 ++--
 ucb/source/core/FileAccess.hxx |8 
 ucb/source/core/providermap.hxx|4 ++--
 ucb/source/core/ucb.hxx|4 ++--
 ucb/source/ucp/cmis/cmis_content.hxx   |4 ++--
 ucb/source/ucp/cmis/cmis_repo_content.hxx  |4 ++--
 ucb/source/ucp/ext/ucpext_content.hxx  |4 ++--
 ucb/source/ucp/ext/ucpext_datasupplier.hxx |4 ++--
 ucb/source/ucp/ext/ucpext_provider.hxx |4 ++--
 ucb/source/ucp/ext/ucpext_resultset.hxx|4 ++--
 ucb/source/ucp/ftp/ftpcontent.hxx  |8 
 ucb/source/ucp/gio/gio_content.hxx |4 ++--
 ucb/source/ucp/hierarchy/hierarchycontent.hxx  |   12 ++--
 ucb/source/ucp/hierarchy/hierarchydata.hxx |4 ++--
 ucb/source/ucp/hierarchy/hierarchyprovider.hxx |4 ++--
 ucb/source/ucp/inc/urihelper.hxx   |4 ++--
 ucb/source/ucp/package/pkgcontent.hxx  |4 ++--
 ucb/source/ucp/package/pkgprovider.hxx |4 ++--
 ucb/source/ucp/tdoc/tdoc_content.hxx   |4 ++--
 ucb/source/ucp/tdoc/tdoc_provider.hxx  |8 
 ucb/source/ucp/webdav-neon/ContentProperties.hxx   |4 ++--
 ucb/source/ucp/webdav-neon/DAVSession.hxx  |8 
 ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx   |8 
 ucb/source/ucp/webdav-neon/DateTimeHelper.hxx  |4 ++--
 ucb/source/ucp/webdav-neon/webdavcontent.hxx   |   16 
 ucb/source/ucp/webdav/ContentProperties.hxx|2 +-
 ucb/source/ucp/webdav/DAVSession.hxx   |2 +-
 ucb/source/ucp/webdav/DAVSessionFactory.hxx|2 +-
 ucb/source/ucp/webdav/DateTimeHelper.hxx   |2 +-
 ucb/source/ucp/webdav/webdavcontent.hxx|8 
 ucb/source/ucp/webdav/webdavprovider.hxx   |2 +-
 ucbhelper/source/provider/contentinfo.hxx  |2 +-
 ucbhelper/source/provider/simpleioerrorrequest.hxx |4 +---
 unodevtools/source/skeletonmaker/skeletoncpp.hxx   |4 ++--
 unodevtools/source/skeletonmaker/skeletonjava.hxx  |4 ++--
 unoidl/source/legacyprovider.hxx   |4 ++--
 unoidl/source/sourcefileprovider.hxx   |4 ++--
 unoidl/source/sourceprovider-parser-requires.hxx   |4 ++--
 unoidl/source/sourceprovider-parser.y  |4 ++--
 unoidl/source/sourceprovider-scanner.hxx   |4 ++--
 unoidl/source/sourceprovider-scanner.l |4 ++--
 unoidl/source/sourcetreeprovider.hxx   |4 ++--
 unoidl/source/unoidlprovider.hxx   |4 ++--
 unotools/IwyuFilter_unotools.yaml  |2 +-
 unotools/inc/unotoolsservices.hxx  |2 +-
 unotools/source/misc/ServiceDocumenter.hxx |4 ++--
 unoxml/inc/event.hxx   |4 ++--
 unoxml/inc/mouseevent.hxx  |4 ++--
 unoxml/inc/mutationevent.hxx   |4 ++--
 unoxml/inc/uievent.hxx |4 ++--
 uui/source/getcontinuations.hxx|4 ++--
 uui/source/iahndl.hxx  |4 ++--
 52 files changed, 117 insertions(+), 119 deletions(-)

New commits:
commit de61e14d0b6ee90cb4d170af340275d811b9fbbf
Author: Noel Grandin 
AuthorDate: Sun May 10 09:19:36 2020 +0200
Commit: Noel Grandin 
CommitDate: Sun May 10 18:28:34 2020 +0200

compact namespace in ucb..uui

Change-Id: I644d5e418028b4b4e66cf67b20a1155a689acab0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93906
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/ucb/source/cacher/cachedcontentresultset.hxx 
b/ucb/source/cacher/cachedcontentresultset.hxx
index d21b74d5fb61..f6a86e704aae 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -40,9 +40,9 @@
 #define CACHED_CONTENT_RESULTSET_FACTORY_NAME 
"com.sun.star.ucb.CachedContentResultSetFactory"
 
 
-namespace com { namespace sun { namespace star { namespace script {
+namespace com::sun::star::script {
 class XTypeConverter;
-} } } }
+}
 
 class CCRS_PropertySetInfo;
 class CachedContentResultSet
diff --git a/ucb/source/core/FileAccess.hxx b/ucb/source/core/FileAccess.hxx
index dd5440e2a802..7b7b8a037103 100644
--- a/ucb/source/core/FileAccess.hxx
+++ b/ucb/source/core/FileAccess.hxx
@@ -26,10 +26,10 @@
 #include 
 #include 
 
-namespace com { namespace sun { namespace star {
-namespace lang { class XMultiServiceFactory; }
-namespace uno { class XInterface; }
-} } }
+namespace com::sun::star {
+namespace lang { class XMultiServiceFactory; }
+namespace uno { class XInterface; }
+}
 
 #define IMPLEMENTATION_NAME "com.sun.star.comp.ucb.SimpleFileAccess"
 
diff --git

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

2019-08-12 Thread Andrea Gelmini (via logerrit) 
 ucb/source/ucp/ftp/ftpurl.cxx |4 ++--
 ucb/source/ucp/hierarchy/hierarchyuri.cxx |   12 ++--
 ucb/source/ucp/package/pkgprovider.cxx|2 +-
 ucb/source/ucp/package/pkguri.cxx |   14 +++---
 ucb/source/ucp/tdoc/tdoc_content.cxx  |6 +++---
 ucbhelper/source/provider/resultset.cxx   |2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit b937a95b4e3f372f64450a6bfea9a7efb5c16464
Author: Andrea Gelmini 
AuthorDate: Sun Aug 11 18:19:03 2019 +0200
Commit: Julien Nabet 
CommitDate: Mon Aug 12 11:38:04 2019 +0200

Fix typos

Change-Id: Ic49b4cc6f2d0e0ac4d2635da2447bc6a2db5322e
Reviewed-on: https://gerrit.libreoffice.org/77275
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index a72a153d5eac..3d04a716a82c 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -563,11 +563,11 @@ OUString FTPURL::net_title() const
 throw curl_exception(err);
 #endif
 else if(try_more && err == CURLE_FTP_ACCESS_DENIED) {
-// We  were  either denied access when trying to login to
+// We were either denied access when trying to login to
 //  an FTP server or when trying to change working directory
 //  to the one given in the URL.
 if(!m_aPathSegmentVec.empty())
-// determine title form url
+// determine title from URL
 aNetTitle = decodePathSegment(m_aPathSegmentVec.back());
 else
 // must be root
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx 
b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
index 6bd2fc5952f1..cc7aed266e58 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
@@ -47,10 +47,10 @@ void HierarchyUri::init() const
 m_aService.clear();
 m_aParentUri.clear();
 
-// URI must match at least: :
+// URI must match at least: :
 if ( m_aUri.getLength() < HIERARCHY_URL_SCHEME_LENGTH + 1 )
 {
-// error, but remember that we did a init().
+// error, but remember that we did an init().
 m_aPath = "/";
 return;
 }
@@ -110,7 +110,7 @@ void HierarchyUri::init() const
 // Only :// ?
 if ( nStart == m_aUri.getLength() )
 {
-// error, but remember that we did a init().
+// error, but remember that we did an init().
 m_aPath = "/";
 return;
 }
@@ -118,7 +118,7 @@ void HierarchyUri::init() const
 // Empty path segments?
 if ( m_aUri.indexOf("//", nStart) != -1 )
 {
-// error, but remember that we did a init().
+// error, but remember that we did an init().
 m_aPath = "/";
 return;
 }
@@ -128,7 +128,7 @@ void HierarchyUri::init() const
 // Only :/// ?
 if ( nEnd == nStart )
 {
-// error, but remember that we did a init().
+// error, but remember that we did an init().
 m_aPath = "/";
 return;
 }
@@ -171,7 +171,7 @@ void HierarchyUri::init() const
 }
 else
 {
-// error, but remember that we did a init().
+// error, but remember that we did an init().
 m_aPath = "/";
 }
 }
diff --git a/ucb/source/ucp/package/pkgprovider.cxx 
b/ucb/source/ucp/package/pkgprovider.cxx
index 7b7848e9a72d..b014c6c01915 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -178,7 +178,7 @@ uno::Reference< ucb::XContent > SAL_CALL 
ContentProvider::queryContent(
 if ( !aUri.isValid() )
 throw ucb::IllegalIdentifierException();
 
-// Create a new identifier for the mormalized URL returned by
+// Create a new identifier for the normalized URL returned by
 // PackageUri::getUri().
 uno::Reference< ucb::XContentIdentifier > xId = new 
::ucbhelper::ContentIdentifier( aUri.getUri() );
 
diff --git a/ucb/source/ucp/package/pkguri.cxx 
b/ucb/source/ucp/package/pkguri.cxx
index 95cb0b7d8874..0458e73085a3 100644
--- a/ucb/source/ucp/package/pkguri.cxx
+++ b/ucb/source/ucp/package/pkguri.cxx
@@ -70,10 +70,10 @@ void PackageUri::init() const
 m_aParam.clear();
 m_aScheme.clear();
 
-// URI must match at least: ://
+// URI must match at least: ://
 if ( m_aUri.getLength() < PACKAGE_URL_SCHEME_LENGTH + 4 )
 {
-// error, but remember that we did a init().
+// error, but remember that we did an init().
 m_aPath = "/";
 return;
 }
@@

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

2018-10-22 Thread Libreoffice Gerrit user 
 ucb/source/core/ucb.cxx|   24 +--
 ucb/source/ucp/cmis/cmis_content.cxx   |   93 ---
 ucb/source/ucp/cmis/cmis_datasupplier.cxx  |7 
 ucb/source/ucp/cmis/cmis_repo_content.cxx  |   15 -
 ucb/source/ucp/file/filprp.cxx |   12 -
 ucb/source/ucp/file/filtask.cxx|   13 -
 ucb/source/ucp/gio/gio_content.cxx |   29 +--
 ucb/source/ucp/hierarchy/hierarchycontent.cxx  |   16 --
 ucb/source/ucp/package/pkgcontent.cxx  |   25 ---
 ucb/source/ucp/tdoc/tdoc_content.cxx   |   25 ---
 ucb/source/ucp/tdoc/tdoc_docmgr.cxx|   94 +++
 ucb/source/ucp/tdoc/tdoc_provider.cxx  |   24 ---
 ucb/source/ucp/webdav-neon/ContentProperties.cxx   |   57 ++-
 ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx   |   26 ---
 ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx   |   14 -
 ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx |   34 +---
 ucb/source/ucp/webdav-neon/NeonLockStore.cxx   |   19 --
 ucb/source/ucp/webdav-neon/NeonSession.cxx |   58 ++-
 ucb/source/ucp/webdav-neon/webdavcontent.cxx   |  165 +++--
 ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx   |   55 ++-
 ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx  |   32 +---
 ucb/source/ucp/webdav/ContentProperties.cxx|   75 ++---
 ucb/source/ucp/webdav/DAVResourceAccess.cxx|   14 -
 ucb/source/ucp/webdav/DAVSessionFactory.cxx|   14 -
 ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx   |   21 --
 ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx  |   21 --
 ucb/source/ucp/webdav/SerfLockStore.cxx|   16 --
 ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx |   14 -
 ucb/source/ucp/webdav/webdavcontent.cxx|  103 +++--
 ucb/source/ucp/webdav/webdavcontentcaps.cxx|   54 ++
 ucb/source/ucp/webdav/webdavdatasupplier.cxx   |   24 ---
 ucbhelper/source/client/interceptedinteraction.cxx |   35 +---
 ucbhelper/source/provider/providerhelper.cxx   |   10 -
 33 files changed, 390 insertions(+), 848 deletions(-)

New commits:
commit e06afb0c9546ddcde1cedd75f59001396ac6fdf2
Author: Arkadiy Illarionov 
AuthorDate: Sat Oct 20 22:15:25 2018 +0300
Commit: Noel Grandin 
CommitDate: Mon Oct 22 09:47:59 2018 +0200

Simplify containers iterations in ucb, ucbhelper

Use range-based loop or replace with STL functions.

Change-Id: I3cdb0f89523008199af1550de164a52b75c52ba5
Reviewed-on: https://gerrit.libreoffice.org/62088
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 8672fa26a7a0..6b3cf12a8f3b 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -464,16 +464,10 @@ void SAL_CALL 
UniversalContentBroker::deregisterContentProvider(
 {
 ProviderList_Impl & rList = aMapIt->getValue();
 
-ProviderList_Impl::iterator aListEnd(rList.end());
-for (ProviderList_Impl::iterator aListIt(rList.begin());
- aListIt != aListEnd; ++aListIt)
-{
-if ((*aListIt).getProvider() == Provider)
-{
-rList.erase(aListIt);
-break;
-}
-}
+auto aListIt = std::find_if(rList.begin(), rList.end(),
+[](const ProviderListEntry_Impl& rEntry) { return 
rEntry.getProvider() == Provider; });
+if (aListIt != rList.end())
+rList.erase(aListIt);
 
 if (rList.empty())
 m_aProviders.erase(aMapIt);
@@ -810,20 +804,18 @@ void UniversalContentBroker::configureUcb()
 void UniversalContentBroker::prepareAndRegister(
 const ContentProviderDataList& rData)
 {
-ContentProviderDataList::const_iterator aEnd(rData.end());
-for (ContentProviderDataList::const_iterator aIt(rData.begin());
- aIt != aEnd; ++aIt)
+for (const auto& rContentProviderData : rData)
 {
 OUString aProviderArguments;
-if (fillPlaceholders(aIt->Arguments,
+if (fillPlaceholders(rContentProviderData.Arguments,
  m_aArguments,
  ))
 {
 registerAtUcb(this,
   m_xContext,
-  aIt->ServiceName,
+  rContentProviderData.ServiceName,
   aProviderArguments,
-  aIt->URLTemplate);
+  rContentProviderData.URLTemplate);
 
 }
 else
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx 
b/ucb/source/ucp/cmis/cmis_content.cxx
index 65cb142f67bd..8a680d6193bb 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -44,6 +44,7 @@
 #endif
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -106,11 +107,9 @@ namespace
 uno::Sequence< OUString >

[Libreoffice-commits] core.git: ucbhelper/source ucb/source xmlhelp/source

2016-06-23 Thread Noel Grandin 
 ucb/source/ucp/file/bc.cxx|   12 -
 ucb/source/ucp/file/bc.hxx|   27 +---
 ucb/source/ucp/file/filcmd.cxx|   12 -
 ucb/source/ucp/file/filcmd.hxx|   24 +--
 ucb/source/ucp/file/filid.cxx |   18 --
 ucb/source/ucp/file/filid.hxx |   21 +--
 ucb/source/ucp/file/filinpstr.cxx |   27 +---
 ucb/source/ucp/file/filinpstr.hxx |   27 +---
 ucb/source/ucp/file/filprp.cxx|9 -
 ucb/source/ucp/file/filprp.hxx|6 
 ucb/source/ucp/file/filrow.cxx|3 
 ucb/source/ucp/file/filrow.hxx|   54 ++--
 ucb/source/ucp/file/filrset.cxx   |   69 +++---
 ucb/source/ucp/file/filrset.hxx   |  138 ++--
 ucb/source/ucp/file/filstr.cxx|   24 +--
 ucb/source/ucp/file/filstr.hxx|   28 +---
 ucb/source/ucp/file/prov.cxx  |   33 +---
 ucb/source/ucp/file/prov.hxx  |9 -
 ucb/source/ucp/ftp/ftpcontentidentifier.cxx   |3 
 ucb/source/ucp/ftp/ftpresultsetbase.cxx   |   80 +++-
 ucb/source/ucp/ftp/ftpresultsetbase.hxx   |   78 +++
 ucbhelper/source/provider/fd_inputstream.cxx  |   10 -
 xmlhelp/source/cxxhelp/inc/tvfactory.hxx  |9 -
 xmlhelp/source/cxxhelp/provider/inputstream.cxx   |   24 +--
 xmlhelp/source/cxxhelp/provider/inputstream.hxx   |   24 +--
 xmlhelp/source/cxxhelp/provider/resultsetbase.cxx |   75 +++
 xmlhelp/source/cxxhelp/provider/resultsetbase.hxx |  146 +++---
 27 files changed, 330 insertions(+), 660 deletions(-)

New commits:
commit 5bd5baff3f2a55bc2d84e1e352a00dd6969394e3
Author: Noel Grandin 
Date:   Thu Jun 23 11:37:33 2016 +0200

remove some more (void) style function definitions/declarations

found with
git grep -nP '^\s*void\s*\)'

Change-Id: I1206031cf957cb6f957cae64ec5cae1280bda694
Reviewed-on: https://gerrit.libreoffice.org/26590
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index f3e37a5..d7b6db8 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -577,8 +577,7 @@ BaseContent::addProperty(
 
 
 void SAL_CALL
-BaseContent::removeProperty(
-const OUString& Name )
+BaseContent::removeProperty( const OUString& Name )
 throw( beans::UnknownPropertyException,
beans::NotRemoveableException,
RuntimeException, std::exception)
@@ -595,8 +594,7 @@ BaseContent::removeProperty(
 
 
 Sequence< ContentInfo > SAL_CALL
-BaseContent::queryCreatableContentsInfo(
-void )
+BaseContent::queryCreatableContentsInfo()
 throw( RuntimeException, std::exception )
 {
 return m_pMyShell->queryCreatableContentsInfo();
@@ -604,8 +602,7 @@ BaseContent::queryCreatableContentsInfo(
 
 
 Reference< XContent > SAL_CALL
-BaseContent::createNewContent(
-const ContentInfo& Info )
+BaseContent::createNewContent( const ContentInfo& Info )
 throw( RuntimeException, std::exception )
 {
 // Check type.
@@ -695,8 +692,7 @@ BaseContent::removePropertySetInfoChangeListener(
 
 
 Reference< XInterface > SAL_CALL
-BaseContent::getParent(
-void )
+BaseContent::getParent()
 throw( RuntimeException, std::exception )
 {
 OUString ParentUnq = getParentName( m_aUncPath );
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index b798cae..c071f61 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -88,25 +88,21 @@ namespace fileaccess {
 
 // XInterface
 virtual css::uno::Any SAL_CALL
-queryInterface(
-const css::uno::Type& aType )
+queryInterface( const css::uno::Type& aType )
 throw( css::uno::RuntimeException, std::exception) override;
 
 virtual void SAL_CALL
-acquire(
-void )
+acquire()
 throw() override;
 
 virtual void SAL_CALL
-release(
-void )
+release()
 throw() override;
 
 
 // XComponent
 virtual void SAL_CALL
-dispose(
-void )
+dispose()
 throw( css::uno::RuntimeException, std::exception ) override;
 
 virtual void SAL_CALL
@@ -156,8 +152,7 @@ namespace fileaccess {
css::uno::RuntimeException, std::exception ) override;
 
 virtual void SAL_CALL
-abort(
-sal_Int32 CommandId )
+abort( sal_Int32 CommandId )
 throw( css::uno::RuntimeException, std::exception ) override;
 
 
@@ -206,8 +201,7 @@ namespace fileaccess {
css::uno::RuntimeException, std::exception) override;
 
 virtual void

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

2013-06-04 Thread Caolán McNamara 
 ucb/source/ucp/ftp/ftpurl.cxx|5 -
 ucbhelper/source/provider/fd_inputstream.cxx |   13 -
 2 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 2684858c79877d81f8ec20b70abda43ca72f060d
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jun 4 11:27:18 2013 +0100

fix build, bad merge

Change-Id: I153b5ac4c2c75aca055ef49920cbccf3bd7720d4

diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 50309e9..6da2bf4 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -411,7 +411,10 @@ oslFileHandle FTPURL::open()
 CURLcode err = curl_easy_perform(curl);
 
 if(err == CURLE_OK)
-osl_setFilePos( res, osl_Pos_Absolut, 0 );
+{
+oslFileError rc = osl_setFilePos( res, osl_Pos_Absolut, 0 );
+SAL_WARN_IF(rc != osl_File_E_None, ucb, osl_setFilePos failed);
+}
 else {
 osl_closeFile(res),res = 0;
 throw curl_exception(err);
diff --git a/ucbhelper/source/provider/fd_inputstream.cxx 
b/ucbhelper/source/provider/fd_inputstream.cxx
index f70a6e9..b7857b6 100644
--- a/ucbhelper/source/provider/fd_inputstream.cxx
+++ b/ucbhelper/source/provider/fd_inputstream.cxx
@@ -28,7 +28,7 @@ using namespace com::sun::star::io;
 
 namespace ucbhelper
 {
-FdInputStream:::FdInputStream:( oslFileHandle tmpfl )
+FdInputStream::FdInputStream( oslFileHandle tmpfl )
 : m_tmpfl(tmpfl)
 , m_nLength( 0 )
 {
@@ -41,7 +41,8 @@ namespace ucbhelper
 sal_uInt64 nFileSize = 0;
 if ( osl_getFilePos( m_tmpfl, nFileSize ) == osl_File_E_None )
 m_nLength = nFileSize;
-osl_setFilePos( m_tmpfl, osl_Pos_Absolut, 0 );
+oslFileError rc = osl_setFilePos( m_tmpfl, osl_Pos_Absolut, 0 );
+SAL_WARN_IF(rc != osl_File_E_None, ucbhelper, osl_setFilePos 
failed);
 }
 }
 
@@ -101,7 +102,8 @@ namespace ucbhelper
 if(!m_tmpfl)
 throw IOException();
 
-osl_setFilePos( m_tmpfl, osl_Pos_Current, nBytesToSkip );
+oslFileError rc = osl_setFilePos( m_tmpfl, osl_Pos_Current, 
nBytesToSkip );
+SAL_WARN_IF(rc != osl_File_E_None, ucbhelper, osl_setFilePos 
failed);
 }
 
 
@@ -123,7 +125,7 @@ namespace ucbhelper
 {
 osl::MutexGuard aGuard(m_aMutex);
 if(m_tmpfl)
-fclose(m_tmpfl),m_tmpfl = 0;
+osl_closeFile(m_tmpfl),m_tmpfl = 0;
 }
 
 
@@ -137,7 +139,8 @@ namespace ucbhelper
 if(!m_tmpfl)
 throw IOException();
 
-fseek(m_tmpfl,long(location),SEEK_SET);
+oslFileError rc = osl_setFilePos( m_tmpfl, osl_Pos_Absolut, location );
+SAL_WARN_IF(rc != osl_File_E_None, ucbhelper, osl_setFilePos 
failed);
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits