diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-20 14:55:36 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-20 14:55:36 +0000 |
| commit | f7a9b6b5c3794f6a21684cb6e9ebccf5faee2e30 (patch) | |
| tree | 012a964d62ff1f78cc219c7f2f4404ea5301d8a8 /sd/source/ui/func | |
| parent | a2121084269dc4a2745e926d416d2ec54a4bdf06 (diff) | |
CWS-TOOLING: integrate CWS impress163_DEV300
Diffstat (limited to 'sd/source/ui/func')
| -rw-r--r-- | sd/source/ui/func/fuolbull.cxx | 24 | ||||
| -rw-r--r-- | sd/source/ui/func/fuprlout.cxx | 30 |
2 files changed, 16 insertions, 38 deletions
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 79cfb4cba6d2..29bc28e91e17 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fuolbull.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.104.1 $ * * This file is part of OpenOffice.org. * @@ -101,16 +101,22 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq ) case RET_OK: { SfxItemSet aSet( *pDlg->GetOutputItemSet() ); -/* i35937 - if (mpView->ISA(DrawViewShell) ) + + OutlinerView* pOLV = mpView->GetTextEditOutlinerView(); + + std::auto_ptr< OutlineViewModelChangeGuard > aGuard; + + if (mpView->ISA(OutlineView)) { - if( mpView->GetMarkedObjectList().GetMarkCount() == 0) - { - SfxUInt16Item aBulletState( EE_PARA_BULLETSTATE, 0 ); - aSet.Put(aBulletState); - } + pOLV = static_cast<OutlineView*>(mpView) + ->GetViewByWindow(mpViewShell->GetActiveWindow()); + + aGuard.reset( new OutlineViewModelChangeGuard( static_cast<OutlineView&>(*mpView) ) ); } -*/ + + if( pOLV ) + pOLV->EnableBullets(); + rReq.Done( aSet ); pArgs = rReq.GetArgs(); } diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index b88d6f226d0f..6975aa66fba9 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fuprlout.cxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.17.130.1 $ * * This file is part of OpenOffice.org. * @@ -287,32 +287,4 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) } } -/************************************************************************* -|* -|* Layoutvorlage von einem StyleSheetPool in einen anderen uebertragen -|* -\************************************************************************/ - -void FuPresentationLayout::TransferLayoutTemplate(String aFromName, - String aToName, - SfxStyleSheetBasePool* pFrom, - SfxStyleSheetBasePool* pTo) -{ - SfxStyleSheetBase* pHis = pFrom->Find(aFromName,SD_STYLE_FAMILY_MASTERPAGE); - SfxStyleSheetBase* pMy = pTo->Find(aToName, SD_STYLE_FAMILY_MASTERPAGE); - - DBG_ASSERT(pHis, "neue Layoutvorlage nicht gefunden"); - - // gibt's noch nicht: neu anlegen - if (!pMy) - { - pMy = &(pTo->Make(aToName, SD_STYLE_FAMILY_MASTERPAGE)); - } - - // Inhalte neu setzen - if (pHis) - pMy->GetItemSet().Set(pHis->GetItemSet()); -} - - } // end of namespace sd |