diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-07-12 18:12:34 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-07-12 20:57:58 +0200 |
commit | 2cca46d54846b0cd7769b9287f17632a4258256d (patch) | |
tree | d0a6fa638d4e4afdbb93ee83c9afd46723f467e1 /framework | |
parent | Disable openCL by default on Mac (for now). (diff) | |
download | core-2cca46d54846b0cd7769b9287f17632a4258256d.tar.gz core-2cca46d54846b0cd7769b9287f17632a4258256d.zip |
PCH for more libraries
Change-Id: I6f9a1969605e0016b11157ddb5754ac77fd3966b
Diffstat (limited to 'framework')
-rw-r--r-- | framework/Library_fwk.mk | 2 | ||||
-rw-r--r-- | framework/inc/pch/precompiled_fwk.cxx | 12 | ||||
-rw-r--r-- | framework/inc/pch/precompiled_fwk.hxx | 396 | ||||
-rw-r--r-- | framework/source/dispatch/menudispatcher.cxx | 2 | ||||
-rw-r--r-- | framework/source/uiconfiguration/windowstateconfiguration.cxx | 2 | ||||
-rw-r--r-- | framework/source/uielement/generictoolbarcontroller.cxx | 2 | ||||
-rw-r--r-- | framework/source/uielement/togglebuttontoolbarcontroller.cxx | 2 | ||||
-rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 16 |
8 files changed, 423 insertions, 11 deletions
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 0e365051a498..2133a9483362 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_set_include,fwk,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_set_precompiled_header,fwk,$(SRCDIR)/framework/inc/pch/precompiled_fwk)) + $(eval $(call gb_Library_use_external,fwk,boost_headers)) $(eval $(call gb_Library_use_custom_headers,fwk,\ diff --git a/framework/inc/pch/precompiled_fwk.cxx b/framework/inc/pch/precompiled_fwk.cxx new file mode 100644 index 000000000000..e61e15d1e8a6 --- /dev/null +++ b/framework/inc/pch/precompiled_fwk.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "precompiled_fwk.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx new file mode 100644 index 000000000000..f8e12620f87c --- /dev/null +++ b/framework/inc/pch/precompiled_fwk.hxx @@ -0,0 +1,396 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +/* + This file has been autogenerated by update_pch.sh . It is possible to edit it + manually (such as when an include file has been moved/renamed/removed. All such + manual changes will be rewritten by the next run of update_pch.sh (which presumably + also fixes all possible problems, so it's usually better to use it). +*/ + +#include "com/sun/star/beans/XFastPropertySet.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/configuration/theDefaultProvider.hpp" +#include "com/sun/star/container/XNameAccess.hpp" +#include "com/sun/star/frame/Desktop.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/system/SystemShellExecute.hpp" +#include "com/sun/star/system/SystemShellExecuteFlags.hpp" +#include "com/sun/star/task/XJobExecutor.hpp" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/util/XMacroExpander.hpp" +#include "com/sun/star/util/XStringWidth.hpp" +#include "com/sun/star/util/theMacroExpander.hpp" +#include "comphelper/configurationhelper.hxx" +#include "comphelper/processfactory.hxx" +#include "comphelper/sequenceashashmap.hxx" +#include "cppuhelper/implbase1.hxx" +#include "officecfg/Office/Common.hxx" +#include "osl/file.h" +#include "rtl/bootstrap.hxx" +#include "rtl/strbuf.hxx" +#include "rtl/ustrbuf.hxx" +#include "sal/types.h" +#include "svtools/colorcfg.hxx" +#include "svtools/imagemgr.hxx" +#include "svtools/langhelp.hxx" +#include "svtools/miscopt.hxx" +#include "tools/urlobj.hxx" +#include "unotools/dynamicmenuoptions.hxx" +#include "unotools/historyoptions.hxx" +#include "vcl/menu.hxx" +#include "vcl/metric.hxx" +#include "vcl/mnemonic.hxx" +#include "vcl/svapp.hxx" +#include "vcl/syswin.hxx" +#include "vcl/virdev.hxx" +#include <algorithm> +#include <boost/bind.hpp> +#include <boost/utility.hpp> +#include <com/sun/star/awt/Command.hpp> +#include <com/sun/star/awt/ContainerWindowProvider.hpp> +#include <com/sun/star/awt/DeviceInfo.hpp> +#include <com/sun/star/awt/ImageDrawMode.hpp> +#include <com/sun/star/awt/Key.hpp> +#include <com/sun/star/awt/KeyEvent.hpp> +#include <com/sun/star/awt/KeyModifier.hpp> +#include <com/sun/star/awt/MenuItemStyle.hpp> +#include <com/sun/star/awt/Point.hpp> +#include <com/sun/star/awt/PopupMenu.hpp> +#include <com/sun/star/awt/PopupMenuDirection.hpp> +#include <com/sun/star/awt/PosSize.hpp> +#include <com/sun/star/awt/Rectangle.hpp> +#include <com/sun/star/awt/Size.hpp> +#include <com/sun/star/awt/Toolkit.hpp> +#include <com/sun/star/awt/VclWindowPeerAttribute.hpp> +#include <com/sun/star/awt/WindowAttribute.hpp> +#include <com/sun/star/awt/WindowDescriptor.hpp> +#include <com/sun/star/awt/XContainerWindowEventHandler.hpp> +#include <com/sun/star/awt/XControl.hpp> +#include <com/sun/star/awt/XControlModel.hpp> +#include <com/sun/star/awt/XDataTransferProviderAccess.hpp> +#include <com/sun/star/awt/XDevice.hpp> +#include <com/sun/star/awt/XDockableWindow.hpp> +#include <com/sun/star/awt/XDockableWindowListener.hpp> +#include <com/sun/star/awt/XGraphics2.hpp> +#include <com/sun/star/awt/XLayoutConstrains.hpp> +#include <com/sun/star/awt/XMenuBar.hpp> +#include <com/sun/star/awt/XSystemDependentMenuPeer.hpp> +#include <com/sun/star/awt/XSystemDependentWindowPeer.hpp> +#include <com/sun/star/awt/XTopWindow.hpp> +#include <com/sun/star/awt/XVclWindowPeer.hpp> +#include <com/sun/star/awt/XWindow.hpp> +#include <com/sun/star/awt/XWindow2.hpp> +#include <com/sun/star/awt/XWindowListener.hpp> +#include <com/sun/star/awt/XWindowPeer.hpp> +#include <com/sun/star/beans/NamedValue.hpp> +#include <com/sun/star/beans/Property.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/beans/PropertyState.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/beans/UnknownPropertyException.hpp> +#include <com/sun/star/beans/XMaterialHolder.hpp> +#include <com/sun/star/beans/XMultiHierarchicalPropertySet.hpp> +#include <com/sun/star/beans/XProperty.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/configuration/CorruptedUIConfigurationException.hpp> +#include <com/sun/star/configuration/theDefaultProvider.hpp> +#include <com/sun/star/container/ElementExistException.hpp> +#include <com/sun/star/container/NoSuchElementException.hpp> +#include <com/sun/star/container/XContainer.hpp> +#include <com/sun/star/container/XContainerQuery.hpp> +#include <com/sun/star/container/XEnumeration.hpp> +#include <com/sun/star/container/XHierarchicalNameAccess.hpp> +#include <com/sun/star/container/XIndexAccess.hpp> +#include <com/sun/star/container/XIndexContainer.hpp> +#include <com/sun/star/container/XNameAccess.hpp> +#include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/container/XNameReplace.hpp> +#include <com/sun/star/container/XNamed.hpp> +#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> +#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> +#include <com/sun/star/document/AmbigousFilterRequest.hpp> +#include <com/sun/star/document/FilterOptionsRequest.hpp> +#include <com/sun/star/document/LockedDocumentRequest.hpp> +#include <com/sun/star/document/MacroExecMode.hpp> +#include <com/sun/star/document/UpdateDocMode.hpp> +#include <com/sun/star/document/XActionLockable.hpp> +#include <com/sun/star/document/XDocumentLanguages.hpp> +#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> +#include <com/sun/star/document/XDocumentRecovery.hpp> +#include <com/sun/star/document/XInteractionFilterOptions.hpp> +#include <com/sun/star/document/XInteractionFilterSelect.hpp> +#include <com/sun/star/document/XTypeDetection.hpp> +#include <com/sun/star/embed/ElementModes.hpp> +#include <com/sun/star/embed/FileSystemStorageFactory.hpp> +#include <com/sun/star/embed/VerbAttributes.hpp> +#include <com/sun/star/embed/XPackageStructureCreator.hpp> +#include <com/sun/star/embed/XTransactedObject.hpp> +#include <com/sun/star/frame/AppDispatchProvider.hpp> +#include <com/sun/star/frame/AutoRecovery.hpp> +#include <com/sun/star/frame/CommandGroup.hpp> +#include <com/sun/star/frame/ContentHandlerFactory.hpp> +#include <com/sun/star/frame/Desktop.hpp> +#include <com/sun/star/frame/DispatchHelper.hpp> +#include <com/sun/star/frame/DispatchResultState.hpp> +#include <com/sun/star/frame/Frame.hpp> +#include <com/sun/star/frame/FrameAction.hpp> +#include <com/sun/star/frame/FrameLoaderFactory.hpp> +#include <com/sun/star/frame/FrameSearchFlag.hpp> +#include <com/sun/star/frame/GlobalEventBroadcaster.hpp> +#include <com/sun/star/frame/LayoutManager.hpp> +#include <com/sun/star/frame/LayoutManagerEvents.hpp> +#include <com/sun/star/frame/ModuleManager.hpp> +#include <com/sun/star/frame/OfficeFrameLoader.hpp> +#include <com/sun/star/frame/PopupMenuControllerFactory.hpp> +#include <com/sun/star/frame/StartModule.hpp> +#include <com/sun/star/frame/StatusbarControllerFactory.hpp> +#include <com/sun/star/frame/TaskCreator.hpp> +#include <com/sun/star/frame/ToolbarControllerFactory.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> +#include <com/sun/star/frame/XComponentLoader.hpp> +#include <com/sun/star/frame/XControlNotificationListener.hpp> +#include <com/sun/star/frame/XController.hpp> +#include <com/sun/star/frame/XDesktop.hpp> +#include <com/sun/star/frame/XDispatch.hpp> +#include <com/sun/star/frame/XDispatchProvider.hpp> +#include <com/sun/star/frame/XFrame.hpp> +#include <com/sun/star/frame/XFrameLoader.hpp> +#include <com/sun/star/frame/XFramesSupplier.hpp> +#include <com/sun/star/frame/XInterceptorInfo.hpp> +#include <com/sun/star/frame/XLayoutManager.hpp> +#include <com/sun/star/frame/XLayoutManager2.hpp> +#include <com/sun/star/frame/XLoadable.hpp> +#include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/frame/XModel2.hpp> +#include <com/sun/star/frame/XModule.hpp> +#include <com/sun/star/frame/XModuleManager.hpp> +#include <com/sun/star/frame/XNotifyingDispatch.hpp> +#include <com/sun/star/frame/XPopupMenuController.hpp> +#include <com/sun/star/frame/XStorable.hpp> +#include <com/sun/star/frame/XSynchronousFrameLoader.hpp> +#include <com/sun/star/frame/XTerminateListener2.hpp> +#include <com/sun/star/frame/XTitle.hpp> +#include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> +#include <com/sun/star/frame/XToolbarController.hpp> +#include <com/sun/star/frame/status/ItemState.hpp> +#include <com/sun/star/frame/status/ItemStatus.hpp> +#include <com/sun/star/frame/status/Visibility.hpp> +#include <com/sun/star/graphic/GraphicType.hpp> +#include <com/sun/star/graphic/XGraphic.hpp> +#include <com/sun/star/i18n/ScriptType.hpp> +#include <com/sun/star/io/XActiveDataSource.hpp> +#include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/io/XSeekable.hpp> +#include <com/sun/star/io/XStream.hpp> +#include <com/sun/star/io/XTruncate.hpp> +#include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/lang/IllegalArgumentException.hpp> +#include <com/sun/star/lang/SystemDependent.hpp> +#include <com/sun/star/lang/WrappedTargetException.hpp> +#include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XEventListener.hpp> +#include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XMultiComponentFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/linguistic2/XLanguageGuessing.hpp> +#include <com/sun/star/style/XStyleFamiliesSupplier.hpp> +#include <com/sun/star/task/ErrorCodeRequest.hpp> +#include <com/sun/star/task/InteractionHandler.hpp> +#include <com/sun/star/task/JobExecutor.hpp> +#include <com/sun/star/task/StatusIndicatorFactory.hpp> +#include <com/sun/star/task/XAsyncJob.hpp> +#include <com/sun/star/task/XInteractionAbort.hpp> +#include <com/sun/star/task/XInteractionApprove.hpp> +#include <com/sun/star/task/XInteractionHandler.hpp> +#include <com/sun/star/task/XJob.hpp> +#include <com/sun/star/task/XJobExecutor.hpp> +#include <com/sun/star/task/XStatusIndicator.hpp> +#include <com/sun/star/task/XStatusIndicatorFactory.hpp> +#include <com/sun/star/task/XStatusIndicatorSupplier.hpp> +#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> +#include <com/sun/star/ucb/InteractiveIOException.hpp> +#include <com/sun/star/ucb/NameClash.hpp> +#include <com/sun/star/ucb/UniversalContentBroker.hpp> +#include <com/sun/star/ucb/XContentProviderManager.hpp> +#include <com/sun/star/ui/ConfigurationEvent.hpp> +#include <com/sun/star/ui/DockingArea.hpp> +#include <com/sun/star/ui/DocumentAcceleratorConfiguration.hpp> +#include <com/sun/star/ui/GlobalAcceleratorConfiguration.hpp> +#include <com/sun/star/ui/ImageType.hpp> +#include <com/sun/star/ui/ItemStyle.hpp> +#include <com/sun/star/ui/ItemType.hpp> +#include <com/sun/star/ui/ModuleAcceleratorConfiguration.hpp> +#include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> +#include <com/sun/star/ui/UIElementFactoryManager.hpp> +#include <com/sun/star/ui/UIElementType.hpp> +#include <com/sun/star/ui/WindowStateConfiguration.hpp> +#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> +#include <com/sun/star/ui/XStatusbarItem.hdl> +#include <com/sun/star/ui/XUIConfiguration.hpp> +#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> +#include <com/sun/star/ui/XUIConfigurationPersistence.hpp> +#include <com/sun/star/ui/XUIElement.hpp> +#include <com/sun/star/ui/XUIElementSettings.hpp> +#include <com/sun/star/ui/XUIFunctionListener.hpp> +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Exception.hpp> +#include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/uno/XCurrentContext.hpp> +#include <com/sun/star/uri/XUriReference.hpp> +#include <com/sun/star/uri/XUriReferenceFactory.hpp> +#include <com/sun/star/util/Color.hpp> +#include <com/sun/star/util/PathSettings.hpp> +#include <com/sun/star/util/PathSubstitution.hpp> +#include <com/sun/star/util/URL.hpp> +#include <com/sun/star/util/URLTransformer.hpp> +#include <com/sun/star/util/XChangesBatch.hpp> +#include <com/sun/star/util/XChangesNotifier.hpp> +#include <com/sun/star/util/XCloseBroadcaster.hpp> +#include <com/sun/star/util/XCloseable.hpp> +#include <com/sun/star/util/XMacroExpander.hpp> +#include <com/sun/star/util/XModifiable.hpp> +#include <com/sun/star/util/XModifyBroadcaster.hpp> +#include <com/sun/star/util/XStringWidth.hpp> +#include <com/sun/star/util/XURLTransformer.hpp> +#include <com/sun/star/xml/sax/InputSource.hpp> +#include <com/sun/star/xml/sax/Parser.hpp> +#include <com/sun/star/xml/sax/Writer.hpp> +#include <com/sun/star/xml/sax/XAttributeList.hpp> +#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> +#include <com/sun/star/xml/sax/XParser.hpp> +#include <comphelper/attributelist.hxx> +#include <comphelper/configuration.hxx> +#include <comphelper/configurationhelper.hxx> +#include <comphelper/enumhelper.hxx> +#include <comphelper/extract.hxx> +#include <comphelper/interaction.hxx> +#include <comphelper/mediadescriptor.hxx> +#include <comphelper/namedvaluecollection.hxx> +#include <comphelper/processfactory.hxx> +#include <comphelper/sequence.hxx> +#include <comphelper/sequenceashashmap.hxx> +#include <comphelper/sequenceasvector.hxx> +#include <comphelper/string.hxx> +#include <comphelper/uno3.hxx> +#include <config_features.h> +#include <cppuhelper/exc_hlp.hxx> +#include <cppuhelper/factory.hxx> +#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/proptypehlp.hxx> +#include <cppuhelper/queryinterface.hxx> +#include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/weak.hxx> +#include <functional> +#include <i18nlangtag/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> +#include <map> +#include <osl/diagnose.h> +#include <osl/file.hxx> +#include <osl/mutex.hxx> +#include <osl/process.h> +#include <osl/security.hxx> +#include <osl/socket.hxx> +#include <osl/thread.h> +#include <osl/time.h> +#include <rtl/bootstrap.hxx> +#include <rtl/instance.hxx> +#include <rtl/logfile.h> +#include <rtl/logfile.hxx> +#include <rtl/strbuf.hxx> +#include <rtl/string.h> +#include <rtl/string.hxx> +#include <rtl/uri.hxx> +#include <rtl/ustrbuf.hxx> +#include <rtl/ustring.hxx> +#include <sal/macros.h> +#include <set> +#include <sot/filelist.hxx> +#include <stdio.h> +#include <string.h> +#include <svl/documentlockfile.hxx> +#include <svl/imageitm.hxx> +#include <svl/languageoptions.hxx> +#include <svl/urihelper.hxx> +#include <svtools/acceleratorexecute.hxx> +#include <svtools/colorcfg.hxx> +#include <svtools/framestatuslistener.hxx> +#include <svtools/imagemgr.hxx> +#include <svtools/imgdef.hxx> +#include <svtools/javainteractionhandler.hxx> +#include <svtools/langtab.hxx> +#include <svtools/menuoptions.hxx> +#include <svtools/miscopt.hxx> +#include <svtools/sfxecode.hxx> +#include <svtools/statusbarcontroller.hxx> +#include <svtools/toolboxcontroller.hxx> +#include <svtools/transfer.hxx> +#include <toolkit/awt/vclxmenu.hxx> +#include <toolkit/awt/vclxwindow.hxx> +#include <toolkit/helper/convert.hxx> +#include <toolkit/helper/vclunohelper.hxx> +#include <tools/debug.hxx> +#include <tools/diagnose_ex.h> +#include <tools/errinf.hxx> +#include <tools/gen.hxx> +#include <tools/rcid.h> +#include <tools/resmgr.hxx> +#include <tools/solar.h> +#include <tools/stream.hxx> +#include <tools/string.hxx> +#include <tools/urlobj.hxx> +#include <tools/wintypes.hxx> +#include <tools/wldcrd.hxx> +#include <ucbhelper/content.hxx> +#include <uno/current_context.hxx> +#include <unotools/bootstrap.hxx> +#include <unotools/cmdoptions.hxx> +#include <unotools/configitem.hxx> +#include <unotools/configmgr.hxx> +#include <unotools/configpaths.hxx> +#include <unotools/historyoptions.hxx> +#include <unotools/localfilehelper.hxx> +#include <unotools/moduleoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/streamwrap.hxx> +#include <unotools/tempfile.hxx> +#include <unotools/ucbhelper.hxx> +#include <unotools/ucbstreamhelper.hxx> +#include <vcl/bitmap.hxx> +#include <vcl/cmdevt.hxx> +#include <vcl/combobox.hxx> +#include <vcl/dockingarea.hxx> +#include <vcl/graph.hxx> +#include <vcl/graphicfilter.hxx> +#include <vcl/i18nhelp.hxx> +#include <vcl/image.hxx> +#include <vcl/keycod.hxx> +#include <vcl/menu.hxx> +#include <vcl/mnemonic.hxx> +#include <vcl/msgbox.hxx> +#include <vcl/pngread.hxx> +#include <vcl/pngwrite.hxx> +#include <vcl/status.hxx> +#include <vcl/svapp.hxx> +#include <vcl/syswin.hxx> +#include <vcl/taskpanelist.hxx> +#include <vcl/toolbox.hxx> +#include <vcl/wall.hxx> +#include <vcl/window.hxx> +#include <vcl/wrkwin.hxx> +#include <vector> +#include <wchar.h> + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 6518d5fed2e4..1c00f2bc7b08 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -265,7 +265,7 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); ++nPos ) { sal_uInt16 nId = pMenu->GetItemId(nPos); - PopupMenu* pPopup = pMenu->GetPopupMenu(nId); + ::PopupMenu* pPopup = pMenu->GetPopupMenu(nId); if ( pPopup ) impl_setAccelerators( (Menu *)pPopup, aAccel ); else if ( nId && !pMenu->GetPopupMenu(nId)) diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 6f426bc69d12..c357e85cb6ae 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -52,6 +52,8 @@ using namespace com::sun::star::container; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::ui; +#undef WINDOWSTATE_MASK_POS + //_________________________________________________________________________________________________________________ // Namespace //_________________________________________________________________________________________________________________ diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index fc6ad416e93f..386fda57385f 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -324,7 +324,7 @@ MenuToolbarController::~MenuToolbarController() } -class Toolbarmenu : public PopupMenu +class Toolbarmenu : public ::PopupMenu { public: Toolbarmenu(); diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index 9a766a14b48f..8b7c899e7ab8 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -112,7 +112,7 @@ throw (::com::sun::star::uno::RuntimeException) ( m_eStyle == STYLE_TOGGLE_DROPDOWNBUTTON )) { // create popup menu - PopupMenu aPopup; + ::PopupMenu aPopup; const sal_uInt32 nCount = m_aDropdownMenuList.size(); for ( sal_uInt32 i = 0; i < nCount; i++ ) { diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 5f1637b516d0..7d22760eed31 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1619,11 +1619,11 @@ void ToolBarManager::ImplClearPopupMenu( ToolBox *pToolBar ) if ( m_bDisposed ) return; - PopupMenu *pMenu = pToolBar->GetMenu(); + ::PopupMenu *pMenu = pToolBar->GetMenu(); // remove config entries from menu, so we have a clean menu to start with // remove submenu first - PopupMenu* pItemMenu = pMenu->GetPopupMenu( 1 ); + ::PopupMenu* pItemMenu = pMenu->GetPopupMenu( 1 ); if( pItemMenu ) { pItemMenu->Clear(); @@ -1692,12 +1692,12 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const return true; } -PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar) +::PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar) { // update the list of hidden tool items first pToolBar->UpdateCustomMenu(); - PopupMenu *pMenu = pToolBar->GetMenu(); + ::PopupMenu *pMenu = pToolBar->GetMenu(); // remove all entries before inserting new ones ImplClearPopupMenu( pToolBar ); // No config menu entries if command ".uno:ConfigureDialog" is not enabled @@ -1717,12 +1717,12 @@ PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar) // popup menu for quick customization sal_Bool bHideDisabledEntries = !SvtMenuOptions().IsEntryHidingEnabled(); - PopupMenu aPopupMenu( FwkResId( POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION )); + ::PopupMenu aPopupMenu( FwkResId( POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION )); if ( m_pToolBar->IsCustomize() ) { sal_uInt16 nPos( 0 ); - PopupMenu* pItemMenu( aPopupMenu.GetPopupMenu( 1 )); + ::PopupMenu* pItemMenu( aPopupMenu.GetPopupMenu( 1 )); sal_Bool bIsFloating( sal_False ); @@ -1794,7 +1794,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar) if( aPopupMenu.GetPopupMenu( 1 ) ) { // create an own submenu to avoid auto-delete when resource menu is deleted - PopupMenu *pItemMenu = new PopupMenu(); + ::PopupMenu *pItemMenu = new ::PopupMenu(); for( i=0; i< aPopupMenu.GetPopupMenu( 1 )->GetItemCount(); i++) pItemMenu->CopyItem( *aPopupMenu.GetPopupMenu( 1 ), i, MENU_APPEND ); @@ -1817,7 +1817,7 @@ IMPL_LINK( ToolBarManager, Command, CommandEvent*, pCmdEvt ) if ( pCmdEvt->GetCommand() != COMMAND_CONTEXTMENU ) return 0; - PopupMenu * pMenu = GetToolBarCustomMenu(m_pToolBar); + ::PopupMenu * pMenu = GetToolBarCustomMenu(m_pToolBar); if (pMenu) { // make sure all disabled entries will be shown |