diff options
author | Jan Holesovsky <kendy@suse.cz> | 2013-07-16 16:12:48 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2013-07-17 13:27:46 +0200 |
commit | 8c69fcd6ebe514a3b10f929059f0c676913374f3 (patch) | |
tree | ddaea14be7cc59924367d0600bf3900572f9ecfc /dbaccess | |
parent | 7cfd340e92835c43788031ef184095f0f61a61a9 (diff) |
Move hasBigImages() from ToolboxController to SfxToolBoxController.
We want to decide whether the images are big or not based on the real
(underlying) ToolBox, not on the global setting, because we can have both
toolbars with large as well as small icons visible at the same time (small in
sidebar, large in toolbars).
Change-Id: I046a12a495f2038df9a571f5779794a639bae6dc
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/ui/control/toolboxcontroller.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 57e3b0054ab8..b833483fcc1d 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -200,8 +200,6 @@ namespace dbaui Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager( OUString("com.sun.star.sdb.OfficeDatabaseDocument") ); Reference<XImageManager> xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY); - short nImageType = hasBigImages() ? ImageType::SIZE_LARGE : ImageType::SIZE_DEFAULT; - Sequence< OUString> aSeq(1); sal_uInt16 nCount = pMenu->GetItemCount(); for (sal_uInt16 nPos = 0; nPos < nCount; ++nPos) @@ -211,7 +209,7 @@ namespace dbaui sal_uInt16 nItemId = pMenu->GetItemId(nPos); aSeq[0] = pMenu->GetItemCommand(nItemId); - Sequence< Reference<XGraphic> > aImages = xImageMgr->getImages(nImageType,aSeq); + Sequence< Reference<XGraphic> > aImages = xImageMgr->getImages(ImageType::SIZE_DEFAULT, aSeq); Image aImage(aImages[0]); pMenu->SetItemImage(nItemId,aImage); |