[Libreoffice-commits] core.git: extensions/source
Caolán McNamara
caolanm at redhat.com
Thu Dec 22 17:44:13 UTC 2016
extensions/source/propctrlr/formresid.hrc | 56 +++++++++++-----------
extensions/source/propctrlr/pcrmiscres.src | 56 +++++++++++-----------
extensions/source/propctrlr/selectlabeldialog.cxx | 10 +--
extensions/source/propctrlr/taborder.cxx | 44 ++++++++---------
4 files changed, 83 insertions(+), 83 deletions(-)
New commits:
commit 4a780e9e036b5c4f821f0f6e590710e5dc9c20e3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 22 15:58:00 2016 +0000
RID_SVXBMP->RID_EXTBMP
Change-Id: I19e5c60ea8b42223322da2a1e343b7c4c1c59928
diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc
index 52cc1f6..c4b0862 100644
--- a/extensions/source/propctrlr/formresid.hrc
+++ b/extensions/source/propctrlr/formresid.hrc
@@ -309,34 +309,34 @@
#define RID_RSC_ENUM_WHEEL_BEHAVIOR ( RID_PROPCONTROLLER_START + 30 )
#define RID_RSC_ENUM_TEXT_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 31 )
#define RID_RSC_ENUM_SHEET_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 32 )
-#define RID_SVXBMP_CONTROL ( RID_PROPCONTROLLER_START + 33 )
-#define RID_SVXBMP_BUTTON ( RID_PROPCONTROLLER_START + 34 )
-#define RID_SVXBMP_RADIOBUTTON ( RID_PROPCONTROLLER_START + 35 )
-#define RID_SVXBMP_CHECKBOX ( RID_PROPCONTROLLER_START + 36 )
-#define RID_SVXBMP_FIXEDTEXT ( RID_PROPCONTROLLER_START + 37 )
-#define RID_SVXBMP_GROUPBOX ( RID_PROPCONTROLLER_START + 38 )
-#define RID_SVXBMP_EDITBOX ( RID_PROPCONTROLLER_START + 39 )
-#define RID_SVXBMP_LISTBOX ( RID_PROPCONTROLLER_START + 40 )
-#define RID_SVXBMP_COMBOBOX ( RID_PROPCONTROLLER_START + 41 )
-#define RID_SVXBMP_GRID ( RID_PROPCONTROLLER_START + 42 )
-#define RID_SVXBMP_IMAGEBUTTON ( RID_PROPCONTROLLER_START + 43 )
-#define RID_SVXBMP_FILECONTROL ( RID_PROPCONTROLLER_START + 44 )
-#define RID_SVXBMP_DATEFIELD ( RID_PROPCONTROLLER_START + 45 )
-#define RID_SVXBMP_TIMEFIELD ( RID_PROPCONTROLLER_START + 46 )
-#define RID_SVXBMP_NUMERICFIELD ( RID_PROPCONTROLLER_START + 47 )
-#define RID_SVXBMP_CURRENCYFIELD ( RID_PROPCONTROLLER_START + 48 )
-#define RID_SVXBMP_PATTERNFIELD ( RID_PROPCONTROLLER_START + 49 )
-#define RID_SVXBMP_IMAGECONTROL ( RID_PROPCONTROLLER_START + 50 )
-#define RID_SVXBMP_HIDDEN ( RID_PROPCONTROLLER_START + 51 )
-#define RID_SVXBMP_FORMATTEDFIELD ( RID_PROPCONTROLLER_START + 52 )
-#define RID_SVXBMP_FILTER ( RID_PROPCONTROLLER_START + 53 )
-#define RID_SVXBMP_FORMS ( RID_PROPCONTROLLER_START + 54 )
-#define RID_SVXBMP_FORM ( RID_PROPCONTROLLER_START + 55 )
-#define RID_SVXBMP_COLLAPSEDNODE ( RID_PROPCONTROLLER_START + 56 )
-#define RID_SVXBMP_EXPANDEDNODE ( RID_PROPCONTROLLER_START + 57 )
-#define RID_SVXBMP_SCROLLBAR ( RID_PROPCONTROLLER_START + 58 )
-#define RID_SVXBMP_SPINBUTTON ( RID_PROPCONTROLLER_START + 59 )
-#define RID_SVXBMP_NAVIGATIONBAR ( RID_PROPCONTROLLER_START + 60 )
+#define RID_EXTBMP_CONTROL ( RID_PROPCONTROLLER_START + 33 )
+#define RID_EXTBMP_BUTTON ( RID_PROPCONTROLLER_START + 34 )
+#define RID_EXTBMP_RADIOBUTTON ( RID_PROPCONTROLLER_START + 35 )
+#define RID_EXTBMP_CHECKBOX ( RID_PROPCONTROLLER_START + 36 )
+#define RID_EXTBMP_FIXEDTEXT ( RID_PROPCONTROLLER_START + 37 )
+#define RID_EXTBMP_GROUPBOX ( RID_PROPCONTROLLER_START + 38 )
+#define RID_EXTBMP_EDITBOX ( RID_PROPCONTROLLER_START + 39 )
+#define RID_EXTBMP_LISTBOX ( RID_PROPCONTROLLER_START + 40 )
+#define RID_EXTBMP_COMBOBOX ( RID_PROPCONTROLLER_START + 41 )
+#define RID_EXTBMP_GRID ( RID_PROPCONTROLLER_START + 42 )
+#define RID_EXTBMP_IMAGEBUTTON ( RID_PROPCONTROLLER_START + 43 )
+#define RID_EXTBMP_FILECONTROL ( RID_PROPCONTROLLER_START + 44 )
+#define RID_EXTBMP_DATEFIELD ( RID_PROPCONTROLLER_START + 45 )
+#define RID_EXTBMP_TIMEFIELD ( RID_PROPCONTROLLER_START + 46 )
+#define RID_EXTBMP_NUMERICFIELD ( RID_PROPCONTROLLER_START + 47 )
+#define RID_EXTBMP_CURRENCYFIELD ( RID_PROPCONTROLLER_START + 48 )
+#define RID_EXTBMP_PATTERNFIELD ( RID_PROPCONTROLLER_START + 49 )
+#define RID_EXTBMP_IMAGECONTROL ( RID_PROPCONTROLLER_START + 50 )
+#define RID_EXTBMP_HIDDEN ( RID_PROPCONTROLLER_START + 51 )
+#define RID_EXTBMP_FORMATTEDFIELD ( RID_PROPCONTROLLER_START + 52 )
+#define RID_EXTBMP_FILTER ( RID_PROPCONTROLLER_START + 53 )
+#define RID_EXTBMP_FORMS ( RID_PROPCONTROLLER_START + 54 )
+#define RID_EXTBMP_FORM ( RID_PROPCONTROLLER_START + 55 )
+#define RID_EXTBMP_COLLAPSEDNODE ( RID_PROPCONTROLLER_START + 56 )
+#define RID_EXTBMP_EXPANDEDNODE ( RID_PROPCONTROLLER_START + 57 )
+#define RID_EXTBMP_SCROLLBAR ( RID_PROPCONTROLLER_START + 58 )
+#define RID_EXTBMP_SPINBUTTON ( RID_PROPCONTROLLER_START + 59 )
+#define RID_EXTBMP_NAVIGATIONBAR ( RID_PROPCONTROLLER_START + 60 )
#endif
diff --git a/extensions/source/propctrlr/pcrmiscres.src b/extensions/source/propctrlr/pcrmiscres.src
index 58a393c..b587bb7 100644
--- a/extensions/source/propctrlr/pcrmiscres.src
+++ b/extensions/source/propctrlr/pcrmiscres.src
@@ -25,142 +25,142 @@ String RID_STR_CONFIRM_DELETE_DATA_TYPE
"Please note that this will affect all controls which are bound to this data type.";
};
-Bitmap RID_SVXBMP_CONTROL
+Bitmap RID_EXTBMP_CONTROL
{
File = "sx10144.png";
};
-Bitmap RID_SVXBMP_BUTTON
+Bitmap RID_EXTBMP_BUTTON
{
File = "sx10594.png";
};
-Bitmap RID_SVXBMP_RADIOBUTTON
+Bitmap RID_EXTBMP_RADIOBUTTON
{
File = "sx10595.png";
};
-Bitmap RID_SVXBMP_CHECKBOX
+Bitmap RID_EXTBMP_CHECKBOX
{
File = "sx10596.png";
};
-Bitmap RID_SVXBMP_FIXEDTEXT
+Bitmap RID_EXTBMP_FIXEDTEXT
{
File = "sx10597.png";
};
-Bitmap RID_SVXBMP_GROUPBOX
+Bitmap RID_EXTBMP_GROUPBOX
{
File = "sx10598.png";
};
-Bitmap RID_SVXBMP_EDITBOX
+Bitmap RID_EXTBMP_EDITBOX
{
File = "sx10599.png";
};
-Bitmap RID_SVXBMP_LISTBOX
+Bitmap RID_EXTBMP_LISTBOX
{
File = "sx10600.png";
};
-Bitmap RID_SVXBMP_COMBOBOX
+Bitmap RID_EXTBMP_COMBOBOX
{
File = "sx10601.png";
};
-Bitmap RID_SVXBMP_GRID
+Bitmap RID_EXTBMP_GRID
{
File = "sx10603.png";
};
-Bitmap RID_SVXBMP_IMAGEBUTTON
+Bitmap RID_EXTBMP_IMAGEBUTTON
{
File = "sx10604.png";
};
-Bitmap RID_SVXBMP_FILECONTROL
+Bitmap RID_EXTBMP_FILECONTROL
{
File = "sx10605.png";
};
-Bitmap RID_SVXBMP_DATEFIELD
+Bitmap RID_EXTBMP_DATEFIELD
{
File = "sx10704.png";
};
-Bitmap RID_SVXBMP_TIMEFIELD
+Bitmap RID_EXTBMP_TIMEFIELD
{
File = "sx10705.png";
};
-Bitmap RID_SVXBMP_NUMERICFIELD
+Bitmap RID_EXTBMP_NUMERICFIELD
{
File = "sx10706.png";
};
-Bitmap RID_SVXBMP_CURRENCYFIELD
+Bitmap RID_EXTBMP_CURRENCYFIELD
{
File = "sx10707.png";
};
-Bitmap RID_SVXBMP_PATTERNFIELD
+Bitmap RID_EXTBMP_PATTERNFIELD
{
File = "sx10708.png";
};
-Bitmap RID_SVXBMP_IMAGECONTROL
+Bitmap RID_EXTBMP_IMAGECONTROL
{
File = "sx10710.png";
};
-Bitmap RID_SVXBMP_HIDDEN
+Bitmap RID_EXTBMP_HIDDEN
{
File = "sx18022.png";
};
-Bitmap RID_SVXBMP_FORMATTEDFIELD
+Bitmap RID_EXTBMP_FORMATTEDFIELD
{
File = "sx10728.png";
};
-Bitmap RID_SVXBMP_FILTER
+Bitmap RID_EXTBMP_FILTER
{
File = "sx10715.png";
};
-Bitmap RID_SVXBMP_FORMS
+Bitmap RID_EXTBMP_FORMS
{
File = "sx18013.png";
};
-Bitmap RID_SVXBMP_FORM
+Bitmap RID_EXTBMP_FORM
{
File = "sx10593.png";
};
-Bitmap RID_SVXBMP_COLLAPSEDNODE
+Bitmap RID_EXTBMP_COLLAPSEDNODE
{
File = "sx18002.png";
};
-Bitmap RID_SVXBMP_EXPANDEDNODE
+Bitmap RID_EXTBMP_EXPANDEDNODE
{
File = "sx18003.png";
};
-Bitmap RID_SVXBMP_SCROLLBAR
+Bitmap RID_EXTBMP_SCROLLBAR
{
File = "sx10768.png";
};
-Bitmap RID_SVXBMP_SPINBUTTON
+Bitmap RID_EXTBMP_SPINBUTTON
{
File = "sx10769.png";
};
-Bitmap RID_SVXBMP_NAVIGATIONBAR
+Bitmap RID_EXTBMP_NAVIGATIONBAR
{
File = "sx10607.png";
};
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index 5cf7a447..8849c8e 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -64,8 +64,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_SVXBMP_COLLAPSEDNODE))),
- Image(BitmapEx(PcrRes(RID_SVXBMP_EXPANDEDNODE))));
+ m_pControlTree->SetNodeBitmaps(Image(BitmapEx(PcrRes(RID_EXTBMP_COLLAPSEDNODE))),
+ Image(BitmapEx(PcrRes(RID_EXTBMP_EXPANDEDNODE))));
m_pControlTree->SetSelectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
m_pControlTree->SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
@@ -99,7 +99,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_SVXBMP_GROUPBOX : RID_SVXBMP_FIXEDTEXT)));
+ m_aRequiredControlImage = Image(BitmapEx(PcrRes(FormComponentType::RADIOBUTTON == nClassId ? RID_EXTBMP_GROUPBOX : RID_EXTBMP_FIXEDTEXT)));
// calc the currently set label control (so InsertEntries can calc m_pInitialSelection)
Any aCurrentLabelControl( m_xControlModel->getPropertyValue(PROPERTY_CONTROLLABEL) );
@@ -110,7 +110,7 @@ namespace pcr
aCurrentLabelControl >>= m_xInitialLabelControl;
// insert the root
- Image aRootImage(BitmapEx(PcrRes(RID_SVXBMP_FORMS)));
+ Image aRootImage(BitmapEx(PcrRes(RID_EXTBMP_FORMS)));
SvTreeListEntry* pRoot = m_pControlTree->InsertEntry(PcrRes(RID_STR_FORMS).toString(), aRootImage, aRootImage);
// build the tree
@@ -198,7 +198,7 @@ namespace pcr
Reference< XIndexAccess > xCont(xAsSet, UNO_QUERY);
if (xCont.is() && xCont->getCount())
{ // yes -> step down
- Image aFormImage(BitmapEx(PcrRes(RID_SVXBMP_FORM)));
+ Image aFormImage(BitmapEx(PcrRes(RID_EXTBMP_FORM)));
SvTreeListEntry* pCont = m_pControlTree->InsertEntry(sName, aFormImage, aFormImage, pContainerEntry);
sal_Int32 nContChildren = InsertEntries(xCont, pCont);
if (nContChildren)
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index cf2b0ed..32796b0 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -44,33 +44,33 @@ namespace pcr
Image GetImage( const Reference< XPropertySet >& _rxSet )
{
- sal_uInt16 nImageId = RID_SVXBMP_CONTROL;
+ sal_uInt16 nImageId = RID_EXTBMP_CONTROL;
// TODO: classify controls also in Basic propbrw
if ( _rxSet.is() && ::comphelper::hasProperty( PROPERTY_CLASSID, _rxSet ) )
{
switch( ::comphelper::getINT16( _rxSet->getPropertyValue( PROPERTY_CLASSID ) ) )
{
- case FormComponentType::COMMANDBUTTON: nImageId = RID_SVXBMP_BUTTON; break;
- case FormComponentType::FIXEDTEXT: nImageId = RID_SVXBMP_FIXEDTEXT; break;
- case FormComponentType::TEXTFIELD: nImageId = RID_SVXBMP_EDITBOX; break;
- case FormComponentType::RADIOBUTTON: nImageId = RID_SVXBMP_RADIOBUTTON; break;
- case FormComponentType::CHECKBOX: nImageId = RID_SVXBMP_CHECKBOX; break;
- case FormComponentType::LISTBOX: nImageId = RID_SVXBMP_LISTBOX; break;
- case FormComponentType::COMBOBOX: nImageId = RID_SVXBMP_COMBOBOX; break;
- case FormComponentType::GROUPBOX: nImageId = RID_SVXBMP_GROUPBOX; break;
- case FormComponentType::IMAGEBUTTON: nImageId = RID_SVXBMP_IMAGEBUTTON; break;
- case FormComponentType::FILECONTROL: nImageId = RID_SVXBMP_FILECONTROL; break;
- case FormComponentType::HIDDENCONTROL: nImageId = RID_SVXBMP_HIDDEN; break;
- case FormComponentType::DATEFIELD: nImageId = RID_SVXBMP_DATEFIELD; break;
- case FormComponentType::TIMEFIELD: nImageId = RID_SVXBMP_TIMEFIELD; break;
- case FormComponentType::NUMERICFIELD: nImageId = RID_SVXBMP_NUMERICFIELD; break;
- case FormComponentType::CURRENCYFIELD: nImageId = RID_SVXBMP_CURRENCYFIELD; break;
- case FormComponentType::PATTERNFIELD: nImageId = RID_SVXBMP_PATTERNFIELD; break;
- case FormComponentType::IMAGECONTROL: nImageId = RID_SVXBMP_IMAGECONTROL; break;
- case FormComponentType::GRIDCONTROL: nImageId = RID_SVXBMP_GRID; break;
- case FormComponentType::SCROLLBAR: nImageId = RID_SVXBMP_SCROLLBAR; break;
- case FormComponentType::SPINBUTTON: nImageId = RID_SVXBMP_SPINBUTTON; break;
- case FormComponentType::NAVIGATIONBAR: nImageId = RID_SVXBMP_NAVIGATIONBAR; break;
+ case FormComponentType::COMMANDBUTTON: nImageId = RID_EXTBMP_BUTTON; break;
+ case FormComponentType::FIXEDTEXT: nImageId = RID_EXTBMP_FIXEDTEXT; break;
+ case FormComponentType::TEXTFIELD: nImageId = RID_EXTBMP_EDITBOX; break;
+ case FormComponentType::RADIOBUTTON: nImageId = RID_EXTBMP_RADIOBUTTON; break;
+ case FormComponentType::CHECKBOX: nImageId = RID_EXTBMP_CHECKBOX; break;
+ case FormComponentType::LISTBOX: nImageId = RID_EXTBMP_LISTBOX; break;
+ case FormComponentType::COMBOBOX: nImageId = RID_EXTBMP_COMBOBOX; break;
+ case FormComponentType::GROUPBOX: nImageId = RID_EXTBMP_GROUPBOX; break;
+ case FormComponentType::IMAGEBUTTON: nImageId = RID_EXTBMP_IMAGEBUTTON; break;
+ case FormComponentType::FILECONTROL: nImageId = RID_EXTBMP_FILECONTROL; break;
+ case FormComponentType::HIDDENCONTROL: nImageId = RID_EXTBMP_HIDDEN; break;
+ case FormComponentType::DATEFIELD: nImageId = RID_EXTBMP_DATEFIELD; break;
+ case FormComponentType::TIMEFIELD: nImageId = RID_EXTBMP_TIMEFIELD; break;
+ case FormComponentType::NUMERICFIELD: nImageId = RID_EXTBMP_NUMERICFIELD; break;
+ case FormComponentType::CURRENCYFIELD: nImageId = RID_EXTBMP_CURRENCYFIELD; break;
+ case FormComponentType::PATTERNFIELD: nImageId = RID_EXTBMP_PATTERNFIELD; break;
+ case FormComponentType::IMAGECONTROL: nImageId = RID_EXTBMP_IMAGECONTROL; break;
+ case FormComponentType::GRIDCONTROL: nImageId = RID_EXTBMP_GRID; break;
+ case FormComponentType::SCROLLBAR: nImageId = RID_EXTBMP_SCROLLBAR; break;
+ case FormComponentType::SPINBUTTON: nImageId = RID_EXTBMP_SPINBUTTON; break;
+ case FormComponentType::NAVIGATIONBAR: nImageId = RID_EXTBMP_NAVIGATIONBAR; break;
default:
OSL_FAIL( "TabOrderDialog::GetImage: unknown control type" );
}
More information about the Libreoffice-commits
mailing list