svdedtv2.cxx (ddde725d) svdedtv2.cxx (8718d260)
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

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

2074 Rectangle aLogicRect;
2075
2076 if(pGraf && (pGraf->HasGDIMetaFile() || pGraf->isEmbeddedSvg()))
2077 {
2078 GDIMetaFile aMetaFile;
2079
2080 if(pGraf->HasGDIMetaFile())
2081 {
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

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

2074 Rectangle aLogicRect;
2075
2076 if(pGraf && (pGraf->HasGDIMetaFile() || pGraf->isEmbeddedSvg()))
2077 {
2078 GDIMetaFile aMetaFile;
2079
2080 if(pGraf->HasGDIMetaFile())
2081 {
2082 aMetaFile = pGraf->GetTransformedGraphic(
2083 SDRGRAFOBJ_TRANSFORMATTR_COLOR|SDRGRAFOBJ_TRANSFORMATTR_MIRROR).GetGDIMetaFile();
2082 aMetaFile = pGraf->GetTransformedGraphic(SDRGRAFOBJ_TRANSFORMATTR_COLOR|SDRGRAFOBJ_TRANSFORMATTR_MIRROR).GetGDIMetaFile();
2084 }
2085 else if(pGraf->isEmbeddedSvg())
2086 {
2087 aMetaFile = pGraf->getMetafileFromEmbeddedSvg();
2088 }
2089
2090 if(aMetaFile.GetActionCount())
2091 {
2083 }
2084 else if(pGraf->isEmbeddedSvg())
2085 {
2086 aMetaFile = pGraf->getMetafileFromEmbeddedSvg();
2087 }
2088
2089 if(aMetaFile.GetActionCount())
2090 {
2092 ImpSdrGDIMetaFileImport aFilter(*pMod);
2093
2094 aLogicRect = pGraf->GetLogicRect();
2091 aLogicRect = pGraf->GetLogicRect();
2095 aFilter.SetScaleRect(aLogicRect);
2096 aFilter.SetLayer(pObj->GetLayer());
2097
2092 ImpSdrGDIMetaFileImport aFilter(*pMod, pObj->GetLayer(), aLogicRect);
2098 nInsAnz = aFilter.DoImport(aMetaFile, *pOL, nInsPos, pProgrInfo);
2099 }
2100 }
2101 if ( pOle2!=NULL && pOle2->GetGraphic() )
2102 {
2093 nInsAnz = aFilter.DoImport(aMetaFile, *pOL, nInsPos, pProgrInfo);
2094 }
2095 }
2096 if ( pOle2!=NULL && pOle2->GetGraphic() )
2097 {
2103 //const GDIMetaFile* pMtf=pOle2->GetGDIMetaFile();
2104 ImpSdrGDIMetaFileImport aFilter(*pMod);
2105
2106 aLogicRect = pOle2->GetLogicRect();
2098 aLogicRect = pOle2->GetLogicRect();
2107 aFilter.SetScaleRect(aLogicRect);
2108 aFilter.SetLayer(pObj->GetLayer());
2109
2110 nInsAnz=aFilter.DoImport(pOle2->GetGraphic()->GetGDIMetaFile(),*pOL,nInsPos,pProgrInfo);
2099 ImpSdrGDIMetaFileImport aFilter(*pMod, pObj->GetLayer(), aLogicRect);
2100 nInsAnz = aFilter.DoImport(pOle2->GetGraphic()->GetGDIMetaFile(), *pOL, nInsPos, pProgrInfo);
2111 }
2112 if (nInsAnz!=0)
2113 {
2114 // transformation
2115 GeoStat aGeoStat(pGraf ? pGraf->GetGeoStat() : pOle2->GetGeoStat());
2116 sal_uIntPtr nObj=nInsPos;
2117
2118 if(aGeoStat.nShearWink)

--- 66 unchanged lines hidden --- 		2101 }
2102 if (nInsAnz!=0)
2103 {
2104 // transformation
2105 GeoStat aGeoStat(pGraf ? pGraf->GetGeoStat() : pOle2->GetGeoStat());
2106 sal_uIntPtr nObj=nInsPos;
2107
2108 if(aGeoStat.nShearWink)

--- 66 unchanged lines hidden ---