diff options
Diffstat (limited to 'extensions/source')
30 files changed, 44 insertions, 176 deletions
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" |