summaryrefslogtreecommitdiff
path: root/sw/source/uibase/uno/unotxdoc.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-04-27 09:12:17 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-04-27 14:17:45 +0200
commit847462f75dc7bb59795aad7664d0b065a3fce866 (patch)
tree93f949c8524a00830a5ecff12216ee52e596dab7 /sw/source/uibase/uno/unotxdoc.cxx
parentf368499b9bcc05eb70aae9914c1760d00b86a2f9 (diff)
remove sw bitmaps from .src files
Change-Id: I9ccd69662f9d3a77d1921b3433b0e2f541960a90 Reviewed-on: https://gerrit.libreoffice.org/37020 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase/uno/unotxdoc.cxx')
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx21
1 files changed, 11 insertions, 10 deletions
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 33eef3dc62bb..939145763a70 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -103,6 +103,7 @@
#include <modcfg.hxx>
#include <ndtxt.hxx>
#include <utlui.hrc>
+#include "bitmaps.hlst"
#include <swcont.hxx>
#include <unodefaults.hxx>
#include <SwXDocumentSettings.hxx>
@@ -4081,26 +4082,26 @@ static Any lcl_GetDisplayBitmap(const OUString& _sLinkSuffix)
OUString sLinkSuffix = _sLinkSuffix;
if(!sLinkSuffix.isEmpty())
sLinkSuffix = sLinkSuffix.copy(1);
- sal_uInt16 nImgId(0);
+ OUString sImgId;
if(sLinkSuffix == "outline")
- nImgId = RID_BMP_NAVI_OUTLINE;
+ sImgId = RID_BMP_NAVI_OUTLINE;
else if(sLinkSuffix == "table")
- nImgId = RID_BMP_NAVI_TABLE;
+ sImgId = RID_BMP_NAVI_TABLE;
else if(sLinkSuffix == "frame")
- nImgId = RID_BMP_NAVI_FRAME;
+ sImgId = RID_BMP_NAVI_FRAME;
else if(sLinkSuffix == "graphic")
- nImgId = RID_BMP_NAVI_GRAPHIC;
+ sImgId = RID_BMP_NAVI_GRAPHIC;
else if(sLinkSuffix == "ole")
- nImgId = RID_BMP_NAVI_OLE;
+ sImgId = RID_BMP_NAVI_OLE;
else if(sLinkSuffix.isEmpty())
- nImgId = RID_BMP_NAVI_BOOKMARK;
+ sImgId = RID_BMP_NAVI_BOOKMARK;
else if(sLinkSuffix == "region")
- nImgId = RID_BMP_NAVI_REGION;
+ sImgId = RID_BMP_NAVI_REGION;
- if (nImgId)
+ if (!sImgId.isEmpty())
{
- aRet <<= VCLUnoHelper::CreateBitmap(BitmapEx(SW_RES(nImgId)));
+ aRet <<= VCLUnoHelper::CreateBitmap(BitmapEx(sImgId));
}
return aRet;
}