summaryrefslogtreecommitdiff
path: root/sd/source/ui/app
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-05-19 09:32:45 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-05-19 09:32:45 +0000
commit615772fb62f460cb026771b27822f83264784a1c (patch)
tree5e0ed28e780a5321a8156a8246cddee0aef84f07 /sd/source/ui/app
parent04a678277a03469c17b32b6bfdc259700e55e956 (diff)
CWS-TOOLING: integrate CWS impress169
2009-05-13 17:37:21 +0200 sj r271865 : #i100942# applied patch, removed oversafe buffer check (now without warnings on 64 bit platform) 2009-05-13 12:27:18 +0200 sj r271855 : #i101769# fixed line/fill attributes for graphic objects 2009-05-12 10:25:17 +0200 cl r271799 : report correct minimum cell hight for empty cells 2009-04-28 17:29:46 +0200 cl r271334 : fixed merge error 2009-04-28 16:18:01 +0200 cl r271330 : fixed build error 2009-04-28 12:38:09 +0200 cl r271320 : #i100129# images for new layouts 2009-04-27 19:12:06 +0200 cl r271302 : CWS-TOOLING: rebase CWS impress169 to trunk@270723 (milestone: DEV300:m46) 2009-04-20 19:13:28 +0200 sj r271012 : #i100942# applied patch, removed oversafe buffer check 2009-04-09 18:00:01 +0200 sj r270719 : #158488# added rectangular gradient support 2009-04-09 17:49:52 +0200 sj r270718 : #158488# added rectangular gradient support 2009-04-09 17:46:24 +0200 sj r270717 : #158488# added rectangular gradient support 2009-03-26 18:16:34 +0100 cl r270098 : #i99867# applied patch from jlcheng to correctly register table design pane 2009-03-26 18:12:11 +0100 cl r270097 : #i100220# leave some items default so they are not overridden if a new table style is set 2009-03-26 18:11:10 +0100 cl r270096 : #i100220# clear only those items that are also in the style when assigning a new table layout 2009-03-26 15:56:24 +0100 cl r270085 : #i99977# listen to outliner and dispose if outliner dies 2009-03-26 15:47:29 +0100 cl r270084 : #i99977# made the Outliner a SfxBroadcaster so others can listen for its death 2009-03-24 19:10:05 +0100 sj r269991 : #i100490# fixed text resize problem 2009-03-23 14:31:11 +0100 sj r269872 : #i96083# added patch, (dubious && and ||) 2009-03-19 17:55:11 +0100 sj r269764 : #i100275# applied patch, row height is now correct even for rows containing no text 2009-03-18 18:10:52 +0100 sj r269701 : #i93616# solved performance problem when loading document 2009-03-18 16:20:40 +0100 sj r269688 : removing unused code 2009-03-18 16:19:22 +0100 sj r269687 : removing unused code 2009-03-18 16:17:54 +0100 sj r269686 : removing unused code 2009-03-18 10:28:07 +0100 cl r269643 : #i100029# let cells be disposed as soon as the table model is disposed 2009-03-17 15:56:50 +0100 cl r269614 : #i99984# new impress photo layouts 3x2 and 2x2 2009-03-17 15:36:35 +0100 cl r269611 : #i99984# adding new impress photo layouts 3x2 and 2x2 2009-03-16 18:43:48 +0100 cl r269564 : #i55224# correct internal links if pages are changed 2009-03-16 16:40:38 +0100 cl r269559 : #i55224# correct internal hyperlinks if slides are changed/renamed 2009-03-16 15:34:12 +0100 cl r269553 : #i99427# invalidate slots after promote/demote 2009-03-13 18:18:20 +0100 sj r269492 : #i92421# fixed loop if loading encrypted ppt file 2009-03-13 14:51:58 +0100 sj r269481 : #i93002# fixed crash if saving presentation without master title placeholder 2009-03-13 12:26:21 +0100 sj r269468 : #i100147# do not exceed the max point count if creating simple polygon via ::GetSimple 2009-03-12 17:00:45 +0100 sj r269427 : #i82518# justifying rectangles for arc/pie and chord actions, fixed round rectangle problem
Diffstat (limited to 'sd/source/ui/app')
-rw-r--r--sd/source/ui/app/res_bmp.src16
-rw-r--r--sd/source/ui/app/strings.src8
2 files changed, 24 insertions, 0 deletions
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 5951fddd0e1c..25bb04e954ca 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -237,6 +237,22 @@ Bitmap BMP_FOIL_25_H
{
File = "foil25_h.bmp" ;
};
+Bitmap BMP_FOIL_26
+{
+ File = "foil26.bmp" ;
+};
+Bitmap BMP_FOIL_26_H
+{
+ File = "foil26_h.bmp" ;
+};
+Bitmap BMP_FOIL_27
+{
+ File = "foil27.bmp" ;
+};
+Bitmap BMP_FOIL_27_H
+{
+ File = "foil27_h.bmp" ;
+};
Bitmap BMP_FOILH_01
{
File = "foilh01.bmp" ;
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 7bea646e3122..ca20d5900768 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -253,6 +253,10 @@ String STR_AUTOLAYOUT_4OBJ
{
Text [ en-US ] = "Title, 4 Objects" ;
};
+String STR_AUTOLAYOUT_4CLIPART
+{
+ Text [ en-US ] = "Title, 4 Cliparts" ;
+};
String STR_AL_TITLE_VERT_OUTLINE
{
Text [ en-US ] = "Title, Vertical Text" ;
@@ -269,6 +273,10 @@ String STR_AL_VERT_TITLE_VERT_OUTLINE
{
Text [ en-US ] = "Vertical Title, Vertical Text" ;
};
+String STR_AUTOLAYOUT_6CLIPART
+{
+ Text [ en-US ] = "Title, 6 Cliparts" ;
+};
String STR_AUTOLAYOUT_HANDOUT1
{