tparea.cxx (2ee96f1c) tparea.cxx (70d3707a)
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

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

1127 }
1128 break;
1129 case XFILL_BITMAP:
1130 {
1131 nPos = aLbBitmap.GetSelectEntryPos();
1132 if( nPos != LISTBOX_ENTRY_NOTFOUND &&
1133 nPos != aLbBitmap.GetSavedValue() )
1134 {
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

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

1127 }
1128 break;
1129 case XFILL_BITMAP:
1130 {
1131 nPos = aLbBitmap.GetSelectEntryPos();
1132 if( nPos != LISTBOX_ENTRY_NOTFOUND &&
1133 nPos != aLbBitmap.GetSavedValue() )
1134 {
1135 XOBitmap aXOBitmap = pBitmapList->GetBitmap( nPos )->GetXBitmap();
1136 String aString = aLbBitmap.GetSelectEntry();
1137 XFillBitmapItem aFillBitmapItem( aString, aXOBitmap );
1135 const XBitmapEntry* pXBitmapEntry = pBitmapList->GetBitmap(nPos);
1136 const String aString(aLbBitmap.GetSelectEntry());
1137 const XFillBitmapItem aFillBitmapItem(aString, pXBitmapEntry->GetGraphicObject());
1138 pOld = GetOldItem( rAttrs, XATTR_FILLBITMAP );
1139 if ( !pOld || !( *(const XFillBitmapItem*)pOld == aFillBitmapItem ) )
1140 {
1141 rAttrs.Put( aFillBitmapItem );
1142 bModified = sal_True;
1143 }
1144 }
1145 // NEU

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

2245
2246IMPL_LINK( SvxAreaTabPage, ModifyBitmapHdl_Impl, void *, EMPTYARG )
2247{
2248 const SfxPoolItem* pPoolItem = NULL;
2249 sal_uInt16 _nPos = aLbBitmap.GetSelectEntryPos();
2250 if( _nPos != LISTBOX_ENTRY_NOTFOUND )
2251 {
2252 // ItemSet fuellen und an aCtlXRectPreview weiterleiten
1138 pOld = GetOldItem( rAttrs, XATTR_FILLBITMAP );
1139 if ( !pOld || !( *(const XFillBitmapItem*)pOld == aFillBitmapItem ) )
1140 {
1141 rAttrs.Put( aFillBitmapItem );
1142 bModified = sal_True;
1143 }
1144 }
1145 // NEU

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

2245
2246IMPL_LINK( SvxAreaTabPage, ModifyBitmapHdl_Impl, void *, EMPTYARG )
2247{
2248 const SfxPoolItem* pPoolItem = NULL;
2249 sal_uInt16 _nPos = aLbBitmap.GetSelectEntryPos();
2250 if( _nPos != LISTBOX_ENTRY_NOTFOUND )
2251 {
2252 // ItemSet fuellen und an aCtlXRectPreview weiterleiten
2253 XBitmapEntry* pEntry = pBitmapList->GetBitmap( _nPos );
2253 const XBitmapEntry* pEntry = pBitmapList->GetBitmap(_nPos);
2254
2254
2255 rXFSet.Put( XFillStyleItem( XFILL_BITMAP ) );
2256 rXFSet.Put( XFillBitmapItem( String(), pEntry->GetXBitmap() ) );
2255 rXFSet.Put(XFillStyleItem(XFILL_BITMAP));
2256 rXFSet.Put(XFillBitmapItem(String(), pEntry->GetGraphicObject()));
2257 }
2258 // NEU
2259 else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), sal_True, &pPoolItem ) )
2260 {
2257 }
2258 // NEU
2259 else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), sal_True, &pPoolItem ) )
2260 {
2261 rXFSet.Put( XFillStyleItem( XFILL_BITMAP ) );
2262 rXFSet.Put( XFillBitmapItem( String(), ( ( const XFillBitmapItem* ) pPoolItem )->GetBitmapValue() ) );
2261 rXFSet.Put(XFillStyleItem(XFILL_BITMAP));
2262 rXFSet.Put(XFillBitmapItem(String(), ((const XFillBitmapItem*)pPoolItem)->GetGraphicObject()));
2263 }
2264 else
2265 rXFSet.Put( XFillStyleItem( XFILL_NONE ) );
2266
2267 aCtlBitmapPreview.SetAttributes( aXFillAttr.GetItemSet() );
2268 aCtlBitmapPreview.Invalidate();
2269
2270 return( 0L );

--- 324 unchanged lines hidden --- 		2263 }
2264 else
2265 rXFSet.Put( XFillStyleItem( XFILL_NONE ) );
2266
2267 aCtlBitmapPreview.SetAttributes( aXFillAttr.GetItemSet() );
2268 aCtlBitmapPreview.Invalidate();
2269
2270 return( 0L );

--- 324 unchanged lines hidden ---