[Libreoffice-commits] core.git: sd/source
Tor Lillqvist
tlillqvist at suse.com
Mon Aug 5 02:50:45 PDT 2013
sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0d417eceb74041c71a95a16e0ee0dab5d4ab2870
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Aug 5 12:37:06 2013 +0300
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
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 10d145a3..244a30a 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;
}
More information about the Libreoffice-commits
mailing list