summaryrefslogtreecommitdiff
path: root/desktop/source/app/desktop.hrc
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:13:07 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:13:07 +0200
commit95920b4502a03d2d51a68626c1a562486326a38d (patch)
tree2bcd68bd250df21dd16a9c8277a78e49a313eea2 /desktop/source/app/desktop.hrc
parent185575042240290a791eb23e3508aafa34c5a065 (diff)
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 8ae8ec3b786ca9c5bfdde8c737cc76e0178e2a65 (HEAD, tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 18 19:01:18 2011 +0100 Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit 4772261c09d3d79d1ab8126e060d272c0de156f0 Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> Date: Tue Jan 18 10:43:05 2011 +0100 calc65: #i116371# fix backgrounds for polypolygons in metafile Signed-off-by: Thorsten Behrens <tbehrens@novell.com> (cherry picked from commit cb7d7138b943042f11eec3211d7a913c9b85908c) Signed-off-by: Michael Meeks <michael.meeks@novell.com> Signed-off-by: Petr Mladek <pmladek@suse.cz> Signed-off-by: Radek Doulik <rodo@novell.com> .../source/processor2d/vclmetafileprocessor2d.cxx | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) commit 4cf8bcde1cfa948b3415ec4775671b53e290aeae Author: Andras Timar <timar@fsf.hu> Date: Sun Jan 16 21:08:02 2011 +0100 Sun Microsystems -> The Document Foundation in desktop file fdo#31191 sysui/desktop/menus/startcenter.desktop | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 57746f255004ef42fc87c3ad3d30a4cb47a0111b Author: Petr Mladek <pmladek@suse.cz> Date: Thu Jan 13 21:13:19 2011 +0100 unopkg crasher on SLED11-SP1 (bnc#655912) activateExtension call broke memory if dp_misc::getIdentifier and xNewExtension were called inline; the problem was visible only with gcc-4.3.4 and did not appear with older or newer gcc versions valgrind got happy and unopkg stopped crashing after the values were passed via the extra variables it looks like a miscompilation; IMHO, it does not make sense to report it because it does not happen with last gcc version this code is not critical for the performance, so the workaround with extra variables is fine; they might even be optimized out by the compiler Signed off by Michael, Noel, Tor .../deployment/manager/dp_extensionmanager.cxx | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) commit 6196104011a42b17239da44fca374d3e0ba60cfd Author: Michael Meeks <michael.meeks@novell.com> Date: Fri Jan 14 13:59:23 2011 +0000 fix FMR crasher bug#33099, approved by Fridrich, David & Petr. Signed-off-by: Michael Meeks <michael.meeks@novell.com> xmlhelp/source/cxxhelp/provider/databases.cxx | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 66586a94e673256024e3c5c7dd8d70bedd1694f0 Author: Tor Lillqvist <tlillqvist@novell.com> Date: Fri Jan 14 12:23:56 2011 +0200 Be slightly more paranoid defensive (cherry picked from commit f8bfab1f464d0f26accb6d28b31b4749306bbfda) Signed-off-by: Thorsten Behrens <thb@documentfoundation.org> Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch> Signed-off-by: Michael Meeks <michael.meeks@novell.com> desktop/win32/source/setup/setup.cpp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit a8aa27383ae8570b8cd73376b54f114bd74afac6 Author: Tor Lillqvist <tlillqvist@novell.com> Date: Thu Jan 13 23:49:18 2011 +0200 Fix buffer size problem that broke MSI installer localization (cherry picked from commit 5b7719a49fd57a9f446201fabc02bf1787dbbeee) Signed-off-by: Thorsten Behrens <thb@documentfoundation.org> Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch> Signed-off-by: Michael Meeks <michael.meeks@novell.com> desktop/win32/source/setup/setup.cpp | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) commit d7b0664fa0966efc77dc2f6a93d3e68adbff00aa Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:59:37 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: libs-core_libreoffice-3.3.0.4
Diffstat (limited to 'desktop/source/app/desktop.hrc')
-rw-r--r--desktop/source/app/desktop.hrc80
1 files changed, 40 insertions, 40 deletions
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index 9c68d7b9fd2d..035318b4d7d5 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,60 +32,60 @@
#include <svl/solar.hrc>
#endif
-#define RID_DESKTOP_DIALOG_START 2000
-#define RID_FIRSTSTSTART_START 3000
-#define RID_DESKTOP_STRING_START 10000
+#define RID_DESKTOP_DIALOG_START 2000
+#define RID_FIRSTSTSTART_START 3000
+#define RID_DESKTOP_STRING_START 10000
-#define INFOBOX_CMDLINEHELP (RID_DESKTOP_DIALOG_START+51)
-#define INFOBOX_EXPIRED (RID_DESKTOP_DIALOG_START+52)
+#define INFOBOX_CMDLINEHELP (RID_DESKTOP_DIALOG_START+51)
+#define INFOBOX_EXPIRED (RID_DESKTOP_DIALOG_START+52)
-#define QBX_USERDATALOCKED (RID_DESKTOP_DIALOG_START+100)
+#define QBX_USERDATALOCKED (RID_DESKTOP_DIALOG_START+100)
-#define DLG_CMDLINEHELP (RID_DESKTOP_DIALOG_START+101)
-#define TXT_DLG_CMDLINEHELP_HEADER (RID_DESKTOP_DIALOG_START+102)
-#define TXT_DLG_CMDLINEHELP_LEFT (RID_DESKTOP_DIALOG_START+103)
-#define TXT_DLG_CMDLINEHELP_RIGHT (RID_DESKTOP_DIALOG_START+104)
-#define TXT_DLG_CMDLINEHELP_BOTTOM (RID_DESKTOP_DIALOG_START+105)
-#define BTN_DLG_CMDLINEHELP_OK (RID_DESKTOP_DIALOG_START+106)
+#define DLG_CMDLINEHELP (RID_DESKTOP_DIALOG_START+101)
+#define TXT_DLG_CMDLINEHELP_HEADER (RID_DESKTOP_DIALOG_START+102)
+#define TXT_DLG_CMDLINEHELP_LEFT (RID_DESKTOP_DIALOG_START+103)
+#define TXT_DLG_CMDLINEHELP_RIGHT (RID_DESKTOP_DIALOG_START+104)
+#define TXT_DLG_CMDLINEHELP_BOTTOM (RID_DESKTOP_DIALOG_START+105)
+#define BTN_DLG_CMDLINEHELP_OK (RID_DESKTOP_DIALOG_START+106)
-#define QBX_CONFIG_IMPORTSETTINGS (RID_DESKTOP_DIALOG_START+180)
+#define QBX_CONFIG_IMPORTSETTINGS (RID_DESKTOP_DIALOG_START+180)
#define EBX_ERR_PRINTDISABLED (RID_DESKTOP_DIALOG_START+190)
-#define STR_RECOVER_QUERY (RID_DESKTOP_STRING_START+0)
-#define STR_RECOVER_TITLE (RID_DESKTOP_STRING_START+1)
-#define STR_RECOVER_PREPARED (RID_DESKTOP_STRING_START+2)
-
-#define STR_BOOTSTRAP_ERR_CANNOT_START (RID_DESKTOP_STRING_START+100)
-#define STR_BOOTSTRAP_ERR_DIR_MISSING (RID_DESKTOP_STRING_START+101)
-#define STR_BOOTSTRAP_ERR_PATH_INVALID (RID_DESKTOP_STRING_START+102)
-#define STR_BOOTSTRAP_ERR_NO_PATH (RID_DESKTOP_STRING_START+103)
-#define STR_BOOTSTRAP_ERR_INTERNAL (RID_DESKTOP_STRING_START+104)
-#define STR_BOOTSTRAP_ERR_FILE_CORRUPT (RID_DESKTOP_STRING_START+105)
-#define STR_BOOTSTRAP_ERR_FILE_MISSING (RID_DESKTOP_STRING_START+106)
-#define STR_BOOTSTRAP_ERR_NO_SUPPORT (RID_DESKTOP_STRING_START+107)
-#define STR_BOOTSTRAP_ERR_LANGUAGE_MISSING (RID_DESKTOP_STRING_START+108)
-
-#define STR_BOOTSTRAP_ERR_NO_SERVICE (RID_DESKTOP_STRING_START+120)
-#define STR_BOOTSTRAP_ERR_NO_CFG_SERVICE (RID_DESKTOP_STRING_START+121)
-#define STR_BOOTSTRAP_ERR_CFG_DATAACCESS (RID_DESKTOP_STRING_START+122)
+#define STR_RECOVER_QUERY (RID_DESKTOP_STRING_START+0)
+#define STR_RECOVER_TITLE (RID_DESKTOP_STRING_START+1)
+#define STR_RECOVER_PREPARED (RID_DESKTOP_STRING_START+2)
+
+#define STR_BOOTSTRAP_ERR_CANNOT_START (RID_DESKTOP_STRING_START+100)
+#define STR_BOOTSTRAP_ERR_DIR_MISSING (RID_DESKTOP_STRING_START+101)
+#define STR_BOOTSTRAP_ERR_PATH_INVALID (RID_DESKTOP_STRING_START+102)
+#define STR_BOOTSTRAP_ERR_NO_PATH (RID_DESKTOP_STRING_START+103)
+#define STR_BOOTSTRAP_ERR_INTERNAL (RID_DESKTOP_STRING_START+104)
+#define STR_BOOTSTRAP_ERR_FILE_CORRUPT (RID_DESKTOP_STRING_START+105)
+#define STR_BOOTSTRAP_ERR_FILE_MISSING (RID_DESKTOP_STRING_START+106)
+#define STR_BOOTSTRAP_ERR_NO_SUPPORT (RID_DESKTOP_STRING_START+107)
+#define STR_BOOTSTRAP_ERR_LANGUAGE_MISSING (RID_DESKTOP_STRING_START+108)
+
+#define STR_BOOTSTRAP_ERR_NO_SERVICE (RID_DESKTOP_STRING_START+120)
+#define STR_BOOTSTRAP_ERR_NO_CFG_SERVICE (RID_DESKTOP_STRING_START+121)
+#define STR_BOOTSTRAP_ERR_CFG_DATAACCESS (RID_DESKTOP_STRING_START+122)
#define STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE (RID_DESKTOP_STRING_START+123)
-#define STR_ASK_START_SETUP_MANUALLY (RID_DESKTOP_STRING_START+152)
+#define STR_ASK_START_SETUP_MANUALLY (RID_DESKTOP_STRING_START+152)
-#define STR_INTERNAL_ERRMSG (RID_DESKTOP_STRING_START+161)
+#define STR_INTERNAL_ERRMSG (RID_DESKTOP_STRING_START+161)
-#define STR_CONFIG_ERR_SETTINGS_INCOMPLETE (RID_DESKTOP_STRING_START+182)
-#define STR_CONFIG_ERR_CANNOT_CONNECT (RID_DESKTOP_STRING_START+183)
-#define STR_CONFIG_ERR_RIGHTS_MISSING (RID_DESKTOP_STRING_START+184)
-#define STR_CONFIG_ERR_ACCESS_GENERAL (RID_DESKTOP_STRING_START+187)
-#define STR_CONFIG_ERR_NO_WRITE_ACCESS (RID_DESKTOP_STRING_START+188)
+#define STR_CONFIG_ERR_SETTINGS_INCOMPLETE (RID_DESKTOP_STRING_START+182)
+#define STR_CONFIG_ERR_CANNOT_CONNECT (RID_DESKTOP_STRING_START+183)
+#define STR_CONFIG_ERR_RIGHTS_MISSING (RID_DESKTOP_STRING_START+184)
+#define STR_CONFIG_ERR_ACCESS_GENERAL (RID_DESKTOP_STRING_START+187)
+#define STR_CONFIG_ERR_NO_WRITE_ACCESS (RID_DESKTOP_STRING_START+188)
#define STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE (RID_DESKTOP_STRING_START+189)
#define STR_BOOSTRAP_ERR_NOACCESSRIGHTS (RID_DESKTOP_STRING_START+190)
-#define STR_TITLE_USERDATALOCKED (RID_DESKTOP_STRING_START+206)
-#define STR_TITLE_EXPIRED (RID_DESKTOP_STRING_START+207)
+#define STR_TITLE_USERDATALOCKED (RID_DESKTOP_STRING_START+206)
+#define STR_TITLE_EXPIRED (RID_DESKTOP_STRING_START+207)
#endif // _DESKTOP_HRC_