summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2009-10-01 12:25:02 +0000
committerKurt Zenker <kz@openoffice.org>2009-10-01 12:25:02 +0000
commitfc2ba0a7d62c13968657efbb0c12cd7ba967bbb0 (patch)
tree6ef3277c056c3bf0d632c231ce283dd3b2cfad7e
parent6d1dd26cce2cbef8f0cc347fc253eb42836bca5f (diff)
CWS-TOOLING: integrate CWS impressnotes03_OOO320
2009-09-28 16:30:17 +0200 cl r276496 : #i105382# use correct method to get master page 2009-09-28 12:23:04 +0200 cl r276486 : #i105266# also save text on close to avoid focus trouble under linux 2009-09-25 13:59:50 +0200 cl r276456 : #i105266# resolved a merge conflict 2009-09-25 13:57:24 +0200 cl r276454 : #i105266# resolved a merge conflict 2009-09-25 13:51:12 +0200 cl r276450 : #i105266# resolved a merge conflict 2009-09-25 13:40:08 +0200 cl r276447 : #i105266# resolved a merge conflict
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu2
-rw-r--r--svx/inc/svx/svxids.hrc4
-rw-r--r--svx/sdi/svx.sdi2
3 files changed, 4 insertions, 4 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index b4d7127a2c..2925c2a978 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -2074,7 +2074,7 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:ShowAnnotation" oor:op="replace">
+ <node oor:name=".uno:ShowAnnotations" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Comme~nts</value>
</prop>
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index eb35d48735..4d8f48af85 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -1351,7 +1351,6 @@
#define SID_ATTR_PARA_OUTLINE_LEVEL (SID_SVX_START+1092)
#define SID_OBJECT_MIRROR (SID_SVX_START+1093)
-#define SID_INSERT_POSTIT (SID_SVX_START+1093)
#define SID_DELETE_POSTIT (SID_SVX_START+1094)
#define SID_NEXT_POSTIT (SID_SVX_START+1095)
#define SID_PREVIOUS_POSTIT (SID_SVX_START+1096)
@@ -1359,9 +1358,10 @@
#define SID_SHOW_POSTIT (SID_SVX_START+1098)
#define SID_REPLYTO_POSTIT (SID_SVX_START+1099)
#define SID_DELETEALLBYAUTHOR_POSTIT (SID_SVX_START+1100)
+#define SID_INSERT_POSTIT (SID_SVX_START+1101)
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE SID_DELETEALLBYAUTHOR_POSTIT + 1
+#define SID_SVX_FIRSTFREE SID_INSERT_POSTIT + 1
// --------------------------------------------------------------------------
// Overflow check for slot IDs
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 28f50ef89b..e3826708c1 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -5954,7 +5954,7 @@ SfxVoidItem InsertAnnotation SID_INSERT_POSTIT
]
//--------------------------------------------------------------------------
-SfxBoolItem ShowAnnotation SID_SHOW_POSTIT
+SfxBoolItem ShowAnnotations SID_SHOW_POSTIT
()
[
/* flags: */