diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-11-27 12:39:32 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-11-27 12:39:32 +0000 |
| commit | 764026f7d09f18e5757c588439f925bb725c99d1 (patch) | |
| tree | 8e7f568a7b36c30ed69de48b1e877e4add8c1eaa | |
| parent | dca5cf3fdaaed8be10e8ca32fa8d7b4e0647e17b (diff) | |
dba33a: summary migration from SVN
2009-11-06 13:10:39 +0000 msc r277387 : minor fix for automatic test
2009-11-06 13:09:33 +0000 msc r277385 : minor fix for automatic test
2009-11-06 12:30:57 +0000 fs r277383 : argh. On some virtual machines, waiting 5 seconds for the event to arrive is not enough. Increasing the timeout ...
2009-11-06 12:13:34 +0000 fs r277382 : this diagnostic code should not have slipped in
2009-11-05 13:21:06 +0000 fs r277369 : SHL2NOCHECK=TRUE (requested by hjs)
2009-11-04 14:09:46 +0000 msc r277355 : minor fix for automatic testing
2009-11-04 13:23:02 +0000 msc r277352 : minor fix for automatic testing
2009-11-04 10:53:28 +0000 msc r277341 : minor fix for automated testscript
2009-11-04 08:30:58 +0000 msc r277333 : minor fix for automatic test
2009-11-04 08:15:43 +0000 msc r277332 : minor fix for automatic test
2009-11-03 14:25:44 +0000 fs r277324 : #i10000#
2009-11-03 09:47:47 +0000 fs r277315 : found yet another help ID zombie ... moved formhelpid.hrc content to propctrlr.hrc, where it belongs
2009-11-03 08:50:24 +0000 fs r277312 : use createTempFileURL, which cares for some more specialities ...
2009-11-03 08:44:55 +0000 fs r277311 : when creating a temp file for purpose of getting a temp file URL, the delete the file immediately. On some machines/JVMs, the file exists, with write access denied, which isn't Good (TM)
2009-10-22 13:06:17 +0000 fs r277126 : removed wrong assertion
2009-10-21 08:10:35 +0000 fs r277077 : reverted the previous change, which was nonsense
2009-10-21 07:19:43 +0000 fs r277076 : export the component_foo functions, now that some of the objects are built with VISIBILITY_HIDDEN=TRUE
2009-10-21 07:08:35 +0000 fs r277075 : spare useless call
2009-10-20 21:26:31 +0000 fs r277072 : #i10000#
2009-10-20 08:06:04 +0000 fs r277039 : CWS-TOOLING: rebase CWS dba33a to trunk@277035 (milestone: DEV300:m62)
2009-10-16 09:55:25 +0000 fs r276960 : remove one of the superfluous implts_doLayout calls introduced with the previous patch
2009-10-15 13:18:52 +0000 fs r276941 : removed the basic tests. According to cn, they're not used anymore (for a long time), and according to 'du -h', they take up 6.0M on my hard disc. For too much for useless code, /me thinks.
2009-10-15 13:06:51 +0000 fs r276940 : #i10000# remove useless include (otherwise the compiler warning it provokes would need to be fixed by declaring VISIBILITY_HIDDEN=TRUE in the makefile.mk)
2009-10-15 12:52:39 +0000 fs r276939 : #i10000#
2009-10-15 12:44:26 +0000 fs r276938 : #i10000#
2009-10-15 12:00:33 +0000 fs r276936 : #i10000#
2009-10-15 10:31:37 +0000 fs r276934 : #i105259# prepare for the Hidden arg
2009-10-15 10:31:05 +0000 fs r276933 : IsMaximized -> const
2009-10-15 09:50:15 +0000 fs r276932 : during #i105259#:
introduce an option to the layout manager to preserve, if possible, the size of the content window
when layouting. Enable this option for embedded (SFX-based) documents opened for outplace editing.
(the option is incompatible with in-place editing, anyway)
This is because such embedded objects couple the (content) window size to the VisAreaSize, in that
both are used interchangeably. When an embedded object is closed, it remembers the VisAreaSize,
and restores it upon next open. This, however, leads to different content window sizes when the
window is closed with another toolbar set than used during opening.
This patch here prevents those different content window sizes. Also, now the content window size
doesn't change when, explicitly or implicitly, a toolbar is shown or hidden. Instead, the content
window size stays the same, and the container window size is adjusted.
2009-10-15 09:32:41 +0000 fs r276931 : during #i105259#: UNO access to more attributes of top windows
2009-10-15 09:30:28 +0000 fs r276930 : indention corrected (better readable)
2009-10-15 09:26:46 +0000 fs r276929 : during #i105259#: access to more attributes of top windows
2009-10-14 10:04:39 +0000 fs r276889 : connecting via services manager, not naming service
2009-10-12 11:31:08 +0000 fs r276831 : during #i105806# FillPropertySet: do not attempt to set *AutoStyleName if it doesn't exist
2009-10-12 11:24:44 +0000 fs r276830 : #i105806# getPropertyValue: throw an UnknownPropertyException for, well, unknown properties
2009-10-08 08:20:58 +0000 fs r276774 : implSubmit: re-throw WrappedTargetExceptions unmodified
2009-10-07 19:19:42 +0000 fs r276770 : #i105198# do not pass an CommandType if we do not have a command
2009-10-07 17:39:36 +0000 fs r276768 : export the OWeakObject::disposeWeakConnectionPoint symbol
2009-10-07 12:59:17 +0000 fs r276754 : #i87693#
2009-10-07 11:19:22 +0000 fs r276752 : #i10000#
2009-10-07 10:21:08 +0000 fs r276748 : #105482# do not require a controller, at least not in *all* circumstances (executed reports have a model, the ReportDefinition, but no Controller)
2009-10-07 10:04:08 +0000 fs r276747 : copying the changes from CWS fwk121 herein, in particular the fix for
issue #i105371#
2009-10-07 09:58:30 +0000 fs r276746 : copying the changes from CWS fwk121 herein, in particular the fix for
issue #i105371#
2009-10-07 09:48:14 +0000 fs r276744 : removed (now) pointless assertion
2009-10-07 06:59:19 +0000 fs r276740 : export the OWeakObject::disposeWeakConnectionPoint symbol
2009-10-07 06:44:43 +0000 fs r276739 : OComponentHelper::release & WeakAggComponentImplHelperBase::release:
when our ref count drops to 0, call OWeakObject's disposeWeakConnectionPoint before (temporarily) incrementing
the ref count, again. This ensures that our adapter cannot create references to the dying object anymore.
(A complex test case in dbaccess (#i105505#) triggered such a situation, but in another class using an analogous
release/dispose/destroy pattern, namely WeakComponentImplHelperBase)
2009-10-07 06:37:20 +0000 fs r276738 : found during some new complex test cases: call disposeWeakConnectionPoint before actually starting to destroy the object, this ensures no other threads will resurrect it while it is dying
2009-10-06 21:58:24 +0000 fs r276734 : oops, two small corrections to the previous fix (hey, complex test cases are cool)
2009-10-06 21:51:16 +0000 fs r276733 : log the name of the data source which cannot be revoked
2009-10-06 21:50:41 +0000 fs r276732 : more detailed error message when cleanup fails
2009-10-06 21:50:01 +0000 fs r276731 : reworked the ModelImpl caching. The new and improved UNO API test for css.sdb.RowSet
revealed some inconsistencies, in whether the objects are cached by their URL, or by their
registration name. This has been changed to caching by registration name.
2009-10-06 13:50:34 +0000 fs r276714 : print diagnostics when we cannot clean up the test case
2009-10-06 13:45:02 +0000 fs r276713 : this test failed all the time, since the core (rightfully) threw an exception. Disabled it for the moment, until issue 84253 is fixed
2009-10-06 12:52:46 +0000 fs r276711 : rewrote this test. Now we do not re-use the same .odb across different test cases, as this leads to unreliable
(timing-dependent) results/failures. Instead, every test sets up a new odb file.
Also, did some re-factoring, improved the cleanup code, and caught a few more errors.
2009-10-06 12:51:07 +0000 fs r276710 : DBTools taking a logger now
2009-10-06 12:50:42 +0000 fs r276709 : taking a PrintWriter for logging purpose
2009-10-06 12:50:03 +0000 fs r276708 : DBTools taking a logger now
2009-10-06 12:49:22 +0000 fs r276707 : typo
2009-10-06 12:49:03 +0000 fs r276706 : typo
2009-10-06 12:48:52 +0000 fs r276705 : wrappers around some database-related services - initial versions only, to evolve over time, and intended to finally replace the DBTools class
2009-10-06 12:48:02 +0000 fs r276704 : typo
2009-10-06 12:38:42 +0000 fs r276702 : some better diagnostics, done during getting the API tests to work more reliably
2009-10-06 10:35:51 +0000 fs r276698 : when living in, e.g., the DataSourceBrowser, we can't expect to find an XModifiable2, so don't assert its existence
2009-10-05 12:47:52 +0000 oj r276677 : #i105607# check for read moved into if scope
2009-10-05 11:37:06 +0000 fs r276676 : when saving a file fails, retrieve the error message from the InteractionRequestStringResolver - this is better than any generic message we can create
2009-10-05 10:04:23 +0000 oj r276673 : #i105607# check for read moved into if scope
2009-10-05 09:46:17 +0000 fs r276671 : #i10000#
2009-10-05 08:43:58 +0000 fs r276664 : #i105505#
release: dispose the (base classes) weak connection point before disposing ourself,
and in particular before temporarily incrementing our ref count, again.
This way, we prevent that a separate thread re-surrects us (using the weak connection
point's queryAdapted) while we're in the process of destruction
2009-10-05 08:41:49 +0000 fs r276663 : #i105505# +disposeWeakConnectionPoint (outsourced into dedicated method from ::release)
2009-10-05 08:40:26 +0000 fs r276662 : no need to derived from OSubComponent, its features are not used, directly derive from WeakComponentImplFoo instead
2009-10-05 08:39:38 +0000 fs r276661 : #i105505# diagnostics
2009-10-05 08:39:16 +0000 fs r276660 : #i105505# +testDocumentRevenants
2009-10-05 08:36:01 +0000 fs r276659 : #i105560# reverted the removal of GenericController::openHelpAgent - this is needed in module reportdesign
2009-10-04 19:53:30 +0000 fs r276657 : #105560#
remove unused code
thanks to cmc@openoffice.org for submitting the patch
2009-10-04 19:50:28 +0000 fs r276656 : #i105550# remove unused 'fire' method (thanks to cmc)
2009-10-03 16:13:15 +0000 fs r276655 : CWS-TOOLING: rebase CWS dba33a to trunk@276429 (milestone: DEV300:m60)
2009-10-02 19:20:48 +0000 fs r276651 : #i104117# lotta changed IDs ...
2009-10-02 10:52:24 +0000 fs r276634 : #i105505#
If a model is created, and is a revenant of a previous incarnation, then ensure it is properly initialized.
In particular, in its ctor, set the state to "Initializing", not "Initialized", and then let the ModelImpl
call attachResource. This ensures that the model is initialized completely, including firing the necessary
events.
2009-10-02 10:51:08 +0000 fs r276633 : #i105505# always do an attachResource at the newly loaded model, even if it (internally) was not really loaded, but only a revenant of a previous incarnation of this document
2009-10-01 11:10:13 +0000 fs r276597 : do not rely on the name 'Standard' for the one and only form in a document
2009-10-01 10:36:29 +0000 fs r276590 : #i105509# don't rely on default form component names, use indexes
2009-10-01 09:12:20 +0000 fs r276582 : #i105505#
2009-09-30 07:55:21 +0000 fs r276542 : removed some unsed methods / spared some unnecessary pixel<->logic conversion
2009-09-30 07:53:22 +0000 fs r276541 : removed unneeded methods
2009-09-30 06:35:59 +0000 fs r276538 : #i10000#
2009-09-29 13:45:02 +0000 fs r276531 : refactored the Roadmap* classes, to be able to fix above-mentioned #i105113#
2009-09-29 10:27:10 +0000 fs r276520 : #i105367#
2009-09-29 08:46:45 +0000 fs r276510 : #i104956# cleaned up the makefiles
2009-09-28 21:00:07 +0000 fs r276505 : #i104117# sourced those IDs out from extension.hrc
2009-09-28 20:59:05 +0000 fs r276504 : no need to let one FREE...
2009-09-28 20:53:36 +0000 fs r276503 : #i104117#
cleaned up the mess with help IDs in module extensions.
Formerly, extensions used to use help IDs which were declared in module svx, and vice versa.
Also, help ID ranges were not respected.
2009-09-28 11:25:36 +0000 fs r276489 : typo
2009-09-28 11:25:10 +0000 fs r276488 : #i105235#
2009-09-24 11:53:16 +0000 fs r276423 : #i105234# do not zoom the control when they view information is still uninitialized (happens at least in Writer when opening a form document)
2009-09-24 09:42:28 +0000 fs r276415 : #i105234# proper zoom handling for the nav bar
2009-09-24 09:42:19 +0000 fs r276414 : #i105234# setZoom: care for precision errors caused by implicit conversion float->double
2009-09-16 11:11:43 +0000 fs r276195 : #i105082#
consolidated the sub storage handling, by delegating more functionality into
the DocumentStorageAccess class. As a result, there won't be that many unnecessary
commits anymore. Also, the two different storage caches (in ModelImpl::m_aStorages
and DocumentStorageAccess::m_aExposedStorages) have been consolidated.
This is not really part of the fix of issue 105082, but it helped reducing the
calls to the storage/package implementation.
2009-09-15 21:42:27 +0000 fs r276190 : don't calculate space for BOLD if the text is not really bold (speeds up rendering for large tree structures)
2009-09-15 20:20:23 +0000 fs r276188 : getTypeInfo: fill m_aTypeInfoRows only if really all type infos could be retrieved
2009-09-15 20:19:29 +0000 fs r276187 : do not continue loading when the controller initialization throws an error
2009-09-14 12:25:57 +0000 fs r276119 : oops, this patch was not intended for this CWS
2009-09-14 12:13:57 +0000 fs r276114 : #cr6875455# introduce a ReferenceDevice property for various control models
2009-09-14 10:33:02 +0000 fs r276106 : removed dead file
2009-09-09 08:37:31 +0000 fs r275972 : remove OSL_TRACE in VCLXButton dtor
2009-09-08 11:19:17 +0000 oj r275926 : i76534# remove mnemonic from fixed text
2009-09-07 08:39:37 +0000 fs r275874 : create CWS dba33a from cws/dba32g@275857 (CWS: dba32g)
55 files changed, 756 insertions, 665 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/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/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/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.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/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.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/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index 19ca5588c09c..95af9cf8e666 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" 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; } diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 96412feed10a..d3e2cf6b11bc 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -152,7 +152,6 @@ public: DocumentModifyGuard( const Reference< XInterface >& _rxFormComponent ) :m_xDocumentModify( getXModel( _rxFormComponent ), UNO_QUERY ) { - OSL_ENSURE( m_xDocumentModify.is(), "DocumentModifyGuard::DocumentModifyGuard: no document, or no XModifiable2!" ); impl_changeModifiableFlag_nothrow( false ); } ~DocumentModifyGuard() diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index ec953f66c6f6..0a25f66fe401 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -1003,23 +1003,23 @@ namespace frm sal_Bool OListBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) { // current selektion list - const ORowSetValue rCurrentValue( getFirstSelectedValue() ); - if ( rCurrentValue != m_aSaveValue ) + const ORowSetValue aCurrentValue( getFirstSelectedValue() ); + if ( aCurrentValue != m_aSaveValue ) { - if ( rCurrentValue.isNull() ) + if ( aCurrentValue.isNull() ) m_xColumnUpdate->updateNull(); else { try { - m_xColumnUpdate->updateObject( rCurrentValue.makeAny() ); + m_xColumnUpdate->updateObject( aCurrentValue.makeAny() ); } catch ( const Exception& ) { return sal_False; } } - m_aSaveValue = rCurrentValue; + m_aSaveValue = aCurrentValue; } return sal_True; } diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index b9738ddd49ae..79d28727b5d5 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -435,6 +435,11 @@ namespace frm // allowed to leave throw; } + catch( const WrappedTargetException& e ) + { + // allowed to leave + throw; + } catch( const Exception& e ) { OSL_ENSURE( sal_False, "OClickableImageBaseControl::implSubmit: caught an unknown exception!" ); diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 43f784f2219c..9f41f68427b1 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -46,6 +46,8 @@ /** === begin UNO includes === **/ #include <com/sun/star/awt/PosSize.hpp> /** === end UNO includes === **/ + +#include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> @@ -400,6 +402,33 @@ namespace frm } //-------------------------------------------------------------------- + void SAL_CALL ORichTextPeer::draw( sal_Int32 _nX, sal_Int32 _nY ) throw(::com::sun::star::uno::RuntimeException) + { + ::vos::OGuard aGuard( Application::GetSolarMutex() ); + + RichTextControl* pControl = static_cast< RichTextControl* >( GetWindow() ); + if ( !pControl ) + return; + + OutputDevice* pTargetDevice = VCLUnoHelper::GetOutputDevice( getGraphics() ); + OSL_ENSURE( pTargetDevice != NULL, "ORichTextPeer::draw: no graphics -> no drawing!" ); + if ( !pTargetDevice ) + return; + + ::Size aSize = pControl->GetSizePixel(); + const MapUnit eTargetUnit = pTargetDevice->GetMapMode().GetMapUnit(); + if ( eTargetUnit != MAP_PIXEL ) + aSize = pControl->PixelToLogic( aSize, eTargetUnit ); + + ::Point aPos( _nX, _nY ); + // the XView::draw API talks about pixels, always ... + if ( eTargetUnit != MAP_PIXEL ) + aPos = pTargetDevice->PixelToLogic( aPos ); + + pControl->Draw( pTargetDevice, aPos, aSize, WINDOW_DRAW_NOCONTROLS ); + } + + //-------------------------------------------------------------------- void SAL_CALL ORichTextPeer::setProperty( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (RuntimeException) { if ( !GetWindow() ) diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx index 5775e2626d2d..eecff6527eea 100644 --- a/forms/source/richtext/richtextcontrol.hxx +++ b/forms/source/richtext/richtextcontrol.hxx @@ -135,6 +135,9 @@ namespace frm ORichTextPeer(); ~ORichTextPeer(); + // XView + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException); + // XVclWindowPeer virtual void SAL_CALL setProperty( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::RuntimeException); diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index bcfb0fc2ad35..9e002d4ed7c0 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -605,21 +605,32 @@ namespace frm _pDev->SetMapMode( aNormalizedMapMode ); // translate coordinates - Point aPos( OutputDevice::LogicToLogic( _rPos, aOriginalMapMode, aNormalizedMapMode ) ); - Size aSize( OutputDevice::LogicToLogic( _rSize, aOriginalMapMode, aNormalizedMapMode ) ); + Point aPos( _rPos ); + Size aSize( _rSize ); + if ( aOriginalMapMode.GetMapUnit() == MAP_PIXEL ) + { + aPos = _pDev->PixelToLogic( _rPos, aNormalizedMapMode ); + aSize = _pDev->PixelToLogic( _rSize, aNormalizedMapMode ); + } + else + { + aPos = OutputDevice::LogicToLogic( _rPos, aOriginalMapMode, aNormalizedMapMode ); + aSize = OutputDevice::LogicToLogic( _rSize, aOriginalMapMode, aNormalizedMapMode ); + } Rectangle aPlayground( aPos, aSize ); Size aOnePixel( _pDev->PixelToLogic( Size( 1, 1 ) ) ); + aPlayground.Right() -= aOnePixel.Width(); + aPlayground.Bottom() -= aOnePixel.Height(); // background _pDev->SetLineColor(); - _pDev->DrawRect( Rectangle( aPlayground.TopLeft(), m_pEngine->GetPaperSize()) ); + _pDev->DrawRect( aPlayground ); - // possibly with border + // do we need to draw a border? bool bBorder = ( m_pAntiImpl->GetStyle() & WB_BORDER ); if ( bBorder ) - // let's draw a border - _pDev->SetLineColor( COL_BLACK ); + _pDev->SetLineColor( m_pAntiImpl->GetSettings().GetStyleSettings().GetMonoColor() ); else _pDev->SetLineColor(); _pDev->SetFillColor( m_pAntiImpl->GetBackground().GetColor() ); @@ -632,7 +643,9 @@ namespace frm // leave a space of one pixel between the "surroundings" of the control // and the content lcl_inflate( aPlayground, -aOnePixel.Width(), -aOnePixel.Height() ); + lcl_inflate( aPlayground, -aOnePixel.Width(), -aOnePixel.Height() ); + // actually draw the content m_pEngine->Draw( _pDev, aPlayground, Point(), TRUE ); _pDev->Pop(); diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx index 778d31c3e6e1..a4f49aa2d41c 100644 --- a/forms/source/richtext/richtextvclcontrol.hxx +++ b/forms/source/richtext/richtextvclcontrol.hxx @@ -117,13 +117,15 @@ namespace frm const EditView& getView() const; EditView& getView(); + // Window overridables + virtual void Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, ULONG _nFlags ); + protected: // Window overridables virtual void Resize(); virtual void GetFocus(); virtual void StateChanged( StateChangedType nStateChange ); virtual long PreNotify( NotifyEvent& _rNEvt ); - virtual void Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, ULONG _nFlags ); virtual long Notify( NotifyEvent& _rNEvt ); private: diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index 67e71baf8533..8d540a663098 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -592,18 +592,21 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor if ( aData.getLength() > nRead ) aData.realloc( nRead ); - if ( nRead && nRead <= MAX_STORCACHE_SIZE ) + if ( nRead <= MAX_STORCACHE_SIZE ) { uno::Reference< io::XStream > xCacheStream = CreateMemoryStream( GetServiceFactory() ); OSL_ENSURE( xCacheStream.is(), "If the stream can not be created an exception must be thrown!\n" ); - uno::Reference< io::XOutputStream > xOutStream( xCacheStream->getOutputStream(), uno::UNO_SET_THROW ); - xOutStream->writeBytes( aData ); + if ( nRead ) + { + uno::Reference< io::XOutputStream > xOutStream( xCacheStream->getOutputStream(), uno::UNO_SET_THROW ); + xOutStream->writeBytes( aData ); + } m_xCacheSeek.set( xCacheStream, uno::UNO_QUERY_THROW ); m_xCacheStream = xCacheStream; m_xCacheSeek->seek( 0 ); } - else if ( nRead && !m_aTempURL.getLength() ) + else if ( !m_aTempURL.getLength() ) { m_aTempURL = GetNewTempFileURL( GetServiceFactory() ); diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java index 36ac2a2da127..23dec6a80191 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java @@ -287,9 +287,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog /** used in developement to start the wizard */ public static void main(String args[]) { - String ConnectStr = "uno:socket,host=127.0.0.1,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.NamingService"; //localhost - // ;Lo-1.Germany.sun.com; - // 10.16.65.155 + String ConnectStr = "uno:socket,host=127.0.0.1,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.ServiceManager"; try { XMultiServiceFactory xLocMSF = Desktop.connect(ConnectStr); AgendaWizardDialogImpl wizard = new AgendaWizardDialogImpl(xLocMSF); diff --git a/wizards/com/sun/star/wizards/common/Desktop.java b/wizards/com/sun/star/wizards/common/Desktop.java index 064033585ac1..2c4c81368fc4 100644 --- a/wizards/com/sun/star/wizards/common/Desktop.java +++ b/wizards/com/sun/star/wizards/common/Desktop.java @@ -182,21 +182,11 @@ public class Desktop public static XMultiServiceFactory connect(String connectStr) throws com.sun.star.uno.Exception, com.sun.star.uno.RuntimeException, Exception { - XComponentContext xcomponentcontext = null; - XMultiComponentFactory xMultiComponentFactory = getMultiComponentFactory(); - // create a connector, so that it can contact the office - Object xUrlResolver = xMultiComponentFactory.createInstanceWithContext("com.sun.star.bridge.UnoUrlResolver", xcomponentcontext); - XUnoUrlResolver urlResolver = (XUnoUrlResolver) UnoRuntime.queryInterface(XUnoUrlResolver.class, xUrlResolver); - Object rInitialObject = urlResolver.resolve(connectStr); - XNamingService rName = (XNamingService) UnoRuntime.queryInterface(XNamingService.class, rInitialObject); - XMultiServiceFactory xMSF = null; - if (rName != null) - { - System.err.println("got the remote naming service !"); - Object rXsmgr = rName.getRegisteredObject("StarOffice.ServiceManager"); - xMSF = (XMultiServiceFactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, rXsmgr); - } - return (xMSF); + XMultiComponentFactory componentFactory = getMultiComponentFactory(); + Object xUrlResolver = componentFactory.createInstanceWithContext( "com.sun.star.bridge.UnoUrlResolver", null ); + XUnoUrlResolver urlResolver = UnoRuntime.queryInterface(XUnoUrlResolver.class, xUrlResolver); + XMultiServiceFactory orb = UnoRuntime.queryInterface(XMultiServiceFactory.class, urlResolver.resolve( connectStr ) ); + return orb; } public static String getIncrementSuffix(XNameAccess xElementContainer, String ElementName) diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index be8721a8febe..2a7151cd1135 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -599,8 +599,8 @@ public class DBMetaData public void getDataSourceInterfaces() throws Exception { - xCompleted = (XCompletedConnection) UnoRuntime.queryInterface(XCompletedConnection.class, xDataSource); - xDataSourcePropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xDataSource); + xCompleted = (XCompletedConnection) UnoRuntime.queryInterface(XCompletedConnection.class, getDataSource()); + xDataSourcePropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, getDataSource()); bPasswordIsRequired = ((Boolean) xDataSourcePropertySet.getPropertyValue("IsPasswordRequired")).booleanValue(); } @@ -684,7 +684,7 @@ public class DBMetaData private boolean getConnection(String _DataSourceName) { setDataSourceByName(_DataSourceName, true); - return getConnection(xDataSource); + return getConnection( getDataSource() ); } private boolean getConnection(com.sun.star.sdbc.XConnection _DBConnection) diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java index 311a97f362ed..a8dbe94e5db0 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java @@ -107,7 +107,7 @@ public class FaxWizardDialogImpl extends FaxWizardDialog try { - String ConnectStr = "uno:socket,host=127.0.0.1,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.NamingService"; + String ConnectStr = "uno:socket,host=127.0.0.1,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.ServiceManager"; XMultiServiceFactory xLocMSF = Desktop.connect(ConnectStr); FaxWizardDialogImpl lw = new FaxWizardDialogImpl(xLocMSF); lw.startWizard(xLocMSF, null); diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java index 4a58311751ef..1a47712ca213 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java @@ -121,7 +121,7 @@ public class LetterWizardDialogImpl extends LetterWizardDialog public static void main(String args[]) { //only being called when starting wizard remotely - String ConnectStr = "uno:socket,host=127.0.0.1,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.NamingService"; + String ConnectStr = "uno:socket,host=127.0.0.1,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.ServiceManager"; XMultiServiceFactory xLocMSF = null; try { diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java index 181c83d9134a..dcbb920e4b0d 100644 --- a/wizards/com/sun/star/wizards/query/QueryWizard.java +++ b/wizards/com/sun/star/wizards/query/QueryWizard.java @@ -89,7 +89,7 @@ public class QueryWizard extends WizardDialog CurDBMetaData = new QuerySummary(xMSF, m_oResource); } -/* public static void main(String args[]) + public static void main(String args[]) { String ConnectStr = "uno:pipe,name=fs93730;urp;StarOffice.ServiceManager"; try @@ -110,7 +110,6 @@ public class QueryWizard extends WizardDialog jexception.printStackTrace(System.out); } } - */ public XComponent[] startQueryWizard(XMultiServiceFactory xMSF, PropertyValue[] CurPropertyValues) { diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java index 914ef13f0c75..82c405747ad8 100644 --- a/wizards/com/sun/star/wizards/report/CallReportWizard.java +++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java @@ -36,6 +36,8 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.text.XTextDocument; import com.sun.star.wizards.common.Properties; import com.sun.star.lang.XComponent; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.wizards.common.Desktop; /** This class capsulates the class, that implements the minimal component, a * factory for creating the service (<CODE>__getServiceFactory</CODE>) and a @@ -48,6 +50,27 @@ public class CallReportWizard static boolean bWizardstartedalready; + public static void main(String args[]) + { + String ConnectStr = "uno:pipe,name=fs93730;urp;StarOffice.ServiceManager"; + try + { + XMultiServiceFactory orb = Desktop.connect(ConnectStr); + if ( orb != null ) + { + PropertyValue[] curproperties = new PropertyValue[1]; + curproperties[0] = Properties.createProperty("DataSourceName", "countries"); + + ReportWizard wizard = new ReportWizard(orb); + wizard.startReportWizard(orb, curproperties); + } + } + catch (java.lang.Exception jexception) + { + jexception.printStackTrace(System.out); + } + } + /** Gives a factory for creating the service. * This method is called by the <code>JavaLoader</code> * <p> diff --git a/wizards/com/sun/star/wizards/web/CallWizard.java b/wizards/com/sun/star/wizards/web/CallWizard.java index 4d417afc986d..7019e00f5d5c 100644 --- a/wizards/com/sun/star/wizards/web/CallWizard.java +++ b/wizards/com/sun/star/wizards/web/CallWizard.java @@ -299,15 +299,10 @@ public class CallWizard { String ConnectStr = - "uno:socket,host=localhost,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.NamingService"; - //localhost ;Lo-1.Germany.sun.com; 10.16.65.155 + "uno:socket,host=localhost,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.ServiceManager"; try { XMultiServiceFactory xmsf = Desktop.connect(ConnectStr); - //File dir = new File("D:\\CWS\\extras6");//("C:\\Documents and Settings\\rpiterman\\My Documents"); - //getFiles(dir,xLocMSF); - - //read Configuration CallWizard.WizardImplementation ww = new CallWizard.WizardImplementation(xmsf); ww.trigger("start"); diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.java b/wizards/com/sun/star/wizards/web/FTPDialog.java index 3352b1dff07f..0d9b083489e5 100644 --- a/wizards/com/sun/star/wizards/web/FTPDialog.java +++ b/wizards/com/sun/star/wizards/web/FTPDialog.java @@ -636,7 +636,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID */ public static void main(String args[]) { - String ConnectStr = "uno:socket,host=localhost,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.NamingService"; //localhost ;Lo-1.Germany.sun.com; 10.16.65.155 + String ConnectStr = "uno:socket,host=localhost,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.ServiceManager"; try { XMultiServiceFactory xLocMSF = Desktop.connect(ConnectStr); diff --git a/wizards/com/sun/star/wizards/web/WebWizard.java b/wizards/com/sun/star/wizards/web/WebWizard.java index 6913369991b4..41de8c8e5293 100644 --- a/wizards/com/sun/star/wizards/web/WebWizard.java +++ b/wizards/com/sun/star/wizards/web/WebWizard.java @@ -59,15 +59,10 @@ public class WebWizard extends WWD_Events { String ConnectStr = - "uno:socket,host=localhost,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.NamingService"; - //localhost ;Lo-1.Germany.sun.com; 10.16.65.155 + "uno:socket,host=localhost,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.ServiceManager"; try { XMultiServiceFactory xmsf = Desktop.connect(ConnectStr); - //File dir = new File("D:\\CWS\\extras6");//("C:\\Documents and Settings\\rpiterman\\My Documents"); - //getFiles(dir,xLocMSF); - - //read Configuration WebWizard ww = new WebWizard(xmsf); ww.show(); ww.cleanup(); |