mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b*, c*: load BitmapEx resources instead of Image ones

Browse Source 
Change-Id: Idbf99de17e5349712ef7c3da3ce8bb8b5f879ef7
This commit is contained in:
Caolán McNamara 2017-01-16 09:33:26 +00:00
parent 6d2693853e
commit 74b92741b8
27 changed files with 317 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
basctl/inc/basidesh.hrc
View File

@ -27,17 +27,17 @@
#define RID_POPUP_BRKPROPS ( RID_BASICIDE_START + 11 ) #define RID_POPUP_BRKPROPS ( RID_BASICIDE_START + 11 )
#define RID_POPUP_TABBAR ( RID_BASICIDE_START + 12 ) #define RID_POPUP_TABBAR ( RID_BASICIDE_START + 12 )
#define RID_IMG_REMOVEWATCH ( RID_BASICIDE_START + 8 ) #define RID_BMP_REMOVEWATCH ( RID_BASICIDE_START + 8 )
#define RID_IMG_INSTALLATION ( RID_BASICIDE_START + 20 ) #define RID_BMP_INSTALLATION ( RID_BASICIDE_START + 20 )
#define RID_IMG_DOCUMENT ( RID_BASICIDE_START + 22 ) #define RID_BMP_DOCUMENT ( RID_BASICIDE_START + 22 )
#define RID_IMG_MODLIB ( RID_BASICIDE_START + 24 ) #define RID_BMP_MODLIB ( RID_BASICIDE_START + 24 )
#define RID_IMG_MODLIBNOTLOADED ( RID_BASICIDE_START + 26 ) #define RID_BMP_MODLIBNOTLOADED ( RID_BASICIDE_START + 26 )
#define RID_IMG_MODULE ( RID_BASICIDE_START + 28 ) #define RID_BMP_MODULE ( RID_BASICIDE_START + 28 )
#define RID_IMG_MACRO ( RID_BASICIDE_START + 30 ) #define RID_BMP_MACRO ( RID_BASICIDE_START + 30 )
#define RID_IMG_DLGLIB ( RID_BASICIDE_START + 32 ) #define RID_BMP_DLGLIB ( RID_BASICIDE_START + 32 )
#define RID_IMG_DLGLIBNOTLOADED ( RID_BASICIDE_START + 34 ) #define RID_BMP_DLGLIBNOTLOADED ( RID_BASICIDE_START + 34 )
#define RID_IMG_DIALOG ( RID_BASICIDE_START + 36 ) #define RID_BMP_DIALOG ( RID_BASICIDE_START + 36 )
#define RID_IMG_LOCKED ( RID_BASICIDE_START + 41 ) #define RID_BMP_LOCKED ( RID_BASICIDE_START + 41 )
#define RID_STR_SEARCHALLMODULES ( RID_BASICIDE_START + 1 ) #define RID_STR_SEARCHALLMODULES ( RID_BASICIDE_START + 1 )
#define RID_STR_SEARCHFROMSTART ( RID_BASICIDE_START + 2 ) #define RID_STR_SEARCHFROMSTART ( RID_BASICIDE_START + 2 )

2
basctl/source/basicide/baside2b.cxx
View File

@ -1566,7 +1566,7 @@ WatchWindow::WatchWindow (Layout* pParent)
aRemoveWatchButton->SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) ); aRemoveWatchButton->SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
aRemoveWatchButton->SetPosPixel( Point( nTextLen + aXEdit->GetSizePixel().Width() + 4, 2 ) ); aRemoveWatchButton->SetPosPixel( Point( nTextLen + aXEdit->GetSizePixel().Width() + 4, 2 ) );
aRemoveWatchButton->SetHelpId(HID_BASICIDE_REMOVEWATCH); aRemoveWatchButton->SetHelpId(HID_BASICIDE_REMOVEWATCH);
aRemoveWatchButton->SetModeImage(Image(IDEResId(RID_IMG_REMOVEWATCH))); aRemoveWatchButton->SetModeImage(Image(BitmapEx(IDEResId(RID_BMP_REMOVEWATCH))));
aRemoveWatchButton->SetQuickHelpText(IDEResId(RID_STR_REMOVEWATCHTIP)); aRemoveWatchButton->SetQuickHelpText(IDEResId(RID_STR_REMOVEWATCHTIP));
Size aSz( aRemoveWatchButton->GetModeImage().GetSizePixel() ); Size aSz( aRemoveWatchButton->GetModeImage().GetSizePixel() );
aSz.Width() += 6; aSz.Width() += 6;

53
basctl/source/basicide/basidesh.src
View File

@ -442,50 +442,59 @@ Bitmap RID_BMP_ERRORMARKER
File = "im30841.png"; File = "im30841.png";
}; };
Image RID_IMG_LOCKED Bitmap RID_BMP_LOCKED
{ {
ImageBitmap = Bitmap { File = "lock.png" ; }; File = "lock.png";
}; };
Image RID_IMG_INSTALLATION Bitmap RID_BMP_INSTALLATION
{ {
ImageBitmap = Bitmap { File = "harddisk_16.png"; }; File = "harddisk_16.png";
}; };
Image RID_IMG_DOCUMENT
Bitmap RID_BMP_DOCUMENT
{ {
ImageBitmap = Bitmap { File = "im30826.png"; }; File = "im30826.png";
}; };
Image RID_IMG_MODLIB
Bitmap RID_BMP_MODLIB
{ {
ImageBitmap = Bitmap { File = "im30820.png"; }; File = "im30820.png";
}; };
Image RID_IMG_MODLIBNOTLOADED
Bitmap RID_BMP_MODLIBNOTLOADED
{ {
ImageBitmap = Bitmap { File = "im30827.png"; }; File = "im30827.png";
}; };
Image RID_IMG_MODULE
Bitmap RID_BMP_MODULE
{ {
ImageBitmap = Bitmap { File = "im30821.png"; }; File = "im30821.png";
}; };
Image RID_IMG_MACRO
Bitmap RID_BMP_MACRO
{ {
ImageBitmap = Bitmap { File = "im30822.png"; }; File = "im30822.png";
}; };
Image RID_IMG_DLGLIB
Bitmap RID_BMP_DLGLIB
{ {
ImageBitmap = Bitmap { File = "dialogfolder_16.png"; }; File = "dialogfolder_16.png";
}; };
Image RID_IMG_DLGLIBNOTLOADED
Bitmap RID_BMP_DLGLIBNOTLOADED
{ {
ImageBitmap = Bitmap { File = "dialogfoldernot_16.png"; }; File = "dialogfoldernot_16.png";
}; };
Image RID_IMG_DIALOG
Bitmap RID_BMP_DIALOG
{ {
ImageBitmap = Bitmap { File = "im30823.png"; }; File = "im30823.png";
}; };
Image RID_IMG_REMOVEWATCH
Bitmap RID_BMP_REMOVEWATCH
{ {
ImageBitmap = Bitmap { File = "baswatr.png" ; }; File = "baswatr.png";
}; };
String RID_STR_REMOVEWATCHTIP String RID_STR_REMOVEWATCHTIP

26
basctl/source/basicide/bastype2.cxx
View File

