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

INTEGRATION: CWS mav21 (1.37.12); FILE MERGED

Browse source 
2007/05/25 13:48:27 mav 1.37.12.2: RESYNC: (1.37-1.38); FILE MERGED
2007/05/14 15:26:20 mav 1.37.12.1: #i77319# the method GetAnyCurRect is not safe when there is no frame
This commit is contained in:
Jens-Heiner Rechtien 2007-06-26 14:55:39 +00:00
parent 175b4ec2a6
commit cb674aaf8b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sw/source/core/frmedt/fefly1.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: fefly1.cxx,v $
*
* $Revision: 1.39 $
* $Revision: 1.40 $
*
* last change: $Author: hr $ $Date: 2007-06-26 13:46:54 $
* last change: $Author: hr $ $Date: 2007-06-26 15:55:39 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -1502,7 +1502,7 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference <
SwFlyFrm *pFly = FindFlyFrm( xObj );
if ( !pFly )
{
aResult = GetAnyCurRect( RECT_FLY_EMBEDDED, 0, xObj ).SSize();
aResult = rRect.SSize();
return aResult;
}