strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS aw013 (1.3.120); FILE MERGED

Browse source 
2004/06/24 09:33:13 aw 1.3.120.1: #i29181#
This commit is contained in:
Rüdiger Timm 2004-07-12 14:09:05 +00:00
parent 569172c506
commit 3e28ade888
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sd/source/ui/func/futransf.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: futransf.cxx,v $ * $RCSfile: futransf.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: hr $ $Date: 2004-02-04 10:15:45 $ * last change: $Author: rt $ $Date: 2004-07-12 15:09:05 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -104,13 +104,13 @@ FuTransform::FuTransform(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pVi
SdDrawDocument* pDoc, SfxRequest& rReq) SdDrawDocument* pDoc, SfxRequest& rReq)
: FuPoor(pViewSh, pWin, pView, pDoc, rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq)
{ {
if( pView->HasMarkedObj() ) if( pView->AreObjectsMarked() )
/* ( pView->IsResizeAllowed() || /* ( pView->IsResizeAllowed() ||
pView->IsMoveAllowed() || pView->IsMoveAllowed() ||
pView->IsRotateAllowed() ) ) */ pView->IsRotateAllowed() ) ) */
{ {
// Undo // Undo
String aString( pView->GetMarkDescription() ); String aString( pView->GetDescriptionOfMarkedObjects() );
aString.Append( sal_Unicode(' ') ); aString.Append( sal_Unicode(' ') );
aString.Append( String( SdResId( STR_TRANSFORM ) ) ); aString.Append( String( SdResId( STR_TRANSFORM ) ) );
pView->BegUndo( aString ); pView->BegUndo( aString );
@ -122,7 +122,7 @@ FuTransform::FuTransform(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pVi
// --------- Itemset fuer Groesse und Position -------- // --------- Itemset fuer Groesse und Position --------
SfxItemSet aSet( pView->GetGeoAttrFromMarked() ); SfxItemSet aSet( pView->GetGeoAttrFromMarked() );
const SdrMarkList& rMarkList = pView->GetMarkList(); const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
SdrObject* pObj = rMarkList.GetMark(0)->GetObj(); SdrObject* pObj = rMarkList.GetMark(0)->GetObj();
if( rMarkList.GetMarkCount() == 1 && if( rMarkList.GetMarkCount() == 1 &&
pObj->GetObjInventor() == SdrInventor && pObj->GetObjInventor() == SdrInventor &&
@ -189,7 +189,7 @@ FuTransform::FuTransform(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pVi
* An der E3dView muss demnaechst SetGeoAttrToMarked() mit folgendem * An der E3dView muss demnaechst SetGeoAttrToMarked() mit folgendem
* Code ueberladen werden: * Code ueberladen werden:
**********************************************************************/ **********************************************************************/
const SdrMarkList& rMarkList = pView->GetMarkList(); const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
ULONG nCount = rMarkList.GetMarkCount(); ULONG nCount = rMarkList.GetMarkCount();
for (ULONG nMark = 0; nMark < nCount; nMark++) for (ULONG nMark = 0; nMark < nCount; nMark++)