[Libreoffice-commits] .: framework/source

Caolán McNamara caolan at kemper.freedesktop.org
Thu Nov 11 07:46:45 PST 2010


 framework/source/uiconfiguration/imagemanagerimpl.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 81af3a6da8634bd8cd6ffd800d0ff68041e1b9d8
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Thu Nov 11 15:46:36 2010 +0000

    add in JoeP's extras

diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 94f462a..6988f75 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -88,8 +88,7 @@ using namespace ::cppu;
 // Image sizes for our toolbars/menus
 const sal_Int32 IMAGE_SIZE_NORMAL         = 16;
 const sal_Int32 IMAGE_SIZE_LARGE          = 26;
-const sal_Int16 MAX_IMAGETYPE_VALUE       = ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST|
-                                            ::com::sun::star::ui::ImageType::SIZE_LARGE;
+const sal_Int16 MAX_IMAGETYPE_VALUE       = ::com::sun::star::ui::ImageType::SIZE_LARGE;
 
 static const char   IMAGE_FOLDER[]        = "images";
 static const char   BITMAPS_FOLDER[]      = "Bitmaps";
@@ -98,13 +97,13 @@ static const char   IMAGE_EXTENSION[]     = ".png";
 static const char*  IMAGELIST_XML_FILE[]  =
 {
     "sc_imagelist.xml",
-    "lc_imagelist.xml",
+    "lc_imagelist.xml"
 };
 
 static const char*  BITMAP_FILE_NAMES[]   =
 {
     "sc_userimages.png",
-    "lc_userimages.png",
+    "lc_userimages.png"
 };
 
 namespace framework
@@ -115,7 +114,7 @@ namespace framework
     static const char* ImageType_Prefixes[ImageType_COUNT] =
     {
         "res/commandimagelist/sc_",
-        "res/commandimagelist/lc_",
+        "res/commandimagelist/lc_"
     };
 
 typedef GraphicNameAccess CmdToXGraphicNameAccess;


More information about the Libreoffice-commits mailing list