[Libreoffice-commits] .: dbaccess/source reportdesign/inc reportdesign/source
Sebastian Spaeth
spaetz at kemper.freedesktop.org
Tue Nov 16 06:13:42 PST 2010
dbaccess/source/ui/dlg/indexdialog.cxx | 3
dbaccess/source/ui/imagelists/dbimagelists.src | 88 -------------------------
dbaccess/source/ui/inc/dbu_resource.hrc | 55 +++++----------
reportdesign/inc/RptResId.hrc | 10 +-
reportdesign/source/ui/dlg/GroupsSorting.cxx | 9 +-
reportdesign/source/ui/dlg/GroupsSorting.src | 58 ----------------
6 files changed, 32 insertions(+), 191 deletions(-)
New commits:
commit f3ae562680e574664fc0e5dda78ff01b730ae265
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Tue Nov 16 15:13:11 2010 +0100
Remove more _HC _SHC uses
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 0aa5e8b..997f0c8 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -316,8 +316,7 @@ DBG_NAME(DbaIndexDialog)
//------------------------------------------------------------------
void DbaIndexDialog::fillIndexList()
{
- sal_Bool bHiContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
- Image aPKeyIcon(ModuleRes( bHiContrast ? IMG_PKEYICON_SCH : IMG_PKEYICON));
+ Image aPKeyIcon(ModuleRes( IMG_PKEYICON ));
// fill the list with the index names
m_aIndexes.Clear();
Indexes::iterator aIndexLoop = m_pIndexes->begin();
diff --git a/dbaccess/source/ui/imagelists/dbimagelists.src b/dbaccess/source/ui/imagelists/dbimagelists.src
index c579bc1..91bda09 100644
--- a/dbaccess/source/ui/imagelists/dbimagelists.src
+++ b/dbaccess/source/ui/imagelists/dbimagelists.src
@@ -56,13 +56,6 @@ ImageList IMG_INDEX_DLG_SC
IL_TOOL_2 ;
};
-ImageList IMG_INDEX_DLG_SCH
-{
- MASKCOLOR;
- prefix = "sch";
- IL_TOOL_2 ;
-};
-
ImageList IMG_INDEX_DLG_LC
{
MASKCOLOR;
@@ -82,41 +75,21 @@ Image IMG_FORMFOLDER_TREE_L
ImageBitmap = Bitmap { File = "forms_32"; };
MASKCOLOR;
};
-Image IMG_FORMFOLDER_TREE_LHC
-{
- ImageBitmap = Bitmap { File = "forms_32_h"; };
- MASKCOLOR;
-};
Image IMG_REPORTFOLDER_TREE_L
{
ImageBitmap = Bitmap { File = "reports_32"; };
MASKCOLOR;
};
-Image IMG_REPORTFOLDER_TREE_LHC
-{
- ImageBitmap = Bitmap { File = "reports_32_h"; };
- MASKCOLOR;
-};
Image IMG_QUERYFOLDER_TREE_L
{
ImageBitmap = Bitmap { File = "queries_32"; };
MASKCOLOR;
};
-Image IMG_QUERYFOLDER_TREE_LHC
-{
- ImageBitmap = Bitmap { File = "queries_32_h"; };
- MASKCOLOR;
-};
Image IMG_TABLEFOLDER_TREE_L
{
ImageBitmap = Bitmap { File = "tables_32"; };
MASKCOLOR;
};
-Image IMG_TABLEFOLDER_TREE_LHC
-{
- ImageBitmap = Bitmap { File = "tables_32_h"; };
- MASKCOLOR;
-};
//========================================================================
//= database object icons
@@ -130,12 +103,6 @@ Image DATABASE_TREE_ICON
MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
};
-Image DATABASE_TREE_ICON_SCH
-{
- ImageBitmap = Bitmap { File = "db_sch.bmp"; };
- MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
-};
-
//------------------------------------------------------------------------
// tables and table folders
@@ -145,24 +112,12 @@ Image TABLE_TREE_ICON
MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
-Image TABLE_TREE_ICON_SCH
-{
- ImageBitmap = Bitmap { File = "sxh03188.png"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
-
Image TABLEFOLDER_TREE_ICON
{
ImageBitmap = Bitmap { File = "sx03187.png"; };
MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
-Image TABLEFOLDER_TREE_ICON_SCH
-{
- ImageBitmap = Bitmap { File = "sxh03187.png"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
-
//------------------------------------------------------------------------
// views
@@ -172,12 +127,6 @@ Image VIEW_TREE_ICON
MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
-Image VIEW_TREE_ICON_SCH
-{
- ImageBitmap = Bitmap { File = "sxh16670.png"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
-
//------------------------------------------------------------------------
// queries and query folders
@@ -187,24 +136,12 @@ Image QUERY_TREE_ICON
MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
-Image QUERY_TREE_ICON_SCH
-{
- ImageBitmap = Bitmap { File = "sxh03202.bmp"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
-
Image QUERYFOLDER_TREE_ICON
{
ImageBitmap = Bitmap { File = "sx03201.bmp"; };
MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
-Image QUERYFOLDER_TREE_ICON_SCH
-{
- ImageBitmap = Bitmap { File = "sxh03201.bmp"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
-
//------------------------------------------------------------------------
// forms and form folders
@@ -214,24 +151,12 @@ Image FORM_TREE_ICON
MASKCOLOR;
};
-Image FORM_TREE_ICON_SCH
-{
- ImageBitmap = Bitmap { File = "form_16_h"; };
- MASKCOLOR;
-};
-
Image FORMFOLDER_TREE_ICON
{
ImageBitmap = Bitmap { File = "forms_16"; };
MASKCOLOR;
};
-Image FORMFOLDER_TREE_ICON_SCH
-{
- ImageBitmap = Bitmap { File = "forms_16_h"; };
- MASKCOLOR;
-};
-
//------------------------------------------------------------------------
// reports and report folders
@@ -241,22 +166,9 @@ Image REPORT_TREE_ICON
MASKCOLOR;
};
-Image REPORT_TREE_ICON_SCH
-{
- ImageBitmap = Bitmap { File = "report_16_h"; };
- MASKCOLOR;
-};
Image REPORTFOLDER_TREE_ICON
{
ImageBitmap = Bitmap { File = "reports_16"; };
MASKCOLOR;
};
-Image REPORTFOLDER_TREE_ICON_SCH
-{
- ImageBitmap = Bitmap { File = "reports_16_h"; };
- MASKCOLOR;
-};
-
-//========================================================================
-
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 52edf0f..ef5efc0 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -249,40 +249,27 @@
// free
// free
#define IMG_PKEYICON RID_IMAGE_START + 12
-#define REPORTFOLDER_TREE_ICON_SCH RID_IMAGE_START + 13
-#define FORMFOLDER_TREE_ICON_SCH RID_IMAGE_START + 14
-#define IMG_DATABASE_CONNECTED RID_IMAGE_START + 15
-#define QUERYFOLDER_TREE_ICON_SCH RID_IMAGE_START + 16
-#define TABLEFOLDER_TREE_ICON_SCH RID_IMAGE_START + 17
// free
-#define DATABASE_TREE_ICON_SCH RID_IMAGE_START + 19
-#define IMG_DATABASE_CONNECTED_SCH RID_IMAGE_START + 20
-#define TABLE_TREE_ICON_SCH RID_IMAGE_START + 21
-#define VIEW_TREE_ICON_SCH RID_IMAGE_START + 22
-#define QUERY_TREE_ICON_SCH RID_IMAGE_START + 23
-#define REPORTFOLDER_TREE_ICON RID_IMAGE_START + 24
// free
+#define IMG_DATABASE_CONNECTED RID_IMAGE_START + 15
// free
+// ...
// free
-#define BMP_EXCEPTION_ERROR_SCH RID_IMAGE_START + 28
-#define BMP_EXCEPTION_WARNING_SCH RID_IMAGE_START + 29
-#define BMP_EXCEPTION_INFO_SCH RID_IMAGE_START + 30
-#define IMG_PKEYICON_SCH RID_IMAGE_START + 31
-#define IMG_JOINS_H RID_IMAGE_START + 32
+#define IMG_JOINS_H RID_IMAGE_START + 32
#define IMG_FORMFOLDER_TREE_L RID_IMAGE_START + 39
#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
-#define IMG_FORMFOLDER_TREE_LHC RID_IMAGE_START + 43
-#define IMG_REPORTFOLDER_TREE_LHC RID_IMAGE_START + 44
-#define IMG_QUERYFOLDER_TREE_LHC RID_IMAGE_START + 45
-#define IMG_TABLEFOLDER_TREE_LHC RID_IMAGE_START + 46
+// 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
#define REPORT_TREE_ICON RID_IMAGE_START + 52
-#define FORM_TREE_ICON_SCH RID_IMAGE_START + 53
-#define REPORT_TREE_ICON_SCH RID_IMAGE_START + 54
+// free
+// free
#define FORMFOLDER_TREE_ICON RID_IMAGE_START + 55
@@ -290,17 +277,17 @@
// image lists
#define IMG_JOINS RID_IMAGELIST_START + 0
#define IMG_INDEX_DLG_SC RID_IMAGELIST_START + 1
-#define IMG_INDEX_DLG_SCH RID_IMAGELIST_START + 2
+// free
#define IMG_INDEX_DLG_LC RID_IMAGELIST_START + 3
-#define IMG_INDEX_DLG_LCH RID_IMAGELIST_START + 4
+// free
#define IMP_FORM_SC RID_IMAGELIST_START + 5
-#define IMP_FORM_SCH RID_IMAGELIST_START + 6
+// free
#define IMP_FORM_LC RID_IMAGELIST_START + 7
-#define IMP_FORM_LCH RID_IMAGELIST_START + 8
+// free
#define IMP_REPORT_SC RID_IMAGELIST_START + 9
-#define IMP_REPORT_SCH RID_IMAGELIST_START + 10
+// free
#define IMP_REPORT_LC RID_IMAGELIST_START + 11
-#define IMP_REPORT_LCH RID_IMAGELIST_START + 12
+// free
//========================================================================
// menues
@@ -385,17 +372,17 @@
// free
#define RSC_QUERY_OBJECT_TYPE RID_UNTYPED_START + 4
#define IMG_TABLESUBCRIPTION_SC RID_UNTYPED_START + 5
-#define IMG_TABLESUBCRIPTION_SCH RID_UNTYPED_START + 6
+// free
#define IMG_TABLESUBCRIPTION_LC RID_UNTYPED_START + 7
-#define IMG_TABLESUBCRIPTION_LCH RID_UNTYPED_START + 8
+// free
#define IMG_QUERYADMINISTRATION_SC RID_UNTYPED_START + 9
-#define IMG_QUERYADMINISTRATION_SCH RID_UNTYPED_START + 10
+// free
#define IMG_QUERYADMINISTRATION_LC RID_UNTYPED_START + 11
-#define IMG_QUERYADMINISTRATION_LCH RID_UNTYPED_START + 12
+// free
#define IMG_DOCUMENTLINKS_SC RID_UNTYPED_START + 13
-#define IMG_DOCUMENTLINKS_SCH RID_UNTYPED_START + 14
+// free
#define IMG_DOCUMENTLINKS_LC RID_UNTYPED_START + 15
-#define IMG_DOCUMENTLINKS_LCH RID_UNTYPED_START + 16
+// free
//========================================================================
// various
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index a848a5d..be9d14c 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -262,16 +262,16 @@
// image lists -----------------------------------------------------------------------
#define IMG_CONDFORMAT_DLG_SC (RID_IMAGELIST_START + 0)
-#define IMG_CONDFORMAT_DLG_SCH (RID_IMAGELIST_START + 1)
+// free
#define IMG_CONDFORMAT_DLG_LC (RID_IMAGELIST_START + 2)
-#define IMG_CONDFORMAT_DLG_LCH (RID_IMAGELIST_START + 3)
+// free
#define RID_SVXIMGLIST_RPTEXPL (RID_IMAGELIST_START + 4)
#define IMGLST_GROUPSORT_DLG_SC (RID_IMAGELIST_START + 6)
-#define IMGLST_GROUPSORT_DLG_SCH (RID_IMAGELIST_START + 7)
+// free
#define IMG_ADDFIELD_DLG_SC (RID_IMAGELIST_START + 8)
-#define IMG_ADDFIELD_DLG_SCH (RID_IMAGELIST_START + 9)
+// free
#define IMG_ADDFIELD_DLG_LC (RID_IMAGELIST_START + 10)
-#define IMG_ADDFIELD_DLG_LCH (RID_IMAGELIST_START + 11)
+// free
#define ADDFIELD_FL_HELP_SEPARATOR (RID_IMAGELIST_START + 12)
#define ADDFIELD_HELP_FIELD (RID_IMAGELIST_START + 13)
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 8609e8a..8adfd12 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -1467,16 +1467,17 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
}
}
-ImageList OGroupsSortingDialog::getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const
+/**
+ * @param _bHiContast (sic) unused noop. FIXME: please remove carefully
+ */
+ImageList OGroupsSortingDialog::getImageList(sal_Int16 _eBitmapSet,sal_Bool /*_bHiContast*/) const
{
sal_Int16 nN = IMG_CONDFORMAT_DLG_SC;
- sal_Int16 nH = IMG_CONDFORMAT_DLG_SCH;
if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
{
nN = IMG_CONDFORMAT_DLG_LC;
- nH = IMG_CONDFORMAT_DLG_LCH;
}
- return ImageList(ModuleRes( _bHiContast ? nH : nN ));
+ return ImageList(ModuleRes( nN ));
}
//------------------------------------------------------------------
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src
index af78f65..0d6910e 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.src
+++ b/reportdesign/source/ui/dlg/GroupsSorting.src
@@ -436,61 +436,3 @@ ImageList IMGLST_GROUPSORT_DLG_SC
prefix = "sc";
DEF_IL_GROUPSORT ;
};
-
-ImageList IMGLST_GROUPSORT_DLG_SCH
-{
- DEF_MASKCOLOR;
- prefix = "sch";
- DEF_IL_GROUPSORT ;
-};
-
-
-// Image IMG_GROUPSORT_MOVEUP
-// {
-// ImageBitmap = Bitmap
-// {
-// File = "reportgroupmoveup"; // reportdesign/res/...
-// };
-// DEF_MASKCOLOR;
-// };
-// Image IMG_GROUPSORT_MOVEDOWN
-// {
-// ImageBitmap = Bitmap
-// {
-// File = "reportgroupmovedown";
-// };
-// DEF_MASKCOLOR;
-// };
-// Image IMG_GROUPSORT_DELETE
-// {
-// ImageBitmap = Bitmap
-// {
-// File = "reportgroupdelete";
-// };
-// DEF_MASKCOLOR;
-// };
-//
-// Image IMG_GROUPSORT_MOVEUP_H
-// {
-// ImageBitmap = Bitmap
-// {
-// File = "reportgroupmoveup_h"; // reportdesign/res/...
-// };
-// DEF_MASKCOLOR;
-// };
-// Image IMG_GROUPSORT_MOVEDOWN_H
-// {
-// ImageBitmap = Bitmap
-// {
-// File = "reportgroupmovedown_h";
-// };
-// DEF_MASKCOLOR;
-// };
-// Image IMG_GROUPSORT_DELETE_H
-// {
-// ImageBitmap = Bitmap
-// {
-// File = "reportgroupdelete_h";
-// };
-// DEF_MASKCOLOR;
-// };
More information about the Libreoffice-commits
mailing list