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

split GetImageForCommand into GetBitmapForCommand and co

Browse Source 
Change-Id: I89431532ef26fc33146252e218096e690825b896
This commit is contained in:
Caolán McNamara
2017-01-20 16:46:14 +00:00
parent aa0951b22d
commit c41b7a3974
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/vcl/commandinfoprovider.hxx
View File

@@ -89,6 +89,11 @@ public:
OUString GetCommandPropertyFromModule( const OUString& rCommandName, const OUString& rModuleName ); OUString GetCommandPropertyFromModule( const OUString& rCommandName, const OUString& rModuleName );
BitmapEx GetBitmapForCommand(
const OUString& rsCommandName,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
vcl::ImageType eImageType = vcl::ImageType::Small);
Image GetImageForCommand( Image GetImageForCommand(
const OUString& rsCommandName, const OUString& rsCommandName,
const css::uno::Reference<css::frame::XFrame>& rxFrame, const css::uno::Reference<css::frame::XFrame>& rxFrame,

28
vcl/source/helper/commandinfoprovider.cxx
View File

@@ -209,14 +209,14 @@ OUString CommandInfoProvider::GetRealCommandForCommand(const OUString& rCommandN
return GetCommandProperty("TargetURL", rCommandName); return GetCommandProperty("TargetURL", rCommandName);
} }
Image CommandInfoProvider::GetImageForCommand(const OUString& rsCommandName, BitmapEx CommandInfoProvider::GetBitmapForCommand(const OUString& rsCommandName,
const Reference<frame::XFrame>& rxFrame, const Reference<frame::XFrame>& rxFrame,
vcl::ImageType eImageType) vcl::ImageType eImageType)
{ {
SetFrame(rxFrame); SetFrame(rxFrame);
if (rsCommandName.isEmpty()) if (rsCommandName.isEmpty())
return Image(); return BitmapEx();
sal_Int16 nImageType(ui::ImageType::COLOR_NORMAL | ui::ImageType::SIZE_DEFAULT); sal_Int16 nImageType(ui::ImageType::COLOR_NORMAL | ui::ImageType::SIZE_DEFAULT);
@@ -241,10 +241,11 @@ Image CommandInfoProvider::GetImageForCommand(const OUString& rsCommandName,
aGraphicSeq = xDocImgMgr->getImages( nImageType, aImageCmdSeq ); aGraphicSeq = xDocImgMgr->getImages( nImageType, aImageCmdSeq );
Reference<graphic::XGraphic> xGraphic = aGraphicSeq[0]; Reference<graphic::XGraphic> xGraphic = aGraphicSeq[0];
Image aImage(xGraphic); const Graphic aGraphic(xGraphic);
BitmapEx aBitmap(aGraphic.GetBitmapEx());
if (!!aImage) if (!!aBitmap)
return aImage; return aBitmap;
} }
} }
catch (Exception&) catch (Exception&)
@@ -264,13 +265,22 @@ Image CommandInfoProvider::GetImageForCommand(const OUString& rsCommandName,
Reference<graphic::XGraphic> xGraphic(aGraphicSeq[0]); Reference<graphic::XGraphic> xGraphic(aGraphicSeq[0]);
return Image(xGraphic); const Graphic aGraphic(xGraphic);
return aGraphic.GetBitmapEx();
} }
catch (Exception&) catch (Exception&)
{ {
} }
return Image(); return BitmapEx();
}
Image CommandInfoProvider::GetImageForCommand(const OUString& rsCommandName,
const Reference<frame::XFrame>& rxFrame,
vcl::ImageType eImageType)
{
return Image(GetBitmapForCommand(rsCommandName, rxFrame, eImageType));
} }
sal_Int32 CommandInfoProvider::GetPropertiesForCommand ( sal_Int32 CommandInfoProvider::GetPropertiesForCommand (