diff options
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/dlg/LayerTabBar.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/inc/LayerTabBar.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/TabControl.hxx | 6 | ||||
-rw-r--r-- | sd/source/ui/view/tabcontr.cxx | 12 |
4 files changed, 14 insertions, 14 deletions
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index c6c9b0b0dde2..fa1406695333 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -174,7 +174,7 @@ void LayerTabBar::Command(const CommandEvent& rCEvt) } } -long LayerTabBar::StartRenaming() +bool LayerTabBar::StartRenaming() { bool bOK = true; OUString aLayerName = GetPageText( GetEditPageId() ); @@ -204,7 +204,7 @@ long LayerTabBar::StartRenaming() return bOK ? 1 : 0; } -long LayerTabBar::AllowRenaming() +TabBarAllowRenamingReturnCode LayerTabBar::AllowRenaming() { bool bOK = true; @@ -242,7 +242,7 @@ long LayerTabBar::AllowRenaming() } } - return bOK ? 1 : 0; + return bOK ? TABBAR_RENAMING_YES : TABBAR_RENAMING_NO; } void LayerTabBar::EndRenaming() diff --git a/sd/source/ui/inc/LayerTabBar.hxx b/sd/source/ui/inc/LayerTabBar.hxx index 83453a7d78e9..6f42de10fd5c 100644 --- a/sd/source/ui/inc/LayerTabBar.hxx +++ b/sd/source/ui/inc/LayerTabBar.hxx @@ -66,8 +66,8 @@ protected: virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; - virtual long StartRenaming() SAL_OVERRIDE; - virtual long AllowRenaming() SAL_OVERRIDE; + virtual bool StartRenaming() SAL_OVERRIDE; + virtual TabBarAllowRenamingReturnCode AllowRenaming() SAL_OVERRIDE; virtual void EndRenaming() SAL_OVERRIDE; virtual void ActivatePage() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index cbc273b21573..2ec16b904d42 100644 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -65,12 +65,12 @@ protected: virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; - virtual long StartRenaming() SAL_OVERRIDE; - virtual long AllowRenaming() SAL_OVERRIDE; + virtual bool StartRenaming() SAL_OVERRIDE; + virtual TabBarAllowRenamingReturnCode AllowRenaming() SAL_OVERRIDE; virtual void EndRenaming() SAL_OVERRIDE; virtual void ActivatePage() SAL_OVERRIDE; - virtual long DeactivatePage() SAL_OVERRIDE; + virtual bool DeactivatePage() SAL_OVERRIDE; // DragSourceHelper virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 97c76b6d1932..827739acff84 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -307,7 +307,7 @@ void TabControl::Command(const CommandEvent& rCEvt) } } -long TabControl::StartRenaming() +bool TabControl::StartRenaming() { bool bOK = false; @@ -321,10 +321,10 @@ long TabControl::StartRenaming() pView->SdrEndTextEdit(); } - return bOK ? 1 : 0; + return bOK; } -long TabControl::AllowRenaming() +TabBarAllowRenamingReturnCode TabControl::AllowRenaming() { bool bOK = true; @@ -344,7 +344,7 @@ long TabControl::AllowRenaming() bOK = false; } } - return bOK ? 1 : 0; + return bOK ? TABBAR_RENAMING_YES : TABBAR_RENAMING_NO; } void TabControl::EndRenaming() @@ -363,9 +363,9 @@ void TabControl::ActivatePage() } } -long TabControl::DeactivatePage() +bool TabControl::DeactivatePage() { - return pDrViewSh->IsSwitchPageAllowed() ? 1 : 0; + return pDrViewSh->IsSwitchPageAllowed(); } |