diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-25 16:34:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-26 08:57:30 +0100 |
| commit | 816190b7b0f0cb75782cd12fe2cd908fdaf819fa (patch) | |
| tree | 4d8c1ce10b7cd4b3d43c59fcd7699e176a3df2a3 /extensions/source/propctrlr/selectlabeldialog.cxx | |
| parent | 7df948695e5be0077fd9d7d8bc8e25072c345890 (diff) | |
remove extensions bitmaps from .src files
resulting in the removal of a updchk .res file
Change-Id: I7a6f3601f25763253ba34590a1970ca8a042db23
Diffstat (limited to 'extensions/source/propctrlr/selectlabeldialog.cxx')
| -rw-r--r-- | extensions/source/propctrlr/selectlabeldialog.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index 8849c8e838ef..ffec0db1ca00 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -19,6 +19,7 @@ #include "selectlabeldialog.hxx" #include "formresid.hrc" +#include "bitmaps.hlst" #include "formbrowsertools.hxx" #include "formstrings.hxx" #include <com/sun/star/form/FormComponentType.hpp> @@ -64,8 +65,8 @@ namespace pcr m_pControlTree->EnableInplaceEditing( false ); m_pControlTree->SetStyle(m_pControlTree->GetStyle() | WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL); - m_pControlTree->SetNodeBitmaps(Image(BitmapEx(PcrRes(RID_EXTBMP_COLLAPSEDNODE))), - Image(BitmapEx(PcrRes(RID_EXTBMP_EXPANDEDNODE)))); + m_pControlTree->SetNodeBitmaps(Image(BitmapEx(RID_EXTBMP_COLLAPSEDNODE)), + Image(BitmapEx(RID_EXTBMP_EXPANDEDNODE))); m_pControlTree->SetSelectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected)); m_pControlTree->SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected)); @@ -99,7 +100,7 @@ namespace pcr sal_Int16 nClassId = 0; try { nClassId = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); } catch(...) { } m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUString(SERVICE_COMPONENT_GROUPBOX) : OUString(SERVICE_COMPONENT_FIXEDTEXT); - m_aRequiredControlImage = Image(BitmapEx(PcrRes(FormComponentType::RADIOBUTTON == nClassId ? RID_EXTBMP_GROUPBOX : RID_EXTBMP_FIXEDTEXT))); + m_aRequiredControlImage = Image(BitmapEx(FormComponentType::RADIOBUTTON == nClassId ? OUStringLiteral(RID_EXTBMP_GROUPBOX) : OUStringLiteral(RID_EXTBMP_FIXEDTEXT))); // calc the currently set label control (so InsertEntries can calc m_pInitialSelection) Any aCurrentLabelControl( m_xControlModel->getPropertyValue(PROPERTY_CONTROLLABEL) ); @@ -110,7 +111,7 @@ namespace pcr aCurrentLabelControl >>= m_xInitialLabelControl; // insert the root - Image aRootImage(BitmapEx(PcrRes(RID_EXTBMP_FORMS))); + Image aRootImage(BitmapEx(RID_EXTBMP_FORMS)); SvTreeListEntry* pRoot = m_pControlTree->InsertEntry(PcrRes(RID_STR_FORMS).toString(), aRootImage, aRootImage); // build the tree @@ -198,7 +199,7 @@ namespace pcr Reference< XIndexAccess > xCont(xAsSet, UNO_QUERY); if (xCont.is() && xCont->getCount()) { // yes -> step down - Image aFormImage(BitmapEx(PcrRes(RID_EXTBMP_FORM))); + Image aFormImage(BitmapEx(RID_EXTBMP_FORM)); SvTreeListEntry* pCont = m_pControlTree->InsertEntry(sName, aFormImage, aFormImage, pContainerEntry); sal_Int32 nContChildren = InsertEntries(xCont, pCont); if (nContChildren) |