fillctrl.cxx (f6e50924) fillctrl.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

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

417 {
418 pFillAttrLB->RemoveEntry( nCount - 1 );
419 }
420 }
421 aTmpStr = TMP_STR_BEGIN;
422 aTmpStr += aString;
423 aTmpStr += TMP_STR_END;
424
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

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

417 {
418 pFillAttrLB->RemoveEntry( nCount - 1 );
419 }
420 }
421 aTmpStr = TMP_STR_BEGIN;
422 aTmpStr += aString;
423 aTmpStr += TMP_STR_END;
424
425 XBitmapEntry* pEntry = new XBitmapEntry( pBitmapItem->GetBitmapValue(), aTmpStr );
425 XBitmapEntry* pEntry = new XBitmapEntry(pBitmapItem->GetGraphicObject(), aTmpStr);
426 XBitmapList aBitmapList( String::CreateFromAscii("TmpList") );
427 aBitmapList.Insert( pEntry );
428 aBitmapList.SetDirty( sal_False );
426 XBitmapList aBitmapList( String::CreateFromAscii("TmpList") );
427 aBitmapList.Insert( pEntry );
428 aBitmapList.SetDirty( sal_False );
429 //Bitmap* pBmp = aBitmapList.GetBitmap( 0 );
430 //( (ListBox*)pFillAttrLB )->InsertEntry( pEntry->GetName(), *pBmp );
431 pFillAttrLB->Fill( &aBitmapList );
432 pFillAttrLB->SelectEntryPos( pFillAttrLB->GetEntryCount() - 1 );
433 aBitmapList.Remove( 0 );
434 delete pEntry;
435 }
436 // NEU
437 }
438 else

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

770
771 if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_BITMAP_LIST ) )
772 {
773 SvxBitmapListItem aItem(
774 *(const SvxBitmapListItem*)( pSh->GetItem( SID_BITMAP_LIST ) ) );
775
776 if ( nPos < aItem.GetBitmapList()->Count() ) // kein temp. Eintrag ?
777 {
429 pFillAttrLB->Fill( &aBitmapList );
430 pFillAttrLB->SelectEntryPos( pFillAttrLB->GetEntryCount() - 1 );
431 aBitmapList.Remove( 0 );
432 delete pEntry;
433 }
434 // NEU
435 }
436 else

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

768
769 if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_BITMAP_LIST ) )
770 {
771 SvxBitmapListItem aItem(
772 *(const SvxBitmapListItem*)( pSh->GetItem( SID_BITMAP_LIST ) ) );
773
774 if ( nPos < aItem.GetBitmapList()->Count() ) // kein temp. Eintrag ?
775 {
778 XOBitmap aXOBitmap = aItem.GetBitmapList()->GetBitmap( nPos )->GetXBitmap();
779 XFillBitmapItem aXFillBitmapItem( pLbFillAttr->GetSelectEntry(), aXOBitmap );
776 const XBitmapEntry* pXBitmapEntry = aItem.GetBitmapList()->GetBitmap(nPos);
777 const XFillBitmapItem aXFillBitmapItem(pLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject());
780
781 aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillBitmap" ));
782 aXFillBitmapItem.QueryValue( a );
783 aArgs[0].Value = a;
778
779 aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillBitmap" ));
780 aXFillBitmapItem.QueryValue( a );
781 aArgs[0].Value = a;
784 ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillBitmap" )),
785 aArgs );
782 ((SvxFillToolBoxControl*)GetData())->Dispatch(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FillBitmap")), aArgs);
786 }
787 }
788 }
789 break;
790 }
791
792 // release focus
793 if ( pLbFillAttr->IsRelease() && pBox )

--- 49 unchanged lines hidden --- 		783 }
784 }
785 }
786 break;
787 }
788
789 // release focus
790 if ( pLbFillAttr->IsRelease() && pBox )

--- 49 unchanged lines hidden ---