openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msei...@apache.org
Subject svn commit: r1864131 - in /openoffice/branches/AOO42X: ./ main/default_images/sfx2/res/symphony/morebutton_h.png main/default_images/sfx2/res/symphony/open_more_hc.png main/sfx2/source/sidebar/Sidebar.src main/sfx2/source/sidebar/Theme.cxx
Date Thu, 01 Aug 2019 08:32:32 GMT
Author: mseidel
Date: Thu Aug  1 08:32:32 2019
New Revision: 1864131

URL: http://svn.apache.org/viewvc?rev=1864131&view=rev
Log:
Merged r1864074, r1864095, r1864107 and r1864127 from trunk

Added high contrast icon for sidebar menu
Cleaned up whitespace. Use correct icon for high contrast.
Update graphic for high contrast
Add close button for high contrast in side bar

Added:
    openoffice/branches/AOO42X/main/default_images/sfx2/res/symphony/open_more_hc.png
      - copied unchanged from r1864074, openoffice/trunk/main/default_images/sfx2/res/symphony/open_more_hc.png
Modified:
    openoffice/branches/AOO42X/   (props changed)
    openoffice/branches/AOO42X/main/default_images/sfx2/res/symphony/morebutton_h.png
    openoffice/branches/AOO42X/main/sfx2/source/sidebar/Sidebar.src
    openoffice/branches/AOO42X/main/sfx2/source/sidebar/Theme.cxx

Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  1 08:32:32 2019
@@ -9,4 +9,4 @@
 /openoffice/branches/ia2:1417739-1541842
 /openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
 /openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857222,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,185
 9839,1860288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567,1861660,1861664-1861665,1861790,1861946,1861956,1862194,1862234,1862415-1862416,1862420,1862666,1862697,1862776,1862940,1862964,1862974,1863005,1863007,1863057,1863087-1863088,1863107,1863135,1863197,1863408,1863510,1863520,1863528,1863573-1863575,1863578,1863688,1863829-1863830,1863873,1863875,1863880,1863883,1863962,1863970,1863972-1863973,1864075
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857222,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,185
 9839,1860288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567,1861660,1861664-1861665,1861790,1861946,1861956,1862194,1862234,1862415-1862416,1862420,1862666,1862697,1862776,1862940,1862964,1862974,1863005,1863007,1863057,1863087-1863088,1863107,1863135,1863197,1863408,1863510,1863520,1863528,1863573-1863575,1863578,1863688,1863829-1863830,1863873,1863875,1863880,1863883,1863962,1863970,1863972-1863973,1864074-1864075,1864095,1864107,1864127

