svdomeas.cxx (cdf0e10c) svdomeas.cxx (a5258243)
1/*************************************************************************
2 *
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 *
5 * Copyright 2000, 2010 Oracle and/or its affiliates.
6 *
7 * OpenOffice.org - a multi-platform office productivity suite
8 *

--- 1144 unchanged lines hidden (view full) ---

1153{
1154 SdrTextObj::RestGeoData(rGeo);
1155 SdrMeasureObjGeoData& rMGeo=(SdrMeasureObjGeoData&)rGeo;
1156 aPt1=rMGeo.aPt1;
1157 aPt2=rMGeo.aPt2;
1158 SetTextDirty();
1159}
1160
1/*************************************************************************
2 *
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 *
5 * Copyright 2000, 2010 Oracle and/or its affiliates.
6 *
7 * OpenOffice.org - a multi-platform office productivity suite
8 *

--- 1144 unchanged lines hidden (view full) ---

1153{
1154 SdrTextObj::RestGeoData(rGeo);
1155 SdrMeasureObjGeoData& rMGeo=(SdrMeasureObjGeoData&)rGeo;
1156 aPt1=rMGeo.aPt1;
1157 aPt2=rMGeo.aPt2;
1158 SetTextDirty();
1159}
1160
1161SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier) const
1161SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const
1162{
1163 // get XOR Poly as base
1164 XPolyPolygon aTmpPolyPolygon(TakeXorPoly());
1165
1166 // get local ItemSet and StyleSheet
1167 SfxItemSet aSet(GetObjectItemSet());
1168 SfxStyleSheet* pStyleSheet = GetStyleSheet();
1169

--- 94 unchanged lines hidden (view full) ---

1264 pPath = new SdrPathObj(OBJ_PATHLINE, aPolyPoly);
1265 pPath->SetModel(GetModel());
1266 pPath->SetMergedItemSet(aSet);
1267 pPath->SetStyleSheet(pStyleSheet, true);
1268
1269 pGroup->GetSubList()->NbcInsertObject(pPath);
1270 }
1271
1162{
1163 // get XOR Poly as base
1164 XPolyPolygon aTmpPolyPolygon(TakeXorPoly());
1165
1166 // get local ItemSet and StyleSheet
1167 SfxItemSet aSet(GetObjectItemSet());
1168 SfxStyleSheet* pStyleSheet = GetStyleSheet();
1169

--- 94 unchanged lines hidden (view full) ---

1264 pPath = new SdrPathObj(OBJ_PATHLINE, aPolyPoly);
1265 pPath->SetModel(GetModel());
1266 pPath->SetMergedItemSet(aSet);
1267 pPath->SetStyleSheet(pStyleSheet, true);
1268
1269 pGroup->GetSubList()->NbcInsertObject(pPath);
1270 }
1271
1272 return ImpConvertAddText(pGroup, bBezier);
1272 if(bAddText)
1273 {
1274 return ImpConvertAddText(pGroup, bBezier);
1275 }
1276 else
1277 {
1278 return pGroup;
1279 }
1273}
1274
1275sal_Bool SdrMeasureObj::BegTextEdit(SdrOutliner& rOutl)
1276{
1277 UndirtyText();
1278 return SdrTextObj::BegTextEdit(rOutl);
1279}
1280

--- 214 unchanged lines hidden --- 		1280}
1281
1282sal_Bool SdrMeasureObj::BegTextEdit(SdrOutliner& rOutl)
1283{
1284 UndirtyText();
1285 return SdrTextObj::BegTextEdit(rOutl);
1286}
1287

--- 214 unchanged lines hidden ---