diff options
Diffstat (limited to 'svx/source/form/datanavi.cxx')
| -rw-r--r-- | svx/source/form/datanavi.cxx | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index fffdcba33636..7862c8f1ea5b 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -26,6 +26,7 @@ #include "fmservs.hxx" #include "fmhelp.hrc" +#include "bitmaps.hlst" #include <svx/svxids.hrc> #include <tools/rcid.h> #include <tools/diagnose_ex.h> @@ -344,11 +345,11 @@ namespace svxform m_pItemList->SetToolBoxItemIds(m_nAddId, m_nAddElementId, m_nAddAttributeId, m_nEditId, m_nRemoveId); m_pToolBox->InsertSeparator(4,5); - m_pToolBox->SetItemImage(m_nAddId, Image(BitmapEx(SVX_RES(RID_SVXBMP_ADD)))); - m_pToolBox->SetItemImage(m_nAddElementId, Image(BitmapEx(SVX_RES(RID_SVXBMP_ADD_ELEMENT)))); - m_pToolBox->SetItemImage(m_nAddAttributeId, Image(BitmapEx(SVX_RES(RID_SVXBMP_ADD_ATTRIBUTE)))); - m_pToolBox->SetItemImage(m_nEditId, Image(BitmapEx(SVX_RES(RID_SVXBMP_EDIT)))); - m_pToolBox->SetItemImage(m_nRemoveId, Image(BitmapEx(SVX_RES(RID_SVXBMP_REMOVE)))); + m_pToolBox->SetItemImage(m_nAddId, Image(BitmapEx(RID_SVXBMP_ADD))); + m_pToolBox->SetItemImage(m_nAddElementId, Image(BitmapEx(RID_SVXBMP_ADD_ELEMENT))); + m_pToolBox->SetItemImage(m_nAddAttributeId, Image(BitmapEx(RID_SVXBMP_ADD_ATTRIBUTE))); + m_pToolBox->SetItemImage(m_nEditId, Image(BitmapEx(RID_SVXBMP_EDIT))); + m_pToolBox->SetItemImage(m_nRemoveId, Image(BitmapEx(RID_SVXBMP_REMOVE))); if ( DGTInstance == m_eGroup ) m_pToolBox->RemoveItem( m_pToolBox->GetItemPos( m_nAddId ) ); @@ -432,16 +433,16 @@ namespace svxform switch ( eChildType ) { case css::xml::dom::NodeType_ATTRIBUTE_NODE: - aExpImg = aCollImg = Image(BitmapEx(SVX_RES(RID_SVXBMP_ATTRIBUTE))); + aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_ATTRIBUTE)); break; case css::xml::dom::NodeType_ELEMENT_NODE: - aExpImg = aCollImg = Image(BitmapEx(SVX_RES(RID_SVXBMP_ELEMENT))); + aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_ELEMENT)); break; case css::xml::dom::NodeType_TEXT_NODE: - aExpImg = aCollImg = Image(BitmapEx(SVX_RES(RID_SVXBMP_TEXT))); + aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_TEXT)); break; default: - aExpImg = aCollImg = Image(BitmapEx(SVX_RES(RID_SVXBMP_OTHER))); + aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_OTHER)); } OUString sName = m_xUIHelper->getNodeDisplayName( xChild, bShowDetails ); @@ -455,7 +456,7 @@ namespace svxform Reference< css::xml::dom::XNamedNodeMap > xMap = xChild->getAttributes(); if ( xMap.is() ) { - aExpImg = aCollImg = Image(BitmapEx(SVX_RES(RID_SVXBMP_ATTRIBUTE))); + aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_ATTRIBUTE)); sal_Int32 j, nMapLen = xMap->getLength(); for ( j = 0; j < nMapLen; ++j ) { @@ -796,7 +797,7 @@ namespace svxform SvTreeListEntry* XFormsPage::AddEntry( ItemNode* _pNewNode, bool _bIsElement ) { SvTreeListEntry* pParent = m_pItemList->FirstSelected(); - Image aImage(BitmapEx(SVX_RES(_bIsElement ? RID_SVXBMP_ELEMENT : RID_SVXBMP_ATTRIBUTE))); + Image aImage(BitmapEx(_bIsElement ? OUString(RID_SVXBMP_ELEMENT) : OUString(RID_SVXBMP_ATTRIBUTE))); OUString sName; try { @@ -814,7 +815,7 @@ namespace svxform SvTreeListEntry* XFormsPage::AddEntry( const Reference< XPropertySet >& _rEntry ) { SvTreeListEntry* pEntry = nullptr; - Image aImage(BitmapEx(SVX_RES(RID_SVXBMP_ELEMENT))); + Image aImage(BitmapEx(RID_SVXBMP_ELEMENT)); ItemNode* pNode = new ItemNode( _rEntry ); OUString sTemp; @@ -1163,7 +1164,7 @@ namespace svxform Reference < XEnumeration > xNum = xNumAccess->createEnumeration(); if ( xNum.is() && xNum->hasMoreElements() ) { - Image aImage(BitmapEx(SVX_RES(RID_SVXBMP_ELEMENT))); + Image aImage(BitmapEx(RID_SVXBMP_ELEMENT)); OUString sDelim( ": " ); while ( xNum->hasMoreElements() ) { |