Files
loongoffice/2
Valentin Kettner 86075a3f0f Split out IDocumentDrawModelAccess from SwDoc.
To the new class DocumentDrawModelManager.
All moved methods and members have the same in thew new class.

Change-Id: I89ad0e0c4a42885d5810e834983ea8e8e6c0a2d2
2014-06-03 19:12:05 +02:00

593 lines
21 KiB
Plaintext

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "hintids.hxx"
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdotext.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/outliner.hxx>
#include <svx/xfillit.hxx>
#include <editeng/colritem.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/ulspitem.hxx>
#include <svl/itemiter.hxx>
#include <svl/whiter.hxx>
#include <svtools/htmlout.hxx>
#include <svtools/htmltokn.h>
#include <svtools/htmlkywd.hxx>
#include <svx/svdpool.hxx>
#include "charatr.hxx"
#include <frmfmt.hxx>
#include <fmtanchr.hxx>
#include <fmtsrnd.hxx>
#include "ndtxt.hxx"
#include "doc.hxx"
#include <IDocumentDrawModelAccess.hxx>
#include "dcontact.hxx"
#include "poolfmt.hxx"
#include "swcss1.hxx"
#include "swhtml.hxx"
#include <shellio.hxx>
#include <rtl/strbuf.hxx>
using namespace css;
static HTMLOptionEnum aHTMLMarqBehaviorTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_BEHAV_scroll, SDRTEXTANI_SCROLL },
{ OOO_STRING_SVTOOLS_HTML_BEHAV_alternate, SDRTEXTANI_ALTERNATE },
{ OOO_STRING_SVTOOLS_HTML_BEHAV_slide, SDRTEXTANI_SLIDE },
{ 0, 0 }
};
static HTMLOptionEnum aHTMLMarqDirectionTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_AL_left, SDRTEXTANI_LEFT },
{ OOO_STRING_SVTOOLS_HTML_AL_right, SDRTEXTANI_RIGHT },
{ 0, 0 }
};
void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
const Size& rPixSpace,
sal_Int16 eVertOri,
sal_Int16 eHoriOri,
SfxItemSet& rCSS1ItemSet,
SvxCSS1PropertyInfo& rCSS1PropInfo,
bool bHidden )
{
// always on top of text.
// but in invisible layer. <ConnectToLayout> will move the object
// to the visible layer.
pNewDrawObj->SetLayer( pDoc->getIDocumentDrawModelAccess().GetInvisibleHeavenId() );
SfxItemSet aFrmSet( pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
Reader::ResetFrmFmtAttrs( aFrmSet );
sal_uInt16 nLeftSpace = 0, nRightSpace = 0, nUpperSpace = 0, nLowerSpace = 0;
if( (rPixSpace.Width() || rPixSpace.Height()) && Application::GetDefaultDevice() )
{
Size aTwipSpc( rPixSpace.Width(), rPixSpace.Height() );
aTwipSpc =
Application::GetDefaultDevice()->PixelToLogic( aTwipSpc,
MapMode(MAP_TWIP) );
nLeftSpace = nRightSpace = (sal_uInt16)aTwipSpc.Width();
nUpperSpace = nLowerSpace = (sal_uInt16)aTwipSpc.Height();
}
// linken/rechten Rand setzen
const SfxPoolItem *pItem;
if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_LR_SPACE, true, &pItem ) )
{
// Ggf. den Erstzeilen-Einzug noch plaetten
const SvxLRSpaceItem *pLRItem = (const SvxLRSpaceItem *)pItem;
SvxLRSpaceItem aLRItem( *pLRItem );
aLRItem.SetTxtFirstLineOfst( 0 );
if( rCSS1PropInfo.bLeftMargin )
{
nLeftSpace = static_cast< sal_uInt16 >(aLRItem.GetLeft());
rCSS1PropInfo.bLeftMargin = false;
}
if( rCSS1PropInfo.bRightMargin )
{
nRightSpace = static_cast< sal_uInt16 >(aLRItem.GetRight());
rCSS1PropInfo.bRightMargin = false;
}
rCSS1ItemSet.ClearItem( RES_LR_SPACE );
}
if( nLeftSpace || nRightSpace )
{
SvxLRSpaceItem aLRItem( RES_LR_SPACE );
aLRItem.SetLeft( nLeftSpace );
aLRItem.SetRight( nRightSpace );
aFrmSet.Put( aLRItem );
}
// oberen/unteren Rand setzen
if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_UL_SPACE, true, &pItem ) )
{
// Ggf. den Erstzeilen-Einzug noch plaetten
const SvxULSpaceItem *pULItem = (const SvxULSpaceItem *)pItem;
if( rCSS1PropInfo.bTopMargin )
{
nUpperSpace = pULItem->GetUpper();
rCSS1PropInfo.bTopMargin = false;
}
if( rCSS1PropInfo.bBottomMargin )
{
nLowerSpace = pULItem->GetLower();
rCSS1PropInfo.bBottomMargin = false;
}
rCSS1ItemSet.ClearItem( RES_UL_SPACE );
}
if( nUpperSpace || nLowerSpace )
{
SvxULSpaceItem aULItem( RES_UL_SPACE );
aULItem.SetUpper( nUpperSpace );
aULItem.SetLower( nLowerSpace );
aFrmSet.Put( aULItem );
}
SwFmtAnchor aAnchor( FLY_AS_CHAR );
if( SVX_CSS1_POS_ABSOLUTE == rCSS1PropInfo.ePosition &&
SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eLeftType &&
SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType )
{
const SwStartNode *pFlySttNd =
pPam->GetPoint()->nNode.GetNode().FindFlyStartNode();
if( pFlySttNd )
{
aAnchor.SetType( FLY_AT_FLY );
SwPosition aPos( *pFlySttNd );
aAnchor.SetAnchor( &aPos );
}
else
{
aAnchor.SetType( FLY_AT_PAGE );
}
// #i26791# - direct positioning for <SwDoc::Insert(..)>
pNewDrawObj->SetRelativePos( Point(rCSS1PropInfo.nLeft + nLeftSpace,
rCSS1PropInfo.nTop + nUpperSpace) );
aFrmSet.Put( SwFmtSurround(SURROUND_THROUGHT) );
}
else if( SVX_ADJUST_LEFT == rCSS1PropInfo.eFloat ||
text::HoriOrientation::LEFT == eHoriOri )
{
aAnchor.SetType( FLY_AT_PARA );
aFrmSet.Put( SwFmtSurround(bHidden ? SURROUND_THROUGHT
: SURROUND_RIGHT) );
// #i26791# - direct positioning for <SwDoc::Insert(..)>
pNewDrawObj->SetRelativePos( Point(nLeftSpace, nUpperSpace) );
}
else if( text::VertOrientation::NONE != eVertOri )
{
aFrmSet.Put( SwFmtVertOrient( 0, eVertOri ) );
}
if (FLY_AT_PAGE == aAnchor.GetAnchorId())
{
aAnchor.SetPageNum( 1 );
}
else if( FLY_AT_FLY != aAnchor.GetAnchorId() )
{
aAnchor.SetAnchor( pPam->GetPoint() );
}
aFrmSet.Put( aAnchor );
pDoc->InsertDrawObj( *pPam, *pNewDrawObj, aFrmSet );
}
static void PutEEPoolItem( SfxItemSet &rEEItemSet,
const SfxPoolItem& rSwItem )
{
sal_uInt16 nEEWhich = 0;
switch( rSwItem.Which() )
{
case RES_CHRATR_COLOR: nEEWhich = EE_CHAR_COLOR; break;
case RES_CHRATR_CROSSEDOUT: nEEWhich = EE_CHAR_STRIKEOUT; break;
case RES_CHRATR_ESCAPEMENT: nEEWhich = EE_CHAR_ESCAPEMENT; break;
case RES_CHRATR_FONT: nEEWhich = EE_CHAR_FONTINFO; break;
case RES_CHRATR_CJK_FONT: nEEWhich = EE_CHAR_FONTINFO_CJK; break;
case RES_CHRATR_CTL_FONT: nEEWhich = EE_CHAR_FONTINFO_CTL; break;
case RES_CHRATR_FONTSIZE: nEEWhich = EE_CHAR_FONTHEIGHT; break;
case RES_CHRATR_CJK_FONTSIZE: nEEWhich = EE_CHAR_FONTHEIGHT_CJK; break;
case RES_CHRATR_CTL_FONTSIZE: nEEWhich = EE_CHAR_FONTHEIGHT_CTL; break;
case RES_CHRATR_KERNING: nEEWhich = EE_CHAR_KERNING; break;
case RES_CHRATR_POSTURE: nEEWhich = EE_CHAR_ITALIC; break;
case RES_CHRATR_CJK_POSTURE: nEEWhich = EE_CHAR_ITALIC_CJK; break;
case RES_CHRATR_CTL_POSTURE: nEEWhich = EE_CHAR_ITALIC_CTL; break;
case RES_CHRATR_UNDERLINE: nEEWhich = EE_CHAR_UNDERLINE; break;
case RES_CHRATR_WEIGHT: nEEWhich = EE_CHAR_WEIGHT; break;
case RES_CHRATR_CJK_WEIGHT: nEEWhich = EE_CHAR_WEIGHT_CJK; break;
case RES_CHRATR_CTL_WEIGHT: nEEWhich = EE_CHAR_WEIGHT_CTL; break;
case RES_BACKGROUND:
case RES_CHRATR_BACKGROUND:
{
const SvxBrushItem& rBrushItem = (const SvxBrushItem&)rSwItem;
rEEItemSet.Put( XFillStyleItem(XFILL_SOLID) );
rEEItemSet.Put( XFillColorItem(aEmptyOUStr,
rBrushItem.GetColor()) );
}
break;
}
if( nEEWhich )
{
SfxPoolItem *pEEItem = rSwItem.Clone();
pEEItem->SetWhich( nEEWhich );
rEEItemSet.Put( *pEEItem );
delete pEEItem;
}
}
void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
{
OSL_ENSURE( !pMarquee, "Marquee in Marquee???" );
aContents = "";
OUString aId, aStyle, aClass;
long nWidth=0, nHeight=0;
bool bPrcWidth = false, bDirection = false, bBGColor = false;
Size aSpace( 0, 0 );
sal_Int16 eVertOri = text::VertOrientation::TOP;
sal_Int16 eHoriOri = text::HoriOrientation::NONE;
SdrTextAniKind eAniKind = SDRTEXTANI_SCROLL;
SdrTextAniDirection eAniDir = SDRTEXTANI_LEFT;
sal_uInt16 nCount = 0, nDelay = 60;
sal_Int16 nAmount = -6;
Color aBGColor;
const HTMLOptions& rHTMLOptions = GetOptions();
for (size_t i = 0, n = rHTMLOptions.size(); i < n; ++i)
{
const HTMLOption& rOption = rHTMLOptions[i];
switch( rOption.GetToken() )
{
case HTML_O_ID:
aId = rOption.GetString();
break;
case HTML_O_STYLE:
aStyle = rOption.GetString();
break;
case HTML_O_CLASS:
aClass = rOption.GetString();
break;
case HTML_O_BEHAVIOR:
eAniKind =
(SdrTextAniKind)rOption.GetEnum( aHTMLMarqBehaviorTable,
static_cast< sal_uInt16 >(eAniKind) );
break;
case HTML_O_BGCOLOR:
rOption.GetColor( aBGColor );
bBGColor = true;
break;
case HTML_O_DIRECTION:
eAniDir =
(SdrTextAniDirection)rOption.GetEnum( aHTMLMarqDirectionTable,
static_cast< sal_uInt16 >(eAniDir) );
bDirection = true;
break;
case HTML_O_LOOP:
if (rOption.GetString().
equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_LOOP_infinite))
{
nCount = 0;
}
else
{
sal_uInt32 nLoop = rOption.GetSNumber();
nCount = (sal_uInt16)(nLoop>0 ? nLoop : 0 );
}
break;
case HTML_O_SCROLLAMOUNT:
nAmount = -((sal_Int16)rOption.GetNumber());
break;
case HTML_O_SCROLLDELAY:
nDelay = (sal_uInt16)rOption.GetNumber();
break;
case HTML_O_WIDTH:
// erstmal nur als Pixelwerte merken!
nWidth = rOption.GetNumber();
bPrcWidth = rOption.GetString().indexOf('%') != -1;
if( bPrcWidth && nWidth>100 )
nWidth = 100;
break;
case HTML_O_HEIGHT:
// erstmal nur als Pixelwerte merken!
nHeight = rOption.GetNumber();
if( rOption.GetString().indexOf('%') != -1 )
nHeight = 0;
break;
case HTML_O_HSPACE:
// erstmal nur als Pixelwerte merken!
aSpace.Height() = rOption.GetNumber();
break;
case HTML_O_VSPACE:
// erstmal nur als Pixelwerte merken!
aSpace.Width() = rOption.GetNumber();
break;
case HTML_O_ALIGN:
eVertOri =
rOption.GetEnum( aHTMLImgVAlignTable,
text::VertOrientation::TOP );
eHoriOri =
rOption.GetEnum( aHTMLImgHAlignTable,
text::HoriOrientation::NONE );
break;
}
}
// Ein DrawTxtobj anlegen
// #i52858# - method name changed
SdrModel* pModel = pDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel();
SdrPage* pPg = pModel->GetPage( 0 );
pMarquee = SdrObjFactory::MakeNewObject( SdrInventor,
OBJ_TEXT, pPg, pModel );
if( !pMarquee )
return;
pPg->InsertObject( pMarquee );
if( !aId.isEmpty() )
InsertBookmark( aId );
// (Nur) Alternate leueft per Default von links nach rechts
if( SDRTEXTANI_ALTERNATE==eAniKind && !bDirection )
eAniDir = SDRTEXTANI_RIGHT;
// die fuer das Scrollen benoetigten Attribute umsetzen
sal_uInt16 aWhichMap[7] = { XATTR_FILL_FIRST, XATTR_FILL_LAST,
SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST,
EE_CHAR_START, EE_CHAR_END,
0 };
SfxItemSet aItemSet( pModel->GetItemPool(), aWhichMap );
aItemSet.Put( SdrTextAutoGrowWidthItem( false ) );
aItemSet.Put( SdrTextAutoGrowHeightItem( true ) );
aItemSet.Put( SdrTextAniKindItem( eAniKind ) );
aItemSet.Put( SdrTextAniDirectionItem( eAniDir ) );
aItemSet.Put( SdrTextAniCountItem( nCount ) );
aItemSet.Put( SdrTextAniDelayItem( nDelay ) );
aItemSet.Put( SdrTextAniAmountItem( nAmount ) );
if( SDRTEXTANI_ALTERNATE==eAniKind )
{
// (Nur) Alternate startet und stoppt per default Inside
aItemSet.Put( SdrTextAniStartInsideItem(true) );
aItemSet.Put( SdrTextAniStopInsideItem(true) );
if( SDRTEXTANI_LEFT==eAniDir )
aItemSet.Put( SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT) );
}
// die Default-Farbe (aus der Standard-Vorlage) setzen, damit ueberhaupt
// eine sinnvolle Farbe gesetzt ist.
const Color& rDfltColor =
pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_STANDARD )
->GetColor().GetValue();
aItemSet.Put( SvxColorItem( rDfltColor, EE_CHAR_COLOR ) );
// Die Attribute der aktuellen Absatzvorlage setzen
sal_uInt16 nWhichIds[] =
{
RES_CHRATR_COLOR, RES_CHRATR_CROSSEDOUT, RES_CHRATR_ESCAPEMENT,
RES_CHRATR_FONT, RES_CHRATR_FONTSIZE, RES_CHRATR_KERNING,
RES_CHRATR_POSTURE, RES_CHRATR_UNDERLINE, RES_CHRATR_WEIGHT,
RES_CHRATR_BACKGROUND,
RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_FONTSIZE,
RES_CHRATR_CJK_POSTURE, RES_CHRATR_CJK_WEIGHT,
RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONTSIZE,
RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT,
0
};
SwTxtNode const*const pTxtNd =
pPam->GetPoint()->nNode.GetNode().GetTxtNode();
if( pTxtNd )
{
const SfxItemSet& rItemSet = pTxtNd->GetAnyFmtColl().GetAttrSet();
const SfxPoolItem *pItem;
for( sal_uInt16 i=0; nWhichIds[i]; i++ )
{
if( SFX_ITEM_SET == rItemSet.GetItemState( nWhichIds[i], true, &pItem ) )
PutEEPoolItem( aItemSet, *pItem );
}
}
// die Attribute der Umgebung am Draw-Objekt setzen
_HTMLAttr** pTbl = (_HTMLAttr**)&aAttrTab;
for( sal_uInt16 nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* );
nCnt--; ++pTbl )
{
_HTMLAttr *pAttr = *pTbl;
if( pAttr )
PutEEPoolItem( aItemSet, pAttr->GetItem() );
}
if( bBGColor )
{
aItemSet.Put( XFillStyleItem(XFILL_SOLID) );
aItemSet.Put( XFillColorItem(aEmptyOUStr, aBGColor) );
}
// Styles parsen (funktioniert hier nur fuer Attribute, die auch
// am Zeichen-Objekt gesetzt werden koennen)
SfxItemSet aStyleItemSet( pDoc->GetAttrPool(),
pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( HasStyleOptions( aStyle, aId, aClass ) &&
ParseStyleOptions( aStyle, aId, aClass, aStyleItemSet, aPropInfo ) )
{
SfxItemIter aIter( aStyleItemSet );
const SfxPoolItem *pItem = aIter.FirstItem();
while( pItem )
{
PutEEPoolItem( aItemSet, *pItem );
pItem = aIter.NextItem();
}
}
// jetzt noch die Groesse setzen
Size aTwipSz( bPrcWidth ? 0 : nWidth, nHeight );
if( (aTwipSz.Width() || aTwipSz.Height()) && Application::GetDefaultDevice() )
{
aTwipSz = Application::GetDefaultDevice()
->PixelToLogic( aTwipSz, MapMode( MAP_TWIP ) );
}
if( SVX_CSS1_LTYPE_TWIP== aPropInfo.eWidthType )
{
aTwipSz.Width() = aPropInfo.nWidth;
nWidth = 1; // != 0;
bPrcWidth = false;
}
if( SVX_CSS1_LTYPE_TWIP== aPropInfo.eHeightType )
aTwipSz.Height() = aPropInfo.nHeight;
bFixMarqueeWidth = false;
if( !nWidth || bPrcWidth )
{
if( pTable )
{
if( !pCurTable )
{
// Die Laufschrift steht in einer Tabelle, aber nicht
// in einer Zelle. Da jetzt keine vernuenftige Zuordung
// zu einer Zelle moeglich ist, passen wir hir die
// Breite dem Inhalt der Laufschrift an.
bFixMarqueeWidth = true;
}
else if( !nWidth )
{
// Da wir wissen, in welcher Zelle die Laufschrift ist,
// koennen wir die Breite auch anpassen. Keine Breitenangabe
// wird wie 100% behandelt.
nWidth = 100;
bPrcWidth = true;
}
aTwipSz.Width() = MINLAY;
}
else
{
long nBrowseWidth = GetCurrentBrowseWidth();
aTwipSz.Width() = !nWidth ? nBrowseWidth
: (nWidth*nBrowseWidth) / 100;
}
}
// Die Hoehe ist nur eine Mindest-Hoehe
if( aTwipSz.Height() < MINFLY )
aTwipSz.Height() = MINFLY;
aItemSet.Put( SdrTextMinFrameHeightItem( aTwipSz.Height() ) );
pMarquee->SetMergedItemSetAndBroadcast(aItemSet);
if( aTwipSz.Width() < MINFLY )
aTwipSz.Width() = MINFLY;
pMarquee->SetLogicRect( Rectangle( 0, 0, aTwipSz.Width(), aTwipSz.Height() ) );
// und das Objekt in das Dok einfuegen
InsertDrawObject( pMarquee, aSpace, eVertOri, eHoriOri, aStyleItemSet,
aPropInfo );
// Das Zeichen-Objekt der Tabelle bekanntmachen. Ist ein bisserl
// umstaendlich, weil noch ueber den Parser gegangen wird, obwohl die
// Tabelle bekannt ist, aber anderenfalls muesste man die Tabelle
// oeffentlich machen, und das ist auch nicht schoen. Das globale
// pTable kann uebrigens auch nicht verwendet werden, denn die
// Laufschrift kann sich auch mal in einer Sub-Tabelle befinden.
if( pCurTable && bPrcWidth)
RegisterDrawObjectToTable( pCurTable, pMarquee, (sal_uInt8)nWidth );
}
void SwHTMLParser::EndMarquee()
{
OSL_ENSURE( pMarquee && OBJ_TEXT==pMarquee->GetObjIdentifier(),
"kein Marquee oder falscher Typ" );
if( bFixMarqueeWidth )
{
// Da es keine fixe Hoehe gibt, das Text-Objekt erstmal breiter
// als den Text machen, damit nicht umgebrochen wird.
const Rectangle& rOldRect = pMarquee->GetLogicRect();
pMarquee->SetLogicRect( Rectangle( rOldRect.TopLeft(),
Size( USHRT_MAX, 240 ) ) );
}
// den gesammelten Text einfuegen
((SdrTextObj*)pMarquee)->SetText( aContents );
pMarquee->SetMergedItemSetAndBroadcast( pMarquee->GetMergedItemSet() );
if( bFixMarqueeWidth )
{
// die Groesse dem Text anpassen.
((SdrTextObj*)pMarquee)->FitFrameToTextSize();
}
aContents = "";
pMarquee = 0;
}
void SwHTMLParser::InsertMarqueeText()
{
OSL_ENSURE( pMarquee && OBJ_TEXT==pMarquee->GetObjIdentifier(),
"kein Marquee oder falscher Typ" );
// das akteulle Textstueck an den Text anhaengen
aContents += aToken;
}
void SwHTMLParser::ResizeDrawObject( SdrObject* pObj, SwTwips nWidth )
{
OSL_ENSURE( OBJ_TEXT==pObj->GetObjIdentifier(),
"kein Marquee oder falscher Typ" );
if( OBJ_TEXT!=pObj->GetObjIdentifier() )
return;
// die alte Groesse
const Rectangle& rOldRect = pObj->GetLogicRect();
Size aNewSz( nWidth, rOldRect.GetSize().Height() );
pObj->SetLogicRect( Rectangle( rOldRect.TopLeft(), aNewSz ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */