Kaydet (Commit) 172a96e5 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky

bSwitchOff is always false now

Change-Id: Ic79c0f1cf2816da60962f67c57efb75685d984f1
üst 71b35212
......@@ -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 )
{
......
......@@ -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; }
......
......@@ -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));
......
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