diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:55:08 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:55:08 +0100 |
commit | 4fdd55226d2972e3a256426db3122ac23b0615c6 (patch) | |
tree | 23f5b3a68382d6d3b8db0cb5e2537ed74a228d7c /ucbhelper/workben | |
parent | c3d5444d84e18fa82235bb9d419861ac5e54f544 (diff) | |
parent | e1028d9225bc47922c387aa462887c7643bc6c40 (diff) |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
comphelper/source/misc/servicedecl.cxx
i18npool/source/breakiterator/breakiteratorImpl.cxx
l10ntools/scripts/localize.pl
svl/source/items/itemset.cxx
svl/source/memtools/svarray.cxx
svl/source/numbers/zformat.cxx
svtools/source/brwbox/brwbox1.cxx
tools/source/stream/strmwnt.cxx
vcl/inc/vcl/graphite_adaptors.hxx
vcl/inc/vcl/graphite_layout.hxx
vcl/inc/vcl/graphite_serverfont.hxx
vcl/source/control/imgctrl.cxx
vcl/source/gdi/outdev.cxx
vcl/source/gdi/outdev3.cxx
vcl/source/glyphs/gcach_ftyp.cxx
vcl/source/glyphs/graphite_adaptors.cxx
vcl/source/glyphs/graphite_layout.cxx
vcl/source/window/winproc.cxx
vcl/unx/source/fontmanager/fontconfig.cxx
Diffstat (limited to 'ucbhelper/workben')
-rw-r--r-- | ucbhelper/workben/ucbexplorer/ucbexplorer.hrc | 7 | ||||
-rw-r--r-- | ucbhelper/workben/ucbexplorer/ucbexplorer.src | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.hrc b/ucbhelper/workben/ucbexplorer/ucbexplorer.hrc index c2dc98574e3a..7d6aa8dba4ad 100644 --- a/ucbhelper/workben/ucbexplorer/ucbexplorer.hrc +++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.hrc @@ -24,13 +24,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -//========================================================================= -// + // UCB Explorer ( resource identifiers ) -// -// (C) 2000 StarOffice Entwicklungs GmbH, Hamburg, Germany -// -//========================================================================= #ifndef _UCBEXPLORER_HRC #define _UCBEXPLORER_HRC diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.src b/ucbhelper/workben/ucbexplorer/ucbexplorer.src index ea9aa993cba2..aac9b6ac8571 100644 --- a/ucbhelper/workben/ucbexplorer/ucbexplorer.src +++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.src @@ -81,6 +81,7 @@ Menu MENU_POPUP ModalDialog DLG_STRINGINPUT { + HelpID = "ucbhelper:ModalDialog:DLG_STRINGINPUT"; Border = TRUE ; Moveable = TRUE ; OutputSize = TRUE ; @@ -94,6 +95,7 @@ ModalDialog DLG_STRINGINPUT }; Edit ED_STRINGINPUT_DLG_NAME { + HelpID = "ucbhelper:Edit:DLG_STRINGINPUT:ED_STRINGINPUT_DLG_NAME"; Pos = MAP_APPFONT ( 40 , 16 ) ; Size = MAP_APPFONT ( 110 , 12 ) ; Border = TRUE ; |