diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-06-10 15:21:43 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2015-06-10 16:10:27 +0300 |
| commit | 172a96e5246c7847313838464c671dccfd564ab8 (patch) | |
| tree | 3285b325339abfb00f4136e43cd0b453dddea6f4 /sd | |
| parent | 71b35212265bb93b10ca35ab964a36e6b6cc552b (diff) | |
bSwitchOff is always false now
Change-Id: Ic79c0f1cf2816da60962f67c57efb75685d984f1
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuolbull.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/inc/View.hxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview.cxx | 7 |
3 files changed, 4 insertions, 8 deletions
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index bbee427cd69e..c4befa02eef1 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -265,7 +265,7 @@ void FuOutlineBullet::SetCurrentBulletsNumbering(SfxRequest& rReq) } else { - mpView->ChangeMarkedObjectsBulletsNumbering( bToggle, nSId == FN_SVX_SET_BULLET, bInMasterView ? 0 : pNumRule, false ); + mpView->ChangeMarkedObjectsBulletsNumbering( bToggle, nSId == FN_SVX_SET_BULLET, bInMasterView ? 0 : pNumRule ); } if ( bInMasterView ) { diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 14a0ab01a8c0..d7945c4c7912 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -244,8 +244,7 @@ public: void ChangeMarkedObjectsBulletsNumbering( const bool bToggle, const bool bHandleBullets, - const SvxNumRule* pNumRule, - const bool bSwitchOff); + const SvxNumRule* pNumRule); void SetPossibilitiesDirty() { bPossibilitiesDirty = true; } void SetMoveAllowed( bool bSet ) { bMoveAllowed = bSet; } diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 291accf4d6bc..b424cf7db4d5 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -1326,8 +1326,7 @@ bool View::ShouldToggleOn( void View::ChangeMarkedObjectsBulletsNumbering( const bool bToggle, const bool bHandleBullets, - const SvxNumRule* pNumRule, - const bool bSwitchOff ) + const SvxNumRule* pNumRule ) { SdrModel* pSdrModel = GetModel(); vcl::Window* pWindow = dynamic_cast< vcl::Window* >(GetFirstOutputDevice()); @@ -1337,9 +1336,7 @@ void View::ChangeMarkedObjectsBulletsNumbering( const bool bUndoEnabled = pSdrModel->IsUndoEnabled(); SdrUndoGroup* pUndoGroup = bUndoEnabled ? new SdrUndoGroup(*pSdrModel) : 0; - const bool bToggleOn = - !bSwitchOff - && ShouldToggleOn( bToggle, bHandleBullets ); + const bool bToggleOn = ShouldToggleOn( bToggle, bHandleBullets ); boost::scoped_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel)); boost::scoped_ptr<OutlinerView> pOutlinerView(new OutlinerView(pOutliner.get(), pWindow)); |