diff options
| author | Andre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM> | 2010-06-02 15:26:12 +0200 |
|---|---|---|
| committer | Andre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM> | 2010-06-02 15:26:12 +0200 |
| commit | 5ad79ff63008de36accc910d474f2e85b4d8d9e1 (patch) | |
| tree | e53102eb1d03e0003486e03a83378474d624e808 /sd | |
| parent | 3660c4324cf2da169d24e8cc1e1662faedee935e (diff) | |
| parent | 38c1d35d15a0adc980c2355ff97ce327645cd954 (diff) | |
renaissance1: merge with DEV300_m80
Diffstat (limited to 'sd')
98 files changed, 530 insertions, 2616 deletions
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index fdf5f8c7db18..7e92020eb88f 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -477,7 +477,6 @@ #include "sfx2/tabdlg.hxx" #include "sfx2/tbxctrl.hxx" #include "sfx2/templdlg.hxx" -#include "sfx2/topfrm.hxx" #include "sfx2/tplpitem.hxx" #include "sfx2/viewfac.hxx" #include "sfx2/viewfrm.hxx" diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx index 6dd9b08ea442..6efd1cbe89f2 100644 --- a/sd/inc/pres.hxx +++ b/sd/inc/pres.hxx @@ -39,7 +39,6 @@ enum PresObjKind PRESOBJ_ORGCHART, PRESOBJ_TABLE, PRESOBJ_IMAGE, - PRESOBJ_BACKGROUND, PRESOBJ_PAGE, PRESOBJ_HANDOUT, PRESOBJ_NOTES, diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index dff2344a5395..0dad3ca237cb 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -69,6 +69,11 @@ class DrawDocShell; class SdGlobalResourceContainer; } +namespace com { namespace sun { namespace star { namespace frame { + class XFrame; +} } } } + + // ---------------------- // - SdOptionStreamMode - // ---------------------- @@ -165,8 +170,8 @@ private: SfxFrame* ExecuteNewDocument( SfxRequest& rReq ); static void ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewFrame, const sal_Int32 eMedium ); - static SfxFrame* CreateEmptyDocument( DocumentType eDocType, SfxFrame* pTargetFrame = 0 ); - static SfxFrame* CreateFromTemplate( const String& rTemplatePath, SfxFrame* pTargetFrame = 0 ); + static SfxFrame* CreateEmptyDocument( DocumentType eDocType, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame ); + static SfxFrame* CreateFromTemplate( const String& rTemplatePath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame ); /** The resource container controls the lifetime of some singletons. */ diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 76d0317fe735..51a1a03d838a 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -157,8 +157,6 @@ protected: /** a helper class to manipulate effects inside the main sequence */ boost::shared_ptr< sd::MainSequence > mpMainSequence; - void AdjustBackgroundSize(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage(); SfxItemSet* mpItems; @@ -194,11 +192,13 @@ public: sd::ShapeList& GetPresentationShapeList() { return maPresentationShapeList; } + void EnsureMasterPageDefaultBackground(); SdrObject* CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rectangle& rRect, BOOL bInsert=FALSE); SdrObject* CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert); SdrObject* GetPresObj(PresObjKind eObjKind, int nIndex = 1 ); PresObjKind GetPresObjKind(SdrObject* pObj) const; String GetPresObjText(PresObjKind eObjKind) const; + SfxStyleSheet* GetStyleSheetForMasterPageBackground() const; SfxStyleSheet* GetStyleSheetForPresObj(PresObjKind eObjKind) const; bool RestoreDefaultText( SdrObject* pObj ); diff --git a/sd/inc/segdefs.hxx b/sd/inc/segdefs.hxx deleted file mode 100644 index fc06d39b4ac1..000000000000 --- a/sd/inc/segdefs.hxx +++ /dev/null @@ -1,29 +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. - * - ************************************************************************/ -#include <segdefs_.hxx> - - diff --git a/sd/inc/segdefs_.hxx b/sd/inc/segdefs_.hxx deleted file mode 100644 index a93071b463b6..000000000000 --- a/sd/inc/segdefs_.hxx +++ /dev/null @@ -1,1400 +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. - * - ************************************************************************/ -#define app_01 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define app_04 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define app_05 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define app_0a SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define app2_01 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define app2_03 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define app2_06 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define app4_01 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define splcfg_01 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define splcfg_04 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define app5_01 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define optsitem_01 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define optsitem_02 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define optsitem_03 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define optsitem_04 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define optsitem_06 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define optsitem_07 SEG_SEGCLASS(STARTING_SEG000,STARTING_CODE) -#define drawdoc2_04 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviewsa_0a SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drawdoc_11 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drawdoc2_03 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdpage_11 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drawdoc_0e SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define stlsheet_06 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drawview_06 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdview_07 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drawview_09 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews5_08 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_06 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdview_11 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drawview_04 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews5_01 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define viewshel_07 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fudraw_0b SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fudraw_04 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fusel_04 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define viewshel_0a SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews4_08 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_09 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews4_0b SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fudraw_09 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fusel_07 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews4_01 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviewsa_06 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define viewshel_06 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fupoor_03 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define docshel2_04 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews1_01 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews5_07 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews1_02 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fupoor_01 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fudraw_01 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fusel_08 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fudraw_0a SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fupoor_04 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fupoor_02 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fudraw_02 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews7_02 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define viewshel_08 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews6_07 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define tbxitem_01 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define tbxitem_02 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define docshell_07 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drawdoc2_0c SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define docshell_0a SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define docshel4_1d SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define stlsheet_07 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_20 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define docshell_08 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define docshell_06 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define viewshe2_16 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_0c SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fudraw_0e SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define fupoor_12 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define docshel4_0b SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews1_0b SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews7_01 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews7_03 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdview_0a SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define tbxitem_03 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define drviews3_06 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_07 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdpage_03 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define viewshe2_01 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_14 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_1b SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_1c SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_19 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_17 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_18 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_1a SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_15 SEG_SEGCLASS(STARTWORK_SEG000,STARTWORK_CODE) -#define sdwindow_0d SEG_SEGCLASS(STARTWORK_SEG001,STARTWORK_CODE) -#define sdwindow_04 SEG_SEGCLASS(STARTWORK_SEG001,STARTWORK_CODE) -#define sdpage2_08 SEG_SEGCLASS(STARTWORK_SEG001,STARTWORK_CODE) -#define sdruler_06 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define viewshe2_09 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdwindow_0e SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdwindow_0f SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define outlview_0f SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define outlview_09 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define fuoltext_06 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define outlnvsh_1c SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define outlnvsh_11 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define outlview_0a SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdwindow_21 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define outlnvsh_15 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define viewshe2_07 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdwindow_11 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdwindow_10 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdwindow_12 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define viewshe2_08 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews1_06 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews4_02 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews5_05 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define viewshel_10 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define viewshel_12 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdwindow_13 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews1_10 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define viewshel_13 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define viewshel_0f SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdpage_1f SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews1_1c SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews5_06 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews5_04 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews1_13 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdruler_03 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define sdruler_01 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviews1_14 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define app3_01 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define docshel4_1c SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drviewsh_01 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define docshell_02 SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define docshel4_0e SEG_SEGCLASS(STARTSLICE_SEG000,STARTSLICE_CODE) -#define drawdoc2_07 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define drawdoc2_09 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define drawdoc2_0e SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage2_05 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage2_07 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define drawdoc_04 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_01 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define outlview_0c SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_0e SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_0d SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define drawdoc2_13 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_19 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_04 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_05 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define drawdoc_13 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdoutl_01 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define drawdoc_12 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define outlnvsh_01 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdview_01 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define drawdoc2_05 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define drtxtob_01 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_1d SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_1b SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_12 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define sdpage_13 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define stlpool_03 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define stlsheet_01 SEG_SEGCLASS(STARTSLICE_SEG001,STARTSLICE_CODE) -#define app3_02 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define fusel_01 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define fusel_02 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define drviewsa_05 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define drawdoc2_0d SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlview_14 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlview_0b SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define frmview_04 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define sdview_02 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define sdview_06 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define drawview_02 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlnvsh_05 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define fuoltext_02 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlview_02 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define fuoutl_02 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define fuoltext_08 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlview_12 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlview_18 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlview_01 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlview_13 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define outlnvsh_14 SEG_SEGCLASS(STARTSLICE_SEG002,STARTSLICE_CODE) -#define drtxtob_04 SEG_SEGCLASS(STARTSLICE_SEG003,STARTSLICE_CODE) -#define outlview_16 SEG_SEGCLASS(STARTSLICE_SEG003,STARTSLICE_CODE) -#define tbxww_08 SEG_SEGCLASS(STARTSLICE_SEG003,STARTSLICE_CODE) -#define viewshe2_0b SEG_SEGCLASS(STARTSLICE_SEG004,STARTSLICE_CODE) -#define sdpage_1a SEG_SEGCLASS(STARTSLICE_SEG004,STARTSLICE_CODE) -#define sdpage_0a SEG_SEGCLASS(STARTSLICE_SEG004,STARTSLICE_CODE) -#define sdview_03 SEG_SEGCLASS(STARTSLICE_SEG004,STARTSLICE_CODE) -#define outlnvsh_0d SEG_SEGCLASS(STARTSLICE_SEG004,STARTSLICE_CODE) -#define sdview_04 SEG_SEGCLASS(STARTSLICE_SEG004,STARTSLICE_CODE) -#define outlnvsh_0b SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define drviews1_16 SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define sdwindow_05 SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define drviews1_15 SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define drviews1_12 SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define outlnvsh_1e SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define drawdoc2_12 SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define drawdoc_01 SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define stlpool_01 SEG_SEGCLASS(STARTSLICE_SEG005,STARTSLICE_CODE) -#define optsitem_14 SEG_SEGCLASS(STARTSLICE_SEG006,STARTSLICE_CODE) -#define optsitem_16 SEG_SEGCLASS(STARTSLICE_SEG006,STARTSLICE_CODE) -#define optsitem_17 SEG_SEGCLASS(STARTSLICE_SEG006,STARTSLICE_CODE) -#define drviews1_1d SEG_SEGCLASS(STARTSLICE_SEG006,STARTSLICE_CODE) -#define stlsheet_05 SEG_SEGCLASS(STARTSLICE_SEG007,STARTSLICE_CODE) -#define drawdoc4_01 SEG_SEGCLASS(STARTSLICE_SEG007,STARTSLICE_CODE) -#define stlpool_07 SEG_SEGCLASS(STARTSLICE_SEG007,STARTSLICE_CODE) -#define drawdoc_10 SEG_SEGCLASS(STARTSLICE_SEG007,STARTSLICE_CODE) -#define outlnvsh_06 SEG_SEGCLASS(STARTSLICE_SEG008,STARTSLICE_CODE) -#define outlview_03 SEG_SEGCLASS(STARTSLICE_SEG008,STARTSLICE_CODE) -#define viewshel_01 SEG_SEGCLASS(STARTSLICE_SEG008,STARTSLICE_CODE) -#define viewshel_02 SEG_SEGCLASS(STARTSLICE_SEG008,STARTSLICE_CODE) -#define sdwindow_01 SEG_SEGCLASS(STARTSLICE_SEG008,STARTSLICE_CODE) -#define frmview_01 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define frmview_07 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define drviewsa_03 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define frmview_03 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define outlnvsh_03 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define outlnvsh_10 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define fuoutl_01 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define drviewsa_07 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define fuoltext_01 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define fuoltext_07 SEG_SEGCLASS(STARTSLICE_SEG009,STARTSLICE_CODE) -#define drawitem_03 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_06 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define docshell_0b SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define docshell_01 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_02 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_08 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_0c SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_09 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_0e SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_12 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_0f SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_14 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_18 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_15 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_1a SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_1e SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_1b SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_20 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_24 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drawitem_21 SEG_SEGCLASS(STARTSLICE_SEG010,STARTSLICE_CODE) -#define drviews1_11 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define drbezob_01 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define tabcontr_01 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define drawview_01 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define drstdob_01 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define layertab_01 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define sdruler_02 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define sdruler_08 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define docshel2_03 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define docshel2_02 SEG_SEGCLASS(STARTSLICE_SEG011,STARTSLICE_CODE) -#define tbxww_04 SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define viewshe2_1d SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define viewshel_04 SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define docshel2_05 SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define sdwindow_02 SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define drtxtob_02 SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define drstdob_02 SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define drbezob_02 SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define sdruler_04 SEG_SEGCLASS(STARTSLICE_SEG012,STARTSLICE_CODE) -#define tabcontr_02 SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define layertab_02 SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define drviews1_0a SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define outlnvsh_1a SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define app4_02 SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define docdlg_01 SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define tabcontr_04 SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define viewshe2_10 SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define outlnvsh_08 SEG_SEGCLASS(STARTSLICE_SEG013,STARTSLICE_CODE) -#define outlnvsh_09 SEG_SEGCLASS(STARTSLICE_SEG014,STARTSLICE_CODE) -#define outlnvsh_0a SEG_SEGCLASS(STARTSLICE_SEG014,STARTSLICE_CODE) -#define outlnvsh_18 SEG_SEGCLASS(STARTSLICE_SEG014,STARTSLICE_CODE) -#define outlnvsh_19 SEG_SEGCLASS(STARTSLICE_SEG014,STARTSLICE_CODE) -#define tabcontr_08 SEG_SEGCLASS(STARTSLICE_SEG015,STARTSLICE_CODE) -#define drawdoc2_16 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define drviews2_02 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define drawview_05 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define fucopy_01 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define drawview_03 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define sdview_08 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define drviews1_03 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define sdpage2_06 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define sdview_09 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define fudraw_06 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define sdview2_07 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define drviewsc_01 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define fuoltext_04 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define outlview_19 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define sdview_0e SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define futext_04 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define fupoor_05 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define fuconstr_04 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define sdpage2_04 SEG_SEGCLASS(CALLOPT_SEG000,CALLOPT_CODE) -#define viewshel_0b SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define drviews4_09 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define sdwindow_0a SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define fusel_05 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define fudraw_05 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define fupoor_0f SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define drawdoc3_09 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define fusel_03 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define viewshel_09 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define drviews4_07 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define fudraw_03 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define sdwindow_08 SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define viewshe2_1b SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define sdwindow_0b SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define drviews4_0a SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define viewshel_0c SEG_SEGCLASS(WORKSET_SEG000,WORKSET_CODE) -#define viewshel_05 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define drviews8_01 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define drviewsb_01 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define outlnvsh_0f SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuarea_01 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconpol_05 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define sdview_10 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconrec_05 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconstr_05 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_05 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_0a SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_01 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_0b SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_0c SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define sdview_13 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_08 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconstr_07 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconpol_07 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define app6_06 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_0f SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconrec_07 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_0d SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_03 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define sdview_14 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_0e SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_02 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_10 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconbez_05 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconstr_02 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconpol_02 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconpol_08 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconstr_08 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconrec_08 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define futext_09 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconstr_01 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fuconpol_01 SEG_SEGCLASS(SLICES_SEG000,SLICES_CODE) -#define fudraw_0d SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define fupoor_0d SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define futext_11 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define sdwindow_1d SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define sdwindow_1f SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define drviews1_08 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define sdview2_05 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define fuoutl_03 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define sdwindow_1e SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define viewshe2_13 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define outlview_08 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define outlview_0e SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define drawdoc2_0b SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define outlview_0d SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define outlnvsh_0e SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define viewshe2_1c SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define sdwindow_22 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define drviews1_09 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define sdview2_06 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define outlview_1a SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define fuoltext_09 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define fuoltext_0b SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define viewshe2_12 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define outlview_07 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define outlview_10 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define outlview_11 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define drawdoc2_0f SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define fubullet_01 SEG_SEGCLASS(SLICES_SEG001,SLICES_CODE) -#define drviews4_05 SEG_SEGCLASS(SLICES_SEG002,SLICES_CODE) -#define showwin_03 SEG_SEGCLASS(SLICES_SEG002,SLICES_CODE) -#define fuslshow_0c SEG_SEGCLASS(SLICES_SEG002,SLICES_CODE) -#define fupoor_08 SEG_SEGCLASS(SLICES_SEG002,SLICES_CODE) -#define fusel_06 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdpage_02 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdpage2_02 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc_02 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define docshel4_0f SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc3_06 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc3_0a SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define docshell_05 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define stlsheet_02 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define stlpool_02 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define stlpool_06 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define dragserv_03 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc_06 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc3_08 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdoutl_02 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define stlpool_05 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define fuprlout_01 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc_03 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdpage_18 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdpage2_01 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawview_07 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define docshel4_0c SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdiocmpt_01 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define frmview_06 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define stlsheet_03 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdpage2_03 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc_05 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define docshel4_1e SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define frmview_05 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc2_11 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define drawdoc2_14 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define docshel4_14 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define docshel4_0d SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define stlsheet_04 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define viewshe2_1f SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define app6_0a SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdobjpal_12 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdobjpal_11 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdobjpal_14 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdobjpal_06 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdobjpal_02 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define app6_05 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdobjpal_04 SEG_SEGCLASS(SLICES_SEG003,SLICES_CODE) -#define sdview_0c SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define sdobjpal_17 SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define sdobjpal_0c SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define sdobjpal_01 SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define sdobjpal_0d SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define app6_07 SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define app6_0b SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define drviews6_03 SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define sdobjpal_10 SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define drviews6_04 SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define sdobjpal_0e SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define app6_08 SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define sdobjpal_0f SEG_SEGCLASS(SLICES_SEG004,SLICES_CODE) -#define fuconstr_03 SEG_SEGCLASS(SLICES_SEG005,SLICES_CODE) -#define fuconrec_03 SEG_SEGCLASS(SLICES_SEG005,SLICES_CODE) -#define fuconbez_03 SEG_SEGCLASS(SLICES_SEG005,SLICES_CODE) -#define fuconarc_03 SEG_SEGCLASS(SLICES_SEG005,SLICES_CODE) -#define futext_12 SEG_SEGCLASS(SLICES_SEG006,SLICES_CODE) -#define frmview_02 SEG_SEGCLASS(SLICES_SEG006,SLICES_CODE) -#define fuconrec_04 SEG_SEGCLASS(SLICES_SEG006,SLICES_CODE) -#define viewshe2_0a SEG_SEGCLASS(SLICES_SEG006,SLICES_CODE) -#define drviews3_01 SEG_SEGCLASS(SLICES_SEG006,SLICES_CODE) -#define drawdoc2_10 SEG_SEGCLASS(SLICES_SEG007,SLICES_CODE) -#define fuoltext_03 SEG_SEGCLASS(SLICES_SEG007,SLICES_CODE) -#define fuoltext_05 SEG_SEGCLASS(SLICES_SEG007,SLICES_CODE) -#define fuconrec_01 SEG_SEGCLASS(SLICES_SEG007,SLICES_CODE) -#define fuconrec_02 SEG_SEGCLASS(SLICES_SEG007,SLICES_CODE) -#define sdview_0f SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define drtxtob_03 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define outlview_15 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define fuchar_01 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define dlgchar_01 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define dlgchar_02 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define fuolbull_01 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_02 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_04 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define dlgolbul_01 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_03 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_07 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_05 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_0f SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_10 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_0b SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_06 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_01 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_0c SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_09 SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_0a SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_0d SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define enumdlg_0e SEG_SEGCLASS(SLICES_SEG008,SLICES_CODE) -#define sdpage_07 SEG_SEGCLASS(SLICES_SEG009,SLICES_CODE) -#define app1_03 SEG_SEGCLASS(SLICES_SEG009,SLICES_CODE) -#define newfoil_01 SEG_SEGCLASS(SLICES_SEG009,SLICES_CODE) -#define newfoil_03 SEG_SEGCLASS(SLICES_SEG009,SLICES_CODE) -#define newfoil_07 SEG_SEGCLASS(SLICES_SEG009,SLICES_CODE) -#define newfoil_05 SEG_SEGCLASS(SLICES_SEG009,SLICES_CODE) -#define newfoil_02 SEG_SEGCLASS(SLICES_SEG010,SLICES_CODE) -#define newfoil_04 SEG_SEGCLASS(SLICES_SEG010,SLICES_CODE) -#define newfoil_06 SEG_SEGCLASS(SLICES_SEG010,SLICES_CODE) -#define futext_07 SEG_SEGCLASS(SLICES_SEG010,SLICES_CODE) -#define app_02 SEG_SEGCLASS(SLICES_SEG010,SLICES_CODE) -#define sdobjpal_03 SEG_SEGCLASS(SLICES_SEG011,SLICES_CODE) -#define sdobjpal_13 SEG_SEGCLASS(SLICES_SEG011,SLICES_CODE) -#define tabcontr_03 SEG_SEGCLASS(SLICES_SEG011,SLICES_CODE) -#define fuconpol_04 SEG_SEGCLASS(SLICES_SEG011,SLICES_CODE) -#define app2_02 SEG_SEGCLASS(SLICES_SEG011,SLICES_CODE) -#define app1_02 SEG_SEGCLASS(SLICES_SEG011,SLICES_CODE) -#define app6_02 SEG_SEGCLASS(SLICES_SEG011,SLICES_CODE) -#define app2_07 SEG_SEGCLASS(SLICES_SEG012,SLICES_CODE) -#define outlnvsh_1d SEG_SEGCLASS(SLICES_SEG012,SLICES_CODE) -#define drviews1_07 SEG_SEGCLASS(SLICES_SEG012,SLICES_CODE) -#define fuconbez_04 SEG_SEGCLASS(SLICES_SEG012,SLICES_CODE) -#define fupoor_0e SEG_SEGCLASS(SLICES_SEG012,SLICES_CODE) -#define app_08 SEG_SEGCLASS(SLICES_SEG013,SLICES_CODE) -#define sdobjpal_19 SEG_SEGCLASS(SLICES_SEG013,SLICES_CODE) -#define tbxww_01 SEG_SEGCLASS(SLICES_SEG013,SLICES_CODE) -#define tbxww_06 SEG_SEGCLASS(SLICES_SEG013,SLICES_CODE) -#define tbxww_07 SEG_SEGCLASS(SLICES_SEG013,SLICES_CODE) -#define tbxww_05 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fupoor_10 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define unchss_01 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define drviews6_09 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_03 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_06 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_0e SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_11 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_13 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_07 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_07 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define showview_01 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define showwin_07 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_11 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_0d SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_1b SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_08 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_15 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_16 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_1a SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define showwin_05 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_08 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw2_0b SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define showview_03 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define showview_06 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define showview_04 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw2_01 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_0b SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw3_02 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_14 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_0a SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw3_01 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshow_12 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw2_0c SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw3_08 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw3_0b SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw3_0c SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw2_10 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw3_12 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw2_0e SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw3_09 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw2_02 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_21 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_22 SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fuslshw2_0f SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define fader_0f SEG_SEGCLASS(SLICES_SEG014,SLICES_CODE) -#define tbxww_02 SEG_SEGCLASS(SLICES_SEG015,SLICES_CODE) -#define drviews1_19 SEG_SEGCLASS(SLICES_SEG015,SLICES_CODE) -#define fupage_01 SEG_SEGCLASS(SLICES_SEG015,SLICES_CODE) -#define viewshe2_20 SEG_SEGCLASS(SLICES_SEG015,SLICES_CODE) -#define drawdoc2_06 SEG_SEGCLASS(SLICES_SEG015,SLICES_CODE) -#define dlgpage_01 SEG_SEGCLASS(SLICES_SEG015,SLICES_CODE) -#define sdundogr_05 SEG_SEGCLASS(SLICES_SEG015,SLICES_CODE) -#define fuconbez_07 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define fuconstr_06 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define fuconrec_06 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define fuconbez_06 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define fudraw_0c SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define fuslshow_01 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define drawdoc_08 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define drawdoc_09 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define drawdoc_0a SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define drawdoc_0b SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define drawdoc_0c SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define present_01 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define present_03 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define present_04 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define present_02 SEG_SEGCLASS(SLICES_SEG016,SLICES_CODE) -#define fuslshow_02 SEG_SEGCLASS(SLICES_SEG017,SLICES_CODE) -#define fader_02 SEG_SEGCLASS(SLICES_SEG017,SLICES_CODE) -#define mover_02 SEG_SEGCLASS(SLICES_SEG017,SLICES_CODE) -#define showview_02 SEG_SEGCLASS(SLICES_SEG017,SLICES_CODE) -#define fuslshow_0e SEG_SEGCLASS(SLICES_SEG018,SLICES_CODE) -#define fuslshow_0f SEG_SEGCLASS(SLICES_SEG018,SLICES_CODE) -#define docshel4_11 SEG_SEGCLASS(SLICES_SEG018,SLICES_CODE) -#define docshel4_16 SEG_SEGCLASS(SLICES_SEG018,SLICES_CODE) -#define app6_03 SEG_SEGCLASS(SLICES_SEG018,SLICES_CODE) -#define sdobjpal_21 SEG_SEGCLASS(SLICES_SEG018,SLICES_CODE) -#define app6_04 SEG_SEGCLASS(SLICES_SEG018,SLICES_CODE) -#define fuedibez_03 SEG_SEGCLASS(SLICES_SEG019,SLICES_CODE) -#define fuedibez_0a SEG_SEGCLASS(SLICES_SEG019,SLICES_CODE) -#define fuedibez_04 SEG_SEGCLASS(SLICES_SEG019,SLICES_CODE) -#define fuedibez_05 SEG_SEGCLASS(SLICES_SEG019,SLICES_CODE) -#define fuconbez_01 SEG_SEGCLASS(SLICES_SEG020,SLICES_CODE) -#define fuconbez_08 SEG_SEGCLASS(SLICES_SEG020,SLICES_CODE) -#define fader_01 SEG_SEGCLASS(SLICES_SEG020,SLICES_CODE) -#define fupoor_09 SEG_SEGCLASS(SLICES_SEG020,SLICES_CODE) -#define sdview2_01 SEG_SEGCLASS(SLICES_SEG020,SLICES_CODE) -#define mover_01 SEG_SEGCLASS(SLICES_SEG020,SLICES_CODE) -#define showwin_01 SEG_SEGCLASS(SLICES_SEG020,SLICES_CODE) -#define showwin_02 SEG_SEGCLASS(SLICES_SEG020,SLICES_CODE) -#define dragserv_02 SEG_SEGCLASS(SLICES_SEG021,SLICES_CODE) -#define dragserv_04 SEG_SEGCLASS(SLICES_SEG021,SLICES_CODE) -#define dragserv_05 SEG_SEGCLASS(SLICES_SEG021,SLICES_CODE) -#define dragserv_06 SEG_SEGCLASS(SLICES_SEG021,SLICES_CODE) -#define dragserv_08 SEG_SEGCLASS(SLICES_SEG021,SLICES_CODE) -#define stlpool_09 SEG_SEGCLASS(SLICES_SEG022,SLICES_CODE) -#define stlpool_0a SEG_SEGCLASS(SLICES_SEG022,SLICES_CODE) -#define drviews6_08 SEG_SEGCLASS(SLICES_SEG023,SLICES_CODE) -#define fuslshow_09 SEG_SEGCLASS(SLICES_SEG023,SLICES_CODE) -#define fuedibez_07 SEG_SEGCLASS(SLICES_SEG024,SLICES_CODE) -#define fuconbez_02 SEG_SEGCLASS(SLICES_SEG024,SLICES_CODE) -#define fupoor_0b SEG_SEGCLASS(SLICES_SEG024,SLICES_CODE) -#define sdview2_03 SEG_SEGCLASS(SLICES_SEG024,SLICES_CODE) -#define showwin_04 SEG_SEGCLASS(SLICES_SEG025,SLICES_CODE) -#define showwin_06 SEG_SEGCLASS(SLICES_SEG025,SLICES_CODE) -#define fuinsert_01 SEG_SEGCLASS(SLICES_SEG025,SLICES_CODE) -#define graphpro_01 SEG_SEGCLASS(SLICES_SEG025,SLICES_CODE) -#define graphpro_02 SEG_SEGCLASS(SLICES_SEG025,SLICES_CODE) -#define graphpro_03 SEG_SEGCLASS(SLICES_SEG025,SLICES_CODE) -#define fuinsert_02 SEG_SEGCLASS(SLICES_SEG026,SLICES_CODE) -#define fuprlout_02 SEG_SEGCLASS(SLICES_SEG026,SLICES_CODE) -#define fucopy_02 SEG_SEGCLASS(SLICES_SEG026,SLICES_CODE) -#define fucopy_04 SEG_SEGCLASS(SLICES_SEG026,SLICES_CODE) -#define fuline_01 SEG_SEGCLASS(SLICES_SEG026,SLICES_CODE) -#define unprlout_01 SEG_SEGCLASS(SLICES_SEG027,SLICES_CODE) -#define unmovss_01 SEG_SEGCLASS(SLICES_SEG027,SLICES_CODE) -#define stlsheet_08 SEG_SEGCLASS(SLICES_SEG027,SLICES_CODE) -#define copydlg_01 SEG_SEGCLASS(SLICES_SEG027,SLICES_CODE) -#define copydlg_03 SEG_SEGCLASS(SLICES_SEG027,SLICES_CODE) -#define copydlg_02 SEG_SEGCLASS(SLICES_SEG028,SLICES_CODE) -#define copydlg_04 SEG_SEGCLASS(SLICES_SEG028,SLICES_CODE) -#define docshell_0c SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define docshel3_01 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define fusearch_01 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define sdoutl_03 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define app2_04 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define sdoutl_04 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define fusearch_02 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define fuspell_01 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define fuspell_02 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define fusearch_03 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define sdoutl_07 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define fuspell_03 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define sdoutl_05 SEG_SEGCLASS(SLICES_SEG029,SLICES_CODE) -#define viewshe2_04 SEG_SEGCLASS(SLICES_SEG030,SLICES_CODE) -#define viewshe2_05 SEG_SEGCLASS(SLICES_SEG030,SLICES_CODE) -#define sdwindow_16 SEG_SEGCLASS(SLICES_SEG030,SLICES_CODE) -#define outlnvsh_13 SEG_SEGCLASS(SLICES_SEG030,SLICES_CODE) -#define viewshe2_0e SEG_SEGCLASS(SLICES_SEG031,SLICES_CODE) -#define fuzoom_04 SEG_SEGCLASS(SLICES_SEG031,SLICES_CODE) -#define fuzoom_05 SEG_SEGCLASS(SLICES_SEG031,SLICES_CODE) -#define outlnvsh_16 SEG_SEGCLASS(SLICES_SEG031,SLICES_CODE) -#define fuzoom_01 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define fuzoom_02 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define fuzoom_03 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define fuzoom_07 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define fuzoom_08 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define fuolbull_02 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define fuolbull_04 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define newfoil_08 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define app6_09 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define app6_01 SEG_SEGCLASS(SLICES_SEG032,SLICES_CODE) -#define docdlg_04 SEG_SEGCLASS(SLICES_SEG033,SLICES_CODE) -#define docdlg_05 SEG_SEGCLASS(SLICES_SEG033,SLICES_CODE) -#define drviews1_0d SEG_SEGCLASS(SLICES_SEG033,SLICES_CODE) -#define fuconarc_01 SEG_SEGCLASS(SLICES_SEG033,SLICES_CODE) -#define fuconarc_02 SEG_SEGCLASS(SLICES_SEG034,SLICES_CODE) -#define fuconarc_04 SEG_SEGCLASS(SLICES_SEG034,SLICES_CODE) -#define fuconarc_05 SEG_SEGCLASS(SLICES_SEG034,SLICES_CODE) -#define fuconarc_07 SEG_SEGCLASS(SLICES_SEG034,SLICES_CODE) -#define fuconarc_08 SEG_SEGCLASS(SLICES_SEG034,SLICES_CODE) -#define fuedibez_01 SEG_SEGCLASS(SLICES_SEG034,SLICES_CODE) -#define fuedibez_02 SEG_SEGCLASS(SLICES_SEG034,SLICES_CODE) -#define fuedibez_08 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define fupoor_0c SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define fudspord_01 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define fudspord_02 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define fudspord_03 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define fudspord_04 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define fudspord_05 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define fudspord_07 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define fudspord_08 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define futempl_01 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define drawview_08 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define sdview_12 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define tabtempl_01 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define tabtempl_02 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define tabtempl_03 SEG_SEGCLASS(SLICES_SEG035,SLICES_CODE) -#define slidvish_01 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidvish_03 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidvish_0c SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define fuslid_01 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidvish_18 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_05 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_12 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_06 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_0a SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_11 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_01 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_09 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_04 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidview_0b SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define slidvish_1c SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define fuslsel_01 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define fuslsel_08 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define fuslid_06 SEG_SEGCLASS(SLICES_SEG036,SLICES_CODE) -#define drviews4_06 SEG_SEGCLASS(SLICES_SEG037,SLICES_CODE) -#define sdruler_05 SEG_SEGCLASS(SLICES_SEG037,SLICES_CODE) -#define viewshe2_1e SEG_SEGCLASS(SLICES_SEG037,SLICES_CODE) -#define fuslshow_13 SEG_SEGCLASS(SLICES_SEG037,SLICES_CODE) -#define fuinsfil_01 SEG_SEGCLASS(SLICES_SEG037,SLICES_CODE) -#define fuinsfil_07 SEG_SEGCLASS(SLICES_SEG037,SLICES_CODE) -#define fuinsfil_09 SEG_SEGCLASS(SLICES_SEG037,SLICES_CODE) -#define fuinsfil_02 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define fuinsfil_04 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define fuprtmpl_01 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define prlayout_01 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define prlayout_03 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define prlayout_05 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define prlayout_02 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define prlayout_04 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define prltempl_03 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define prltempl_01 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define prltempl_02 SEG_SEGCLASS(SLICES_SEG038,SLICES_CODE) -#define fuprtmpl_02 SEG_SEGCLASS(SLICES_SEG039,SLICES_CODE) -#define docshel4_19 SEG_SEGCLASS(SLICES_SEG039,SLICES_CODE) -#define sdobjpal_08 SEG_SEGCLASS(SLICES_SEG039,SLICES_CODE) -#define sdobjpal_09 SEG_SEGCLASS(SLICES_SEG040,SLICES_CODE) -#define sdobjpal_18 SEG_SEGCLASS(SLICES_SEG041,SLICES_CODE) -#define drviews1_05 SEG_SEGCLASS(SLICES_SEG041,SLICES_CODE) -#define drviews1_0c SEG_SEGCLASS(SLICES_SEG041,SLICES_CODE) -#define fuedibez_06 SEG_SEGCLASS(SLICES_SEG041,SLICES_CODE) -#define unmodpg_01 SEG_SEGCLASS(SLICES_SEG041,SLICES_CODE) -#define unmodpg_06 SEG_SEGCLASS(SLICES_SEG042,SLICES_CODE) -#define drviews5_02 SEG_SEGCLASS(SLICES_SEG042,SLICES_CODE) -#define drviews5_0c SEG_SEGCLASS(SLICES_SEG042,SLICES_CODE) -#define layertab_04 SEG_SEGCLASS(SLICES_SEG043,SLICES_CODE) -#define layertab_08 SEG_SEGCLASS(SLICES_SEG043,SLICES_CODE) -#define sdruler_07 SEG_SEGCLASS(SLICES_SEG043,SLICES_CODE) -#define futxtatt_01 SEG_SEGCLASS(SLICES_SEG043,SLICES_CODE) -#define fusnapln_01 SEG_SEGCLASS(SLICES_SEG043,SLICES_CODE) -#define dlgsnap_01 SEG_SEGCLASS(SLICES_SEG043,SLICES_CODE) -#define dlgsnap_03 SEG_SEGCLASS(SLICES_SEG043,SLICES_CODE) -#define inspage_05 SEG_SEGCLASS(SLICES_SEG044,SLICES_CODE) -#define inspage_06 SEG_SEGCLASS(SLICES_SEG044,SLICES_CODE) -#define sdpage_09 SEG_SEGCLASS(SLICES_SEG045,SLICES_CODE) -#define app_0b SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define app_0c SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define docshell_03 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define drviewsh_02 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_04 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_05 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_06 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_07 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_08 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_09 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_0a SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_0b SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_0d SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_0e SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_0f SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_10 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_11 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_12 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_13 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_14 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_15 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_16 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_17 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_19 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_1a SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_1b SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_1d SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_1e SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define slidvish_1f SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define outlnvsh_04 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define outlnvsh_07 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define outlnvsh_0c SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define outlnvsh_12 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define outlnvsh_17 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define outlnvsh_1b SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define outlnvsh_1f SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define outlnvsh_20 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdobjfac_02 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define drawdoc2_01 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define drawdoc2_02 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define drawdoc2_08 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define drawdoc2_0a SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_09 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_0a SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_0b SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_0c SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_0d SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_0e SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_0f SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_10 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_11 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_12 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_13 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_14 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_15 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define sdattr_16 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define anminfo_01 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define anminfo_02 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define anminfo_03 SEG_SEGCLASS(UNUSED_SEG000,UNUSED_CODE) -#define anminfo_04 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define anminfo_05 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define anminfo_06 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define anminfo_07 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define anminfo_08 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define anminfo_09 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define app3_03 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define app4_03 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define app1_01 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define docshel3_02 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define drviews3_05 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define drviews3_07 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define drviews3_09 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define drviews9_01 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define drviews9_02 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define drviews9_03 SEG_SEGCLASS(UNUSED_SEG001,UNUSED_CODE) -#define drviews9_04 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews4_03 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews4_04 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews6_01 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews6_02 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews6_05 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews6_06 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews7_04 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews7_05 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviews7_06 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviewsa_04 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviewsa_08 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define drviewsa_09 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_02 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_03 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_04 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_05 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_06 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_07 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_09 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_0a SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_0c SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_0d SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_0e SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_0f SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_10 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_11 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define fuslsel_12 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define viewshe2_02 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define viewshe2_03 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE) -#define viewshe2_06 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshe2_0f SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshe2_14 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshe2_17 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshe2_18 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshe2_19 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshe2_1a SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_02 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_03 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_07 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_08 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_0c SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_0d SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_0e SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_0f SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define slidview_10 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslhide_01 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslhide_02 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslprms_01 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslprms_02 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslprms_03 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslprms_04 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslshow_05 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslshow_06 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslshow_15 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuslshow_16 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshel_03 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshel_0e SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshel_11 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define viewshel_14 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuzoom_06 SEG_SEGCLASS(UNUSED_SEG003,UNUSED_CODE) -#define fuscale_01 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuscale_02 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuscale_03 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuscale_04 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_03 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_04 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_05 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_06 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_07 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_0a SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_0d SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_0e SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_0f SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_10 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_11 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuslshw3_13 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuoltext_0a SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define outlview_04 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define outlview_05 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define outlview_06 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define outlview_17 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define futhes_01 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define futhes_02 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuinsfil_03 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuinsfil_05 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuinsfil_06 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuinsfil_08 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuprobjs_01 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuprobjs_02 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define fuolbull_03 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define docshel4_12 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define docshel4_1f SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define app7_01 SEG_SEGCLASS(UNUSED_SEG004,UNUSED_CODE) -#define dlgass_01 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_02 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_03 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_04 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_05 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_06 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_07 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_08 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_09 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_0a SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_0b SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_0c SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_0d SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_0e SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_0f SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_10 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_11 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_12 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define dlgass_13 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define splcfg_02 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define splcfg_03 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define optsitem_05 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define optsitem_08 SEG_SEGCLASS(UNUSED_SEG005,UNUSED_CODE) -#define optsitem_09 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_0a SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_0b SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_0c SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_0d SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_0e SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_0f SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_10 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_11 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_12 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_13 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_15 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_18 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define optsitem_19 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_01 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_03 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_04 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_05 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_06 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_07 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_08 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_0a SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_0b SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_0c SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_0d SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_0e SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_0f SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_10 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_11 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_12 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_13 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_14 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_15 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_16 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_17 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_18 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_19 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define animobjs_1a SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define diactrl_01 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define diactrl_02 SEG_SEGCLASS(UNUSED_SEG006,UNUSED_CODE) -#define diactrl_03 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_04 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_05 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_06 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_07 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_08 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_09 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_0a SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_0b SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_0c SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_0d SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_0e SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_0f SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_10 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_11 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_12 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_13 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_14 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_15 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_16 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_17 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_18 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_19 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_1a SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_1b SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_1c SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_1d SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_1e SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_1f SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_20 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define diactrl_21 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdobjpal_05 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdobjpal_07 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdobjpal_0a SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdobjpal_15 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdobjpal_16 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdobjpal_20 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdview_05 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdview_0d SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdview_15 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdview_16 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdview_17 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define fuexhtml_01 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define fuexhtml_02 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define fuexhtml_03 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define fuexhtml_04 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdundogr_01 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdundogr_02 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdundogr_03 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define sdundogr_04 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define drviews1_0e SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define drviews1_17 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define drviews1_18 SEG_SEGCLASS(UNUSED_SEG007,UNUSED_CODE) -#define drviews1_1a SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define drviews1_1b SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_01 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_02 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_03 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_04 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_05 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_06 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_07 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_08 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_09 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_0a SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_0b SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define undopage_0c SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconarc_06 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedibez_09 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconctl_01 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconctl_02 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconctl_03 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconctl_04 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconctl_05 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconctl_06 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconctl_07 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuconctl_08 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedipo_01 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedipo_02 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedipo_03 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedipo_04 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedipo_05 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedipo_06 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedipo_07 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuedipo_08 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define drviews8_02 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define unmodpg_02 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define unmodpg_03 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define unmodpg_04 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define unmodpg_05 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuslid_02 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuslid_03 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuslid_04 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuslid_05 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fuslid_07 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_05 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_10 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_12 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_14 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_17 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_18 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_19 SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_1c SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_1d SEG_SEGCLASS(UNUSED_SEG008,UNUSED_CODE) -#define fader_1e SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_1f SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_20 SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_23 SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_24 SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_25 SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_26 SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_27 SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_28 SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_29 SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_2a SEG_SEGCLASS(UNUSED_SEG009,UNUSED_CODE) -#define fader_2b SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define fader_2c SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define showview_05 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define showview_07 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define showview_08 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define fupoor_06 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define fupoor_0a SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define fupoor_11 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define sdwindow_03 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define bmcache_01 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define bmcache_02 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define bmcache_03 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_01 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_02 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_03 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_04 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_05 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_06 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_07 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_08 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_09 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_0a SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_0b SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define diadlg_0c SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define unslprms_01 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define unslprms_02 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define unslprms_03 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define unslprms_04 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define mover_03 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define mover_05 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define mover_06 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define mover_07 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define mover_08 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define mover_09 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define fuslshw2_03 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define fuslshw2_04 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define fuslshw2_05 SEG_SEGCLASS(UNUSED_SEG010,UNUSED_CODE) -#define fuslshw2_06 SEG_SEGCLASS(UNUSED_SEG011,UNUSED_CODE) -#define fuslshw2_08 SEG_SEGCLASS(UNUSED_SEG011,UNUSED_CODE) -#define fuslshw2_09 SEG_SEGCLASS(UNUSED_SEG011,UNUSED_CODE) -#define fuslshw2_0a SEG_SEGCLASS(UNUSED_SEG011,UNUSED_CODE) -#define fuslshw2_0d SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define fuslshw2_1a SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define inspagob_01 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define inspagob_02 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define inspagob_03 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define inspagob_04 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define inspagob_05 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define unchss_02 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define unchss_03 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define unchss_04 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define unchss_05 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define unchss_06 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define prlayout_06 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_01 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_06 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_07 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_08 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_09 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_0a SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_0b SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_0c SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_0d SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_0e SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_0f SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_10 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel2_11 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define optdlg_01 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define optdlg_02 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define optdlg_04 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_01 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_02 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_03 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_04 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_05 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_06 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_07 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_08 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define assclass_09 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define drtxtob_05 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel5_01 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel5_02 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define docshel5_03 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define sdclient_01 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define sdclient_02 SEG_SEGCLASS(UNUSED_SEG012,UNUSED_CODE) -#define sdclient_03 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdclient_04 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdclient_05 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdview2_02 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdview2_04 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdview2_08 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdview2_09 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define tabcontr_05 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define tabcontr_06 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define tabcontr_07 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define tabcontr_09 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define tabcontr_0a SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define tabcontr_0b SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define drviews5_03 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define drviews5_09 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define drviews5_0a SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define drviews5_0b SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define drviews5_0d SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define layertab_03 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define layertab_05 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define layertab_06 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define layertab_07 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define layertab_09 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define layertab_0a SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define layertab_0b SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define dlgctrls_01 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdoutl_06 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdoutl_08 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define pubdlg_01 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define pubdlg_02 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define sdruler_09 SEG_SEGCLASS(UNUSED_SEG013,UNUSED_CODE) -#define prntopts_01 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define prntopts_02 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define prntopts_03 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define prntopts_04 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define prntopts_05 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define prntopts_07 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fudraw_07 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fudraw_08 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fulink_01 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define futransf_01 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define futransf_02 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define futransf_03 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fuoaprms_01 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fuoaprms_02 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fuoaprms_03 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fuoaprms_04 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fuinsert_05 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fuinsert_06 SEG_SEGCLASS(UNUSED_SEG014,UNUSED_CODE) -#define fuinsert_09 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define fuinsert_0a SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define fuinsert_0b SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define fulinend_01 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define fuconpol_03 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define fuconpol_06 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define fucopy_03 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define fuparagr_01 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define sdtreelb_02 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define sdtreelb_03 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define sdtreelb_04 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define sdtreelb_05 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define sdtreelb_06 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define sdtreelb_07 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define sdtreelb_08 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define enumdlg_08 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define clview_01 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define clview_02 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define clview_03 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define clview_04 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define clview_05 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define dragserv_01 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define dragserv_07 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_01 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_02 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_03 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_04 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_05 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_07 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_08 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_09 SEG_SEGCLASS(UNUSED_SEG015,UNUSED_CODE) -#define tpoption_0a SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpoption_0b SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpoption_0c SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpoption_0d SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpoption_0e SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpoption_0f SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpoption_10 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_01 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_02 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_03 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_04 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_05 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_06 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_07 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_08 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_0b SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_0c SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpscale_0d SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_01 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_02 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_03 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_04 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_05 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_06 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_07 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_08 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_09 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_0a SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_0b SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_0c SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_0d SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_0e SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_0f SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_10 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_11 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_12 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_13 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_14 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_15 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_16 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_17 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_18 SEG_SEGCLASS(UNUSED_SEG016,UNUSED_CODE) -#define tpeffect_19 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_1a SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_1b SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_1c SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_1d SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_1e SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_1f SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_20 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_21 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_22 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_23 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_24 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_25 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_26 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_27 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_28 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_29 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_2a SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_2b SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_2c SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_2d SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tpeffect_2e SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unoaprms_01 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unoaprms_02 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unoaprms_03 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unoaprms_04 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unprlout_02 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unprlout_03 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unprlout_04 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unprlout_05 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unprlout_06 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unmovss_02 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unmovss_03 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unmovss_04 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unmovss_05 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define unmovss_06 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define tabtempl_04 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define copydlg_05 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define paragr_01 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define inspage_07 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define dlgsnap_02 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define dlgsnap_04 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define dlgsnap_05 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_06 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_08 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_0b SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_0c SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_14 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_15 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_16 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_17 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_1c SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define sdpage_1e SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define drawdoc3_01 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define drawdoc3_02 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define drawdoc3_03 SEG_SEGCLASS(UNUSED_SEG017,UNUSED_CODE) -#define drawdoc3_04 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawdoc3_05 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawdoc3_07 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_01 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_04 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_05 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_07 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_0a SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_0b SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_0d SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_10 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_11 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_13 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_16 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_17 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_19 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_1c SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_1d SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_1f SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_22 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define drawitem_23 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define stlpool_04 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define stlpool_0b SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define pglink_01 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define pglink_02 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define pglink_03 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) -#define pglink_04 SEG_SEGCLASS(UNUSED_SEG018,UNUSED_CODE) diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index d49d743b6dee..7dfeac99121b 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -126,6 +126,8 @@ public: virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acquire (void) throw (); + virtual void SAL_CALL release (void) throw (); protected: void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily ); diff --git a/sd/prj/build.lst b/sd/prj/build.lst index bc8bf923f7e5..87204261b200 100755 --- a/sd/prj/build.lst +++ b/sd/prj/build.lst @@ -44,3 +44,4 @@ sd sd\source\ui\framework\factories nmake - all sd_framework_factories sd sd sd\source\ui\framework\tools nmake - all sd_framework_tools sd_inc NULL sd sd\source\ui\annotations nmake - all sd_uiannotations sd_inc NULL sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL +sd sd\qa\unoapi nmake - all sd_qa_unoapi NULL diff --git a/sd/prj/make.bat b/sd/prj/make.bat deleted file mode 100644 index 7525d0a51632..000000000000 --- a/sd/prj/make.bat +++ /dev/null @@ -1,92 +0,0 @@ -@echo off -REM ***************************************************************** -REM * MAKE -REM * (c) Copyright 1992-1994 STAR DIVISION -REM * Beschreibung: Uebersetzt aktuelle Version -REM * Aufruf: MAKE [Option1 .. OptionN] -REM * Optionen: PRODUCT - Product-Version (FULL) -REM * DEMO - Product-Version (DEMO) -REM * DEPEND - Depend-Listen erzeugen -REM * OPTIMIZE - Version mit Optimierung -REM * DEBUG - Version mit Debuginformationen -REM * PROFILE - Version fuer Profiling -REM * DBGUITL - Version mit Assertions -REM * ESO: PCH - Precompiled Header verwenden -REM ***************************************************************** - -IF "%1" == "" goto Next - -set STEMPFILE=%temp%\temp.mak -echo. >%STEMPFILE% -set MAKECMD=@%STEMPFILE% - -REM *** Parameter parsen *** -:Loop - -IF "%1" == "" goto Next - -IF "%1" == "product" echo product=full >>%STEMPFILE% -IF "%1" == "Product" echo product=full >>%STEMPFILE% -IF "%1" == "PRODUCT" echo product=full >>%STEMPFILE% - -IF "%1" == "demo" echo product=demo >>%STEMPFILE% -IF "%1" == "Demo" echo product=demo >>%STEMPFILE% -IF "%1" == "DEMO" echo product=demo >>%STEMPFILE% - -IF "%1" == "depend" echo depend=true >>%STEMPFILE% -IF "%1" == "Depend" echo depend=true >>%STEMPFILE% -IF "%1" == "DEPEND" echo depend=true >>%STEMPFILE% - -IF "%1" == "optimize" echo optimize=true >>%STEMPFILE% -IF "%1" == "Optimize" echo optimize=true >>%STEMPFILE% -IF "%1" == "OPTIMIZE" echo optimize=true >>%STEMPFILE% - -IF "%1" == "debug" echo debug=true >>%STEMPFILE% -IF "%1" == "Debug" echo debug=true >>%STEMPFILE% -IF "%1" == "DEBUG" echo debug=true >>%STEMPFILE% - -IF "%1" == "profile" echo product=full profile=true >>%STEMPFILE% -IF "%1" == "Profile" echo product=full profile=true >>%STEMPFILE% -IF "%1" == "PROFILE" echo product=full profile=true >>%STEMPFILE% - -IF "%1" == "dbgutil" echo dbgutil=true >>%STEMPFILE% -IF "%1" == "Dbgutil" echo dbgutil=true >>%STEMPFILE% -IF "%1" == "DBGUTIL" echo dbgutil=true >>%STEMPFILE% - -IF "%1" == "seg" echo product=full seg=true >>%STEMPFILE% -IF "%1" == "Seg" echo product=full seg=true >>%STEMPFILE% -IF "%1" == "SEG" echo product=full seg=true >>%STEMPFILE% - -IF "%1" == "tcv" echo product=full tcv=-2000 >>%STEMPFILE% -IF "%1" == "tcv" echo product=full tcv=-2000 >>%STEMPFILE% -IF "%1" == "TCV" echo product=full tcv=-2000 >>%STEMPFILE% - -IF "%1" == "siz" echo product=full siz=true >>%STEMPFILE% -IF "%1" == "Siz" echo product=full siz=true >>%STEMPFILE% -IF "%1" == "SIZ" echo product=full siz=true >>%STEMPFILE% - -IF "%1" == "pch" echo prjpch=true >>%STEMPFILE% -IF "%1" == "Pch" echo prjpch=true >>%STEMPFILE% -IF "%1" == "PCH" echo prjpch=true >>%STEMPFILE% - -IF "%1" == "-i" echo -i >>%STEMPFILE% -IF "%1" == "-I" echo -i >>%STEMPFILE% - -shift -goto Loop - -:Next -REM *** Kommando setzen *** -SET STREECMD=nmake %MAKECMD% - -REM *** Kommando ausfuehren *** -echo ****************************************************** -echo MAKE - (c) 1992-1994 STAR DIVISION -call stree MAKE - -REM *** Aufraeumen *** -IF NOT "%STEMPFILE%" == "" del %STEMPFILE% -SET STREECMD= -set STEMPFILE= -set MAKECMD= -echo on diff --git a/sd/prj/postdlv.btm b/sd/prj/postdlv.btm deleted file mode 100644 index 3db49b3ad126..000000000000 --- a/sd/prj/postdlv.btm +++ /dev/null @@ -1,2 +0,0 @@ -quit - diff --git a/sd/prj/stree.bat b/sd/prj/stree.bat deleted file mode 100644 index 3903ca0043fc..000000000000 --- a/sd/prj/stree.bat +++ /dev/null @@ -1,151 +0,0 @@ -REM ***************************************************************** -REM * STREE -REM * (c) Copyright 1992-1994 STAR DIVISION -REM * Beschreibung: Arbeitet Source-Verzeichnis-Baum von TOOLS ab -REM * Aufruf: STREE DIR -REM * DIR: ALL - Alle Verzeichnisse -REM * MAKE - Alle Verzeichnisse mit MAKEFILE -REM * Umgebung: GUI - Systemversion -REM * COM - Systemversion -REM * GUIBASE - Abhaengiges Source-Verzeichnis -REM * STREECMD - Auszufuehrendes Kommando (z.B. nmake) -REM ***************************************************************** - -REM *** Parameter parsen und Variablen ueberpruefen *** -IF "%GUI%" == "" GOTO Error1 -IF "%COM%" == "" GOTO Error1 -IF "%GUIBASE%" == "" GOTO Error1 - -IF "%1" == "" GOTO Error3 -IF "%STREECMD%" == "" GOTO Error3 - - -REM *** Kommando ausgeben *** -echo Kommando: %STREECMD% - -REM *** In die Root wechseln -cd .. - - -REM *** Include - Verzeichnisse *** -IF NOT "%1" == "ALL" goto NotAll -cd inc -echo ------------------------------------------------------ -cd -%STREECMD% -IF ERRORLEVEL 1 goto Error2 -cd .. - -cd res -echo ------------------------------------------------------ -cd -%STREECMD% -IF ERRORLEVEL 1 goto Error2 -cd .. - -cd source\ui\inc -echo ------------------------------------------------------ -cd -%STREECMD% -IF ERRORLEVEL 1 goto Error2 -cd ..\..\.. - -REM *** Verzeichnisse mit Makefile *** -:NotAll - -cd sdi -echo ------------------------------------------------------ -cd -%STREECMD% -IF ERRORLEVEL 1 goto Error2 -cd .. - -REM stardiv/sd -> ONE - -cd source\ui -cd app -echo ------------------------------------------------------ -cd -%STREECMD% -IF ERRORLEVEL 1 goto Error2 -cd .. - -cd dlg -echo ------------------------------------------------------ -cd -%STREECMD% -IF ERRORLEVEL 1 goto Error2 -cd .. - -cd docshell -echo ------------------------------------------------------ -cd -%STREECMD% -IF ERRORLEVEL 1 goto Error2 -cd .. - -cd view -echo ------------------------------------------------------ -cd -%STREECMD% -IF ERRORLEVEL 1 goto Error2 -cd .. - -cd func -echo ------------------------------------------------------ -cd -%STREECMD% -IF ERRORLEVEL 1 goto Error2 -cd .. - -cd unoidl -echo ------------------------------------------------------ -cd -%STREECMD% -IF ERRORLEVEL 1 goto Error2 -cd ..\.. - -cd core -echo ------------------------------------------------------ -cd -%STREECMD% -IF ERRORLEVEL 1 goto Error2 -cd .. - -cd filter -echo ------------------------------------------------------ -cd -%STREECMD% -IF ERRORLEVEL 1 goto Error2 -cd .. - -echo ------------------------------------------------------ -cd -%STREECMD% -IF ERRORLEVEL 1 goto Error2 -cd .. - -echo ------------------------------------------------------ -cd util -%STREECMD% -IF ERRORLEVEL 1 goto Error2 -cd .. - -echo ------------------------------------------------------ -cd prj -goto End - -REM *** Fehler ausgeben *** -:Error1 -echo Error: Keine Systemversion oder nicht vollstaendig gesetzt ! -goto End -:Error2 -echo Error: Fehler bei Ausfhrung eines Kommandos ! -goto End -:Error3 -echo Error: Falsche Parameter wurden an STREE uebergeben ! -goto End - -REM *** Aufraeumen *** -:End - diff --git a/sd/qa/unoapi/Test.java b/sd/qa/unoapi/Test.java new file mode 100644 index 000000000000..cfb4f13d7743 --- /dev/null +++ b/sd/qa/unoapi/Test.java @@ -0,0 +1,51 @@ +/************************************************************************* +* 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. +************************************************************************/ + +package org.openoffice.sd.qa.unoapi; + +import org.openoffice.Runner; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +public final class Test { + @org.junit.Before public void setUp() throws Exception { + connection.setUp(); + } + + @org.junit.After public void tearDown() + throws InterruptedException, com.sun.star.uno.Exception + { + connection.tearDown(); + } + + @org.junit.Test public void test() { + assertTrue( + Runner.run( + "-sce", "sd.sce", "-xcl", "knownissues.xcl", "-cs", + connection.getDescription())); + } + + private final OfficeConnection connection = new OfficeConnection(); +} diff --git a/sd/qa/unoapi/knownissues.xcl b/sd/qa/unoapi/knownissues.xcl index c3f100506e47..0f28aebd2890 100644 --- a/sd/qa/unoapi/knownissues.xcl +++ b/sd/qa/unoapi/knownissues.xcl @@ -50,3 +50,7 @@ sd.DrawController_OutlineView::com::sun::star::beans::XPropertySet ### i88537 ### sd.DrawController_PresentationView::com::sun::star::beans::XPropertySet + +### i109518 ### +sd.SdXPresentation::com::sun::star::presentation::XPresentation +sd.SdXPresentation::com::sun::star::beans::XPropertySet diff --git a/sd/qa/unoapi/makefile.mk b/sd/qa/unoapi/makefile.mk index 8828b08d6af5..62aefb3f5f71 100644 --- a/sd/qa/unoapi/makefile.mk +++ b/sd/qa/unoapi/makefile.mk @@ -1,7 +1,6 @@ #************************************************************************* -# # 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 @@ -22,19 +21,28 @@ # version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. -# -#************************************************************************* +#***********************************************************************/ -PRJ=..$/.. +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -PRJNAME=sd -TARGET=qa_unoapi +PRJ = ../.. +PRJNAME = sd +TARGET = qa_unoapi -.INCLUDE: settings.mk +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = org/openoffice/sd/qa/unoapi +JAVATESTFILES = Test.java +JAVAFILES = $(JAVATESTFILES) +JARFILES = OOoRunner.jar ridl.jar test.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) +.END +.INCLUDE: settings.mk .INCLUDE: target.mk +.INCLUDE: installationtest.mk -ALLTAR : UNOAPI_TEST +ALLTAR : javatest -UNOAPI_TEST: - +$(SOLARENV)$/bin$/checkapi -sce sd.sce -xcl knownissues.xcl -tdoc $(PWD)$/testdocuments -THRCNT 1 +.END diff --git a/sd/qa/unoapi/sd.sce b/sd/qa/unoapi/sd.sce index 84a5216c5ee1..c964c1ba0090 100644 --- a/sd/qa/unoapi/sd.sce +++ b/sd/qa/unoapi/sd.sce @@ -1,11 +1,11 @@ -o sd.AccessibleDrawDocumentView --o sd.AccessibleOutlineView +#i111199 -o sd.AccessibleOutlineView #i35935# -o sd.AccessibleSlideView --o sd.DrawController_DrawView --o sd.DrawController_HandoutView --o sd.DrawController_NotesView --o sd.DrawController_OutlineView --o sd.DrawController_PresentationView +#i111042# -o sd.DrawController_DrawView +#i111042# -o sd.DrawController_HandoutView +#i111042# -o sd.DrawController_NotesView +#i111043# -o sd.DrawController_OutlineView +#i111042# -o sd.DrawController_PresentationView -o sd.SdDocLinkTargets -o sd.SdDrawPage -o sd.SdDrawPagesAccess @@ -16,7 +16,7 @@ -o sd.SdMasterPagesAccess -o sd.SdPageLinkTargets -o sd.SdXCustomPresentation --o sd.SdXCustomPresentationAccess +#i111329 -o sd.SdXCustomPresentationAccess #i84994# -o sd.SdXImpressDocument -o sd.SdXPresentation #i87746 -o sd.SdXShape diff --git a/sd/res/buttons/glas-blue.zip b/sd/res/buttons/glas-blue.zip Binary files differindex 8eaace3eb91f..93a380b6c522 100644 --- a/sd/res/buttons/glas-blue.zip +++ b/sd/res/buttons/glas-blue.zip diff --git a/sd/res/buttons/glas-green.zip b/sd/res/buttons/glas-green.zip Binary files differindex 9e99fcff6cf0..af1543545442 100644 --- a/sd/res/buttons/glas-green.zip +++ b/sd/res/buttons/glas-green.zip diff --git a/sd/res/buttons/glas-red.zip b/sd/res/buttons/glas-red.zip Binary files differindex 3a6914740e36..914514c7f166 100644 --- a/sd/res/buttons/glas-red.zip +++ b/sd/res/buttons/glas-red.zip diff --git a/sd/res/buttons/round-gorilla.zip b/sd/res/buttons/round-gorilla.zip Binary files differindex 3f75e1180b98..727df6b92e52 100644 --- a/sd/res/buttons/round-gorilla.zip +++ b/sd/res/buttons/round-gorilla.zip diff --git a/sd/res/buttons/round-white.zip b/sd/res/buttons/round-white.zip Binary files differindex 2d2aa97dbfde..9c5f1b2aaa3e 100644 --- a/sd/res/buttons/round-white.zip +++ b/sd/res/buttons/round-white.zip diff --git a/sd/res/buttons/simple.zip b/sd/res/buttons/simple.zip Binary files differindex 5bb1cb5c4907..60c0b095702a 100644 --- a/sd/res/buttons/simple.zip +++ b/sd/res/buttons/simple.zip diff --git a/sd/res/buttons/square-blue.zip b/sd/res/buttons/square-blue.zip Binary files differindex 5db6e2a30b92..86c33465fb6d 100644 --- a/sd/res/buttons/square-blue.zip +++ b/sd/res/buttons/square-blue.zip diff --git a/sd/res/buttons/square-gray.zip b/sd/res/buttons/square-gray.zip Binary files differindex 57b7d37bfc79..31713b7975c3 100644 --- a/sd/res/buttons/square-gray.zip +++ b/sd/res/buttons/square-gray.zip diff --git a/sd/res/buttons/square-green.zip b/sd/res/buttons/square-green.zip Binary files differindex 3b26abce7eba..6962225306d0 100644 --- a/sd/res/buttons/square-green.zip +++ b/sd/res/buttons/square-green.zip diff --git a/sd/res/buttons/square-red.zip b/sd/res/buttons/square-red.zip Binary files differindex 06f0d793ff00..8199cbe736b6 100644 --- a/sd/res/buttons/square-red.zip +++ b/sd/res/buttons/square-red.zip diff --git a/sd/res/buttons/square-yellow.zip b/sd/res/buttons/square-yellow.zip Binary files differindex a264603189e5..27af86075ee5 100644 --- a/sd/res/buttons/square-yellow.zip +++ b/sd/res/buttons/square-yellow.zip diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 4294a55aee4d..e2fdc2f805e5 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -42,7 +42,6 @@ #include <unotools/useroptions.hxx> #include <sfx2/printer.hxx> -#include <sfx2/topfrm.hxx> #include <sfx2/app.hxx> #include <sfx2/linkmgr.hxx> #include <svx/dialogs.hrc> @@ -634,25 +633,6 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) if( aName != pPage->GetName() ) pPage->SetName( aName ); - - SdrObject* pPresObj = pPage->GetPresObj( PRESOBJ_BACKGROUND ) ; - - if( pPage->GetPageKind() == PK_STANDARD ) - { - DBG_ASSERT( pPresObj, "Masterpage without a background object!" ); - if (pPresObj && pPresObj->GetOrdNum() != 0 ) - pPage->NbcSetObjectOrdNum(pPresObj->GetOrdNum(),0); - } - else - { - DBG_ASSERT( pPresObj == NULL, "Non Standard Masterpage with a background object!\n(This assertion is ok for old binary files)" ); - if( pPresObj ) - { - pPage->RemoveObject( pPresObj->GetOrdNum() ); - pPage->RemovePresObj(pPresObj); - SdrObject::Free( pPresObj ); - } - } } // Sprachabhaengige Namen der StandardLayer erzeugen @@ -724,11 +704,6 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) SdPage* pPage = (SdPage*)GetMasterPage(nPage); NewOrLoadCompleted( pPage, pSPool ); - - // BackgroundObjekt vor Selektion schuetzen #62144# - SdrObject* pBackObj = pPage->GetPresObj(PRESOBJ_BACKGROUND); - if(pBackObj) - pBackObj->SetMarkProtect(TRUE); } } diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index aad4bfca227b..950d98a487e9 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -177,6 +177,29 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int nIndex ) return 0; } +/** create background properties */ +void SdPage::EnsureMasterPageDefaultBackground() +{ + if(mbMaster) + { + // no hard attributes on MasterPage attributes + getSdrPageProperties().ClearItem(); + SfxStyleSheet* pSheetForPresObj = GetStyleSheetForMasterPageBackground(); + + if(pSheetForPresObj) + { + // set StyleSheet for background fill attributes + getSdrPageProperties().SetStyleSheet(pSheetForPresObj); + } + else + { + // no style found, assert and set at least XFILL_NONE + OSL_ENSURE(false, "No Style for MasterPageBackground fill found (!)"); + getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE)); + } + } +} + /** creates a presentation object with the given PresObjKind on this page. A user call will be set */ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rectangle& rRect, BOOL /* bInsert */ ) @@ -287,15 +310,6 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec } break; - case PRESOBJ_BACKGROUND: - { - pSdrObj = new SdrRectObj(); - pSdrObj->SetMoveProtect(TRUE); - pSdrObj->SetResizeProtect(TRUE); - pSdrObj->SetMarkProtect(TRUE); - } - break; - case PRESOBJ_HANDOUT: { //Erste Standardseite am SdrPageObj vermerken @@ -446,18 +460,9 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec { SdrLayerAdmin& rLayerAdmin = pModel->GetLayerAdmin(); - if (eObjKind == PRESOBJ_BACKGROUND) - { - // Hintergrund der MasterPage - pSdrObj->SetLayer( rLayerAdmin. - GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE) ); - } - else - { - // Hintergrundobjekte der MasterPage - pSdrObj->SetLayer( rLayerAdmin. - GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE) ); - } + // Hintergrundobjekte der MasterPage + pSdrObj->SetLayer( rLayerAdmin. + GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE) ); } // Objekt am StyleSheet anmelden @@ -524,6 +529,25 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec |* \************************************************************************/ +SfxStyleSheet* SdPage::GetStyleSheetForMasterPageBackground() const +{ + String aName(GetLayoutName()); + String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR )); + USHORT nPos = aName.Search(aSep); + + if (nPos != STRING_NOTFOUND) + { + nPos = nPos + aSep.Len(); + aName.Erase(nPos); + } + + aName += String(SdResId(STR_LAYOUT_BACKGROUND)); + + SfxStyleSheetBasePool* pStShPool = pModel->GetStyleSheetPool(); + SfxStyleSheetBase* pResult = pStShPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE); + return (SfxStyleSheet*)pResult; +} + SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind) const { String aName(GetLayoutName()); @@ -549,10 +573,6 @@ SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind) const aName += String(SdResId(STR_LAYOUT_TITLE)); break; - case PRESOBJ_BACKGROUND: - aName += String(SdResId(STR_LAYOUT_BACKGROUND)); - break; - case PRESOBJ_NOTES: aName += String(SdResId(STR_LAYOUT_NOTES)); break; @@ -718,9 +738,7 @@ void SdPage::CreateTitleAndLayout(BOOL bInit, BOOL bCreate ) **************************************************************************/ if( mePageKind == PK_STANDARD ) { - SdrObject* pMasterBackground = pMasterPage->GetPresObj( PRESOBJ_BACKGROUND ); - if( pMasterBackground == NULL ) - pMasterPage->CreateDefaultPresObj(PRESOBJ_BACKGROUND, true); + pMasterPage->EnsureMasterPageDefaultBackground(); } if( ( (SdDrawDocument*) GetModel() )->GetDocumentType() == DOCUMENT_TYPE_IMPRESS ) @@ -904,15 +922,6 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert) return NULL; } } - else if( eObjKind == PRESOBJ_BACKGROUND ) - { - Point aBackgroundPos ( GetLftBorder(), GetUppBorder() ); - Size aBackgroundSize ( GetSize() ); - aBackgroundSize.Width() -= GetLftBorder() + GetRgtBorder() - 1; - aBackgroundSize.Height() -= GetUppBorder() + GetLwrBorder() - 1; - Rectangle aBackgroundRect(aBackgroundPos, aBackgroundSize); - return CreatePresObj( PRESOBJ_BACKGROUND, FALSE, aBackgroundRect, bInsert ); - } else { DBG_ERROR("SdPage::CreateDefaultPresObj() - unknown PRESOBJ kind" ); @@ -1646,7 +1655,6 @@ void SdPage::SetSize(const Size& aSize) if (aSize != aOldSize) { FmFormPage::SetSize(aSize); - AdjustBackgroundSize(); if (aOldSize.Height() == 10 && aOldSize.Width() == 10) { @@ -1677,7 +1685,6 @@ void SdPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr) nRgt != GetRgtBorder() || nLwr != GetLwrBorder() ) { FmFormPage::SetBorder(nLft, nUpp, nRgt, nLwr); - AdjustBackgroundSize(); } } @@ -1693,7 +1700,6 @@ void SdPage::SetLftBorder(INT32 nBorder) if (nBorder != GetLftBorder() ) { FmFormPage::SetLftBorder(nBorder); - AdjustBackgroundSize(); } } @@ -1709,7 +1715,6 @@ void SdPage::SetRgtBorder(INT32 nBorder) if (nBorder != GetRgtBorder() ) { FmFormPage::SetRgtBorder(nBorder); - AdjustBackgroundSize(); } } @@ -1725,7 +1730,6 @@ void SdPage::SetUppBorder(INT32 nBorder) if (nBorder != GetUppBorder() ) { FmFormPage::SetUppBorder(nBorder); - AdjustBackgroundSize(); } } @@ -1741,7 +1745,6 @@ void SdPage::SetLwrBorder(INT32 nBorder) if (nBorder != GetLwrBorder() ) { FmFormPage::SetLwrBorder(nBorder); - AdjustBackgroundSize(); } } @@ -1756,7 +1759,6 @@ void SdPage::SetBackgroundFullSize( BOOL bIn ) if( bIn != mbBackgroundFullSize ) { mbBackgroundFullSize = bIn; - AdjustBackgroundSize(); } } @@ -1846,18 +1848,10 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR if (pObj) { - USHORT nIndexBackground = 0; // #88084# remember aTopLeft as original TopLeft Point aTopLeft(pObj->GetCurrentBoundRect().TopLeft()); - if (bIsPresObjOnMaster && (pObj == GetPresObj(PRESOBJ_BACKGROUND, nIndexBackground)) ) - { - /************************************************************** - * 1. Praesentationsobjekte auf Handzettelseite sollen nur positioniert werden - * 2. Hintergrundobjekt wird nicht skaliert - **************************************************************/ - } - else if (!pObj->IsEdgeObj()) + if (!pObj->IsEdgeObj()) { /************************************************************** * Objekt skalieren @@ -1972,7 +1966,6 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR } pOutlineSheet->GetItemSet().Put(aTempSet); - pOutlineSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)); } } @@ -2570,43 +2563,6 @@ const String& SdPage::GetName() const return maCreatedPageName; } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - -void SdPage::AdjustBackgroundSize() -{ - SdrObject* pObj = GetPresObj(PRESOBJ_BACKGROUND); - - if (pObj) - { - // Hintergrund-Objekt verschieben - pObj->SetMoveProtect(FALSE); - pObj->SetResizeProtect(FALSE); - - { - sd::ScopeLockGuard aGuard( maLockAutoLayoutArrangement ); - - Point aBackgroundPos; - Size aBackgroundSize( GetSize() ); - - if( !mbBackgroundFullSize ) - { - aBackgroundPos = Point( GetLftBorder(), GetUppBorder() ); - aBackgroundSize.Width() -= GetLftBorder() + GetRgtBorder() - 1; - aBackgroundSize.Height() -= GetUppBorder() + GetLwrBorder() - 1; - } - Rectangle aBackgroundRect (aBackgroundPos, aBackgroundSize); - pObj->SetLogicRect(aBackgroundRect); - } - pObj->SetMoveProtect(TRUE); - pObj->SetResizeProtect(TRUE); - } -} - /************************************************************************* |* |* diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index e592ba45a27e..c91fee735954 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -1437,6 +1437,8 @@ void SAL_CALL SdStyleSheetPool::dispose() throw (RuntimeException) // EndListening( *mpDoc ); mpDoc = 0; + + Clear(); } } @@ -1475,3 +1477,15 @@ SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet ) } // -------------------------------------------------------------------- + +void SAL_CALL SdStyleSheetPool::acquire (void) throw () +{ + SdStyleSheetPoolBase::acquire(); +} + +void SAL_CALL SdStyleSheetPool::release (void) throw () +{ + SdStyleSheetPoolBase::release(); +} + +// -------------------------------------------------------------------- diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index a306b956c897..7d28e5285f40 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -111,16 +111,14 @@ sal_Bool SdCGMFilter::Import() if( ( nRetValue &~0xff000000 ) != 0xffffff ) // maybe the backgroundcolor is already white { // so we must not set a master page mrDocument.StopWorkStartupDelay(); - SdrObject* pObj = mrDocument.GetMasterSdPage(0, PK_STANDARD)->GetPresObj(PRESOBJ_BACKGROUND); + SdPage* pSdPage = mrDocument.GetMasterSdPage(0, PK_STANDARD); - if( pObj ) + if(pSdPage) { - SfxItemSet aSet( mrDocument.GetPool() ); - Color aColor( (BYTE)( nRetValue >> 16 ), (BYTE)( nRetValue >> 8 ), (BYTE)( nRetValue >> 16 ) ); - - aSet.Put( XFillColorItem( String(), aColor ) ); - aSet.Put( XFillStyleItem( XFILL_SOLID ) ); - pObj->SetMergedItemSetAndBroadcast( aSet ); + // set PageFill to given color + const Color aColor((BYTE)(nRetValue >> 16), (BYTE)(nRetValue >> 8), (BYTE)(nRetValue >> 16)); + pSdPage->getSdrPageProperties().PutItem(XFillColorItem(String(), aColor)); + pSdPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_SOLID)); } } } diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index f07245d1ff31..c9d083db86d9 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -5358,6 +5358,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a pClientTextBox->Write( pOut->GetData(), pOut->Tell() ); delete pOut, aTextRule.pOut = NULL; } + if ( aExtBu.Tell() ) + { + if ( !pClientData ) + pClientData = new SvMemoryStream( 0x200, 0x200 ); + ImplProgTagContainer( pClientData, &aExtBu ); + } } } } diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index e65a07d2e7fc..be6da8ddb74b 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -72,7 +72,7 @@ ButtonsImpl::ButtonsImpl( const OUString& rURL ) { try { - mxStorage = comphelper::OStorageHelper::GetStorageFromURL( rURL, ElementModes::READ ); + mxStorage = comphelper::OStorageHelper::GetStorageOfFormatFromURL( ZIP_STORAGE_FORMAT_STRING, rURL, ElementModes::READ ); } catch( Exception& ) { diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 89c823dc6493..59d5b5e0b98a 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -255,6 +255,8 @@ sal_Bool ImplSdPPTImport::Import() return FALSE; pSdrModel->setLock( sal_True ); + pSdrModel->EnableUndo(false); + SdrOutliner& rOutl = mpDoc->GetDrawOutliner(); sal_uInt32 nControlWord = rOutl.GetEditEngine().GetControlWord(); nControlWord |= EE_CNTRL_ULSPACESUMMATION; @@ -861,35 +863,29 @@ sal_Bool ImplSdPPTImport::Import() { if ( pMPage->GetPageKind() == PK_STANDARD ) { - // Hintergrundobjekt gefunden (erstes Objekt der MasterPage) - pObj->SetEmptyPresObj( TRUE ); - pObj->SetUserCall( pMPage ); - pObj->SetLayer( mnBackgroundLayerID ); - - // Schatten am ersten Objekt (Hintergrundobjekt) entfernen (#57918#) - SfxItemSet aTempAttr( mpDoc->GetPool() ); - aTempAttr.Put( pObj->GetMergedItemSet() ); + // transform data from imported background object to new form + // and delete the object. It was used as container to transport + // the attributes of the MasterPage background fill + SfxStyleSheet* pSheet = pMPage->GetStyleSheetForMasterPageBackground(); - BOOL bShadowIsOn = ( (SdrShadowItem&)( aTempAttr.Get( SDRATTR_SHADOW ) ) ).GetValue(); - if( bShadowIsOn ) + if(pSheet) { - aTempAttr.Put( SdrShadowItem( FALSE ) ); - pObj->SetMergedItemSet( aTempAttr ); - } - SfxStyleSheet* pSheet = pMPage->GetStyleSheetForPresObj( PRESOBJ_BACKGROUND ); - if ( pSheet ) - { // StyleSheet fuellen und dem Objekt zuweisen + // if we have a StyleSheet (for Masterpages), set attributes there and use it pSheet->GetItemSet().ClearItem(); - pSheet->GetItemSet().Put( pObj->GetMergedItemSet() ); - aTempAttr.ClearItem(); - pObj->SetMergedItemSet( aTempAttr ); - pObj->SetStyleSheet( pSheet, FALSE ); + pSheet->GetItemSet().Put(pObj->GetMergedItemSet()); + pMPage->getSdrPageProperties().ClearItem(); + pMPage->getSdrPageProperties().SetStyleSheet(pSheet); + } + else + { + // without StyleSheet, set attributes directly. This + // should not be done at all and is an error (will be asserted by SdrPage) + pMPage->getSdrPageProperties().ClearItem(); + pMPage->getSdrPageProperties().PutItemSet(pObj->GetMergedItemSet()); } - pMPage->InsertPresObj( pObj, PRESOBJ_BACKGROUND ); - // #110094#-15 - // tell the page that it's visualization has changed - pMPage->ActionChanged(); + pMPage->RemoveObject(pObj->GetOrdNum()); + SdrObject::Free(pObj); } } } @@ -1419,6 +1415,7 @@ sal_Bool ImplSdPPTImport::Import() xDocProps->setTemplateName(::rtl::OUString()); pSdrModel->setLock( sal_False ); + pSdrModel->EnableUndo(true); return bOk; } diff --git a/sd/source/ui/animations/CustomAnimation.src b/sd/source/ui/animations/CustomAnimation.src index 1320e75d3e36..449107f05c75 100644 --- a/sd/source/ui/animations/CustomAnimation.src +++ b/sd/source/ui/animations/CustomAnimation.src @@ -202,7 +202,7 @@ Menu RID_CUSTOMANIMATION_FONTSTYLE_POPUP MenuItem { Identifier = CM_UNDERLINED ; - Text [ en-US ] = "Underlinded" ; + Text [ en-US ] = "Underlined" ; }; }; }; diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 36c824e1b919..aa42fec50f9c 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -338,7 +338,7 @@ void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq) if( pArgs ) { const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == pArgs->GetItemState( SID_DELETE_POSTIT, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( SID_DELETEALLBYAUTHOR_POSTIT, TRUE, &pPoolItem ) ) { OUString sAuthor( (( const SfxStringItem* ) pPoolItem )->GetValue() ); DeleteAnnotationsByAuthor( sAuthor ); @@ -1072,7 +1072,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation USHORT nId = 0; // set slot images - Reference< ::com::sun::star::frame::XFrame > xFrame( mrBase.GetMainViewShell()->GetViewFrame()->GetFrame()->GetFrameInterface() ); + Reference< ::com::sun::star::frame::XFrame > xFrame( mrBase.GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface() ); if( xFrame.is() ) { const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); @@ -1091,7 +1091,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation } } - nId = pMenu->Execute( pParent, rContextRect, POPUPMENU_EXECUTE_DOWN ); + nId = pMenu->Execute( pParent, rContextRect, POPUPMENU_EXECUTE_DOWN|POPUPMENU_NOMOUSEUPCLOSE ); switch( nId ) { case SID_REPLYTO_POSTIT: diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index eaacc332725d..ad6709c776ce 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -780,6 +780,8 @@ void AnnotationWindow::Command( const CommandEvent& rCEvt ) { if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) { + if( mpMeta->IsVisible() &&(mpMeta->GetPosPixel().Y() < rCEvt.GetMousePosPixel().Y()) ) + return; mrManager.ExecuteAnnotationContextMenu( mxAnnotation, this, Rectangle(rCEvt.GetMousePosPixel(),Size(1,1)) ); } else diff --git a/sd/source/ui/app/makefile.mk b/sd/source/ui/app/makefile.mk index 84fbe3676b97..d64d9b672f7e 100644 --- a/sd/source/ui/app/makefile.mk +++ b/sd/source/ui/app/makefile.mk @@ -95,11 +95,7 @@ $(INCCOM)$/sddll0.hxx: makefile.mk .IF "$(GUI)"=="UNX" echo \#define DLL_NAME \"libsd$(DLLPOSTFIX)$(DLLPOST)\" >$@ .ELSE # "$(GUI)"=="UNX" -.IF "$(USE_SHELL)"!="4nt" echo \#define DLL_NAME \"sd$(DLLPOSTFIX).DLL\" >$@ -.ELSE # "$(USE_SHELL)"!="4nt" - echo #define DLL_NAME "sd$(DLLPOSTFIX).DLL" >$@ -.ENDIF # "$(USE_SHELL)"!="4nt" .ENDIF # "$(GUI)"=="UNX" LOCALIZE_ME = tbxids_tmpl.src menuids2_tmpl.src menu_tmpl.src menuids_tmpl.src menuids4_tmpl.src popup2_tmpl.src toolbox2_tmpl.src menuportal_tmpl.src menuids3_tmpl.src diff --git a/sd/source/ui/app/menuportal_tmpl.src b/sd/source/ui/app/menuportal_tmpl.src index e96ca6101fdc..29d7c6da1e4a 100644 --- a/sd/source/ui/app/menuportal_tmpl.src +++ b/sd/source/ui/app/menuportal_tmpl.src @@ -68,7 +68,6 @@ Menu SD_MENU_PORTAL MI ( ITEM_FILE_PRINTDOC ) MI ( ITEM_FILE_SETUPPRINTER ) SEPARATOR - MI ( ITEM_FILE_BACKTOWEBTOP ) MI ( ITEM_FILE_LOGOUT ) }; }; diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 6f7e34a3c0fe..e3181f792d04 100644..100755 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -675,7 +675,8 @@ BOOL SdOptionsMisc::ReadData( const Any* pValues ) if( pValues[13].hasValue() ) SetDefaultObjectSizeHeight( *(sal_uInt32*) pValues[ 13 ].getValue() ); if( pValues[14].hasValue() ) SetPrinterIndependentLayout( *(sal_uInt16*) pValues[ 14 ].getValue() ); - if( pValues[15].hasValue() ) SetShowComments( *(sal_Bool*) pValues[ 11 ].getValue() ); + if( pValues[15].hasValue() ) + SetShowComments( *(sal_Bool*) pValues[ 15 ].getValue() ); // just for Impress if( GetConfigId() == SDCFG_IMPRESS ) @@ -787,6 +788,7 @@ SdOptionsMiscItem::SdOptionsMiscItem( USHORT _nWhich, SdOptions* pOpts, ::sd::Fr maOptionsMisc.SetPreviewTransitions(pOpts->IsPreviewTransitions()); maOptionsMisc.SetDisplay(pOpts->GetDisplay()); + maOptionsMisc.SetShowComments( pOpts->IsShowComments() ); } if( pView ) @@ -865,6 +867,7 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const // #90356# pOpts->SetShowUndoDeleteWarning( maOptionsMisc.IsShowUndoDeleteWarning() ); pOpts->SetPrinterIndependentLayout( maOptionsMisc.GetPrinterIndependentLayout() ); + pOpts->SetShowComments( maOptionsMisc.IsShowComments() ); // #97016# pOpts->SetDefaultObjectSizeWidth( maOptionsMisc.GetDefaultObjectSizeWidth() ); pOpts->SetDefaultObjectSizeHeight( maOptionsMisc.GetDefaultObjectSizeHeight() ); diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index fcc22b73f424..743b7a35610d 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -84,6 +84,8 @@ using ::sd::framework::FrameworkHelper; +using ::com::sun::star::uno::Reference; +using ::com::sun::star::frame::XFrame; namespace { @@ -302,13 +304,7 @@ void SdModule::OutlineToImpress (SfxRequest& rRequest) } SFX_REQUEST_ARG( rRequest, pFrmItem, SfxFrameItem, SID_DOCFRAME, FALSE); - if ( pFrmItem ) - { - SfxFrame* pFrame = pFrmItem->GetFrame(); - pFrame->InsertDocument( pDocSh ); - } - else - SfxViewFrame::CreateViewFrame(*pDocSh, ::sd::OUTLINE_FACTORY_ID); + SfxViewFrame::LoadDocumentIntoFrame( *pDocSh, pFrmItem, ::sd::OUTLINE_FACTORY_ID ); ::sd::ViewShell* pViewSh = pDocSh->GetViewShell(); @@ -533,7 +529,7 @@ void SdModule::AddSummaryPage (SfxViewFrame* pViewFrame, SdDrawDocument* pDocume } } -SfxFrame* SdModule::CreateFromTemplate( const String& rTemplatePath, SfxFrame* pTargetFrame ) +SfxFrame* SdModule::CreateFromTemplate( const String& rTemplatePath, const Reference< XFrame >& i_rFrame ) { SfxFrame* pFrame = 0; @@ -552,17 +548,9 @@ SfxFrame* SdModule::CreateFromTemplate( const String& rTemplatePath, SfxFrame* p } else if( pDocShell ) { - if ( pTargetFrame ) - { - pFrame = pTargetFrame; - pFrame->InsertDocument( pDocShell ); - } - else - { - SfxViewFrame* pViewFrame = SfxViewFrame::CreateViewFrame( *pDocShell ); - if( pViewFrame ) - pFrame = pViewFrame->GetFrame(); - } + SfxViewFrame* pViewFrame = SfxViewFrame::LoadDocumentIntoFrame( *pDocShell, i_rFrame ); + OSL_ENSURE( pViewFrame, "SdModule::CreateFromTemplate: no view frame - was the document really loaded?" ); + pFrame = pViewFrame ? &pViewFrame->GetFrame() : NULL; } return pFrame; @@ -574,10 +562,10 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) SfxFrame* pFrame = 0; if ( SvtModuleOptions().IsImpress() ) { - SfxFrame* pTargetFrame = 0; - SFX_REQUEST_ARG( rReq, pFrmItem, SfxFrameItem, SID_DOCFRAME, FALSE); + Reference< XFrame > xTargetFrame; + SFX_REQUEST_ARG( rReq, pFrmItem, SfxUnoFrameItem, SID_FILLFRAME, FALSE); if ( pFrmItem ) - pTargetFrame = pFrmItem->GetFrame(); + xTargetFrame = pFrmItem->GetFrame(); bool bMakeLayoutVisible = false; SfxViewFrame* pViewFrame = NULL; @@ -597,12 +585,12 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) if( aStandardTemplate.Len() > 0 ) { //load a template document - pFrame = CreateFromTemplate( aStandardTemplate, pTargetFrame ); + pFrame = CreateFromTemplate( aStandardTemplate, xTargetFrame ); } else { //create an empty document - pFrame = CreateEmptyDocument( DOCUMENT_TYPE_IMPRESS, pTargetFrame ); + pFrame = CreateEmptyDocument( DOCUMENT_TYPE_IMPRESS, xTargetFrame ); bMakeLayoutVisible = true; } } @@ -635,7 +623,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) SfxStringItem aReferer( SID_REFERER, UniString() ); SfxStringItem aPassword( SID_PASSWORD, aPasswrd ); - if ( pTargetFrame ) + if ( xTargetFrame.is() ) { SfxAllItemSet aSet( *rReq.GetArgs()->GetPool() ); aSet.Put( aFile ); @@ -645,10 +633,10 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) if (aPasswrd.Len() > 0) aSet.Put( aPassword ); - const SfxPoolItem* pRet = pTargetFrame->LoadDocumentSynchron( aSet ); + const SfxPoolItem* pRet = SfxFrame::OpenDocumentSynchron( aSet, xTargetFrame ); const SfxViewFrameItem* pFrameItem = PTR_CAST( SfxViewFrameItem, pRet ); if ( pFrameItem && pFrameItem->GetFrame() ) - pFrame = pFrameItem->GetFrame()->GetFrame(); + pFrame = &pFrameItem->GetFrame()->GetFrame(); } else { @@ -667,7 +655,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) const SfxPoolItem* pRet = SFX_APP()->ExecuteSlot (aRequest); const SfxViewFrameItem* pFrameItem = PTR_CAST( SfxViewFrameItem, pRet ); if ( pFrameItem ) - pFrame = pFrameItem->GetFrame()->GetFrame(); + pFrame = &pFrameItem->GetFrame()->GetFrame(); } catch (::com::sun::star::uno::Exception e) { @@ -691,20 +679,9 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) SfxObjectShell* pShell = xShell; if( pShell ) { - if ( pTargetFrame ) - { - pFrame = pTargetFrame; - pFrame->InsertDocument( pShell ); - pViewFrame = pFrame->GetCurrentViewFrame(); - } - else - { - pViewFrame = SfxViewFrame::CreateViewFrame( *pShell ); - if( pViewFrame ) - pFrame = pViewFrame->GetFrame(); - } - + pViewFrame = SfxViewFrame::LoadDocumentIntoFrame( *pShell, xTargetFrame ); DBG_ASSERT( pViewFrame, "no ViewFrame!!" ); + pFrame = pViewFrame ? &pViewFrame->GetFrame() : NULL; if(bNewDocDirect && !bStartWithTemplate) { @@ -790,7 +767,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) return pFrame; } -SfxFrame* SdModule::CreateEmptyDocument( DocumentType eDocType, SfxFrame* pTargetFrame ) +SfxFrame* SdModule::CreateEmptyDocument( DocumentType eDocType, const Reference< XFrame >& i_rFrame ) { SfxFrame* pFrame = 0; @@ -807,17 +784,9 @@ SfxFrame* SdModule::CreateEmptyDocument( DocumentType eDocType, SfxFrame* pTarge pDoc->StopWorkStartupDelay(); } - if ( pTargetFrame ) - { - pFrame = pTargetFrame; - pFrame->InsertDocument( pNewDocSh ); - } - else - { - SfxViewFrame* pViewFrame = SfxViewFrame::CreateViewFrame( *pNewDocSh ); - if( pViewFrame ) - pFrame = pViewFrame->GetFrame(); - } + SfxViewFrame* pViewFrame = SfxViewFrame::LoadDocumentIntoFrame( *pNewDocSh, i_rFrame ); + OSL_ENSURE( pViewFrame, "SdModule::CreateEmptyDocument: no view frame - was the document really loaded?" ); + pFrame = pViewFrame ? &pViewFrame->GetFrame() : NULL; } return pFrame; diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index c82bda44f846..d398724a3074 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -1591,14 +1591,13 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview ) aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aDocFile )); aReq.AppendItem( SfxStringItem( SID_REFERER, aEmptyStr ) ); aReq.AppendItem( SfxStringItem( SID_TARGETNAME, aTargetStr ) ); - aReq.AppendItem( SfxBoolItem( SID_VIEW, FALSE ) ); + aReq.AppendItem( SfxBoolItem( SID_HIDDEN, TRUE ) ); aReq.AppendItem( SfxBoolItem( SID_PREVIEW, bDocPreview ) ); - const SfxObjectShellItem* pRet = (SfxObjectShellItem*) - SFX_APP()->ExecuteSlot( aReq ); + const SfxViewFrameItem* pRet = PTR_CAST( SfxViewFrameItem, SFX_APP()->ExecuteSlot( aReq ) ); - if( pRet && pRet->GetObjectShell() ) - xDocShell = pRet->GetObjectShell(); + if ( pRet && pRet->GetFrame() && pRet->GetFrame()->GetObjectShell() ) + xDocShell = pRet->GetFrame()->GetObjectShell(); } diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index d6e358cc5411..294e61f3fe40 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -856,8 +856,7 @@ void PresLayoutPreview::Paint( OutputDevice& aOut, SdrTextObj* pObj, bool bVisib aObjectTransform.translate(maOutRect.TopLeft().X(), maOutRect.TopLeft().Y()); // create geometry using unit range and object transform - const basegfx::B2DRange aUnitRange(0.0, 0.0, 1.0, 1.0); - basegfx::B2DPolyPolygon aGeometry(basegfx::tools::createPolygonFromRect(aUnitRange)); + basegfx::B2DPolyPolygon aGeometry(basegfx::tools::createUnitPolygon()); aGeometry.transform(aObjectTransform); // apply line pattern if wanted diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 1dbd1b1ce923..f284651b91e5 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -59,7 +59,6 @@ #ifndef _SO_CLSIDS_HXX #include <sot/clsids.hxx> #endif -#include <sfx2/topfrm.hxx> #include <svl/cjkoptions.hxx> #include <svl/visitem.hxx> @@ -146,7 +145,7 @@ void DrawDocShell::Construct( bool bClipboard ) // the document's ref device. UpdateRefDevice(); - SetModel( new SdXImpressDocument( this, bClipboard ) ); + SetBaseModel( new SdXImpressDocument( this, bClipboard ) ); SetPool( &mpDoc->GetItemPool() ); mpUndoManager = new sd::UndoManager; mpDoc->SetSdrUndoManager( mpUndoManager ); @@ -163,7 +162,7 @@ void DrawDocShell::Construct( bool bClipboard ) DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode, BOOL bDataObject, - DocumentType eDocumentType,BOOL bScriptSupport) : + DocumentType eDocumentType) : SfxObjectShell( eMode == SFX_CREATE_MODE_INTERNAL ? SFX_CREATE_MODE_EMBEDDED : eMode), mpDoc(NULL), mpUndoManager(NULL), @@ -176,8 +175,6 @@ DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode, mbOwnPrinter(FALSE), mbNewDocument( sal_True ) { - if ( !bScriptSupport ) - SetHasNoBasic(); Construct( eMode == SFX_CREATE_MODE_INTERNAL ); } @@ -187,6 +184,28 @@ DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode, |* \************************************************************************/ +DrawDocShell::DrawDocShell( const sal_uInt64 nModelCreationFlags, BOOL bDataObject, DocumentType eDocumentType ) : + SfxObjectShell( nModelCreationFlags ), + mpDoc(NULL), + mpUndoManager(NULL), + mpPrinter(NULL), + mpViewShell(NULL), + mpFontList(NULL), + meDocType(eDocumentType), + mpFilterSIDs(0), + mbSdDataObj(bDataObject), + mbOwnPrinter(FALSE), + mbNewDocument( sal_True ) +{ + Construct( FALSE ); +} + +/************************************************************************* +|* +|* Konstruktor 3 +|* +\************************************************************************/ + DrawDocShell::DrawDocShell(SdDrawDocument* pDoc, SfxObjectCreateMode eMode, BOOL bDataObject, DocumentType eDocumentType) : @@ -362,7 +381,7 @@ void DrawDocShell::InPlaceActivate( BOOL bActive ) ViewShell* pViewSh = NULL; SfxViewShell* pSfxViewSh = NULL; - SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(this, 0, false); + SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(this, false); while (pSfxViewFrame) { @@ -376,7 +395,7 @@ void DrawDocShell::InPlaceActivate( BOOL bActive ) pFrameViewList->Insert( new FrameView( mpDoc, pViewSh->GetFrameView() ) ); } - pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, 0, false); + pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, false); } } } @@ -392,7 +411,7 @@ void DrawDocShell::InPlaceActivate( BOOL bActive ) { ViewShell* pViewSh = NULL; SfxViewShell* pSfxViewSh = NULL; - SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(this, 0,false); + SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(this, false); sal_uInt32 i; for( i = 0; pSfxViewFrame && (i < pFrameViewList->Count()); i++ ) @@ -406,7 +425,7 @@ void DrawDocShell::InPlaceActivate( BOOL bActive ) pViewSh->ReadFrameViewData( (FrameView*)pFrameViewList->GetObject(i) ); } - pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, 0,false); + pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, false); } } } @@ -570,7 +589,7 @@ IMPL_LINK(DrawDocShell, OnlineSpellCallback, SpellCallbackInfo*, pInfo) void DrawDocShell::ClearUndoBuffer() { // clear possible undo buffers of outliners - SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(this, 0, false); + SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(this, false); while(pSfxViewFrame) { ViewShellBase* pViewShellBase = dynamic_cast< ViewShellBase* >( pSfxViewFrame->GetViewShell() ); @@ -593,7 +612,7 @@ void DrawDocShell::ClearUndoBuffer() } } } - pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, 0, false); + pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, false); } SfxUndoManager* pUndoManager = GetUndoManager(); diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx index 38dff2996fcf..d5e7315144c0 100644 --- a/sd/source/ui/docshell/grdocsh.cxx +++ b/sd/source/ui/docshell/grdocsh.cxx @@ -68,8 +68,16 @@ SFX_IMPL_OBJECTFACTORY( GraphicDocShell, SvGlobalName(SO3_SDRAW_CLASSID_60), SFX GraphicDocShell::GraphicDocShell(SfxObjectCreateMode eMode, BOOL bDataObject, - DocumentType eDocType,BOOL bScriptSupport) : - DrawDocShell(eMode, bDataObject, eDocType, bScriptSupport) + DocumentType eDocType) : + DrawDocShell(eMode, bDataObject, eDocType) +{ + SetStyleFamily( SD_STYLE_FAMILY_GRAPHICS ); +} + +GraphicDocShell::GraphicDocShell(const sal_uInt64 nModelCreationFlags, + BOOL bDataObject, + DocumentType eDocType) : + DrawDocShell(nModelCreationFlags, bDataObject, eDocType) { SetStyleFamily( SD_STYLE_FAMILY_GRAPHICS ); } diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 131b3a401936..74088422b4ab 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -31,7 +31,7 @@ #include "ViewShellBase.hxx" #include <cppcanvas/vclfactory.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/topfrm.hxx> +#include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> #include <vcl/dialog.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index f45ed82f4d3e..92b1450624e1 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -210,7 +210,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractDialog* pDlg = pFact ? pFact->CreateSfxDialog( &mpView->GetViewShell()->GetViewFrame()->GetWindow(), aSet, - mpView->GetViewShell()->GetViewFrame()->GetFrame()->GetFrameInterface(), + mpView->GetViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP ) : 0; if( !pDlg ) return; diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 134646f2368e..9fb0007cc72c 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -84,6 +84,7 @@ #include "undoback.hxx" #include "sdabstdlg.hxx" #include "sdresid.hxx" +#include "sdundogr.hxx" #include "helpids.h" namespace sd { @@ -276,20 +277,28 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) } else { - // Only this page, check if there is a background-object on that page - SdrObject* pObj = mpPage->GetBackgroundObj(); - if( pObj ) + // Only this page, get attributes for background fill + const SfxItemSet& rBackgroundAttributes = mpPage->getSdrPageProperties().GetItemSet(); + + if(XFILL_NONE != ((const XFillStyleItem&)rBackgroundAttributes.Get(XATTR_FILLSTYLE)).GetValue()) { - aMergedAttr.Put(pObj->GetMergedItemSet()); + // page attributes are used, take them + aMergedAttr.Put(rBackgroundAttributes); } else { - // if the page hasn't got a background-object, than use - // the fillstyle-settings of the masterpage for the dialog - if( pStyleSheet && pStyleSheet->GetItemSet().GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DEFAULT ) - mergeItemSetsImpl( aMergedAttr, pStyleSheet->GetItemSet() ); + if(pStyleSheet + && XFILL_NONE != ((const XFillStyleItem&)pStyleSheet->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue()) + { + // if the page has no fill style, use the settings from the + // background stylesheet (if used) + mergeItemSetsImpl(aMergedAttr, pStyleSheet->GetItemSet()); + } else - aMergedAttr.Put( XFillStyleItem( XFILL_NONE ) ); + { + // no fill style from page, start with no fill style + aMergedAttr.Put(XFillStyleItem(XFILL_NONE)); + } } } } @@ -351,6 +360,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) ( ( (XFillStyleItem*) aMergedAttr.GetItem( XATTR_FILLSTYLE ) )->GetValue() == XFILL_NONE ) ) ) mbPageBckgrdDeleted = TRUE; + bool bSetToAllPages = false; + // Ask, wether the setting are for the background-page or for the current page if( !mbMasterPage && bChanges ) { @@ -366,17 +377,19 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) aTit, aTxt ); aQuestionBox.SetImage( QueryBox::GetStandardImage() ); - mbMasterPage = ( RET_YES == aQuestionBox.Execute() ); + bSetToAllPages = ( RET_YES == aQuestionBox.Execute() ); } if( mbPageBckgrdDeleted ) { - mpBackgroundObjUndoAction = new SdBackgroundObjUndoAction( *mpDoc, *mpPage, mpPage->GetBackgroundObj() ); - mpPage->SetBackgroundObj( NULL ); - - // #110094#-15 - // tell the page that it's visualization has changed - mpPage->ActionChanged(); + mpBackgroundObjUndoAction = new SdBackgroundObjUndoAction( + *mpDoc, *mpPage, mpPage->getSdrPageProperties().GetItemSet()); + + if(!mpPage->IsMasterPage()) + { + // on normal pages, switch off fill attribute usage + mpPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE)); + } } } @@ -393,6 +406,48 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) pStyleSheet->GetItemSet().Put( *(pTempSet.get()) ); pStyleSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)); } + else if( bSetToAllPages ) + { + String aComment(SdResId(STR_UNDO_CHANGE_PAGEFORMAT)); + SfxUndoManager* pUndoMgr = mpDocSh->GetUndoManager(); + pUndoMgr->EnterListAction(aComment, aComment); + SdUndoGroup* pUndoGroup = new SdUndoGroup(mpDoc); + pUndoGroup->SetComment(aComment); + + //Set background on all master pages + USHORT nMasterPageCount = mpDoc->GetMasterSdPageCount(ePageKind); + for (USHORT i = 0; i < nMasterPageCount; ++i) + { + SdPage *pMasterPage = mpDoc->GetMasterSdPage(i, ePageKind); + SdStyleSheet *pStyle = + pMasterPage->getPresentationStyle(HID_PSEUDOSHEET_BACKGROUND); + StyleSheetUndoAction* pAction = + new StyleSheetUndoAction(mpDoc, (SfxStyleSheet*)pStyle, &(*pTempSet.get())); + pUndoGroup->AddAction(pAction); + pStyle->GetItemSet().Put( *(pTempSet.get()) ); + pStyle->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)); + } + + //Remove background from all pages to reset to the master bg + USHORT nPageCount(mpDoc->GetSdPageCount(ePageKind)); + for(USHORT i=0; i<nPageCount; ++i) + { + SdPage *pPage = mpDoc->GetSdPage(i, ePageKind); + + const SfxItemSet& rFillAttributes = pPage->getSdrPageProperties().GetItemSet(); + if(XFILL_NONE != ((const XFillStyleItem&)rFillAttributes.Get(XATTR_FILLSTYLE)).GetValue()) + { + SdBackgroundObjUndoAction *pBackgroundObjUndoAction = new SdBackgroundObjUndoAction(*mpDoc, *pPage, rFillAttributes); + pUndoGroup->AddAction(pBackgroundObjUndoAction); + pPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE)); + pPage->ActionChanged(); + } + } + + pUndoMgr->AddUndoAction(pUndoGroup); + pUndoMgr->LeaveListAction(); + + } const SfxPoolItem *pItem; if( SFX_ITEM_SET == pTempSet->GetItemState( EE_PARA_WRITINGDIR, sal_False, &pItem ) ) @@ -403,15 +458,12 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) mpDoc->SetChanged(TRUE); - SdrObject* pObj = mpPage->IsMasterPage() ? - mpPage->GetPresObj( PRESOBJ_BACKGROUND ) : - ((SdPage&)(mpPage->TRG_GetMasterPage())).GetPresObj( PRESOBJ_BACKGROUND ); - if( pObj ) - { - // BackgroundObj: no hard attributes allowed - SfxItemSet aSet( mpDoc->GetPool() ); - pObj->SetMergedItemSet(aSet); - } + // BackgroundFill of Masterpage: no hard attributes allowed + SdrPage& rUsedMasterPage = mpPage->IsMasterPage() ? *mpPage : mpPage->TRG_GetMasterPage(); + OSL_ENSURE(rUsedMasterPage.IsMasterPage(), "No MasterPage (!)"); + rUsedMasterPage.getSdrPageProperties().ClearItem(); + OSL_ENSURE(0 != rUsedMasterPage.getSdrPageProperties().GetStyleSheet(), + "MasterPage without StyleSheet detected (!)"); } aNewAttr.Put(*(pTempSet.get())); @@ -536,28 +588,11 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) if( !mbMasterPage && !mbPageBckgrdDeleted ) { // Only this page - SdrObject* pObj = mpPage->GetBackgroundObj(); - delete mpBackgroundObjUndoAction; - mpBackgroundObjUndoAction = new SdBackgroundObjUndoAction( *mpDoc, *mpPage, pObj ); - - if( !pObj ) - { - pObj = new SdrRectObj(); - mpPage->SetBackgroundObj( pObj ); - } - - Point aPos ( nLeft, nUpper ); - Size aSize( mpPage->GetSize() ); - aSize.Width() -= nLeft + nRight - 1; - aSize.Height() -= nUpper + nLower - 1; - Rectangle aRect( aPos, aSize ); - pObj->SetLogicRect( aRect ); - pObj->SetMergedItemSet(*pArgs); - - // #110094#-15 - // tell the page that it's visualization has changed - mpPage->ActionChanged(); + mpBackgroundObjUndoAction = new SdBackgroundObjUndoAction( + *mpDoc, *mpPage, mpPage->getSdrPageProperties().GetItemSet()); + mpPage->getSdrPageProperties().ClearItem(); + mpPage->getSdrPageProperties().PutItemSet(*pArgs); } } diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index bb6f6e7b6908..c1df44e52677 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -104,6 +104,7 @@ FuPoor::FuPoor ( bNoScrollUntilInside (TRUE), bScrollable (FALSE), bDelayActive (FALSE), + bFirstMouseMove (FALSE), // #95491# remember MouseButton state mnCode(0) { diff --git a/sd/source/ui/func/futext2.cxx b/sd/source/ui/func/futext2.cxx deleted file mode 100644 index 5e6bed107e93..000000000000 --- a/sd/source/ui/func/futext2.cxx +++ /dev/null @@ -1,30 +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_sd.hxx" - diff --git a/sd/source/ui/func/makefile.mk b/sd/source/ui/func/makefile.mk index 332d5d505792..9ec946325239 100644 --- a/sd/source/ui/func/makefile.mk +++ b/sd/source/ui/func/makefile.mk @@ -61,7 +61,6 @@ SLOFILES = \ $(SLO)$/fuscale.obj \ $(SLO)$/futransf.obj \ $(SLO)$/futext.obj \ - $(SLO)$/futext2.obj \ $(SLO)$/fuline.obj \ $(SLO)$/sdundo.obj \ $(SLO)$/sdundogr.obj \ @@ -133,7 +132,6 @@ LIB1OBJFILES= \ $(SLO)$/fuscale.obj \ $(SLO)$/futransf.obj \ $(SLO)$/futext.obj \ - $(SLO)$/futext2.obj \ $(SLO)$/fuline.obj \ $(SLO)$/sdundo.obj \ $(SLO)$/sdundogr.obj \ diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx index 2f1ab259bc55..7f0245c50cda 100644 --- a/sd/source/ui/func/undoback.cxx +++ b/sd/source/ui/func/undoback.cxx @@ -32,6 +32,7 @@ #include "sdpage.hxx" #include "sdresid.hxx" #include "strings.hrc" +#include <svl/itemset.hxx> // --------------------------- // - BackgroundObjUndoAction - @@ -41,10 +42,13 @@ TYPEINIT1( SdBackgroundObjUndoAction, SdUndoAction ); // ----------------------------------------------------------------------------- -SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( SdDrawDocument& rDoc, SdPage& rPage, const SdrObject* pBackgroundObj ) : - SdUndoAction( &rDoc ), - mrPage( rPage ), - mpBackgroundObj( pBackgroundObj ? pBackgroundObj->Clone() : NULL ) +SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( + SdDrawDocument& rDoc, + SdPage& rPage, + const SfxItemSet& rItenSet) +: SdUndoAction(&rDoc), + mrPage(rPage), + mpItemSet(new SfxItemSet(rItenSet)) { String aString( SdResId( STR_UNDO_CHANGE_PAGEFORMAT ) ); SetComment( aString ); @@ -54,20 +58,18 @@ SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( SdDrawDocument& rDoc, SdPa SdBackgroundObjUndoAction::~SdBackgroundObjUndoAction() { - SdrObject::Free( mpBackgroundObj ); + delete mpItemSet; } // ----------------------------------------------------------------------------- void SdBackgroundObjUndoAction::ImplRestoreBackgroundObj() { - SdrObject* pOldObj = mrPage.GetBackgroundObj(); - - if( pOldObj ) - pOldObj = pOldObj->Clone(); - - mrPage.SetBackgroundObj( mpBackgroundObj ); - mpBackgroundObj = pOldObj; + SfxItemSet* pNew = new SfxItemSet(mrPage.getSdrPageProperties().GetItemSet()); + mrPage.getSdrPageProperties().ClearItem(); + mrPage.getSdrPageProperties().PutItemSet(*mpItemSet); + delete mpItemSet; + mpItemSet = pNew; // #110094#-15 // tell the page that it's visualization has changed @@ -92,5 +94,5 @@ void SdBackgroundObjUndoAction::Redo() SdUndoAction* SdBackgroundObjUndoAction::Clone() const { - return new SdBackgroundObjUndoAction( *mpDoc, mrPage, mpBackgroundObj ); + return new SdBackgroundObjUndoAction(*mpDoc, mrPage, *mpItemSet); } diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 2509a4f4f375..f2b77d01f96c 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -70,8 +70,12 @@ public: DrawDocShell ( SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED, BOOL bSdDataObj=FALSE, - DocumentType=DOCUMENT_TYPE_IMPRESS, - BOOL bScriptSupport=TRUE); + DocumentType=DOCUMENT_TYPE_IMPRESS); + + DrawDocShell ( + const sal_uInt64 nModelCreationFlags, + BOOL bSdDataObj=FALSE, + DocumentType=DOCUMENT_TYPE_IMPRESS); DrawDocShell ( SdDrawDocument* pDoc, diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx index 61f3f75110ce..7b506c515185 100644 --- a/sd/source/ui/inc/GraphicDocShell.hxx +++ b/sd/source/ui/inc/GraphicDocShell.hxx @@ -57,8 +57,12 @@ public: GraphicDocShell ( SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED, BOOL bSdDataObj=FALSE, - DocumentType=DOCUMENT_TYPE_DRAW, - BOOL bScriptSupport=TRUE); + DocumentType=DOCUMENT_TYPE_DRAW); + + GraphicDocShell ( + const sal_uInt64 nModelCreationFlags, + BOOL bSdDataObj=FALSE, + DocumentType=DOCUMENT_TYPE_DRAW); virtual ~GraphicDocShell (void); }; diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 9c0d621f2ca3..f2b621814c49 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -74,8 +74,6 @@ public: void PresPaint(const Region& rRegion); - virtual SdrObject* GetMaxToBtmObj(SdrObject* pObj) const; - virtual void DeleteMarked(); // from SdrView protected: virtual void ModelHasChanged(); diff --git a/sd/source/ui/inc/undoback.hxx b/sd/source/ui/inc/undoback.hxx index 2496b8c4732b..ca62c6cae0b0 100644 --- a/sd/source/ui/inc/undoback.hxx +++ b/sd/source/ui/inc/undoback.hxx @@ -32,7 +32,7 @@ class SdDrawDocument; class SdPage; -class SdrObject; +class SfxItemSet; // ----------------------------- // - SdBackgroundObjUndoAction - @@ -43,7 +43,7 @@ class SdBackgroundObjUndoAction : public SdUndoAction private: SdPage& mrPage; - SdrObject* mpBackgroundObj; + SfxItemSet* mpItemSet; void ImplRestoreBackgroundObj(); @@ -51,7 +51,10 @@ public: TYPEINFO(); - SdBackgroundObjUndoAction( SdDrawDocument& rDoc, SdPage& rPage, const SdrObject* pBackgroundObj ); + SdBackgroundObjUndoAction( + SdDrawDocument& rDoc, + SdPage& rPage, + const SfxItemSet& rItenSet); virtual ~SdBackgroundObjUndoAction(); virtual void Undo(); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 485db61efcaa..db4ba2f118d0 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -44,7 +44,6 @@ #include <svx/svdpool.hxx> #include <svl/itemprop.hxx> -#include <sfx2/topfrm.hxx> #include <sfx2/viewfrm.hxx> #include <toolkit/unohlp.hxx> @@ -704,9 +703,9 @@ void SAL_CALL SlideShow::end() throw(RuntimeException) { PresentationViewShell* pShell = dynamic_cast<PresentationViewShell*>(pFullScreenViewShellBase->GetMainViewShell().get()); - if( pShell && pShell->GetViewFrame() && pShell->GetViewFrame()->GetTopFrame() ) + if( pShell && pShell->GetViewFrame() ) { - WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pShell->GetViewFrame()->GetTopFrame()->GetWindow().GetParent()); + WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pShell->GetViewFrame()->GetTopFrame().GetWindow().GetParent()); if( pWorkWindow ) { pWorkWindow->StartPresentationMode( FALSE, isAlwaysOnTop() ); @@ -1200,7 +1199,7 @@ void SlideShow::StartFullscreenPresentation( ) // The new frame is created hidden. To make it visible and activate the // new view shell--a prerequisite to process slot calls and initialize // its panes--a GrabFocus() has to be called later on. - SfxTopFrame* pNewFrame = SfxTopFrame::Create( mpDoc->GetDocSh(), pWorkWindow, PRESENTATION_FACTORY_ID, TRUE); + SfxFrame* pNewFrame = SfxFrame::Create( *mpDoc->GetDocSh(), *pWorkWindow, PRESENTATION_FACTORY_ID, true ); pNewFrame->SetPresentationMode(TRUE); mpFullScreenViewShellBase = static_cast<ViewShellBase*>(pNewFrame->GetCurrentViewFrame()->GetViewShell()); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 34ff6603cd99..50b58f76c41f 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -51,7 +51,8 @@ #include <sfx2/imagemgr.hxx> #include <sfx2/request.hxx> -#include "sfx2/docfile.hxx" +#include <sfx2/docfile.hxx> +#include <sfx2/app.hxx> #include <svx/unoapi.hxx> #include <svx/svdoole2.hxx> @@ -2220,9 +2221,9 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG ) PopupMenu* pPageMenu = pMenu->GetPopupMenu( CM_GOTO ); SfxViewFrame* pViewFrame = getViewFrame(); - if( pViewFrame && pViewFrame->GetFrame() ) + if( pViewFrame ) { - Reference< ::com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame()->GetFrameInterface() ); + Reference< ::com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() ); if( xFrame.is() ) { pMenu->SetItemImage( CM_NEXT_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10617") ), FALSE, FALSE ) ); @@ -2845,12 +2846,12 @@ void SlideshowImpl::setActiveXToolbarsVisible( sal_Bool bVisible ) // this is a plugin/activex mode, no toolbars should be visible during slide show // after the end of slide show they should be visible again SfxViewFrame* pViewFrame = getViewFrame(); - if( pViewFrame && pViewFrame->GetFrame() && pViewFrame->GetFrame()->GetTopFrame() ) + if( pViewFrame ) { try { Reference< frame::XLayoutManager > xLayoutManager; - Reference< beans::XPropertySet > xFrameProps( pViewFrame->GetFrame()->GetTopFrame()->GetFrameInterface(), UNO_QUERY_THROW ); + Reference< beans::XPropertySet > xFrameProps( pViewFrame->GetFrame().GetTopFrame().GetFrameInterface(), UNO_QUERY_THROW ); if ( ( xFrameProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) ) >>= xLayoutManager ) && xLayoutManager.is() ) @@ -3474,39 +3475,11 @@ void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException) { if( maPresSettings.mnPauseTimeout ) { - boost::scoped_ptr< Graphic > pGraphic; - - if( maPresSettings.mbShowPauseLogo ) + if( mpShowWindow ) { - // load about image from module path - String aBmpFileName( RTL_CONSTASCII_USTRINGPARAM("about.bmp") ); - INetURLObject aObj( SvtPathOptions().GetModulePath(), INET_PROT_FILE ); - aObj.insertName( aBmpFileName ); - SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ ); - if ( !aStrm.GetError() ) - { - Bitmap aBmp; - aStrm >> aBmp; - pGraphic.reset( new Graphic(aBmp) ); - pGraphic->SetPrefMapMode(MAP_PIXEL); - } - else - { - //if no image is located in the module path - //use default logo from iso resource: - - String aMgrName( RTL_CONSTASCII_USTRINGPARAM( "iso" ) ); - boost::scoped_ptr< ResMgr > pResMgr( ResMgr::CreateResMgr( U2S( aMgrName )) ); - DBG_ASSERT(pResMgr,"No ResMgr found"); - if(pResMgr.get()) - { - pGraphic.reset( new Graphic( Bitmap( ResId( RID_DEFAULT_ABOUT_BMP_LOGO, *pResMgr ) ) ) ); - pGraphic->SetPrefMapMode(MAP_PIXEL); - } - } + Graphic aGraphic( SfxApplication::GetApplicationLogo().GetBitmapEx() ); + mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout, &aGraphic ); } - if( mpShowWindow ) - mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout, pGraphic.get() ); } else { diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 7be2b4df9dc5..7c2f3f8c48ce 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -87,7 +87,6 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/topfrm.hxx> #include <tools/link.hxx> #include <vcl/svapp.hxx> @@ -697,7 +696,7 @@ void SlideSorterController::GetCtrlState (SfxItemSet& rSet) SfxViewFrame* pSlideViewFrame = SfxViewFrame::Current(); DBG_ASSERT(pSlideViewFrame!=NULL, "SlideSorterController::GetCtrlState: ViewFrame not found"); - if (pSlideViewFrame && pSlideViewFrame->ISA(SfxTopViewFrame)) + if (pSlideViewFrame) { pSlideViewFrame->GetSlotState (SID_RELOAD, NULL, &rSet); } diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index d6d8c71d9193..39e14bf88ae7 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -77,7 +77,6 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> -#include <sfx2/topfrm.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <svx/svxids.hrc> @@ -537,14 +536,7 @@ void SlotManager::GetCtrlState (SfxItemSet& rSet) SfxViewFrame* pSlideViewFrame = pShell->GetViewFrame(); DBG_ASSERT(pSlideViewFrame!=NULL, "SlideSorterController::GetCtrlState: ViewFrame not found"); - if (pSlideViewFrame->ISA(SfxTopViewFrame)) - { - pSlideViewFrame->GetSlotState (SID_RELOAD, NULL, &rSet); - } - else // MI sagt: kein MDIFrame --> disablen - { - rSet.DisableItem(SID_RELOAD); - } + pSlideViewFrame->GetSlotState (SID_RELOAD, NULL, &rSet); } } diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx index 51908fd046a9..0f4ede6216c1 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx @@ -54,7 +54,8 @@ public: private: model::SharedPageDescriptor mpDescriptor; - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact (void); +protected: + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); }; diff --git a/sd/source/ui/slidesorter/view/SlsPageObject.cxx b/sd/source/ui/slidesorter/view/SlsPageObject.cxx index 790a1ad63edc..28c572de9594 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObject.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObject.cxx @@ -67,7 +67,7 @@ SharedPageDescriptor PageObject::GetDescriptor (void) const -sdr::contact::ViewContact* PageObject::CreateObjectSpecificViewContact (void) +sdr::contact::ViewContact* PageObject::CreateObjectSpecificViewContact() { if (mpDescriptor.get() != NULL) return mpDescriptor->GetPageObjectFactory().CreateViewContact(this, mpDescriptor); diff --git a/sd/source/ui/toolpanel/ControlDescriptorIterator.cxx b/sd/source/ui/toolpanel/ControlDescriptorIterator.cxx deleted file mode 100644 index 9d873b897402..000000000000 --- a/sd/source/ui/toolpanel/ControlDescriptorIterator.cxx +++ /dev/null @@ -1,223 +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_sd.hxx" - -/* -#include "ControlDescriptorIterator.hxx" - -#include "ControlContainer.hxx" -#include "ControlContainerDescriptor.hxx" - -namespace sd { namespace toolpanel { - - -ControlDescriptorIterator::ControlDescriptorIterator (void) - : mpContainer (NULL), - mbSkipInvisibleControls(true) -{ -} - - - - -ControlDescriptorIterator::ControlDescriptorIterator ( - ControlDescriptorList& rContainer, - const ControlDescriptorList::iterator& aIterator, - bool bSkipInvisibleControls) - : mpContainer(&rContainer), - maIterator (aIterator), - mbSkipInvisibleControls(bSkipInvisibleControls) -{ - AdvanceToNextVisibleControl(); -} - - - - -ControlDescriptorIterator::ControlDescriptorIterator ( - const ControlDescriptorIterator& aIterator) - : mpContainer (aIterator.mpContainer), - maIterator (aIterator.maIterator), - mbSkipInvisibleControls (aIterator.mbSkipInvisibleControls) -{ -} - - - - -ControlDescriptorIterator& ControlDescriptorIterator::operator= ( - const ControlDescriptorIterator& aIterator) -{ - mpContainer = aIterator.mpContainer; - maIterator = aIterator.maIterator; - mbSkipInvisibleControls = aIterator.mbSkipInvisibleControls; - - AdvanceToNextVisibleControl(); - - return *this; -} - - - - -ControlDescriptorIterator::value_type& - ControlDescriptorIterator::operator* (void) -{ - return *maIterator; -} - - - - -const ControlDescriptorIterator::value_type& - ControlDescriptorIterator::operator* (void) - const -{ - return *maIterator; -} - - - - -ControlDescriptorIterator::value_type& - ControlDescriptorIterator::operator-> (void) -{ - return *maIterator; -} - - - - -const ControlDescriptorIterator::value_type& - ControlDescriptorIterator::operator-> (void) - const -{ - return *maIterator; -} - - - - -bool ControlDescriptorIterator::operator== ( - const ControlDescriptorIterator& aIterator) const -{ - return ! operator!=(aIterator); -} - - - - -bool ControlDescriptorIterator::operator!= ( - const ControlDescriptorIterator& aIterator) const -{ - return maIterator != aIterator.maIterator; -} - - - - -ControlDescriptorIterator& ControlDescriptorIterator::operator++ (void) -{ - maIterator++; - AdvanceToNextVisibleControl(); - return *this; -} - - - -ControlDescriptorIterator ControlDescriptorIterator::operator++ (int) -{ - ControlDescriptorIterator aIterator (*this); - ++(*this); - return aIterator; -} - - - - -ControlDescriptorIterator& ControlDescriptorIterator::operator-- (void) -{ - maIterator--; - AdvanceToPreviousVisibleControl(); - return *this; -} - - - -ControlDescriptorIterator ControlDescriptorIterator::operator-- (int) -{ - ControlDescriptorIterator aIterator (*this); - --(*this); - return aIterator; -} - - - - -ControlDescriptorIterator ControlDescriptorIterator::operator+ ( - int nValue) const -{ - return ControlDescriptorIterator (*mpContainer, maIterator+nValue); -} - - - -ControlDescriptorIterator ControlDescriptorIterator::operator- ( - int nValue) const -{ - return ControlDescriptorIterator (*mpContainer, maIterator-nValue); -} - - - -void ControlDescriptorIterator::AdvanceToNextVisibleControl (void) -{ - if (mbSkipInvisibleControls && mpContainer!=NULL) - { - while (maIterator != mpContainer->end() - && ! (**maIterator).IsVisible()) - ++maIterator; - } -} - - - - -void ControlDescriptorIterator::AdvanceToPreviousVisibleControl (void) -{ - if (mbSkipInvisibleControls && mpContainer!=NULL) - { - while (maIterator != mpContainer->begin() - && ! (**maIterator).IsVisible()) - --maIterator; - } -} - -} } // end of namespace ::sd::toolpanel -*/ diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx index 0c485afed3d2..2e121098194a 100644 --- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx +++ b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx @@ -43,7 +43,7 @@ #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include "stlpool.hxx" - +#include <svx/xfillit0.hxx> using namespace ::com::sun::star; namespace sd { namespace toolpanel { namespace controls { @@ -446,9 +446,10 @@ void DocumentHelper::AssignMasterPageToPage ( // not override the new master page) and assign the master page to // the regular slide. pDocument->GetDocSh()->GetUndoManager()->AddUndoAction( - new SdBackgroundObjUndoAction(*pDocument, *pPage, pPage->GetBackgroundObj()), - TRUE); - pPage->SetBackgroundObj(NULL); + new SdBackgroundObjUndoAction( + *pDocument, *pPage, pPage->getSdrPageProperties().GetItemSet()), + TRUE); + pPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE)); pDocument->SetMasterPage ( (pPage->GetPageNum()-1)/2, diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index 8d6bd5f6b4bc..81678d1af7c0 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -265,7 +265,7 @@ EventMultiplexer::Implementation::Implementation (ViewShellBase& rBase) // Connect to the frame to listen for controllers being exchanged. // Listen to changes of certain properties. Reference<frame::XFrame> xFrame ( - mrBase.GetFrame()->GetTopFrame()->GetFrameInterface(), + mrBase.GetFrame()->GetTopFrame().GetFrameInterface(), uno::UNO_QUERY); mxFrameWeak = xFrame; if (xFrame.is()) diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx index ae36f8954e56..46ac4174cbe7 100644 --- a/sd/source/ui/tools/IdleDetection.cxx +++ b/sd/source/ui/tools/IdleDetection.cxx @@ -82,18 +82,15 @@ sal_Int32 IdleDetection::CheckSlideShowRunning (void) // Ignore the current frame when it does not exist, is not valid, or // is not active. bool bIgnoreFrame (true); - if (pViewFrame->GetFrame() != NULL) + uno::Reference<frame::XFrame> xFrame (pViewFrame->GetFrame().GetFrameInterface()); + try { - uno::Reference<frame::XFrame> xFrame (pViewFrame->GetFrame()->GetFrameInterface()); - try - { - if (xFrame.is() && xFrame->isActive()) - bIgnoreFrame = false; - } - catch (uno::RuntimeException e) - { - (void) e; - } + if (xFrame.is() && xFrame->isActive()) + bIgnoreFrame = false; + } + catch (uno::RuntimeException e) + { + (void) e; } if (bIgnoreFrame) continue; diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx index 48aed3ccad39..a423692caa4f 100644 --- a/sd/source/ui/unoidl/unodoc.cxx +++ b/sd/source/ui/unoidl/unodoc.cxx @@ -66,12 +66,9 @@ uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( SdDLL::Init(); - const SfxObjectCreateMode eCreateMode = ( _nCreationFlags & SFXMODEL_EMBEDDED_OBJECT ) ? SFX_CREATE_MODE_EMBEDDED : SFX_CREATE_MODE_STANDARD; - const bool bScriptSupport = ( _nCreationFlags & SFXMODEL_DISABLE_EMBEDDED_SCRIPTS ) == 0; - SfxObjectShell* pShell = new ::sd::GraphicDocShell( - eCreateMode, FALSE, DOCUMENT_TYPE_DRAW, bScriptSupport ); + _nCreationFlags, FALSE, DOCUMENT_TYPE_DRAW ); return uno::Reference< uno::XInterface >( pShell->GetModel() ); } @@ -98,12 +95,9 @@ uno::Reference< uno::XInterface > SAL_CALL SdPresentationDocument_createInstance SdDLL::Init(); - const SfxObjectCreateMode eCreateMode = ( _nCreationFlags & SFXMODEL_EMBEDDED_OBJECT ) ? SFX_CREATE_MODE_EMBEDDED : SFX_CREATE_MODE_STANDARD; - const bool bScriptSupport = ( _nCreationFlags & SFXMODEL_DISABLE_EMBEDDED_SCRIPTS ) == 0; - SfxObjectShell* pShell = new ::sd::DrawDocShell( - eCreateMode, FALSE, DOCUMENT_TYPE_IMPRESS, bScriptSupport ); + _nCreationFlags, FALSE, DOCUMENT_TYPE_IMPRESS ); return uno::Reference< uno::XInterface >( pShell->GetModel() ); } diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 47f3818f6ddc..5b0594ba58b0 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -455,23 +455,9 @@ void SdXImpressDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { if( hasEventListeners() ) { - - bool bBackgroundShape = false; - - // the background shape itself has no api representation, so filter all notifies for it - const SdrObject* pSdrObj = pSdrHint->GetObject(); - if( pSdrObj && (pSdrObj->GetObjInventor() == SdrInventor) && (pSdrObj->GetObjIdentifier() == OBJ_RECT) ) - { - SdPage* pPage = (SdPage*)pSdrObj->GetPage(); - bBackgroundShape = pPage && (pPage->GetPresObjKind(const_cast<SdrObject*>(pSdrObj)) == PRESOBJ_BACKGROUND); - } - - if( !bBackgroundShape ) - { - document::EventObject aEvent; - if( SvxUnoDrawMSFactory::createEvent( mpDoc, pSdrHint, aEvent ) ) - notifyEvent( aEvent ); - } + document::EventObject aEvent; + if( SvxUnoDrawMSFactory::createEvent( mpDoc, pSdrHint, aEvent ) ) + notifyEvent( aEvent ); } if( pSdrHint->GetKind() == HINT_MODELCLEARED ) @@ -2743,13 +2729,9 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn pMPage->SetLayoutName( aLayoutName ); mpDoc->InsertMasterPage(pMPage, (USHORT)nInsertPos); - { // insert background object - Point aBackgroundPos ( pMPage->GetLftBorder(), pMPage->GetUppBorder() ); - Size aBackgroundSize ( pMPage->GetSize() ); - aBackgroundSize.Width() -= pMPage->GetLftBorder() + pMPage->GetRgtBorder() - 1; - aBackgroundSize.Height() -= pMPage->GetUppBorder() + pMPage->GetLwrBorder() - 1; - Rectangle aBackgroundRect (aBackgroundPos, aBackgroundSize); - pMPage->CreatePresObj(PRESOBJ_BACKGROUND, FALSE, aBackgroundRect, sal_True ); + { + // ensure default MasterPage fill + pMPage->EnsureMasterPageDefaultBackground(); } xDrawPage = uno::Reference< drawing::XDrawPage >::query( pMPage->getUnoPage() ); diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 54c3f88a6916..d4ea1dce196f 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -737,22 +737,6 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName, aAny <<= aName; } } - else if( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_shape_zorder ) ) ) - { - SdrObject* pObj = mpShape->GetSdrObject(); - SdPage* pPage = pObj ? (SdPage*)pObj->GetPage() : NULL; - if( pPage && pPage == pObj->GetObjList() && pPage->IsMasterPage() && pPage->GetPageKind() == PK_STANDARD ) - { - sal_Int32 nOrdNum; - if( aAny >>= nOrdNum ) - { - // if this is a masterpage, there is always a background shape with the ord num 0 - // so we add one to the api ordnum to hide the background shape over the api - nOrdNum++; - aAny <<= nOrdNum; - } - } - } mpShape->_setPropertyValue(aPropertyName, aAny); } @@ -910,30 +894,6 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName, aRet <<= aName; } } - else if( PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_shape_zorder ) ) ) - { - SdrObject* pObj = mpShape->GetSdrObject(); - SdPage* pPage = pObj ? (SdPage*)pObj->GetPage() : NULL; - if( pPage && pPage == pObj->GetObjList() && pPage->IsMasterPage() && pPage->GetPageKind() == PK_STANDARD ) - { - sal_Int32 nOrdNum; - if( aRet >>= nOrdNum ) - { - // if this is a masterpage, there is always a background shape with the ord num 0 - // so we add one to the api ordnum to hide the background shape over the api - if( nOrdNum > 0 ) - { - nOrdNum--; - aRet <<= nOrdNum; - } - else - { - DBG_ERROR( "Masterpage without a background shape, ZOrder property will be corrupt!" ); - } - } - } - } - } return aRet; diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 834d79bcd5e4..69d961d7237a 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -356,7 +356,6 @@ SdGenericDrawPage::SdGenericDrawPage( SdXImpressDocument* _pModel, SdPage* pInPa mpModel ( _pModel ), mpSdrModel(0), mpPropSet ( _pSet ), - mbHasBackgroundObject(sal_False), mbIsImpressDocument(false) { mpSdrModel = SvxFmDrawPage::mpModel; @@ -1384,9 +1383,6 @@ Reference< drawing::XShape > SdGenericDrawPage::_CreateShape( SdrObject *pObj ) case PRESOBJ_TABLE: aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("TableShape") ); break; - case PRESOBJ_BACKGROUND: - DBG_ASSERT( sal_False, "Danger! Someone got hold of the horrible background shape!" ); - break; case PRESOBJ_PAGE: aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("PageShape") ); break; @@ -2461,40 +2457,11 @@ void SdDrawPage::setBackground( const Any& rValue ) if( !xSet.is() ) { - // the easy case, clear the background obj - GetPage()->SetBackgroundObj( NULL ); - - // #110094#-15 - // tell the page that it's visualization has changed - GetPage()->ActionChanged(); - + // the easy case, no background set. Set XFILL_NONE to represent this + GetPage()->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE)); return; } - // prepare background object - SdrObject* pObj = GetPage()->GetBackgroundObj(); - if( NULL == pObj ) - { - pObj = new SdrRectObj(); - GetPage()->SetBackgroundObj( pObj ); - - // #110094#-15 - // tell the page that it's visualization has changed - GetPage()->ActionChanged(); - } - - const sal_Int32 nLeft = GetPage()->GetLftBorder(); - const sal_Int32 nRight = GetPage()->GetRgtBorder(); - const sal_Int32 nUpper = GetPage()->GetUppBorder(); - const sal_Int32 nLower = GetPage()->GetLwrBorder(); - - Point aPos ( nLeft, nRight ); - Size aSize( GetPage()->GetSize() ); - aSize.Width() -= nLeft + nRight - 1; - aSize.Height() -= nUpper + nLower - 1; - Rectangle aRect( aPos, aSize ); - pObj->SetLogicRect( aRect ); - // is it our own implementation? SdUnoPageBackground* pBack = SdUnoPageBackground::getImplementation( xSet ); @@ -2532,11 +2499,14 @@ void SdDrawPage::setBackground( const Any& rValue ) //-/ pObj->NbcSetAttributes( aSet, sal_False ); if( aSet.Count() == 0 ) { - GetPage()->SetBackgroundObj( NULL ); + // no background fill, represent by setting XFILL_NONE + GetPage()->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE)); } else { - pObj->SetMergedItemSet(aSet); + // background fill, set at page (not sure if ClearItem is needed) + GetPage()->getSdrPageProperties().ClearItem(); + GetPage()->getSdrPageProperties().PutItemSet(aSet); } // repaint only @@ -2567,14 +2537,19 @@ Reference< XAnnotationEnumeration > SAL_CALL SdGenericDrawPage::createAnnotation void SdDrawPage::getBackground( Any& rValue ) throw() { - SdrObject* pObj = GetPage()->GetBackgroundObj(); - if( NULL == pObj ) + const SfxItemSet& rFillAttributes = GetPage()->getSdrPageProperties().GetItemSet(); + + if(XFILL_NONE == ((const XFillStyleItem&)rFillAttributes.Get(XATTR_FILLSTYLE)).GetValue()) { + // no fill set (switched off by XFILL_NONE), clear rValue to represent this rValue.clear(); } else { - Reference< beans::XPropertySet > xSet( new SdUnoPageBackground( GetModel()->GetDoc(), pObj ) ); + // there is a fill set, export to rValue + Reference< beans::XPropertySet > xSet(new SdUnoPageBackground( + GetModel()->GetDoc(), + &GetPage()->getSdrPageProperties().GetItemSet())); rValue <<= xSet; } } @@ -2678,7 +2653,6 @@ Any SdGenericDrawPage::getNavigationOrder() SdMasterPage::SdMasterPage( SdXImpressDocument* pModel, SdPage* pPage ) throw() : SdGenericDrawPage( pModel, pPage, ImplGetMasterPagePropertySet( pPage ? pPage->GetPageKind() : PK_STANDARD ) ) { - mbHasBackgroundObject = pPage && GetPage()->GetPageKind() == PK_STANDARD; } SdMasterPage::~SdMasterPage() throw() @@ -2823,7 +2797,7 @@ sal_Bool SAL_CALL SdMasterPage::hasElements() throw(uno::RuntimeException) if( SvxFmDrawPage::mpPage == NULL ) return sal_False; - return (SvxFmDrawPage::mpPage->GetObjCount() > 1) || (!mbHasBackgroundObject && SvxFmDrawPage::mpPage->GetObjCount() == 1 ); + return SvxFmDrawPage::mpPage->GetObjCount() > 0; } uno::Type SAL_CALL SdMasterPage::getElementType() @@ -2840,13 +2814,7 @@ sal_Int32 SAL_CALL SdMasterPage::getCount() throwIfDisposed(); - sal_Int32 nCount = SdGenericDrawPage::getCount(); - DBG_ASSERT( !mbHasBackgroundObject || (nCount > 0), "possible wrong shape count!" ); - - if( mbHasBackgroundObject && ( nCount > 0 ) ) - nCount--; - - return nCount; + return SdGenericDrawPage::getCount(); } Any SAL_CALL SdMasterPage::getByIndex( sal_Int32 Index ) @@ -2856,9 +2824,6 @@ Any SAL_CALL SdMasterPage::getByIndex( sal_Int32 Index ) throwIfDisposed(); - if( mbHasBackgroundObject ) - Index++; - return SdGenericDrawPage::getByIndex(Index); } @@ -2958,16 +2923,9 @@ void SdMasterPage::setBackground( const Any& rValue ) } } - - // if no background style is available, try the background object - SdrObject* pObj = GetPage()->GetPresObj(PRESOBJ_BACKGROUND); - if( pObj == NULL ) - return; - - pObj->SetMergedItemSet(aSet); - - // repaint only - SvxFmDrawPage::mpPage->ActionChanged(); + // if no background style is available, set at page directly. This + // is an error and should NOT happen (and will be asserted from the SdrPage) + GetPage()->getSdrPageProperties().PutItemSet(aSet); } } catch( Exception& ) @@ -3010,23 +2968,19 @@ void SdMasterPage::getBackground( Any& rValue ) throw() } } - // no stylesheet? try old fashion background rectangle - SdrObject* pObj = NULL; - if( SvxFmDrawPage::mpPage->GetObjCount() >= 1 ) + // No style found, use fill attributes from page background. This + // should NOT happen and is an error + const SfxItemSet& rFallbackItemSet(SvxFmDrawPage::mpPage->getSdrPageProperties().GetItemSet()); + + if(XFILL_NONE == ((const XFillStyleItem&)rFallbackItemSet.Get(XATTR_FILLSTYLE)).GetValue()) { - pObj = SvxFmDrawPage::mpPage->GetObj(0); - if( pObj->GetObjInventor() != SdrInventor || pObj->GetObjIdentifier() != OBJ_RECT ) - pObj = NULL; + rValue <<= Reference< beans::XPropertySet >( + new SdUnoPageBackground(GetModel()->GetDoc(), &rFallbackItemSet)); } - - if( pObj ) + else { - rValue <<= Reference< beans::XPropertySet >( new SdUnoPageBackground( GetModel()->GetDoc(), pObj ) ); - return; + rValue.clear(); } - - - rValue.clear(); } } catch( Exception& ) diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx index a9452793f777..52e5cc061f7d 100644 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/unoidl/unopage.hxx @@ -94,7 +94,6 @@ protected: void SetWidth( sal_Int32 nWidth ); void SetHeight( sal_Int32 nHeight ); - sal_Bool mbHasBackgroundObject; bool mbIsImpressDocument; virtual void disposing() throw(); diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 341cd0c53d40..1ac62fb1363f 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -65,21 +65,12 @@ const SvxItemPropertySet* ImplGetPageBackgroundPropertySet() UNO3_GETIMPLEMENTATION_IMPL( SdUnoPageBackground ); -SdUnoPageBackground::SdUnoPageBackground( SdDrawDocument* pDoc /* = NULL */, SdrObject* pObj /* = NULL */ ) throw() -: mpPropSet( ImplGetPageBackgroundPropertySet() ), mpSet( NULL ), mpDoc( pDoc ) -{ - if( pDoc ) - { - StartListening( *pDoc ); - mpSet = new SfxItemSet( pDoc->GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST ); - - if( pObj ) - mpSet->Put(pObj->GetMergedItemSet()); - } -} - -SdUnoPageBackground::SdUnoPageBackground( SdDrawDocument* pDoc, const SfxItemSet* pSet ) throw() -: mpPropSet( ImplGetPageBackgroundPropertySet() ), mpSet( NULL ), mpDoc( pDoc ) +SdUnoPageBackground::SdUnoPageBackground( + SdDrawDocument* pDoc /* = NULL */, + const SfxItemSet* pSet /* = NULL */) throw() +: mpPropSet(ImplGetPageBackgroundPropertySet()), + mpSet(NULL), + mpDoc(pDoc) { if( pDoc ) { diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx index dfe876cc95b8..530a75856662 100644 --- a/sd/source/ui/unoidl/unopback.hxx +++ b/sd/source/ui/unoidl/unopback.hxx @@ -40,8 +40,6 @@ #include <cppuhelper/implbase4.hxx> const SvxItemPropertySet* ImplGetPageBackgroundPropertySet(); - -class SdrObject; class SdDrawDocument; class SfxItemSet; @@ -59,8 +57,7 @@ protected: const SfxItemPropertySimpleEntry* getPropertyMapEntry( const ::rtl::OUString& rPropertyName ) const throw(); public: - SdUnoPageBackground( SdDrawDocument* pDoc = NULL, SdrObject* pObj = NULL ) throw(); - SdUnoPageBackground( SdDrawDocument* pDoc, const SfxItemSet* pSet ) throw(); + SdUnoPageBackground( SdDrawDocument* pDoc = NULL, const SfxItemSet* pSet = NULL) throw(); ~SdUnoPageBackground() throw(); // internal diff --git a/sd/source/ui/view/DocumentRenderer.src b/sd/source/ui/view/DocumentRenderer.src index 5a1030f1c18d..6419cb5c4e90 100644 --- a/sd/source/ui/view/DocumentRenderer.src +++ b/sd/source/ui/view/DocumentRenderer.src @@ -160,7 +160,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS { < "Original colors" ; > ; < "Grayscale" ; > ; - < "Black & White" ; > ; + < "Black & white" ; > ; }; }; StringArray _STR_IMPRESS_PRINT_UI_QUALITY_CHOICES_HELP @@ -184,8 +184,8 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS { < "Original size" ; > ; < "Fit to printable page" ; > ; - < "Distribute on multiple paper sheets" ; > ; - < "Tile paper sheet with repeated slides" ; > ; + < "Distribute on multiple sheets of paper" ; > ; + < "Tile sheet of paper with repeated slides" ; > ; }; }; StringArray _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW @@ -194,8 +194,8 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS { < "Original size" ; > ; < "Fit to printable page" ; > ; - < "Distribute on multiple paper sheets" ; > ; - < "Tile paper sheet with repeated pages" ; > ; + < "Distribute on multiple sheets of paper" ; > ; + < "Tile sheet of paper with repeated pages" ; > ; }; }; StringArray _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx index 273f7a3fd613..a16b12d3cb63 100644 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -89,10 +89,10 @@ PresentationViewShellBase::PresentationViewShellBase ( GetUpdateLockManager()->Disable(); // Hide the automatic (non-context sensitive) tool bars. - if (_pFrame!=NULL && _pFrame->GetFrame()!=NULL) + if (_pFrame!=NULL) { Reference<beans::XPropertySet> xFrameSet ( - _pFrame->GetFrame()->GetFrameInterface(), + _pFrame->GetFrame().GetFrameInterface(), UNO_QUERY); if (xFrameSet.is()) { diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index e2a75849c524..4919a9fe2bbb 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -718,8 +718,8 @@ void ToolBarManager::Implementation::SetValid (bool bValid) if (mbIsValid) { Reference<frame::XFrame> xFrame; - if (mrBase.GetViewFrame() != NULL && mrBase.GetViewFrame()->GetFrame()) - xFrame = mrBase.GetViewFrame()->GetFrame()->GetFrameInterface(); + if (mrBase.GetViewFrame() != NULL) + xFrame = mrBase.GetViewFrame()->GetFrame().GetFrameInterface(); try { Reference<beans::XPropertySet> xFrameProperties (xFrame, UNO_QUERY_THROW); diff --git a/sd/source/ui/view/UpdateLockManager.cxx b/sd/source/ui/view/UpdateLockManager.cxx index 2c992e826f0f..f373042f627b 100644 --- a/sd/source/ui/view/UpdateLockManager.cxx +++ b/sd/source/ui/view/UpdateLockManager.cxx @@ -396,11 +396,10 @@ Reference< ::com::sun::star::frame::XLayoutManager> if (mxLayoutManager.get() == NULL) { - if (mrBase.GetViewFrame()!=NULL - && mrBase.GetViewFrame()->GetFrame()!=NULL) + if (mrBase.GetViewFrame()!=NULL) { Reference<beans::XPropertySet> xFrameProperties ( - mrBase.GetViewFrame()->GetFrame()->GetFrameInterface(), + mrBase.GetViewFrame()->GetFrame().GetFrameInterface(), UNO_QUERY); if (xFrameProperties.is()) { diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 4a60d92e6bcb..6640d2455c20 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -280,11 +280,7 @@ ViewShellBase::ViewShellBase ( SfxViewFrame* _pFrame, SfxViewShell*) : SfxViewShell (_pFrame, - SFX_VIEW_MAXIMIZE_FIRST - | SFX_VIEW_OPTIMIZE_EACH - | SFX_VIEW_DISABLE_ACCELS - | SFX_VIEW_OBJECTSIZE_EMBEDDED - | SFX_VIEW_CAN_PRINT + SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS), maMutex(), mpImpl(), @@ -1054,7 +1050,7 @@ void ViewShellBase::UpdateBorder ( bool bForce /* = false */ ) // calls for the views in side panes but prevents calling an already // dying SfxViewShell base class. // For issue #140703# we have to check the existence of the window, - // too. The SfxTopViewFrame accesses the window without checking it. + // too. The SfxViewFrame accesses the window without checking it. ViewShell* pMainViewShell = GetMainViewShell().get(); if (pMainViewShell != NULL && GetWindow()!=NULL) { @@ -1270,7 +1266,7 @@ CustomHandleManager& ViewShellBase::getCustomHandleManager() const Reference< XMultiServiceFactory > xServiceManager( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); Reference< XModuleManager > xModuleManager( xServiceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager") ) ), UNO_QUERY_THROW ); - Reference< XInterface > xIfac( GetMainViewShell()->GetViewFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY_THROW ); + Reference< XInterface > xIfac( GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(), UNO_QUERY_THROW ); ::rtl::OUString aModuleIdentifier( xModuleManager->identify( xIfac ) ); diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 304b9bf3de4b..81e69f36300c 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -303,8 +303,7 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, String aTemplateName(aLayoutName); if (ePresObjKind == PRESOBJ_TITLE || - ePresObjKind == PRESOBJ_NOTES || - ePresObjKind == PRESOBJ_BACKGROUND) + ePresObjKind == PRESOBJ_NOTES) { // Presentation object (except outline) SfxStyleSheet* pSheet = rPage.GetStyleSheetForPresObj( ePresObjKind ); @@ -577,17 +576,6 @@ void DrawView::HideSdrPage() ::sd::View::HideSdrPage(); } -SdrObject* DrawView::GetMaxToBtmObj(SdrObject* pObj) const -{ - if( pObj ) - { - SdPage* pPage = (SdPage*)pObj->GetPage(); - if( pPage && pPage->IsMasterPage() ) - return pPage->GetPresObj( PRESOBJ_BACKGROUND ) ; - } - return NULL; -} - void DrawView::DeleteMarked() { sd::UndoManager* pUndoManager = mpDoc->GetUndoManager(); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 4b9aecb02ac5..55ba07c3fa23 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -154,12 +154,32 @@ void DrawViewShell::Deactivate(BOOL bIsMDIActivate) ViewShell::Deactivate(bIsMDIActivate); } +namespace +{ + class LockUI + { + private: + void Lock(bool bLock); + SfxViewFrame *mpFrame; + public: + LockUI(SfxViewFrame *pFrame) : mpFrame(pFrame) { Lock(true); } + ~LockUI() { Lock(false); } + + }; + + void LockUI::Lock(bool bLock) + { + if (!mpFrame) + return; + mpFrame->Enable( !bLock ); + } +} + /************************************************************************* |* |* Wird gerufen, wenn sich der Selektionszustand der View aendert |* \************************************************************************/ - void DrawViewShell::SelectionHasChanged (void) { Invalidate(); @@ -213,6 +233,8 @@ void DrawViewShell::SelectionHasChanged (void) // we need to deselect it now if (!pOleObj) { + //#i47279# disable frame until after object has completed unload + LockUI aUILock(GetViewFrame()); pIPClient->DeactivateObject(); //HMHmpDrView->ShowMarkHdl(); } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index e7ea82bb345a..852e56096a76 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -98,9 +98,12 @@ #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XConfiguration.hpp> +#include <com/sun/star/frame/XFrame.hpp> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; +using ::com::sun::star::frame::XFrame; +using ::com::sun::star::frame::XController; namespace sd { @@ -375,17 +378,15 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) try { + Reference< XFrame > xFrame( pFrame->GetFrame().GetFrameInterface(), UNO_SET_THROW ); + // Save the current configuration of panes and views. Reference<XControllerManager> xControllerManager ( GetViewShellBase().GetController(), UNO_QUERY_THROW); Reference<XConfigurationController> xConfigurationController ( - xControllerManager->getConfigurationController()); - if ( ! xConfigurationController.is()) - throw RuntimeException(); + xControllerManager->getConfigurationController(), UNO_QUERY_THROW ); Reference<XConfiguration> xConfiguration ( - xConfigurationController->getRequestedConfiguration()); - if ( ! xConfiguration.is()) - throw RuntimeException(); + xConfigurationController->getRequestedConfiguration(), UNO_SET_THROW ); SfxChildWindow* pWindow = pFrame->GetChildWindow(nId); if(pWindow) @@ -398,14 +399,12 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) // Normale Weiterleitung an ViewFrame zur Ausfuehrung GetViewFrame()->ExecuteSlot(rReq); - // From here on we must cope with this object already being + // From here on we must cope with this object and the frame already being // deleted. Do not call any methods or use data members. - ViewShellBase* pBase = ViewShellBase::GetViewShellBase(pFrame); - OSL_ASSERT(pBase!=NULL); + Reference<XController> xController( xFrame->getController(), UNO_SET_THROW ); // Restore the configuration. - xControllerManager = Reference<XControllerManager>( - pBase->GetController(), UNO_QUERY_THROW); + xControllerManager = Reference<XControllerManager>( xController, UNO_QUERY_THROW); xConfigurationController = Reference<XConfigurationController>( xControllerManager->getConfigurationController()); if ( ! xConfigurationController.is()) diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index f3f4d3ded05e..18ff686fc612 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -153,7 +153,7 @@ void DrawViewShell::ArrangeGUIElements (void) if ( pIPClient && pIPClient->IsObjectInPlaceActive() ) bClientActive = TRUE; - BOOL bInPlaceActive = GetViewFrame()->GetFrame()->IsInPlace(); + BOOL bInPlaceActive = GetViewFrame()->GetFrame().IsInPlace(); if ( mbZoomOnPage && !bInPlaceActive && !bClientActive ) { diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index f718bc46ba93..e0cb78095bd0 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -1592,9 +1592,9 @@ void DrawViewShell::GetModeSwitchingMenuState (SfxItemSet &rSet) // view mode is allowed. const bool bIsRunning = SlideShow::IsRunning(GetViewShellBase()); - if (GetViewFrame()->GetFrame()->IsInPlace() || bIsRunning) + if (GetViewFrame()->GetFrame().IsInPlace() || bIsRunning) { - if ( !GetViewFrame()->GetFrame()->IsInPlace() ) + if ( !GetViewFrame()->GetFrame().IsInPlace() ) { rSet.ClearItem( SID_DRAWINGMODE ); rSet.DisableItem( SID_DRAWINGMODE ); diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index d3ae49a1f068..1a667b28f6d4 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -66,7 +66,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <avmedia/mediawindow.hxx> #include <svl/urihelper.hxx> -#include <sfx2/topfrm.hxx> #include <sfx2/docfile.hxx> #include "DrawViewShell.hxx" diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index e5af6dcf991a..0a5f743bb738 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -59,7 +59,6 @@ #include <svx/svdouno.hxx> #include <tools/urlobj.hxx> #include <svx/fmshell.hxx> -#include <sfx2/topfrm.hxx> #include <svl/cjkoptions.hxx> #ifndef SD_FRAME_VIEW diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index e358ebf4d562..aca0130624ce 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -33,7 +33,6 @@ #ifndef _SVXIDS_HRC #include <svx/svxids.hrc> #endif -#include <sfx2/topfrm.hxx> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/drawing/framework/ResourceId.hpp> #include <rtl/ustrbuf.hxx> @@ -54,6 +53,7 @@ #include "sdiocmpt.hxx" #include "framework/FrameworkHelper.hxx" #include <comphelper/processfactory.hxx> +#include <sfx2/viewfrm.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -100,8 +100,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * ULONG nSdViewShellCount = 0; ViewShellBase* pBase = NULL; SfxViewShell* pSfxViewSh = NULL; - SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(pDocShell, - TYPE(SfxTopViewFrame)); + SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(pDocShell); while (pSfxViewFrame) { @@ -142,8 +141,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * } } - pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, pDocShell, - TYPE(SfxTopViewFrame)); + pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, pDocShell); } SdDrawDocument* pDoc = pDocShell->GetDoc(); diff --git a/sd/source/ui/view/makefile.mk b/sd/source/ui/view/makefile.mk index 074497ca1de7..3b3bca4ff3d5 100644 --- a/sd/source/ui/view/makefile.mk +++ b/sd/source/ui/view/makefile.mk @@ -53,7 +53,6 @@ SLOFILES = \ $(SLO)$/sdview2.obj \ $(SLO)$/sdview3.obj \ $(SLO)$/sdview4.obj \ - $(SLO)$/sdview5.obj \ $(SLO)$/viewshel.obj \ $(SLO)$/viewshe2.obj \ $(SLO)$/viewshe3.obj \ diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 65e92b26c420..1467e6c24bd0 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -58,7 +58,6 @@ #include <sfx2/tplpitem.hxx> #include <svx/svdorect.hxx> #include <sot/formats.hxx> -#include <sfx2/topfrm.hxx> #include <com/sun/star/linguistic2/XThesaurus.hpp> #include <com/sun/star/i18n/TransliterationModules.hdl> #include <editeng/unolingu.hxx> diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 15b2f0f15d0f..30daec8b636e 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -209,7 +209,7 @@ OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewSh maBulletFont.SetShadow(FALSE); - Reference<XFrame> xFrame (mpOutlineViewShell->GetViewShellBase().GetFrame()->GetTopFrame()->GetFrameInterface(), UNO_QUERY); + Reference<XFrame> xFrame (mpOutlineViewShell->GetViewShellBase().GetFrame()->GetTopFrame().GetFrameInterface(), UNO_QUERY); const OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( ".uno:ShowSlide" )); maSlideImage = GetImage( xFrame, aSlotURL, true, false /* todo, hc mode */ ); diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index fde6287e3038..11f20c7a83d4 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -38,7 +38,6 @@ #include "optsitem.hxx" #include "sddll.hxx" #include <sfx2/request.hxx> -#include <sfx2/topfrm.hxx> #ifndef _SFX_DISPATCH_HXX #include <sfx2/dispatch.hxx> #endif diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 94bf70287ccd..813c6caba95a 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -261,11 +261,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP if( !bSubContentProcessing || !pObject->IsNotVisibleAsMaster() ) { eKind = pObjectsSdPage ? pObjectsSdPage->GetPresObjKind(pObject) : PRESOBJ_NONE; - - if( eKind != PRESOBJ_BACKGROUND ) - { - bCreateOutline = true; - } + bCreateOutline = true; } } else if( ( pObject->GetObjInventor() == SdrInventor ) && ( pObject->GetObjIdentifier() == OBJ_TEXT ) ) @@ -311,7 +307,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP // create dashed border { // create object polygon - basegfx::B2DPolygon aPolygon(basegfx::tools::createPolygonFromRect(basegfx::B2DRange(0.0, 0.0, 1.0, 1.0))); + basegfx::B2DPolygon aPolygon(basegfx::tools::createUnitPolygon()); aPolygon.transform(aObjectMatrix); // create line and stroke attribute diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx deleted file mode 100644 index 51c6725f6d83..000000000000 --- a/sd/source/ui/view/sdview5.cxx +++ /dev/null @@ -1,29 +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_sd.hxx" diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 9e5d927b263e..20ca059b16d5 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -75,14 +75,14 @@ </menu:menu> <menu:menu menu:id=".uno:ViewMenu"> <menu:menupopup> - <menu:menuitem menu:id=".uno:PageMode"/> - <menu:menuitem menu:id=".uno:MasterPage"/> + <menu:menuitem menu:id=".uno:PageMode" menu:style="radio"/> + <menu:menuitem menu:id=".uno:MasterPage" menu:style="radio"/> <menu:menuseparator/> <menu:menu menu:id=".uno:DisplayQualityMenu"> <menu:menupopup> - <menu:menuitem menu:id=".uno:OutputQualityColor"/> - <menu:menuitem menu:id=".uno:OutputQualityGrayscale"/> - <menu:menuitem menu:id=".uno:OutputQualityBlackWhite"/> + <menu:menuitem menu:id=".uno:OutputQualityColor" menu:style="radio"/> + <menu:menuitem menu:id=".uno:OutputQualityGrayscale" menu:style="radio"/> + <menu:menuitem menu:id=".uno:OutputQualityBlackWhite" menu:style="radio"/> </menu:menupopup> </menu:menu> <menu:menuseparator/> diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index c1dacd33e0c0..03d4c238e360 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -76,12 +76,12 @@ </menu:menu> <menu:menu menu:id=".uno:ViewMenu"> <menu:menupopup> - <menu:menuitem menu:id=".uno:NormalMultiPaneGUI"/> - <menu:menuitem menu:id=".uno:OutlineMode"/> - <menu:menuitem menu:id=".uno:DiaMode"/> + <menu:menuitem menu:id=".uno:NormalMultiPaneGUI" menu:style="radio"/> + <menu:menuitem menu:id=".uno:OutlineMode" menu:style="radio"/> + <menu:menuitem menu:id=".uno:DiaMode" menu:style="radio"/> <menu:menuitem menu:id=".uno:Presentation"/> - <menu:menuitem menu:id=".uno:NotesMode"/> - <menu:menuitem menu:id=".uno:HandoutMode"/> + <menu:menuitem menu:id=".uno:NotesMode" menu:style="radio"/> + <menu:menuitem menu:id=".uno:HandoutMode" menu:style="radio"/> <menu:menuseparator/> <menu:menu menu:id=".uno:MasterPageMenu"> <menu:menupopup> @@ -93,9 +93,9 @@ </menu:menu> <menu:menu menu:id=".uno:DisplayQualityMenu"> <menu:menupopup> - <menu:menuitem menu:id=".uno:OutputQualityColor"/> - <menu:menuitem menu:id=".uno:OutputQualityGrayscale"/> - <menu:menuitem menu:id=".uno:OutputQualityBlackWhite"/> + <menu:menuitem menu:id=".uno:OutputQualityColor" menu:style="radio"/> + <menu:menuitem menu:id=".uno:OutputQualityGrayscale" menu:style="radio"/> + <menu:menuitem menu:id=".uno:OutputQualityBlackWhite" menu:style="radio"/> </menu:menupopup> </menu:menu> <menu:menuseparator/> diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index 715e40e252af..54406135331d 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -157,7 +157,7 @@ LIB6FILES= \ # sdd SHL2TARGET= sdd$(DLLPOSTFIX) SHL2IMPLIB= sddimp -SHL2VERSIONMAP= sdd.map +SHL2VERSIONMAP=$(SOLARENV)/src/component.map SHL2DEF=$(MISC)$/$(SHL2TARGET).def DEF2NAME= $(SHL2TARGET) diff --git a/sd/util/sd.map b/sd/util/sd.map deleted file mode 100644 index 59e1057c6daa..000000000000 --- a/sd/util/sd.map +++ /dev/null @@ -1,8 +0,0 @@ -SD_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/sd/util/sdd.map b/sd/util/sdd.map deleted file mode 100644 index c7439a13948e..000000000000 --- a/sd/util/sdd.map +++ /dev/null @@ -1,8 +0,0 @@ -SCH_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/sd/util/sdfilt.map b/sd/util/sdfilt.map index 62213393408d..e38cc1e8c597 100644 --- a/sd/util/sdfilt.map +++ b/sd/util/sdfilt.map @@ -1,4 +1,4 @@ -PPTEXPORTER_1_0 { +UDK_3_0_0 { global: ExportPPT; ImportPPT; diff --git a/sd/util/sdui.map b/sd/util/sdui.map index 51f26bb81cfb..ad5e33836c7c 100644 --- a/sd/util/sdui.map +++ b/sd/util/sdui.map @@ -1,4 +1,4 @@ -CUI_1_0 { +UDK_3_0_0 { global: CreateDialogFactory; local: |