summaryrefslogtreecommitdiff
path: root/sw/source/core
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2006-07-25 11:36:46 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2006-07-25 11:36:46 +0000
commita97b646bede52e26468dfe68e07f987697105327 (patch)
treef816a94340427524b05d3c3dfc39734e5555f041 /sw/source/core
parentba42f5f2a29cbae83496ed49b291483f8634e5a4 (diff)
INTEGRATION: CWS aw035 (1.70.40); FILE MERGED
2006/07/14 11:02:07 aw 1.70.40.1: #126320# SdrMark::GetObj() -> SdrMark::GetMarkedSdrObj() for isolating selection handling
Diffstat (limited to 'sw/source/core')
-rw-r--r--sw/source/core/unocore/unodraw.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 8b7d20fa4e17..b0546861041a 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: unodraw.cxx,v $
*
- * $Revision: 1.70 $
+ * $Revision: 1.71 $
*
- * last change: $Author: hr $ $Date: 2006-06-19 12:40:57 $
+ * last change: $Author: rt $ $Date: 2006-07-25 12:36:46 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -840,7 +840,7 @@ uno::Reference< drawing::XShapeGroup > SwXDrawPage::group(const uno::Reference<
sal_Bool bFlyInCnt = sal_False;
for ( sal_uInt16 i = 0; !bFlyInCnt && i < rMarkList.GetMarkCount(); ++i )
{
- const SdrObject *pObj = rMarkList.GetMark( i )->GetObj();
+ const SdrObject *pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
if ( FLY_IN_CNTNT == ::FindFrmFmt( (SdrObject*)pObj )->GetAnchor().GetAnchorId() )
bFlyInCnt = sal_True;
}