wall.cxx (9f62ea84) | wall.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 --- 5 unchanged lines hidden (view full) --- 14 * software distributed under the License is distributed on an 15 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 16 * KIND, either express or implied. See the License for the 17 * specific language governing permissions and limitations 18 * under the License. 19 * 20 *************************************************************/ 21 | 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 --- 5 unchanged lines hidden (view full) --- 14 * software distributed under the License is distributed on an 15 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 16 * KIND, either express or implied. See the License for the 17 * specific language governing permissions and limitations 18 * under the License. 19 * 20 *************************************************************/ 21 |
22 23 | |
24// MARKER(update_precomp.py): autogen include statement, do not remove 25#include "precompiled_vcl.hxx" 26 27#include <tools/stream.hxx> 28#include <tools/vcompat.hxx> 29#include <tools/debug.hxx> | 22// MARKER(update_precomp.py): autogen include statement, do not remove 23#include "precompiled_vcl.hxx" 24 25#include <tools/stream.hxx> 26#include <tools/vcompat.hxx> 27#include <tools/debug.hxx> |
30 | |
31#include <vcl/bitmapex.hxx> 32#include <vcl/gradient.hxx> 33#include <vcl/wall.hxx> 34#include <vcl/svapp.hxx> | 28#include <vcl/bitmapex.hxx> 29#include <vcl/gradient.hxx> 30#include <vcl/wall.hxx> 31#include <vcl/svapp.hxx> |
35 | |
36#include <wall2.hxx> | 32#include <wall2.hxx> |
33#include <vcl/dibtools.hxx> |
|
37 | 34 |
38 | |
39DBG_NAME( Wallpaper ) 40 41// ----------------------------------------------------------------------- 42 43ImplWallpaper::ImplWallpaper() : 44 maColor( COL_TRANSPARENT ) 45{ 46 mnRefCount = 1; --- 95 unchanged lines hidden (view full) --- 142 { 143 rImplWallpaper.mpGradient = new Gradient; 144 rIStm >> *rImplWallpaper.mpGradient; 145 } 146 147 if( bBmp ) 148 { 149 rImplWallpaper.mpBitmap = new BitmapEx; | 35DBG_NAME( Wallpaper ) 36 37// ----------------------------------------------------------------------- 38 39ImplWallpaper::ImplWallpaper() : 40 maColor( COL_TRANSPARENT ) 41{ 42 mnRefCount = 1; --- 95 unchanged lines hidden (view full) --- 138 { 139 rImplWallpaper.mpGradient = new Gradient; 140 rIStm >> *rImplWallpaper.mpGradient; 141 } 142 143 if( bBmp ) 144 { 145 rImplWallpaper.mpBitmap = new BitmapEx; |
150 rIStm >> *rImplWallpaper.mpBitmap; | 146 ReadDIBBitmapEx(*rImplWallpaper.mpBitmap, rIStm); |
151 } 152 153 // version 3 (new color format) 154 if( aCompat.GetVersion() >= 3 ) 155 { 156 rImplWallpaper.maColor.Read( rIStm, sal_True ); 157 } 158 } --- 19 unchanged lines hidden (view full) --- 178 179 if( bRect ) 180 rOStm << *rImplWallpaper.mpRect; 181 182 if( bGrad ) 183 rOStm << *rImplWallpaper.mpGradient; 184 185 if( bBmp ) | 147 } 148 149 // version 3 (new color format) 150 if( aCompat.GetVersion() >= 3 ) 151 { 152 rImplWallpaper.maColor.Read( rIStm, sal_True ); 153 } 154 } --- 19 unchanged lines hidden (view full) --- 174 175 if( bRect ) 176 rOStm << *rImplWallpaper.mpRect; 177 178 if( bGrad ) 179 rOStm << *rImplWallpaper.mpGradient; 180 181 if( bBmp ) |
186 rOStm << *rImplWallpaper.mpBitmap; | 182 WriteDIBBitmapEx(*rImplWallpaper.mpBitmap, rOStm); |
187 188 // version 3 (new color format) 189 ( (Color&) rImplWallpaper.maColor ).Write( rOStm, sal_True ); 190 191 return rOStm; 192} 193 194// ----------------------------------------------------------------------- --- 444 unchanged lines hidden --- | 183 184 // version 3 (new color format) 185 ( (Color&) rImplWallpaper.maColor ).Write( rOStm, sal_True ); 186 187 return rOStm; 188} 189 190// ----------------------------------------------------------------------- --- 444 unchanged lines hidden --- |