mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

masterfix: #i112758# integration of renaissance2 in m81 broke smoketestoo_native

Browse Source
This commit is contained in:
obo
2010-06-29 15:31:44 +02:00
parent 6d3db84c49
commit 4adb61dc6b
2 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sd/source/ui/inc/view/viewoverlaymanager.hxx
View File

@@ -59,12 +59,7 @@ public:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
static BitmapEx maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START];
static BitmapEx maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START];
private: private:
void UpdateImages();
ViewShellBase& mrBase; ViewShellBase& mrBase;
ULONG mnUpdateTagsEvent; ULONG mnUpdateTagsEvent;

60
sd/source/ui/view/viewoverlaymanager.cxx
View File

@@ -45,6 +45,7 @@
#include <vcl/help.hxx> #include <vcl/help.hxx>
#include <vcl/imagerepository.hxx> #include <vcl/imagerepository.hxx>
#include <vcl/lazydelete.hxx>
#include <svx/sdrpagewindow.hxx> #include <svx/sdrpagewindow.hxx>
#include <svx/sdrpaintwindow.hxx> #include <svx/sdrpaintwindow.hxx>
@@ -79,9 +80,6 @@ class ImageButtonHdl;
// -------------------------------------------------------------------- // --------------------------------------------------------------------
BitmapEx ViewOverlayManager::maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START];
BitmapEx ViewOverlayManager::maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START];
static USHORT gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; static USHORT gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA };
static USHORT gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE }; static USHORT gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE };
@@ -97,6 +95,32 @@ static BitmapEx loadImageResource( USHORT nId )
// -------------------------------------------------------------------- // --------------------------------------------------------------------
static BitmapEx* getButtonImage( int index, bool large )
{
static vcl::DeleteOnDeinit< BitmapEx > gSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START] = { 0, 0, 0, 0, 0, 0, 0, 0 };
static vcl::DeleteOnDeinit< BitmapEx > gLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START] = { 0, 0, 0, 0, 0, 0, 0, 0 };
if( !gSmallButtonImages[0].get() )
{
for( sal_uInt16 i = 0; i < (BMP_PLACEHOLDER_SMALL_END-BMP_PLACEHOLDER_SMALL_START); i++ )
{
gSmallButtonImages[i].set( new BitmapEx( loadImageResource( BMP_PLACEHOLDER_SMALL_START + i ) ) );
gLargeButtonImages[i].set( new BitmapEx( loadImageResource( BMP_PLACEHOLDER_LARGE_START + i ) ) );
}
}
if( large )
{
return gLargeButtonImages[index].get();
}
else
{
return gSmallButtonImages[index].get();
}
}
// --------------------------------------------------------------------
const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32; const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32;
class ChangePlaceholderTag : public SmartTag class ChangePlaceholderTag : public SmartTag
@@ -374,20 +398,20 @@ BitmapEx ChangePlaceholderTag::createOverlayImage( int nHighlight )
Size aShapeSizePix = pDev->LogicToPixel(rSnapRect.GetSize()); Size aShapeSizePix = pDev->LogicToPixel(rSnapRect.GetSize());
long nShapeSizePix = std::min(aShapeSizePix.Width(),aShapeSizePix.Height()); long nShapeSizePix = std::min(aShapeSizePix.Width(),aShapeSizePix.Height());
BitmapEx* pImages = (nShapeSizePix > 250) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; bool bLarge = nShapeSizePix > 250;
Size aSize( pImages->GetSizePixel() ); Size aSize( getButtonImage( 0, bLarge )->GetSizePixel() );
aRet.SetSizePixel( Size( aSize.Width() << 1, aSize.Height() << 1 ) ); aRet.SetSizePixel( Size( aSize.Width() << 1, aSize.Height() << 1 ) );
const Rectangle aRectSrc( Point( 0, 0 ), aSize ); const Rectangle aRectSrc( Point( 0, 0 ), aSize );
aRet = pImages[(nHighlight == 0) ? 4 : 0]; aRet = *(getButtonImage((nHighlight == 0) ? 4 : 0, bLarge));
aRet.Expand( aSize.Width(), aSize.Height(), NULL, TRUE ); aRet.Expand( aSize.Width(), aSize.Height(), NULL, TRUE );
aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, &pImages[(nHighlight == 1) ? 5 : 1] ); aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, getButtonImage((nHighlight == 1) ? 5 : 1, bLarge) );
aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, &pImages[(nHighlight == 2) ? 6 : 2] ); aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, getButtonImage((nHighlight == 2) ? 6 : 2, bLarge) );
aRet.CopyPixel( Rectangle( Point( aSize.Width(), aSize.Height() ), aSize ), aRectSrc, &pImages[(nHighlight == 3) ? 7 : 3] ); aRet.CopyPixel( Rectangle( Point( aSize.Width(), aSize.Height() ), aSize ), aRectSrc, getButtonImage((nHighlight == 3) ? 7 : 3, bLarge) );
} }
return aRet; return aRet;
@@ -411,9 +435,9 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList )
if( 50 > nShapeSizePix ) if( 50 > nShapeSizePix )
return; return;
BitmapEx* pImages = (nShapeSizePix > 250) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; bool bLarge = nShapeSizePix > 250;
Size aButtonSize( pDev->PixelToLogic(pImages[0].GetSizePixel()) ); Size aButtonSize( pDev->PixelToLogic( getButtonImage(0, bLarge )->GetSizePixel()) );
const int nColumns = 2; const int nColumns = 2;
const int nRows = 2; const int nRows = 2;
@@ -490,17 +514,6 @@ ViewOverlayManager::~ViewOverlayManager()
// -------------------------------------------------------------------- // --------------------------------------------------------------------
void ViewOverlayManager::UpdateImages()
{
for( sal_uInt16 i = 0; i < (BMP_PLACEHOLDER_SMALL_END-BMP_PLACEHOLDER_SMALL_START); i++ )
{
maSmallButtonImages[i] = loadImageResource( BMP_PLACEHOLDER_SMALL_START + i );
maLargeButtonImages[i] = loadImageResource( BMP_PLACEHOLDER_LARGE_START + i );
}
}
// --------------------------------------------------------------------
void ViewOverlayManager::Notify(SfxBroadcaster&, const SfxHint& rHint) void ViewOverlayManager::Notify(SfxBroadcaster&, const SfxHint& rHint)
{ {
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
@@ -548,9 +561,6 @@ bool ViewOverlayManager::CreateTags()
if( pPage ) if( pPage )
{ {
if( !maSmallButtonImages[0] )
UpdateImages();
const std::list< SdrObject* >& rShapes = pPage->GetPresentationShapeList().getList(); const std::list< SdrObject* >& rShapes = pPage->GetPresentationShapeList().getList();
for( std::list< SdrObject* >::const_iterator iter( rShapes.begin() ); iter != rShapes.end(); iter++ ) for( std::list< SdrObject* >::const_iterator iter( rShapes.begin() ); iter != rShapes.end(); iter++ )