actiontriggerhelper.cxx (6d739b60) | actiontriggerhelper.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_framework.hxx" 26#include <framework/actiontriggerhelper.hxx> 27#include <classes/actiontriggerseparatorpropertyset.hxx> 28#include <classes/rootactiontriggercontainer.hxx> 29#include <classes/imagewrapper.hxx> 30#include <framework/addonsoptions.hxx> 31#include <com/sun/star/lang/XServiceInfo.hpp> 32#include <com/sun/star/beans/XPropertySet.hpp> 33#include <com/sun/star/awt/XBitmap.hpp> 34#include <vcl/svapp.hxx> 35#include <vos/mutex.hxx> 36#include <tools/stream.hxx> 37#include <cppuhelper/weak.hxx> 38#include <comphelper/processfactory.hxx> | 22// MARKER(update_precomp.py): autogen include statement, do not remove 23#include "precompiled_framework.hxx" 24#include <framework/actiontriggerhelper.hxx> 25#include <classes/actiontriggerseparatorpropertyset.hxx> 26#include <classes/rootactiontriggercontainer.hxx> 27#include <classes/imagewrapper.hxx> 28#include <framework/addonsoptions.hxx> 29#include <com/sun/star/lang/XServiceInfo.hpp> 30#include <com/sun/star/beans/XPropertySet.hpp> 31#include <com/sun/star/awt/XBitmap.hpp> 32#include <vcl/svapp.hxx> 33#include <vos/mutex.hxx> 34#include <tools/stream.hxx> 35#include <cppuhelper/weak.hxx> 36#include <comphelper/processfactory.hxx> |
37#include <vcl/dibtools.hxx> |
|
39 | 38 |
40 | |
41const sal_uInt16 START_ITEMID = 1000; 42 43using namespace rtl; 44using namespace vos; 45using namespace com::sun::star::awt; 46using namespace com::sun::star::uno; 47using namespace com::sun::star::lang; 48using namespace com::sun::star::beans; --- 142 unchanged lines hidden (view full) --- 191 // use a more time consuming way to build an Image! 192 Image aImage; 193 Bitmap aBitmap; 194 195 Sequence< sal_Int8 > aDIBSeq; 196 { 197 aDIBSeq = xBitmap->getDIB(); 198 SvMemoryStream aMem( (void *)aDIBSeq.getConstArray(), aDIBSeq.getLength(), STREAM_READ ); | 39const sal_uInt16 START_ITEMID = 1000; 40 41using namespace rtl; 42using namespace vos; 43using namespace com::sun::star::awt; 44using namespace com::sun::star::uno; 45using namespace com::sun::star::lang; 46using namespace com::sun::star::beans; --- 142 unchanged lines hidden (view full) --- 189 // use a more time consuming way to build an Image! 190 Image aImage; 191 Bitmap aBitmap; 192 193 Sequence< sal_Int8 > aDIBSeq; 194 { 195 aDIBSeq = xBitmap->getDIB(); 196 SvMemoryStream aMem( (void *)aDIBSeq.getConstArray(), aDIBSeq.getLength(), STREAM_READ ); |
199 aMem >> aBitmap; | 197 ReadDIB(aBitmap, aMem, true); |
200 } 201 202 aDIBSeq = xBitmap->getMaskDIB(); 203 if ( aDIBSeq.getLength() > 0 ) 204 { 205 Bitmap aMaskBitmap; 206 SvMemoryStream aMem( (void *)aDIBSeq.getConstArray(), aDIBSeq.getLength(), STREAM_READ ); | 198 } 199 200 aDIBSeq = xBitmap->getMaskDIB(); 201 if ( aDIBSeq.getLength() > 0 ) 202 { 203 Bitmap aMaskBitmap; 204 SvMemoryStream aMem( (void *)aDIBSeq.getConstArray(), aDIBSeq.getLength(), STREAM_READ ); |
207 aMem >> aMaskBitmap; | 205 ReadDIB(aMaskBitmap, aMem, true); |
208 aImage = Image( aBitmap, aMaskBitmap ); 209 } 210 else 211 aImage = Image( aBitmap ); 212 213 if ( !!aImage ) 214 pSubMenu->SetItemImage( nNewItemId, aImage ); 215 } --- 189 unchanged lines hidden --- | 206 aImage = Image( aBitmap, aMaskBitmap ); 207 } 208 else 209 aImage = Image( aBitmap ); 210 211 if ( !!aImage ) 212 pSubMenu->SetItemImage( nNewItemId, aImage ); 213 } --- 189 unchanged lines hidden --- |