@ -257,14 +257,14 @@ void TreeListBox::ImpCreateLibEntries( SvTreeListEntry* pDocumentRootEntry, cons
// create tree list box entry // create tree list box entry
sal_uInt16 nId; sal_uInt16 nId;
if ( ( nMode & BROWSEMODE_DIALOGS ) && !( nMode & BROWSEMODE_MODULES ) ) if ( ( nMode & BROWSEMODE_DIALOGS ) && !( nMode & BROWSEMODE_MODULES ) )
nId = bLoaded ? RID_IMG_DLGLIB : RID_IMG_DLGLIBNOTLOADED; nId = bLoaded ? RID_BMP_DLGLIB : RID_BMP_DLGLIBNOTLOADED;
else else
nId = bLoaded ? RID_IMG_MODLIB : RID_IMG_MODLIBNOTLOADED; nId = bLoaded ? RID_BMP_MODLIB : RID_BMP_MODLIBNOTLOADED;
SvTreeListEntry* pLibRootEntry = FindEntry( pDocumentRootEntry, aLibName, OBJ_TYPE_LIBRARY ); SvTreeListEntry* pLibRootEntry = FindEntry( pDocumentRootEntry, aLibName, OBJ_TYPE_LIBRARY );
if ( pLibRootEntry ) if ( pLibRootEntry )
{ {
SetEntryBitmaps( pLibRootEntry, Image( IDEResId( nId ) ) ); SetEntryBitmaps(pLibRootEntry, Image(BitmapEx(IDEResId(nId))));
if ( IsExpanded( pLibRootEntry ) ) if ( IsExpanded(pLibRootEntry))
ImpCreateLibSubEntries( pLibRootEntry, rDocument, aLibName ); ImpCreateLibSubEntries( pLibRootEntry, rDocument, aLibName );
} }
else else
@ -307,7 +307,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const
{ {
pModuleEntry = AddEntry( pModuleEntry = AddEntry(
aModName, aModName,
Image( IDEResId( RID_IMG_MODULE ) ), Image(BitmapEx(IDEResId(RID_BMP_MODULE))),
pLibRootEntry, false, pLibRootEntry, false,
o3tl::make_unique<Entry>(OBJ_TYPE_MODULE)); o3tl::make_unique<Entry>(OBJ_TYPE_MODULE));
} }
@ -327,7 +327,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const
{ {
AddEntry( AddEntry(
aName, aName,
Image( IDEResId( RID_IMG_MACRO ) ), Image(BitmapEx(IDEResId(RID_BMP_MACRO))),
pModuleEntry, false, pModuleEntry, false,
o3tl::make_unique<Entry>( o3tl::make_unique<Entry>(
OBJ_TYPE_METHOD)); OBJ_TYPE_METHOD));
@ -366,7 +366,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const
{ {
AddEntry( AddEntry(
aDlgName, aDlgName,
Image( IDEResId( RID_IMG_DIALOG ) ), Image(BitmapEx(IDEResId(RID_BMP_DIALOG))),
pLibRootEntry, false, pLibRootEntry, false,
o3tl::make_unique<Entry>(OBJ_TYPE_DIALOG)); o3tl::make_unique<Entry>(OBJ_TYPE_DIALOG));
} }
@ -394,7 +394,7 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* pLibRootEntr
SvTreeListEntry* pLibSubRootEntry = FindEntry( pLibRootEntry, aEntryName, eType ); SvTreeListEntry* pLibSubRootEntry = FindEntry( pLibRootEntry, aEntryName, eType );
if( pLibSubRootEntry ) if( pLibSubRootEntry )
{ {
SetEntryBitmaps( pLibSubRootEntry, Image( IDEResId( RID_IMG_MODLIB ) ) ); SetEntryBitmaps(pLibSubRootEntry, Image(BitmapEx(IDEResId(RID_BMP_MODLIB))));
if ( IsExpanded( pLibSubRootEntry ) ) if ( IsExpanded( pLibSubRootEntry ) )
ImpCreateLibSubSubEntriesInVBAMode( pLibSubRootEntry, rDocument, rLibName ); ImpCreateLibSubSubEntriesInVBAMode( pLibSubRootEntry, rDocument, rLibName );
} }
@ -402,7 +402,7 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* pLibRootEntr
{ {
AddEntry( AddEntry(
aEntryName, aEntryName,
Image( IDEResId( RID_IMG_MODLIB ) ), Image(BitmapEx(IDEResId(RID_BMP_MODLIB))),
pLibRootEntry, true, o3tl::make_unique<Entry>(eType)); pLibRootEntry, true, o3tl::make_unique<Entry>(eType));
} }
} }
@ -463,7 +463,7 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvTreeListEntry* pLibSubRo
{ {
pModuleEntry = AddEntry( pModuleEntry = AddEntry(
aEntryName, aEntryName,
Image( IDEResId( RID_IMG_MODULE ) ), Image(BitmapEx(IDEResId(RID_BMP_MODULE))),
pLibSubRootEntry, false, pLibSubRootEntry, false,
o3tl::make_unique<Entry>(OBJ_TYPE_MODULE)); o3tl::make_unique<Entry>(OBJ_TYPE_MODULE));
} }
@ -483,7 +483,7 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvTreeListEntry* pLibSubRo
{ {
AddEntry( AddEntry(
aName, aName,
Image( IDEResId( RID_IMG_MACRO ) ), Image(BitmapEx(IDEResId(RID_BMP_MACRO))),
pModuleEntry, false, pModuleEntry, false,
o3tl::make_unique<Entry>(OBJ_TYPE_METHOD)); o3tl::make_unique<Entry>(OBJ_TYPE_METHOD));
} }
@ -771,12 +771,12 @@ void TreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& r
else else
{ {
// default icon // default icon
rImage = Image( IDEResId( RID_IMG_DOCUMENT ) ); rImage = Image(BitmapEx(IDEResId(RID_BMP_DOCUMENT)));
} }
} }
else else
{ {
rImage = Image( IDEResId( RID_IMG_INSTALLATION ) ); rImage = Image(BitmapEx(IDEResId(RID_BMP_INSTALLATION)));
} }
} }

4
basctl/source/basicide/bastype3.cxx
View File

@ -105,8 +105,8 @@ void TreeListBox::RequestingChildren( SvTreeListEntry* pEntry )
ImpCreateLibSubEntries( pEntry, aDocument, aOULibName ); ImpCreateLibSubEntries( pEntry, aDocument, aOULibName );
// exchange image // exchange image
bool bDlgMode = ( nMode & BROWSEMODE_DIALOGS ) && !( nMode & BROWSEMODE_MODULES ); const bool bDlgMode = (nMode & BROWSEMODE_DIALOGS) && !(nMode & BROWSEMODE_MODULES);
Image aImage( IDEResId( bDlgMode ? RID_IMG_DLGLIB : RID_IMG_MODLIB ) ); Image aImage(BitmapEx(IDEResId(bDlgMode ? RID_BMP_DLGLIB : RID_BMP_MODLIB)));
SetEntryBitmaps( pEntry, aImage ); SetEntryBitmaps( pEntry, aImage );
} }
else else

8
basctl/source/basicide/moduldl2.cxx
View File

@ -1442,7 +1442,7 @@ SvTreeListEntry* LibPage::ImpInsertLibEntry( const OUString& rLibName, sal_uLong
if (bProtected) if (bProtected)
{ {
Image aImage(IDEResId(RID_IMG_LOCKED)); Image aImage(BitmapEx(IDEResId(RID_BMP_LOCKED)));
m_pLibBox->SetExpandedEntryBmp(pNewEntry, aImage); m_pLibBox->SetExpandedEntryBmp(pNewEntry, aImage);
m_pLibBox->SetCollapsedEntryBmp(pNewEntry, aImage); m_pLibBox->SetCollapsedEntryBmp(pNewEntry, aImage);
} }
@ -1535,10 +1535,10 @@ void createLibImpl( vcl::Window* pWin, const ScriptDocument& rDocument,
sal_uInt16 nMode = pBasicBox->GetMode(); sal_uInt16 nMode = pBasicBox->GetMode();
bool bDlgMode = ( nMode & BROWSEMODE_DIALOGS ) && !( nMode & BROWSEMODE_MODULES ); bool bDlgMode = ( nMode & BROWSEMODE_DIALOGS ) && !( nMode & BROWSEMODE_MODULES );
sal_uInt16 nId = bDlgMode ? RID_IMG_DLGLIB : RID_IMG_MODLIB; const sal_uInt16 nId = bDlgMode ? RID_BMP_DLGLIB : RID_BMP_MODLIB;
SvTreeListEntry* pNewLibEntry = pBasicBox->AddEntry( SvTreeListEntry* pNewLibEntry = pBasicBox->AddEntry(
aLibName, aLibName,
Image( IDEResId( nId ) ), Image(BitmapEx(IDEResId(nId))),
pRootEntry, false, pRootEntry, false,
o3tl::make_unique<Entry>(OBJ_TYPE_LIBRARY)); o3tl::make_unique<Entry>(OBJ_TYPE_LIBRARY));
DBG_ASSERT( pNewLibEntry, "InsertEntry fehlgeschlagen!" ); DBG_ASSERT( pNewLibEntry, "InsertEntry fehlgeschlagen!" );
@ -1547,7 +1547,7 @@ void createLibImpl( vcl::Window* pWin, const ScriptDocument& rDocument,
{ {
SvTreeListEntry* pEntry_ = pBasicBox->AddEntry( SvTreeListEntry* pEntry_ = pBasicBox->AddEntry(
aModName, aModName,
Image( IDEResId( RID_IMG_MODULE ) ), Image(BitmapEx(IDEResId(RID_BMP_MODULE))),
pNewLibEntry, false, pNewLibEntry, false,
o3tl::make_unique<Entry>(OBJ_TYPE_MODULE)); o3tl::make_unique<Entry>(OBJ_TYPE_MODULE));
DBG_ASSERT( pEntry_, "InsertEntry fehlgeschlagen!" ); DBG_ASSERT( pEntry_, "InsertEntry fehlgeschlagen!" );

4
basctl/source/basicide/moduldlg.cxx
View File

@ -847,7 +847,7 @@ void ObjectPage::NewDialog()
{ {
pEntry = m_pBasicBox->AddEntry( pEntry = m_pBasicBox->AddEntry(
aDlgName, aDlgName,
Image( IDEResId( RID_IMG_DIALOG ) ), Image(BitmapEx(IDEResId(RID_BMP_DIALOG))),
pLibEntry, false, pLibEntry, false,
o3tl::make_unique<Entry>(OBJ_TYPE_DIALOG)); o3tl::make_unique<Entry>(OBJ_TYPE_DIALOG));
DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" ); DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" );
@ -1018,7 +1018,7 @@ SbModule* createModImpl( vcl::Window* pWin, const ScriptDocument& rDocument,
{ {
pEntry = rBasicBox.AddEntry( pEntry = rBasicBox.AddEntry(
aModName, aModName,
Image( IDEResId( RID_IMG_MODULE ) ), Image(BitmapEx(IDEResId(RID_BMP_MODULE))),
pSubRootEntry, false, pSubRootEntry, false,
o3tl::make_unique<Entry>(OBJ_TYPE_MODULE)); o3tl::make_unique<Entry>(OBJ_TYPE_MODULE));
DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" ); DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" );

55
chart2/source/controller/dialogs/Bitmaps.hrc
View File

@ -21,25 +21,6 @@
#include <svl/solar.hrc> #include <svl/solar.hrc>
// chart types
// Images:
#define IMG_TYPE_COLUMN (RID_APP_START + 1)
#define IMG_TYPE_BAR (RID_APP_START + 2)
#define IMG_TYPE_PIE (RID_APP_START + 3)
#define IMG_TYPE_AREA (RID_APP_START + 4)
#define IMG_TYPE_LINE (RID_APP_START + 5)
#define IMG_TYPE_XY (RID_APP_START + 6)
#define IMG_TYPE_BUBBLE (RID_APP_START + 7)
#define IMG_TYPE_NET (RID_APP_START + 8)
#define IMG_TYPE_STOCK (RID_APP_START + 9)
#define IMG_TYPE_COLUMN_LINE (RID_APP_START + 10)
#define IMG_TYPE_GL3D_BAR (RID_APP_START + 11)
#define IMG_STEP_START (RID_APP_START + 12)
#define IMG_STEP_END (RID_APP_START + 13)
#define IMG_STEP_CENTER_X (RID_APP_START + 14)
#define IMG_STEP_CENTER_Y (RID_APP_START + 15)
//Chart Subtypes //Chart Subtypes
// Bitmaps: // Bitmaps:
@ -188,14 +169,6 @@
//further Images: //further Images:
//SchStatisticTabPage and SchDataStatisticsDlg part 1
#define BMP_INDICATE_BOTH_VERTI (RID_APP_START + 89)
#define BMP_INDICATE_UP (RID_APP_START + 90)
#define BMP_INDICATE_DOWN (RID_APP_START + 91)
#define BMP_INDICATE_BOTH_HORI (RID_APP_START + 97)
#define BMP_INDICATE_RIGHT (RID_APP_START + 98)
#define BMP_INDICATE_LEFT (RID_APP_START + 99)
//SchStatisticTabPage and SchDataStatisticsDlg part 2 //SchStatisticTabPage and SchDataStatisticsDlg part 2
#define BMP_REGRESSION_NONE (RID_APP_START + 92) #define BMP_REGRESSION_NONE (RID_APP_START + 92)
#define BMP_REGRESSION_LINEAR (RID_APP_START + 93) #define BMP_REGRESSION_LINEAR (RID_APP_START + 93)
@ -205,6 +178,34 @@
#define BMP_REGRESSION_POLYNOMIAL (RID_APP_START + 110) #define BMP_REGRESSION_POLYNOMIAL (RID_APP_START + 110)
#define BMP_REGRESSION_MOVING_AVERAGE (RID_APP_START + 111) #define BMP_REGRESSION_MOVING_AVERAGE (RID_APP_START + 111)
// chart types
// Images:
#define BMP_TYPE_COLUMN (RID_APP_START + 112)
#define BMP_TYPE_BAR (RID_APP_START + 113)
#define BMP_TYPE_PIE (RID_APP_START + 114)
#define BMP_TYPE_AREA (RID_APP_START + 115)
#define BMP_TYPE_LINE (RID_APP_START + 116)
#define BMP_TYPE_XY (RID_APP_START + 117)
#define BMP_TYPE_BUBBLE (RID_APP_START + 118)
#define BMP_TYPE_NET (RID_APP_START + 119)
#define BMP_TYPE_STOCK (RID_APP_START + 120)
#define BMP_TYPE_COLUMN_LINE (RID_APP_START + 131)
#define BMP_TYPE_GL3D_BAR (RID_APP_START + 132)
#define BMP_STEP_START (RID_APP_START + 133)
#define BMP_STEP_END (RID_APP_START + 134)
#define BMP_STEP_CENTER_X (RID_APP_START + 135)
#define BMP_STEP_CENTER_Y (RID_APP_START + 136)
//SchStatisticTabPage and SchDataStatisticsDlg part 1
#define BMP_INDICATE_BOTH_VERTI (RID_APP_START + 137)
#define BMP_INDICATE_UP (RID_APP_START + 138)
#define BMP_INDICATE_DOWN (RID_APP_START + 139)
#define BMP_INDICATE_BOTH_HORI (RID_APP_START + 140)
#define BMP_INDICATE_RIGHT (RID_APP_START + 141)
#define BMP_INDICATE_LEFT (RID_APP_START + 142)
// CHART_BITMAPS_HRC // CHART_BITMAPS_HRC
#endif #endif

178
chart2/source/controller/dialogs/Bitmaps.src
View File

@ -18,66 +18,81 @@
*/ */
#include "Bitmaps.hrc" #include "Bitmaps.hrc"
Image IMG_TYPE_COLUMN Bitmap BMP_TYPE_COLUMN
{ {
ImageBitmap = Bitmap { File = "typecolumn_16.png" ; }; File = "typecolumn_16.png";
}; };
Image IMG_TYPE_BAR
Bitmap BMP_TYPE_BAR
{ {
ImageBitmap = Bitmap { File = "typebar_16.png" ; }; File = "typebar_16.png";
}; };
Image IMG_TYPE_PIE
Bitmap BMP_TYPE_PIE
{ {
ImageBitmap = Bitmap { File = "typepie_16.png" ; }; File = "typepie_16.png";
}; };
Image IMG_TYPE_LINE
Bitmap BMP_TYPE_LINE
{ {
ImageBitmap = Bitmap { File = "typepointline_16.png" ; }; File = "typepointline_16.png";
}; };
Image IMG_TYPE_XY
Bitmap BMP_TYPE_XY
{ {
ImageBitmap = Bitmap { File = "typexy_16.png" ; }; File = "typexy_16.png";
}; };
Image IMG_TYPE_AREA
Bitmap BMP_TYPE_AREA
{ {
ImageBitmap = Bitmap { File = "typearea_16.png" ; }; File = "typearea_16.png";
}; };
Image IMG_TYPE_NET
Bitmap BMP_TYPE_NET
{ {
ImageBitmap = Bitmap { File = "typenet_16.png" ; }; File = "typenet_16.png";
}; };
Image IMG_TYPE_STOCK
Bitmap BMP_TYPE_STOCK
{ {
ImageBitmap = Bitmap { File = "typestock_16.png" ; }; File = "typestock_16.png";
}; };
Image IMG_TYPE_COLUMN_LINE
Bitmap BMP_TYPE_COLUMN_LINE
{ {
ImageBitmap = Bitmap { File = "typecolumnline_16.png" ; }; File = "typecolumnline_16.png";
}; };
Image IMG_TYPE_BUBBLE
Bitmap BMP_TYPE_BUBBLE
{ {
ImageBitmap = Bitmap { File = "typebubble_16.png" ; }; File = "typebubble_16.png";
}; };
Image IMG_TYPE_GL3D_BAR
Bitmap BMP_TYPE_GL3D_BAR
{ {
ImageBitmap = Bitmap { File = "typegl3dbar_16.png" ; }; File = "typegl3dbar_16.png";
}; };
Image IMG_STEP_START
Bitmap BMP_STEP_START
{ {
ImageBitmap = Bitmap { File = "step_start_30.png" ; }; File = "step_start_30.png";
}; };
Image IMG_STEP_END
Bitmap BMP_STEP_END
{ {
ImageBitmap = Bitmap { File = "step_end_30.png" ; }; File = "step_end_30.png";
}; };
Image IMG_STEP_CENTER_X
Bitmap BMP_STEP_CENTER_X
{ {
ImageBitmap = Bitmap { File = "step_center_x_30.png" ; }; File = "step_center_x_30.png";
}; };
Image IMG_STEP_CENTER_Y
Bitmap BMP_STEP_CENTER_Y
{ {
ImageBitmap = Bitmap { File = "step_center_y_30.png" ; }; File = "step_center_y_30.png";
}; };
Bitmap BMP_BUBBLE_1 Bitmap BMP_BUBBLE_1
{ {
File = "bubble_52x60.png" ; File = "bubble_52x60.png" ;
@ -180,6 +195,7 @@ Bitmap BMP_COLUMNS_2D_1
{ {
File = "columns_52x60.png" ; File = "columns_52x60.png" ;
}; };
Bitmap BMP_COLUMNS_2D_2 Bitmap BMP_COLUMNS_2D_2
{ {
File = "columnstack_52x60.png" ; File = "columnstack_52x60.png" ;
@ -491,98 +507,70 @@ Bitmap BMP_STOCK_4
}; };
//error indicator //error indicator
Image BMP_INDICATE_BOTH_VERTI Bitmap BMP_INDICATE_BOTH_VERTI
{ {
ImageBitmap = Bitmap File = "errorbothverti_30.png" ;
{
File = "errorbothverti_30.png" ;
};
}; };
Image BMP_INDICATE_DOWN
Bitmap BMP_INDICATE_DOWN
{ {
ImageBitmap = Bitmap File = "errordown_30.png" ;
{
File = "errordown_30.png" ;
};
}; };
Image BMP_INDICATE_UP
Bitmap BMP_INDICATE_UP
{ {
ImageBitmap = Bitmap File = "errorup_30.png" ;
{
File = "errorup_30.png" ;
};
}; };
Image BMP_INDICATE_BOTH_HORI
Bitmap BMP_INDICATE_BOTH_HORI
{ {
ImageBitmap = Bitmap File = "errorbothhori_30.png" ;
{
File = "errorbothhori_30.png" ;
};
}; };
Image BMP_INDICATE_RIGHT
Bitmap BMP_INDICATE_RIGHT
{ {
ImageBitmap = Bitmap File = "errorright_30.png" ;
{
File = "errorright_30.png" ;
};
}; };
Image BMP_INDICATE_LEFT
Bitmap BMP_INDICATE_LEFT
{ {
ImageBitmap = Bitmap File = "errorleft_30.png" ;
{
File = "errorleft_30.png" ;
};
}; };
//regression curves //regression curves
Image BMP_REGRESSION_NONE Bitmap BMP_REGRESSION_NONE
{ {
ImageBitmap = Bitmap File = "regno.png" ;
{
File = "regno.png" ;
};
}; };
Image BMP_REGRESSION_LINEAR
Bitmap BMP_REGRESSION_LINEAR
{ {
ImageBitmap = Bitmap File = "reglin.png" ;
{
File = "reglin.png" ;
};
}; };
Image BMP_REGRESSION_LOG
Bitmap BMP_REGRESSION_LOG
{ {
ImageBitmap = Bitmap File = "reglog.png" ;
{
File = "reglog.png" ;
};
}; };
Image BMP_REGRESSION_EXP
Bitmap BMP_REGRESSION_EXP
{ {
ImageBitmap = Bitmap File = "regexp.png" ;
{
File = "regexp.png" ;
};
}; };
Image BMP_REGRESSION_POWER
Bitmap BMP_REGRESSION_POWER
{ {
ImageBitmap = Bitmap File = "regpow.png" ;
{
File = "regpow.png" ;
};
}; };
Image BMP_REGRESSION_POLYNOMIAL
Bitmap BMP_REGRESSION_POLYNOMIAL
{ {
ImageBitmap = Bitmap File = "regpoly.png" ;
{
File = "regpoly.png" ;
};
}; };
Image BMP_REGRESSION_MOVING_AVERAGE
Bitmap BMP_REGRESSION_MOVING_AVERAGE
{ {
ImageBitmap = Bitmap File = "regavg.png";
{
File = "regavg.png" ;
};
}; };
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

53
chart2/source/controller/dialogs/ChartTypeDialogController.cxx
View File

@ -439,10 +439,12 @@ OUString ColumnChartDialogController::getName()
{ {
return SCH_RESSTR( STR_TYPE_COLUMN ); return SCH_RESSTR( STR_TYPE_COLUMN );
} }
Image ColumnChartDialogController::getImage() Image ColumnChartDialogController::getImage()
{ {
return Image( SchResId( IMG_TYPE_COLUMN )); return Image(BitmapEx(SchResId(BMP_TYPE_COLUMN)));
} }
const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTemplateMap() const const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTemplateMap() const
{ {
static tTemplateServiceChartTypeParameterMap s_aTemplateMap{ static tTemplateServiceChartTypeParameterMap s_aTemplateMap{
@ -505,17 +507,21 @@ void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
BarChartDialogController::BarChartDialogController() BarChartDialogController::BarChartDialogController()
{ {
} }
BarChartDialogController::~BarChartDialogController() BarChartDialogController::~BarChartDialogController()
{ {
} }
OUString BarChartDialogController::getName() OUString BarChartDialogController::getName()
{ {
return SCH_RESSTR( STR_TYPE_BAR ); return SCH_RESSTR( STR_TYPE_BAR );
} }
Image BarChartDialogController::getImage() Image BarChartDialogController::getImage()
{ {
return Image( SchResId( IMG_TYPE_BAR )); return Image(BitmapEx(SchResId(BMP_TYPE_BAR)));
} }
const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTemplateMap() const const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTemplateMap() const
{ {
static tTemplateServiceChartTypeParameterMap s_aTemplateMap{ static tTemplateServiceChartTypeParameterMap s_aTemplateMap{
@ -586,7 +592,7 @@ OUString PieChartDialogController::getName()
} }
Image PieChartDialogController::getImage() Image PieChartDialogController::getImage()
{ {
return Image( SchResId( IMG_TYPE_PIE )); return Image(BitmapEx(SchResId(BMP_TYPE_PIE)));
} }
const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTemplateMap() const const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTemplateMap() const
{ {
@ -644,10 +650,12 @@ OUString LineChartDialogController::getName()
{ {
return SCH_RESSTR( STR_TYPE_LINE ); return SCH_RESSTR( STR_TYPE_LINE );
} }
Image LineChartDialogController::getImage() Image LineChartDialogController::getImage()
{ {
return Image( SchResId( IMG_TYPE_LINE )); return Image(BitmapEx(SchResId(BMP_TYPE_LINE)));
} }
const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTemplateMap() const const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTemplateMap() const
{ {
static tTemplateServiceChartTypeParameterMap s_aTemplateMap{ static tTemplateServiceChartTypeParameterMap s_aTemplateMap{
@ -779,21 +787,26 @@ void LineChartDialogController::adjustParameterToMainType( ChartTypeParameter& r
ChartTypeDialogController::adjustParameterToMainType( rParameter ); ChartTypeDialogController::adjustParameterToMainType( rParameter );
} }
XYChartDialogController::XYChartDialogController() XYChartDialogController::XYChartDialogController()
{ {
bSupportsXAxisWithValues = true; bSupportsXAxisWithValues = true;
} }
XYChartDialogController::~XYChartDialogController() XYChartDialogController::~XYChartDialogController()
{ {
} }
OUString XYChartDialogController::getName() OUString XYChartDialogController::getName()
{ {
return SCH_RESSTR( STR_TYPE_XY ); return SCH_RESSTR( STR_TYPE_XY );
} }
Image XYChartDialogController::getImage() Image XYChartDialogController::getImage()
{ {
return Image( SchResId( IMG_TYPE_XY )); return Image(BitmapEx(SchResId(BMP_TYPE_XY)));
} }
const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplateMap() const const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplateMap() const
{ {
static tTemplateServiceChartTypeParameterMap s_aTemplateMap{ static tTemplateServiceChartTypeParameterMap s_aTemplateMap{
@ -803,6 +816,7 @@ const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplat
{"com.sun.star.chart2.template.ThreeDScatter" , ChartTypeParameter(4,true,true,GlobalStackMode_NONE,false,true)}}; {"com.sun.star.chart2.template.ThreeDScatter" , ChartTypeParameter(4,true,true,GlobalStackMode_NONE,false,true)}};
return s_aTemplateMap; return s_aTemplateMap;
} }
void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
{ {
rSubTypeList.Clear(); rSubTypeList.Clear();
@ -877,24 +891,30 @@ void XYChartDialogController::adjustParameterToSubType( ChartTypeParameter& rPar
break; break;
} }
} }
AreaChartDialogController::AreaChartDialogController() AreaChartDialogController::AreaChartDialogController()
{ {
} }
AreaChartDialogController::~AreaChartDialogController() AreaChartDialogController::~AreaChartDialogController()
{ {
} }
OUString AreaChartDialogController::getName() OUString AreaChartDialogController::getName()
{ {
return SCH_RESSTR(STR_TYPE_AREA); return SCH_RESSTR(STR_TYPE_AREA);
} }
Image AreaChartDialogController::getImage() Image AreaChartDialogController::getImage()
{ {
return Image( SchResId( IMG_TYPE_AREA )); return Image(BitmapEx(SchResId(BMP_TYPE_AREA)));
} }
bool AreaChartDialogController::shouldShow_3DLookControl() const bool AreaChartDialogController::shouldShow_3DLookControl() const
{ {
return true; return true;
} }
const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTemplateMap() const const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTemplateMap() const
{ {
static tTemplateServiceChartTypeParameterMap s_aTemplateMap{ static tTemplateServiceChartTypeParameterMap s_aTemplateMap{
@ -906,6 +926,7 @@ const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTempl
{"com.sun.star.chart2.template.PercentStackedThreeDArea" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT)}}; {"com.sun.star.chart2.template.PercentStackedThreeDArea" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT)}};
return s_aTemplateMap; return s_aTemplateMap;
} }
void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
{ {
rSubTypeList.Clear(); rSubTypeList.Clear();
@ -956,25 +977,31 @@ void AreaChartDialogController::adjustParameterToMainType( ChartTypeParameter& r
ChartTypeDialogController::adjustParameterToMainType( rParameter ); ChartTypeDialogController::adjustParameterToMainType( rParameter );
} }
NetChartDialogController::NetChartDialogController() NetChartDialogController::NetChartDialogController()
{ {
bSupports3D = false; bSupports3D = false;
} }
NetChartDialogController::~NetChartDialogController() NetChartDialogController::~NetChartDialogController()
{ {
} }
OUString NetChartDialogController::getName() OUString NetChartDialogController::getName()
{ {
return SCH_RESSTR(STR_TYPE_NET); return SCH_RESSTR(STR_TYPE_NET);
} }
Image NetChartDialogController::getImage() Image NetChartDialogController::getImage()
{ {
return Image( SchResId( IMG_TYPE_NET )); return Image(BitmapEx(SchResId(BMP_TYPE_NET)));
} }
bool NetChartDialogController::shouldShow_StackingControl() const bool NetChartDialogController::shouldShow_StackingControl() const
{ {
return true; return true;
} }
const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTemplateMap() const const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTemplateMap() const
{ {
static tTemplateServiceChartTypeParameterMap s_aTemplateMap{ static tTemplateServiceChartTypeParameterMap s_aTemplateMap{
@ -1059,9 +1086,10 @@ OUString StockChartDialogController::getName()
{ {
return SCH_RESSTR(STR_TYPE_STOCK); return SCH_RESSTR(STR_TYPE_STOCK);
} }
Image StockChartDialogController::getImage() Image StockChartDialogController::getImage()
{ {
return Image( SchResId( IMG_TYPE_STOCK )); return Image(BitmapEx(SchResId(BMP_TYPE_STOCK)));
} }
const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const
@ -1108,7 +1136,7 @@ OUString CombiColumnLineChartDialogController::getName()
Image CombiColumnLineChartDialogController::getImage( ) Image CombiColumnLineChartDialogController::getImage( )
{ {
return Image( SchResId( IMG_TYPE_COLUMN_LINE ) ); return Image(BitmapEx(SchResId(BMP_TYPE_COLUMN_LINE)));
} }
const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const
@ -1226,20 +1254,25 @@ void CombiColumnLineChartDialogController::adjustParameterToSubType( ChartTypePa
break; break;
} }
} }
BubbleChartDialogController::BubbleChartDialogController() BubbleChartDialogController::BubbleChartDialogController()
{ {
} }
BubbleChartDialogController::~BubbleChartDialogController() BubbleChartDialogController::~BubbleChartDialogController()
{ {
} }
OUString BubbleChartDialogController::getName() OUString BubbleChartDialogController::getName()
{ {
return SCH_RESSTR(STR_TYPE_BUBBLE); return SCH_RESSTR(STR_TYPE_BUBBLE);
} }
Image BubbleChartDialogController::getImage() Image BubbleChartDialogController::getImage()
{ {
return Image( SchResId( IMG_TYPE_BUBBLE )); return Image(BitmapEx(SchResId(BMP_TYPE_BUBBLE)));
} }
const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTemplateMap() const const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTemplateMap() const
{ {
static tTemplateServiceChartTypeParameterMap s_aTemplateMap{ static tTemplateServiceChartTypeParameterMap s_aTemplateMap{

18
chart2/source/controller/dialogs/DataBrowser.cxx
View File

@ -353,40 +353,40 @@ Image SeriesHeader::GetChartTypeImage(
if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_AREA ) if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_AREA )
{ {
aResult = Image( SchResId( IMG_TYPE_AREA ) ); aResult = Image(BitmapEx(SchResId(BMP_TYPE_AREA)));
} }
else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ) else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_COLUMN )
{ {
if( bSwapXAndYAxis ) if( bSwapXAndYAxis )
aResult = Image( SchResId( IMG_TYPE_BAR ) ); aResult = Image(BitmapEx(SchResId(BMP_TYPE_BAR)));
else else
aResult = Image( SchResId( IMG_TYPE_COLUMN ) ); aResult = Image(BitmapEx(SchResId(BMP_TYPE_COLUMN)));
} }
else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_LINE ) else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_LINE )
{ {
aResult = Image( SchResId( IMG_TYPE_LINE ) ); aResult = Image(BitmapEx(SchResId(BMP_TYPE_LINE)) );
} }
else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ) else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_SCATTER )
{ {
aResult = Image( SchResId( IMG_TYPE_XY ) ); aResult = Image(BitmapEx(SchResId(BMP_TYPE_XY)));
} }
else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_PIE ) else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_PIE )
{ {
aResult = Image( SchResId( IMG_TYPE_PIE ) ); aResult = Image(BitmapEx(SchResId(BMP_TYPE_PIE)));
} }
else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_NET else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_NET
|| aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ) || aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET )
{ {
aResult = Image( SchResId( IMG_TYPE_NET ) ); aResult = Image(BitmapEx(SchResId(BMP_TYPE_NET)));
} }
else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK ) else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK )
{ {
// @todo: correct image for candle-stick type // @todo: correct image for candle-stick type
aResult = Image( SchResId( IMG_TYPE_STOCK ) ); aResult = Image(BitmapEx(SchResId(BMP_TYPE_STOCK)));
} }
else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ) else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE )
{ {
aResult = Image( SchResId( IMG_TYPE_BUBBLE ) ); aResult = Image(BitmapEx(SchResId(BMP_TYPE_BUBBLE)));
} }
return aResult; return aResult;

2
chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx
View File

@ -32,7 +32,7 @@ OUString GL3DBarChartDialogController::getName()
Image GL3DBarChartDialogController::getImage() Image GL3DBarChartDialogController::getImage()
{ {
return Image(SchResId(IMG_TYPE_GL3D_BAR)); return Image(BitmapEx(SchResId(BMP_TYPE_GL3D_BAR)));
} }
const tTemplateServiceChartTypeParameterMap& const tTemplateServiceChartTypeParameterMap&

12
chart2/source/controller/dialogs/res_ErrorBar.cxx
View File

@ -665,15 +665,15 @@ void ErrorBarResources::FillValueSets()
{ {
if( m_eErrorBarType == ERROR_BAR_Y ) if( m_eErrorBarType == ERROR_BAR_Y )
{ {
m_pFiNegative->SetImage( Image( SchResId( BMP_INDICATE_DOWN ) ) ); m_pFiNegative->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_DOWN))));
m_pFiPositive->SetImage( Image( SchResId( BMP_INDICATE_UP ) ) ); m_pFiPositive->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_UP))));
m_pFiBoth->SetImage( Image( SchResId( BMP_INDICATE_BOTH_VERTI ) ) ); m_pFiBoth->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_BOTH_VERTI))));
} }
else if( m_eErrorBarType == ERROR_BAR_X ) else if( m_eErrorBarType == ERROR_BAR_X )
{ {
m_pFiNegative->SetImage( Image( SchResId( BMP_INDICATE_LEFT ) ) ); m_pFiNegative->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_LEFT))));
m_pFiPositive->SetImage( Image( SchResId( BMP_INDICATE_RIGHT ) ) ); m_pFiPositive->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_RIGHT))));
m_pFiBoth->SetImage( Image( SchResId( BMP_INDICATE_BOTH_HORI ) ) ); m_pFiBoth->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_BOTH_HORI))));
} }
} }

12
chart2/source/controller/dialogs/res_Trendline.cxx
View File

@ -312,12 +312,12 @@ bool TrendlineResources::FillItemSet(SfxItemSet* rOutAttrs) const
void TrendlineResources::FillValueSets() void TrendlineResources::FillValueSets()
{ {
m_pFI_Linear->SetImage( Image( SchResId( BMP_REGRESSION_LINEAR ) ) ); m_pFI_Linear->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_LINEAR))));
m_pFI_Logarithmic->SetImage( Image( SchResId( BMP_REGRESSION_LOG ) ) ); m_pFI_Logarithmic->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_LOG))));
m_pFI_Exponential->SetImage( Image( SchResId( BMP_REGRESSION_EXP ) ) ); m_pFI_Exponential->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_EXP))));
m_pFI_Power->SetImage( Image( SchResId( BMP_REGRESSION_POWER ) ) ); m_pFI_Power->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_POWER))));
m_pFI_Polynomial->SetImage( Image( SchResId( BMP_REGRESSION_POLYNOMIAL ) ) ); m_pFI_Polynomial->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_POLYNOMIAL))));
m_pFI_MovingAverage->SetImage(Image( SchResId( BMP_REGRESSION_MOVING_AVERAGE ) ) ); m_pFI_MovingAverage->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_MOVING_AVERAGE))));
} }
void TrendlineResources::UpdateControlStates() void TrendlineResources::UpdateControlStates()

