Makefile.in | 4
extensions/source/propctrlr/formresid.hrc | 67 +++-----
extensions/source/propctrlr/pcrmiscres.src | 176 +++++++++++++++++-----
extensions/source/propctrlr/selectlabeldialog.cxx | 10 -
extensions/source/propctrlr/selectlabeldialog.hxx | 1
extensions/source/propctrlr/taborder.cxx | 53 ++----
extensions/source/propctrlr/taborder.hxx | 2
include/svx/dialogs.hrc | 15 +
svx/source/dialog/imapdlg.hrc | 2
svx/source/dialog/imapdlg.src | 27 ---
svx/source/tbxctrls/tbcontrl.cxx | 51 ++----
svx/source/tbxctrls/tbcontrl.src | 61 +++++++
unoidl/source/sourceprovider-parser.y | 20 +-
13 files changed, 298 insertions(+), 191 deletions(-)
New commits:
commit c7964e48b6d9a85d8d08ed3b7cbd58c117ac4e0a
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 21 14:21:27 2016 +0000
tweak fuzzing dependencies
Change-Id: If78e68556711bc9b9a00d3b18d13852adf44b9f0
diff --git a/Makefile.in b/Makefile.in
index 517d133..5c269f0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -421,10 +421,10 @@ $(foreach ide,\
vim \
xcode \
qtcreator \
- eclipsecdt,\
+ eclipsecdt,\
$(eval $(call gb_Top_GbuildToIdeIntegration,$(ide))))
-fuzzers: Library_sal Library_salhelper Library_reg Library_store
Library_unoidl codemaker Library_cppu Library_i18nlangtag StaticLibrary_ulingu
StaticLibrary_jpeg StaticLibrary_findsofficepath Rdb_services udkapi offapi
Library_clew Library_gie Library_reflection Library_invocadapt
Library_bootstrap Library_introspection Library_stocservices Library_cppuhelper
Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts
Executable_wmffuzzer
+fuzzers: Library_sal Library_salhelper Library_reg Library_store
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper
Library_comphelper StaticLibrary_ulingu StaticLibrary_jpeg
StaticLibrary_findsofficepath Library_tl Rdb_services udkapi offapi
Library_clew Library_gie Library_reflection Library_invocadapt
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader
Library_gcc3_uno instsetoo_native more_fonts Executable_wmffuzzer
endif # MAKE_RESTARTS
commit 64a2dc962cd68c86281ed747d3dc96bc996115eb
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 21 15:47:02 2016 +0000
unwind RID_SVXIL_FRAME ImageList
Change-Id: I18f567d3ff7f415c75e29043ef29a460be8a21c5
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index cebaa5d..cd7984d1 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -141,8 +141,6 @@
// ResId's fuer Dialoge aus StarDraw
#define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289)
-#define RID_SVXIL_FRAME (RID_SVX_START + 65)
-
#define RID_SVXIMAGE_LIGHT_ON (RID_SVX_START + 210)
#define RID_SVXIMAGE_LIGHT_OFF (RID_SVX_START + 211)
#define RID_SVXIMAGE_COLORDLG (RID_SVX_START + 214)
@@ -178,6 +176,19 @@
#define RID_SVXBMP_TEXT (RID_SVX_START + 73)
#define RID_SVXBMP_OTHER (RID_SVX_START + 74)
+#define RID_SVXBMP_FRAME1 (RID_SVX_START + 75)
+#define RID_SVXBMP_FRAME2 (RID_SVX_START + 76)
+#define RID_SVXBMP_FRAME3 (RID_SVX_START + 77)
+#define RID_SVXBMP_FRAME4 (RID_SVX_START + 78)
+#define RID_SVXBMP_FRAME5 (RID_SVX_START + 79)
+#define RID_SVXBMP_FRAME6 (RID_SVX_START + 80)
+#define RID_SVXBMP_FRAME7 (RID_SVX_START + 81)
+#define RID_SVXBMP_FRAME8 (RID_SVX_START + 82)
+#define RID_SVXBMP_FRAME9 (RID_SVX_START + 83)
+#define RID_SVXBMP_FRAME10 (RID_SVX_START + 84)
+#define RID_SVXBMP_FRAME11 (RID_SVX_START + 85)
+#define RID_SVXBMP_FRAME12 (RID_SVX_START + 86)
+
// Menu for the ruler
#define RID_SVXMN_RULER (RID_SVX_START + 92)
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index f60dc31..fcbbd75 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -255,7 +255,7 @@ class SvxFrameWindow_Impl : public svtools::ToolbarPopup
private:
VclPtr<SvxFrmValueSet_Impl> aFrameSet;
svt::ToolboxController& mrController;
- ImageList aImgList;
+ std::vector<BitmapEx> aImgVec;
bool bParagraphMode;
void InitImageList();
@@ -272,7 +272,6 @@ public:
virtual void dispose() override;
virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent
) throw ( css::uno::RuntimeException ) override;
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
};
class SvxLineWindow_Impl : public svtools::ToolbarPopup
@@ -1746,12 +1745,12 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl (
svt::ToolboxController& rController,
sal_uInt16 i = 0;
for ( i=1; i<9; i++ )
- aFrameSet->InsertItem( i, aImgList.GetImage(i) );
+ aFrameSet->InsertItem(i, Image(aImgVec[i-1]));
//bParagraphMode should have been set in StateChanged
if ( !bParagraphMode )
for ( i = 9; i < 13; i++ )
- aFrameSet->InsertItem( i, aImgList.GetImage(i) );
+ aFrameSet->InsertItem(i, Image(aImgVec[i-1]));
aFrameSet->SetColCount( 4 );
aFrameSet->SetSelectHdl( LINK( this, SvxFrameWindow_Impl, SelectHdl ) );
@@ -1786,21 +1785,6 @@ void SvxFrameWindow_Impl::KeyInput( const KeyEvent&
rKEvt )
aFrameSet->KeyInput( rKEvt );
}
-void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
-{
- ToolbarPopup::DataChanged( rDCEvt );
-
- if( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && (
rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) )
- {
- InitImageList();
-
- sal_uInt16 nNumOfItems = aFrameSet->GetItemCount();
-
- for( sal_uInt16 i = 1 ; i <= nNumOfItems ; ++i )
- aFrameSet->SetItemImage( i, aImgList.GetImage( i ) );
- }
-}
-
enum class FrmValidFlags {
NONE = 0x00,
Left = 0x01,
@@ -1956,7 +1940,7 @@ void SvxFrameWindow_Impl::statusChanged( const
css::frame::FeatureStateEvent& rE
else if ( !bTableMode && !bParagraphMode )
{
for ( sal_uInt16 i = 9; i < 13; i++ )
- aFrameSet->InsertItem( i, aImgList.GetImage(i) );
+ aFrameSet->InsertItem(i, Image(aImgVec[i-1]));
bResize = true;
}
@@ -1981,16 +1965,25 @@ void SvxFrameWindow_Impl::CalcSizeValueSet()
void SvxFrameWindow_Impl::InitImageList()
{
- aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) );
-
- if( GetParent()->GetDPIScaleFactor() > 1 )
- {
- for (short i = 0; i < aImgList.GetImageCount(); i++)
+ aImgVec.clear();
+ aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME1)));
+ aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME2)));
+ aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME3)));
+ aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME4)));
+ aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME5)));
+ aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME6)));
+ aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME7)));
+ aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME8)));
+ aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME9)));
+ aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME10)));
+ aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME11)));
+ aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME12)));
+
+ if (GetParent()->GetDPIScaleFactor() > 1)
+ {
+ for (size_t i = 0; i < aImgVec.size(); ++i)
{
- OUString rImageName = aImgList.GetImageName(i);
- BitmapEx b = aImgList.GetImage(rImageName).GetBitmapEx();
- b.Scale(GetParent()->GetDPIScaleFactor(),
GetParent()->GetDPIScaleFactor());
- aImgList.ReplaceImage(rImageName, Image(b));
+ aImgVec[i].Scale(GetParent()->GetDPIScaleFactor(),
GetParent()->GetDPIScaleFactor());
}
}
}
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index 194d6a8..c8447b2 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -34,11 +34,64 @@ Image RID_SVX_RELOAD_SPECIAL
ImageBitmap = Bitmap { File = "reloads.png" ; };
};
-ImageList RID_SVXIL_FRAME
+Bitmap RID_SVXBMP_FRAME1
{
- Prefix = "fr";
- IdList = { 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 ; 8 ; 9 ; 10 ; 11 ; 12 ; };
- IdCount = { 12 ; };
+ File = "fr01.png";
+};
+
+Bitmap RID_SVXBMP_FRAME2
+{
+ File = "fr02.png";
+};
+
+Bitmap RID_SVXBMP_FRAME3
+{
+ File = "fr03.png";
+};
+
+Bitmap RID_SVXBMP_FRAME4
+{
+ File = "fr04.png";
+};
+
+Bitmap RID_SVXBMP_FRAME5
+{
+ File = "fr05.png";
+};
+
+Bitmap RID_SVXBMP_FRAME6
+{
+ File = "fr06.png";
+};
+
+Bitmap RID_SVXBMP_FRAME7
+{
+ File = "fr07.png";
+};
+
+Bitmap RID_SVXBMP_FRAME8
+{
+ File = "fr08.png";
+};
+
+Bitmap RID_SVXBMP_FRAME9
+{
+ File = "fr09.png";
+};
+
+Bitmap RID_SVXBMP_FRAME10
+{
+ File = "fr010.png";
+};
+
+Bitmap RID_SVXBMP_FRAME11
+{
+ File = "fr011.png";
+};
+
+Bitmap RID_SVXBMP_FRAME12
+{
+ File = "fr012.png";
};
String RID_SVXSTR_NOFILL
commit 68f76781312551d84f25404a13a75bd47589520b
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 21 15:01:37 2016 +0000
drop unused IL_IMAPDLG resource
since
commit 149c7ac26a97c96574fbbd86225d1486cef13417
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Sep 5 12:51:01 2014 +0100
convert floating RID_SVXDLG_CONTOUR to .ui
Change-Id: I184bea52b5937f940b3cfbfb60fcb325ae6ae5c3
diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc
index e457d15..715cc05 100644
--- a/svx/source/dialog/imapdlg.hrc
+++ b/svx/source/dialog/imapdlg.hrc
@@ -45,8 +45,6 @@
#define TBI_UNDO 40
#define TBI_REDO 41
-#define IL_IMAPDLG 1024
-
/******************************************************************************/
#define RID_SVXMN_IMAP (RID_SVX_IMAPDLG_START + 1)
diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src
index 69e9f5b..7687a8f 100644
--- a/svx/source/dialog/imapdlg.src
+++ b/svx/source/dialog/imapdlg.src
@@ -20,33 +20,6 @@
#include "helpid.hrc"
#include "imapdlg.hrc"
-ImageList IL_IMAPDLG
-{
- Prefix = "id";
- IdList =
- {
- TBI_APPLY ;
- TBI_OPEN ;
- TBI_SAVEAS ;
- TBI_SELECT ;
- TBI_RECT ;
- TBI_CIRCLE ;
- TBI_POLY ;
- TBI_FREEPOLY ;
- TBI_POLYEDIT ;
- TBI_POLYMOVE ;
- TBI_POLYINSERT ;
- TBI_POLYDELETE ;
- TBI_UNDO ;
- TBI_REDO ;
- TBI_ACTIVE ;
- TBI_MACRO ;
- TBI_PROPERTY ;
- };
- IdCount = { 17 ; };
-};
-
-/******************************************************************************/
Menu RID_SVXMN_IMAP
{
ItemList =
commit 7c7e1fb0f2a088ad80caaa7a45e7bc9e7df5b31f
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 21 14:57:27 2016 +0000
unwind RID_IL_FORMEXPLORER imagelist
Change-Id: I4c86aa99aecf22e842183966721976a921bafe7b
diff --git a/extensions/source/propctrlr/formresid.hrc
b/extensions/source/propctrlr/formresid.hrc
index 9f41b8f..6019632 100644
--- a/extensions/source/propctrlr/formresid.hrc
+++ b/extensions/source/propctrlr/formresid.hrc
@@ -274,10 +274,6 @@
#define RID_STR_CONFIRM_DELETE_DATA_TYPE ( RID_FORMBROWSER_START + 500 )
-// - ImageLists
-
-#define RID_IL_FORMEXPLORER ( RID_PROPCONTROLLER_START + 0 )
-
// - untyped resources
#define RID_RSC_ENUM_SCROLLBARS ( RID_PROPCONTROLLER_START + 0 )
@@ -313,41 +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 )
-
-// - ImageList - local ids
-
-// HACK HACK HACK
-// as long as we have no real property browser, but this outsourcing only,
-// we do not duplicate images. Instead we do some hard coding for the image ids
-
-#define RID_SVXIMG_CONTROL 10144
-#define RID_SVXIMG_BUTTON 10594
-#define RID_SVXIMG_RADIOBUTTON 10595
-#define RID_SVXIMG_CHECKBOX 10596
-#define RID_SVXIMG_FIXEDTEXT 10597
-#define RID_SVXIMG_GROUPBOX 10598
-#define RID_SVXIMG_EDIT 10599
-#define RID_SVXIMG_LISTBOX 10600
-#define RID_SVXIMG_COMBOBOX 10601
-#define RID_SVXIMG_GRID 10603
-#define RID_SVXIMG_IMAGEBUTTON 10604
-#define RID_SVXIMG_FILECONTROL 10605
-#define RID_SVXIMG_DATEFIELD 10704
-#define RID_SVXIMG_TIMEFIELD 10705
-#define RID_SVXIMG_NUMERICFIELD 10706
-#define RID_SVXIMG_CURRENCYFIELD 10707
-#define RID_SVXIMG_PATTERNFIELD 10708
-#define RID_SVXIMG_IMAGECONTROL 10710
-#define RID_SVXIMG_HIDDEN 18022
-#define RID_SVXIMG_FORMATTEDFIELD 10728
-#define RID_SVXIMG_FILTER 10715
-#define RID_SVXIMG_FORMS 18013
-#define RID_SVXIMG_FORM 10593
-#define RID_SVXIMG_COLLAPSEDNODE 18002
-#define RID_SVXIMG_EXPANDEDNODE 18003
-#define RID_SVXIMG_SCROLLBAR 10768
-#define RID_SVXIMG_SPINBUTTON 10769
-#define RID_SVXIMG_NAVIGATIONBAR 10607
+#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_EDIT ( 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 )
#endif
diff --git a/extensions/source/propctrlr/pcrmiscres.src
b/extensions/source/propctrlr/pcrmiscres.src
index 29bed66..a856d02 100644
--- a/extensions/source/propctrlr/pcrmiscres.src
+++ b/extensions/source/propctrlr/pcrmiscres.src
@@ -25,44 +25,144 @@ String RID_STR_CONFIRM_DELETE_DATA_TYPE
"Please note that this will affect all controls which are bound
to this data type.";
};
-#define IMAGE_IDS \
- IdList = \
- { \
- RID_SVXIMG_CONTROL; \
- RID_SVXIMG_BUTTON; \
- RID_SVXIMG_RADIOBUTTON; \
- RID_SVXIMG_CHECKBOX; \
- RID_SVXIMG_FIXEDTEXT; \
- RID_SVXIMG_GROUPBOX; \
- RID_SVXIMG_EDIT; \
- RID_SVXIMG_LISTBOX; \
- RID_SVXIMG_COMBOBOX; \
- RID_SVXIMG_GRID; \
- RID_SVXIMG_IMAGEBUTTON; \
- RID_SVXIMG_FILECONTROL; \
- RID_SVXIMG_DATEFIELD; \
- RID_SVXIMG_TIMEFIELD; \
- RID_SVXIMG_NUMERICFIELD; \
- RID_SVXIMG_CURRENCYFIELD; \
- RID_SVXIMG_PATTERNFIELD; \
- RID_SVXIMG_IMAGECONTROL; \
- RID_SVXIMG_HIDDEN; \
- RID_SVXIMG_FORMATTEDFIELD; \
- RID_SVXIMG_FILTER; \
- RID_SVXIMG_FORMS; \
- RID_SVXIMG_FORM; \
- RID_SVXIMG_COLLAPSEDNODE; \
- RID_SVXIMG_EXPANDEDNODE; \
- RID_SVXIMG_SCROLLBAR; \
- RID_SVXIMG_SPINBUTTON; \
- RID_SVXIMG_NAVIGATIONBAR; \
- }; \
- IdCount = 29
-
-ImageList RID_IL_FORMEXPLORER
-{
- Prefix = "sx";
- IMAGE_IDS;
+Bitmap RID_SVXBMP_CONTROL
+{
+ File = "sx10144.png";
+};
+
+Bitmap RID_SVXBMP_BUTTON
+{
+ File = "sx10594.png";
+};
+
+Bitmap RID_SVXBMP_RADIOBUTTON
+{
+ File = "sx10595.png";
+};
+
+Bitmap RID_SVXBMP_CHECKBOX
+{
+ File = "sx10596.png";
+};
+
+Bitmap RID_SVXBMP_FIXEDTEXT
+{
+ File = "sx10597.png";
+};
+
+Bitmap RID_SVXBMP_GROUPBOX
+{
+ File = "sx10598.png";
+};
+
+Bitmap RID_SVXBMP_EDIT
+{
+ File = "sx10599.png";
+};
+
+Bitmap RID_SVXBMP_LISTBOX
+{
+ File = "sx10600.png";
+};
+
+Bitmap RID_SVXBMP_COMBOBOX
+{
+ File = "sx10601.png";
+};
+
+Bitmap RID_SVXBMP_GRID
+{
+ File = "sx10603.png";
+};
+
+Bitmap RID_SVXBMP_IMAGEBUTTON
+{
+ File = "sx10604.png";
+};
+
+Bitmap RID_SVXBMP_FILECONTROL
+{
+ File = "sx10605.png";
+};
+
+Bitmap RID_SVXBMP_DATEFIELD
+{
+ File = "sx10704.png";
+};
+
+Bitmap RID_SVXBMP_TIMEFIELD
+{
+ File = "sx10705.png";
+};
+
+Bitmap RID_SVXBMP_NUMERICFIELD
+{
+ File = "sx10706.png";
+};
+
+Bitmap RID_SVXBMP_CURRENCYFIELD
+{
+ File = "sx10707.png";
+};
+
+Bitmap RID_SVXBMP_PATTERNFIELD
+{
+ File = "sx10708.png";
+};
+
+Bitmap RID_SVXBMP_IMAGECONTROL
+{
+ File = "sx10710.png";
+};
+
+Bitmap RID_SVXBMP_HIDDEN
+{
+ File = "sx18022.png";
+};
+
+Bitmap RID_SVXBMP_FORMATTEDFIELD
+{
+ File = "sx10728.png";
+};
+
+Bitmap RID_SVXBMP_FILTER
+{
+ File = "sx10715.png";
+};
+
+Bitmap RID_SVXBMP_FORMS
+{
+ File = "sx18013.png";
+};
+
+Bitmap RID_SVXBMP_FORM
+{
+ File = "sx10593.png";
+};
+
+Bitmap RID_SVXBMP_COLLAPSEDNODE
+{
+ File = "sx18002.png";
+};
+
+Bitmap RID_SVXBMP_EXPANDEDNODE
+{
+ File = "sx18003.png";
+};
+
+Bitmap RID_SVXBMP_SCROLLBAR
+{
+ File = "sx10768.png";
+};
+
+Bitmap RID_SVXBMP_SPINBUTTON
+{
+ File = "sx10769.png";
+};
+
+Bitmap RID_SVXBMP_NAVIGATIONBAR
+{
+ File = "sx10607.png";
};
String RID_STR_PROPTITLE_PUSHBUTTON
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx
b/extensions/source/propctrlr/selectlabeldialog.cxx
index 2310a7d..5cf7a447 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -49,7 +49,6 @@ namespace pcr
OSelectLabelDialog::OSelectLabelDialog( vcl::Window* pParent, Reference<
XPropertySet > const & _xControlModel )
:ModalDialog(pParent, "LabelSelectionDialog",
"modules/spropctrlr/ui/labelselectiondialog.ui")
- ,m_aModelImages(PcrRes(RID_IL_FORMEXPLORER))
,m_xControlModel(_xControlModel)
,m_pInitialSelection(nullptr)
,m_pLastSelected(nullptr)
@@ -65,7 +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( m_aModelImages.GetImage(
RID_SVXIMG_COLLAPSEDNODE ), m_aModelImages.GetImage( RID_SVXIMG_EXPANDEDNODE )
);
+
m_pControlTree->SetNodeBitmaps(Image(BitmapEx(PcrRes(RID_SVXBMP_COLLAPSEDNODE))),
+
Image(BitmapEx(PcrRes(RID_SVXBMP_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 =
m_aModelImages.GetImage((FormComponentType::RADIOBUTTON == nClassId) ?
RID_SVXIMG_GROUPBOX : RID_SVXIMG_FIXEDTEXT);
+ m_aRequiredControlImage =
Image(BitmapEx(PcrRes(FormComponentType::RADIOBUTTON == nClassId ?
RID_SVXBMP_GROUPBOX : RID_SVXBMP_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 = m_aModelImages.GetImage(RID_SVXIMG_FORMS);
+ Image aRootImage(BitmapEx(PcrRes(RID_SVXBMP_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 = m_aModelImages.GetImage(
RID_SVXIMG_FORM );
+ Image aFormImage(BitmapEx(PcrRes(RID_SVXBMP_FORM)));
SvTreeListEntry* pCont =
m_pControlTree->InsertEntry(sName, aFormImage, aFormImage, pContainerEntry);
sal_Int32 nContChildren = InsertEntries(xCont, pCont);
if (nContChildren)
diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx
b/extensions/source/propctrlr/selectlabeldialog.hxx
index b16c19b..626a40c 100644
--- a/extensions/source/propctrlr/selectlabeldialog.hxx
+++ b/extensions/source/propctrlr/selectlabeldialog.hxx
@@ -43,7 +43,6 @@ namespace pcr
VclPtr<SvTreeListBox> m_pControlTree;
VclPtr<CheckBox> m_pNoAssignment;
- ImageList m_aModelImages;
css::uno::Reference< css::beans::XPropertySet > m_xControlModel;
OUString m_sRequiredService;
Image m_aRequiredControlImage;
diff --git a/extensions/source/propctrlr/taborder.cxx
b/extensions/source/propctrlr/taborder.cxx
index 09f3a68..bb33c49 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -74,7 +74,6 @@ namespace pcr
,m_xModel( _rxTabModel )
,m_xControlContainer( _rxControlCont )
,m_xORB( _rxORB )
- ,pImageList( nullptr )
{
get(m_pLB_Controls, "CTRLtree");
get(m_pPB_OK, "ok");
@@ -89,8 +88,6 @@ namespace pcr
m_pPB_OK->SetClickHdl( LINK( this, TabOrderDialog, OKClickHdl ) );
m_pPB_OK->Disable();
- pImageList = new ImageList( PcrRes( RID_IL_FORMEXPLORER ) );
-
if ( m_xModel.is() )
m_xTempModel = new OSimpleTabModel( m_xModel->getControlModels() );
@@ -121,8 +118,6 @@ namespace pcr
void TabOrderDialog::dispose()
{
m_pLB_Controls->Hide();
- // delete pLB_Controls;
- delete pImageList;
m_pLB_Controls.clear();
m_pPB_OK.clear();
m_pPB_MoveUp.clear();
@@ -131,45 +126,43 @@ namespace pcr
ModalDialog::dispose();
}
-
Image TabOrderDialog::GetImage( const Reference< XPropertySet >& _rxSet )
const
{
- sal_uInt16 nImageId = RID_SVXIMG_CONTROL;
+ sal_uInt16 nImageId = RID_SVXBMP_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_SVXIMG_BUTTON; break;
- case FormComponentType::FIXEDTEXT: nImageId =
RID_SVXIMG_FIXEDTEXT; break;
- case FormComponentType::TEXTFIELD: nImageId =
RID_SVXIMG_EDIT; break;
- case FormComponentType::RADIOBUTTON: nImageId =
RID_SVXIMG_RADIOBUTTON; break;
- case FormComponentType::CHECKBOX: nImageId =
RID_SVXIMG_CHECKBOX; break;
- case FormComponentType::LISTBOX: nImageId =
RID_SVXIMG_LISTBOX; break;
- case FormComponentType::COMBOBOX: nImageId =
RID_SVXIMG_COMBOBOX; break;
- case FormComponentType::GROUPBOX: nImageId =
RID_SVXIMG_GROUPBOX; break;
- case FormComponentType::IMAGEBUTTON: nImageId =
RID_SVXIMG_IMAGEBUTTON; break;
- case FormComponentType::FILECONTROL: nImageId =
RID_SVXIMG_FILECONTROL; break;
- case FormComponentType::HIDDENCONTROL: nImageId =
RID_SVXIMG_HIDDEN; break;
- case FormComponentType::DATEFIELD: nImageId =
RID_SVXIMG_DATEFIELD; break;
- case FormComponentType::TIMEFIELD: nImageId =
RID_SVXIMG_TIMEFIELD; break;
- case FormComponentType::NUMERICFIELD: nImageId =
RID_SVXIMG_NUMERICFIELD; break;
- case FormComponentType::CURRENCYFIELD: nImageId =
RID_SVXIMG_CURRENCYFIELD; break;
- case FormComponentType::PATTERNFIELD: nImageId =
RID_SVXIMG_PATTERNFIELD; break;
- case FormComponentType::IMAGECONTROL: nImageId =
RID_SVXIMG_IMAGECONTROL; break;
- case FormComponentType::GRIDCONTROL: nImageId =
RID_SVXIMG_GRID; break;
- case FormComponentType::SCROLLBAR: nImageId =
RID_SVXIMG_SCROLLBAR; break;
- case FormComponentType::SPINBUTTON: nImageId =
RID_SVXIMG_SPINBUTTON; break;
- case FormComponentType::NAVIGATIONBAR: nImageId =
RID_SVXIMG_NAVIGATIONBAR; break;
+ case FormComponentType::COMMANDBUTTON: nImageId =
RID_SVXBMP_BUTTON; break;
+ case FormComponentType::FIXEDTEXT: nImageId =
RID_SVXBMP_FIXEDTEXT; break;
+ case FormComponentType::TEXTFIELD: nImageId =
RID_SVXBMP_EDIT; 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;
default:
OSL_FAIL( "TabOrderDialog::GetImage: unknown control type" );
}
}
- return pImageList->GetImage( nImageId );
+ return Image(BitmapEx(PcrRes(nImageId)));;
}
-
void TabOrderDialog::FillList()
{
DBG_ASSERT( m_xTempModel.is() && m_xControlContainer.is(),
"TabOrderDialog::FillList: invalid call!" );
diff --git a/extensions/source/propctrlr/taborder.hxx
b/extensions/source/propctrlr/taborder.hxx
index 6569086..130ea42 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -76,8 +76,6 @@ namespace pcr
VclPtr<PushButton> m_pPB_MoveDown;
VclPtr<PushButton> m_pPB_AutoOrder;
- ImageList* pImageList;
-
DECL_LINK( MoveUpClickHdl, Button*, void );
DECL_LINK( MoveDownClickHdl, Button*, void );
DECL_LINK( AutoOrderClickHdl, Button*, void );
commit 5a610d1f15f494135f093f1d7644d58f189be9ad
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 21 14:25:30 2016 +0000
quieten the clang fallthrough warnings
Change-Id: I73f068971a6908153d887e34425076e6194c657d
diff --git a/unoidl/source/sourceprovider-parser.y
b/unoidl/source/sourceprovider-parser.y
index 332df89..518f1c5 100644
--- a/unoidl/source/sourceprovider-parser.y
+++ b/unoidl/source/sourceprovider-parser.y
@@ -334,7 +334,7 @@ Found findEntity(
break;
}
assert(e->entity.is());
- // fall through
+ SAL_FALLTHROUGH;
case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL:
if (e->entity->getSort() == unoidl::Entity::SORT_TYPEDEF) {
if (typedefed != nullptr) {
@@ -449,7 +449,7 @@ Found findEntity(
return FOUND_ERROR;
}
assert(e->entity.is());
- // fall through
+ SAL_FALLTHROUGH;
case
unoidl::detail::SourceProviderEntity::KIND_EXTERNAL:
switch (e->entity->getSort()) {
case
unoidl::Entity::SORT_ENUM_TYPE:
@@ -679,7 +679,7 @@ Found findEntity(
break;
}
assert(e->entity.is());
- // fall through
+ SAL_FALLTHROUGH;
case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL:
switch (e->entity->getSort()) {
case unoidl::Entity::SORT_ENUM_TYPE:
@@ -745,7 +745,7 @@ Found findEntity(
return FOUND_ERROR;
}
assert(e->entity.is());
- // fall through
+ SAL_FALLTHROUGH;
case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL:
if (e->entity->getSort()
==
unoidl::Entity::SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE)
@@ -776,7 +776,7 @@ Found findEntity(
t = unoidl::detail::SourceProviderType(n, e, args);
break;
}
- // fall through
+ SAL_FALLTHROUGH;
case unoidl::detail::SourceProviderEntity::KIND_INTERFACE_DECL:
case
unoidl::detail::SourceProviderEntity::KIND_PUBLISHED_INTERFACE_DECL:
error(
@@ -3806,7 +3806,7 @@ type:
break;
}
assert(ent->entity.is());
- // fall through
+ SAL_FALLTHROUGH;
case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL:
if (data->publishedContext
&& ent->entity->getSort() != unoidl::Entity::SORT_MODULE
@@ -3853,7 +3853,7 @@ type:
break;
case unoidl::Entity::SORT_TYPEDEF:
assert(false && "this cannot happen");
- // fall through
+ SAL_FALLTHROUGH;
default:
break;
}
@@ -3866,7 +3866,7 @@ type:
+ " used in published context"));
YYERROR;
}
- // fall through
+ SAL_FALLTHROUGH;
case
unoidl::detail::SourceProviderEntity::KIND_PUBLISHED_INTERFACE_DECL:
$$ = new unoidl::detail::SourceProviderType(
unoidl::detail::SourceProviderType::TYPE_INTERFACE, name,
@@ -3918,7 +3918,7 @@ type:
break;
}
assert(ent->entity.is());
- // fall through
+ SAL_FALLTHROUGH;
case unoidl::detail::SourceProviderEntity::KIND_EXTERNAL:
if (ent->entity->getSort()
== unoidl::Entity::SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE)
@@ -4445,7 +4445,7 @@ bool parse(OUString const & uri,
SourceProviderScannerData * data) {
break;
default:
assert(false);
- // fall through
+ SAL_FALLTHROUGH;
case 1:
throw FileFormatException(
uri,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
