[Libreoffice-commits] .: connectivity/source

[Sebastian Spaeth]

 connectivity/source/drivers/hsqldb/HConnection.cxx |   13 ++++++-------
 connectivity/source/drivers/hsqldb/hsqlui.hrc      |    1 -
 connectivity/source/drivers/hsqldb/hsqlui.src      |    7 +------
 3 files changed, 7 insertions(+), 14 deletions(-)

New commits:
commit 334438e184e094353de22d2f9d10aad00f0489dc
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Thu Nov 11 13:10:14 2010 +0100

    Remove one more hi-contrast image loading instance
    
    And remove the definitions of the hi-contrast image too. High contrast
    is just another theme and should not be handled like this.

diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 543e6b3..6ac46f0 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -359,13 +359,12 @@ namespace connectivity { namespace hsqldb
 
             // assemble the image URL
             ::rtl::OUStringBuffer aImageURL;
-            aImageURL.appendAscii( "private:graphicrepository/" );  // load the graphic from the global graphic repository
-            aImageURL.appendAscii( "database/" );                   // the relative path within the images.zip
-            if ( _ColorMode == GraphicColorMode::NORMAL )
-                aImageURL.appendAscii( LINKED_TEXT_TABLE_IMAGE_RESOURCE );
-            else
-                aImageURL.appendAscii( LINKED_TEXT_TABLE_IMAGE_RESOURCE_HC );
-                                                                    // the name of the graphic to use
+            // load the graphic from the global graphic repository
+            aImageURL.appendAscii( "private:graphicrepository/" );
+            // the relative path within the images.zip
+            aImageURL.appendAscii( "database/" );
+            aImageURL.appendAscii( LINKED_TEXT_TABLE_IMAGE_RESOURCE );
+            // the name of the graphic to use
             ::rtl::OUString sImageURL( aImageURL.makeStringAndClear() );
 
             // ask the provider to obtain a graphic
diff --git a/connectivity/source/drivers/hsqldb/hsqlui.hrc b/connectivity/source/drivers/hsqldb/hsqlui.hrc
index 052b603..e17ffb5 100644
--- a/connectivity/source/drivers/hsqldb/hsqlui.hrc
+++ b/connectivity/source/drivers/hsqldb/hsqlui.hrc
@@ -29,7 +29,6 @@
 #define CONNECTIVITY_HSQLUI_HRC
 
 #define LINKED_TEXT_TABLE_IMAGE_RESOURCE        "linked_text_table.png"
-#define LINKED_TEXT_TABLE_IMAGE_RESOURCE_HC     "linked_text_table_hc.png"
 
 #endif // CONNECTIVITY_HSQLUI_HRC
 
diff --git a/connectivity/source/drivers/hsqldb/hsqlui.src b/connectivity/source/drivers/hsqldb/hsqlui.src
index 0e0189c..27166ed 100644
--- a/connectivity/source/drivers/hsqldb/hsqlui.src
+++ b/connectivity/source/drivers/hsqldb/hsqlui.src
@@ -32,7 +32,7 @@
 /*  Note:
     The resource file built here (hsqldb.res, finally) is *not* included
     in the final OOo installation. Instead, it is only built to ensure that
-    the two images below are included in the application-wide image repository
+    the image below is included in the application-wide image repository
     (images.zip). This way, they can be accessed at runtime, but without the
     indirection via a resource file - the GraphicProvider service supports
     a "private:imagerepository/*" protocol meanwhile, which allows this.
@@ -46,8 +46,3 @@ Image 1000
 {
     ImageBitmap = Bitmap { File = LINKED_TEXT_TABLE_IMAGE_RESOURCE; };
 };
-
-Image 1001
-{
-    ImageBitmap = Bitmap { File = LINKED_TEXT_TABLE_IMAGE_RESOURCE_HC; };
-};