diff options
Diffstat (limited to 'cui')
147 files changed, 321 insertions, 2192 deletions
diff --git a/cui/inc/pch/precompiled_cui.cxx b/cui/inc/pch/precompiled_cui.cxx deleted file mode 100644 index 4d85e0351431..000000000000 --- 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 5d78bc270793..000000000000 --- a/cui/inc/pch/precompiled_cui.hxx +++ /dev/null @@ -1,961 +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 "bootstrp/sstring.hxx" -#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 b2a58dd84b90..13d5bff7e580 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - //----------------------------------------------- // include own files diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 14087c3c5659..99cb2445acc7 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> @@ -4141,7 +4138,7 @@ bool EntrySort( SvxConfigEntry* a, SvxConfigEntry* b ) SvxEntries* ToolbarSaveInData::GetEntries() { - typedef ::std::hash_map< ::rtl::OUString, + typedef ::boost::unordered_map< ::rtl::OUString, bool, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ToolbarInfo; @@ -4202,7 +4199,7 @@ SvxEntries* ToolbarSaveInData::GetEntries() pEntry->SetStyle( GetSystemStyle( url ) ); - // insert into hash_map to filter duplicates from the parent + // insert into boost::unordered_map to filter duplicates from the parent aToolbarInfo.insert( ToolbarInfo::value_type( systemname, true )); OUString custom(RTL_CONSTASCII_USTRINGPARAM(CUSTOM_TOOLBAR_STR)); @@ -5290,7 +5287,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, { FreeResource(); - typedef ::std::hash_map< ::rtl::OUString, + typedef ::boost::unordered_map< ::rtl::OUString, bool, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ImageInfo; @@ -5975,7 +5972,6 @@ BitmapEx SvxIconSelectorDialog::AutoScaleBitmap(BitmapEx & aBitmap, const long a imgposY = (aStandardSize - imgOldHeight) / 2 + 0.5; } - Size aBmpSize = aRet.GetSizePixel(); Size aStdSize( aStandardSize, aStandardSize ); Rectangle aRect(aEmptyPoint, aStdSize ); diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 86eed6d9ce8b..18f1fa122562 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> @@ -1513,7 +1510,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry ) } default: - DBG_ERROR( "Falscher Gruppentyp!" ); + OSL_FAIL( "Falscher Gruppentyp!" ); break; } } diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 85c2d44a6a64..02383fc0b3bf 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -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 4498c5ea4ccb..3f26f09d9761 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -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 28a3d42cb35e..6fee34f67ca6 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> @@ -955,7 +953,7 @@ void SvxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry ) } default: - DBG_ERROR( "Falscher Gruppentyp!" ); + OSL_FAIL( "Falscher Gruppentyp!" ); break; } } diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx index f3098f0688de..34dd071e50e9 100644 --- a/cui/source/dialogs/SpellAttrib.cxx +++ b/cui/source/dialogs/SpellAttrib.cxx @@ -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> diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 871a59925111..e18f2e3f13e1 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 58b0bc163e0b..99c7079a53eb 100644 --- a/cui/source/dialogs/commonlingui.cxx +++ b/cui/source/dialogs/commonlingui.cxx @@ -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 93ce5e7ca44e..9ec9c84253b7 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <stdio.h> @@ -349,7 +346,6 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe // left align aShowText field int nLeftEdge = aSymbolText.GetPosPixel().X(); nLeftEdge += aSymbolText.GetTextWidth( aSymbolText.GetText() ); - Size aNewSize = aShowText.GetOutputSizePixel(); aShowText.SetPosPixel( Point( nLeftEdge+4, aShowText.GetPosPixel().Y() ) ); } diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index bac1d9d897e7..7d38ea63ca8d 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -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> @@ -240,7 +237,7 @@ FmSearchDialog::~FmSearchDialog() //------------------------------------------------------------------------ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sInitialText) { - // die Initialisierung all der Controls + //the initialization of all the Controls m_rbSearchForText.SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios)); m_rbSearchForNull.SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios)); m_rbSearchForNotNull.SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios)); @@ -268,8 +265,8 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI m_aHalfFullFormsCJK.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled)); m_aSoundsLikeCJK.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled)); - // die Listboxen fuellen - // die Methoden des Feldvergleiches + // fill the listboxes + // method of field comparison USHORT nResIds[] = { RID_STR_SEARCH_ANYWHERE, RID_STR_SEARCH_BEGINNING, @@ -280,7 +277,7 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI m_lbPosition.InsertEntry( String( CUI_RES( nResIds[i] ) ) ); m_lbPosition.SelectEntryPos(MATCHING_ANYWHERE); - // die Feld-Listbox + // the field listbox for (USHORT i=0; i<strVisibleFields.GetTokenCount(';'); ++i) m_lbField.InsertEntry(strVisibleFields.GetToken(i, ';')); @@ -289,14 +286,15 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI LoadParams(); m_cmbSearchText.SetText(sInitialText); - // wenn die Edit-Zeile den Text veraendert hat (weil er zum Beispiel Steuerzeichen enthielt, wie das bei Memofeldern der Fall - // sein kann), nehme ich einen leeren UniString + // if the Edit-line has changed the text (e.g. because it contains + // control characters, as can be the case with memo fields), I use + // an empty UniString. UniString sRealSetText = m_cmbSearchText.GetText(); if (!sRealSetText.Equals(sInitialText)) m_cmbSearchText.SetText(UniString()); LINK(this, FmSearchDialog, OnSearchTextModified).Call(&m_cmbSearchText); - // initial die ganzen UI-Elemente fuer die Suche an + // initial m_aDelayedPaint.SetTimeoutHdl(LINK(this, FmSearchDialog, OnDelayedPaint)); m_aDelayedPaint.SetTimeout(500); EnableSearchUI(sal_True); @@ -310,8 +308,10 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI //------------------------------------------------------------------------ sal_Bool FmSearchDialog::Close() { - // Wenn der Close-Button disabled ist und man im Dialog ESC drueckt, dann wird irgendwo vom Frame trotzdem Close aufgerufen, - // was ich allerdings nicht will, wenn ich gerade mitten in einer (eventuell in einem extra Thread laufenden) Suche bin + // If the close button is disabled and ESC is pressed in a dialog, + // then Frame will call Close anyway, which I don't want to happen + // while I'm in the middle of a search (maybe one that's running + // in its own thread) if (!m_pbClose.IsEnabled()) return sal_False; return ModalDialog::Close(); @@ -325,7 +325,7 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton) EnableSearchForDependees(sal_True); } else - // die Feldlistbox entsprechend en- oder disablen + // en- or disable field list box accordingly if (pButton == &m_rbSingleField) { m_lbField.Enable(); diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 43f0f5dc5845..bd5240e1e7c4 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> @@ -194,12 +191,12 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, { SolarMutexGuard aGuard; - mpBrowser->aFoundList.Insert( - new String( aFoundURL.GetMainURL( INetURLObject::NO_DECODE ) ), - LIST_APPEND ); + mpBrowser->aFoundList.push_back( + new String( aFoundURL.GetMainURL( INetURLObject::NO_DECODE ) ) + ); mpBrowser->aLbxFound.InsertEntry( GetReducedString( aFoundURL, 50 ), - (USHORT) mpBrowser->aFoundList.Count() - 1 ); + (USHORT) mpBrowser->aFoundList.size() - 1 ); } } } @@ -315,9 +312,9 @@ void SAL_CALL TakeThread::run() { // kompletten Filenamen aus FoundList holen if( mpBrowser->bTakeAll ) - aURL = INetURLObject(*mpBrowser->aFoundList.GetObject( nPos = i )); + aURL = INetURLObject( *mpBrowser->aFoundList[ nPos = i ] ); else - aURL = INetURLObject(*mpBrowser->aFoundList.GetObject( nPos = mpBrowser->aLbxFound.GetSelectEntryPos( i ) )); + aURL = INetURLObject(*mpBrowser->aFoundList[ nPos = mpBrowser->aLbxFound.GetSelectEntryPos( i ) ]); // Position in Taken-Liste uebernehmen mrTakenList.Insert( (void*) (ULONG)nPos, LIST_APPEND ); @@ -384,7 +381,7 @@ IMPL_LINK( TakeProgress, ClickCancelBtn, void*, EMPTYARG ) IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG ) { TPGalleryThemeProperties* mpBrowser = (TPGalleryThemeProperties*) GetParent(); - ::std::bit_vector aRemoveEntries( mpBrowser->aFoundList.Count(), false ); + ::std::vector<bool, std::allocator<bool> > aRemoveEntries( mpBrowser->aFoundList.size(), false ); ::std::vector< String > aRemainingVector; sal_uInt32 i, nCount; @@ -401,15 +398,14 @@ IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG ) // refill found list for( i = 0, nCount = aRemoveEntries.size(); i < nCount; ++i ) if( !aRemoveEntries[ i ] ) - aRemainingVector.push_back( *mpBrowser->aFoundList.GetObject( i ) ); - - for( String* pStr = mpBrowser->aFoundList.First(); pStr; pStr = mpBrowser->aFoundList.Next() ) - delete pStr; + aRemainingVector.push_back( *mpBrowser->aFoundList[ i ] ); - mpBrowser->aFoundList.Clear(); + for ( i = 0, nCount = mpBrowser->aFoundList.size(); i < nCount; ++i ) + delete mpBrowser->aFoundList[ i ]; + mpBrowser->aFoundList.clear(); for( i = 0, nCount = aRemainingVector.size(); i < nCount; ++i ) - mpBrowser->aFoundList.Insert( new String( aRemainingVector[ i ] ), LIST_APPEND ); + mpBrowser->aFoundList.push_back( new String( aRemainingVector[ i ] ) ); aRemainingVector.clear(); @@ -818,8 +814,8 @@ TPGalleryThemeProperties::~TPGalleryThemeProperties() xMediaPlayer.clear(); xDialogListener.clear(); - for( String* pStr = aFoundList.First(); pStr; pStr = aFoundList.Next() ) - delete pStr; + for ( size_t i = 0, n = aFoundList.size(); i < n; ++i ) + delete aFoundList[ i ]; for( void* pEntry = aFilterEntryList.First(); pEntry; pEntry = aFilterEntryList.Next() ) delete (FilterEntry*) pEntry; @@ -997,10 +993,10 @@ void TPGalleryThemeProperties::SearchFiles() { SearchProgress* pProgress = new SearchProgress( this, aURL ); - for( String* pStr = aFoundList.First(); pStr; pStr = aFoundList.Next() ) - delete pStr; + for ( size_t i = 0, n = aFoundList.size(); i < n; ++i ) + delete aFoundList[ i ]; + aFoundList.clear(); - aFoundList.Clear(); aLbxFound.Clear(); pProgress->SetFileType( aCbbFileType.GetText() ); @@ -1061,9 +1057,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG ) } catch(IllegalArgumentException) { -#ifdef DBG_UTIL - DBG_ERROR( "Folder picker failed with illegal arguments" ); -#endif + OSL_FAIL( "Folder picker failed with illegal arguments" ); } } @@ -1115,7 +1109,7 @@ void TPGalleryThemeProperties::DoPreview() if( aString != aPreviewString ) { - INetURLObject _aURL( *aFoundList.GetObject( aLbxFound.GetEntryPos( aString ) ) ); + INetURLObject _aURL( *aFoundList[ aLbxFound.GetEntryPos( aString ) ] ); bInputAllowed = FALSE; if ( !aWndPreview.SetGraphic( _aURL ) ) @@ -1197,7 +1191,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFoundHdl, void *, EMPTYARG ) else aCbxPreview.Disable(); - if( aFoundList.Count() ) + if( aFoundList.size() ) aBtnTakeAll.Enable(); else aBtnTakeAll.Disable(); @@ -1238,7 +1232,7 @@ IMPL_LINK( TPGalleryThemeProperties, PreviewTimerHdl, void *, EMPTYARG ) IMPL_LINK( TPGalleryThemeProperties, EndSearchProgressHdl, SearchProgress *, EMPTYARG ) { - if( aFoundList.Count() ) + if( aFoundList.size() ) { aLbxFound.SelectEntryPos( 0 ); aBtnTakeAll.Enable(); diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index beb0774c7bd0..82e95178a2bb 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -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> @@ -450,7 +447,7 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, switch( maCtlLight.GetActualRP() ) { - default: DBG_ERROR("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" ); + default: OSL_FAIL("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" ); case( RP_LT ): nAzim = 4500, nElev = 4500; break; case( RP_MT ): nAzim = 9000, nElev = 4500; break; case( RP_RT ): nAzim = 13500, nElev = 4500; break; diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index eb80960da935..7c38c610b639 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 d52476bf221e..f04dc998bedd 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 4d0f2d91d12f..aa1fd6ab285f 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -26,10 +26,7 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <tools/ref.hxx> #include <tools/shl.hxx> #include <svl/intitem.hxx> diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index ac6cdd178eae..e624b0ef2d5d 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -26,11 +26,7 @@ * ************************************************************************/ -// 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> #include <tools/debug.hxx> #include <vcl/msgbox.hxx> @@ -227,7 +223,7 @@ void SvxMessDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt ) break; default: - DBG_ERROR( "Falsche Button-Nummer!!!" ); + OSL_FAIL( "Falsche Button-Nummer!!!" ); } } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index bc16fa576d04..01d01525bc1f 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -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; @@ -918,7 +906,7 @@ namespace svx case HHC::eRubyHangulAbove: m_pHangulAbove->Check(); break; case HHC::eRubyHangulBelow: m_pHangulBelow->Check(); break; default: - DBG_ERROR( "HangulHanjaConversionDialog::SetConversionFormat: unknown type!" ); + OSL_FAIL( "HangulHanjaConversionDialog::SetConversionFormat: unknown type!" ); } } @@ -940,7 +928,7 @@ namespace svx if ( m_pHangulBelow->IsChecked() ) return HHC::eRubyHangulBelow; - DBG_ERROR( "HangulHanjaConversionDialog::GetConversionFormat: no radio checked?" ); + OSL_FAIL( "HangulHanjaConversionDialog::GetConversionFormat: no radio checked?" ); return HHC::eSimpleConversion; } @@ -1758,13 +1746,13 @@ namespace svx //fill found entries into boxes sal_uInt32 nCnt = aEntries.getLength(); - sal_uInt32 n = 0; if( nCnt ) { if( !m_pSuggestions ) m_pSuggestions = new SuggestionList( MAXNUM_SUGGESTIONS ); const OUString* pSugg = aEntries.getConstArray(); + sal_uInt32 n = 0; while( nCnt ) { m_pSuggestions->Set( pSugg[ n ], sal_uInt16( n ) ); diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index b3983caf9596..3d7942f4dadc 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 a196730d9eb9..770736162f0b 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 881a75bf5692..4109846bff4c 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 5312ccbdc830..0a2f7af154d5 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 9c0264bfc17b..a19309b4a7d7 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 60dc605de4d0..0b4abd3a03f9 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> @@ -535,7 +532,7 @@ BOOL SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL ) } catch( ... ) { - DBG_ERROR( "FileExists: ucb error" ); + OSL_FAIL( "FileExists: ucb error" ); } } diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index be532c66f482..1b9b63bf8231 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -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" @@ -40,7 +37,6 @@ #include <svtools/langtab.hxx> #include <svx/dialmgr.hxx> #include <svx/dlgutil.hxx> -#include <tools/list.hxx> #include <tools/shl.hxx> #include <vcl/msgbox.hxx> diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src index 5a727fb096df..06547352b35d 100755 --- a/cui/source/dialogs/hyphen.src +++ b/cui/source/dialogs/hyphen.src @@ -31,8 +31,6 @@ String RID_SVXSTR_HMERR_CHECKINSTALL { - /* ### ACHTUNG: Neuer Text in Resource? ist für die Prüfung nicht verfügbar. \nÃœberprüfen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gewünschte Sprache : ist f³r die Pr³fung nicht verf³gbar. \nšberpr³fen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew³nschte Sprache */ - /* ### ACHTUNG: Neuer Text in Resource? ist für die Prüfung nicht verfügbar. \nÃœberprüfen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gewünschte Sprache : ist f³r die Pr³fung nicht verf³gbar. \nšberpr³fen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew³nschte Sprache */ Text [ en-US ] = "is not available for spellchecking\nPlease check your installation and install the desired language\n" ; }; diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index f8822c8d5f6f..ddeb7040bbdd 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> @@ -877,6 +874,7 @@ void IconChoiceDialog::ActivatePageImpl () DBG_ASSERT( !maPageList.empty(), "keine Pages angemeldet" ); IconChoicePageData* pData = GetPageData ( mnCurrentPageId ); DBG_ASSERT( pData, "Id nicht bekannt" ); + BOOL bReadOnly = FALSE; if ( pData ) { if ( !pData->pPage ) @@ -916,11 +914,11 @@ void IconChoiceDialog::ActivatePageImpl () if ( pExampleSet ) pData->pPage->ActivatePage( *pExampleSet ); + SetHelpId( pData->pPage->GetHelpId() ); + bReadOnly = pData->pPage->IsReadOnly(); } - SetHelpId( pData->pPage->GetHelpId() ); - BOOL bReadOnly = pData->pPage->IsReadOnly(); if ( bReadOnly || bHideResetBtn ) aResetBtn.Hide(); else diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 935876869f5d..041ef64e5d26 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -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> @@ -367,7 +364,7 @@ short SvInsertOleDlg::Execute() } else { - OSL_ASSERT( "Can not get InteractionHandler!\n" ); + OSL_FAIL( "Can not get InteractionHandler!\n" ); aMedium.realloc( 1 ); } @@ -679,7 +676,7 @@ short SvInsertAppletDialog::Execute() } catch ( uno::Exception& ) { - DBG_ERROR( "No Applet!" ); + OSL_FAIL( "No Applet!" ); } } else @@ -729,7 +726,7 @@ short SvInsertAppletDialog::Execute() } catch ( uno::Exception& ) { - DBG_ERROR( "No Applet!" ); + OSL_FAIL( "No Applet!" ); } } } @@ -912,7 +909,7 @@ short SfxInsertFloatingFrameDialog::Execute() } catch ( uno::Exception& ) { - DBG_ERROR( "No IFrame!" ); + OSL_FAIL( "No IFrame!" ); } } else @@ -999,7 +996,7 @@ short SfxInsertFloatingFrameDialog::Execute() } catch ( uno::Exception& ) { - DBG_ERROR( "No IFrame!" ); + OSL_FAIL( "No IFrame!" ); } } } diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 588b105d26d5..e6653d01b6b9 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -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 a07b29722747..eb1fe3432895 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -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" @@ -115,7 +112,7 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml aTbLinks.SetTabs( &nTabs[0], MAP_APPFONT ); aTbLinks.Resize(); // OS: Hack fuer richtige Selektion - //JP 24.02.99: UpdateTimer fuer DDE-/Grf-Links, auf die gewarted wird + // UpdateTimer fuer DDE-/Grf-Links, auf die gewarted wird aUpdateTimer.SetTimeoutHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl ) ); aUpdateTimer.SetTimeout( 1000 ); diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx index 3470d22188c2..4c34d9338fe8 100644 --- a/cui/source/dialogs/multifil.cxx +++ b/cui/source/dialogs/multifil.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 <vcl/msgbox.hxx> diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index ffdc3834dc6c..030a88b617d8 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -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 cdd36aeb1b1b..b387b4f87369 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -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 f10ac3586baf..e4bd2dd52de7 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "passwdomdlg.hrc" diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 1360e9093276..007ffa82762b 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -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 e94528f18d91..e00ed70cc1a7 100644 --- a/cui/source/dialogs/plfilter.cxx +++ b/cui/source/dialogs/plfilter.cxx @@ -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 ab4fdb0d3f1f..0255e3c9fc55 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.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/date.hxx> diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src index c8262ab5f7a1..2a3dc5e98a00 100644 --- a/cui/source/dialogs/postdlg.src +++ b/cui/source/dialogs/postdlg.src @@ -121,7 +121,6 @@ ModalDialog RID_SVXDLG_POSTIT }; String STR_NOTIZ_INSERT { - /* ### ACHTUNG: Neuer Text in Resource? Notiz einfügen : Notiz einf³gen */ Text [ en-US ] = "Insert note" ; }; }; diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 355017889b65..40b5ecaf20e1 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 44ae64458d1f..52b9f43bd0e8 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -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/sdrcelldlg.src b/cui/source/dialogs/sdrcelldlg.src index 223028d45b40..7f03cc9010bc 100644 --- a/cui/source/dialogs/sdrcelldlg.src +++ b/cui/source/dialogs/sdrcelldlg.src @@ -100,7 +100,6 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG { Pos = MAP_APPFONT ( 169 , 151 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Zurück : Zur³ck */ Text [ de ] = "Zurück" ; Text [ en-US ] = "Return" ; TabStop = TRUE ; diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 95f631ce03d8..f5b9affb4d80 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "showcols.hxx" #include "fmsearch.hrc" @@ -86,7 +83,7 @@ IMPL_LINK( FmShowColsDialog, OnClickedOk, Button*, EMPTYARG ) } catch(...) { - DBG_ERROR("FmShowColsDialog::OnClickedOk Exception occurred!"); + OSL_FAIL("FmShowColsDialog::OnClickedOk Exception occurred!"); } } } @@ -120,11 +117,11 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com: ::rtl::OUString sName; xCurCol->getPropertyValue(CUIFM_PROP_LABEL) >>= sName; - sCurName = (const sal_Unicode*)sName; + sCurName = sName; } catch(...) { - DBG_ERROR("FmShowColsDialog::SetColumns Exception occurred!"); + OSL_FAIL("FmShowColsDialog::SetColumns Exception occurred!"); } // if the col is hidden, put it into the list diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index ffa88f5bf3c7..81591e13317f 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 85a4b8a9a02c..c503061a1f44 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "srchxtra.hxx" diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src index dc3469a468a5..6a943a3530f2 100644 --- a/cui/source/dialogs/svuidlg.src +++ b/cui/source/dialogs/svuidlg.src @@ -127,7 +127,6 @@ ModalDialog MD_UPDATE_BASELINKS { Pos = MAP_APPFONT ( 83 , 6 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Element: : Verknüpfungen */ Text [ en-US ] = "Element:" ; }; FixedText FT_TYPE @@ -211,7 +210,6 @@ ModalDialog MD_UPDATE_BASELINKS { Pos = MAP_APPFONT ( 133 , 150 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Manuell : Ma~nuell */ Text [ en-US ] = "Ma~nual" ; }; FixedText FT_FULL_FILE_NAME diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 0fa4b8dbaea6..6c28969d43f8 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 38a03773c7f7..42eda26ff2ff 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> @@ -142,7 +139,7 @@ void SvxZoomDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt ) break; default: - DBG_ERROR( "wrong button number" ); + OSL_FAIL( "wrong button number" ); } } @@ -165,7 +162,7 @@ void SvxZoomDialog::HideButton( USHORT nBtnId ) break; default: - DBG_ERROR( "Falsche Button-Nummer!!!" ); + OSL_FAIL( "Falsche Button-Nummer!!!" ); } } @@ -427,7 +424,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn ) } else { - DBG_ERROR( "Wrong Button" ); + OSL_FAIL( "Wrong Button" ); return 0; } @@ -509,7 +506,7 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn ) } else { - DBG_ERROR( "Wrong Button" ); + OSL_FAIL( "Wrong Button" ); return 0; } pOutSet = new SfxItemSet( rSet ); diff --git a/cui/source/factory/cuiexp.cxx b/cui/source/factory/cuiexp.cxx index 4dfc3b19b88f..bfa1b40e81b1 100644 --- a/cui/source/factory/cuiexp.cxx +++ b/cui/source/factory/cuiexp.cxx @@ -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 a7f9d20d9d4d..c04206ccb63b 100644 --- a/cui/source/factory/cuiresmgr.cxx +++ b/cui/source/factory/cuiresmgr.cxx @@ -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 b773e3e79d09..31cba6a36898 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -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" diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx index 46c91735b739..ac3753f57074 100644 --- a/cui/source/factory/init.cxx +++ b/cui/source/factory/init.cxx @@ -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/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 6254a9150038..536c94f1b454 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -47,7 +47,7 @@ #include <com/sun/star/media/XPlayer.hpp> #include <com/sun/star/ui/dialogs/XFolderPicker.hpp> #include <svtools/dialogclosedlistener.hxx> -#include <bootstrp/sstring.hxx> +#include <vector> // ------------ // - Forwards - @@ -59,6 +59,8 @@ class SearchProgress; class TakeProgress; class TPGalleryThemeProperties; +typedef ::std::vector< UniString* > StringList; + // --------------- // - FilterEntry - // --------------- diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 375aa2450e88..a65754f20ff5 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -36,7 +36,6 @@ #include <svtools/ivctrl.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> -#include <tools/list.hxx> #include <tools/string.hxx> #include <vector> diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index eb169352b0e3..3f475dfe818c 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -39,10 +39,10 @@ #include <vcl/lstbox.hxx> #include <rtl/ustring.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> -typedef ::std::hash_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventsHash; +typedef ::boost::unordered_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventsHash; struct EventDisplayName { diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 4182e4c729b0..10c3408481e2 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -44,7 +44,7 @@ #include <com/sun/star/script/browse/XBrowseNode.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #define OBJTYPE_BASICMANAGER 1L #define OBJTYPE_METHOD 2L @@ -61,7 +61,7 @@ #define INPUTMODE_NEWMACRO 2 #define INPUTMODE_RENAME 3 -typedef ::std::hash_map < ::rtl::OUString, ::rtl::OUString , +typedef ::boost::unordered_map < ::rtl::OUString, ::rtl::OUString , ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > Selection_hash; class SFEntry; diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 3e5c2aab9547..4d2cd38a60d7 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -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> @@ -96,13 +91,7 @@ void SvxChartColorTable::replace( size_t _nIndex, const XColorEntry & _rEntry ) DBG_ASSERT( _nIndex <= m_aColorEntries.size(), "SvxChartColorTable::replace invalid index" ); - Color aCol1 = m_aColorEntries[ _nIndex ].GetColor(), aCol2; m_aColorEntries[ _nIndex ] = _rEntry; - aCol2 = m_aColorEntries[ _nIndex ].GetColor(); - if ( aCol2 != const_cast< XColorEntry& >( _rEntry ).GetColor() ) - { - DBG_ERRORFILE( "wrong color" ); - } } void SvxChartColorTable::useDefault() diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index ad93e38ac2fc..0e625d56dadd 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -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 68d4d3a9644c..fc29f3a71a72 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -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 8c32ad12f40d..a292401bad86 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "connpoolsettings.hxx" //........................................................................ @@ -75,7 +72,7 @@ namespace offapp //==================================================================== TYPEINIT1( DriverPoolingSettingsItem, SfxPoolItem ) //-------------------------------------------------------------------- - DriverPoolingSettingsItem::DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings _rSettings ) + DriverPoolingSettingsItem::DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings ) :SfxPoolItem(_nId) ,m_aSettings(_rSettings) { diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index a347d1588c4e..1f53d207f2ab 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -92,7 +92,7 @@ namespace offapp public: TYPEINFO(); - DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings _rSettings ); + DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings ); virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index 40f0158404cc..6d7f63b96093 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -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 08b82b16f837..a5ae42598841 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -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 9505cb52e9c5..bb935779f273 100644 --- a/cui/source/options/dbregisterednamesconfig.cxx +++ b/cui/source/options/dbregisterednamesconfig.cxx @@ -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 97c9cf0b2587..080cd5e9e987 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -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 12af2c5da37f..d4f7c84c284d 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -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> diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index af302be381c5..418f8c6009b9 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -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 f003ec944cda..c50db3641f03 100644 --- a/cui/source/options/internationaloptions.cxx +++ b/cui/source/options/internationaloptions.cxx @@ -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 63cb9bcc0d3e..28ecf2fa58fe 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -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 e2a76f3e4a6f..2591ad7a63a5 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -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> diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 50284925852e..f04a50dc076f 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -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> @@ -228,7 +225,7 @@ BOOL SvxAsianLayoutPage::FillItemSet( SfxItemSet& ) } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters"); + OSL_FAIL("exception in XForbiddenCharacters"); } } eLastUsedLanguageTypeForForbiddenCharacters = aLanguageLB.GetSelectLanguage(); @@ -362,7 +359,7 @@ IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG ) } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters"); + OSL_FAIL("exception in XForbiddenCharacters"); } } } @@ -425,7 +422,7 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit) } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters"); + OSL_FAIL("exception in XForbiddenCharacters"); } } pImpl->aConfig.SetStartEndChars( aLocale, bEnable ? &sStart : 0, bEnable ? &sEnd : 0); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index d1cfdd1b67e3..85a76459e917 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -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 f9eebcca1c28..647c5e2c006f 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -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> @@ -113,6 +110,9 @@ class ColorConfigWindow_Impl : public Window FixedText aSmarttagsFT; ColorListBox aSmarttagsLB; Window aSmarttagsWN; + CheckBox aShadowColorCB; + ColorListBox aShadowColorLB; + Window aShadowColorWN; Window aWriterBackWN; SvxExtFixedText_Impl aWriterFT; FixedText aWrtTextGridFT; @@ -308,6 +308,7 @@ sal_Int16 lcl_getGroup( sal_Int32 _nFeature ) case ANCHOR : case SPELL : case SMARTTAGS : + case SHADOWCOLOR : { nRet = GROUP_GENERAL; break; @@ -415,6 +416,9 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aSmarttagsFT(this, ResId( FT_SMARTTAGS, *rResId.GetResMgr() )), aSmarttagsLB(this, ResId( LB_SMARTTAGS, *rResId.GetResMgr() )), aSmarttagsWN(this, ResId( WN_SMARTTAGS, *rResId.GetResMgr() )), + aShadowColorCB(this, ResId( CB_SHADOWCOLOR, *rResId.GetResMgr())), + aShadowColorLB(this, ResId( LB_SHADOWCOLOR, *rResId.GetResMgr())), + aShadowColorWN(this, ResId( WN_SHADOWCOLOR, *rResId.GetResMgr())), aWriterBackWN(this), aWriterFT(this, ResId(FT_WRITER, *rResId.GetResMgr())), aWrtTextGridFT(this, ResId( FT_WRITERTEXTGRID, *rResId.GetResMgr())), @@ -552,6 +556,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aCheckBoxes[LINKSVISITED ] = &aLinksVisitedCB ; aFixedTexts[SPELL ]=& aSpellFT; aFixedTexts[SMARTTAGS ]=& aSmarttagsFT; + aCheckBoxes[SHADOWCOLOR ]=& aShadowColorCB; aFixedTexts[WRITERTEXTGRID ]=& aWrtTextGridFT; aCheckBoxes[WRITERFIELDSHADINGS ] = &aWrtFieldCB ; aCheckBoxes[WRITERIDXSHADINGS ] = &aWrtIdxShadingBackCB ; @@ -597,6 +602,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aColorBoxes[LINKSVISITED ] = &aLinksVisitedLB ; aColorBoxes[SPELL ] = &aSpellLB ; aColorBoxes[SMARTTAGS ] = &aSmarttagsLB ; + aColorBoxes[SHADOWCOLOR ] = &aShadowColorLB ; aColorBoxes[WRITERTEXTGRID ] = &aWrtTextGridLB ; aColorBoxes[WRITERFIELDSHADINGS ] = &aWrtFieldLB ; aColorBoxes[WRITERIDXSHADINGS ] = &aWrtIdxShadingBackLB ; @@ -642,6 +648,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aWindows[LINKSVISITED ] = &aLinksVisitedWN ; aWindows[SPELL ] = &aSpellWN ; aWindows[SMARTTAGS ] = &aSmarttagsWN ; + aWindows[SHADOWCOLOR ] = &aShadowColorWN ; aWindows[WRITERTEXTGRID ] = &aWrtTextGridWN ; aWindows[WRITERFIELDSHADINGS ] = &aWrtFieldWN ; aWindows[WRITERIDXSHADINGS ] = &aWrtIdxShadingBackWN ; @@ -703,8 +710,6 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe sal_Int32 nHeight = LogicToPixel( Size( 0, _LINE_HEIGHT ), MAP_APPFONT ).Height(); sal_Int32 nLineNum = nLastY / nHeight; - Point aFixedPos = LogicToPixel( Point( _FT_XPOS, nLineNum * _LINE_HEIGHT ), MAP_APPFONT ); - Point aLBPos = LogicToPixel( Point( _LB_XPOS, nLineNum * _LINE_HEIGHT ), MAP_APPFONT ); Size aFixedSize = LogicToPixel( Size( _FT_WIDTH , _FT_HEIGHT ), MAP_APPFONT ); Size aLBSize = LogicToPixel( Size( _LB_WIDTH , _LB_HEIGHT ), MAP_APPFONT ); Size aWinSize = LogicToPixel( Size( _WN_WIDTH , _WN_HEIGHT ), MAP_APPFONT ); diff --git a/cui/source/options/optcolor.hrc b/cui/source/options/optcolor.hrc index d8bb17b54e39..3b96231d71d6 100644 --- a/cui/source/options/optcolor.hrc +++ b/cui/source/options/optcolor.hrc @@ -186,6 +186,10 @@ #define LB_SQLCOMMENT 193 #define WN_SQLCOMMENT 194 +#define CB_SHADOWCOLOR 196 +#define LB_SHADOWCOLOR 197 +#define WN_SHADOWCOLOR 198 + #define ST_EXTENSION 166 diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index 57d90ec574a8..b615d07f3c8f 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -37,7 +37,7 @@ namespace svtools {class EditableColorConfig;class EditableExtendedColorConfig;} class ColorConfigCtrl_Impl; -class AbstractSvxNameDialog; //CHINA001 class SvxNameDialog; +class AbstractSvxNameDialog; class SvxColorOptionsTabPage : public SfxTabPage { using SfxTabPage::DeactivatePage; diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src index 5b4a58bd59c4..a3640678b1d1 100644 --- a/cui/source/options/optcolor.src +++ b/cui/source/options/optcolor.src @@ -211,280 +211,287 @@ TabPage RID_SVXPAGE_COLORCONFIG }; LB_WN( SMARTTAGS, 10 ) + Checkbox CB_SHADOWCOLOR + { + CB_POS_SIZE( 11 ); + Text [ en-US ] = "Shadows"; + }; + LB_WN( SHADOWCOLOR, 11 ) + FixedText FT_WRITER { - FT_SEP_POS_SIZE( 11 ); + FT_SEP_POS_SIZE( 12 ); Text [ en-US ] = "Text Document"; }; FixedText FT_WRITERTEXTGRID { - FT_POS_SIZE( 12 ); + FT_POS_SIZE( 13 ); Text [ en-US ] = "Grid"; }; - LB_WN( WRITERTEXTGRID, 12 ) + LB_WN( WRITERTEXTGRID, 13 ) CheckBox CB_WRITERFIELDSHADINGS { - CB_POS_SIZE( 13 ); + CB_POS_SIZE( 14 ); Text [ en-US ] = "Field shadings"; }; - LB_WN( WRITERFIELDSHADINGS, 13 ) + LB_WN( WRITERFIELDSHADINGS, 14 ) CheckBox CB_WRITERIDXSHADINGS { - CB_POS_SIZE( 14 ); + CB_POS_SIZE( 15 ); Text [ en-US ] = "Index and table shadings"; }; - LB_WN( WRITERIDXSHADINGS, 14 ) + LB_WN( WRITERIDXSHADINGS, 15 ) FixedText FT_WRITERSCRIPTINDICATOR { - FT_POS_SIZE( 15 ); + FT_POS_SIZE( 16 ); Text [ en-US ] = "Script indicator"; }; - LB_WN( WRITERSCRIPTINDICATOR, 15 ) + LB_WN( WRITERSCRIPTINDICATOR, 16 ) CheckBox CB_WRITERSECTIONBOUNDARIES { - CB_POS_SIZE( 16 ); + CB_POS_SIZE( 17 ); Text [ en-US ] = "Section boundaries"; }; - LB_WN( WRITERSECTIONBOUNDARIES, 16 ) + LB_WN( WRITERSECTIONBOUNDARIES, 17 ) FixedText FT_WRITERPAGEBREAKS { - FT_POS_SIZE( 17 ); + FT_POS_SIZE( 18 ); Text [ en-US ] = "Page and column breaks"; }; - LB_WN( WRITERPAGEBREAKS, 17 ) + LB_WN( WRITERPAGEBREAKS, 18 ) FixedText FT_WRITERDIRECTCURSOR { - FT_POS_SIZE( 18 ); + FT_POS_SIZE( 19 ); Text [ en-US ] = "Direct cursor"; }; - LB_WN( WRITERDIRECTCURSOR, 18 ) + LB_WN( WRITERDIRECTCURSOR, 19 ) FixedText FT_HTML { - FT_SEP_POS_SIZE( 19 ); + FT_SEP_POS_SIZE( 20 ); Text [ en-US ] = "HTML Document"; }; FixedText FT_HTMLSGML { - FT_POS_SIZE( 20 ); + FT_POS_SIZE( 21 ); Text [ en-US ] = "SGML syntax highlighting"; }; - LB_WN( HTMLSGML, 20 ) + LB_WN( HTMLSGML, 21 ) FixedText FT_HTMLCOMMENT { - FT_POS_SIZE( 21 ); + FT_POS_SIZE( 22 ); Text [ en-US ] = "Comment highlighting"; }; - LB_WN( HTMLCOMMENT, 21 ) + LB_WN( HTMLCOMMENT, 22 ) FixedText FT_HTMLKEYWORD { - FT_POS_SIZE( 22 ); + FT_POS_SIZE( 23 ); Text [ en-US ] = "Keyword highlighting"; }; - LB_WN( HTMLKEYWORD, 22 ) + LB_WN( HTMLKEYWORD, 23 ) FixedText FT_HTMLUNKNOWN { - FT_POS_SIZE( 23 ); + FT_POS_SIZE( 24 ); Text [ en-US ] = "Text"; }; - LB_WN( HTMLUNKNOWN, 23 ) + LB_WN( HTMLUNKNOWN, 24 ) FixedText FT_CALC { - FT_SEP_POS_SIZE( 24 ); + FT_SEP_POS_SIZE( 25 ); Text [ en-US ] = "Spreadsheet"; }; FixedText FT_CALCGRID { - FT_POS_SIZE( 25 ); + FT_POS_SIZE( 26 ); Text [ en-US ] = "Grid lines"; }; - LB_WN( CALCGRID, 25 ) + LB_WN( CALCGRID, 26 ) FixedText FT_CALCPAGEBREAK { - FT_POS_SIZE( 26 ); + FT_POS_SIZE( 27 ); Text [ en-US ] = "Page breaks"; }; - LB_WN( CALCPAGEBREAK, 26 ) + LB_WN( CALCPAGEBREAK, 27 ) FixedText FT_CALCPAGEBREAKMANUAL { - FT_POS_SIZE( 27 ); + FT_POS_SIZE( 28 ); Text [ en-US ] = "Manual page breaks"; }; - LB_WN( CALCPAGEBREAKMANUAL, 27 ) + LB_WN( CALCPAGEBREAKMANUAL, 28 ) FixedText FT_CALCPAGEBREAKAUTO { - FT_POS_SIZE( 28 ); + FT_POS_SIZE( 29 ); Text [ en-US ] = "Automatic page breaks"; }; - LB_WN( CALCPAGEBREAKAUTO, 28) + LB_WN( CALCPAGEBREAKAUTO, 29) FixedText FT_CALCDETECTIVE { - FT_POS_SIZE( 29 ); + FT_POS_SIZE( 30 ); Text [ en-US ] = "Detective"; }; - LB_WN( CALCDETECTIVE, 29 ) + LB_WN( CALCDETECTIVE, 30 ) FixedText FT_CALCDETECTIVEERROR { - FT_POS_SIZE( 30 ); + FT_POS_SIZE( 31 ); Text [ en-US ] = "Detective error"; }; - LB_WN( CALCDETECTIVEERROR, 30 ) + LB_WN( CALCDETECTIVEERROR, 31 ) FixedText FT_CALCREFERENCE { - FT_POS_SIZE( 31 ); + FT_POS_SIZE( 32 ); Text [ en-US ] = "References"; }; - LB_WN( CALCREFERENCE, 31 ) + LB_WN( CALCREFERENCE, 32 ) FixedText FT_CALCNOTESBACKGROUND { - FT_POS_SIZE( 32 ); + FT_POS_SIZE( 33 ); Text [ en-US ] = "Notes background"; }; - LB_WN( CALCNOTESBACKGROUND, 32 ) + LB_WN( CALCNOTESBACKGROUND, 33 ) FixedText FT_DRAW { - FT_SEP_POS_SIZE( 33 ); + FT_SEP_POS_SIZE( 34 ); Text [ en-US ] = "Drawing / Presentation"; }; FixedText FT_DRAWGRID { - FT_POS_SIZE( 34 ); + FT_POS_SIZE( 35 ); Text [ en-US ] = "Grid"; }; - LB_WN( DRAWGRID, 34 ) + LB_WN( DRAWGRID, 35 ) FixedText FT_BASIC { - FT_SEP_POS_SIZE( 35 ); + FT_SEP_POS_SIZE( 36 ); Text [ en-US ] = "Basic Syntax Highlighting"; }; FixedText FT_BASICIDENTIFIER { - FT_POS_SIZE( 36 ); + FT_POS_SIZE( 37 ); Text [ en-US ] = "Identifier"; }; - LB_WN( BASICIDENTIFIER, 36 ) + LB_WN( BASICIDENTIFIER, 37 ) FixedText FT_BASICCOMMENT { - FT_POS_SIZE( 37 ); + FT_POS_SIZE( 38 ); Text [ en-US ] = "Comment"; }; - LB_WN( BASICCOMMENT, 37 ) + LB_WN( BASICCOMMENT, 38 ) FixedText FT_BASICNUMBER { - FT_POS_SIZE( 38 ); + FT_POS_SIZE( 39 ); Text [ en-US ] = "Number"; }; - LB_WN( BASICNUMBER, 38) + LB_WN( BASICNUMBER, 39) FixedText FT_BASICSTRING { - FT_POS_SIZE( 39 ); + FT_POS_SIZE( 40 ); Text [ en-US ] = "String"; }; - LB_WN( BASICSTRING, 39 ) + LB_WN( BASICSTRING, 40 ) FixedText FT_BASICOPERATOR { - FT_POS_SIZE( 40 ); + FT_POS_SIZE( 41 ); Text [ en-US ] = "Operator"; }; - LB_WN( BASICOPERATOR, 40 ) + LB_WN( BASICOPERATOR, 41 ) FixedText FT_BASICKEYWORD { - FT_POS_SIZE( 41 ); + FT_POS_SIZE( 42 ); Text [ en-US ] = "Reserved expression"; }; - LB_WN( BASICKEYWORD, 41 ) + LB_WN( BASICKEYWORD, 42 ) FixedText FT_BASICERROR { - FT_POS_SIZE( 42 ); + FT_POS_SIZE( 43 ); Text [ en-US ] = "Error"; }; - LB_WN( BASICERROR, 42 ) + LB_WN( BASICERROR, 43 ) FixedText FT_SQL_COMMAND { - FT_SEP_POS_SIZE( 43 ); + FT_SEP_POS_SIZE( 44 ); Text [ en-US ] = "SQL Syntax Highlighting"; }; FixedText FT_SQLIDENTIFIER { - FT_POS_SIZE( 44 ); + FT_POS_SIZE( 45 ); Text [ en-US ] = "Identifier"; }; - LB_WN( SQLIDENTIFIER, 44 ) + LB_WN( SQLIDENTIFIER, 45 ) FixedText FT_SQLNUMBER { - FT_POS_SIZE( 45 ); + FT_POS_SIZE( 46 ); Text [ en-US ] = "Number"; }; - LB_WN( SQLNUMBER, 45 ) + LB_WN( SQLNUMBER, 46 ) FixedText FT_SQLSTRING { - FT_POS_SIZE( 46 ); + FT_POS_SIZE( 47 ); Text [ en-US ] = "String"; }; - LB_WN( SQLSTRING, 46 ) + LB_WN( SQLSTRING, 47 ) FixedText FT_SQLOPERATOR { - FT_POS_SIZE( 47 ); + FT_POS_SIZE( 48 ); Text [ en-US ] = "Operator"; }; - LB_WN( SQLOPERATOR, 47 ) + LB_WN( SQLOPERATOR, 48 ) FixedText FT_SQLKEYWORD { - FT_POS_SIZE( 48 ); + FT_POS_SIZE( 49 ); Text [ en-US ] = "Keyword"; }; - LB_WN( SQLKEYWORD, 48 ) + LB_WN( SQLKEYWORD, 49 ) FixedText FT_SQLPARAMETER { - FT_POS_SIZE( 49 ); + FT_POS_SIZE( 50 ); Text [ en-US ] = "Parameter"; }; - LB_WN( SQLPARAMETER, 49 ) + LB_WN( SQLPARAMETER, 50 ) FixedText FT_SQLCOMMENT { - FT_POS_SIZE( 50 ); + FT_POS_SIZE( 51 ); Text [ en-US ] = "Comment"; }; - LB_WN( SQLCOMMENT, 50 ) + LB_WN( SQLCOMMENT, 51 ) String ST_EXTENSION { diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 0096b032cfa7..3b2b1111ee46 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -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" diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 09701a02d903..43a88bbe75b5 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.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 <editeng/unolingu.hxx> diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src index b5d31ce90fe9..1bb0826f6069 100644 --- a/cui/source/options/optdict.src +++ b/cui/source/options/optdict.src @@ -39,8 +39,6 @@ ModalDialog RID_SFXDLG_NEWDICT SVLook = TRUE ; Size = MAP_APPFONT ( 213 , 66 ) ; Moveable = TRUE ; - /* ### ACHTUNG: Neuer Text in Resource? Benutzerwörterbuch anlegen : Benutzerw÷rterbuch anlegen */ - /* ### ACHTUNG: Neuer Text in Resource? Benutzerwörterbuch anlegen : Benutzerw÷rterbuch anlegen */ Text [ en-US ] = "New Dictionary" ; FixedText FT_DICTNAME { @@ -80,8 +78,6 @@ ModalDialog RID_SFXDLG_NEWDICT { Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( 145 , 8 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Wörterbuch : W÷rterbuch */ - /* ### ACHTUNG: Neuer Text in Resource? Wörterbuch : W÷rterbuch */ Text [ en-US ] = "Dictionary" ; }; OKButton BTN_NEWDICT_OK @@ -111,8 +107,6 @@ ModalDialog RID_SFXDLG_EDITDICT SVLook = TRUE ; Size = MAP_APPFONT( 270, 161 ); - /* ### ACHTUNG: Neuer Text in Resource? Benutzerwörterbuch bearbeiten : Benutzerw÷rterbuch bearbeiten */ - /* ### ACHTUNG: Neuer Text in Resource? Benutzerwörterbuch bearbeiten : Benutzerw÷rterbuch bearbeiten */ Text [ en-US ] = "Edit Custom Dictionary" ; Moveable = TRUE ; @@ -218,8 +212,6 @@ ModalDialog RID_SFXDLG_EDITDICT Pos = MAP_APPFONT ( 209 , 143 ) ; Size = MAP_APPFONT ( 55 , 14 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Schließen : ~Schlie˜en */ - /* ### ACHTUNG: Neuer Text in Resource? ~Schließen : ~Schlie˜en */ Text [ en-US ] = "~Close" ; }; }; @@ -234,10 +226,6 @@ QueryBox RID_SFXQB_SET_LANGUAGE { Buttons = WB_YES_NO ; DefButton = WB_DEF_NO ; - /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie die Sprache des Wörterbuches '%1' ändern? : Möchten Sie die Sprache des Wörterbuches ''%1'' ändern? */ - /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie die Sprache des Wörterbuches '%1' ändern? : Möchten Sie die Sprache des Wörterbuches ''%1'' ändern? */ - /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie die Sprache des Wörterbuches '%1' ändern? : M÷chten Sie die Sprache des W÷rterbuches '%1' õndern? */ - /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie die Sprache des Wörterbuches '%1' ändern? : M÷chten Sie die Sprache des W÷rterbuches '%1' õndern? */ Message [ en-US ] = "Do you want to change the '%1' dictionary language?" ; }; // ********************************************************************** EOF diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 8e35b22a028b..eb597b2ca700 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -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> @@ -188,7 +185,6 @@ SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent, BOOL OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) { - BOOL bModified = FALSE; SvtFilterOptions* pOpt = SvtFilterOptions::Get(); static struct ChkCBoxEntries{ @@ -231,10 +227,7 @@ BOOL OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) pCheckButtonData->ConvertToButtonState( nButtonFlags ); if( bCheck != (pOpt->*pArr->FnIs)() ) - { - bModified = TRUE; (pOpt->*pArr->FnSet)( bCheck ); - } } } } diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 6d6ba6cd3c71..138d67e30f39 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> @@ -942,7 +940,7 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& ) case 1: eSet = SFX_SYMBOLS_SIZE_SMALL; break; case 2: eSet = SFX_SYMBOLS_SIZE_LARGE; break; default: - DBG_ERROR( "OfaViewTabPage::FillItemSet(): This state of aIconSizeLB should not be possible!" ); + OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of aIconSizeLB should not be possible!" ); } aMiscOptions.SetSymbolsSize( eSet ); } @@ -1863,10 +1861,8 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) aComplexLanguageFT.Enable( bEnable ); aComplexLanguageLB.Enable( bEnable ); #endif - /*---------------------07-05-07-------------------------- - check the box "For the current document only" - set the focus to the Western Language box - --------------------------------------------------------*/ + // check the box "For the current document only" + // set the focus to the Western Language box const SfxPoolItem* pLang = 0; if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, FALSE, &pLang ) &&( (const SfxBoolItem*)pLang)->GetValue() == TRUE ) { diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index 8a2639eec455..1d5971ccad32 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -270,6 +270,7 @@ TabPage OFA_TP_VIEW < "Tango" ; > ; < "Oxygen" ; > ; < "Classic" ; > ; + < "Human" ; > ; }; }; CheckBox CB_SYSTEM_FONT diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 633a29b60ac9..c66b571632c4 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.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 <vcl/svapp.hxx> diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index ffde2ea6e7f0..226fb8e7988f 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -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 b44f12af7e04..c45a0c299209 100644 --- a/cui/source/options/optimprove.cxx +++ b/cui/source/options/optimprove.cxx @@ -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 a503ed0c3bbf..5bb7c1592061 100644 --- a/cui/source/options/optimprove2.cxx +++ b/cui/source/options/optimprove2.cxx @@ -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 b0e21d180e52..f94ea15edf0a 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.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/config.hxx> @@ -156,23 +153,6 @@ String lcl_MakeTabEntry(const SfxFilter* pFilter) BOOL IsJavaInstalled_Impl( /*!!!SfxIniManager* pIniMgr*/ ) { BOOL bRet = FALSE; -/*!!! (pb) needs new implementation - String aIniEntry; - String aFullName = Config::GetConfigName( pIniMgr->Get( SFX_KEY_USERCONFIG_PATH ), - String::CreateFromAscii("java") ); - INetURLObject aIniFileObj( aFullName, INET_PROT_FILE ); - String aIniPath = aIniFileObj.getName(); - if ( pIniMgr->SearchFile( aIniPath ) ) - { - Config aJavaCfg( aIniPath ); - aJavaCfg.SetGroup( "Java" ); - ByteString sTemp = aJavaCfg.ReadKey( ByteString(::rtl::OUStringToOString(pIniMgr->GetKeyName( SFX_KEY_JAVA_SYSTEMCLASSPATH ),RTL_TEXTENCODING_UTF8)) ); - String aJavaSystemClassPath = ::rtl::OStringToOUString(sTemp,RTL_TEXTENCODING_UTF8); - String aJavaRuntimeLib = ::rtl::OStringToOUString(aJavaCfg.ReadKey( "RuntimeLib" ),RTL_TEXTENCODING_UTF8); - if ( aJavaSystemClassPath.Len() && aJavaRuntimeLib.Len() ) - bRet = TRUE; - } -*/ return bRet; } @@ -216,12 +196,9 @@ void SvxNoSpaceEdit::Modify() } /********************************************************************/ -/********************************************************************/ /* */ /* SvxProxyTabPage */ /* */ -/* */ -/********************************************************************/ /********************************************************************/ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) : @@ -362,15 +339,15 @@ void SvxProxyTabPage::ReadConfigData_Impl() } } - catch(container::NoSuchElementException e) { + catch(container::NoSuchElementException &e) { OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: NoSuchElementException caught" ); } - catch(com::sun::star::lang::WrappedTargetException e) { + catch(com::sun::star::lang::WrappedTargetException &e) { OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: WrappedTargetException caught" ); } - catch(RuntimeException e) { + catch(RuntimeException &e) { OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: RuntimeException caught" ); } @@ -420,16 +397,16 @@ void SvxProxyTabPage::ReadConfigDefaults_Impl() aNoProxyForED.SetText( aStringValue ); } } - catch(beans::UnknownPropertyException e) + catch(beans::UnknownPropertyException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: UnknownPropertyException caught" ); } - catch(com::sun::star::lang::WrappedTargetException e) { + catch(com::sun::star::lang::WrappedTargetException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: WrappedTargetException caught" ); } - catch(RuntimeException e) + catch(RuntimeException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: RuntimeException caught" ); } @@ -454,16 +431,16 @@ void SvxProxyTabPage::RestoreConfigDefaults_Impl() xChangesBatch->commitChanges(); } - catch(beans::UnknownPropertyException e) + catch(beans::UnknownPropertyException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: UnknownPropertyException caught" ); } - catch(com::sun::star::lang::WrappedTargetException e) { + catch(com::sun::star::lang::WrappedTargetException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: WrappedTargetException caught" ); } - catch(RuntimeException e) + catch(RuntimeException &e) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: RuntimeException caught" ); } @@ -559,23 +536,23 @@ BOOL SvxProxyTabPage::FillItemSet(SfxItemSet& ) xChangesBatch->commitChanges(); } - catch(com::sun::star::lang::IllegalArgumentException e) { + catch(com::sun::star::lang::IllegalArgumentException &e) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: IllegalArgumentException caught" ); } - catch(beans::UnknownPropertyException e) { + catch(beans::UnknownPropertyException &e) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: UnknownPropertyException caught" ); } - catch(beans::PropertyVetoException e) { + catch(beans::PropertyVetoException &e) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: PropertyVetoException caught" ); } - catch(com::sun::star::lang::WrappedTargetException e) { + catch(com::sun::star::lang::WrappedTargetException &e) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: WrappedTargetException caught" ); } - catch(RuntimeException e) { + catch(RuntimeException &e) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: RuntimeException caught" ); } @@ -683,12 +660,9 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit ) /********************************************************************/ -/********************************************************************/ /* */ /* SvxSearchTabPage */ /* */ -/* */ -/********************************************************************/ /********************************************************************/ SvxSearchTabPage::SvxSearchTabPage(Window* pParent, const SfxItemSet& rSet ) : @@ -762,12 +736,12 @@ SfxTabPage* SvxSearchTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet void SvxSearchTabPage::Reset( const SfxItemSet& ) { - //The two lines below are moved here from the last part of this method by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + //The two lines below are moved here from the last part of this method aChangePB.Disable(); aAddPB.Disable(); sal_uInt16 nCount = aSearchConfig.Count(); - aSearchLB.Clear(); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + aSearchLB.Clear(); for(sal_uInt16 i = 0; i < nCount; i++) { const SvxSearchEngineData& rData = aSearchConfig.GetData(i); @@ -801,7 +775,6 @@ void SvxSearchTabPage::ActivatePage( const SfxItemSet& ) int SvxSearchTabPage::DeactivatePage( SfxItemSet* _pSet ) { - //Modified by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) if(!ConfirmLeave(String())) return KEEP_PAGE; @@ -812,7 +785,6 @@ int SvxSearchTabPage::DeactivatePage( SfxItemSet* _pSet ) // ----------------------------------------------------------------------- -//add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) BOOL SvxSearchTabPage::ConfirmLeave( const String& rStringSelection) { if(aChangePB.IsEnabled()) @@ -919,7 +891,6 @@ void SvxSearchTabPage::InitControls_Impl() IMPL_LINK( SvxSearchTabPage, NewSearchHdl_Impl, PushButton *, EMPTYARG ) { - //The 3 lines below is modified by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) SearchEntryHdl_Impl(&aSearchLB); if(aChangePB.IsEnabled() || aAddPB.IsEnabled()) return 0; @@ -936,7 +907,6 @@ IMPL_LINK( SvxSearchTabPage, NewSearchHdl_Impl, PushButton *, EMPTYARG ) IMPL_LINK( SvxSearchTabPage, AddSearchHdl_Impl, PushButton *, EMPTYARG ) { - //The following two lines is added by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) aAddPB.Enable(FALSE); aChangePB.Enable(FALSE); aCurrentSrchData.sEngineName = aSearchNameED.GetText(); @@ -951,7 +921,6 @@ IMPL_LINK( SvxSearchTabPage, AddSearchHdl_Impl, PushButton *, EMPTYARG ) IMPL_LINK( SvxSearchTabPage, ChangeSearchHdl_Impl, PushButton *, EMPTYARG ) { - //The following two lines is added by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) aChangePB.Enable(FALSE); aAddPB.Enable(FALSE); USHORT nPos = aSearchLB.GetSelectEntryPos(); @@ -983,7 +952,7 @@ IMPL_LINK( SvxSearchTabPage, ChangeSearchHdl_Impl, PushButton *, EMPTYARG ) IMPL_LINK( SvxSearchTabPage, DeleteSearchHdl_Impl, PushButton *, EMPTYARG) { - aChangePB.Enable(FALSE); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + aChangePB.Enable(FALSE); USHORT nPos = aSearchLB.GetSelectEntryPos(); DBG_ASSERT(nPos != LISTBOX_ENTRY_NOTFOUND, "kein Eintrag selektiert!"); aSearchConfig.RemoveData(aSearchLB.GetSelectEntry()); @@ -1001,7 +970,6 @@ IMPL_LINK( SvxSearchTabPage, SearchEntryHdl_Impl, ListBox*, pBox ) if ( nEntryPos != LISTBOX_ENTRY_NOTFOUND ) { String sSelection(pBox->GetSelectEntry()); - //Modified by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) if(!ConfirmLeave(sSelection)) return 0; @@ -1099,104 +1067,6 @@ IMPL_LINK( SvxSearchTabPage, SearchPartHdl_Impl, RadioButton *, EMPTYARG ) return 0; } -// ----------------------------------------------------------------------- - -/********************************************************************/ -/********************************************************************/ -/* */ -/* SvxOtherTabPage */ -/* */ -/********************************************************************/ -/********************************************************************/ - -/* -SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) : - - PatternField( pParent, rResId ), - - sMsg233 ( ResId( ST_MSG_233 ) ), - sMsg255 ( ResId( ST_MSG_255 ) ) - -{ - FreeResource(); - SelectFixedFont(); -} */ - -/*void SvxPatternField::KeyInput( const KeyEvent& rKEvt ) -{ - PatternField::KeyInput( rKEvt ); - BOOL bDelete = ( rKEvt.GetKeyCode().GetCode() == KEY_DELETE ); - String sEntry( GetText() ); - sEntry[(USHORT)3] = '.'; - sEntry[(USHORT)7] = '.'; - sEntry[(USHORT)11] = '.'; - Selection aSelection( GetSelection() ); - String sPart( sEntry.GetToken( 0, '.' ) ); - USHORT i, nPart( sPart.EraseLeadingChars() ); - BOOL bSet = FALSE; - - if ( sPart.Len() && ( !nPart || nPart > 255 ) ) - { - // der erste Part darf nicht 0 und nicht gr"osser 255 sein - String sMsg( sPart ); - sMsg += ' '; - sMsg += sMsg233; - InfoBox( this, sMsg ).Execute(); - - if ( nPart == 0 ) - sPart = " 1"; - else - sPart = "255"; - sEntry.SetToken( 0, '.', sPart ); - bSet = TRUE; - }; - - for ( i = 1; i < 4; i++ ) - { - // die anderen Parts d"urfen nicht gr"osser 255 sein - sPart = sEntry.GetToken( i, '.' ); - nPart = sPart.EraseLeadingChars(); - - if ( nPart > 255 ) - { - String sMsg( sPart ); - sMsg += ' '; - sMsg += sMsg255; - InfoBox( this, sMsg ).Execute(); - - if ( nPart == 0 ) - sPart = " 1"; - else - sPart = "255"; - sEntry.SetToken( i, '.', sPart ); - bSet = TRUE; - }; - } - - if ( bSet ) - { - SetText( sEntry ); - SetSelection( aSelection ); - } -} -*/ -// ----------------------------------------------------------------------- -#if 0 -long SvxPatternField::Notify( NotifyEvent& rNEvt ) -{ - return PatternField::Notify( rNEvt ); -/*! long nHandled = 0; - - if ( rNEvt.GetType() == EVENT_KEYUP ) - { - const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - KeyInput( *pKEvt ); - nHandled = 1; - } - return nHandled;*/ -} -#endif - // class JavaScriptDisableQueryBox_Impl -------------------------------------- class JavaScriptDisableQueryBox_Impl : public ModalDialog @@ -1607,18 +1477,9 @@ int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet ) namespace { -/* bool Enable( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, Control& _rCtrl, FixedImage& _rImg ) - { - bool b = _rOpt.IsOptionEnabled( _eOpt ); - _rCtrl.Enable( b ); - _Img.Show( !b ); - return b; - } -*/ bool EnableAndSet( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, CheckBox& _rCtrl, FixedImage& _rImg ) { -// bool b = Enable( _rOpt, _eOpt, _rCtrl, _rImg ); bool b = _rOpt.IsOptionEnabled( _eOpt ); _rCtrl.Enable( b ); _rImg.Show( !b ); @@ -1671,7 +1532,6 @@ void SvxSecurityTabPage::Reset( const SfxItemSet& ) } } -//added by jmeng begin MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ), aMSWordGB ( this, CUI_RES( GB_MOZPLUGIN ) ), @@ -1729,7 +1589,6 @@ inline bool getDllURL(rtl::OString * path) return false; } dirPath = dirPath.copy(0, dirPath.lastIndexOf('/')); -// osl::FileBase::getAbsoluteFileURL(dirPath, libPath, dllPath); ::rtl::OUString sysDirPath; osl::FileBase::getSystemPathFromFileURL(dirPath, sysDirPath); *path = OUStringToOString(sysDirPath, RTL_TEXTENCODING_ASCII_US); @@ -1862,7 +1721,6 @@ BOOL MozPluginTabPage::uninstallPlugin() return false; #endif } -//added by jmeng end /* -------------------------------------------------------------------------*/ diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 8c41db2ee4f3..8a6c62637624 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -200,7 +200,7 @@ private: virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - BOOL ConfirmLeave( const String& rStringSelection ); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + BOOL ConfirmLeave( const String& rStringSelection ); SvxSearchTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSearchTabPage(); @@ -278,7 +278,6 @@ public: virtual void Reset( const SfxItemSet& rSet ); }; -//added by jmeng begin class MozPluginTabPage : public SfxTabPage { FixedLine aMSWordGB; @@ -300,7 +299,7 @@ public: virtual void Reset( const SfxItemSet& rSet ); }; -//added by jmeng end + #endif #ifdef WNT diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src index 9023dfa52394..fbf2146c390e 100755 --- a/cui/source/options/optinet2.src +++ b/cui/source/options/optinet2.src @@ -37,8 +37,6 @@ /* */ /************************************************************************/ -// added by jmeng begin - TabPage RID_SVXPAGE_INET_MOZPLUGIN { OutputSize = TRUE ; @@ -61,8 +59,6 @@ TabPage RID_SVXPAGE_INET_MOZPLUGIN }; }; -//added by jmeng end - TabPage RID_SVXPAGE_INET_PROXY { HelpId = HID_OPTIONS_PROXY ; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 3d6e4e305df6..f0cad8367ca6 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "optjava.hxx" @@ -82,16 +79,6 @@ SvxJavaTable::~SvxJavaTable() void SvxJavaTable::SetTabs() { SvxSimpleTable::SetTabs(); -/* - USHORT nAdjust = SV_LBOXTAB_ADJUST_RIGHT | SV_LBOXTAB_ADJUST_LEFT | - SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_ADJUST_NUMERIC | SV_LBOXTAB_FORCE; - if ( aTabs.Count() > 0 ) - { - SvLBoxTab* pTab = (SvLBoxTab*)aTabs.GetObject(0); - pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SV_LBOXTAB_PUSHABLE | SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_FORCE; - } -*/ } void SvxJavaTable::MouseButtonUp( const MouseEvent& _rMEvt ) @@ -181,8 +168,6 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet m_aResetTimer.SetTimeoutHdl( LINK( this, SvxJavaOptionsPage, ResetHdl_Impl ) ); m_aResetTimer.SetTimeout( RESET_TIMEOUT ); -//! m_aJavaList.EnableCheckButton( new SvLBoxButtonData( &m_aJavaList, true ) ); - static long aStaticTabs[]= { 5, 0, 15, 90, 130, 300 @@ -243,13 +228,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage() JavaInfo* pInfo = *pIter; jfw_freeJavaInfo( pInfo ); } -/* - rtl_uString** pParamArr = m_parParameters; - for ( sal_Int32 i = 0; i < m_nParamSize; ++i ) - rtl_uString_release( *pParamArr++ ); - rtl_freeMemory( m_parParameters ); - rtl_uString_release( m_pClassPath ); -*/ + jfw_unlock(); } diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 0be75792e2df..6de0b37a187d 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -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 337a963c1a3e..caa0f8c66776 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <vcl/msgbox.hxx> @@ -294,7 +291,6 @@ void lcl_SetCheckButton( SvLBoxEntry* pEntry, BOOL bCheck ) pItem->SetStateChecked(); else pItem->SetStateUnchecked(); - //InvalidateEntry( pEntry ); } } @@ -451,7 +447,6 @@ void OptionsUserData::SetChecked( BOOL bVal ) void OptionsUserData::SetNumericValue( BYTE nNumVal ) { -// DBG_ASSERT( nNumVal < 256, "value out of range" ); if (HasNumericValue() && (GetNumericValue() != nNumVal)) { nVal &= 0xffffff00; @@ -492,8 +487,6 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, Font aFont( aOldFont ); aFont.SetWeight( WEIGHT_BOLD ); -// BOOL bFett = TRUE; -// USHORT nPos = 0; //??? das untere byte aus dem user data in string wandeln OptionsUserData aData( (ULONG) pEntry->GetUserData() ); if(aData.HasNumericValue()) @@ -504,9 +497,6 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, rDev.DrawText( aNewPos, sTxt ); } -// if( STRING_NOTFOUND != nPos ) -// aNewPos.X() += rDev.GetTextWidth( sTxt ); - rDev.SetFont( aOldFont ); } } @@ -1328,7 +1318,6 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) for (ULONG i = 0; i < nEntries; ++i) { INT32 nDics = aDics.getLength(); -// const uno::Reference< XDictionary > *pDic = aDics.getConstArray(); aActiveDics.realloc( nDics ); OUString *pActiveDic = aActiveDics.getArray(); @@ -1356,7 +1345,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) } } } - // + aActiveDics.realloc( nActiveDics ); Any aTmp; aTmp <<= aActiveDics; @@ -1430,11 +1419,9 @@ ULONG SvxLinguTabPage::GetDicUserData( const uno::Reference< XDictionary > &rxDi { uno::Reference< frame::XStorable > xStor( rxDic, UNO_QUERY ); -// ULONG nUserData = 0; BOOL bChecked = rxDic->isActive(); BOOL bEditable = !xStor.is() || !xStor->isReadonly(); BOOL bDeletable = bEditable; -// BOOL bNegativ = rxDic->getDictionaryType() == DictionaryType_NEGATIVE; nRes = DicUserData( nIdx, bChecked, bEditable, bDeletable ).GetUserData(); @@ -1548,9 +1535,6 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pEntry = CreateEntry( sGrammarAuto, CBCOL_FIRST ); aLngCfg.GetProperty( C2U(UPN_IS_GRAMMAR_AUTO) ) >>= bVal; -// const SfxPoolItem* pItem = GetItem( rSet, SID_AUTOSPELL_CHECK ); -// if (pItem) -// bVal = ((SfxBoolItem *) pItem)->GetValue(); nUserData = OptionsUserData( EID_GRAMMAR_AUTO, FALSE, 0, TRUE, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); @@ -1861,7 +1845,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) case EID_NUM_POST_BREAK : nRID = STR_NUM_POST_BREAK_DLG; break; case EID_NUM_MIN_WORDLEN: nRID = STR_NUM_MIN_WORDLEN_DLG; break; default: - DBG_ERROR( "unexpected case" ); + OSL_FAIL( "unexpected case" ); } OptionsBreakSet aDlg( this, nRID ); @@ -1881,7 +1865,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) } else { - DBG_ERROR( "pBtn unexpected value" ); + OSL_FAIL( "pBtn unexpected value" ); } return 0; @@ -1917,7 +1901,7 @@ IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox ) } else { - DBG_ERROR( "pBox unexpected value" ); + OSL_FAIL( "pBox unexpected value" ); } return 0; @@ -1958,7 +1942,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) aLinguModulesFT.GetPosPixel().Y(); DBG_ASSERT( nDeltaY >= 0, "move/resize value is negative" ); Point aPos; - // + aPos = aLinguDicsFT.GetPosPixel(); aPos.Y() -= nDeltaY; aLinguDicsFT.SetPosPixel( aPos ); @@ -1974,7 +1958,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) aPos = aLinguDicsDelPB.GetPosPixel(); aPos.Y() -= nDeltaY; aLinguDicsDelPB.SetPosPixel( aPos ); - // + aPos = aLinguOptionsFT.GetPosPixel(); aPos.Y() -= nDeltaY; aLinguOptionsFT.SetPosPixel( aPos ); @@ -1984,7 +1968,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) aPos = aLinguOptionsEditPB.GetPosPixel(); aPos.Y() -= nDeltaY; aLinguOptionsEditPB.SetPosPixel( aPos ); - // + Size aSize( aLinguOptionsCLB.GetSizePixel() ); aSize.Height() += nDeltaY; aLinguOptionsCLB.SetSizePixel( aSize ); @@ -2138,7 +2122,7 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) } else { - DBG_ERROR( "pBox unexpected value" ); + OSL_FAIL( "pBox unexpected value" ); } return 0; @@ -2146,8 +2130,6 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) { -// if (pBox == (SvTreeListBox *) &aModulesCLB) -// { pBox = &aModulesCLB; SvLBoxEntry *pCurEntry = pBox->GetCurEntry(); if (pCurEntry) @@ -2173,7 +2155,6 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) } } } -// } return 0; } @@ -2197,7 +2178,6 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) Locale aCurLocale; SvxLanguageToLocale(aCurLocale, eCurLanguage); SvLBoxTreeList *pModel = aModulesCLB.GetModel(); -// uno::Reference<XLinguServiceManager>& xMgr = rLinguData.GetManager(); if (pBox) { @@ -2263,8 +2243,6 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) aModulesCLB.Clear(); if(LANGUAGE_DONTKNOW != eCurLanguage) { -// sal_Int32 nEntryPos = 1; - ULONG n; ServiceInfo_Impl* pInfo; @@ -2276,7 +2254,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) String(), TRUE, FALSE, TYPE_SPELL, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + Sequence< OUString > aNames( rLinguData.GetSortedImplNames( eCurLanguage, TYPE_SPELL ) ); const OUString *pName = aNames.getConstArray(); ULONG nNames = (ULONG) aNames.getLength(); @@ -2320,7 +2298,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_GRAMMAR, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_GRAMMAR ); pName = aNames.getConstArray(); nNames = (ULONG) aNames.getLength(); @@ -2364,7 +2342,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_HYPH, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_HYPH ); pName = aNames.getConstArray(); nNames = (ULONG) aNames.getLength(); @@ -2408,7 +2386,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_THES, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); - // + aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_THES ); pName = aNames.getConstArray(); nNames = (ULONG) aNames.getLength(); @@ -2489,7 +2467,7 @@ IMPL_LINK( SvxEditModulesDlg, ClickHdl_Impl, PushButton *, pBtn ) } else { - DBG_ERROR( "pBtn unexpected value" ); + OSL_FAIL( "pBtn unexpected value" ); } return 0; diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index e90326d45087..1ef0a8237ffb 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -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 90e7a3f64915..1737d4ac685c 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 a2c594cc1b78..625f9f6fed90 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.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 <svl/eitem.hxx> @@ -106,62 +103,6 @@ void FilterWarningDialog_Impl::SetFilterName(const String& rFilterUIName) aFilterWarningFT.SetText(sTmp); } // ---------------------------------------------------------------------- -#ifdef FILTER_WARNING_ENABLED -class SvxAlienFilterWarningConfig_Impl : public utl::ConfigItem -{ - sal_Bool bWarning; - com::sun::star::uno::Sequence< OUString > aPropNames; - - public: - SvxAlienFilterWarningConfig_Impl(); - ~SvxAlienFilterWarningConfig_Impl(); - - virtual void Commit(); - - void ResetWarning() - { - if(bWarning) - { - bWarning = sal_False; - ConfigItem::SetModified(); - } - - } - sal_Bool IsWarning()const{return bWarning;} -}; -// ---------------------------------------------------------------------- -SvxAlienFilterWarningConfig_Impl::SvxAlienFilterWarningConfig_Impl() : - ConfigItem(C2U("TypeDetection.Misc/Defaults"), - CONFIG_MODE_IMMEDIATE_UPDATE), - aPropNames(1), - bWarning(sal_True) -{ - aPropNames.getArray()[0] = C2U("ShowAlienFilterWarning"); - Sequence<Any> aValues = GetProperties(aPropNames); - const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aPropNames.getLength(), "GetProperties failed"); - if(aValues.getLength() == aPropNames.getLength() && - pValues[0].hasValue() && - pValues[0].getValueType() == ::getBooleanCppuType()) - bWarning = *(sal_Bool*)pValues[0].getValue(); -} -// ---------------------------------------------------------------------- -SvxAlienFilterWarningConfig_Impl::~SvxAlienFilterWarningConfig_Impl() -{ - if(IsModified()) - Commit(); -} -// ---------------------------------------------------------------------- -void SvxAlienFilterWarningConfig_Impl::Commit() -{ - Sequence<Any> aValues(aPropNames.getLength()); - Any* pValues = aValues.getArray(); - pValues[0].setValue(&bWarning, ::getBooleanCppuType()); - PutProperties(aPropNames, aValues); -} -#endif // FILTER_WARNING_ENABLED -// ---------------------------------------------------------------------- -// ---------------------------------------------------------------------- struct SvxSaveTabPage_Impl { @@ -333,26 +274,6 @@ OUString lcl_ExtractUIName(const Sequence<PropertyValue> rProperties) return sRet; } // ----------------------------------------------------------------------- -bool SfxSaveTabPage::AcceptFilter( USHORT nPos ) -{ - const OUString* pFilters = pImpl->aFilterArr[nPos].getConstArray(); - sal_Bool bAlien = sal_False, bODF = sal_False; - OUString* pUIFilters = pImpl->aUIFilterArr[nPos].getArray(); - OUString sUIName; - for(int nFilter = 0; nFilter < pImpl->aFilterArr[nPos].getLength(); nFilter++) - { - if( pImpl->aDefaultArr[nPos] == pFilters[nFilter] ) - { - bAlien = pImpl->aAlienArr[nPos][nFilter]; - bODF = pImpl->aODFArr[nPos][nFilter]; - sUIName = pUIFilters[nFilter];; - break; - } - } - bool bSet = true; - return bSet; -} -// ----------------------------------------------------------------------- void SfxSaveTabPage::DetectHiddenControls() { long nDelta = 0; @@ -469,38 +390,31 @@ BOOL SfxSaveTabPage::FillItemSet( SfxItemSet& rSet ) SvtModuleOptions aModuleOpt; if(pImpl->aDefaultArr[APP_MATH].getLength() && - pImpl->aDefaultArr[APP_MATH] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_MATH) && - AcceptFilter( APP_MATH )) + pImpl->aDefaultArr[APP_MATH] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_MATH)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_MATH, pImpl->aDefaultArr[APP_MATH]); if( pImpl->aDefaultArr[APP_DRAW].getLength() && - pImpl->aDefaultArr[APP_DRAW] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_DRAW) && - AcceptFilter( APP_DRAW )) + pImpl->aDefaultArr[APP_DRAW] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_DRAW)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_DRAW, pImpl->aDefaultArr[APP_DRAW]); if(pImpl->aDefaultArr[APP_IMPRESS].getLength() && - pImpl->aDefaultArr[APP_IMPRESS] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_IMPRESS)&& - AcceptFilter( APP_IMPRESS )) + pImpl->aDefaultArr[APP_IMPRESS] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_IMPRESS)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_IMPRESS, pImpl->aDefaultArr[APP_IMPRESS]); if(pImpl->aDefaultArr[APP_CALC].getLength() && - pImpl->aDefaultArr[APP_CALC] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_CALC)&& - AcceptFilter( APP_CALC )) + pImpl->aDefaultArr[APP_CALC] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_CALC)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_CALC, pImpl->aDefaultArr[APP_CALC]); if(pImpl->aDefaultArr[APP_WRITER].getLength() && - pImpl->aDefaultArr[APP_WRITER] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITER)&& - AcceptFilter( APP_WRITER)) + pImpl->aDefaultArr[APP_WRITER] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITER)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_WRITER, pImpl->aDefaultArr[APP_WRITER]); if(pImpl->aDefaultArr[APP_WRITER_WEB].getLength() && - pImpl->aDefaultArr[APP_WRITER_WEB] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITERWEB)&& - AcceptFilter( APP_WRITER_WEB )) + pImpl->aDefaultArr[APP_WRITER_WEB] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITERWEB)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_WRITERWEB, pImpl->aDefaultArr[APP_WRITER_WEB]); if(pImpl->aDefaultArr[APP_WRITER_GLOBAL].getLength() && - pImpl->aDefaultArr[APP_WRITER_GLOBAL] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITERGLOBAL)&& - AcceptFilter( APP_WRITER_GLOBAL )) + pImpl->aDefaultArr[APP_WRITER_GLOBAL] != aModuleOpt.GetFactoryDefaultFilter(SvtModuleOptions::E_WRITERGLOBAL)) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::E_WRITERGLOBAL, pImpl->aDefaultArr[APP_WRITER_GLOBAL]); return bModified; @@ -581,7 +495,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) case APP_IMPRESS : sReplace = C2U("com.sun.star.presentation.PresentationDocument");break; case APP_DRAW : sReplace = C2U("com.sun.star.drawing.DrawingDocument");break; case APP_MATH : sReplace = C2U("com.sun.star.formula.FormulaProperties");break; - default: DBG_ERROR("illegal user data"); + default: OSL_FAIL("illegal user data"); } String sTmp(sCommand); sTmp.SearchAndReplaceAscii("%1", sReplace); @@ -627,7 +541,6 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) } aDocInfoCB.Check(aSaveOpt.IsDocInfoSave()); -// aDocInfoCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOCINFSAVE)); aBackupCB.Check(aSaveOpt.IsBackup()); BOOL bBackupRO = aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP); @@ -637,22 +550,16 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) aAutoSaveCB.Check(aSaveOpt.IsAutoSave()); aWarnAlienFormatCB.Check(aSaveOpt.IsWarnAlienFormat()); aWarnAlienFormatCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT)); -// aAutoSaveCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVE)); // the pretty printing aSizeOptimizationCB.Check( !aSaveOpt.IsPrettyPrinting()); -// aSizeOptimizationCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOPRETTYPRINTING )); - aAutoSaveEdit.SetValue( aSaveOpt.GetAutoSaveTime() ); -// aAutoSaveEdit.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVETIME)); // relativ speichern aRelativeFsysCB.Check( aSaveOpt.IsSaveRelFSys() ); -// aRelativeFsysCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELFSYS)); aRelativeInetCB.Check( aSaveOpt.IsSaveRelINet() ); -// aRelativeInetCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELINET)); void* pDefaultVersion = (void*)long( aSaveOpt.GetODFDefaultVersion() ); aODFVersionLB.SelectEntryPos( aODFVersionLB.GetEntryPos( pDefaultVersion ) ); @@ -666,7 +573,6 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) aSizeOptimizationCB.SaveValue(); aAutoSaveCB.SaveValue(); aAutoSaveEdit.SaveValue(); -// aAutoSavePromptBtn.SaveValue(); aRelativeFsysCB.SaveValue(); aRelativeInetCB.SaveValue(); @@ -683,14 +589,12 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox ) { aAutoSaveEdit.Enable(); aMinuteFT.Enable(); -// aAutoSavePromptBtn.Enable(); aAutoSaveEdit.GrabFocus(); } else { aAutoSaveEdit.Disable(); aMinuteFT.Disable(); -// aAutoSavePromptBtn.Disable(); } } return 0; @@ -706,7 +610,6 @@ OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties) if(!pProperties[nProp].Name.compareToAscii("UIName")) { pProperties[nProp].Value >>= sRet; -//! break; } else if(!pProperties[nProp].Name.compareToAscii("Flags")) { diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 519438a245b6..6f6d424fde4a 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -88,7 +88,6 @@ private: DECL_LINK( FilterHdl_Impl, ListBox * ); DECL_LINK( ODFVersionHdl_Impl, ListBox * ); - bool AcceptFilter( USHORT nPos ); void DetectHiddenControls(); #endif diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src index cdbdbd46ae62..39ffea74e988 100644 --- a/cui/source/options/optsave.src +++ b/cui/source/options/optsave.src @@ -89,13 +89,13 @@ TabPage RID_SFXPAGE_SAVE CheckBox BTN_AUTOSAVE { Pos = MAP_APPFONT ( 12 , 63 ) ; - Size = MAP_APPFONT ( 150 , 10 ) ; + Size = MAP_APPFONT ( 193 , 10 ) ; Text [ en-US ] = "Save ~AutoRecovery information every" ; }; NumericField ED_AUTOSAVE { Border = TRUE ; - Pos = MAP_APPFONT ( 180 , 62 ) ; + Pos = MAP_APPFONT ( 210 , 61 ) ; Size = MAP_APPFONT ( 21 , 12 ) ; Left = TRUE ; Repeat = TRUE ; @@ -110,7 +110,7 @@ TabPage RID_SFXPAGE_SAVE }; FixedText FT_MINUTE { - Pos = MAP_APPFONT ( 204 , 63 ) ; + Pos = MAP_APPFONT ( 234 , 63 ) ; Size = MAP_APPFONT ( 35 , 8 ) ; Text [ en-US ] = "Minutes" ; }; diff --git a/cui/source/options/optspell.src b/cui/source/options/optspell.src index e4241d4e4bb4..93957d9d79eb 100644 --- a/cui/source/options/optspell.src +++ b/cui/source/options/optspell.src @@ -56,16 +56,12 @@ TabPage RID_SFXPAGE_SPELL { Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( 115 , 66 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Wörterbücher : W÷rterb³cher */ - /* ### ACHTUNG: Neuer Text in Resource? Wörterbücher : W÷rterb³cher */ Text [ en-US ] = "Dictionaries" ; }; CheckBox BTN_CAPS { Pos = MAP_APPFONT ( 12 , 82 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Großgeschriebene Wörter : ~Gro˜geschriebene W÷rter */ - /* ### ACHTUNG: Neuer Text in Resource? ~Großgeschriebene Wörter : ~Gro˜geschriebene W÷rter */ Text [ en-US ] = "~Capital words" ; TabStop = TRUE ; }; @@ -73,8 +69,6 @@ TabPage RID_SFXPAGE_SPELL { Pos = MAP_APPFONT ( 12 , 95 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Wörter mit Ziffern : ~W÷rter mit Ziffern */ - /* ### ACHTUNG: Neuer Text in Resource? ~Wörter mit Ziffern : ~W÷rter mit Ziffern */ Text [ en-US ] = "~Words with numbers " ; TabStop = TRUE ; }; @@ -82,8 +76,6 @@ TabPage RID_SFXPAGE_SPELL { Pos = MAP_APPFONT ( 12 , 108 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Groß- u. ~Kleinschreibung : Gro˜- u. ~Kleinschreibung */ - /* ### ACHTUNG: Neuer Text in Resource? Groß- u. ~Kleinschreibung : Gro˜- u. ~Kleinschreibung */ Text [ en-US ] = "~Case sensitive " ; TabStop = TRUE ; }; @@ -91,8 +83,6 @@ TabPage RID_SFXPAGE_SPELL { Pos = MAP_APPFONT ( 6 , 71 ) ; Size = MAP_APPFONT ( 115 , 53 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Prüfen : Pr³fen */ - /* ### ACHTUNG: Neuer Text in Resource? Prüfen : Pr³fen */ Text [ en-US ] = "Check" ; }; }; diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 131e3bbda5d9..696d5863e005 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -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> diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx index 4b7debb7a549..67d8d2190496 100644 --- a/cui/source/options/radiobtnbox.cxx +++ b/cui/source/options/radiobtnbox.cxx @@ -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 274c1eaf7478..b481c631b165 100644 --- a/cui/source/options/readonlyimage.cxx +++ b/cui/source/options/readonlyimage.cxx @@ -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> diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index aefd70d69a1b..966bddd88acc 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -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 da088606c9e3..ee1c482e091f 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -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 29a5e87a1a99..5af0beee0230 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -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> @@ -361,9 +359,7 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItem case RID_SVXPAGE_ACCESSIBILITYCONFIG: fnCreate = &SvxAccessibilityOptionsTabPage::Create; break; case RID_SVXPAGE_SSO: fnCreate = GetSSOCreator(); break; case RID_SVXPAGE_OPTIONS_CTL: fnCreate = &SvxCTLOptionsPage::Create ; break; - //added by jmeng begin case RID_SVXPAGE_INET_MOZPLUGIN: fnCreate = &MozPluginTabPage::Create; break; - //added by jmeng end case RID_SVXPAGE_OPTIONS_JAVA: fnCreate = &SvxJavaOptionsPage::Create ; break; case RID_SVXPAGE_ONLINEUPDATE: fnCreate = &SvxOnlineUpdateTabPage::Create; break; case RID_OPTPAGE_CHART_DEFCOLORS: fnCreate = &SvxDefaultColorOptPage::Create; break; @@ -839,13 +835,11 @@ void OfaTreeOptionsDialog::InitTreeAndHandler() { aTreeLB.SetNodeDefaultImages(); - String sResName = String::CreateFromAscii( "iso" ); - ResMgr* pIsoRes = ResMgr::CreateResMgr( ::rtl::OUStringToOString( sResName, RTL_TEXTENCODING_UTF8 ) ); + ResMgr* pIsoRes = ResMgr::CreateResMgr( "iso" ); if ( !pIsoRes ) { // Fallback: Use ooo resource file - String sOOoName = String::CreateFromAscii( "ooo" ); - pIsoRes = ResMgr::CreateResMgr( ::rtl::OUStringToOString( sOOoName, RTL_TEXTENCODING_UTF8 ) ); + pIsoRes = ResMgr::CreateResMgr("ooo"); } //! ResMgr* pIsoRes = SFX_APP()->GetLabelResManager(); @@ -1696,7 +1690,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet default: { - DBG_ERROR( "Unhandled option in ApplyItemSet" ); + OSL_FAIL( "Unhandled option in ApplyItemSet" ); } break; } diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 2c9a7ebbdd7c..296c1e5ecc06 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -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> @@ -209,7 +206,7 @@ void WebConnectionInfoDialog::FillPasswordList() aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' ); aUIEntry += aURLEntries[nURLInd].UserList[nUserInd].UserName; SvLBoxEntry* pEntry = m_aPasswordsLB.InsertEntry( aUIEntry ); - pEntry->SetUserData( (void*)(nCount++) ); + pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) ); } } @@ -228,7 +225,7 @@ void WebConnectionInfoDialog::FillPasswordList() aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' ); aUIEntry += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*" ) ); SvLBoxEntry* pEntry = m_aPasswordsLB.InsertEntry( aUIEntry ); - pEntry->SetUserData( (void*)(nCount++) ); + pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) ); } } } diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 772ee2a27fbb..1dd8ad177119 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -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 f89ee9a6ef6a..fd68e1e1f557 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -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> @@ -2127,7 +2125,6 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn ) LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE, 0 )); pMap->SetText(nMode < SGL_END ? sStartQuoteDlg : sEndQuoteDlg ); sal_UCS4 cDlg; - //The two lines below are added by BerryJia for Bug95846 Time:2002-8-13 15:50 SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); LanguageType eLang = Application::GetSettings().GetLanguage(); switch( nMode ) @@ -2135,25 +2132,25 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn ) case SGL_START: cDlg = cSglStartQuote; if(cDlg == 0) - cDlg = pAutoCorrect->GetQuote('\'',TRUE,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 + cDlg = pAutoCorrect->GetQuote('\'',TRUE,eLang); break; case SGL_END: cDlg = cSglEndQuote; if(cDlg == 0) - cDlg = pAutoCorrect->GetQuote('\'',FALSE,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 + cDlg = pAutoCorrect->GetQuote('\'',FALSE,eLang); break; case DBL_START: cDlg = cStartQuote; if(cDlg == 0) - cDlg = pAutoCorrect->GetQuote('\"',TRUE,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 + cDlg = pAutoCorrect->GetQuote('\"',TRUE,eLang); break; case DBL_END: cDlg = cEndQuote; if(cDlg == 0) - cDlg = pAutoCorrect->GetQuote('\"',FALSE,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 + cDlg = pAutoCorrect->GetQuote('\"',FALSE,eLang); break; default: - DBG_ERROR("svx::OfaQuoteTabPage::QuoteHdl(), how to initialize cDlg?" ); + OSL_FAIL("svx::OfaQuoteTabPage::QuoteHdl(), how to initialize cDlg?" ); cDlg = 0; break; diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src index 53b31dc575ea..c863435f1476 100644 --- a/cui/source/tabpages/autocdlg.src +++ b/cui/source/tabpages/autocdlg.src @@ -205,7 +205,6 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY COMMON_CLB_ENTRIES String ST_DEL_EMPTY_PARA { - /* ### ACHTUNG: Neuer Text in Resource? Leere Absätze entfernen : Leere Absõtze entfernen */ Text [ en-US ] = "Remove blank paragraphs" ; }; String ST_USER_STYLE @@ -218,7 +217,6 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY }; String ST_RIGHT_MARGIN { - /* ### ACHTUNG: Neuer Text in Resource? Zusammenfassen von einzeiligen Absätzen ab : Zusammenfassen von einzeiligen Absõtzen ab */ // Text [ norwegian_wrong ] = "+++Combine single line paragraphs at" ; // Text [ swedish_wrong ] = ~Kombinera enradiga stycken B738vid " ; Text [ en-US ] = "Combine single line paragraphs if length greater than" ; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index bbaaea4dbf72..9225f1c4f679 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -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> @@ -594,8 +591,8 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) } nWhich = GetWhich( SID_ATTR_BRUSH_CHAR ); - SfxItemState eState = rSet.GetItemState( nWhich, TRUE ); - eState = rSet.GetItemState( nWhich, FALSE ); + rSet.GetItemState( nWhich, TRUE ); + rSet.GetItemState( nWhich, FALSE ); if ( rSet.GetItemState( nWhich, TRUE ) > SFX_ITEM_AVAILABLE ) { pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) ); diff --git a/cui/source/tabpages/backgrnd.src b/cui/source/tabpages/backgrnd.src index 7f413f116aff..49f2124f8b88 100644 --- a/cui/source/tabpages/backgrnd.src +++ b/cui/source/tabpages/backgrnd.src @@ -71,7 +71,6 @@ TabPage RID_SVXPAGE_BACKGROUND Size = MAP_APPFONT ( 24 , 10 ) ; Hide = TRUE ; LeftLabel = TRUE ; - /* ### ACHTUNG: Neuer Text in Resource? Fü~r : F³~r */ Text [ en-US ] = "F~or" ; }; ListBox LB_TBL_BOX @@ -203,7 +202,6 @@ TabPage RID_SVXPAGE_BACKGROUND Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 103 ) ; Size = MAP_APPFONT ( 49 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Fläche : ~Flõche */ Text [ en-US ] = "Ar~ea" ; }; RadioButton BTN_TILE diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index f688e9b720f5..af6197312dbd 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.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 <svx/dialogs.hrc> diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 7ac6acad9278..7ca9e34b9098 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.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/objsh.hxx> @@ -450,7 +447,6 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) const SvxBoxInfoItem* pBoxInfoItem; USHORT nWhichBox = GetWhich(SID_ATTR_BORDER_OUTER); SfxMapUnit eCoreUnit; - const Color aColBlack = RGBCOL(COL_BLACK); pBoxItem = (const SvxBoxItem*)GetItem( rSet, SID_ATTR_BORDER_OUTER ); diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index 290306176e1c..707af534a6df 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -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 97bcd96954fd..c41dad92b704 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -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> @@ -621,6 +618,30 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) : m_pColorLB = new ColorListBox( this, CUI_RES( LB_COLOR2 ) ); } + //In MacOSX the standard dialogs name font-name, font-style as + //Family, Typeface + //In GNOME the standard dialogs name font-name, font-style as + //Family, Style + //In Windows the standard dialogs name font-name, font-style as + //Font, Style +#ifdef WNT + String sFontFamilyString(CUI_RES(STR_CHARNAME_FONT)); +#else + String sFontFamilyString(CUI_RES(STR_CHARNAME_FAMILY)); +#endif + m_pWestFontNameFT->SetText(sFontFamilyString); + m_pEastFontNameFT->SetText(sFontFamilyString); + m_pCTLFontNameFT->SetText(sFontFamilyString); + +#ifdef MACOSX + String sFontStyleString(CUI_RES(STR_CHARNAME_TYPEFACE)); +#else + String sFontStyleString(CUI_RES(STR_CHARNAME_STYLE)); +#endif + m_pWestFontStyleFT->SetText(sFontStyleString); + m_pEastFontStyleFT->SetText(sFontStyleString); + m_pCTLFontStyleFT->SetText(sFontStyleString); + m_pWestLine ->Show( bCJK ); m_pColorFL ->Show( bCJK ); @@ -980,7 +1001,6 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox ) void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ) { - FixedText* pNameLabel = NULL; FontNameBox* pNameBox = NULL; FixedText* pStyleLabel = NULL; FontStyleBox* pStyleBox = NULL; @@ -993,7 +1013,6 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp switch ( eLangGrp ) { case Western : - pNameLabel = m_pWestFontNameFT; pNameBox = m_pWestFontNameLB; pStyleLabel = m_pWestFontStyleFT; pStyleBox = m_pWestFontStyleLB; @@ -1005,7 +1024,6 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp break; case Asian : - pNameLabel = m_pEastFontNameFT; pNameBox = m_pEastFontNameLB; pStyleLabel = m_pEastFontStyleFT; pStyleBox = m_pEastFontStyleLB; @@ -1017,7 +1035,6 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp break; case Ctl : - pNameLabel = m_pCTLFontNameFT; pNameBox = m_pCTLFontNameLB; pStyleLabel = m_pCTLFontStyleFT; pStyleBox = m_pCTLFontStyleLB; @@ -2447,7 +2464,6 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) m_aUnderlineLB.GetSelectHdl().Call(NULL); // don't call SelectHdl_Impl directly! // in DisableControls, we may have re-reouted the select handler - // 30.05.2001 - 86262 - frank.schoenheit@germany.sun.com // the select handler for the emphasis listbox // SelectHdl_Impl( &m_aEmphasisLB ); diff --git a/cui/source/tabpages/chardlg.hrc b/cui/source/tabpages/chardlg.hrc index 3d12b5f3bd0b..0d583b0431e8 100644 --- a/cui/source/tabpages/chardlg.hrc +++ b/cui/source/tabpages/chardlg.hrc @@ -70,6 +70,10 @@ #define STR_CHARNAME_NOSTYLE 150 #define STR_CHARNAME_TRANSPARENT 151 +#define STR_CHARNAME_FAMILY 152 +#define STR_CHARNAME_FONT 153 +#define STR_CHARNAME_STYLE 154 +#define STR_CHARNAME_TYPEFACE 155 // EffectsPage -------------------------------------------------------------- diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src index 9673fc950f3f..0d3960fd219c 100644 --- a/cui/source/tabpages/chardlg.src +++ b/cui/source/tabpages/chardlg.src @@ -48,13 +48,11 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 12 , 14 ); Size = MAP_APPFONT ( 80 , 8 ); - Text [ en-US ] = "Font"; }; FixedText FT_WEST_NAME_NOCJK { Pos = MAP_APPFONT ( 12 , 6 ); Size = MAP_APPFONT ( 112 , 8 ); - Text [ en-US ] = "~Font"; }; ComboBox LB_WEST_NAME { @@ -76,13 +74,11 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 96 , 14 ); Size = MAP_APPFONT ( 40 , 8 ); - Text [ en-US ] = "~Typeface"; }; FixedText FT_WEST_STYLE_NOCJK { Pos = MAP_APPFONT ( 130 , 6 ); Size = MAP_APPFONT ( 72 , 8 ); - Text [ en-US ] = "~Typeface"; }; ComboBox LB_WEST_STYLE { @@ -182,7 +178,6 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 12 , 54 ); Size = MAP_APPFONT ( 80 , 8 ); - Text [ en-US ] = "Font"; }; ComboBox LB_EAST_NAME { @@ -196,7 +191,6 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 96 , 54 ); Size = MAP_APPFONT ( 40 , 8 ); - Text [ en-US ] = "T~ypeface"; }; ComboBox LB_EAST_STYLE { @@ -252,7 +246,6 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 12 , 94 ); Size = MAP_APPFONT ( 80 , 8 ); - Text [ en-US ] = "Font"; }; ComboBox LB_CTL_NAME { @@ -266,7 +259,6 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 96 , 94 ); Size = MAP_APPFONT ( 40 , 8 ); - Text [ en-US ] = "Ty~peface"; }; ComboBox LB_CTL_STYLE { @@ -353,6 +345,22 @@ TabPage RID_SVXPAGE_CHAR_NAME { Text [ en-US ] = "Transparent"; }; + String STR_CHARNAME_FAMILY + { + Text [ en-US ] = "Family"; + }; + String STR_CHARNAME_FONT + { + Text [ en-US ] = "Font"; + }; + String STR_CHARNAME_STYLE + { + Text [ en-US ] = "Style"; + }; + String STR_CHARNAME_TYPEFACE + { + Text [ en-US ] = "Typeface"; + }; }; // RID_SVXPAGE_CHAR_EFFECTS --------------------------------------------------- diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index 20f448209ec8..5c447b2fc147 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.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/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index cfd7d7327d2c..72b1bf4d6b8d 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 85bc19f67daf..2269ecfe051f 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -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> @@ -470,16 +467,12 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) { if(pField == &aLeftMF) { -// nLeft = aPageSize.Width() - -// ((nRight + aOrigSize.Width()) * nWidthZoom) / 100; nLeft = aOrigSize.Width() - ( aPageSize.Width() * 100 / nWidthZoom + nRight ); aLeftMF.SetValue( aLeftMF.Normalize( nLeft ), eUnit ); } else { -// nRight = aPageSize.Width() - -// ((nLeft - aOrigSize.Width()) * nWidthZoom) / 100; nRight = aOrigSize.Width() - ( aPageSize.Width() * 100 / nWidthZoom + nLeft ); aRightMF.SetValue( aRightMF.Normalize( nRight ), eUnit ); @@ -503,16 +496,12 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) { if(pField == &aTopMF) { -// nTop = aPageSize.Height() - -// ((aOrigSize.Height() - nBottom) * nHeightZoom)/ 100; nTop = aOrigSize.Height() - ( aPageSize.Height() * 100 / nHeightZoom + nBottom); aTopMF.SetValue( aWidthMF.Normalize( nTop ), eUnit ); } else { -// nBottom = aPageSize.Height() - -// ((aOrigSize.Height() - nTop)*nHeightZoom) / 100; nBottom = aOrigSize.Height() - ( aPageSize.Height() * 100 / nHeightZoom + nTop); aBottomMF.SetValue( aWidthMF.Normalize( nBottom ), eUnit ); @@ -605,11 +594,6 @@ void SvxGrfCropPage::CalcMinMaxBorder() nMin = nMinWidth - (nL >= 0 ? nL : 0); aRightMF.SetMax( aRightMF.Normalize(nMin), eUnit ); - // Zoom nicht unter 2% -/* nMin = (aOrigSize.Width() * 102) /100; - aLeftMF.SetMax(aPageSize.Width() - nR - nMin); - aRightMF.SetMax(aPageSize.Width() - nL - nMin); -*/ long nUp = lcl_GetValue( aTopMF, eUnit ); long nMinHeight = (aOrigSize.Height() * 10) /11; nMin = nMinHeight - (nUp >= 0 ? nUp : 0); @@ -618,11 +602,6 @@ void SvxGrfCropPage::CalcMinMaxBorder() long nLow = lcl_GetValue(aBottomMF, eUnit ); nMin = nMinHeight - (nLow >= 0 ? nLow : 0); aTopMF.SetMax( aTopMF.Normalize(nMin), eUnit ); - - // Zoom nicht unter 2% -/* nMin = (aOrigSize.Height() * 102) /100; - aTopMF.SetMax(aPageSize.Height() - nLow - nMin); - aBottomMF.SetMax(aPageSize.Height() - nUp - nMin);*/ } /*-------------------------------------------------------------------- Beschreibung: Spinsize auf 1/20 der Originalgroesse setzen, @@ -808,7 +787,4 @@ void SvxGrfCropPage::SvxCropExample::SetFrameSize( const Size& rSz ) Invalidate(); } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index e63ea5855ce4..411e5f53257b 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.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 <sfx2/app.hxx> diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src index 05497e59b7a4..36fb0f52d108 100644 --- a/cui/source/tabpages/labdlg.src +++ b/cui/source/tabpages/labdlg.src @@ -149,8 +149,6 @@ TabPage RID_SVXPAGE_CAPTION { Pos = MAP_APPFONT ( 6 , 85 ) ; Size = MAP_APPFONT ( 42 , 8 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Länge : ~Lõnge */ - /* ### ACHTUNG: Neuer Text in Resource? ~Länge : ~Lõnge */ Text [ en-US ] = "~Length" ; }; MetricField MF_LAENGE diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 49cc40676710..fe8107ef8b85 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 @@ -178,7 +175,7 @@ void _SfxMacroTabPage::EnableButtons( const String& rLangName ) sEventMacro = ((SvLBoxString*)pE->GetItem( LB_MACROS_ITEMPOS ))->GetText(); if ( rLangName.EqualsAscii("JavaScript") ) { - DBG_ERROR( "_SfxMacroTabPage::EnableButtons(): this is not an up to date usage!" ); + OSL_FAIL( "_SfxMacroTabPage::EnableButtons(): this is not an up to date usage!" ); } else { diff --git a/cui/source/tabpages/macroass.src b/cui/source/tabpages/macroass.src index 4f5d78ffe795..36c4a9115105 100644 --- a/cui/source/tabpages/macroass.src +++ b/cui/source/tabpages/macroass.src @@ -91,7 +91,6 @@ TabPage RID_SVXPAGE_EVENTASSIGN { Pos = MAP_APPFONT ( COL4 , ROW0 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; - // ### ACHTUNG: Neuer Text in Resource? Z~uweisen : Zuweisen Disable = TRUE ; TabStop = TRUE ; Text [ en-US ] = "~Assign" ; diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 0c306fbe051a..68dc7d5fb193 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.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> @@ -524,9 +521,6 @@ BOOL SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) } } -//enum SdrMeasureTextHPos {SDRMEASURE_TEXTHAUTO,SDRMEASURE_TEXTLEFTOUTSIDE,SDRMEASURE_TEXTINSIDE,SDRMEASURE_TEXTRIGHTOUTSIDE}; -//enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_VERTICALCENTERED,SDRMEASURE_BELOW}; - if( bPositionModified ) { // Position diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 238174cf0c00..6578599ee104 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> @@ -589,7 +582,6 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) AddAutomaticLanguage_Impl(eLangType, pAutoEntryAttr->GetValue()); UpdateFormatListBox_Impl(FALSE,TRUE); -//! erAck 26.01.01 //! This spoils everything because it rematches currency formats based on //! the selected aLbCurrency entry instead of the current format. //! Besides that everything seems to be initialized by now, so why call it? @@ -1131,8 +1123,6 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl String aFormat=*aEntryList[nFmtLbSelPos]; aEdFormat.SetText(aFormat); aFtComment.SetText(pNumFmtShell->GetComment4Entry(nFmtLbSelPos)); - - //@23.09.97 aEdFormat.SetText( aLbFormat.GetSelectEntry() ); } if(!bOneAreaFlag || !bCat) diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src index b8c35b2d17ad..7eea452f88f5 100644 --- a/cui/source/tabpages/numfmt.src +++ b/cui/source/tabpages/numfmt.src @@ -142,7 +142,6 @@ TabPage RID_SVXPAGE_NUMBERFORMAT { Pos = MAP_APPFONT ( 12 , 120 ) ; Size = MAP_APPFONT ( 69 , 8 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Führende ~Nullen : F³hrende ~Nullen */ Text [ en-US ] = "Leading ~zeroes" ; }; NumericField ED_LEADZEROES diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 203e7ea1f585..66288342415b 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> @@ -328,7 +325,7 @@ int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); + //im Draw gibt es das Item als WhichId, im Writer nur als SlotId SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem); if(eState != SFX_ITEM_SET) @@ -402,11 +399,6 @@ IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) return 0; } -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ - SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, const SfxItemSet& rSet) : @@ -514,8 +506,6 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet ) delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); - if(!pActNum) pActNum = new SvxNumRule(*pSaveNum); else if(*pSaveNum != *pActNum) @@ -573,11 +563,6 @@ void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet) } -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ - SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, const SfxItemSet& rSet) : @@ -721,7 +706,6 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); if(!pActNum) pActNum = new SvxNumRule(*pSaveNum); else if(*pSaveNum != *pActNum) @@ -850,10 +834,6 @@ void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType, } } -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, const SfxItemSet& rSet) : @@ -877,7 +857,6 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, aLinkedCB.SetClickHdl(LINK(this, SvxBitmapPickTabPage, LinkBmpHdl_Impl)); // Grafiknamen ermitteln - GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); pExamplesVS->SetHelpId(HID_VALUESET_NUMBMP ); for(USHORT i = 0; i < aGrfNames.Count(); i++) @@ -925,7 +904,6 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) const SfxPoolItem* pItem; bPreset = FALSE; BOOL bIsPreset = FALSE; -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); if(pExampleSet) { @@ -967,8 +945,6 @@ BOOL SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet ) { if ( !aGrfNames.Count() ) { -// das ist im SfxItemSet leider nicht zulaessig #52134# -// rSet.DisableItem(SID_ATTR_NUMBERING_RULE); return FALSE; } if( (bPreset || bModified) && pActNum) @@ -1356,7 +1332,6 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) else aLevelLB.SelectEntryPos(aLevelLB.GetEntryCount() - 1); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); USHORT nMask = 1; aLevelLB.SetUpdateMode(FALSE); aLevelLB.SetNoSelection(); @@ -1636,12 +1611,6 @@ void SvxNumOptionsTabPage::InitControls() aStartED.SetText(aEmptyStr); break; case SHOW_BULLET: - { -// const Font* pFnt = aNumFmtArr[Lvl]->GetBulletFont(); -// if(pFnt) -// ChgTxtFont(aBulletFT, *pFnt); -// aBulletFT.SetText(String((char)aNumFmtArr[nLvl]->GetBulletChar())); - } break; case SHOW_BITMAP: break; @@ -1817,7 +1786,6 @@ IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox ) IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { String sSelectStyle; - sal_Int16 eOldType; BOOL bShowOrient = FALSE; BOOL bBmp = FALSE; String aEmptyStr; @@ -1827,7 +1795,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) if(nActNumLvl & nMask) { SvxNumberFormat aNumFmt(pActNum->GetLevel(i)); - eOldType = aNumFmt.GetNumberingType(); // PAGEDESC gibt es nicht USHORT nNumType = (USHORT)(ULONG)pBox->GetEntryData(pBox->GetSelectEntryPos()); aNumFmt.SetNumberingType((sal_Int16)nNumType); @@ -1855,8 +1822,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) aNumFmt.SetBulletChar( SVX_DEF_BULLET ); pActNum->SetLevel(i, aNumFmt); SwitchNumberType(SHOW_BULLET); - //ChgTxtFont(aBulletFT, *aNumFmt.GetBulletFont()); - //aBulletFT.SetText( aNumFmt.GetBulletChar() ); // Zuweisung der Zeichenvorlage automatisch if(bAutomaticCharStyles) { @@ -1867,7 +1832,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { aNumFmt.SetPrefix( aPrefixED.GetText() ); aNumFmt.SetSuffix( aSuffixED.GetText() ); -// aNumFmt.SetBulletFont(0); SwitchNumberType(SHOW_NUMBERING); pActNum->SetLevel(i, aNumFmt); CheckForStartValue_Impl(nNumberingType); @@ -1897,7 +1861,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { aCharFmtLB.SelectEntry(sSelectStyle); CharFmtHdl_Impl(&aCharFmtLB); - // bAutomaticCharStyles wird im CharFmtHdl_Impl zurueckgesetzt bAutomaticCharStyles = TRUE; } return 0; @@ -2005,7 +1968,6 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) Size aSize; sal_Bool bSucc(sal_False); SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) ); -// aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE ); if(MN_GALLERY_ENTRY <= nItemId ) { @@ -2436,7 +2398,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) aStdFont.SetColor(aTextColor); aStdFont.SetFillColor(aBackColor); - // USHORT nFontHeight = nYStep * 6 / 10; if(bPosition) nFontHeight = nYStep * 15 / 10; @@ -3040,7 +3001,6 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, FALSE, &pItem)) nTmpNumLvl = ((const SfxUInt16Item*)pItem)->GetValue(); } - // if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, FALSE, &pItem)) { delete pSaveNum; diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 3556f8bd85aa..46d5da8355bb 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.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/objsh.hxx> diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index c4c9dde501f6..afabe8b31d02 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -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> @@ -181,9 +178,6 @@ USHORT GetHtmlMode_Impl(const SfxItemSet& rSet) IMPL_LINK( SvxStdParagraphTabPage, ELRLoseFocusHdl, Edit *, EMPTYARG ) { -//! if ( aLeftIndent.IsRelativeMode() ) -//! return 0; //!!! - SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); FieldUnit eUnit = @@ -274,7 +268,7 @@ BOOL SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) break; default: - DBG_ERROR( "unbekannter Type fuer Zeilenabstand." ); + OSL_FAIL( "unbekannter Type fuer Zeilenabstand." ); break; } eState = GetItemSet().GetItemState( nWhich ); @@ -1003,8 +997,6 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) 0x0002 --->EnableRegisterMode() 0x0004 --->EnableAutoFirstLine() 0x0008 --->EnableNegativeMode() - - */ SFX_ITEMSET_ARG (&aSet,pPageWidthItem,SfxUInt16Item,SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,sal_False); SFX_ITEMSET_ARG (&aSet,pFlagSetItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,sal_False); @@ -1710,7 +1702,6 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) aPagenumEdit.Enable(FALSE); aPagenumText.Enable(FALSE); } -//!!! ApplyCollClickHdl_Impl( &aApplyCollBtn ); if ( !bIsPageModel ) { @@ -1936,10 +1927,6 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe aBreakTypeLB ( this, CUI_RES( LB_BREAKTYPE )), aBreakPositionFT ( this, CUI_RES( FT_BREAKPOSITION )), aBreakPositionLB ( this, CUI_RES( LB_BREAKPOSITION )), -// aPageBox ( this, CUI_RES( BTN_BREAKPAGE ) ), -// aColumnBox ( this, CUI_RES( BTN_BREAKCOLUMN ) ), -// aBeforeBox ( this, CUI_RES( BTN_PAGEBREAKBEFORE ) ), -// aAfterBox ( this, CUI_RES( BTN_PAGEBREAKAFTER ) ), aApplyCollBtn ( this, CUI_RES( BTN_PAGECOLL ) ), aApplyCollBox ( this, CUI_RES( LB_PAGECOLL ) ), aPagenumText ( this, CUI_RES( FT_PAGENUM ) ), @@ -2319,17 +2306,10 @@ void lcl_SetBox(const SfxItemSet& rSet, USHORT nSlotId, TriStateBox& rBox) void SvxAsianTabPage::Reset( const SfxItemSet& rSet ) { lcl_SetBox(rSet, SID_ATTR_PARA_FORBIDDEN_RULES, aForbiddenRulesCB ); -// lcl_SetBox(rSet, , aAllowWordBreakCB ); lcl_SetBox(rSet, SID_ATTR_PARA_HANGPUNCTUATION, aHangingPunctCB ); - //character distance not yet available -// lcl_SetBox(rSet, , aPuntuationCB ); lcl_SetBox(rSet, SID_ATTR_PARA_SCRIPTSPACE, aScriptSpaceCB ); -// lcl_SetBox(rSet, , aAdjustNumbersCB ); -// aAllowWordBreakCB .Enable(FALSE); -// aPuntuationCB .Enable(FALSE); -// aAdjustNumbersCB .Enable(FALSE); } IMPL_LINK( SvxAsianTabPage, ClickHdl_Impl, TriStateBox*, pBox ) diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src index a1cb7cb80582..4f39be3c957b 100644 --- a/cui/source/tabpages/strings.src +++ b/cui/source/tabpages/strings.src @@ -29,110 +29,74 @@ String RID_SVXSTR_DESC_GRADIENT { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Farbverlauf ein: : Geben Sie hier bitte den Namen f³r den Farbverlauf ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Farbverlauf ein: : Geben Sie hier bitte den Namen f³r den Farbverlauf ein: */ Text [ en-US ] = "Please enter a name for the gradient:" ; }; String RID_SVXSTR_ASK_DEL_GRADIENT { - /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelöscht werden? : Soll der Farbverlauf wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelöscht werden? : Soll der Farbverlauf wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the gradient?" ; }; String RID_SVXSTR_ASK_CHANGE_GRADIENT { - /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde geändert und nicht gesichert. \nSie können den selektierten Farbverlauf ändern \noder einen neuen Farbverlauf hinzufügen. : Der Farbverlauf wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Farbverlauf õndern \noder einen neuen Farbverlauf hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde geändert und nicht gesichert. \nSie können den selektierten Farbverlauf ändern \noder einen neuen Farbverlauf hinzufügen. : Der Farbverlauf wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Farbverlauf õndern \noder einen neuen Farbverlauf hinzuf³gen. */ Text [ en-US ] = "The gradient was modified without saving. \nModify the selected gradient or add a new gradient." ; }; String RID_SVXSTR_DESC_NEW_BITMAP { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Bitmap ein: : Geben Sie hier bitte den Namen f³r die Bitmap ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Bitmap ein: : Geben Sie hier bitte den Namen f³r die Bitmap ein: */ Text [ en-US ] = "Please enter a name for the bitmap:" ; }; String RID_SVXSTR_DESC_EXT_BITMAP { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die externe Bitmap ein: : Geben Sie hier bitte den Namen f³r die externe Bitmap ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die externe Bitmap ein: : Geben Sie hier bitte den Namen f³r die externe Bitmap ein: */ Text [ en-US ] = "Please enter a name for the external bitmap:" ; }; String RID_SVXSTR_ASK_DEL_BITMAP { - /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelöscht werden? : Soll die Bitmap wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelöscht werden? : Soll die Bitmap wirklich gel÷scht werden? */ Text [ en-US ] = "Are you sure you want to delete the bitmap?" ; }; String RID_SVXSTR_ASK_CHANGE_BITMAP { - /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen. : Die Bitmap wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Bitmap õndern \noder eine neue Bitmap hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen. : Die Bitmap wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Bitmap õndern \noder eine neue Bitmap hinzuf³gen. */ Text [ en-US ] = "The bitmap was modified without saving. \nModify the selected bitmap or add a new bitmap." ; }; String RID_SVXSTR_DESC_LINESTYLE { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Linienstil ein: : Geben Sie hier bitte den Namen f³r den Linienstil ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Linienstil ein: : Geben Sie hier bitte den Namen f³r den Linienstil ein: */ Text [ en-US ] = "Please enter a name for the line style:" ; }; String RID_SVXSTR_ASK_DEL_LINESTYLE { - /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelöscht werden? : Soll der Linienstil wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelöscht werden? : Soll der Linienstil wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the line style?" ; }; String RID_SVXSTR_ASK_CHANGE_LINESTYLE { - /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen. : Der Linienstil wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Linienstil õndern \noder einen neuen Linienstil hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen. : Der Linienstil wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Linienstil õndern \noder einen neuen Linienstil hinzuf³gen. */ Text [ en-US ] = "The line style was modified without saving. \nModify the selected line style or add a new line style." ; }; String RID_SVXSTR_DESC_HATCH { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Schraffur ein: : Geben Sie hier bitte den Namen f³r die Schraffur ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Schraffur ein: : Geben Sie hier bitte den Namen f³r die Schraffur ein: */ Text [ en-US ] = "Please enter a name for the hatching:" ; }; String RID_SVXSTR_ASK_DEL_HATCH { - /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelöscht werden? : Soll die Schraffur wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelöscht werden? : Soll die Schraffur wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the hatching?" ; }; String RID_SVXSTR_ASK_CHANGE_HATCH { - /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde geändert und nicht gesichert. \nSie können die selektierte Schraffur ändern \noder eine neue Schraffur hinzufügen. : Die Schraffur wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Schraffur õndern \noder eine neue Schraffur hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde geändert und nicht gesichert. \nSie können die selektierte Schraffur ändern \noder eine neue Schraffur hinzufügen. : Die Schraffur wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Schraffur õndern \noder eine neue Schraffur hinzuf³gen. */ Text [ en-US ] = "The hatching type was modified but not saved. \nModify the selected hatching type or add a new hatching type." ; }; String RID_SVXSTR_CHANGE { - /* ### ACHTUNG: Neuer Text in Resource? Ändern : ÂŽndern */ - /* ### ACHTUNG: Neuer Text in Resource? Ändern : ÂŽndern */ Text [ en-US ] = "Modify" ; }; String RID_SVXSTR_ADD { - /* ### ACHTUNG: Neuer Text in Resource? Hinzufügen : Hinzuf³gen */ - /* ### ACHTUNG: Neuer Text in Resource? Hinzufügen : Hinzuf³gen */ Text [ en-US ] = "Add" ; }; String RID_SVXSTR_DESC_COLOR { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die neue Farbe ein: : Geben Sie hier bitte den Namen f³r die neue Farbe ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die neue Farbe ein: : Geben Sie hier bitte den Namen f³r die neue Farbe ein: */ Text [ en-US ] = "Please enter a name for the new color:" ; }; String RID_SVXSTR_ASK_DEL_COLOR { - /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelöscht werden? : Soll die Farbe wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelöscht werden? : Soll die Farbe wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the color?" ; }; String RID_SVXSTR_ASK_CHANGE_COLOR { - /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde geändert und nicht gesichert. \nSie können die selektierte Farbe ändern \noder eine neue Farbe hinzufügen. : Die Farbe wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Farbe õndern \noder eine neue Farbe hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde geändert und nicht gesichert. \nSie können die selektierte Farbe ändern \noder eine neue Farbe hinzufügen. : Die Farbe wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Farbe õndern \noder eine neue Farbe hinzuf³gen. */ Text [ en-US ] = "The color was modified without saving.\nModify the selected color or add a new color." ; }; String RID_SVXSTR_TABLE @@ -149,8 +113,6 @@ String RID_SVXSTR_READ_DATA_ERROR }; String RID_SVXSTR_WARN_TABLE_OVERWRITE { - /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde geändert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde geõndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde geändert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde geõndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */ Text [ en-US ] = "The list was modified without saving. Would you like to save the list now?" ; }; String RID_SVXSTR_WARN_NAME_DUPLICATE @@ -159,20 +121,14 @@ String RID_SVXSTR_WARN_NAME_DUPLICATE }; String RID_SVXSTR_DESC_LINEEND { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für das neue Linienende ein: : Geben Sie hier bitte den Namen f³r das neue Linienende ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für das neue Linienende ein: : Geben Sie hier bitte den Namen f³r das neue Linienende ein: */ Text [ en-US ] = "Please enter a name for the new arrowhead:" ; }; String RID_SVXSTR_ASK_DEL_LINEEND { - /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelöscht werden? : Soll das Linienende wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelöscht werden? : Soll das Linienende wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the arrowhead?" ; }; String RID_SVXSTR_ASK_CHANGE_LINEEND { - /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde geändert und nicht gesichert. \nMöchten Sie das Linienende jetzt sichern? : Das Linienende wurde geõndert und nicht gesichert. \nM÷chten Sie das Linienende jetzt sichern? */ - /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde geändert und nicht gesichert. \nMöchten Sie das Linienende jetzt sichern? : Das Linienende wurde geõndert und nicht gesichert. \nM÷chten Sie das Linienende jetzt sichern? */ Text [ en-US ] = "The arrowhead was modified without saving.\nWould you like to save the arrowhead now?" ; }; diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 41df6a759ec8..7a53da94b26c 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -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> @@ -95,11 +92,11 @@ struct StringIdPair_Impl #define LB_REL_CHAR 0x00020000L // as char, relative to character #define LB_REL_ROW 0x00040000L // as char, relative to line -// OD 10.11.2003 #i22305# +// #i22305# #define LB_FLY_VERT_FRAME 0x00100000L // vertical entire frame #define LB_FLY_VERT_PRTAREA 0x00200000L // vertical frame text area -// OD 11.11.2003 #i22341# +// #i22341# #define LB_VERT_LINE 0x00400000L // vertical text line static RelationMap aRelationMap[] = @@ -122,11 +119,11 @@ static RelationMap aRelationMap[] = {SwFPos::REL_BORDER, SwFPos::REL_BORDER, LB_VERT_FRAME, RelOrientation::FRAME}, {SwFPos::REL_PRTAREA, SwFPos::REL_PRTAREA, LB_VERT_PRTAREA, RelOrientation::PRINT_AREA}, - // OD 10.11.2003 #i22305# + // #i22305# {SwFPos::FLY_REL_PG_FRAME, SwFPos::FLY_REL_PG_FRAME, LB_FLY_VERT_FRAME, RelOrientation::FRAME}, {SwFPos::FLY_REL_PG_PRTAREA, SwFPos::FLY_REL_PG_PRTAREA, LB_FLY_VERT_PRTAREA, RelOrientation::PRINT_AREA}, - // OD 11.11.2003 #i22341# + // #i22341# {SwFPos::REL_LINE, SwFPos::REL_LINE, LB_VERT_LINE, RelOrientation::TEXT_LINE} }; @@ -193,8 +190,8 @@ static FrmMap aHFlyHtmlMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, LB_FLY_REL_PG_FRAME} }; -// OD 19.09.2003 #i18732# - own vertical alignment map for to frame anchored objects -// OD 10.11.2003 #i22305# +// #i18732# - own vertical alignment map for to frame anchored objects +// #i22305# #define VERT_FRAME_REL (LB_VERT_FRAME|LB_FLY_VERT_PRTAREA) static FrmMap aVFrameMap[] = @@ -298,14 +295,14 @@ static FrmMap aHCharHtmlAbsMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, LB_REL_PG_FRAME} }; -// OD 19.09.2003 #i18732# - allow vertical alignment at page areas -// OD 12.11.2003 #i22341# - handle <LB_REL_CHAR> on its own +// #i18732# - allow vertical alignment at page areas +// #i22341# - handle <LB_REL_CHAR> on its own #define VERT_CHAR_REL (LB_VERT_FRAME|LB_VERT_PRTAREA| \ LB_REL_PG_FRAME|LB_REL_PG_PRTAREA) static FrmMap aVCharMap[] = { - // OD 11.11.2003 #i22341# + // #i22341# // introduce mappings for new vertical alignment at top of line <LB_VERT_LINE> // and correct mapping for vertical alignment at character for position <FROM_BOTTOM> // Note: Because of these adjustments the map becomes ambigous in its values @@ -477,7 +474,7 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL( } return eStringId; } -// OD 12.11.2003 #i22341# - helper method in order to determine all possible +// #i22341# - helper method in order to determine all possible // listbox relations in a relation map for a given relation ULONG lcl_GetLBRelationsForRelations( const USHORT _nRel ) { @@ -494,7 +491,7 @@ ULONG lcl_GetLBRelationsForRelations( const USHORT _nRel ) return nLBRelations; } -// OD 14.11.2003 #i22341# - helper method on order to determine all possible +// #i22341# - helper method on order to determine all possible // listbox relations in a relation map for a given string ID ULONG lcl_GetLBRelationsForStrID( const FrmMap* _pMap, const SvxSwFramePosString::StringId _eStrId, @@ -913,15 +910,15 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) } m_aHoriMirrorCB.Show(FALSE); m_aKeepRatioCB.Enable(FALSE); - // OD 19.09.2003 #i18732# - hide checkbox in HTML mode + // #i18732# - hide checkbox in HTML mode m_aFollowCB.Show(FALSE); } else { - // OD 06.11.2003 #i18732# correct enable/disable of check box 'Mirror on..' + // #i18732# correct enable/disable of check box 'Mirror on..' m_aHoriMirrorCB.Enable(!m_aAsCharRB.IsChecked() && !m_bIsMultiSelection); - // OD 06.11.2003 #i18732# - enable/disable check box 'Follow text flow'. + // #i18732# - enable/disable check box 'Follow text flow'. m_aFollowCB.Enable( m_aToParaRB.IsChecked() || m_aToCharRB.IsChecked() ); } @@ -979,7 +976,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) m_aVertByMF.SaveValue(); m_aHoriByMF.SaveValue(); - // OD 19.09.2003 #i18732# + // #i18732# m_aFollowCB.SaveValue(); RangeModifyHdl(&m_aWidthMF); // initially set maximum values @@ -1053,7 +1050,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, RangeModifyHdl, Edit *, EMPTYARG ) aVal.bAutoHeight = false; aVal.bAutoWidth = false; aVal.bMirror = m_aHoriMirrorCB.IsChecked(); - // OD 18.09.2003 #i18732# + // #i18732# aVal.bFollowTextFlow = m_aFollowCB.IsChecked(); if ( m_pHMap ) @@ -1131,7 +1128,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, AnchorTypeHdl, RadioButton *, EMPTYARG ) { m_aHoriMirrorCB.Enable(!m_aAsCharRB.IsChecked() && !m_bIsMultiSelection); - // OD 06.11.2003 #i18732# - enable check box 'Follow text flow' for anchor + // #i18732# - enable check box 'Follow text flow' for anchor // type to-paragraph' and to-character m_aFollowCB.Enable( m_aToParaRB.IsChecked() || m_aToCharRB.IsChecked() ); @@ -1167,32 +1164,6 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB ) else m_bAtVertPosModified = TRUE; - // OD 12.11.2003 #i22341# - following special handling no longer needed - /* - if (!bHori && m_pVMap == aVCharMap) - { - // Ausrichtung Vertikal - String sEntry; - USHORT nMapPos = GetMapPos(m_pVMap, m_aVertLB); - USHORT nAlign = GetAlignment(m_pVMap, nMapPos, m_aVertLB, m_aVertToLB); - USHORT nRel = GetRelation(m_pVMap, m_aVertToLB); - - if (nRel == SwFPos::REL_CHAR) - sEntry = m_aFramePosString.GetString(SwFPos::FROMBOTTOM); - else - sEntry = m_aFramePosString.GetString(SwFPos::FROMTOP); - - USHORT nOldPos = m_aVertLB.GetSelectEntryPos(); - - String sName = m_aVertLB.GetEntry(m_aVertLB.GetEntryCount() - 1); - if (sName != sEntry) - { - m_aVertLB.RemoveEntry(m_aVertLB.GetEntryCount() - 1); - m_aVertLB.InsertEntry(sEntry); - m_aVertLB.SelectEntryPos(nOldPos); - } - } - */ if(m_bHtmlMode && TextContentAnchorType_AT_CHARACTER == GetAnchorType()) // wieder Sonderbehandlung { if(bHori) @@ -1366,7 +1337,7 @@ short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, USHORT nMapPos, ListBox &/ { short nAlign = 0; - // OD 14.11.2003 #i22341# - special handling also for map <aVCharMap>, + // #i22341# - special handling also for map <aVCharMap>, // because it contains ambigous items for alignment if (pMap == aVAsCharHtmlMap || pMap == aVAsCharMap || pMap == aVCharMap ) @@ -1469,7 +1440,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, } else if ( nAnchor == TextContentAnchorType_AT_FRAME ) { - // OD 19.09.2003 #i18732# - own vertical alignment map for to frame + // #i18732# - own vertical alignment map for to frame // anchored objects. m_pVMap = m_bHtmlMode ? aVFlyHtmlMap : aVFrameMap; m_pHMap = m_bHtmlMode ? aHFlyHtmlMap : aHFrameMap; @@ -1516,7 +1487,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, nH = m_nOldH; nHRel = m_nOldHRel; } - // OD 12.11.2003 #i22341# - pass <nHRel> as 3rd parameter to method <FillPosLB> + // #i22341# - pass <nHRel> as 3rd parameter to method <FillPosLB> USHORT nMapPos = FillPosLB(m_pHMap, nH, nHRel, m_aHoriLB); FillRelLB(m_pHMap, nMapPos, nH, nHRel, m_aHoriToLB, m_aHoriToFT); @@ -1526,7 +1497,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, nV = m_nOldV; nVRel = m_nOldVRel; } - // OD 12.11.2003 #i22341# - pass <nVRel> as 3rd parameter to method <FillPosLB> + // #i22341# - pass <nVRel> as 3rd parameter to method <FillPosLB> nMapPos = FillPosLB(m_pVMap, nV, nVRel, m_aVertLB); FillRelLB(m_pVMap, nMapPos, nV, nVRel, m_aVertToLB, m_aVertToFT); @@ -1675,7 +1646,7 @@ ULONG SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, USHORT nMapPos, USHORT nAlign { USHORT nRelCount = SAL_N_ELEMENTS(aRelationMap); - // OD 14.11.2003 #i22341# - special handling for map <aVCharMap>, + // #i22341# - special handling for map <aVCharMap>, // because its ambigous in its <eStrId>/<eMirrorStrId>. if ( pMap == aVCharMap ) { @@ -1768,7 +1739,7 @@ USHORT SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap, _rLB.Clear(); - // OD 12.11.2003 #i22341# - determine all possible listbox relations for + // #i22341# - determine all possible listbox relations for // given relation for map <aVCharMap> const ULONG nLBRelations = (_pMap != aVCharMap) ? 0L @@ -1789,7 +1760,7 @@ USHORT SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap, // bei zeichengebundenen Rahmen keine doppelten Eintraege einfuegen _rLB.InsertEntry(sEntry); } - // OD 12.11.2003 #i22341# - add condition to handle map <aVCharMap> + // #i22341# - add condition to handle map <aVCharMap> // that is ambigous in the alignment. if ( _pMap[i].nAlign == _nAlign && ( !(_pMap == aVCharMap) || _pMap[i].nLBRelations & nLBRelations ) ) @@ -1816,7 +1787,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) m_pSdrView = pSdrView; if(!m_pSdrView) { - DBG_ERROR("No SdrView* set"); + OSL_FAIL("No SdrView* set"); return; } @@ -1876,7 +1847,10 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) } // this should happen via SID_ATTR_TRANSFORM_AUTOSIZE - if( rMarkList.GetMarkCount() == 1 ) + if( rMarkList.GetMarkCount() != 1 ) + m_bIsMultiSelection = true; +#if OSL_DEBUG_LEVEL > 1 + else { const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier(); @@ -1884,35 +1858,10 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) ( eKind==OBJ_TEXT || eKind==OBJ_TITLETEXT || eKind==OBJ_OUTLINETEXT) && ( (SdrTextObj*) pObj )->HasText() ) { - DBG_ERROR("AutoWidth/AutoHeight should be enabled"); + OSL_FAIL("AutoWidth/AutoHeight should be enabled"); } } - else - m_bIsMultiSelection = true; - - // use page offset and recalculate - Point aPt( m_pSdrView->GetSdrPageView()->GetPageOrigin() ); - - // Massstab - Fraction aUIScale = m_pSdrView->GetModel()->GetUIScale(); - -// lcl_ScaleRect( m_aWorkArea, aUIScale ); -// lcl_ScaleRect( m_aRect, aUIScale ); -// lcl_ScalePoint( aPt, aUIScale ); - - // Metrik konvertieren -// int nDigits = maMtrPosX.GetDecimalDigits(); - -// aPt = lcl_ConvertPoint( aPt, nDigits, (MapUnit) mePoolUnit, meDlgUnit ); -// m_aWorkArea = lcl_ConvertRect( m_aWorkArea, nDigits, (MapUnit) mePoolUnit, meDlgUnit ); -// m_aRect = lcl_ConvertRect( m_aRect, nDigits, (MapUnit) mePoolUnit, meDlgUnit ); - - // use page offset -// aPt *= -1; -// aPt += m_aWorkArea.TopLeft(); -// m_aWorkArea.SetPos( aPt ); - - //SetMinMaxPosition(); +#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 49fd6bcf393e..36b1f3a38de2 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -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 42e4a867b181..d418bff74a19 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -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> @@ -121,13 +118,11 @@ SvxLineTabDialog::SvxLineTabDialog AddTabPage( RID_SVXPAGE_LINE_DEF, SvxLineDefTabPage::Create, 0); AddTabPage( RID_SVXPAGE_LINEEND_DEF, SvxLineEndDefTabPage::Create, 0); -// AddTabPage( RID_SVXPAGE_COLOR, SvxColorTabPage::Create, 0 ); SetCurPageId( RID_SVXPAGE_LINE ); CancelButton& rBtnCancel = GetCancelButton(); rBtnCancel.SetClickHdl( LINK( this, SvxLineTabDialog, CancelHdlImpl ) ); -//! rBtnCancel.SetText( CUI_RESSTR( RID_SVXSTR_CLOSE ) ); } // ----------------------------------------------------------------------- @@ -235,8 +230,8 @@ void SvxLineTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) ( (SvxLineTabPage&) rPage ).SetColorTable( pColorTab ); ( (SvxLineTabPage&) rPage ).SetDashList( pDashList ); ( (SvxLineTabPage&) rPage ).SetLineEndList( pLineEndList ); - ( (SvxLineTabPage&) rPage ).SetDlgType( nDlgType );//CHINA001 ( (SvxLineTabPage&) rPage ).SetDlgType( &nDlgType ); - ( (SvxLineTabPage&) rPage ).SetPageType( nPageType );//CHINA001 ( (SvxLineTabPage&) rPage ).SetPageType( &nPageType ); + ( (SvxLineTabPage&) rPage ).SetDlgType( nDlgType ); + ( (SvxLineTabPage&) rPage ).SetPageType( nPageType ); ( (SvxLineTabPage&) rPage ).SetPosDashLb( &nPosDashLb ); ( (SvxLineTabPage&) rPage ).SetPosLineEndLb( &nPosLineEndLb ); ( (SvxLineTabPage&) rPage ).SetDashChgd( &nDashListState ); @@ -279,18 +274,6 @@ void SvxLineTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) ( (SvxShadowTabPage&) rPage ).Construct(); } break; -/* - case RID_SVXPAGE_COLOR: - ( (SvxColorTabPage&) rPage ).SetColorTable( pColorTab ); - ( (SvxColorTabPage&) rPage ).SetPageType( &nPageType ); - ( (SvxColorTabPage&) rPage ).SetDlgType( &nDlgType ); - ( (SvxColorTabPage&) rPage ).SetPos( &mnPos ); - ( (SvxColorTabPage&) rPage ).SetAreaTP( &mbAreaTP ); - ( (SvxColorTabPage&) rPage ).SetColorChgd( &mnColorTableState ); - ( (SvxColorTabPage&) rPage ).SetDeleteColorTable( mbDeleteColorTable ); - ( (SvxColorTabPage&) rPage ).Construct(); - break; -*/ } } diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 1dfabdf356b4..55b6acd21258 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -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 b44b9a86237f..c7c38975a6d2 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.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/textattr.cxx b/cui/source/tabpages/textattr.cxx index 67c97784e417..8a4a59fa238f 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> @@ -421,7 +418,7 @@ BOOL SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) switch( eState ) { default: ; //prevent warning - DBG_ERROR( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" ); + OSL_FAIL( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" ); case STATE_NOCHECK: eFTS = SDRTEXTFIT_NONE; break; case STATE_CHECK: eFTS = SDRTEXTFIT_AUTOFIT; break; } @@ -755,7 +752,6 @@ bool SvxTextAttrPage::IsTextDirectionLeftToRight (void) const return bLeftToRightDirection; } -//add CHINA001 begin void SvxTextAttrPage::PageCreated(SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pViewItem,OfaPtrItem,SID_SVXTEXTATTRPAGE_VIEW,sal_False); @@ -766,6 +762,4 @@ void SvxTextAttrPage::PageCreated(SfxAllItemSet aSet) Construct(); } -//end of CHINA001 - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index c101406b643c..8493665bc01d 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.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 <sfx2/app.hxx> @@ -37,7 +34,7 @@ #define _SVX_TPAREA_CXX -#if defined (UNX) || defined (WTC) || defined (ICC) || defined(WNT) +#if defined (UNX) || defined (ICC) || defined(WNT) #include <stdlib.h> #endif @@ -1248,7 +1245,7 @@ BOOL SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { // Prozentwerte werden negativ gesetzt, damit // diese nicht skaliert werden; dieses wird - // im Item beruecksichtigt ( KA05.11.96 ) + // im Item beruecksichtigt pItem = new XFillBmpSizeXItem( -labs( static_cast<long>(aMtrFldXSize.GetValue()) ) ); } } @@ -1285,7 +1282,7 @@ BOOL SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { // Prozentwerte werden negativ gesetzt, damit // diese vom MetricItem nicht skaliert werden; - // dieses wird im Item beruecksichtigt ( KA05.11.96 ) + // dieses wird im Item beruecksichtigt pItem = new XFillBmpSizeYItem( -labs( static_cast<long>(aMtrFldYSize.GetValue()) ) ); } } diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 3216a8cff824..e7b5cf60275d 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 @@ -125,7 +122,6 @@ SvxBitmapTabPage::SvxBitmapTabPage // Setzen des Output-Devices rXFSet.Put( aXFStyleItem ); rXFSet.Put( aXBitmapItem ); - //aCtlPreview.SetAttributes( aXFillAttr ); aBtnAdd.SetClickHdl( LINK( this, SvxBitmapTabPage, ClickAddHdl_Impl ) ); aBtnImport.SetClickHdl( @@ -357,14 +353,6 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG ) } if( pXOBitmap ) { - //WorkWindow aTmpWW( DLGWIN ); - //VirtualDevice aVD( aTmpWW ); - //USHORT nLines = aCtlPixel.GetLineCount(); - //Color aPixelColor, aBackColor; - //BOOL bPixelColor = FALSE; - //USHORT nWidth = pBitmap->GetSizePixel().Width(); - //USHORT nHeight = pBitmap->GetSizePixel().Height(); - // #85339# try to convert bitmapped item to array item. if(pXOBitmap->GetBitmapType() == XBITMAP_IMPORT) { @@ -576,9 +564,7 @@ long SvxBitmapTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); break; - // return( TRUE ); // Abbruch } delete aMessDlg; } @@ -647,7 +633,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -778,7 +763,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -798,7 +782,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); - //aLbBitmaps.Invalidate(); } #endif diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 039cd18a16cd..124417157409 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> @@ -456,10 +453,8 @@ IMPL_LINK( SvxColorTabPage, ModifiedHdl_Impl, void *, EMPTYARG ) IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) { Window *pWindow = this; - bool bEnabled; while( pWindow ) { - bEnabled = pWindow->IsEnabled(); pWindow = pWindow->GetParent(); } @@ -1164,17 +1159,9 @@ void SvxColorTabPage::FillValueSet_Impl( ValueSet& rVs ) void SvxColorTabPage::RgbToCmyk_Impl( Color& rColor, USHORT& rK ) { - USHORT nColor1, nColor2, nColor3; - USHORT nProzent; // nur temporaer !!! - - nColor1 = 255 - rColor.GetRed(); - nProzent = ColorToPercent_Impl( nColor1 ); - - nColor2 = 255 - rColor.GetGreen(); - nProzent = ColorToPercent_Impl( nColor2 ); - - nColor3 = 255 - rColor.GetBlue(); - nProzent = ColorToPercent_Impl( nColor3 ); + USHORT const nColor1 = 255 - rColor.GetRed(); + USHORT const nColor2 = 255 - rColor.GetGreen(); + USHORT const nColor3 = 255 - rColor.GetBlue(); rK = Min( Min( nColor1, nColor2 ), nColor3 ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 492802a80a17..e7b68c9f2f95 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> @@ -115,9 +112,7 @@ SvxGradientTabPage::SvxGradientTabPage // Solange NICHT vom Item unterstuetzt - //aMtrColorTo.Disable(); aMtrColorTo.SetValue( 100 ); - //aMtrColorFrom.Disable(); aMtrColorFrom.SetValue( 100 ); // Setzen des Output-Devices @@ -312,9 +307,7 @@ long SvxGradientTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); <-- wuerde die Seite nicht verlassen break; - // return( TRUE ); // Abbruch } delete aMessDlg; } @@ -484,7 +477,6 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -513,7 +505,6 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); - //aLbGradients.Invalidate(); } #endif @@ -719,7 +710,6 @@ IMPL_LINK( SvxGradientTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) else { LeaveWait(); - //aIStream.Close(); ErrorBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) ).Execute(); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 771ad92430e5..7896c0aa128c 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> @@ -285,9 +282,7 @@ long SvxHatchTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); <-- wuerde die Seite nicht verlassen break; - // return( TRUE ); // Abbruch } delete aMessDlg; } @@ -338,7 +333,6 @@ BOOL SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) void SvxHatchTabPage::Reset( const SfxItemSet& rSet ) { - // aLbHatchings.SelectEntryPos( 0 ); ChangeHatchHdl_Impl( this ); // Status der Buttons ermitteln @@ -461,19 +455,6 @@ IMPL_LINK( SvxHatchTabPage, ChangeHatchHdl_Impl, void *, EMPTYARG ) default: aCtlAngle.SetActualRP( RP_MM ); break; } - // Backgroundcolor - /* - const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBACKGROUND ), TRUE, &pPoolItem ) ) - { - rXFSet.Put ( XFillBackgroundItem( ( ( XFillBackgroundItem* )pPoolItem)->GetValue() ) ); - if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), TRUE, &pPoolItem ) ) - { - Color aColor( ( ( const XFillColorItem* ) pPoolItem )->GetValue() ); - rXFSet.Put( XFillColorItem( String(), aColor ) ); - } - } - */ // ItemSet fuellen und an aCtlPreview weiterleiten rXFSet.Put( XFillHatchItem( String(), *pHatch ) ); aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() ); @@ -548,7 +529,6 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -572,7 +552,6 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); - //aLbHatchings.Invalidate(); } #endif diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 48c4dc41e271..cfa9731a63c9 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -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 diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index f4057e3ae1b8..4dd53f46a7ed 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 9b5573416dd1..b770136bbf7c 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 bf615350c5c8..54a4aa473587 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.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 <sfx2/app.hxx> diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 2c6b73bc2985..acd806a1790a 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> @@ -558,7 +555,6 @@ void SvxSlantTabPage::Construct() BOOL SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) { BOOL bModified = FALSE; - INT32 nValue = 0L; String aStr = aMtrRadius.GetText(); if( aStr != aMtrRadius.GetSavedValue() ) @@ -575,7 +571,7 @@ BOOL SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) if( aStr != aMtrAngle.GetSavedValue() ) { - nValue = static_cast<INT32>(aMtrAngle.GetValue()); + INT32 nValue = static_cast<INT32>(aMtrAngle.GetValue()); rAttrs.Put( SfxInt32Item( SID_ATTR_TRANSFORM_SHEAR, nValue ) ); bModified = TRUE; } |