From 51392ec4319478b14dc33e6d2684e7e6d1063fc6 Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Tue, 16 Nov 2010 21:20:50 -0800 Subject: HC Cleanup - base --- dbaccess/inc/ToolBoxHelper.hxx | 8 +++----- dbaccess/source/ui/app/AppIconControl.cxx | 18 +++++++++--------- dbaccess/source/ui/control/dbtreelistbox.cxx | 16 ++++++++-------- dbaccess/source/ui/control/toolboxcontroller.cxx | 6 +----- dbaccess/source/ui/imagelists/dbimagelists.src | 2 +- dbaccess/source/ui/inc/dbu_resource.hrc | 4 ---- dbaccess/source/ui/misc/ToolBoxHelper.cxx | 19 +++++++------------ 7 files changed, 29 insertions(+), 44 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/inc/ToolBoxHelper.hxx b/dbaccess/inc/ToolBoxHelper.hxx index f2afce8d9..1adf4945a 100644 --- a/dbaccess/inc/ToolBoxHelper.hxx +++ b/dbaccess/inc/ToolBoxHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,6 @@ namespace dbaui { 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 ToolBox* m_pToolBox; // our toolbox (may be NULL) public: @@ -72,13 +71,12 @@ namespace dbaui */ 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. */ void checkImageList(); - - inline sal_Bool isToolBoxHiContrast() const { return m_bIsHiContrast; } + protected: DECL_LINK(ConfigOptionsChanged, SvtMiscOptions*); DECL_LINK(SettingsChanged, VclWindowEvent* ); diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index 7000db65e..293d65ff3 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ using namespace ::dbaui; // class OApplicationIconControl DBG_NAME(OApplicationIconControl) //================================================================== -OApplicationIconControl::OApplicationIconControl(Window* _pParent) +OApplicationIconControl::OApplicationIconControl(Window* _pParent) : SvtIconChoiceCtrl(_pParent,WB_ICON | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /*!WB_NOSELECTION |*/ WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | WB_SMART_ARRANGE | WB_NOHSCROLL | WB_CENTER) ,DropTargetHelper(this) @@ -57,17 +57,17 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent) ElementType eType; USHORT nImageResId; } aCategories[] = { - { RID_STR_TABLES_CONTAINER, E_TABLE, IMG_TABLEFOLDER_TREE_L }, - { RID_STR_QUERIES_CONTAINER, E_QUERY, IMG_QUERYFOLDER_TREE_L }, - { RID_STR_FORMS_CONTAINER, E_FORM, IMG_FORMFOLDER_TREE_L }, + { RID_STR_TABLES_CONTAINER, E_TABLE, IMG_TABLEFOLDER_TREE_L }, + { RID_STR_QUERIES_CONTAINER, E_QUERY, IMG_QUERYFOLDER_TREE_L }, + { RID_STR_FORMS_CONTAINER, E_FORM, IMG_FORMFOLDER_TREE_L }, { RID_STR_REPORTS_CONTAINER, E_REPORT, IMG_REPORTFOLDER_TREE_L } }; for ( size_t i=0; i < SAL_N_ELEMENTS(aCategories); ++i) { SvxIconChoiceCtrlEntry* pEntry = InsertEntry( - String( ModuleRes( aCategories[i].nLabelResId ) ), - Image( ModuleRes( aCategories[i].nImageResId ) ) ); - if ( pEntry ) + String( ModuleRes( aCategories[i].nLabelResId ) ) , + Image( ModuleRes( aCategories[i].nImageResId ) ) ); + if ( pEntry ) pEntry->SetUserData( new ElementType( aCategories[i].eType ) ); } @@ -96,7 +96,7 @@ sal_Int8 OApplicationIconControl::AcceptDrop( const AcceptDropEvent& _rEvt ) sal_Int8 nDropOption = DND_ACTION_NONE; if ( m_pActionListener ) { - + SvxIconChoiceCtrlEntry* pEntry = GetEntry(_rEvt.maPosPixel); if ( pEntry ) { diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index e7635179f..1ddba159a 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,7 +92,7 @@ DBTreeListBox::DBTreeListBox( Window* pParent, const Reference< XMultiServiceFac ,m_xORB(_rxORB) { DBG_CTOR(DBTreeListBox,NULL); - init(); + init(); } // ----------------------------------------------------------------------------- void DBTreeListBox::init() @@ -407,7 +407,7 @@ void DBTreeListBox::KeyInput( const KeyEvent& rKEvt ) // 2002-12-02 - 105831 - fs@openoffice.org } - if ( !bHandled ) + if ( !bHandled ) SvTreeListBox::KeyInput(rKEvt); } // ----------------------------------------------------------------------------- @@ -427,7 +427,7 @@ BOOL DBTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText m_aSelectedEntries.erase( pEntry ); } SetEntryText(pEntry,aEntry.aNewText); - + return FALSE; // we never want that the base change our text } @@ -590,20 +590,20 @@ namespace throw IllegalArgumentException(); // API bug: this should be a NoSupportException } - + //-------------------------------------------------------------------- Any SAL_CALL SelectionSupplier::getSelection( ) throw (RuntimeException) { return m_aSelection; } - + //-------------------------------------------------------------------- void SAL_CALL SelectionSupplier::addSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException) { OSL_ENSURE( false, "SelectionSupplier::removeSelectionChangeListener: no support!" ); // API bug: this should be a NoSupportException } - + //-------------------------------------------------------------------- void SAL_CALL SelectionSupplier::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException) { @@ -709,7 +709,7 @@ IMPL_LINK(DBTreeListBox, OnTimeOut, void*, /*EMPTY_ARG*/) { implStopSelectionTimer(); - m_aSelChangeHdl.Call( NULL ); + m_aSelChangeHdl.Call( NULL ); return 0L; } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index ad90d8a35..78632ef6a 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -192,8 +192,6 @@ namespace dbaui { pMenu.reset( new PopupMenu( ModuleRes( RID_MENU_APP_NEW ) ) ); - sal_Bool bHighContrast = isHighContrast(); - try { Reference 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; - if ( bHighContrast ) - nImageType |= ImageType::COLOR_HIGHCONTRAST; Sequence< ::rtl::OUString> aSeq(1); USHORT nCount = pMenu->GetItemCount(); diff --git a/dbaccess/source/ui/imagelists/dbimagelists.src b/dbaccess/source/ui/imagelists/dbimagelists.src index e296c6d0e..9c5d4d78a 100644 --- a/dbaccess/source/ui/imagelists/dbimagelists.src +++ b/dbaccess/source/ui/imagelists/dbimagelists.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index af22fc44d..c5f2afaa0 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -260,10 +260,6 @@ #define IMG_REPORTFOLDER_TREE_L RID_IMAGE_START + 40 #define IMG_QUERYFOLDER_TREE_L RID_IMAGE_START + 41 #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_CREATEFOLDER_SC RID_IMAGE_START + 49 #define FORM_TREE_ICON RID_IMAGE_START + 51 diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index 91d2d46b3..7c1f774af 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,9 +40,8 @@ namespace dbaui { DBG_NAME(OToolBoxHelper) OToolBoxHelper::OToolBoxHelper() - : m_bIsHiContrast(sal_False) - ,m_nSymbolsSize(-1 ) - ,m_pToolBox(NULL) + : m_nSymbolsSize(-1 ) + , m_pToolBox(NULL) { DBG_CTOR(OToolBoxHelper,NULL); @@ -56,21 +55,18 @@ namespace dbaui SvtMiscOptions().RemoveListenerLink( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) ); Application::RemoveEventListener( LINK( this, OToolBoxHelper, SettingsChanged ) ); DBG_DTOR(OToolBoxHelper,NULL); - } - + } + // ----------------------------------------------------------------------------- void OToolBoxHelper::checkImageList() { if ( m_pToolBox ) { sal_Int16 nCurSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize(); - if ( nCurSymbolsSize != m_nSymbolsSize || - m_bIsHiContrast != m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode() ) + if ( nCurSymbolsSize != m_nSymbolsSize ) { m_nSymbolsSize = nCurSymbolsSize; - m_bIsHiContrast = m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode(); - m_pToolBox->SetImageList( getImageList(m_nSymbolsSize) ); Size aTbOldSize = m_pToolBox->GetSizePixel(); adjustToolBoxSize(m_pToolBox); @@ -105,7 +101,7 @@ namespace dbaui ( pData->GetType() == DATACHANGED_DISPLAY )) && ( pData->GetFlags() & SETTINGS_STYLE ))) // check if imagelist changed - checkImageList(); + checkImageList(); } return 0L; @@ -117,7 +113,6 @@ namespace dbaui m_pToolBox = _pTB; if ( m_pToolBox ) { - // m_bIsHiContrast = m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode(); ConfigOptionsChanged(NULL); if ( bFirstTime ) adjustToolBoxSize(m_pToolBox); -- cgit v1.2.3