Modified: openoffice/branches/AOO42X/main/default_images/sfx2/res/symphony/morebutton_h.png
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/default_images/sfx2/res/symphony/morebutton_h.png?rev=1864131&r1=1864130&r2=1864131&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/AOO42X/main/sfx2/source/sidebar/Sidebar.src
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/sfx2/source/sidebar/Sidebar.src?rev=1864131&r1=1864130&r2=1864131&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/sfx2/source/sidebar/Sidebar.src (original)
+++ openoffice/branches/AOO42X/main/sfx2/source/sidebar/Sidebar.src Thu Aug  1 08:32:32 2019
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,303 +7,306 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
+
+
 #include "Sidebar.hrc"
 
 Resource RID_SIDEBAR_RESOURCE
 {
-    Image IMAGE_SIDEBAR_PLUS
-    {
-        ImageBitmap = Bitmap { File = "plus.png" ;};
-    };
-    
-    Image IMAGE_SIDEBAR_PLUS_HC
-    {
-        ImageBitmap = Bitmap { File = "plus_hc.png" ;};
-    };
-    
-    Image IMAGE_SIDEBAR_MINUS
-    {
-        ImageBitmap = Bitmap { File = "minus.png" ;};
-    };
-    
-    Image IMAGE_SIDEBAR_MINUS_HC
-    {
-        ImageBitmap = Bitmap { File = "minus_hc.png" ;};
-    };
-    
-    Image IMAGE_SIDEBAR_GRIP
-    {
-        ImageBitmap = Bitmap { File = "grip.png" ;};
-    };
-    
-    Image IMAGE_SIDEBAR_GRIP_HC
-    {
-        ImageBitmap = Bitmap { File = "grip_hc.png" ;};
-    };
-    
-    Image IMAGE_SIDEBAR_MENU
-    {
-        ImageBitmap = Bitmap { File = "symphony/open_more.png" ;};
-    };
-    
-    Image IMAGE_SIDEBAR_MENU_HC
-    {
-        ImageBitmap = Bitmap { File = "menu_hc.png" ;};
-    };
-
-    Image IMAGE_SIDEBAR_DETAIL_DIALOG
-    {
-        ImageBitmap = Bitmap { File = "symphony/morebutton.png" ;};
-    };
-    
-    Image IMAGE_SIDEBAR_DETAIL_DIALOG_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/morebutton_h.png" ;};
-    };
-
-    Image IMAGE_SIDEBAR_TOOLBOX_SEPARATOR
-    {
-        ImageBitmap = Bitmap { File = "separator.png" ;};
-    };
-
-    Image IMAGE_SIDEBAR_DECK_3D_LARGE
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-3d-large.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_3D_LARGE_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-3d-large-hc.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_3D_SMALL
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-3d-small.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_3D_SMALL_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-3d-small-hc.png" ;};
-    };
-
-    Image IMAGE_SIDEBAR_DECK_ANIMATION_LARGE
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-animation-large.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_ANIMATION_LARGE_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-animation-large-hc.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_ANIMATION_SMALL
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-animation-small.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_ANIMATION_SMALL_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-animation-small-hc.png" ;};
-    };
-
-    Image IMAGE_SIDEBAR_DECK_COLORS_LARGE
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-colors-large.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_COLORS_LARGE_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-colors-large-hc.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_COLORS_SMALL
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-colors-small.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_COLORS_SMALL_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-colors-small-hc.png" ;};
-    };
-
-    Image IMAGE_SIDEBAR_DECK_EYEDROPPER_LARGE
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-large.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_EYEDROPPER_LARGE_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-large-hc.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_EYEDROPPER_SMALL
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-small.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_EYEDROPPER_SMALL_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-small-hc.png" ;};
-    };
-
-    Image IMAGE_SIDEBAR_DECK_GALLERY_LARGE
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-large.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_GALLERY_LARGE_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-large-hc.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_GALLERY_SMALL
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-small.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_GALLERY_SMALL_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-small-hc.png" ;};
-    };
-
-    Image IMAGE_SIDEBAR_DECK_IMGANIM_LARGE
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-large.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_IMGANIM_LARGE_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-large-hc.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_IMGANIM_SMALL
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-small.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_IMGANIM_SMALL_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-small-hc.png" ;};
-    };
-
-    Image IMAGE_SIDEBAR_DECK_NAVIGATOR_LARGE
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-large.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_NAVIGATOR_LARGE_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-large-hc.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_NAVIGATOR_SMALL
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-small.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_NAVIGATOR_SMALL_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-small-hc.png" ;};
-    };
-
-    Image IMAGE_SIDEBAR_PROPERTIES_DECK_LARGE
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-property-large.png" ;};
-    };
-    Image IMAGE_SIDEBAR_PROPERTIES_DECK_LARGE_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-property-large-hc.png" ;};
-    };
-    Image IMAGE_SIDEBAR_PROPERTIES_DECK_SMALL
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-property-small.png" ;};
-    };
-    Image IMAGE_SIDEBAR_PROPERTIES_DECK_SMALL_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-property-small-hc.png" ;};
-    };
-
-    Image IMAGE_SIDEBAR_DECK_STYLE_LARGE
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-style-large.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_STYLE_LARGE_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-style-large-hc.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_STYLE_SMALL
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-style-small.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_STYLE_SMALL_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-style-small-hc.png" ;};
-    };
-
-    Image IMAGE_SIDEBAR_DECK_TEMPLATE_LARGE
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-template-large.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_TEMPLATE_LARGE_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-template-large-hc.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_TEMPLATE_SMALL
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-template-small.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_TEMPLATE_SMALL_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-template-small-hc.png" ;};
-    };
-
-    Image IMAGE_SIDEBAR_DECK_TRANSITION_LARGE
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-transition-large.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_TRANSITION_LARGE_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-transition-large-hc.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_TRANSITION_SMALL
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-transition-small.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_TRANSITION_SMALL_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-transition-small-hc.png" ;};
-    };
-
-    Image IMAGE_SIDEBAR_DECK_FUNCTIONS_LARGE
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-functions-large.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_FUNCTIONS_LARGE_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-functions-large-hc.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-functions-small.png" ;};
-    };
-    Image IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL_HC
-    {
-        ImageBitmap = Bitmap { File = "symphony/sidebar-functions-small-hc.png" ;};
-    };
-
-    String STRING_CUSTOMIZATION
-    {
-	Text [en-US] = "Customization";
-    };
-    String STRING_RESTORE
-    {
-	Text [en-US] = "Restore Default";
-    };
+	Image IMAGE_SIDEBAR_PLUS
+	{
+		ImageBitmap = Bitmap { File = "plus.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_PLUS_HC
+	{
+		ImageBitmap = Bitmap { File = "plus_hc.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_MINUS
+	{
+		ImageBitmap = Bitmap { File = "minus.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_MINUS_HC
+	{
+		ImageBitmap = Bitmap { File = "minus_hc.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_GRIP
+	{
+		ImageBitmap = Bitmap { File = "grip.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_GRIP_HC
+	{
+		ImageBitmap = Bitmap { File = "grip_hc.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_MENU
+	{
+		ImageBitmap = Bitmap { File = "symphony/open_more.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_MENU_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/open_more_hc.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_DETAIL_DIALOG
+	{
+		ImageBitmap = Bitmap { File = "symphony/morebutton.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_DETAIL_DIALOG_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/morebutton_h.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_TOOLBOX_SEPARATOR
+	{
+		ImageBitmap = Bitmap { File = "separator.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_DECK_3D_LARGE
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-3d-large.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_3D_LARGE_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-3d-large-hc.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_3D_SMALL
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-3d-small.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_3D_SMALL_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-3d-small-hc.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_DECK_ANIMATION_LARGE
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-animation-large.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_ANIMATION_LARGE_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-animation-large-hc.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_ANIMATION_SMALL
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-animation-small.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_ANIMATION_SMALL_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-animation-small-hc.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_DECK_COLORS_LARGE
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-colors-large.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_COLORS_LARGE_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-colors-large-hc.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_COLORS_SMALL
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-colors-small.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_COLORS_SMALL_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-colors-small-hc.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_DECK_EYEDROPPER_LARGE
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-large.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_EYEDROPPER_LARGE_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-large-hc.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_EYEDROPPER_SMALL
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-small.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_EYEDROPPER_SMALL_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-small-hc.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_DECK_GALLERY_LARGE
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-large.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_GALLERY_LARGE_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-large-hc.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_GALLERY_SMALL
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-small.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_GALLERY_SMALL_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-small-hc.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_DECK_IMGANIM_LARGE
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-large.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_IMGANIM_LARGE_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-large-hc.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_IMGANIM_SMALL
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-small.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_IMGANIM_SMALL_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-small-hc.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_DECK_NAVIGATOR_LARGE
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-large.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_NAVIGATOR_LARGE_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-large-hc.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_NAVIGATOR_SMALL
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-small.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_NAVIGATOR_SMALL_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-small-hc.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_PROPERTIES_DECK_LARGE
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-property-large.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_PROPERTIES_DECK_LARGE_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-property-large-hc.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_PROPERTIES_DECK_SMALL
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-property-small.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_PROPERTIES_DECK_SMALL_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-property-small-hc.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_DECK_STYLE_LARGE
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-style-large.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_STYLE_LARGE_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-style-large-hc.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_STYLE_SMALL
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-style-small.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_STYLE_SMALL_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-style-small-hc.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_DECK_TEMPLATE_LARGE
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-template-large.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_TEMPLATE_LARGE_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-template-large-hc.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_TEMPLATE_SMALL
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-template-small.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_TEMPLATE_SMALL_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-template-small-hc.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_DECK_TRANSITION_LARGE
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-transition-large.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_TRANSITION_LARGE_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-transition-large-hc.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_TRANSITION_SMALL
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-transition-small.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_TRANSITION_SMALL_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-transition-small-hc.png" ;} ;
+	};
+
+	Image IMAGE_SIDEBAR_DECK_FUNCTIONS_LARGE
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-functions-large.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_FUNCTIONS_LARGE_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-functions-large-hc.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-functions-small.png" ;} ;
+	};
+	Image IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL_HC
+	{
+		ImageBitmap = Bitmap { File = "symphony/sidebar-functions-small-hc.png" ;} ;
+	};
+
+	String STRING_CUSTOMIZATION
+	{
+		Text [en-US] = "Customization" ;
+	};
+	String STRING_RESTORE
+	{
+		Text [en-US] = "Restore Default" ;
+	};
 };
 
 String SFX_STR_SIDEBAR_MORE_OPTIONS
 {
-    Text [en-US] = "More Options";
+	Text [en-US] = "More Options" ;
 };
 
 String SFX_STR_SIDEBAR_CLOSE_DECK
 {
-    Text [en-US] = "Close Sidebar Deck";
+	Text [en-US] = "Close Sidebar Deck" ;
 };
 
 String SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX
 {
-    Text [en-US] = "Panel: ";
+	Text [en-US] = "Panel: " ;
 };
 
+// ********************************************************************** EOF

Modified: openoffice/branches/AOO42X/main/sfx2/source/sidebar/Theme.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/sfx2/source/sidebar/Theme.cxx?rev=1864131&r1=1864130&r2=1864131&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/sfx2/source/sidebar/Theme.cxx (original)
+++ openoffice/branches/AOO42X/main/sfx2/source/sidebar/Theme.cxx Thu Aug  1 08:32:32 2019
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,18 +7,20 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
+
+
 #include "precompiled_sfx2.hxx"
 
 #include "sfx2/sidebar/Theme.hxx"
@@ -39,1148 +41,1078 @@ namespace sfx2 { namespace sidebar {
 ::rtl::Reference<Theme> Theme::mpInstance;
 
 
-
-
 Theme& Theme::GetCurrentTheme (void)
 {
-    if ( ! mpInstance.is())
-    {
-        mpInstance.set(new Theme());
-        mpInstance->InitializeTheme();
-    }
-    return *mpInstance;
+	if ( ! mpInstance.is())
+	{
+		mpInstance.set(new Theme());
+		mpInstance->InitializeTheme();
+	}
+	return *mpInstance;
 }
 
 
-
-
 Theme::Theme (void)
-    : ThemeInterfaceBase(m_aMutex),
-      maImages(),
-      maColors(),
-      maPaints(),
-      maIntegers(),
-      maBooleans(),
-      mbIsHighContrastMode(Application::GetSettings().GetStyleSettings().GetHighContrastMode()),
-      mbIsHighContrastModeSetManually(false),
-      maPropertyNameToIdMap(),
-      maPropertyIdToNameMap(),
-      maRawValues(),
-      maChangeListeners(),
-      maVetoableListeners()
+	: ThemeInterfaceBase(m_aMutex),
+	  maImages(),
+	  maColors(),
+	  maPaints(),
+	  maIntegers(),
+	  maBooleans(),
+	  mbIsHighContrastMode(Application::GetSettings().GetStyleSettings().GetHighContrastMode()),
+	  mbIsHighContrastModeSetManually(false),
+	  maPropertyNameToIdMap(),
+	  maPropertyIdToNameMap(),
+	  maRawValues(),
+	  maChangeListeners(),
+	  maVetoableListeners()
 
 {
-    SetupPropertyMaps();
+	SetupPropertyMaps();
 }
 
 
-
-
 Theme::~Theme (void)
 {
 }
 
 
-
-
 Image Theme::GetImage (const ThemeItem eItem)
 {
-    const PropertyType eType (GetPropertyType(eItem));
-    OSL_ASSERT(eType==PT_Image);
-    const sal_Int32 nIndex (GetIndex(eItem, eType));
-    const Theme& rTheme (GetCurrentTheme());
-    return rTheme.maImages[nIndex];
+	const PropertyType eType (GetPropertyType(eItem));
+	OSL_ASSERT(eType==PT_Image);
+	const sal_Int32 nIndex (GetIndex(eItem, eType));
+	const Theme& rTheme (GetCurrentTheme());
+	return rTheme.maImages[nIndex];
 }
 
 
-
-
 Color Theme::GetColor (const ThemeItem eItem)
 {
-    const PropertyType eType (GetPropertyType(eItem));
-    OSL_ASSERT(eType==PT_Color || eType==PT_Paint);
-    const sal_Int32 nIndex (GetIndex(eItem, eType));
-    const Theme& rTheme (GetCurrentTheme());
-    if (eType == PT_Color)
-        return rTheme.maColors[nIndex];
-    else if (eType == PT_Paint)
-        return rTheme.maPaints[nIndex].GetColor();
-    else
-        return COL_WHITE;
+	const PropertyType eType (GetPropertyType(eItem));
+	OSL_ASSERT(eType==PT_Color || eType==PT_Paint);
+	const sal_Int32 nIndex (GetIndex(eItem, eType));
+	const Theme& rTheme (GetCurrentTheme());
+	if (eType == PT_Color)
+		return rTheme.maColors[nIndex];
+	else if (eType == PT_Paint)
+		return rTheme.maPaints[nIndex].GetColor();
+	else
+		return COL_WHITE;
 }
 
 
-
-
 const Paint& Theme::GetPaint (const ThemeItem eItem)
 {
-    const PropertyType eType (GetPropertyType(eItem));
-    OSL_ASSERT(eType==PT_Paint);
-    const sal_Int32 nIndex (GetIndex(eItem, eType));
-    const Theme& rTheme (GetCurrentTheme());
-    return rTheme.maPaints[nIndex];
+	const PropertyType eType (GetPropertyType(eItem));
+	OSL_ASSERT(eType==PT_Paint);
+	const sal_Int32 nIndex (GetIndex(eItem, eType));
+	const Theme& rTheme (GetCurrentTheme());
+	return rTheme.maPaints[nIndex];
 }
 
 
-
-
 const Wallpaper Theme::GetWallpaper (const ThemeItem eItem)
 {
-    return GetPaint(eItem).GetWallpaper();
+	return GetPaint(eItem).GetWallpaper();
 }
 
 
-
-
 sal_Int32 Theme::GetInteger (const ThemeItem eItem)
 {
-    const PropertyType eType (GetPropertyType(eItem));
-    OSL_ASSERT(eType==PT_Integer);
-    const sal_Int32 nIndex (GetIndex(eItem, eType));
-    const Theme& rTheme (GetCurrentTheme());
-    return rTheme.maIntegers[nIndex];
+	const PropertyType eType (GetPropertyType(eItem));
+	OSL_ASSERT(eType==PT_Integer);
+	const sal_Int32 nIndex (GetIndex(eItem, eType));
+	const Theme& rTheme (GetCurrentTheme());
+	return rTheme.maIntegers[nIndex];
 }
 
 
-
-
 bool Theme::GetBoolean (const ThemeItem eItem)
 {
-    const PropertyType eType (GetPropertyType(eItem));
-    OSL_ASSERT(eType==PT_Boolean);
-    const sal_Int32 nIndex (GetIndex(eItem, eType));
-    const Theme& rTheme (GetCurrentTheme());
-    return rTheme.maBooleans[nIndex];
+	const PropertyType eType (GetPropertyType(eItem));
+	OSL_ASSERT(eType==PT_Boolean);
+	const sal_Int32 nIndex (GetIndex(eItem, eType));
+	const Theme& rTheme (GetCurrentTheme());
+	return rTheme.maBooleans[nIndex];
 }
 
 
-
-
 Rectangle Theme::GetRectangle (const ThemeItem eItem)
 {
-    const PropertyType eType (GetPropertyType(eItem));
-    OSL_ASSERT(eType==PT_Rectangle);
-    const sal_Int32 nIndex (GetIndex(eItem, eType));
-    const Theme& rTheme (GetCurrentTheme());
-    return rTheme.maRectangles[nIndex];
+	const PropertyType eType (GetPropertyType(eItem));
+	OSL_ASSERT(eType==PT_Rectangle);
+	const sal_Int32 nIndex (GetIndex(eItem, eType));
+	const Theme& rTheme (GetCurrentTheme());
+	return rTheme.maRectangles[nIndex];
 }
 
 
-
-
 bool Theme::IsHighContrastMode (void)
 {
-    const Theme& rTheme (GetCurrentTheme());
-    return rTheme.mbIsHighContrastMode;
+	const Theme& rTheme (GetCurrentTheme());
+	return rTheme.mbIsHighContrastMode;
 }
 
 
-
-
 void Theme::HandleDataChange (void)
 {
-    Theme& rTheme (GetCurrentTheme());
+	Theme& rTheme (GetCurrentTheme());
 
-    if ( ! rTheme.mbIsHighContrastModeSetManually)
-    {
-        // Do not modify mbIsHighContrastMode when it was manually set.
-        GetCurrentTheme().mbIsHighContrastMode = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
-        rTheme.maRawValues[Bool_IsHighContrastModeActive] = Any(GetCurrentTheme().mbIsHighContrastMode);
-    }
+	if ( ! rTheme.mbIsHighContrastModeSetManually)
+	{
+		// Do not modify mbIsHighContrastMode when it was manually set.
+		GetCurrentTheme().mbIsHighContrastMode = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
+		rTheme.maRawValues[Bool_IsHighContrastModeActive] = Any(GetCurrentTheme().mbIsHighContrastMode);
+	}
 
-    GetCurrentTheme().UpdateTheme();
+	GetCurrentTheme().UpdateTheme();
 }
 
 
-
-
 void Theme::InitializeTheme (void)
 {
-    setPropertyValue(
-        maPropertyIdToNameMap[Bool_UseSymphonyIcons],
-        Any(false));
-    setPropertyValue(
-        maPropertyIdToNameMap[Bool_UseSystemColors],
-        Any(false));
+	setPropertyValue(
+		maPropertyIdToNameMap[Bool_UseSymphonyIcons],
+		Any(false));
+	setPropertyValue(
+		maPropertyIdToNameMap[Bool_UseSystemColors],
+		Any(false));
 }
 
 
-
-
 void Theme::UpdateTheme (void)
 {
-    SidebarResource aLocalResource;
+	SidebarResource aLocalResource;
 
-    try
-    {
-        const StyleSettings& rStyle (Application::GetSettings().GetStyleSettings());
-        const bool bUseSystemColors (GetBoolean(Bool_UseSystemColors));
+	try
+	{
+		const StyleSettings& rStyle (Application::GetSettings().GetStyleSettings());
+		const bool bUseSystemColors (GetBoolean(Bool_UseSystemColors));
 
 #define Alternatives(n,hc,sys) (mbIsHighContrastMode ? hc : (bUseSystemColors ? sys : n))
 
-        Color aBaseBackgroundColor (rStyle.GetDialogColor());
-        // UX says this should be a little brighter, but that looks off when compared to the other windows.
-        //aBaseBackgroundColor.IncreaseLuminance(7);
-        Color aBorderColor (aBaseBackgroundColor);
-        aBorderColor.DecreaseLuminance(15);
-        Color aSecondColor (aBaseBackgroundColor);
-        aSecondColor.DecreaseLuminance(15);
-        
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_DeckBackground],
-            Any(sal_Int32(aBaseBackgroundColor.GetRGBColor())));
-
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_DeckTitleBarBackground],
-            Any(sal_Int32(aBaseBackgroundColor.GetRGBColor())));
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_DeckLeftPadding],
-            Any(sal_Int32(2)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_DeckTopPadding],
-            Any(sal_Int32(2)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_DeckRightPadding],
-            Any(sal_Int32(2)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_DeckBottomPadding],
-            Any(sal_Int32(2)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_DeckBorderSize],
-            Any(sal_Int32(1)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_DeckSeparatorHeight],
-            Any(sal_Int32(1)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_ButtonCornerRadius],
-            Any(sal_Int32(3)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Color_DeckTitleFont],
-            Any(sal_Int32(rStyle.GetFontColor().GetRGBColor())));
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_DeckTitleBarHeight],
-            Any(sal_Int32(Alternatives(
-                        26,
-                        26,
-                        rStyle.GetFloatTitleHeight()))));
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_PanelBackground],
-            Any(sal_Int32(aBaseBackgroundColor.GetRGBColor())));
-      
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_PanelTitleBarBackground],
-            Any(Tools::VclToAwtGradient(Gradient(
-                        GRADIENT_LINEAR,
-                        aSecondColor.GetRGBColor(),
-                        aBaseBackgroundColor.GetRGBColor()
-                        ))));
-        setPropertyValue(
-            maPropertyIdToNameMap[Color_PanelTitleFont],
-            Any(sal_Int32(mbIsHighContrastMode ? 0x00ff00 : 0x262626)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_PanelTitleBarHeight],
-            Any(sal_Int32(Alternatives(
-                        26,
-                        26,
-                        rStyle.GetTitleHeight()))));
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_TabBarBackground],
-            Any(sal_Int32(aBaseBackgroundColor.GetRGBColor())));
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_TabBarLeftPadding],
-            Any(sal_Int32(2)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_TabBarTopPadding],
-            Any(sal_Int32(2)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_TabBarRightPadding],
-            Any(sal_Int32(2)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_TabBarBottomPadding],
-            Any(sal_Int32(2)));
-
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_TabMenuPadding],
-            Any(sal_Int32(6)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Color_TabMenuSeparator],
-            Any(sal_Int32(aBorderColor.GetRGBColor())));
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_TabMenuSeparatorPadding],
-            Any(sal_Int32(7)));
-    
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_TabItemWidth],
-            Any(sal_Int32(32)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Int_TabItemHeight],
-            Any(sal_Int32(32)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Color_TabItemBorder],
-            Any(sal_Int32(rStyle.GetActiveBorderColor().GetRGBColor())));
-        //                    mbIsHighContrastMode ? 0x00ff00 : 0xbfbfbf)));
-
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_DropDownBackground],
-            Any(sal_Int32(aBaseBackgroundColor.GetRGBColor())));
-        setPropertyValue(
-            maPropertyIdToNameMap[Color_DropDownBorder],
-            Any(sal_Int32(rStyle.GetActiveBorderColor().GetRGBColor())));
-
-        setPropertyValue(
-            maPropertyIdToNameMap[Color_Highlight],
-            Any(sal_Int32(rStyle.GetHighlightColor().GetRGBColor())));
-        setPropertyValue(
-            maPropertyIdToNameMap[Color_HighlightText],
-            Any(sal_Int32(rStyle.GetHighlightTextColor().GetRGBColor())));
-
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_TabItemBackgroundNormal],
-            Any());
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_TabItemBackgroundHighlight],
-            Any(sal_Int32(rStyle.GetActiveTabColor().GetRGBColor())));
-        //                    mbIsHighContrastMode ? 0x000000 : 0x00ffffff)));
-
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_HorizontalBorder],
-            Any(sal_Int32(aBorderColor.GetRGBColor())));
-        //                    mbIsHighContrastMode ? 0x00ff00 :  0xe4e4e4)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_VerticalBorder],
-            Any(sal_Int32(aBorderColor.GetRGBColor())));
-        //                    mbIsHighContrastMode ? 0x00ff00 : 0xe4e4e4)));
-
-        setPropertyValue(
-            maPropertyIdToNameMap[Image_Grip],
-            Any(
-                mbIsHighContrastMode
-                    ? A2S("private:graphicrepository/sfx2/res/grip_hc.png")
-                    : A2S("private:graphicrepository/sfx2/res/grip.png")));
-        setPropertyValue(
-            maPropertyIdToNameMap[Image_Expand],
-            Any(
-                mbIsHighContrastMode
-                    ? A2S("private:graphicrepository/res/plus_sch.png")
-                    : A2S("private:graphicrepository/res/plus.png")));
-        setPropertyValue(
-            maPropertyIdToNameMap[Image_Collapse],
-            Any(
-                mbIsHighContrastMode
-                    ? A2S("private:graphicrepository/res/minus_sch.png")
-                    : A2S("private:graphicrepository/res/minus.png")));
-        setPropertyValue(
-            maPropertyIdToNameMap[Image_TabBarMenu],
-            Any(
-                mbIsHighContrastMode
-                    ? A2S("private:graphicrepository/sfx2/res/menu_hc.png")
-                    : A2S("private:graphicrepository/sfx2/res/symphony/open_more.png")));
-        setPropertyValue(
-            maPropertyIdToNameMap[Image_PanelMenu],
-            Any(
-                mbIsHighContrastMode
-                    ? A2S("private:graphicrepository/sfx2/res/symphony/morebutton.png")
-                    : A2S("private:graphicrepository/sfx2/res/symphony/morebutton_h.png")));
-        setPropertyValue(
-            maPropertyIdToNameMap[Image_Closer],
-            Any(A2S("private:graphicrepository/sfx2/res/closedoc.png")));
-        setPropertyValue(
-            maPropertyIdToNameMap[Image_CloseIndicator],
-            Any(
-                mbIsHighContrastMode
-                    ? A2S("private:graphicrepository/res/commandimagelist/lch_decrementlevel.png")
-                    : A2S("private:graphicrepository/res/commandimagelist/lc_decrementlevel.png")));
-        setPropertyValue(
-            maPropertyIdToNameMap[Image_ToolBoxItemSeparator],
-            Any(
-                A2S("private:graphicrepository/sfx2/res/separator.png")));
-
-        // ToolBox
-
-        /*
-        // Separator style
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_ToolBoxBackground],
-            Any(sal_Int32(rStyle.GetMenuColor().GetRGBColor())));
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_ToolBoxBorderTopLeft],
-            Any());
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_ToolBoxBorderCenterCorners],
-            Any());
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_ToolBoxBorderBottomRight],
-            Any());
-        setPropertyValue(
-            maPropertyIdToNameMap[Rect_ToolBoxPadding],
-            Any(awt::Rectangle(2,2,2,2)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Rect_ToolBoxBorder],
-            Any(awt::Rectangle(0,0,0,0)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Bool_UseToolBoxItemSeparator],
-            Any(true));
-
-        */
-
-        // Gradient style
-        Color aGradientStop2 (aBaseBackgroundColor);
-        aGradientStop2.IncreaseLuminance(17);
-        Color aToolBoxBorderColor (aBaseBackgroundColor);
-        aToolBoxBorderColor.DecreaseLuminance(12);
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_ToolBoxBackground],
-            Any(Tools::VclToAwtGradient(Gradient(
-                        GRADIENT_LINEAR,
-                        aBaseBackgroundColor.GetRGBColor(),
-                        aGradientStop2.GetRGBColor()
-                        ))));
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_ToolBoxBorderTopLeft],
-            mbIsHighContrastMode
-                ? Any(util::Color(sal_uInt32(0x00ff00)))
-                : Any(util::Color(aToolBoxBorderColor.GetRGBColor())));
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_ToolBoxBorderCenterCorners],
-            mbIsHighContrastMode
-                ? Any(util::Color(sal_uInt32(0x00ff00)))
-                : Any(util::Color(aToolBoxBorderColor.GetRGBColor())));
-        setPropertyValue(
-            maPropertyIdToNameMap[Paint_ToolBoxBorderBottomRight],
-            mbIsHighContrastMode
-                ? Any(util::Color(sal_uInt32(0x00ff00)))
-                : Any(util::Color(aToolBoxBorderColor.GetRGBColor())));
-        setPropertyValue(
-            maPropertyIdToNameMap[Rect_ToolBoxPadding],
-            Any(awt::Rectangle(2,2,2,2)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Rect_ToolBoxBorder],
-            Any(awt::Rectangle(1,1,1,1)));
-        setPropertyValue(
-            maPropertyIdToNameMap[Bool_UseToolBoxItemSeparator],
-            Any(false));
-    }
-    catch(beans::UnknownPropertyException& rException)
-    {
-        OSL_TRACE("unknown property: %s",
-            OUStringToOString(
-                rException.Message,
-                RTL_TEXTENCODING_ASCII_US).getStr());
-        OSL_ASSERT(false);
-    }
+		Color aBaseBackgroundColor (rStyle.GetDialogColor());
+		// UX says this should be a little brighter, but that looks off when compared to the other windows.
+		//aBaseBackgroundColor.IncreaseLuminance(7);
+		Color aBorderColor (aBaseBackgroundColor);
+		aBorderColor.DecreaseLuminance(15);
+		Color aSecondColor (aBaseBackgroundColor);
+		aSecondColor.DecreaseLuminance(15);
+
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_DeckBackground],
+			Any(sal_Int32(aBaseBackgroundColor.GetRGBColor())));
+
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_DeckTitleBarBackground],
+			Any(sal_Int32(aBaseBackgroundColor.GetRGBColor())));
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_DeckLeftPadding],
+			Any(sal_Int32(2)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_DeckTopPadding],
+			Any(sal_Int32(2)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_DeckRightPadding],
+			Any(sal_Int32(2)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_DeckBottomPadding],
+			Any(sal_Int32(2)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_DeckBorderSize],
+			Any(sal_Int32(1)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_DeckSeparatorHeight],
+			Any(sal_Int32(1)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_ButtonCornerRadius],
+			Any(sal_Int32(3)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Color_DeckTitleFont],
+			Any(sal_Int32(rStyle.GetFontColor().GetRGBColor())));
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_DeckTitleBarHeight],
+			Any(sal_Int32(Alternatives(
+						26,
+						26,
+						rStyle.GetFloatTitleHeight()))));
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_PanelBackground],
+			Any(sal_Int32(aBaseBackgroundColor.GetRGBColor())));
+
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_PanelTitleBarBackground],
+			Any(Tools::VclToAwtGradient(Gradient(
+						GRADIENT_LINEAR,
+						aSecondColor.GetRGBColor(),
+						aBaseBackgroundColor.GetRGBColor()
+						))));
+		setPropertyValue(
+			maPropertyIdToNameMap[Color_PanelTitleFont],
+			Any(sal_Int32(mbIsHighContrastMode ? 0x00ff00 : 0x262626)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_PanelTitleBarHeight],
+			Any(sal_Int32(Alternatives(
+						26,
+						26,
+						rStyle.GetTitleHeight()))));
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_TabBarBackground],
+			Any(sal_Int32(aBaseBackgroundColor.GetRGBColor())));
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_TabBarLeftPadding],
+			Any(sal_Int32(2)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_TabBarTopPadding],
+			Any(sal_Int32(2)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_TabBarRightPadding],
+			Any(sal_Int32(2)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_TabBarBottomPadding],
+			Any(sal_Int32(2)));
+
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_TabMenuPadding],
+			Any(sal_Int32(6)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Color_TabMenuSeparator],
+			Any(sal_Int32(aBorderColor.GetRGBColor())));
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_TabMenuSeparatorPadding],
+			Any(sal_Int32(7)));
+
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_TabItemWidth],
+			Any(sal_Int32(32)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Int_TabItemHeight],
+			Any(sal_Int32(32)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Color_TabItemBorder],
+			Any(sal_Int32(rStyle.GetActiveBorderColor().GetRGBColor())));
+		//					mbIsHighContrastMode ? 0x00ff00 : 0xbfbfbf)));
+
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_DropDownBackground],
+			Any(sal_Int32(aBaseBackgroundColor.GetRGBColor())));
+		setPropertyValue(
+			maPropertyIdToNameMap[Color_DropDownBorder],
+			Any(sal_Int32(rStyle.GetActiveBorderColor().GetRGBColor())));
+
+		setPropertyValue(
+			maPropertyIdToNameMap[Color_Highlight],
+			Any(sal_Int32(rStyle.GetHighlightColor().GetRGBColor())));
+		setPropertyValue(
+			maPropertyIdToNameMap[Color_HighlightText],
+			Any(sal_Int32(rStyle.GetHighlightTextColor().GetRGBColor())));
+
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_TabItemBackgroundNormal],
+			Any());
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_TabItemBackgroundHighlight],
+			Any(sal_Int32(rStyle.GetActiveTabColor().GetRGBColor())));
+		//					mbIsHighContrastMode ? 0x000000 : 0x00ffffff)));
+
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_HorizontalBorder],
+			Any(sal_Int32(aBorderColor.GetRGBColor())));
+		//					mbIsHighContrastMode ? 0x00ff00 : 0xe4e4e4)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_VerticalBorder],
+			Any(sal_Int32(aBorderColor.GetRGBColor())));
+		//					mbIsHighContrastMode ? 0x00ff00 : 0xe4e4e4)));
+
+		setPropertyValue(
+			maPropertyIdToNameMap[Image_Grip],
+			Any(
+				mbIsHighContrastMode
+					? A2S("private:graphicrepository/sfx2/res/grip_hc.png")
+					: A2S("private:graphicrepository/sfx2/res/grip.png")));
+		setPropertyValue(
+			maPropertyIdToNameMap[Image_Expand],
+			Any(
+				mbIsHighContrastMode
+					? A2S("private:graphicrepository/res/plus_sch.png")
+					: A2S("private:graphicrepository/res/plus.png")));
+		setPropertyValue(
+			maPropertyIdToNameMap[Image_Collapse],
+			Any(
+				mbIsHighContrastMode
+					? A2S("private:graphicrepository/res/minus_sch.png")
+					: A2S("private:graphicrepository/res/minus.png")));
+		setPropertyValue(
+			maPropertyIdToNameMap[Image_TabBarMenu],
+			Any(
+				mbIsHighContrastMode
+					? A2S("private:graphicrepository/sfx2/res/symphony/open_more_hc.png")
+					: A2S("private:graphicrepository/sfx2/res/symphony/open_more.png")));
+		setPropertyValue(
+			maPropertyIdToNameMap[Image_PanelMenu],
+			Any(
+				mbIsHighContrastMode
+					? A2S("private:graphicrepository/sfx2/res/symphony/morebutton_h.png")
+					: A2S("private:graphicrepository/sfx2/res/symphony/morebutton.png")));
+		setPropertyValue(
+			maPropertyIdToNameMap[Image_Closer],
+			Any(
+				mbIsHighContrastMode
+					? A2S("private:graphicrepository/sfx2/res/closedochc.png")
+					: A2S("private:graphicrepository/sfx2/res/closedoc.png")));
+		setPropertyValue(
+			maPropertyIdToNameMap[Image_CloseIndicator],
+			Any(
+				mbIsHighContrastMode
+					? A2S("private:graphicrepository/res/commandimagelist/lch_decrementlevel.png")
+					: A2S("private:graphicrepository/res/commandimagelist/lc_decrementlevel.png")));
+		setPropertyValue(
+			maPropertyIdToNameMap[Image_ToolBoxItemSeparator],
+			Any(
+				A2S("private:graphicrepository/sfx2/res/separator.png")));
+
+		// ToolBox
+
+		/*
+		// Separator style
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_ToolBoxBackground],
+			Any(sal_Int32(rStyle.GetMenuColor().GetRGBColor())));
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_ToolBoxBorderTopLeft],
+			Any());
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_ToolBoxBorderCenterCorners],
+			Any());
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_ToolBoxBorderBottomRight],
+			Any());
+		setPropertyValue(
+			maPropertyIdToNameMap[Rect_ToolBoxPadding],
+			Any(awt::Rectangle(2,2,2,2)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Rect_ToolBoxBorder],
+			Any(awt::Rectangle(0,0,0,0)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Bool_UseToolBoxItemSeparator],
+			Any(true));
+
+		*/
+
+		// Gradient style
+		Color aGradientStop2 (aBaseBackgroundColor);
+		aGradientStop2.IncreaseLuminance(17);
+		Color aToolBoxBorderColor (aBaseBackgroundColor);
+		aToolBoxBorderColor.DecreaseLuminance(12);
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_ToolBoxBackground],
+			Any(Tools::VclToAwtGradient(Gradient(
+						GRADIENT_LINEAR,
+						aBaseBackgroundColor.GetRGBColor(),
+						aGradientStop2.GetRGBColor()
+						))));
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_ToolBoxBorderTopLeft],
+			mbIsHighContrastMode
+				? Any(util::Color(sal_uInt32(0x00ff00)))
+				: Any(util::Color(aToolBoxBorderColor.GetRGBColor())));
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_ToolBoxBorderCenterCorners],
+			mbIsHighContrastMode
+				? Any(util::Color(sal_uInt32(0x00ff00)))
+				: Any(util::Color(aToolBoxBorderColor.GetRGBColor())));
+		setPropertyValue(
+			maPropertyIdToNameMap[Paint_ToolBoxBorderBottomRight],
+			mbIsHighContrastMode
+				? Any(util::Color(sal_uInt32(0x00ff00)))
+				: Any(util::Color(aToolBoxBorderColor.GetRGBColor())));
+		setPropertyValue(
+			maPropertyIdToNameMap[Rect_ToolBoxPadding],
+			Any(awt::Rectangle(2,2,2,2)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Rect_ToolBoxBorder],
+			Any(awt::Rectangle(1,1,1,1)));
+		setPropertyValue(
+			maPropertyIdToNameMap[Bool_UseToolBoxItemSeparator],
+			Any(false));
+	}
+	catch(beans::UnknownPropertyException& rException)
+	{
+		OSL_TRACE("unknown property: %s",
+			OUStringToOString(
+				rException.Message,
+				RTL_TEXTENCODING_ASCII_US).getStr());
+		OSL_ASSERT(false);
+	}
 }
 
 
