summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dbaccess/inc/ToolBoxHelper.hxx4
-rw-r--r--dbaccess/source/ui/app/AppIconControl.cxx10
-rw-r--r--dbaccess/source/ui/control/toolboxcontroller.cxx4
-rw-r--r--dbaccess/source/ui/inc/dbu_resource.hrc4
-rw-r--r--dbaccess/source/ui/misc/ToolBoxHelper.cxx11
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx6
6 files changed, 14 insertions, 25 deletions
diff --git a/dbaccess/inc/ToolBoxHelper.hxx b/dbaccess/inc/ToolBoxHelper.hxx
index 0888ded71792..280d523a8ca0 100644
--- a/dbaccess/inc/ToolBoxHelper.hxx
+++ b/dbaccess/inc/ToolBoxHelper.hxx
@@ -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 d63f23a2dc4a..2fb94bb6b77f 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -57,16 +57,16 @@ 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 ) ) );
+ String( ModuleRes( aCategories[i].nLabelResId ) ) ,
+ Image( ModuleRes( aCategories[i].nImageResId ) ) );
if ( pEntry )
pEntry->SetUserData( new ElementType( aCategories[i].eType ) );
}
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 57618dea47b1..5be041603daf 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -192,8 +192,6 @@ namespace dbaui
{
pMenu.reset( new PopupMenu( ModuleRes( RID_MENU_APP_NEW ) ) );
- sal_Bool bHighContrast = isHighContrast();
-
try
{
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;
- if ( bHighContrast )
- nImageType |= ImageType::COLOR_HIGHCONTRAST;
Sequence< ::rtl::OUString> aSeq(1);
USHORT nCount = pMenu->GetItemCount();
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index c81a77c9bbe6..a1f852d2130e 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 18db86b6cf07..4e9c5b6c565a 100644
--- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx
+++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
@@ -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);
@@ -64,12 +63,9 @@ namespace dbaui
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();
@@ -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);
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index dbc44dc17d60..1294e97da483 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -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();
for (USHORT i = 0; i < nCount; ++i)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 22:25:22 +0000