diff options
120 files changed, 268 insertions, 1617 deletions
diff --git a/cui/inc/pch/precompiled_cui.cxx b/cui/inc/pch/precompiled_cui.cxx deleted file mode 100644 index 6fc161f77..000000000 --- a/cui/inc/pch/precompiled_cui.cxx +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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. - * - ************************************************************************/ - -#include "precompiled_cui.hxx" - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx deleted file mode 100644 index da8c76e72..000000000 --- a/cui/inc/pch/precompiled_cui.hxx +++ /dev/null @@ -1,960 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:08.279739 -#if 0 -#ifdef PRECOMPILED_HEADERS -//---MARKER--- -#include "avmedia/mediaitem.hxx" -#include "avmedia/mediawindow.hxx" -#include "basegfx/matrix/b2dhommatrix.hxx" -#include "basegfx/numeric/ftools.hxx" -#include "basegfx/point/b2dpoint.hxx" -#include "basegfx/point/b3dpoint.hxx" -#include "basegfx/polygon/b2dlinegeometry.hxx" -#include "basegfx/polygon/b2dpolygon.hxx" -#include "basegfx/polygon/b2dpolygontools.hxx" -#include "basegfx/polygon/b2dpolypolygon.hxx" -#include "basegfx/polygon/b2dpolypolygontools.hxx" -#include "basegfx/polygon/b3dpolygon.hxx" -#include "basegfx/polygon/b3dpolypolygon.hxx" -#include "basegfx/polygon/b3dpolypolygontools.hxx" -#include "basegfx/range/b2drange.hxx" -#include "basegfx/vector/b2dvector.hxx" -#include "basegfx/vector/b3dvector.hxx" -#include "basic/basmgr.hxx" -#include "basic/sbmod.hxx" -#include "basic/sbuno.hxx" -#include "basic/sbx.hxx" -#include "basic/sbxvar.hxx" -#include "boost/scoped_ptr.hpp" -#include "boost/shared_ptr.hpp" -#include "boost/spirit/core.hpp" -#include "com/sun/star/accessibility/AccessibleEventId.hpp" -#include "com/sun/star/accessibility/AccessibleEventObject.hpp" -#include "com/sun/star/accessibility/AccessibleRelationType.hpp" -#include "com/sun/star/accessibility/AccessibleRole.hpp" -#include "com/sun/star/accessibility/AccessibleStateType.hpp" -#include "com/sun/star/accessibility/AccessibleTextType.hpp" -#include "com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp" -#include "com/sun/star/accessibility/TextSegment.hpp" -#include "com/sun/star/accessibility/XAccessible.hpp" -#include "com/sun/star/accessibility/XAccessibleAction.hpp" -#include "com/sun/star/accessibility/XAccessibleContext.hpp" -#include "com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp" -#include "com/sun/star/accessibility/XAccessibleEventListener.hpp" -#include "com/sun/star/accessibility/XAccessibleImage.hpp" -#include "com/sun/star/accessibility/XAccessibleRelationSet.hpp" -#include "com/sun/star/accessibility/XAccessibleSelection.hpp" -#include "com/sun/star/accessibility/XAccessibleStateSet.hpp" -#include "com/sun/star/accessibility/XAccessibleTable.hpp" -#include "com/sun/star/accessibility/XAccessibleTextAttributes.hpp" -#include "com/sun/star/accessibility/XAccessibleValue.hpp" -#include "com/sun/star/awt/CharSet.hpp" -#include "com/sun/star/awt/FocusChangeReason.hpp" -#include "com/sun/star/awt/FontDescriptor.hpp" -#include "com/sun/star/awt/FontFamily.hpp" -#include "com/sun/star/awt/FontPitch.hpp" -#include "com/sun/star/awt/FontSlant.hpp" -#include "com/sun/star/awt/FontType.hpp" -#include "com/sun/star/awt/FontWeight.hpp" -#include "com/sun/star/awt/FontWidth.hpp" -#include "com/sun/star/awt/Gradient.hpp" -#include "com/sun/star/awt/GradientStyle.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/LineEndFormat.hpp" -#include "com/sun/star/awt/PosSize.hpp" -#include "com/sun/star/awt/RasterOperation.hpp" -#include "com/sun/star/awt/Rectangle.hpp" -#include "com/sun/star/awt/ScrollBarOrientation.hpp" -#include "com/sun/star/awt/SimpleFontMetric.hpp" -#include "com/sun/star/awt/Size.hpp" -#include "com/sun/star/awt/TextAlign.hpp" -#include "com/sun/star/awt/VisualEffect.hpp" -#include "com/sun/star/awt/WindowAttribute.hpp" -#include "com/sun/star/awt/WindowDescriptor.hpp" -#include "com/sun/star/awt/XBitmap.hpp" -#include "com/sun/star/awt/XCheckBox.hpp" -#include "com/sun/star/awt/XComboBox.hpp" -#include "com/sun/star/awt/XControl.hpp" -#include "com/sun/star/awt/XControlContainer.hpp" -#include "com/sun/star/awt/XControlModel.hpp" -#include "com/sun/star/awt/XDevice.hpp" -#include "com/sun/star/awt/XFocusListener.hpp" -#include "com/sun/star/awt/XFont.hpp" -#include "com/sun/star/awt/XGraphics.hpp" -#include "com/sun/star/awt/XImageConsumer.hpp" -#include "com/sun/star/awt/XItemListener.hpp" -#include "com/sun/star/awt/XLayoutConstrains.hpp" -#include "com/sun/star/awt/XListBox.hpp" -#include "com/sun/star/awt/XMouseListener.hpp" -#include "com/sun/star/awt/XProgressMonitor.hpp" -#include "com/sun/star/awt/XTabController.hpp" -#include "com/sun/star/awt/XTabControllerModel.hpp" -#include "com/sun/star/awt/XTextListener.hpp" -#include "com/sun/star/awt/XToolkit.hpp" -#include "com/sun/star/awt/XVclWindowPeer.hpp" -#include "com/sun/star/awt/XWindow.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/PropertyAttribute.hpp" -#include "com/sun/star/beans/PropertyChangeEvent.hpp" -#include "com/sun/star/beans/PropertyState.hpp" -#include "com/sun/star/beans/PropertyValue.hpp" -#include "com/sun/star/beans/PropertyValues.hdl" -#include "com/sun/star/beans/PropertyValues.hpp" -#include "com/sun/star/beans/XFastPropertySet.hpp" -#include "com/sun/star/beans/XIntrospection.hpp" -#include "com/sun/star/beans/XMultiPropertySet.hpp" -#include "com/sun/star/beans/XMultiPropertyStates.hpp" -#include "com/sun/star/beans/XPropertyChangeListener.hpp" -#include "com/sun/star/beans/XPropertySet.hpp" -#include "com/sun/star/beans/XPropertySetInfo.hpp" -#include "com/sun/star/beans/XPropertyState.hpp" -#include "com/sun/star/chart/ChartAxisArrangeOrderType.hpp" -#include "com/sun/star/container/ContainerEvent.hpp" -#include "com/sun/star/container/NoSuchElementException.hpp" -#include "com/sun/star/container/XChild.hpp" -#include "com/sun/star/container/XContainer.hpp" -#include "com/sun/star/container/XContainerListener.hpp" -#include "com/sun/star/container/XContainerQuery.hpp" -#include "com/sun/star/container/XContentEnumerationAccess.hpp" -#include "com/sun/star/container/XEnumeration.hpp" -#include "com/sun/star/container/XEnumerationAccess.hpp" -#include "com/sun/star/container/XHierarchicalNameAccess.hpp" -#include "com/sun/star/container/XIdentifierContainer.hpp" -#include "com/sun/star/container/XIndexAccess.hpp" -#include "com/sun/star/container/XIndexContainer.hpp" -#include "com/sun/star/container/XIndexReplace.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/container/XSet.hpp" -#include "com/sun/star/datatransfer/DataFlavor.hpp" -#include "com/sun/star/datatransfer/XTransferable.hpp" -#include "com/sun/star/datatransfer/clipboard/XClipboard.hpp" -#include "com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp" -#include "com/sun/star/datatransfer/dnd/DNDConstants.hpp" -#include "com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp" -#include "com/sun/star/datatransfer/dnd/XDropTarget.hpp" -#include "com/sun/star/document/EventObject.hpp" -#include "com/sun/star/document/UpdateDocMode.hpp" -#include "com/sun/star/document/XActionLockable.hpp" -#include "com/sun/star/document/XBinaryStreamResolver.hpp" -#include "com/sun/star/document/XDocumentInfoSupplier.hpp" -#include "com/sun/star/document/XEmbeddedObjectResolver.hpp" -#include "com/sun/star/document/XEventBroadcaster.hpp" -#include "com/sun/star/document/XEventListener.hpp" -#include "com/sun/star/document/XEventsSupplier.hpp" -#include "com/sun/star/document/XExporter.hpp" -#include "com/sun/star/document/XFilter.hpp" -#include "com/sun/star/document/XGraphicObjectResolver.hpp" -#include "com/sun/star/document/XImporter.hpp" -#include "com/sun/star/document/XLinkTargetSupplier.hpp" -#include "com/sun/star/document/XMimeTypeInfo.hpp" -#include "com/sun/star/drawing/BitmapMode.hpp" -#include "com/sun/star/drawing/CameraGeometry.hpp" -#include "com/sun/star/drawing/CircleKind.hpp" -#include "com/sun/star/drawing/ColorMode.hpp" -#include "com/sun/star/drawing/ConnectionType.hpp" -#include "com/sun/star/drawing/ConnectorType.hpp" -#include "com/sun/star/drawing/DashStyle.hpp" -#include "com/sun/star/drawing/Direction3D.hpp" -#include "com/sun/star/drawing/DoubleSequence.hpp" -#include "com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp" -#include "com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp" -#include "com/sun/star/drawing/EnhancedCustomShapeParameter.hpp" -#include "com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp" -#include "com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp" -#include "com/sun/star/drawing/EnhancedCustomShapeSegment.hpp" -#include "com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp" -#include "com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp" -#include "com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp" -#include "com/sun/star/drawing/FillStyle.hpp" -#include "com/sun/star/drawing/FlagSequence.hpp" -#include "com/sun/star/drawing/Hatch.hpp" -#include "com/sun/star/drawing/HomogenMatrix.hpp" -#include "com/sun/star/drawing/HomogenMatrix3.hpp" -#include "com/sun/star/drawing/LineDash.hpp" -#include "com/sun/star/drawing/LineJoint.hpp" -#include "com/sun/star/drawing/LineStyle.hpp" -#include "com/sun/star/drawing/MeasureKind.hpp" -#include "com/sun/star/drawing/MeasureTextHorzPos.hpp" -#include "com/sun/star/drawing/MeasureTextVertPos.hpp" -#include "com/sun/star/drawing/NormalsKind.hpp" -#include "com/sun/star/drawing/PolyPolygonShape3D.hpp" -#include "com/sun/star/drawing/PolygonFlags.hpp" -#include "com/sun/star/drawing/PolygonKind.hpp" -#include "com/sun/star/drawing/Position3D.hpp" -#include "com/sun/star/drawing/ProjectionMode.hpp" -#include "com/sun/star/drawing/RectanglePoint.hpp" -#include "com/sun/star/drawing/ShadeMode.hpp" -#include "com/sun/star/drawing/TextAdjust.hpp" -#include "com/sun/star/drawing/TextAnimationDirection.hpp" -#include "com/sun/star/drawing/TextAnimationKind.hpp" -#include "com/sun/star/drawing/TextFitToSizeType.hpp" -#include "com/sun/star/drawing/TextHorizontalAdjust.hpp" -#include "com/sun/star/drawing/TextVerticalAdjust.hpp" -#include "com/sun/star/drawing/TextureKind.hpp" -#include "com/sun/star/drawing/TextureMode.hpp" -#include "com/sun/star/drawing/TextureProjectionMode.hpp" -#include "com/sun/star/drawing/XGluePointsSupplier.hpp" -#include "com/sun/star/drawing/XShapeDescriptor.hpp" -#include "com/sun/star/embed/Aspects.hpp" -#include "com/sun/star/embed/ElementModes.hpp" -#include "com/sun/star/embed/EmbedMisc.hpp" -#include "com/sun/star/embed/EmbedStates.hpp" -#include "com/sun/star/embed/EntryInitModes.hpp" -#include "com/sun/star/embed/NoVisualAreaSizeException.hpp" -#include "com/sun/star/embed/XEmbedObjectCreator.hpp" -#include "com/sun/star/embed/XEmbedObjectFactory.hpp" -#include "com/sun/star/embed/XEmbedPersist.hpp" -#include "com/sun/star/embed/XEmbeddedObject.hpp" -#include "com/sun/star/embed/XInsertObjectDialog.hpp" -#include "com/sun/star/embed/XLinkageSupport.hpp" -#include "com/sun/star/embed/XStorage.hpp" -#include "com/sun/star/embed/XTransactedObject.hpp" -#include "com/sun/star/form/DatabaseDeleteEvent.hpp" -#include "com/sun/star/form/DatabaseParameterEvent.hpp" -#include "com/sun/star/form/ErrorEvent.hpp" -#include "com/sun/star/form/FormButtonType.hpp" -#include "com/sun/star/form/FormComponentType.hpp" -#include "com/sun/star/form/ListSourceType.hpp" -#include "com/sun/star/form/NavigationBarMode.hpp" -#include "com/sun/star/form/TabulatorCycle.hpp" -#include "com/sun/star/form/XBoundComponent.hpp" -#include "com/sun/star/form/XBoundControl.hpp" -#include "com/sun/star/form/XConfirmDeleteBroadcaster.hpp" -#include "com/sun/star/form/XConfirmDeleteListener.hpp" -#include "com/sun/star/form/XDatabaseParameterBroadcaster2.hpp" -#include "com/sun/star/form/XDatabaseParameterListener.hpp" -#include "com/sun/star/form/XForm.hpp" -#include "com/sun/star/form/XFormComponent.hpp" -#include "com/sun/star/form/XFormController.hpp" -#include "com/sun/star/form/XFormControllerListener.hpp" -#include "com/sun/star/form/XFormsSupplier.hpp" -#include "com/sun/star/form/XFormsSupplier2.hpp" -#include "com/sun/star/form/XGrid.hpp" -#include "com/sun/star/form/XGridColumnFactory.hpp" -#include "com/sun/star/form/XGridFieldDataSupplier.hpp" -#include "com/sun/star/form/XGridPeer.hpp" -#include "com/sun/star/form/XImageProducerSupplier.hpp" -#include "com/sun/star/form/XLoadListener.hpp" -#include "com/sun/star/form/XLoadable.hpp" -#include "com/sun/star/form/XReset.hpp" -#include "com/sun/star/form/XResetListener.hpp" -#include "com/sun/star/form/binding/XBindableValue.hpp" -#include "com/sun/star/form/binding/XListEntrySink.hpp" -#include "com/sun/star/form/binding/XValueBinding.hpp" -#include "com/sun/star/form/submission/XSubmissionSupplier.hpp" -#include "com/sun/star/form/validation/XFormComponentValidityListener.hpp" -#include "com/sun/star/form/validation/XValidatableFormComponent.hpp" -#include "com/sun/star/frame/DispatchDescriptor.hpp" -#include "com/sun/star/frame/DispatchInformation.hpp" -#include "com/sun/star/frame/FeatureStateEvent.hpp" -#include "com/sun/star/frame/FrameSearchFlag.hpp" -#include "com/sun/star/frame/XComponentLoader.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/XDispatchInformationProvider.hpp" -#include "com/sun/star/frame/XDispatchProvider.hpp" -#include "com/sun/star/frame/XDispatchProviderInterception.hpp" -#include "com/sun/star/frame/XDispatchProviderInterceptor.hpp" -#include "com/sun/star/frame/XFrame.hpp" -#include "com/sun/star/frame/XFrameActionListener.hpp" -#include "com/sun/star/frame/XFrames.hpp" -#include "com/sun/star/frame/XFramesSupplier.hpp" -#include "com/sun/star/frame/XInterceptorInfo.hpp" -#include "com/sun/star/frame/XModel.hpp" -#include "com/sun/star/frame/XModuleManager.hpp" -#include "com/sun/star/frame/XStatusListener.hpp" -#include "com/sun/star/frame/XStorable.hpp" -#include "com/sun/star/frame/XSynchronousDispatch.hpp" -#include "com/sun/star/frame/status/ClipboardFormats.hpp" -#include "com/sun/star/frame/status/FontHeight.hpp" -#include "com/sun/star/frame/status/ItemStatus.hpp" -#include "com/sun/star/frame/status/LeftRightMargin.hpp" -#include "com/sun/star/frame/status/UpperLowerMargin.hpp" -#include "com/sun/star/frame/status/UpperLowerMarginScale.hpp" -#include "com/sun/star/gallery/GalleryItemType.hpp" -#include "com/sun/star/gallery/XGalleryItem.hpp" -#include "com/sun/star/gallery/XGalleryTheme.hpp" -#include "com/sun/star/gallery/XGalleryThemeProvider.hpp" -#include "com/sun/star/graphic/XGraphic.hpp" -#include "com/sun/star/graphic/XGraphicProvider.hpp" -#include "com/sun/star/graphic/XGraphicRenderer.hpp" -#include "com/sun/star/i18n/CharacterIteratorMode.hdl" -#include "com/sun/star/i18n/CharacterIteratorMode.hpp" -#include "com/sun/star/i18n/CollatorOptions.hpp" -#include "com/sun/star/i18n/ForbiddenCharacters.hpp" -#include "com/sun/star/i18n/InputSequenceCheckMode.hpp" -#include "com/sun/star/i18n/KCharacterType.hpp" -#include "com/sun/star/i18n/ScriptType.hdl" -#include "com/sun/star/i18n/ScriptType.hpp" -#include "com/sun/star/i18n/TextConversionOption.hdl" -#include "com/sun/star/i18n/TextConversionOption.hpp" -#include "com/sun/star/i18n/TextConversionType.hpp" -#include "com/sun/star/i18n/TransliterationModules.hpp" -#include "com/sun/star/i18n/UnicodeScript.hpp" -#include "com/sun/star/i18n/UnicodeType.hdl" -#include "com/sun/star/i18n/WordType.hpp" -#include "com/sun/star/i18n/XBreakIterator.hpp" -#include "com/sun/star/i18n/XExtendedInputSequenceChecker.hpp" -#include "com/sun/star/i18n/XExtendedTextConversion.hpp" -#include "com/sun/star/i18n/XForbiddenCharacters.hpp" -#include "com/sun/star/i18n/XTextConversion.hpp" -#include "com/sun/star/inspection/XObjectInspector.hpp" -#include "com/sun/star/inspection/XObjectInspectorModel.hpp" -#include "com/sun/star/io/IOException.hpp" -#include "com/sun/star/io/XActiveDataControl.hpp" -#include "com/sun/star/io/XActiveDataSink.hpp" -#include "com/sun/star/io/XActiveDataSource.hpp" -#include "com/sun/star/io/XInputStream.hpp" -#include "com/sun/star/io/XInputStreamProvider.hpp" -#include "com/sun/star/io/XMarkableStream.hpp" -#include "com/sun/star/io/XObjectInputStream.hpp" -#include "com/sun/star/io/XObjectOutputStream.hpp" -#include "com/sun/star/io/XOutputStream.hpp" -#include "com/sun/star/io/XPersistObject.hpp" -#include "com/sun/star/io/XSeekable.hdl" -#include "com/sun/star/io/XStream.hpp" -#include "com/sun/star/lang/DisposedException.hpp" -#include "com/sun/star/lang/EventObject.hpp" -#include "com/sun/star/lang/IllegalArgumentException.hpp" -#include "com/sun/star/lang/IndexOutOfBoundsException.hpp" -#include "com/sun/star/lang/Locale.hpp" -#include "com/sun/star/lang/NoSupportException.hpp" -#include "com/sun/star/lang/ServiceNotRegisteredException.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/XServiceDisplayName.hpp" -#include "com/sun/star/lang/XServiceInfo.hpp" -#include "com/sun/star/lang/XServiceName.hpp" -#include "com/sun/star/lang/XSingleComponentFactory.hpp" -#include "com/sun/star/lang/XTypeProvider.hpp" -#include "com/sun/star/lang/XUnoTunnel.hpp" -#include "com/sun/star/linguistic2/ConversionDictionaryType.hpp" -#include "com/sun/star/linguistic2/ConversionDirection.hdl" -#include "com/sun/star/linguistic2/ConversionPropertyType.hpp" -#include "com/sun/star/linguistic2/DictionaryEvent.hpp" -#include "com/sun/star/linguistic2/DictionaryEventFlags.hpp" -#include "com/sun/star/linguistic2/DictionaryListEvent.hpp" -#include "com/sun/star/linguistic2/DictionaryListEventFlags.hpp" -#include "com/sun/star/linguistic2/DictionaryType.hpp" -#include "com/sun/star/linguistic2/SpellFailure.hpp" -#include "com/sun/star/linguistic2/XAvailableLocales.hpp" -#include "com/sun/star/linguistic2/XConversionDictionary.hpp" -#include "com/sun/star/linguistic2/XConversionDictionaryList.hpp" -#include "com/sun/star/linguistic2/XConversionPropertyType.hpp" -#include "com/sun/star/linguistic2/XDictionary.hpp" -#include "com/sun/star/linguistic2/XDictionary1.hpp" -#include "com/sun/star/linguistic2/XDictionaryEntry.hpp" -#include "com/sun/star/linguistic2/XDictionaryEventListener.hpp" -#include "com/sun/star/linguistic2/XDictionaryList.hpp" -#include "com/sun/star/linguistic2/XDictionaryListEventListener.hpp" -#include "com/sun/star/linguistic2/XHyphenatedWord.hpp" -#include "com/sun/star/linguistic2/XHyphenator.hpp" -#include "com/sun/star/linguistic2/XLinguServiceManager.hdl" -#include "com/sun/star/linguistic2/XLinguServiceManager.hpp" -#include "com/sun/star/linguistic2/XMeaning.hpp" -#include "com/sun/star/linguistic2/XPossibleHyphens.hpp" -#include "com/sun/star/linguistic2/XSpellAlternatives.hpp" -#include "com/sun/star/linguistic2/XSpellChecker.hpp" -#include "com/sun/star/linguistic2/XSpellChecker1.hpp" -#include "com/sun/star/linguistic2/XSupportedLocales.hpp" -#include "com/sun/star/linguistic2/XThesaurus.hpp" -#include "com/sun/star/media/XPlayer.hpp" -#include "com/sun/star/media/ZoomLevel.hpp" -#include "com/sun/star/plugin/PluginDescription.hpp" -#include "com/sun/star/plugin/XPluginManager.hpp" -#include "com/sun/star/reflection/XIdlClass.hpp" -#include "com/sun/star/reflection/XIdlMethod.hpp" -#include "com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp" -#include "com/sun/star/reflection/XProxyFactory.hpp" -#include "com/sun/star/registry/XRegistryKey.hpp" -#include "com/sun/star/registry/XSimpleRegistry.hpp" -#include "com/sun/star/script/ScriptEvent.hpp" -#include "com/sun/star/script/ScriptEventDescriptor.hpp" -#include "com/sun/star/script/XEventAttacherManager.hpp" -#include "com/sun/star/script/XInvocation.hpp" -#include "com/sun/star/script/XLibraryContainer.hpp" -#include "com/sun/star/script/XScriptListener.hpp" -#include "com/sun/star/script/XTypeConverter.hpp" -#include "com/sun/star/script/browse/BrowseNodeFactoryViewTypes.hpp" -#include "com/sun/star/script/browse/BrowseNodeTypes.hpp" -#include "com/sun/star/script/browse/XBrowseNode.hpp" -#include "com/sun/star/script/browse/XBrowseNodeFactory.hpp" -#include "com/sun/star/script/provider/ScriptErrorRaisedException.hpp" -#include "com/sun/star/script/provider/ScriptExceptionRaisedException.hpp" -#include "com/sun/star/script/provider/ScriptFrameworkErrorType.hpp" -#include "com/sun/star/script/provider/XScriptProvider.hpp" -#include "com/sun/star/script/provider/XScriptProviderSupplier.hpp" -#include "com/sun/star/sdb/CommandType.hpp" -#include "com/sun/star/sdb/ParametersRequest.hpp" -#include "com/sun/star/sdb/RowChangeAction.hpp" -#include "com/sun/star/sdb/RowChangeEvent.hpp" -#include "com/sun/star/sdb/SQLContext.hpp" -#include "com/sun/star/sdb/SQLErrorEvent.hpp" -#include "com/sun/star/sdb/XColumn.hpp" -#include "com/sun/star/sdb/XColumnUpdate.hpp" -#include "com/sun/star/sdb/XCompletedConnection.hpp" -#include "com/sun/star/sdb/XInteractionSupplyParameters.hpp" -#include "com/sun/star/sdb/XQueriesSupplier.hpp" -#include "com/sun/star/sdb/XResultSetAccess.hpp" -#include "com/sun/star/sdb/XRowSetApproveBroadcaster.hpp" -#include "com/sun/star/sdb/XRowSetApproveListener.hpp" -#include "com/sun/star/sdb/XRowSetSupplier.hpp" -#include "com/sun/star/sdb/XSQLErrorBroadcaster.hpp" -#include "com/sun/star/sdb/XSQLErrorListener.hpp" -#include "com/sun/star/sdb/XSQLQueryComposer.hpp" -#include "com/sun/star/sdb/XSQLQueryComposerFactory.hpp" -#include "com/sun/star/sdb/XSingleSelectQueryComposer.hpp" -#include "com/sun/star/sdbc/ColumnValue.hpp" -#include "com/sun/star/sdbc/DataType.hpp" -#include "com/sun/star/sdbc/ResultSetConcurrency.hpp" -#include "com/sun/star/sdbc/ResultSetType.hpp" -#include "com/sun/star/sdbc/XConnection.hpp" -#include "com/sun/star/sdbc/XDataSource.hpp" -#include "com/sun/star/sdbc/XDatabaseMetaData.hpp" -#include "com/sun/star/sdbc/XPreparedStatement.hpp" -#include "com/sun/star/sdbc/XResultSet.hpp" -#include "com/sun/star/sdbc/XResultSetUpdate.hpp" -#include "com/sun/star/sdbc/XRow.hpp" -#include "com/sun/star/sdbc/XRowSet.hpp" -#include "com/sun/star/sdbc/XRowSetListener.hpp" -#include "com/sun/star/sdbc/XStatement.hpp" -#include "com/sun/star/sdbcx/Privilege.hpp" -#include "com/sun/star/sdbcx/XColumnsSupplier.hpp" -#include "com/sun/star/sdbcx/XDataDescriptorFactory.hpp" -#include "com/sun/star/sdbcx/XDeleteRows.hpp" -#include "com/sun/star/sdbcx/XRowLocate.hpp" -#include "com/sun/star/sdbcx/XTablesSupplier.hpp" -#include "com/sun/star/security/XDocumentDigitalSignatures.hpp" -#include "com/sun/star/style/BreakType.hpp" -#include "com/sun/star/style/CaseMap.hpp" -#include "com/sun/star/style/GraphicLocation.hpp" -#include "com/sun/star/style/LineSpacing.hpp" -#include "com/sun/star/style/LineSpacingMode.hpp" -#include "com/sun/star/style/NumberingType.hpp" -#include "com/sun/star/style/PageStyleLayout.hpp" -#include "com/sun/star/style/ParagraphAdjust.hpp" -#include "com/sun/star/style/TabStop.hpp" -#include "com/sun/star/style/VerticalAlignment.hpp" -#include "com/sun/star/style/XStyle.hpp" -#include "com/sun/star/style/XStyleFamiliesSupplier.hpp" -#include "com/sun/star/table/BorderLine.hpp" -#include "com/sun/star/table/CellAddress.hpp" -#include "com/sun/star/table/CellContentType.hpp" -#include "com/sun/star/table/CellHoriJustify.hpp" -#include "com/sun/star/table/CellOrientation.hpp" -#include "com/sun/star/table/CellRangeAddress.hpp" -#include "com/sun/star/table/CellVertJustify.hpp" -#include "com/sun/star/table/ShadowFormat.hpp" -#include "com/sun/star/table/ShadowLocation.hpp" -#include "com/sun/star/table/TableBorder.hpp" -#include "com/sun/star/table/TableOrientation.hpp" -#include "com/sun/star/task/XInteractionHandler.hpp" -#include "com/sun/star/task/XStatusIndicator.hpp" -#include "com/sun/star/task/XStatusIndicatorFactory.hpp" -#include "com/sun/star/text/CharacterCompressionType.hpp" -#include "com/sun/star/text/ControlCharacter.hpp" -#include "com/sun/star/text/FilenameDisplayFormat.hpp" -#include "com/sun/star/text/FontEmphasis.hpp" -#include "com/sun/star/text/GraphicCrop.hpp" -#include "com/sun/star/text/HoriOrientation.hpp" -#include "com/sun/star/text/RelOrientation.hpp" -#include "com/sun/star/text/RubyAdjust.hpp" -#include "com/sun/star/text/TextContentAnchorType.hpp" -#include "com/sun/star/text/VertOrientation.hpp" -#include "com/sun/star/text/WrapTextMode.hpp" -#include "com/sun/star/text/WritingMode.hpp" -#include "com/sun/star/text/WritingMode2.hpp" -#include "com/sun/star/text/XDefaultNumberingProvider.hpp" -#include "com/sun/star/text/XNumberingFormatter.hpp" -#include "com/sun/star/text/XNumberingTypeInfo.hpp" -#include "com/sun/star/text/XRubySelection.hpp" -#include "com/sun/star/text/XSimpleText.hpp" -#include "com/sun/star/text/XText.hpp" -#include "com/sun/star/text/XTextContent.hpp" -#include "com/sun/star/text/XTextCursor.hpp" -#include "com/sun/star/text/XTextField.hdl" -#include "com/sun/star/text/XTextField.hpp" -#include "com/sun/star/text/XTextRange.hpp" -#include "com/sun/star/text/XTextRangeCompare.hpp" -#include "com/sun/star/text/XTextRangeMover.hpp" -#include "com/sun/star/ucb/CommandAbortedException.hpp" -#include "com/sun/star/ucb/NameClash.hpp" -#include "com/sun/star/ucb/NumberedSortingInfo.hpp" -#include "com/sun/star/ucb/TransferInfo.hpp" -#include "com/sun/star/ucb/XAnyCompare.hpp" -#include "com/sun/star/ucb/XAnyCompareFactory.hpp" -#include "com/sun/star/ucb/XCommandEnvironment.hpp" -#include "com/sun/star/ucb/XContent.hpp" -#include "com/sun/star/ucb/XContentAccess.hpp" -#include "com/sun/star/ucb/XContentProvider.hpp" -#include "com/sun/star/ucb/XSimpleFileAccess.hpp" -#include "com/sun/star/ucb/XSortedDynamicResultSetFactory.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/UIElementType.hpp" -#include "com/sun/star/ui/XImageManager.hpp" -#include "com/sun/star/ui/XModuleUIConfigurationManager.hpp" -#include "com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp" -#include "com/sun/star/ui/XUIConfiguration.hpp" -#include "com/sun/star/ui/XUIConfigurationListener.hpp" -#include "com/sun/star/ui/XUIConfigurationManager.hpp" -#include "com/sun/star/ui/XUIConfigurationManagerSupplier.hpp" -#include "com/sun/star/ui/XUIConfigurationPersistence.hpp" -#include "com/sun/star/ui/XUIConfigurationStorage.hpp" -#include "com/sun/star/ui/XUIElement.hpp" -#include "com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp" -#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp" -#include "com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp" -#include "com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp" -#include "com/sun/star/ui/dialogs/ListboxControlActions.hpp" -#include "com/sun/star/ui/dialogs/TemplateDescription.hpp" -#include "com/sun/star/ui/dialogs/XExecutableDialog.hpp" -#include "com/sun/star/ui/dialogs/XFilePicker.hpp" -#include "com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp" -#include "com/sun/star/ui/dialogs/XFilePickerListener.hpp" -#include "com/sun/star/ui/dialogs/XFilePickerNotifier.hpp" -#include "com/sun/star/ui/dialogs/XFilePreview.hpp" -#include "com/sun/star/ui/dialogs/XFilterManager.hpp" -#include "com/sun/star/ui/dialogs/XFolderPicker.hpp" -#include "com/sun/star/uno/Any.h" -#include "com/sun/star/uno/Any.hxx" -#include "com/sun/star/uno/Exception.hpp" -#include "com/sun/star/uno/Reference.h" -#include "com/sun/star/uno/Reference.hxx" -#include "com/sun/star/uno/RuntimeException.hpp" -#include "com/sun/star/uno/Sequence.h" -#include "com/sun/star/uno/Sequence.hxx" -#include "com/sun/star/uno/Type.h" -#include "com/sun/star/uno/XAggregation.hpp" -#include "com/sun/star/uno/XComponentContext.hpp" -#include "com/sun/star/uno/XInterface.hpp" -#include "com/sun/star/uno/XNamingService.hpp" -#include "com/sun/star/util/Date.hpp" -#include "com/sun/star/util/DateTime.hpp" -#include "com/sun/star/util/Language.hpp" -#include "com/sun/star/util/MeasureUnit.hpp" -#include "com/sun/star/util/NumberFormat.hpp" -#include "com/sun/star/util/SearchAlgorithms.hpp" -#include "com/sun/star/util/SearchFlags.hpp" -#include "com/sun/star/util/SearchOptions.hpp" -#include "com/sun/star/util/SearchResult.hpp" -#include "com/sun/star/util/SortField.hpp" -#include "com/sun/star/util/SortFieldType.hpp" -#include "com/sun/star/util/URL.hpp" -#include "com/sun/star/util/XCancellable.hpp" -#include "com/sun/star/util/XChangesBatch.hpp" -#include "com/sun/star/util/XCloneable.hpp" -#include "com/sun/star/util/XCloseable.hpp" -#include "com/sun/star/util/XFlushable.hpp" -#include "com/sun/star/util/XLocalizedAliases.hpp" -#include "com/sun/star/util/XModeChangeBroadcaster.hpp" -#include "com/sun/star/util/XModeChangeListener.hpp" -#include "com/sun/star/util/XModeSelector.hpp" -#include "com/sun/star/util/XModifiable.hpp" -#include "com/sun/star/util/XModifyBroadcaster.hpp" -#include "com/sun/star/util/XModifyListener.hpp" -#include "com/sun/star/util/XNumberFormatTypes.hpp" -#include "com/sun/star/util/XNumberFormats.hpp" -#include "com/sun/star/util/XNumberFormatsSupplier.hpp" -#include "com/sun/star/util/XNumberFormatter.hpp" -#include "com/sun/star/util/XTextSearch.hpp" -#include "com/sun/star/util/XURLTransformer.hpp" -#include "com/sun/star/util/logging/LogLevel.hpp" -#include "com/sun/star/util/logging/XLogger.hpp" -#include "com/sun/star/view/XSelectionChangeListener.hpp" -#include "com/sun/star/view/XSelectionSupplier.hpp" -#include "com/sun/star/xforms/XFormsSupplier.hpp" -#include "com/sun/star/xforms/XFormsUIHelper1.hpp" -#include "com/sun/star/xforms/XModel.hpp" -#include "com/sun/star/xforms/XSubmission.hpp" -#include "com/sun/star/xml/AttributeData.hpp" -#include "com/sun/star/xml/dom/DOMException.hpp" -#include "com/sun/star/xml/dom/XDocument.hpp" -#include "com/sun/star/xml/dom/XNode.hpp" -#include "com/sun/star/xml/dom/events/XEventListener.hpp" -#include "com/sun/star/xml/dom/events/XEventTarget.hpp" -#include "com/sun/star/xml/sax/InputSource.hpp" -#include "com/sun/star/xml/sax/SAXParseException.hpp" -#include "com/sun/star/xml/sax/XAttributeList.hpp" -#include "com/sun/star/xml/sax/XDocumentHandler.hpp" -#include "com/sun/star/xml/sax/XParser.hpp" -#include "comphelper/accessibleeventnotifier.hxx" -#include "comphelper/anytostring.hxx" -#include "comphelper/broadcasthelper.hxx" -#include "comphelper/componentcontext.hxx" -#include "comphelper/configurationhelper.hxx" -#include "comphelper/container.hxx" -#include "comphelper/embeddedobjectcontainer.hxx" -#include "comphelper/enumhelper.hxx" -#include "comphelper/implementationreference.hxx" -#include "comphelper/interaction.hxx" -#include "comphelper/numbers.hxx" -#include "comphelper/processfactory.hxx" -#include "comphelper/propertycontainer.hxx" -#include "comphelper/propertysethelper.hxx" -#include "comphelper/regpathhelper.hxx" -#include "comphelper/scopeguard.hxx" -#include "comphelper/seqstream.hxx" -#include "comphelper/sequence.hxx" -#include "comphelper/sequenceashashmap.hxx" -#include "comphelper/sequenceasvector.hxx" -#include "comphelper/storagehelper.hxx" -#include "comphelper/types.hxx" -#include "comphelper/uno3.hxx" -#include "connectivity/IParseContext.hxx" -#include "connectivity/dbexception.hxx" -#include "connectivity/sqlnode.hxx" -#include "connectivity/sqlparse.hxx" -#include "cppuhelper/bootstrap.hxx" -#include "cppuhelper/compbase12.hxx" -#include "cppuhelper/compbase2.hxx" -#include "cppuhelper/compbase3.hxx" -#include "cppuhelper/compbase4.hxx" -#include "cppuhelper/compbase6.hxx" -#include "cppuhelper/compbase7.hxx" -#include "cppuhelper/component.hxx" -#include "cppuhelper/component_context.hxx" -#include "cppuhelper/exc_hlp.hxx" -#include "cppuhelper/factory.hxx" -#include "cppuhelper/implbase1.hxx" -#include "cppuhelper/implbase11.hxx" -#include "cppuhelper/implbase12.hxx" -#include "cppuhelper/implbase2.hxx" -#include "cppuhelper/implbase3.hxx" -#include "cppuhelper/implbase4.hxx" -#include "cppuhelper/implbase5.hxx" -#include "cppuhelper/implbase6.hxx" -#include "cppuhelper/implbase8.hxx" -#include "cppuhelper/implementationentry.hxx" -#include "cppuhelper/interfacecontainer.h" -#include "cppuhelper/interfacecontainer.hxx" -#include "cppuhelper/propshlp.hxx" -#include "cppuhelper/queryinterface.hxx" -#include "cppuhelper/servicefactory.hxx" -#include "cppuhelper/typeprovider.hxx" -#include "cppuhelper/weak.hxx" -#include "cppuhelper/weakagg.hxx" -#include "cppuhelper/weakref.hxx" -#include "i18npool/lang.h" -#include "i18npool/mslangid.hxx" -#include "jvmfwk/framework.h" -#include "linguistic/lngprops.hxx" -#include "osl/diagnose.h" -#include "osl/endian.h" -#include "osl/file.hxx" -#include "osl/interlck.h" -#include "osl/module.h" -#include "osl/module.hxx" -#include "osl/nlsupport.h" -#include "osl/process.h" -#include "osl/security.hxx" -#include "rsc/rscsfx.hxx" -#include "rtl/bootstrap.hxx" -#include "rtl/cipher.h" -#include "rtl/crc.h" -#include "rtl/digest.h" -#include "rtl/locale.h" -#include "rtl/logfile.hxx" -#include "rtl/math.hxx" -#include "rtl/memory.h" -#include "rtl/tencinfo.h" -#include "rtl/textenc.h" -#include "rtl/ustrbuf.hxx" -#include "rtl/ustring.hxx" -#include "rtl/uuid.h" -#include "sal/config.h" -#include "sal/main.h" -#include "sal/types.h" -#include "sfx2/bindings.hxx" -#include "sfx2/ctrlitem.hxx" -#include "sfx2/dispatch.hxx" -#include "sfx2/docfilt.hxx" -#include "sfx2/event.hxx" -#include "sfx2/frame.hxx" -#include "sfx2/frmdescr.hxx" -#include "sfx2/imagemgr.hxx" -#include "sfx2/imgmgr.hxx" -#include "sfx2/linkmgr.hxx" -#include "sfx2/linksrc.hxx" -#include "sfx2/lnkbase.hxx" -#include "sfx2/minarray.hxx" -#include "sfx2/minfitem.hxx" -#include "sfx2/mnuitem.hxx" -#include "sfx2/module.hxx" -#include "sfx2/msg.hxx" -#include "sfx2/msgpool.hxx" -#include "sfx2/objface.hxx" -#include "sfx2/objitem.hxx" -#include "sfx2/progress.hxx" -#include "sfx2/querystatus.hxx" -#include "sfx2/request.hxx" -#include "sfx2/sfxdefs.hxx" -#include "sfx2/sfxdlg.hxx" -#include "sfx2/sfxhelp.hxx" -#include "sfx2/sfxhtml.hxx" -#include "sfx2/sfxstatuslistener.hxx" -#include "sfx2/sfxuno.hxx" -#include "sfx2/shell.hxx" -#include "sfx2/srchdefs.hxx" -#include "sfx2/tplpitem.hxx" -#include "sfx2/viewfrm.hxx" -#include "sot/clsids.hxx" -#include "sot/exchange.hxx" -#include "sot/factory.hxx" -#include "sot/formats.hxx" -#include <map> -#include <set> -#include <slist> -#include <vector> -#include "svtools/FilterConfigItem.hxx" -#include "svtools/accessibilityoptions.hxx" -#include "svl/adrparse.hxx" -#include "svtools/apearcfg.hxx" -#include "svl/brdcst.hxx" -#include "unotools/cacheoptions.hxx" -#include "svl/cancel.hxx" -#include "svl/cjkoptions.hxx" -#include "unotools/cmdoptions.hxx" -#include "svl/cntwall.hxx" -#include "svtools/colorcfg.hxx" -#include "svl/ctloptions.hxx" -#include "unotools/defaultoptions.hxx" -#include "unotools/dynamicmenuoptions.hxx" -#include "svtools/ehdl.hxx" -#include "svl/eitem.hxx" -#include "unotools/eventcfg.hxx" -#include "unotools/extendedsecurityoptions.hxx" -#include "svl/filenotation.hxx" -#include "svl/flagitem.hxx" -#include "unotools/fltrcfg.hxx" -#include "unotools/fontoptions.hxx" -#include "svtools/fontsubstconfig.hxx" -#include "svtools/helpopt.hxx" -#include "svl/hint.hxx" -#include "svtools/htmlkywd.hxx" -#include "svtools/htmltokn.h" -#include "svtools/imagemgr.hxx" -#include "svtools/imapcirc.hxx" -#include "svtools/imapobj.hxx" -#include "svtools/imappoly.hxx" -#include "svtools/imaprect.hxx" -#include "svtools/inetimg.hxx" -#include "unotools/inetoptions.hxx" -#include "svl/intitem.hxx" -#include "svl/isethint.hxx" -#include "svl/itemiter.hxx" -#include "svl/itempool.hxx" -#include "svl/itemprop.hxx" -#include "svl/itemset.hxx" -#include "unotools/javaoptions.hxx" -#include "svl/languageoptions.hxx" -#include "unotools/lingucfg.hxx" -#include "unotools/linguprops.hxx" -#include "svl/lngmisc.hxx" -#include "svtools/localresaccess.hxx" -#include "svl/lstner.hxx" -#include "svl/macitem.hxx" -#include "svtools/menuoptions.hxx" -#include "svl/metitem.hxx" -#include "unotools/misccfg.hxx" -#include "svtools/miscopt.hxx" -#include "unotools/moduleoptions.hxx" -#include "svl/numuno.hxx" -#include "unotools/optionsdlg.hxx" -#include "svtools/parhtml.hxx" -#include "svtools/parrtf.hxx" -#include "unotools/pathoptions.hxx" -#include "svl/pickerhelper.hxx" -#include "svl/poolitem.hxx" -#include "unotools/printwarningoptions.hxx" -#include "svl/ptitem.hxx" -#include "svl/rectitem.hxx" -#include "svl/rngitem.hxx" -#include "svtools/rtfkeywd.hxx" -#include "svtools/rtfout.hxx" -#include "svtools/rtftoken.h" -#include "unotools/saveopt.hxx" -#include "unotools/searchopt.hxx" -#include "unotools/securityoptions.hxx" -#include "svl/sfontitm.hxx" -#include "svl/slstitm.hxx" -#include "svl/smplhint.hxx" -#include "svtools/soerr.hxx" -#include "unotools/sourceviewconfig.hxx" -#include "unotools/startoptions.hxx" -#include "svtools/stdmenu.hxx" -#include "svtools/stringtransfer.hxx" -#include "svl/stritem.hxx" -#include "svl/style.hxx" -#include "svl/svarray.hxx" -#include "svl/svstdarr.hxx" -#include "unotools/syslocaleoptions.hxx" -#include "svl/szitem.hxx" -#include "svtools/textdata.hxx" -#include "svtools/transfer.hxx" -#include "svtools/txtcmp.hxx" -#include "svl/undo.hxx" -#include "unotools/undoopt.hxx" -#include "svtools/unoevent.hxx" -#include "svtools/unoimap.hxx" -#include "svl/urihelper.hxx" -#include "svl/urlbmk.hxx" -#include "unotools/useroptions.hxx" -#include "unotools/viewoptions.hxx" -#include "svl/visitem.hxx" -#include "svl/whiter.hxx" -#include "sys/stat.h" -#include "sys/types.h" -#include "toolkit/awt/vclxdevice.hxx" -#include "toolkit/controls/unocontrol.hxx" -#include "tools/bigint.hxx" -#include "tools/color.hxx" -#include "tools/config.hxx" -#include "tools/contnr.hxx" -#include "tools/debug.hxx" -#include "tools/diagnose_ex.h" -#include "tools/dynary.hxx" -#include "tools/errcode.hxx" -#include "tools/errinf.hxx" -#include "tools/fract.hxx" -#include "tools/gen.hxx" -#include "tools/globname.hxx" -#include "tools/inetdef.hxx" -#include "tools/line.hxx" -#include "tools/link.hxx" -#include "tools/list.hxx" -#include "tools/multisel.hxx" -#include "tools/poly.hxx" -#include "tools/rc.h" -#include "tools/rc.hxx" -#include "tools/rcid.h" -#include "tools/ref.hxx" -#include "tools/resary.hxx" -#include "tools/resid.hxx" -#include "tools/resmgr.hxx" -#include "tools/rtti.hxx" -#include "tools/shl.hxx" -#include "tools/solar.h" -#include "tools/stack.hxx" -#include "tools/string.hxx" -#include "tools/table.hxx" -#include "tools/tenccvt.hxx" -#include "tools/urlobj.hxx" -#include "tools/vcompat.hxx" -#include "tools/vector2d.hxx" -#include "tools/weakbase.hxx" -#include "tools/wldcrd.hxx" -#include "tools/zcodec.hxx" -#include "ucbhelper/commandenvironment.hxx" -#include "ucbhelper/configurationkeys.hxx" -#include "ucbhelper/content.hxx" -#include "ucbhelper/contentbroker.hxx" -#include "unicode/ubidi.h" -#include "uno/lbnames.h" -#include "uno/mapping.hxx" -#include "unotools/accessiblerelationsethelper.hxx" -#include "unotools/accessiblestatesethelper.hxx" -#include "unotools/bootstrap.hxx" -#include "unotools/charclass.hxx" -#include "unotools/collatorwrapper.hxx" -#include "unotools/configitem.hxx" -#include "unotools/configmgr.hxx" -#include "unotools/confignode.hxx" -#include "unotools/configpathes.hxx" -#include "unotools/configvaluecontainer.hxx" -#include "unotools/localfilehelper.hxx" -#include "unotools/processfactory.hxx" -#include "comphelper/servicehelper.hxx" -#include "unotools/streamwrap.hxx" -#include "unotools/textsearch.hxx" -#include "unotools/transliterationwrapper.hxx" -#include "unotools/ucbhelper.hxx" -#include "vcl/abstdlg.hxx" -#include "vcl/animate.hxx" -#include "vcl/bitmap.hxx" -#include "vcl/bitmapex.hxx" -#include "vcl/bmpacc.hxx" -#include "vcl/cmdevt.h" -#include "vcl/configsettings.hxx" -#include "vcl/controllayout.hxx" -#include "vcl/cursor.hxx" -#include "vcl/decoview.hxx" -#include "vcl/dndhelp.hxx" -#include "vcl/fldunit.hxx" -#include "vcl/fntstyle.hxx" -#include "unotools/fontcvt.hxx" -#include "vcl/gdimtf.hxx" -#include "vcl/help.hxx" -#include "vcl/image.hxx" -#include "vcl/jobset.hxx" -#include "vcl/keycodes.hxx" -#include "vcl/mapmod.hxx" -#include "vcl/menu.hxx" -#include "vcl/mnemonic.hxx" -#include "vcl/pointr.hxx" -#include "vcl/region.hxx" -#include "vcl/salbtype.hxx" -#include "vcl/stdtext.hxx" -#include "vcl/timer.hxx" -#include "vcl/unohelp.hxx" -#include "vcl/unohelp2.hxx" -#include "vcl/wall.hxx" -#include "vcl/wintypes.hxx" -#include "osl/mutex.hxx" -#include "xmloff/DashStyle.hxx" -#include "xmloff/GradientStyle.hxx" -#include "xmloff/HatchStyle.hxx" -#include "xmloff/ImageStyle.hxx" -#include "xmloff/MarkerStyle.hxx" -#include "xmloff/attrlist.hxx" -#include "xmloff/nmspmap.hxx" -#include "xmloff/xmlcnimp.hxx" -#include "xmloff/xmlictxt.hxx" -#include "xmloff/xmlnmspe.hxx" -#include "xmloff/xmlstyle.hxx" -#include "xmloff/xmltoken.hxx" -#include "xmlscript/xmldlg_imexp.hxx" -//---MARKER--- -#endif -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index e21cfad15..efe79cc44 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - //----------------------------------------------- // include own files @@ -1463,7 +1460,7 @@ String SfxAcceleratorConfigPage::GetFunctionName(KeyFuncType eType) const case KEYFUNC_OPEN : sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Open") ) ) ); break; - + case KEYFUNC_SAVE : sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save") ) ) ); break; @@ -1546,7 +1543,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTi m_pFileDlg = new sfx2::FileDialogHelper( nDialogType, 0 ); m_pFileDlg->SetTitle( rTitle ); - m_pFileDlg->AddFilter( aFilterAllStr, DEFINE_CONST_UNICODE( FILEDIALOG_FILTER_ALL ) ); + m_pFileDlg->AddFilter( aFilterAllStr, DEFINE_CONST_UNICODE( FILEDIALOG_FILTER_ALL ) ); m_pFileDlg->AddFilter( aFilterCfgStr, DEFINE_CONST_UNICODE( "*.cfg" ) ); Link aDlgClosedLink = bSave ? LINK( this, SfxAcceleratorConfigPage, SaveHdl ) diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 4c0aa0547..6380df18f 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <stdlib.h> #include <time.h> diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 86c0f6442..137ade821 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "cfgutil.hxx" #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index bb957a605..1ace65d2f 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include *************************************************************** #include <svtools/svmedit.hxx> #include <tools/diagnose_ex.h> diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index bd2d7577f..0e0c3de52 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <basic/basmgr.hxx> #include "macropg.hxx" diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index a7e8d691b..d124dd4c0 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <vcl/help.hxx> #include <vcl/msgbox.hxx> #include <vcl/metric.hxx> diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx index ce5497ea5..34dd071e5 100644 --- a/cui/source/dialogs/SpellAttrib.cxx +++ b/cui/source/dialogs/SpellAttrib.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <SpellAttrib.hxx> #include <vcl/font.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -73,7 +70,7 @@ TextAttrib* SpellErrorAttrib::Clone() const //----------------------------------------------------------------------- int SpellErrorAttrib::operator==( const TextAttrib& rAttr ) const { - return Which() == rAttr.Which() && + return Which() == rAttr.Which() && m_aSpellErrorDescription == static_cast<const SpellErrorAttrib&>(rAttr).m_aSpellErrorDescription; } @@ -111,12 +108,12 @@ TextAttrib* SpellLanguageAttrib::Clone() const //----------------------------------------------------------------------- int SpellLanguageAttrib::operator==( const TextAttrib& rAttr ) const { - return Which() == rAttr.Which() && + return Which() == rAttr.Which() && m_eLanguage == static_cast<const SpellLanguageAttrib&>(rAttr).m_eLanguage; } //----------------------------------------------------------------------- -SpellBackgroundAttrib::SpellBackgroundAttrib(const Color& rCol) : +SpellBackgroundAttrib::SpellBackgroundAttrib(const Color& rCol) : TextAttrib(TEXTATTR_SPELL_BACKGROUND), m_aBackgroundColor(rCol) { @@ -149,7 +146,7 @@ TextAttrib* SpellBackgroundAttrib::Clone() const //----------------------------------------------------------------------- int SpellBackgroundAttrib::operator==( const TextAttrib& rAttr ) const { - return Which() == rAttr.Which() && + return Which() == rAttr.Which() && m_aBackgroundColor == static_cast<const SpellBackgroundAttrib&>(rAttr).m_aBackgroundColor; } diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 5165c32e7..9b3d6dfa6 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/ref.hxx> diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx index 9c44241f1..1cef018c1 100644 --- a/cui/source/dialogs/commonlingui.cxx +++ b/cui/source/dialogs/commonlingui.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include "commonlingui.hxx" #include <cuires.hrc> diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 15cf6bac0..9ec9c8425 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <stdio.h> @@ -70,7 +67,7 @@ SvxCharacterMap::SvxCharacterMap( Window* pParent, BOOL bOne, const SfxItemSet* bOne = pItem->GetValue(); mpCharMapData = new SvxCharMapData( this, bOne, &CUI_MGR() ); - + SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, FALSE ); if ( pCharItem ) SetChar( pCharItem->GetValue() ); diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index e7cc49b0e..193832d85 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/debug.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> @@ -47,7 +44,7 @@ #include <svl/cjkoptions.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <comphelper/processfactory.hxx> -#include <svx/svxdlg.hxx> +#include <svx/svxdlg.hxx> #include <sal/macros.h> using namespace ::com::sun::star::uno; @@ -131,9 +128,9 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c ,m_pbHelp (this, CUI_RES(1)) ,m_sSearch ( m_pbSearchAgain.GetText() ) ,m_sCancel ( Button::GetStandardText( BUTTON_CANCEL ) ) - ,m_pPreSearchFocus( NULL ) + ,m_pPreSearchFocus( NULL ) ,m_lnkContextSupplier(lnkContextSupplier) - ,m_pConfig( NULL ) + ,m_pConfig( NULL ) { DBG_ASSERT(m_lnkContextSupplier.IsSet(), "FmSearchDialog::FmSearchDialog : have no ContextSupplier !"); @@ -202,9 +199,9 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c //------------------------------------------------------------------------ void FmSearchDialog::implMoveControls( - Control** _ppControls, - sal_Int32 _nControls, - sal_Int32 _nUp, + Control** _ppControls, + sal_Int32 _nControls, + sal_Int32 _nUp, Control* /*_pToResize*/) { for (sal_Int32 i=0; i<_nControls; ++i) @@ -567,7 +564,7 @@ void FmSearchDialog::InitContext(sal_Int16 nContext) fmscContext.nContext = nContext; #ifdef DBG_UTIL - sal_uInt32 nResult = + sal_uInt32 nResult = #endif m_lnkContextSupplier.Call(&fmscContext); DBG_ASSERT(nResult > 0, "FmSearchDialog::InitContext : ContextSupplier didn't give me any controls !"); @@ -631,7 +628,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) if ( !bEnable ) { - // if one of my children has the focus, remember it + // if one of my children has the focus, remember it Window* pFocusWindow = Application::GetFocusWindow( ); if ( pFocusWindow && IsChild( pFocusWindow ) ) m_pPreSearchFocus = pFocusWindow; diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index f006609d1..e8ed58d0c 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <algorithm> #include <ucbhelper/content.hxx> #include <osl/mutex.hxx> diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 566ddd099..889fff616 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <vcl/msgbox.hxx> #include <sfx2/viewfrm.hxx> @@ -64,7 +61,7 @@ void GraphicFilterDialog::PreviewWindow::Paint( const Rectangle& rRect ) const Size aGrfSize( LogicToPixel( maGraphic.GetPrefSize(), maGraphic.GetPrefMapMode() ) ); const Size aOutSize( GetOutputSizePixel() ); - const Point aGrfPos( ( aOutSize.Width() - aGrfSize.Width() ) >> 1, + const Point aGrfPos( ( aOutSize.Width() - aGrfSize.Width() ) >> 1, ( aOutSize.Height() - aGrfSize.Height() ) >> 1 ); if( maGraphic.IsAnimated() ) @@ -105,7 +102,7 @@ GraphicFilterDialog::GraphicFilterDialog( Window* pParent, const ResId& rResId, Size aGrfSize( maSizePixel ); if( rGraphic.GetType() == GRAPHIC_BITMAP && - aPreviewSize.Width() && aPreviewSize.Height() && + aPreviewSize.Width() && aPreviewSize.Height() && aGrfSize.Width() && aGrfSize.Height() ) { const double fGrfWH = (double) aGrfSize.Width() / aGrfSize.Height(); @@ -205,11 +202,11 @@ GraphicFilterMosaic::~GraphicFilterMosaic() // ----------------------------------------------------------------------------- -Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, +Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) { Graphic aRet; - const Size aSize( Max( FRound( GetTileWidth() * fScaleX ), 1L ), + const Size aSize( Max( FRound( GetTileWidth() * fScaleX ), 1L ), Max( FRound( GetTileHeight() * fScaleY ), 1L ) ); BmpFilterParam aParam( aSize ); @@ -271,7 +268,7 @@ GraphicFilterSolarize::~GraphicFilterSolarize() // ----------------------------------------------------------------------------- -Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, +Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) { Graphic aRet; @@ -331,7 +328,7 @@ GraphicFilterSepia::~GraphicFilterSepia() // ----------------------------------------------------------------------------- -Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, +Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) { Graphic aRet; @@ -382,7 +379,7 @@ GraphicFilterPoster::~GraphicFilterPoster() // ----------------------------------------------------------------------------- -Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, +Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) { Graphic aRet; @@ -442,7 +439,7 @@ GraphicFilterEmboss::~GraphicFilterEmboss() // ----------------------------------------------------------------------------- -Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, +Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ ) { Graphic aRet; diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 028fb6ad3..edf0eccdb 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <vcl/settings.hxx> #include <unotools/viewoptions.hxx> diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 560deffc7..2d4516387 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> #include <vcl/help.hxx> diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index b8b0d4d69..aa1fd6ab2 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <string> #include <tools/ref.hxx> #include <tools/shl.hxx> diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index d1f43b143..f56cc15c0 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/ref.hxx> #include <tools/list.hxx> #include <tools/shl.hxx> @@ -93,8 +90,8 @@ IMPL_LINK(SvxNameDialog, ModifyHdl, Edit*, EMPTYARG) // Dialog for editing Object Name // plus uniqueness-callback-linkHandler -SvxObjectNameDialog::SvxObjectNameDialog( - Window* pWindow, +SvxObjectNameDialog::SvxObjectNameDialog( + Window* pWindow, const String& rName) : ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_NAME)), aFtName(this, CUI_RES(NTD_FT_NAME)), @@ -129,9 +126,9 @@ IMPL_LINK(SvxObjectNameDialog, ModifyHdl, Edit*, EMPTYARG) // #i68101# // Dialog for editing Object Title and Description -SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( - Window* pWindow, - const String& rTitle, +SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( + Window* pWindow, + const String& rTitle, const String& rDescription) : ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_TITLE_DESC)), aFtTitle(this, CUI_RES(NTD_FT_TITLE)), diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index d0c95bd64..88c0c0263 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "hangulhanjadlg.hxx" #include "hangulhanjadlg.hrc" #include "commonlingui.hxx" @@ -58,15 +55,6 @@ namespace svx { //............................................................................. -/* - using HangulHanjaConversion::eSimpleConversion; - using HangulHanjaConversion::eHangulBracketed; - using HangulHanjaConversion::eHanjaBracketed; - using HangulHanjaConversion::eRubyHanjaAbove; - using HangulHanjaConversion::eRubyHanjaBelow; - using HangulHanjaConversion::eRubyHangulAbove; - using HangulHanjaConversion::eRubyHangulBelow; -*/ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::linguistic2; diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 0253683eb..2ff875409 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "hldocntp.hxx" #include <sfx2/viewfrm.hxx> #include <sfx2/docfac.hxx> diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 138972521..44c972b9b 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "cuihyperdlg.hxx" #include <unotools/localfilehelper.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index bb89b7843..72f9e8c7f 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <unotools/pathoptions.hxx> #include <unotools/useroptions.hxx> #include <svl/adrparse.hxx> diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 0a88750ad..1827c4df6 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 26053503d..ead41a6f6 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <vcl/wrkwin.hxx> #include <dialmgr.hxx> #include <sfx2/docfile.hxx> diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index e52a8f0a4..9421836a1 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <sfx2/frame.hxx> #include <sfx2/viewfrm.hxx> #include <sot/formats.hxx> diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index f53e66f99..9168ea9db 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "hyphen.hxx" #include "hyphen.hrc" #include "cuires.hrc" @@ -104,7 +101,7 @@ void HyphenEdit_Impl::KeyInput( const KeyEvent& rKEvt ) struct SvxHyphenWordDialog_Impl { SvxHyphenWordDialog * m_pDialog; - + FixedText aWordFT; HyphenEdit_Impl aWordEdit; ImageButton aLeftBtn; @@ -149,9 +146,9 @@ struct SvxHyphenWordDialog_Impl DECL_LINK( GetFocusHdl_Impl, Edit* ); - SvxHyphenWordDialog_Impl( + SvxHyphenWordDialog_Impl( SvxHyphenWordDialog * pDialog, - const String &rWord, + const String &rWord, LanguageType nLang, uno::Reference< linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ); @@ -159,9 +156,9 @@ struct SvxHyphenWordDialog_Impl }; -SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( +SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( SvxHyphenWordDialog * pDialog, - const String &rWord, + const String &rWord, LanguageType nLang, uno::Reference< linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) : @@ -195,7 +192,7 @@ SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( xHyphenator = xHyphen; pHyphWrapper = pWrapper; - uno::Reference< linguistic2::XHyphenatedWord > xHyphWord( pHyphWrapper ? + uno::Reference< linguistic2::XHyphenatedWord > xHyphWord( pHyphWrapper ? pHyphWrapper->GetLast() : NULL, uno::UNO_QUERY ); DBG_ASSERT( xHyphWord.is(), "hyphenation result missing" ); if (xHyphWord.is()) @@ -207,7 +204,7 @@ SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( InitControls_Impl(); aWordEdit.GrabFocus(); - + aLeftBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, Left_Impl ) ); aRightBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, Right_Impl ) ); aOkBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, CutHdl_Impl ) ); @@ -217,11 +214,11 @@ SvxHyphenWordDialog_Impl::SvxHyphenWordDialog_Impl( aCancelBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog_Impl, CancelHdl_Impl ) ); aWordEdit.SetGetFocusHdl( LINK( this, SvxHyphenWordDialog_Impl, GetFocusHdl_Impl ) ); } - + SvxHyphenWordDialog_Impl::~SvxHyphenWordDialog_Impl() { -} +} void SvxHyphenWordDialog_Impl::EnableLRBtn_Impl() @@ -262,7 +259,7 @@ String SvxHyphenWordDialog_Impl::EraseUnusableHyphens_Impl( // returns a String showing only those hyphen positions which will result // in a line break if hyphenation is done there // 1) we will need to discard all hyphenation positions at th end that - // will not result in a line break where the text to the left still fits + // will not result in a line break where the text to the left still fits // on the line. // 2) since as from OOo 3.2 '-' are part of a word an thus text like // 'multi-line-editor' is regarded as single word we also need to discard those @@ -270,11 +267,11 @@ String SvxHyphenWordDialog_Impl::EraseUnusableHyphens_Impl( // the rightmost valid hyphenation position according to 1) // // Example: - // If the possible hyphenation position in 'multi-line-editor' are to eb marked + // If the possible hyphenation position in 'multi-line-editor' are to eb marked // by '=' then the text will look like this 'mul=ti-line-ed=it=or'. // If now the first line is only large enough for 'multi-line-edi' we need to discard - // the last possible hyphnation point because of 1). The the right most valid - // hyphenation position is "ed=itor". The first '-' left of this position is + // the last possible hyphnation point because of 1). The the right most valid + // hyphenation position is "ed=itor". The first '-' left of this position is // "line-ed", thus because of 2) we now need to discard all possible hyphneation // positions to the left of that as well. Thus in the end leaving us with just // 'multi-line-ed=itor' as return value for this function. (Just one valid hyphenation @@ -514,7 +511,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl, Button *, EMPTYARG /* uno::Reference< beans::XPropertySet > xProp( SvxGetLinguPropertySet() ); const rtl::OUString aName( RTL_CONSTASCII_USTRINGPARAM( "IsHyphAuto" ) ); uno::Any aAny; - + aAny <<= sal_True; xProp->setPropertyValue( aName, aAny ); @@ -529,10 +526,10 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl, Button *, EMPTYARG /* { (void) e; DBG_ASSERT( 0, "Hyphenate All failed" ); - } + } } return 0; -} +} IMPL_LINK( SvxHyphenWordDialog_Impl, DeleteHdl_Impl, Button *, EMPTYARG ) @@ -602,15 +599,15 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, GetFocusHdl_Impl, Edit *, EMPTYARG ) return 0; } - + // class SvxHyphenWordDialog --------------------------------------------- -SvxHyphenWordDialog::SvxHyphenWordDialog( +SvxHyphenWordDialog::SvxHyphenWordDialog( const String &rWord, LanguageType nLang, Window* pParent, uno::Reference< linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) : - + SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_HYPHENATE ) ) { m_pImpl = std::auto_ptr< SvxHyphenWordDialog_Impl >( @@ -628,7 +625,7 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( SvxHyphenWordDialog::~SvxHyphenWordDialog() { -} +} void SvxHyphenWordDialog::SetWindowTitle( LanguageType nLang ) diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 29d7f6d6e..4079813b6 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <sfx2/app.hxx> #include <tools/rc.h> #include <tools/shl.hxx> diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index f32d4d5f7..b957e28cd 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/XFilePicker.hpp> diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 80e41147e..e6653d01b 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <dialmgr.hxx> #include <svx/svxdlg.hxx> #include <cuires.hrc> diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 434f8d018..1d24f401f 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <linkdlg.hxx> #include <vcl/svapp.hxx> #include "helpid.hrc" @@ -619,7 +616,7 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, USHORT nPos, sal_Bool INetURLObject aPath( sFileNm, INET_PROT_FILE ); String aFileName = aPath.getName(); aFileName = INetURLObject::decode(aFileName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS); - + if( aFileName.Len() > aTxt.Len() ) aTxt = aFileName; else if( aTxt.Search( aFileName, aTxt.Len() - aFileName.Len() ) == STRING_NOTFOUND ) diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx index b08265991..4c34d9338 100644 --- a/cui/source/dialogs/multifil.cxx +++ b/cui/source/dialogs/multifil.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <vcl/msgbox.hxx> diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index b51f72327..7c1454a3f 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/debug.hxx> #include <tools/urlobj.hxx> diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index 3e0c69e74..b387b4f87 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "cuires.hrc" diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index 07283c494..e4bd2dd52 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "passwdomdlg.hrc" @@ -56,7 +53,7 @@ class PasswordReenterEdit_Impl : public Edit // disallow use of copy c-tor and assignment operator PasswordReenterEdit_Impl( const PasswordReenterEdit_Impl & ); PasswordReenterEdit_Impl & operator = ( const PasswordReenterEdit_Impl & ); - + public: PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId ); virtual ~PasswordReenterEdit_Impl(); @@ -65,12 +62,12 @@ public: virtual void Paint( const Rectangle& rRect ); }; - + PasswordReenterEdit_Impl::PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId ) : Edit( pParent, rResId ) { } - + PasswordReenterEdit_Impl::~PasswordReenterEdit_Impl() { @@ -90,7 +87,7 @@ void PasswordReenterEdit_Impl::Paint( const Rectangle& rRect ) else Edit::Paint( rRect ); } - + ////////////////////////////////////////////////////////////////////// @@ -119,21 +116,21 @@ struct PasswordToOpenModifyDialog_Impl String m_aTwoMismatch; String m_aInvalidStateForOkButton; String m_aInvalidStateForOkButton_v2; - + bool m_bIsPasswordToModify; - + DECL_LINK( OkBtnClickHdl, OKButton * ); - PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, + PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ); ~PasswordToOpenModifyDialog_Impl(); }; -PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( +PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, - sal_uInt16 nMinPasswdLen, + sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) : m_pParent( pParent ), @@ -181,19 +178,19 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_aMoreFewerOptionsBTN.Hide( TRUE ); } - + PasswordToOpenModifyDialog_Impl::~PasswordToOpenModifyDialog_Impl() { } IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG /*pBtn*/ ) { - bool bInvalidState = !m_aOpenReadonlyCB.IsChecked() && - m_aPasswdToOpenED.GetText().Len() == 0 && + bool bInvalidState = !m_aOpenReadonlyCB.IsChecked() && + m_aPasswdToOpenED.GetText().Len() == 0 && m_aPasswdToModifyED.GetText().Len() == 0; if (bInvalidState) { - ErrorBox aErrorBox( m_pParent, WB_OK, + ErrorBox aErrorBox( m_pParent, WB_OK, m_bIsPasswordToModify? m_aInvalidStateForOkButton : m_aInvalidStateForOkButton_v2 ); aErrorBox.Execute(); } @@ -206,7 +203,7 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG { ErrorBox aErrorBox( m_pParent, WB_OK, nMismatch == 1 ? m_aOneMismatch : m_aTwoMismatch ); aErrorBox.Execute(); - + Edit &rEdit = !bToOpenMatch? m_aPasswdToOpenED : m_aPasswdToModifyED; PasswordReenterEdit_Impl &rRepeatEdit = !bToOpenMatch? m_aReenterPasswdToOpenED : m_aReenterPasswdToModifyED; String aEmpty; @@ -221,56 +218,56 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG m_aReenterPasswdToOpenED.SetText( aEmpty ); m_aPasswdToModifyED.SetText( aEmpty ); m_aReenterPasswdToModifyED.SetText( aEmpty ); - } + } rEdit.GrabFocus(); } else { m_pParent->EndDialog( RET_OK ); } - } - + } + return 0; } ////////////////////////////////////////////////////////////////////// -PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( - Window * pParent, - sal_uInt16 nMinPasswdLen, +PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( + Window * pParent, + sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) : SfxModalDialog( pParent, CUI_RES( RID_DLG_PASSWORD_TO_OPEN_MODIFY ) ) { - m_pImpl = std::auto_ptr< PasswordToOpenModifyDialog_Impl >( + m_pImpl = std::auto_ptr< PasswordToOpenModifyDialog_Impl >( new PasswordToOpenModifyDialog_Impl( this, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify ) ); - + FreeResource(); -} +} PasswordToOpenModifyDialog::~PasswordToOpenModifyDialog() { -} +} String PasswordToOpenModifyDialog::GetPasswordToOpen() const { - const bool bPasswdOk = + const bool bPasswdOk = m_pImpl->m_aPasswdToOpenED.GetText().Len() > 0 && m_pImpl->m_aPasswdToOpenED.GetText() == m_pImpl->m_aReenterPasswdToOpenED.GetText(); return bPasswdOk ? m_pImpl->m_aPasswdToOpenED.GetText() : String(); -} +} String PasswordToOpenModifyDialog::GetPasswordToModify() const { - const bool bPasswdOk = + const bool bPasswdOk = m_pImpl->m_aPasswdToModifyED.GetText().Len() > 0 && m_pImpl->m_aPasswdToModifyED.GetText() == m_pImpl->m_aReenterPasswdToModifyED.GetText(); return bPasswdOk ? m_pImpl->m_aPasswdToModifyED.GetText() : String(); -} +} bool PasswordToOpenModifyDialog::IsRecommendToOpenReadonly() const diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 9fe66e58b..59e6a14d2 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <com/sun/star/embed/Aspects.hpp> #include <pastedlg.hxx> diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx index 2ce444996..e00ed70cc 100644 --- a/cui/source/dialogs/plfilter.cxx +++ b/cui/source/dialogs/plfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <set> #include <map> #include <unotools/processfactory.hxx> diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 40ae4d89d..6172ba4f9 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/date.hxx> diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 355017889..40b5ecaf2 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <memory> #include <sfx2/objsh.hxx> diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index 641c76628..2791b19da 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <svl/cjkoptions.hxx> #include <svx/flagsdef.hxx> #include "cuires.hrc" diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 5cb886736..5b2ea7d2a 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "showcols.hxx" #include "fmsearch.hrc" diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index ffa88f5bf..81591e133 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <sfx2/dispatch.hxx> #include <svl/intitem.hxx> #include <svl/eitem.hxx> diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index a37865dba..9f4115509 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "srchxtra.hxx" @@ -183,7 +180,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent, } // item resources are in svx - sal_uInt32 nId = aAttrNames.FindIndex( nSlot ); + sal_uInt32 nId = aAttrNames.FindIndex( nSlot ); SvLBoxEntry* pEntry = NULL; if ( RESARRAY_INDEX_NOTFOUND != nId ) pEntry = aAttrLB.SvTreeListBox::InsertEntry( aAttrNames.GetString(nId) ); diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 96ff22263..15e87cef2 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -26,10 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove - -#include "precompiled_cui.hxx" - #include "thesdlg.hrc" #include "thesdlg.hxx" #include "thesdlg_impl.hxx" diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 04fe71d5d..651bd7617 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> diff --git a/cui/source/factory/cuiexp.cxx b/cui/source/factory/cuiexp.cxx index 11a370c78..bfa1b40e8 100644 --- a/cui/source/factory/cuiexp.cxx +++ b/cui/source/factory/cuiexp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "dlgfact.hxx" #include "sal/types.h" diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx index 86f3064e0..c04206ccb 100644 --- a/cui/source/factory/cuiresmgr.cxx +++ b/cui/source/factory/cuiresmgr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <dialmgr.hxx> diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index a9691e978..679d9bbcd 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "align.hxx" //add for SvxAlignmentTabPage #include "dlgfact.hxx" @@ -988,7 +985,7 @@ Window * AbstractSvxPostItDialog_Impl::GetWindow() String AbstractPasswordToOpenModifyDialog_Impl::GetPasswordToOpen() const { return pDlg->GetPasswordToOpen(); -} +} String AbstractPasswordToOpenModifyDialog_Impl::GetPasswordToModify() const { return pDlg->GetPasswordToModify(); @@ -1153,7 +1150,7 @@ AbstractHangulHanjaConversionDialog* AbstractDialogFactory_Impl::CreateHangulHan return new AbstractHangulHanjaConversionDialog_Impl( pDlg ); } -AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( Window* pParent, +AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, const String &rWord, sal_Int16 nLanguage ) { @@ -1952,7 +1949,7 @@ SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDi return new SvxSplitTableDlg( pParent, bIsTableVertical, nMaxVertical, nMaxHorizontal ); } -SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( Window* pParent ) +SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( Window* pParent ) { return new SvxNewTableDialog( pParent ); } @@ -1968,13 +1965,13 @@ SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Wind return new SvxInsRowColDlg( pParent, bCol, nHelpId ); } -AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog( +AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) { PasswordToOpenModifyDialog * pDlg = new PasswordToOpenModifyDialog( pParent, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify ); return new AbstractPasswordToOpenModifyDialog_Impl( pDlg ); -} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx index 2b145e202..ac3753f57 100644 --- a/cui/source/factory/init.cxx +++ b/cui/source/factory/init.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <vcl/msgbox.hxx> #include "cuicharmap.hxx" diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 068b84bcc..f9dfae270 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,14 +26,9 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <com/sun/star/uno/Sequence.hxx> -// header for SvStream -#include <tools/stream.hxx> -// header for SAL_STATIC_CAST -#include <sal/types.h> +#include <tools/stream.hxx> // header for SvStream +#include <sal/types.h> // header for SAL_STATIC_CAST #include "cfgchart.hxx" #include <dialmgr.hxx> #include <cuires.hrc> diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index 883749b07..6505ba341 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "connpoolconfig.hxx" #include "connpoolsettings.hxx" diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index e36bac1de..58e70b968 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "connpooloptions.hxx" #include "connpooloptions.hrc" #include <svtools/editbrowsebox.hxx> diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index 4505e8191..8704fc854 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "connpoolsettings.hxx" //........................................................................ diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index 50644fb8d..25265011f 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <vcl/wrkwin.hxx> #include <vcl/morebtn.hxx> diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 52ec88eda..92377d061 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "dbregister.hxx" #include "dbregister.hrc" #include "dbregistersettings.hxx" diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx index 064533ac1..097c3ebdf 100644 --- a/cui/source/options/dbregisterednamesconfig.cxx +++ b/cui/source/options/dbregisterednamesconfig.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include "connpooloptions.hxx" #include "dbregisterednamesconfig.hxx" #include "dbregistersettings.hxx" diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx index 9950f059b..561b96547 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "dbregistersettings.hxx" #include <rtl/ustring.hxx> diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index fd0aaf9eb..971f8e579 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "doclinkdialog.hxx" #include "doclinkdialog.hrc" #include <cuires.hrc> @@ -104,7 +101,7 @@ namespace svx //------------------------------------------------------------------ void ODocumentLinkDialog::validate( ) { - + m_aOK.Enable( (0 != m_aName.GetText().Len()) && ( 0 != m_aURL.GetText().Len() ) ); } @@ -155,7 +152,7 @@ namespace svx sMsg.SearchAndReplaceAscii("$file$", sCurrentText); InfoBox aError(this, sMsg); aError.Execute(); - + m_aName.SetSelection(Selection(0,sCurrentText.Len())); m_aName.GrabFocus(); return 0L; diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 8f296cba1..34fb816f2 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <tools/shl.hxx> #include <svtools/ctrltool.hxx> #include <vcl/svapp.hxx> diff --git a/cui/source/options/internationaloptions.cxx b/cui/source/options/internationaloptions.cxx index b790c07fa..ad47dd33e 100644 --- a/cui/source/options/internationaloptions.cxx +++ b/cui/source/options/internationaloptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "internationaloptions.hxx" #include "internationaloptions.hrc" #include <svl/eitem.hxx> diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index 7b514df50..28ecf2fa5 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,14 +26,10 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "optHeaderTabListbox.hxx" #include <vcl/svapp.hxx> #include <svtools/headbar.hxx> - namespace svx { // class OptLBoxString_Impl ---------------------------------------------- diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index bce38f023..37863c17c 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <optaccessibility.hxx> #include <optaccessibility.hrc> #include <dialmgr.hxx> @@ -41,7 +38,7 @@ static void MovePosY( Window& _rWin, long _nDelta ) { Point aPoint = _rWin.GetPosPixel(); aPoint.Y() += _nDelta; - + _rWin.SetPosPixel( aPoint ); } diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index f00dadf16..4ddaf34fb 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <optasian.hxx> #include <editeng/langitem.hxx> #include <editeng/unolingu.hxx> @@ -285,7 +282,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) aEndFT.Enable(FALSE); aEndED.Enable(FALSE); aHintFT.Enable(FALSE); - } + } if(bKernWesternText) aCharKerningRB.Check(TRUE); else diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 815d02e50..4046db171 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <unotools/pathoptions.hxx> #include <cuires.hrc> #include "optchart.hxx" diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index f13708140..4ac044aea 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <svtools/colorcfg.hxx> #include <svtools/extcolorcfg.hxx> diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index a4bebf70b..60461e7d1 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include "optctl.hxx" #include <dialmgr.hxx> #include "optctl.hrc" @@ -43,7 +41,7 @@ IMPL_LINK( SvxCTLOptionsPage, SequenceCheckingCB_Hdl, void*, EMPTYARG ) m_aTypeReplaceCB.Enable( bIsSequenceChecking ); // #i48117#: by default restricted and type&replace have to be switched on if(bIsSequenceChecking) - { + { m_aTypeReplaceCB.Check( sal_True ); m_aRestrictedCB.Check( sal_True ); } diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 3f828e7d5..dad04e282 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <editeng/unolingu.hxx> diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index b74756a25..4632ee145 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <unotools/moduleoptions.hxx> #include <unotools/fltrcfg.hxx> diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index d184d852f..35fb2fa07 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <svl/zforlist.hxx> #include <svtools/grfmgr.hxx> #include <svl/flagitem.hxx> diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 72c7636a0..0aa7b446b 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <vcl/svapp.hxx> diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 811972688..c2a7243c9 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <svtools/langtab.hxx> diff --git a/cui/source/options/optimprove.cxx b/cui/source/options/optimprove.cxx index c463e1890..c45a0c299 100644 --- a/cui/source/options/optimprove.cxx +++ b/cui/source/options/optimprove.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #define _SVX_OPTIMPROVE_CXX diff --git a/cui/source/options/optimprove2.cxx b/cui/source/options/optimprove2.cxx index a1e0fe10b..5bb7c1592 100644 --- a/cui/source/options/optimprove2.cxx +++ b/cui/source/options/optimprove2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #define _SVX_OPTIMPROVE_CXX diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index e5745e46c..b2a935f57 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/config.hxx> diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 1012903a5..c19d68874 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "optjava.hxx" diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index abdae39ff..2d36ef34f 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <unotools/searchopt.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 28c0a9d03..5012914d4 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <vcl/msgbox.hxx> diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 851a5863b..a092b6c1b 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <svtools/langtab.hxx> #include <svl/zforlist.hxx> #include <svtools/grfmgr.hxx> diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index a7506ccf1..ebefdb757 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <svx/svxdlg.hxx> diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index f31556787..e2b67a71e 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <svl/eitem.hxx> diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index ca1a9acc1..696d5863e 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <vcl/svapp.hxx> #include <sfx2/filedlghelper.hxx> @@ -104,7 +101,7 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSe // dynamical length of the PushButtons CalcButtonWidth(); - + m_aLastCheckedTemplate = m_aLastChecked.GetText(); UpdateLastCheckedText(); @@ -137,7 +134,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() Date aDate; Time aTime; - + lastCheckedTV.Seconds = (sal_uInt32) lastChecked; osl_getLocalTimeFromSystemTime( &lastCheckedTV, &lastCheckedTV ); @@ -168,7 +165,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() sal_Int32 nIndex = aText.indexOf( UNISTRING( "%DATE%" ) ); if ( nIndex != -1 ) aText = aText.replaceAt( nIndex, 6, aDateStr ); - + nIndex = aText.indexOf( UNISTRING( "%TIME%" ) ); if ( nIndex != -1 ) aText = aText.replaceAt( nIndex, 6, aTimeStr ); diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx index a1cf73cb7..67d8d2190 100644 --- a/cui/source/options/radiobtnbox.cxx +++ b/cui/source/options/radiobtnbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "radiobtnbox.hxx" diff --git a/cui/source/options/readonlyimage.cxx b/cui/source/options/readonlyimage.cxx index fa299b971..b481c631b 100644 --- a/cui/source/options/readonlyimage.cxx +++ b/cui/source/options/readonlyimage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <readonlyimage.hxx> #include <vcl/help.hxx> #include <dialmgr.hxx> @@ -54,7 +51,7 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt ) String aStr(ReadOnlyImage::GetHelpTip()); if ( Help::IsBalloonHelpEnabled() ) - Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect, + Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect, aStr ); else if ( Help::IsQuickHelpEnabled() ) Help::ShowQuickHelp( this, aScreenRect, aStr ); diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index ef900ffc5..b806a0ad1 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include "sdbcdriverenum.hxx" #include <comphelper/stl_types.hxx> #include <comphelper/processfactory.hxx> diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx index 633080756..ee1c482e0 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <unotools/securityoptions.hxx> diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 5c4498de0..7dd4d8727 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,8 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/loader/CannotActivateFactoryException.hpp> @@ -2149,27 +2147,27 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN ) continue; #endif -#ifdef LINUX - // Disable Mozilla Plug-in tab-page on Linux if we find a - // globally installed plugin - if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN ) { - struct stat sb; - char *p; - bool bHaveSystemWidePlugin = false; - char mozpaths[]="/usr/lib/mozilla/plugins/libnpsoplugin.so:/usr/lib/firefox/plugins/libnpsoplugin.so:/usr/lib/mozilla-firefox/plugins/libnpsoplugin.so:/usr/lib/iceweasel/plugins/libnpsoplugin.so:/usr/lib/iceape/plugins/libnpsoplugin.so:/usr/lib/browser-plugins/libnpsoplugin.so:/usr/lib64/browser-plugins/libnpsoplugin.so"; - - p = strtok(mozpaths, ":"); - while (p != NULL) { - if (stat(p, &sb) != -1) { - bHaveSystemWidePlugin = true; - break; - } - p = strtok(NULL, ":"); - } - - if (bHaveSystemWidePlugin == true) - continue; - } +#ifdef LINUX + // Disable Mozilla Plug-in tab-page on Linux if we find a + // globally installed plugin + if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN ) { + struct stat sb; + char *p; + bool bHaveSystemWidePlugin = false; + char mozpaths[]="/usr/lib/mozilla/plugins/libnpsoplugin.so:/usr/lib/firefox/plugins/libnpsoplugin.so:/usr/lib/mozilla-firefox/plugins/libnpsoplugin.so:/usr/lib/iceweasel/plugins/libnpsoplugin.so:/usr/lib/iceape/plugins/libnpsoplugin.so:/usr/lib/browser-plugins/libnpsoplugin.so:/usr/lib64/browser-plugins/libnpsoplugin.so"; + + p = strtok(mozpaths, ":"); + while (p != NULL) { + if (stat(p, &sb) != -1) { + bHaveSystemWidePlugin = true; + break; + } + p = strtok(NULL, ":"); + } + + if (bHaveSystemWidePlugin == true) + continue; + } #endif AddTabPage( nPageId, rInetArray.GetString(i), nGroup ); } diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 91090d13a..296c1e5ec 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <dialmgr.hxx> #include <cuires.hrc> @@ -202,7 +199,7 @@ void WebConnectionInfoDialog::FillPasswordList() uno::Sequence< task::UrlRecord > aURLEntries = xPasswdContainer->getAllPersistent( xInteractionHandler ); sal_Int32 nCount = 0; for ( sal_Int32 nURLInd = 0; nURLInd < aURLEntries.getLength(); nURLInd++ ) - { + { for ( sal_Int32 nUserInd = 0; nUserInd < aURLEntries[nURLInd].UserList.getLength(); nUserInd++ ) { ::rtl::OUString aUIEntry( aURLEntries[nURLInd].Url ); @@ -216,10 +213,10 @@ void WebConnectionInfoDialog::FillPasswordList() // remember pos of first url container entry. m_nPos = nCount; - uno::Reference< task::XUrlContainer > xUrlContainer( + uno::Reference< task::XUrlContainer > xUrlContainer( xPasswdContainer, uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > aUrls + uno::Sequence< rtl::OUString > aUrls = xUrlContainer->getUrls( sal_True /* OnlyPersistent */ ); for ( sal_Int32 nURLIdx = 0; nURLIdx < aUrls.getLength(); nURLIdx++ ) @@ -249,7 +246,7 @@ IMPL_LINK( WebConnectionInfoDialog, RemovePasswordHdl, PushButton*, EMPTYARG ) uno::Reference< task::XPasswordContainer > xPasswdContainer( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.PasswordContainer" ) ) ), uno::UNO_QUERY_THROW ); @@ -260,7 +257,7 @@ IMPL_LINK( WebConnectionInfoDialog, RemovePasswordHdl, PushButton*, EMPTYARG ) } else { - uno::Reference< task::XUrlContainer > xUrlContainer( + uno::Reference< task::XUrlContainer > xUrlContainer( xPasswdContainer, uno::UNO_QUERY_THROW ); xUrlContainer->removeUrl( aURL ); } @@ -280,20 +277,20 @@ IMPL_LINK( WebConnectionInfoDialog, RemoveAllPasswordsHdl, PushButton*, EMPTYARG { uno::Reference< task::XPasswordContainer > xPasswdContainer( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.PasswordContainer" ) ) ), uno::UNO_QUERY_THROW ); // should the master password be requested before? xPasswdContainer->removeAllPersistent(); - uno::Reference< task::XUrlContainer > xUrlContainer( + uno::Reference< task::XUrlContainer > xUrlContainer( xPasswdContainer, uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > aUrls + uno::Sequence< rtl::OUString > aUrls = xUrlContainer->getUrls( sal_True /* OnlyPersistent */ ); for ( sal_Int32 nURLIdx = 0; nURLIdx < aUrls.getLength(); nURLIdx++ ) - xUrlContainer->removeUrl( aUrls[ nURLIdx ] ); - + xUrlContainer->removeUrl( aUrls[ nURLIdx ] ); + m_aPasswordsLB.Clear(); } catch( uno::Exception& ) @@ -313,15 +310,15 @@ IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG ) ::rtl::OUString aURL = m_aPasswordsLB.GetEntryText( pEntry, 0 ); ::rtl::OUString aUserName = m_aPasswordsLB.GetEntryText( pEntry, 1 ); - ::comphelper::DocPasswordRequest* pPasswordRequest + ::comphelper::DocPasswordRequest* pPasswordRequest = new ::comphelper::DocPasswordRequest( - ::comphelper::DocPasswordRequestType_STANDARD, + ::comphelper::DocPasswordRequestType_STANDARD, task::PasswordRequestMode_PASSWORD_CREATE, aURL ); uno::Reference< task::XInteractionRequest > rRequest( pPasswordRequest ); uno::Reference< task::XInteractionHandler > xInteractionHandler( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" ) ) ), uno::UNO_QUERY_THROW ); xInteractionHandler->handle( rRequest ); @@ -334,10 +331,10 @@ IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG ) uno::Reference< task::XPasswordContainer > xPasswdContainer( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.PasswordContainer" ) ) ), uno::UNO_QUERY_THROW ); - xPasswdContainer->addPersistent( + xPasswdContainer->addPersistent( aURL, aUserName, aPasswd, xInteractionHandler ); } } @@ -361,7 +358,7 @@ IMPL_LINK( WebConnectionInfoDialog, EntrySelectedHdl, void*, EMPTYARG ) { m_aRemoveBtn.Enable( TRUE ); - // url container entries (-> use system credentials) have + // url container entries (-> use system credentials) have // no password sal_Int32 nPos = (sal_Int32)(sal_IntPtr)pEntry->GetUserData(); m_aChangeBtn.Enable( nPos < m_nPos ); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index fe4c00d00..1dd8ad177 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "align.hxx" diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 0105894c6..4e51bd599 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,11 +26,9 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR + #include <svl/svstdarr.hxx> #include <vcl/msgbox.hxx> #include <vcl/field.hxx> @@ -135,8 +133,8 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : //! LANGUAGE_NONE is displayed as '[All]' and the LanguageType //! will be set to LANGUAGE_DONTKNOW sal_Int16 nLangList = LANG_LIST_WESTERN; - - if( SvtLanguageOptions().IsCTLFontEnabled() ) + + if( SvtLanguageOptions().IsCTLFontEnabled() ) nLangList |= LANG_LIST_CTL; aLanguageLB.SetLanguageList( nLangList, TRUE, TRUE ); aLanguageLB.SelectLanguage( LANGUAGE_NONE ); @@ -490,7 +488,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, /* */ /*********************************************************************/ -SvLBoxEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, USHORT nCol) +SvLBoxEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, USHORT nCol) { SvLBoxEntry* pEntry = new SvLBoxEntry; @@ -1859,10 +1857,10 @@ enum OfaQuoteOptions REPLACE_1ST }; -SvLBoxEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, USHORT nCol) +SvLBoxEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, USHORT nCol) { SvLBoxEntry* pEntry = new SvLBoxEntry; - + if ( !pCheckButtonData ) { pCheckButtonData = new SvLBoxButtonData( &aSwCheckLB ); @@ -1923,7 +1921,7 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : sStandard(CUI_RES(ST_STANDARD)) { FreeResource(); - + BOOL bShowSWOptions = FALSE; aCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_CLB ); @@ -1939,7 +1937,7 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : { 3, 0, 20, 40 }; - + aSwCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL); aSwCheckLB.SvxSimpleTable::SetTabs(aStaticTabs); @@ -2081,7 +2079,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& ) aCheckLB.InsertEntry( sNonBrkSpace ); aCheckLB.InsertEntry( sOrdinal ); - + USHORT nPos = 0; aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & AddNonBrkSpace) ); aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgOrdinalNumber) ); @@ -2304,7 +2302,7 @@ BOOL OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& ) bModified |= pOpt->bAutoCmpltCollectWords != bCheck; pOpt->bAutoCmpltCollectWords = bCheck; bCheck = !aCBRemoveList.IsChecked(); // inverted value! - bModified |= pOpt->bAutoCmpltKeepList != bCheck; + bModified |= pOpt->bAutoCmpltKeepList != bCheck; pOpt->bAutoCmpltKeepList = bCheck; bCheck = aCBAppendSpace.IsChecked(); bModified |= pOpt->bAutoCmpltAppendBlanc != bCheck; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index be495720d..ca794242d 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <unotools/pathoptions.hxx> #include <vcl/msgbox.hxx> diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index f22d1c28d..af6197312 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <svx/dialogs.hrc> diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index c99316337..e4ab0aa8b 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> @@ -186,7 +183,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, aWndPresets ( this, CUI_RES( WIN_PRESETS ) ), aUserDefFT ( this, CUI_RES( FT_USERDEF ) ), aFrameSel ( this, CUI_RES( WIN_FRAMESEL ) ), - + aFlSep1 ( this, CUI_RES( FL_SEPARATOR1 ) ), aFlLine ( this, CUI_RES( FL_LINE ) ), aStyleFT ( this, CUI_RES( FT_STYLE ) ), @@ -452,8 +449,8 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) SfxMapUnit eCoreUnit; pBoxItem = (const SvxBoxItem*)GetItem( rSet, SID_ATTR_BORDER_OUTER ); - - + + pBoxInfoItem = (const SvxBoxInfoItem*)GetItem( rSet, SID_ATTR_BORDER_INNER, sal_False ); eCoreUnit = rSet.GetPool()->GetMetric( nWhichBox ); @@ -741,7 +738,7 @@ BOOL SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) nMinValue == aRightMF .GetValue() || nMinValue == aTopMF .GetValue() || nMinValue == aBottomMF.GetValue() || - (pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(VALID_DISTANCE)) + (pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(VALID_DISTANCE)) ) { aBoxItem.SetDistance( (USHORT)GetCoreValue( aLeftMF, eCoreUnit ), BOX_LINE_LEFT ); diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index 780e969e1..707af534a 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "borderconn.hxx" #include <svx/frmsel.hxx> #include "editeng/bolnitem.hxx" diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 44d2cce3f..82f56354c 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <editeng/unolingu.hxx> #include <vcl/svapp.hxx> diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index 9619344f3..3ab32baa8 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/module.hxx> @@ -559,7 +556,7 @@ void SvxConnectionPage::PageCreated (SfxAllItemSet aSet) SFX_ITEMSET_ARG(&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,sal_False); if (pOfaPtrItem) SetView( static_cast<SdrView *>(pOfaPtrItem->GetValue()) ); - + Construct(); } diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index 582bab2fe..d7774d932 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <sfx2/basedlgs.hxx> #include <cuires.hrc> #include "dstribut.hxx" diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index fde1e3b65..93cd0632f 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <svl/eitem.hxx> #include <sfx2/app.hxx> diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index fa5a36d50..d4245e1e1 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <sfx2/app.hxx> @@ -582,13 +579,13 @@ SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView* pSdrVie //different positioning page in Writer if(nAnchorCtrls & 0x00ff ) - { - AddTabPage( RID_SVXPAGE_SWPOSSIZE, SvxSwPosSizeTabPage::Create, + { + AddTabPage( RID_SVXPAGE_SWPOSSIZE, SvxSwPosSizeTabPage::Create, SvxSwPosSizeTabPage::GetRanges ); RemoveTabPage( RID_SVXPAGE_POSITION_SIZE); } else - { + { AddTabPage( RID_SVXPAGE_POSITION_SIZE, SvxPositionSizeTabPage::Create, SvxPositionSizeTabPage::GetRanges ); RemoveTabPage( RID_SVXPAGE_SWPOSSIZE ); @@ -623,7 +620,7 @@ void SvxCaptionTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) SvxSwPosSizeTabPage& rSwPage = static_cast<SvxSwPosSizeTabPage&>(rPage); rSwPage.EnableAnchorTypes(nAnchorCtrls); rSwPage.SetValidateFramePosLink( aValidateLink ); - } + } break; case RID_SVXPAGE_CAPTION: @@ -636,7 +633,7 @@ void SvxCaptionTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) void SvxCaptionTabDialog::SetValidateFramePosLink( const Link& rLink ) { aValidateLink = rLink; -} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index cf6cc6fd5..ddfe7f714 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #define ITEMID_MACRO 0 #include <svl/macitem.hxx> #undef ITEMID_MACRO diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 023153bc2..344551b23 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/module.hxx> @@ -123,12 +120,12 @@ SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) : aLbUnit ( this, CUI_RES( LB_UNIT ) ), aTsbParallel ( this, CUI_RES( TSB_PARALLEL ) ), aCtlPreview ( this, CUI_RES( CTL_PREVIEW ), rInAttrs ), - + aFlVert ( this, CUI_RES( FL_VERT ) ), rOutAttrs ( rInAttrs ), aAttrSet ( *rInAttrs.GetPool() ), pView( 0 ), - + bPositionModified ( FALSE ) { FillUnitLB(); @@ -863,10 +860,10 @@ void SvxMeasurePage::FillUnitLB() void SvxMeasurePage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,sal_False); - + if (pOfaPtrItem) SetView( static_cast<SdrView *>(pOfaPtrItem->GetValue())); - + Construct(); } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 2ec19a24e..7a209f5ed 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -26,13 +26,6 @@ * ************************************************************************/ -#if !ENABLE_LAYOUT_EXPERIMENTAL -//#undef ENABLE_LAYOUT -#endif - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <svl/eitem.hxx> #include <svl/intitem.hxx> diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 95dfe6f19..8a1d58994 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 23f3c4c15..90f5d8cbc 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 88031affc..c1d0df336 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <svl/style.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> @@ -662,7 +659,7 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent, aLeftIndent ( this, CUI_RES( ED_LEFTINDENT ) ), aRightLabel ( this, CUI_RES( FT_RIGHTINDENT ) ), aRightIndent ( this, CUI_RES( ED_RIGHTINDENT ) ), - + aFLineLabel ( this, CUI_RES( FT_FLINEINDENT ) ), aFLineIndent ( this, CUI_RES( ED_FLINEINDENT ) ), aAutoCB ( this, CUI_RES( CB_AUTO ) ), diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 2bcb5ebae..802440a55 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <cstddef> #include <swpossizetabpage.hxx> #include <dialmgr.hxx> diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 4f8b1bc5e..36b1f3a38 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/ref.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 3bbccabd9..b316498d7 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <vcl/msgbox.hxx> #include <unotools/pathoptions.hxx> diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 7985a436a..a531e3fad 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 36feaae67..4ef0287df 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/module.hxx> diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 28959aeca..2000dd4ca 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/module.hxx> diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index eef41b4df..05015b20f 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <sfx2/app.hxx> @@ -255,7 +252,7 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const SfxItemSet rOutAttrs ( rInAttrs ), nPageType(0), nDlgType(0), - + aFlProp ( this, CUI_RES( FL_PROP ) ), aRbtTransOff ( this, CUI_RES( RBT_TRANS_OFF ) ), aRbtTransLinear ( this, CUI_RES( RBT_TRANS_LINEAR ) ), @@ -277,7 +274,7 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const SfxItemSet aMtrTrgrStartValue ( this, CUI_RES( MTR_TRGR_START_VALUE ) ), aFtTrgrEndValue ( this, CUI_RES( FT_TRGR_END_VALUE ) ), aMtrTrgrEndValue ( this, CUI_RES( MTR_TRGR_END_VALUE ) ), - + aCtlBitmapPreview ( this, CUI_RES( CTL_BITMAP_PREVIEW ) ), aCtlXRectPreview ( this, CUI_RES( CTL_TRANS_PREVIEW ) ), bBitmap ( FALSE ), @@ -650,7 +647,7 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : aMtrFldOffset ( this, CUI_RES( MTR_FLD_OFFSET ) ), aCtlXRectPreview ( this, CUI_RES( CTL_COLOR_PREVIEW ) ), - + rOutAttrs ( rInAttrs ), pColorTab( NULL ), diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 691239eb4..05898008e 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - //svdraw.hxx #define _SVDRAW_HXX #define _SDR_NOITEMS diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index bbc0ddf06..3da79d2f3 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <unotools/pathoptions.hxx> diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 769e0513f..06cfbb00d 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <vcl/wrkwin.hxx> #include <tools/shl.hxx> #include <tools/urlobj.hxx> diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 6f53a3003..987ef5d2b 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index c3cb88395..4c05982c9 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #ifndef _SVX_SIZEITEM_HXX //autogen #include <editeng/sizeitem.hxx> #endif @@ -51,7 +48,7 @@ #include "svx/dlgutil.hxx" #include "svx/svxgrahicitem.hxx" #include <sfx2/request.hxx> -#include "svx/ofaitem.hxx" +#include "svx/ofaitem.hxx" #include <svx/svdobj.hxx> #include <svx/svdview.hxx> #include <svx/svdmodel.hxx> @@ -122,18 +119,18 @@ SvxLineTabPage::SvxLineTabPage aFlLineEnds ( this, CUI_RES( FL_LINE_ENDS ) ), aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), aFLSeparator ( this, CUI_RES( FL_SEPARATOR ) ), - + // #116827# maFLEdgeStyle ( this, CUI_RES( FL_EDGE_STYLE ) ), maFTEdgeStyle ( this, CUI_RES( FT_EDGE_STYLE ) ), maLBEdgeStyle ( this, CUI_RES( LB_EDGE_STYLE ) ), - + pSymbolList(NULL), bNewSize(false), nNumMenuGalleryItems(0), nSymbolType(SVX_SYMBOLTYPE_UNKNOWN), //unbekannt bzw. unchanged pSymbolAttr(NULL), - //#58425# Symbole auf einer Linie (z.B. StarChart) + //#58425# Symbole auf einer Linie (z.B. StarChart) aFlSymbol ( this, CUI_RES(FL_SYMBOL_FORMAT)), aSymbolMB ( this, CUI_RES(MB_SYMBOL_BITMAP)), aSymbolWidthFT ( this, CUI_RES(FT_SYMBOL_WIDTH)), @@ -141,7 +138,7 @@ SvxLineTabPage::SvxLineTabPage aSymbolHeightFT ( this, CUI_RES(FT_SYMBOL_HEIGHT)), aSymbolHeightMF ( this, CUI_RES(MF_SYMBOL_HEIGHT)), aSymbolRatioCB ( this, CUI_RES(CB_SYMBOL_RATIO)), - + bLastWidthModified(FALSE), aSymbolLastSize(Size(0,0)), bSymbols(FALSE), diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 798733996..8488dee30 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 671e12c11..02ca47477 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index e57c19c87..0fd849e1c 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <sfx2/app.hxx> diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index d5e483ccd..2bf84a27a 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> @@ -132,12 +129,12 @@ SvxTransformTabDialog::SvxTransformTabDialog( Window* pParent, const SfxItemSet* //different positioning page in Writer if(nAnchorCtrls & 0x00ff) - { + { AddTabPage(RID_SVXPAGE_SWPOSSIZE, SvxSwPosSizeTabPage::Create, SvxSwPosSizeTabPage::GetRanges); RemoveTabPage(RID_SVXPAGE_POSITION_SIZE); } else - { + { AddTabPage(RID_SVXPAGE_POSITION_SIZE, SvxPositionSizeTabPage::Create, SvxPositionSizeTabPage::GetRanges); RemoveTabPage(RID_SVXPAGE_SWPOSSIZE); } @@ -163,7 +160,7 @@ void SvxTransformTabDialog::PageCreated(USHORT nId, SfxTabPage &rPage) SvxPositionSizeTabPage& rSvxPos = static_cast<SvxPositionSizeTabPage&>(rPage); rSvxPos.SetView(pView); rSvxPos.Construct(); - + if(nAnchorCtrls & SVX_OBJ_NORESIZE) { rSvxPos.DisableResize(); @@ -174,7 +171,7 @@ void SvxTransformTabDialog::PageCreated(USHORT nId, SfxTabPage &rPage) rSvxPos.DisableProtect(); rSvxPos.UpdateControlStates(); } - + break; } case RID_SVXPAGE_SWPOSSIZE : @@ -194,7 +191,7 @@ void SvxTransformTabDialog::PageCreated(USHORT nId, SfxTabPage &rPage) rSvxAng.SetView( pView ); rSvxAng.Construct(); - + break; } @@ -231,13 +228,13 @@ SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs ) aMtrPosX ( this, CUI_RES( MTR_FLD_POS_X ) ), aFtPosY ( this, CUI_RES( FT_POS_Y ) ), aMtrPosY ( this, CUI_RES( MTR_FLD_POS_Y ) ), - aFtPosPresets ( this, CUI_RES(FT_POSPRESETS) ), + aFtPosPresets ( this, CUI_RES(FT_POSPRESETS) ), aCtlRect ( this, CUI_RES( CTL_RECT ) ), - + aFlAngle ( this, CUI_RES( FL_ANGLE ) ), aFtAngle ( this, CUI_RES( FT_ANGLE ) ), aMtrAngle ( this, CUI_RES( MTR_FLD_ANGLE ) ), - aFtAnglePresets ( this, CUI_RES(FT_ANGLEPRESETS) ), + aFtAnglePresets ( this, CUI_RES(FT_ANGLEPRESETS) ), aCtlAngle ( this, CUI_RES( CTL_ANGLE ), RP_RB, 200, 80, CS_ANGLE ), rOutAttrs ( rInAttrs ) @@ -713,27 +710,27 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage( Window* pParent, const SfxItemSe maMtrPosY ( this, CUI_RES( MTR_FLD_POS_Y ) ), maFtPosReference ( this, CUI_RES( FT_POSREFERENCE ) ), maCtlPos ( this, CUI_RES( CTL_POSRECT ), RP_LT ), - + maFlSize ( this, CUI_RES( FL_SIZE ) ), maFtWidth ( this, CUI_RES( FT_WIDTH ) ), maMtrWidth ( this, CUI_RES( MTR_FLD_WIDTH ) ), maFtHeight ( this, CUI_RES( FT_HEIGHT ) ), maMtrHeight ( this, CUI_RES( MTR_FLD_HEIGHT ) ), maCbxScale ( this, CUI_RES( CBX_SCALE ) ), - maFtSizeReference ( this, CUI_RES( FT_SIZEREFERENCE) ), + maFtSizeReference ( this, CUI_RES( FT_SIZEREFERENCE) ), maCtlSize ( this, CUI_RES( CTL_SIZERECT ), RP_LT ), - + maFlProtect ( this, CUI_RES( FL_PROTECT) ), maTsbPosProtect ( this, CUI_RES( TSB_POSPROTECT ) ), maTsbSizeProtect ( this, CUI_RES( TSB_SIZEPROTECT ) ), - + maFlAdjust ( this, CUI_RES( FL_ADJUST ) ), maTsbAutoGrowWidth ( this, CUI_RES( TSB_AUTOGROW_WIDTH ) ), maTsbAutoGrowHeight ( this, CUI_RES( TSB_AUTOGROW_HEIGHT ) ), maFlDivider (this, CUI_RES( FL_DIVIDER ) ), - + mrOutAttrs ( rInAttrs ), mnProtectSizeState( STATE_NOCHECK ), mbPageDisabled ( FALSE ), @@ -829,7 +826,7 @@ void SvxPositionSizeTabPage::Construct() } } - // this should happen via SID_ATTR_TRANSFORM_AUTOSIZE + // this should happen via SID_ATTR_TRANSFORM_AUTOSIZE if(1 == rMarkList.GetMarkCount()) { const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); @@ -1621,7 +1618,7 @@ IMPL_LINK( SvxPositionSizeTabPage, ChangeWidthHdl, void *, EMPTYARG ) if( maCbxScale.IsChecked() && maCbxScale.IsEnabled() ) { sal_Int64 nHeight(basegfx::fround64((mfOldHeight * (double)maMtrWidth.GetValue()) / mfOldWidth)); - + if(nHeight <= maMtrHeight.GetMax(FUNIT_NONE)) { maMtrHeight.SetUserValue(nHeight, FUNIT_NONE); @@ -1630,7 +1627,7 @@ IMPL_LINK( SvxPositionSizeTabPage, ChangeWidthHdl, void *, EMPTYARG ) { nHeight = maMtrHeight.GetMax(FUNIT_NONE); maMtrHeight.SetUserValue(nHeight); - + const sal_Int64 nWidth(basegfx::fround64((mfOldWidth * (double)nHeight) / mfOldHeight)); maMtrWidth.SetUserValue(nWidth, FUNIT_NONE); } |