| viewfun3.cxx (45fd3b9a) | viewfun3.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 --- 829 unchanged lines hidden (view full) --- 838 } 839 } 840 else if ( aDataHelper.HasFormat( SOT_FORMAT_GDIMETAFILE ) ) 841 { 842 GDIMetaFile aMtf; 843 if( aDataHelper.GetGDIMetaFile( FORMAT_GDIMETAFILE, aMtf ) ) 844 bRet = ApplyGraphicToObject( pHitObj, Graphic(aMtf) ); 845 } | 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 --- 829 unchanged lines hidden (view full) --- 838 } 839 } 840 else if ( aDataHelper.HasFormat( SOT_FORMAT_GDIMETAFILE ) ) 841 { 842 GDIMetaFile aMtf; 843 if( aDataHelper.GetGDIMetaFile( FORMAT_GDIMETAFILE, aMtf ) ) 844 bRet = ApplyGraphicToObject( pHitObj, Graphic(aMtf) ); 845 } |
| 846 else if ( aDataHelper.HasFormat( SOT_FORMAT_BITMAP ) ) | 846 else if ( aDataHelper.HasFormat( SOT_FORMAT_BITMAP ) || aDataHelper.HasFormat( SOT_FORMATSTR_ID_PNG ) ) |
| 847 { 848 BitmapEx aBmpEx; 849 if( aDataHelper.GetBitmapEx( FORMAT_BITMAP, aBmpEx ) ) 850 bRet = ApplyGraphicToObject( pHitObj, Graphic(aBmpEx) ); 851 } 852 } 853 else 854 { --- 992 unchanged lines hidden --- | 847 { 848 BitmapEx aBmpEx; 849 if( aDataHelper.GetBitmapEx( FORMAT_BITMAP, aBmpEx ) ) 850 bRet = ApplyGraphicToObject( pHitObj, Graphic(aBmpEx) ); 851 } 852 } 853 else 854 { --- 992 unchanged lines hidden --- |