diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-10-01 10:20:24 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-10-01 10:20:24 +0000 |
| commit | d507cdf83a74b4d468b6e5682a1434bad7f792c8 (patch) | |
| tree | 69c4ad5df94f1727e1cf5fc4ed3c0665e49a5e31 | |
| parent | c290df5561c78d706af9f1e0d1fb13271c37c64d (diff) | |
CWS-TOOLING: integrate CWS impressnotes03
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.xcu | 2 | ||||
| -rw-r--r-- | svx/inc/svx/svxids.hrc | 4 | ||||
| -rw-r--r-- | svx/sdi/svx.sdi | 2 |
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 b4d7127a2c89..2925c2a97802 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 a4b0d8736618..4e3b1ebf4889 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 28f50ef89b5c..e3826708c196 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: */ |