galmisc.cxx (f6e50924) galmisc.cxx (45fd3b9a)
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

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

601 bRet = SetGraphic( mpGraphicObject->GetGraphic(), rFlavor );
602 }
603 else if( ( FORMAT_GDIMETAFILE == nFormat ) && mpGraphicObject )
604 {
605 bRet = SetGDIMetaFile( mpGraphicObject->GetGraphic().GetGDIMetaFile(), rFlavor );
606 }
607 else if( ( FORMAT_BITMAP == nFormat ) && mpGraphicObject )
608 {
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

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

601 bRet = SetGraphic( mpGraphicObject->GetGraphic(), rFlavor );
602 }
603 else if( ( FORMAT_GDIMETAFILE == nFormat ) && mpGraphicObject )
604 {
605 bRet = SetGDIMetaFile( mpGraphicObject->GetGraphic().GetGDIMetaFile(), rFlavor );
606 }
607 else if( ( FORMAT_BITMAP == nFormat ) && mpGraphicObject )
608 {
609 bRet = SetBitmap( mpGraphicObject->GetGraphic().GetBitmap(), rFlavor );
609 bRet = SetBitmapEx( mpGraphicObject->GetGraphic().GetBitmapEx(), rFlavor );
610 }
611
612 return bRet;
613}
614
615// ------------------------------------------------------------------------
616
617sal_Bool GalleryTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject,

--- 58 unchanged lines hidden --- 		610 }
611
612 return bRet;
613}
614
615// ------------------------------------------------------------------------
616
617sal_Bool GalleryTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject,

--- 58 unchanged lines hidden ---