-
-
 void SAL_CALL Theme::disposing (void)
 {
-    ChangeListeners aListeners;
-    maChangeListeners.swap(aListeners);
-
-    const lang::EventObject aEvent (static_cast<XWeak*>(this));
-    
-    for (ChangeListeners::const_iterator
-             iContainer(maChangeListeners.begin()),
-             iContainerEnd(maChangeListeners.end());
-         iContainerEnd!=iContainerEnd;
-         ++iContainerEnd)
-    {
-        for (ChangeListenerContainer::const_iterator
-                 iListener(iContainer->second.begin()),
-                 iEnd(iContainer->second.end());
-             iListener!=iEnd;
-             ++iListener)
-        {
-            try
-            {
-                (*iListener)->disposing(aEvent);
-            }
-            catch(const Exception&)
-            {
-            }
-        }
-    }
-}
+	ChangeListeners aListeners;
+	maChangeListeners.swap(aListeners);
 
+	const lang::EventObject aEvent (static_cast<XWeak*>(this));
 
+	for (ChangeListeners::const_iterator
+			 iContainer(maChangeListeners.begin()),
+			 iContainerEnd(maChangeListeners.end());
+		 iContainerEnd!=iContainerEnd;
+		 ++iContainerEnd)
+	{
+		for (ChangeListenerContainer::const_iterator
+				 iListener(iContainer->second.begin()),
+				 iEnd(iContainer->second.end());
+			 iListener!=iEnd;
+			 ++iListener)
+		{
+			try
+			{
+				(*iListener)->disposing(aEvent);
+			}
+			catch(const Exception&)
+			{
+			}
+		}
+	}
+}
 
 
 Reference<beans::XPropertySet> Theme::GetPropertySet (void)
 {
-    return Reference<beans::XPropertySet>(static_cast<XWeak*>(&GetCurrentTheme()), UNO_QUERY);
+	return Reference<beans::XPropertySet>(static_cast<XWeak*>(&GetCurrentTheme()), UNO_QUERY);
 }
 
 
-
-
 Reference<beans::XPropertySetInfo> SAL_CALL Theme::getPropertySetInfo (void)
-    throw(cssu::RuntimeException)
+	throw(cssu::RuntimeException)
 {
-    return Reference<beans::XPropertySetInfo>(this);
+	return Reference<beans::XPropertySetInfo>(this);
 }
 
 
-
-
 void SAL_CALL Theme::setPropertyValue (
-    const ::rtl::OUString& rsPropertyName,
-    const cssu::Any& rValue)
-    throw(cssu::RuntimeException)
-{
-    PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
-    if (iId == maPropertyNameToIdMap.end())
-        throw beans::UnknownPropertyException(rsPropertyName, NULL);
-
-    const PropertyType eType (GetPropertyType(iId->second));
-    if (eType == PT_Invalid)
-        throw beans::UnknownPropertyException(rsPropertyName, NULL);
-
-    const ThemeItem eItem (iId->second);
-        
-    if (rValue == maRawValues[eItem])
-    {
-        // Value is not different from the one in the property
-        // set => nothing to do.
-        return;
-    }
-
-    const Any aOldValue (maRawValues[eItem]);
-
-    const beans::PropertyChangeEvent aEvent(
-        static_cast<XWeak*>(this),
-        rsPropertyName,
-        sal_False,
-        eItem,
-        aOldValue,
-        rValue);
-    
-    if (DoVetoableListenersVeto(GetVetoableListeners(__AnyItem, false), aEvent))
-        return;
-    if (DoVetoableListenersVeto(GetVetoableListeners(eItem, false), aEvent))
-        return;
-    
-    maRawValues[eItem] = rValue;
-    ProcessNewValue(rValue, eItem, eType);
-
-    BroadcastPropertyChange(GetChangeListeners(__AnyItem, false), aEvent);
-    BroadcastPropertyChange(GetChangeListeners(eItem, false), aEvent);
-}
+	const ::rtl::OUString& rsPropertyName,
+	const cssu::Any& rValue)
+	throw(cssu::RuntimeException)
+{
+	PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
+	if (iId == maPropertyNameToIdMap.end())
+		throw beans::UnknownPropertyException(rsPropertyName, NULL);
+
+	const PropertyType eType (GetPropertyType(iId->second));
+	if (eType == PT_Invalid)
+		throw beans::UnknownPropertyException(rsPropertyName, NULL);
+
+	const ThemeItem eItem (iId->second);
+
+	if (rValue == maRawValues[eItem])
+	{
+		// Value is not different from the one in the property
+		// set => nothing to do.
+		return;
+	}
+
+	const Any aOldValue (maRawValues[eItem]);
+
+	const beans::PropertyChangeEvent aEvent(
+		static_cast<XWeak*>(this),
+		rsPropertyName,
+		sal_False,
+		eItem,
+		aOldValue,
+		rValue);
+
+	if (DoVetoableListenersVeto(GetVetoableListeners(__AnyItem, false), aEvent))
+		return;
+	if (DoVetoableListenersVeto(GetVetoableListeners(eItem, false), aEvent))
+		return;
 
+	maRawValues[eItem] = rValue;
+	ProcessNewValue(rValue, eItem, eType);
 
+	BroadcastPropertyChange(GetChangeListeners(__AnyItem, false), aEvent);
+	BroadcastPropertyChange(GetChangeListeners(eItem, false), aEvent);
+}
 
 
 Any SAL_CALL Theme::getPropertyValue (
-    const ::rtl::OUString& rsPropertyName)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        cssu::RuntimeException)
-{
-    PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
-    if (iId == maPropertyNameToIdMap.end())
-        throw beans::UnknownPropertyException();
-
-    const PropertyType eType (GetPropertyType(iId->second));
-    if (eType == PT_Invalid)
-        throw beans::UnknownPropertyException();
+	const ::rtl::OUString& rsPropertyName)
+	throw(css::beans::UnknownPropertyException,
+		css::lang::WrappedTargetException,
+		cssu::RuntimeException)
+{
+	PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
+	if (iId == maPropertyNameToIdMap.end())
+		throw beans::UnknownPropertyException();
+
+	const PropertyType eType (GetPropertyType(iId->second));
+	if (eType == PT_Invalid)
+		throw beans::UnknownPropertyException();
 
-    const ThemeItem eItem (iId->second);
+	const ThemeItem eItem (iId->second);
 
-    return maRawValues[eItem];
+	return maRawValues[eItem];
 }
 
 
-
-
 void SAL_CALL Theme::addPropertyChangeListener(
-    const ::rtl::OUString& rsPropertyName,
-    const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        cssu::RuntimeException)
-{
-    ThemeItem eItem (__AnyItem);
-    if (rsPropertyName.getLength() > 0)
-    {
-        PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
-        if (iId == maPropertyNameToIdMap.end())
-            throw beans::UnknownPropertyException();
-
-        const PropertyType eType (GetPropertyType(iId->second));
-        if (eType == PT_Invalid)
-            throw beans::UnknownPropertyException();
-
-        eItem = iId->second;
-    }
-    ChangeListenerContainer* pListeners = GetChangeListeners(eItem, true);
-    if (pListeners != NULL)
-        pListeners->push_back(rxListener);
+	const ::rtl::OUString& rsPropertyName,
+	const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener)
+	throw(css::beans::UnknownPropertyException,
+		css::lang::WrappedTargetException,
+		cssu::RuntimeException)
+{
+	ThemeItem eItem (__AnyItem);
+	if (rsPropertyName.getLength() > 0)
+	{
+		PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
+		if (iId == maPropertyNameToIdMap.end())
+			throw beans::UnknownPropertyException();
+
+		const PropertyType eType (GetPropertyType(iId->second));
+		if (eType == PT_Invalid)
+			throw beans::UnknownPropertyException();
+
+		eItem = iId->second;
+	}
+	ChangeListenerContainer* pListeners = GetChangeListeners(eItem, true);
+	if (pListeners != NULL)
+		pListeners->push_back(rxListener);
 }
 
 
-
-
 void SAL_CALL Theme::removePropertyChangeListener(
-    const ::rtl::OUString& rsPropertyName,
-    const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        cssu::RuntimeException)
-{
-    ThemeItem eItem (__AnyItem);
-    if (rsPropertyName.getLength() > 0)
-    {
-        PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
-        if (iId == maPropertyNameToIdMap.end())
-            throw beans::UnknownPropertyException();
-
-        const PropertyType eType (GetPropertyType(iId->second));
-        if (eType == PT_Invalid)
-            throw beans::UnknownPropertyException();
-
-        eItem = iId->second;
-    }
-    ChangeListenerContainer* pContainer = GetChangeListeners(eItem, false);
-    if (pContainer != NULL)
-    {
-        ChangeListenerContainer::iterator iListener (::std::find(pContainer->begin(), pContainer->end(), rxListener));
-        if (iListener != pContainer->end())
-        {
-            pContainer->erase(iListener);
-
-            // Remove the listener container when empty.
-            if (pContainer->empty())
-                maChangeListeners.erase(eItem);
-        }
-    }
+	const ::rtl::OUString& rsPropertyName,
+	const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener)
+	throw(css::beans::UnknownPropertyException,
+		css::lang::WrappedTargetException,
+		cssu::RuntimeException)
+{
+	ThemeItem eItem (__AnyItem);
+	if (rsPropertyName.getLength() > 0)
+	{
+		PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
+		if (iId == maPropertyNameToIdMap.end())
+			throw beans::UnknownPropertyException();
+
+		const PropertyType eType (GetPropertyType(iId->second));
+		if (eType == PT_Invalid)
+			throw beans::UnknownPropertyException();
+
+		eItem = iId->second;
+	}
+	ChangeListenerContainer* pContainer = GetChangeListeners(eItem, false);
+	if (pContainer != NULL)
+	{
+		ChangeListenerContainer::iterator iListener (::std::find(pContainer->begin(), pContainer->end(), rxListener));
+		if (iListener != pContainer->end())
+		{
+			pContainer->erase(iListener);
+
+			// Remove the listener container when empty.
+			if (pContainer->empty())
+				maChangeListeners.erase(eItem);
+		}
+	}
 }
 
 
-
-
 void SAL_CALL Theme::addVetoableChangeListener(
-    const ::rtl::OUString& rsPropertyName,
-    const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        cssu::RuntimeException)
-{
-    ThemeItem eItem (__AnyItem);
-    if (rsPropertyName.getLength() > 0)
-    {
-        PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
-        if (iId == maPropertyNameToIdMap.end())
-            throw beans::UnknownPropertyException();
-
-        const PropertyType eType (GetPropertyType(iId->second));
-        if (eType == PT_Invalid)
-            throw beans::UnknownPropertyException();
-
-        eItem = iId->second;
-    }
-    VetoableListenerContainer* pListeners = GetVetoableListeners(eItem, true);
-    if (pListeners != NULL)
-        pListeners->push_back(rxListener);
+	const ::rtl::OUString& rsPropertyName,
+	const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener)
+	throw(css::beans::UnknownPropertyException,
+		css::lang::WrappedTargetException,
+		cssu::RuntimeException)
+{
+	ThemeItem eItem (__AnyItem);
+	if (rsPropertyName.getLength() > 0)
+	{
+		PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
+		if (iId == maPropertyNameToIdMap.end())
+			throw beans::UnknownPropertyException();
+
+		const PropertyType eType (GetPropertyType(iId->second));
+		if (eType == PT_Invalid)
+			throw beans::UnknownPropertyException();
+
+		eItem = iId->second;
+	}
+	VetoableListenerContainer* pListeners = GetVetoableListeners(eItem, true);
+	if (pListeners != NULL)
+		pListeners->push_back(rxListener);
 }
 
 
-
-
 void SAL_CALL Theme::removeVetoableChangeListener(
-    const ::rtl::OUString& rsPropertyName,
-    const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        cssu::RuntimeException)
-{
-    ThemeItem eItem (__AnyItem);
-    if (rsPropertyName.getLength() > 0)
-    {
-        PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
-        if (iId == maPropertyNameToIdMap.end())
-            throw beans::UnknownPropertyException();
-
-        const PropertyType eType (GetPropertyType(iId->second));
-        if (eType == PT_Invalid)
-            throw beans::UnknownPropertyException();
-
-        eItem = iId->second;
-    }
-    VetoableListenerContainer* pContainer = GetVetoableListeners(eItem, false);
-    if (pContainer != NULL)
-    {
-        VetoableListenerContainer::iterator iListener (::std::find(pContainer->begin(), pContainer->end(), rxListener));
-        if (iListener != pContainer->end())
-        {
-            pContainer->erase(iListener);
-            // Remove container when empty.
-            if (pContainer->empty())
-                maVetoableListeners.erase(eItem);
-        }
-    }
+	const ::rtl::OUString& rsPropertyName,
+	const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener)
+	throw(css::beans::UnknownPropertyException,
+		css::lang::WrappedTargetException,
+		cssu::RuntimeException)
+{
+	ThemeItem eItem (__AnyItem);
+	if (rsPropertyName.getLength() > 0)
+	{
+		PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
+		if (iId == maPropertyNameToIdMap.end())
+			throw beans::UnknownPropertyException();
+
+		const PropertyType eType (GetPropertyType(iId->second));
+		if (eType == PT_Invalid)
+			throw beans::UnknownPropertyException();
+
+		eItem = iId->second;
+	}
+	VetoableListenerContainer* pContainer = GetVetoableListeners(eItem, false);
+	if (pContainer != NULL)
+	{
+		VetoableListenerContainer::iterator iListener (::std::find(pContainer->begin(), pContainer->end(), rxListener));
+		if (iListener != pContainer->end())
+		{
+			pContainer->erase(iListener);
+			// Remove container when empty.
+			if (pContainer->empty())
+				maVetoableListeners.erase(eItem);
+		}
+	}
 }
 
 
-
-
 cssu::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void)
-    throw(cssu::RuntimeException)
+	throw(cssu::RuntimeException)
 {
-    ::std::vector<beans::Property> aProperties;
+	::std::vector<beans::Property> aProperties;
 
-    for (sal_Int32 nItem(__Begin),nEnd(__End); nItem!=nEnd; ++nItem)
-    {
-        const ThemeItem eItem (static_cast<ThemeItem>(nItem));
-        const PropertyType eType (GetPropertyType(eItem));
-        if (eType == PT_Invalid)
-            continue;
-
-        const beans::Property aProperty(
-            maPropertyIdToNameMap[eItem],
-            eItem,
-            GetCppuType(eType),
-            0);
-        aProperties.push_back(aProperty);
-    }
-        
-    return cssu::Sequence<css::beans::Property>(
-        &aProperties.front(),
-        aProperties.size());
+	for (sal_Int32 nItem(__Begin),nEnd(__End); nItem!=nEnd; ++nItem)
+	{
+		const ThemeItem eItem (static_cast<ThemeItem>(nItem));
+		const PropertyType eType (GetPropertyType(eItem));
+		if (eType == PT_Invalid)
+			continue;
+
+		const beans::Property aProperty(
+			maPropertyIdToNameMap[eItem],
+			eItem,
+			GetCppuType(eType),
+			0);
+		aProperties.push_back(aProperty);
+	}
+
+	return cssu::Sequence<css::beans::Property>(
+		&aProperties.front(),
+		aProperties.size());
 }
 
 
-
-
 beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsPropertyName)
-    throw(css::beans::UnknownPropertyException,
-        cssu::RuntimeException)
+	throw(css::beans::UnknownPropertyException,
+		cssu::RuntimeException)
 {
-    PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
-    if (iId == maPropertyNameToIdMap.end())
-        throw beans::UnknownPropertyException();
-
-    const PropertyType eType (GetPropertyType(iId->second));
-    if (eType == PT_Invalid)
-        throw beans::UnknownPropertyException();
-
-    const ThemeItem eItem (iId->second);
-
-    return beans::Property(
-        rsPropertyName,
-        eItem,
-        GetCppuType(eType),
-        0);
+	PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
+	if (iId == maPropertyNameToIdMap.end())
+		throw beans::UnknownPropertyException();
+
+	const PropertyType eType (GetPropertyType(iId->second));
+	if (eType == PT_Invalid)
+		throw beans::UnknownPropertyException();
+
+	const ThemeItem eItem (iId->second);
+
+	return beans::Property(
+		rsPropertyName,
+		eItem,
+		GetCppuType(eType),
+		0);
 }
 
 
-
-
 sal_Bool SAL_CALL Theme::hasPropertyByName (const ::rtl::OUString& rsPropertyName)
-    throw(cssu::RuntimeException)
+	throw(cssu::RuntimeException)
 {
-    PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
-    if (iId == maPropertyNameToIdMap.end())
-        return sal_False;
+	PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
+	if (iId == maPropertyNameToIdMap.end())
+		return sal_False;
 
-    const PropertyType eType (GetPropertyType(iId->second));
-    if (eType == PT_Invalid)
-        return sal_False;
+	const PropertyType eType (GetPropertyType(iId->second));
+	if (eType == PT_Invalid)
+		return sal_False;
 
-    return sal_True;
+	return sal_True;
 }
 
 
-
-
 void Theme::SetupPropertyMaps (void)
 {
-    maPropertyIdToNameMap.resize(__Post_Rect);
-    maImages.resize(__Image_Color - __Pre_Image - 1);
-    maColors.resize(__Color_Paint - __Image_Color - 1);
-    maPaints.resize(__Paint_Int - __Color_Paint - 1);
-    maIntegers.resize(__Int_Bool - __Paint_Int - 1);
-    maBooleans.resize(__Bool_Rect - __Int_Bool - 1);
-    maRectangles.resize(__Post_Rect - __Bool_Rect - 1);
-    
-    #define AddEntry(e) maPropertyNameToIdMap[A2S(#e)]=e; maPropertyIdToNameMap[e]=A2S(#e)
-    
-    AddEntry(Image_Grip);
-    AddEntry(Image_Expand);
-    AddEntry(Image_Collapse);
-    AddEntry(Image_TabBarMenu);
-    AddEntry(Image_PanelMenu);
-    AddEntry(Image_ToolBoxItemSeparator);
-    AddEntry(Image_Closer);
-    AddEntry(Image_CloseIndicator);
-
-    AddEntry(Color_DeckTitleFont);
-    AddEntry(Color_PanelTitleFont);
-    AddEntry(Color_TabMenuSeparator);
-    AddEntry(Color_TabItemBorder);
-    AddEntry(Color_DropDownBorder);
-    AddEntry(Color_Highlight);
-    AddEntry(Color_HighlightText);
-
-    AddEntry(Paint_DeckBackground);
-    AddEntry(Paint_DeckTitleBarBackground);
-    AddEntry(Paint_PanelBackground);
-    AddEntry(Paint_PanelTitleBarBackground);
-    AddEntry(Paint_TabBarBackground);
-    AddEntry(Paint_TabItemBackgroundNormal);
-    AddEntry(Paint_TabItemBackgroundHighlight);
-    AddEntry(Paint_HorizontalBorder);
-    AddEntry(Paint_VerticalBorder);
-    AddEntry(Paint_ToolBoxBackground);
-    AddEntry(Paint_ToolBoxBorderTopLeft);
-    AddEntry(Paint_ToolBoxBorderCenterCorners);
-    AddEntry(Paint_ToolBoxBorderBottomRight);
-    AddEntry(Paint_DropDownBackground);
-
-    AddEntry(Int_DeckTitleBarHeight);
-    AddEntry(Int_DeckBorderSize);
-    AddEntry(Int_DeckSeparatorHeight);
-    AddEntry(Int_PanelTitleBarHeight);
-    AddEntry(Int_TabMenuPadding);
-    AddEntry(Int_TabMenuSeparatorPadding);
-    AddEntry(Int_TabItemWidth);
-    AddEntry(Int_TabItemHeight);
-    AddEntry(Int_DeckLeftPadding);
-    AddEntry(Int_DeckTopPadding);
-    AddEntry(Int_DeckRightPadding);
-    AddEntry(Int_DeckBottomPadding);
-    AddEntry(Int_TabBarLeftPadding);
-    AddEntry(Int_TabBarTopPadding);
-    AddEntry(Int_TabBarRightPadding);
-    AddEntry(Int_TabBarBottomPadding);
-    AddEntry(Int_ButtonCornerRadius);
-
-    AddEntry(Bool_UseSymphonyIcons);
-    AddEntry(Bool_UseSystemColors);
-    AddEntry(Bool_UseToolBoxItemSeparator);
-    AddEntry(Bool_IsHighContrastModeActive);
-
-    AddEntry(Rect_ToolBoxPadding);
-    AddEntry(Rect_ToolBoxBorder);
-    
-    #undef AddEntry
+	maPropertyIdToNameMap.resize(__Post_Rect);
+	maImages.resize(__Image_Color - __Pre_Image - 1);
+	maColors.resize(__Color_Paint - __Image_Color - 1);
+	maPaints.resize(__Paint_Int - __Color_Paint - 1);
+	maIntegers.resize(__Int_Bool - __Paint_Int - 1);
+	maBooleans.resize(__Bool_Rect - __Int_Bool - 1);
+	maRectangles.resize(__Post_Rect - __Bool_Rect - 1);
+
+	#define AddEntry(e) maPropertyNameToIdMap[A2S(#e)]=e; maPropertyIdToNameMap[e]=A2S(#e)
+
+	AddEntry(Image_Grip);
+	AddEntry(Image_Expand);
+	AddEntry(Image_Collapse);
+	AddEntry(Image_TabBarMenu);
+	AddEntry(Image_PanelMenu);
+	AddEntry(Image_ToolBoxItemSeparator);
+	AddEntry(Image_Closer);
+	AddEntry(Image_CloseIndicator);
+
+	AddEntry(Color_DeckTitleFont);
+	AddEntry(Color_PanelTitleFont);
+	AddEntry(Color_TabMenuSeparator);
+	AddEntry(Color_TabItemBorder);
+	AddEntry(Color_DropDownBorder);
+	AddEntry(Color_Highlight);
+	AddEntry(Color_HighlightText);
+
+	AddEntry(Paint_DeckBackground);
+	AddEntry(Paint_DeckTitleBarBackground);
+	AddEntry(Paint_PanelBackground);
+	AddEntry(Paint_PanelTitleBarBackground);
+	AddEntry(Paint_TabBarBackground);
+	AddEntry(Paint_TabItemBackgroundNormal);
+	AddEntry(Paint_TabItemBackgroundHighlight);
+	AddEntry(Paint_HorizontalBorder);
+	AddEntry(Paint_VerticalBorder);
+	AddEntry(Paint_ToolBoxBackground);
+	AddEntry(Paint_ToolBoxBorderTopLeft);
+	AddEntry(Paint_ToolBoxBorderCenterCorners);
+	AddEntry(Paint_ToolBoxBorderBottomRight);
+	AddEntry(Paint_DropDownBackground);
+
+	AddEntry(Int_DeckTitleBarHeight);
+	AddEntry(Int_DeckBorderSize);
+	AddEntry(Int_DeckSeparatorHeight);
+	AddEntry(Int_PanelTitleBarHeight);
+	AddEntry(Int_TabMenuPadding);
+	AddEntry(Int_TabMenuSeparatorPadding);
+	AddEntry(Int_TabItemWidth);
+	AddEntry(Int_TabItemHeight);
+	AddEntry(Int_DeckLeftPadding);
+	AddEntry(Int_DeckTopPadding);
+	AddEntry(Int_DeckRightPadding);
+	AddEntry(Int_DeckBottomPadding);
+	AddEntry(Int_TabBarLeftPadding);
+	AddEntry(Int_TabBarTopPadding);
+	AddEntry(Int_TabBarRightPadding);
+	AddEntry(Int_TabBarBottomPadding);
+	AddEntry(Int_ButtonCornerRadius);
+
+	AddEntry(Bool_UseSymphonyIcons);
+	AddEntry(Bool_UseSystemColors);
+	AddEntry(Bool_UseToolBoxItemSeparator);
+	AddEntry(Bool_IsHighContrastModeActive);
 
-    maRawValues.resize(maPropertyIdToNameMap.size());
-}
+	AddEntry(Rect_ToolBoxPadding);
+	AddEntry(Rect_ToolBoxBorder);
 
+	#undef AddEntry
 
+	maRawValues.resize(maPropertyIdToNameMap.size());
+}
 
 
 Theme::PropertyType Theme::GetPropertyType (const ThemeItem eItem)
 {
-    switch(eItem)
-    {
-        case Image_Grip:
-        case Image_Expand:
-        case Image_Collapse:
-        case Image_TabBarMenu:
-        case Image_PanelMenu:
-        case Image_ToolBoxItemSeparator:
-        case Image_Closer:
-        case Image_CloseIndicator:
-            return PT_Image;
-
-        case Color_DeckTitleFont:
-        case Color_PanelTitleFont:
-        case Color_TabMenuSeparator:
-        case Color_TabItemBorder:
-        case Color_DropDownBorder:
-        case Color_Highlight:
-        case Color_HighlightText:
-            return PT_Color;
-
-        case Paint_DeckBackground:
-        case Paint_DeckTitleBarBackground:
-        case Paint_PanelBackground:
-        case Paint_PanelTitleBarBackground:
-        case Paint_TabBarBackground:
-        case Paint_TabItemBackgroundNormal:
-        case Paint_TabItemBackgroundHighlight:
-        case Paint_HorizontalBorder:
-        case Paint_VerticalBorder:
-        case Paint_ToolBoxBackground:
-        case Paint_ToolBoxBorderTopLeft:
-        case Paint_ToolBoxBorderCenterCorners:
-        case Paint_ToolBoxBorderBottomRight:
-        case Paint_DropDownBackground:
-            return PT_Paint;
-
-        case Int_DeckTitleBarHeight:
-        case Int_DeckBorderSize:
-        case Int_DeckSeparatorHeight:
-        case Int_PanelTitleBarHeight:
-        case Int_TabMenuPadding:
-        case Int_TabMenuSeparatorPadding:
-        case Int_TabItemWidth:
-        case Int_TabItemHeight:
-        case Int_DeckLeftPadding:
-        case Int_DeckTopPadding:
-        case Int_DeckRightPadding:
-        case Int_DeckBottomPadding:
-        case Int_TabBarLeftPadding:
-        case Int_TabBarTopPadding:
-        case Int_TabBarRightPadding:
-        case Int_TabBarBottomPadding:
-        case Int_ButtonCornerRadius:
-            return PT_Integer;
-
-        case Bool_UseSymphonyIcons:
-        case Bool_UseSystemColors:
-        case Bool_UseToolBoxItemSeparator:
-        case Bool_IsHighContrastModeActive:
-            return PT_Boolean;
-
-        case Rect_ToolBoxBorder:
-        case Rect_ToolBoxPadding:
-            return PT_Rectangle;
-            
-        default:
-            return PT_Invalid;
-    }
+	switch(eItem)
+	{
+		case Image_Grip:
+		case Image_Expand:
+		case Image_Collapse:
+		case Image_TabBarMenu:
+		case Image_PanelMenu:
+		case Image_ToolBoxItemSeparator:
+		case Image_Closer:
+		case Image_CloseIndicator:
+			return PT_Image;
+
+		case Color_DeckTitleFont:
+		case Color_PanelTitleFont:
+		case Color_TabMenuSeparator:
+		case Color_TabItemBorder:
+		case Color_DropDownBorder:
+		case Color_Highlight:
+		case Color_HighlightText:
+			return PT_Color;
+
+		case Paint_DeckBackground:
+		case Paint_DeckTitleBarBackground:
+		case Paint_PanelBackground:
+		case Paint_PanelTitleBarBackground:
+		case Paint_TabBarBackground:
+		case Paint_TabItemBackgroundNormal:
+		case Paint_TabItemBackgroundHighlight:
+		case Paint_HorizontalBorder:
+		case Paint_VerticalBorder:
+		case Paint_ToolBoxBackground:
+		case Paint_ToolBoxBorderTopLeft:
+		case Paint_ToolBoxBorderCenterCorners:
+		case Paint_ToolBoxBorderBottomRight:
+		case Paint_DropDownBackground:
+			return PT_Paint;
+
+		case Int_DeckTitleBarHeight:
+		case Int_DeckBorderSize:
+		case Int_DeckSeparatorHeight:
+		case Int_PanelTitleBarHeight:
+		case Int_TabMenuPadding:
+		case Int_TabMenuSeparatorPadding:
+		case Int_TabItemWidth:
+		case Int_TabItemHeight:
+		case Int_DeckLeftPadding:
+		case Int_DeckTopPadding:
+		case Int_DeckRightPadding:
+		case Int_DeckBottomPadding:
+		case Int_TabBarLeftPadding:
+		case Int_TabBarTopPadding:
+		case Int_TabBarRightPadding:
+		case Int_TabBarBottomPadding:
+		case Int_ButtonCornerRadius:
+			return PT_Integer;
+
+		case Bool_UseSymphonyIcons:
+		case Bool_UseSystemColors:
+		case Bool_UseToolBoxItemSeparator:
+		case Bool_IsHighContrastModeActive:
+			return PT_Boolean;
+
+		case Rect_ToolBoxBorder:
+		case Rect_ToolBoxPadding:
+			return PT_Rectangle;
+
+		default:
+			return PT_Invalid;
+	}
 }
 
 
-
-
 cssu::Type Theme::GetCppuType (const PropertyType eType)
 {
-    switch(eType)
-    {
-        case PT_Image:
-            return getCppuType((rtl::OUString*)NULL);
-
-        case PT_Color:
-            return getCppuType((sal_uInt32*)NULL);
-
-        case PT_Paint:
-            return getCppuVoidType();
-
-        case PT_Integer:
-            return getCppuType((sal_Int32*)NULL);
-
-        case PT_Boolean:
-            return getCppuType((sal_Bool*)NULL);
-
-        case PT_Rectangle:
-            return getCppuType((awt::Rectangle*)NULL);
-
-        case PT_Invalid:
-        default:
-            return getCppuVoidType();
-    }
+	switch(eType)
+	{
+		case PT_Image:
+			return getCppuType((rtl::OUString*)NULL);
+
+		case PT_Color:
+			return getCppuType((sal_uInt32*)NULL);
+
+		case PT_Paint:
+			return getCppuVoidType();
+
+		case PT_Integer:
+			return getCppuType((sal_Int32*)NULL);
+
+		case PT_Boolean:
+			return getCppuType((sal_Bool*)NULL);
+
+		case PT_Rectangle:
+			return getCppuType((awt::Rectangle*)NULL);
+
+		case PT_Invalid:
+		default:
+			return getCppuVoidType();
+	}
 }
 
 
