diff options
author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-19 16:36:58 +0100 |
---|---|---|
committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-19 16:36:58 +0100 |
commit | da26d9e98c9ae665edc38123a733e607d9f30d70 (patch) | |
tree | edd01b9faf7f336f7d0a8524e0db1033b8d38ffb | |
parent | 9566cd38c65e04b7376089631210e1953254370b (diff) | |
parent | b6ff0013e4e3ddef8c08fcba0896d41e6bba1b5e (diff) |
gnumake3: mergeing changes from DEV300_m97, fixing jars for svl complex test, deliver globlmn.hrc for now, adding component registration for svx libraries, still misses gengal and friends when packing
27 files changed, 178 insertions, 1103 deletions
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index d414d1e72309..0eae96d02328 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -244,7 +244,7 @@ protected: const String& rText, USHORT MaxWidth); - virtual USHORT Print(SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog = 0); + virtual USHORT Print(SfxProgress &rProgress, BOOL bIsAPI); virtual SfxPrinter *GetPrinter(BOOL bCreate = FALSE); virtual USHORT SetPrinter(SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false); diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 243e16fb6504..53399212da97 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -78,7 +78,7 @@ #include <editeng/unolingu.hxx> #include <ucbhelper/content.hxx> #include <vcl/mapmod.hxx> -#include <vcl/mapunit.hxx> +#include <tools/mapunit.hxx> #include <vcl/msgbox.hxx> #include <sfx2/sfx.hrc> #include <document.hxx> diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx deleted file mode 100644 index bcb768fe600b..000000000000 --- a/starmath/source/math_pch.cxx +++ /dev/null @@ -1,833 +0,0 @@ -/************************************************************************* - * - * 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): autogen include statement, do not remove -#include "precompiled_starmath.hxx" - -#define SMDLL 1 - -#include "starmath.hrc" - -#define ITEMID_FONT 1 -#define ITEMID_FONTHEIGHT 2 -#define ITEMID_LRSPACE 3 -#define ITEMID_WEIGHT 4 - -//--------- ab hier die "generierten" -#include <tools/string.hxx> -#include <tools/solar.h> -#include <tools/list.hxx> -#include <tools/contnr.hxx> -#include <tools/rtti.hxx> -#include <tools/ref.hxx> -#include <tools/link.hxx> -#include <svl/brdcst.hxx> -#include <svl/svarray.hxx> -#include <tools/debug.hxx> -#include <svl/hint.hxx> -#include <svl/smplhint.hxx> -#include <sot/sotref.hxx> -#include <tools/globname.hxx> -#include <sot/factory.hxx> -#include <vcl/sv.h> -#include <basic/sbxdef.hxx> -#include <tools/time.hxx> -#include <tools/gen.hxx> -#include <tools/stream.hxx> -#include <tools/errinf.hxx> -#include <tools/errcode.hxx> -#include <sot/object.hxx> -#include <sot/sotdata.hxx> -#include <sfx2/shell.hxx> -#include <sal/types.h> -#include <sal/config.h> -#include <tools/date.hxx> -#include <tools/ownlist.hxx> -#include <vcl/accel.hxx> -#include <tools/resid.hxx> -#include <tools/rc.hxx> -#include <tools/rc.hxx> -#include <i18npool/lang.h> -#include <tools/resmgr.hxx> -#include <vcl/keycod.hxx> -#include <vcl/keycodes.hxx> -#include <vcl/vclenum.hxx> -#include <vcl/timer.hxx> -#include <vcl/cmdevt.hxx> -#include <vcl/font.hxx> -#include <tools/color.hxx> -#include <vcl/outdev.hxx> -#include <vcl/region.hxx> -#include <vcl/mapmod.hxx> -#include <tools/fract.hxx> -#include <vcl/wall.hxx> -#include <vcl/settings.hxx> -#include <vcl/bitmap.hxx> -#include <vcl/pointr.hxx> -#include <vcl/ptrstyle.hxx> -#include <vcl/wintypes.hxx> -#include <vcl/inputctx.hxx> -#include <vcl/event.hxx> -#include <format.hxx> -#include <utility.hxx> -#include <vcl/fixed.hxx> -#include <vcl/image.hxx> -#include <vcl/ctrl.hxx> -#include <vcl/window.hxx> -#include <sfx2/minarray.hxx> -#include <vcl/combobox.hxx> -#include <vcl/combobox.h> -#include <vcl/edit.hxx> -#include <vcl/menu.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/lstbox.h> -#include <usr/guid.hxx> -#include <usr/sequ.hxx> -#include <uno/types.h> -#include <uno/macros.h> -#include <vos/xception.hxx> -#include <osl/mutex.h> -#include <tools/shl.hxx> -#include <sfx2/module.hxx> -#include <sfx2/imgdef.hxx> -#include <usr/uno.hxx> -#include <usr/xiface.hxx> -#include <usr/ustring.hxx> -#include <vos/refernce.hxx> -#include <vos/types.hxx> -#include <osl/types.h> -#include <osl/interlck.h> -#include <vos/object.hxx> -#include <vos/macros.hxx> -#include <smdll.hxx> -#include <sfx2/sfxsids.hrc> -#include <chaos/cntids.hrc> -#include <svl/cntwids.hrc> -#include <svl/solar.hrc> -#include <svl/lstner.hxx> -#include <starmath.hrc> -#include <basic/sbx.hxx> -#include <basic/sbxform.hxx> -#include <basic/sbxobj.hxx> -#include <basic/sbxvar.hxx> -#include <basic/sbxcore.hxx> -#include <basic/sbxprop.hxx> -#include <basic/sbxmeth.hxx> -#include <tools/unqid.hxx> -#include <tools/unqidx.hxx> -#include <svl/poolitem.hxx> -#include <svtools/args.hxx> -#include <smmod.hxx> -#include <vos/thread.hxx> -#include <osl/thread.h> -#include <vos/runnable.hxx> -#include <vcl/apptypes.hxx> -#include <tools/dynary.hxx> -#include <vcl/metric.hxx> -#include <vcl/svapp.hxx> -#include <vcl/timer.hxx> -#include <sfx2/app.hxx> -#include <sfx2/sfx.hrc> -#include <svl/memberid.hrc> -#include <vcl/syswin.hxx> -#include <vcl/virdev.hxx> -#include <tools/datetime.hxx> -#include <tools/wldcrd.hxx> -#include <parse.hxx> -#include <tools/stack.hxx> -#include <types.hxx> -#include <config.hxx> -#include <svtools/confitem.hxx> -#include <tools/poly.hxx> -#include <svx/xpoly.hxx> -#include <rect.hxx> -#include <vcl/outdev.hxx> -#ifndef _SMART_COM_SUN_STAR_FRAME_XDISPATCHPROVIDERINTERCEPTOR_HXX_ -#include <smart/com/sun/star/frame/XDispatchProviderInterceptor.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_XDISPATCH_HXX_ -#include <smart/com/sun/star/frame/XDispatch.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HXX_ -#include <smart/com/sun/star/frame/XDispatchProvider.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_XSTATUSLISTENER_HXX_ -#include <smart/com/sun/star/frame/XStatusListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_FRAMESEARCHFLAG_HXX_ -#include <smart/com/sun/star/frame/FrameSearchFlag.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_XDISPATCHPROVIDERINTERCEPTION_HXX_ -#include <smart/com/sun/star/frame/XDispatchProviderInterception.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_FEATURESTATEEVENT_HXX_ -#include <smart/com/sun/star/frame/FeatureStateEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_DISPATCHDESCRIPTOR_HXX_ -#include <smart/com/sun/star/frame/DispatchDescriptor.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_XFRAMEACTIONLISTENER_HXX_ -#include <smart/com/sun/star/frame/XFrameActionListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HXX_ -#include <smart/com/sun/star/frame/XComponentLoader.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_XFRAME_HXX_ -#include <smart/com/sun/star/frame/XFrame.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_FRAMEACTIONEVENT_HXX_ -#include <smart/com/sun/star/frame/FrameActionEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_FRAMEACTION_HXX_ -#include <smart/com/sun/star/frame/FrameAction.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_UTIL_XURLTRANSFORMER_HXX_ -#include <smart/com/sun/star/util/XURLTransformer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_TASK_XSTATUSINDICATORFACTORY_HXX_ -#include <smart/com/sun/star/task/XStatusIndicatorFactory.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_TASK_XSTATUSINDICATORSUPPLIER_HXX_ -#include <smart/com/sun/star/task/XStatusIndicatorSupplier.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_TASK_XSTATUSINDICATOR_HXX_ -#include <smart/com/sun/star/task/XStatusIndicator.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_FRAME_XBROWSEHISTORYREGISTRY_HXX_ -#include <smart/com/sun/star/frame/XBrowseHistoryRegistry.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_IO_BUFFERSIZEEXCEEDEDEXCEPTION_HXX_ -#include <smart/com/sun/star/io/BufferSizeExceededException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_IO_NOTCONNECTEDEXCEPTION_HXX_ -#include <smart/com/sun/star/io/NotConnectedException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_IO_IOEXCEPTION_HXX_ -#include <smart/com/sun/star/io/IOException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_IO_UNEXPECTEDEOFEXCEPTION_HXX_ -#include <smart/com/sun/star/io/UnexpectedEOFException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_IO_WRONGFORMATEXCEPTION_HXX_ -#include <smart/com/sun/star/io/WrongFormatException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_SERVICENOTREGISTEREDEXCEPTION_HXX_ -#include <smart/com/sun/star/lang/ServiceNotRegisteredException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_NULLPOINTEREXCEPTION_HXX_ -#include <smart/com/sun/star/lang/NullPointerException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_CLASSNOTFOUNDEXCEPTION_HXX_ -#include <smart/com/sun/star/lang/ClassNotFoundException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_NOSUCHMETHODEXCEPTION_HXX_ -#include <smart/com/sun/star/lang/NoSuchMethodException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_SECURITYEXCEPTION_HXX_ -#include <smart/com/sun/star/lang/SecurityException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_NOSUCHFIELDEXCEPTION_HXX_ -#include <smart/com/sun/star/lang/NoSuchFieldException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HXX_ -#include <smart/com/sun/star/lang/DisposedException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_ARRAYINDEXOUTOFBOUNDSEXCEPTION_HXX_ -#include <smart/com/sun/star/lang/ArrayIndexOutOfBoundsException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_ILLEGALACCESSEXCEPTION_HXX_ -#include <smart/com/sun/star/lang/IllegalAccessException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_INDEXOUTOFBOUNDSEXCEPTION_HXX_ -#include <smart/com/sun/star/lang/IndexOutOfBoundsException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HXX_ -#include <smart/com/sun/star/lang/IllegalArgumentException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_NOSUPPORTEXCEPTION_HXX_ -#include <smart/com/sun/star/lang/NoSupportException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_WRAPPEDTARGETEXCEPTION_HXX_ -#include <smart/com/sun/star/lang/WrappedTargetException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_PARAMINFO_HXX_ -#include <smart/com/sun/star/reflection/ParamInfo.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLARRAY_HXX_ -#include <smart/com/sun/star/reflection/XIdlArray.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLCLASSPROVIDER_HXX_ -#include <smart/com/sun/star/reflection/XIdlClassProvider.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_FIELDACCESSMODE_HXX_ -#include <smart/com/sun/star/reflection/FieldAccessMode.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLCLASS_HXX_ -#include <smart/com/sun/star/reflection/XIdlClass.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLFIELD_HXX_ -#include <smart/com/sun/star/reflection/XIdlField.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_PARAMMODE_HXX_ -#include <smart/com/sun/star/reflection/ParamMode.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_METHODMODE_HXX_ -#include <smart/com/sun/star/reflection/MethodMode.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLMEMBER_HXX_ -#include <smart/com/sun/star/reflection/XIdlMember.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLREFLECTION_HXX_ -#include <smart/com/sun/star/reflection/XIdlReflection.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLMETHOD_HXX_ -#include <smart/com/sun/star/reflection/XIdlMethod.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_REFLECTION_INVOCATIONTARGETEXCEPTION_HXX_ -#include <smart/com/sun/star/reflection/InvocationTargetException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYVALUES_HXX_ -#include <smart/com/sun/star/beans/PropertyValues.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYSET_HXX_ -#include <smart/com/sun/star/beans/XPropertySet.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_ -#include <smart/com/sun/star/beans/PropertyValue.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYSTATE_HXX_ -#include <smart/com/sun/star/beans/PropertyState.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYSETINFO_HXX_ -#include <smart/com/sun/star/beans/XPropertySetInfo.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XMULTIPROPERTYSET_HXX_ -#include <smart/com/sun/star/beans/XMultiPropertySet.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XFASTPROPERTYSET_HXX_ -#include <smart/com/sun/star/beans/XFastPropertySet.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XVETOABLECHANGELISTENER_HXX_ -#include <smart/com/sun/star/beans/XVetoableChangeListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYSTATE_HXX_ -#include <smart/com/sun/star/beans/XPropertyState.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYSTATECHANGELISTENER_HXX_ -#include <smart/com/sun/star/beans/XPropertyStateChangeListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HXX_ -#include <smart/com/sun/star/beans/PropertyAttribute.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTIESCHANGELISTENER_HXX_ -#include <smart/com/sun/star/beans/XPropertiesChangeListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HXX_ -#include <smart/com/sun/star/beans/XPropertyChangeListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYACCESS_HXX_ -#include <smart/com/sun/star/beans/XPropertyAccess.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYCONTAINER_HXX_ -#include <smart/com/sun/star/beans/XPropertyContainer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYSTATECHANGEEVENT_HXX_ -#include <smart/com/sun/star/beans/PropertyStateChangeEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYCHANGEEVENT_HXX_ -#include <smart/com/sun/star/beans/PropertyChangeEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_UNKNOWNPROPERTYEXCEPTION_HXX_ -#include <smart/com/sun/star/beans/UnknownPropertyException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_INTROSPECTIONEXCEPTION_HXX_ -#include <smart/com/sun/star/beans/IntrospectionException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYEXISTEXCEPTION_HXX_ -#include <smart/com/sun/star/beans/PropertyExistException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_ILLEGALTYPEEXCEPTION_HXX_ -#include <smart/com/sun/star/beans/IllegalTypeException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYVETOEXCEPTION_HXX_ -#include <smart/com/sun/star/beans/PropertyVetoException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HXX_ -#include <smart/com/sun/star/container/XEnumerationAccess.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMEACCESS_HXX_ -#include <smart/com/sun/star/container/XHierarchicalNameAccess.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XNAMEACCESS_HXX_ -#include <smart/com/sun/star/container/XNameAccess.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XCONTENTENUMERATIONACCESS_HXX_ -#include <smart/com/sun/star/container/XContentEnumerationAccess.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XENUMERATION_HXX_ -#include <smart/com/sun/star/container/XEnumeration.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XELEMENTACCESS_HXX_ -#include <smart/com/sun/star/container/XElementAccess.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XINDEXACCESS_HXX_ -#include <smart/com/sun/star/container/XIndexAccess.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_XEVENTLISTENER_HXX_ -#include <smart/com/sun/star/lang/XEventListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_EVENTOBJECT_HXX_ -#include <smart/com/sun/star/lang/EventObject.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_SCRIPT_XALLLISTENERADAPTERSERVICE_HXX_ -#include <smart/com/sun/star/script/XAllListenerAdapterService.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_SCRIPT_XALLLISTENER_HXX_ -#include <smart/com/sun/star/script/XAllListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_SCRIPT_ALLEVENTOBJECT_HXX_ -#include <smart/com/sun/star/script/AllEventObject.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XCOMPONENTENUMERATION_HXX_ -#include <smart/com/sun/star/container/XComponentEnumeration.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_XCOMPONENT_HXX_ -#include <smart/com/sun/star/lang/XComponent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XCOMPONENTENUMERATIONACCESS_HXX_ -#include <smart/com/sun/star/container/XComponentEnumerationAccess.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_LISTENEREXISTEXCEPTION_HXX_ -#include <smart/com/sun/star/lang/ListenerExistException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_ELEMENTEXISTEXCEPTION_HXX_ -#include <smart/com/sun/star/container/ElementExistException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_LANG_INVALIDLISTENEREXCEPTION_HXX_ -#include <smart/com/sun/star/lang/InvalidListenerException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_CONTAINER_NOSUCHELEMENTEXCEPTION_HXX_ -#include <smart/com/sun/star/container/NoSuchElementException.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XKEYLISTENER_HXX_ -#include <smart/com/sun/star/awt/XKeyListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XPAINTLISTENER_HXX_ -#include <smart/com/sun/star/awt/XPaintListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_KEYEVENT_HXX_ -#include <smart/com/sun/star/awt/KeyEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_KEYMODIFIER_HXX_ -#include <smart/com/sun/star/awt/KeyModifier.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XMOUSEMOTIONLISTENER_HXX_ -#include <smart/com/sun/star/awt/XMouseMotionListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FOCUSEVENT_HXX_ -#include <smart/com/sun/star/awt/FocusEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XWINDOWLISTENER_HXX_ -#include <smart/com/sun/star/awt/XWindowListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XACTIVATELISTENER_HXX_ -#include <smart/com/sun/star/awt/XActivateListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_MOUSEEVENT_HXX_ -#include <smart/com/sun/star/awt/MouseEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTOPWINDOWLISTENER_HXX_ -#include <smart/com/sun/star/awt/XTopWindowListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_PAINTEVENT_HXX_ -#include <smart/com/sun/star/awt/PaintEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_INPUTEVENT_HXX_ -#include <smart/com/sun/star/awt/InputEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_KEYGROUP_HXX_ -#include <smart/com/sun/star/awt/KeyGroup.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_KEY_HXX_ -#include <smart/com/sun/star/awt/Key.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_WINDOWEVENT_HXX_ -#include <smart/com/sun/star/awt/WindowEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XMOUSELISTENER_HXX_ -#include <smart/com/sun/star/awt/XMouseListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_KEYFUNCTION_HXX_ -#include <smart/com/sun/star/awt/KeyFunction.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FOCUSCHANGEREASON_HXX_ -#include <smart/com/sun/star/awt/FocusChangeReason.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_MOUSEBUTTON_HXX_ -#include <smart/com/sun/star/awt/MouseButton.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XFOCUSLISTENER_HXX_ -#include <smart/com/sun/star/awt/XFocusListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XADJUSTMENTLISTENER_HXX_ -#include <smart/com/sun/star/awt/XAdjustmentListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XACTIONLISTENER_HXX_ -#include <smart/com/sun/star/awt/XActionListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTLISTENER_HXX_ -#include <smart/com/sun/star/awt/XTextListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XSPINLISTENER_HXX_ -#include <smart/com/sun/star/awt/XSpinListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XITEMLISTENER_HXX_ -#include <smart/com/sun/star/awt/XItemListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XVCLCONTAINERLISTENER_HXX_ -#include <smart/com/sun/star/awt/XVclContainerListener.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XFILEDIALOG_HXX_ -#include <smart/com/sun/star/awt/XFileDialog.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTCOMPONENT_HXX_ -#include <smart/com/sun/star/awt/XTextComponent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XLISTBOX_HXX_ -#include <smart/com/sun/star/awt/XListBox.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XPROGRESSMONITOR_HXX_ -#include <smart/com/sun/star/awt/XProgressMonitor.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_TEXTALIGN_HXX_ -#include <smart/com/sun/star/awt/TextAlign.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XSCROLLBAR_HXX_ -#include <smart/com/sun/star/awt/XScrollBar.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XVCLCONTAINERPEER_HXX_ -#include <smart/com/sun/star/awt/XVclContainerPeer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTABCONTROLLERMODEL_HXX_ -#include <smart/com/sun/star/awt/XTabControllerModel.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XMESSAGEBOX_HXX_ -#include <smart/com/sun/star/awt/XMessageBox.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTEDITFIELD_HXX_ -#include <smart/com/sun/star/awt/XTextEditField.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_STYLE_HXX_ -#include <smart/com/sun/star/awt/Style.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTIMEFIELD_HXX_ -#include <smart/com/sun/star/awt/XTimeField.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XVCLWINDOWPEER_HXX_ -#include <smart/com/sun/star/awt/XVclWindowPeer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XCONTROLMODEL_HXX_ -#include <smart/com/sun/star/awt/XControlModel.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XSPINFIELD_HXX_ -#include <smart/com/sun/star/awt/XSpinField.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XUNOCONTROLCONTAINER_HXX_ -#include <smart/com/sun/star/awt/XUnoControlContainer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTLAYOUTCONSTRAINS_HXX_ -#include <smart/com/sun/star/awt/XTextLayoutConstrains.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XNUMERICFIELD_HXX_ -#include <smart/com/sun/star/awt/XNumericField.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XBUTTON_HXX_ -#include <smart/com/sun/star/awt/XButton.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTAREA_HXX_ -#include <smart/com/sun/star/awt/XTextArea.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XIMAGEBUTTON_HXX_ -#include <smart/com/sun/star/awt/XImageButton.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XFIXEDTEXT_HXX_ -#include <smart/com/sun/star/awt/XFixedText.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XCONTROLCONTAINER_HXX_ -#include <smart/com/sun/star/awt/XControlContainer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XDIALOG_HXX_ -#include <smart/com/sun/star/awt/XDialog.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_SCROLLBARORIENTATION_HXX_ -#include <smart/com/sun/star/awt/ScrollBarOrientation.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XRADIOBUTTON_HXX_ -#include <smart/com/sun/star/awt/XRadioButton.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XCURRENCYFIELD_HXX_ -#include <smart/com/sun/star/awt/XCurrencyField.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XPATTERNFIELD_HXX_ -#include <smart/com/sun/star/awt/XPatternField.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_VCLWINDOWPEERATTRIBUTE_HXX_ -#include <smart/com/sun/star/awt/VclWindowPeerAttribute.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTABCONTROLLER_HXX_ -#include <smart/com/sun/star/awt/XTabController.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XVCLCONTAINER_HXX_ -#include <smart/com/sun/star/awt/XVclContainer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XDATEFIELD_HXX_ -#include <smart/com/sun/star/awt/XDateField.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XCOMBOBOX_HXX_ -#include <smart/com/sun/star/awt/XComboBox.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XCONTROL_HXX_ -#include <smart/com/sun/star/awt/XControl.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XCHECKBOX_HXX_ -#include <smart/com/sun/star/awt/XCheckBox.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_MESSAGEBOXCOMMAND_HXX_ -#include <smart/com/sun/star/awt/MessageBoxCommand.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XLAYOUTCONSTRAINS_HXX_ -#include <smart/com/sun/star/awt/XLayoutConstrains.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XPROGRESSBAR_HXX_ -#include <smart/com/sun/star/awt/XProgressBar.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_SIMPLEFONTMETRIC_HXX_ -#include <smart/com/sun/star/awt/SimpleFontMetric.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTWEIGHT_HXX_ -#include <smart/com/sun/star/awt/FontWeight.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTSLANT_HXX_ -#include <smart/com/sun/star/awt/FontSlant.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_CHARSET_HXX_ -#include <smart/com/sun/star/awt/CharSet.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTDESCRIPTOR_HXX_ -#include <smart/com/sun/star/awt/FontDescriptor.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTWIDTH_HXX_ -#include <smart/com/sun/star/awt/FontWidth.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XFONT_HXX_ -#include <smart/com/sun/star/awt/XFont.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTTYPE_HXX_ -#include <smart/com/sun/star/awt/FontType.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTUNDERLINE_HXX_ -#include <smart/com/sun/star/awt/FontUnderline.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTSTRIKEOUT_HXX_ -#include <smart/com/sun/star/awt/FontStrikeout.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTFAMILY_HXX_ -#include <smart/com/sun/star/awt/FontFamily.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_FONTPITCH_HXX_ -#include <smart/com/sun/star/awt/FontPitch.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTOPWINDOW_HXX_ -#include <smart/com/sun/star/awt/XTopWindow.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XWINDOW_HXX_ -#include <smart/com/sun/star/awt/XWindow.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_POSSIZE_HXX_ -#include <smart/com/sun/star/awt/PosSize.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_VCLCONTAINEREVENT_HXX_ -#include <smart/com/sun/star/awt/VclContainerEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_ITEMEVENT_HXX_ -#include <smart/com/sun/star/awt/ItemEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_SPINEVENT_HXX_ -#include <smart/com/sun/star/awt/SpinEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_TEXTEVENT_HXX_ -#include <smart/com/sun/star/awt/TextEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_ADJUSTMENTTYPE_HXX_ -#include <smart/com/sun/star/awt/AdjustmentType.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_ACTIONEVENT_HXX_ -#include <smart/com/sun/star/awt/ActionEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_ADJUSTMENTEVENT_HXX_ -#include <smart/com/sun/star/awt/AdjustmentEvent.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_RECTANGLE_HXX_ -#include <smart/com/sun/star/awt/Rectangle.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_SELECTION_HXX_ -#include <smart/com/sun/star/awt/Selection.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_SIZE_HXX_ -#include <smart/com/sun/star/awt/Size.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_WINDOWDESCRIPTOR_HXX_ -#include <smart/com/sun/star/awt/WindowDescriptor.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_INVALIDATESTYLE_HXX_ -#include <smart/com/sun/star/awt/InvalidateStyle.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XTOOLKIT_HXX_ -#include <smart/com/sun/star/awt/XToolkit.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XWINDOWPEER_HXX_ -#include <smart/com/sun/star/awt/XWindowPeer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_WINDOWCLASS_HXX_ -#include <smart/com/sun/star/awt/WindowClass.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XSYSTEMDEPENDENTWINDOWPEER_HXX_ -#include <smart/com/sun/star/awt/XSystemDependentWindowPeer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_WINDOWATTRIBUTE_HXX_ -#include <smart/com/sun/star/awt/WindowAttribute.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XPOINTER_HXX_ -#include <smart/com/sun/star/awt/XPointer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_SYSTEMPOINTER_HXX_ -#include <smart/com/sun/star/awt/SystemPointer.hxx> -#endif -#ifndef _SMART_COM_SUN_STAR_AWT_XVIEW_HXX_ -#include <smart/com/sun/star/awt/XView.hxx> -#endif -#include <usr/refl.hxx> -#include <sfx2/msg.hxx> -#include <svl/itemset.hxx> -#include <sfx2/basedlgs.hxx> -#include <vcl/floatwin.hxx> -#include <vcl/dialog.hxx> -#include <vcl/window.hxx> -#include <sfx2/viewfrm.hxx> -#include <sfx2/frame.hxx> -#include <sfx2/objface.hxx> -#include <vcl/event.hxx> -#include <svl/eitem.hxx> -#include <svl/intitem.hxx> -#include <symbol.hxx> -#include <svl/itempool.hxx> -#include <vcl/image.hxx> -#include <vcl/metric.hxx> -#include <sfx2/inimgr.hxx> -#include <node.hxx> -#include <tools/pstm.hxx> -#include <tools/table.hxx> -#include <sfx2/docfac.hxx> -#include <svl/ownlist.hxx> -#include <sfx2/objsh.hxx> -#include <svl/stritem.hxx> -#include <vcl/mapmod.hxx> -#include <sfx2/ipfrm.hxx> -#include <vcl/dialog.hxx> -#include <sfx2/dispatch.hxx> -#include <svl/svstdarr.hxx> -#include <sfx2/bindings.hxx> -#include <dialog.hxx> -#include <vcl/button.hxx> -#include <vcl/symbol.hxx> -#include <sfx2/tabdlg.hxx> -#include <vcl/button.hxx> -#include <vcl/tabdlg.hxx> -#include <vcl/tabpage.hxx> -#include <vcl/tabctrl.hxx> -#include <vcl/group.hxx> -#include <svx/optgenrl.hxx> -#include <vcl/fixed.hxx> -#include <vcl/edit.hxx> -#include <vcl/group.hxx> -#include <document.hxx> -#include <vcl/field.hxx> -#include <vcl/spinfld.hxx> -#include <vcl/menubtn.hxx> -#include <vcl/scrbar.hxx> -#include <svtools/ctrlbox.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/virdev.hxx> -#include <vcl/combobox.hxx> -#include <vcl/field.hxx> -#include <svtools/ctrltool.hxx> -#include <sfx2/interno.hxx> -#include <sfx2/sfxdefs.hxx> -#include <sfx2/childwin.hxx> -#include <sfx2/chalign.hxx> -#include <vcl/floatwin.hxx> -#include <sot/storage.hxx> -#include <rsc/rscsfx.hxx> -#include <vcl/msgbox.hxx> -#include <vcl/btndlg.hxx> -#include <uno/uno.h> -#include <uno/string.h> -#include <uno/sequence.h> -#include <uno/any.h> -#include <uno/exceptn.h> -#include <uno/intrface.h> -#include <uno/factory.h> -#include <uno/api.h> -#include <svx/svxids.hrc> -#include <view.hxx> -#include <sfx2/dockwin.hxx> -#include <vcl/dockwin.hxx> -#include <sfx2/viewsh.hxx> -#include <sfx2/clientsh.hxx> -#include <svtools/scrwin.hxx> -#include <vcl/scrbar.hxx> -#include <sfx2/ctrlitem.hxx> -#include <sfx2/viewfac.hxx> -#include <edit.hxx> -#include <editeng/editdata.hxx> -#include <toolbox.hxx> -#include <vcl/toolbox.hxx> -#include <vcl/dockwin.hxx> -#include <smslots.hxx> -#include <svl/undo.hxx> -#include <sfx2/request.hxx> -#include <svl/whiter.hxx> -#include <vcl/prntypes.hxx> -#include <vcl/jobset.hxx> -#include <vcl/gdimtf.hxx> -#include <sot/exchange.hxx> -#include <vcl/wrkwin.hxx> -#include <tools/sstring.hxx> -#include <action.hxx> -#include <sfx2/filedlg.hxx> -#include <sfx2/iodlg.hxx> diff --git a/starmath/source/smres.src b/starmath/source/smres.src index bef6d0bec106..601472b62f5a 100644..100755 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -1755,18 +1755,12 @@ StringArray RID_PRINTUIOPTIONS < "%PRODUCTNAME %s"; >; < "Contents"; >; < "~Title"; >; - < "Specifies whether you want the name of the document to be included in the printout"; >; < "~Formula text"; >; - < "Specifies whether to include the contents of the 'Commands' window at the bottom of the printout."; >; < "B~orders"; >; - < "Applies a thin border to the formula area in the printout."; >; < "Size"; >; < "O~riginal size"; >; - < "Prints the formula without adjusting the current font size."; >; < "Fit to ~page"; >; - < "Adjusts the formula to the page format used in the printout."; >; < "~Scaling"; >; - < "Reduces or enlarges the size of the printed formula by a specified enlargement factor."; >; }; }; diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 108cb9c69e4a..6520f9e8acf7 100755 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -81,8 +81,8 @@ using namespace ::com::sun::star::script; SmPrintUIOptions::SmPrintUIOptions() { ResStringArray aLocalizedStrings( SmResId( RID_PRINTUIOPTIONS ) ); - DBG_ASSERT( aLocalizedStrings.Count() >= 15, "resource incomplete" ); - if( aLocalizedStrings.Count() < 15 ) // bad resource ? + DBG_ASSERT( aLocalizedStrings.Count() >= 9, "resource incomplete" ); + if( aLocalizedStrings.Count() < 9 ) // bad resource ? return; SmModule *pp = SM_MOD(); @@ -100,42 +100,42 @@ SmPrintUIOptions::SmPrintUIOptions() String aAppGroupname( aLocalizedStrings.GetString( 0 ) ); aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ), aOpt.GetModuleName( SvtModuleOptions::E_SMATH ) ); - m_aUIProperties[0].Value = getGroupControlOpt( aAppGroupname, rtl::OUString() ); + m_aUIProperties[0].Value = getGroupControlOpt( aAppGroupname, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:TabPage:AppPage" ) ) ); // create subgroup for print options m_aUIProperties[1].Value = getSubgroupControlOpt( aLocalizedStrings.GetString( 1 ), rtl::OUString() ); // create a bool option for title row (matches to SID_PRINTTITLE) m_aUIProperties[2].Value = getBoolControlOpt( aLocalizedStrings.GetString( 2 ), - aLocalizedStrings.GetString( 3 ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:TitleRow:CheckBox" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( PRTUIOPT_TITLE_ROW ) ), pConfig->IsPrintTitle() ); // create a bool option for formula text (matches to SID_PRINTTEXT) - m_aUIProperties[3].Value = getBoolControlOpt( aLocalizedStrings.GetString( 4 ), - aLocalizedStrings.GetString( 5 ), + m_aUIProperties[3].Value = getBoolControlOpt( aLocalizedStrings.GetString( 3 ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:FormulaText:CheckBox" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( PRTUIOPT_FORMULA_TEXT ) ), pConfig->IsPrintFormulaText() ); // create a bool option for border (matches to SID_PRINTFRAME) - m_aUIProperties[4].Value = getBoolControlOpt( aLocalizedStrings.GetString( 6 ), - aLocalizedStrings.GetString( 7 ), + m_aUIProperties[4].Value = getBoolControlOpt( aLocalizedStrings.GetString( 4 ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:Border:CheckBox" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( PRTUIOPT_BORDER ) ), pConfig->IsPrintFrame() ); // create subgroup for print format - m_aUIProperties[5].Value = getSubgroupControlOpt( aLocalizedStrings.GetString( 8 ), rtl::OUString() ); + m_aUIProperties[5].Value = getSubgroupControlOpt( aLocalizedStrings.GetString( 5 ), rtl::OUString() ); // create a radio button group for print format (matches to SID_PRINTSIZE) Sequence< rtl::OUString > aChoices( 3 ); - aChoices[0] = aLocalizedStrings.GetString( 9 ); - aChoices[1] = aLocalizedStrings.GetString( 11 ); - aChoices[2] = aLocalizedStrings.GetString( 13 ); - Sequence< rtl::OUString > aHelpTexts( 3 ); - aHelpTexts[0] = aLocalizedStrings.GetString( 10 ); - aHelpTexts[1] = aLocalizedStrings.GetString( 12 ); - aHelpTexts[2] = aLocalizedStrings.GetString( 14 ); + aChoices[0] = aLocalizedStrings.GetString( 6 ); + aChoices[1] = aLocalizedStrings.GetString( 7 ); + aChoices[2] = aLocalizedStrings.GetString( 8 ); + Sequence< rtl::OUString > aHelpIds( 3 ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:0" ) ); + aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:1" ) ); + aHelpIds[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:2" ) ); OUString aPrintFormatProp( RTL_CONSTASCII_USTRINGPARAM( PRTUIOPT_PRINT_FORMAT ) ); m_aUIProperties[6].Value = getChoiceControlOpt( rtl::OUString(), - aHelpTexts, + aHelpIds, aPrintFormatProp, aChoices, static_cast< sal_Int32 >(pConfig->GetPrintSize()) ); @@ -143,7 +143,7 @@ SmPrintUIOptions::SmPrintUIOptions() // create a numeric box for scale dependent on PrintFormat = "Scaling" (matches to SID_PRINTZOOM) vcl::PrinterOptionsHelper::UIControlOptions aRangeOpt( aPrintFormatProp, 2, sal_True ); m_aUIProperties[ 7 ].Value = getRangeControlOpt( rtl::OUString(), - aLocalizedStrings.GetString( 14 ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintScale:NumericField" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( PRTUIOPT_PRINT_SCALE ) ), pConfig->GetPrintZoomFactor(), // initial value 10, // min value diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 748e62e3536e..ad9ff8e618f0 100755 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1156,7 +1156,7 @@ void SmViewShell::Impl_Print( rOutDev.Pop(); } -USHORT SmViewShell::Print(SfxProgress & /*rProgress*/, BOOL /*bIsAPI*/, PrintDialog * /*pPrintDialog*/) +USHORT SmViewShell::Print(SfxProgress & /*rProgress*/, BOOL /*bIsAPI*/) { RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::Print" ); DBG_ASSERT( 0, "SmViewShell::Print: no longer used with new UI print dialog. Should be removed!!" ); diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index c5d67217ab2a..89c5a7a1a1be 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -28,7 +28,7 @@ #define _MODOPT_HXX #include <tools/string.hxx> -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include <vcl/field.hxx> #include <svl/svarray.hxx> #include <unotools/configitem.hxx> diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 7a5f1e2847b1..13e8cb3ddbdd 100644..100755 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -659,7 +659,6 @@ #include "unotools/pathoptions.hxx" #include "svl/poolitem.hxx" #include "svtools/prgsbar.hxx" -#include "svtools/printdlg.hxx" #include "svtools/prnsetup.hxx" #include "svl/ptitem.hxx" #include "svl/rectitem.hxx" @@ -913,7 +912,7 @@ #include "vcl/event.hxx" #include "vcl/field.hxx" #include "vcl/fixed.hxx" -#include "vcl/fldunit.hxx" +#include "tools/fldunit.hxx" #include "vcl/font.hxx" #include "unotools/fontcvt.hxx" #include "vcl/graph.hxx" @@ -950,7 +949,7 @@ #include "vcl/virdev.hxx" #include "vcl/waitobj.hxx" #include "vcl/window.hxx" -#include "vcl/wintypes.hxx" +#include "tools/wintypes.hxx" #include "vcl/wrkwin.hxx" #include "vos/mutex.hxx" diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index c8e601143877..da2fc80f33ad 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -28,7 +28,7 @@ #define _SWMODULE_HXX #include <tools/link.hxx> #include <tools/string.hxx> -#include <vcl/fldunit.hxx> +#include <tools/fldunit.hxx> #include <svl/lstner.hxx> #include <unotools/options.hxx> #include <sfx2/module.hxx> diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index b54922a1b8e7..bc16348abaee 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -198,8 +198,8 @@ SwPrintUIOptions::SwPrintUIOptions( { ResStringArray aLocalizedStrings( SW_RES( STR_PRINTOPTUI ) ); - DBG_ASSERT( aLocalizedStrings.Count() >= 44, "resource incomplete" ); - if( aLocalizedStrings.Count() < 44 ) // bad resource ? + DBG_ASSERT( aLocalizedStrings.Count() >= 30, "resource incomplete" ); + if( aLocalizedStrings.Count() < 30 ) // bad resource ? return; // printing HTML sources does not have any valid UI options. @@ -226,7 +226,7 @@ SwPrintUIOptions::SwPrintUIOptions( String aAppGroupname( aLocalizedStrings.GetString( 0 ) ); aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ), aModOpt.GetModuleName( SvtModuleOptions::E_SWRITER ) ); - m_aUIProperties[ nIdx++ ].Value = getGroupControlOpt( aAppGroupname, rtl::OUString() ); + m_aUIProperties[ nIdx++ ].Value = getGroupControlOpt( aAppGroupname, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:TabPage:AppPage" ) ) ); // create sub section for Contents m_aUIProperties[ nIdx++ ].Value = getSubgroupControlOpt( aLocalizedStrings.GetString( 1 ), rtl::OUString() ); @@ -234,79 +234,79 @@ SwPrintUIOptions::SwPrintUIOptions( // create a bool option for background bool bDefaultVal = rDefaultPrintData.IsPrintPageBackground(); m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 2 ), - aLocalizedStrings.GetString( 3 ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintPageBackground" ) ), - bDefaultVal ); + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintPageBackground:CheckBox" ) ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintPageBackground" ) ), + bDefaultVal ); // create a bool option for pictures/graphics AND OLE and drawing objects as well bDefaultVal = rDefaultPrintData.IsPrintGraphic() || rDefaultPrintData.IsPrintDraw(); - m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 4 ), - aLocalizedStrings.GetString( 5 ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintPicturesAndObjects" ) ), - bDefaultVal ); + m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 3 ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox" ) ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintPicturesAndObjects" ) ), + bDefaultVal ); if (!bWeb) { // create a bool option for hidden text bDefaultVal = rDefaultPrintData.IsPrintHiddenText(); - m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 6 ), - aLocalizedStrings.GetString( 7 ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintHiddenText" ) ), - bDefaultVal ); + m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 4 ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintHiddenText:CheckBox" ) ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintHiddenText" ) ), + bDefaultVal ); // create a bool option for place holder bDefaultVal = rDefaultPrintData.IsPrintTextPlaceholder(); - m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 8 ), - aLocalizedStrings.GetString( 9 ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintTextPlaceholder" ) ), - bDefaultVal ); + m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 5 ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintTextPlaceholder:CheckBox" ) ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintTextPlaceholder" ) ), + bDefaultVal ); } // create a bool option for controls bDefaultVal = rDefaultPrintData.IsPrintControl(); - m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 10 ), - aLocalizedStrings.GetString( 11 ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintControls" ) ), - bDefaultVal ); + m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 6 ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintControls:CheckBox" ) ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintControls" ) ), + bDefaultVal ); // create sub section for Color - m_aUIProperties[ nIdx++ ].Value = getSubgroupControlOpt( aLocalizedStrings.GetString( 12 ), rtl::OUString() ); + m_aUIProperties[ nIdx++ ].Value = getSubgroupControlOpt( aLocalizedStrings.GetString( 7 ), rtl::OUString() ); // create a bool option for printing text with black font color bDefaultVal = rDefaultPrintData.IsPrintBlackFont(); - m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 13 ), - aLocalizedStrings.GetString( 14 ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintBlackFonts" ) ), - bDefaultVal ); + m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 8 ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintBlackFonts:CheckBox" ) ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintBlackFonts" ) ), + bDefaultVal ); if (!bWeb) { // create subgroup for misc options - m_aUIProperties[ nIdx++ ].Value = getSubgroupControlOpt( rtl::OUString( aLocalizedStrings.GetString( 15 ) ), rtl::OUString() ); + m_aUIProperties[ nIdx++ ].Value = getSubgroupControlOpt( rtl::OUString( aLocalizedStrings.GetString( 9 ) ), rtl::OUString() ); // create a bool option for printing automatically inserted blank pages bDefaultVal = rDefaultPrintData.IsPrintEmptyPages(); - m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 16 ), - aLocalizedStrings.GetString( 17 ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintEmptyPages" ) ), - bDefaultVal ); + m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 10 ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintEmptyPages:CheckBox" ) ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintEmptyPages" ) ), + bDefaultVal ); } // create a bool option for paper tray bDefaultVal = rDefaultPrintData.IsPaperFromSetup(); vcl::PrinterOptionsHelper::UIControlOptions aPaperTrayOpt; aPaperTrayOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OptionsPageOptGroup" ) ); - m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 18 ), - aLocalizedStrings.GetString( 19 ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintPaperFromSetup" ) ), - bDefaultVal, - aPaperTrayOpt - ); + m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 11 ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox" ) ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintPaperFromSetup" ) ), + bDefaultVal, + aPaperTrayOpt + ); // print range selection vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; aPrintRangeOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) ); aPrintRangeOpt.mbInternalOnly = sal_True; - m_aUIProperties[nIdx++].Value = getSubgroupControlOpt( rtl::OUString( aLocalizedStrings.GetString( 37 ) ), + m_aUIProperties[nIdx++].Value = getSubgroupControlOpt( rtl::OUString( aLocalizedStrings.GetString( 26 ) ), rtl::OUString(), aPrintRangeOpt ); @@ -315,18 +315,18 @@ SwPrintUIOptions::SwPrintUIOptions( rtl::OUString aPrintRangeName( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ); uno::Sequence< rtl::OUString > aChoices( 3 ); uno::Sequence< sal_Bool > aChoicesDisabled( 3 ); - uno::Sequence< rtl::OUString > aHelpText( 3 ); - aChoices[0] = aLocalizedStrings.GetString( 38 ); + uno::Sequence< rtl::OUString > aHelpIds( 3 ); + aChoices[0] = aLocalizedStrings.GetString( 27 ); aChoicesDisabled[0] = sal_False; - aHelpText[0] = aLocalizedStrings.GetString( 39 ); - aChoices[1] = aLocalizedStrings.GetString( 40 ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ) ); + aChoices[1] = aLocalizedStrings.GetString( 28 ); aChoicesDisabled[1] = sal_False; - aHelpText[1] = aLocalizedStrings.GetString( 41 ); - aChoices[2] = aLocalizedStrings.GetString( 42 ); + aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ) ); + aChoices[2] = aLocalizedStrings.GetString( 29 ); aChoicesDisabled[2] = sal_Bool(! bHasSelection); - aHelpText[2] = aLocalizedStrings.GetString( 43 ); + aHelpIds[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ) ); m_aUIProperties[nIdx++].Value = getChoiceControlOpt( rtl::OUString(), - aHelpText, + aHelpIds, aPrintRangeName, aChoices, bHasSelection ? 2 /*enable 'Selection' radio button*/ : 0 /* enable 'All pages' */, @@ -336,7 +336,7 @@ SwPrintUIOptions::SwPrintUIOptions( // create a an Edit dependent on "Pages" selected vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, sal_True ); m_aUIProperties[nIdx++].Value = getEditControlOpt( rtl::OUString(), - rtl::OUString(), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PageRange:Edit" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ), rtl::OUString(), aPageRangeOpt @@ -344,31 +344,31 @@ SwPrintUIOptions::SwPrintUIOptions( // print content selection vcl::PrinterOptionsHelper::UIControlOptions aContentsOpt; aContentsOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "JobPage" ) ); - m_aUIProperties[nIdx++].Value = getSubgroupControlOpt( rtl::OUString( aLocalizedStrings.GetString( 20 ) ), + m_aUIProperties[nIdx++].Value = getSubgroupControlOpt( rtl::OUString( aLocalizedStrings.GetString( 12 ) ), rtl::OUString(), aContentsOpt ); // create a list box for notes content const sal_Int16 nPrintPostIts = rDefaultPrintData.GetPrintPostIts(); aChoices.realloc( 4 ); - aChoices[0] = aLocalizedStrings.GetString( 21 ); - aChoices[1] = aLocalizedStrings.GetString( 22 ); - aChoices[2] = aLocalizedStrings.GetString( 23 ); - aChoices[3] = aLocalizedStrings.GetString( 24 ); - aHelpText.realloc( 2 ); - aHelpText[0] = aLocalizedStrings.GetString( 25 ); - aHelpText[1] = aLocalizedStrings.GetString( 25 ); + aChoices[0] = aLocalizedStrings.GetString( 13 ); + aChoices[1] = aLocalizedStrings.GetString( 14 ); + aChoices[2] = aLocalizedStrings.GetString( 15 ); + aChoices[3] = aLocalizedStrings.GetString( 16 ); + aHelpIds.realloc( 2 ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText" ) ); + aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" ) ); vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), 0, sal_False ); aAnnotOpt.mbEnabled = bHasPostIts; - m_aUIProperties[ nIdx++ ].Value = getChoiceControlOpt( aLocalizedStrings.GetString( 26 ), - aHelpText, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintAnnotationMode" ) ), - aChoices, - nPrintPostIts, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) ), - uno::Sequence< sal_Bool >(), - aAnnotOpt - ); + m_aUIProperties[ nIdx++ ].Value = getChoiceControlOpt( aLocalizedStrings.GetString( 17 ), + aHelpIds, + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintAnnotationMode" ) ), + aChoices, + nPrintPostIts, + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "List" ) ), + uno::Sequence< sal_Bool >(), + aAnnotOpt + ); // create subsection for Page settings vcl::PrinterOptionsHelper::UIControlOptions aPageSetOpt; @@ -376,16 +376,16 @@ SwPrintUIOptions::SwPrintUIOptions( if (!bWeb) { - m_aUIProperties[nIdx++].Value = getSubgroupControlOpt( rtl::OUString( aLocalizedStrings.GetString( 27 ) ), + m_aUIProperties[nIdx++].Value = getSubgroupControlOpt( rtl::OUString( aLocalizedStrings.GetString( 18 ) ), rtl::OUString(), aPageSetOpt ); uno::Sequence< rtl::OUString > aRLChoices( 3 ); - aRLChoices[0] = aLocalizedStrings.GetString( 28 ); - aRLChoices[1] = aLocalizedStrings.GetString( 29 ); - aRLChoices[2] = aLocalizedStrings.GetString( 30 ); + aRLChoices[0] = aLocalizedStrings.GetString( 19 ); + aRLChoices[1] = aLocalizedStrings.GetString( 20 ); + aRLChoices[2] = aLocalizedStrings.GetString( 21 ); uno::Sequence< rtl::OUString > aRLHelp( 1 ); - aRLHelp[0] = aLocalizedStrings.GetString( 31 ); + aRLHelp[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox" ) ); // create a choice option for all/left/right pages // 0 : all pages (left & right) // 1 : left pages @@ -397,7 +397,7 @@ SwPrintUIOptions::SwPrintUIOptions( nPagesChoice = 1; else if (!rDefaultPrintData.IsPrintLeftPage() && rDefaultPrintData.IsPrintRightPage()) nPagesChoice = 2; - m_aUIProperties[ nIdx++ ].Value = getChoiceControlOpt( aLocalizedStrings.GetString( 32 ), + m_aUIProperties[ nIdx++ ].Value = getChoiceControlOpt( aLocalizedStrings.GetString( 22 ), aRLHelp, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintLeftRightPages" ) ), aRLChoices, @@ -409,27 +409,29 @@ SwPrintUIOptions::SwPrintUIOptions( // create a bool option for brochure bDefaultVal = rDefaultPrintData.IsPrintProspect(); rtl::OUString aBrochurePropertyName( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ); - m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 33 ), - aLocalizedStrings.GetString( 34 ), - aBrochurePropertyName, - bDefaultVal, - aPageSetOpt - ); + m_aUIProperties[ nIdx++ ].Value = getBoolControlOpt( aLocalizedStrings.GetString( 23 ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintProspect:CheckBox" ) ), + aBrochurePropertyName, + bDefaultVal, + aPageSetOpt + ); if (bCTL) { // create a bool option for brochure RTL dependent on brochure uno::Sequence< rtl::OUString > aBRTLChoices( 2 ); - aBRTLChoices[0] = aLocalizedStrings.GetString( 35 ); - aBRTLChoices[1] = aLocalizedStrings.GetString( 36 ); + aBRTLChoices[0] = aLocalizedStrings.GetString( 24 ); + aBRTLChoices[1] = aLocalizedStrings.GetString( 25 ); vcl::PrinterOptionsHelper::UIControlOptions aBrochureRTLOpt( aBrochurePropertyName, -1, sal_True ); + uno::Sequence< rtl::OUString > aBRTLHelpIds( 1 ); + aBRTLHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox" ) ); aBrochureRTLOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) ); // RTL brochure choices // 0 : left-to-right // 1 : right-to-left const sal_Int16 nBRTLChoice = rDefaultPrintData.IsPrintProspectRTL() ? 1 : 0; m_aUIProperties[ nIdx++ ].Value = getChoiceControlOpt( rtl::OUString(), - uno::Sequence< rtl::OUString >(), + aBRTLHelpIds, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspectRTL" ) ), aBRTLChoices, nBRTLChoice, diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index 282551474e36..64a261fc8ba0 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -54,6 +54,8 @@ #include <mdiexp.hxx> // ...Percent() #include <poolfmt.hxx> +#include "vcl/metric.hxx" + #define ASC_BUFFLEN 4096 class SwASCIIParser @@ -129,24 +131,14 @@ SwASCIIParser::SwASCIIParser(SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, } if( rOpt.GetFontName().Len() ) { - bool bDelete = false; - const SfxFont* pFnt = 0; + Font aTextFont( rOpt.GetFontName(), Size( 0, 10 ) ); if( pDoc->getPrinter( false ) ) - pFnt = pDoc->getPrinter( false )->GetFontByName( rOpt.GetFontName() ); - - if( !pFnt ) - { - pFnt = new SfxFont( FAMILY_DONTKNOW, rOpt.GetFontName() ); - bDelete = true; - } - SvxFontItem aFont( pFnt->GetFamily(), pFnt->GetName(), - aEmptyStr, pFnt->GetPitch(), pFnt->GetCharSet(), RES_CHRATR_FONT ); + aTextFont = pDoc->getPrinter( false )->GetFontMetric( aTextFont ); + SvxFontItem aFont( aTextFont.GetFamily(), aTextFont.GetName(), + aEmptyStr, aTextFont.GetPitch(), aTextFont.GetCharSet(), RES_CHRATR_FONT ); pItemSet->Put( aFont ); pItemSet->Put( aFont, RES_CHRATR_CJK_FONT ); pItemSet->Put( aFont, RES_CHRATR_CTL_FONT ); - - if( bDelete ) - delete (SfxFont*)pFnt; } } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 0a6151b98388..0ab613730948 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -32,7 +32,7 @@ #include "wrtww8.hxx" #include "ww8par.hxx" -#include <oox/core/tokens.hxx> +#include <oox/token/tokens.hxx> #include <oox/export/drawingml.hxx> #include <oox/export/utils.hxx> #include <oox/export/vmlexport.hxx> @@ -128,6 +128,7 @@ using rtl::OUString; using rtl::OUStringBuffer; using rtl::OUStringToOString; +using namespace oox; using namespace docx; using namespace sax_fastparser; using namespace nsSwDocInfoSubType; diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 35c126cd6571..a4b5fb3a9514 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/i18n/ScriptType.hdl> -#include <oox/core/tokens.hxx> +#include <oox/token/tokens.hxx> #include <oox/export/drawingml.hxx> #include <oox/export/vmlexport.hxx> @@ -62,6 +62,7 @@ using namespace ::comphelper; using namespace ::com::sun::star; +using namespace ::oox; using oox::vml::VMLExport; diff --git a/sw/source/filter/ww8/docxfootnotes.hxx b/sw/source/filter/ww8/docxfootnotes.hxx index b9d49f78f560..ec91731bc6dd 100644 --- a/sw/source/filter/ww8/docxfootnotes.hxx +++ b/sw/source/filter/ww8/docxfootnotes.hxx @@ -30,7 +30,6 @@ #include <fmtftn.hxx> -#include <oox/core/tokens.hxx> #include <rtl/string.hxx> #include <rtl/ustring.hxx> #include <sax/fshelper.hxx> diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index 5645891c5b3c..05c30ce7b496 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -40,7 +40,7 @@ #include "xmlbrshe.hxx" #include <editeng/tstpitem.hxx> #include <editeng/brshitem.hxx> -#include <vcl/fldunit.hxx> +#include <tools/fldunit.hxx> #include <swmodule.hxx> #include <doc.hxx> #include "fmtornt.hxx" diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index 98fe7316ecd5..d4b15b7febd0 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -210,21 +210,15 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) if(!pStdFont->IsFontDefault(nFontId)) { sEntry = pStdFont->GetFontFor(nFontId); - sal_Bool bDelete = sal_False; - const SfxFont* pFnt = pPrt ? pPrt->GetFontByName(sEntry): 0; - if(!pFnt) - { - pFnt = new SfxFont( FAMILY_DONTKNOW, sEntry, PITCH_DONTKNOW, - ::gsl_getSystemTextEncoding() ); - bDelete = sal_True; - } - pFontItem = new SvxFontItem(pFnt->GetFamily(), pFnt->GetName(), - aEmptyStr, pFnt->GetPitch(), pFnt->GetCharSet(), nFontWhich); - if(bDelete) + + Font aFont( sEntry, Size( 0, 10 ) ); + if( pPrt ) { - delete (SfxFont*) pFnt; - bDelete = sal_False; + aFont = pPrt->GetFontMetric( aFont ); } + + pFontItem = new SvxFontItem(aFont.GetFamily(), aFont.GetName(), + aEmptyStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich); } else { @@ -303,25 +297,18 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) if(!pStdFont->IsFontDefault(aFontIdPoolId[nIdx])) { sEntry = pStdFont->GetFontFor(aFontIdPoolId[nIdx]); - sal_Bool bDelete = sal_False; - const SfxFont* pFnt = pPrt ? pPrt->GetFontByName(sEntry): 0; - if(!pFnt) - { - pFnt = new SfxFont( FAMILY_DONTKNOW, sEntry, PITCH_DONTKNOW, - ::gsl_getSystemTextEncoding() ); - bDelete = sal_True; - } + + Font aFont( sEntry, Size( 0, 10 ) ); + if( pPrt ) + aFont = pPrt->GetFontMetric( aFont ); + pColl = pDoc->GetTxtCollFromPool(aFontIdPoolId[nIdx + 1]); if( !bHTMLTemplSet || SFX_ITEM_SET != pColl->GetAttrSet().GetItemState( nFontWhich, sal_False ) ) { - pColl->SetFmtAttr(SvxFontItem(pFnt->GetFamily(), pFnt->GetName(), - aEmptyStr, pFnt->GetPitch(), pFnt->GetCharSet(), nFontWhich)); - } - if(bDelete) - { - delete (SfxFont*) pFnt; + pColl->SetFmtAttr(SvxFontItem(aFont.GetFamily(), aFont.GetName(), + aEmptyStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); } } sal_Int32 nFontHeight = pStdFont->GetFontHeight( static_cast< sal_Int8 >(aFontIdPoolId[nIdx]), 0, eLanguage ); diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src index 0f0eddc5d9ed..400b3439b795 100644 --- a/sw/source/ui/config/optdlg.src +++ b/sw/source/ui/config/optdlg.src @@ -1035,7 +1035,6 @@ TabPage TP_OPTSHDWCRSR }; }; - StringArray STR_PRINTOPTUI { ItemList [en-US] = @@ -1043,47 +1042,33 @@ StringArray STR_PRINTOPTUI < "%PRODUCTNAME %s"; >; < "Contents"; >; < "Page ba~ckground"; >; - < "Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document."; >; < "P~ictures and other graphic objects"; >; - < "Specifies whether the graphics and drawing or OLE objects of your text document are printed"; >; < "Hidden te~xt"; >; - < "Enable this option to print text that is marked as hidden."; >; < "~Text placeholders"; >; - < "Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout."; >; < "Form control~s"; >; - < "Specifies whether the form control fields of the text document are printed"; >; < "Color"; >; < "Print text in blac~k"; >; - < "Specifies whether to always print text in black."; >; < "Pages"; >; < "Print ~automatically inserted blank pages"; >; - < "If this option is enabled automatically inserted blank pages are printed. This is best if you are printing double-sided. For example, in a book, a \"chapter\" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not"; >; < "~Use only paper tray from printer preferences"; >; - < "For printers with multiple trays this option specifies whether the paper tray used is specified by the system settings of the printer."; >; < "Print"; >; < "None (document only)"; >; < "Comments only"; >; < "Place at end of document"; >; < "Place at end of page"; >; - < "Specify where to print comments (if any)."; >; < "~Comments"; >; < "Page sides";>; < "All pages"; >; < "Back sides / left pages"; >; < "Front sides / right pages"; >; - < "Specify which pages to include in the output"; >; < "Include"; >; < "Broch~ure"; >; - < "Select the Brochure option to print the document in brochure format."; >; < "Left-to-right script"; >; < "Right-to-left script"; >; < "Range and copies"; >; < "~All pages"; >; - < "Print the whole document."; >; < "Pa~ges"; >; - < "Print a range of pages of the document."; >; < "~Selection"; >; - < "Print only the selected parts of the document"; >; }; }; diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 6e6ed773a33d..01ef0a4f7500 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -726,20 +726,12 @@ void lcl_SetColl(SwWrtShell* pWrtShell, USHORT nType, SfxPrinter* pPrt, const String& rStyle, USHORT nFontWhich) { - BOOL bDelete = FALSE; - const SfxFont* pFnt = pPrt ? pPrt->GetFontByName(rStyle): 0; - if(!pFnt) - { - pFnt = new SfxFont(FAMILY_DONTKNOW, rStyle); - bDelete = TRUE; - } + Font aFont( rStyle, Size( 0, 10 ) ); + if( pPrt ) + aFont = pPrt->GetFontMetric( aFont ); SwTxtFmtColl *pColl = pWrtShell->GetTxtCollFromPool(nType); - pColl->SetFmtAttr(SvxFontItem(pFnt->GetFamily(), pFnt->GetName(), - aEmptyStr, pFnt->GetPitch(), pFnt->GetCharSet(), nFontWhich)); - if(bDelete) - { - delete (SfxFont*) pFnt; - } + pColl->SetFmtAttr(SvxFontItem(aFont.GetFamily(), aFont.GetName(), + aEmptyStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); } /*-- 11.10.2005 15:47:52--------------------------------------------------- @@ -822,22 +814,13 @@ BOOL SwStdFontTabPage::FillItemSet( SfxItemSet& ) FONT_GROUP_CJK == nFontGroup ? RES_CHRATR_CJK_FONTSIZE : RES_CHRATR_CTL_FONTSIZE); if(sStandard != sShellStd) { - BOOL bDelete = FALSE; - const SfxFont* pFnt = pPrinter ? pPrinter->GetFontByName(sStandard): 0; - if(!pFnt) - { - pFnt = new SfxFont(FAMILY_DONTKNOW, sStandard); - bDelete = TRUE; - } - pWrtShell->SetDefault(SvxFontItem(pFnt->GetFamily(), pFnt->GetName(), - aEmptyStr, pFnt->GetPitch(), pFnt->GetCharSet(), nFontWhich)); + Font aFont( sStandard, Size( 0, 10 ) ); + if( pPrinter ) + aFont = pPrinter->GetFontMetric( aFont ); + pWrtShell->SetDefault(SvxFontItem(aFont.GetFamily(), aFont.GetName(), + aEmptyStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); SwTxtFmtColl *pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_STANDARD); pColl->ResetFmtAttr(nFontWhich); - if(bDelete) - { - delete (SfxFont*) pFnt; - bDelete = FALSE; - } // lcl_SetColl(pWrtShell, RES_POOLCOLL_STANDARD, pPrinter, sStandard); bMod = TRUE; } @@ -943,15 +926,24 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet) // #i94536# prevent duplication of font entries when 'reset' button is pressed if( !aStandardBox.GetEntryCount() ) { - const USHORT nCount = pPrt->GetFontCount(); - for (USHORT i = 0; i < nCount; ++i) + // get the set of disctinct available family names + std::set< String > aFontNames; + int nFontNames = pPrt->GetDevFontCount(); + for( int i = 0; i < nFontNames; i++ ) + { + FontInfo aInf( pPrt->GetDevFont( i ) ); + aFontNames.insert( aInf.GetName() ); + } + + // insert to listboxes + for( std::set< String >::const_iterator it = aFontNames.begin(); + it != aFontNames.end(); ++it ) { - const String &rString = pPrt->GetFont(i)->GetName(); - aStandardBox.InsertEntry( rString ); - aTitleBox .InsertEntry( rString ); - aListBox .InsertEntry( rString ); - aLabelBox .InsertEntry( rString ); - aIdxBox .InsertEntry( rString ); + aStandardBox.InsertEntry( *it ); + aTitleBox .InsertEntry( *it ); + aListBox .InsertEntry( *it ); + aLabelBox .InsertEntry( *it ); + aIdxBox .InsertEntry( *it ); } } if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_STDFONTS, FALSE, &pItem)) diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 355e68bd5c58..4cab48e79d8a 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -58,6 +58,8 @@ #include <ascfldlg.hrc> #endif +#include "vcl/metric.hxx" + using namespace ::com::sun::star; @@ -180,11 +182,21 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, bDelPrinter = TRUE; } - const USHORT nCount = pPrt->GetFontCount(); - for (USHORT i = 0; i < nCount; ++i) + + // get the set of disctinct available family names + std::set< String > aFontNames; + int nFontNames = pPrt->GetDevFontCount(); + for( int i = 0; i < nFontNames; i++ ) + { + FontInfo aInf( pPrt->GetDevFont( i ) ); + aFontNames.insert( aInf.GetName() ); + } + + // insert to listbox + for( std::set< String >::const_iterator it = aFontNames.begin(); + it != aFontNames.end(); ++it ) { - const String &rStr = pPrt->GetFont(i)->GetName(); - aFontLB.InsertEntry( rStr ); + aFontLB.InsertEntry( *it ); } if( !aOpt.GetFontName().Len() ) diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx index d0d8f2cb804a..2b1c9366707e 100644 --- a/sw/source/ui/inc/pview.hxx +++ b/sw/source/ui/inc/pview.hxx @@ -223,7 +223,6 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell SW_DLLPRIVATE virtual USHORT SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); SW_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ); - SW_DLLPRIVATE virtual PrintDialog* CreatePrintDialog( Window *pParent ); SW_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, BOOL bInner ); diff --git a/sw/source/ui/inc/uitool.hxx b/sw/source/ui/inc/uitool.hxx index e48f78f9aa96..c3dfd0f07b2a 100644 --- a/sw/source/ui/inc/uitool.hxx +++ b/sw/source/ui/inc/uitool.hxx @@ -27,7 +27,7 @@ #ifndef _UITOOL_HXX #define _UITOOL_HXX -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include <vcl/field.hxx> #include <swtypes.hxx> #include "swdllapi.h" diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/ui/inc/usrpref.hxx index 0758f89af8bf..854b12d4f40e 100644 --- a/sw/source/ui/inc/usrpref.hxx +++ b/sw/source/ui/inc/usrpref.hxx @@ -32,7 +32,7 @@ #include <unotools/configitem.hxx> #include <fldupde.hxx> #include "viewopt.hxx" -#include <vcl/fldunit.hxx> +#include <tools/fldunit.hxx> /* -----------------------------28.09.00 09:45-------------------------------- diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 78817eec874c..0c92d7fdeb65 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -57,7 +57,6 @@ class SvxRuler; class SvxLRSpaceItem; class SwDocShell; class SwScrollbar; -class PrintDialog; class SvxVCBrowser; class SvBorder; class Ruler; @@ -355,7 +354,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell // Methoden fuers Printing SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); - SW_DLLPRIVATE virtual PrintDialog* CreatePrintDialog( Window* pParent ); SfxTabPage* CreatePrintOptionsPage( Window* pParent, const SfxItemSet& rSet); // fuer Readonly-Umschaltung diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index addf6f9db512..fd5d57ae35c0 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -35,7 +35,6 @@ #include <vcl/help.hxx> #include <vcl/cmdevt.hxx> #include <vcl/button.hxx> -#include <svtools/printdlg.hxx> #include <svl/whiter.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> @@ -1985,18 +1984,6 @@ SfxTabPage* SwPagePreView::CreatePrintOptionsPage( Window *pParent, --------------------------------------------------------------------*/ -PrintDialog* SwPagePreView::CreatePrintDialog( Window *pParent ) -{ - PrintDialog *pDlg = ::CreatePrintDialog( pParent, 1, 0 ); - pDlg->DisableRange( PRINTDIALOG_SELECTION ); - return pDlg; -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - // OD 18.12.2002 #103492# - no longer needed ?? Size SwPagePreView::GetOptimalSizePixel() const { diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 5abe83c3a53d..5c440d55883e 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -39,7 +39,6 @@ #include <svl/eitem.hxx> #include <unotools/undoopt.hxx> #include <unotools/lingucfg.hxx> -#include <svtools/printdlg.hxx> #include <unotools/useroptions.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> @@ -183,7 +182,7 @@ void SwView::ImpSetVerb( int nSelType ) } if ( bResetVerbs ) { - SetVerbs( 0 ); + SetVerbs( Sequence< embed::VerbDescriptor >() ); bVerbsActive = sal_False; } } diff --git a/sw/source/ui/uiview/viewfunc.hxx b/sw/source/ui/uiview/viewfunc.hxx index f04db152ec2f..6da6c01bbda4 100644 --- a/sw/source/ui/uiview/viewfunc.hxx +++ b/sw/source/ui/uiview/viewfunc.hxx @@ -30,7 +30,6 @@ class ImageButton; class Point; -class PrintDialog; class SfxItemSet; class SfxPrinter; class SfxTabPage; @@ -42,7 +41,6 @@ class Window; class SwWrtShell; // folgende Funktionen stehen im viewprt.cxx -PrintDialog* CreatePrintDialog( Window* , USHORT, SwWrtShell* ); void SetPrinter( IDocumentDeviceAccess*, SfxPrinter*, BOOL bWeb ); SfxTabPage* CreatePrintOptionsPage( Window*, const SfxItemSet& ); void SetAppPrintOptions( ViewShell* pSh, BOOL bWeb ); diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx index 7ddc594dd223..3fdc6f6d61d3 100644 --- a/sw/source/ui/uiview/viewprt.cxx +++ b/sw/source/ui/uiview/viewprt.cxx @@ -49,7 +49,6 @@ #include <svl/flagitem.hxx> #include <vcl/msgbox.hxx> #include <vcl/oldprintadaptor.hxx> -#include <svtools/printdlg.hxx> #include <sfx2/printer.hxx> #include <sfx2/prnmon.hxx> #include <editeng/paperinf.hxx> @@ -183,42 +182,6 @@ SfxTabPage* __EXPORT SwView::CreatePrintOptionsPage(Window* pParent, } /*-------------------------------------------------------------------- - Beschreibung: Druckerdialog - --------------------------------------------------------------------*/ - -PrintDialog* CreatePrintDialog( Window* pParent, USHORT nPg, SwWrtShell* pSh ) -{ - PrintDialog *pDlg = new PrintDialog( pParent, false ); -// pDlg->ChangeFirstPage( 1 ); - - if ( !nPg ) - nPg = 1; -// pDlg->ChangeLastPage( nPg ); -// pDlg->ChangeMaxPage( 9999 ); - pDlg->EnableRange( PRINTDIALOG_FROMTO ); - - if (pSh && (pSh->IsSelection() || pSh->IsFrmSelected() || pSh->IsObjSelected())) - pDlg->EnableRange( PRINTDIALOG_SELECTION ); - - pDlg->SetRangeText( String::CreateFromInt32(nPg) ); - pDlg->EnableRange( PRINTDIALOG_RANGE ); - pDlg->EnableCollate(); - return pDlg; -} - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -PrintDialog* __EXPORT SwView::CreatePrintDialog( Window* pParent ) -{ - // AMA: Hier sollte vielleicht die virtuelle Seitennummer angezeigt werden, - // aber nur, wenn das Drucken virtuelle Seitennummern und nicht wie - // bisher (auch beim SWG 2.0) physikalische beachtet werden. - return ::CreatePrintDialog( pParent, GetWrtShell().GetPhyPageNum(), &GetWrtShell() ); -} - -/*-------------------------------------------------------------------- Beschreibung: Print-Dispatcher --------------------------------------------------------------------*/ |