Skip to content

C
core
Kaydet (Commit) 172a96e5 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky
Dosyalara gözat
Seçenekler

bSwitchOff is always false now 

Change-Id: Ic79c0f1cf2816da60962f67c57efb75685d984f1
üst 71b35212
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
sd/source/ui/func/fuolbull.cxx
Dosyayı görüntüle @ 172a96e5
...@@ -265,7 +265,7 @@ void FuOutlineBullet::SetCurrentBulletsNumbering(SfxRequest& rReq) ...@@ -265,7 +265,7 @@ void FuOutlineBullet::SetCurrentBulletsNumbering(SfxRequest& rReq)
} }
else 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 ) if ( bInMasterView )
{ {
......
sd/source/ui/inc/View.hxx
Dosyayı görüntüle @ 172a96e5
...@@ -244,8 +244,7 @@ public: ...@@ -244,8 +244,7 @@ public:
void ChangeMarkedObjectsBulletsNumbering( void ChangeMarkedObjectsBulletsNumbering(
const bool bToggle, const bool bToggle,
const bool bHandleBullets, const bool bHandleBullets,
const SvxNumRule* pNumRule, const SvxNumRule* pNumRule);
const bool bSwitchOff);
void SetPossibilitiesDirty() { bPossibilitiesDirty = true; } void SetPossibilitiesDirty() { bPossibilitiesDirty = true; }
void SetMoveAllowed( bool bSet ) { bMoveAllowed = bSet; } void SetMoveAllowed( bool bSet ) { bMoveAllowed = bSet; }
......
sd/source/ui/view/sdview.cxx
Dosyayı görüntüle @ 172a96e5
...@@ -1326,8 +1326,7 @@ bool View::ShouldToggleOn( ...@@ -1326,8 +1326,7 @@ bool View::ShouldToggleOn(
void View::ChangeMarkedObjectsBulletsNumbering( void View::ChangeMarkedObjectsBulletsNumbering(
const bool bToggle, const bool bToggle,
const bool bHandleBullets, const bool bHandleBullets,
const SvxNumRule* pNumRule, const SvxNumRule* pNumRule )
const bool bSwitchOff )
{ {
SdrModel* pSdrModel = GetModel(); SdrModel* pSdrModel = GetModel();
vcl::Window* pWindow = dynamic_cast< vcl::Window* >(GetFirstOutputDevice()); vcl::Window* pWindow = dynamic_cast< vcl::Window* >(GetFirstOutputDevice());
...@@ -1337,9 +1336,7 @@ void View::ChangeMarkedObjectsBulletsNumbering( ...@@ -1337,9 +1336,7 @@ void View::ChangeMarkedObjectsBulletsNumbering(
const bool bUndoEnabled = pSdrModel->IsUndoEnabled(); const bool bUndoEnabled = pSdrModel->IsUndoEnabled();
SdrUndoGroup* pUndoGroup = bUndoEnabled ? new SdrUndoGroup(*pSdrModel) : 0; SdrUndoGroup* pUndoGroup = bUndoEnabled ? new SdrUndoGroup(*pSdrModel) : 0;
const bool bToggleOn = const bool bToggleOn = ShouldToggleOn( bToggle, bHandleBullets );
!bSwitchOff
&& ShouldToggleOn( bToggle, bHandleBullets );
boost::scoped_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel)); boost::scoped_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel));
boost::scoped_ptr<OutlinerView> pOutlinerView(new OutlinerView(pOutliner.get(), pWindow)); boost::scoped_ptr<OutlinerView> pOutlinerView(new OutlinerView(pOutliner.get(), pWindow));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment