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

HC Cleanup - base

Browse Source
This commit is contained in:
Joseph Powers
2010-11-16 21:20:50 -08:00
parent 6ddd931bbf
commit b46ec155ec
6 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbaccess/inc/ToolBoxHelper.hxx
View File

@@ -43,7 +43,6 @@ namespace dbaui
{ {
class DBACCESS_DLLPUBLIC OToolBoxHelper class DBACCESS_DLLPUBLIC OToolBoxHelper
{ {
sal_Bool m_bIsHiContrast;// true when the toolbox is in hi contrast mode
sal_Int16 m_nSymbolsSize; // shows the toolbox large or small bitmaps sal_Int16 m_nSymbolsSize; // shows the toolbox large or small bitmaps
ToolBox* m_pToolBox; // our toolbox (may be NULL) ToolBox* m_pToolBox; // our toolbox (may be NULL)
public: public:
@@ -72,13 +71,12 @@ namespace dbaui
*/ */
virtual void setToolBox(ToolBox* _pTB); virtual void setToolBox(ToolBox* _pTB);
inline ToolBox* getToolBox() const { return m_pToolBox; } inline ToolBox* getToolBox() const { return m_pToolBox; }
/** checks if the toolbox needs a new imagelist. /** checks if the toolbox needs a new imagelist.
*/ */
void checkImageList(); void checkImageList();
inline sal_Bool isToolBoxHiContrast() const { return m_bIsHiContrast; }
protected: protected:
DECL_LINK(ConfigOptionsChanged, SvtMiscOptions*); DECL_LINK(ConfigOptionsChanged, SvtMiscOptions*);
DECL_LINK(SettingsChanged, VclWindowEvent* ); DECL_LINK(SettingsChanged, VclWindowEvent* );

10
dbaccess/source/ui/app/AppIconControl.cxx
View File

@@ -57,16 +57,16 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent)
ElementType eType; ElementType eType;
USHORT nImageResId; USHORT nImageResId;
} aCategories[] = { } aCategories[] = {
{ RID_STR_TABLES_CONTAINER, E_TABLE, IMG_TABLEFOLDER_TREE_L }, { RID_STR_TABLES_CONTAINER, E_TABLE, IMG_TABLEFOLDER_TREE_L },
{ RID_STR_QUERIES_CONTAINER, E_QUERY, IMG_QUERYFOLDER_TREE_L }, { RID_STR_QUERIES_CONTAINER, E_QUERY, IMG_QUERYFOLDER_TREE_L },
{ RID_STR_FORMS_CONTAINER, E_FORM, IMG_FORMFOLDER_TREE_L }, { RID_STR_FORMS_CONTAINER, E_FORM, IMG_FORMFOLDER_TREE_L },
{ RID_STR_REPORTS_CONTAINER, E_REPORT, IMG_REPORTFOLDER_TREE_L } { RID_STR_REPORTS_CONTAINER, E_REPORT, IMG_REPORTFOLDER_TREE_L }
}; };
for ( size_t i=0; i < SAL_N_ELEMENTS(aCategories); ++i) for ( size_t i=0; i < SAL_N_ELEMENTS(aCategories); ++i)
{ {
SvxIconChoiceCtrlEntry* pEntry = InsertEntry( SvxIconChoiceCtrlEntry* pEntry = InsertEntry(
String( ModuleRes( aCategories[i].nLabelResId ) ), String( ModuleRes( aCategories[i].nLabelResId ) ) ,
Image( ModuleRes( aCategories[i].nImageResId ) ) ); Image( ModuleRes( aCategories[i].nImageResId ) ) );
if ( pEntry ) if ( pEntry )
pEntry->SetUserData( new ElementType( aCategories[i].eType ) ); pEntry->SetUserData( new ElementType( aCategories[i].eType ) );
} }

4
dbaccess/source/ui/control/toolboxcontroller.cxx
View File

@@ -192,8 +192,6 @@ namespace dbaui
{ {
pMenu.reset( new PopupMenu( ModuleRes( RID_MENU_APP_NEW ) ) ); pMenu.reset( new PopupMenu( ModuleRes( RID_MENU_APP_NEW ) ) );
sal_Bool bHighContrast = isHighContrast();
try try
{ {
Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(getServiceManager()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY); Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(getServiceManager()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY);
@@ -202,8 +200,6 @@ namespace dbaui
short nImageType = hasBigImages() ? ImageType::SIZE_LARGE : ImageType::SIZE_DEFAULT; short nImageType = hasBigImages() ? ImageType::SIZE_LARGE : ImageType::SIZE_DEFAULT;
if ( bHighContrast )
nImageType |= ImageType::COLOR_HIGHCONTRAST;
Sequence< ::rtl::OUString> aSeq(1); Sequence< ::rtl::OUString> aSeq(1);
USHORT nCount = pMenu->GetItemCount(); USHORT nCount = pMenu->GetItemCount();

4
dbaccess/source/ui/inc/dbu_resource.hrc
View File

@@ -260,10 +260,6 @@
#define IMG_REPORTFOLDER_TREE_L RID_IMAGE_START + 40 #define IMG_REPORTFOLDER_TREE_L RID_IMAGE_START + 40
#define IMG_QUERYFOLDER_TREE_L RID_IMAGE_START + 41 #define IMG_QUERYFOLDER_TREE_L RID_IMAGE_START + 41
#define IMG_TABLEFOLDER_TREE_L RID_IMAGE_START + 42 #define IMG_TABLEFOLDER_TREE_L RID_IMAGE_START + 42
// free
// free
// free
// free
#define IMG_NAVIGATION_BTN_UP_SC RID_IMAGE_START + 47 #define IMG_NAVIGATION_BTN_UP_SC RID_IMAGE_START + 47
#define IMG_NAVIGATION_CREATEFOLDER_SC RID_IMAGE_START + 49 #define IMG_NAVIGATION_CREATEFOLDER_SC RID_IMAGE_START + 49
#define FORM_TREE_ICON RID_IMAGE_START + 51 #define FORM_TREE_ICON RID_IMAGE_START + 51

11
dbaccess/source/ui/misc/ToolBoxHelper.cxx
View File

@@ -40,9 +40,8 @@ namespace dbaui
{ {
DBG_NAME(OToolBoxHelper) DBG_NAME(OToolBoxHelper)
OToolBoxHelper::OToolBoxHelper() OToolBoxHelper::OToolBoxHelper()
: m_bIsHiContrast(sal_False) : m_nSymbolsSize(-1 )
,m_nSymbolsSize(-1 ) , m_pToolBox(NULL)
,m_pToolBox(NULL)
{ {
DBG_CTOR(OToolBoxHelper,NULL); DBG_CTOR(OToolBoxHelper,NULL);
@@ -64,12 +63,9 @@ namespace dbaui
if ( m_pToolBox ) if ( m_pToolBox )
{ {
sal_Int16 nCurSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize(); sal_Int16 nCurSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize();
if ( nCurSymbolsSize != m_nSymbolsSize || if ( nCurSymbolsSize != m_nSymbolsSize )
m_bIsHiContrast != m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode() )
{ {
m_nSymbolsSize = nCurSymbolsSize; m_nSymbolsSize = nCurSymbolsSize;
m_bIsHiContrast = m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode();
m_pToolBox->SetImageList( getImageList(m_nSymbolsSize) ); m_pToolBox->SetImageList( getImageList(m_nSymbolsSize) );
Size aTbOldSize = m_pToolBox->GetSizePixel(); Size aTbOldSize = m_pToolBox->GetSizePixel();
@@ -117,7 +113,6 @@ namespace dbaui
m_pToolBox = _pTB; m_pToolBox = _pTB;
if ( m_pToolBox ) if ( m_pToolBox )
{ {
// m_bIsHiContrast = m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode();
ConfigOptionsChanged(NULL); ConfigOptionsChanged(NULL);
if ( bFirstTime ) if ( bFirstTime )
adjustToolBoxSize(m_pToolBox); adjustToolBoxSize(m_pToolBox);

6
reportdesign/source/ui/report/ReportSection.cxx
View File

@@ -461,7 +461,11 @@ void OReportSection::SelectAll(const sal_uInt16 _nObjectType)
} }
} }
} }
void lcl_insertMenuItemImages(PopupMenu& rContextMenu,OReportController& rController,const uno::Reference< report::XReportDefinition>& _xReportDefinition,uno::Reference<frame::XFrame>& _rFrame) void lcl_insertMenuItemImages(
PopupMenu& rContextMenu,
OReportController& rController,
const uno::Reference< report::XReportDefinition>& _xReportDefinition,uno::Reference<frame::XFrame>& _rFrame
)
{ {
const USHORT nCount = rContextMenu.GetItemCount(); const USHORT nCount = rContextMenu.GetItemCount();
for (USHORT i = 0; i < nCount; ++i) for (USHORT i = 0; i < nCount; ++i)