summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Nebel <nn@openoffice.org>2001-03-16 18:36:28 +0000
committerNiklas Nebel <nn@openoffice.org>2001-03-16 18:36:28 +0000
commitaef523664a5f8d7b56ebc1674b36367298b59b49 (patch)
tree58b17b76d682c7ec56301bc6f6820c625f72f3e8
parent71f9f79bb3c418c257f92167427f51c8a757a951 (diff)
use sal integer types
-rw-r--r--sc/inc/miscuno.hxx22
-rw-r--r--sc/source/ui/unoobj/miscuno.cxx22
2 files changed, 22 insertions, 22 deletions
diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx
index 1c97863a5d9b..f7f83735edfa 100644
--- a/sc/inc/miscuno.hxx
+++ b/sc/inc/miscuno.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: miscuno.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 16:44:49 $
+ * last change: $Author: nn $ $Date: 2001-03-16 19:35:34 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -148,7 +148,7 @@ class ScIndexEnumeration : public cppu::WeakImplHelper2<
{
private:
com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> xIndex;
- INT32 nPos;
+ sal_Int32 nPos;
public:
ScIndexEnumeration(const com::sun::star::uno::Reference<
@@ -323,20 +323,20 @@ class ScUnoHelpFunctions
public:
static com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
AnyToInterface( const com::sun::star::uno::Any& rAny );
- static BOOL GetBoolProperty( const com::sun::star::uno::Reference<
+ static sal_Bool GetBoolProperty( const com::sun::star::uno::Reference<
com::sun::star::beans::XPropertySet>& xProp,
- const ::rtl::OUString& rName, BOOL bDefault = FALSE );
- static long GetLongProperty( const com::sun::star::uno::Reference<
+ const ::rtl::OUString& rName, sal_Bool bDefault = sal_False );
+ static sal_Int32 GetLongProperty( const com::sun::star::uno::Reference<
com::sun::star::beans::XPropertySet>& xProp,
const ::rtl::OUString& rName, long nDefault = 0 );
- static long GetEnumProperty( const com::sun::star::uno::Reference<
+ static sal_Int32 GetEnumProperty( const com::sun::star::uno::Reference<
com::sun::star::beans::XPropertySet>& xProp,
const ::rtl::OUString& rName, long nDefault );
- static BOOL GetBoolFromAny( const com::sun::star::uno::Any& aAny );
- static INT16 GetInt16FromAny( const com::sun::star::uno::Any& aAny );
- static INT32 GetEnumFromAny( const com::sun::star::uno::Any& aAny );
- static void SetBoolInAny( com::sun::star::uno::Any& rAny, BOOL bValue );
+ static sal_Bool GetBoolFromAny( const com::sun::star::uno::Any& aAny );
+ static sal_Int16 GetInt16FromAny( const com::sun::star::uno::Any& aAny );
+ static sal_Int32 GetEnumFromAny( const com::sun::star::uno::Any& aAny );
+ static void SetBoolInAny( com::sun::star::uno::Any& rAny, sal_Bool bValue );
};
diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx
index 2f744bb3873a..5fabb242bf92 100644
--- a/sc/source/ui/unoobj/miscuno.cxx
+++ b/sc/source/ui/unoobj/miscuno.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: miscuno.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: nn $ $Date: 2001-01-11 13:31:17 $
+ * last change: $Author: nn $ $Date: 2001-03-16 19:36:28 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -96,10 +96,10 @@ uno::Reference<uno::XInterface> ScUnoHelpFunctions::AnyToInterface( const uno::A
}
// static
-BOOL ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp,
- const rtl::OUString& rName, BOOL bDefault )
+sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp,
+ const rtl::OUString& rName, sal_Bool bDefault )
{
- BOOL bRet = bDefault;
+ sal_Bool bRet = bDefault;
if ( xProp.is() )
{
try
@@ -122,7 +122,7 @@ BOOL ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPropertyS
}
// static
-long ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XPropertySet>& xProp,
+sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XPropertySet>& xProp,
const rtl::OUString& rName, long nDefault )
{
sal_Int32 nRet = nDefault;
@@ -143,7 +143,7 @@ long ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XPropertyS
}
// static
-long ScUnoHelpFunctions::GetEnumProperty( const uno::Reference<beans::XPropertySet>& xProp,
+sal_Int32 ScUnoHelpFunctions::GetEnumProperty( const uno::Reference<beans::XPropertySet>& xProp,
const rtl::OUString& rName, long nDefault )
{
sal_Int32 nRet = nDefault;
@@ -173,7 +173,7 @@ long ScUnoHelpFunctions::GetEnumProperty( const uno::Reference<beans::XPropertyS
}
// static
-BOOL ScUnoHelpFunctions::GetBoolFromAny( const uno::Any& aAny )
+sal_Bool ScUnoHelpFunctions::GetBoolFromAny( const uno::Any& aAny )
{
if ( aAny.getValueTypeClass() == uno::TypeClass_BOOLEAN )
return *(sal_Bool*)aAny.getValue();
@@ -181,7 +181,7 @@ BOOL ScUnoHelpFunctions::GetBoolFromAny( const uno::Any& aAny )
}
// static
-INT16 ScUnoHelpFunctions::GetInt16FromAny( const uno::Any& aAny )
+sal_Int16 ScUnoHelpFunctions::GetInt16FromAny( const uno::Any& aAny )
{
sal_Int16 nRet;
if ( aAny >>= nRet )
@@ -190,7 +190,7 @@ INT16 ScUnoHelpFunctions::GetInt16FromAny( const uno::Any& aAny )
}
// static
-INT32 ScUnoHelpFunctions::GetEnumFromAny( const uno::Any& aAny )
+sal_Int32 ScUnoHelpFunctions::GetEnumFromAny( const uno::Any& aAny )
{
sal_Int32 nRet = 0;
if ( aAny.getValueTypeClass() == uno::TypeClass_ENUM )
@@ -201,7 +201,7 @@ INT32 ScUnoHelpFunctions::GetEnumFromAny( const uno::Any& aAny )
}
// static
-void ScUnoHelpFunctions::SetBoolInAny( uno::Any& rAny, BOOL bValue )
+void ScUnoHelpFunctions::SetBoolInAny( uno::Any& rAny, sal_Bool bValue )
{
rAny.setValue( &bValue, getBooleanCppuType() );
}