summaryrefslogtreecommitdiff
path: root/sd/source/ui/inc
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-12-11 15:25:59 +0000
committerRüdiger Timm <rt@openoffice.org>2008-12-11 15:25:59 +0000
commit34d877e2d966d1772c61d6bc8217438fcf34389f (patch)
tree4be409f826f17619f940f644133ea3c24b7d0ab9 /sd/source/ui/inc
parent4707f7bb54d143e642ad5df5eedf56d5d2b08385 (diff)
CWS-TOOLING: integrate CWS impressfontsize
2008-12-11 14:15:16 +0100 wg r265298 : i97125 2008-12-11 12:54:53 +0100 wg r265288 : i97125 2008-12-11 12:53:03 +0100 wg r265287 : i97125 2008-12-11 11:25:42 +0100 wg r265270 : i97125 2008-12-11 10:22:13 +0100 wg r265253 : i97125 2008-12-11 09:22:47 +0100 wg r265247 : i97125 2008-12-09 15:28:51 +0100 cl r265097 : added missing toolbar buttons for inc/dec font size 2008-12-08 17:39:46 +0100 cl r265012 : #i80257# added autolayout text only 2008-12-08 17:32:07 +0100 cl r265011 : #i80257# added autolayout text only 2008-12-08 16:42:19 +0100 cl r265008 : #i94459# fixed a bug in insertByName and replaceByName 2008-12-08 16:25:26 +0100 cl r265007 : #i80257# new image for text only auto layout in impress 2008-12-08 16:24:01 +0100 cl r265006 : #i80257# new image for text only auto layout in impress 2008-12-08 16:01:46 +0100 cl r265003 : #i88855# changed wording from Monitor to Display 2008-12-08 15:57:24 +0100 cl r265002 : #i91904# applied patch to fix a wrong index access 2008-12-05 12:51:47 +0100 cl r264900 : #i8824# allow setting of text properties at shape without reformating text 2008-12-05 11:09:21 +0100 cl r264895 : fixed build problem 2008-12-04 12:04:09 +0100 cl r264829 : fixed build issue 2008-12-04 11:03:58 +0100 cl r264823 : #i8824# set new fontsize at shape 2008-12-02 22:39:22 +0100 cl r264732 : fixed build problem 2008-12-02 22:38:42 +0100 cl r264731 : fixed build problem 2008-12-01 17:44:29 +0100 cl r264623 : CWS-TOOLING: rebase CWS impressfontsize to trunk@264325 (milestone: DEV300:m36) 2008-11-07 11:38:13 +0100 cl r263418 : #i95920# fixed an OpenSolaris build breaker 2008-11-06 14:56:04 +0100 cl r263386 : #i40730# added support to supress export of hidden slides to html 2008-11-06 14:55:41 +0100 cl r263385 : #i40730# added support to supress export of hidden slides to html 2008-11-06 14:03:59 +0100 cl r263384 : #158530# allow editing of interaction links with hyperlink editor 2008-10-20 15:34:13 +0200 cl r262322 : #i8824# migrate cws impressfontsize to subversion.
Diffstat (limited to 'sd/source/ui/inc')
-rw-r--r--sd/source/ui/inc/futext.hxx4
-rw-r--r--sd/source/ui/inc/pubdlg.hrc1
-rw-r--r--sd/source/ui/inc/pubdlg.hxx1
-rw-r--r--sd/source/ui/inc/res_bmp.hrc2
-rw-r--r--sd/source/ui/inc/strings.hrc2
5 files changed, 10 insertions, 0 deletions
diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx
index 599fbf66210d..f0f1956dbb6c 100644
--- a/sd/source/ui/inc/futext.hxx
+++ b/sd/source/ui/inc/futext.hxx
@@ -40,6 +40,8 @@
struct StyleRequestData;
class SdrTextObj;
class OutlinerParaObject;
+class FontList;
+class OutlinerView;
namespace sd {
@@ -87,6 +89,8 @@ public:
*/
virtual bool cancel();
+ static void ChangeFontSize( bool, OutlinerView*, const FontList*, ::sd::View* );
+
protected:
FuText (ViewShell* pViewSh,
::sd::Window* pWin,
diff --git a/sd/source/ui/inc/pubdlg.hrc b/sd/source/ui/inc/pubdlg.hrc
index e040b79a385a..e54145dbcb45 100644
--- a/sd/source/ui/inc/pubdlg.hrc
+++ b/sd/source/ui/inc/pubdlg.hrc
@@ -89,6 +89,7 @@
#define PAGE3_TITEL_3 60
#define PAGE3_SLD_SOUND 61
#define PAGE3_VERT 62
+#define PAGE3_HIDDEN_SLIDES 63
//////////////////////////////
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index ce0819fc861c..f4ab1ea79546 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -136,6 +136,7 @@ private:
RadioButton* pPage3_Resolution_3;
FixedLine* pPage3_Titel3;
CheckBox* pPage3_SldSound;
+ CheckBox* pPage3_HiddenSlides;
// page 4 controls
FixedBitmap* pPage4_Bmp;
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 29ea40bea1d9..b5e4dbcc0428 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -98,6 +98,7 @@
#define BMP_FOILH_06 RID_APP_START+35
#define BMP_FOILH_09 RID_APP_START+36
#define BMP_FOILN_01 RID_APP_START+40
+#define BMP_FOIL_25 RID_APP_START+41
// Bitmaps fuer Tree-ListBox im Effekte-TabDialog
#define BMP_PAGE RID_APP_START+42
@@ -229,6 +230,7 @@
#define BMP_FADE_EFFECT_INDICATOR_H RID_SD_START+332
#define BMP_FOILH_09_H RID_SD_START+333
+#define BMP_FOIL_25_H RID_SD_START+334
// -----------------------------------------------------------------------------
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index 153d91aa9687..db2683bf5c6c 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -198,6 +198,8 @@
#define STR_AUTOLAYOUT_HANDOUT6 (RID_APP_START+235)
#define STR_AUTOLAYOUT_NOTES (RID_APP_START+236)
#define STR_AUTOLAYOUT_HANDOUT9 (RID_APP_START+237)
+#define STR_AUTOLAYOUT_ONLY_TEXT (RID_APP_START+238)
+
#define STR_TRANSFORM (RID_APP_START+240)