Kaydet (Commit) dd9fd8f3 authored tarafından Noel Grandin's avatar Noel Grandin

sal_Bool->bool

Change-Id: Ide1fd8bdc6a6c3e5fc454b248c35f563c2ef8841
üst e0c9266f
...@@ -157,9 +157,9 @@ class SC_DLLPUBLIC ScUnoHelpFunctions ...@@ -157,9 +157,9 @@ class SC_DLLPUBLIC ScUnoHelpFunctions
public: public:
static com::sun::star::uno::Reference<com::sun::star::uno::XInterface> static com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
AnyToInterface( const com::sun::star::uno::Any& rAny ); AnyToInterface( const com::sun::star::uno::Any& rAny );
static sal_Bool GetBoolProperty( const com::sun::star::uno::Reference< static bool GetBoolProperty( const com::sun::star::uno::Reference<
com::sun::star::beans::XPropertySet>& xProp, com::sun::star::beans::XPropertySet>& xProp,
const OUString& rName, sal_Bool bDefault = false ); const OUString& rName, bool bDefault = false );
static sal_Int32 GetLongProperty( const com::sun::star::uno::Reference< static sal_Int32 GetLongProperty( const com::sun::star::uno::Reference<
com::sun::star::beans::XPropertySet>& xProp, com::sun::star::beans::XPropertySet>& xProp,
const OUString& rName, long nDefault = 0 ); const OUString& rName, long nDefault = 0 );
...@@ -170,11 +170,11 @@ public: ...@@ -170,11 +170,11 @@ public:
const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xProp, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xProp,
const OUString& rName, const OUString& rDefault ); const OUString& rName, const OUString& rDefault );
static sal_Bool GetBoolFromAny( const com::sun::star::uno::Any& aAny ); static bool GetBoolFromAny( const com::sun::star::uno::Any& aAny );
static sal_Int16 GetInt16FromAny( const com::sun::star::uno::Any& aAny ); static sal_Int16 GetInt16FromAny( const com::sun::star::uno::Any& aAny );
static sal_Int32 GetInt32FromAny( const com::sun::star::uno::Any& aAny ); static sal_Int32 GetInt32FromAny( const com::sun::star::uno::Any& aAny );
static sal_Int32 GetEnumFromAny( 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 ); static void SetBoolInAny( com::sun::star::uno::Any& rAny, bool bValue );
static void SetOptionalPropertyValue( static void SetOptionalPropertyValue(
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rPropSet, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rPropSet,
......
...@@ -41,10 +41,10 @@ uno::Reference<uno::XInterface> ScUnoHelpFunctions::AnyToInterface( const uno::A ...@@ -41,10 +41,10 @@ uno::Reference<uno::XInterface> ScUnoHelpFunctions::AnyToInterface( const uno::A
return uno::Reference<uno::XInterface>(); //! Exception? return uno::Reference<uno::XInterface>(); //! Exception?
} }
sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp, bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp,
const OUString& rName, sal_Bool bDefault ) const OUString& rName, bool bDefault )
{ {
sal_Bool bRet = bDefault; bool bRet = bDefault;
if ( xProp.is() ) if ( xProp.is() )
{ {
try try
...@@ -133,7 +133,7 @@ OUString ScUnoHelpFunctions::GetStringProperty( ...@@ -133,7 +133,7 @@ OUString ScUnoHelpFunctions::GetStringProperty(
return aRet; return aRet;
} }
sal_Bool ScUnoHelpFunctions::GetBoolFromAny( const uno::Any& aAny ) bool ScUnoHelpFunctions::GetBoolFromAny( const uno::Any& aAny )
{ {
if ( aAny.getValueTypeClass() == uno::TypeClass_BOOLEAN ) if ( aAny.getValueTypeClass() == uno::TypeClass_BOOLEAN )
return *(sal_Bool*)aAny.getValue(); return *(sal_Bool*)aAny.getValue();
...@@ -166,9 +166,10 @@ sal_Int32 ScUnoHelpFunctions::GetEnumFromAny( const uno::Any& aAny ) ...@@ -166,9 +166,10 @@ sal_Int32 ScUnoHelpFunctions::GetEnumFromAny( const uno::Any& aAny )
return nRet; return nRet;
} }
void ScUnoHelpFunctions::SetBoolInAny( uno::Any& rAny, sal_Bool bValue ) void ScUnoHelpFunctions::SetBoolInAny( uno::Any& rAny, bool bValue )
{ {
rAny.setValue( &bValue, getBooleanCppuType() ); sal_Bool bTemp = bValue ? 1 : 0;
rAny.setValue( &bTemp, getBooleanCppuType() );
} }
void ScUnoHelpFunctions::SetOptionalPropertyValue( void ScUnoHelpFunctions::SetOptionalPropertyValue(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment