summaryrefslogtreecommitdiff
path: root/sd/source/ui/app
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-05-27 20:45:56 +0200
committerJan Holesovsky <kendy@suse.cz>2011-05-27 20:45:56 +0200
commit209a875b72d5e311b1149ec9d028001994c4ae4f (patch)
tree3d75eb1e522261d985ef7862d58fca94cb29bd78 /sd/source/ui/app
parent6d421b526ac2250b28f650736c684e572434ce4c (diff)
parentc8d090428ba2a9d710499baf62ddfe252c16aa1f (diff)
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts: slideshow/source/engine/makefile.mk
Diffstat (limited to 'sd/source/ui/app')
-rw-r--r--sd/source/ui/app/res_bmp.src13
1 files changed, 13 insertions, 0 deletions
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 07309b86c1be..e58f813e3c0a 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -253,6 +253,19 @@ Bitmap BMP_GRAPHIC
#define SfxStyleFamiliesRes2\
Text [ en-US ] = "Presentation Styles" ;\
+String STR_STYLE_FILTER_USED
+{
+ Text [ en-US ] = "Applied Styles" ;
+};
+String STR_STYLE_FILTER_USERDEF
+{
+ Text [ en-US ] = "Custom Styles" ;
+};
+String STR_STYLE_FILTER_ALL
+{
+ Text [ en-US ] = "All Styles" ;
+};
+
SfxStyleFamilies DLG_STYLE_DESIGNER
{
StyleFamilyList =