-
-
 sal_Int32 Theme::GetIndex (const ThemeItem eItem, const PropertyType eType)
 {
-    switch(eType)
-    {
-        case PT_Image:
-            return eItem - __Pre_Image-1;
-        case PT_Color:
-            return eItem - __Image_Color-1;
-        case PT_Paint:
-            return eItem - __Color_Paint-1;
-        case PT_Integer:
-            return eItem - __Paint_Int-1;
-        case PT_Boolean:
-            return eItem - __Int_Bool-1;
-        case PT_Rectangle:
-            return eItem - __Bool_Rect-1;
-
-        default:
-            OSL_ASSERT(false);
-            return 0;
-    }
+	switch(eType)
+	{
+		case PT_Image:
+			return eItem - __Pre_Image-1;
+		case PT_Color:
+			return eItem - __Image_Color-1;
+		case PT_Paint:
+			return eItem - __Color_Paint-1;
+		case PT_Integer:
+			return eItem - __Paint_Int-1;
+		case PT_Boolean:
+			return eItem - __Int_Bool-1;
+		case PT_Rectangle:
+			return eItem - __Bool_Rect-1;
+
+		default:
+			OSL_ASSERT(false);
+			return 0;
+	}
 }
 
 
-
-
 Theme::VetoableListenerContainer* Theme::GetVetoableListeners (
-    const ThemeItem eItem,
-    const bool bCreate)
+	const ThemeItem eItem,
+	const bool bCreate)
 {
-    VetoableListeners::iterator iContainer (maVetoableListeners.find(eItem));
-    if (iContainer != maVetoableListeners.end())
-        return &iContainer->second;
-    else if (bCreate)
-    {
-        maVetoableListeners[eItem] = VetoableListenerContainer();
-        return &maVetoableListeners[eItem];
-    }
-    else
-        return NULL;
+	VetoableListeners::iterator iContainer (maVetoableListeners.find(eItem));
+	if (iContainer != maVetoableListeners.end())
+		return &iContainer->second;
+	else if (bCreate)
+	{
+		maVetoableListeners[eItem] = VetoableListenerContainer();
+		return &maVetoableListeners[eItem];
+	}
+	else
+		return NULL;
 }
 
 
-
-
 Theme::ChangeListenerContainer* Theme::GetChangeListeners (
-    const ThemeItem eItem,
-    const bool bCreate)
+	const ThemeItem eItem,
+	const bool bCreate)
 {
-    ChangeListeners::iterator iContainer (maChangeListeners.find(eItem));
-    if (iContainer != maChangeListeners.end())
-        return &iContainer->second;
-    else if (bCreate)
-    {
-        maChangeListeners[eItem] = ChangeListenerContainer();
-        return &maChangeListeners[eItem];
-    }
-    else
-        return NULL;
+	ChangeListeners::iterator iContainer (maChangeListeners.find(eItem));
+	if (iContainer != maChangeListeners.end())
+		return &iContainer->second;
+	else if (bCreate)
+	{
+		maChangeListeners[eItem] = ChangeListenerContainer();
+		return &maChangeListeners[eItem];
+	}
+	else
+		return NULL;
 }
 
 
-
-
 bool Theme::DoVetoableListenersVeto (
-    const VetoableListenerContainer* pListeners,
-    const beans::PropertyChangeEvent& rEvent) const
+	const VetoableListenerContainer* pListeners,
+	const beans::PropertyChangeEvent& rEvent) const
 {
-    if (pListeners == NULL)
-        return false;
+	if (pListeners == NULL)
+		return false;
 
-    VetoableListenerContainer aListeners (*pListeners);
-    try
-    {
-        for (VetoableListenerContainer::const_iterator
-                 iListener(aListeners.begin()),
-                 iEnd(aListeners.end());
-             iListener!=iEnd;
-             ++iListener)
-        {
-            (*iListener)->vetoableChange(rEvent);
-        }
-    }
-    catch(const beans::PropertyVetoException&)
-    {
-        return true;
-    }
-    catch(const Exception&)
-    {
-        // Ignore any other errors (such as disposed listeners).
-    }
-    return false;
+	VetoableListenerContainer aListeners (*pListeners);
+	try
+	{
+		for (VetoableListenerContainer::const_iterator
+				 iListener(aListeners.begin()),
+				 iEnd(aListeners.end());
+			 iListener!=iEnd;
+			 ++iListener)
+		{
+			(*iListener)->vetoableChange(rEvent);
+		}
+	}
+	catch(const beans::PropertyVetoException&)
+	{
+		return true;
+	}
+	catch(const Exception&)
+	{
+		// Ignore any other errors (such as disposed listeners).
+	}
+	return false;
 }
 
 
-
-
 void Theme::BroadcastPropertyChange (
-    const ChangeListenerContainer* pListeners,
-    const beans::PropertyChangeEvent& rEvent) const
+	const ChangeListenerContainer* pListeners,
+	const beans::PropertyChangeEvent& rEvent) const
 {
-    if (pListeners == NULL)
-        return;
+	if (pListeners == NULL)
+		return;
 
-    const ChangeListenerContainer aListeners (*pListeners);
-    try
-    {
-        for (ChangeListenerContainer::const_iterator
-                 iListener(aListeners.begin()),
-                 iEnd(aListeners.end());
-             iListener!=iEnd;
-             ++iListener)
-        {
-            (*iListener)->propertyChange(rEvent);
-        }
-    }
-    catch(const Exception&)
-    {
-        // Ignore any errors (such as disposed listeners).
-    }
+	const ChangeListenerContainer aListeners (*pListeners);
+	try
+	{
+		for (ChangeListenerContainer::const_iterator
+				 iListener(aListeners.begin()),
+				 iEnd(aListeners.end());
+			 iListener!=iEnd;
+			 ++iListener)
+		{
+			(*iListener)->propertyChange(rEvent);
+		}
+	}
+	catch(const Exception&)
+	{
+		// Ignore any errors (such as disposed listeners).
+	}
 }
 
 
-
-
 void Theme::ProcessNewValue (
-    const Any& rValue,
-    const ThemeItem eItem,
-    const PropertyType eType)
-{
-    const sal_Int32 nIndex (GetIndex (eItem, eType));
-    switch (eType)
-    {
-        case PT_Image:
-        {
-            ::rtl::OUString sURL;
-            if (rValue >>= sURL)
-            {
-                maImages[nIndex] = Tools::GetImage(sURL, NULL);
-            }
-            break;
-        }
-        case PT_Color:
-        {
-            sal_Int32 nColorValue (0);
-            if (rValue >>= nColorValue)
-            {
-                maColors[nIndex] = Color(nColorValue);
-            }
-            break;
-        }
-        case PT_Paint:
-        {
-            maPaints[nIndex] = Paint::Create(rValue);
-            break;
-        }
-        case PT_Integer:
-        {
-            sal_Int32 nValue (0);
-            if (rValue >>= nValue)
-            {
-                maIntegers[nIndex] = nValue;
-            }
-            break;
-        }
-        case PT_Boolean:
-        {
-            sal_Bool nValue (0);
-            if (rValue >>= nValue)
-            {
-                maBooleans[nIndex] = (nValue==sal_True);
-                if (eItem == Bool_IsHighContrastModeActive)
-                {
-                    mbIsHighContrastModeSetManually = true;
-                    mbIsHighContrastMode = maBooleans[nIndex];
-                    HandleDataChange();
-                }
-                else if (eItem == Bool_UseSystemColors)
-                {
-                    HandleDataChange();
-                }
-            }
-            break;
-        }
-        case PT_Rectangle:
-        {
-            awt::Rectangle aBox;
-            if (rValue >>= aBox)
-            {
-                maRectangles[nIndex] = Rectangle(
-                    aBox.X,
-                    aBox.Y,
-                    aBox.Width,
-                    aBox.Height);
-            }
-            break;
-        }
-        case PT_Invalid:
-            OSL_ASSERT(eType != PT_Invalid);
-            throw RuntimeException();
-    }
+	const Any& rValue,
+	const ThemeItem eItem,
+	const PropertyType eType)
+{
+	const sal_Int32 nIndex (GetIndex (eItem, eType));
+	switch (eType)
+	{
+		case PT_Image:
+		{
+			::rtl::OUString sURL;
+			if (rValue >>= sURL)
+			{
+				maImages[nIndex] = Tools::GetImage(sURL, NULL);
+			}
+			break;
+		}
+		case PT_Color:
+		{
+			sal_Int32 nColorValue (0);
+			if (rValue >>= nColorValue)
+			{
+				maColors[nIndex] = Color(nColorValue);
+			}
+			break;
+		}
+		case PT_Paint:
+		{
+			maPaints[nIndex] = Paint::Create(rValue);
+			break;
+		}
+		case PT_Integer:
+		{
+			sal_Int32 nValue (0);
+			if (rValue >>= nValue)
+			{
+				maIntegers[nIndex] = nValue;
+			}
+			break;
+		}
+		case PT_Boolean:
+		{
+			sal_Bool nValue (0);
+			if (rValue >>= nValue)
+			{
+				maBooleans[nIndex] = (nValue==sal_True);
+				if (eItem == Bool_IsHighContrastModeActive)
+				{
+					mbIsHighContrastModeSetManually = true;
+					mbIsHighContrastMode = maBooleans[nIndex];
+					HandleDataChange();
+				}
+				else if (eItem == Bool_UseSystemColors)
+				{
+					HandleDataChange();
+				}
+			}
+			break;
+		}
+		case PT_Rectangle:
+		{
+			awt::Rectangle aBox;
+			if (rValue >>= aBox)
+			{
+				maRectangles[nIndex] = Rectangle(
+					aBox.X,
+					aBox.Y,
+					aBox.Width,
+					aBox.Height);
+			}
+			break;
+		}
+		case PT_Invalid:
+			OSL_ASSERT(eType != PT_Invalid);
+			throw RuntimeException();
+	}
 }
 
-
-
-
 } } // end of namespace sfx2::sidebar



Mime
View raw message