summaryrefslogtreecommitdiff
path: root/sw/source/core
diff options
context:
space:
mode:
authorSébastien Le Ray <sebastien-libreoffice@orniz.org>2011-03-06 16:39:25 +0100
committerMichael Meeks <michael.meeks@novell.com>2011-03-08 12:00:01 +0000
commit497683efc24fa419dee4170cc32a4a1e39402f48 (patch)
tree8e870bc39936d1633e2e819a970032cbc1b24337 /sw/source/core
parent4b8b1cc624aa94ed42a9bc2f63420cf5ccb9484f (diff)
Renamed shadow images to *-mask.
Diffstat (limited to 'sw/source/core')
-rw-r--r--sw/source/core/inc/pagefrm.hrc6
-rw-r--r--sw/source/core/layout/pagefrm.src12
-rw-r--r--sw/source/core/layout/paintfrm.cxx6
3 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/core/inc/pagefrm.hrc b/sw/source/core/inc/pagefrm.hrc
index 20a0512f409e..302ba9a76b16 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 dd7746709159..83b80e4714f9 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 66f2f615d39d..4ce499522b18 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;