summaryrefslogtreecommitdiff
path: root/sc/inc/convuno.hxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-06-04 09:05:26 +0000
committerOliver Bolte <obo@openoffice.org>2004-06-04 09:05:26 +0000
commit2ec07da70bfa17f52c6caecba7a24d31c320eabe (patch)
tree37613512ba49214789791114eaef2b01593c07a8 /sc/inc/convuno.hxx
parentb93b620a3c39b6a09b8da6115a954785470be99a (diff)
INTEGRATION: CWS rowlimit (1.3.340); FILE MERGED
2004/02/20 22:54:28 er 1.3.340.3: #i1967# type correctness 2004/01/16 17:39:43 er 1.3.340.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short 2003/11/28 19:47:17 er 1.3.340.1: #i1967# move ScAddress, ScRange from global.hxx to address.hxx
Diffstat (limited to 'sc/inc/convuno.hxx')
-rw-r--r--sc/inc/convuno.hxx15
1 files changed, 10 insertions, 5 deletions
diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx
index d84e22b0ce88..5481e66343b1 100644
--- a/sc/inc/convuno.hxx
+++ b/sc/inc/convuno.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: convuno.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: nn $ $Date: 2000-12-19 09:31:08 $
+ * last change: $Author: obo $ $Date: 2004-06-04 10:05:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -81,6 +81,11 @@
#include "global.hxx"
#endif
+#ifndef SC_ADDRESS_HXX
+#include "address.hxx"
+#endif
+
+
class ScUnoConversion
{
public:
@@ -122,7 +127,7 @@ inline void ScUnoConversion::FillScAddress(
ScAddress& rScAddress,
const ::com::sun::star::table::CellAddress& rApiAddress )
{
- rScAddress.Set( (USHORT)rApiAddress.Column, (USHORT)rApiAddress.Row, (USHORT)rApiAddress.Sheet );
+ rScAddress.Set( (SCCOL)rApiAddress.Column, (SCROW)rApiAddress.Row, (SCTAB)rApiAddress.Sheet );
}
inline void ScUnoConversion::FillApiAddress(
@@ -138,8 +143,8 @@ inline void ScUnoConversion::FillScRange(
ScRange& rScRange,
const ::com::sun::star::table::CellRangeAddress& rApiRange )
{
- rScRange.aStart.Set( (USHORT)rApiRange.StartColumn, (USHORT)rApiRange.StartRow, (USHORT)rApiRange.Sheet );
- rScRange.aEnd.Set( (USHORT)rApiRange.EndColumn, (USHORT)rApiRange.EndRow, (USHORT)rApiRange.Sheet );
+ rScRange.aStart.Set( (SCCOL)rApiRange.StartColumn, (SCROW)rApiRange.StartRow, (SCTAB)rApiRange.Sheet );
+ rScRange.aEnd.Set( (SCCOL)rApiRange.EndColumn, (SCROW)rApiRange.EndRow, (SCTAB)rApiRange.Sheet );
}
inline void ScUnoConversion::FillApiRange(