[Libreoffice-commits] .: 2 commits - basic/source ucb/source xmlhelp/source

[Thorsten Behrens]

 basic/source/runtime/iosys.cxx                  |    4 ++--
 ucb/source/ucp/file/filinpstr.cxx               |    2 +-
 ucb/source/ucp/file/filrec.cxx                  |    2 +-
 ucb/source/ucp/file/filstr.cxx                  |    4 ++--
 xmlhelp/source/cxxhelp/provider/inputstream.cxx |    6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 0a6f4e361634e126a588f3a11420a016688971a6
Author: Michael Lefevre <lefevre00 at yahoo.fr>
Date:   Wed Apr 13 22:43:56 2011 +0200

    Kill Pos_XXX in favour of osl_Pos_XXX

diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 1f3c22d..ea7538e 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -390,7 +390,7 @@ sal_uIntPtr OslStream::PutData( const void* pData, sal_uIntPtr nSize )
 sal_uIntPtr OslStream::SeekPos( sal_uIntPtr nPos )
 {
     if( nPos == STREAM_SEEK_TO_END )
-        maFile.setPos( Pos_End, 0 );
+        maFile.setPos( osl_Pos_End, 0 );
     else
         maFile.setPos( osl_Pos_Absolut, (sal_uInt64)nPos );
     sal_uInt64 nRealPos(0);
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
index f176762..fd2ec40 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
@@ -208,7 +208,7 @@ XInputStream_impl::getLength(
     if( err != osl::FileBase::E_None )
         throw io::IOException();
 
-    err = m_aFile.setPos( Pos_End, 0 );
+    err = m_aFile.setPos( osl_Pos_End, 0 );
     if( err != osl::FileBase::E_None )
         throw io::IOException();
 
commit fdd7dfc17f192c1f91109964ba2b07c1d3c72f81
Author: Michael Lefevre <lefevre00 at yahoo.fr>
Date:   Wed Apr 13 22:28:59 2011 +0200

    Kill Pos_XXX in favour of osl_Pos_XXX

diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 8759f9d..1f3c22d 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -392,7 +392,7 @@ sal_uIntPtr OslStream::SeekPos( sal_uIntPtr nPos )
     if( nPos == STREAM_SEEK_TO_END )
         maFile.setPos( Pos_End, 0 );
     else
-        maFile.setPos( Pos_Absolut, (sal_uInt64)nPos );
+        maFile.setPos( osl_Pos_Absolut, (sal_uInt64)nPos );
     sal_uInt64 nRealPos(0);
     maFile.getPos( nRealPos );
     return sal::static_int_cast<sal_uIntPtr>(nRealPos);
diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx
index a7af4b6..1a683c6 100644
--- a/ucb/source/ucp/file/filinpstr.cxx
+++ b/ucb/source/ucp/file/filinpstr.cxx
@@ -230,7 +230,7 @@ XInputStream_impl::seek(
 {
     if( location < 0 )
         throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 0 );
-    if( osl::FileBase::E_None != m_aFile.setPos( Pos_Absolut, sal_uInt64( location ) ) )
+    if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolut, sal_uInt64( location ) ) )
         throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 }
 
diff --git a/ucb/source/ucp/file/filrec.cxx b/ucb/source/ucp/file/filrec.cxx
index a4a07b0..768f0ee 100644
--- a/ucb/source/ucp/file/filrec.cxx
+++ b/ucb/source/ucp/file/filrec.cxx
@@ -85,7 +85,7 @@ sal_Bool ReconnectingFile::reconnect()
 {
     ::osl::FileBase::RC nRes = ::osl::FileBase::E_NETWORK;
 
-    if ( uHow == Pos_Absolut && uPos > 0 )
+    if ( uHow == osl_Pos_Absolut && uPos > 0 )
     {
         if ( m_bDisconnect )
         {
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index 7efe373..a8b77f5 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -189,7 +189,7 @@ void SAL_CALL XStream_impl::truncate(void)
     if (osl::FileBase::E_None != m_aFile.setSize(0))
         throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
-    if (osl::FileBase::E_None != m_aFile.setPos(Pos_Absolut,sal_uInt64(0)))
+    if (osl::FileBase::E_None != m_aFile.setPos(osl_Pos_Absolut,sal_uInt64(0)))
         throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 }
 
@@ -351,7 +351,7 @@ XStream_impl::seek(
 {
     if( location < 0 )
         throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 0 );
-    if( osl::FileBase::E_None != m_aFile.setPos( Pos_Absolut, sal_uInt64( location ) ) )
+    if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolut, sal_uInt64( location ) ) )
         throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 }
 
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
index b668a7d..f176762 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
@@ -178,7 +178,7 @@ XInputStream_impl::seek(
 {
     if( location < 0 )
         throw lang::IllegalArgumentException();
-    if( osl::FileBase::E_None != m_aFile.setPos( Pos_Absolut, sal_uInt64( location ) ) )
+    if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolut, sal_uInt64( location ) ) )
         throw io::IOException();
 }
 
@@ -216,7 +216,7 @@ XInputStream_impl::getLength(
     if( err != osl::FileBase::E_None )
         throw io::IOException();
 
-    err = m_aFile.setPos( Pos_Absolut, uCurrentPos );
+    err = m_aFile.setPos( osl_Pos_Absolut, uCurrentPos );
     if( err != osl::FileBase::E_None )
         throw io::IOException();
     else