diff options
| -rw-r--r-- | dbaccess/source/ui/dlg/indexdialog.src | 5 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/sqlmessage.cxx | 7 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/sqlmessage.src | 17 |
3 files changed, 3 insertions, 26 deletions
diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src index ae8f80d6c616..f765ad0e667d 100644 --- a/dbaccess/source/ui/dlg/indexdialog.src +++ b/dbaccess/source/ui/dlg/indexdialog.src @@ -199,11 +199,6 @@ Image IMG_PKEYICON ImageBitmap = Bitmap { File = "pkey.bmp"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; -Image IMG_PKEYICON_SCH -{ - ImageBitmap = Bitmap { File = "pkey_sch.bmp"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; -}; ErrorBox ERR_NEED_INDEX_FIELDS { diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 0220c2691ade..a0f38a540db3 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -153,20 +153,17 @@ namespace { ::boost::shared_ptr< IImageProvider >* ppProvider( &m_pErrorImage ); USHORT nNormalImageID( BMP_EXCEPTION_ERROR ); - USHORT nHCImageID( BMP_EXCEPTION_ERROR_SCH ); switch ( _eType ) { case SQLExceptionInfo::SQL_WARNING: ppProvider = &m_pWarningsImage; nNormalImageID = BMP_EXCEPTION_WARNING; - nHCImageID = BMP_EXCEPTION_WARNING_SCH; break; case SQLExceptionInfo::SQL_CONTEXT: ppProvider = &m_pInfoImage; nNormalImageID = BMP_EXCEPTION_INFO; - nHCImageID = BMP_EXCEPTION_INFO_SCH; break; default: @@ -174,7 +171,9 @@ namespace } if ( !ppProvider->get() ) - ppProvider->reset( new ImageProvider( nNormalImageID, nHCImageID ) ); + // FIXME: remove second arg from ImageProvider. + // FIXME: It used to be high contrast + ppProvider->reset( new ImageProvider( nNormalImageID, nNormalImageID ) ); return *ppProvider; } diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src index af3d53f785dd..ede10863c152 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.src +++ b/dbaccess/source/ui/dlg/sqlmessage.src @@ -53,23 +53,6 @@ Image BMP_EXCEPTION_INFO ImageBitmap = Bitmap { File = "exinfo.bmp"; }; MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; }; -Image BMP_EXCEPTION_ERROR_SCH -{ - ImageBitmap = Bitmap { File = "exerror_sch.bmp"; }; - MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; -}; - -Image BMP_EXCEPTION_WARNING_SCH -{ - ImageBitmap = Bitmap { File = "exwarning_sch.bmp"; }; - MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; -}; - -Image BMP_EXCEPTION_INFO_SCH -{ - ImageBitmap = Bitmap { File = "exinfo_sch.bmp"; }; - MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; -}; ModalDialog DLG_SQLEXCEPTIONCHAIN { |