3
cui/source/customize/acccfg.hrc
View File

@ -20,9 +20,6 @@
#define STR_GROUP_STYLES 58 #define STR_GROUP_STYLES 58
#define STR_PDF_EXPORT_SEND 59 #define STR_PDF_EXPORT_SEND 59
#define BMP_COLLAPSED 63
#define BMP_EXPANDED 64
#define STR_BASICMACROS 67 #define STR_BASICMACROS 67
#define STR_HUMAN_APPNAME 69 #define STR_HUMAN_APPNAME 69

14
cui/source/customize/acccfg.src
View File

@ -35,20 +35,6 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
{ {
Text [ en-US ] = "Styles" ; Text [ en-US ] = "Styles" ;
}; };
Image BMP_COLLAPSED
{
ImageBitmap = Bitmap
{
File = "plus.bmp" ;
};
};
Image BMP_EXPANDED
{
ImageBitmap = Bitmap
{
File = "minus.bmp" ;
};
};
}; };
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

12
cui/source/customize/cfgutil.cxx
View File

@ -359,17 +359,17 @@ struct SvxConfigGroupBoxResource_Impl : public Resource
SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() : SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
Resource(CUI_RES(RID_SVXPAGE_CONFIGGROUPBOX)), Resource(CUI_RES(RID_SVXPAGE_CONFIGGROUPBOX)),
m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK)), m_hdImage(BitmapEx(CUI_RES(RID_CUIBMP_HARDDISK))),
m_libImage(CUI_RES(RID_CUIIMG_LIB)), m_libImage(BitmapEx(CUI_RES(RID_CUIBMP_LIB))),
m_macImage(CUI_RES(RID_CUIIMG_MACRO)), m_macImage(BitmapEx(CUI_RES(RID_CUIBMP_MACRO))),
m_docImage(CUI_RES(RID_CUIIMG_DOC)), m_docImage(BitmapEx(CUI_RES(RID_CUIBMP_DOC))),
m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)), m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)),
m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)), m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)),
m_sMacros(CUI_RESSTR(STR_BASICMACROS)), m_sMacros(CUI_RESSTR(STR_BASICMACROS)),
m_sDlgMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)), m_sDlgMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)),
m_aStrGroupStyles(CUI_RESSTR(STR_GROUP_STYLES)), m_aStrGroupStyles(CUI_RESSTR(STR_GROUP_STYLES)),
m_collapsedImage(CUI_RES(BMP_COLLAPSED)), m_collapsedImage(BitmapEx(CUI_RES(RID_CUIBMP_COLLAPSED))),
m_expandedImage(CUI_RES(BMP_EXPANDED)) m_expandedImage(BitmapEx(CUI_RES(RID_CUIBMP_EXPANDED)))
{ {
FreeResource(); FreeResource();
} }

8
cui/source/customize/selector.cxx
View File

@ -201,10 +201,10 @@ SvxConfigGroupListBox::SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyl
, m_bShowSlots(false) , m_bShowSlots(false)
, pFunctionListBox(nullptr) , pFunctionListBox(nullptr)
, m_pImageProvider(nullptr) , m_pImageProvider(nullptr)
, m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK)) , m_hdImage(BitmapEx(CUI_RES(RID_CUIBMP_HARDDISK)))
, m_libImage(CUI_RES(RID_CUIIMG_LIB)) , m_libImage(BitmapEx(CUI_RES(RID_CUIBMP_LIB)))
, m_macImage(CUI_RES(RID_CUIIMG_MACRO)) , m_macImage(BitmapEx(CUI_RES(RID_CUIBMP_MACRO)))
, m_docImage(CUI_RES(RID_CUIIMG_DOC)) , m_docImage(BitmapEx(CUI_RES(RID_CUIBMP_DOC)))
, m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)) , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS))
, m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)) , m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS))
{ {

8
cui/source/dialogs/cuihyperdlg.cxx
View File

@ -86,10 +86,10 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings)
std::vector<Image> imgVector; std::vector<Image> imgVector;
OUString aStrTitle; OUString aStrTitle;
SvxIconChoiceCtrlEntry *pEntry; SvxIconChoiceCtrlEntry *pEntry;
imgVector.push_back( Image( CUI_RES ( RID_SVXBMP_HLINETTP ) ) ); imgVector.push_back(Image(BitmapEx(CUI_RES(RID_SVXBMP_HLINETTP))));
imgVector.push_back( Image( CUI_RES ( RID_SVXBMP_HLMAILTP ) ) ); imgVector.push_back(Image(BitmapEx(CUI_RES(RID_SVXBMP_HLMAILTP))));
imgVector.push_back( Image( CUI_RES ( RID_SVXBMP_HLDOCTP ) ) ); imgVector.push_back(Image(BitmapEx(CUI_RES(RID_SVXBMP_HLDOCTP))));
imgVector.push_back( Image( CUI_RES ( RID_SVXBMP_HLDOCNTP ) ) ); imgVector.push_back(Image(BitmapEx(CUI_RES(RID_SVXBMP_HLDOCNTP))));
for(Image &aImage : imgVector ) for(Image &aImage : imgVector )
{ {

26
cui/source/dialogs/cuires.src
View File

@ -70,24 +70,34 @@ String RID_SVXSTR_EDIT_GRAPHIC
Text [ en-US ] = "Link" ; Text [ en-US ] = "Link" ;
}; };
Image RID_CUIIMG_HARDDISK Bitmap RID_CUIBMP_HARDDISK
{ {
ImageBitmap = Bitmap { File = "harddisk_16.png" ; }; File = "harddisk_16.png";
}; };
Image RID_CUIIMG_LIB Bitmap RID_CUIBMP_LIB
{ {
ImageBitmap = Bitmap { File = "im30820.png"; }; File = "im30820.png";
}; };
Image RID_CUIIMG_MACRO Bitmap RID_CUIBMP_MACRO
{ {
ImageBitmap = Bitmap { File = "im30821.png"; }; File = "im30821.png";
}; };
Image RID_CUIIMG_DOC Bitmap RID_CUIBMP_DOC
{ {
ImageBitmap = Bitmap { File = "im30826.png"; }; File = "im30826.png";
};
Bitmap RID_CUIBMP_COLLAPSED
{
File = "plus.bmp" ;
};
Bitmap RID_CUIBMP_EXPANDED
{
File = "minus.bmp" ;
}; };
String RID_SVXSTR_LOADACCELCONFIG String RID_SVXSTR_LOADACCELCONFIG

2
cui/source/dialogs/hldocntp.cxx
View File

@ -105,7 +105,7 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDia
get(m_pCbbPath, "path"); get(m_pCbbPath, "path");
m_pCbbPath->SetSmartProtocol(INetProtocol::File); m_pCbbPath->SetSmartProtocol(INetProtocol::File);
get(m_pBtCreate, "create"); get(m_pBtCreate, "create");
BitmapEx aBitmap = Image(CUI_RES(RID_SVXBMP_NEWDOC)).GetBitmapEx(); BitmapEx aBitmap(CUI_RES(RID_SVXBMP_NEWDOC));
aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality ); aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality );
m_pBtCreate->SetModeImage(Image(aBitmap)); m_pBtCreate->SetModeImage(Image(aBitmap));
get(m_pLbDocTypes, "types"); get(m_pLbDocTypes, "types");

4
cui/source/dialogs/hldoctp.cxx
View File

@ -41,13 +41,13 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p
get(m_pCbbPath, "path"); get(m_pCbbPath, "path");
m_pCbbPath->SetSmartProtocol(INetProtocol::File); m_pCbbPath->SetSmartProtocol(INetProtocol::File);
get(m_pBtFileopen, "fileopen"); get(m_pBtFileopen, "fileopen");
BitmapEx aBitmap = Image(CUI_RES(RID_SVXBMP_FILEOPEN)).GetBitmapEx(); BitmapEx aBitmap(CUI_RES(RID_SVXBMP_FILEOPEN));
aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality); aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality);
m_pBtFileopen->SetModeImage(Image(aBitmap)); m_pBtFileopen->SetModeImage(Image(aBitmap));
get(m_pEdTarget, "target"); get(m_pEdTarget, "target");
get(m_pFtFullURL, "url"); get(m_pFtFullURL, "url");
get(m_pBtBrowse, "browse"); get(m_pBtBrowse, "browse");
aBitmap = Image(CUI_RES(RID_SVXBMP_TARGET)).GetBitmapEx(); aBitmap = BitmapEx(CUI_RES(RID_SVXBMP_TARGET));
aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality ); aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality );
m_pBtBrowse->SetModeImage(Image(aBitmap)); m_pBtBrowse->SetModeImage(Image(aBitmap));

2
cui/source/dialogs/hlmailtp.cxx
View File

@ -44,7 +44,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog*
get(m_pCbbReceiver, "receiver"); get(m_pCbbReceiver, "receiver");
m_pCbbReceiver->SetSmartProtocol(INetProtocol::Mailto); m_pCbbReceiver->SetSmartProtocol(INetProtocol::Mailto);
get(m_pBtAdrBook, "adressbook"); get(m_pBtAdrBook, "adressbook");
BitmapEx aBitmap = Image(CUI_RES(RID_SVXBMP_ADRESSBOOK)).GetBitmapEx(); BitmapEx aBitmap(CUI_RES(RID_SVXBMP_ADRESSBOOK));
aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality ); aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality );
m_pBtAdrBook->SetModeImage(Image(aBitmap)); m_pBtAdrBook->SetModeImage(Image(aBitmap));
get(m_pFtSubject, "subject_label"); get(m_pFtSubject, "subject_label");

2
cui/source/dialogs/hltpbase.cxx
View File

@ -172,7 +172,7 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
get(mpEdIndication, "indication"); get(mpEdIndication, "indication");
get(mpEdText, "name"); get(mpEdText, "name");
get(mpBtScript, "script"); get(mpBtScript, "script");
BitmapEx aBitmap = Image(CUI_RES (RID_SVXBMP_SCRIPT)).GetBitmapEx(); BitmapEx aBitmap(CUI_RES(RID_SVXBMP_SCRIPT));
aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality ); aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality );
mpBtScript->SetModeImage(Image(aBitmap)); mpBtScript->SetModeImage(Image(aBitmap));

40
cui/source/dialogs/hyperdlg.src
View File

@ -94,54 +94,54 @@ String RID_SVXSTR_HYPERDLG_QUERYOVERWRITE
Text [ en-US ] = "The file already exists. Overwrite?" ; Text [ en-US ] = "The file already exists. Overwrite?" ;
}; };
Image RID_SVXBMP_HLINETTP Bitmap RID_SVXBMP_HLINETTP
{ {
ImageBitmap = Bitmap { File = "hlinettp.png" ; }; File = "hlinettp.png";
}; };
Image RID_SVXBMP_HLMAILTP Bitmap RID_SVXBMP_HLMAILTP
{ {
ImageBitmap = Bitmap { File = "hlmailtp.png" ; }; File = "hlmailtp.png";
}; };
Image RID_SVXBMP_HLDOCTP Bitmap RID_SVXBMP_HLDOCTP
{ {
ImageBitmap = Bitmap { File = "hldoctp.png" ; }; File = "hldoctp.png";
}; };
Image RID_SVXBMP_HLDOCNTP Bitmap RID_SVXBMP_HLDOCNTP
{ {
ImageBitmap = Bitmap { File = "hldocntp.png" ; }; File = "hldocntp.png";
}; };
Image RID_SVXBMP_BROWSE Bitmap RID_SVXBMP_BROWSE
{ {
ImageBitmap = Bitmap { File = "browse.png" ; }; File = "browse.png";
}; };
Image RID_SVXBMP_SCRIPT Bitmap RID_SVXBMP_SCRIPT
{ {
ImageBitmap = Bitmap { File = "script.png" ; }; File = "script.png";
}; };
Image RID_SVXBMP_ADRESSBOOK Bitmap RID_SVXBMP_ADRESSBOOK
{ {
ImageBitmap = Bitmap { File = "adrbook.png" ; }; File = "adrbook.png";
}; };
Image RID_SVXBMP_FILEOPEN Bitmap RID_SVXBMP_FILEOPEN
{ {
ImageBitmap = Bitmap { File = "fileopen.png" ; }; File = "fileopen.png";
}; };
Image RID_SVXBMP_TARGET Bitmap RID_SVXBMP_TARGET
{ {
ImageBitmap = Bitmap { File = "target.png" ; }; File = "target.png";
}; };
Image RID_SVXBMP_NEWDOC Bitmap RID_SVXBMP_NEWDOC
{ {
ImageBitmap = Bitmap { File = "newdoc.png" ; }; File = "newdoc.png";
}; };
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

28
cui/source/dialogs/scriptdlg.cxx
View File

@ -76,10 +76,10 @@ void ShowErrorDialog( const Any& aException )
SFTreeListBox::SFTreeListBox(vcl::Window* pParent) SFTreeListBox::SFTreeListBox(vcl::Window* pParent)
: SvTreeListBox(pParent) : SvTreeListBox(pParent)
, m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK)) , m_hdImage(BitmapEx(CUI_RES(RID_CUIBMP_HARDDISK)))
, m_libImage(CUI_RES(RID_CUIIMG_LIB)) , m_libImage(BitmapEx(CUI_RES(RID_CUIBMP_LIB)))
, m_macImage(CUI_RES(RID_CUIIMG_MACRO)) , m_macImage(BitmapEx(CUI_RES(RID_CUIBMP_MACRO)))
, m_docImage(CUI_RES(RID_CUIIMG_DOC)) , m_docImage(BitmapEx(CUI_RES(RID_CUIBMP_DOC)))
, m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)) , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS))
, m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)) , m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS))
{ {
@ -237,7 +237,7 @@ void SFTreeListBox::Init( const OUString& language )
Reference< browse::XBrowseNode > langEntries = Reference< browse::XBrowseNode > langEntries =
getLangNodeFromRootNode( children[ n ], lang ); getLangNodeFromRootNode( children[ n ], lang );
insertEntry( uiName, app ? RID_CUIIMG_HARDDISK : RID_CUIIMG_DOC, insertEntry( uiName, app ? RID_CUIBMP_HARDDISK : RID_CUIBMP_DOC,
nullptr, true, o3tl::make_unique< SFEntry >( OBJTYPE_SFROOT, langEntries, xDocumentModel ), factoryURL ); nullptr, true, o3tl::make_unique< SFEntry >( OBJTYPE_SFROOT, langEntries, xDocumentModel ), factoryURL );
} }
@ -319,11 +319,11 @@ void SFTreeListBox:: RequestSubEntries( SvTreeListEntry* pRootEntry, Reference<
OUString name( children[ n ]->getName() ); OUString name( children[ n ]->getName() );
if ( children[ n ]->getType() != browse::BrowseNodeTypes::SCRIPT) if ( children[ n ]->getType() != browse::BrowseNodeTypes::SCRIPT)
{ {
insertEntry( name, RID_CUIIMG_LIB, pRootEntry, true, o3tl::make_unique< SFEntry >( OBJTYPE_SCRIPTCONTAINER, children[ n ],model )); insertEntry(name, RID_CUIBMP_LIB, pRootEntry, true, o3tl::make_unique< SFEntry >( OBJTYPE_SCRIPTCONTAINER, children[ n ],model));
} }
else else
{ {
insertEntry( name, RID_CUIIMG_MACRO, pRootEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_METHOD, children[ n ],model )); insertEntry(name, RID_CUIBMP_MACRO, pRootEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_METHOD, children[ n ],model));
} }
} }
} }
@ -338,7 +338,7 @@ SvTreeListEntry * SFTreeListBox::insertEntry(
bool bChildrenOnDemand, std::unique_ptr< SFEntry > && aUserData, const OUString& factoryURL ) bool bChildrenOnDemand, std::unique_ptr< SFEntry > && aUserData, const OUString& factoryURL )
{ {
SvTreeListEntry * p; SvTreeListEntry * p;
if( nBitmap == RID_CUIIMG_DOC && !factoryURL.isEmpty() ) if( nBitmap == RID_CUIBMP_DOC && !factoryURL.isEmpty() )
{ {
Image aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL) ); Image aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL) );
p = InsertEntry( p = InsertEntry(
@ -357,19 +357,19 @@ SvTreeListEntry * SFTreeListBox::insertEntry(
bool bChildrenOnDemand, std::unique_ptr< SFEntry > && aUserData ) bool bChildrenOnDemand, std::unique_ptr< SFEntry > && aUserData )
{ {
Image aImage; Image aImage;
if( nBitmap == RID_CUIIMG_HARDDISK ) if( nBitmap == RID_CUIBMP_HARDDISK )
{ {
aImage = m_hdImage; aImage = m_hdImage;
} }
else if( nBitmap == RID_CUIIMG_LIB ) else if( nBitmap == RID_CUIBMP_LIB )
{ {
aImage = m_libImage; aImage = m_libImage;
} }
else if( nBitmap == RID_CUIIMG_MACRO ) else if( nBitmap == RID_CUIBMP_MACRO )
{ {
aImage = m_macImage; aImage = m_macImage;
} }
else if( nBitmap == RID_CUIIMG_DOC ) else if( nBitmap == RID_CUIBMP_DOC )
{ {
aImage = m_docImage; aImage = m_docImage;
} }
@ -956,12 +956,12 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
if ( aChildNode->getType() == browse::BrowseNodeTypes::SCRIPT ) if ( aChildNode->getType() == browse::BrowseNodeTypes::SCRIPT )
{ {
pNewEntry = m_pScriptsBox->insertEntry( aChildName, pNewEntry = m_pScriptsBox->insertEntry( aChildName,
RID_CUIIMG_MACRO, pEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_METHOD, aChildNode,xDocumentModel ) ); RID_CUIBMP_MACRO, pEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_METHOD, aChildNode,xDocumentModel ) );
} }
else else
{ {
pNewEntry = m_pScriptsBox->insertEntry( aChildName, pNewEntry = m_pScriptsBox->insertEntry( aChildName,
RID_CUIIMG_LIB, pEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_SCRIPTCONTAINER, aChildNode,xDocumentModel ) ); RID_CUIBMP_LIB, pEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_SCRIPTCONTAINER, aChildNode,xDocumentModel ) );
// If the Parent is not loaded then set to // If the Parent is not loaded then set to
// loaded, this will prevent RequestingChildren ( called // loaded, this will prevent RequestingChildren ( called

10
cui/source/inc/cuires.hrc
View File

@ -28,10 +28,12 @@
// RID_SVX_START + 0 unused // RID_SVX_START + 0 unused
#define RID_SVXSTR_OPTIONS_RESTART (RID_SVX_START + 1) #define RID_SVXSTR_OPTIONS_RESTART (RID_SVX_START + 1)
#define RID_CUIIMG_HARDDISK (RID_SVX_START + 4) #define RID_CUIBMP_HARDDISK (RID_SVX_START + 4)
#define RID_CUIIMG_LIB (RID_SVX_START + 5) #define RID_CUIBMP_LIB (RID_SVX_START + 5)
#define RID_CUIIMG_MACRO (RID_SVX_START + 6) #define RID_CUIBMP_MACRO (RID_SVX_START + 6)
#define RID_CUIIMG_DOC (RID_SVX_START + 7) #define RID_CUIBMP_DOC (RID_SVX_START + 7)
#define RID_CUIBMP_COLLAPSED (RID_SVX_START + 8)
#define RID_CUIBMP_EXPANDED (RID_SVX_START + 9)
// Gallery // Gallery
#define RID_CUI_GALLERY_START (RID_SVX_START + 360) #define RID_CUI_GALLERY_START (RID_SVX_START + 360)