diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-27 11:31:32 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-27 11:31:32 +0000 |
| commit | 3f861da6dded936f08f1be66da502e173db8a9f2 (patch) | |
| tree | 44659fa7c2f9ecf5d83c2def1dac6e16b8adc814 /sw/source/ui | |
| parent | 8190d6f719cfb9ee140d56f7d9a61b93ed31c5b3 (diff) | |
INTEGRATION: CWS os42 (1.2.80); FILE MERGED
2004/11/12 10:36:58 os 1.2.80.2: RESYNC: (1.2-1.3); FILE MERGED
2004/11/11 12:36:47 iha 1.2.80.1: #i36242# custom shapes could not be selected if another was selected before
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/ribbar/concustomshape.cxx | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/sw/source/ui/ribbar/concustomshape.cxx b/sw/source/ui/ribbar/concustomshape.cxx index d9139f8a6675..bec9de9609f5 100644 --- a/sw/source/ui/ribbar/concustomshape.cxx +++ b/sw/source/ui/ribbar/concustomshape.cxx @@ -2,9 +2,9 @@ * * $RCSfile: concustomshape.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2004-11-26 14:15:58 $ + * last change: $Author: hr $ $Date: 2004-11-27 12:31:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -152,12 +152,29 @@ ConstCustomShape::ConstCustomShape( SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView, SfxRequest& rReq ) : SwDrawBase( pWrtShell, pEditWin, pSwView ) { + aCustomShape = ConstCustomShape::GetShapeTypeFromRequest( rReq ); +} + +/************************************************************************* +|* +\************************************************************************/ + +rtl::OUString ConstCustomShape::GetShapeType() const +{ + return aCustomShape; +} + +//static +rtl::OUString ConstCustomShape::GetShapeTypeFromRequest( SfxRequest& rReq ) +{ + rtl::OUString aRet; const SfxItemSet* pArgs = rReq.GetArgs(); if ( pArgs ) { const SfxStringItem& rItm = (const SfxStringItem&)pArgs->Get( rReq.GetSlot() ); - aCustomShape = rItm.GetValue(); + aRet = rItm.GetValue(); } + return aRet; } /************************************************************************* |