summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2013-08-05 12:37:06 +0300
committerTor Lillqvist <tlillqvist@suse.com>2013-08-05 12:48:31 +0300
commit0d417eceb74041c71a95a16e0ee0dab5d4ab2870 (patch)
tree26ceb5d9aedaaf0578f1a7c2c7a167dd55b237ae
parent0cdac15aa7ec11414f5b1fe2460517e85b4dc467 (diff)
WaE: '==' : unsafe mix of type 'bool' and type 'sal_Int16' in operation
getId() should obviously return a sal_uInt16 and not a bool. Change-Id: I87a2a39f8fd101d6b0385986cc1493b9e2b79681
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 10d145a34225..244a30a73a52 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -191,7 +191,7 @@ public:
bool getIsPreview() const;
void setIsPreview( bool bIsPreview );
- bool getId() const;
+ sal_uInt16 getId() const;
bool select( const OUString& rsPresetId );
@@ -476,7 +476,7 @@ void CustomAnimationCreateTabPage::setIsPreview( bool bIsPreview )
mpCBXPReview->Check( bIsPreview ? sal_True : sal_False );
}
-bool CustomAnimationCreateTabPage::getId() const
+sal_uInt16 CustomAnimationCreateTabPage::getId() const
{
return mnId;
}