[Libreoffice-commits] .: sw/inc sw/source

[Sebastian Spaeth]

 sw/inc/comcore.hrc             |    3 ---
 sw/source/core/view/viewsh.cxx |    9 ++-------
 2 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit b0ff351787f75ad42133e3235a8c6a9141e29f0d
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Tue Nov 16 11:08:17 2010 +0100

    Remove 2 more _HC references

diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index 3347161..d92a2c3 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -84,9 +84,6 @@
 #define STR_TABLE_NAME                      (RC_COMCORE_BEGIN + 46)
 #define STR_PARAGRAPH_UNDO                  (RC_COMCORE_BEGIN + 47)
 
-#define RID_GRAPHIC_REPLACEBMP_HC           (RC_COMCORE_BEGIN + 48)
-#define RID_GRAPHIC_ERRORBMP_HC             (RC_COMCORE_BEGIN + 49)
-
 // defines for the Autoformat Redline Comments
 #define STR_AUTOFMTREDL_DEL_EMPTY_PARA			0
 #define STR_AUTOFMTREDL_USE_REPLACE             1
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 55964a2..354f067 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -2294,26 +2294,21 @@ sal_Int32 ViewShell::GetPageNumAndSetOffsetForPDF( OutputDevice& rOut, const SwR
 const BitmapEx& ViewShell::GetReplacementBitmap( bool bIsErrorState )
 {
     BitmapEx** ppRet;
-    USHORT nResId = 0, nHCResId = 0;
+    USHORT nResId = 0;
     if( bIsErrorState )
     {
         ppRet = &pErrorBmp;
         nResId = RID_GRAPHIC_ERRORBMP;
-        nHCResId = RID_GRAPHIC_ERRORBMP_HC;
     }
     else
     {
         ppRet = &pReplaceBmp;
         nResId = RID_GRAPHIC_REPLACEBMP;
-        nHCResId = RID_GRAPHIC_REPLACEBMP_HC;
     }
 
     if( !*ppRet )
     {
-        USHORT nBmpResId =
-            Application::GetSettings().GetStyleSettings().GetHighContrastMode()
-                ? nHCResId : nResId;
-        *ppRet = new BitmapEx( SW_RES( nBmpResId ) );
+        *ppRet = new BitmapEx( SW_RES( nResId ) );
     }
     return **ppRet;
 }