[ooo-build-commit] Branch 'ooo/master' - 2 commits - starmath/sdi sw/sdi sw/source sw/uiconfig
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Sep 16 20:11:33 PDT 2009
starmath/sdi/makefile.mk | 3 ++-
sw/sdi/makefile.mk | 8 ++++----
sw/source/core/undo/undo.src | 2 +-
sw/source/ui/app/mn.src | 10 +++++-----
sw/source/ui/config/optdlg.src | 6 +++---
sw/source/ui/docvw/docvw.src | 4 ++--
sw/source/ui/utlui/utlui.src | 4 ++--
sw/uiconfig/sglobal/accelerator/en-GB/default.xml | 2 +-
sw/uiconfig/sglobal/accelerator/en-US/default.xml | 2 +-
sw/uiconfig/swform/accelerator/en-US/default.xml | 2 +-
sw/uiconfig/swreport/accelerator/en-GB/default.xml | 2 +-
sw/uiconfig/swreport/accelerator/en-US/default.xml | 2 +-
sw/uiconfig/swriter/accelerator/en-GB/default.xml | 2 +-
sw/uiconfig/swriter/accelerator/en-US/default.xml | 2 +-
sw/uiconfig/swxform/accelerator/en-GB/default.xml | 2 +-
sw/uiconfig/swxform/accelerator/en-US/default.xml | 2 +-
16 files changed, 28 insertions(+), 27 deletions(-)
New commits:
commit 1680b437d8759e970c6bdf73949f3711211e2ae1
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Sep 16 13:55:36 2009 +0000
CWS-TOOLING: integrate CWS impressnotes01
2009-09-11 13:52:41 +0200 cl r276061 : CWS-TOOLING: rebase CWS impressnotes01 to trunk at 276043 (milestone: DEV300:m58)
2009-09-10 15:44:57 +0200 cl r276039 : #i103139# continued work on the impress annotation feature
2009-09-10 14:52:31 +0200 cl r276032 : #i103139# continued work on the impress annotation feature
2009-09-10 14:50:32 +0200 cl r276031 : #i103139# continued work on the impress annotation feature
2009-09-10 14:48:29 +0200 cl r276030 : #i103139# continued work on the impress annotation feature
2009-09-10 11:36:11 +0200 cl r276027 : #i103139# continued work on the impress annotation feature
2009-09-09 20:22:41 +0200 cl r276018 : #i103139# continued work on the impress annotation feature
2009-09-09 20:21:45 +0200 cl r276017 : #i103139# continued work on the impress annotation feature
2009-09-09 19:32:29 +0200 sj r276015 : #i103139# added import of comments (ppt binary)
2009-09-09 19:31:07 +0200 sj r276014 : #i103139# added import of comments (ppt binary)
2009-09-09 19:16:41 +0200 cl r276011 : #i103139# continued work on the impress annotation feature
2009-09-09 19:15:19 +0200 cl r276010 : #i103139# continued work on the impress annotation feature
2009-09-09 16:27:19 +0200 cl r276001 : #i104579# fixed isEmptyPresObj()
2009-09-09 15:12:02 +0200 cl r275997 : #i103139# continued work on the impress annotation feature
2009-09-09 15:06:29 +0200 sj r275996 : #i103139# added import of comments (ppt binary)
2009-09-09 14:53:01 +0200 cl r275995 : #i103139# continued work on the impress annotation feature
2009-09-09 14:51:32 +0200 cl r275994 : #i103139# continued work on the impress annotation feature
2009-09-09 12:11:17 +0200 cl r275982 : #i103139# continued work on the impress annotation feature
2009-09-09 11:47:55 +0200 cl r275981 : #i103139# continued work on the impress annotation feature
2009-09-09 11:47:23 +0200 cl r275980 : #i103139# continued work on the impress annotation feature
2009-09-09 11:44:47 +0200 cl r275978 : #i104315# added missing tab pages
2009-09-08 16:04:44 +0200 cl r275936 : #i103139# continued work on the impress annotation feature
2009-09-08 16:03:28 +0200 cl r275935 : #i103139# continued work on the impress annotation feature
2009-09-08 11:45:47 +0200 cl r275920 : #i103139# continued work on the impress annotation feature
2009-09-08 11:41:51 +0200 cl r275919 : #i103139# continued work on the impress annotation feature
2009-09-07 18:30:55 +0200 cl r275910 : #i103139# continued work on the impress annotation feature
2009-09-07 18:29:37 +0200 cl r275909 : #i103139# continued work on the impress annotation feature
2009-09-07 17:25:43 +0200 cl r275905 : #i103139# continued work on the impress annotation feature
2009-09-07 12:00:28 +0200 cl r275884 : #i103139# continued work on the impress annotation feature
2009-09-06 14:14:00 +0200 cl r275859 : #i103139# continued work on the impress annotation feature
2009-09-05 20:57:24 +0200 cl r275854 : #i103139# continued work on the impress annotation feature
2009-09-05 20:56:29 +0200 cl r275853 : #i103139# continued work on the impress annotation feature
2009-09-05 20:55:27 +0200 cl r275852 : #i103139# continued work on the impress annotation feature
2009-09-05 20:11:42 +0200 cl r275851 : #i103139# continued work on the impress annotation feature
2009-09-05 20:11:09 +0200 cl r275850 : #i103139# continued work on the impress annotation feature
2009-09-05 17:43:33 +0200 cl r275845 : #i103139# continued work on the impress annotation feature
2009-09-05 17:04:41 +0200 cl r275843 : #i103139# continued work on the impress annotation feature
2009-09-05 17:03:26 +0200 cl r275842 : #i103139# continued work on the impress annotation feature
2009-09-05 17:02:53 +0200 cl r275841 : #i103139# continued work on the impress annotation feature
2009-09-05 13:15:04 +0200 pl r275839 : #i104823# WB_NEEDSFOCUS
2009-09-05 13:14:41 +0200 pl r275838 : #i104823# WB_NEEDSFOCUS
2009-09-04 17:48:21 +0200 cl r275826 : #i103139# continued work on the impress annotation feature
2009-09-04 17:35:03 +0200 cl r275825 : #i103139# continued work on the impress annotation feature
2009-09-04 17:15:46 +0200 cl r275824 : #i103139# continued work on the impress annotation feature
2009-09-04 17:12:54 +0200 cl r275823 : #i103139# continued work on the impress annotation feature
2009-09-04 17:05:23 +0200 cl r275822 : #i103139# continued work on the impress annotation feature
2009-09-04 16:48:28 +0200 cl r275820 : #i103139# continued work on the impress annotation feature
2009-09-04 16:44:02 +0200 cl r275818 : #i103139# continued work on the impress annotation feature
2009-09-04 16:43:23 +0200 cl r275817 : #i103139# continued work on the impress annotation feature
2009-09-04 16:06:04 +0200 cl r275812 : #i103139# continued work on the impress annotation feature
2009-09-04 16:05:45 +0200 cl r275811 : #i103139# continued work on the impress annotation feature
2009-09-04 15:04:33 +0200 cl r275806 : #i103139# continued work on the impress annotation feature
2009-09-04 11:43:14 +0200 cl r275795 : #i103139# continued work on the impress annotation feature
2009-09-04 11:27:10 +0200 cl r275793 : #i103139# continued work on the impress annotation feature
2009-09-04 11:10:02 +0200 cl r275792 : #i103139# continued work on the impress annotation feature
2009-09-04 11:07:05 +0200 cl r275790 : #i103139# continued work on the impress annotation feature
2009-09-04 11:05:01 +0200 cl r275789 : #i103139# continued work on the impress annotation feature
2009-09-04 10:55:51 +0200 cl r275785 : #i103139# renamed notes to comments
2009-09-04 10:54:57 +0200 cl r275784 : #i103139# renamed notes to comments
2009-09-03 20:37:35 +0200 cl r275772 : #i103139# continued work on the impress annotation feature
2009-09-03 20:35:31 +0200 cl r275771 : #i103139# continued work on the impress annotation feature
2009-09-01 18:17:55 +0200 cl r275680 : #i103139# continued work on the impress annotation feature
2009-09-01 18:15:08 +0200 cl r275678 : #i103139# continued work on the impress annotation feature
2009-09-01 18:13:38 +0200 cl r275677 : #i103139#
continued work on the impress annotation feature
2009-08-18 12:35:42 +0200 cl r275089 : fixed merge error
2009-08-18 11:39:58 +0200 cl r275086 : CWS-TOOLING: rebase CWS impressnotes01 to trunk at 275001 (milestone: DEV300:m55)
2009-07-30 13:45:10 +0200 cl r274481 : fixed merge errrors
2009-07-30 13:41:21 +0200 cl r274480 : fixed merge errrors
2009-07-30 13:39:40 +0200 cl r274478 : fixed merge errrors
2009-07-22 18:07:30 +0200 cl r274256 : CWS-TOOLING: rebase CWS impressnotes01 to trunk at 273858 (milestone: DEV300:m52)
2009-07-21 17:21:31 +0200 cl r274208 : merging
2009-07-20 14:28:34 +0200 cl r274137 : #i103139# annotation support for impress
2009-07-20 14:28:04 +0200 cl r274136 : #i103139# annotation support for impress
2009-07-20 14:27:20 +0200 cl r274135 : #i103139# annotation support for impress
2009-07-20 14:21:17 +0200 cl r274134 : #i103139# annotation support for impress
2009-07-20 14:20:56 +0200 cl r274133 : #i103139# annotation support for impress
2009-07-20 14:20:09 +0200 cl r274132 : #i103139# annotation support for impress
2009-07-20 14:19:00 +0200 cl r274131 : #i103139# annotation support for impress
2009-07-20 14:17:50 +0200 cl r274130 : #i103139# annotation support for impress
2009-07-20 14:12:24 +0200 cl r274129 : #i103139# annotation support for impress
2009-07-20 13:52:03 +0200 cl r274128 : #i103139# annotation support for impress
2009-07-20 13:51:11 +0200 cl r274127 : #i103139# annotation support for impress
2009-07-20 13:48:59 +0200 cl r274126 : #i103139# annotation support for impress
2009-07-20 13:43:56 +0200 cl r274125 : #i103139# annotation support for impress
2009-07-20 13:31:55 +0200 cl r274123 : #i103139# annotation support for impress
2009-07-20 13:30:45 +0200 cl r274122 : #i103139# annotation support for impress
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
index eed66f3..2cf91da 100644
--- a/sw/source/core/undo/undo.src
+++ b/sw/source/core/undo/undo.src
@@ -612,7 +612,7 @@ String STR_CHART
};
String STR_NOTE
{
- Text [ en-US ] = "note";
+ Text [ en-US ] = "comment";
};
String STR_REFERENCE
{
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 3336858..f1f210f 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -441,26 +441,26 @@
{\
Identifier = FN_DELETE_NOTE ;\
HelpID = FN_DELETE_NOTE ;\
- Text [ en-US ] = "Delete ~Note" ;\
+ Text [ en-US ] = "Delete ~Comment" ;\
};\
MenuItem\
{\
Identifier = FN_DELETE_NOTE_AUTHOR ;\
HelpID = FN_DELETE_NOTE_AUTHOR ;\
- Text [ en-US ] = "Delete ~All Notes by $1" ;\
+ Text [ en-US ] = "Delete ~All Comments by $1" ;\
};\
MenuItem\
{\
Identifier = FN_DELETE_ALL_NOTES ;\
HelpID = FN_DELETE_ALL_NOTES ;\
- Text [ en-US ] = "~Delete All Notes" ;\
+ Text [ en-US ] = "~Delete All Comments" ;\
};\
/*
MenuItem\
{\
Identifier = FN_HIDE_NOTE ;\
HelpID = FN_HIDE_NOTE ;\
- Text [ en-US ] = "~Hide note" ;\
+ Text [ en-US ] = "~Hide comment" ;\
};\
MenuItem\
{\
@@ -472,7 +472,7 @@
{\
Identifier = FN_HIDE_ALL_NOTES ;\
HelpID = FN_HIDE_ALL_NOTES ;\
- Text [ en-US ] = "Hide all ~notes" ;\
+ Text [ en-US ] = "Hide all ~comments" ;\
};
*/
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index 6fd2204..1a4c970 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -173,7 +173,7 @@ TabPage TP_CONTENT_OPT
{
Pos = MAP_APPFONT ( 12 , 119 ) ;
Size = MAP_APPFONT ( 108 , 10 ) ;
- Text [ en-US ] = "~Notes" ;
+ Text [ en-US ] = "~Comments" ;
};
FixedLine FL_SETTINGS
{
@@ -323,7 +323,7 @@ TabPage TP_OPTPRINT_PAGE
{
Pos = MAP_APPFONT ( 180 , 27 ) ;
Size = MAP_APPFONT ( 74 , 10 ) ;
- Text [ en-US ] = "Notes ~only" ;
+ Text [ en-US ] = "Comments ~only" ;
};
RadioButton RB_END
{
@@ -347,7 +347,7 @@ TabPage TP_OPTPRINT_PAGE
{
Pos = MAP_APPFONT ( 174 , 3 ) ;
Size = MAP_APPFONT ( 80 , 8 ) ;
- Text [ en-US ] = "Notes" ;
+ Text [ en-US ] = "Comments" ;
Group = TRUE ;
};
FixedLine FL_4
diff --git a/sw/source/ui/docvw/docvw.src b/sw/source/ui/docvw/docvw.src
index 602749b..74da499 100644
--- a/sw/source/ui/docvw/docvw.src
+++ b/sw/source/ui/docvw/docvw.src
@@ -315,12 +315,12 @@ String STR_POSTIT_YESTERDAY
String STR_DELETE_ALL_NOTES
{
- Text [ en-US ] = "All Notes" ;
+ Text [ en-US ] = "All Comments" ;
};
String STR_DELETE_AUTHOR_NOTES
{
- Text [ en-US ] = "Notes by " ;
+ Text [ en-US ] = "Comments by " ;
};
String STR_NODATE
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index 7a45772..34d9186 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -226,7 +226,7 @@ String STR_CONTENT_TYPE_DRAWOBJECT
};
String STR_CONTENT_TYPE_POSTIT
{
- Text [ en-US ] = "Notes" ;
+ Text [ en-US ] = "Comments" ;
};
String STR_CONTENT_TYPE_SINGLE_OUTLINE
{
@@ -270,7 +270,7 @@ String STR_CONTENT_TYPE_SINGLE_INDEX
};
String STR_CONTENT_TYPE_SINGLE_POSTIT
{
- Text [ en-US ] = "Note" ;
+ Text [ en-US ] = "Comment" ;
};
String STR_CONTENT_TYPE_SINGLE_DRAWOBJECT
{
diff --git a/sw/uiconfig/sglobal/accelerator/en-GB/default.xml b/sw/uiconfig/sglobal/accelerator/en-GB/default.xml
index 2bc3719..c07ff3f 100644
--- a/sw/uiconfig/sglobal/accelerator/en-GB/default.xml
+++ b/sw/uiconfig/sglobal/accelerator/en-GB/default.xml
@@ -111,5 +111,5 @@
<accel:item accel:code="KEY_J" accel:shift="true" accel:mod1="true" xlink:href=".uno:FullScreen"/>
<accel:item accel:code="KEY_X" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveDirectCharFormats"/>
<accel:item accel:code="KEY_DIVIDE" accel:mod1="true" xlink:href=".uno:InsertZWSP"/>
- <accel:item accel:code="KEY_N" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
+ <accel:item accel:code="KEY_C" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
</accel:acceleratorlist>
diff --git a/sw/uiconfig/sglobal/accelerator/en-US/default.xml b/sw/uiconfig/sglobal/accelerator/en-US/default.xml
index 2bc3719..c07ff3f 100644
--- a/sw/uiconfig/sglobal/accelerator/en-US/default.xml
+++ b/sw/uiconfig/sglobal/accelerator/en-US/default.xml
@@ -111,5 +111,5 @@
<accel:item accel:code="KEY_J" accel:shift="true" accel:mod1="true" xlink:href=".uno:FullScreen"/>
<accel:item accel:code="KEY_X" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveDirectCharFormats"/>
<accel:item accel:code="KEY_DIVIDE" accel:mod1="true" xlink:href=".uno:InsertZWSP"/>
- <accel:item accel:code="KEY_N" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
+ <accel:item accel:code="KEY_C" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
</accel:acceleratorlist>
diff --git a/sw/uiconfig/swform/accelerator/en-US/default.xml b/sw/uiconfig/swform/accelerator/en-US/default.xml
index 5abee2c..82fcdd0 100644
--- a/sw/uiconfig/swform/accelerator/en-US/default.xml
+++ b/sw/uiconfig/swform/accelerator/en-US/default.xml
@@ -116,5 +116,5 @@
<accel:item accel:code="KEY_X" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveDirectCharFormats"/>
<accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
<accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
- <accel:item accel:code="KEY_N" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
+ <accel:item accel:code="KEY_C" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
</accel:acceleratorlist>
diff --git a/sw/uiconfig/swreport/accelerator/en-GB/default.xml b/sw/uiconfig/swreport/accelerator/en-GB/default.xml
index 0e5e416..83f88ad 100644
--- a/sw/uiconfig/swreport/accelerator/en-GB/default.xml
+++ b/sw/uiconfig/swreport/accelerator/en-GB/default.xml
@@ -111,5 +111,5 @@
<accel:item accel:code="KEY_J" accel:shift="true" accel:mod1="true" xlink:href=".uno:FullScreen"/>
<accel:item accel:code="KEY_X" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveDirectCharFormats"/>
<accel:item accel:code="KEY_DIVIDE" accel:mod1="true" xlink:href=".uno:InsertZWSP"/>
- <accel:item accel:code="KEY_N" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
+ <accel:item accel:code="KEY_C" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
</accel:acceleratorlist>
diff --git a/sw/uiconfig/swreport/accelerator/en-US/default.xml b/sw/uiconfig/swreport/accelerator/en-US/default.xml
index 0e5e416..83f88ad 100644
--- a/sw/uiconfig/swreport/accelerator/en-US/default.xml
+++ b/sw/uiconfig/swreport/accelerator/en-US/default.xml
@@ -111,5 +111,5 @@
<accel:item accel:code="KEY_J" accel:shift="true" accel:mod1="true" xlink:href=".uno:FullScreen"/>
<accel:item accel:code="KEY_X" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveDirectCharFormats"/>
<accel:item accel:code="KEY_DIVIDE" accel:mod1="true" xlink:href=".uno:InsertZWSP"/>
- <accel:item accel:code="KEY_N" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
+ <accel:item accel:code="KEY_C" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
</accel:acceleratorlist>
diff --git a/sw/uiconfig/swriter/accelerator/en-GB/default.xml b/sw/uiconfig/swriter/accelerator/en-GB/default.xml
index 22f5da3..cb04b7f 100644
--- a/sw/uiconfig/swriter/accelerator/en-GB/default.xml
+++ b/sw/uiconfig/swriter/accelerator/en-GB/default.xml
@@ -111,5 +111,5 @@
<accel:item accel:code="KEY_J" accel:shift="true" accel:mod1="true" xlink:href=".uno:FullScreen"/>
<accel:item accel:code="KEY_X" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveDirectCharFormats"/>
<accel:item accel:code="KEY_DIVIDE" accel:mod1="true" xlink:href=".uno:InsertZWSP"/>
- <accel:item accel:code="KEY_N" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
+ <accel:item accel:code="KEY_C" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
</accel:acceleratorlist>
diff --git a/sw/uiconfig/swriter/accelerator/en-US/default.xml b/sw/uiconfig/swriter/accelerator/en-US/default.xml
index 22f5da3..cb04b7f 100644
--- a/sw/uiconfig/swriter/accelerator/en-US/default.xml
+++ b/sw/uiconfig/swriter/accelerator/en-US/default.xml
@@ -111,5 +111,5 @@
<accel:item accel:code="KEY_J" accel:shift="true" accel:mod1="true" xlink:href=".uno:FullScreen"/>
<accel:item accel:code="KEY_X" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveDirectCharFormats"/>
<accel:item accel:code="KEY_DIVIDE" accel:mod1="true" xlink:href=".uno:InsertZWSP"/>
- <accel:item accel:code="KEY_N" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
+ <accel:item accel:code="KEY_C" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
</accel:acceleratorlist>
diff --git a/sw/uiconfig/swxform/accelerator/en-GB/default.xml b/sw/uiconfig/swxform/accelerator/en-GB/default.xml
index 0e5e416..83f88ad 100644
--- a/sw/uiconfig/swxform/accelerator/en-GB/default.xml
+++ b/sw/uiconfig/swxform/accelerator/en-GB/default.xml
@@ -111,5 +111,5 @@
<accel:item accel:code="KEY_J" accel:shift="true" accel:mod1="true" xlink:href=".uno:FullScreen"/>
<accel:item accel:code="KEY_X" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveDirectCharFormats"/>
<accel:item accel:code="KEY_DIVIDE" accel:mod1="true" xlink:href=".uno:InsertZWSP"/>
- <accel:item accel:code="KEY_N" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
+ <accel:item accel:code="KEY_C" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
</accel:acceleratorlist>
diff --git a/sw/uiconfig/swxform/accelerator/en-US/default.xml b/sw/uiconfig/swxform/accelerator/en-US/default.xml
index 0e5e416..83f88ad 100644
--- a/sw/uiconfig/swxform/accelerator/en-US/default.xml
+++ b/sw/uiconfig/swxform/accelerator/en-US/default.xml
@@ -111,5 +111,5 @@
<accel:item accel:code="KEY_J" accel:shift="true" accel:mod1="true" xlink:href=".uno:FullScreen"/>
<accel:item accel:code="KEY_X" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveDirectCharFormats"/>
<accel:item accel:code="KEY_DIVIDE" accel:mod1="true" xlink:href=".uno:InsertZWSP"/>
- <accel:item accel:code="KEY_N" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
+ <accel:item accel:code="KEY_C" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
</accel:acceleratorlist>
commit 7eee55e4a3d2a3573b148e78de647a9ae89df41a
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Sep 16 11:45:54 2009 +0000
CWS-TOOLING: integrate CWS l10nframework01
diff --git a/starmath/sdi/makefile.mk b/starmath/sdi/makefile.mk
index a10a81a..768280a 100644
--- a/starmath/sdi/makefile.mk
+++ b/starmath/sdi/makefile.mk
@@ -39,7 +39,7 @@ SVSDIINC=$(PRJ)$/inc
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
-
+.IF "$(L10N_framework)"==""
# --- Files --------------------------------------------------------
@@ -52,6 +52,7 @@ SVSDI1DEPEND= \
$(SVSDIINC)$/starmath.hrc
# --- Targets -------------------------------------------------------
+.ENDIF
.INCLUDE : target.mk
diff --git a/sw/sdi/makefile.mk b/sw/sdi/makefile.mk
index 1a3f17a..cc6ae3b 100644
--- a/sw/sdi/makefile.mk
+++ b/sw/sdi/makefile.mk
@@ -38,20 +38,20 @@ PRJNAME=sw
TARGET=swslots
# --- Settings -----------------------------------------------------
-
+.IF "$(L10N_framework)"==""
SVSDIINC=$(PRJ)$/source$/ui$/inc
+.ENDIF
.INCLUDE : $(PRJ)$/inc$/swpre.mk
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/inc$/sw.mk
-
+.IF "$(L10N_framework)"==""
SDI1NAME=$(TARGET)
SDI1EXPORT=swriter
#SIDHRCNAME=swslots.hrc
# --- Files --------------------------------------------------------
-
SVSDI1DEPEND= \
switems.sdi\
swriter.sdi\
@@ -98,7 +98,7 @@ SVSDI1DEPEND= \
swslots.hrc \
$(INC)$/globals.hrc \
$(INC)$/cmdid.h
-
+.ENDIF
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
More information about the ooo-build-commit
mailing list