diff options
| author | Sébastien Le Ray <sebastien-libreoffice@orniz.org> | 2011-03-06 16:39:25 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-08 12:00:01 +0000 |
| commit | 4e7e90f575657ba6096bc8ed11c6ee4d6f309fe8 (patch) | |
| tree | 6dbb0c0a223b1b046b81460c97ef1e26f8e27bf9 | |
| parent | 63a4ba9aad0fa6d621e67fd27986508cdf5c00d4 (diff) | |
Renamed shadow images to *-mask.
| -rw-r--r-- | sw/source/core/inc/pagefrm.hrc | 6 | ||||
| -rw-r--r-- | sw/source/core/layout/pagefrm.src | 12 | ||||
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/core/inc/pagefrm.hrc b/sw/source/core/inc/pagefrm.hrc index 20a0512f40..302ba9a76b 100644 --- a/sw/source/core/inc/pagefrm.hrc +++ b/sw/source/core/inc/pagefrm.hrc @@ -31,9 +31,9 @@ #include "rcid.hrc" // Bitmaps for page shadow -#define BMP_PAGE_RIGHT_SHADOW RC_PAGEFRM_BEGIN + 0 -#define BMP_PAGE_BOTTOM_RIGHT_SHADOW RC_PAGEFRM_BEGIN + 1 -#define BMP_PAGE_BOTTOM_SHADOW RC_PAGEFRM_BEGIN + 2 +#define BMP_PAGE_RIGHT_SHADOW_MASK RC_PAGEFRM_BEGIN + 0 +#define BMP_PAGE_BOTTOM_RIGHT_SHADOW_MASK RC_PAGEFRM_BEGIN + 1 +#define BMP_PAGE_BOTTOM_SHADOW_MASK RC_PAGEFRM_BEGIN + 2 // If you add resources, don't forget to update this diff --git a/sw/source/core/layout/pagefrm.src b/sw/source/core/layout/pagefrm.src index dd77467091..83b80e4714 100644 --- a/sw/source/core/layout/pagefrm.src +++ b/sw/source/core/layout/pagefrm.src @@ -1,17 +1,17 @@ #include "pagefrm.hrc" -Bitmap BMP_PAGE_RIGHT_SHADOW +Bitmap BMP_PAGE_RIGHT_SHADOW_MASK { - File = "page-right-shadow.png"; + File = "page-right-shadow-mask.png"; }; -Bitmap BMP_PAGE_BOTTOM_RIGHT_SHADOW +Bitmap BMP_PAGE_BOTTOM_RIGHT_SHADOW_MASK { - File = "page-bottomright-shadow.png"; + File = "page-bottomright-shadow-mask.png"; }; -Bitmap BMP_PAGE_BOTTOM_SHADOW +Bitmap BMP_PAGE_BOTTOM_SHADOW_MASK { - File = "page-bottom-shadow.png"; + File = "page-bottom-shadow-mask.png"; }; diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 82ab24b663..13b51d301e 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -5313,7 +5313,7 @@ const sal_Int8 SwPageFrm::mnShadowPxWidth = 10; if(!initialized) { - AlphaMask aMask( SW_RES( BMP_PAGE_BOTTOM_RIGHT_SHADOW ) ); + AlphaMask aMask( SW_RES( BMP_PAGE_BOTTOM_RIGHT_SHADOW_MASK ) ); Bitmap aFilledSquare( Size( mnShadowPxWidth, mnShadowPxWidth ), 24 ); aFilledSquare.Erase( aShadowColor ); @@ -5325,12 +5325,12 @@ const sal_Int8 SwPageFrm::mnShadowPxWidth = 10; aFilledSquare = Bitmap( Size( 1, mnShadowPxWidth ), 24 ); aFilledSquare.Erase( aShadowColor ); - aMask = Bitmap( SW_RES( BMP_PAGE_BOTTOM_SHADOW ) ); + aMask = Bitmap( SW_RES( BMP_PAGE_BOTTOM_SHADOW_MASK ) ); aPageBottomShadowBase = BitmapEx( aFilledSquare, aMask ); aFilledSquare = Bitmap( Size( mnShadowPxWidth, 1 ), 24 ); aFilledSquare.Erase( aShadowColor ); - aMask = Bitmap( SW_RES( BMP_PAGE_RIGHT_SHADOW ) ); + aMask = Bitmap( SW_RES( BMP_PAGE_RIGHT_SHADOW_MASK ) ); aPageRightShadowBase = BitmapEx( aFilledSquare, aMask ); initialized = true; |