summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2013-04-17 12:15:11 +0000
committerMichael Meeks <michael.meeks@suse.com>2013-05-20 11:33:15 +0100
commit946a36ec4377e114ad56fe437b8d8d8f41a7ccdf (patch)
tree9964ac27ed69060cf19367376c07e914f557cc51 /include
parent58a825b4d047c0f99d4f9a193c97af423b23fb97 (diff)
Related: #i122041# Added 'Automatic' to TextPropertyPanel, FontColor...
and HilightColor. Added 'No Color' to ParagraphPropertyPanel and BackgroundColor (cherry picked from commit 6b722f7d7c1ae5a1b344a24442bd591afba8606b) Conflicts: svx/inc/svx/dialogs.hrc Change-Id: If75bdb87a1fc43e753c8c8ab15370808235926fd
Diffstat (limited to 'include')
-rw-r--r--include/svx/dialogs.hrc3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 08ff470dc2f6..4cfa8c5fc1ce 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -26,7 +26,7 @@
// Resource-Id's ------------------------------------------------------------
// !!! IMPORTANT: consider and update FIRSTFREE when introducing new RIDs !!! (not for RIDs for Strings - they have there own)
-#define RID_SVX_FIRSTFREE 332
+#define RID_SVX_FIRSTFREE 333
// some strings also used in CUI
#define RID_SVXERRCTX (RID_SVX_START + 351)
@@ -270,6 +270,7 @@
#define RID_POPUPPANEL_PARAPAGE_LINESPACING (RID_SVX_START + 329)
#define RID_POPUPPANEL_PARAPAGE_BULLETS (RID_SVX_START + 330)
#define RID_POPUPPANEL_PARAPAGE_NUMBERING (RID_SVX_START + 331)
+#define RID_POPUPPANEL_PARAPAGE_BACK_COLOR (RID_SVX_START + 332)
// !!! IMPORTANT: consider and update RID_SVX_FIRSTFREE when introducing new RIDs !!! (see above)