diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-17 17:10:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-17 18:45:16 +0100 |
| commit | 8711842d1b861544ed4a934f675adbed7cf83f32 (patch) | |
| tree | b330404723edaf8750b6333d0e1e321f5c039d2f /sd/source/ui | |
| parent | bool improvements (diff) | |
| download | core-8711842d1b861544ed4a934f675adbed7cf83f32.tar.gz core-8711842d1b861544ed4a934f675adbed7cf83f32.zip | |
bool improvements
Change-Id: I19b429741a2ba972bef8863008657823b9bb7f91
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/inc/unomodel.hxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/table/TableDesignPane.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/tools/EventMultiplexer.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index dc5d8332fa26..515500cd8f04 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -127,8 +127,8 @@ public: static rtl::Reference< SdXImpressDocument > GetModel( SdDrawDocument* pDoc ); // intern - virtual int operator==( const SdXImpressDocument& rModel ) const { return mpDoc == rModel.mpDoc; } - virtual int operator!=( const SdXImpressDocument& rModel ) const { return mpDoc != rModel.mpDoc; } + virtual bool operator==( const SdXImpressDocument& rModel ) const { return mpDoc == rModel.mpDoc; } + virtual bool operator!=( const SdXImpressDocument& rModel ) const { return mpDoc != rModel.mpDoc; } ::sd::DrawDocShell* GetDocShell() const { return mpDocShell; } SdDrawDocument* GetDoc() const { return mpDoc; } diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index eb52e4ff9423..8aa954ac9f60 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -842,9 +842,9 @@ short TableDesignDialog::Execute() if( aImpl.isOptionsChanged() ) aImpl.ApplyOptions(); - return true; + return RET_OK; } - return false; + return RET_CANCEL; } // ==================================================================== diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index e9550bcfbcf2..5052e60758ad 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -773,7 +773,7 @@ void EventMultiplexer::Implementation::CallListeners (EventMultiplexerEvent& rEv ListenerList::const_iterator iListenerEnd (aCopyListeners.end()); for (; iListener!=iListenerEnd; ++iListener) { - if ((iListener->second && rEvent.meEventId) != 0) + if ((iListener->second && rEvent.meEventId)) iListener->first.Call(&rEvent); } } |