summaryrefslogtreecommitdiff
path: root/starmath/source
diff options
context:
space:
mode:
authorCarsten Driesner <cd@openoffice.org>2011-01-21 17:18:37 +0100
committerCarsten Driesner <cd@openoffice.org>2011-01-21 17:18:37 +0100
commit3b3b5fddf1c0710db2a3c4ec30cc60646dd89892 (patch)
treec291d484cfdf8637900f874b864f087b8aaecad2 /starmath/source
parenta0495fb8cd5a320fc2ffc983c2e9e80ac27eb8e2 (diff)
parentd0e975c37f80f242dd345d02570b23a0367caf84 (diff)
removetooltypes01: Rebase to DEV300m98
Diffstat (limited to 'starmath/source')
-rw-r--r--starmath/source/document.cxx2
-rw-r--r--starmath/source/math_pch.cxx833
-rwxr-xr-x[-rw-r--r--]starmath/source/smres.src6
-rwxr-xr-xstarmath/source/unomodel.cxx36
-rwxr-xr-xstarmath/source/view.cxx2
5 files changed, 20 insertions, 859 deletions
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 5a3d26a87a..dc575e685f 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 95eb42a8f4..0000000000
--- 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 0ce3cbce24..4b3f9886e4 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 10916de3bc..b15afa71b4 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 6c1670eaeb..12a657daae 100755
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1156,7 +1156,7 @@ void SmViewShell::Impl_Print(
rOutDev.Pop();
}
-sal_uInt16 SmViewShell::Print(SfxProgress & /*rProgress*/, sal_Bool /*bIsAPI*/, PrintDialog * /*pPrintDialog*/)
+sal_uInt16 SmViewShell::Print(SfxProgress & /*rProgress*/, sal_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!!" );