shapeexport.cxx (cdf0e10c) shapeexport.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 *

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

225 if ( xCustomShapeReplacement.is() )
226 aShapeInfo.xCustomShapeReplacement = xCustomShapeReplacement;
227
228 // -----------------------------
229 // first compute the shapes type
230 // -----------------------------
231 ImpCalcShapeType(xShape, aShapeInfo.meShapeType);
232
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 *

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

225 if ( xCustomShapeReplacement.is() )
226 aShapeInfo.xCustomShapeReplacement = xCustomShapeReplacement;
227
228 // -----------------------------
229 // first compute the shapes type
230 // -----------------------------
231 ImpCalcShapeType(xShape, aShapeInfo.meShapeType);
232
233 // #i118485# enabled XmlShapeTypeDrawChartShape and XmlShapeTypeDrawOLE2Shape
234 // to have text
233 const bool bObjSupportsText =
234// aShapeInfo.meShapeType != XmlShapeTypeDrawControlShape &&
235 const bool bObjSupportsText =
236// aShapeInfo.meShapeType != XmlShapeTypeDrawControlShape &&
235 aShapeInfo.meShapeType != XmlShapeTypeDrawChartShape &&
236 aShapeInfo.meShapeType != XmlShapeTypePresChartShape &&
237 aShapeInfo.meShapeType != XmlShapeTypePresChartShape &&
237 aShapeInfo.meShapeType != XmlShapeTypeDrawOLE2Shape &&
238 aShapeInfo.meShapeType != XmlShapeTypePresOLE2Shape &&
239 aShapeInfo.meShapeType != XmlShapeTypeDrawSheetShape &&
240 aShapeInfo.meShapeType != XmlShapeTypePresSheetShape &&
241 aShapeInfo.meShapeType != XmlShapeTypeDraw3DSceneObject &&
242 aShapeInfo.meShapeType != XmlShapeTypeDraw3DCubeObject &&
243 aShapeInfo.meShapeType != XmlShapeTypeDraw3DSphereObject &&
244 aShapeInfo.meShapeType != XmlShapeTypeDraw3DLatheObject &&
245 aShapeInfo.meShapeType != XmlShapeTypeDraw3DExtrudeObject &&

--- 1058 unchanged lines hidden --- 		238 aShapeInfo.meShapeType != XmlShapeTypePresOLE2Shape &&
239 aShapeInfo.meShapeType != XmlShapeTypeDrawSheetShape &&
240 aShapeInfo.meShapeType != XmlShapeTypePresSheetShape &&
241 aShapeInfo.meShapeType != XmlShapeTypeDraw3DSceneObject &&
242 aShapeInfo.meShapeType != XmlShapeTypeDraw3DCubeObject &&
243 aShapeInfo.meShapeType != XmlShapeTypeDraw3DSphereObject &&
244 aShapeInfo.meShapeType != XmlShapeTypeDraw3DLatheObject &&
245 aShapeInfo.meShapeType != XmlShapeTypeDraw3DExtrudeObject &&

--- 1058 unchanged lines hidden ---