[Libreoffice-commits] .: padmin/source

[Sebastian Spaeth]

 padmin/source/padialog.cxx |   15 +++------------
 padmin/source/padialog.hrc |    8 ++++----
 padmin/source/padialog.src |   21 ---------------------
 3 files changed, 7 insertions(+), 37 deletions(-)

New commits:
commit 247e4d86b634c83649f0a9b452ce5c45875ca8fe
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Tue Nov 16 16:37:14 2010 +0100

    Remove some more _HC uses in padmin

diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 36a0e94..9ee6676 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -109,18 +109,9 @@ PADialog::PADialog( Window* pParent, BOOL /*bAdmin*/ ) :
 
 void PADialog::updateSettings()
 {
-    if( ! GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        m_aPrinterImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PRINTER ) ) );
-        m_aFaxImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_FAX ) ) );
-        m_aPdfImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PDF ) ) );
-    }
-    else
-    {
-        m_aPrinterImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PRINTER_HC ) ) );
-        m_aFaxImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_FAX_HC ) ) );
-        m_aPdfImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PDF_HC ) ) );
-    }
+    m_aPrinterImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PRINTER ) ) );
+    m_aFaxImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_FAX ) ) );
+    m_aPdfImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PDF ) ) );
 }
 
 void PADialog::Init()
diff --git a/padmin/source/padialog.hrc b/padmin/source/padialog.hrc
index bd53ebd..c835847 100644
--- a/padmin/source/padialog.hrc
+++ b/padmin/source/padialog.hrc
@@ -190,13 +190,13 @@
 #define RID_TXT_FONT_REGULAR				 	 1095
 
 #define RID_BMP_SMALL_PRINTER					 1096
-#define RID_BMP_SMALL_PRINTER_HC                 1097
+// free
 #define RID_BMP_SMALL_FAX					 	 1098
-#define RID_BMP_SMALL_FAX_HC                     1099
+// free
 #define RID_BMP_SMALL_PDF						 1100
-#define RID_BMP_SMALL_PDF_HC                     1101
+// free
 #define RID_BMP_PRINTER					 	     1102
-#define RID_BMP_PRINTER_HC                       1103
+// free
 
 #define RID_AFMERROR_OK                         1300
 #define RID_AFMERROR_NO_FONT_NAME               1301
diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src
index 0cd2d40..41966b7 100644
--- a/padmin/source/padialog.src
+++ b/padmin/source/padialog.src
@@ -476,27 +476,6 @@ Bitmap RID_BMP_PRINTER
     File = "printer_large.png";
 };
 
-Bitmap RID_BMP_SMALL_PRINTER_HC
-{
-    File = "printer_16_h.png";
-};
-
-Bitmap RID_BMP_SMALL_FAX_HC
-{
-    File = "fax_16_h.png";
-};
-
-Bitmap RID_BMP_SMALL_PDF_HC
-{
-    File = "printpdf_16_h.png";
-};
-
-Bitmap RID_BMP_PRINTER_HC
-{
-    File = "printer_40x48_h.png";
-};
-
-
 String RID_AFMERROR_OK
 {
     Text [ en-US ] = "No error";