[Libreoffice] [PATCH] Kill Pos_XXX in favour of osl_Pos_XXX
Michael Lefevre
lefevre00 at yahoo.fr
Wed Apr 13 13:28:59 PDT 2011
---
basic/source/runtime/iosys.cxx | 2 +-
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 | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 9caeff7..ff3385a 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -405,7 +405,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
--
1.7.1
More information about the LibreOffice
mailing list