fecopy.cxx (1cd65da9) fecopy.cxx (a206ee71)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

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

1294 }
1295 }
1296 }
1297 // <--
1298 }
1299 }
1300 else if( SOT_FORMAT_GDIMETAFILE == nFmt )
1301 rGrf = Imp()->GetDrawView()->GetMarkedObjMetaFile();
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

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

1294 }
1295 }
1296 }
1297 // <--
1298 }
1299 }
1300 else if( SOT_FORMAT_GDIMETAFILE == nFmt )
1301 rGrf = Imp()->GetDrawView()->GetMarkedObjMetaFile();
1302 else if( SOT_FORMAT_BITMAP == nFmt )
1302 else if( SOT_FORMAT_BITMAP == nFmt || SOT_FORMATSTR_ID_PNG == nFmt )
1303 rGrf = Imp()->GetDrawView()->GetMarkedObjBitmapEx();
1304 }
1305 return bConvert;
1306}
1307
1308// --> OD 2005-08-03 #i50824#
1309// --> OD 2006-03-01 #b6382898#
1310// replace method <lcl_RemoveOleObjsFromSdrModel> by <lcl_ConvertSdrOle2ObjsToSdrGrafObjs>

--- 276 unchanged lines hidden --- 		1303 rGrf = Imp()->GetDrawView()->GetMarkedObjBitmapEx();
1304 }
1305 return bConvert;
1306}
1307
1308// --> OD 2005-08-03 #i50824#
1309// --> OD 2006-03-01 #b6382898#
1310// replace method <lcl_RemoveOleObjsFromSdrModel> by <lcl_ConvertSdrOle2ObjsToSdrGrafObjs>

--- 276 unchanged lines hidden ---