summaryrefslogtreecommitdiff
path: root/ucb/source/ucp
diff options
context:
space:
mode:
authorHennes Rohling <hro@openoffice.org>2001-04-03 11:06:25 +0000
committerHennes Rohling <hro@openoffice.org>2001-04-03 11:06:25 +0000
commit2fff5148bd1f9c039e436c03224dbc0083da9b89 (patch)
treec876ad3d310bc67d13d564859436db191e7368e6 /ucb/source/ucp
parent76db0a64d13c166b156eef3cbbb320f7fb53d860 (diff)
Removed some warnings
Diffstat (limited to 'ucb/source/ucp')
-rw-r--r--ucb/source/ucp/file/bc.cxx6
-rw-r--r--ucb/source/ucp/file/filrset.cxx8
-rw-r--r--ucb/source/ucp/file/filrset.hxx6
-rw-r--r--ucb/source/ucp/file/shell.cxx18
4 files changed, 19 insertions, 19 deletions
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 4f657b898168..92eb12402043 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: bc.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: abi $ $Date: 2001-02-02 16:53:39 $
+ * last change: $Author: hro $ $Date: 2001-04-03 12:06:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -995,7 +995,7 @@ BaseContent::setPropertyValues(
aDstName,
NameClash::KEEP );
}
- catch( const CommandAbortedException& e )
+ catch( const CommandAbortedException& )
{
}
}
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index ec4319592cf2..deef29fc4763 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: filrset.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: kso $ $Date: 2001-03-01 08:03:26 $
+ * last change: $Author: hro $ $Date: 2001-04-03 12:06:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -318,7 +318,7 @@ XResultSet_impl::OneMoreFaked( void )
throw( sdbc::SQLException,
uno::RuntimeException )
{
- sal_Int32 k = m_aItems.size();
+ sal_uInt32 k = m_aItems.size();
if( k < m_pMyShell->m_vecMountPoint.size() &&
( m_nOpenMode == OpenMode::ALL || m_nOpenMode == OpenMode::FOLDERS ) )
{
@@ -526,7 +526,7 @@ XResultSet_impl::isAfterLast(
throw( sdbc::SQLException,
uno::RuntimeException )
{
- return m_nRow >= sal_Int32( m_aItems.size() ); // Cannot happen, if m_aFolder.isOpen()
+ return m_nRow >= m_aItems.size(); // Cannot happen, if m_aFolder.isOpen()
}
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index d1dc5399d0cb..6b6a55355e42 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: filrset.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: armin $ $Date: 2001-03-08 09:55:55 $
+ * last change: $Author: hro $ $Date: 2001-04-03 12:06:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -688,7 +688,7 @@ namespace fileaccess {
shell* m_pMyShell;
com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider;
sal_Bool m_nIsOpen;
- sal_Int32 m_nRow;
+ sal_uInt32 m_nRow;
sal_Bool m_nWasNull;
sal_Int32 m_nOpenMode;
sal_Bool m_bRowCountFinal;
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 117610bf4491..5ae8b2d918ea 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: shell.cxx,v $
*
- * $Revision: 1.29 $
+ * $Revision: 1.30 $
*
- * last change: $Author: hro $ $Date: 2001-03-30 12:53:50 $
+ * last change: $Author: hro $ $Date: 2001-04-03 12:06:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -640,7 +640,7 @@ void SAL_CALL shell::page( sal_Int32 CommandId,
no_err = aFile.read( (void*) BFF,bfz,nrc ) == osl::FileBase::E_None;
if( no_err )
{
- uno::Sequence< sal_Int8 > seq( BFF,nrc );
+ uno::Sequence< sal_Int8 > seq( BFF, (sal_uInt32)nrc );
xOutputStream->writeBytes( seq );
}
else
@@ -1484,7 +1484,7 @@ XStream_impl::readBytes(
sal_uInt64 nrc;
m_aFile.read( (void* )buffer,sal_uInt64(nBytesToRead),nrc );
- aData = uno::Sequence< sal_Int8 > ( buffer,nrc );
+ aData = uno::Sequence< sal_Int8 > ( buffer, (sal_uInt32)nrc );
delete[] buffer;
return ( sal_Int32 ) nrc;
}
@@ -2764,15 +2764,15 @@ shell::write( sal_Int32 CommandId,
nReadBytes = aInputStream->readBytes( seq,
nRequestedBytes );
}
- catch( const io::NotConnectedException& e )
+ catch( const io::NotConnectedException& )
{
bSuccess = false;
}
- catch( const io::BufferSizeExceededException& e )
+ catch( const io::BufferSizeExceededException& )
{
bSuccess = false;
}
- catch( const io::IOException& e )
+ catch( const io::IOException& )
{
bSuccess = false;
}
@@ -2956,7 +2956,7 @@ shell::commit( const shell::ContentMap::iterator& it,
if( m_bFaked )
{
- for( sal_Int32 i = 0; i < m_vecMountPoint.size(); ++i )
+ for( sal_uInt32 i = 0; i < m_vecMountPoint.size(); ++i )
if( it->first == m_vecMountPoint[i].m_aDirectory )
aAny <<= m_vecMountPoint[i].m_aTitle;
}
@@ -3437,7 +3437,7 @@ void SAL_CALL
shell::notifyContentExchanged( std::vector< std::list< ContentEventNotifier* >* >* listeners_vec )
{
std::list< ContentEventNotifier* >* listeners;
- for( sal_Int32 i = 0; i < listeners_vec->size(); ++i )
+ for( sal_uInt32 i = 0; i < listeners_vec->size(); ++i )
{
listeners = (*listeners_vec)[i];
std::list< ContentEventNotifier* >::iterator it = listeners->begin();