summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lippka ORACLE <christian.lippka@oracle.com>2011-12-06 01:46:46 +0100
committerThorsten Behrens <tbehrens@suse.com>2011-12-06 09:39:09 +0100
commit37fe168502f4c21b2f1d4bb0491cbb658ae6afcb (patch)
tree0cdade72f78b3ecdc4973fa8ec5f6eee5c7bcb2e
parent78fff8ca491b70af21705ae169ab48f68b8a5e37 (diff)
impress210: #i116846# adding uncommited changes from cws impressdefautls1
# HG changeset patch # User Christian Lippka ORACLE <christian.lippka@oracle.com> # Date 1297097627 -3600 # Node ID e7f337a6055814068bdc823306bc3a3f9cac48e5 # Parent 80a255ef3468baa8b249e02aa760b0da463e1d26 impress210: #i116846# adding uncommited changes from cws impressdefautls1
-rw-r--r--extras/source/palettes/standard.soc2
-rw-r--r--sd/source/ui/slideshow/slideshow.src6
-rw-r--r--svx/inc/svx/xdef.hxx2
3 files changed, 5 insertions, 5 deletions
diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc
index 0370e7af4dcf..f48577aa85b8 100644
--- a/extras/source/palettes/standard.soc
+++ b/extras/source/palettes/standard.soc
@@ -48,7 +48,7 @@
<draw:color draw:name="Blue 6" draw:color="#0099ff"/>
<draw:color draw:name="Blue 7" draw:color="#00b8ff"/>
<draw:color draw:name="Blue 8" draw:color="#99ccff"/>
- <draw:color draw:name="Blue 9" draw:color="#CFE7E5"/>
+ <draw:color draw:name="Blue 9" draw:color="#CFE7F5"/>
<draw:color draw:name="Turquoise 1" draw:color="#00dcff"/>
<draw:color draw:name="Turquoise 2" draw:color="#00cccc"/>
<draw:color draw:name="Turquoise 3" draw:color="#23b8dc"/>
diff --git a/sd/source/ui/slideshow/slideshow.src b/sd/source/ui/slideshow/slideshow.src
index 78cd2aae0d9f..c3efa2ac2f32 100644
--- a/sd/source/ui/slideshow/slideshow.src
+++ b/sd/source/ui/slideshow/slideshow.src
@@ -74,7 +74,7 @@ Menu RID_SLIDESHOW_CONTEXTMENU
MenuItem
{
Identifier = CM_PEN_MODE;
- Text [ en-US ] = "Mouse pointer as ~pen";
+ Text [ en-US ] = "Mouse Pointer as ~Pen";
};
MenuItem
{
@@ -115,12 +115,12 @@ Menu RID_SLIDESHOW_CONTEXTMENU
MenuItem
{
Identifier = CM_COLOR_PEN ;
- Text [ en-US ] = "~Change Pen Color..." ;
+ Text [ en-US ] = "~Change pen Color..." ;
};
MenuItem
{
Identifier = CM_ERASE_ALLINK ;
- Text [ en-US ] = "~Erase All Ink On Slide" ;
+ Text [ en-US ] = "~Erase all ink on Slide" ;
};
MenuItem
{
diff --git a/svx/inc/svx/xdef.hxx b/svx/inc/svx/xdef.hxx
index 645f86845cda..beaaa8a38179 100644
--- a/svx/inc/svx/xdef.hxx
+++ b/svx/inc/svx/xdef.hxx
@@ -37,7 +37,7 @@
|*
\************************************************************************/
-#define COL_DEFAULT_SHAPE_FILLING RGB_COLORDATA( 0xCF, 0xE7, 0xE5 )
+#define COL_DEFAULT_SHAPE_FILLING RGB_COLORDATA( 0xCF, 0xE7, 0xF5 )
#define COL_DEFAULT_SHAPE_STROKE RGB_COLORDATA( 128, 128, 128 )
#define XATTR_START 1000