tpbitmap.cxx (97e8a929) tpbitmap.cxx (a68b38df)
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

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

588 }
589 }
590
591 DBG_ASSERT( pEntry, "SvxBitmapTabPage::ClickAddHdl_Impl(), pEntry == 0 ?" );
592
593 if( pEntry )
594 {
595 pBitmapList->Insert( pEntry );
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

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

588 }
589 }
590
591 DBG_ASSERT( pEntry, "SvxBitmapTabPage::ClickAddHdl_Impl(), pEntry == 0 ?" );
592
593 if( pEntry )
594 {
595 pBitmapList->Insert( pEntry );
596 const Size aUiSize(pBitmapList->getUiBitmapWidth(), pBitmapList->getUiBitmapHeight());
597 aLbBitmaps.Append(aUiSize, *pEntry );
596 const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
597 aLbBitmaps.Append(rStyleSettings.GetListBoxPreviewDefaultPixelSize(), *pEntry );
598 aLbBitmaps.SelectEntryPos( aLbBitmaps.GetEntryCount() - 1 );
599
600#ifdef WNT
601 // hack: #31355# W.P.
602 Rectangle aRect( aLbBitmaps.GetPosPixel(), aLbBitmaps.GetSizePixel() );
603 if( sal_True ) { // ??? overlapped with pDlg
604 // and srolling
605 Invalidate( aRect );

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

696 delete pDlg;
697 delete pWarnBox;
698
699 if( !nError )
700 {
701 XBitmapEntry* pEntry = new XBitmapEntry( aGraphic, aName );
702 pBitmapList->Insert( pEntry );
703
598 aLbBitmaps.SelectEntryPos( aLbBitmaps.GetEntryCount() - 1 );
599
600#ifdef WNT
601 // hack: #31355# W.P.
602 Rectangle aRect( aLbBitmaps.GetPosPixel(), aLbBitmaps.GetSizePixel() );
603 if( sal_True ) { // ??? overlapped with pDlg
604 // and srolling
605 Invalidate( aRect );

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

696 delete pDlg;
697 delete pWarnBox;
698
699 if( !nError )
700 {
701 XBitmapEntry* pEntry = new XBitmapEntry( aGraphic, aName );
702 pBitmapList->Insert( pEntry );
703
704 const Size aUiSize(pBitmapList->getUiBitmapWidth(), pBitmapList->getUiBitmapHeight());
705 aLbBitmaps.Append(aUiSize, *pEntry );
704 const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
705 aLbBitmaps.Append(rStyleSettings.GetListBoxPreviewDefaultPixelSize(), *pEntry );
706 aLbBitmaps.SelectEntryPos( aLbBitmaps.GetEntryCount() - 1 );
707
708#ifdef WNT
709 // hack: #31355# W.P.
710 Rectangle aRect( aLbBitmaps.GetPosPixel(), aLbBitmaps.GetSizePixel() );
711 if( sal_True ) { // ??? overlapped with pDlg
712 // and srolling
713 Invalidate( aRect );

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

752 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
753 DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
754 AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
755 DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
756
757 long nCount = pBitmapList->Count();
758 sal_Bool bDifferent = sal_False;
759 sal_Bool bLoop = sal_True;
706 aLbBitmaps.SelectEntryPos( aLbBitmaps.GetEntryCount() - 1 );
707
708#ifdef WNT
709 // hack: #31355# W.P.
710 Rectangle aRect( aLbBitmaps.GetPosPixel(), aLbBitmaps.GetSizePixel() );
711 if( sal_True ) { // ??? overlapped with pDlg
712 // and srolling
713 Invalidate( aRect );

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

752 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
753 DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
754 AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
755 DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
756
757 long nCount = pBitmapList->Count();
758 sal_Bool bDifferent = sal_False;
759 sal_Bool bLoop = sal_True;
760 const Size aUiSize(pBitmapList->getUiBitmapWidth(), pBitmapList->getUiBitmapHeight());
760 const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
761
762 while( bLoop && pDlg->Execute() == RET_OK )
763 {
764 pDlg->GetName( aName );
765 bDifferent = sal_True;
766
767 for( long i = 0; i < nCount && bDifferent; i++ )
768 {

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

777 XBitmapEntry* pEntry = pBitmapList->GetBitmap( nPos );
778
779 pEntry->SetName( aName );
780
781 const BitmapEx aBitmapEx(aBitmapCtl.GetBitmapEx());
782
783 pEntry->SetGraphicObject(Graphic(aBitmapEx));
784
761
762 while( bLoop && pDlg->Execute() == RET_OK )
763 {
764 pDlg->GetName( aName );
765 bDifferent = sal_True;
766
767 for( long i = 0; i < nCount && bDifferent; i++ )
768 {

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

777 XBitmapEntry* pEntry = pBitmapList->GetBitmap( nPos );
778
779 pEntry->SetName( aName );
780
781 const BitmapEx aBitmapEx(aBitmapCtl.GetBitmapEx());
782
783 pEntry->SetGraphicObject(Graphic(aBitmapEx));
784
785 aLbBitmaps.Modify( aUiSize, *pEntry, nPos );
785 aLbBitmaps.Modify( rStyleSettings.GetListBoxPreviewDefaultPixelSize(), *pEntry, nPos );
786 aLbBitmaps.SelectEntryPos( nPos );
787
788 // Flag fuer modifiziert setzen
789 *pnBitmapListState |= CT_MODIFIED;
790
791 bBmpChanged = sal_False;
792 }
793 else

--- 274 unchanged lines hidden --- 		786 aLbBitmaps.SelectEntryPos( nPos );
787
788 // Flag fuer modifiziert setzen
789 *pnBitmapListState |= CT_MODIFIED;
790
791 bBmpChanged = sal_False;
792 }
793 else

--- 274 unchanged lines hidden ---