diff options
| author | Kai Sommerfeld <kso@openoffice.org> | 2009-12-10 10:15:20 +0100 |
|---|---|---|
| committer | Kai Sommerfeld <kso@openoffice.org> | 2009-12-10 10:15:20 +0100 |
| commit | c3805734015532711e32e6be776fec75604beda5 (patch) | |
| tree | 0314f4dd48ffce9919e21221ec169d343e7cf870 /extensions | |
| parent | 4bf7a83912dce2dd3832236900e52fff62f4b085 (diff) | |
| parent | d95c37cdac36e96c22fa38b519817cc0466f1f96 (diff) | |
merged with DEV300_m67
Diffstat (limited to 'extensions')
49 files changed, 985 insertions, 776 deletions
diff --git a/extensions/inc/abpilot.hrc b/extensions/inc/abpilot.hrc new file mode 100644 index 000000000000..bac5dc33d5d1 --- /dev/null +++ b/extensions/inc/abpilot.hrc @@ -0,0 +1,44 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2009 by Sun Microsystems, Inc. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ +
+#ifndef EXTENSIONS_ABPILOT_HRC
+#define EXTENSIONS_ABPILOT_HRC
+
+#include "extensio.hrc"
+
+#define HID_ABSPILOT_PREVIOUS ( HID_ABP_START + 0) +#define HID_ABSPILOT_NEXT ( HID_ABP_START + 1) +#define HID_ABSPILOT_CANCEL ( HID_ABP_START + 2) +#define HID_ABSPILOT_FINISH ( HID_ABP_START + 3) +#define UID_ABSPILOT_HELP ( HID_ABP_START + 4) +#define HID_ABSPILOT ( HID_ABP_START + 5) + // !! if you add new IDs, please also adjust HID_ABP_LAST below !! +#define HID_ABP_LAST HID_ABSPILOT + +#if HID_ABP_LAST > HID_ABP_END + #error help id range overflow (ABP) +#endif + +#endif // EXTENSIONS_ABPILOT_HRC diff --git a/extensions/inc/bibliography.hrc b/extensions/inc/bibliography.hrc new file mode 100644 index 000000000000..7275598bf377 --- /dev/null +++ b/extensions/inc/bibliography.hrc @@ -0,0 +1,85 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2009 by Sun Microsystems, Inc. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ +
+#ifndef EXTENSIONS_BIBLIOGRAPHY_HRC
+#define EXTENSIONS_BIBLIOGRAPHY_HRC
+
+#include "extensio.hrc"
+
+#define HID_BIB_CHANGESOURCE ( HID_BIBLIO_START + 0) +#define HID_BIB_MAPPINGDLG ( HID_BIBLIO_START + 1) +#define HID_BIB_TBX_TABLE ( HID_BIBLIO_START + 2) +#define HID_BIB_TBX_SEARCH ( HID_BIBLIO_START + 3) +#define HID_BIB_TBX_AUTOFILTER ( HID_BIBLIO_START + 4) +#define HID_BIB_IDENTIFIER_POS ( HID_BIBLIO_START + 5) +#define HID_BIB_AUTHORITYTYPE_POS ( HID_BIBLIO_START + 6) +#define HID_BIB_AUTHOR_POS ( HID_BIBLIO_START + 7) +#define HID_BIB_TITLE_POS ( HID_BIBLIO_START + 8) +#define HID_BIB_YEAR_POS ( HID_BIBLIO_START + 9) +#define HID_BIB_ISBN_POS ( HID_BIBLIO_START + 10) +#define HID_BIB_BOOKTITLE_POS ( HID_BIBLIO_START + 11) +#define HID_BIB_CHAPTER_POS ( HID_BIBLIO_START + 12) +#define HID_BIB_EDITION_POS ( HID_BIBLIO_START + 13) +#define HID_BIB_EDITOR_POS ( HID_BIBLIO_START + 14) +#define HID_BIB_HOWPUBLISHED_POS ( HID_BIBLIO_START + 15) +#define HID_BIB_INSTITUTION_POS ( HID_BIBLIO_START + 16) +#define HID_BIB_JOURNAL_POS ( HID_BIBLIO_START + 17) +#define HID_BIB_MONTH_POS ( HID_BIBLIO_START + 18) +#define HID_BIB_NOTE_POS ( HID_BIBLIO_START + 19) +#define HID_BIB_ANNOTE_POS ( HID_BIBLIO_START + 20) +#define HID_BIB_NUMBER_POS ( HID_BIBLIO_START + 21) +#define HID_BIB_ORGANIZATIONS_POS ( HID_BIBLIO_START + 22) +#define HID_BIB_PAGES_POS ( HID_BIBLIO_START + 23) +#define HID_BIB_PUBLISHER_POS ( HID_BIBLIO_START + 24) +#define HID_BIB_ADDRESS_POS ( HID_BIBLIO_START + 25) +#define HID_BIB_SCHOOL_POS ( HID_BIBLIO_START + 26) +#define HID_BIB_SERIES_POS ( HID_BIBLIO_START + 27) +#define HID_BIB_REPORTTYPE_POS ( HID_BIBLIO_START + 28) +#define HID_BIB_VOLUME_POS ( HID_BIBLIO_START + 29) +#define HID_BIB_URL_POS ( HID_BIBLIO_START + 30) +#define HID_BIB_CUSTOM1_POS ( HID_BIBLIO_START + 31) +#define HID_BIB_CUSTOM2_POS ( HID_BIBLIO_START + 32) +#define HID_BIB_CUSTOM3_POS ( HID_BIBLIO_START + 33) +#define HID_BIB_CUSTOM4_POS ( HID_BIBLIO_START + 34) +#define HID_BIB_CUSTOM5_POS ( HID_BIBLIO_START + 35) +#define HID_BIB_DB_TBX ( HID_BIBLIO_START + 36) +#define HID_BIB_DB_GHIDCTRL ( HID_BIBLIO_START + 37) +#define HID_BIB_CONTROL_PAGE ( HID_BIBLIO_START + 38) +#define HID_BIB_CONTROL_PARENT ( HID_BIBLIO_START + 39) +#define UID_BIB_FRAME_WINDOW ( HID_BIBLIO_START + 40) +#define HID_BIB_DELETE_RECORD ( HID_BIBLIO_START + 41) +#define HID_BIB_INSERT_RECORD ( HID_BIBLIO_START + 42) +#define HID_BIB_DB_GRIDCTRL ( HID_BIBLIO_START + 43) +#define HID_DLG_MAPPING ( HID_BIBLIO_START + 44) +#define HID_DLG_DBCHANGE ( HID_BIBLIO_START + 45) +#define HID_SELECTION_TLB ( HID_BIBLIO_START + 46) + // !! if you add new IDs, please also adjust HID_ABP_LAST below !! +#define HID_BIB_LAST HID_SELECTION_TLB + +#if HID_BIB_LAST > HID_BIBLIO_END + #error help id range overflow (BIBLIO) +#endif + +#endif // EXTENSIONS_BIBLIOGRAPHY_HRC
diff --git a/extensions/inc/dbpilots.hrc b/extensions/inc/dbpilots.hrc new file mode 100644 index 000000000000..c111a99ddb46 --- /dev/null +++ b/extensions/inc/dbpilots.hrc @@ -0,0 +1,54 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2009 by Sun Microsystems, Inc. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ +
+#ifndef EXTENSIONS_DBPILOT_HRC
+#define EXTENSIONS_DBPILOT_HRC
+
+#include "extensio.hrc"
+
+#define HID_GHIDWIZARD_PREVIOUS ( HID_DBP_START + 0) +#define HID_GHIDWIZARD_NEXT ( HID_DBP_START + 1) +#define HID_GHIDWIZARD_CANCEL ( HID_DBP_START + 2) +#define HID_GHIDWIZARD_FINISH ( HID_DBP_START + 3) +#define HID_GROUPWIZARD_PREVIOUS ( HID_DBP_START + 4) +#define HID_GROUPWIZARD_NEXT ( HID_DBP_START + 5) +#define HID_GROUPWIZARD_CANCEL ( HID_DBP_START + 6) +#define HID_GROUPWIZARD_FINISH ( HID_DBP_START + 7) +#define HID_LISTWIZARD_PREVIOUS ( HID_DBP_START + 8) +#define HID_LISTWIZARD_NEXT ( HID_DBP_START + 9) +#define HID_LISTWIZARD_CANCEL ( HID_DBP_START + 10) +#define HID_LISTWIZARD_FINISH ( HID_DBP_START + 11) +#define HID_GRIDWIZARD_PREVIOUS ( HID_DBP_START + 12) +#define HID_GRIDWIZARD_NEXT ( HID_DBP_START + 13) +#define HID_GRIDWIZARD_CANCEL ( HID_DBP_START + 14) +#define HID_GRIDWIZARD_FINISH ( HID_DBP_START + 15) + // !! if you add new IDs, please also adjust HID_ABP_LAST below !! +#define HID_DBP_LAST HID_GRIDWIZARD_FINISH + +#if HID_DBP_LAST > HID_DBP_END + #error help id range overflow (DBP) +#endif +
+#endif // EXTENSIONS_DBPILOT_HRC
diff --git a/extensions/inc/extensio.hrc b/extensions/inc/extensio.hrc index 6af1dc5b04fb..ee84e9a560f6 100644 --- a/extensions/inc/extensio.hrc +++ b/extensions/inc/extensio.hrc @@ -33,438 +33,46 @@ #include <svtools/solar.hrc> // ----------------------------------------------------------------------- -// - resource id areas +// - resource id ranges -#define RID_DBP_START ( RID_MORE_EXTENSIONS_START + 0 ) -#define RID_DBP_END ( RID_MORE_EXTENSIONS_START + 29 ) +#define RID_ABP_START ( RID_MORE_EXTENSIONS_START + 0 ) +#define RID_ABP_END ( RID_MORE_EXTENSIONS_START + 19 ) -#define RID_DBI_START ( RID_MORE_EXTENSIONS_START + 30 ) -#define RID_DBI_END ( RID_MORE_EXTENSIONS_START + 59 ) +#define RID_DBP_START ( RID_MORE_EXTENSIONS_START + 20 ) +#define RID_DBP_END ( RID_MORE_EXTENSIONS_START + 39 ) -#define RID_ABP_START ( RID_MORE_EXTENSIONS_START + 60 ) -#define RID_ABP_END ( RID_MORE_EXTENSIONS_START + 89 ) +// !!! please adjust RID_LAST_EXTENSIONS_RANGE if you add new ranges here !!! +#define RID_LAST_EXTENSIONS_RANGE RID_DBP_END -// ----------------------------------------------------------------------- -// - help ids - -#define HID_PROTOCOLS HID_EXTENSIONS_START - -#define HID_BIB_CHANGESOURCE (HID_EXTENSIONS_START + 1) -#define HID_BIB_MAPPINGDLG (HID_EXTENSIONS_START + 2) -#define HID_BIB_TBX_TABLE (HID_EXTENSIONS_START + 3) -#define HID_BIB_TBX_SEARCH (HID_EXTENSIONS_START + 4) -#define HID_BIB_TBX_AUTOFILTER (HID_EXTENSIONS_START + 5) - -#define HID_BIB_IDENTIFIER_POS (HID_EXTENSIONS_START + 6) -#define HID_BIB_AUTHORITYTYPE_POS (HID_EXTENSIONS_START + 7) -#define HID_BIB_AUTHOR_POS (HID_EXTENSIONS_START + 8) -#define HID_BIB_TITLE_POS (HID_EXTENSIONS_START + 9) -#define HID_BIB_YEAR_POS (HID_EXTENSIONS_START + 10) -#define HID_BIB_ISBN_POS (HID_EXTENSIONS_START + 11) -#define HID_BIB_BOOKTITLE_POS (HID_EXTENSIONS_START + 12) -#define HID_BIB_CHAPTER_POS (HID_EXTENSIONS_START + 13) -#define HID_BIB_EDITION_POS (HID_EXTENSIONS_START + 14) -#define HID_BIB_EDITOR_POS (HID_EXTENSIONS_START + 15) -#define HID_BIB_HOWPUBLISHED_POS (HID_EXTENSIONS_START + 16) -#define HID_BIB_INSTITUTION_POS (HID_EXTENSIONS_START + 17) -#define HID_BIB_JOURNAL_POS (HID_EXTENSIONS_START + 18) -#define HID_BIB_MONTH_POS (HID_EXTENSIONS_START + 19) -#define HID_BIB_NOTE_POS (HID_EXTENSIONS_START + 20) -#define HID_BIB_ANNOTE_POS (HID_EXTENSIONS_START + 21) -#define HID_BIB_NUMBER_POS (HID_EXTENSIONS_START + 22) -#define HID_BIB_ORGANIZATIONS_POS (HID_EXTENSIONS_START + 23) -#define HID_BIB_PAGES_POS (HID_EXTENSIONS_START + 24) -#define HID_BIB_PUBLISHER_POS (HID_EXTENSIONS_START + 25) -#define HID_BIB_ADDRESS_POS (HID_EXTENSIONS_START + 26) -#define HID_BIB_SCHOOL_POS (HID_EXTENSIONS_START + 27) -#define HID_BIB_SERIES_POS (HID_EXTENSIONS_START + 28) -#define HID_BIB_REPORTTYPE_POS (HID_EXTENSIONS_START + 29) -#define HID_BIB_VOLUME_POS (HID_EXTENSIONS_START + 30) -#define HID_BIB_URL_POS (HID_EXTENSIONS_START + 31) -#define HID_BIB_CUSTOM1_POS (HID_EXTENSIONS_START + 32) -#define HID_BIB_CUSTOM2_POS (HID_EXTENSIONS_START + 33) -#define HID_BIB_CUSTOM3_POS (HID_EXTENSIONS_START + 34) -#define HID_BIB_CUSTOM4_POS (HID_EXTENSIONS_START + 35) -#define HID_BIB_CUSTOM5_POS (HID_EXTENSIONS_START + 36) - -#define HID_BIB_DB_TBX (HID_EXTENSIONS_START + 37) -#define HID_BIB_DB_GRIDCTRL (HID_EXTENSIONS_START + 38) -#define HID_BIB_CONTROL_PAGE (HID_EXTENSIONS_START + 39) -#define HID_BIB_CONTROL_PARENT (HID_EXTENSIONS_START + 40) - -#define HID_GRIDWIZARD_PREVIOUS (HID_EXTENSIONS_START + 41) -#define HID_GRIDWIZARD_NEXT (HID_EXTENSIONS_START + 42) -#define HID_GRIDWIZARD_CANCEL (HID_EXTENSIONS_START + 43) -#define HID_GRIDWIZARD_FINISH (HID_EXTENSIONS_START + 44) -#define HID_GROUPWIZARD_PREVIOUS (HID_EXTENSIONS_START + 45) -#define HID_GROUPWIZARD_NEXT (HID_EXTENSIONS_START + 46) -#define HID_GROUPWIZARD_CANCEL (HID_EXTENSIONS_START + 47) -#define HID_GROUPWIZARD_FINISH (HID_EXTENSIONS_START + 48) -#define HID_LISTWIZARD_PREVIOUS (HID_EXTENSIONS_START + 49) -#define HID_LISTWIZARD_NEXT (HID_EXTENSIONS_START + 50) -#define HID_LISTWIZARD_CANCEL (HID_EXTENSIONS_START + 51) -#define HID_LISTWIZARD_FINISH (HID_EXTENSIONS_START + 52) -#define HID_DBIWIZARD_PREVIOUS (HID_EXTENSIONS_START + 53) -#define HID_DBIWIZARD_NEXT (HID_EXTENSIONS_START + 54) -#define HID_DBIWIZARD_CANCEL (HID_EXTENSIONS_START + 55) -#define HID_DBIWIZARD_FINISH (HID_EXTENSIONS_START + 56) -#define UID_DBIWIZARD_SOURCESTATS (HID_EXTENSIONS_START + 57) -#define UID_DBIWIZARD_SOURCEFILE (HID_EXTENSIONS_START + 58) -#define UID_DBIWIZARD_QUERIES (HID_EXTENSIONS_START + 59) -#define UID_DBIWIZARD_FORMS (HID_EXTENSIONS_START + 60) -#define UID_DBIWIZARD_FORMS_SAVETO (HID_EXTENSIONS_START + 61) - -#define UID_BIB_FRAME_WINDOW (HID_EXTENSIONS_START + 62) - -#define HID_ABSPILOT_PREVIOUS (HID_EXTENSIONS_START + 63) -#define HID_ABSPILOT_NEXT (HID_EXTENSIONS_START + 64) -#define HID_ABSPILOT_CANCEL (HID_EXTENSIONS_START + 65) -#define HID_ABSPILOT_FINISH (HID_EXTENSIONS_START + 66) -#define UID_ABSPILOT_HELP (HID_EXTENSIONS_START + 67) -#define HID_ABSPILOT (HID_EXTENSIONS_START + 68) - -#define HID_DBIWIZARD (HID_EXTENSIONS_START + 69) -#define UID_DBIWIZARD_HELP (HID_EXTENSIONS_START + 70) -#define HID_DBIWIZARD_FILESELECTION (HID_EXTENSIONS_START + 71) - -#define HID_BIB_DELETE_RECORD (HID_EXTENSIONS_START + 72) -#define HID_BIB_INSERT_RECORD (HID_EXTENSIONS_START + 73) +#if RID_LAST_EXTENSIONS_RANGE > RID_MORE_EXTENSIONS_END + #error id range overflow +#endif -#define HID_DLG_MAPPING (HID_EXTENSIONS_START + 74) -#define HID_DLG_DBCHANGE (HID_EXTENSIONS_START + 75) -#define HID_SELECTION_TLB (HID_EXTENSIONS_START + 76) +// ----------------------------------------------------------------------- +// - help id ranges -#define HID_CHECK_FOR_UPD_DLG (HID_EXTENSIONS_START + 77) -#define HID_CHECK_FOR_UPD_CLOSE (HID_EXTENSIONS_START + 78) -#define HID_CHECK_FOR_UPD_PAUSE (HID_EXTENSIONS_START + 80) -#define HID_CHECK_FOR_UPD_RESUME (HID_EXTENSIONS_START + 81) -#define HID_CHECK_FOR_UPD_DOWNLOAD (HID_EXTENSIONS_START + 82) -#define HID_CHECK_FOR_UPD_DOWNLOAD2 (HID_EXTENSIONS_START + 83) -#define HID_CHECK_FOR_UPD_INSTALL (HID_EXTENSIONS_START + 84) -#define HID_CHECK_FOR_UPD_STATUS (HID_EXTENSIONS_START + 85) -#define HID_CHECK_FOR_UPD_DESCRIPTION (HID_EXTENSIONS_START + 86) -#define HID_CHECK_FOR_UPD_CANCEL (HID_EXTENSIONS_START + 87) +#define HID_DBP_START ( HID_EXTENSIONS_START + 0 ) +#define HID_DBP_END ( HID_EXTENSIONS_START + 19 ) -// please adjust HID_LAST_EXTENSIONS_ID if you add new ids here! -// you probably have to insert your new helpid into util/hidother.hrc, too! +#define HID_ABP_START ( HID_EXTENSIONS_START + 20 ) +#define HID_ABP_END ( HID_EXTENSIONS_START + 39 ) -#define HID_LAST_EXTENSIONS_ID HID_CHECK_FOR_UPD_CANCEL +#define HID_BIBLIO_START ( HID_EXTENSIONS_START + 40 ) +#define HID_BIBLIO_END ( HID_EXTENSIONS_START + 89 ) -#if HID_LAST_EXTENSIONS_ID > HID_EXTENSIONS_END - #error id overflow -#endif +#define HID_PROPC_START ( HID_EXTENSIONS_START + 90 ) +#define HID_PROPC_END ( HID_EXTENSIONS_START + 499 ) -//----------------------------------------------------------------------- - // FREE -#define HID_PROP_INPUT_REQUIRED (HID_FORMS_START + 1) -#define HID_PROP_GROUPBOX (HID_FORMS_START + 2) -#define HID_PROP_CONTROLSOURCE (HID_FORMS_START + 3) -#define HID_PROP_NAME (HID_FORMS_START + 4) -#define HID_PROP_TABINDEX (HID_FORMS_START + 5) -#define HID_PROP_MASTERFIELDS (HID_FORMS_START + 6) -#define HID_PROP_SLAVEFIELDS (HID_FORMS_START + 7) -#define HID_PROP_DATASOURCE (HID_FORMS_START + 8) -#define HID_PROP_CURSORSOURCE (HID_FORMS_START + 9) -#define HID_PROP_CURSORSOURCETYPE (HID_FORMS_START + 10) -#define HID_PROP_CURSORTYPE (HID_FORMS_START + 11) -#define HID_PROP_READONLY (HID_FORMS_START + 12) -#define HID_PROP_DATAENTRY (HID_FORMS_START + 13) -#define HID_PROP_NAVIGATION (HID_FORMS_START + 14) -#define HID_PROP_CYCLE (HID_FORMS_START + 15) -#define HID_PROP_ALLOW_ADDITIONS (HID_FORMS_START + 16) -#define HID_PROP_ALLOW_EDITS (HID_FORMS_START + 17) -#define HID_PROP_ALLOW_DELETIONS (HID_FORMS_START + 18) -#define HID_PROP_DIRTY (HID_FORMS_START + 19) -#define HID_PROP_OLDVALUE (HID_FORMS_START + 20) -#define HID_PROP_VALUE (HID_FORMS_START + 21) -#define HID_PROP_LOCKED (HID_FORMS_START + 22) -#define HID_PROP_FORMATKEY (HID_FORMS_START + 23) -#define HID_PROP_REQUIRED (HID_FORMS_START + 24) -#define HID_PROP_WHEEL_BEHAVIOR (HID_FORMS_START + 25) - // FREE -#define HID_PROP_UNIQUE (HID_FORMS_START + 27) -#define HID_PROP_CLASSID (HID_FORMS_START + 28) -#define HID_PROP_LEFT (HID_FORMS_START + 29) -#define HID_PROP_RIGHT (HID_FORMS_START + 30) -#define HID_PROP_HEIGHT (HID_FORMS_START + 31) -#define HID_PROP_WIDTH (HID_FORMS_START + 32) -#define HID_PROP_BOUNDCOLUMN (HID_FORMS_START + 33) -#define HID_PROP_LISTSOURCETYPE (HID_FORMS_START + 34) -#define HID_PROP_LISTSOURCE (HID_FORMS_START + 35) -#define HID_PROP_LISTINDEX (HID_FORMS_START + 36) -#define HID_PROP_TEXT (HID_FORMS_START + 37) -#define HID_PROP_LABEL (HID_FORMS_START + 38) -#define HID_PROP_STRINGITEMLIST (HID_FORMS_START + 39) -#define HID_PROP_SEARCHING (HID_FORMS_START + 40) -#define HID_PROP_FONT (HID_FORMS_START + 41) -#define HID_PROP_ROWHEIGHT (HID_FORMS_START + 42) -#define HID_PROP_BACKGROUNDCOLOR (HID_FORMS_START + 43) -#define HID_PROP_FILLCOLOR (HID_FORMS_START + 44) -#define HID_PROP_LINECOLOR (HID_FORMS_START + 46) -#define HID_PROP_BORDER (HID_FORMS_START + 47) -#define HID_PROP_ALIGN (HID_FORMS_START + 48) -#define HID_PROP_DROPDOWN (HID_FORMS_START + 49) -#define HID_PROP_MULTILINE (HID_FORMS_START + 50) -#define HID_PROP_HSCROLL (HID_FORMS_START + 51) -#define HID_PROP_VSCROLL (HID_FORMS_START + 52) -#define HID_PROP_TABSTOP (HID_FORMS_START + 53) -#define HID_PROP_REFVALUE (HID_FORMS_START + 54) -#define HID_PROP_BUTTONTYPE (HID_FORMS_START + 55) -#define HID_PROP_SUBMIT_ACTION (HID_FORMS_START + 56) -#define HID_PROP_SUBMIT_METHOD (HID_FORMS_START + 57) -#define HID_PROP_SUBMIT_ENCODING (HID_FORMS_START + 58) -#define HID_PROP_DEFAULTVALUE (HID_FORMS_START + 59) -#define HID_PROP_SUBMIT_TARGET (HID_FORMS_START + 60) -#define HID_PROP_DEFAULT_STATE (HID_FORMS_START + 61) -#define HID_PROP_IMAGE_URL (HID_FORMS_START + 62) -#define HID_PROP_DEFAULT_SELECT_SEQ (HID_FORMS_START + 63) -#define HID_PROP_MULTISELECTION (HID_FORMS_START + 64) -#define HID_PROP_DATE (HID_FORMS_START + 65) -#define HID_PROP_DATEMIN (HID_FORMS_START + 66) -#define HID_PROP_DATEMAX (HID_FORMS_START + 67) -#define HID_PROP_DATEFORMAT (HID_FORMS_START + 68) -#define HID_PROP_TIME (HID_FORMS_START + 69) -#define HID_PROP_TIMEMIN (HID_FORMS_START + 70) -#define HID_PROP_TIMEMAX (HID_FORMS_START + 71) -#define HID_PROP_TIMEFORMAT (HID_FORMS_START + 72) -#define HID_PROP_VALUEMIN (HID_FORMS_START + 73) -#define HID_PROP_VALUEMAX (HID_FORMS_START + 74) -#define HID_PROP_VALUESTEP (HID_FORMS_START + 75) -#define HID_PROP_CURRENCYSYMBOL (HID_FORMS_START + 76) -#define HID_PROP_EDITMASK (HID_FORMS_START + 77) -#define HID_PROP_LITERALMASK (HID_FORMS_START + 78) -#define HID_PROP_ENABLED (HID_FORMS_START + 79) -#define HID_PROP_AUTOCOMPLETE (HID_FORMS_START + 80) -#define HID_PROP_LINECOUNT (HID_FORMS_START + 81) -#define HID_PROP_MAXTEXTLEN (HID_FORMS_START + 82) -#define HID_PROP_SPIN (HID_FORMS_START + 83) -#define HID_PROP_STRICTFORMAT (HID_FORMS_START + 84) -#define HID_PROP_SHOWTHOUSANDSEP (HID_FORMS_START + 85) -#define HID_PROP_VERTICAL_ALIGN (HID_FORMS_START + 86) -#define HID_PROP_PRINTABLE (HID_FORMS_START + 87) -#define HID_PROP_TARGET_URL (HID_FORMS_START + 88) -#define HID_PROP_TARGET_FRAME (HID_FORMS_START + 89) -#define HID_PROP_TAG (HID_FORMS_START + 90) -#define HID_PROP_ECHO_CHAR (HID_FORMS_START + 91) -#define HID_PROP_EMPTY_IS_NULL (HID_FORMS_START + 92) -#define HID_PROP_DECIMAL_ACCURACY (HID_FORMS_START + 93) -#define HID_PROP_ENABLE_VISIBLE (HID_FORMS_START + 94) -#define HID_PROP_DEFAULT_BUTTON (HID_FORMS_START + 95) -#define HID_PROP_HIDDEN_VALUE (HID_FORMS_START + 96) -#define HID_PROP_TRISTATE (HID_FORMS_START + 97) -#define HID_PROP_NAVIGATIONBAR (HID_FORMS_START + 98) -#define HID_PROP_FILTER (HID_FORMS_START + 99) -#define HID_PROP_SORT_CRITERIA (HID_FORMS_START + 100) -#define HID_PROP_DEFAULT_LONG_VALUE (HID_FORMS_START + 101) -#define HID_PROP_DEFAULT_TIME (HID_FORMS_START + 102) -#define HID_PROP_DEFAULT_DATE (HID_FORMS_START + 103) -#define HID_PROP_HELPTEXT (HID_FORMS_START + 104) -#define HID_PROP_HELPURL (HID_FORMS_START + 105) -#define HID_PROP_RECORDMARKER (HID_FORMS_START + 106) -#define HID_PROP_FILTERPROPOSAL (HID_FORMS_START + 107) -#define HID_PROP_EFFECTIVEMIN (HID_FORMS_START + 108) -#define HID_PROP_EFFECTIVEMAX (HID_FORMS_START + 109) -#define HID_PROP_EFFECTIVEDEFAULT (HID_FORMS_START + 110) -#define HID_PROP_CONTROLLABEL (HID_FORMS_START + 111) -#define HID_PROP_CURRSYM_POSITION (HID_FORMS_START + 112) -#define HID_PROP_ESCAPE_PROCESSING (HID_FORMS_START + 113) - // FREE -#define HID_PROP_TITLE (HID_FORMS_START + 115) -#define HID_PROP_STEP (HID_FORMS_START + 116) - // FREE -#define HID_PROP_PROGRESSVALUE (HID_FORMS_START + 118) -#define HID_PROP_PROGRESSVALUE_MIN (HID_FORMS_START + 119) -#define HID_PROP_PROGRESSVALUE_MAX (HID_FORMS_START + 120) -#define HID_PROP_SCROLLVALUE (HID_FORMS_START + 121) -#define HID_PROP_SCROLLVALUE_MAX (HID_FORMS_START + 122) -#define HID_PROP_LINEINCREMENT (HID_FORMS_START + 123) -#define HID_PROP_BLOCKINCREMENT (HID_FORMS_START + 124) -#define HID_PROP_VISIBLESIZE (HID_FORMS_START + 125) -#define HID_PROP_ORIENTATION (HID_FORMS_START + 126) -#define HID_PROP_POSITIONX (HID_FORMS_START + 127) -#define HID_PROP_POSITIONY (HID_FORMS_START + 128) -#define HID_PROP_PUSHBUTTONTYPE (HID_FORMS_START + 129) -#define HID_PROP_STATE (HID_FORMS_START + 130) -#define HID_PROP_SCALEIMAGE (HID_FORMS_START + 131) -#define HID_PROP_BOUND_CELL (HID_FORMS_START + 132) -#define HID_PROP_LIST_CELL_RANGE (HID_FORMS_START + 133) -#define HID_PROP_CELL_EXCHANGE_TYPE (HID_FORMS_START + 134) -#define HID_PROP_SELECTEDITEMS (HID_FORMS_START + 135) -#define HID_PROP_SCROLLVALUE_MIN (HID_FORMS_START + 136) -#define HID_PROP_DEFAULT_SCROLLVALUE (HID_FORMS_START + 137) -#define HID_PROP_REPEAT_DELAY (HID_FORMS_START + 138) -#define HID_PROP_SYMBOLCOLOR (HID_FORMS_START + 139) -#define HID_PROP_SPINVALUE (HID_FORMS_START + 140) -#define HID_PROP_SPINVALUE_MIN (HID_FORMS_START + 141) -#define HID_PROP_SPINVALUE_MAX (HID_FORMS_START + 142) -#define HID_PROP_DEFAULT_SPINVALUE (HID_FORMS_START + 143) -#define HID_PROP_SPININCREMENT (HID_FORMS_START + 144) -#define HID_PROP_REPEAT (HID_FORMS_START + 145) -#define HID_PROP_WORDBREAK (HID_FORMS_START + 146) -#define HID_PROP_SHOW_SCROLLBARS (HID_FORMS_START + 147) -#define HID_PROP_TABORDER_CONTROLS (HID_FORMS_START + 148) -#define HID_FIELDLINK_DETAIL_COLUMN (HID_FORMS_START + 149) -#define HID_FIELDLINK_MASTER_COLUMN (HID_FORMS_START + 150) -#define UID_FIELDLINK_DETAIL1 (HID_FORMS_START + 151) -#define UID_FIELDLINK_MASTER1 (HID_FORMS_START + 152) -#define UID_FIELDLINK_DETAIL2 (HID_FORMS_START + 153) -#define UID_FIELDLINK_MASTER2 (HID_FORMS_START + 154) -#define UID_FIELDLINK_DETAIL3 (HID_FORMS_START + 155) -#define UID_FIELDLINK_MASTER3 (HID_FORMS_START + 156) -#define UID_FIELDLINK_DETAIL4 (HID_FORMS_START + 157) -#define UID_FIELDLINK_MASTER4 (HID_FORMS_START + 158) -#define HID_PROP_ICONSIZE (HID_FORMS_START + 159) -#define HID_PROP_SHOW_POSITION (HID_FORMS_START + 160) -#define HID_PROP_SHOW_NAVIGATION (HID_FORMS_START + 161) -#define HID_PROP_SHOW_RECORDACTIONS (HID_FORMS_START + 162) -#define HID_PROP_SHOW_FILTERSORT (HID_FORMS_START + 163) -#define HID_PROP_AUTOLINEBREAK (HID_FORMS_START + 164) -#define HID_PROP_TEXTTYPE (HID_FORMS_START + 165) -#define HID_PROP_LINEEND_FORMAT (HID_FORMS_START + 166) -#define HID_PROP_XSD_TOTAL_DIGITS (HID_FORMS_START + 167) -#define HID_PROP_XSD_FRACTION_DIGITS (HID_FORMS_START + 168) -#define HID_PROP_XSD_MAX_INCLUSIVE (HID_FORMS_START + 169) -#define HID_PROP_XSD_MAX_EXCLUSIVE (HID_FORMS_START + 170) -#define HID_PROP_XSD_MIN_INCLUSIVE (HID_FORMS_START + 171) -#define HID_PROP_XSD_MIN_EXCLUSIVE (HID_FORMS_START + 172) -#define HID_PROP_UNCHECKEDREFVALUE (HID_FORMS_START + 173) -#define HID_PROP_SUBMISSION_ID (HID_FORMS_START + 174) - // FREE - // FREE - // FREE - // FREE - // FREE -#define UID_PROP_DLG_FONT_TYPE (HID_FORMS_START + 180) -#define UID_PROP_DLG_IMAGE_URL (HID_FORMS_START + 181) -#define UID_PROP_DLG_BACKGROUNDCOLOR (HID_FORMS_START + 182) -#define UID_PROP_DLG_SYMBOLCOLOR (HID_FORMS_START + 183) -#define UID_PROP_DLG_ATTR_DATASOURCE (HID_FORMS_START + 184) -#define UID_PROP_DLG_ATTR_TARGET_URL (HID_FORMS_START + 185) -#define UID_PROP_DLG_NUMBER_FORMAT (HID_FORMS_START + 186) -#define UID_PROP_DLG_CONTROLLABEL (HID_FORMS_START + 187) -#define UID_PROP_DLG_FILLCOLOR (HID_FORMS_START + 188) -#define UID_PROP_DLG_TABINDEX (HID_FORMS_START + 189) -#define UID_PROP_DLG_SQLCOMMAND (HID_FORMS_START + 190) -#define UID_PROP_DLG_FORMLINKFIELDS (HID_FORMS_START + 191) -#define UID_PROP_DLG_FILTER (HID_FORMS_START + 192) -#define UID_PROP_DLG_ORDER (HID_FORMS_START + 193) -#define UID_PROP_DLG_SELECTION (HID_FORMS_START + 194) -#define UID_EVT_MACRODLG (HID_FORMS_START + 195) -#define UID_BRWEVT_APPROVEACTIONPERFORMED (HID_FORMS_START + 196) -#define UID_BRWEVT_ACTIONPERFORMED (HID_FORMS_START + 197) -#define UID_BRWEVT_CHANGED (HID_FORMS_START + 198) -#define UID_BRWEVT_TEXTCHANGED (HID_FORMS_START + 199) -#define UID_BRWEVT_ITEMSTATECHANGED (HID_FORMS_START + 200) -#define UID_BRWEVT_FOCUSGAINED (HID_FORMS_START + 201) -#define UID_BRWEVT_FOCUSLOST (HID_FORMS_START + 202) -#define UID_BRWEVT_KEYTYPED (HID_FORMS_START + 203) -#define UID_BRWEVT_KEYUP (HID_FORMS_START + 204) -#define UID_BRWEVT_MOUSEENTERED (HID_FORMS_START + 205) -#define UID_BRWEVT_MOUSEDRAGGED (HID_FORMS_START + 206) -#define UID_BRWEVT_MOUSEMOVED (HID_FORMS_START + 207) -#define UID_BRWEVT_MOUSEPRESSED (HID_FORMS_START + 208) -#define UID_BRWEVT_MOUSERELEASED (HID_FORMS_START + 209) -#define UID_BRWEVT_MOUSEEXITED (HID_FORMS_START + 210) -#define UID_BRWEVT_APPROVERESETTED (HID_FORMS_START + 211) -#define UID_BRWEVT_RESETTED (HID_FORMS_START + 212) -#define UID_BRWEVT_SUBMITTED (HID_FORMS_START + 213) -#define UID_BRWEVT_BEFOREUPDATE (HID_FORMS_START + 214) -#define UID_BRWEVT_AFTERUPDATE (HID_FORMS_START + 215) -#define UID_BRWEVT_LOADED (HID_FORMS_START + 216) -#define UID_BRWEVT_RELOADING (HID_FORMS_START + 217) -#define UID_BRWEVT_RELOADED (HID_FORMS_START + 218) -#define UID_BRWEVT_UNLOADING (HID_FORMS_START + 219) -#define UID_BRWEVT_UNLOADED (HID_FORMS_START + 220) -#define UID_BRWEVT_CONFIRMDELETE (HID_FORMS_START + 221) -#define UID_BRWEVT_APPROVEROWCHANGE (HID_FORMS_START + 222) -#define UID_BRWEVT_ROWCHANGE (HID_FORMS_START + 223) -#define UID_BRWEVT_POSITIONING (HID_FORMS_START + 224) -#define UID_BRWEVT_POSITIONED (HID_FORMS_START + 225) -#define UID_BRWEVT_APPROVEPARAMETER (HID_FORMS_START + 226) -#define UID_BRWEVT_ERROROCCURED (HID_FORMS_START + 227) -#define UID_BRWEVT_ADJUSTMENTVALUECHANGED (HID_FORMS_START + 228) -#define HID_PROP_XML_DATA_MODEL (HID_FORMS_START + 229) -#define HID_PROP_BIND_EXPRESSION (HID_FORMS_START + 230) -#define HID_PROP_XSD_REQUIRED (HID_FORMS_START + 231) -#define HID_PROP_XSD_RELEVANT (HID_FORMS_START + 232) -#define HID_PROP_XSD_READONLY (HID_FORMS_START + 233) -#define HID_PROP_XSD_CONSTRAINT (HID_FORMS_START + 234) -#define HID_PROP_XSD_CALCULATION (HID_FORMS_START + 235) -#define HID_PROP_XSD_DATA_TYPE (HID_FORMS_START + 236) -#define HID_PROP_XSD_WHITESPACES (HID_FORMS_START + 237) -#define HID_PROP_XSD_PATTERN (HID_FORMS_START + 238) -#define HID_PROP_XSD_LENGTH (HID_FORMS_START + 239) -#define HID_PROP_XSD_MIN_LENGTH (HID_FORMS_START + 230) -#define HID_PROP_XSD_MAX_LENGTH (HID_FORMS_START + 241) -#define UID_PROP_DLG_BIND_EXPRESSION (HID_FORMS_START + 242) -#define UID_PROP_DLG_XSD_REQUIRED (HID_FORMS_START + 243) -#define UID_PROP_DLG_XSD_RELEVANT (HID_FORMS_START + 244) -#define UID_PROP_DLG_XSD_READONLY (HID_FORMS_START + 245) -#define UID_PROP_DLG_XSD_CONSTRAINT (HID_FORMS_START + 246) -#define UID_PROP_DLG_XSD_CALCULATION (HID_FORMS_START + 247) -#define UID_PROP_ADD_DATA_TYPE (HID_FORMS_START + 248) -#define UID_PROP_REMOVE_DATA_TYPE (HID_FORMS_START + 249) -#define HID_PROP_LIST_BINDING (HID_FORMS_START + 250) -#define HID_PROP_BINDING_NAME (HID_FORMS_START + 251) -#define HID_PROP_SELECTION_TYPE (HID_FORMS_START + 253) -#define HID_PROP_ROOT_DISPLAYED (HID_FORMS_START + 254) -#define HID_PROP_SHOWS_HANDLES (HID_FORMS_START + 255) -#define HID_PROP_SHOWS_ROOT_HANDLES (HID_FORMS_START + 256) -#define HID_PROP_EDITABLE (HID_FORMS_START + 257) -#define HID_PROP_INVOKES_STOP_NOT_EDITING (HID_FORMS_START + 258) -#define HID_PROP_ROW_HEIGHT (HID_FORMS_START + 259) -#define HID_PROP_DECORATION (HID_FORMS_START + 252) +#define HID_UPDATE_START ( HID_EXTENSIONS_START + 500 ) +#define HID_UPDATE_END ( HID_EXTENSIONS_START + 519 ) -#define HID_EVT_ACTIONPERFORMED (HID_FORMS_START + 300) -#define HID_EVT_AFTERUPDATE (HID_FORMS_START + 301) -#define HID_EVT_BEFOREUPDATE (HID_FORMS_START + 302) -#define HID_EVT_CONFIRMDELETE (HID_FORMS_START + 303) -#define HID_EVT_ERROROCCURED (HID_FORMS_START + 304) -#define HID_EVT_FOCUSGAINED (HID_FORMS_START + 305) -#define HID_EVT_FOCUSLOST (HID_FORMS_START + 306) -#define HID_EVT_ITEMSTATECHANGED (HID_FORMS_START + 307) -#define HID_EVT_KEYTYPED (HID_FORMS_START + 308) -#define HID_EVT_LOADED (HID_FORMS_START + 309) -#define HID_EVT_MOUSEDRAGGED (HID_FORMS_START + 310) -#define HID_EVT_MOUSEENTERED (HID_FORMS_START + 311) -#define HID_EVT_MOUSEEXITED (HID_FORMS_START + 312) -#define HID_EVT_MOUSEMOVED (HID_FORMS_START + 313) -#define HID_EVT_MOUSEPRESSED (HID_FORMS_START + 314) -#define HID_EVT_MOUSERELEASED (HID_FORMS_START + 315) -#define HID_EVT_POSITIONED (HID_FORMS_START + 316) -#define HID_EVT_RESETTED (HID_FORMS_START + 317) -#define HID_EVT_SUBMITTED (HID_FORMS_START + 318) -#define HID_EVT_TEXTCHANGED (HID_FORMS_START + 319) -#define HID_EVT_UNLOADED (HID_FORMS_START + 320) -#define HID_EVT_CHANGED (HID_FORMS_START + 321) -#define HID_EVT_APPROVEACTIONPERFORMED (HID_FORMS_START + 322) -#define HID_EVT_APPROVERESETTED (HID_FORMS_START + 323) -#define HID_EVT_KEYUP (HID_FORMS_START + 324) -#define HID_EVT_APPROVEPARAMETER (HID_FORMS_START + 325) -#define HID_EVT_POSITIONING (HID_FORMS_START + 326) -#define HID_EVT_RELOADED (HID_FORMS_START + 327) -#define HID_EVT_APPROVEROWCHANGE (HID_FORMS_START + 328) -#define HID_EVT_ROWCHANGE (HID_FORMS_START + 329) -#define HID_EVT_RELOADING (HID_FORMS_START + 330) -#define HID_EVT_UNLOADING (HID_FORMS_START + 331) -#define HID_EVT_ADJUSTMENTVALUECHANGED (HID_FORMS_START + 332) -#define HID_PROP_TOGGLE (HID_FORMS_START + 333) -#define HID_PROP_FOCUSONCLICK (HID_FORMS_START + 334) -#define HID_PROP_HIDEINACTIVESELECTION (HID_FORMS_START + 335) -#define HID_PROP_VISUALEFFECT (HID_FORMS_START + 336) -#define HID_PROP_BORDERCOLOR (HID_FORMS_START + 337) -#define UID_PROP_DLG_BORDERCOLOR (HID_FORMS_START + 338) -#define HID_PROP_IMAGEPOSITION (HID_FORMS_START + 339) -#define HID_PROP_NOLABEL (HID_FORMS_START + 340) -#define HID_PROP_WRITING_MODE (HID_FORMS_START + 341) -#define HID_PROP_ANCHOR_TYPE (HID_FORMS_START + 343) - // please adjust HID_LAST_FORMS_ID if you add new ids here! +// !!! please adjust HID_LAST_EXTENSIONS_RANGE if you add new ranges here !!! -#define HID_LAST_FORMS_ID HID_PROP_ANCHOR_TYPE +#define HID_LAST_EXTENSIONS_RANGE HID_UPDATE_END -#if HID_LAST_FORMS_ID > HID_FORMS_END - #error id overflow +#if HID_LAST_EXTENSIONS_RANGE > HID_EXTENSIONS_END + #error id range overflow #endif #endif diff --git a/extensions/inc/propctrlr.hrc b/extensions/inc/propctrlr.hrc new file mode 100644 index 000000000000..cd27f844434f --- /dev/null +++ b/extensions/inc/propctrlr.hrc @@ -0,0 +1,336 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2009 by Sun Microsystems, Inc. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ +
+#ifndef EXTENSIONS_PROPCTRLR_HRC
+#define EXTENSIONS_PROPCTRLR_HRC
+
+#include "extensio.hrc"
+
+#define HID_PROP_INPUT_REQUIRED ( HID_PROPC_START + 0) +#define HID_PROP_GROUPBOX ( HID_PROPC_START + 1) +#define HID_PROP_CONTROLSOURCE ( HID_PROPC_START + 2) +#define HID_PROP_NAME ( HID_PROPC_START + 3) +#define HID_PROP_TABINDEX ( HID_PROPC_START + 4) +#define HID_PROP_MASTERFIELDS ( HID_PROPC_START + 5) +#define HID_PROP_SLAVEFIELDS ( HID_PROPC_START + 6) +#define HID_PROP_DATASOURCE ( HID_PROPC_START + 7) +#define HID_PROP_CURSORSOURCE ( HID_PROPC_START + 8) +#define HID_PROP_CURSORSOURCETYPE ( HID_PROPC_START + 9) +#define HID_PROP_CURSORTYPE ( HID_PROPC_START + 10) +#define HID_PROP_READONLY ( HID_PROPC_START + 11) +#define HID_PROP_DATAENTRY ( HID_PROPC_START + 12) +#define HID_PROP_NAVIGATION ( HID_PROPC_START + 13) +#define HID_PROP_CYCLE ( HID_PROPC_START + 14) +#define HID_PROP_ALLOW_ADDITIONS ( HID_PROPC_START + 15) +#define HID_PROP_ALLOW_EDITS ( HID_PROPC_START + 16) +#define HID_PROP_ALLOW_DELETIONS ( HID_PROPC_START + 17) +#define HID_PROP_DIRTY ( HID_PROPC_START + 18) +#define HID_PROP_OLDVALUE ( HID_PROPC_START + 19) +#define HID_PROP_VALUE ( HID_PROPC_START + 20) +#define HID_PROP_LOCKED ( HID_PROPC_START + 21) +#define HID_PROP_FORMATKEY ( HID_PROPC_START + 22) +#define HID_PROP_REQUIRED ( HID_PROPC_START + 23) +#define HID_PROP_WHEEL_BEHAVIOR ( HID_PROPC_START + 24) +#define HID_PROP_UNIQUE ( HID_PROPC_START + 25) +#define HID_PROP_CLASSID ( HID_PROPC_START + 26) +#define HID_PROP_LEFT ( HID_PROPC_START + 27) +#define HID_PROP_RIGHT ( HID_PROPC_START + 28) +#define HID_PROP_HEIGHT ( HID_PROPC_START + 29) +#define HID_PROP_WIDTH ( HID_PROPC_START + 30) +#define HID_PROP_BOUNDCOLUMN ( HID_PROPC_START + 31) +#define HID_PROP_LISTSOURCETYPE ( HID_PROPC_START + 32) +#define HID_PROP_LISTSOURCE ( HID_PROPC_START + 33) +#define HID_PROP_LISTINDEX ( HID_PROPC_START + 34) +#define HID_PROP_TEXT ( HID_PROPC_START + 35) +#define HID_PROP_LABEL ( HID_PROPC_START + 36) +#define HID_PROP_STRINGITEMLIST ( HID_PROPC_START + 37) +#define HID_PROP_SEARCHING ( HID_PROPC_START + 38) +#define HID_PROP_FONT ( HID_PROPC_START + 39) +#define HID_PROP_ROWHEIGHT ( HID_PROPC_START + 40) +#define HID_PROP_BACKGROUNDCOLOR ( HID_PROPC_START + 41) +#define HID_PROP_FILLCOLOR ( HID_PROPC_START + 42) +#define HID_PROP_LINECOLOR ( HID_PROPC_START + 43) +#define HID_PROP_BORDER ( HID_PROPC_START + 44) +#define HID_PROP_ALIGN ( HID_PROPC_START + 45) +#define HID_PROP_DROPDOWN ( HID_PROPC_START + 46) +#define HID_PROP_MULTILINE ( HID_PROPC_START + 47) +#define HID_PROP_HSCROLL ( HID_PROPC_START + 48) +#define HID_PROP_VSCROLL ( HID_PROPC_START + 49) +#define HID_PROP_TABSTOP ( HID_PROPC_START + 50) +#define HID_PROP_REFVALUE ( HID_PROPC_START + 51) +#define HID_PROP_BUTTONTYPE ( HID_PROPC_START + 52) +#define HID_PROP_SUBMIT_ACTION ( HID_PROPC_START + 53) +#define HID_PROP_SUBMIT_METHOD ( HID_PROPC_START + 54) +#define HID_PROP_SUBMIT_ENCODING ( HID_PROPC_START + 55) +#define HID_PROP_DEFAULTVALUE ( HID_PROPC_START + 56) +#define HID_PROP_SUBMIT_TARGET ( HID_PROPC_START + 57) +#define HID_PROP_DEFAULT_STATE ( HID_PROPC_START + 58) +#define HID_PROP_IMAGE_URL ( HID_PROPC_START + 59) +#define HID_PROP_DEFAULT_SELECT_SEQ ( HID_PROPC_START + 60) +#define HID_PROP_MULTISELECTION ( HID_PROPC_START + 61) +#define HID_PROP_DATE ( HID_PROPC_START + 62) +#define HID_PROP_DATEMIN ( HID_PROPC_START + 63) +#define HID_PROP_DATEMAX ( HID_PROPC_START + 64) +#define HID_PROP_DATEFORMAT ( HID_PROPC_START + 65) +#define HID_PROP_TIME ( HID_PROPC_START + 66) +#define HID_PROP_TIMEMIN ( HID_PROPC_START + 67) +#define HID_PROP_TIMEMAX ( HID_PROPC_START + 68) +#define HID_PROP_TIMEFORMAT ( HID_PROPC_START + 69) +#define HID_PROP_VALUEMIN ( HID_PROPC_START + 70) +#define HID_PROP_VALUEMAX ( HID_PROPC_START + 71) +#define HID_PROP_VALUESTEP ( HID_PROPC_START + 72) +#define HID_PROP_CURRENCYSYMBOL ( HID_PROPC_START + 73) +#define HID_PROP_EDITMASK ( HID_PROPC_START + 74) +#define HID_PROP_LITERALMASK ( HID_PROPC_START + 75) +#define HID_PROP_ENABLED ( HID_PROPC_START + 76) +#define HID_PROP_AUTOCOMPLETE ( HID_PROPC_START + 77) +#define HID_PROP_LINECOUNT ( HID_PROPC_START + 78) +#define HID_PROP_MAXTEXTLEN ( HID_PROPC_START + 79) +#define HID_PROP_SPIN ( HID_PROPC_START + 80) +#define HID_PROP_STRICTFORMAT ( HID_PROPC_START + 81) +#define HID_PROP_SHOWTHOUSANDSEP ( HID_PROPC_START + 82) +#define HID_PROP_VERTICAL_ALIGN ( HID_PROPC_START + 83) +#define HID_PROP_PRINTABLE ( HID_PROPC_START + 84) +#define HID_PROP_TARGET_URL ( HID_PROPC_START + 85) +#define HID_PROP_TARGET_FRAME ( HID_PROPC_START + 86) +#define HID_PROP_TAG ( HID_PROPC_START + 87) +#define HID_PROP_ECHO_CHAR ( HID_PROPC_START + 88) +#define HID_PROP_EMPTY_IS_NULL ( HID_PROPC_START + 89) +#define HID_PROP_DECIMAL_ACCURACY ( HID_PROPC_START + 90) +#define HID_PROP_ENABLE_VISIBLE ( HID_PROPC_START + 91) +#define HID_PROP_DEFAULT_BUTTON ( HID_PROPC_START + 92) +#define HID_PROP_HIDDEN_VALUE ( HID_PROPC_START + 93) +#define HID_PROP_TRISTATE ( HID_PROPC_START + 94) +#define HID_PROP_NAVIGATIONBAR ( HID_PROPC_START + 95) +#define HID_PROP_FILTER ( HID_PROPC_START + 96) +#define HID_PROP_SORT_CRITERIA ( HID_PROPC_START + 97) +#define HID_PROP_DEFAULT_LONG_VALUE ( HID_PROPC_START + 98) +#define HID_PROP_DEFAULT_TIME ( HID_PROPC_START + 99) +#define HID_PROP_DEFAULT_DATE ( HID_PROPC_START + 100) +#define HID_PROP_HELPTEXT ( HID_PROPC_START + 101) +#define HID_PROP_HELPURL ( HID_PROPC_START + 102) +#define HID_PROP_RECORDMARKER ( HID_PROPC_START + 103) +#define HID_PROP_FILTERPROPOSAL ( HID_PROPC_START + 104) +#define HID_PROP_EFFECTIVEMIN ( HID_PROPC_START + 105) +#define HID_PROP_EFFECTIVEMAX ( HID_PROPC_START + 106) +#define HID_PROP_EFFECTIVEDEFAULT ( HID_PROPC_START + 107) +#define HID_PROP_CONTROLLABEL ( HID_PROPC_START + 108) +#define HID_PROP_CURRSYM_POSITION ( HID_PROPC_START + 109) +#define HID_PROP_ESCAPE_PROCESSING ( HID_PROPC_START + 110) +#define HID_PROP_TITLE ( HID_PROPC_START + 111) +#define HID_PROP_STEP ( HID_PROPC_START + 112) +#define HID_PROP_PROGRESSVALUE ( HID_PROPC_START + 113) +#define HID_PROP_PROGRESSVALUE_MIN ( HID_PROPC_START + 114) +#define HID_PROP_PROGRESSVALUE_MAX ( HID_PROPC_START + 115) +#define HID_PROP_SCROLLVALUE ( HID_PROPC_START + 116) +#define HID_PROP_SCROLLVALUE_MAX ( HID_PROPC_START + 117) +#define HID_PROP_LINEINCREMENT ( HID_PROPC_START + 118) +#define HID_PROP_BLOCKINCREMENT ( HID_PROPC_START + 119) +#define HID_PROP_VISIBLESIZE ( HID_PROPC_START + 120) +#define HID_PROP_ORIENTATION ( HID_PROPC_START + 121) +#define HID_PROP_POSITIONX ( HID_PROPC_START + 122) +#define HID_PROP_POSITIONY ( HID_PROPC_START + 123) +#define HID_PROP_PUSHBUTTONTYPE ( HID_PROPC_START + 124) +#define HID_PROP_STATE ( HID_PROPC_START + 125) +#define HID_PROP_SCALEIMAGE ( HID_PROPC_START + 126) +#define HID_PROP_BOUND_CELL ( HID_PROPC_START + 127) +#define HID_PROP_LIST_CELL_RANGE ( HID_PROPC_START + 128) +#define HID_PROP_CELL_EXCHANGE_TYPE ( HID_PROPC_START + 129) +#define HID_PROP_SELECTEDITEMS ( HID_PROPC_START + 130) +#define HID_PROP_SCROLLVALUE_MIN ( HID_PROPC_START + 131) +#define HID_PROP_DEFAULT_SCROLLVALUE ( HID_PROPC_START + 132) +#define HID_PROP_REPEAT_DELAY ( HID_PROPC_START + 133) +#define HID_PROP_SYMBOLCOLOR ( HID_PROPC_START + 134) +#define HID_PROP_SPINVALUE ( HID_PROPC_START + 135) +#define HID_PROP_SPINVALUE_MIN ( HID_PROPC_START + 136) +#define HID_PROP_SPINVALUE_MAX ( HID_PROPC_START + 137) +#define HID_PROP_DEFAULT_SPINVALUE ( HID_PROPC_START + 138) +#define HID_PROP_SPININCREMENT ( HID_PROPC_START + 139) +#define HID_PROP_REPEAT ( HID_PROPC_START + 140) +#define HID_PROP_WORDBREAK ( HID_PROPC_START + 141) +#define HID_PROP_SHOW_SCROLLBARS ( HID_PROPC_START + 142) +#define HID_PROP_TABORDER_CONTROLS ( HID_PROPC_START + 143) +#define HID_FIELDLINK_DETAIL_COLUMN ( HID_PROPC_START + 144) +#define HID_FIELDLINK_MASTER_COLUMN ( HID_PROPC_START + 145) +#define UID_FIELDLINK_DETAIL1 ( HID_PROPC_START + 146) +#define UID_FIELDLINK_MASTER1 ( HID_PROPC_START + 147) +#define UID_FIELDLINK_DETAIL2 ( HID_PROPC_START + 148) +#define UID_FIELDLINK_MASTER2 ( HID_PROPC_START + 149) +#define UID_FIELDLINK_DETAIL3 ( HID_PROPC_START + 150) +#define UID_FIELDLINK_MASTER3 ( HID_PROPC_START + 151) +#define UID_FIELDLINK_DETAIL4 ( HID_PROPC_START + 152) +#define UID_FIELDLINK_MASTER4 ( HID_PROPC_START + 153) +#define HID_PROP_ICONSIZE ( HID_PROPC_START + 154) +#define HID_PROP_SHOW_POSITION ( HID_PROPC_START + 155) +#define HID_PROP_SHOW_NAVIGATION ( HID_PROPC_START + 156) +#define HID_PROP_SHOW_RECORDACTIONS ( HID_PROPC_START + 157) +#define HID_PROP_SHOW_FILTERSORT ( HID_PROPC_START + 158) +#define HID_PROP_AUTOLINEBREAK ( HID_PROPC_START + 159) +#define HID_PROP_TEXTTYPE ( HID_PROPC_START + 160) +#define HID_PROP_LINEEND_FORMAT ( HID_PROPC_START + 161) +#define HID_PROP_XSD_TOTAL_DIGITS ( HID_PROPC_START + 162) +#define HID_PROP_XSD_FRACTION_DIGITS ( HID_PROPC_START + 163) +#define HID_PROP_XSD_MAX_INCLUSIVE ( HID_PROPC_START + 164) +#define HID_PROP_XSD_MAX_EXCLUSIVE ( HID_PROPC_START + 165) +#define HID_PROP_XSD_MIN_INCLUSIVE ( HID_PROPC_START + 166) +#define HID_PROP_XSD_MIN_EXCLUSIVE ( HID_PROPC_START + 167) +#define HID_PROP_UNCHECKEDREFVALUE ( HID_PROPC_START + 168) +#define HID_PROP_SUBMISSION_ID ( HID_PROPC_START + 169) +#define UID_PROP_DLG_FONT_TYPE ( HID_PROPC_START + 170) +#define UID_PROP_DLG_IMAGE_URL ( HID_PROPC_START + 171) +#define UID_PROP_DLG_BACKGROUNDCOLOR ( HID_PROPC_START + 172) +#define UID_PROP_DLG_SYMBOLCOLOR ( HID_PROPC_START + 173) +#define UID_PROP_DLG_ATTR_DATASOURCE ( HID_PROPC_START + 174) +#define UID_PROP_DLG_ATTR_TARGET_URL ( HID_PROPC_START + 175) +#define UID_PROP_DLG_NUMBER_FORMAT ( HID_PROPC_START + 176) +#define UID_PROP_DLG_CONTROLLABEL ( HID_PROPC_START + 177) +#define UID_PROP_DLG_FILLCOLOR ( HID_PROPC_START + 178) +#define UID_PROP_DLG_TABINDEX ( HID_PROPC_START + 179) +#define UID_PROP_DLG_SQLCOMMAND ( HID_PROPC_START + 180) +#define UID_PROP_DLG_FORMLINKFIELDS ( HID_PROPC_START + 181) +#define UID_PROP_DLG_FILTER ( HID_PROPC_START + 182) +#define UID_PROP_DLG_ORDER ( HID_PROPC_START + 183) +#define UID_PROP_DLG_SELECTION ( HID_PROPC_START + 184) +#define UID_EVT_MACRODLG ( HID_PROPC_START + 185) +#define UID_BRWEVT_APPROVEACTIONPERFORMED ( HID_PROPC_START + 186) +#define UID_BRWEVT_ACTIONPERFORMED ( HID_PROPC_START + 187) +#define UID_BRWEVT_CHANGED ( HID_PROPC_START + 188) +#define UID_BRWEVT_TEXTCHANGED ( HID_PROPC_START + 189) +#define UID_BRWEVT_ITEMSTATECHANGED ( HID_PROPC_START + 190) +#define UID_BRWEVT_FOCUSGAINED ( HID_PROPC_START + 191) +#define UID_BRWEVT_FOCUSLOST ( HID_PROPC_START + 192) +#define UID_BRWEVT_KEYTYPED ( HID_PROPC_START + 193) +#define UID_BRWEVT_KEYUP ( HID_PROPC_START + 194) +#define UID_BRWEVT_MOUSEENTERED ( HID_PROPC_START + 195) +#define UID_BRWEVT_MOUSEDRAGGED ( HID_PROPC_START + 196) +#define UID_BRWEVT_MOUSEMOVED ( HID_PROPC_START + 197) +#define UID_BRWEVT_MOUSEPRESSED ( HID_PROPC_START + 198) +#define UID_BRWEVT_MOUSERELEASED ( HID_PROPC_START + 199) +#define UID_BRWEVT_MOUSEEXITED ( HID_PROPC_START + 200) +#define UID_BRWEVT_APPROVERESETTED ( HID_PROPC_START + 201) +#define UID_BRWEVT_RESETTED ( HID_PROPC_START + 202) +#define UID_BRWEVT_SUBMITTED ( HID_PROPC_START + 203) +#define UID_BRWEVT_BEFOREUPDATE ( HID_PROPC_START + 204) +#define UID_BRWEVT_AFTERUPDATE ( HID_PROPC_START + 205) +#define UID_BRWEVT_LOADED ( HID_PROPC_START + 206) +#define UID_BRWEVT_RELOADING ( HID_PROPC_START + 207) +#define UID_BRWEVT_RELOADED ( HID_PROPC_START + 208) +#define UID_BRWEVT_UNLOADING ( HID_PROPC_START + 209) +#define UID_BRWEVT_UNLOADED ( HID_PROPC_START + 210) +#define UID_BRWEVT_CONFIRMDELETE ( HID_PROPC_START + 211) +#define UID_BRWEVT_APPROVEROWCHANGE ( HID_PROPC_START + 212) +#define UID_BRWEVT_ROWCHANGE ( HID_PROPC_START + 213) +#define UID_BRWEVT_POSITIONING ( HID_PROPC_START + 214) +#define UID_BRWEVT_POSITIONED ( HID_PROPC_START + 215) +#define UID_BRWEVT_APPROVEPARAMETER ( HID_PROPC_START + 216) +#define UID_BRWEVT_ERROROCCURED ( HID_PROPC_START + 217) +#define UID_BRWEVT_ADJUSTMENTVALUECHANGED ( HID_PROPC_START + 218) +#define HID_PROP_XML_DATA_MODEL ( HID_PROPC_START + 219) +#define HID_PROP_BIND_EXPRESSION ( HID_PROPC_START + 220) +#define HID_PROP_XSD_REQUIRED ( HID_PROPC_START + 221) +#define HID_PROP_XSD_RELEVANT ( HID_PROPC_START + 222) +#define HID_PROP_XSD_READONLY ( HID_PROPC_START + 223) +#define HID_PROP_XSD_CONSTRAINT ( HID_PROPC_START + 224) +#define HID_PROP_XSD_CALCULATION ( HID_PROPC_START + 225) +#define HID_PROP_XSD_DATA_TYPE ( HID_PROPC_START + 226) +#define HID_PROP_XSD_WHITESPACES ( HID_PROPC_START + 227) +#define HID_PROP_XSD_PATTERN ( HID_PROPC_START + 228) +#define HID_PROP_XSD_LENGTH ( HID_PROPC_START + 229) +#define HID_PROP_XSD_MIN_LENGTH ( HID_PROPC_START + 230) +#define HID_PROP_XSD_MAX_LENGTH ( HID_PROPC_START + 231) +#define UID_PROP_DLG_BIND_EXPRESSION ( HID_PROPC_START + 232) +#define UID_PROP_DLG_XSD_REQUIRED ( HID_PROPC_START + 233) +#define UID_PROP_DLG_XSD_RELEVANT ( HID_PROPC_START + 234) +#define UID_PROP_DLG_XSD_READONLY ( HID_PROPC_START + 235) +#define UID_PROP_DLG_XSD_CONSTRAINT ( HID_PROPC_START + 236) +#define UID_PROP_DLG_XSD_CALCULATION ( HID_PROPC_START + 237) +#define UID_PROP_ADD_DATA_TYPE ( HID_PROPC_START + 238) +#define UID_PROP_REMOVE_DATA_TYPE ( HID_PROPC_START + 239) +#define HID_PROP_LIST_BINDING ( HID_PROPC_START + 240) +#define HID_PROP_BINDING_NAME ( HID_PROPC_START + 241) +#define HID_PROP_SELECTION_TYPE ( HID_PROPC_START + 242) +#define HID_PROP_ROOT_DISPLAYED ( HID_PROPC_START + 243) +#define HID_PROP_SHOWS_HANDLES ( HID_PROPC_START + 244) +#define HID_PROP_SHOWS_ROOT_HANDLES ( HID_PROPC_START + 245) +#define HID_PROP_EDITABLE ( HID_PROPC_START + 246) +#define HID_PROP_INVOKES_STOP_NOT_EDITING ( HID_PROPC_START + 247) +#define HID_PROP_ROW_HEIGHT ( HID_PROPC_START + 248) +#define HID_PROP_DECORATION ( HID_PROPC_START + 249) +#define HID_EVT_ACTIONPERFORMED ( HID_PROPC_START + 250) +#define HID_EVT_AFTERUPDATE ( HID_PROPC_START + 251) +#define HID_EVT_BEFOREUPDATE ( HID_PROPC_START + 252) +#define HID_EVT_CONFIRMDELETE ( HID_PROPC_START + 253) +#define HID_EVT_ERROROCCURED ( HID_PROPC_START + 254) +#define HID_EVT_FOCUSGAINED ( HID_PROPC_START + 255) +#define HID_EVT_FOCUSLOST ( HID_PROPC_START + 256) +#define HID_EVT_ITEMSTATECHANGED ( HID_PROPC_START + 257) +#define HID_EVT_KEYTYPED ( HID_PROPC_START + 258) +#define HID_EVT_LOADED ( HID_PROPC_START + 259) +#define HID_EVT_MOUSEDRAGGED ( HID_PROPC_START + 260) +#define HID_EVT_MOUSEENTERED ( HID_PROPC_START + 261) +#define HID_EVT_MOUSEEXITED ( HID_PROPC_START + 262) +#define HID_EVT_MOUSEMOVED ( HID_PROPC_START + 263) +#define HID_EVT_MOUSEPRESSED ( HID_PROPC_START + 264) +#define HID_EVT_MOUSERELEASED ( HID_PROPC_START + 265) +#define HID_EVT_POSITIONED ( HID_PROPC_START + 266) +#define HID_EVT_RESETTED ( HID_PROPC_START + 267) +#define HID_EVT_SUBMITTED ( HID_PROPC_START + 268) +#define HID_EVT_TEXTCHANGED ( HID_PROPC_START + 269) +#define HID_EVT_UNLOADED ( HID_PROPC_START + 270) +#define HID_EVT_CHANGED ( HID_PROPC_START + 271) +#define HID_EVT_APPROVEACTIONPERFORMED ( HID_PROPC_START + 272) +#define HID_EVT_APPROVERESETTED ( HID_PROPC_START + 273) +#define HID_EVT_KEYUP ( HID_PROPC_START + 274) +#define HID_EVT_APPROVEPARAMETER ( HID_PROPC_START + 275) +#define HID_EVT_POSITIONING ( HID_PROPC_START + 276) +#define HID_EVT_RELOADED ( HID_PROPC_START + 277) +#define HID_EVT_APPROVEROWCHANGE ( HID_PROPC_START + 278) +#define HID_EVT_ROWCHANGE ( HID_PROPC_START + 279) +#define HID_EVT_RELOADING ( HID_PROPC_START + 280) +#define HID_EVT_UNLOADING ( HID_PROPC_START + 281) +#define HID_EVT_ADJUSTMENTVALUECHANGED ( HID_PROPC_START + 282) +#define HID_PROP_TOGGLE ( HID_PROPC_START + 283) +#define HID_PROP_FOCUSONCLICK ( HID_PROPC_START + 284) +#define HID_PROP_HIDEINACTIVESELECTION ( HID_PROPC_START + 285) +#define HID_PROP_VISUALEFFECT ( HID_PROPC_START + 286) +#define HID_PROP_BORDERCOLOR ( HID_PROPC_START + 287) +#define UID_PROP_DLG_BORDERCOLOR ( HID_PROPC_START + 288) +#define HID_PROP_IMAGEPOSITION ( HID_PROPC_START + 289) +#define HID_PROP_NOLABEL ( HID_PROPC_START + 290) +#define HID_PROP_WRITING_MODE ( HID_PROPC_START + 291) +#define HID_PROP_ANCHOR_TYPE ( HID_PROPC_START + 292) +#define HID_FM_PROPDLG_TABCTR ( HID_PROPC_START + 293) +#define HID_FM_PROPDLG_TAB_GENERAL ( HID_PROPC_START + 294) +#define HID_FM_PROPDLG_TAB_DATA ( HID_PROPC_START + 295) +#define HID_FM_PROPDLG_TAB_EVT ( HID_PROPC_START + 296) + // please adjust HID_LAST_PROPC_ID if you add new ids here! + +#define HID_LAST_PROPC_ID HID_FM_PROPDLG_TAB_EVT + +#if HID_LAST_PROPC_ID > HID_PROPC_END + #error help id overflow (PROPC) +#endif + +#endif // EXTENSIONS_PROPCTRLR_HRC diff --git a/extensions/inc/update.hrc b/extensions/inc/update.hrc new file mode 100644 index 000000000000..806f99686bee --- /dev/null +++ b/extensions/inc/update.hrc @@ -0,0 +1,48 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2009 by Sun Microsystems, Inc. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ +
+#ifndef EXTENSIONS_UPDATE_HRC
+#define EXTENSIONS_UPDATE_HRC
+
+#include "extensio.hrc"
+
+#define HID_CHECK_FOR_UPD_DLG ( HID_UPDATE_START + 0) +#define HID_CHECK_FOR_UPD_CLOSE ( HID_UPDATE_START + 1) +#define HID_CHECK_FOR_UPD_PAUSE ( HID_UPDATE_START + 2) +#define HID_CHECK_FOR_UPD_RESUME ( HID_UPDATE_START + 3) +#define HID_CHECK_FOR_UPD_DOWNLOAD ( HID_UPDATE_START + 4) +#define HID_CHECK_FOR_UPD_DOWNLOAD2 ( HID_UPDATE_START + 5) +#define HID_CHECK_FOR_UPD_INSTALL ( HID_UPDATE_START + 6) +#define HID_CHECK_FOR_UPD_STATUS ( HID_UPDATE_START + 7) +#define HID_CHECK_FOR_UPD_DESCRIPTION ( HID_UPDATE_START + 8) +#define HID_CHECK_FOR_UPD_CANCEL ( HID_UPDATE_START + 9) + // !! if you add new IDs, please also adjust HID_UPDATE_LAST below !! +#define HID_UPDATE_LAST HID_CHECK_FOR_UPD_CANCEL + +#if HID_UPDATE_LAST > HID_UPDATE_END + #error help id range overflow (UPDATE) +#endif +
+#endif // EXTENSIONS_UPDATE_HRC
diff --git a/extensions/prj/d.lst b/extensions/prj/d.lst index 053796a2c365..ecfe0ef9abcd 100644 --- a/extensions/prj/d.lst +++ b/extensions/prj/d.lst @@ -20,6 +20,7 @@ mkdir: %_DEST%\bin%_EXT%\so ..\%__SRC%\bin\nsplugin %_DEST%\bin%_EXT%\nsplugin ..\%__SRC%\bin\npsoplugin.dll %_DEST%\bin%_EXT%\npsoplugin.dll ..\%__SRC%\bin\npsoplugin_so.dll %_DEST%\bin%_EXT%\so\npsoplugin.dll +..\%__SRC%\bin\x64\so_activex.dll %_DEST%\bin%_EXT%\so_activex_x64.dll ..\%__SRC%\bin\mdibundle.zip %_DEST%\bin%_EXT%\mdibundle.zip ..\source\bibliography\uiconfig\sbibliography\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sbibliography\menubar\*.xml diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc index 9ca5ccdea925..6b7a7d467d2b 100644 --- a/extensions/source/abpilot/abpresid.hrc +++ b/extensions/source/abpilot/abpresid.hrc @@ -31,9 +31,7 @@ #ifndef EXTENSIONS_ABPRESID_HRC #define EXTENSIONS_ABPRESID_HRC -#ifndef EXTENSIONS_INC_EXTENSIO_HRC -#include "extensio.hrc" -#endif +#include "abpilot.hrc" //======================================================================== // basics diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index c28d28481884..50e9fb0326ae 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -31,12 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "abspilot.hxx" -#ifndef EXTENSIONS_INC_EXTENSIO_HRC -#include "extensio.hrc" -#endif -#ifndef EXTENSIONS_ABPRESID_HRC +#include "abpilot.hrc" #include "abpresid.hrc" -#endif #include "componentmodule.hxx" #include <tools/debug.hxx> #include <svtools/localresaccess.hxx> diff --git a/extensions/source/activex/main/SOActiveX.cpp b/extensions/source/activex/main/SOActiveX.cpp index 9811cd3f7c19..52833ae17587 100644 --- a/extensions/source/activex/main/SOActiveX.cpp +++ b/extensions/source/activex/main/SOActiveX.cpp @@ -1025,6 +1025,7 @@ HRESULT CSOActiveX::OnDrawAdvanced( ATL_DRAWINFO& di ) hr = CreateFrameOldWay( mOffWin, di.prcBounds->right - di.prcBounds->left, di.prcBounds->bottom - di.prcBounds->top ); + if( !SUCCEEDED( hr ) ) { // if the frame can not be opened do not try any more @@ -1038,6 +1039,7 @@ HRESULT CSOActiveX::OnDrawAdvanced( ATL_DRAWINFO& di ) { hr = LoadURLToFrame(); mbLoad = FALSE; + if( !SUCCEEDED( hr ) ) { // if the document can not be opened do not try any more diff --git a/extensions/source/activex/main/SOComWindowPeer.h b/extensions/source/activex/main/SOComWindowPeer.h index 27c6f4037baa..55be8cafcbb0 100644 --- a/extensions/source/activex/main/SOComWindowPeer.h +++ b/extensions/source/activex/main/SOComWindowPeer.h @@ -55,7 +55,7 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SOCOMWINDOWPEER) /* [in] */ short /*s*/, /* [retval][out] */ long __RPC_FAR *ret) { - *ret = (long) m_hwnd; + *ret = HandleToLong( m_hwnd ); return S_OK; } diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk index 64dcbe34a2e1..6ecd7f909484 100644 --- a/extensions/source/activex/main/makefile.mk +++ b/extensions/source/activex/main/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -49,6 +49,10 @@ LIBTARGET=NO USE_DEFFILE=YES UWINAPILIB= +.IF "$(BUILD_X64)"!="" +USE_DEFFILE_X64=TRUE +.ENDIF + INCPRE+=$(foreach,i,$(ATL_INCLUDE) -I$(i)) \ -I$(MISC) \ @@ -58,9 +62,6 @@ INCPRE+=$(foreach,i,$(ATL_INCLUDE) -I$(i)) \ .IF "$(PRODUCT)"!="" RC+=-DPRODUCT .ENDIF -.IF "$(USE_STLP_DEBUG)"!="" -CDEFS+=-D_DEBUG -.ENDIF # "$(USE_STLP_DEBUG)"!="" RCFILES=\ $(TARGET).rc @@ -86,13 +87,9 @@ SHL1STDLIBS=\ .IF "$(COM)"!="GCC" .IF "$(CCNUMVER)" > "001300000000" -.IF "$(USE_STLP_DEBUG)" != "" - SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib -.ELSE SHL1STDLIBS+= $(ATL_LIB)$/atls.lib .ENDIF .ENDIF -.ENDIF # $(KERNEL32LIB) \ @@ -110,9 +107,51 @@ SHL1RES=$(RES)$/$(TARGET).res .ENDIF +.IF "$(BUILD_X64)"!="" +# -------------------- x64 ----------------------- + +CDEFS_X64+:=$(foreach,i,$(CDEFS) $(subst,-D_X86_=1, $i)) +LIBTARGET_X64=NO +USE_DEFFILE_X64=YES +UWINAPILIB_X64= + +SLOFILES_X64= \ + $(SLO_X64)$/so_activex.obj \ + $(SLO_X64)$/SOActiveX.obj \ + $(SLO_X64)$/SOComWindowPeer.obj \ + $(SLO_X64)$/SODispatchInterceptor.obj \ + $(SLO_X64)$/SOActionsApproval.obj \ + $(SLO_X64)$/StdAfx2.obj + +SHL1TARGET_X64=$(TARGET) + +SHL1STDLIBS_X64+=\ + $(UUIDLIB_X64) \ + $(ADVAPI32LIB_X64) \ + $(OLE32LIB_X64) \ + $(OLEAUT32LIB_X64) \ + $(GDI32LIB_X64) \ + $(URLMONLIB_X64) \ + $(SHLWAPILIB_X64) \ + $(KERNEL32LIB_X64) \ + $(USER32LIB_X64) \ + $(MSVCRT_X64) \ + $(MSVCPRT_X64) \ + $(OLDNAMESLIB_X64) + +SHL1OBJS_X64=$(SLOFILES_X64) +SHL1DEF_X64=$(TARGET).def + +SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atls.lib + +.ENDIF # "$(BUILD_X64)"!="" + # --- Targets ---------------------------------- +.INCLUDE : set_wntx64.mk +VERSIONOBJ_X64= .INCLUDE : target.mk +.INCLUDE : tg_wntx64.mk $(MISC)$/envsettings.h : makefile.mk -$(RM) $@ diff --git a/extensions/source/activex/main/so_activex.cpp b/extensions/source/activex/main/so_activex.cpp index 057406a0f1f2..7db1c67e1585 100644 --- a/extensions/source/activex/main/so_activex.cpp +++ b/extensions/source/activex/main/so_activex.cpp @@ -24,6 +24,30 @@ BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_SOActiveX, CSOActiveX) END_OBJECT_MAP() + +#define X64_LIB_NAME "so_activex_x64.dll" +#define X32_LIB_NAME "so_activex.dll" + +// 06.11.2009 tkr: to provide windows xp as build systems for mingw we need to define KEY_WOW64_64KEY +// in mingw 3.13 KEY_WOW64_64KEY isn't available < Win2003 systems. +// Also defined in setup_native\source\win32\customactions\reg64\reg64.cxx,source\win32\customactions\shellextensions\shellextensions.cxx and +// extensions\source\activex\main\so_activex.cpp +#ifndef KEY_WOW64_64KEY + #define KEY_WOW64_64KEY (0x0100) +#endif + +const REGSAM n64KeyAccess = KEY_ALL_ACCESS | KEY_WOW64_64KEY; +const REGSAM n32KeyAccess = KEY_ALL_ACCESS; + +#ifdef _AMD64_ +const BOOL bX64 = TRUE; +#else +const BOOL bX64 = FALSE; +#endif + +// 10.11.2009 tkr: MinGW doesn't know anything about RegDeleteKeyExA if WINVER < 0x0502. +WINADVAPI LONG WINAPI RegDeleteKeyExA(HKEY,LPCSTR,REGSAM,DWORD); + ///////////////////////////////////////////////////////////////////////////// // DLL Entry Point @@ -131,20 +155,21 @@ const char* aLocalPrefix = "Software\\Classes\\"; BOOL createKey( HKEY hkey, const char* aKeyToCreate, + REGSAM nKeyAccess, const char* aValue = NULL, const char* aChildName = NULL, const char* aChildValue = NULL ) { HKEY hkey1; - return ( ERROR_SUCCESS == RegCreateKey( hkey, aKeyToCreate, &hkey1 ) - && ( !aValue || ERROR_SUCCESS == RegSetValueEx( hkey1, + return ( ERROR_SUCCESS == RegCreateKeyExA( hkey, aKeyToCreate, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey1 , NULL ) + && ( !aValue || ERROR_SUCCESS == RegSetValueExA( hkey1, "", 0, REG_SZ, (const BYTE*)aValue, strlen( aValue ) ) ) - && ( !aChildName || ERROR_SUCCESS == RegSetValueEx( hkey1, + && ( !aChildName || ERROR_SUCCESS == RegSetValueExA( hkey1, aChildName, 0, REG_SZ, @@ -154,8 +179,8 @@ BOOL createKey( HKEY hkey, } -STDAPI DllUnregisterServerNative( int nMode, BOOL bForAllUsers ); -STDAPI DllRegisterServerNative( int nMode, BOOL bForAllUsers, const char* pActiveXPath ) +STDAPI DllUnregisterServerNative( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ); +STDAPI DllRegisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess, const char* pProgramPath, const char* pLibName ) { BOOL aResult = FALSE; @@ -164,89 +189,86 @@ STDAPI DllRegisterServerNative( int nMode, BOOL bForAllUsers, const char* pActiv HKEY hkey2 = NULL; HKEY hkey3 = NULL; HKEY hkey4 = NULL; - char aSubKey[513]; + char aSubKey[513]; int ind; const char* aPrefix = aLocalPrefix; // bForAllUsers ? "" : aLocalPrefix; - char pActiveXPath101[1024]; - char pPrCatalogPath[1019]; + char pActiveXPath[1124]; + char pActiveXPath101[1124]; // In case SO7 is installed for this user he can have local registry entries that will prevent him from // using SO8 ActiveX control. The fix is just to clean up the local entries related to ActiveX control. // Unfortunately it can be done only for the user who installs the office. if ( bForAllUsers ) - DllUnregisterServerNative( nMode, sal_False ); + DllUnregisterServerNative( nMode, sal_False, sal_False ); #ifdef MY_DEBUG - MessageBoxA(NULL, pActiveXPath, "Library Path, ( from library )", MB_OK | MB_ICONINFORMATION); + MessageBoxA(NULL, pProgramPath, "Library Path, ( from library )", MB_OK | MB_ICONINFORMATION); #endif - if ( pActiveXPath ) + if ( pProgramPath && strlen( pProgramPath ) < 1024 ) { - sprintf( pActiveXPath101, "%s, 101", pActiveXPath ); - - int nPrCatLength = strlen( pActiveXPath ) - sizeof( "so_activex.dll" ) + 1; - strncpy( pPrCatalogPath, pActiveXPath, nPrCatLength ); - pPrCatalogPath[ nPrCatLength ] = 0; + sprintf( pActiveXPath, "%s\\%s", pProgramPath, pLibName ); + sprintf( pActiveXPath101, "%s\\%s, 101", pProgramPath, pLibName ); { - wsprintf( aSubKey, "%sCLSID\\%s", aPrefix, aClassID ); + wsprintfA( aSubKey, "%sCLSID\\%s", aPrefix, aClassID ); aResult = - ( ERROR_SUCCESS == RegCreateKey( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, &hkey ) - && ERROR_SUCCESS == RegSetValueEx( hkey, "", 0, REG_SZ, (const BYTE*)"SOActiveX Class", 17 ) - && createKey( hkey, "Control" ) - && createKey( hkey, "EnableFullPage" ) - && createKey( hkey, "InprocServer32", pActiveXPath, "ThreadingModel", "Apartment" ) - && createKey( hkey, "MiscStatus", "0" ) - && createKey( hkey, "MiscStatus\\1", "131473" ) - && createKey( hkey, "ProgID", "so_activex.SOActiveX.1" ) - && createKey( hkey, "Programmable" ) - && createKey( hkey, "ToolboxBitmap32", pActiveXPath101 ) - && createKey( hkey, "TypeLib", aTypeLib ) - && createKey( hkey, "Version", "1.0" ) - && createKey( hkey, "VersionIndependentProgID", "so_activex.SOActiveX" ) + ( ERROR_SUCCESS == RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey , NULL ) + && ERROR_SUCCESS == RegSetValueExA( hkey, "", 0, REG_SZ, (const BYTE*)"SOActiveX Class", 17 ) + && createKey( hkey, "Control", nKeyAccess ) + && createKey( hkey, "EnableFullPage", nKeyAccess ) + && createKey( hkey, "InprocServer32", nKeyAccess, pActiveXPath, "ThreadingModel", "Apartment" ) + && createKey( hkey, "MiscStatus", nKeyAccess, "0" ) + && createKey( hkey, "MiscStatus\\1", nKeyAccess, "131473" ) + && createKey( hkey, "ProgID", nKeyAccess, "so_activex.SOActiveX.1" ) + && createKey( hkey, "Programmable", nKeyAccess ) + && createKey( hkey, "ToolboxBitmap32", nKeyAccess, pActiveXPath101 ) + && createKey( hkey, "TypeLib", nKeyAccess, aTypeLib ) + && createKey( hkey, "Version", nKeyAccess, "1.0" ) + && createKey( hkey, "VersionIndependentProgID", nKeyAccess, "so_activex.SOActiveX" ) && ERROR_SUCCESS == RegCloseKey( hkey ) - && ERROR_SUCCESS == RegCreateKey( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aPrefix, &hkey ) - && createKey( hkey, "so_activex.SOActiveX", "SOActiveX Class" ) - && ERROR_SUCCESS == RegCreateKey( hkey, "so_activex.SOActiveX", &hkey1 ) - && createKey( hkey1, "CLSID", aClassID ) - && createKey( hkey1, "CurVer", "so_activex.SOActiveX.1" ) + && ERROR_SUCCESS == RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aPrefix, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey , NULL ) + && createKey( hkey, "so_activex.SOActiveX", nKeyAccess, "SOActiveX Class" ) + && ERROR_SUCCESS == RegCreateKeyExA( hkey, "so_activex.SOActiveX", 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey1 , NULL ) + && createKey( hkey1, "CLSID", nKeyAccess, aClassID ) + && createKey( hkey1, "CurVer", nKeyAccess, "so_activex.SOActiveX.1" ) && ERROR_SUCCESS == RegCloseKey( hkey1 ) - && createKey( hkey, "so_activex.SOActiveX.1", "SOActiveX Class" ) - && ERROR_SUCCESS == RegCreateKey( hkey, "so_activex.SOActiveX.1", &hkey1 ) - && createKey( hkey1, "CLSID", aClassID ) + && createKey( hkey, "so_activex.SOActiveX.1", nKeyAccess, "SOActiveX Class" ) + && ERROR_SUCCESS == RegCreateKeyExA( hkey, "so_activex.SOActiveX.1", 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey1 , NULL ) + && createKey( hkey1, "CLSID", nKeyAccess, aClassID ) && ERROR_SUCCESS == RegCloseKey( hkey1 ) - && ERROR_SUCCESS == RegCreateKey( hkey, "TypeLib", &hkey1 ) - && ERROR_SUCCESS == RegCreateKey( hkey1, aTypeLib, &hkey2 ) - && createKey( hkey2, "1.0", "wrap_activex 1.0 Type Library" ) - && ERROR_SUCCESS == RegCreateKey( hkey2, "1.0", &hkey3 ) - && ERROR_SUCCESS == RegCreateKey( hkey3, "0", &hkey4 ) - && createKey( hkey4, "win32", pActiveXPath ) + && ERROR_SUCCESS == RegCreateKeyExA( hkey, "TypeLib", 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey1 , NULL ) + && ERROR_SUCCESS == RegCreateKeyExA( hkey1, aTypeLib, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey2 , NULL ) + && createKey( hkey2, "1.0", nKeyAccess, "wrap_activex 1.0 Type Library" ) + && ERROR_SUCCESS == RegCreateKeyExA( hkey2, "1.0", 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey3 , NULL ) + && ERROR_SUCCESS == RegCreateKeyExA( hkey3, "0", 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey4 , NULL ) + && createKey( hkey4, "win32", nKeyAccess, pActiveXPath ) && ERROR_SUCCESS == RegCloseKey( hkey4 ) - && createKey( hkey3, "FLAGS", "0" ) - && createKey( hkey3, "HELPDIR", pPrCatalogPath ) + && createKey( hkey3, "FLAGS", nKeyAccess, "0" ) + && createKey( hkey3, "HELPDIR", nKeyAccess, pProgramPath ) && ERROR_SUCCESS == RegCloseKey( hkey3 ) && ERROR_SUCCESS == RegCloseKey( hkey2 ) && ERROR_SUCCESS == RegCloseKey( hkey1 ) - && ERROR_SUCCESS == RegCreateKey( hkey, "Interface", &hkey1 ) - && createKey( hkey1, aInterIDWinPeer, "ISOComWindowPeer" ) - && ERROR_SUCCESS == RegCreateKey( hkey1, aInterIDWinPeer, &hkey2 ) - && createKey( hkey2, "ProxyStubClsid", aProxyStubWinPeer ) - && createKey( hkey2, "ProxyStubClsid32", aProxyStubWinPeer ) - && createKey( hkey2, "TypeLib", aTypeLib, "Version", "1.0" ) + && ERROR_SUCCESS == RegCreateKeyExA( hkey, "Interface", 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey1 , NULL ) + && createKey( hkey1, aInterIDWinPeer, nKeyAccess, "ISOComWindowPeer" ) + && ERROR_SUCCESS == RegCreateKeyExA( hkey1, aInterIDWinPeer, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey2 , NULL ) + && createKey( hkey2, "ProxyStubClsid", nKeyAccess, aProxyStubWinPeer ) + && createKey( hkey2, "ProxyStubClsid32", nKeyAccess, aProxyStubWinPeer ) + && createKey( hkey2, "TypeLib", nKeyAccess, aTypeLib, "Version", "1.0" ) && ERROR_SUCCESS == RegCloseKey( hkey2 ) - && createKey( hkey1, aInterIDActApprove, "ISOActionsApproval" ) - && ERROR_SUCCESS == RegCreateKey( hkey1, aInterIDActApprove, &hkey2 ) - && createKey( hkey2, "ProxyStubClsid", aProxyStubActApprove ) - && createKey( hkey2, "ProxyStubClsid32", aProxyStubActApprove ) - && createKey( hkey2, "TypeLib", aTypeLib, "Version", "1.0" ) + && createKey( hkey1, aInterIDActApprove, nKeyAccess, "ISOActionsApproval" ) + && ERROR_SUCCESS == RegCreateKeyExA( hkey1, aInterIDActApprove, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey2 , NULL ) + && createKey( hkey2, "ProxyStubClsid", nKeyAccess, aProxyStubActApprove ) + && createKey( hkey2, "ProxyStubClsid32", nKeyAccess, aProxyStubActApprove ) + && createKey( hkey2, "TypeLib", nKeyAccess, aTypeLib, "Version", "1.0" ) && ERROR_SUCCESS == RegCloseKey( hkey2 ) - && createKey( hkey1, aInterIDDispInt, "ISODispatchInterceptor" ) - && ERROR_SUCCESS == RegCreateKey( hkey1, aInterIDDispInt, &hkey2 ) - && createKey( hkey2, "ProxyStubClsid", aProxyStubDispInt ) - && createKey( hkey2, "ProxyStubClsid32", aProxyStubDispInt ) - && createKey( hkey2, "TypeLib", aTypeLib, "Version", "1.0" ) + && createKey( hkey1, aInterIDDispInt, nKeyAccess, "ISODispatchInterceptor" ) + && ERROR_SUCCESS == RegCreateKeyExA( hkey1, aInterIDDispInt, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey2 , NULL ) + && createKey( hkey2, "ProxyStubClsid", nKeyAccess, aProxyStubDispInt ) + && createKey( hkey2, "ProxyStubClsid32", nKeyAccess, aProxyStubDispInt ) + && createKey( hkey2, "TypeLib", nKeyAccess, aTypeLib, "Version", "1.0" ) && ERROR_SUCCESS == RegCloseKey( hkey2 ) && ERROR_SUCCESS == RegCloseKey( hkey1 ) && ERROR_SUCCESS == RegCloseKey( hkey ) ); @@ -259,11 +281,11 @@ STDAPI DllRegisterServerNative( int nMode, BOOL bForAllUsers, const char* pActiv { if( nForModes[ind] & nMode ) { - wsprintf( aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMimeType[ind] ); - if ( ERROR_SUCCESS != RegCreateKey(bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, &hkey) -// || ERROR_SUCCESS != RegSetValueEx(hkey, "Extension", 0, REG_SZ, -// (const BYTE *)aFileExt[ind], strlen( aFileExt[ind] ) ) - || ERROR_SUCCESS != RegSetValueEx(hkey, "CLSID", 0, REG_SZ, + wsprintfA( aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMimeType[ind] ); + if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) +// || ERROR_SUCCESS != RegSetValueExA(hkey, "Extension", 0, REG_SZ, +// (const BYTE *)aFileExt[ind], strlen( aFileExt[ind] ) ) + || ERROR_SUCCESS != RegSetValueExA(hkey, "CLSID", 0, REG_SZ, (const BYTE *)aClassID, strlen(aClassID)) ) aResult = FALSE; @@ -271,9 +293,9 @@ STDAPI DllRegisterServerNative( int nMode, BOOL bForAllUsers, const char* pActiv RegCloseKey(hkey),hkey= NULL; /* - wsprintf( aSubKey, "%s%s", aPrefix, aFileExt[ind] ); - if ( ERROR_SUCCESS != RegCreateKey(bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, &hkey) - || ERROR_SUCCESS != RegSetValueEx(hkey, "Content Type", 0, REG_SZ, + wsprintfA( aSubKey, "%s%s", aPrefix, aFileExt[ind] ); + if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) + || ERROR_SUCCESS != RegSetValueExA(hkey, "Content Type", 0, REG_SZ, (const BYTE *)aMimeType[ind], strlen( aMimeType[ind] ) ) ) aResult = FALSE; if( hkey ) @@ -282,13 +304,13 @@ STDAPI DllRegisterServerNative( int nMode, BOOL bForAllUsers, const char* pActiv } } - wsprintf( aSubKey, "%sCLSID\\%s", aPrefix, aClassID ); - if ( aResult && ERROR_SUCCESS == RegOpenKey(bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, &hkey) ) + wsprintfA( aSubKey, "%sCLSID\\%s", aPrefix, aClassID ); + if ( aResult && ERROR_SUCCESS == RegOpenKeyExA(bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, nKeyAccess, &hkey) ) { for( ind = 0; ind < SUPPORTED_EXT_NUM; ind++ ) { - wsprintf( aSubKey, "EnableFullPage\\%s", aFileExt[ind] ); - if ( ERROR_SUCCESS != RegCreateKey( hkey, aSubKey, &hkey1 ) ) + wsprintfA( aSubKey, "EnableFullPage\\%s", aFileExt[ind] ); + if ( ERROR_SUCCESS != RegCreateKeyExA( hkey, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey1 , NULL ) ) aResult = FALSE; if ( hkey1 ) @@ -304,30 +326,62 @@ STDAPI DllRegisterServerNative( int nMode, BOOL bForAllUsers, const char* pActiv return aResult; } +STDAPI DllRegisterServerNative( int nMode, BOOL bForAllUsers, BOOL bFor64Bit, const char* pProgramPath ) +{ + HRESULT hr = S_OK; + if ( bFor64Bit ) + hr = DllRegisterServerNative_Impl( nMode, bForAllUsers, n64KeyAccess, pProgramPath, X64_LIB_NAME ); + + if ( SUCCEEDED( hr ) ) + hr = DllRegisterServerNative_Impl( nMode, bForAllUsers, n32KeyAccess, pProgramPath, X32_LIB_NAME ); + + return hr; +} + + ///////////////////////////////////////////////////////////////////////////// // DllUnregisterServer - Removes entries from the system registry +HRESULT DeleteKeyTree( HKEY hkey, const char* pPath, REGSAM nKeyAccess ) +{ + HKEY hkey1 = NULL; + + char pSubKeyName[256]; + // first delete the subkeys + while( ERROR_SUCCESS == RegOpenKeyExA( hkey, pPath, 0, nKeyAccess, &hkey1) + && ERROR_SUCCESS == RegEnumKeyA( hkey1, 0, pSubKeyName, 256 ) + && ERROR_SUCCESS == DeleteKeyTree( hkey1, pSubKeyName, nKeyAccess ) ) + { + RegCloseKey( hkey1 ),hkey1= NULL; + } -STDAPI DllUnregisterServerNative( int nMode, BOOL bForAllUsers ) + if ( hkey1 ) + RegCloseKey( hkey1 ),hkey1= NULL; + + // delete the key itself + return RegDeleteKeyExA( hkey, pPath, nKeyAccess & ( KEY_WOW64_64KEY | KEY_WOW64_32KEY ), 0 ); +} + +STDAPI DllUnregisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess ) { HKEY hkey = NULL; BOOL fErr = FALSE; - char aSubKey[513]; - const char* aPrefix = aLocalPrefix; // bForAllUsers ? "" : aLocalPrefix; + char aSubKey[513]; + const char* aPrefix = aLocalPrefix; // bForAllUsers ? "" : aLocalPrefix; - for( int ind = 0; ind < SUPPORTED_EXT_NUM; ind++ ) + for( int ind = 0; ind < SUPPORTED_EXT_NUM; ind++ ) { if( nForModes[ind] & nMode ) { DWORD nSubKeys = 0, nValues = 0; - wsprintf( aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMimeType[ind] ); - if ( ERROR_SUCCESS != RegCreateKey(bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, &hkey) ) + wsprintfA( aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMimeType[ind] ); + if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) ) fErr = TRUE; else { - if ( ERROR_SUCCESS != RegDeleteValue( hkey, "CLSID" ) ) + if ( ERROR_SUCCESS != RegDeleteValue( hkey, "CLSID" ) ) fErr = TRUE; - if ( ERROR_SUCCESS != RegQueryInfoKey( hkey, NULL, NULL, NULL, + if ( ERROR_SUCCESS != RegQueryInfoKey( hkey, NULL, NULL, NULL, &nSubKeys, NULL, NULL, &nValues, NULL, NULL, NULL, NULL ) ) { @@ -338,12 +392,12 @@ STDAPI DllUnregisterServerNative( int nMode, BOOL bForAllUsers ) { RegCloseKey( hkey ), hkey = NULL; if ( !nSubKeys && !nValues ) - SHDeleteKey( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey ); + DeleteKeyTree( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, nKeyAccess ); } } - wsprintf( aSubKey, "%s%s", aPrefix, aFileExt[ind] ); - if ( ERROR_SUCCESS != RegCreateKey(bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, &hkey) ) + wsprintfA( aSubKey, "%s%s", aPrefix, aFileExt[ind] ); + if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) ) fErr = TRUE; else { @@ -358,43 +412,53 @@ STDAPI DllUnregisterServerNative( int nMode, BOOL bForAllUsers ) { RegCloseKey( hkey ), hkey = NULL; if ( !nSubKeys && !nValues ) - SHDeleteKey( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey ); + DeleteKeyTree( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, nKeyAccess ); } } } } - wsprintf( aSubKey, "%sCLSID\\%s", aPrefix, aClassID ); - if( ERROR_SUCCESS != SHDeleteKey( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey ) ) + wsprintfA( aSubKey, "%sCLSID\\%s", aPrefix, aClassID ); + if( ERROR_SUCCESS != DeleteKeyTree( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, nKeyAccess ) ) fErr = TRUE; - wsprintf( aSubKey, "%sso_activex.SOActiveX", aPrefix ); - if( ERROR_SUCCESS != SHDeleteKey( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey ) ) + wsprintfA( aSubKey, "%sso_activex.SOActiveX", aPrefix ); + if( ERROR_SUCCESS != DeleteKeyTree( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, nKeyAccess ) ) fErr = TRUE; - wsprintf( aSubKey, "%sso_activex.SOActiveX.1", aPrefix ); - if( ERROR_SUCCESS != SHDeleteKey( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey ) ) + wsprintfA( aSubKey, "%sso_activex.SOActiveX.1", aPrefix ); + if( ERROR_SUCCESS != DeleteKeyTree( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, nKeyAccess ) ) fErr = TRUE; - wsprintf( aSubKey, "%s\\TypeLib\\%s", aPrefix, aTypeLib ); - if( ERROR_SUCCESS != SHDeleteKey( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey ) ) + wsprintfA( aSubKey, "%s\\TypeLib\\%s", aPrefix, aTypeLib ); + if( ERROR_SUCCESS != DeleteKeyTree( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, nKeyAccess ) ) fErr = TRUE; - wsprintf( aSubKey, "%s\\Interface\\%s", aPrefix, aInterIDWinPeer ); - if( ERROR_SUCCESS != SHDeleteKey( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey ) ) + wsprintfA( aSubKey, "%s\\Interface\\%s", aPrefix, aInterIDWinPeer ); + if( ERROR_SUCCESS != DeleteKeyTree( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, nKeyAccess ) ) fErr = TRUE; - wsprintf( aSubKey, "%s\\Interface\\%s", aPrefix, aInterIDDispInt ); - if( ERROR_SUCCESS != SHDeleteKey( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey ) ) + wsprintfA( aSubKey, "%s\\Interface\\%s", aPrefix, aInterIDDispInt ); + if( ERROR_SUCCESS != DeleteKeyTree( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, nKeyAccess ) ) fErr = TRUE; - wsprintf( aSubKey, "%s\\Interface\\%s", aPrefix, aInterIDActApprove ); - if( ERROR_SUCCESS != SHDeleteKey( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey ) ) + wsprintfA( aSubKey, "%s\\Interface\\%s", aPrefix, aInterIDActApprove ); + if( ERROR_SUCCESS != DeleteKeyTree( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, nKeyAccess ) ) fErr = TRUE; return !fErr; } +STDAPI DllUnregisterServerNative( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ) +{ + HRESULT hr = DllUnregisterServerNative_Impl( nMode, bForAllUsers, n32KeyAccess ); + if ( SUCCEEDED( hr ) && bFor64Bit ) + hr = DllUnregisterServerNative_Impl( nMode, bForAllUsers, n64KeyAccess ); + + return hr; +} + + ///////////////////////////////////////////////////////////////////////////// // DllRegisterServerDoc - Adds entries to the system registry @@ -409,41 +473,41 @@ const char* aMSMimeType[] = { "application/msword", "application/mspowerpoint" }; const int nForMSModes[] = { 1, 1, 2, 2, 4, 4, 4 }; -STDAPI DllUnregisterServerDoc( int nMode, BOOL bForAllUsers ); -STDAPI DllRegisterServerDoc( int nMode, BOOL bForAllUsers ) +STDAPI DllUnregisterServerDoc( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ); +STDAPI DllRegisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess ) { BOOL aResult = TRUE; HKEY hkey = NULL; HKEY hkey1 = NULL; - char aSubKey[513]; + char aSubKey[513]; int ind; - const char* aPrefix = aLocalPrefix; // bForAllUsers ? "" : aLocalPrefix; + const char* aPrefix = aLocalPrefix; // bForAllUsers ? "" : aLocalPrefix; // In case SO7 is installed for this user he can have local registry entries that will prevent him from // using SO8 ActiveX control. The fix is just to clean up the local entries related to ActiveX control. // Unfortunately it can be done only for the user who installs the office. if ( bForAllUsers ) - DllUnregisterServerDoc( nMode, sal_False ); + DllUnregisterServerDoc( nMode, sal_False, sal_False ); for( ind = 0; ind < SUPPORTED_MSEXT_NUM && aResult; ind++ ) { if( nForMSModes[ind] & nMode ) { - wsprintf( aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMSMimeType[ind] ); - if ( ERROR_SUCCESS != RegCreateKey(bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, &hkey) - || ERROR_SUCCESS != RegSetValueEx(hkey, "Extension", 0, REG_SZ, + wsprintfA( aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMSMimeType[ind] ); + if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) + || ERROR_SUCCESS != RegSetValueExA(hkey, "Extension", 0, REG_SZ, (const BYTE *)aMSFileExt[ind], strlen( aMSFileExt[ind] ) ) - || ERROR_SUCCESS != RegSetValueEx(hkey, "CLSID", 0, REG_SZ, + || ERROR_SUCCESS != RegSetValueExA(hkey, "CLSID", 0, REG_SZ, (const BYTE *)aClassID, strlen(aClassID)) ) aResult = FALSE; if( hkey ) RegCloseKey(hkey),hkey= NULL; - wsprintf( aSubKey, "%s%s", aPrefix, aMSFileExt[ind] ); - if ( ERROR_SUCCESS != RegCreateKey(bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, &hkey) - || ERROR_SUCCESS != RegSetValueEx(hkey, "Content Type", 0, REG_SZ, + wsprintfA( aSubKey, "%s%s", aPrefix, aMSFileExt[ind] ); + if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) + || ERROR_SUCCESS != RegSetValueExA(hkey, "Content Type", 0, REG_SZ, (const BYTE *)aMSMimeType[ind], strlen( aMSMimeType[ind] ) ) ) aResult = FALSE; @@ -452,16 +516,16 @@ STDAPI DllRegisterServerDoc( int nMode, BOOL bForAllUsers ) } } - wsprintf( aSubKey, "%sCLSID\\%s", aPrefix, aClassID ); - if ( aResult && ERROR_SUCCESS == RegCreateKey( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, &hkey ) - && createKey( hkey, "EnableFullPage" ) ) + wsprintfA( aSubKey, "%sCLSID\\%s", aPrefix, aClassID ); + if ( aResult && ERROR_SUCCESS == RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey , NULL ) + && createKey( hkey, "EnableFullPage", nKeyAccess ) ) { for( ind = 0; ind < SUPPORTED_MSEXT_NUM; ind++ ) { if( nForMSModes[ind] & nMode ) { - wsprintf( aSubKey, "EnableFullPage\\%s", aMSFileExt[ind] ); - if ( ERROR_SUCCESS != RegCreateKey( hkey, aSubKey, &hkey1 ) ) + wsprintfA( aSubKey, "EnableFullPage\\%s", aMSFileExt[ind] ); + if ( ERROR_SUCCESS != RegCreateKeyExA( hkey, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey1 , NULL ) ) aResult = FALSE; if ( hkey1 ) @@ -478,17 +542,28 @@ STDAPI DllRegisterServerDoc( int nMode, BOOL bForAllUsers ) return aResult; } +STDAPI DllRegisterServerDoc( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ) +{ + HRESULT hr = S_OK; + if ( bFor64Bit ) + hr = DllRegisterServerDoc_Impl( nMode, bForAllUsers, n64KeyAccess ); + + if ( SUCCEEDED( hr ) ) + hr = DllRegisterServerDoc_Impl( nMode, bForAllUsers, n32KeyAccess ); + + return hr; +} ///////////////////////////////////////////////////////////////////////////// // DllUnregisterServerDoc - Removes entries from the system registry -STDAPI DllUnregisterServerDoc( int nMode, BOOL bForAllUsers ) +STDAPI DllUnregisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess ) { HKEY hkey = NULL; BOOL fErr = FALSE; - char aSubKey[513]; - const char* aPrefix = aLocalPrefix; // bForAllUsers ? "" : aLocalPrefix; + char aSubKey[513]; + const char* aPrefix = aLocalPrefix; // bForAllUsers ? "" : aLocalPrefix; for( int ind = 0; ind < SUPPORTED_MSEXT_NUM; ind++ ) { @@ -496,8 +571,8 @@ STDAPI DllUnregisterServerDoc( int nMode, BOOL bForAllUsers ) { DWORD nSubKeys = 0, nValues = 0; - wsprintf( aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMSMimeType[ind] ); - if ( ERROR_SUCCESS != RegCreateKey(bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, &hkey) ) + wsprintfA( aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMSMimeType[ind] ); + if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) ) fErr = TRUE; else { @@ -518,12 +593,12 @@ STDAPI DllUnregisterServerDoc( int nMode, BOOL bForAllUsers ) { RegCloseKey( hkey ), hkey = NULL; if ( !nSubKeys && !nValues ) - SHDeleteKey( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey ); + DeleteKeyTree( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, nKeyAccess ); } } - wsprintf( aSubKey, "%s%s", aPrefix, aMSFileExt[ind] ); - if ( ERROR_SUCCESS != RegCreateKey(bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, &hkey) ) + wsprintfA( aSubKey, "%s%s", aPrefix, aMSFileExt[ind] ); + if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) ) fErr = TRUE; else { @@ -541,7 +616,7 @@ STDAPI DllUnregisterServerDoc( int nMode, BOOL bForAllUsers ) { RegCloseKey( hkey ), hkey = NULL; if ( !nSubKeys && !nValues ) - SHDeleteKey( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey ); + DeleteKeyTree( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, nKeyAccess ); } } } @@ -550,33 +625,59 @@ STDAPI DllUnregisterServerDoc( int nMode, BOOL bForAllUsers ) return !fErr; } +STDAPI DllUnregisterServerDoc( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ) +{ + HRESULT hr = S_OK; + if ( bFor64Bit ) + hr = DllUnregisterServerDoc_Impl( nMode, bForAllUsers, n64KeyAccess ); + + if ( SUCCEEDED( hr ) ) + hr = DllUnregisterServerDoc_Impl( nMode, bForAllUsers, n32KeyAccess ); + + return hr; +} + +///////////////////////////////////////////////////////////////////////////// +// DllRegisterServer - regsvr32 entry point + STDAPI DllRegisterServer( void ) { - char pActiveXPath[1019]; + char pProgramPath[1024]; HRESULT aResult = E_FAIL; - HMODULE aCurModule = GetModuleHandleA( "so_activex.dll" ); - if( aCurModule && GetModuleFileNameA( aCurModule, pActiveXPath, 1019 ) ) + HMODULE aCurModule = GetModuleHandleA( bX64 ? X64_LIB_NAME : X32_LIB_NAME ); + DWORD nLen = 0; + DWORD nLibNameLen = strlen( bX64 ? X64_LIB_NAME : X32_LIB_NAME ); + + if( aCurModule ) { - aResult = DllRegisterServerNative( 31, TRUE, pActiveXPath ); - if( SUCCEEDED( aResult ) ) - aResult = DllRegisterServerDoc( 31, TRUE ); - else + nLen = GetModuleFileNameA( aCurModule, pProgramPath, 1024 ); + if ( nLen && nLen > nLibNameLen + 1 ) { - aResult = DllRegisterServerNative( 31, FALSE, pActiveXPath ); + pProgramPath[ nLen - nLibNameLen - 1 ] = 0; + aResult = DllRegisterServerNative( 31, TRUE, bX64, pProgramPath ); if( SUCCEEDED( aResult ) ) - aResult = DllRegisterServerDoc( 31, FALSE ); + aResult = DllRegisterServerDoc( 31, TRUE, bX64 ); + else + { + aResult = DllRegisterServerNative( 31, FALSE, bX64, pProgramPath ); + if( SUCCEEDED( aResult ) ) + aResult = DllRegisterServerDoc( 31, FALSE, bX64 ); + } } } return aResult; } +///////////////////////////////////////////////////////////////////////////// +// DllUnregisterServer - regsvr32 entry point + STDAPI DllUnregisterServer( void ) { - DllUnregisterServerDoc( 63, FALSE ); - DllUnregisterServerNative( 63, FALSE ); - DllUnregisterServerDoc( 63, TRUE ); - return DllUnregisterServerNative( 63, TRUE ); + DllUnregisterServerDoc( 63, FALSE, bX64 ); + DllUnregisterServerNative( 63, FALSE, bX64 ); + DllUnregisterServerDoc( 63, TRUE, bX64 ); + return DllUnregisterServerNative( 63, TRUE, bX64 ); } diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc index fad6da48c020..c30bd0846875 100644 --- a/extensions/source/bibliography/bib.hrc +++ b/extensions/source/bibliography/bib.hrc @@ -30,7 +30,7 @@ #ifndef BIB_HRC #define BIB_HRC -#include <extensio.hrc> +#include "bibliography.hrc" #ifndef RID_BIB_START #define RID_BIB_START RID_EXTENSIONS_START diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index 77d9858f028d..464a45ca3e76 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -32,17 +32,13 @@ #include "precompiled_extensions.hxx" #include <osl/mutex.hxx> #include <tools/urlobj.hxx> -#ifndef _TOOLKIT_UNOHLP_HXX #include <toolkit/helper/vclunohelper.hxx> -#endif #include <comphelper/processfactory.hxx> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#ifndef EXTENSIONS_INC_EXTENSIO_HRC -#include "extensio.hrc" -#endif +#include "bibliography.hrc" #include <vcl/lstbox.hxx> #include <vcl/edit.hxx> #include <tools/debug.hxx> diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 3d9667b94f06..a554741c666a 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -370,7 +370,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl: BibBookContainer *pMyWindow = new BibBookContainer( pParent, m_pDatMan ); pMyWindow->Show(); - ::bib::BibView* pView = new ::bib::BibView( pMyWindow, m_pDatMan, WB_SECTION_STYLE | WB_3DLOOK ); + ::bib::BibView* pView = new ::bib::BibView( pMyWindow, m_pDatMan, WB_VSCROLL | WB_HSCROLL | WB_3DLOOK ); pView->Show(); m_pDatMan->SetView( pView ); diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx index 57b713e0f24d..feb8eceb0e35 100644 --- a/extensions/source/bibliography/bibview.hxx +++ b/extensions/source/bibliography/bibview.hxx @@ -32,8 +32,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/XControlContainer.hpp> -#include <svtools/section.hxx> -#include <svtools/sectctr.hxx> #include "formcontrolcontainer.hxx" #include "bibshortcuthandler.hxx" diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 5a901447865f..1d322a9b383f 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -80,20 +80,14 @@ #include "bibview.hxx" // #100312# --------- #include "bibbeam.hxx" -#ifndef _BIB_FMPROP_HRC #include "bibprop.hrc" -#endif #include "toolbar.hxx" #include "toolbar.hrc" #include "bibconfig.hxx" #include "bibbeam.hxx" -#ifndef BIB_HRC #include "bib.hrc" -#endif #include "datman.hrc" -#ifndef EXTENSIONS_INC_EXTENSIO_HRC -#include "extensio.hrc" -#endif +#include "bibliography.hrc" #include <connectivity/dbtools.hxx> using namespace ::com::sun::star; diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 6f9826153fc8..5dc410db4c59 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -42,18 +42,12 @@ #include "framectr.hxx" #include "datman.hxx" #include "bibresid.hxx" -#ifndef BIB_HRC #include "bib.hrc" -#endif -#ifndef _TOOLKIT_UNOHLP_HXX #include <toolkit/helper/vclunohelper.hxx> -#endif #include "bibconfig.hxx" #include <cppuhelper/implbase1.hxx> // helper for implementations #include <vcl/svapp.hxx> -#ifndef EXTENSIONS_INC_EXTENSIO_HRC -#include <extensio.hrc> -#endif +#include "bibliography.hrc" #include <comphelper/processfactory.hxx> #include <com/sun/star/form/XConfirmDeleteListener.hpp> #include <com/sun/star/form/XFormController.hpp> diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 293c3af7b186..62efe9127641 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -40,28 +40,18 @@ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/form/ListSourceType.hpp> #include <com/sun/star/awt/XWindow.hpp> -#ifndef _TOOLKIT_UNOHLP_HXX #include <toolkit/helper/vclunohelper.hxx> -#endif #include <cppuhelper/implbase1.hxx> // helper for implementations #include "general.hxx" #include "sections.hrc" #include "bibresid.hxx" #include "datman.hxx" #include "bibconfig.hxx" -#ifndef _BIB_FMPROP_HRC #include "bibprop.hrc" -#endif -#ifndef BIB_HRC #include "bib.hrc" -#endif #include "bibmod.hxx" -#ifndef BIBTOOLS_HXX #include "bibtools.hxx" -#endif -#ifndef EXTENSIONS_INC_EXTENSIO_HRC -#include "extensio.hrc" -#endif +#include "bibliography.hrc" #include <tools/debug.hxx> #include <vcl/mnemonic.hxx> #include <vcl/svapp.hxx> @@ -69,9 +59,7 @@ #include <vcl/mnemonic.hxx> #include <algorithm> #include <functional> -#ifndef _VECTOR_ #include <vector> -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/extensions/source/bibliography/hidother.src b/extensions/source/bibliography/hidother.src index b0dbac415a31..82111c538094 100644 --- a/extensions/source/bibliography/hidother.src +++ b/extensions/source/bibliography/hidother.src @@ -27,8 +27,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "..\..\inc\extensio.hrc" // HID_FUNC_XXX -//#include "hidother.hrc" + +#include "bibliography.hrc" hidspecial HID_BIB_IDENTIFIER_POS { HelpID = HID_BIB_IDENTIFIER_POS ; }; hidspecial HID_BIB_AUTHORITYTYPE_POS { HelpID = HID_BIB_AUTHORITYTYPE_POS ; }; diff --git a/extensions/source/bibliography/menu.src b/extensions/source/bibliography/menu.src index d06cce2e4361..468fbf5837db 100644 --- a/extensions/source/bibliography/menu.src +++ b/extensions/source/bibliography/menu.src @@ -36,7 +36,7 @@ #ifndef _GLOBALACC_SRC #include <svx/globlac.hrc> #endif -#include <extensio.hrc> +#include "bibliography.hrc" #include "bib.hrc" diff --git a/extensions/source/bibliography/sections.src b/extensions/source/bibliography/sections.src index b6fd032d5f4e..ea9d5f3412e3 100644 --- a/extensions/source/bibliography/sections.src +++ b/extensions/source/bibliography/sections.src @@ -30,7 +30,7 @@ //#pragma CHARSET_ANSI #include "sections.hrc" -#include "extensio.hrc" +#include "bibliography.hrc" #define FT_POS 12 #define FTSIZE_LEFT 88 diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 71de2963862b..416ff1e1845b 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -620,8 +620,8 @@ void BibToolBar::RebuildToolbar() void BibToolBar::ApplyImageList() { ImageList& rList = ( nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ) ? - ( GetDisplayBackground().GetColor().IsDark() ? aImgLstHC : aImgLst ) : - ( GetDisplayBackground().GetColor().IsDark() ? aBigImgLstHC : aBigImgLst ); + ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aImgLstHC : aImgLst ) : + ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aBigImgLstHC : aBigImgLst ); SetItemImage(TBC_BT_AUTOFILTER , rList.GetImage(SID_FM_AUTOFILTER)); SetItemImage(TBC_BT_FILTERCRIT , rList.GetImage(SID_FM_FILTERCRIT)); diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src index 49154b69a3c0..a291a11e25bd 100644 --- a/extensions/source/bibliography/toolbar.src +++ b/extensions/source/bibliography/toolbar.src @@ -28,7 +28,7 @@ * ************************************************************************/ #include <svx/svxids.hrc> -#include "extensio.hrc" +#include "bibliography.hrc" #include "toolbar.hrc" #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 43d8c7af5889..1d02cac88a4b 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -376,7 +376,7 @@ namespace dbp { ::svt::OLocalResourceAccess aLocalResAccess( ModuleRes( RID_PAGE_TABLESELECTION ), RSC_TABPAGE ); - bool bIsHiContrast = m_aTable.GetBackground().GetColor().IsDark(); + bool bIsHiContrast = m_aTable.GetSettings().GetStyleSettings().GetHighContrastMode(); aTableImage = Image( ModuleRes( bIsHiContrast ? IMG_TABLE_HC : IMG_TABLE ) ); aQueryImage = Image( ModuleRes( bIsHiContrast ? IMG_QUERY_HC : IMG_QUERY ) ); } diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc index ab2efbe89921..c54463704f44 100644 --- a/extensions/source/dbpilots/dbpresid.hrc +++ b/extensions/source/dbpilots/dbpresid.hrc @@ -31,9 +31,7 @@ #ifndef _EXTENSIONS_DBP_DBPRESID_HRC_ #define _EXTENSIONS_DBP_DBPRESID_HRC_ -#ifndef EXTENSIONS_INC_EXTENSIO_HRC -#include "extensio.hrc" -#endif +#include "dbpilots.hrc" //======================================================================== // basics diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index ad09e2d7122c..c3d50e6c112d 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -39,9 +39,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <tools/debug.hxx> #include "dbptools.hxx" -#ifndef EXTENSIONS_INC_EXTENSIO_HRC -#include "extensio.hrc" -#endif +#include "dbpilots.hrc" #define GW_STATE_DATASOURCE_SELECTION 0 #define GW_STATE_FIELDSELECTION 1 diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 8b82db094b31..2f6c87783811 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -36,9 +36,7 @@ #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include "optiongrouplayouter.hxx" -#ifndef EXTENSIONS_INC_EXTENSIO_HRC -#include "extensio.hrc" -#endif +#include "dbpilots.hrc" //#define GBW_STATE_DATASELECTION 0 diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index f86b284b72fd..8afc76a0beea 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -40,9 +40,7 @@ #include <tools/debug.hxx> #include <vcl/msgbox.hxx> #include <connectivity/dbtools.hxx> -#ifndef EXTENSIONS_INC_EXTENSIO_HRC -#include "extensio.hrc" -#endif +#include "dbpilots.hrc" #include <comphelper/extract.hxx> //......................................................................... diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index 9e9780574328..f73d4f10d77a 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -32,9 +32,7 @@ #include "precompiled_extensions.hxx" #include "browserview.hxx" #include "propertyeditor.hxx" -#ifndef _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ -#include "formhelpid.hrc" -#endif +#include "propctrlr.hrc" #include <tools/debug.hxx> #include <memory> diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index ac5802129e28..cb4e02e6fb90 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -779,13 +779,6 @@ namespace pcr ); } - //---------------------------------------------------------------- - void SAL_CALL ComposedPropertyUIUpdate::fire() - { - impl_checkDisposed(); - impl_fireAll_throw(); - } - //-------------------------------------------------------------------- void ComposedPropertyUIUpdate::impl_fireAll_throw() { diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx index 8f5ead84ecf1..ddccb8475040 100644 --- a/extensions/source/propctrlr/composeduiupdate.hxx +++ b/extensions/source/propctrlr/composeduiupdate.hxx @@ -119,26 +119,6 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > getUIForPropertyHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _rxHandler ); - /** fires the collected UI changes to our delegator UI - - All operations for any elements are forwarded: - <ul><li>If an element has been hidden at least once, it's also hidden at the delegator UI.</li> - <li>If an element has been shown at least once, and never been hidden, it's also - shown at the delegator UI.</li> - <li>If an element has never been shown or hidden, it's also not touched at the delegator UI.</li> - <li>The same holds if you replace "hidden" in the last three items with "disabled", - and "shown" with "enabled".</li> - <li>If an element should have been rebuilt (->XObjectInspectorUI::rebuiltPropertyUI) - at least once, it's rebuilt at the delegator UI, too.<br/> - After that, the request to rebuild the UI for this property is cleared, so subsequent - calls to ->fire will not trigger an new rebuilt request. - </ul> - - @throws ::com::sun::star::lang::DisposedException - if ->dispose has been called previously - */ - void SAL_CALL fire(); - /** Suspends automatic firing of UI changes normally, as soon as any of the property handlers does a request for an @@ -182,7 +162,21 @@ namespace pcr /// throws an exception if the component is already disposed void impl_checkDisposed() const; - /** fires all accumulated changes + /** fires the collected UI changes to our delegator UI + + All operations for any elements are forwarded: + <ul><li>If an element has been hidden at least once, it's also hidden at the delegator UI.</li> + <li>If an element has been shown at least once, and never been hidden, it's also + shown at the delegator UI.</li> + <li>If an element has never been shown or hidden, it's also not touched at the delegator UI.</li> + <li>The same holds if you replace "hidden" in the last three items with "disabled", + and "shown" with "enabled".</li> + <li>If an element should have been rebuilt (->XObjectInspectorUI::rebuiltPropertyUI) + at least once, it's rebuilt at the delegator UI, too.<br/> + After that, the request to rebuild the UI for this property is cleared, so subsequent + calls to ->fire will not trigger an new rebuilt request. + </ul> + @precond instance is not disposed */ diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index aed1d120bb09..dcc8c3e78508 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -41,9 +41,7 @@ #ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" #endif -#ifndef _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ -#include "formhelpid.hrc" -#endif +#include "propctrlr.hrc" #include "formmetadata.hxx" /** === begin UNO includes === **/ diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index b200d37cb83b..7511c1dfa1e4 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -33,9 +33,7 @@ #include "eformspropertyhandler.hxx" #include "formstrings.hxx" #include "formmetadata.hxx" -#ifndef EXTENSIONS_INC_EXTENSIO_HRC -#include "extensio.hrc" -#endif +#include "propctrlr.hrc" #include "formbrowsertools.hxx" #include "eformshelper.hxx" #include "handlerhelper.hxx" diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 05d0984349b4..197a1cfb41f9 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -32,7 +32,7 @@ #include "precompiled_extensions.hxx" #include "eventhandler.hxx" -#include "extensio.hrc" +#include "propctrlr.hrc" #include "formbrowsertools.hxx" #include "formresid.hrc" #include "formstrings.hxx" diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index e28eb2e89224..f21e70a20f47 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -32,7 +32,7 @@ #include "precompiled_extensions.hxx" #include "controltype.hxx" -#include "extensio.hrc" +#include "propctrlr.hrc" #include "fontdialog.hxx" #include "formcomponenthandler.hxx" #include "formlinkdialog.hxx" diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index d37a67d39daf..96234358a886 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -35,7 +35,7 @@ #include "formstrings.hxx" #include "defaultforminspection.hxx" #ifndef _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ -#include "formhelpid.hrc" +#include "propctrlr.hrc" #endif /** === begin UNO includes === **/ diff --git a/extensions/source/propctrlr/formhelpid.hrc b/extensions/source/propctrlr/formhelpid.hrc deleted file mode 100644 index 529c3b30d97b..000000000000 --- a/extensions/source/propctrlr/formhelpid.hrc +++ /dev/null @@ -1,55 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: formhelpid.hrc,v $ - * $Revision: 1.17 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ -#define _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ - -#ifndef _SOLAR_HRC -#include <svtools/solar.hrc> -#endif - -// TODO: create a new help id range in <svtools/solar.hrc> -// at the moment, the help ids are ripped from svx/inc/fmhelper.hrc -// (the old property browser was implemented in svx) - -#define HID_PROPCONTROLLER_START HID_FORMS_START + 400 - -// FREE -// FREE -// FREE -// FREE -// FREE -#define HID_FM_PROPDLG_TABCTR (HID_PROPCONTROLLER_START + 5) -#define HID_FM_PROPDLG_TAB_GENERAL (HID_PROPCONTROLLER_START + 6) -#define HID_FM_PROPDLG_TAB_DATA (HID_PROPCONTROLLER_START + 7) -#define HID_FM_PROPDLG_TAB_EVT (HID_PROPCONTROLLER_START + 8) - -#endif // _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ - diff --git a/extensions/source/propctrlr/formlinkdialog.src b/extensions/source/propctrlr/formlinkdialog.src index 5132e9886338..c86ee2a6f1bd 100644 --- a/extensions/source/propctrlr/formlinkdialog.src +++ b/extensions/source/propctrlr/formlinkdialog.src @@ -31,9 +31,7 @@ #ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" #endif -#ifndef EXTENSIONS_INC_EXTENSIO_HRC -#include "extensio.hrc" -#endif +#include "propctrlr.hrc" #ifndef EXTENSIONS_SOURCE_PROPCTRLR_FORMLINKDIALOG_HRC #include "formlinkdialog.hrc" #endif diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index cdfefa314c55..0fba16859fdc 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -32,15 +32,13 @@ #include "precompiled_extensions.hxx" #include "formmetadata.hxx" #ifndef _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ -#include "formhelpid.hrc" +#include "propctrlr.hrc" #endif #include "formstrings.hxx" #ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" #endif -#ifndef EXTENSIONS_INC_EXTENSIO_HRC -#include "extensio.hrc" -#endif +#include "propctrlr.hrc" #include <svtools/localresaccess.hxx> #include <tools/debug.hxx> #include <cppuhelper/extract.hxx> diff --git a/extensions/source/propctrlr/listselectiondlg.src b/extensions/source/propctrlr/listselectiondlg.src index d334b956dc1e..6a994ce83be8 100644 --- a/extensions/source/propctrlr/listselectiondlg.src +++ b/extensions/source/propctrlr/listselectiondlg.src @@ -31,9 +31,7 @@ #ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" #endif -#ifndef EXTENSIONS_INC_EXTENSIO_HRC -#include "extensio.hrc" -#endif +#include "propctrlr.hrc" #ifndef EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HRC #include "listselectiondlg.hrc" #endif diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index f8021b55229c..865a0074d457 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -114,7 +114,7 @@ namespace pcr aPB_OK.SetClickHdl( LINK( this, TabOrderDialog, OKClickHdl ) ); aPB_OK.Disable(); - sal_Bool bIsHighContrast = GetDisplayBackground().GetColor().IsDark(); + sal_Bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); pImageList = new ImageList( PcrRes( bIsHighContrast ? RID_IL_FORMEXPLORER_HC : RID_IL_FORMEXPLORER ) ); diff --git a/extensions/source/propctrlr/taborder.src b/extensions/source/propctrlr/taborder.src index 168d5f7d3bcb..681176cb314e 100644 --- a/extensions/source/propctrlr/taborder.src +++ b/extensions/source/propctrlr/taborder.src @@ -34,9 +34,7 @@ #ifndef EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HRC #include "taborder.hrc" #endif -#ifndef EXTENSIONS_INC_EXTENSIO_HRC -#include "extensio.hrc" -#endif +#include "propctrlr.hrc" ModalDialog RID_DLG_TABORDER { diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index 8b60b63ec95a..9555caaac6d3 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -34,18 +34,10 @@ #include "formstrings.hxx" #include "formmetadata.hxx" #include "xsddatatypes.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_ #include "formlocalid.hrc" -#endif -#ifndef EXTENSIONS_INC_EXTENSIO_HRC -#include "extensio.hrc" -#endif +#include "propctrlr.hrc" #include "newdatatype.hxx" #include "xsdvalidationhelper.hxx" #include "pcrcommon.hxx" diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 23d4da29a41f..7ca5e97239d1 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -264,7 +264,7 @@ protected: virtual void SAL_CALL onTerminated(); /* Wrapper around checkForUpdates */ - bool runCheck(); + bool runCheck( bool & rbExtensionsChecked ); private: @@ -453,7 +453,7 @@ UpdateCheckThread::cancel() //------------------------------------------------------------------------------ bool -UpdateCheckThread::runCheck() +UpdateCheckThread::runCheck( bool & rbExtensionsChecked ) { bool ret = false; UpdateState eUIState = UPDATESTATE_NO_UPDATE_AVAIL; @@ -474,12 +474,14 @@ UpdateCheckThread::runCheck() // and when there was no office update found if ( ( eUIState != UPDATESTATE_UPDATE_AVAIL ) && ( eUIState != UPDATESTATE_UPDATE_NO_DOWNLOAD ) && - !aController->isDialogShowing() ) + !aController->isDialogShowing() && + !rbExtensionsChecked ) { bool bHasExtensionUpdates = checkForExtensionUpdates( m_xContext ); aController->setHasExtensionUpdates( bHasExtensionUpdates ); if ( bHasExtensionUpdates ) aController->setUIState( UPDATESTATE_EXT_UPD_AVAIL ); + rbExtensionsChecked = true; } // joining with this thread is safe again @@ -500,6 +502,11 @@ UpdateCheckThread::onTerminated() void SAL_CALL UpdateCheckThread::run() { + bool bExtensionsChecked = false; + TimeValue systime; + TimeValue nExtCheckTime; + osl_getSystemTime( &nExtCheckTime ); + osl::Condition::Result aResult = osl::Condition::result_timeout; TimeValue tv = { 10, 0 }; @@ -547,7 +554,6 @@ UpdateCheckThread::run() if( ! checkNow ) { - TimeValue systime; osl_getSystemTime(&systime); // Go back to sleep until time has elapsed @@ -563,19 +569,28 @@ UpdateCheckThread::run() static sal_uInt8 n = 0; - if( ! hasInternetConnection() || ! runCheck() ) + if( ! hasInternetConnection() || ! runCheck( bExtensionsChecked ) ) { - // Increase next by 1, 5, 15, 60, .. minutes - static const sal_Int16 nRetryInterval[] = { 60, 300, 900, 3600 }; + // the extension update check should be independent from the office update check + // + osl_getSystemTime( &systime ); + if ( nExtCheckTime.Seconds + offset < systime.Seconds ) + bExtensionsChecked = false; - if( n < sizeof(nRetryInterval) / sizeof(sal_Int16) ) + // Increase next by 15, 60, .. minutes + static const sal_Int32 nRetryInterval[] = { 900, 3600, 14400, 86400 }; + + if( n < sizeof(nRetryInterval) / sizeof(sal_Int32) ) ++n; tv.Seconds = nRetryInterval[n-1]; aResult = m_aCondition.wait(&tv); } else // reset retry counter + { n = 0; + bExtensionsChecked = false; + } } } @@ -591,8 +606,10 @@ UpdateCheckThread::run() void SAL_CALL ManualUpdateCheckThread::run() { + bool bExtensionsChecked = false; + try { - runCheck(); + runCheck( bExtensionsChecked ); m_aCondition.reset(); } catch(const uno::Exception& e) { @@ -1528,6 +1545,8 @@ void UpdateCheck::showExtensionDialog() rtl::Reference<UpdateHandler> UpdateCheck::getUpdateHandler() { + osl::MutexGuard aGuard(m_aMutex); + if( ! m_aUpdateHandler.is() ) m_aUpdateHandler = new UpdateHandler(m_xContext, this); diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index 19ca5588c09c..ad1debd91beb 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -31,7 +31,7 @@ #include "precompiled_extensions.hxx" #include "updatehdl.hxx" -#include "extensio.hrc" +#include "update.hrc" #include "osl/diagnose.h" #include "osl/thread.hxx" @@ -200,6 +200,10 @@ void UpdateHandler::setVisible( bool bVisible ) if ( !mxUpdDlg.is() ) createDialog(); + // this should never happen, but if it happens we better return here + if ( !mxUpdDlg.is() ) + return; + updateState( meCurState ); uno::Reference< awt::XWindow > xWindow( mxUpdDlg, uno::UNO_QUERY ); @@ -1032,6 +1036,12 @@ void UpdateHandler::showControls( short nControls ) //-------------------------------------------------------------------- void UpdateHandler::createDialog() { + if ( !mxContext.is() ) + { + OSL_ASSERT( false ); + return; + } + uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager() ); if( xServiceManager.is() ) diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 58d785d36982..8d33e63b5770 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -96,14 +96,16 @@ public: throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException) { sal_Int32 n = m_xStream->readBytes(aData, nBytesToRead); - OSL_TRACE( "\n %s", aData.get()->elements ); + if ( n ) + OSL_TRACE( "Read [%d] bytes: %s\n", n, aData.get()->elements ); return n; }; virtual sal_Int32 SAL_CALL readSomeBytes(uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException) { sal_Int32 n = m_xStream->readSomeBytes(aData, nMaxBytesToRead); - OSL_TRACE( "\n %s", aData.get()->elements ); + if ( n ) + OSL_TRACE( "Read [%d] bytes: %s\n", n, aData.get()->elements ); return n; }; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) diff --git a/extensions/util/hidother.src b/extensions/util/hidother.src index 3f8fcd5ed7f8..308e4ed2ab88 100644 --- a/extensions/util/hidother.src +++ b/extensions/util/hidother.src @@ -28,7 +28,11 @@ * ************************************************************************/ -#include "../inc/extensio.hrc" +#include "../inc/abpilot.hrc" +#include "../inc/bibliography.hrc" +#include "../inc/dbpilots.hrc" +#include "../inc/propctrlr.hrc" +#include "../inc/update.hrc" hidspecial HID_ABSPILOT { HelpId = HID_ABSPILOT; } hidspecial HID_ABSPILOT_CANCEL { HelpId = HID_ABSPILOT_CANCEL; } @@ -90,13 +94,6 @@ hidspecial HID_CHECK_FOR_UPD_PAUSE { HelpId = HID_CHECK_FOR_UPD_PAU hidspecial HID_CHECK_FOR_UPD_RESUME { HelpId = HID_CHECK_FOR_UPD_RESUME; } hidspecial HID_CHECK_FOR_UPD_STATUS { HelpId = HID_CHECK_FOR_UPD_STATUS; } -hidspecial HID_DBIWIZARD { HelpId = HID_DBIWIZARD; } -hidspecial HID_DBIWIZARD_CANCEL { HelpId = HID_DBIWIZARD_CANCEL; } -hidspecial HID_DBIWIZARD_FILESELECTION { HelpId = HID_DBIWIZARD_FILESELECTION; } -hidspecial HID_DBIWIZARD_FINISH { HelpId = HID_DBIWIZARD_FINISH; } -hidspecial HID_DBIWIZARD_NEXT { HelpId = HID_DBIWIZARD_NEXT; } -hidspecial HID_DBIWIZARD_PREVIOUS { HelpId = HID_DBIWIZARD_PREVIOUS; } - hidspecial HID_DLG_DBCHANGE { HelpId = HID_DLG_DBCHANGE; } hidspecial HID_DLG_MAPPING { HelpId = HID_DLG_MAPPING; } @@ -345,7 +342,6 @@ hidspecial HID_PROP_XSD_REQUIRED { HelpId = HID_PROP_XSD_REQUIRED hidspecial HID_PROP_XSD_TOTAL_DIGITS { HelpId = HID_PROP_XSD_TOTAL_DIGITS; } hidspecial HID_PROP_XSD_WHITESPACES { HelpId = HID_PROP_XSD_WHITESPACES; } -hidspecial HID_PROTOCOLS { HelpId = HID_PROTOCOLS; } hidspecial HID_SELECTION_TLB { HelpId = HID_SELECTION_TLB; } hidspecial UID_ABSPILOT_HELP { HelpId = UID_ABSPILOT_HELP; } @@ -385,13 +381,6 @@ hidspecial UID_BRWEVT_TEXTCHANGED { HelpId = UID_BRWEVT_TEXTCHANGE hidspecial UID_BRWEVT_UNLOADED { HelpId = UID_BRWEVT_UNLOADED; } hidspecial UID_BRWEVT_UNLOADING { HelpId = UID_BRWEVT_UNLOADING; } -hidspecial UID_DBIWIZARD_FORMS { HelpId = UID_DBIWIZARD_FORMS; } -hidspecial UID_DBIWIZARD_FORMS_SAVETO { HelpId = UID_DBIWIZARD_FORMS_SAVETO; } -hidspecial UID_DBIWIZARD_HELP { HelpId = UID_DBIWIZARD_HELP; } -hidspecial UID_DBIWIZARD_QUERIES { HelpId = UID_DBIWIZARD_QUERIES; } -hidspecial UID_DBIWIZARD_SOURCEFILE { HelpId = UID_DBIWIZARD_SOURCEFILE; } -hidspecial UID_DBIWIZARD_SOURCESTATS { HelpId = UID_DBIWIZARD_SOURCESTATS; } - hidspecial UID_EVT_MACRODLG { HelpId = UID_EVT_MACRODLG; } hidspecial UID_FIELDLINK_DETAIL1 { HelpId = UID_FIELDLINK_DETAIL1; } @@ -435,3 +424,8 @@ hidspecial UID_PROP_DLG_XSD_READONLY { HelpId = UID_PROP_DLG_XSD_READ hidspecial UID_PROP_DLG_XSD_RELEVANT { HelpId = UID_PROP_DLG_XSD_RELEVANT; } hidspecial UID_PROP_DLG_XSD_REQUIRED { HelpId = UID_PROP_DLG_XSD_REQUIRED; } hidspecial UID_PROP_REMOVE_DATA_TYPE { HelpId = UID_PROP_REMOVE_DATA_TYPE; } + +hidspecial HID_FM_PROPDLG_TABCTR { HelpId = HID_FM_PROPDLG_TABCTR; } +hidspecial HID_FM_PROPDLG_TAB_GENERAL { HelpId = HID_FM_PROPDLG_TAB_GENERAL; } +hidspecial HID_FM_PROPDLG_TAB_DATA { HelpId = HID_FM_PROPDLG_TAB_DATA; } +hidspecial HID_FM_PROPDLG_TAB_EVT { HelpId = HID_FM_PROPDLG_TAB_EVT; } |