diff options
Diffstat (limited to 'sd')
256 files changed, 271 insertions, 8619 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index 0c14dec72583..1b608fa7b637 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -136,9 +136,6 @@ public: */ void StartSpelling (void); - /** Proxy for method from base class to avoid compiler warning */ - void StartSpelling(EditView&, unsigned char); - /** Initiate a find and/or replace on the next relevant text object. @return Returns </TRUE> when the search/replace is finished (as @@ -179,13 +176,6 @@ public: enum ChangeHint { CH_VIEW_SHELL_INVALID, CH_VIEW_SHELL_VALID }; - /** Handle a change outside the outliner which may affect the outliner. - At the moment this is restricted to changes of the main view shell - but later may include any changes that are detected now by - DetectChange(). - */ - void HandleOutsideChange (ChangeHint eHint); - int GetIgnoreCurrentPageChangesLevel() const { return mnIgnoreCurrentPageChangesLevel; }; void IncreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel++; }; void DecreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel--; }; @@ -421,15 +411,6 @@ private: */ void EndOfSearch (void); - /** Prepare to commence searching/spell checking on the specified page. - This also creates a proper page iterator. - @param nPageIndex - Index of the page to prepare for searching. The default value - of -1 is a flag for using the first/last page of the current - edit mode/view mode depending on the search direction. - */ - void InitPage (USHORT nPageIndex = (USHORT)-1); - /** Show a dialog that tells the user that the search has ended either because there are no more matches after finding at least one or that no match has been found at all. @@ -521,11 +502,6 @@ private: */ bool HandleFailedSearch (void); - /** Return a parent window for a dialog. The returned window depends on - the search mode. - */ - ::Window* GetParentForDialog (void); - /** Take a position as returned by an object iterator and switch to the view and page on which the object specified by this position is located. diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index ce291a6f5a00..92301f06289c 100644 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx @@ -109,13 +109,6 @@ public: */ explicit Iterator (IteratorImplBase* pObject); - /** Create a new iterator with the implementation object being the copy - of the provided one. - @param rObject - A copy of this object will become the implementation object. - */ - explicit Iterator (const IteratorImplBase& rObject); - ~Iterator (void); /** Assign the iterator from the given one. The implementation object @@ -240,9 +233,8 @@ private: This specifies whether the returned iterator points to the first, (one past the) last, or current object. @return - Returns an iterator as constructed by one of the + Returns an iterator as constructed by <member>CreateSelectionIterator()</member>, - <member>CreateViewIterator()</member>, or <member>CreateDocumentIterator()</member>. */ Iterator CreateIterator (IteratorLocation aLocation); @@ -270,24 +262,6 @@ private: IteratorLocation aLocation=BEGIN); /** Create an iterator that iterates over all <type>SdrObjects</type> - objects of the <member>mpOutliner</member> outliner that belong to - the current view. - @param pDocument - The document to which the objects belong. - @param pViewShell - The view shell which displays the objects. - @param bDirectionIsForward - The direction of iteration. It defaults to forward. - @param aLocation - This specifies at which object the iterator points initially. - */ - Iterator CreateViewIterator ( - SdDrawDocument* pDocument, - const boost::shared_ptr<ViewShell>& rpViewShell, - bool bDirectionIsForward=true, - IteratorLocation aLocation=BEGIN); - - /** Create an iterator that iterates over all <type>SdrObjects</type> objects of the <member>mpOutliner</member> outliner. @param pDocument The document to which the objects belong. @@ -356,9 +330,6 @@ public: assigned to the data members of this object. */ IteratorPosition (const IteratorPosition& aPosition); - /** Create a new object and set its data members to the given values. - */ - IteratorPosition (SdrObject* pObject, sal_Int32 nText, sal_Int32 nPageIndex, PageKind ePageKind, EditMode eEditMode); /// The destructor is a no-op at the moment. ~IteratorPosition (void); diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 1d801baa5d3c..6811da762934 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -441,7 +441,6 @@ public: CharClass* GetCharClass() const { return mpCharClass; } void RestoreLayerNames(); - void MakeUniqueLayerNames(); void UpdateAllLinks(); @@ -465,18 +464,6 @@ public: static SdDrawDocument* pDocLockedInsertingLinks; // static to prevent recursions while resolving links - /** This method acts as a simplified front end for the more complex - <member>CreatePage()</member> method. - @param nPageNum - The page number as passed to the <member>GetSdPage()</member> - method from which to use certain properties for the new pages. - These include the auto layout. - @return - Returns an index of the inserted pages that can be used with the - <member>GetSdPage()</member> method. - */ - USHORT CreatePage (USHORT nPageNum); - /** Create and insert a set of two new pages: a standard (draw) page and the associated notes page. The new pages are inserted direclty after the specified page set. @@ -687,7 +674,6 @@ namespace sd class ModifyGuard { public: - ModifyGuard( DrawDocShell* pDocShell ); ModifyGuard( SdDrawDocument* pDoc ); ~ModifyGuard(); diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 0dad3ca237cb..f0d5cc64a3c4 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -141,8 +141,6 @@ public: SD_DLLPUBLIC SvNumberFormatter* GetNumberFormatter(); - ::com::sun::star::text::WritingMode GetDefaultWritingMode() const; - //virtuelle Methoden fuer den Optionendialog virtual SfxItemSet* CreateItemSet( USHORT nId ); virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); 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/shapelist.hxx b/sd/inc/shapelist.hxx index 553f438669d2..44a258001fc3 100644 --- a/sd/inc/shapelist.hxx +++ b/sd/inc/shapelist.hxx @@ -60,10 +60,6 @@ namespace sd returns the first shape if pObj is 0 */ SdrObject* getNextShape(SdrObject* pObj) const; - /** returns the shape prior to the given shape in the list or 0 - returns the last shape if pObj is 0 */ - SdrObject* getPreviousShape( SdrObject* pObj ) const; - /** */ SdrObject* getNextShape(); diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index d49d743b6dee..e8baba1aa79e 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -68,7 +68,6 @@ public: SfxStyleSheetBase* GetActualStyleSheet() { return mpActualStyleSheet; } SfxStyleSheetBase* GetTitleSheet(const String& rLayoutName); - String GetLayoutName() const; // Caller muss Liste loeschen List* CreateOutlineSheetList(const String& rLayoutName); @@ -82,7 +81,6 @@ public: when styles are missing. */ SD_DLLPUBLIC void CreateLayoutStyleSheets(const String& rLayoutName, sal_Bool bCheck = sal_False ); - void EraseLayoutStyleSheets(const String& rLayoutName); List* CreateLayoutSheetNames(const String& rLayoutName) const; void CreateLayoutSheetList(const String& rLayoutName, SdStyleSheetVector& rLayoutSheets); void CopyLayoutSheets(const String& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets ); diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx index ced8a48c5bb6..6fa186596fba 100644 --- a/sd/inc/textapi.hxx +++ b/sd/inc/textapi.hxx @@ -53,7 +53,6 @@ public: virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); OutlinerParaObject* CreateText(); - void SetString( const String& rText ); void SetText( OutlinerParaObject& rText ); String GetText(); diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 7852f7cc8fcf..33b9c233909b 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -1809,15 +1809,6 @@ void EffectSequenceHelper::append( const CustomAnimationEffectPtr& pEffect ) // -------------------------------------------------------------------- -void EffectSequenceHelper::insert( EffectSequence::iterator& rPos, const CustomAnimationEffectPtr& pEffect ) -{ - pEffect->setEffectSequence( this ); - maEffects.insert( rPos, pEffect ); - rebuild(); -} - -// -------------------------------------------------------------------- - CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPresetPtr& pPreset, const Any& rTarget, double fDuration /* = -1.0 */ ) { CustomAnimationEffectPtr pEffect; diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 092549428a42..14614dbf1337 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -1342,37 +1342,6 @@ void SdDrawDocument::CheckMasterPages() } } - - - -USHORT SdDrawDocument::CreatePage (USHORT nPageNum) -{ - PageKind ePageKind = PK_STANDARD; - - // Get current page. - SdPage* pActualPage = GetSdPage(nPageNum, ePageKind); - - // Get background flags. - SdrLayerAdmin& rLayerAdmin = GetLayerAdmin(); - BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE); - BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE); - SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers(); - - // Get layout from current page. - AutoLayout eAutoLayout = pActualPage->GetAutoLayout(); - - return CreatePage ( - pActualPage, ePageKind, - // No names for the new slides. - String(), String(), - eAutoLayout, eAutoLayout, - aVisibleLayers.IsSet(aBckgrnd), - aVisibleLayers.IsSet(aBckgrndObj)); -} - - - - USHORT SdDrawDocument::CreatePage ( SdPage* pActualPage, PageKind ePageKind, diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index b615c7e76c05..89f74de30494 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -242,26 +242,6 @@ void SdDrawDocument::CreateLayoutTemplates() rISet.Put(SvxLRSpaceItem(EE_PARA_LRSPACE)); rISet.Put(SvxULSpaceItem(EE_PARA_ULSPACE)); - // only change paragraph text direction, - // if this is a new document and - // text direction is set explicitly to RTL -/* - if( mpDocSh && - mpDocSh->IsNewDocument() && - SD_MOD()->GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB ) - { - SvxAdjustItem aAdjust( SVX_ADJUST_RIGHT ); - SvxFrameDirectionItem aFrameDirectionItem( FRMDIR_HORI_RIGHT_TOP, EE_PARA_WRITINGDIR ); - - rISet.Put( aAdjust ); - rISet.Put( aFrameDirectionItem ); - - pItemPool->SetPoolDefaultItem( aAdjust ); - pItemPool->SetPoolDefaultItem( aFrameDirectionItem ); - } - else - rISet.Put( SvxAdjustItem() ); -*/ rISet.Put( SdrTextLeftDistItem( 250 ) ); // sj: (i33745) using text frame distances seems to be a better default rISet.Put( SdrTextRightDistItem( 250 ) ); rISet.Put( SdrTextUpperDistItem( 125 ) ); @@ -1121,57 +1101,6 @@ void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject* /************************************************************************* |* -|* Sprachabhaengige Namen der StandardLayer durch eindeutigen Namen ersetzen -|* -\************************************************************************/ - -void SdDrawDocument::MakeUniqueLayerNames() -{ - String aLayerLayout(SdResId(STR_LAYER_LAYOUT)); - String aLayerBckgrnd(SdResId(STR_LAYER_BCKGRND)); - String aLayerBckgrndObj(SdResId(STR_LAYER_BCKGRNDOBJ)); - String aLayerControls(SdResId(STR_LAYER_CONTROLS)); - String aLayerMeasurelines(SdResId(STR_LAYER_MEASURELINES)); - SdrLayerAdmin& rLayerAdmin = GetLayerAdmin(); - USHORT nStandardLayer = 5; - USHORT nLayerCount = Min(rLayerAdmin.GetLayerCount(), nStandardLayer); - - for (USHORT nLayer = 0; nLayer < nLayerCount; nLayer++) - { - // Die sprachabhaengigen Namen der Default-Layer werden nicht mehr - // gespeichert. Es werden stattdessen eindeutige Namen verwendet. - SdrLayer* pLayer = rLayerAdmin.GetLayer(nLayer); - - if (pLayer) - { - String aLayerName(pLayer->GetName()); - - if (aLayerName == aLayerLayout) - { - pLayer->SetName( String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_LAYOUT" ))); - } - else if (aLayerName == aLayerBckgrnd) - { - pLayer->SetName( String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_BCKGRND" ))); - } - else if (aLayerName == aLayerBckgrndObj) - { - pLayer->SetName( String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_BACKGRNDOBJ" ))); - } - else if (aLayerName == aLayerControls) - { - pLayer->SetName( String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_CONTROLS" ))); - } - else if (aLayerName == aLayerMeasurelines) - { - pLayer->SetName( String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_MEASURELINES" ))); - } - } - } -} - -/************************************************************************* -|* |* Eindeutige Namen der StandardLayer durch sprachabhaengige Namen ersetzen |* \************************************************************************/ @@ -1545,12 +1474,6 @@ SdStyleSheetPool* SdDrawDocument::GetSdStyleSheetPool() const return dynamic_cast< SdStyleSheetPool* >( GetStyleSheetPool() ); } -ModifyGuard::ModifyGuard( DrawDocShell* pDocShell ) -: mpDocShell( pDocShell ), mpDoc( 0 ) -{ - init(); -} - ModifyGuard::ModifyGuard( SdDrawDocument* pDoc ) : mpDocShell( 0 ), mpDoc( pDoc ) { diff --git a/sd/source/core/shapelist.cxx b/sd/source/core/shapelist.cxx index daefe45c3cb1..4bb14b642f79 100644 --- a/sd/source/core/shapelist.cxx +++ b/sd/source/core/shapelist.cxx @@ -132,25 +132,6 @@ SdrObject* ShapeList::getNextShape(SdrObject* pObj) const return 0; } -SdrObject* ShapeList::getPreviousShape( SdrObject* pObj ) const -{ - if( pObj ) - { - ListImpl::const_iterator aIter( std::find( maShapeList.begin(), maShapeList.end(), pObj ) ); - if( (aIter != maShapeList.end()) && (aIter != maShapeList.begin()) ) - { - aIter--; - return (*aIter); - } - } - else if( !maShapeList.empty() ) - { - return (*--maShapeList.end()); - } - - return 0; -} - void ShapeList::ObjectInDestruction(const SdrObject& rObject) { ListImpl::iterator aIter( std::find( maShapeList.begin(), maShapeList.end(), &rObject ) ); diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index e592ba45a27e..25ccc7d708ff 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -144,30 +144,6 @@ SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const String& rLayoutName) return pResult; } -// ---------------------------------------------------------- -// find layout name of first layout -// ---------------------------------------------------------- - -String SdStyleSheetPool::GetLayoutName() const -{ - String aName( SdResId(STR_LAYOUT_DEFAULT_NAME ) ); - sal_uInt32 nCount = aStyles.size(); - - for( sal_uInt32 n = 0; n < nCount; n++ ) - { - aName = aStyles[n]->GetName(); - sal_uInt16 nPos = aName.SearchAscii( SD_LT_SEPARATOR ); - if( nPos != STRING_NOTFOUND ) - break; - } - - sal_uInt16 nPos = aName.Search( sal_Unicode( ' ' )); - if( nPos != STRING_NOTFOUND ) - aName.Erase( nPos ); // removing blanks and number (e.g. "Gliederung 1") - - return aName; -} - /************************************************************************* |* |* eine Liste der Gliederungstextvorlagen fuer ein Praesentationlayout @@ -573,32 +549,6 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo /************************************************************************* |* -|* StyleSheets des genannten Praesentationslayouts loeschen -|* -\************************************************************************/ - -void SdStyleSheetPool::EraseLayoutStyleSheets(const String& rLayoutName) -{ - SfxStyleSheetBase* pSheet = NULL; - - List* pNameList = CreateLayoutSheetNames(rLayoutName); - - String* pName = (String*)pNameList->First(); - while (pName) - { - pSheet = Find(*pName, SD_STYLE_FAMILY_MASTERPAGE); - DBG_ASSERT(pSheet, "EraseLayoutStyleSheets: Vorlage nicht gefunden"); - if (pSheet) - Remove(pSheet); - delete pName; - pName = (String*)pNameList->Next(); - } - delete pNameList; -} - - -/************************************************************************* -|* |* Graphik-StyleSheets aus dem Quellpool in diesen Pool kopieren |* |* (rSourcePool kann nicht const sein, weil SfxStyleSheetPoolBase::Find diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index 0856e867f4e1..ab6c69ee8fdc 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -118,7 +118,6 @@ public: void Dispose(); void SetText( OutlinerParaObject& rText ); - void SetString( const String& rText ); OutlinerParaObject* CreateText(); String GetText(); SdDrawDocument* GetDoc() { return pImpl->mpDoc; } @@ -177,16 +176,6 @@ OutlinerParaObject* TextApiObject::CreateText() return mpSource->CreateText(); } -void TextApiObject::SetString( const String& rText ) -{ - SdrModel* pModel = mpSource->GetDoc(); - if( pModel && pModel->IsUndoEnabled() ) - pModel->AddUndo( new UndoTextAPIChanged( *pModel, this ) ); - - mpSource->SetString( rText ); - maSelection.nStartPara = 0xffff; -} - void TextApiObject::SetText( OutlinerParaObject& rText ) { SdrModel* pModel = mpSource->GetDoc(); @@ -288,22 +277,6 @@ void TextAPIEditSource::SetText( OutlinerParaObject& rText ) } } -void TextAPIEditSource::SetString( const String& rText ) -{ - if ( pImpl->mpDoc ) - { - if( !pImpl->mpOutliner ) - { - //init draw model first - pImpl->mpOutliner = new Outliner( pImpl->mpDoc, OUTLINERMODE_TEXTOBJECT ); - pImpl->mpDoc->SetCalcFieldValueHdl( pImpl->mpOutliner ); - } - else - pImpl->mpOutliner->Clear(); - pImpl->mpOutliner->Insert( rText ); - } -} - OutlinerParaObject* TextAPIEditSource::CreateText() { if ( pImpl->mpDoc && pImpl->mpOutliner ) diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index f3ec27d8093c..3d8797beb328 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -476,7 +476,6 @@ class GroupTable ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & GetCurrentGroupAccess() const { return mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mXIndexAccess; }; sal_uInt32 GetGroupsClosed(); - void SkipCurrentGroup(); void ResetGroupTable( sal_uInt32 nCount ); void ClearGroupTable(); sal_Bool EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex ); @@ -534,7 +533,7 @@ class PortionObj : public PropStateValue protected : void ImplClear(); - void ImplConstruct( PortionObj& rPortionObj ); + void ImplConstruct( const PortionObj& rPortionObj ); sal_uInt32 ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, String& rURL ); sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); @@ -567,13 +566,13 @@ class PortionObj : public PropStateValue sal_Bool bLast, FontCollection& rFontCollection ); PortionObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, FontCollection& rFontCollection ); - PortionObj( PortionObj& rPortionObj ); + PortionObj( const PortionObj& rPortionObj ); ~PortionObj(); void Write( SvStream* pStrm, sal_Bool bLast ); sal_uInt32 Count() const { return mnTextSize; }; - PortionObj& operator=( PortionObj& rPortionObj ); + PortionObj& operator=( const PortionObj& rPortionObj ); }; struct ParaFlags @@ -594,10 +593,9 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph protected : - void ImplConstruct( ParagraphObj& rParagraphObj ); + void ImplConstruct( const ParagraphObj& rParagraphObj ); void ImplClear(); sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); - ::com::sun::star::awt::Size ImplMapSize( const ::com::sun::star::awt::Size& rSize ); void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = FALSE ); void ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = FALSE ); @@ -631,7 +629,7 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContentRef, ParaFlags, FontCollection& rFontCollection, PPTExBulletProvider& rBuProv ); - ParagraphObj( ParagraphObj& rParargraphObj ); + ParagraphObj( const ParagraphObj& rParargraphObj ); ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, PPTExBulletProvider& rBuProv ); @@ -641,7 +639,7 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph void Write( SvStream* pStrm ); sal_uInt32 Count() const { return mnTextSize; }; - ParagraphObj& operator=( ParagraphObj& rParagraphObj ); + ParagraphObj& operator=( const ParagraphObj& rParagraphObj ); }; struct ImplTextObj @@ -659,13 +657,13 @@ struct ImplTextObj class TextObj { - ImplTextObj* mpImplTextObj; + mutable ImplTextObj* mpImplTextObj; void ImplCalculateTextPositions(); public : TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > & rXText, int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rBuProv ); - TextObj( TextObj& rTextObj ); + TextObj( const TextObj& rTextObj ); ~TextObj(); void Write( SvStream* pStrm ); diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index f07245d1ff31..7915bc8b0340 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -312,14 +312,6 @@ sal_Bool GroupTable::GetNextGroupEntry() // --------------------------------------------------------------------------------------------- -void GroupTable::SkipCurrentGroup() -{ - if ( mnCurrentGroupEntry ) - delete ( mpGroupEntry[ --mnCurrentGroupEntry ] ); -} - -// --------------------------------------------------------------------------------------------- - FontCollectionEntry::~FontCollectionEntry() { } @@ -1869,7 +1861,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text } } -PortionObj::PortionObj( PortionObj& rPortionObj ) +PortionObj::PortionObj( const PortionObj& rPortionObj ) : PropStateValue( rPortionObj ) { ImplConstruct( rPortionObj ); @@ -2097,7 +2089,7 @@ void PortionObj::ImplClear() delete[] mpText; } -void PortionObj::ImplConstruct( PortionObj& rPortionObj ) +void PortionObj::ImplConstruct( const PortionObj& rPortionObj ) { mbLastPortion = rPortionObj.mbLastPortion; mnTextSize = rPortionObj.mnTextSize; @@ -2291,7 +2283,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com return nRetValue; } -PortionObj& PortionObj::operator=( PortionObj& rPortionObj ) +PortionObj& PortionObj::operator=( const PortionObj& rPortionObj ) { if ( this != &rPortionObj ) { @@ -2369,7 +2361,7 @@ ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun:: } } -ParagraphObj::ParagraphObj( ParagraphObj& rObj ) +ParagraphObj::ParagraphObj( const ParagraphObj& rObj ) : List() , PropStateValue() , SOParagraph() @@ -2878,7 +2870,7 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo meBiDi = ePropState; } -void ParagraphObj::ImplConstruct( ParagraphObj& rParagraphObj ) +void ParagraphObj::ImplConstruct( const ParagraphObj& rParagraphObj ) { mnTextSize = rParagraphObj.mnTextSize; mnTextAdjust = rParagraphObj.mnTextAdjust; @@ -2891,8 +2883,9 @@ void ParagraphObj::ImplConstruct( ParagraphObj& rParagraphObj ) mbForbiddenRules = rParagraphObj.mbForbiddenRules; mnBiDi = rParagraphObj.mnBiDi; - for ( void* pPtr = rParagraphObj.First(); pPtr; pPtr = rParagraphObj.Next() ) - Insert( new PortionObj( *(PortionObj*)pPtr ), LIST_APPEND ); + ParagraphObj& rOther = const_cast<ParagraphObj&>(rParagraphObj); + for ( const void* pPtr = rOther.First(); pPtr; pPtr = rOther.Next() ) + Insert( new PortionObj( *(const PortionObj*)pPtr ), LIST_APPEND ); maTabStop = rParagraphObj.maTabStop; bExtendedParameters = rParagraphObj.bExtendedParameters; @@ -2917,16 +2910,6 @@ void ParagraphObj::ImplConstruct( ParagraphObj& rParagraphObj ) nBulletId = rParagraphObj.nBulletId; } -::com::sun::star::awt::Size ParagraphObj::ImplMapSize( const ::com::sun::star::awt::Size& rSize ) -{ - Size aSize( OutputDevice::LogicToLogic( Size( rSize.Width, rSize.Height ), maMapModeSrc, maMapModeDest ) ); - if ( !aSize.Width() ) - aSize.Width()++; - if ( !aSize.Height() ) - aSize.Height()++; - return ::com::sun::star::awt::Size( aSize.Width(), aSize.Height() ); -} - sal_uInt32 ParagraphObj::ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ) { mnTextSize = 0; @@ -2935,7 +2918,7 @@ sal_uInt32 ParagraphObj::ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosi return mnTextSize; } -ParagraphObj& ParagraphObj::operator=( ParagraphObj& rParagraphObj ) +ParagraphObj& ParagraphObj::operator=( const ParagraphObj& rParagraphObj ) { if ( this != &rParagraphObj ) { @@ -2998,7 +2981,7 @@ TextObj::TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSim ImplCalculateTextPositions(); } -TextObj::TextObj( TextObj& rTextObj ) +TextObj::TextObj( const TextObj& rTextObj ) { mpImplTextObj = rTextObj.mpImplTextObj; mpImplTextObj->mnRefCount++; diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx index 5adcbd5fc56a..4bcb73535ba1 100644 --- a/sd/source/filter/html/htmlattr.cxx +++ b/sd/source/filter/html/htmlattr.cxx @@ -100,15 +100,3 @@ void SdHtmlAttrPreview::SetColors( Color& aBack, Color& aText, Color& aLink, m_aVLinkColor = aVLink; m_aALinkColor = aALink; } - -// ===================================================================== -// ===================================================================== -void SdHtmlAttrPreview::GetColors( Color& aBack, Color& aText, Color& aLink, - Color& aVLink, Color& aALink ) const -{ - aBack = m_aBackColor; - aText = m_aTextColor; - aLink = m_aLinkColor; - aVLink = m_aVLinkColor; - aALink = m_aALinkColor; -} diff --git a/sd/source/filter/html/htmlattr.hxx b/sd/source/filter/html/htmlattr.hxx index b076b2a29307..1caa16822ab1 100644 --- a/sd/source/filter/html/htmlattr.hxx +++ b/sd/source/filter/html/htmlattr.hxx @@ -46,8 +46,6 @@ public: void SetColors( Color& aBack, Color& aText, Color& aLink, Color& aVLink, Color& aALink ); - void GetColors( Color& aBack, Color& aText, Color& aLink, - Color& aVLink, Color& aALink ) const; }; #endif // _SD_HTMLATTR_HXX diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 82fabc73aed2..9de46771e14c 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -3371,15 +3371,6 @@ BOOL HtmlErrorContext::GetString( ULONG, String& rCtxStr ) // ===================================================================== -void HtmlErrorContext::SetContext( USHORT nResId ) -{ - mnResId = nResId; - maURL1.Erase(); - maURL2.Erase(); -} - -// ===================================================================== - void HtmlErrorContext::SetContext( USHORT nResId, const String& rURL ) { mnResId = nResId; diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 34ca8182d22f..43bc12419f84 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -88,7 +88,6 @@ public: virtual BOOL GetString( ULONG nErrId, String& rCtxStr ); - void SetContext( USHORT nResId ); void SetContext( USHORT nResId, const String& rURL ); void SetContext( USHORT nResId, const String& rURL1, const String& rURL2 ); }; diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index a4a3564d35b0..25ac858ca319 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -84,11 +84,6 @@ Ppt97Animation::Ppt97Animation( SvStream& rInputStream ) m_aAtom.ReadStream( rInputStream ); } -Ppt97Animation::Ppt97Animation() - : MEMBER_CONSTRUCTOR_LIST() -{ -} - Ppt97Animation::Ppt97Animation( const Ppt97Animation& rAnimation ) : MEMBER_CONSTRUCTOR_LIST() { @@ -163,11 +158,12 @@ bool Ppt97Animation::HasAfterEffect_DimAtNextEffect() const { return m_aAtom.nAfterEffect == 2; } +#ifdef FUTURE bool Ppt97Animation::HasAfterEffect_DimAfterEffect() const { return m_aAtom.nAfterEffect == 3; } - +#endif UINT32 Ppt97Animation::GetSoundRef() const { return m_aAtom.nSoundRef; diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx index 4aa24ab12de8..c68ba9a19382 100644 --- a/sd/source/filter/ppt/ppt97animations.hxx +++ b/sd/source/filter/ppt/ppt97animations.hxx @@ -95,7 +95,6 @@ class Ppt97Animation public: //public methods Ppt97Animation( SvStream& rIn ); - Ppt97Animation(); Ppt97Animation( const Ppt97Animation& rAnimation ); Ppt97Animation& operator= ( const Ppt97Animation& rAnimation ); bool operator < ( const Ppt97Animation& rAnimation ) const;//later is greater @@ -129,7 +128,9 @@ private: //private methods bool HasAfterEffect() const; bool HasAfterEffect_ChangeColor() const; bool HasAfterEffect_DimAtNextEffect() const; +#ifdef FUTURE bool HasAfterEffect_DimAfterEffect() const; +#endif bool HasStopPreviousSound() const; bool HasReverseOrder() const; //true if the text paragraphs should be animated in reverse order sal_Int32 GetParagraphLevel() const; //paragraph level that is animated ( that paragraph and higher levels ) diff --git a/sd/source/filter/ppt/pptatom.cpp b/sd/source/filter/ppt/pptatom.cpp index 21a0c3c3f9f8..e48cdcc0acd6 100644 --- a/sd/source/filter/ppt/pptatom.cpp +++ b/sd/source/filter/ppt/pptatom.cpp @@ -109,15 +109,3 @@ const Atom* Atom::findNextChildAtom( sal_uInt16 nRecType, const Atom* pLast ) co return pChild; } - -/** returns the next child atom after pLast with nRecType and nRecInstance or NULL */ -const Atom* Atom::findNextChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance, const Atom* pLast ) const -{ - const Atom* pChild = pLast != NULL ? pLast->mpNextAtom : mpFirstChild; - while( pChild && (pChild->maRecordHeader.nRecType != nRecType) && (pChild->maRecordHeader.nRecInstance != nRecInstance) ) - { - pChild = findNextChildAtom( pChild ); - } - - return pChild; -} diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx index 0b13dc314584..7cadad0e7dcd 100644 --- a/sd/source/filter/ppt/pptatom.hxx +++ b/sd/source/filter/ppt/pptatom.hxx @@ -61,9 +61,6 @@ public: /** returns the first child atom with nRecType and nRecInstance or NULL */ inline const Atom* findFirstChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance ) const; - /** returns the next child atom after pLast with nRecType and nRecInstance or NULL */ - const Atom* findNextChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance, const Atom* pLast ) const; - /** returns the first child atom or NULL */ inline const Atom* findFirstChildAtom() const; @@ -114,11 +111,6 @@ inline const DffRecordHeader& Atom::getHeader() const return maRecordHeader; } -inline const Atom* Atom::findFirstChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance ) const -{ - return findNextChildAtom( nRecType, nRecInstance, NULL ); -} - inline const Atom* Atom::findFirstChildAtom() const { return mpFirstChild; diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 16fc1a99dd8a..10b0b152b8f4 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -1522,52 +1522,6 @@ void AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference< // -------------------------------------------------------------------- -/* todo: for now we dump sub containers into its parent container, what else to do with it? */ -void AnimationImporter::importAnimationSubContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) -{ - DBG_ASSERT( pAtom && xNode.is(), "invalid call to ppt::AnimationImporter::importTimeContainer()!"); - if( pAtom && xNode.is() ) - { - // import sub containers - const Atom* pChildAtom = pAtom->findFirstChildAtom(); - - while( pChildAtom ) - { - switch( pChildAtom->getType() ) - { - case DFF_msofbtAnimNode: - case DFF_msofbtAnimEvent: - case DFF_msofbtAnimValue: - case DFF_msofbtAnimAction: - case DFF_msofbtAnimPropertySet: - break; - case DFF_msofbtAnimCommand: - { - const OUString aServiceName( OUString::createFromAscii("com.sun.star.animations.Command") ); - Reference< XAnimationNode > xChildNode( ::comphelper::getProcessServiceFactory()->createInstance(aServiceName), UNO_QUERY ); - importAnimationNodeContainer( pChildAtom, xChildNode ); - Reference< XTimeContainer > xParentContainer( xNode, UNO_QUERY ); - if( xParentContainer.is() && xChildNode.is() ) - xParentContainer->appendChild( xChildNode ); - } - break; - - default: - { - dump_atom_header( pChildAtom, true, false ); - dump_atom( pChildAtom ); - dump_atom_header( pChildAtom, false, false ); - } - break; - } - - pChildAtom = pAtom->findNextChildAtom( pChildAtom ); - } - } -} - -// -------------------------------------------------------------------- - void AnimationImporter::importAnimationNodeContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) { DBG_ASSERT( pAtom && xNode.is(), "invalid call to ppt::AnimationImporter::importAnimationNodeContainer()!"); @@ -3894,14 +3848,6 @@ void AnimationImporter::dump_atom( const Atom* , bool ) { } -void AnimationImporter::dump( sal_uInt32 , bool ) -{ -} - -void AnimationImporter::dump_anim_group( const Atom* , const AnimationNode& , const PropertySet& , bool ) -{ -} - void AnimationImporter::dump_target( ::com::sun::star::uno::Any& ) { } @@ -3922,10 +3868,6 @@ void AnimationImporter::dump( const char * ) { } -void AnimationImporter::dump( const rtl::OUString& ) -{ -} - void AnimationImporter::dump( const char * , sal_Int32 ) { } diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx index d29449361861..24f423029e82 100644 --- a/sd/source/filter/ppt/pptinanimations.hxx +++ b/sd/source/filter/ppt/pptinanimations.hxx @@ -62,7 +62,6 @@ private: void importAnimationContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xParent ); void importTimeContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void importAnimationNodeContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); - void importAnimationSubContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void importAnimateSetContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void importAnimateFilterContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); @@ -109,18 +108,18 @@ private: #ifdef DBG_ANIM_LOG FILE * mpFile; + void dump_anim_group( const Atom* pAtom, const AnimationNode& rNode, const PropertySet& rSet, bool bOpen ); + void dump( const rtl::OUString& rString ); + void dump( sal_uInt32 nLen, bool bNewLine = true ); #endif void dump_atom_header( const Atom* pAtom, bool bOpen, bool bAppend ); void dump_atom( const Atom* pAtom, bool bNewLine = true ); - void dump( sal_uInt32 nLen, bool bNewLine = true ); - void dump_anim_group( const Atom* pAtom, const AnimationNode& rNode, const PropertySet& rSet, bool bOpen ); void dump_target( ::com::sun::star::uno::Any& rAny ); void dump( ::com::sun::star::uno::Any& rAny ); void dump( const PropertySet& rSet ); void dump( const AnimationNode& rNode ); void dump( const char * pText ); - void dump( const rtl::OUString& rString ); void dump( const char * pText, sal_Int32 nInt ); void dump( const char * pText, double fDouble ); void dump( const char * pText, const char * pText2 ); diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx index 70734ac23198..de5342afd23f 100644 --- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx +++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx @@ -44,18 +44,6 @@ namespace accessibility { May change in the future. */ -AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView, USHORT nWindowId) - : mpView (pView), - mnWindowId (nWindowId), - mrDevice (pView->GetPaintWindow((sal_uInt32)nWindowId)->GetOutputDevice()) -{ - OSL_ASSERT (mpView != NULL); - // empty -} - - - - AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView, OutputDevice& rDevice) : mpView (pView), mnWindowId (0), @@ -86,15 +74,6 @@ AccessibleViewForwarder::~AccessibleViewForwarder (void) -void AccessibleViewForwarder::SetView (SdrPaintView* pView) -{ - mpView = pView; - OSL_ASSERT (mpView != NULL); -} - - - - sal_Bool AccessibleViewForwarder::IsValid (void) const { return sal_True; diff --git a/sd/source/ui/animations/AnimationSchemesPane.cxx b/sd/source/ui/animations/AnimationSchemesPane.cxx deleted file mode 100644 index 337dc64331fd..000000000000 --- a/sd/source/ui/animations/AnimationSchemesPane.cxx +++ /dev/null @@ -1,443 +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 "AnimationSchemesPane.hxx" -#include "AnimationSchemesPane.hrc" -#include "CustomAnimation.hrc" - -#include "TransitionPreset.hxx" -#include "sdresid.hxx" -#include "ViewShellBase.hxx" -#include "DrawDocShell.hxx" -#include "SlideSorterViewShell.hxx" -#include "drawdoc.hxx" -#include "filedlg.hxx" -#include "strings.hrc" -#include "EventMultiplexer.hxx" -#include <com/sun/star/beans/XPropertySet.hpp> - -#ifndef _SVT_CONTROLDIMS_HRC_ -#include <svtools/controldims.hrc> -#endif -#include <svx/gallery.hxx> -#include <unotools/pathoptions.hxx> -#include <vcl/msgbox.hxx> -#include <tools/urlobj.hxx> - -#include <algorithm> - - -using namespace ::com::sun::star; - -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; -using ::com::sun::star::uno::RuntimeException; - -// ______________________ -// -// Local Helper Functions -// ______________________ - -namespace -{ - -typedef ::boost::shared_ptr<sd::slidesorter::SlideSorterViewShell::PageSelection> - SharedPageSelection; -SharedPageSelection lcl_getSelectedPages (::sd::ViewShellBase& rBase) -{ - ::sd::slidesorter::SlideSorterViewShell*pSlideSorterViewShell - = ::sd::slidesorter::SlideSorterViewShell::GetSlideSorter(rBase); - DBG_ASSERT( pSlideSorterViewShell, "No Slide-Sorter available" ); - - if (pSlideSorterViewShell != NULL) - { - return pSlideSorterViewShell->GetPageSelection(); - } - else - { - return SharedPageSelection(new sd::slidesorter::SlideSorterViewShell::PageSelection()); - } -} - -// void lcl_ApplyToPages( ::std::vector< SdPage * > aPages, const ::sd::impl::TransitionEffect & rEffect ) -// { -// ::std::vector< SdPage * >::const_iterator aIt( aPages.begin()); -// const ::std::vector< SdPage * >::const_iterator aEndIt( aPages.end()); -// for( ; aIt != aEndIt; ++aIt ) -// { -// rEffect.applyTo( *(*aIt) ); -// } -// } - -} // anonymous namespace - -namespace sd -{ - -// ____________________ -// -// AnimationSchemesPane -// ____________________ - -AnimationSchemesPane::AnimationSchemesPane( - ::Window * pParent, - ViewShellBase & rBase, - SdDrawDocument* pDoc ) : - Control( pParent, SdResId( DLG_ANIMATION_SCHEMES_PANE ) ), - - mrBase( rBase ), - mpDrawDoc( pDoc ), - maFL_APPLY_SCHEME( this, SdResId( FL_APPLY_SCHEME ) ), - maLB_ANIMATION_SCHEMES( this, SdResId( LB_ANIMATION_SCHEMES ) ), - maFL_EMPTY1( this, SdResId( FL_EMPTY1 ) ), - maPB_APPLY_TO_ALL( this, SdResId( PB_APPLY_TO_ALL ) ), - maPB_PLAY( this, SdResId( PB_PLAY ) ), - maPB_SLIDE_SHOW( this, SdResId( PB_SLIDE_SHOW ) ), - maFL_EMPTY2( this, SdResId( FL_EMPTY2 ) ), - maCB_AUTO_PREVIEW( this, SdResId( CB_AUTO_PREVIEW ) ), - - maSTR_NO_SCHEME( SdResId( STR_NO_SCHEME ) ), - mbHasSelection( false ), - mbUpdatingControls( false ), - mbIsMainViewChangePending( false ) -{ - // use no resource ids from here on - FreeResource(); - - if( pDoc ) - mxModel.set( pDoc->getUnoModel(), uno::UNO_QUERY ); - // TODO: get correct view - if( mxModel.is()) - mxView.set( mxModel->getCurrentController(), uno::UNO_QUERY ); - - // fill list box of slide transitions - maLB_ANIMATION_SCHEMES.InsertEntry( maSTR_NO_SCHEME ); - - // set defaults - maCB_AUTO_PREVIEW.Check(); // automatic preview on - - // update control states before adding handlers - updateLayout(); - updateControls(); - - // set handlers - maPB_APPLY_TO_ALL.SetClickHdl( LINK( this, AnimationSchemesPane, ApplyToAllButtonClicked )); - maPB_PLAY.SetClickHdl( LINK( this, AnimationSchemesPane, PlayButtonClicked )); - maPB_SLIDE_SHOW.SetClickHdl( LINK( this, AnimationSchemesPane, SlideShowButtonClicked )); - - maLB_ANIMATION_SCHEMES.SetSelectHdl( LINK( this, AnimationSchemesPane, SchemeSelected )); - - addListener(); -} - -AnimationSchemesPane::~AnimationSchemesPane() -{ - removeListener(); -} - -void AnimationSchemesPane::Resize() -{ - updateLayout(); -} - -void AnimationSchemesPane::onSelectionChanged() -{ - updateControls(); -} - -void AnimationSchemesPane::onChangeCurrentPage() -{ - updateControls(); -} - -void AnimationSchemesPane::updateLayout() -{ - ::Size aPaneSize( GetSizePixel() ); - - // start layouting elements from bottom to top. The remaining space is used - // for the topmost list box - ::Point aOffset( LogicToPixel( Point( 3, 3 ), MAP_APPFONT ) ); - long nOffsetX = aOffset.getX(); - long nOffsetY = aOffset.getY(); - long nOffsetBtnX = LogicToPixel( Point( 6, 1 ), MAP_APPFONT ).getX(); - - ::Point aUpperLeft( nOffsetX, aPaneSize.getHeight() - nOffsetY ); - long nMaxWidth = aPaneSize.getWidth() - 2 * nOffsetX; - - // auto preview check-box - ::Size aCtrlSize = maCB_AUTO_PREVIEW.GetSizePixel(); - aCtrlSize.setWidth( maCB_AUTO_PREVIEW.CalcMinimumSize( nMaxWidth ).getWidth()); - aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); - maCB_AUTO_PREVIEW.SetPosSizePixel( aUpperLeft, aCtrlSize ); - - // fixed line above check-box - aCtrlSize = maFL_EMPTY2.GetSizePixel(); - aCtrlSize.setWidth( nMaxWidth ); - aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); - maFL_EMPTY2.SetPosSizePixel( aUpperLeft, aCtrlSize ); - - // buttons "Play" and "Slide Show" - long nPlayButtonWidth = maPB_PLAY.CalcMinimumSize().getWidth() + 2 * nOffsetBtnX; - long nSlideShowButtonWidth = maPB_SLIDE_SHOW.CalcMinimumSize().getWidth() + 2 * nOffsetBtnX; - - if( (nPlayButtonWidth + nSlideShowButtonWidth + nOffsetX) <= nMaxWidth ) - { - // place buttons side by side - aCtrlSize = maPB_PLAY.GetSizePixel(); - aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); - aCtrlSize.setWidth( nPlayButtonWidth ); - maPB_PLAY.SetPosSizePixel( aUpperLeft, aCtrlSize ); - - aUpperLeft.setX( aUpperLeft.getX() + nPlayButtonWidth + nOffsetX ); - aCtrlSize.setWidth( nSlideShowButtonWidth ); - maPB_SLIDE_SHOW.SetPosSizePixel( aUpperLeft, aCtrlSize ); - aUpperLeft.setX( nOffsetX ); - } - else - { - // place buttons on top of each other - aCtrlSize = maPB_SLIDE_SHOW.GetSizePixel(); - aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); - aCtrlSize.setWidth( nSlideShowButtonWidth ); - maPB_SLIDE_SHOW.SetPosSizePixel( aUpperLeft, aCtrlSize ); - - aCtrlSize = maPB_PLAY.GetSizePixel(); - aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight() - nOffsetY ); - aCtrlSize.setWidth( nPlayButtonWidth ); - maPB_PLAY.SetPosSizePixel( aUpperLeft, aCtrlSize ); - } - - // "Apply to All Slides" button - aCtrlSize = maPB_APPLY_TO_ALL.GetSizePixel(); - aCtrlSize.setWidth( maPB_APPLY_TO_ALL.CalcMinimumSize( nMaxWidth ).getWidth() + 2 * nOffsetBtnX ); - aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight() - nOffsetY ); - maPB_APPLY_TO_ALL.SetPosSizePixel( aUpperLeft, aCtrlSize ); - - // fixed line above "Apply to All Slides" button - aCtrlSize = maFL_EMPTY1.GetSizePixel(); - aCtrlSize.setWidth( nMaxWidth ); - aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); - maFL_EMPTY1.SetPosSizePixel( aUpperLeft, aCtrlSize ); - - // fixed line "Apply to selected slides" - aCtrlSize = maFL_APPLY_SCHEME.GetSizePixel(); - aCtrlSize.setWidth( nMaxWidth ); - ::Point aUpperLeftCorner( nOffsetX, nOffsetY ); - maFL_APPLY_SCHEME.SetPosSizePixel( aUpperLeftCorner, aCtrlSize ); - aUpperLeftCorner.setY( aUpperLeftCorner.getY() + aCtrlSize.getHeight() + nOffsetY ); - aUpperLeft.setY( aUpperLeft.getY() - nOffsetY ); - - // list box animation scheme - aCtrlSize.setWidth( nMaxWidth ); - aCtrlSize.setHeight( aUpperLeft.getY() - aUpperLeftCorner.getY() ); - maLB_ANIMATION_SCHEMES.SetPosSizePixel( aUpperLeftCorner, aCtrlSize ); -} - -void AnimationSchemesPane::updateControls() -{ - SharedPageSelection aSelectedPages( lcl_getSelectedPages( mrBase )); - if( aSelectedPages->empty()) - { - mbHasSelection = false; - return; - } - mbHasSelection = true; - - DBG_ASSERT( ! mbUpdatingControls, "Multiple Control Updates" ); - mbUpdatingControls = true; - - // get model data for first page -#ifdef DBG_UTIL - SdPage * pFirstPage = aSelectedPages->front(); - DBG_ASSERT( pFirstPage, "Invalid Page" ); -#endif - -// // merge with other pages -// ::std::vector< SdPage * >::const_iterator aIt( aSelectedPages.begin()); -// const ::std::vector< SdPage * >::const_iterator aEndIt( aSelectedPages.end()); - -// // start with second page (note aIt != aEndIt, because ! aSelectedPages.empty()) -// for( ++aIt ;aIt != aEndIt; ++aIt ) -// { -// if( *aIt ) -// // merge -// } - - mbUpdatingControls = false; - - updateControlState(); -} - -void AnimationSchemesPane::updateControlState() -{ - maLB_ANIMATION_SCHEMES.Enable( mbHasSelection ); - - maPB_APPLY_TO_ALL.Enable( mbHasSelection ); - maPB_PLAY.Enable( mbHasSelection ); -// maPB_SLIDE_SHOW.Enable( TRUE ); - maCB_AUTO_PREVIEW.Enable( mbHasSelection ); -} - -void AnimationSchemesPane::getAnimationSchemeFromControls() const -{ - // TODO: Implement -} - -void AnimationSchemesPane::applyToSelectedPages() -{ - if( ! mbUpdatingControls ) - { - SharedPageSelection aSelectedPages( lcl_getSelectedPages( mrBase )); - if( ! aSelectedPages->empty()) - { -// lcl_ApplyToPages( aSelectedPages, getAnimationSchemeFromControls() ); - } - if( maCB_AUTO_PREVIEW.IsEnabled() && - maCB_AUTO_PREVIEW.IsChecked()) - { - playCurrentScheme(); - } - } -} - -void AnimationSchemesPane::playCurrentScheme() -{ - // TODO: Implement a preview in the center view -} - -void AnimationSchemesPane::addListener() -{ - Link aLink( LINK(this,AnimationSchemesPane,EventMultiplexerListener) ); - mrBase.GetEventMultiplexer()->AddEventListener( - aLink, - tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION - | tools::EventMultiplexerEvent::EID_CURRENT_PAGE - | tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED - | tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED - | tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED); -} - -void AnimationSchemesPane::removeListener() -{ - Link aLink( LINK(this,AnimationSchemesPane,EventMultiplexerListener) ); - mrBase.GetEventMultiplexer()->RemoveEventListener( aLink ); -} - -IMPL_LINK(AnimationSchemesPane,EventMultiplexerListener, - tools::EventMultiplexerEvent*,pEvent) -{ - switch (pEvent->meEventId) - { - case tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION: - onSelectionChanged(); - break; - - case tools::EventMultiplexerEvent::EID_CURRENT_PAGE: - onChangeCurrentPage(); - break; - - case tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED: - mxView = Reference<drawing::XDrawView>(); - onSelectionChanged(); - onChangeCurrentPage(); - break; - - case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED: - mbIsMainViewChangePending = true; - break; - - case tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED: - if (mbIsMainViewChangePending) - { - mbIsMainViewChangePending = false; - mxView = Reference<drawing::XDrawView>::query( mxModel->getCurrentController() ); - onSelectionChanged(); - onChangeCurrentPage(); - } - break; - } - return 0; -} - -IMPL_LINK( AnimationSchemesPane, ApplyToAllButtonClicked, void *, EMPTYARG ) -{ - DBG_ASSERT( mpDrawDoc, "Invalid Draw Document!" ); - if( !mpDrawDoc ) - return 0; - - ::std::vector< SdPage * > aPages; - - sal_uInt16 nPageCount = mpDrawDoc->GetSdPageCount( PK_STANDARD ); - aPages.reserve( nPageCount ); - for( sal_uInt16 i=0; i<nPageCount; ++i ) - { - SdPage * pPage = mpDrawDoc->GetSdPage( i, PK_STANDARD ); - if( pPage ) - aPages.push_back( pPage ); - } - -// if( ! aPages.empty()) -// lcl_ApplyToPages( aPages, getAnimationSchemeFromControls() ); - - return 0; -} - - -IMPL_LINK( AnimationSchemesPane, PlayButtonClicked, void *, EMPTYARG ) -{ - playCurrentScheme(); - return 0; -} - -IMPL_LINK( AnimationSchemesPane, SlideShowButtonClicked, void *, EMPTYARG ) -{ - mrBase.StartPresentation(); - return 0; -} - -IMPL_LINK( AnimationSchemesPane, SchemeSelected, void *, EMPTYARG ) -{ - applyToSelectedPages(); - return 0; -} - -::Window * createAnimationSchemesPanel( ::Window* pParent, ViewShellBase& rBase ) -{ - ::Window* pWindow = 0; - - DrawDocShell* pDocSh = rBase.GetDocShell(); - if( pDocSh ) - pWindow = new AnimationSchemesPane( pParent, rBase, pDocSh->GetDoc() ); - - return pWindow; -} - - -} // namespace sd diff --git a/sd/source/ui/animations/AnimationSchemesPane.hrc b/sd/source/ui/animations/AnimationSchemesPane.hrc deleted file mode 100644 index 2b9ec9be3611..000000000000 --- a/sd/source/ui/animations/AnimationSchemesPane.hrc +++ /dev/null @@ -1,50 +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. - * - ************************************************************************/ - -#ifndef _SD_ANIMATIONSCHEMESPANE_HRC -#define _SD_ANIMATIONSCHEMESPANE_HRC - -#define FL_APPLY_SCHEME 1 -// spec: 1 -#define LB_ANIMATION_SCHEMES 2 - -#define FL_EMPTY1 3 -// spec: 2 -#define PB_APPLY_TO_ALL 4 -// spec: 3 -#define PB_PLAY 5 -// spec: 4 -#define PB_SLIDE_SHOW 6 - -#define FL_EMPTY2 7 -// spec: 5 -#define CB_AUTO_PREVIEW 8 - -#define STR_NO_SCHEME 9 - - -#endif // _SD_ANIMATIONSCHEMESPANE_HRC diff --git a/sd/source/ui/animations/AnimationSchemesPane.hxx b/sd/source/ui/animations/AnimationSchemesPane.hxx deleted file mode 100644 index 8528e5e6ef64..000000000000 --- a/sd/source/ui/animations/AnimationSchemesPane.hxx +++ /dev/null @@ -1,114 +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. - * - ************************************************************************/ -#ifndef SD_ANIMATIONSCHEMESPANE_HXX -#define SD_ANIMATIONSCHEMESPANE_HXX - -#include <vcl/ctrl.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX -#include <vcl/button.hxx> -#endif -#include <vcl/field.hxx> -#include <com/sun/star/drawing/XDrawView.hpp> -#include <com/sun/star/frame/XModel.hpp> - -#include <vector> - -class SdDrawDocument; -class SdPage; - -namespace sd { namespace tools { -class EventMultiplexerEvent; -} } - -namespace sd -{ - -class ViewShellBase; - -class AnimationSchemesPane : public Control -{ -public: - explicit AnimationSchemesPane( - ::Window * pParent, - ViewShellBase & rBase, - SdDrawDocument* pDoc ); - virtual ~AnimationSchemesPane(); - - virtual void Resize(); - - void onSelectionChanged(); - void onChangeCurrentPage(); - -private: - void updateLayout(); - void updateControls(); - void updateControlState(); - - void applyToSelectedPages(); - void playCurrentScheme(); - - void addListener(); - void removeListener(); - - void getAnimationSchemeFromControls() const; - - DECL_LINK( ApplyToAllButtonClicked, void * ); - DECL_LINK( PlayButtonClicked, void * ); - DECL_LINK( SlideShowButtonClicked, void * ); - - DECL_LINK( SchemeSelected, void * ); - DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*); - -private: - ViewShellBase & mrBase; - SdDrawDocument * mpDrawDoc; - - FixedLine maFL_APPLY_SCHEME; - ListBox maLB_ANIMATION_SCHEMES; - FixedLine maFL_EMPTY1; - PushButton maPB_APPLY_TO_ALL; - PushButton maPB_PLAY; - PushButton maPB_SLIDE_SHOW; - FixedLine maFL_EMPTY2; - CheckBox maCB_AUTO_PREVIEW; - - String maSTR_NO_SCHEME; - - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView > mxView; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; - - bool mbHasSelection; - bool mbUpdatingControls; - bool mbIsMainViewChangePending; -}; - -} // namespace sd - -// SD_ANIMATIONSCHEMESPANE_HXX -#endif diff --git a/sd/source/ui/animations/AnimationSchemesPane.src b/sd/source/ui/animations/AnimationSchemesPane.src deleted file mode 100644 index 12447c917930..000000000000 --- a/sd/source/ui/animations/AnimationSchemesPane.src +++ /dev/null @@ -1,113 +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 "CustomAnimation.hrc" -#include "AnimationSchemesPane.hrc" -#include "helpids.h" - -#ifndef _SVT_CONTROLDIMS_HRC_ -#include <svtools/controldims.hrc> -#endif - -// Note: Sizes of 1 usually mean they are auto-calculated - -Control DLG_ANIMATION_SCHEMES_PANE -{ - OutputSize = TRUE; - Size = MAP_APPFONT( 1, 1 ); - - Text [ en-US ] = "Animation Schemes"; - - FixedLine FL_APPLY_SCHEME - { - Size = MAP_APPFONT( 1, RSC_CD_FIXEDLINE_HEIGHT ); - Text [ en-US ] = "Apply to selected slides "; - }; - - ListBox LB_ANIMATION_SCHEMES - { - HelpId = HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES; - Border = TRUE ; - TabStop = TRUE ; - - Size = MAP_APPFONT( 1, 1 ); - }; - - FixedLine FL_EMPTY1 - { - Size = MAP_APPFONT( 1, RSC_CD_FIXEDLINE_HEIGHT ); - }; - - PushButton PB_APPLY_TO_ALL - { - HelpId = HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL; - Size = MAP_APPFONT( 1, RSC_CD_PUSHBUTTON_HEIGHT ); - TabStop = TRUE ; - - Text [ en-US ] = "Apply to All Slides"; - }; - - - PushButton PB_PLAY - { - HelpId = HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY; - Size = MAP_APPFONT( 1, RSC_CD_PUSHBUTTON_HEIGHT ); - TabStop = TRUE ; - - Text [ en-US ] = "Play"; - }; - - PushButton PB_SLIDE_SHOW - { - HelpId = HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW; - Size = MAP_APPFONT( 1, RSC_CD_PUSHBUTTON_HEIGHT ); - TabStop = TRUE ; - - Text [ en-US ] = "Slide Show"; - }; - - FixedLine FL_EMPTY2 - { - Size = MAP_APPFONT( 1, RSC_CD_FIXEDLINE_HEIGHT ); - }; - - Checkbox CB_AUTO_PREVIEW - { - HelpId = HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW; - Size = MAP_APPFONT( 1, RSC_CD_CHECKBOX_HEIGHT ); - TabStop = TRUE ; - - Text [ en-US ] = "Automatic preview"; - }; - - // -------------------- - - String STR_NO_SCHEME - { - Text [ en-US ] = "No Animation"; - }; -}; diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 3ac3d1f24a07..f76b84d29826 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -92,7 +92,6 @@ extern void fillDurationComboBox( ComboBox* pBox ); class CategoryListBox : public ListBox { public: - CategoryListBox( Window* pParent, WinBits nStyle = WB_BORDER ); CategoryListBox( Window* pParent, const ResId& rResId ); ~CategoryListBox(); @@ -110,12 +109,6 @@ private: Link maDoubleClickHdl; }; -CategoryListBox::CategoryListBox( Window* pParent, WinBits nStyle /* = WB_BORDER */ ) -: ListBox( pParent, nStyle ) -{ - EnableUserDraw( TRUE ); -} - CategoryListBox::CategoryListBox( Window* pParent, const ResId& rResId ) : ListBox( pParent, rResId ) { diff --git a/sd/source/ui/animations/CustomAnimationSchemesPane.hrc b/sd/source/ui/animations/CustomAnimationSchemesPane.hrc deleted file mode 100644 index 70168d2662cf..000000000000 --- a/sd/source/ui/animations/CustomAnimationSchemesPane.hrc +++ /dev/null @@ -1,32 +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. - * - ************************************************************************/ - -#ifndef _SD_CUSTOMANIMATIONSCHEMESPANE_HRC -#define _SD_CUSTOMANIMATIONSCHEMESPANE_HRC - - -#endif // _SD_CUSTOMANIMATIONSCHEMESPANE_HRC
\ No newline at end of file diff --git a/sd/source/ui/animations/CustomAnimationSchemesPane.src b/sd/source/ui/animations/CustomAnimationSchemesPane.src deleted file mode 100644 index 1499b79bbb4b..000000000000 --- a/sd/source/ui/animations/CustomAnimationSchemesPane.src +++ /dev/null @@ -1,71 +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 "CustomAnimation.hrc" - -ModalDialog DLG_CUSTOMANIMATION_SCHEMES_PANE -{ - DialogControl = TRUE; - - Text [ en-US ] = "Animation Schemes"; - - Fixedline 1 - { - Text [ en-US ] = "Apply to selected slides"; - }; - - PushButton 1 - { - Text [ en-US ] = "Apply to All Slides"; - }; - - PushButton 2 - { - Text [ en-US ] = "Play"; - }; - - PushButton 3 - { - Text [ en-US ] = "Slide Show"; - }; - - Checkbox 4 - { - Text [ en-US ] = "Automatic preview"; - }; - - String 2 - { - Text [ en-US ] = "No Animation"; - }; - - String 3 - { - Text [ en-US ] = "Recently used Schemes"; - }; -}; - diff --git a/sd/source/ui/animations/makefile.mk b/sd/source/ui/animations/makefile.mk index 2194dad6eafc..db010bf4ef23 100644 --- a/sd/source/ui/animations/makefile.mk +++ b/sd/source/ui/animations/makefile.mk @@ -42,16 +42,13 @@ ENABLE_EXCEPTIONS=TRUE SRS1NAME=$(TARGET) SRC1FILES =\ - AnimationSchemesPane.src\ CustomAnimationPane.src\ CustomAnimationDialog.src\ CustomAnimationCreateDialog.src\ SlideTransitionPane.src\ - CustomAnimationSchemesPane.src\ CustomAnimation.src SLOFILES = \ - $(SLO)$/AnimationSchemesPane.obj \ $(SLO)$/CustomAnimationCreateDialog.obj\ $(SLO)$/CustomAnimationDialog.obj\ $(SLO)$/CustomAnimationPane.obj \ diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index aa42fec50f9c..1e64617edab8 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -971,7 +971,7 @@ IMPL_LINK(AnnotationManagerImpl,EventMultiplexerListener, } return 0; } - +#if 0 OUString AnnotationManagerImpl::GetHelpText( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ) { OUString sRet; @@ -994,7 +994,7 @@ OUString AnnotationManagerImpl::GetHelpText( ::com::sun::star::uno::Reference< : return sRet; } - +#endif void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation > xAnnotation, ::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu /* = false */ ) { diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 43b53d8467f9..70b95c2a509b 100755 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -99,9 +99,9 @@ public: void onTagDeselected( AnnotationTag& rTag ); void onSelectionChanged(); - +#if 0 rtl::OUString GetHelpText( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ); - +#endif void addListener(); void removeListener(); diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index ad6709c776ce..3ba99307fd41 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -493,12 +493,6 @@ void AnnotationWindow::ResizeIfNeccessary(long aOldHeight, long aNewHeight) } } -void AnnotationWindow::SetReadonly(bool bSet) -{ - mbReadonly = bSet; - getView()->SetReadOnly(bSet); -} - void AnnotationWindow::SetLanguage(const SvxLanguageItem aNewItem) { Engine()->SetModifyHdl( Link() ); diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index ba82d4e862d3..264cb2fa1afe 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -144,7 +144,6 @@ class AnnotationWindow : public FloatingWindow void Rescale(); - void SetReadonly(bool bSet); bool IsReadOnly() { return mbReadonly;} bool IsProtected() { return mbProtected; } diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index e3181f792d04..4355da3011c9 100755 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -222,22 +222,6 @@ SdOptionsLayout::SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig ) : // ----------------------------------------------------------------------------- -void SdOptionsLayout::SetDefaults() -{ - SetRulerVisible( TRUE ); - SetHelplines( TRUE ); - SetHandlesBezier( FALSE ); - SetMoveOutline( TRUE ); - SetDragStripes( FALSE ); - if ( isMetricSystem() ) - SetMetric( FUNIT_CM ); // default for countries with metric system - else - SetMetric( FUNIT_INCH ); // default for others - SetDefTab( 1250 ); -} - -// ----------------------------------------------------------------------------- - BOOL SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const { return( IsRulerVisible() == rOpt.IsRulerVisible() && @@ -406,12 +390,6 @@ SdOptionsContents::SdOptionsContents( USHORT nConfigId, BOOL bUseConfig ) : // ----------------------------------------------------------------------------- -void SdOptionsContents::SetDefaults() -{ -} - -// ----------------------------------------------------------------------------- - BOOL SdOptionsContents::operator==(const SdOptionsContents&) const { return true; @@ -459,14 +437,6 @@ BOOL SdOptionsContents::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsContentsItem::SdOptionsContentsItem( USHORT _nWhich ) -: SfxPoolItem ( _nWhich ) -, maOptionsContents ( 0, FALSE ) -{ -} - -// ---------------------------------------------------------------------- - SdOptionsContentsItem::SdOptionsContentsItem(USHORT _nWhich, SdOptions*, ::sd::FrameView*) : SfxPoolItem ( _nWhich ) , maOptionsContents ( 0, FALSE ) @@ -542,40 +512,6 @@ SdOptionsMisc::SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ) : // ----------------------------------------------------------------------------- -void SdOptionsMisc::SetDefaults() -{ - SetStartWithTemplate( TRUE ); - SetMarkedHitMovesAlways( TRUE ); - SetMoveOnlyDragging( FALSE ); - SetCrookNoContortion( FALSE ); - SetQuickEdit( GetConfigId() != SDCFG_DRAW ); - SetMasterPagePaintCaching( TRUE ); - SetDragWithCopy( FALSE ); - SetPickThrough( TRUE ); - SetBigHandles( FALSE ); - SetDoubleClickTextEdit( TRUE ); - SetClickChangeRotation( FALSE ); - SetStartWithActualPage( FALSE ); - SetSummationOfParagraphs( FALSE ); - SetSolidDragging( TRUE ); - SetSolidMarkHdl( TRUE ); - // #90356# - SetShowUndoDeleteWarning( TRUE ); - // The default for 6.1-and-above documents is to use printer-independent - // formatting. - SetPrinterIndependentLayout (1); - // #97016# - SetDefaultObjectSizeWidth(8000); - SetDefaultObjectSizeHeight(5000); - SetPreviewNewEffects(true); - SetPreviewChangedEffects(false); - SetPreviewTransitions(true); - SetDisplay(0); - SetShowComments(true); -} - -// ----------------------------------------------------------------------------- - BOOL SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const { return( IsStartWithTemplate() == rOpt.IsStartWithTemplate() && @@ -909,22 +845,6 @@ SdOptionsSnap::SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig ) : // ----------------------------------------------------------------------------- -void SdOptionsSnap::SetDefaults() -{ - SetSnapHelplines( TRUE ); - SetSnapBorder( TRUE ); - SetSnapFrame( FALSE ); - SetSnapPoints( FALSE ); - SetOrtho( FALSE ); - SetBigOrtho( TRUE ); - SetRotate( FALSE ); - SetSnapArea( 5 ); - SetAngle( 1500 ); - SetEliminatePolyPointLimitAngle( 1500 ); -} - -// ----------------------------------------------------------------------------- - BOOL SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const { return( IsSnapHelplines() == rOpt.IsSnapHelplines() && @@ -1098,13 +1018,6 @@ SdOptionsZoom::SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ) : // ----------------------------------------------------------------------------- -void SdOptionsZoom::SetDefaults() -{ - SetScale( 1, 1 ); -} - -// ----------------------------------------------------------------------------- - BOOL SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const { INT32 nX1, nX2, nY1, nY2; @@ -1160,63 +1073,6 @@ BOOL SdOptionsZoom::WriteData( Any* pValues ) const /************************************************************************* |* -|* SdOptionsZoomItem -|* -\************************************************************************/ - -SdOptionsZoomItem::SdOptionsZoomItem( USHORT _nWhich ) -: SfxPoolItem ( _nWhich ) -, maOptionsZoom ( 0, FALSE ) -{ -} - -// ---------------------------------------------------------------------- - -SdOptionsZoomItem::SdOptionsZoomItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* ) -: SfxPoolItem ( _nWhich ) -, maOptionsZoom ( 0, FALSE ) -{ - if( pOpts ) - { - INT32 nX, nY; - - pOpts->GetScale( nX, nY ); - maOptionsZoom.SetScale( nX, nY ); - } -} - -// ---------------------------------------------------------------------- - -SfxPoolItem* SdOptionsZoomItem::Clone( SfxItemPool* ) const -{ - return new SdOptionsZoomItem( *this ); -} - - -// ---------------------------------------------------------------------- - -int SdOptionsZoomItem::operator==( const SfxPoolItem& rAttr ) const -{ - const bool bSameType = SfxPoolItem::operator==(rAttr); - DBG_ASSERT( bSameType, "SdOptionsZoomItem::operator==(), differen pool item type!" ); - return bSameType && ( maOptionsZoom == static_cast< const SdOptionsZoomItem& >(rAttr).maOptionsZoom ); -} - -// ----------------------------------------------------------------------- - -void SdOptionsZoomItem::SetOptions( SdOptions* pOpts ) const -{ - if( pOpts ) - { - INT32 nX, nY; - - maOptionsZoom.GetScale( nX, nY ); - pOpts->SetScale( nX, nY ); - } -} - -/************************************************************************* -|* |* SdOptionsGrid |* \************************************************************************/ @@ -1366,13 +1222,6 @@ BOOL SdOptionsGrid::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsGridItem::SdOptionsGridItem( USHORT _nWhich ) : - SvxGridItem( _nWhich ) -{ -} - -// ----------------------------------------------------------------------------- - SdOptionsGridItem::SdOptionsGridItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SvxGridItem( _nWhich ) { @@ -1458,33 +1307,6 @@ SdOptionsPrint::SdOptionsPrint( USHORT nConfigId, BOOL bUseConfig ) : // ----------------------------------------------------------------------------- -void SdOptionsPrint::SetDefaults() -{ - SetDraw( TRUE ); - SetNotes( FALSE ); - SetHandout( FALSE ); - SetOutline( FALSE ); - SetDate( FALSE ); - SetTime( FALSE ); - SetPagename( FALSE ); - SetHiddenPages( TRUE ); - SetPagesize( FALSE ); - SetPagetile( FALSE ); - SetWarningPrinter( TRUE ); - SetWarningSize( FALSE ); - SetWarningOrientation( FALSE ); - SetBooklet( FALSE ); - SetFrontPage( TRUE ); - SetBackPage( TRUE ); - SetCutPage( FALSE ); - SetPaperbin( FALSE ); - SetOutputQuality( 0 ); - SetHandoutHorizontal( TRUE ); - SetHandoutPages( 6 ); -} - -// ----------------------------------------------------------------------------- - BOOL SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const { return( IsDraw() == rOpt.IsDraw() && @@ -1630,31 +1452,6 @@ BOOL SdOptionsPrint::WriteData( Any* pValues ) const return TRUE; } -void SdOptionsPrint::SetPrinterOptions( const SdOptionsPrint* pOptions ) -{ - bDraw = pOptions->bDraw; - bNotes = pOptions->bNotes; - bHandout = pOptions->bHandout; - bOutline = pOptions->bOutline; - bDate = pOptions->bDate; - bTime = pOptions->bTime; - bPagename = pOptions->bPagename; - bHiddenPages = pOptions->bHiddenPages; - bPagesize = pOptions->bPagesize; - bPagetile = pOptions->bPagetile; - bWarningPrinter = pOptions->bWarningPrinter; - bWarningSize = pOptions->bWarningSize; - bWarningOrientation = pOptions->bWarningOrientation; - bBooklet = pOptions->bBooklet; - bFront = pOptions->bFront; - bBack = pOptions->bBack; - bCutPage = pOptions->bCutPage; - bPaperbin = pOptions->bPaperbin; - nQuality = pOptions->nQuality; - mnHandoutPages = pOptions->mnHandoutPages; - mbHandoutHorizontal = pOptions->mbHandoutHorizontal; -} - /************************************************************************* |* |* SdOptionsPrintItem @@ -1766,32 +1563,6 @@ SdOptions::~SdOptions() // ---------------------------------------------------------------------- -void SdOptions::SetRangeDefaults( ULONG nOptionsRange ) -{ - if( nOptionsRange & SD_OPTIONS_LAYOUT ) - SdOptionsLayout::SetDefaults(); - - if( nOptionsRange & SD_OPTIONS_CONTENTS ) - SdOptionsContents::SetDefaults(); - - if( nOptionsRange & SD_OPTIONS_MISC ) - SdOptionsMisc::SetDefaults(); - - if( nOptionsRange & SD_OPTIONS_SNAP ) - SdOptionsSnap::SetDefaults(); - - if( nOptionsRange & SD_OPTIONS_ZOOM ) - SdOptionsZoom::SetDefaults(); - - if( nOptionsRange & SD_OPTIONS_GRID ) - SdOptionsGrid::SetDefaults(); - - if( nOptionsRange & SD_OPTIONS_PRINT ) - SdOptionsPrint::SetDefaults(); -} - -// ---------------------------------------------------------------------- - void SdOptions::StoreConfig( ULONG nOptionsRange ) { if( nOptionsRange & SD_OPTIONS_LAYOUT ) diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index fb180509cff9..ccbc7c8f5665 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -336,20 +336,3 @@ OutputDevice* SdModule::GetRefDevice (::sd::DrawDocShell& ) { return GetVirtualRefDevice(); } - - -/************************************************************************* -|* -\************************************************************************/ - -::com::sun::star::text::WritingMode SdModule::GetDefaultWritingMode() const -{ -/* - const SvtLanguageOptions aLanguageOptions; - - return( aLanguageOptions.IsCTLFontEnabled() ? - ::com::sun::star::text::WritingMode_RL_TB : - ::com::sun::star::text::WritingMode_LR_TB ); -*/ - return ::com::sun::star::text::WritingMode_LR_TB; -} diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx index 7420319ab491..975d277c7dff 100644 --- a/sd/source/ui/dlg/LayerDialogContent.cxx +++ b/sd/source/ui/dlg/LayerDialogContent.cxx @@ -86,14 +86,6 @@ LayerDialogContent::~LayerDialogContent (void) -LayerTabBar& LayerDialogContent::GetLayerTabBar (void) -{ - return maLayerTabBar; -} - - - - BOOL LayerDialogContent::Close (void) { return SfxDockingWindow::Close(); diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index c0dcd76f0fae..20c952c9c597 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -94,15 +94,6 @@ PaneDockingWindow::~PaneDockingWindow (void) -void PaneDockingWindow::SetTitle (const String& rsTitle) -{ - msTitle = rsTitle; - Invalidate(); -} - - - - void PaneDockingWindow::Resize (void) { SfxDockingWindow::Resize(); diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 2ac4801aba0c..e179a0ba9f86 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -691,19 +691,6 @@ void AnimationWindow::ResetAttrs() // ----------------------------------------------------------------------- -void AnimationWindow::WaitInEffect( ULONG nMilliSeconds ) const -{ - ULONG nEnd = Time::GetSystemTicks() + nMilliSeconds; - ULONG nCurrent = Time::GetSystemTicks(); - while (nCurrent < nEnd) - { - nCurrent = Time::GetSystemTicks(); - Application::Reschedule(); - } -} - -// ----------------------------------------------------------------------- - void AnimationWindow::WaitInEffect( ULONG nMilliSeconds, ULONG nTime, SfxProgress* pProgress ) const { diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index d398724a3074..1eb3a3d0cedc 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -1928,21 +1928,6 @@ SfxObjectShellLock AssistentDlg::GetDocument() return mpImpl->GetDocument(); } -String AssistentDlg::GetTopic() const -{ - return mpImpl->mpPage4AskTopicEDT->GetText(); -} - -String AssistentDlg::GetUserName() const -{ - return mpImpl->mpPage4AskNameEDT->GetText(); -} - -String AssistentDlg::GetInformation() const -{ - return mpImpl->mpPage4AskInfoEDT->GetText(); -} - OutputType AssistentDlg::GetOutputMedium() const { if(mpImpl->mpPage2Medium1RB->IsChecked()) diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index 40bfae16c2a4..f9dcf5046189 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -207,287 +207,3 @@ void SdPageListControl::DataChanged( const DataChangedEvent& rDCEvt ) SvTreeListBox::DataChanged( rDCEvt ); } -// ==================================================================== -// TemplateCache -// ==================================================================== - -// Kennung fuer die Config Datei mit den Cache Daten -static const UINT16 nMagic = (UINT16)0x4127; - -TemplateCacheInfo::TemplateCacheInfo() -{ - m_bImpress = FALSE; - m_bValid = FALSE; - m_bModified = TRUE; -} - -TemplateCacheInfo::TemplateCacheInfo( const String& rFile, const DateTime& rDateTime, BOOL bImpress ) -{ - m_aFile = rFile; - m_aDateTime = rDateTime; - m_bImpress = bImpress; - m_bValid = FALSE; - m_bModified = TRUE; -} - -SvStream& operator >> (SvStream& rIn, TemplateCacheInfo& rInfo) -{ - rIn.ReadByteString( rInfo.m_aFile, RTL_TEXTENCODING_UTF8 ); - USHORT nDay, nMonth, nYear; - rIn >> nDay; - rIn >> nMonth; - rIn >> nYear; - rInfo.m_aDateTime.SetDay( nDay ); - rInfo.m_aDateTime.SetMonth( nMonth ); - rInfo.m_aDateTime.SetYear( nYear); - - USHORT nHour, nMin, nSec, n100Sec; - - rIn >> nHour; - rIn >> nMin; - rIn >> nSec; - rIn >> n100Sec; - - rInfo.m_aDateTime.SetHour( nHour ); - rInfo.m_aDateTime.SetMin( nMin ); - rInfo.m_aDateTime.SetSec( nSec ); - rInfo.m_aDateTime.Set100Sec( n100Sec ); - - rIn >> rInfo.m_bImpress; - - rInfo.m_bModified = FALSE; - - return rIn; -} - -SvStream& operator << (SvStream& rOut, const TemplateCacheInfo& rInfo) -{ - USHORT nTemp; - - rOut.WriteByteString( rInfo.m_aFile, RTL_TEXTENCODING_UTF8 ); - - nTemp = rInfo.m_aDateTime.GetDay(); - rOut << nTemp; - - nTemp = rInfo.m_aDateTime.GetMonth(); - rOut << nTemp; - - nTemp = rInfo.m_aDateTime.GetYear(); - rOut << nTemp; - - nTemp = rInfo.m_aDateTime.GetHour(); - rOut << nTemp; - - nTemp = rInfo.m_aDateTime.GetMin(); - rOut << nTemp; - - nTemp = rInfo.m_aDateTime.GetSec(); - rOut << nTemp; - - nTemp = rInfo.m_aDateTime.Get100Sec(); - rOut << nTemp; - - rOut << rInfo.m_bImpress; - - return rOut; -} - -TemplateCache::TemplateCache() -{ -} - -TemplateCache::~TemplateCache() -{ - Clear(); -} - -void TemplateCache::Clear() -{ - for( TemplateCacheDirEntry* pDir = m_aDirs.First(); pDir; pDir = m_aDirs.Next() ) - { - for( TemplateCacheInfo* pEntry = pDir->m_aFiles.First(); pEntry; pEntry = pDir->m_aFiles.Next() ) - delete pEntry; - delete pDir; - } -} - -void TemplateCache::Load() -{ - INetURLObject aURL( SvtPathOptions().GetUserConfigPath() ); - aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( "template.sod" ) ) ); - SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE, TRUE ); // Download - SvStream* pStream = aMedium.GetInStream(); - - if( !pStream ) - return; - - UINT16 aCheck; - *pStream >> aCheck; - - if(aCheck != nMagic) - return; - - UINT16 nDirs; - *pStream >> nDirs; - - for( UINT16 nDir = 0; pStream->GetError() == SVSTREAM_OK && nDir < nDirs; nDir++ ) - { - TemplateCacheDirEntry* pDir = new TemplateCacheDirEntry(); - m_aDirs.Insert(pDir); - - pStream->ReadByteString( pDir->m_aPath, RTL_TEXTENCODING_UTF8 ); - - UINT16 nFiles; - *pStream >> nFiles; - - for( UINT16 nFile = 0; pStream->GetError() == SVSTREAM_OK && nFile < nFiles; nFile++ ) - { - TemplateCacheInfo* pEntry = new TemplateCacheInfo(); - *pStream >> *pEntry; - pDir->m_aFiles.Insert(pEntry); - } - } - - if( pStream->GetError() != SVSTREAM_OK ) - { - // Ein I/O Problem ist doch kein Beinbruch, dann wird der Cache halt neu erzeugt - Clear(); - } -} - -void TemplateCache::Save() -{ - INetURLObject aURL( SvtPathOptions().GetUserConfigPath() ); - aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( "template.sod" ) ) ); - SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, FALSE ); // Download - SvStream* pStream = aMedium.GetInStream(); - - if( !pStream ) - return; - - UINT16 nCheck = nMagic; - *pStream << nCheck; - - const UINT16 nDirs = (UINT16) m_aDirs.Count(); - *pStream << nDirs; - - for( TemplateCacheDirEntry* pDir = m_aDirs.First(); - pStream->GetError() == SVSTREAM_OK && pDir; - pDir = m_aDirs.Next() ) - { - pStream->WriteByteString( pDir->m_aPath, RTL_TEXTENCODING_UTF8 ); - - const UINT16 nFiles = (UINT16) pDir->m_aFiles.Count(); - *pStream << nFiles; - - for( TemplateCacheInfo* pEntry = pDir->m_aFiles.First(); - pStream->GetError() == SVSTREAM_OK && pEntry; - pEntry = pDir->m_aFiles.Next() ) - { - *pStream << *pEntry; - } - } -} - -TemplateCacheDirEntry* TemplateCache::GetDirEntry( const String& rPath ) -{ - TemplateCacheDirEntry* pDir = m_aDirs.GetCurObject(); - if( pDir && pDir->m_aPath == rPath ) - return pDir; - - for( pDir = m_aDirs.First(); pDir; pDir = m_aDirs.Next() ) - { - if( pDir->m_aPath == rPath ) - return pDir; - } - - return NULL; -} - -TemplateCacheInfo* TemplateCache::GetFileInfo( const String& rPath ) -{ - INetURLObject aUrl( rPath ); - String aPath( aUrl.GetPath() ); - String aName( aUrl.GetName( INetURLObject::DECODE_UNAMBIGUOUS ) ); - - DBG_ASSERT( aUrl.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); - - TemplateCacheDirEntry* pDir = GetDirEntry( aPath ); - - if( NULL != pDir ) - { - for( TemplateCacheInfo* pEntry = pDir->m_aFiles.First(); pEntry; pEntry = pDir->m_aFiles.Next() ) - { - if( pEntry->GetFile() == aName ) - return pEntry; - } - } - - return NULL; -} - -TemplateCacheInfo* TemplateCache::AddFileInfo( const String& rPath ) -{ - INetURLObject aUrl( rPath ); - String aPath( aUrl.GetPath() ); - String aName( aUrl.GetName( INetURLObject::DECODE_UNAMBIGUOUS ) ); - - DBG_ASSERT( aUrl.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); - - TemplateCacheDirEntry* pDir = GetDirEntry( aPath ); - TemplateCacheInfo* pEntry = NULL; - - if( pDir == NULL ) - { - pDir = new TemplateCacheDirEntry(); - pDir->m_aPath = aPath; - m_aDirs.Insert(pDir); - } - - if( NULL != pDir ) - { - for( pEntry = pDir->m_aFiles.First(); pEntry; pEntry = pDir->m_aFiles.Next() ) - { - if( pEntry->GetFile() == aName) - return pEntry; - } - - pEntry = new TemplateCacheInfo(); - pEntry->SetFile( aName ); - pDir->m_aFiles.Insert(pEntry); - } - - return pEntry; -} - -BOOL TemplateCache::ClearInvalidEntrys() -{ - BOOL bModified = FALSE; - - for( TemplateCacheDirEntry* pDir = m_aDirs.First(); pDir; pDir = m_aDirs.Next() ) - { - for( TemplateCacheInfo* pEntry = pDir->m_aFiles.First(); pEntry; pEntry = pDir->m_aFiles.Next() ) - { - if(!pEntry->IsValid()) - { - pDir->m_aFiles.Remove(pEntry); - delete pEntry; - bModified = TRUE; - } - else if( pEntry->IsModified() ) - { - bModified = TRUE; - } - } - - if( pDir->m_aFiles.Count() == 0 ) - { - m_aDirs.Remove(pDir); - delete pDir; - } - } - - return bModified; -} - - diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index dc3e7f636e8d..35bbd41de448 100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -56,37 +56,7 @@ public: }; -class TemplateCacheInfo -{ -private: - DateTime m_aDateTime; - String m_aFile; - BOOL m_bImpress; - BOOL m_bValid; - BOOL m_bModified; - -public: - TemplateCacheInfo(); - TemplateCacheInfo( const String& rFile, const DateTime& rDateTime, BOOL bImpress ); - - BOOL IsValid() const { return m_bValid; } - void SetValid( BOOL bValid = TRUE ) { m_bValid = bValid; } - - BOOL IsImpress() const { return m_bImpress; } - void SetImpress( BOOL bImpress = TRUE ) { m_bImpress = bImpress; } - - const String& GetFile() const { return m_aFile; } - void SetFile( const String& rFile ) { m_aFile = rFile; } - - const DateTime& GetDateTime() const { return m_aDateTime; } - void SetDateTime( const DateTime& rDateTime ) { m_aDateTime = rDateTime; } - - BOOL IsModified() const { return m_bModified; } - void SetModified( BOOL bModified = TRUE ) { m_bModified = bModified; } - - friend SvStream& operator >> (SvStream& rIn, TemplateCacheInfo& rInfo); - friend SvStream& operator << (SvStream& rOut, const TemplateCacheInfo& rInfo); -}; +class TemplateCacheInfo; DECLARE_LIST( TemplateCacheInfoList, TemplateCacheInfo * ) @@ -98,22 +68,3 @@ public: }; DECLARE_LIST( TemplateCacheDirEntryList, TemplateCacheDirEntry * ) - -class TemplateCache -{ -private: - TemplateCacheDirEntryList m_aDirs; - TemplateCacheDirEntry* GetDirEntry( const String& rPath ); - void Clear(); -public: - TemplateCache(); - ~TemplateCache(); - - void Load(); - void Save(); - - TemplateCacheInfo* GetFileInfo( const String& rPath ); - TemplateCacheInfo* AddFileInfo( const String& rPath ); - - BOOL ClearInvalidEntrys(); -}; diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx index 14c1209875ef..1a5a612d37ad 100644 --- a/sd/source/ui/dlg/dlgctrls.cxx +++ b/sd/source/ui/dlg/dlgctrls.cxx @@ -51,12 +51,6 @@ FadeEffectLB::FadeEffectLB( Window* pParent, SdResId Id ) { } -FadeEffectLB::FadeEffectLB( Window* pParent, WinBits aWB ) -: ListBox( pParent, aWB ), - mpImpl( new FadeEffectLBImpl ) -{ -} - FadeEffectLB::~FadeEffectLB() { delete mpImpl; diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index 2b78a649eaef..6cd220d5a5bc 100644..100755 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -96,27 +96,35 @@ SdSnapLineDlg::SdSnapLineDlg( DBG_ASSERT( pPool, "Wo ist der Pool?" ); SfxMapUnit ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH ); - // Hier werden die Max- und MinWerte in Ahaengigkeit von der + // #i48497# Consider page origin + SdrPageView* pPV = pView->GetSdrPageView(); + Point aLeftTop(aWorkArea.Left()+1, aWorkArea.Top()+1); + pPV->LogicToPagePos(aLeftTop); + Point aRightBottom(aWorkArea.Right()-2, aWorkArea.Bottom()-2); + pPV->LogicToPagePos(aRightBottom); + + // Hier werden die Max- und MinWerte in Abhaengigkeit von der // WorkArea, PoolUnit und der FieldUnit: - SetMetricValue( aMtrFldX, aWorkArea.Left(), ePoolUnit ); + SetMetricValue( aMtrFldX, aLeftTop.X(), ePoolUnit ); + long nValue = static_cast<long>(aMtrFldX.GetValue()); nValue = Fraction( nValue ) / aUIScale; aMtrFldX.SetMin( nValue ); aMtrFldX.SetFirst( nValue ); - SetMetricValue( aMtrFldX, aWorkArea.Right()+1, ePoolUnit ); + SetMetricValue( aMtrFldX, aRightBottom.X(), ePoolUnit ); nValue = static_cast<long>(aMtrFldX.GetValue()); nValue = Fraction( nValue ) / aUIScale; aMtrFldX.SetMax( nValue ); aMtrFldX.SetLast( nValue ); - SetMetricValue( aMtrFldY, aWorkArea.Top(), ePoolUnit ); + SetMetricValue( aMtrFldY, aLeftTop.Y(), ePoolUnit ); nValue = static_cast<long>(aMtrFldY.GetValue()); nValue = Fraction( nValue ) / aUIScale; aMtrFldY.SetMin( nValue ); aMtrFldY.SetFirst( nValue ); - SetMetricValue( aMtrFldY, aWorkArea.Bottom()+1, ePoolUnit ); + SetMetricValue( aMtrFldY, aRightBottom.Y(), ePoolUnit ); nValue = static_cast<long>(aMtrFldY.GetValue()); nValue = Fraction( nValue ) / aUIScale; aMtrFldY.SetMax( nValue ); diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 71a7145425b7..a42ce43a2c6d 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -45,7 +45,6 @@ #include "DrawDocShell.hxx" #include "ViewShell.hxx" #include "ViewShellBase.hxx" -#include "showview.hxx" #include "drawview.hxx" #include "sdpage.hxx" #include "sfx2/viewfrm.hxx" @@ -81,17 +80,6 @@ SdDocPreviewWin::SdDocPreviewWin( Window* pParent, const ResId& rResId ) SetBackground( aEmpty ); } -SdDocPreviewWin::SdDocPreviewWin( Window* pParent ) -: Control(pParent, 0 ), pMetaFile( 0 ), bInEffect(FALSE), mpObj(NULL), mnShowPage(0) -{ - SetBorderStyle( WINDOW_BORDER_MONO ); - svtools::ColorConfig aColorConfig; - Wallpaper aEmpty; - SetBackground( aEmpty ); - Resize(); - Show(); -} - SdDocPreviewWin::~SdDocPreviewWin() { delete pMetaFile; @@ -104,13 +92,6 @@ void SdDocPreviewWin::Resize() mxSlideShow->resize( GetSizePixel() ); } -void SdDocPreviewWin::SetGDIFile( GDIMetaFile* pFile ) -{ - delete pMetaFile; - pMetaFile = pFile; - Invalidate(); -} - void SdDocPreviewWin::CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rPoint ) { Size aTmpSize = pFile ? pFile->GetPrefSize() : Size(1,1 ); diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 182c70954111..71fad02f24a7 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -69,7 +69,6 @@ private: using sfx2::FileDialogHelper::Execute; #endif - friend class SdExportFileDialog; friend class SdOpenSoundFileDialog; css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > mxControlAccess; @@ -95,8 +94,6 @@ public: // overwritten from FileDialogHelper, to receive user feedback virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); - - sal_Bool SelectionBoxState() const; }; // ------------------------------------------------------------------------ @@ -313,91 +310,6 @@ ErrCode SdFileDialog_Imp::Execute() return FileDialogHelper::Execute(); } -// ------------------------------------------------------------------------ -sal_Bool SdFileDialog_Imp::SelectionBoxState() const -{ - if ( !mbUsableSelection || !mxControlAccess.is() ) - return sal_False; - - sal_Bool bState(0); - try - { - mxControlAccess->getValue( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0 ) >>= bState; - } - catch( css::lang::IllegalArgumentException ) - { -#ifdef DBG_UTIL - DBG_ERROR( "Cannot access \"selection\" checkbox" ); -#endif - } - - return bState; -} - - -// -------------------------------------------------------------------- -// ----------- SdExportFileDialog --------------------------- -// -------------------------------------------------------------------- - -// these are simple forwarders -SdExportFileDialog::SdExportFileDialog(BOOL bHaveCheckbox) : - mpImpl( new SdFileDialog_Imp( css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION_SELECTION, - bHaveCheckbox ) ) -{ - // setup filter - const String aHTMLFilter( SdResId( STR_EXPORT_HTML_NAME ) ); - GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); - const USHORT nFilterCount = pFilter->GetExportFormatCount(); - - // add HTML filter - mpImpl->AddFilter( aHTMLFilter, String( SdResId( STR_EXPORT_HTML_FILTER ) ) ); - - // add other graphic filters - for ( USHORT i = 0; i < nFilterCount; i++ ) - { - mpImpl->AddFilter( pFilter->GetExportFormatName( i ), - pFilter->GetExportWildcard( i ) ); - } - - // set dialog title - mpImpl->SetTitle( String( SdResId( STR_EXPORT_DIALOG_TITLE ) ) ); -} - -// ------------------------------------------------------------------------ -SdExportFileDialog::~SdExportFileDialog() -{ -} - -// ------------------------------------------------------------------------ -ErrCode SdExportFileDialog::Execute() -{ - return mpImpl->Execute(); -} - -String SdExportFileDialog::GetPath() const -{ - return mpImpl->GetPath(); -} - -// ------------------------------------------------------------------------ -void SdExportFileDialog::SetPath( const String& rPath ) -{ - mpImpl->SetDisplayDirectory( rPath ); -} - -// ------------------------------------------------------------------------ -String SdExportFileDialog::ReqCurrentFilter() const -{ - return mpImpl->GetCurrentFilter(); -} - -// ------------------------------------------------------------------------ -BOOL SdExportFileDialog::IsExportSelection() const -{ - return mpImpl->SelectionBoxState(); -} - - // -------------------------------------------------------------------- // ----------- SdOpenSoundFileDialog ----------------------- // -------------------------------------------------------------------- diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 294e61f3fe40..b48a1682bba6 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -291,12 +291,6 @@ HeaderFooterDialog::~HeaderFooterDialog() // ----------------------------------------------------------------------- -void HeaderFooterDialog::initTabPages() -{ -} - -// ----------------------------------------------------------------------- - IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl ) { const USHORT nId = pTabCtrl->GetCurPageId(); diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index f16e90dd7791..5d260367f383 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -142,7 +142,6 @@ List* SdInsertPagesObjsDlg::GetList( USHORT nType ) // wird das gesamte Dokument (und nicht mehr!) eingefuegt. if( aLbTree.GetSelectionCount() == 0 || ( aLbTree.IsSelected( aLbTree.First() ) ) ) - //return( aLbTree.GetBookmarkList( nType ) ); return( NULL ); // #37350# } return( aLbTree.GetSelectEntryList( nType ) ); diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index ea7a702e539e..3c9aad38c332 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -41,15 +41,6 @@ #include "app.hrc" #include <svl/intitem.hxx> #include <sfx2/request.hxx> -// STATIC DATA ----------------------------------------------------------- - -static USHORT pPrintOptRanges[] = -{ - ATTR_OPTIONS_PRINT, - ATTR_OPTIONS_PRINT, - 0 -}; - /************************************************************************* |* @@ -236,13 +227,6 @@ SfxTabPage* SdPrintOptions::Create( Window* pWindow, //----------------------------------------------------------------------- -USHORT* SdPrintOptions::GetRanges() -{ - return pPrintOptRanges; -} - -//----------------------------------------------------------------------- - IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, CheckBox *, pCbx ) { // there must be at least one of them checked diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 9dbf8e22629c..d44d99ed3c64 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -730,61 +730,6 @@ List* SdPageObjsTLB::GetSelectEntryList( USHORT nDepth ) /************************************************************************* |* -|* Alle Pages (und Objekte) des Docs zurueckgeben -|* nType == 0 -> Seiten -|* nType == 1 -> Objekte -|* -\************************************************************************/ - -List* SdPageObjsTLB::GetBookmarkList( USHORT nType ) -{ - List* pList = NULL; - - if( GetBookmarkDoc() ) - { - SdPage* pPage = NULL; - String* pName = NULL; - USHORT nPage = 0; - const USHORT nMaxPages = mpBookmarkDoc->GetSdPageCount( PK_STANDARD ); - - while( nPage < nMaxPages ) - { - pPage = mpBookmarkDoc->GetSdPage( nPage, PK_STANDARD ); - - if( nType == 0 ) // Seitennamen einfuegen - { - if( !pList ) - pList = new List(); - - pName = new String( pPage->GetRealName() ); - pList->Insert( pName, LIST_APPEND ); - } - else // Objektnamen einfuegen - { - // Ueber Objekte der Seite iterieren - SdrObjListIter aIter( *pPage, IM_DEEPWITHGROUPS ); - while( aIter.IsMore() ) - { - SdrObject* pObj = aIter.Next(); - String aStr( GetObjectName( pObj ) ); - if( aStr.Len() ) - { - if( !pList ) - pList = new List(); - - pName = new String( aStr ); - pList->Insert( pName, LIST_APPEND ); - } - } - } - nPage++; - } - } - return( pList ); -} - -/************************************************************************* -|* |* Eintraege werden erst auf Anforderung (Doppelklick) eingefuegt |* \************************************************************************/ diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index ebe0243f7d99..af2668fc9dad 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -86,15 +86,6 @@ using namespace ::com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -static USHORT pActionRanges[] = -{ - ATTR_ANIMATION_TRANSPCOLOR, - ATTR_ANIMATION_TRANSPCOLOR, - ATTR_ACTION_START, - ATTR_ACTION_END, - 0 -}; - #define DOCUMENT_TOKEN (sal_Unicode('#')) /************************************************************************* @@ -423,13 +414,6 @@ SfxTabPage* SdTPAction::Create( Window* pWindow, //------------------------------------------------------------------------ -USHORT* SdTPAction::GetRanges() -{ - return( pActionRanges ); -} - -//------------------------------------------------------------------------ - void SdTPAction::UpdateTree() { if( !bTreeUpdated && mpDoc && mpDoc->GetDocSh() && mpDoc->GetDocSh()->GetMedium() ) @@ -849,35 +833,6 @@ void SdTPAction::SetEditText( String const & rStr ) } } -String SdTPAction::GetMacroName( const String& rMacroPath ) -{ - String result = rMacroPath; - - // try to get name by parsing the macro path - // using the new URI parsing services - - Reference< XMultiServiceFactory > xSMgr = - ::comphelper::getProcessServiceFactory(); - - Reference< com::sun::star::uri::XUriReferenceFactory > - xFactory( xSMgr->createInstance( - ::rtl::OUString::createFromAscii( - "com.sun.star.uri.UriReferenceFactory" ) ), UNO_QUERY ); - - if ( xFactory.is() ) - { - Reference< com::sun::star::uri::XVndSunStarScriptUrl > - xUrl( xFactory->parse( rMacroPath ), UNO_QUERY ); - - if ( xUrl.is() ) - { - result = xUrl->getName(); - } - } - - return result; -} - //------------------------------------------------------------------------ String SdTPAction::GetEditText( BOOL bFullDocDestination ) diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 29218a7b985a..a033661e7c85 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -312,18 +312,6 @@ BOOL DrawDocShell::InitNew( const ::com::sun::star::uno::Reference< ::com::sun:: |* \************************************************************************/ -sal_Bool DrawDocShell::IsNewDocument() const -{ - return( mbNewDocument && - ( !GetMedium() || GetMedium()->GetURLObject().GetProtocol() == INET_PROT_NOT_VALID ) ); -} - -/************************************************************************* -|* -|* Load: Pools und Dokument laden -|* -\************************************************************************/ - BOOL DrawDocShell::Load( SfxMedium& rMedium ) { mbNewDocument = sal_False; diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index f284651b91e5..78b1b9434ad0 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -548,21 +548,6 @@ void DrawDocShell::SetModified( BOOL bSet /* = TRUE */ ) } } -::Window* DrawDocShell::GetWindow() const -{ - SfxViewFrame* pFrame = GetFrame(); - if( pFrame == NULL ) - pFrame = SfxViewFrame::GetFirst( this ); - - if( pFrame ) - return &(pFrame->GetWindow()); - else - { - DBG_ASSERT( 0, "No active window for DrawDocShell found! (next gpf is caused by this assertion)" ); - return NULL; - } -} - /************************************************************************* |* |* Callback fuer ExecuteSpellPopup() diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index c8256bc2c0a6..55e22361ad3a 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -87,15 +87,12 @@ const ConfigurationClassifier::ResourceIdVector& ConfigurationClassifier::GetC2m - const ConfigurationClassifier::ResourceIdVector& ConfigurationClassifier::GetC1andC2 (void) const { return maC1andC2; } - - void ConfigurationClassifier::PartitionResources ( const ::com::sun::star::uno::Sequence<Reference<XResourceId> >& rS1, const ::com::sun::star::uno::Sequence<Reference<XResourceId> >& rS2) @@ -222,8 +219,6 @@ void ConfigurationClassifier::CopyResources ( } - - void ConfigurationClassifier::TraceResourceIdVector ( const sal_Char* pMessage, const ResourceIdVector& rResources) const @@ -240,6 +235,4 @@ void ConfigurationClassifier::TraceResourceIdVector ( } - - } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 68bf55bb7495..99b8b8fc5278 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -101,8 +101,6 @@ public: const Reference<frame::XController>& rxController); ~Implementation (void); - void Initialize (const Reference<frame::XController>& rxController); - Reference<XControllerManager> mxControllerManager; /** The Broadcaster class implements storing and calling of listeners. @@ -119,8 +117,6 @@ public: ViewShellBase* mpBase; - bool mbIsInitialized; - ::boost::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer; ::boost::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager; @@ -705,7 +701,6 @@ ConfigurationController::Implementation::Implementation ( mpBroadcaster(new ConfigurationControllerBroadcaster(&rController)), mxRequestedConfiguration(new Configuration(&rController, true)), mpBase(NULL), - mbIsInitialized(false), mpResourceFactoryContainer(new ResourceFactoryManager(mxControllerManager)), mpResourceManager( new ConfigurationControllerResourceManager(mpResourceFactoryContainer,mpBroadcaster)), @@ -721,27 +716,6 @@ ConfigurationController::Implementation::Implementation ( -void ConfigurationController::Implementation::Initialize ( - const Reference<frame::XController>& rxController) -{ - mxControllerManager = Reference<XControllerManager>(rxController, UNO_QUERY_THROW); - - mpConfigurationUpdater->SetControllerManager(mxControllerManager); - - // Tunnel through the controller to obtain a ViewShellBase. - Reference<lang::XUnoTunnel> xTunnel (rxController, UNO_QUERY_THROW); - if (xTunnel.is()) - { - ::sd::DrawController* pController = reinterpret_cast<sd::DrawController*>( - xTunnel->getSomething(sd::DrawController::getUnoTunnelId())); - if (pController != NULL) - mpBase = pController->GetViewShellBase(); - } -} - - - - ConfigurationController::Implementation::~Implementation (void) { } diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx index 63e45f8bb110..1781f6e038f4 100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx @@ -60,12 +60,12 @@ void ConfigurationTracer::TraceConfiguration ( +#ifdef DEBUG void ConfigurationTracer::TraceBoundResources ( const Reference<XConfiguration>& rxConfiguration, const Reference<XResourceId>& rxResourceId, const int nIndentation) { -#ifdef DEBUG Sequence<Reference<XResourceId> > aResourceList ( rxConfiguration->getResources(rxResourceId, ::rtl::OUString(), AnchorBindingMode_DIRECT)); const ::rtl::OUString sIndentation (::rtl::OUString::createFromAscii(" ")); @@ -77,11 +77,7 @@ void ConfigurationTracer::TraceBoundResources ( OSL_TRACE("%s\n", OUStringToOString(sLine, RTL_TEXTENCODING_UTF8).getStr()); TraceBoundResources(rxConfiguration, aResourceList[nIndex], nIndentation+1); } -#else - (void)rxConfiguration; - (void)rxResourceId; - (void)nIndentation; -#endif } +#endif } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx index 8a789a051584..b04206fd65e1 100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx @@ -32,7 +32,6 @@ namespace sd { namespace framework { - /** Print debug information about configurations to the standard error output channel. */ @@ -43,13 +42,14 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration, const char* pMessage); - +#ifdef DEBUG static void TraceBoundResources ( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId>& rxResourceId, const int nIndentation); +#endif }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index 5db5cb436739..50a68706745d 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -162,14 +162,6 @@ Reference<XConfiguration> ConfigurationUpdater::GetCurrentConfiguration (void) c -Reference<XConfiguration> ConfigurationUpdater::GetRequestedConfiguration (void) const -{ - return mxRequestedConfiguration; -} - - - - bool ConfigurationUpdater::IsUpdatePossible (void) { return ! mbUpdateBeingProcessed diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx index 87c92be5e5c4..a9f3e09f2a64 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx @@ -84,9 +84,6 @@ public: css::uno::Reference< css::drawing::framework::XConfiguration> GetCurrentConfiguration (void) const; - css::uno::Reference< - css::drawing::framework::XConfiguration> GetRequestedConfiguration (void) const; - friend class ConfigurationUpdaterLock; /** Return a lock of the called ConfigurationUpdater. While the returned object exists no update of the current configuration is diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 32894411547a..15d7c3a6f4ec 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -592,17 +592,6 @@ bool ResourceId::IsBoundToAnchor ( -bool ResourceId::IsValid (void) const -{ - return maResourceURLs.size() == 0 - || maResourceURLs[0].getLength()>0 - || maResourceURLs.size() == 1; - -} - - - - void ResourceId::ParseResourceURL (void) { ::osl::Guard< ::osl::Mutex > aGuard (::osl::Mutex::getGlobalMutex()); diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 969844f7650d..5ee2ae9433d4 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -551,32 +551,6 @@ Reference<XResource> BasicPaneFactory::CreateChildWindowPane ( return xPane; } - - - -bool BasicPaneFactory::IsBoundToChildWindow (const Reference<XResourceId>& rxResourceId) const -{ - if ( ! rxResourceId.is()) - return false; - - Reference<XResourceId> xAnchorId (rxResourceId->getAnchor()); - if ( ! xAnchorId.is()) - return false; - - const OUString sAnchorURL (xAnchorId->getResourceURL()); - if (sAnchorURL == FrameworkHelper::msLeftImpressPaneURL) - return true; - else if (sAnchorURL == FrameworkHelper::msLeftDrawPaneURL) - return true; - else if (sAnchorURL == FrameworkHelper::msRightPaneURL) - return true; - else - return false; -} - - - - void BasicPaneFactory::ThrowIfDisposed (void) const throw (lang::DisposedException) { diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index 1f442656d1d9..891845a5a1aa 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx @@ -159,12 +159,6 @@ private: css::drawing::framework::XResourceId>& rxPaneId, const PaneDescriptor& rDescriptor); - /** Return <TRUE/> when the specified resource is bound to one of the - child windows. - */ - bool IsBoundToChildWindow ( - const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId) const; - void ThrowIfDisposed (void) const throw (css::lang::DisposedException); }; diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index 8942833d2483..19eb50d67f0d 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -267,23 +267,6 @@ void SAL_CALL TaskPanelFactory::releaseResource ( -//============================================================================= - -void TaskPanelFactory::ThrowIfDisposed (void) const - throw (lang::DisposedException) -{ - if (rBHelper.bDisposed || rBHelper.bInDispose) - { - throw lang::DisposedException ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "TaskPanelFactory object has already been disposed")), - const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); - } -} - - - - //===== ToolPanelResource ===================================================== namespace { diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.hxx b/sd/source/ui/framework/factories/TaskPanelFactory.hxx index 1130a106a56c..70550bd45bee 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.hxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.hxx @@ -89,8 +89,6 @@ public: private: ViewShellBase* mpViewShellBase; - - void ThrowIfDisposed (void) const throw (css::lang::DisposedException); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index 0a3aeccade7c..04b730e75581 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -101,14 +101,6 @@ void SAL_CALL ViewShellWrapper::disposing (void) -bool ViewShellWrapper::IsUnique (void) -{ - return m_refCount==1; -} - - - - //----- XResource ------------------------------------------------------------- Reference<XResourceId> SAL_CALL ViewShellWrapper::getResourceId (void) diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx index cf9b095072b1..090247e7f68c 100644 --- a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx +++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx @@ -145,17 +145,6 @@ void ReadOnlyModeObserver::AddStatusListener ( -void ReadOnlyModeObserver::RemoveStatusListener ( - const Reference<frame::XStatusListener>& rxListener) -{ - mpBroadcaster->removeListener( - getCppuType((Reference<frame::XStatusListener>*)NULL), - rxListener); -} - - - - bool ReadOnlyModeObserver::ConnectToDispatch (void) { if ( ! mxDispatch.is()) diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx index f01649bdf8bd..d783d6d83abf 100644 --- a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx +++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx @@ -91,12 +91,6 @@ public: const ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener>& rxListener); - /** Remove the given listener. - */ - void RemoveStatusListener ( - const ::com::sun::star::uno::Reference< - com::sun::star::frame::XStatusListener>& rxListener); - // XEventListener virtual void SAL_CALL disposing ( diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx index 8f79ed41f24b..fcd90ca6454b 100644 --- a/sd/source/ui/framework/module/ResourceManager.cxx +++ b/sd/source/ui/framework/module/ResourceManager.cxx @@ -291,25 +291,4 @@ void SAL_CALL ResourceManager::disposing ( } } - - - -void ResourceManager::Trace (void) const -{ - OSL_TRACE("main views with resource %s:", - ::rtl::OUStringToOString( - FrameworkHelper::ResourceIdToString(mxResourceId), RTL_TEXTENCODING_UTF8).getStr()); - - MainViewContainer::const_iterator iDescriptor; - for (iDescriptor=mpActiveMainViewContainer->begin(); - iDescriptor!=mpActiveMainViewContainer->end(); - ++iDescriptor) - { - OSL_TRACE(" %s", - ::rtl::OUStringToOString(*iDescriptor, RTL_TEXTENCODING_UTF8).getStr()); - } -} - - - } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index 23cb1ed7dd48..d00ee78c2de3 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -126,8 +126,6 @@ private: const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XConfiguration>& rxConfiguration); void UpdateForMainViewShell (void); - - void Trace (void) const; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 25790e736473..9edb584a9e29 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -982,28 +982,6 @@ void SAL_CALL FrameworkHelper::DisposeListener::disposing (const lang::EventObje -//----- DispatchCaller -------------------------------------------------------- - -DispatchCaller::DispatchCaller ( - SfxDispatcher& rDispatcher, - USHORT nSId) - : mrDispatcher(rDispatcher), - mnSId(nSId) -{ -} - - - - -void DispatchCaller::operator() (bool bEventSeen) -{ - (void)bEventSeen; - mrDispatcher.Execute(mnSId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); -} - - - - //===== FrameworkHelperResourceIdFilter ======================================= FrameworkHelperResourceIdFilter::FrameworkHelperResourceIdFilter ( diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index 26119b6a03b9..c0d8235e97fb 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -72,13 +72,6 @@ FuConstruct::FuConstruct ( { } -FunctionReference FuConstruct::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) -{ - FunctionReference xFunc( new FuConstruct( pViewSh, pWin, pView, pDoc, rReq ) ); - xFunc->DoExecute(rReq); - return xFunc; -} - void FuConstruct::DoExecute( SfxRequest& rReq ) { FuDraw::DoExecute( rReq ); diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index bbe13c114931..5cc3cc49ca88 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -99,14 +99,6 @@ FuDraw::FuDraw(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, { } -FunctionReference FuDraw::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ) -{ - FuDraw* pFunc; - FunctionReference xFunc( pFunc = new FuDraw( pViewSh, pWin, pView, pDoc, rReq ) ); - pFunc->SetPermanent(bPermanent); - return xFunc; -} - /************************************************************************* |* |* Destruktor diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx index 2bb056f55e42..c0ef53f144b3 100644 --- a/sd/source/ui/func/fuoutl.cxx +++ b/sd/source/ui/func/fuoutl.cxx @@ -60,12 +60,6 @@ FuOutline::FuOutline ( { } -FunctionReference FuOutline::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) -{ - FunctionReference xFunc( new FuOutline( pViewSh, pWin, pView, pDoc, rReq ) ); - return xFunc; -} - /************************************************************************* |* |* Command, weiterleiten an OutlinerView diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index bb6f6e7b6908..45c444da151f 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -246,16 +246,6 @@ IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer ) /************************************************************************* |* -|* String in Applikations-Statuszeile ausgeben -|* -\************************************************************************/ - -void FuPoor::WriteStatus(const String& ) -{ -} - -/************************************************************************* -|* |* Tastaturereignisse bearbeiten |* |* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls @@ -1120,18 +1110,6 @@ void FuPoor::StartDelayToScrollTimer () /************************************************************************* |* -|* Handler fuer Maustaste -|* -\************************************************************************/ - -long FuPoor::diffPoint (long pos1, long pos2) -{ - return (pos1 > pos2) ? pos1 - pos2 - : pos2 - pos1; -} - -/************************************************************************* -|* |* Help-event |* \************************************************************************/ diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx index 82007fe61893..04fcf124cc14 100644 --- a/sd/source/ui/func/fusearch.cxx +++ b/sd/source/ui/func/fusearch.cxx @@ -38,7 +38,6 @@ #include <svx/srchdlg.hxx> #include <sfx2/bindings.hxx> #include "fupoor.hxx" -#include "fuspell.hxx" // wegen SidArraySpell[] #ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" #endif @@ -55,6 +54,14 @@ class SfxRequest; namespace sd { +static USHORT SidArraySpell[] = { + SID_DRAWINGMODE, + SID_OUTLINEMODE, + SID_DIAMODE, + SID_NOTESMODE, + SID_HANDOUTMODE, + 0 }; + TYPEINIT1( FuSearch, FuPoor ); /************************************************************************* diff --git a/sd/source/ui/func/fuspell.cxx b/sd/source/ui/func/fuspell.cxx deleted file mode 100644 index 526efb0087e4..000000000000 --- a/sd/source/ui/func/fuspell.cxx +++ /dev/null @@ -1,166 +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 "fuspell.hxx" - -#include <editeng/outliner.hxx> -#include <sfx2/bindings.hxx> - -#include <sfx2/viewfrm.hxx> -#include "fupoor.hxx" -#include "Outliner.hxx" -#include "drawdoc.hxx" -#include "DrawViewShell.hxx" -#include "OutlineViewShell.hxx" -#include "ViewShellBase.hxx" - -#include "app.hrc" - -class SfxRequest; - -namespace sd { - -USHORT SidArraySpell[] = { - SID_DRAWINGMODE, - SID_OUTLINEMODE, - SID_DIAMODE, - SID_NOTESMODE, - SID_HANDOUTMODE, - 0 }; - -TYPEINIT1( FuSpell, FuPoor ); - -/************************************************************************* -|* -|* Konstruktor -|* -\************************************************************************/ - -FuSpell::FuSpell ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq ) - : FuPoor(pViewSh, pWin, pView, pDoc, rReq), - pSdOutliner(NULL), - bOwnOutliner(FALSE) -{ -} - -FunctionReference FuSpell::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) -{ - FunctionReference xFunc( new FuSpell( pViewSh, pWin, pView, pDoc, rReq ) ); - xFunc->DoExecute(rReq); - return xFunc; -} - -void FuSpell::DoExecute( SfxRequest& ) -{ - mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArraySpell ); - - if ( mpViewShell->ISA(DrawViewShell) ) - { - bOwnOutliner = TRUE; - pSdOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); - } - else if ( mpViewShell->ISA(OutlineViewShell) ) - { - bOwnOutliner = FALSE; - pSdOutliner = mpDoc->GetOutliner(); - } - - if (pSdOutliner) - pSdOutliner->PrepareSpelling(); -} - - - -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - -FuSpell::~FuSpell() -{ - mpDocSh->GetViewShell()->GetViewFrame()->GetBindings().Invalidate( SidArraySpell ); - - if (pSdOutliner) - pSdOutliner->EndSpelling(); - - if (bOwnOutliner) - delete pSdOutliner; -} - -/************************************************************************* -|* -|* Pruefung starten -|* -\************************************************************************/ - -void FuSpell::StartSpelling() -{ - // Get current main view shell. - ViewShellBase* pBase (ViewShellBase::GetViewShellBase ( - mpDocSh->GetViewShell()->GetViewFrame())); - if (pBase != NULL) - mpViewShell = pBase->GetMainViewShell().get(); - else - mpViewShell = NULL; - if (mpViewShell != NULL) - { - if ( pSdOutliner && mpViewShell->ISA(DrawViewShell) && !bOwnOutliner ) - { - pSdOutliner->EndSpelling(); - - bOwnOutliner = TRUE; - pSdOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); - pSdOutliner->PrepareSpelling(); - } - else if ( pSdOutliner && mpViewShell->ISA(OutlineViewShell) && bOwnOutliner ) - { - pSdOutliner->EndSpelling(); - delete pSdOutliner; - - bOwnOutliner = FALSE; - pSdOutliner = mpDoc->GetOutliner(); - pSdOutliner->PrepareSpelling(); - } - - if (pSdOutliner) - pSdOutliner->StartSpelling(); - } -} - - - -} // end of namespace sd diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index f62b1b087aee..31797f3c8a03 100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -136,29 +136,4 @@ void FuTransform::DoExecute( SfxRequest& rReq ) } } -/************************************************************************* -|* -|* Function ResizeObject -|* -\************************************************************************/ - -Point FuTransform::GetPoint( Rectangle aRect, RECT_POINT eRP ) -{ - - switch( eRP ) - { - case RP_LT: return( Point( aRect.Left(), aRect.Top() ) ); - case RP_MT: return( Point( aRect.Center().X(), aRect.Top() ) ); - case RP_RT: return( Point( aRect.Right(), aRect.Top() ) ); - case RP_LM: return( Point( aRect.Left(), aRect.Center().Y() ) ); - case RP_MM: return( Point( aRect.Center().X(), aRect.Center().Y() ) ); - case RP_RM: return( Point( aRect.Right(), aRect.Center().Y() ) ); - case RP_LB: return( Point( aRect.Left(), aRect.Bottom() ) ); - case RP_MB: return( Point( aRect.Center().X(), aRect.Bottom() ) ); - case RP_RB: return( Point( aRect.Right(), aRect.Bottom() ) ); - } - return( Point ( 0, 0 ) ); // Sollte nicht vorkommen ! -} - - } // end of namespace sd diff --git a/sd/source/ui/func/makefile.mk b/sd/source/ui/func/makefile.mk index 9ec946325239..a7567c5c0ff2 100644 --- a/sd/source/ui/func/makefile.mk +++ b/sd/source/ui/func/makefile.mk @@ -84,7 +84,6 @@ SLOFILES = \ $(SLO)$/fuolbull.obj \ $(SLO)$/fucopy.obj \ $(SLO)$/fulink.obj \ - $(SLO)$/fuspell.obj \ $(SLO)$/futhes.obj \ $(SLO)$/fusearch.obj \ $(SLO)$/fuinsfil.obj \ @@ -98,7 +97,6 @@ SLOFILES = \ $(SLO)$/fumorph.obj \ $(SLO)$/fuexpand.obj \ $(SLO)$/fusumry.obj \ - $(SLO)$/outlinfo.obj \ $(SLO)$/fucushow.obj \ $(SLO)$/fuvect.obj \ $(SLO)$/bulmaper.obj \ @@ -173,7 +171,6 @@ LIB3OBJFILES= \ $(SLO)$/fumorph.obj \ $(SLO)$/fuexpand.obj \ $(SLO)$/fusumry.obj \ - $(SLO)$/outlinfo.obj \ $(SLO)$/fucushow.obj \ $(SLO)$/fuvect.obj \ $(SLO)$/bulmaper.obj \ diff --git a/sd/source/ui/func/outlinfo.cxx b/sd/source/ui/func/outlinfo.cxx deleted file mode 100644 index 0a52da329b20..000000000000 --- a/sd/source/ui/func/outlinfo.cxx +++ /dev/null @@ -1,301 +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 <vcl/metric.hxx> -#include <editeng/outliner.hxx> -#include <svx/svdorect.hxx> -#include <svx/svdoutl.hxx> -#include <editeng/svxfont.hxx> -#include "drawdoc.hxx" -#include "outlinfo.hxx" -#include <algorithm> - -// #101500# -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ -#include <com/sun/star/i18n/ScriptType.hdl> -#endif -#include <com/sun/star/i18n/XBreakIterator.hpp> -#include <comphelper/processfactory.hxx> - -#ifndef _COM_SUN_STAR_I18N_CHARACTERITERATORMODE_HDL_ -#include <com/sun/star/i18n/CharacterIteratorMode.hdl> -#endif -#include <editeng/unolingu.hxx> - -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::i18n; - -// ---------------- -// - OutlinerInfo - -// ---------------- - -OutlinerInfo::OutlinerInfo() : - pParagraphs ( NULL ), - nParaCount ( 0UL ), - nExtraData ( 0L ) -{ -} - -// ----------------------------------------------------------------------------- - -OutlinerInfo::~OutlinerInfo() -{ - Clear(); -} - -// ----------------------------------------------------------------------------- - -void OutlinerInfo::SetTextObj( SdDrawDocument* pDoc, SdrRectObj* pObj, OutputDevice* pOut ) -{ - Clear(); - - SdrOutliner& rOutliner = pDoc->GetDrawOutliner(); - - mpOut = pOut; - rOutliner.SetText( *pObj->GetOutlinerParaObject() ); - - aObjBound = pObj->GetCurrentBoundRect(); - nParaCount = rOutliner.GetParagraphCount(); - nExtraData = 0L; - - if( nParaCount ) - { - mbVertical = rOutliner.IsVertical(); - pObj->TakeTextRect( rOutliner, aParaBound, TRUE ); - - if( IsVertical() ) - aTextOffset = aParaBound.TopRight(); - else - aTextOffset = aParaBound.TopLeft(); - - nCurPara = 0; - bInit = TRUE; - - rOutliner.SetDrawPortionHdl( LINK( this, OutlinerInfo, DrawPortionHdl ) ); - pParagraphs = new OutlinerParagraph[ nParaCount ]; - rOutliner.StripPortions(); - rOutliner.SetDrawPortionHdl( Link() ); - - if( 1 == nParaCount ) - pParagraphs[ 0 ].aRect = aParaBound; - else if( IsVertical() ) - { - pParagraphs[ 0 ].aRect.Right() = aParaBound.Right(); - - for( USHORT i = 0; i < nParaCount; i++ ) - { - if( i > 0 ) - pParagraphs[i].aRect.Right() = pParagraphs[ i - 1 ].aRect.Left(); - - pParagraphs[i].aRect.Left() = pParagraphs[i].aRect.Right() - rOutliner.GetTextHeight( i ); - } - } - else - { - pParagraphs[ 0 ].aRect.Top() = aParaBound.Top(); - - for( USHORT i = 0; i < nParaCount; i++ ) - { - if( i > 0 ) - pParagraphs[ i ].aRect.Top() = pParagraphs[ i - 1 ].aRect.Bottom(); - - pParagraphs[ i ].aRect.Bottom() = pParagraphs[ i ].aRect.Top() + rOutliner.GetTextHeight( i ); - } - } - } - else - { - pParagraphs = NULL; - aParaBound = Rectangle(); - aTextOffset = Point(); - } - - nCurPara = 0; - bInit = FALSE; -} - -// ----------------------------------------------------------------------------- - -void OutlinerInfo::Clear() -{ - for( void* pChar = aCharacterList.First(); pChar; pChar = aCharacterList.Next() ) - delete (OutlinerCharacter*) pChar; - aCharacterList.Clear(); - - delete[] pParagraphs; - pParagraphs = NULL; - - nCurPara = nParaCount = 0UL; - aObjBound = aParaBound = Rectangle(); - aTextOffset = Point(); -} - -// ----------------------------------------------------------------------------- - -const Rectangle& OutlinerInfo::GetParaRect( const ULONG nPara ) const -{ - DBG_ASSERT( nPara < nParaCount, "Para out of range!" ); - return pParagraphs[ nPara ].aRect; -} - -// ----------------------------------------------------------------------------- - -BOOL OutlinerInfo::GetParaCharCount( const ULONG nPara ) const -{ - DBG_ASSERT( nPara < nParaCount, "Para out of range!" ); - return (0 != pParagraphs[ nPara ].nCharCount); -} - -// ----------------------------------------------------------------------------- - -IMPL_LINK(OutlinerInfo, DrawPortionHdl, DrawPortionInfo*, pInfo) -{ - // #101500# - Point aStart; - sal_Bool bIsVertical(IsVertical()); - mpOut->SetFont((const Font&)pInfo->mrFont); - FontMetric aFontMetric(mpOut->GetFontMetric()); - sal_Bool bUseBreakIterator(sal_False); - - // initialize BreakIterator - Reference < com::sun::star::i18n::XBreakIterator > xBreak; - Reference < XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); - Reference < XInterface > xInterface = xMSF->createInstance(::rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator")); - ::com::sun::star::lang::Locale aFontLocale = SvxCreateLocale(pInfo->mrFont.GetLanguage()); - - if(xInterface.is()) - { - Any x = xInterface->queryInterface(::getCppuType((const Reference< XBreakIterator >*)0)); - x >>= xBreak; - } - - if(xBreak.is()) - { - bUseBreakIterator = sal_True; - } - - if(bIsVertical) - { - aStart.X() = pInfo->mrStartPos.X() + aTextOffset.X() - aFontMetric.GetDescent(); - aStart.Y() = pInfo->mrStartPos.Y() + aTextOffset.Y(); - - const Point aTopLeft(aStart.X(), aParaBound.Top()); - const Point aBottomRight(aStart.X() + aFontMetric.GetLineHeight(), aParaBound.Bottom()); - const Rectangle aCurRect(aTopLeft, aBottomRight); - - if(pInfo->mnPara != nCurPara) - { - nCurPara = pInfo->mnPara; - pParagraphs[nCurPara].aRect = aCurRect; - } - else - { - pParagraphs[nCurPara].aRect.Union(aCurRect); - } - } - else - { - aStart.X() = pInfo->mrStartPos.X() + aTextOffset.X(); - aStart.Y() = pInfo->mrStartPos.Y() + aTextOffset.Y() - aFontMetric.GetAscent(); - - const Point aTopLeft(aParaBound.Left(), aStart.Y()); - const Point aBottomRight(aParaBound.Right(), aStart.Y() + aFontMetric.GetLineHeight()); - const Rectangle aCurRect(aTopLeft, aBottomRight); - - if(pInfo->mnPara != nCurPara) - { - nCurPara = pInfo->mnPara; - pParagraphs[nCurPara].aRect = aCurRect; - } - else - { - pParagraphs[nCurPara].aRect.Union(aCurRect); - } - } - - if(pInfo->mnTextLen && (0xFFFF != pInfo->mnIndex)) - { - pParagraphs[nCurPara].nCharCount += pInfo->mnTextLen; - sal_uInt16 nInsertIndex(0xffff); - - if(pInfo->IsRTL()) - nInsertIndex = (sal_uInt16)aCharacterList.Count(); - - for(sal_uInt16 nCharIndex(0); nCharIndex < pInfo->mnTextLen; ) - { - xub_StrLen nNextGlyphLen(1); - sal_Bool bIsSingleSpace(sal_False); - - if(bUseBreakIterator) - { - sal_Int32 nDone(0L); - nNextGlyphLen = (xub_StrLen)xBreak->nextCharacters( pInfo->mrText, pInfo->mnTextStart, aFontLocale, - CharacterIteratorMode::SKIPCELL, 1, nDone) - (pInfo->mnTextStart); - } - - if(!bIsSingleSpace) - { - Size aGlyphSize(pInfo->mrFont.GetPhysTxtSize(mpOut, - pInfo->mrText, nCharIndex + pInfo->mnTextStart, nNextGlyphLen)); - - if(bIsVertical) - { - ::std::swap(aGlyphSize.Width(), aGlyphSize.Height()); - } - - const Rectangle aRect(aStart, aGlyphSize); - - aCharacterList.Insert(new OutlinerCharacter( - aRect, - pInfo->mnPara, - pInfo->mrFont.GetColor()), - nInsertIndex); - - long dx = 0; - if( pInfo->mpDXArray ) - dx = (pInfo->mpDXArray)[nCharIndex]; - - if(bIsVertical) - aStart.Y() = pInfo->mrStartPos.Y() + aTextOffset.Y() + dx; - else - aStart.X() = pInfo->mrStartPos.X() + aTextOffset.X() + dx; - } - - nCharIndex = nCharIndex + nNextGlyphLen; - } - } - - return 0L; -} - -// eof diff --git a/sd/source/ui/func/sdundogr.cxx b/sd/source/ui/func/sdundogr.cxx index daea6eef49a2..7b7a361bba80 100644 --- a/sd/source/ui/func/sdundogr.cxx +++ b/sd/source/ui/func/sdundogr.cxx @@ -116,14 +116,3 @@ void SdUndoGroup::AddAction(SdUndoAction* pAction) { aCtn.Insert(pAction, CONTAINER_APPEND); } - -/************************************************************************* -|* -|* Zeiger auf eine Aktion liefern -|* -\************************************************************************/ - -SdUndoAction* SdUndoGroup::GetAction(ULONG nAction) const -{ - return (SdUndoAction*)aCtn.GetObject(nAction); -} diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx index 684487d0c592..933e961ed927 100644 --- a/sd/source/ui/func/unoaprms.cxx +++ b/sd/source/ui/func/unoaprms.cxx @@ -39,52 +39,6 @@ TYPEINIT1(SdAnimationPrmsUndoAction, SdUndoAction); /************************************************************************* |* -|* 2. Ctor, der den ersten (inline) nach der Version 4.0 einmal ersetzen -|* soll (mit 3. Parameter dann) -|* Hier werden die Member mit den Animations-Informationen vorbelegt, -|* um nicht immer alle inline-Methoden aufrufen zu muessen, auch im -|* Hinblick auf zukuenftige Erweiterungen (neue Member etc.) -|* -\************************************************************************/ - -SdAnimationPrmsUndoAction::SdAnimationPrmsUndoAction( - SdDrawDocument* pTheDoc, - SdrObject* pObj ) : - SdUndoAction ( pTheDoc ), - pObject ( pObj ), - bInfoCreated ( FALSE ) // Fuer Animationsreihenfolge existiert Info -{ - SdAnimationInfo* pInfo = pTheDoc->GetAnimationInfo( pObject ); - if( pInfo ) - { - bNewActive = bOldActive = pInfo->mbActive; - eNewEffect = eOldEffect = pInfo->meEffect; - eNewTextEffect = eOldTextEffect = pInfo->meTextEffect; - eNewSpeed = eOldSpeed = pInfo->meSpeed; - bNewDimPrevious = bOldDimPrevious= pInfo->mbDimPrevious; - aNewDimColor = aOldDimColor = pInfo->maDimColor; - bNewDimHide = bOldDimHide = pInfo->mbDimHide; - bNewSoundOn = bOldSoundOn = pInfo->mbSoundOn; - aNewSoundFile = aOldSoundFile = pInfo->maSoundFile; - bNewPlayFull = bOldPlayFull = pInfo->mbPlayFull; - - pNewPathObj = pOldPathObj = pInfo->mpPathObj; - - eNewClickAction = eOldClickAction = pInfo->meClickAction; - aNewBookmark = aOldBookmark = pInfo->GetBookmark(); -// bNewInvisibleInPres = bOldInvisibleInPres= pInfo->mbInvisibleInPresentation; - nNewVerb = nOldVerb = pInfo->mnVerb; - nNewPresOrder = nOldPresOrder = pInfo->mnPresOrder; - - eNewSecondEffect = eOldSecondEffect = pInfo->meSecondEffect; - eNewSecondSpeed = eOldSecondSpeed = pInfo->meSecondSpeed; - bNewSecondSoundOn = bOldSecondSoundOn = pInfo->mbSecondSoundOn; - bNewSecondPlayFull = bOldSecondPlayFull = pInfo->mbSecondPlayFull; - } -} - -/************************************************************************* -|* |* Undo() |* \************************************************************************/ diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index 33e0bbf725ab..5c8fba1e6b2d 100644 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx @@ -53,13 +53,10 @@ class AccessibleViewForwarder public: //===== internal ======================================================== - AccessibleViewForwarder (SdrPaintView* pView, USHORT nWindowId); AccessibleViewForwarder (SdrPaintView* pView, OutputDevice& rDevice); virtual ~AccessibleViewForwarder (void); - void SetView (SdrPaintView* pView); - //===== IAccessibleViewforwarder ======================================== /** This method informs you about the state of the forwarder. Do not diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 5afda083abbc..c8744b2201ac 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -126,8 +126,6 @@ public: void SetSubController ( const css::uno::Reference<css::drawing::XDrawSubController>& rxSubController); - ::com::sun::star::awt::Rectangle GetVisArea (void) const; - /** Call this method when the VisArea has changed. */ void FireVisAreaChanged (const Rectangle& rVisArea) throw(); diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index f2b77d01f96c..4ad4b0d09392 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -115,7 +115,6 @@ public: sd::ViewShell* GetViewShell() { return mpViewShell; } ::sd::FrameView* GetFrameView(); - ::Window* GetWindow() const; ::sd::FunctionReference GetDocShellFunction() const { return mxDocShellFunction; } void SetDocShellFunction( const ::sd::FunctionReference& xFunction ); @@ -164,8 +163,6 @@ public: UINT16 GetStyleFamily() const { return mnStyleFamily; } void SetStyleFamily( UINT16 nSF ) { mnStyleFamily = nSF; } - sal_Bool IsNewDocument() const; - /** executes the SID_OPENDOC slot to let the framework open a document with the given URL and this document as a referer */ void OpenBookmark( const String& rBookmarkURL ); diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index e48d3cef142b..e0fcf4d8cb5b 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -93,11 +93,6 @@ public: PageKind ePageKind = PK_STANDARD, FrameView* pFrameView = NULL); - DrawViewShell( - SfxViewFrame* pFrame, - ::Window* pParentWindow, - const DrawViewShell& rShell); - virtual ~DrawViewShell (void); virtual void Init (bool bIsMainViewShell); @@ -198,9 +193,6 @@ public: void ExecFormText(SfxRequest& rReq); void GetFormTextState(SfxItemSet& rSet); - void ExecObjPalette(SfxRequest& rReq); - void GetObjPaletteState(SfxItemSet& rSet); - void ExecAnimationWin(SfxRequest& rReq); void GetAnimationWinState(SfxItemSet& rSet); diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx index 39e12e47d1e1..6b5d96be95c6 100644 --- a/sd/source/ui/inc/GraphicViewShell.hxx +++ b/sd/source/ui/inc/GraphicViewShell.hxx @@ -52,11 +52,6 @@ public: SFX_DECL_VIEWFACTORY(GraphicViewShell); SFX_DECL_INTERFACE(SD_IF_SDGRAPHICVIEWSHELL) - GraphicViewShell ( - SfxViewFrame* pFrame, - ::Window* pParentWindow, - const DrawViewShell& rShell); - /** Create a new view shell for the Draw application. @param rViewShellBase The new object will be stacked on this view shell base. diff --git a/sd/source/ui/inc/LayerDialogContent.hxx b/sd/source/ui/inc/LayerDialogContent.hxx index f06b785737b0..3c0b00025307 100644 --- a/sd/source/ui/inc/LayerDialogContent.hxx +++ b/sd/source/ui/inc/LayerDialogContent.hxx @@ -50,8 +50,6 @@ public: ViewShellBase& rBase); virtual ~LayerDialogContent (void); - LayerTabBar& GetLayerTabBar (void); - protected: virtual BOOL Close (void); virtual void Resize (void); diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx index 4e74d922d256..caaa8c175f68 100644 --- a/sd/source/ui/inc/MasterPageObserver.hxx +++ b/sd/source/ui/inc/MasterPageObserver.hxx @@ -80,12 +80,6 @@ public: */ void RemoveEventListener (const Link& rEventListener); - /** Return a set of the names of master pages for the given document. - This convenience method exists because this set is part of the - internal data structure and thus takes no time to create. - */ - MasterPageNameSet GetMasterPageNames (SdDrawDocument& rDocument); - private: static ::osl::Mutex maMutex; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 710ee3a96cf7..78481294bf94 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -162,7 +162,9 @@ public: */ void IgnoreCurrentPageChanges (bool bIgnore); +#if 0 sal_Int32 GetPageNumberWidthPixel(); +#endif void InvalidateSlideNumberArea(); diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 0bc083b12b2e..6c3848f39926 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -67,11 +67,6 @@ public: ::Window* pParentWindow, FrameView* pFrameView = NULL); - OutlineViewShell ( - SfxViewFrame* pFrame, - ::Window* pParentWindow, - const OutlineViewShell& rShell); - virtual ~OutlineViewShell (void); virtual void Shutdown (void); diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 03e6cf96c0f0..9d07ab9beefc 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -93,12 +93,6 @@ public: */ USHORT AddMenu (const String& rsMenuName, ULONG nHelpId, const Link& rCallback); - /** Set the title of the docking window to the given string. Use this - method when the title is not yet known at the time of construction - or can not be passed to the constructor. - */ - void SetTitle (const String& rsTitle); - ::Window* GetContentWindow (void); ::boost::shared_ptr<ToolBox> GetTitleToolBox (void) const; diff --git a/sd/source/ui/inc/SdUnoPresView.hxx b/sd/source/ui/inc/SdUnoPresView.hxx deleted file mode 100644 index 8edf171f60cc..000000000000 --- a/sd/source/ui/inc/SdUnoPresView.hxx +++ /dev/null @@ -1,54 +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. - * - ************************************************************************/ - -#ifndef SD_UNO_PRES_VIEW_HXX -#define SD_UNO_PRES_VIEW_HXX - -#include "SdUnoDrawView.hxx" - -namespace sd { - -/** The sub controller for the slide show (or preview?) It formerly reduced - the property set inherited from SdUnoDrawView to just 'CurrentPage'. - Now that we have to always support the whole set, we can as well try to - do that as best as we can. Therefore the inherited functionality is - provided as is. -*/ -class SdUnoPresView - : public SdUnoDrawView -{ -public: - SdUnoPresView ( - DrawController& rController, - DrawViewShell& rViewShell, - View& rView) throw(); - virtual ~SdUnoPresView (void) throw(); -}; - -} // end of namespace sd - -#endif diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 6f8ebb285886..4e6033d67ad1 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -53,12 +53,6 @@ public: TYPEINFO(); SFX_DECL_INTERFACE(SD_IF_SDSLIDESORTERVIEWSHELL) - static SfxShell* CreateInstance ( - sal_Int32 nId, - SfxShell* pParent, - void* pUserData, - ViewShellBase& rBase); - static ::boost::shared_ptr<SlideSorterViewShell> Create( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, diff --git a/sd/source/ui/inc/SlideView.hxx b/sd/source/ui/inc/SlideView.hxx index 3764347f2a4b..17f7f17e3a9a 100644 --- a/sd/source/ui/inc/SlideView.hxx +++ b/sd/source/ui/inc/SlideView.hxx @@ -36,7 +36,6 @@ class SdPage; namespace sd { -class ShowView; class SlideViewShell; class Window; @@ -129,7 +128,6 @@ private: List aDelayedPaints; SlideViewShell* pSlideViewShell; BitmapCache* pCache; - ShowView* pShowView; VirtualDevice* mpVDev; USHORT nAllowInvalidateSmph; USHORT nPagesPerRow; diff --git a/sd/source/ui/inc/TaskPaneViewShell.hxx b/sd/source/ui/inc/TaskPaneViewShell.hxx index d9f432029dc2..f502ee03c87f 100644 --- a/sd/source/ui/inc/TaskPaneViewShell.hxx +++ b/sd/source/ui/inc/TaskPaneViewShell.hxx @@ -44,7 +44,6 @@ class PopupMenu; namespace sd { namespace toolpanel { class TaskPaneShellManager; -class TitleToolBox; class TitleBar; class TitledControl; class ToolPanel; @@ -101,9 +100,6 @@ public: virtual SdPage* GetActualPage (void); virtual SdPage* getCurrentPage (void) const; - void Execute (SfxRequest& rRequest); - void GetState (SfxItemSet& rItemSet); - virtual void ArrangeGUIElements (void); TaskPaneShellManager& GetSubShellManager (void) const; @@ -121,12 +117,6 @@ public: */ void ShowPanel (const PanelId nId); - /** Hide and collapse the specified panel. - @param nId - The id of the panel that is to hide. - */ - void HidePanel (const PanelId nId); - /** Expand the specified panel. Its visibility state is not modified. @param nId The id of the panel that is to expand. @@ -200,27 +190,6 @@ private: }; - - -/** This functor makes visible a panel in the task pane. It can be used - with the FrameworkHelper to make a panel visible after an asynchonous - update of the configuration, e.g. after switching to another view. -*/ -class PanelActivation -{ -public: - /** Create a new object that, when its operator() method is called, will - make the specified panel visible in the task pane that belongs to - the application window specified by the given ViewShellBase. - */ - PanelActivation (ViewShellBase& rBase, TaskPaneViewShell::PanelId nPanelId); - void operator() (bool); -private: - ViewShellBase& mrBase; - TaskPaneViewShell::PanelId mnPanelId; -}; - - } } // end of namespace ::sd::toolpanel #endif diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx index 2caead9a3c5d..d8b84d1d7b61 100644 --- a/sd/source/ui/inc/ToolBarManager.hxx +++ b/sd/source/ui/inc/ToolBarManager.hxx @@ -144,14 +144,6 @@ public: TBG__LAST = TBG_MASTER_MODE }; - /** Only after calls with bValid=<TRUE/> may the tool bar manager use - the frame::XLayoutManager to change the visible tool bars. Call - this method when the controller is attached to or detachted from the - frame. When called with <FALSE/> then ResetAllToolBars() is - executed. - */ - void SetValid (bool bValid); - /** Reset the set of visible object bars in the specified group. Tool bars in other groups are not affected. @param rParentShell @@ -209,10 +201,6 @@ public: ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName); - void RemoveToolBarShell ( - ToolBarGroup eGroup, - ShellId nToolBarId); - /** This is basically a shortcut for ResetToolBars(),AddToolBar(). The main difference is, that all sub shells of the specified parent shell are deactivated as well. @@ -275,10 +263,6 @@ public: }; friend class UpdateLock; - /** Return whether updates of tool bars are locked. - */ - bool IsUpdateLocked (void) const; - void ToolBarsDestroyed(void); private: diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index a0d7bf179886..c4f9ab6e7d19 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -160,10 +160,7 @@ public: void SetMarkedOriginalSize(); - VirtualDevice* CreatePageVDev(USHORT nSdPage, PageKind ePageKind, ULONG nWidthPixel); - void LockRedraw(BOOL bLock); - bool IsRedrawLocked (void) const; BOOL IsMorphingAllowed() const; BOOL IsVectorizeAllowed() const; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 64bc5cbc02b7..ffefb9de7359 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -141,10 +141,6 @@ public: ::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter = true); - ViewShell ( - SfxViewFrame *pFrame, - ::Window* pParentWindow, - const ViewShell& rShell); virtual ~ViewShell (void); /** The Init method has to be called from the outside directly @@ -235,7 +231,6 @@ public: void InitWindows(const Point& rViewOrigin, const Size& rViewSize, const Point& rWinPos, BOOL bUpdate = FALSE); void InvalidateWindows(); - void UpdateWindows(); /** This method is still used by the OutlineViewShell to update the model according to the content of the outline view. This in turn updates the previews in the slide sorter. @@ -243,8 +238,6 @@ public: virtual void UpdatePreview (SdPage* pPage, BOOL bInit = FALSE); void DrawMarkRect(const Rectangle& rRect) const; - void DrawFilledRect( const Rectangle& rRect, const Color& rLColor, - const Color& rFColor ) const; void ExecReq( SfxRequest &rReq ); diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 5e1acbe2a6ac..13dbd6e6cd53 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -55,7 +55,6 @@ class ToolBarManager; class UpdateLockManager; class ViewShell; class ViewShellManager; -class CustomHandleManager; /** SfxViewShell descendant that the stacked Draw/Impress shells are based on. @@ -110,10 +109,6 @@ public: DrawDocShell* GetDocShell (void) const; SdDrawDocument* GetDocument (void) const; - /** Callback function for retrieving item values related to menu entries. - */ - void GetMenuState (SfxItemSet& rSet); - /** Callback function for general slot calls. At the moment these are slots for switching the pane docking windows on and off. */ @@ -163,12 +158,6 @@ public: PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI ); - /// Forwarded to the print manager. - USHORT SetPrinterOptDlg ( - SfxPrinter* pNewPrinter, - USHORT nDiffFlags = SFX_PRINTER_ALL, - BOOL _bShowDialog = TRUE); - virtual void PreparePrint (PrintDialog* pPrintDialog); /// Forward methods to main sub shell. @@ -259,8 +248,6 @@ public: */ ::Window* GetViewWindow (void); - CustomHandleManager& getCustomHandleManager() const; - /** returns the ui descriptive name for the given uno slot. The result is taken from the configuration and not cached, so do not use it excessive (f.e. in status updates) */ ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const; @@ -293,22 +280,6 @@ public: virtual void addCustomHandler( SdrView& rSourceView, ViewShell::ShellType eShellType, SdrHdlList& rHandlerList ) = 0; }; -class CustomHandleManager : public ICustomhandleSupplier -{ -public: - CustomHandleManager( ViewShellBase& rViewShellBase ); - virtual ~CustomHandleManager(); - - void registerSupplier( ICustomhandleSupplier* pSupplier ); - void unRegisterSupplier( ICustomhandleSupplier* pSupplier ); - - virtual void addCustomHandler( SdrView& rSourceView, ViewShell::ShellType eShellType, SdrHdlList& rHandlerList ); - -private: - ViewShellBase& mrViewShellBase; - std::set< ICustomhandleSupplier* > maSupplier; -}; - } // end of namespace sd #endif diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx index 27f88b72bf11..d674e7d07eff 100644 --- a/sd/source/ui/inc/ViewShellManager.hxx +++ b/sd/source/ui/inc/ViewShellManager.hxx @@ -90,23 +90,6 @@ public: ViewShell* pViewShell, const SharedShellFactory& rpFactory); - /** Create a new (or possibly recycle an existing) instance of a view - shell that is specified by the given id. When called multiple times - with the same id then multiple instances of the associated view - shell are created. Use the returned pointer to distinguish between - these. - @param nId - The id of the shell to activate. - @return - A pointer to the activated shell is returned. Use this pointer - to identify the shell in other method calls. When an activation - is not possible then NULL is returned. - */ - ViewShell* ActivateViewShell ( - ShellId nId, - ::Window* pParentWindow, - FrameView* pFrameView); - /** Activate the given view shell. */ void ActivateViewShell (ViewShell* pViewShell); @@ -156,10 +139,6 @@ public: */ void DeactivateSubShell (const ViewShell& rParentShell, ShellId nId); - /** Deactivate all sub shells of the given view shell. - */ - void DeactivateAllSubShells (const ViewShell& rParentShell); - /** Move the specified sub shells to the top position among the sub shells of the parent view shell. The rest of the SFX shell stack does not change (but the all shells above the sub shells have to be @@ -173,14 +152,6 @@ public: void InvalidateAllSubShells ( ViewShell* pViewShell); - /** Call this method to when a 'secondary' shell is moved to or from the - stack, e.g. an object bar. As a result a pending - TakeShellsFromStack() is executed and at the next UnlockUpdate() to - lock level 0 the shells are asked about their secondary shells to - push on the shell stack. - */ - void InvalidateShellStack (const SfxShell* pShell); - /** Move the specified view shell to the top most position on the stack of view shells in relation to the other view shells. After this the only shells that are higher on the stack are its object bars. @@ -211,20 +182,6 @@ public: */ SfxShell* GetTopShell (void) const; - /** Return the id of the given shell. - */ - ShellId GetShellId (const SfxShell* pShell) const; - - /** Replace the references to one SfxUndoManager to that of another at all - shells on the SFX shell stack. Call this method when an undo - manager is about to be destroyed. - @param pManager - The undo manager to be replaced. - @param pReplacement - The undo manager that replaces pManager. - */ - void ReplaceUndoManager (SfxUndoManager* pManager, SfxUndoManager* pReplacement); - /** Use this class to safely lock updates of the view shell stack. */ class UpdateLock diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index dbf2a1ed40a6..8dd522d8212d 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -66,8 +66,6 @@ public: void SetViewShell (ViewShell* pViewSh); - void ShareViewArea(::sd::Window* pOtherWin); - /** Set the zoom factor to the specified value and center the display area arround the zoom center. @param nZoom diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 846863c3a68a..7a7a34362c48 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -172,7 +172,6 @@ private: void UpdateControl( ULONG nPos, BOOL bDisableCtrls = FALSE ); void ResetAttrs(); - void WaitInEffect( ULONG nMilliSeconds ) const; void WaitInEffect( ULONG nMilliSeconds, ULONG nTime, SfxProgress* pStbMgr ) const; Fraction GetScale(); diff --git a/sd/source/ui/inc/bmcache.hxx b/sd/source/ui/inc/bmcache.hxx index 26658333dca3..c04f7d2ed2c4 100644 --- a/sd/source/ui/inc/bmcache.hxx +++ b/sd/source/ui/inc/bmcache.hxx @@ -45,8 +45,6 @@ public: : nMaxSize(nMaxSizeKB), nCurSize(0) {} virtual ~BitmapCache(); - void Add(const SdPage* pPage, const Bitmap& rBmp, long nZoomPercent); - const GraphicObject* Get(const SdPage* pPage, long& rZoomPercent, long nZoomTolerancePercent); void Remove(const SdPage* pPage); }; diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx index 418d72618b4c..523b86cf66a8 100644 --- a/sd/source/ui/inc/dlgass.hxx +++ b/sd/source/ui/inc/dlgass.hxx @@ -64,9 +64,6 @@ public: DECL_LINK( FinishHdl, OKButton * ); SfxObjectShellLock GetDocument(); - String GetTopic() const; - String GetUserName() const; - String GetInformation() const; OutputType GetOutputMedium() const; BOOL IsSummary() const; StartType GetStartType() const; diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx index df48868d473d..72b5921d8e86 100644 --- a/sd/source/ui/inc/dlgctrls.hxx +++ b/sd/source/ui/inc/dlgctrls.hxx @@ -50,7 +50,6 @@ class SD_DLLPUBLIC FadeEffectLB : public ListBox { public: FadeEffectLB( Window* pParent, SdResId Id ); - FadeEffectLB( Window* pParent, WinBits aWB ); ~FadeEffectLB(); virtual void Fill(); diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 0827371da3be..76b8fe06f318 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -70,10 +70,8 @@ protected: public: SdDocPreviewWin( Window* pParent, const ResId& rResId ); - SdDocPreviewWin( Window* pParent ); ~SdDocPreviewWin(); void SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage = 0 ); - void SetGDIFile( GDIMetaFile* pFile ); virtual void Resize(); void startPreview(); diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx index 74b4c5d1d6a6..2aaa7be9f123 100644 --- a/sd/source/ui/inc/filedlg.hxx +++ b/sd/source/ui/inc/filedlg.hxx @@ -40,40 +40,9 @@ class SdFileDialog_Imp; -/******************************************************************************/ - -/** - The class SdExportFileDialog wraps the FileDialogHelper, displaying the - FILESAVE_AUTOEXTENSION_SELECTION dialog template. The interface is a downstripped - version of the aforementioned class, with similar semantics. - */ -class SdExportFileDialog -{ - const std::auto_ptr< SdFileDialog_Imp > mpImpl; - - // forbidden and not implemented - SdExportFileDialog (); - SdExportFileDialog (const SdExportFileDialog &); - SdExportFileDialog & operator= (const SdExportFileDialog &); - -public: - explicit SdExportFileDialog( BOOL haveCheckbox ); - ~SdExportFileDialog(); - - ErrCode Execute(); - String GetPath() const; - void SetPath( const String& rPath ); - - String ReqDisplayDirectory() const; - - String ReqCurrentFilter() const; - BOOL IsExportSelection() const; // whether the "selection" checkbox is checked. -}; - /******************************************************************************/ - /** The class SdOpenSoundFileDialog wraps the FileDialogHelper, displaying the FILEOPEN_PLAY dialog template and performing the 'preview' functionality diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index a25839b3e637..58c663449bbc 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -383,23 +383,6 @@ private: }; - -/** This functor wraps a slot call. It is used to call a slot after an - asynchronous configuration update, eg after switching views. -*/ -class DispatchCaller -{ - SfxDispatcher& mrDispatcher; - USHORT mnSId; -public: - /** Create a new DispatchCaller object that, when executed, will call - the given slot at the given dispatcher. - */ - DispatchCaller(SfxDispatcher& rDispatcher, USHORT nSId); - void operator() (bool bEventSeen); -}; - - } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index a4d5390d15d0..e8124e895ee6 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -236,8 +236,6 @@ private: const ::std::vector<rtl::OUString>& rResourceURLs, css::drawing::framework::AnchorBindingMode eMode) const; - bool IsValid (void) const; - void ParseResourceURL (void); }; diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index 96846e5c08d7..a7fbc3dde82a 100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -90,16 +90,6 @@ public: */ ::boost::shared_ptr<ViewShell> GetViewShell (void); - /** Returns whether there is exactly one reference to the called - ViewShellWrapper object (the number of references to the wrapped - ViewShell object is not taken into account). This method is - typically used by the owner of a ViewShellWrapper object to verify - that, at the end of the ViewShellWrapper object's lifetime, the - owner holds the last reference and by releasing it will destroy the - object. - */ - bool IsUnique (void); - // XUnoTunnel diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx index c4199986a5b6..390060a16e3c 100644 --- a/sd/source/ui/inc/fuconstr.hxx +++ b/sd/source/ui/inc/fuconstr.hxx @@ -50,7 +50,6 @@ public: TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx index 77427a7f346e..23f68eda327b 100644 --- a/sd/source/ui/inc/fudraw.hxx +++ b/sd/source/ui/inc/fudraw.hxx @@ -50,8 +50,6 @@ class FuDraw public: TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual BOOL KeyInput(const KeyEvent& rKEvt); virtual BOOL MouseMove(const MouseEvent& rMEvt); virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index a8743fea8a50..92299387849a 100644 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -54,8 +54,6 @@ class FuOutline public: TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual BOOL Command(const CommandEvent& rCEvt); virtual void ScrollStart(); diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index c3c95a384a38..2650e99767b5 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -98,7 +98,6 @@ public: virtual void ScrollEnd() {} // ForceScroll aufgerufen void SetWindow(::sd::Window* pWin) { mpWindow = pWin; } - void WriteStatus(const String& aStr); // Statuszeile schreiben // #97016# II virtual void SelectionHasChanged(); @@ -145,7 +144,6 @@ protected: virtual ~FuPoor (void); DECL_LINK( DelayHdl, Timer * ); - long diffPoint (long pos1, long pos2); void ImpForceQuadratic(Rectangle& rRect); diff --git a/sd/source/ui/inc/fuspell.hxx b/sd/source/ui/inc/fuspell.hxx deleted file mode 100644 index 1bb37d3a873d..000000000000 --- a/sd/source/ui/inc/fuspell.hxx +++ /dev/null @@ -1,71 +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. - * - ************************************************************************/ - -#ifndef SD_FU_SPELL_HXX -#define SD_FU_SPELL_HXX - -#include "fupoor.hxx" - -namespace sd { - -extern USHORT SidArraySpell[]; - -class Outliner; - -class FuSpell - : public FuPoor -{ -public: - TYPEINFO(); - - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); - - void StartSpelling(); - - ::sd::Outliner* GetOutliner() const { return pSdOutliner; } - -protected: - virtual ~FuSpell (void); - - ::sd::Outliner* pSdOutliner; - BOOL bOwnOutliner; - -private: - FuSpell ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq); -}; - -} // end of namespace sd - -#endif - - diff --git a/sd/source/ui/inc/futransf.hxx b/sd/source/ui/inc/futransf.hxx index be554e941400..85041334c7f0 100644 --- a/sd/source/ui/inc/futransf.hxx +++ b/sd/source/ui/inc/futransf.hxx @@ -51,8 +51,6 @@ private: ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); - - Point GetPoint( Rectangle aRect, RECT_POINT eRP ); }; } // end of namespace sd diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index 382727475f84..fa0c4d9282c0 100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -65,7 +65,6 @@ private: SdPage* mpCurrentPage; ViewShell* mpViewShell; - void initTabPages(); void apply( bool bToAll, bool bForceSlides ); void change( SdUndoGroup* pUndoGroup, SdPage* pPage, const HeaderFooterSettings& rNewSettings ); diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index dcf53fc6ffc3..13088dfc64cb 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -163,7 +163,6 @@ public: SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsLayout() {} - void SetDefaults(); BOOL operator==( const SdOptionsLayout& rOpt ) const; BOOL IsRulerVisible() const { Init(); return (BOOL) bRuler; } @@ -220,7 +219,6 @@ public: SdOptionsContents( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsContents() {} - void SetDefaults(); BOOL operator==( const SdOptionsContents& rOpt ) const; }; @@ -230,7 +228,6 @@ class SD_DLLPUBLIC SdOptionsContentsItem : public SfxPoolItem { public: - SdOptionsContentsItem( USHORT nWhich); SdOptionsContentsItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -301,7 +298,6 @@ public: SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsMisc() {} - void SetDefaults(); BOOL operator==( const SdOptionsMisc& rOpt ) const; BOOL IsStartWithTemplate() const { Init(); return (BOOL) bStartWithTemplate; } @@ -427,7 +423,6 @@ public: SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsSnap() {} - void SetDefaults(); BOOL operator==( const SdOptionsSnap& rOpt ) const; BOOL IsSnapHelplines() const { Init(); return (BOOL) bSnapHelplines; } @@ -494,7 +489,6 @@ public: SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsZoom() {} - void SetDefaults(); BOOL operator==( const SdOptionsZoom& rOpt ) const; void GetScale( INT32& rX, INT32& rY ) const { Init(); rX = nX; rY = nY; } @@ -503,23 +497,6 @@ public: // ----------------------------------------------------------------------------- -class SdOptionsZoomItem : public SfxPoolItem -{ -public: - - SdOptionsZoomItem( USHORT nWhich); - SdOptionsZoomItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; - - void SetOptions( SdOptions* pOpts ) const; - - SdOptionsZoom& GetOptionsZoom() { return maOptionsZoom; } -private: - SdOptionsZoom maOptionsZoom; -}; - // ----------------- // - SdOptionsGrid - // ----------------- @@ -569,7 +546,6 @@ class SdOptionsGridItem : public SvxGridItem { public: - SdOptionsGridItem( USHORT nWhich ); SdOptionsGridItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); void SetOptions( SdOptions* pOpts ) const; @@ -616,9 +592,6 @@ public: SdOptionsPrint( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsPrint() {} - void SetPrinterOptions( const SdOptionsPrint* pOptions ); - - void SetDefaults(); BOOL operator==( const SdOptionsPrint& rOpt ) const; BOOL IsDraw() const { Init(); return (BOOL) bDraw; } @@ -700,7 +673,6 @@ public: SdOptions( USHORT nConfigId ); virtual ~SdOptions(); - void SetRangeDefaults( ULONG nOptionRange ); void StoreConfig( ULONG nOptionRange = SD_OPTIONS_ALL ); }; diff --git a/sd/source/ui/inc/outlinfo.hxx b/sd/source/ui/inc/outlinfo.hxx deleted file mode 100644 index 4f277c0fa320..000000000000 --- a/sd/source/ui/inc/outlinfo.hxx +++ /dev/null @@ -1,125 +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. - * - ************************************************************************/ - -#ifndef _OUTLINFO_HXX -#define _OUTLINFO_HXX - -#include <tools/gen.hxx> -#include <vcl/outdev.hxx> - -// --------------- -// - SdLaserInfo - -// --------------- - -struct OutlinerCharacter -{ - Rectangle aRect; - ULONG nPara; - Color aColor; - - // #101500# Removed CharCode, it's only used in one place to compare - // for single space character. This can be done at creation, too. - //USHORT nCharCode; - - OutlinerCharacter( const Rectangle& _rRect, ULONG _nPara, const Color& _rCol /* #101500#, USHORT _nCharCode*/ ) - : aRect( _rRect ), - nPara( _nPara ), - aColor( _rCol ) - { - } -}; - -// ----------------------------------------------------------------------------- - -struct OutlinerParagraph -{ - Rectangle aRect; - ULONG nCharCount; - - OutlinerParagraph() : nCharCount( 0 ) {} - ~OutlinerParagraph() {}; -}; - -// ---------------- -// - OutlinerInfo - -// ---------------- - -class DrawPortionInfo; -class SdDrawDocument; -class SdrRectObj; - -class OutlinerInfo -{ -private: - - List aCharacterList; - Rectangle aObjBound; - Rectangle aParaBound; - Point aTextOffset; - OutlinerParagraph* pParagraphs; - OutputDevice* mpOut; - ULONG nParaCount; - ULONG nCurPara; - long nExtraData; - BOOL bInit; - BOOL mbVertical; - - OutlinerInfo( const OutlinerInfo& ) {} - OutlinerInfo& operator=( const OutlinerInfo& ) { return *this; } - - DECL_LINK( DrawPortionHdl, DrawPortionInfo* ); - -public: - - OutlinerInfo(); - ~OutlinerInfo(); - - void Clear(); - - void SetTextObj( SdDrawDocument* pDoc, SdrRectObj* pObj, OutputDevice* _pOut ); - - const Rectangle& GetObjRect() const { return aObjBound; } - const Rectangle& GetTextRect() const { return aParaBound; } - const Point& GetTextOffset() const { return aTextOffset; } - - ULONG GetParaCount() const { return nParaCount; } - - const Rectangle& GetParaRect( const ULONG nPara ) const; - BOOL GetParaCharCount( const ULONG nPara ) const; - - ULONG GetCharacterCount() const { return aCharacterList.Count(); } - OutlinerCharacter* GetCharacter( ULONG nPos ) const { return (OutlinerCharacter*) aCharacterList.GetObject( nPos ); }; - OutlinerCharacter* GetFirstCharacter() { return (OutlinerCharacter*) aCharacterList.First(); } - OutlinerCharacter* GetNextCharacter() { return (OutlinerCharacter*) aCharacterList.Next(); } - - void SetExtraData( const long _nExtraData = 0L ) { nExtraData = _nExtraData; } - long GetExtraData() const { return nExtraData; } - - BOOL IsVertical() const { return mbVertical; } -}; - -#endif diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index 288bcfb3e359..da9bc20c02d6 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -94,7 +94,6 @@ public: ~SdPrintOptions(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 948a55d3754c..dc98929a9ed1 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -210,7 +210,6 @@ public: BOOL SelectEntry( const String& rName ); String GetSelectEntry(); List* GetSelectEntryList( USHORT nDepth ); - List* GetBookmarkList( USHORT nType ); SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL); ::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); } diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx index b4665dbe5a46..f02977234475 100644 --- a/sd/source/ui/inc/sdundogr.hxx +++ b/sd/source/ui/inc/sdundogr.hxx @@ -48,7 +48,6 @@ public: virtual void Redo(); void AddAction(SdUndoAction* pAction); - SdUndoAction* GetAction(ULONG nAction) const; ULONG Count() const { return aCtn.Count(); } }; diff --git a/sd/source/ui/inc/showview.hxx b/sd/source/ui/inc/showview.hxx deleted file mode 100644 index 748effbe1985..000000000000 --- a/sd/source/ui/inc/showview.hxx +++ /dev/null @@ -1,88 +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. - * - ************************************************************************/ - -#ifndef SD_SHOW_VIEW_HXX -#define SD_SHOW_VIEW_HXX - -#include <svx/fmview.hxx> - -class SdDrawDocument; - -namespace sd { - -class ViewShell; - -/************************************************************************* -|* -|* Beschreibung ShowView ist die View fuer die Diashow -|* -\************************************************************************/ - -class ShowView - : public FmFormView -{ -public: - // wenn waehrend des Zeichnens Plugins 'connected' - // werden sollen, muss pWWin ein Zeiger auf das Fenster - // sein, das das Plugin benutzen soll - ShowView ( - SdDrawDocument* pDoc, - OutputDevice* pOut, - ViewShell* pViewShell, - ::Window* pWin = NULL); - virtual ~ShowView (void); - - SdDrawDocument& GetDoc() const { return *pDrDoc; } - - void SetAllowInvalidate(BOOL bFlag); - BOOL IsInvalidateAllowed() const; - - void SetAllowMasterPageCaching(BOOL bAllow) - { bAllowMasterPageCaching = bAllow; } - BOOL IsMasterPageCachingAllowed() const - { return(bAllowMasterPageCaching); } - - virtual void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); - virtual void InvalidateOneWin(::Window& rWin); - virtual void InvalidateOneWin(::Window& rWin, const Rectangle& rRect); - - virtual void DoConnect(SdrOle2Obj* pOleObj); - -private: - SdDrawDocument* pDrDoc; - ViewShell* mpViewSh; - Window* pWindowForPlugIns; - USHORT nAllowInvalidateSmph; - BOOL bAllowMasterPageCaching; - -}; - -} // end of namespace sd - -#endif - - diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index bc4df5aa44f5..eda80feeb825 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -173,7 +173,6 @@ public: ShowWindow* getShowWindow(); // a.k.a. FuSlideShow::GetShowWindow() int getAnimationMode(); // a.k.a. FuSlideShow::GetAnimationMode() sal_Int32 getCurrentPageNumber(); // a.k.a. FuSlideShow::GetCurrentPage() - sal_Int32 getCurrentPageIndex(); sal_Int32 getFirstPageNumber(); sal_Int32 getLastPageNumber(); bool isEndless(); diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx index 019e06d9dd44..00a2225efbbb 100644 --- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx +++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx @@ -127,11 +127,6 @@ public: Rectangle& aRectangle, ::Window* pWindow); -protected: - /** Initiate a rearrangement of the controls. - */ - void ListHasChanged (void); - private: ::Control maScrollWindow; ScrollBar maVerticalScrollBar; diff --git a/sd/source/ui/inc/taskpane/SubToolPanel.hxx b/sd/source/ui/inc/taskpane/SubToolPanel.hxx index 9524cdddf748..2a56ee6d74dc 100644 --- a/sd/source/ui/inc/taskpane/SubToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/SubToolPanel.hxx @@ -69,19 +69,6 @@ public: SubToolPanel (TreeNode* pParent); virtual ~SubToolPanel (void); - /** Add a control to the sub panel. - @param rTitle - The title that will be shown in the two title bars that - belong to the control. - @param nHelpId - The help id is set at the title bar not the actual control. - */ - void AddControl ( - ::std::auto_ptr<TreeNode> pControl, - const String& rTitle, - ULONG nHelpId); - void AddControl (::std::auto_ptr<TreeNode> pControl); - virtual void Paint (const Rectangle& rRect); /** Initiate a rearrangement of the controls and title bars. @@ -107,11 +94,6 @@ public: ::com::sun::star::accessibility::XAccessible>& rxParent); using Window::GetWindow; -protected: - /** Initiate a rearrangement of the controls. - */ - void ListHasChanged (void); - private: ::Window maWindowFiller; bool mbIsRearrangePending; diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index 250e73124854..cd55832ec4c2 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx @@ -69,15 +69,6 @@ public: TreeNode (TreeNode* pParent); virtual ~TreeNode (void); - /** Returns <TRUE/> if the node has no children, i.e. is a leaf of a - tree. In this case mpControlContainer is NULL. - */ - bool IsLeaf (void); - - /** Returns true if the node has no parent, i.e. is the root of a tree. - */ - bool IsRoot (void); - void SetParentNode (TreeNode* pNewParent); TreeNode* GetParentNode (void); @@ -187,14 +178,6 @@ public: */ void AddStateChangeListener (const Link& rListener); - /** Remove the listener form the list of state change listeners. - @param rListener - It is OK to specify a listener that is not currently - registered. Only when the listener is registered it is - removed. Otherwise the call is ignored. - */ - void RemoveStateChangeListener (const Link& rListener); - /** Call the state change listeners and pass a state change event with the specified event id. The source field is set to this. @param pChild diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index a5a319ca5219..9dfc06e2df58 100644 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -134,13 +134,6 @@ public: virtual void SetEnabledState(bool bFlag); - /** Ownership of the given data remains with the caller. The data - is thus not destroyed when the destructor of this class is - called. - */ - void SetUserData (void* pUserData); - void* GetUserData (void) const; - virtual bool IsShowing (void) const; virtual void Show (bool bVisible); diff --git a/sd/source/ui/inc/taskpane/ToolPanel.hxx b/sd/source/ui/inc/taskpane/ToolPanel.hxx index f2c573a21c06..c3b61a5d22de 100644 --- a/sd/source/ui/inc/taskpane/ToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanel.hxx @@ -101,11 +101,6 @@ public: using Window::GetWindow; -protected: - /** Initiate a rearrangement of the controls. - */ - void ListHasChanged (void); - private: TaskPaneViewShell& mrViewShell; diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index c74253092adf..998b4f0e2142 100644 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx @@ -62,13 +62,6 @@ public: virtual void SAL_CALL disposing (void); - - /** Create an UnknownPropertyException, but do not yet throw it. This - method fills in the fields of the exception. - */ - css::beans::UnknownPropertyException CreateUnknownPropertyException ( - const rtl::OUString& rsPropertyName); - // XPropertySet virtual css::uno::Reference<css::beans::XPropertySetInfo> diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx index d86ac3cf6433..d0661a61636b 100644 --- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx +++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx @@ -92,17 +92,6 @@ public: */ void AddResource (const ::css::uno::Reference<css::uno::XInterface>& rxResource); - /** Tell the container that it is not any longer responsible for the - specified resource. - @return - When the specified resource has previously added to the - container the resource is returned (which is, of course, the - same pointer as the given one.) Otherwise a NULL pointer is - returned. - */ - ::std::auto_ptr<SdGlobalResource> ReleaseResource ( - SdGlobalResource* pResource); - protected: friend class ::SdModule; friend class ::std::auto_ptr<SdGlobalResourceContainer>; diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index 418e4dbf1766..1f45aef331ab 100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -57,13 +57,6 @@ class SlotStateListener public SlotStateListenerInterfaceBase { public: - /** Create a new object that has yet to be told about the the frame and - slots to listen to and the callback that state changes are relayed - to. When you want to listen to one single slot then you can use the - three argument variant of this constructor. - */ - SlotStateListener (void); - /** This convenience version of the constructor takes all parameters that are necessary to observe a single slot. See descriptions of the SetCallback(), ConnectToFrame(), and ObserveSlot() methods for @@ -105,14 +98,6 @@ public: */ void ObserveSlot (const ::rtl::OUString& rSlotName); - /** Return whether the called SlotStateListener is connected to a slot. - One reason for returning <FALSE/> is that the SlotStateListener has - been created before the controller and frame have been properly - initialized. - */ - bool IsValid (void) const; - - //===== frame::XStatusListener ========================================== /** Called by slot state change broadcasters. In turn the callback is diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index d07f24a2dcc2..2ee8bbe6771a 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -114,7 +114,6 @@ private: void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE ); void SetEditText( String const & rStr ); String GetEditText( BOOL bURL = FALSE ); - String GetMacroName( const String& rPath ); USHORT GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); USHORT GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); @@ -123,7 +122,6 @@ public: ~SdTPAction(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index 9cc3555dce3b..a2a80963ad63 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -97,8 +97,6 @@ public: bInfoCreated (bCreated) {} - SdAnimationPrmsUndoAction( SdDrawDocument* pTheDoc, SdrObject* pObj ); - void SetActive(BOOL bTheOldActive, BOOL bTheNewActive) { bOldActive = bTheOldActive; bNewActive = bTheNewActive; } void SetEffect(::com::sun::star::presentation::AnimationEffect eTheOldEffect, ::com::sun::star::presentation::AnimationEffect eTheNewEffect) diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index e30605181c4c..b19f3751e836 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -58,9 +58,10 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetCurrentShape() const throw(); public: - SdUnoSearchReplaceShape( ::com::sun::star::drawing::XDrawPage* xPage ) throw(); // danger, these c'tors are only usable if - SdUnoSearchReplaceShape( ::com::sun::star::drawing::XShape* xShape ) throw(); // the given shape or page is derived from - virtual ~SdUnoSearchReplaceShape() throw(); // this class!!! + // danger, this c'tor is only usable if the given shape or page is derived + // from this class!!! + SdUnoSearchReplaceShape( ::com::sun::star::drawing::XDrawPage* xPage ) throw(); + virtual ~SdUnoSearchReplaceShape() throw(); // XReplaceable virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/zoomlist.hxx b/sd/source/ui/inc/zoomlist.hxx index 1e31eaa598ac..6957bfed25ce 100644 --- a/sd/source/ui/inc/zoomlist.hxx +++ b/sd/source/ui/inc/zoomlist.hxx @@ -44,7 +44,6 @@ public: virtual ~ZoomList(); void InsertZoomRect(const Rectangle& rRect); - Rectangle GetCurrentZoomRect() const; Rectangle GetNextZoomRect(); Rectangle GetPreviousZoomRect(); BOOL IsNextPossible() const; diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 8a87a10e43d0..a1f583a4e40c 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -908,22 +908,6 @@ css::rendering::ViewState PresenterCanvas::MergeViewState ( -Reference<rendering::XCanvas> PresenterCanvas::GetSharedCanvas (void) const -{ - return mxSharedCanvas; -} - - - - -void PresenterCanvas::SetClip (const awt::Rectangle& rClipRectangle) -{ - maClipRectangle = rClipRectangle; -} - - - - awt::Point PresenterCanvas::GetOffset (const Reference<awt::XWindow>& rxBaseWindow) { mbOffsetUpdatePending = false; diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 3734f488d370..ba90a92939ca 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -113,7 +113,6 @@ public: void SetFontDescriptor (const awt::FontDescriptor& rFontDescriptor); sal_Int32 GetTop (void) const; void SetTop (const sal_Int32 nTop); - void ClearText (void); void SetText (const OUString& Text); sal_Int32 ParseDistance (const OUString& rsDistance) const; Reference<rendering::XBitmap> GetBitmap (void); @@ -533,17 +532,6 @@ void PresenterTextView::Implementation::SetTop (const sal_Int32 nTop) -void PresenterTextView::Implementation::ClearText (void) -{ - DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); - msText = OUString(); - mnTotalHeight = 0; - mxBitmap = NULL; -} - - - - void PresenterTextView::Implementation::SetText (const OUString& rText) { DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index c951f68d9b74..187d0d5ea715 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -947,13 +947,6 @@ sal_Int32 SlideShow::getCurrentPageNumber() // --------------------------------------------------------- -sal_Int32 SlideShow::getCurrentPageIndex() -{ - return mxController.is() ? mxController->getCurrentSlideIndex() : 0; -} - -// --------------------------------------------------------- - void SlideShow::jumpToBookmark( const OUString& sBookmark ) { if( mxController.is() ) diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index d58cfcb3f6c9..c2adccc82a80 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -3724,14 +3724,7 @@ Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow() throw (RuntimeExc // -------------------------------------------------------------------- -PresentationSettingsEx::PresentationSettingsEx() -: mbRehearseTimings(sal_False) -, mbPreview(sal_False) -, mpParentWindow( 0 ) -{ -} - -PresentationSettingsEx::PresentationSettingsEx( PresentationSettingsEx& r ) +PresentationSettingsEx::PresentationSettingsEx( const PresentationSettingsEx& r ) : PresentationSettings( r ) , mbRehearseTimings(r.mbRehearseTimings) , mbPreview(r.mbPreview) diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 48dca432671c..cb33c4a740c7 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -112,8 +112,7 @@ struct PresentationSettingsEx : public PresentationSettings css::uno::Reference< css::drawing::XDrawPage > mxStartPage; css::uno::Reference< css::animations::XAnimationNode > mxAnimationNode; - PresentationSettingsEx(); - PresentationSettingsEx( PresentationSettingsEx& ); + PresentationSettingsEx( const PresentationSettingsEx& ); PresentationSettingsEx( PresentationSettings& ); void SetArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments ) throw (css::lang::IllegalArgumentException); diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index 47818b73d193..1bbecbef3d66 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -178,14 +178,6 @@ void BitmapCache::Clear (void) -bool BitmapCache::IsEmpty (void) const -{ - return mpBitmapContainer->empty(); -} - - - - bool BitmapCache::IsFull (void) const { return mbIsFull; @@ -261,21 +253,6 @@ bool BitmapCache::BitmapIsUpToDate (const CacheKey& rKey) -void BitmapCache::ReleaseBitmap (const CacheKey& rKey) -{ - ::osl::MutexGuard aGuard (maMutex); - - CacheBitmapContainer::iterator aIterator (mpBitmapContainer->find(rKey)); - if (aIterator != mpBitmapContainer->end()) - { - UpdateCacheSize(aIterator->second, REMOVE); - mpBitmapContainer->erase(aIterator); - } -} - - - - void BitmapCache::InvalidateBitmap (const CacheKey& rKey) { ::osl::MutexGuard aGuard (maMutex); @@ -348,20 +325,6 @@ void BitmapCache::SetBitmap ( -bool BitmapCache::IsPrecious (const CacheKey& rKey) -{ - ::osl::MutexGuard aGuard (maMutex); - - CacheBitmapContainer::iterator aIterator (mpBitmapContainer->find(rKey)); - if (aIterator != mpBitmapContainer->end()) - return aIterator->second.IsPrecious(); - else - return false; -} - - - - void BitmapCache::SetPrecious (const CacheKey& rKey, bool bIsPrecious) { ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index d0f8766cabf5..2c33e042342f 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx @@ -81,10 +81,6 @@ public: */ void Clear (void); - /** Returns <TRUE/> when there is no preview bitmap in the cache. - */ - bool IsEmpty (void) const; - /** Return <TRUE/> when the cache is full, i.e. the cache compactor had to be run. */ @@ -108,11 +104,6 @@ public: */ ::boost::shared_ptr<BitmapEx> GetBitmap (const CacheKey& rKey); - /** Release the reference to the preview bitmap that is associated with - the given key. - */ - void ReleaseBitmap (const CacheKey& rKey); - /** Mark the specified preview bitmap as not being up-to-date anymore. */ void InvalidateBitmap (const CacheKey& rKey); @@ -128,11 +119,6 @@ public: const ::boost::shared_ptr<BitmapEx>& rpPreview, bool bIsPrecious); - /** Return whether the specified preview bitmap has been marked as - precious. - */ - bool IsPrecious (const CacheKey& rKey); - /** Mark the specified preview bitmap as precious, i.e. that it must not be compressed or otherwise removed from the cache. */ diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index 7658d1f3b663..780a429df29e 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx @@ -199,15 +199,6 @@ void GenericPageCache::RequestPreviewBitmap ( -void GenericPageCache::InvalidatePreviewBitmap (CacheKey aKey) -{ - if (mpBitmapCache.get() != NULL) - mpBitmapCache->InvalidateBitmap(mpCacheContext->GetPage(aKey)); -} - - - - void GenericPageCache::ReleasePreviewBitmap (CacheKey aKey) { if (mpBitmapCache.get() != NULL) @@ -294,17 +285,6 @@ void GenericPageCache::SetPreciousFlag (CacheKey aKey, bool bIsPrecious) -bool GenericPageCache::IsEmpty (void) const -{ - if (mpBitmapCache.get() != NULL) - return mpBitmapCache->IsEmpty(); - else - return true; -} - - - - void GenericPageCache::Pause (void) { ProvideCacheAndProcessor(); diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx index e38745e2844f..89fc657004e8 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx @@ -99,12 +99,6 @@ public: const Size& rSize, bool bMayBeUpToDate = true); - /** Tell the cache to replace the bitmap associated with the given - request data with a new one that reflects recent changes in the - content of the page object. - */ - void InvalidatePreviewBitmap (CacheKey aKey); - /** Call this method when a view-object-contact object is being deleted and does not need (a) its current bitmap in the cache and (b) a requested a new bitmap. @@ -124,10 +118,6 @@ public: */ void SetPreciousFlag (CacheKey aKey, bool bIsPrecious); - /** Return <TRUE/> when there is no preview bitmap in the cache. - */ - bool IsEmpty (void) const; - void Pause (void); void Resume (void); diff --git a/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx b/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx deleted file mode 100644 index 6df77bf52800..000000000000 --- a/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx +++ /dev/null @@ -1,66 +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 "precompiled_sd.hxx" - -#include "SlsIdleDetector.hxx" - -#include "view/SlideSorterView.hxx" -#include "tools/IdleDetection.hxx" -#include "Window.hxx" - -namespace sd { namespace slidesorter { namespace cache { - -IdleDetector::IdleDetector ( - const ::Window* pWindow, - const bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation) - : mpWindow(pWindow), - mbIsSuspendPreviewUpdatesDuringFullScreenPresentation( - bIsSuspendPreviewUpdatesDuringFullScreenPresentation) -{ -} - - - - -bool IdleDetector::operator() (void) -{ - // Determine whether the system is idle. - sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mpWindow)); - if (nIdleState == tools::IdleDetection::IDET_IDLE) - return true; - else - return false; -} - - -} } } // end of namespace ::sd::slidesorter::cache - - - diff --git a/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx b/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx deleted file mode 100644 index a0ad5422496a..000000000000 --- a/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx +++ /dev/null @@ -1,51 +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. - * - ************************************************************************/ - -#ifndef SD_SLIDESORTER_IDLE_DETECTOR_HXX -#define SD_SLIDESORTER_IDLE_DETECTOR_HXX - -class Window; - -namespace sd { namespace slidesorter { namespace cache { - -class IdleDetector -{ -public: - IdleDetector (const ::Window* pWindow, const bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation); - bool operator() (void); - -private: - const ::Window* mpWindow; - const bool mbIsSuspendPreviewUpdatesDuringFullScreenPresentation; -}; - - - - -} } } // end of namespace ::sd::slidesorter::cache - -#endif diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx index 29b7cdb687d1..714e1f008329 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx @@ -29,7 +29,6 @@ #include "SlsGenericPageCache.hxx" #include "SlsRequestFactory.hxx" -#include "SlsIdleDetector.hxx" #include "cache/SlsPageCache.hxx" #include "model/SlideSorterModel.hxx" #include <boost/bind.hpp> @@ -81,25 +80,6 @@ BitmapEx PageCache::GetPreviewBitmap ( -void PageCache::RequestPreviewBitmap ( - CacheKey aKey, - const Size& rSize) -{ - return mpImplementation->RequestPreviewBitmap(aKey, rSize); -} - - - - -void PageCache::InvalidatePreviewBitmap ( - CacheKey aKey) -{ - mpImplementation->InvalidatePreviewBitmap(aKey); -} - - - - void PageCache::ReleasePreviewBitmap ( CacheKey aKey) { diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 86354c823b7e..bec9c7fa369d 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -30,7 +30,6 @@ #include "SlsQueueProcessor.hxx" #include "SlsCacheConfiguration.hxx" #include "SlsRequestQueue.hxx" -#include "SlsIdleDetector.hxx" namespace sd { namespace slidesorter { namespace cache { diff --git a/sd/source/ui/slidesorter/cache/makefile.mk b/sd/source/ui/slidesorter/cache/makefile.mk index d9766e892992..58862a28645a 100644 --- a/sd/source/ui/slidesorter/cache/makefile.mk +++ b/sd/source/ui/slidesorter/cache/makefile.mk @@ -49,7 +49,6 @@ SLOFILES = \ $(SLO)$/SlsCacheCompactor.obj \ $(SLO)$/SlsCacheConfiguration.obj \ $(SLO)$/SlsGenericPageCache.obj \ - $(SLO)$/SlsIdleDetector.obj \ $(SLO)$/SlsPageCache.obj \ $(SLO)$/SlsPageCacheManager.obj \ $(SLO)$/SlsQueueProcessor.obj \ diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index d90f6f0f824f..69c2a02ddc24 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -210,14 +210,6 @@ SlideSorterController::~SlideSorterController (void) -SlideSorter& SlideSorterController::GetSlideSorter (void) const -{ - return mrSlideSorter; -} - - - - model::SharedPageDescriptor SlideSorterController::GetPageAt ( const Point& aPixelPosition) { @@ -229,23 +221,6 @@ model::SharedPageDescriptor SlideSorterController::GetPageAt ( return pDescriptorAtPoint; } - - - -model::SharedPageDescriptor SlideSorterController::GetFadePageAt ( - const Point& aPixelPosition) -{ - sal_Int32 nHitPageIndex (mrView.GetFadePageIndexAtPoint(aPixelPosition)); - model::SharedPageDescriptor pDescriptorAtPoint; - if (nHitPageIndex >= 0) - pDescriptorAtPoint = mrModel.GetPageDescriptor(nHitPageIndex); - - return pDescriptorAtPoint; -} - - - - PageSelector& SlideSorterController::GetPageSelector (void) { OSL_ASSERT(mpPageSelector.get()!=NULL); @@ -800,50 +775,6 @@ Rectangle SlideSorterController::Rearrange (bool bForce) -void SlideSorterController::SetZoom (long int nZoom) -{ - ::sd::Window* pWindow = mrSlideSorter.GetActiveWindow(); - long int nCurrentZoom ((long int)( - pWindow->GetMapMode().GetScaleX().operator double() * 100)); - - if (nZoom > nCurrentZoom) - { - Size aPageSize (mrView.GetPageBoundingBox( - 0, - view::SlideSorterView::CS_MODEL, - view::SlideSorterView::BBT_SHAPE).GetSize()); - Size aWindowSize (pWindow->PixelToLogic( - pWindow->GetOutputSizePixel())); - - // The zoom factor must not grow by more then the ratio of the - // widths of the output window and the page objects. - long nMaxFactor - = nCurrentZoom * aWindowSize.Width() / aPageSize.Width(); - // Apply rounding, so that a current zoom factor of 1 is still - // increased. - nMaxFactor = (nCurrentZoom * 18 + 5) / 10; - nZoom = Min(nMaxFactor, nZoom); - } - if (nZoom < 1) - nZoom = 1; - - mrView.LockRedraw (TRUE); - mrView.GetLayouter().SetZoom(nZoom/100.0, pWindow); - mrView.Layout(); - GetScrollBarManager().UpdateScrollBars (false); - mrView.GetPreviewCache()->InvalidateCache(); - mrView.RequestRepaint(); - mrView.LockRedraw (FALSE); - - /* - ViewShell::SetZoom (nZoom); - GetViewFrame()->GetBindings().Invalidate (SID_ATTR_ZOOM); - */ -} - - - - FunctionReference SlideSorterController::CreateSelectionFunction (SfxRequest& rRequest) { FunctionReference xFunc( SelectionFunction::Create(mrSlideSorter, rRequest) ); diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index 5fdee6400959..f5864c3307a1 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -253,19 +253,4 @@ void CurrentSlideManager::HandleModelChange (void) } } - - - -SdPage* GetCurrentSdPage (SlideSorter& rSlideSorter) -{ - SharedPageDescriptor pDescriptor ( - rSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()); - if (pDescriptor.get() == NULL) - return NULL; - else - return pDescriptor->GetPage(); -} - - - } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index b50be47a0188..0e8f5e100d1c 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -177,17 +177,6 @@ void PageSelector::DeselectPage (int nPageIndex) -void PageSelector::DeselectPage (const SdPage* pPage) -{ - int nPageIndex = (pPage->GetPageNum()-1) / 2; - SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nPageIndex)); - if (pDescriptor.get()!=NULL && pDescriptor->GetPage()==pPage) - DeselectPage(pDescriptor); -} - - - - void PageSelector::DeselectPage (const SharedPageDescriptor& rpDescriptor) { if (rpDescriptor.get()!=NULL && rpDescriptor->Deselect()) diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index b928eeb9f4ce..5ee7f6f58b82 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -219,26 +219,6 @@ void ScrollBarManager::PlaceFiller (const Rectangle& aArea) -void ScrollBarManager::AdaptWindowSize (const Rectangle& rArea) -{ - Size aPixelContentSize (mpContentWindow->LogicToPixel( - mrSlideSorter.GetView().GetLayouter().GetPageBox ( - mrSlideSorter.GetModel().GetPageCount()).GetSize())); - int nHeightDifference = aPixelContentSize.Height() - rArea.GetHeight(); - ::Window* pParentWindow = mpContentWindow->GetParent(); - Size aNewWindowSize (pParentWindow->GetSizePixel()); - if (nHeightDifference != 0) - { - aNewWindowSize.Height() += nHeightDifference; - pParentWindow->SetPosSizePixel( - pParentWindow->GetPosPixel(), - aNewWindowSize); - } -} - - - - void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScrolling) { Rectangle aModelArea (mrSlideSorter.GetView().GetModelArea()); diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx index d24f8a347646..687019954feb 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx @@ -54,18 +54,6 @@ SelectionCommand::SelectionCommand ( -void SelectionCommand::AddSlides ( - const ::boost::shared_ptr<PageSelector::PageSelection>& rpSelection) -{ - PageSelector::PageSelection::iterator iPage = rpSelection->begin(); - PageSelector::PageSelection::iterator iEnd = rpSelection->end(); - for (; iPage!=iEnd; ++iPage) - AddSlide(((*iPage)->GetPageNum()-1)/2); -} - - - - void SelectionCommand::AddSlide (USHORT nPageIndex) { maPagesToSelect.push_back(nPageIndex); @@ -74,14 +62,6 @@ void SelectionCommand::AddSlide (USHORT nPageIndex) -void SelectionCommand::SetCurrentSlide (USHORT nPageIndex) -{ - mnCurrentPageIndex = nPageIndex; -} - - - - void SelectionCommand::operator() (void) { OSL_ASSERT(mpCurrentSlideManager.get()!=NULL); diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx index 88ce0ea29b75..7a9d0f27369e 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx @@ -64,24 +64,11 @@ public: const ::boost::shared_ptr<controller::CurrentSlideManager>& rpCurrentSlideManager, const model::SlideSorterModel& rModel); - /** Add the pages in the given list of selected pages to those that will - be selected when this command is executed, i.e. its operator() - method is called. - The first page will be set as current page when the new current page - has not been specified previously. - */ - void AddSlides (const ::boost::shared_ptr<PageSelector::PageSelection>& rpSelection); - /** Remember the specified page to be selected when this command is executed. */ void AddSlide (USHORT nPageIndex); - /** Call this method to explicitly set the page that will be made the - current page when this command is executed. - */ - void SetCurrentSlide (USHORT nPageIndex); - /** Execute the command and select the pages added by previous calls to AddPages() and AddPage(). */ diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 710e7c2eb02d..c1d742ce7158 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -47,7 +47,6 @@ #include "view/SlsLayouter.hxx" #include "view/SlsPageObjectViewObjectContact.hxx" #include "framework/FrameworkHelper.hxx" -#include "showview.hxx" #include "ViewShellBase.hxx" #include "DrawController.hxx" #include <vcl/sound.hxx> @@ -136,26 +135,6 @@ private: }; -class SelectionFunction::InsertionIndicatorHandler -{ -public: - InsertionIndicatorHandler (SlideSorter& rSlideSorter); - ~InsertionIndicatorHandler (void); - - /** Show the insertion marker at the given coordinates. - */ - void Start (const Point& rMouseModelPosition); - - void UpdatePosition (const Point& rMouseModelPosition); - - /** Hide the insertion marker. - */ - void End (void); - -private: - SlideSorter& mrSlideSorter; -}; - class SelectionFunction::EventDescriptor { public: @@ -188,8 +167,7 @@ SelectionFunction::SelectionFunction ( mbDragSelection(false), maInsertionMarkerBox(), mbProcessingMouseButtonDown(false), - mpSubstitutionHandler(new SubstitutionHandler(mrSlideSorter)), - mpInsertionIndicatorHandler(new InsertionIndicatorHandler(mrSlideSorter)) + mpSubstitutionHandler(new SubstitutionHandler(mrSlideSorter)) { //af aDelayToScrollTimer.SetTimeout(50); aDragTimer.SetTimeoutHdl( LINK( this, SelectionFunction, DragSlideHdl ) ); @@ -710,20 +688,6 @@ void SelectionFunction::GotoNextPage (int nOffset) -void SelectionFunction::ClearOverlays (void) -{ - view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay()); - - rOverlay.GetSubstitutionOverlay().setVisible(false); - rOverlay.GetSubstitutionOverlay().Clear(); - - mpInsertionIndicatorHandler->End(); - rOverlay.GetMouseOverIndicatorOverlay().SetSlideUnderMouse(model::SharedPageDescriptor()); -} - - - - void SelectionFunction::ProcessMouseEvent (sal_uInt32 nEventType, const MouseEvent& rEvent) { // #95491# remember button state for creation of own MouseEvents @@ -1350,55 +1314,4 @@ bool SelectionFunction::SubstitutionHandler::IsSubstitutionInsertionNonTrivial ( return bIsNonTrivial; } - - - -//===== InsertionIndicatorHandler ============================================= - -SelectionFunction::InsertionIndicatorHandler::InsertionIndicatorHandler ( - SlideSorter& rSlideSorter) - : mrSlideSorter(rSlideSorter) -{ -} - - - - -SelectionFunction::InsertionIndicatorHandler::~InsertionIndicatorHandler (void) -{ -} - - - - -void SelectionFunction::InsertionIndicatorHandler::Start (const Point& rMouseModelPosition) -{ - if (mrSlideSorter.GetController().GetProperties()->IsUIReadOnly()) - return; - - view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay()); - rOverlay.GetInsertionIndicatorOverlay().SetPosition(rMouseModelPosition); - rOverlay.GetInsertionIndicatorOverlay().setVisible(true); -} - - - - -void SelectionFunction::InsertionIndicatorHandler::UpdatePosition (const Point& rMouseModelPosition) -{ - if (mrSlideSorter.GetController().GetProperties()->IsUIReadOnly()) - return; - - view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay()); - rOverlay.GetInsertionIndicatorOverlay().SetPosition(rMouseModelPosition); -} - - - - -void SelectionFunction::InsertionIndicatorHandler::End (void) -{ - mrSlideSorter.GetView().GetOverlay().GetInsertionIndicatorOverlay().setVisible(false); -} - } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx index 1b70cb1e154e..7fe090ad5541 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx @@ -53,12 +53,6 @@ SlideFunction::SlideFunction ( { } -FunctionReference SlideFunction::Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ) -{ - FunctionReference xFunc( new SlideFunction( rSlideSorter, rRequest ) ); - return xFunc; -} - void SlideFunction::ScrollStart (void) { } diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 126a599c21d3..e07e2d2cccaf 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -483,68 +483,6 @@ void SlotManager::GetAttrState (SfxItemSet& rSet) } } - - - -void SlotManager::GetCtrlState (SfxItemSet& rSet) -{ - if (rSet.GetItemState(SID_RELOAD) != SFX_ITEM_UNKNOWN) - { - // "Letzte Version" vom SFx en/disablen lassen - ViewShell* pShell = mrSlideSorter.GetViewShell(); - if (pShell != NULL) - { - SfxViewFrame* pSlideViewFrame = pShell->GetViewFrame(); - DBG_ASSERT(pSlideViewFrame!=NULL, - "SlideSorterController::GetCtrlState: ViewFrame not found"); - pSlideViewFrame->GetSlotState (SID_RELOAD, NULL, &rSet); - } - } - - // Output quality. - if (rSet.GetItemState(SID_OUTPUT_QUALITY_COLOR)==SFX_ITEM_AVAILABLE - ||rSet.GetItemState(SID_OUTPUT_QUALITY_GRAYSCALE)==SFX_ITEM_AVAILABLE - ||rSet.GetItemState(SID_OUTPUT_QUALITY_BLACKWHITE)==SFX_ITEM_AVAILABLE - ||rSet.GetItemState(SID_OUTPUT_QUALITY_CONTRAST)==SFX_ITEM_AVAILABLE) - { - ULONG nMode = mrSlideSorter.GetView().GetWindow()->GetDrawMode(); - UINT16 nQuality = 0; - - switch (nMode) - { - case ::sd::ViewShell::OUTPUT_DRAWMODE_COLOR: - nQuality = 0; - break; - case ::sd::ViewShell::OUTPUT_DRAWMODE_GRAYSCALE: - nQuality = 1; - break; - case ::sd::ViewShell::OUTPUT_DRAWMODE_BLACKWHITE: - nQuality = 2; - break; - case ::sd::ViewShell::OUTPUT_DRAWMODE_CONTRAST: - nQuality = 3; - break; - } - - rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_COLOR, - (BOOL)(nQuality==0))); - rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_GRAYSCALE, - (BOOL)(nQuality==1))); - rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_BLACKWHITE, - (BOOL)(nQuality==2))); - rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_CONTRAST, - (BOOL)(nQuality==3))); - } - - if (rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) == SFX_ITEM_AVAILABLE) - { - rSet.Put (SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, TRUE)); - } -} - - - - void SlotManager::GetMenuState ( SfxItemSet& rSet) { EditMode eEditMode = mrSlideSorter.GetModel().GetEditMode(); @@ -1160,38 +1098,6 @@ void SlotManager::InsertSlide (SfxRequest& rRequest) mrSlideSorter.GetView().LockRedraw(FALSE); } - - - -void SlotManager::AssignTransitionEffect (void) -{ - model::SlideSorterModel& rModel (mrSlideSorter.GetModel()); - - // We have to manually select the pages in the document that are - // selected in the slide sorter. - rModel.SynchronizeDocumentSelection(); - - // #i34011#: Needs review, AF's bugfix is removed here - //rShell.AssignFromSlideChangeWindow(rModel.GetEditMode()); - - // We have to remove the selection of master pages to not confuse the - // model. - if (rModel.GetEditMode() == EM_MASTERPAGE) - { - SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument(); - USHORT nMasterPageCount = pDocument->GetMasterSdPageCount(PK_STANDARD); - for (USHORT nIndex=0; nIndex<nMasterPageCount; nIndex++) - { - SdPage* pPage = pDocument->GetMasterSdPage(nIndex, PK_STANDARD); - if (pPage != NULL) - pPage->SetSelected (FALSE); - } - } -} - - - - void SlotManager::ExecuteCommandAsynchronously (::std::auto_ptr<Command> pCommand) { // Ownership of command is (implicitely) transferred to the queue. diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx index 9a3256a07d86..4a5c2b51ac28 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx @@ -68,18 +68,11 @@ class RequestData; bitmaps and throw.</li> </p> - <p>There are three somewhat similar methods for requesting new previews: - a) GetPreviewBitmap() schedules a re-rendering (when necessary) and + <p>There is another somewhat similar methods for requesting new previews: + GetPreviewBitmap() schedules a re-rendering (when necessary) and returns the preview what is currently available, either as a preview of the preview or, when nothing has changed since the last call, as the final thing. - b) RequestPreviewBitmap() schedules, like GetPreviewBitmap(), a - re-rendering when the currently available preview is not up-to-date. It - does not, however, return anything. Use this if you can wait for the - preview. - c) InvalidatePreviewBitmap() does not schedule a re-rendering, but - remembers that one is necessary when one of the other two methods is - called. </p> */ class PageCache @@ -120,24 +113,6 @@ public: CacheKey aKey, const Size& rSize); - /** When the requested preview bitmap does not yet exist or is not - up-to-date then the rendering of one is scheduled. Otherwise this - method does nothing. - */ - void RequestPreviewBitmap ( - CacheKey aKey, - const Size& rSize); - - /** Tell the cache that the bitmap associated with the given request - data is not up-to-date anymore. Unlike the RequestPreviewBitmap() - method this does not trigger the rendering itself. It just - remembers to render it when the preview is requested the next time. - @param rRequestData - It is safe to pass a (barly) living object. It will called only - once to obtain its page object. - */ - void InvalidatePreviewBitmap (CacheKey aKey); - /** Call this method when a view-object-contact object is being deleted and does not need (a) its current bitmap in the cache and (b) a requested new bitmap. diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index af90b60932b9..667aa768ee8f 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -105,8 +105,6 @@ public: */ Rectangle Rearrange (bool bForce = false); - SlideSorter& GetSlideSorter (void) const; - /** Return the descriptor of the page that is rendered under the given position. @return @@ -116,14 +114,6 @@ public: */ model::SharedPageDescriptor GetPageAt (const Point& rPixelPosition); - /** Return the descriptor of the page that is associated to the page - visible fade symbol at the given position. - @return - When the given position is not over a visible page fade symbol - then NULL is returned. - */ - model::SharedPageDescriptor GetFadePageAt (const Point& rPixelPosition); - PageSelector& GetPageSelector (void); FocusManager& GetFocusManager (void); controller::Clipboard& GetClipboard (void); @@ -189,14 +179,6 @@ public: */ void UpdateAllPages (void); - /** Set the zoom factor. The given value is clipped against an upper - bound. - @param nZoom - An integer percent value, i.e. nZoom/100 is the actual zoom - factor. - */ - void SetZoom (long int nZoom); - /** This factory method creates a selection function. */ virtual FunctionReference CreateSelectionFunction (SfxRequest& rRequest); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index 24420160b8cd..57aaf9293301 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -91,7 +91,6 @@ public: /** Deselect the descriptor that is associated with the given page. */ void DeselectPage (int nPageIndex); - void DeselectPage (const SdPage* pPage); void DeselectPage (const model::SharedPageDescriptor& rpDescriptor); /** This convenience method returns the same number of pages that diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index 9d4c5a9329e2..c93ed7708650 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -242,13 +242,6 @@ private: void PlaceHorizontalScrollBar (const Rectangle& aArea); void PlaceVerticalScrollBar (const Rectangle& aArea); void PlaceFiller (const Rectangle& aArea); - - /** Make the height of the content window larger or smaller, so that the - - content size fits exactly in. This is achieved by changing the size - of the parent window and rely on the resulting resize. - */ - void AdaptWindowSize (const Rectangle& rArea); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index ef2bcd7b5617..79b8a1ff5d44 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -99,7 +99,6 @@ protected: private: class SubstitutionHandler; class EventDescriptor; - class InsertionIndicatorHandler; /// Set in MouseButtonDown this flag indicates that a page has been hit. bool mbPageHit; @@ -121,8 +120,6 @@ private: ::std::auto_ptr<SubstitutionHandler> mpSubstitutionHandler; - ::std::auto_ptr<InsertionIndicatorHandler> mpInsertionIndicatorHandler; - DECL_LINK( DragSlideHdl, Timer* ); void StartDrag (void); @@ -182,11 +179,6 @@ private: */ void ProcessRectangleSelection (bool bToggleSelection); - /** Hide and clear the insertion indiciator, substitution display and - selection rectangle. - */ - void ClearOverlays (void); - /** Compute a numerical code that describes a mouse event and that can be used for fast look up of the appropriate reaction. */ diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx index 843e6e82b45c..5b8c7d9a08b6 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx @@ -50,8 +50,6 @@ class SlideFunction public: TYPEINFO(); - static FunctionReference Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ); - virtual BOOL MouseMove (const MouseEvent& rMEvt); virtual BOOL MouseButtonUp (const MouseEvent& rMEvt); virtual BOOL MouseButtonDown (const MouseEvent& rMEvt); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index d7b7a0e06831..0e58d5d3b411 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -63,7 +63,6 @@ public: void FuTemporary (SfxRequest& rRequest); void FuPermanent (SfxRequest& rRequest); void FuSupport (SfxRequest& rRequest); - void GetCtrlState (SfxItemSet &rSet); void GetMenuState (SfxItemSet &rSet); void GetClipboardState (SfxItemSet &rSet); void GetStatusBarState (SfxItemSet& rSet); @@ -94,8 +93,6 @@ private: */ void InsertSlide (SfxRequest& rRequest); - void AssignTransitionEffect (void); - DECL_LINK(UserEventCallback, void*); }; diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index 42bc6c2140f7..4ade19087304 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -83,9 +83,6 @@ public: */ bool SetEditMode (EditMode eEditMode); - /** Set the edit mode to that currently used by the controller. - */ - bool SetEditModeFromController (void); EditMode GetEditMode (void) const; PageKind GetPageType (void) const; @@ -147,10 +144,6 @@ public: */ void SynchronizeDocumentSelection (void); - /** Set the selection of the called model to exactly that of the document. - */ - void SynchronizeModelSelection (void); - /** Replace the factory for the creation of the page objects and contacts with the given object. The old factory is destroyed. */ diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 0854ad5e678a..81877ce7465c 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -100,13 +100,6 @@ public: */ css::uno::Reference<css::drawing::XDrawPage> GetXDrawPage (void) const; - /** Returns the index of the page as it is displayed in the view as page - number. The value may differ from the index returned by the - XDrawPage when there are hidden slides and the XIndexAccess used to - access the model filters them out. - */ - sal_Int32 GetPageIndex (void) const; - /** Return the page shape that is used for visualizing the page. */ view::PageObject* GetPageObject (void); @@ -176,10 +169,6 @@ public: void SetPageNumberAreaModelSize (const Size& rSize); Size GetPageNumberAreaModelSize (void) const; - /** Returns <TRUE/> when the slide is the current slide. - */ - bool IsCurrentPage (void) const; - /** Set or revoke the state of this slide being the current slide. */ void SetIsCurrentPage (const bool bIsCurrent); diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index d5c8dd4bf241..6c16a154ecfd 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -134,7 +134,6 @@ public: given position. */ sal_Int32 GetPageIndexAtPoint (const Point& rPosition) const; - sal_Int32 GetFadePageIndexAtPoint (const Point& rPosition) const; view::Layouter& GetLayouter (void); @@ -206,8 +205,6 @@ public: */ void SetSelectionRectangleVisibility (bool bVisible); - ::sdr::contact::ObjectContact& GetObjectContact (void) const; - typedef ::std::pair<sal_Int32,sal_Int32> PageRange; /** Return the range of currently visible page objects including the first and last one in that range. @@ -217,16 +214,6 @@ public: */ PageRange GetVisiblePageRange (void); - /** Return the size of the area where the page numbers are displayed. - @return - The returned size is given in model coordinates. - */ - Size GetPageNumberAreaModelSize (void) const; - - /** Return the size of the border around the original SdrPageObj. - */ - SvBorder GetModelBorder (void) const; - /** Add a shape to the page. Typically used from inside PostModelChange(). */ diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index 246dcbc05ee7..9b1fd996e9c0 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -69,14 +69,6 @@ public: Layouter (void); ~Layouter (void); - /** Set the minimal, the maximal, and the desired width of the page - objects. The three parameters have to fullfill the constraint - nMinimalWidth <= nPreferredWidth <= nMaximalWidth or the call is - ignored. - */ - void SetObjectWidth (sal_Int32 nMinimalWidth, sal_Int32 nMaximalWidth, - sal_Int32 nPreferredWidth); - /** Set the horizontal and vertical borders in pixel coordinates between the enclosing window and page objects. The borders may be painted larger then the given values when the space for the insertion marker @@ -114,13 +106,6 @@ public: void SetPageBorders (sal_Int32 nLeftBorder, sal_Int32 nRightBorder, sal_Int32 nTopBorder, sal_Int32 nBottomBorder); - /** Set the horizontal and vertical gaps between adjacent page objects. - These gaps are only relevant when there is more than one column or - more than one row. Negative values indicate that the respective gap - is not set. - */ - void SetGaps (sal_Int32 nHorizontalGap, sal_Int32 nVerticalGap); - /** Set the interval of valid column counts. When nMinimalColumnCount <= nMaximalColumnCount is not fullfilled then the call is ignored. @param nMinimalColumnCount @@ -160,19 +145,12 @@ public: /** Change the zoom factor. This does not change the general layout (number of columns). */ - void SetZoom (double nZoomFactor, OutputDevice* pDevice); void SetZoom (Fraction nZoomFactor, OutputDevice* pDevice); /** Return the number of columns. */ sal_Int32 GetColumnCount (void) const; - /** Returns whether the column count is fixed (<TRUE/>) or variable - (<FALSE/>). It is fixed if SetColumnCount() was called with the - same value for minimal and maximal column count. - */ - bool IsColumnCountFixed (void) const; - /** Return the scale factor that can be set at the map mode of the output window. */ @@ -289,7 +267,6 @@ public: const DoublePoint&rLayouterPoint) const; typedef ::std::vector<Rectangle> BackgroundRectangleList; - const BackgroundRectangleList& GetBackgroundRectangleList (void) const; private: class ScreenAndModelValue {public: diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx index c0083ff92d73..31899d3b3e44 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx @@ -69,8 +69,6 @@ public: SdrPageObj& GetPageObject (void) const; - Rectangle GetPageObjectBoundingBox (void) const; - virtual void ActionChanged (void); protected: diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index be298856c066..5ba5344f137a 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -119,30 +119,6 @@ bool SlideSorterModel::SetEditMode (EditMode eEditMode) -bool SlideSorterModel::SetEditModeFromController (void) -{ - bool bIsMasterPageMode = false; - // Get the edit mode from the controller. - try - { - Reference<beans::XPropertySet> xSet (mrSlideSorter.GetXController(), UNO_QUERY_THROW); - Any aValue (xSet->getPropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsMasterPageMode")))); - aValue >>= bIsMasterPageMode; - } - catch (RuntimeException&) - { - // When the property is not supported then the master - // page mode is not supported, too. - bIsMasterPageMode = false; - } - - return SetEditMode(bIsMasterPageMode ? EM_MASTERPAGE : EM_PAGE); -} - - - - EditMode SlideSorterModel::GetEditMode (void) const { return meEditMode; @@ -313,27 +289,6 @@ void SlideSorterModel::SynchronizeDocumentSelection (void) } } - - - -void SlideSorterModel::SynchronizeModelSelection (void) -{ - ::osl::MutexGuard aGuard (maMutex); - - PageEnumeration aAllPages (PageEnumerationProvider::CreateAllPagesEnumeration(*this)); - while (aAllPages.HasMoreElements()) - { - SharedPageDescriptor pDescriptor (aAllPages.GetNextElement()); - if (pDescriptor->GetPage()->IsSelected()) - pDescriptor->Select (); - else - pDescriptor->Deselect (); - } -} - - - - void SlideSorterModel::SetPageObjectFactory( ::std::auto_ptr<controller::PageObjectFactory> pPageObjectFactory) { diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index 2010d313c9dd..ffd93cbf0a13 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -92,14 +92,6 @@ Reference<drawing::XDrawPage> PageDescriptor::GetXDrawPage (void) const -sal_Int32 PageDescriptor::GetPageIndex (void) const -{ - return mnIndex; -} - - - - view::PageObject* PageDescriptor::GetPageObject (void) { if (mpPageObject==NULL && mpPageObjectFactory!=NULL && mpPage != NULL) @@ -279,14 +271,6 @@ Size PageDescriptor::GetPageNumberAreaModelSize (void) const -bool PageDescriptor::IsCurrentPage (void) const -{ - return mbIsCurrent; -} - - - - void PageDescriptor::SetIsCurrentPage (const bool bIsCurrent) { mbIsCurrent = bIsCurrent; diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index db5d948b52fc..787086b4596e 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -631,18 +631,6 @@ void SlideSorterService::Resize (void) -void SlideSorterService::Rearrange (void) -{ - if (mxParentWindow.is()) - { - awt::Rectangle aWindowBox = mxParentWindow->getPosSize(); - mpSlideSorter->GetController().Rearrange(); - } -} - - - - void SlideSorterService::ThrowIfDisposed (void) throw (::com::sun::star::lang::DisposedException) { diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index a502442ab9f2..9af239c64fd1 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx @@ -204,7 +204,6 @@ private: ::boost::scoped_ptr<cppu::IPropertyArrayHelper> mpPropertyArrayHelper; void Resize (void); - void Rearrange (void); /** This method throws a DisposedException when the object has already been disposed. diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 83475948fab2..86ec4002cd02 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -327,22 +327,6 @@ SfxUndoManager* SlideSorterViewShell::ImpGetUndoManager (void) const -SfxShell* SlideSorterViewShell::CreateInstance ( - sal_Int32, - SfxShell*, - void* pUserData, - ViewShellBase& rBase) -{ - return new SlideSorterViewShell ( - rBase.GetViewFrame(), - rBase, - static_cast< ::Window*>(pUserData), - NULL); -} - - - - void SlideSorterViewShell::GetFocus (void) { OSL_ASSERT(mpSlideSorter.get()!=NULL); diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 82aac5b2cd9e..47ce907be637 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -171,52 +171,6 @@ sal_Int32 SlideSorterView::GetPageIndexAtPoint (const Point& rPosition) const -sal_Int32 SlideSorterView::GetFadePageIndexAtPoint ( - const Point& rPosition) const -{ - sal_Int32 nIndex (-1); - - ::sd::Window* pWindow = GetWindow(); - if (pWindow != NULL) - { - Point aModelPosition (pWindow->PixelToLogic (rPosition)); - nIndex = mpLayouter->GetIndexAtPoint( - aModelPosition, - true // Include page borders into hit test - ); - - // Clip the page index against the page count. - if (nIndex >= mrModel.GetPageCount()) - nIndex = -1; - - if (nIndex >= 0) - { - // Now test whether the given position is inside the area of the - // fade effect indicator. - view::PageObjectViewObjectContact* pContact - = mrModel.GetPageDescriptor(nIndex)->GetViewObjectContact(); - if (pContact != NULL) - { - if ( ! pContact->GetBoundingBox( - *pWindow, - PageObjectViewObjectContact::FadeEffectIndicatorBoundingBox, - PageObjectViewObjectContact::ModelCoordinateSystem).IsInside ( - aModelPosition)) - { - nIndex = -1; - } - } - else - nIndex = -1; - } - } - - return nIndex; -} - - - - Layouter& SlideSorterView::GetLayouter (void) { return *mpLayouter.get(); @@ -725,14 +679,6 @@ ViewOverlay& SlideSorterView::GetOverlay (void) -::sdr::contact::ObjectContact& SlideSorterView::GetObjectContact (void) const -{ - return GetSdrPageView()->GetPageWindow(0)->GetObjectContact(); -} - - - - SlideSorterView::PageRange SlideSorterView::GetVisiblePageRange (void) { const int nMaxPageIndex (mrModel.GetPageCount() - 1); @@ -821,22 +767,6 @@ void SlideSorterView::UpdatePageBorders (void) -Size SlideSorterView::GetPageNumberAreaModelSize (void) const -{ - return maPageNumberAreaModelSize; -} - - - - -SvBorder SlideSorterView::GetModelBorder (void) const -{ - return maModelBorder; -} - - - - void SlideSorterView::AddSdrObject (SdrObject& rObject) { mpPage->InsertObject(&rObject); diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index 1ba44caa24b0..3767a655c48b 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -71,22 +71,6 @@ Layouter::~Layouter (void) } -void Layouter::SetObjectWidth ( - sal_Int32 nMinimalWidth, - sal_Int32 nMaximalWidth, - sal_Int32 nPreferredWidth) -{ - if (nMinimalWidth <= nPreferredWidth && nPreferredWidth <= nMaximalWidth) - { - mnMinimalWidth = nMinimalWidth; - mnPreferredWidth = nMaximalWidth; - mnMaximalWidth = nPreferredWidth; - } -} - - - - void Layouter::SetBorders ( sal_Int32 nLeftBorder, sal_Int32 nRightBorder, @@ -125,20 +109,6 @@ void Layouter::SetPageBorders ( -void Layouter::SetGaps ( - sal_Int32 nHorizontalGap, - sal_Int32 nVerticalGap) -{ - if (nHorizontalGap >= 0) - mnHorizontalGap.mnScreen = nHorizontalGap; - if (nVerticalGap >= 0) - mnVerticalGap.mnScreen = nVerticalGap; -} - - - - - void Layouter::SetColumnCount ( sal_Int32 nMinimalColumnCount, sal_Int32 nMaximalColumnCount) @@ -337,14 +307,6 @@ bool Layouter::RearrangeVertical ( -void Layouter::SetZoom (double nZoomFactor, OutputDevice* pDevice) -{ - SetZoom(Fraction(nZoomFactor), pDevice); -} - - - - void Layouter::SetZoom (Fraction nZoomFactor, OutputDevice* pDevice) { MapMode aMapMode (pDevice->GetMapMode()); @@ -406,14 +368,6 @@ sal_Int32 Layouter::GetColumnCount (void) const -bool Layouter::IsColumnCountFixed (void) const -{ - return mnMinimalColumnCount == mnMaximalColumnCount; -} - - - - Size Layouter::GetPageObjectSize (void) const { return maPageObjectModelSize; @@ -801,13 +755,4 @@ sal_Int32 Layouter::ResolvePositionInGap ( -const Layouter::BackgroundRectangleList& - Layouter::GetBackgroundRectangleList (void) const -{ - return maBackgroundRectangleList; -} - - - - } } } // end of namespace ::sd::slidesorter::namespace diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx index 5ef90ad2830b..303e78eeff61 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx @@ -93,21 +93,6 @@ void PageObjectViewContact::ActionChanged (void) ViewContactOfPageObj::ActionChanged(); } -Rectangle PageObjectViewContact::GetPageObjectBoundingBox (void) const -{ - // use model data directly here - OSL_ASSERT(mpDescriptor.get()!=NULL); - Rectangle aRetval(GetPageObject().GetLastBoundRect()); - const SvBorder aPageDescriptorBorder(mpDescriptor->GetModelBorder()); - - aRetval.Left() -= aPageDescriptorBorder.Left(); - aRetval.Top() -= aPageDescriptorBorder.Top(); - aRetval.Right() += aPageDescriptorBorder.Right(); - aRetval.Bottom() += aPageDescriptorBorder.Bottom(); - - return aRetval; -} - SdrPageObj& PageObjectViewContact::GetPageObject (void) const { return ViewContactOfPageObj::GetPageObj(); diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index 8f259e2a8c0f..92cbfe8f04d2 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx @@ -626,7 +626,6 @@ private: // private helpers const BitmapEx& getFadeEffectIconBitmap() const; - const BitmapEx& getCommentsIconBitmap() const; protected: // method which is to be used to implement the local decomposition of a 2D primitive. @@ -684,21 +683,6 @@ const BitmapEx& SdPageObjectFadeNameNumberPrimitive::getFadeEffectIconBitmap() c const sal_Int32 SdPageObjectFadeNameNumberPrimitive::mnCommentsIndicatorOffset(9); BitmapEx* SdPageObjectFadeNameNumberPrimitive::mpCommentsIconBitmap = 0; -const BitmapEx& SdPageObjectFadeNameNumberPrimitive::getCommentsIconBitmap() const -{ - if(mpCommentsIconBitmap == NULL) - { - // prepare CommentsIconBitmap on demand - const sal_uInt16 nIconId(Application::GetSettings().GetStyleSettings().GetHighContrastMode() - ? BMP_COMMENTS_INDICATOR_H - : BMP_COMMENTS_INDICATOR); - const BitmapEx aCommentsIconBitmap(IconCache::Instance().GetIcon(nIconId).GetBitmapEx()); - const_cast< SdPageObjectFadeNameNumberPrimitive* >(this)->mpCommentsIconBitmap = new BitmapEx(aCommentsIconBitmap); - } - - return *mpCommentsIconBitmap; -} - Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { const xub_StrLen nTextLength(getPageName().Len()); diff --git a/sd/source/ui/toolpanel/EmptyWindow.cxx b/sd/source/ui/toolpanel/EmptyWindow.cxx deleted file mode 100644 index 2e964fa4e30b..000000000000 --- a/sd/source/ui/toolpanel/EmptyWindow.cxx +++ /dev/null @@ -1,96 +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 "EmptyWindow.hxx" - -namespace sd { namespace toolpanel { - - -EmptyWindow::EmptyWindow ( - Window* pParentWindow, - Color aBackgroundColor, - const String& rText) - : Window (pParentWindow, WinBits()), - msText (rText) -{ - SetBackground (aBackgroundColor); -} - - - - -EmptyWindow::~EmptyWindow (void) -{ -} - - - - -void EmptyWindow::Paint (const Rectangle& ) -{ - Size aWindowSize (GetOutputSizePixel()); - Point aPosition(aWindowSize.Width()/2,aWindowSize.Height()/2); - - Rectangle aBBox; - aPosition = Point(10,aWindowSize.Height()/2); - if (GetTextBoundRect (aBBox, msText)) - aPosition = Point ( - (aWindowSize.Width()-aBBox.GetWidth())/2, - (aWindowSize.Height()-aBBox.GetHeight())/2); - DrawText (aPosition, msText); - - String sSizeString = String::CreateFromInt32(aWindowSize.Width()); - sSizeString.Append (String::CreateFromAscii(" x ")); - sSizeString.Append (String::CreateFromInt32(aWindowSize.Height())); - if (GetTextBoundRect (aBBox, sSizeString)) - aPosition = Point ( - (aWindowSize.Width()-aBBox.GetWidth())/2, - aPosition.Y() + GetTextHeight() + aBBox.GetHeight()); - DrawText (aPosition, sSizeString); -} - - - - -void EmptyWindow::Resize (void) -{ - Window::Resize(); -} - - - - -void EmptyWindow::GetFocus (void) -{ - GetParent()->GrabFocus(); -} - - -} } // end of namespace ::sd::tpv diff --git a/sd/source/ui/toolpanel/EmptyWindow.hxx b/sd/source/ui/toolpanel/EmptyWindow.hxx deleted file mode 100644 index 4137020874f5..000000000000 --- a/sd/source/ui/toolpanel/EmptyWindow.hxx +++ /dev/null @@ -1,57 +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. - * - ************************************************************************/ - -#ifndef SD_EMPTY_WINDOW_HXX -#define SD_EMPTY_WINDOW_HXX - -#include <vcl/window.hxx> - -namespace sd { namespace toolpanel { - -/** Simply paint a solid background and a centered text. -*/ -class EmptyWindow - : public ::Window -{ -public: - EmptyWindow ( - ::Window* pParentWindow, - Color rBackgroundColor, - const String& rText); - virtual ~EmptyWindow (void); - - virtual void Paint (const Rectangle& rBoundingBox); - virtual void Resize (void); - virtual void GetFocus (void); - -private: - String msText; -}; - -} } // end of namespace ::sd::toolpanel - -#endif diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index a2bb1d0cbbac..6e5a73c3aecc 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -305,14 +305,6 @@ LayoutMenu::~LayoutMenu (void) -String LayoutMenu::GetSelectedLayoutName (void) -{ - return GetItemText (GetSelectItemId()); -} - - - - AutoLayout LayoutMenu::GetSelectedAutoLayout (void) { AutoLayout aResult = AUTOLAYOUT_NONE; diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx index bd121403c2d3..d2f019b5bc34 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.hxx +++ b/sd/source/ui/toolpanel/LayoutMenu.hxx @@ -99,10 +99,6 @@ public: ViewShellBase& rBase, DrawDocShell& rDocShell); - /** Return the name of the currently selected layout. - */ - String GetSelectedLayoutName (void); - /** Return a numerical value representing the currently selected layout. */ diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx index cff065777235..13bb9c8e8d35 100644 --- a/sd/source/ui/toolpanel/ScrollPanel.cxx +++ b/sd/source/ui/toolpanel/ScrollPanel.cxx @@ -110,15 +110,6 @@ ScrollPanel::~ScrollPanel (void) -void ScrollPanel::ListHasChanged (void) -{ - mpControlContainer->ListHasChanged (); - RequestResize (); -} - - - - TitledControl* ScrollPanel::AddControl ( ::std::auto_ptr<TreeNode> pControl, const String& rTitle, diff --git a/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx b/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx deleted file mode 100644 index 0aa2d3f91760..000000000000 --- a/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx +++ /dev/null @@ -1,98 +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 "SimpleLayoutWrapper.hxx" - -#include <vcl/window.hxx> - -namespace sd { namespace toolpanel { - -SimpleLayoutWrapper::SimpleLayoutWrapper ( - ::std::auto_ptr< ::Window> pWindow, - int nPreferredWidth, - int nPreferredHeight, - bool bIsResizable) - : mpWindow (pWindow), - mnPreferredWidth(nPreferredWidth), - mnPreferredHeight(nPreferredHeight), - mbIsResizable (bIsResizable) -{ -} - - - - -SimpleLayoutWrapper::~SimpleLayoutWrapper (void) -{ -} - - - - -Size SimpleLayoutWrapper::GetPreferredSize (void) -{ - return Size (mnPreferredWidth, mnPreferredHeight); -} - - - - -sal_Int32 SimpleLayoutWrapper::GetPreferredWidth (sal_Int32) -{ - return mnPreferredWidth; -} - - - - -sal_Int32 SimpleLayoutWrapper::GetPreferredHeight (sal_Int32) -{ - return mnPreferredHeight; -} - - - - -bool SimpleLayoutWrapper::IsResizable (void) -{ - return mbIsResizable; -} - - - - -::Window* SimpleLayoutWrapper::GetWindow (void) -{ - return mpWindow.get(); -} - - -} } // end of namespace ::sd::toolpanel - diff --git a/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx b/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx deleted file mode 100644 index a05d9d6ff295..000000000000 --- a/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx +++ /dev/null @@ -1,70 +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. - * - ************************************************************************/ - -#ifndef SD_TASKPANE_SIMPLE_LAYOUT_WRAPPER_HXX -#define SD_TASKPANE_SIMPLE_LAYOUT_WRAPPER_HXX - -#include "taskpane/ILayoutableWindow.hxx" - -#include <memory> - -namespace sd { namespace toolpanel { - - -/** Simple wrapper arround a regular VCL window that implements the - methods that return the preferred size of the window. They are - given once to the constructor and are not modified by the wrapper. -*/ -class SimpleLayoutWrapper - : public virtual ILayoutableWindow -{ -public: - SimpleLayoutWrapper ( - ::std::auto_ptr< ::Window> pWindow, - int nPreferredWidth, - int nPreferredHeight, - bool bIsResizable); - virtual ~SimpleLayoutWrapper (void); - - virtual Size GetPreferredSize (void); - virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); - virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); - virtual bool IsResizable (void); - virtual ::Window* GetWindow (void); - - using sd::toolpanel::ILayoutableWindow::GetPreferredWidth; - using sd::toolpanel::ILayoutableWindow::GetPreferredHeight; -private: - ::std::auto_ptr< ::Window> mpWindow; - int mnPreferredWidth; - int mnPreferredHeight; - bool mbIsResizable; -}; - -} } // end of namespace ::sd::toolpanel - -#endif diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx index 31c29f4f1c08..06b63ae2da85 100644 --- a/sd/source/ui/toolpanel/SubToolPanel.cxx +++ b/sd/source/ui/toolpanel/SubToolPanel.cxx @@ -86,64 +86,6 @@ SubToolPanel::~SubToolPanel (void) -void SubToolPanel::ListHasChanged (void) -{ - mpControlContainer->ListHasChanged (); - RequestResize (); -} - - - - -void SubToolPanel::AddControl ( - ::std::auto_ptr<TreeNode> pControl, - const String& rTitle, - ULONG nHelpId) -{ - pControl->GetWindow()->AddEventListener ( - LINK(this,SubToolPanel,WindowEventListener)); - - // We are interested only in the title. The control itself is - // managed by the content object. - TitledControl* pTitledControl = new TitledControl( - this, - pControl, - rTitle, - TitledControlStandardClickHandler(GetControlContainer(), ControlContainer::ES_TOGGLE), - TitleBar::TBT_SUB_CONTROL_HEADLINE); - pTitledControl->GetWindow()->SetParent(this); - pTitledControl->GetWindow()->SetHelpId(nHelpId); - ::std::auto_ptr<TreeNode> pChild (pTitledControl); - - // Add a down link only for the first control so that when - // entering the sub tool panel the focus is set to the first control. - if (mpControlContainer->GetControlCount() == 0) - FocusManager::Instance().RegisterDownLink(GetParent(), pTitledControl->GetWindow()); - FocusManager::Instance().RegisterUpLink(pTitledControl->GetWindow(), GetParent()); - - mpControlContainer->AddControl (pChild); -} - - - - -void SubToolPanel::AddControl (::std::auto_ptr<TreeNode> pControl) -{ - pControl->GetWindow()->AddEventListener ( - LINK(this,SubToolPanel,WindowEventListener)); - - // Add a down link only for the first control so that when - // entering the sub tool panel the focus is set to the first control. - if (mpControlContainer->GetControlCount() == 0) - FocusManager::Instance().RegisterDownLink(GetParent(), pControl->GetWindow()); - FocusManager::Instance().RegisterUpLink(pControl->GetWindow(), GetParent()); - - mpControlContainer->AddControl (pControl); -} - - - - void SubToolPanel::Paint (const Rectangle& rRect) { if (mbIsRearrangePending) diff --git a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx index 5a4875340840..b1556c53d3d2 100644 --- a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx +++ b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx @@ -76,19 +76,6 @@ void TaskPaneShellManager::ReleaseShell (SfxShell* ) // Nothing to do. } -// hack for annotation panel, better fix? -void TaskPaneShellManager_AddSubShell ( TaskPaneShellManager* pManager, sal_Int32 nId, SfxShell* pShell, ::Window* pWindow ) -{ - if( pManager != NULL ) - pManager->AddSubShell( (ShellId)nId, pShell, pWindow ); -} - -void TaskPaneShellManager_RemoveSubShell ( TaskPaneShellManager* pManager, const SfxShell* pShell) -{ - if( pManager != NULL ) - pManager->RemoveSubShell( pShell ); -} - void TaskPaneShellManager::AddSubShell ( ShellId nId, SfxShell* pShell, diff --git a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx index 152f576bd5bc..4e0daacb74b1 100644 --- a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx +++ b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx @@ -55,22 +55,6 @@ TreeNode::~TreeNode (void) -bool TreeNode::IsLeaf (void) -{ - return (mpControlContainer.get()==NULL); -} - - - - -bool TreeNode::IsRoot (void) -{ - return (mpParent==NULL); -} - - - - void TreeNode::SetParentNode (TreeNode* pNewParent) { mpParent = pNewParent; @@ -288,18 +272,6 @@ void TreeNode::AddStateChangeListener (const Link& rListener) -void TreeNode::RemoveStateChangeListener (const Link& rListener) -{ - maStateChangeListeners.erase ( - ::std::find ( - maStateChangeListeners.begin(), - maStateChangeListeners.end(), - rListener)); -} - - - - void TreeNode::FireStateChangeEvent ( TreeNodeStateChangeEventId eEventId, TreeNode* pChild) const diff --git a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx index d80beba7cd10..b2f91d8aa0ba 100644 --- a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx +++ b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx @@ -46,8 +46,6 @@ #include "controls/TableDesignPanel.hxx" #include "controls/CustomAnimationPanel.hxx" #include "controls/SlideTransitionPanel.hxx" -#include "controls/AnimationSchemesPanel.hxx" -#include "TitleToolBox.hxx" #include "taskpane/ControlContainer.hxx" #include "FrameView.hxx" #include "Window.hxx" @@ -75,6 +73,7 @@ #include <svx/colrctrl.hxx> #include <svx/xtable.hxx> #include <vcl/dockwin.hxx> +#include <vcl/toolbox.hxx> #include "sdtreelb.hxx" #include "DrawViewShell.hxx" #include "drawdoc.hxx" @@ -135,13 +134,6 @@ public: */ void AddPanel (sal_uInt32 nInternalId, PanelId nPublicId); - /** Return the public id for the given internal one. - @return - When the given public id is not known then PID_UNKNOWN is - returned. - */ - PanelId GetPublicId (sal_uInt32 nInternalId) const; - /** Return the internal id for the given public one. @return When the given public id is not known then mnInvalidId is @@ -622,21 +614,6 @@ SdPage* TaskPaneViewShell::getCurrentPage(void) const -void TaskPaneViewShell::Execute (SfxRequest& ) -{ -} - - - - -void TaskPaneViewShell::GetState (SfxItemSet& rItemSet) -{ - (void)rItemSet; -} - - - - TaskPaneShellManager& TaskPaneViewShell::GetSubShellManager (void) const { return *mpSubShellManager.get(); @@ -675,21 +652,6 @@ void TaskPaneViewShell::ShowPanel (const PanelId nPublicId) -void TaskPaneViewShell::HidePanel (const PanelId nPublicId) -{ - Initialize(); - sal_uInt32 nId (mpImpl->GetInternalId(nPublicId)); - if (nId != Implementation::mnInvalidId) - { - mpTaskPane->GetControlContainer().SetVisibilityState ( - nId, - ControlContainer::VS_HIDE); - } -} - - - - void TaskPaneViewShell::ExpandPanel (const PanelId nPublicId) { Initialize(); @@ -809,19 +771,6 @@ void TaskPaneViewShell::Implementation::AddPanel ( -TaskPaneViewShell::PanelId - TaskPaneViewShell::Implementation::GetPublicId ( - sal_uInt32 nInternalId) const -{ - if (nInternalId < maIndexMap.size()) - return maIndexMap[nInternalId]; - else - return PID_UNKNOWN; -} - - - - sal_uInt32 TaskPaneViewShell::Implementation::GetInternalId ( TaskPaneViewShell::PanelId nPublicId) const @@ -840,27 +789,6 @@ sal_uInt32 -//===== PanelActivation ======================================================= - -PanelActivation::PanelActivation (ViewShellBase& rBase, TaskPaneViewShell::PanelId nPanelId) - : mrBase(rBase), - mnPanelId(nPanelId) -{ -} - -void PanelActivation::operator() (bool) -{ - toolpanel::TaskPaneViewShell* pTaskPane - = dynamic_cast<toolpanel::TaskPaneViewShell*>( - framework::FrameworkHelper::Instance(mrBase) - ->GetViewShell(framework::FrameworkHelper::msRightPaneURL).get()); - if (pTaskPane != NULL) - pTaskPane->ShowPanel(mnPanelId); -} - - - - //===== ResourceActivationClickHandler ======================================== ResourceActivationClickHandler::ResourceActivationClickHandler ( diff --git a/sd/source/ui/toolpanel/TestMenu.cxx b/sd/source/ui/toolpanel/TestMenu.cxx index 7bfb6adebe8d..a7396cf36999 100644 --- a/sd/source/ui/toolpanel/TestMenu.cxx +++ b/sd/source/ui/toolpanel/TestMenu.cxx @@ -37,6 +37,7 @@ namespace sd { namespace toolpanel { +#ifdef SHOW_COLOR_MENU /** This factory class is used to create instances of ColorMenu. It can be extended so that its constructor stores arguments that later are passed to new ColorMenu objects. @@ -82,16 +83,12 @@ ColorMenu::~ColorMenu (void) } - - ::std::auto_ptr<ControlFactory> ColorMenu::CreateControlFactory (void) { return ::std::auto_ptr<ControlFactory>(new ColorMenuFactory()); } - - /** The preferred size depends on the preferred number of columns, the number of items, and the size of the items. */ @@ -316,5 +313,6 @@ void ColorMenu::Fill (void) maSet.InsertItem (++i, rSettings.GetFontColor()); maSet.SetItemText (i, String::CreateFromAscii("FontColor")); } +#endif } } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/toolpanel/TestMenu.hxx b/sd/source/ui/toolpanel/TestMenu.hxx index 37ac6542970d..d1df4c9f4f5a 100644 --- a/sd/source/ui/toolpanel/TestMenu.hxx +++ b/sd/source/ui/toolpanel/TestMenu.hxx @@ -39,6 +39,8 @@ namespace sd { namespace toolpanel { class ControlFactory; +#ifdef SHOW_COLOR_MENU + /** This demo menu shows the colors that are available from the StyleSettings. */ @@ -75,6 +77,7 @@ private: int CalculateRowCount (const Size& rItemSize, int nColumnCount); void Fill (void); }; +#endif } } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/toolpanel/TestPanel.cxx b/sd/source/ui/toolpanel/TestPanel.cxx index e2786e23a0c5..2b05769e0db7 100644 --- a/sd/source/ui/toolpanel/TestPanel.cxx +++ b/sd/source/ui/toolpanel/TestPanel.cxx @@ -37,6 +37,7 @@ namespace sd { namespace toolpanel { +#ifdef SHOW_TEST_PANEL /** This factory class is used to create instances of TestPanel. It can be extended so that its constructor stores arguments that later are passed to new TestPanel objects. @@ -163,13 +164,11 @@ TestPanel::~TestPanel (void) { } - - - std::auto_ptr<ControlFactory> TestPanel::CreateControlFactory (void) { return std::auto_ptr<ControlFactory>(new TestPanelFactory()); } +#endif } } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/toolpanel/TestPanel.hxx b/sd/source/ui/toolpanel/TestPanel.hxx index f883cc08c1e1..77b075df2660 100644 --- a/sd/source/ui/toolpanel/TestPanel.hxx +++ b/sd/source/ui/toolpanel/TestPanel.hxx @@ -36,6 +36,8 @@ namespace sd { namespace toolpanel { class ControlFactory; class TreeNode; +#ifdef SHOW_TEST_PANEL + /** This panel demonstrates how to create a panel for the task pane. */ class TestPanel @@ -48,6 +50,8 @@ public: static std::auto_ptr<ControlFactory> CreateControlFactory (void); }; +#endif + } } // end of namespace ::sd::toolpanel #endif diff --git a/sd/source/ui/toolpanel/TitleToolBox.cxx b/sd/source/ui/toolpanel/TitleToolBox.cxx deleted file mode 100644 index 57cbac3fe132..000000000000 --- a/sd/source/ui/toolpanel/TitleToolBox.cxx +++ /dev/null @@ -1,116 +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 "TitleToolBox.hxx" - -#include "res_bmp.hrc" -#include <vcl/bitmap.hxx> -#include <vcl/bitmapex.hxx> -#include "sdresid.hxx" -#include <rtl/ustring.hxx> - -namespace sd { namespace toolpanel { - - -TitleToolBox::TitleToolBox (::Window* pParent, WinBits nStyle ) - : ToolBox( pParent, nStyle ) -{ - lastSize = -1; - - Bitmap aBitmap (SdResId (BMP_CLOSE_DOC)); - Bitmap aBitmapHC (SdResId (BMP_CLOSE_DOC_H)); - Bitmap aTriangleRight (SdResId (BMP_TRIANGLE_RIGHT)); - Bitmap aTriangleDown (SdResId (BMP_TRIANGLE_DOWN)); - - maImage = Image (aBitmap, Color (COL_LIGHTMAGENTA)); - maImageHC = Image (aBitmapHC, Color (BMP_COLOR_HIGHCONTRAST)); - maTriangleRight = Image (aTriangleRight, Color (COL_LIGHTMAGENTA)); - maTriangleDown = Image (aTriangleDown, Color (COL_LIGHTMAGENTA)); - - SetOutStyle (TOOLBOX_STYLE_FLAT); - SetBackground (Wallpaper ( - GetSettings().GetStyleSettings().GetDialogColor())); -} - - - - -void TitleToolBox::AddItem (ToolBoxId aId) -{ - switch (aId) - { - case TBID_PANEL_MENU: - InsertItem (TBID_PANEL_MENU, - String::CreateFromAscii ("Panel"), - TIB_DROPDOWN); - break; - - case TBID_DOCUMENT_CLOSE: - InsertItem (TBID_DOCUMENT_CLOSE, - GetSettings().GetStyleSettings().GetHighContrastMode() - ? maImageHC : maImage, 0 ); - break; - - case TBID_TRIANGLE_RIGHT: - InsertItem (TBID_TRIANGLE_RIGHT, - maTriangleRight, 0); - break; - - case TBID_TRIANGLE_DOWN: - InsertItem (TBID_TRIANGLE_DOWN, - maTriangleDown, 0); - break; - - case TBID_TEST: - InsertItem (TBID_TEST, - String::CreateFromAscii ("Test"), - TIB_DROPDOWN); - break; - } -} - - - - -void TitleToolBox::DataChanged (const DataChangedEvent& rDCEvt) -{ - Window::DataChanged (rDCEvt); - - if (rDCEvt.GetFlags() & SETTINGS_STYLE) - { - SetBackground ( - Wallpaper (GetSettings().GetStyleSettings().GetDialogColor())); - } -} - - - - -} } // end of namespace ::sd::toolbox diff --git a/sd/source/ui/toolpanel/TitleToolBox.hxx b/sd/source/ui/toolpanel/TitleToolBox.hxx deleted file mode 100644 index 9433706579df..000000000000 --- a/sd/source/ui/toolpanel/TitleToolBox.hxx +++ /dev/null @@ -1,70 +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. - * - ************************************************************************/ - -#ifndef SD_TOOLBOX_TITLETOOLBOX_HXX -#define SD_TOOLBOX_TITLETOOLBOX_HXX - -#include <vcl/toolbox.hxx> - -class PushButton; - -namespace sd { namespace toolpanel { - -/** Copied from vcl/menu.cxx -// To get the transparent mouse-over look, the TitleToolBox is actually a toolbox -// overload DataChange to handle style changes correctly -*/ -class TitleToolBox - : public ToolBox -{ -public: - enum ToolBoxId { - TBID_DOCUMENT_CLOSE = 1, - TBID_PANEL_MENU = 2, - TBID_TRIANGLE_RIGHT = 3, - TBID_TRIANGLE_DOWN = 4, - TBID_TEST - }; - - TitleToolBox (::Window* pParent, WinBits nStyle = 0); - - void AddItem (ToolBoxId aId); - - void DataChanged (const DataChangedEvent& rDCEvt); - -private: - Image maImage; - Image maImageHC; - Image maTriangleRight; - Image maTriangleDown; - - long lastSize; -}; - -} } // end of namespace ::sd::toolbox - -#endif diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx index 7930bb4cd7f1..eb84e4f72373 100644 --- a/sd/source/ui/toolpanel/TitledControl.cxx +++ b/sd/source/ui/toolpanel/TitledControl.cxx @@ -359,22 +359,6 @@ void TitledControl::SetEnabledState(bool bFlag) -void TitledControl::SetUserData (void* pUserData) -{ - mpUserData = pUserData; -} - - - - -void* TitledControl::GetUserData (void) const -{ - return mpUserData; -} - - - - bool TitledControl::IsShowing (void) const { return mbVisible; diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx index 89ab9397d4ee..e6621b1f544d 100644 --- a/sd/source/ui/toolpanel/ToolPanel.cxx +++ b/sd/source/ui/toolpanel/ToolPanel.cxx @@ -125,15 +125,6 @@ sal_uInt32 ToolPanel::AddControl ( -void ToolPanel::ListHasChanged (void) -{ - mpControlContainer->ListHasChanged (); - Rearrange (); -} - - - - void ToolPanel::Resize (void) { Control::Resize(); diff --git a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx index c4fc41e97744..730fc74795f2 100644 --- a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx +++ b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx @@ -24,7 +24,93 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: AnimationSchemesPanel.cxx,v $ + * $Revision: 1.6 $ + * + * 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 "AnimationSchemesPanel.hxx" + +#include "strings.hrc" +#include "sdresid.hxx" +#include <com/sun/star/frame/XModel.hpp> + +namespace sd +{ + + class ViewShellBase; + extern ::Window * createAnimationSchemesPanel( ::Window* pParent, ViewShellBase& rBase ); + +namespace toolpanel { namespace controls { + +AnimationSchemesPanel::AnimationSchemesPanel(TreeNode* pParent, ViewShellBase& rBase) + : SubToolPanel (pParent), + maPreferredSize( 100, 200 ) +{ + mpWrappedControl = createAnimationSchemesPanel( pParent->GetWindow(), rBase ); + mpWrappedControl->Show(); +} + +AnimationSchemesPanel::~AnimationSchemesPanel() +{ + delete mpWrappedControl; +} + +Size AnimationSchemesPanel::GetPreferredSize() +{ + return maPreferredSize; +} +sal_Int32 AnimationSchemesPanel::GetPreferredWidth(sal_Int32 ) +{ + return maPreferredSize.Width(); +} +sal_Int32 AnimationSchemesPanel::GetPreferredHeight(sal_Int32 ) +{ + return maPreferredSize.Height(); +} +::Window* AnimationSchemesPanel::GetWindow() +{ + return mpWrappedControl; +} +bool AnimationSchemesPanel::IsResizable() +{ + return true; +} +bool AnimationSchemesPanel::IsExpandable() const +{ + return true; +} + + +} } } // end of namespace ::sd::toolpanel::controls // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" #include "AnimationSchemesPanel.hxx" diff --git a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx index 4cee546dae0d..dd3388fb0342 100644 --- a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx +++ b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx @@ -24,6 +24,35 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: AnimationSchemesPanel.hxx,v $ + * $Revision: 1.6 $ + * + * 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. + * + ************************************************************************/ #ifndef SD_TASKPANE_CONTROLS_ANIMATION_SCHEMES_PANEL_HXX #define SD_TASKPANE_CONTROLS_ANIMATION_SCHEMES_PANEL_HXX @@ -66,3 +95,44 @@ private: } } } // end of namespace ::sd::toolpanel::controls #endif +#ifndef SD_TASKPANE_CONTROLS_ANIMATION_SCHEMES_PANEL_HXX +#define SD_TASKPANE_CONTROLS_ANIMATION_SCHEMES_PANEL_HXX + +#include "taskpane/SubToolPanel.hxx" + +namespace sd { +class ViewShellBase; +} + +namespace sd { namespace toolpanel { +class TreeNode; +} } + +namespace sd { namespace toolpanel { namespace controls { + +class AnimationSchemesPanel + : public SubToolPanel +{ +public: + AnimationSchemesPanel ( + TreeNode* pParent, + ViewShellBase& rBase); + virtual ~AnimationSchemesPanel (void); + + virtual Size GetPreferredSize (void); + virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeigh); + virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); + virtual ::Window* GetWindow (void); + virtual bool IsResizable (void); + virtual bool IsExpandable (void) const; + + using Window::GetWindow; + +private: + Size maPreferredSize; + ::Window* mpWrappedControl; +}; + +} } } // end of namespace ::sd::toolpanel::controls + +#endif diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx index 444ecd6dacb4..80a094ec1a66 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx @@ -73,24 +73,6 @@ namespace { typedef ::std::vector<SharedMasterPageDescriptor> MasterPageContainerType; - -class PreviewCreationRequest -{ -public: - PreviewCreationRequest (MasterPageContainer::Token aToken, int nPriority); - MasterPageContainer::Token maToken; - int mnPriority; - class Compare {public: - bool operator() (const PreviewCreationRequest& r1,const PreviewCreationRequest& r2); - }; - class CompareToken {public: - MasterPageContainer::Token maToken; - CompareToken(MasterPageContainer::Token aToken); - bool operator() (const PreviewCreationRequest& rRequest); - }; -}; - - } // end of anonymous namespace @@ -423,28 +405,6 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForURL ( -MasterPageContainer::Token MasterPageContainer::GetTokenForPageName ( - const String& sPageName) -{ - const ::osl::MutexGuard aGuard (mpImpl->maMutex); - - Token aResult (NIL_TOKEN); - if (sPageName.Len() > 0) - { - MasterPageContainerType::iterator iEntry ( - ::std::find_if ( - mpImpl->maContainer.begin(), - mpImpl->maContainer.end(), - MasterPageDescriptor::PageNameComparator(sPageName))); - if (iEntry != mpImpl->maContainer.end()) - aResult = (*iEntry)->maToken; - } - return aResult; -} - - - - MasterPageContainer::Token MasterPageContainer::GetTokenForStyleName (const String& sStyleName) { const ::osl::MutexGuard aGuard (mpImpl->maMutex); @@ -589,46 +549,6 @@ sal_Int32 MasterPageContainer::GetTemplateIndexForToken (Token aToken) -void MasterPageContainer::SetPreviewProviderForToken ( - Token aToken, - const ::boost::shared_ptr<PreviewProvider>& rpPreviewProvider) -{ - const ::osl::MutexGuard aGuard (mpImpl->maMutex); - - SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken); - if (pDescriptor.get()!=NULL) - { - pDescriptor->mpPreviewProvider = rpPreviewProvider; - mpImpl->InvalidatePreview(aToken); - } -} - - - - -SdPage* MasterPageContainer::GetSlideForToken ( - MasterPageContainer::Token aToken, - bool bLoad) -{ - const ::osl::MutexGuard aGuard (mpImpl->maMutex); - - SdPage* pSlide = NULL; - SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken); - if (pDescriptor.get() != NULL) - { - pSlide = pDescriptor->mpSlide; - if (pSlide==NULL && bLoad) - { - GetPageObjectForToken(aToken, bLoad); - pSlide = pDescriptor->mpSlide; - } - } - return pSlide; -} - - - - SharedMasterPageDescriptor MasterPageContainer::GetDescriptorForToken ( MasterPageContainer::Token aToken) { @@ -639,19 +559,6 @@ SharedMasterPageDescriptor MasterPageContainer::GetDescriptorForToken ( - -bool MasterPageContainer::UpdateDescriptor ( - const SharedMasterPageDescriptor& rpDescriptor, - bool bForcePageObject, - bool bForcePreview, - bool bSendEvents) -{ - return mpImpl->UpdateDescriptor(rpDescriptor, bForcePageObject, bForcePreview, bSendEvents); -} - - - - void MasterPageContainer::InvalidatePreview (MasterPageContainer::Token aToken) { mpImpl->InvalidatePreview(aToken); @@ -1311,58 +1218,3 @@ void MasterPageContainer::Implementation::FillingDone (void) } } } // end of namespace ::sd::toolpanel::controls - - - - -namespace { - -//===== PreviewCreationRequest ================================================ - -PreviewCreationRequest::PreviewCreationRequest ( - MasterPageContainer::Token aToken, - int nPriority) - : maToken(aToken), - mnPriority(nPriority) -{ -} - - - - -bool PreviewCreationRequest::Compare::operator() ( - const PreviewCreationRequest& aRequest1, - const PreviewCreationRequest& aRequest2) -{ - if (aRequest1.mnPriority != aRequest2.mnPriority) - { - // Prefer requests with higher priority. - return aRequest1.mnPriority > aRequest2.mnPriority; - } - else - { - // Prefer tokens that have been earlier created (those with lower - // value). - return aRequest1.maToken < aRequest2.maToken; - } -} - - - - -PreviewCreationRequest::CompareToken::CompareToken (MasterPageContainer::Token aToken) - : maToken(aToken) -{ -} - - - - -bool PreviewCreationRequest::CompareToken::operator() (const PreviewCreationRequest& aRequest) -{ - return maToken==aRequest.maToken; -} - - - -} // end of anonymous namespace diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx index d922c089ffb4..60f760f63e34 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx @@ -143,26 +143,16 @@ public: Token GetTokenForIndex (int nIndex); Token GetTokenForURL (const String& sURL); - Token GetTokenForPageName (const String& sPageName); Token GetTokenForStyleName (const String& sStyleName); Token GetTokenForPageObject (const SdPage* pPage); String GetURLForToken (Token aToken); String GetPageNameForToken (Token aToken); String GetStyleNameForToken (Token aToken); - SdPage* GetSlideForToken (Token aToken, bool bLoad=true); SdPage* GetPageObjectForToken (Token aToken, bool bLoad=true); Origin GetOriginForToken (Token aToken); sal_Int32 GetTemplateIndexForToken (Token aToken); ::boost::shared_ptr<MasterPageDescriptor> GetDescriptorForToken (Token aToken); - bool UpdateDescriptor ( - const ::boost::shared_ptr<MasterPageDescriptor>& rpDescriptor, - bool bForcePageObject, - bool bForcePreview, - bool bSendEvents); - - void SetPreviewProviderForToken (Token aToken, - const ::boost::shared_ptr<PreviewProvider>& rpPreviewProvider); void InvalidatePreview (Token aToken); diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx index 6b9ff09bbed3..e45fed2c9c1b 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx @@ -386,46 +386,6 @@ bool DefaultPageObjectProvider::operator== (const PageObjectProvider& rProvider) -//===== DefaultPagePreviewProvider ============================================ - -DefaultPagePreviewProvider::DefaultPagePreviewProvider (void) -{ -} - - - -Image DefaultPagePreviewProvider::operator() ( - int nWidth, - SdPage* pPage, - ::sd::PreviewRenderer& rRenderer) -{ - // Unused parameters. - (void)nWidth; - (void)pPage; - (void)rRenderer; - - return Image(); -} - - - - -int DefaultPagePreviewProvider::GetCostIndex (void) -{ - return 0; -} - - - - -bool DefaultPagePreviewProvider::NeedsPageObject (void) -{ - return false; -} - - - - //===== ExistingPageProvider ================================================== ExistingPageProvider::ExistingPageProvider (SdPage* pPage) diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx index 7cde148b3e3d..071b23cdbb16 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx @@ -170,21 +170,6 @@ public: - -/** Used temporarily to avoid the (expensive) creation of the default page - too early. -*/ -class DefaultPagePreviewProvider : public PreviewProvider -{ -public: - DefaultPagePreviewProvider (void); - virtual Image operator() (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer); - virtual int GetCostIndex (void); - virtual bool NeedsPageObject (void); -}; - - - /** This implementation of the PageObjectProvider simply returns an already existing master page object. */ diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx index 49ae6dff264d..6871883d65f5 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx @@ -337,28 +337,6 @@ bool MasterPageDescriptor::URLComparator::operator() ( -//===== PageNameComparator ==================================================== - -MasterPageDescriptor::PageNameComparator::PageNameComparator (const ::rtl::OUString& sPageName) - : msPageName(sPageName) -{ -} - - - - -bool MasterPageDescriptor::PageNameComparator::operator() ( - const SharedMasterPageDescriptor& rDescriptor) -{ - if (rDescriptor.get() == NULL) - return false; - else - return rDescriptor->msPageName.equals(msPageName); -} - - - - // ===== StyleNameComparator ================================================== MasterPageDescriptor::StyleNameComparator::StyleNameComparator (const ::rtl::OUString& sStyleName) diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx index 1eea46bd1802..0303989e3379 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx @@ -214,11 +214,6 @@ public: URLComparator (const ::rtl::OUString& sURL); bool operator() (const SharedMasterPageDescriptor& rDescriptor); }; - class PageNameComparator { public: - ::rtl::OUString msPageName; - PageNameComparator (const ::rtl::OUString& sPageName); - bool operator() (const SharedMasterPageDescriptor& rDescriptor); - }; class StyleNameComparator { public: ::rtl::OUString msStyleName; StyleNameComparator (const ::rtl::OUString& sStyleName); diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx index 0f485174009d..2ba0cc678403 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx @@ -187,15 +187,6 @@ MasterPageObserver::~MasterPageObserver (void) -MasterPageObserver::MasterPageNameSet MasterPageObserver::GetMasterPageNames ( - SdDrawDocument& rDocument) -{ - return mpImpl->GetMasterPageNames (rDocument); -} - - - - //===== MasterPageObserver::Implementation ==================================== void MasterPageObserver::Implementation::RegisterDocument ( diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index 4571d4278140..b321dbf8dd14 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -41,7 +41,6 @@ #include "app.hrc" #include "res_bmp.hrc" #include "strings.hrc" -#include "showview.hxx" #include "DrawViewShell.hxx" #include "DrawController.hxx" #include "SlideSorterViewShell.hxx" @@ -699,21 +698,6 @@ void MasterPagesSelector::RemoveTokenToIndexEntry ( -void MasterPagesSelector::InvalidatePreview (MasterPageContainer::Token aToken) -{ - const ::osl::MutexGuard aGuard (maMutex); - - int nIndex (GetIndexForToken(aToken)); - if (nIndex > 0) - { - mpContainer->InvalidatePreview(aToken); - mpContainer->RequestPreview(aToken); - } -} - - - - void MasterPagesSelector::InvalidatePreview (const SdPage* pPage) { const ::osl::MutexGuard aGuard (maMutex); @@ -734,20 +718,6 @@ void MasterPagesSelector::InvalidatePreview (const SdPage* pPage) } } - - - -void MasterPagesSelector::InvalidateAllPreviews (void) -{ - const ::osl::MutexGuard aGuard (maMutex); - - for (USHORT nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++) - InvalidatePreview(nIndex); -} - - - - void MasterPagesSelector::UpdateAllPreviews (void) { const ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx index a480729aa9c8..a2df51f2bd4b 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx @@ -131,14 +131,8 @@ public: Index into the value set control that is used for displaying the previews. */ - void InvalidatePreview (MasterPageContainer::Token aToken); void InvalidatePreview (const SdPage* pPage); - /** Mark all previews as no being up-to-date anymore. This method is - typically called when the size of the previews has changed. - */ - void InvalidateAllPreviews (void); - void UpdateAllPreviews (void); protected: diff --git a/sd/source/ui/toolpanel/controls/makefile.mk b/sd/source/ui/toolpanel/controls/makefile.mk index 33871a415a7e..b2218e55008c 100644 --- a/sd/source/ui/toolpanel/controls/makefile.mk +++ b/sd/source/ui/toolpanel/controls/makefile.mk @@ -59,8 +59,7 @@ SLOFILES = \ $(SLO)$/RecentMasterPagesSelector.obj \ $(SLO)$/CustomAnimationPanel.obj \ $(SLO)$/SlideTransitionPanel.obj \ - $(SLO)$/TableDesignPanel.obj \ - $(SLO)$/AnimationSchemesPanel.obj + $(SLO)$/TableDesignPanel.obj # --- Tagets ------------------------------------------------------- diff --git a/sd/source/ui/toolpanel/makefile.mk b/sd/source/ui/toolpanel/makefile.mk index 08a966fe4061..e59e37ff9e03 100644 --- a/sd/source/ui/toolpanel/makefile.mk +++ b/sd/source/ui/toolpanel/makefile.mk @@ -45,10 +45,8 @@ PRJINC=..$/slidesorter SLOFILES = \ $(SLO)$/ControlContainer.obj \ $(SLO)$/ScrollPanel.obj \ - $(SLO)$/SimpleLayoutWrapper.obj \ $(SLO)$/SubToolPanel.obj \ $(SLO)$/TitleBar.obj \ - $(SLO)$/TitleToolBox.obj \ $(SLO)$/TitledControl.obj \ $(SLO)$/ToolPanel.obj \ $(SLO)$/TaskPaneControlFactory.obj \ @@ -57,7 +55,6 @@ SLOFILES = \ $(SLO)$/TaskPaneTreeNode.obj \ $(SLO)$/TaskPaneViewShell.obj \ \ - $(SLO)$/EmptyWindow.obj \ $(SLO)$/LayoutMenu.obj \ $(SLO)$/TestMenu.obj \ $(SLO)$/TestPanel.obj \ diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx index 010571b10927..9cf24dccd508 100644 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx @@ -58,22 +58,6 @@ void SAL_CALL PropertySet::disposing (void) { } - - - -beans::UnknownPropertyException PropertySet::CreateUnknownPropertyException ( - const rtl::OUString& rsPropertyName) -{ - return beans::UnknownPropertyException( - OUString::createFromAscii("property ") - + rsPropertyName - + OUString::createFromAscii(" is not known"), - static_cast<XWeak*>(this)); -} - - - - //----- XPropertySet ---------------------------------------------------------- Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo (void) diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx index 878ef16a52f4..4ed95bbf5b99 100644 --- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx +++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx @@ -152,31 +152,6 @@ void SdGlobalResourceContainer::AddResource (const Reference<XInterface>& rxReso - -::std::auto_ptr<SdGlobalResource> SdGlobalResourceContainer::ReleaseResource ( - SdGlobalResource* pResource) -{ - ::std::auto_ptr<SdGlobalResource> pResult (NULL); - - ::osl::MutexGuard aGuard (mpImpl->maMutex); - - Implementation::ResourceList::iterator iResource; - iResource = ::std::find ( - mpImpl->maResources.begin(), - mpImpl->maResources.end(), - pResource); - if (iResource != mpImpl->maResources.end()) - { - pResult.reset (*iResource); - mpImpl->maResources.erase(iResource); - } - - return pResult; -} - - - - SdGlobalResourceContainer::SdGlobalResourceContainer (void) : mpImpl (new SdGlobalResourceContainer::Implementation()) { diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index e8e2ffb24f2b..b3175b7fdb4a 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -45,16 +45,6 @@ using namespace ::rtl; namespace sd { namespace tools { -SlotStateListener::SlotStateListener (void) - : SlotStateListenerInterfaceBase(maMutex), - maCallback(), - mxDispatchProviderWeak(NULL) -{ -} - - - - SlotStateListener::SlotStateListener ( Link& rCallback, const uno::Reference<frame::XDispatchProvider>& rxDispatchProvider, @@ -125,14 +115,6 @@ void SlotStateListener::ObserveSlot (const ::rtl::OUString& rSlotName) -bool SlotStateListener::IsValid (void) const -{ - return maRegisteredURLList.size() > 0; -} - - - - void SlotStateListener::disposing (void) { ReleaseListeners(); diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index acd57f18d85c..0b2bced0ae65 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -368,18 +368,6 @@ void SAL_CALL -::awt::Rectangle DrawController::GetVisArea (void) const -{ - return awt::Rectangle( - maLastVisArea.Left(), - maLastVisArea.Top(), - maLastVisArea.GetWidth(), - maLastVisArea.GetHeight()); -} - - - - // XDrawView void SAL_CALL DrawController::setCurrentPage( const Reference< drawing::XDrawPage >& xPage ) diff --git a/sd/source/ui/unoidl/SdUnoPresView.cxx b/sd/source/ui/unoidl/SdUnoPresView.cxx deleted file mode 100644 index dcd5001ace38..000000000000 --- a/sd/source/ui/unoidl/SdUnoPresView.cxx +++ /dev/null @@ -1,54 +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 "SdUnoPresView.hxx" - - -namespace sd { - - -SdUnoPresView::SdUnoPresView ( - DrawController& rController, - DrawViewShell& rViewShell, - View& rView) throw() - : SdUnoDrawView (rController, rViewShell, rView) -{ -} - - - - -SdUnoPresView::~SdUnoPresView (void) throw() -{ -} - - - -} // end of namespace sd diff --git a/sd/source/ui/unoidl/makefile.mk b/sd/source/ui/unoidl/makefile.mk index b3e71df86740..cf4910b29186 100644 --- a/sd/source/ui/unoidl/makefile.mk +++ b/sd/source/ui/unoidl/makefile.mk @@ -50,7 +50,6 @@ NOOPTFILES= $(SLO)$/unowcntr.obj SLO1FILES = \ $(SLO)$/DrawController.obj \ - $(SLO)$/SdUnoPresView.obj\ $(SLO)$/SdUnoSlideView.obj\ $(SLO)$/SdUnoOutlineView.obj\ $(SLO)$/SdUnoDrawView.obj \ @@ -66,7 +65,6 @@ SLO1FILES = \ $(SLO)$/unowcntr.obj \ $(SLO)$/unokywds.obj \ $(SLO)$/unopback.obj \ - $(SLO)$/unovwcrs.obj \ $(SLO)$/unodoc.obj \ $(SLO)$/unomodule.obj \ $(SLO)$/randomnode.obj diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index b8f48a6928aa..1935c424ec03 100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -493,24 +493,3 @@ SdCustomShow * SdXCustomPresentationAccess::getSdCustomShow( const OUString& Nam } return NULL; } - -sal_Int32 SdXCustomPresentationAccess::getSdCustomShowIdx( const OUString& Name ) const throw() -{ - sal_Int32 nIdx = 0; - - List* pList = GetCustomShowList(); - const sal_Int32 nCount = pList?pList->Count():0; - - const String aName( Name ); - - while( nIdx < nCount ) - { - SdCustomShow* pShow = (SdCustomShow*)pList->GetObject(nIdx); - if( pShow->GetName() == aName ) - return nIdx; - nIdx++; - } - return -1; -} - - diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index 1267b3a58b0a..615d5ba7007c 100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -124,7 +124,6 @@ private: // intern inline List* GetCustomShowList() const throw(); - sal_Int32 getSdCustomShowIdx( const ::rtl::OUString& Name ) const throw(); SdCustomShow * getSdCustomShow( const ::rtl::OUString& Name ) const throw(); public: diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 54c3f88a6916..fdda65a3d970 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -311,14 +311,6 @@ typedef SORT* PSORT; extern "C" int __LOADONCALLAPI SortFunc( const void* p1, const void* p2 ); -SdXShape::SdXShape() throw() -: mpPropSet(lcl_GetEmpty_SdXShapePropertySet_Impl()), - mpMap(lcl_GetEmpty_SdXShapePropertyMap_Impl()), - mpModel(NULL), - mpImplementationId(NULL) -{ -} - SdXShape::SdXShape( SvxShape* pShape, SdXImpressDocument* pModel) throw() : mpShape( pShape ), mpPropSet( pModel? diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 3e7c3fab7d3c..0e472f41ff16 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -75,7 +75,6 @@ private: com::sun::star::uno::Sequence< sal_Int8 >* mpImplementationId; public: - SdXShape() throw(); SdXShape(SvxShape* pShape, SdXImpressDocument* pModel) throw(); virtual ~SdXShape() throw(); diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 69d961d7237a..4e012422e471 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -345,7 +345,34 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) return pRet; } -UNO3_GETIMPLEMENTATION2_IMPL( SdGenericDrawPage, SvxFmDrawPage ); +const ::com::sun::star::uno::Sequence< sal_Int8 > & SdGenericDrawPage::getUnoTunnelId() throw() +{ + static ::com::sun::star::uno::Sequence< sal_Int8 > * pSeq = 0; + if( !pSeq ) + { + ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ); + if( !pSeq ) + { + static ::com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 ); + rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); + pSeq = &aSeq; + } + } + return *pSeq; +} + +sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException) +{ + if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), + rId.getConstArray(), 16 ) ) + { + return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this)); + } + else + { + return SvxFmDrawPage::getSomething( rId ); + } +} /*********************************************************************** * * diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx index 52e5cc061f7d..5d525b0f0f04 100644 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/unoidl/unopage.hxx @@ -113,7 +113,8 @@ public: SdPage* GetPage() const { return (SdPage*)SvxDrawPage::mpPage; } SdXImpressDocument* GetModel() const; - UNO3_GETIMPLEMENTATION_DECL( SdGenericDrawPage ) + static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); // this is called whenever a SdrObject must be created for a empty api shape wrapper virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(); diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index a1cd11861d3a..56133e03a375 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -105,11 +105,6 @@ SdUnoSearchReplaceShape::SdUnoSearchReplaceShape( drawing::XDrawPage* pPage ) th mpPage = pPage; } -SdUnoSearchReplaceShape::SdUnoSearchReplaceShape( drawing::XShape* pShape ) throw() -{ - mpShape = pShape; -} - SdUnoSearchReplaceShape::~SdUnoSearchReplaceShape() throw() { } diff --git a/sd/source/ui/unoidl/unovwcrs.cxx b/sd/source/ui/unoidl/unovwcrs.cxx deleted file mode 100644 index 8b72cbe1fd96..000000000000 --- a/sd/source/ui/unoidl/unovwcrs.cxx +++ /dev/null @@ -1,209 +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 <com/sun/star/text/XTextViewCursor.hpp> -#include <com/sun/star/view/XScreenCursor.hpp> -#include <sfx2/request.hxx> -#include <vos/mutex.hxx> -#include "View.hxx" -#ifndef SVX_LIGHT -#ifndef SD_DRAW_DOC_SHELL_HXX -#include "DrawDocShell.hxx" -#endif -#endif -#include "ViewShell.hxx" -#include "slideshow.hxx" - -#include <cppuhelper/implbase2.hxx> -#include <vcl/svapp.hxx> - -using namespace ::vos; -using namespace ::rtl; -using namespace ::com::sun::star; - -class SdXTextViewCursor - : public ::cppu::WeakImplHelper2< - text::XTextViewCursor, - view::XScreenCursor > -{ -public: - SdXTextViewCursor(::sd::View* pVw) throw(); - virtual ~SdXTextViewCursor() throw(); - - //XTextViewCursor - virtual sal_Bool SAL_CALL isVisible(void) throw( uno::RuntimeException ); - virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( uno::RuntimeException ); - virtual awt::Point SAL_CALL getPosition(void) throw( uno::RuntimeException ); - - //XTextCursor - virtual void SAL_CALL collapseToStart(void) throw( uno::RuntimeException ); - virtual void SAL_CALL collapseToEnd(void) throw( uno::RuntimeException ); - virtual sal_Bool SAL_CALL isCollapsed(void) throw( uno::RuntimeException ); - virtual sal_Bool SAL_CALL goLeft(sal_Int16 nCount, sal_Bool Expand) throw( uno::RuntimeException ); - virtual sal_Bool SAL_CALL goRight(sal_Int16 nCount, sal_Bool Expand) throw( uno::RuntimeException ); - virtual void SAL_CALL gotoStart(sal_Bool Expand) throw( uno::RuntimeException ); - virtual void SAL_CALL gotoEnd(sal_Bool Expand) throw( uno::RuntimeException ); - virtual void SAL_CALL gotoRange(const uno::Reference< text::XTextRange > & rRange, sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException); - - //XTextRange - virtual uno::Reference< text::XText > SAL_CALL getText(void) throw( uno::RuntimeException ); - virtual uno::Reference< text::XTextRange > SAL_CALL getStart(void) throw( uno::RuntimeException ); - virtual uno::Reference< text::XTextRange > SAL_CALL getEnd(void) throw( uno::RuntimeException ); - virtual OUString SAL_CALL getString(void) throw( uno::RuntimeException ); - virtual void SAL_CALL setString(const OUString& aString) throw( uno::RuntimeException ); - - //XScreenCursor - virtual sal_Bool SAL_CALL screenDown(void) throw( uno::RuntimeException ); - virtual sal_Bool SAL_CALL screenUp(void) throw( uno::RuntimeException ); - - void Invalidate() { mpView = 0; } - -private: - ::sd::View* mpView; -}; - - -text::XTextViewCursor* CreateSdXTextViewCursor(::sd::View* mpView ) -{ - return new SdXTextViewCursor( mpView ); -} - -SdXTextViewCursor::SdXTextViewCursor(::sd::View* pSdView ) throw() - : mpView(pSdView) -{ - -} - -SdXTextViewCursor::~SdXTextViewCursor() throw() -{ -} - -sal_Bool SdXTextViewCursor::isVisible(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return sal_True; -} - -void SdXTextViewCursor::setVisible(sal_Bool ) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); -} - -awt::Point SdXTextViewCursor::getPosition(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return awt::Point(); -} - -void SdXTextViewCursor::collapseToStart(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); -} - -void SdXTextViewCursor::collapseToEnd(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); -} - -sal_Bool SdXTextViewCursor::isCollapsed(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return sal_True; - -} - -sal_Bool SdXTextViewCursor::goLeft(sal_Int16 , sal_Bool ) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return sal_False; -} - -sal_Bool SdXTextViewCursor::goRight(sal_Int16, sal_Bool ) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return sal_False; -} - -void SdXTextViewCursor::gotoRange(const uno::Reference< text::XTextRange > &, sal_Bool ) throw (::com::sun::star::uno::RuntimeException) -{ - DBG_WARNING("not implemented"); -} - -void SdXTextViewCursor::gotoStart(sal_Bool ) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); -} - -void SdXTextViewCursor::gotoEnd(sal_Bool ) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); -} - -sal_Bool SdXTextViewCursor::screenDown(void) throw( uno::RuntimeException ) -{ - OGuard aGuard(Application::GetSolarMutex()); - return sal_False; -} - -sal_Bool SdXTextViewCursor::screenUp(void) throw( uno::RuntimeException ) -{ - OGuard aGuard(Application::GetSolarMutex()); - return sal_False; -} - -uno::Reference< text::XText > SdXTextViewCursor::getText(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return uno::Reference< text::XText > (); -} - -uno::Reference< text::XTextRange > SdXTextViewCursor::getStart(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return uno::Reference< text::XTextRange > (); -} - -uno::Reference< text::XTextRange > SdXTextViewCursor::getEnd(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return uno::Reference< text::XTextRange > (); -} - -OUString SdXTextViewCursor::getString(void) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); - return OUString(); -} - -void SdXTextViewCursor::setString(const OUString& ) throw( uno::RuntimeException ) -{ - DBG_WARNING("not implemented"); -} - - diff --git a/sd/source/ui/unoidl/unowcntr.cxx b/sd/source/ui/unoidl/unowcntr.cxx index fbb9991981f9..e29ee1e1516e 100644 --- a/sd/source/ui/unoidl/unowcntr.cxx +++ b/sd/source/ui/unoidl/unowcntr.cxx @@ -77,31 +77,6 @@ void SvUnoWeakContainer::insert( uno::WeakReference< uno::XInterface > xRef ) th mpList->Insert( new uno::WeakReference< uno::XInterface >( xRef ) ); } -/** removes the given ref from this container */ -void SvUnoWeakContainer::remove( uno::WeakReference< uno::XInterface > xRef ) throw() -{ - uno::WeakReference< uno::XInterface >* pRef = mpList->First(); - while( pRef ) - { - uno::Reference< uno::XInterface > xTestRef( *pRef ); - if(!xTestRef.is()) - { - delete mpList->Remove(); - pRef = mpList->GetCurObject(); - } - else - { - if( *pRef == xRef ) - { - delete mpList->Remove(); - break; - } - - pRef = mpList->Next(); - } - } -} - /** searches the container for a ref that returns true on the given search function */ diff --git a/sd/source/ui/unoidl/unowcntr.hxx b/sd/source/ui/unoidl/unowcntr.hxx index 86d68f3c4d22..a35c27cfd583 100644 --- a/sd/source/ui/unoidl/unowcntr.hxx +++ b/sd/source/ui/unoidl/unowcntr.hxx @@ -46,9 +46,6 @@ public: /** inserts the given ref into this container */ void insert( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > xRef ) throw(); - /** removes the given ref from this container */ - void remove( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > xRef ) throw(); - /** searches the container for a ref that returns true on the given search function */ diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 5314f6dbe768..ed3777d49082 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -318,11 +318,6 @@ void Outliner::StartSpelling (void) mpSearchItem = NULL; } -/** Proxy for method from base class to avoid compiler warning */ -void Outliner::StartSpelling(EditView& rView, unsigned char c) -{ - SdrOutliner::StartSpelling( rView, c ); -} /** Free all resources acquired during the search/spell check. After a spell check the start position is restored here. @@ -425,23 +420,6 @@ BOOL Outliner::SpellNextDocument (void) } -void Outliner::HandleOutsideChange (ChangeHint eHint) -{ - switch (eHint) - { - case CH_VIEW_SHELL_INVALID: - EndSpelling(); - mbPrepareSpellingPending = true; - mbViewShellValid = false; - break; - - case CH_VIEW_SHELL_VALID: - mbViewShellValid = true; - break; - } -} - - /************************************************************************* |* @@ -1076,23 +1054,6 @@ void Outliner::EndOfSearch (void) } } - - - -void Outliner::InitPage (USHORT nPageIndex) -{ - (void)nPageIndex; - - ::sd::outliner::IteratorPosition aPosition (*maObjectIterator); - if (aPosition.meEditMode == EM_PAGE) - mnPageCount = mpDrawDocument->GetSdPageCount(aPosition.mePageKind); - else - mnPageCount = mpDrawDocument->GetMasterSdPageCount(aPosition.mePageKind); -} - - - - void Outliner::ShowEndOfSearchDialog (void) { String aString; @@ -1475,36 +1436,6 @@ bool Outliner::HandleFailedSearch (void) } -#if ENABLE_LAYOUT -#define SvxSearchDialog Window -#endif - -/** See task #95227# for discussion about correct parent for dialogs/info boxes. -*/ -::Window* Outliner::GetParentForDialog (void) -{ - ::Window* pParent = NULL; - - if (meMode == SEARCH) - pParent = static_cast<SvxSearchDialog*>( - SfxViewFrame::Current()->GetChildWindow( - SvxSearchDialogWrapper::GetChildWindowId())->GetWindow()); - - if (pParent == NULL) - pParent = mpViewShell->GetActiveWindow(); - - if (pParent == NULL) - pParent = Application::GetDefDialogParent(); - //1.30->1.31 of sdoutl.cxx pParent = Application::GetDefModalDialogParent(); - - return pParent; -} - -#if ENABLE_LAYOUT -#undef SvxSearchDialog -#endif - - SdrObject* Outliner::SetObject ( const ::sd::outliner::IteratorPosition& rPosition) { diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx index 81f9a50d256d..226d767c6c91 100644 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx @@ -67,15 +67,6 @@ IteratorPosition::IteratorPosition (const IteratorPosition& aPosition) { } -IteratorPosition::IteratorPosition (SdrObject* pObject, sal_Int32 nText, sal_Int32 nPageIndex, PageKind ePageKind, EditMode eEditMode) -: mxObject(pObject) -, mnText(nText) -, mnPageIndex(nPageIndex) -, mePageKind(ePageKind) -, meEditMode(eEditMode) -{ -} - IteratorPosition::~IteratorPosition (void) { } @@ -119,11 +110,6 @@ Iterator::Iterator (IteratorImplBase* pObject) mpIterator = pObject; } -Iterator::Iterator (const IteratorImplBase& rObject) -{ - mpIterator = rObject.Clone(); -} - Iterator::~Iterator (void) { delete mpIterator; @@ -266,28 +252,6 @@ Iterator OutlinerContainer::CreateSelectionIterator ( rObjectList, nObjectIndex, pDocument, rpViewShell, bDirectionIsForward)); } -Iterator OutlinerContainer::CreateViewIterator ( - SdDrawDocument* pDocument, - const ::boost::shared_ptr<ViewShell>& rpViewShell, - bool bDirectionIsForward, - IteratorLocation aLocation) -{ - OSL_ASSERT(rpViewShell.get()); - - const ::boost::shared_ptr<DrawViewShell> pDrawViewShell( - ::boost::dynamic_pointer_cast<DrawViewShell>(rpViewShell)); - sal_Int32 nPageIndex = GetPageIndex ( - pDocument, - rpViewShell, - pDrawViewShell.get() ? pDrawViewShell->GetPageKind() : PK_STANDARD, - pDrawViewShell.get() ? pDrawViewShell->GetEditMode() : EM_PAGE, - bDirectionIsForward, - aLocation); - - return Iterator (new ViewIteratorImpl ( - nPageIndex, pDocument, rpViewShell, bDirectionIsForward)); -} - Iterator OutlinerContainer::CreateDocumentIterator ( SdDrawDocument* pDocument, const ::boost::shared_ptr<ViewShell>& rpViewShell, diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 4919a9fe2bbb..ce3064392d40 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -119,10 +119,9 @@ private: /** Manage tool bars that are implemented as sub shells of a view shell. The typical procedure of updating the sub shells of a view shell is to rebuild a list of sub shells that the caller would like to have active. - The methods ClearGroup(), AddShellId(), and RemoveShellId() allow the - caller to do that. A final call to UpdateShells() activates the - requested shells that are not active and deactivates the active shells - that are not requested. + The methods ClearGroup() and AddShellId() allow the caller to do that. A + final call to UpdateShells() activates the requested shells that are not + active and deactivates the active shells that are not requested . This is done by maintaining two lists. One (the current list) reflects the current state. The other (the requested list) contains the @@ -157,18 +156,6 @@ public: */ void AddShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd::ShellId nId); - /** Remove a shell. This is done only when the specified shell is a - member of the specified group. If it has been requested for another - group or if it has not been requested then this call is ignored. - @param eGroup - The group from which to remove the shell. - @param nId - The id of the shell to remove. - @return - Returns whether the shell is removed. - */ - bool RemoveShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd::ShellId nId); - /** Releasing all shells means that the given ToolBarRules object is informed that every shell mananged by the called ToolBarShellList is about to be removed and that the associated framework tool bars can @@ -296,7 +283,6 @@ public: void AddToolBar (ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName); void AddToolBarShell (ToolBarGroup eGroup, ShellId nToolBarId); void RemoveToolBar (ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName); - void RemoveToolBarShell (ToolBarGroup eGroup, ShellId nToolBarId); /** Release all tool bar shells and the associated framework tool bars. Typically called when the main view shell is being replaced by @@ -332,7 +318,6 @@ public: }; void LockViewShellManager (void); - bool IsUpdateLocked (void) const; void LockUpdate (void); void UnlockUpdate (void); @@ -430,15 +415,6 @@ void ToolBarManager::Shutdown (void) -void ToolBarManager::SetValid (bool bValid) -{ - if (mpImpl.get() != NULL) - mpImpl->SetValid(bValid); -} - - - - void ToolBarManager::ResetToolBars (ToolBarGroup eGroup) { if (mpImpl.get() != NULL) @@ -505,20 +481,6 @@ void ToolBarManager::RemoveToolBar ( -void ToolBarManager::RemoveToolBarShell ( - ToolBarGroup eGroup, - ShellId nToolBarId) -{ - if (mpImpl.get() != NULL) - { - UpdateLock aLock (shared_from_this()); - mpImpl->RemoveToolBarShell(eGroup,nToolBarId); - } -} - - - - void ToolBarManager::SetToolBar ( ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName) @@ -576,17 +538,6 @@ void ToolBarManager::LockViewShellManager (void) -bool ToolBarManager::IsUpdateLocked (void) const -{ - if (mpImpl.get() != NULL) - return mpImpl->IsUpdateLocked(); - else - return false; -} - - - - void ToolBarManager::LockUpdate (void) { if (mpImpl.get()!=NULL) @@ -819,21 +770,6 @@ void ToolBarManager::Implementation::AddToolBarShell ( -void ToolBarManager::Implementation::RemoveToolBarShell ( - ToolBarGroup eGroup, - ShellId nToolBarId) -{ - ViewShell* pMainViewShell = mrBase.GetMainViewShell().get(); - if (pMainViewShell != NULL) - { - GetToolBarRules().SubShellRemoved(eGroup, nToolBarId); - maToolBarShellList.RemoveShellId(eGroup,nToolBarId); - } -} - - - - void ToolBarManager::Implementation::ReleaseAllToolBarShells (void) { maToolBarShellList.ReleaseAllShells(GetToolBarRules()); @@ -946,14 +882,6 @@ void ToolBarManager::Implementation::LockViewShellManager (void) -bool ToolBarManager::Implementation::IsUpdateLocked (void) const -{ - return mnLockCount; -} - - - - void ToolBarManager::Implementation::LockUpdate (void) { #ifdef VERBOSE @@ -1705,26 +1633,6 @@ void ToolBarShellList::AddShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd:: -bool ToolBarShellList::RemoveShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd::ShellId nId) -{ - bool bRemoved (false); - - GroupedShellList::iterator iDescriptor (maNewList.find(ShellDescriptor(nId,eGroup))); - if (iDescriptor != maNewList.end()) - { - if (iDescriptor->meGroup == eGroup) - { - maNewList.erase(iDescriptor); - bRemoved = true; - } - } - - return bRemoved; -} - - - - void ToolBarShellList::ReleaseAllShells (ToolBarRules& rRules) { // Release the currently active tool bars. diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 6640d2455c20..813302136932 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -163,8 +163,6 @@ public: ::boost::shared_ptr<FormShellManager> mpFormShellManager; - ::boost::shared_ptr<CustomHandleManager> mpCustomHandleManager; - Implementation (ViewShellBase& rBase); ~Implementation (void); @@ -460,13 +458,6 @@ ViewShellBase* ViewShellBase::GetViewShellBase (SfxViewFrame* pViewFrame) -void ViewShellBase::GetMenuState (SfxItemSet& ) -{ -} - - - - DrawDocShell* ViewShellBase::GetDocShell (void) const { return mpDocShell; @@ -712,21 +703,6 @@ ErrCode ViewShellBase::DoPrint ( -USHORT ViewShellBase::SetPrinterOptDlg ( - SfxPrinter* pNewPrinter, - USHORT nDiffFlags, - BOOL bShowDialog) -{ - (void)pNewPrinter; - (void)nDiffFlags; - (void)bShowDialog; - return 0; - // return mpImpl->mpPrintManager->SetPrinterOptDlg ( pNewPrinter, nDiffFlags, bShowDialog); -} - - - - void ViewShellBase::PreparePrint (PrintDialog* pPrintDialog) { SfxViewShell::PreparePrint (pPrintDialog); @@ -1247,16 +1223,6 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB -CustomHandleManager& ViewShellBase::getCustomHandleManager() const -{ - OSL_ASSERT(mpImpl.get()!=NULL); - - if( !mpImpl->mpCustomHandleManager.get() ) - mpImpl->mpCustomHandleManager.reset( new ::sd::CustomHandleManager(*const_cast< ViewShellBase* >(this)) ); - - return *mpImpl->mpCustomHandleManager.get(); -} - ::rtl::OUString ViewShellBase::RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const { ::rtl::OUString aLabel; @@ -1813,34 +1779,4 @@ void FocusForwardingWindow::Command (const CommandEvent& rEvent) } // end of anonymouse namespace -// ==================================================================== - -CustomHandleManager::CustomHandleManager( ViewShellBase& rViewShellBase ) -: mrViewShellBase( rViewShellBase ) -{ -} - -CustomHandleManager::~CustomHandleManager() -{ - DBG_ASSERT( maSupplier.empty(), "sd::CustomHandleManager::~CustomHandleManager(), still suppliers attached!" ); -} - -void CustomHandleManager::registerSupplier( ICustomhandleSupplier* pSupplier ) -{ - maSupplier.insert( pSupplier ); -} - -void CustomHandleManager::unRegisterSupplier( ICustomhandleSupplier* pSupplier ) -{ - maSupplier.erase( pSupplier ); -} - -void CustomHandleManager::addCustomHandler( SdrView& rSourceView, ViewShell::ShellType eShellType, SdrHdlList& rHandlerList ) -{ - for( std::set< ICustomhandleSupplier* >::iterator aIter( maSupplier.begin() ); aIter != maSupplier.end(); aIter++ ) - { - (*aIter)->addCustomHandler( rSourceView, eShellType, rHandlerList ); - } -} - } // end of namespace sd diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 8193ae3004d2..463a05b530aa 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -69,48 +69,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; -namespace { - -class ImpUndoDeleteWarning : public ModalDialog -{ -private: - FixedImage maImage; - FixedText maWarningFT; - CheckBox maDisableCB; - OKButton maYesBtn; - CancelButton maNoBtn; - -public: - ImpUndoDeleteWarning(Window* pParent); - BOOL IsWarningDisabled() const { return maDisableCB.IsChecked(); } -}; - -ImpUndoDeleteWarning::ImpUndoDeleteWarning(Window* pParent) -: ModalDialog(pParent, SdResId(RID_UNDO_DELETE_WARNING)), - maImage(this, SdResId(IMG_UNDO_DELETE_WARNING)), - maWarningFT(this, SdResId(FT_UNDO_DELETE_WARNING)), - maDisableCB(this, SdResId(CB_UNDO_DELETE_DISABLE)), - maYesBtn(this, SdResId(BTN_UNDO_DELETE_YES)), - maNoBtn(this, SdResId(BTN_UNDO_DELETE_NO)) -{ - FreeResource(); - - SetHelpId( HID_SD_UNDODELETEWARNING_DLG ); - maDisableCB.SetHelpId( HID_SD_UNDODELETEWARNING_CBX ); - - maYesBtn.SetText(Button::GetStandardText(BUTTON_YES)); - maNoBtn.SetText(Button::GetStandardText(BUTTON_NO)); - maImage.SetImage(WarningBox::GetStandardImage()); - - // #93721# Set focus to YES-Button - maYesBtn.GrabFocus(); -} - -} // end of anonymous namespace - - - - namespace sd { ViewShell::Implementation::Implementation (ViewShell& rViewShell) diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 3ea4ef7a96f3..681536f34160 100755 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -124,10 +124,6 @@ public: void RemoveShellFactory ( const SfxShell* pViewShell, const SharedShellFactory& rpFactory); - ViewShell* ActivateViewShell ( - ShellId nId, - ::Window* pParentWindow, - FrameView* pFrameView); void ActivateViewShell ( ViewShell* pViewShell); void DeactivateViewShell (const ViewShell& rShell); @@ -137,13 +133,10 @@ public: void SetFormShell (const ViewShell* pViewShell, FmFormShell* pFormShell, bool bAbove); void ActivateSubShell (const SfxShell& rParentShell, ShellId nId); void DeactivateSubShell (const SfxShell& rParentShell, ShellId nId); - void DeactivateAllSubShells (const SfxShell& rViewShell); void MoveSubShellToTop (const SfxShell& rParentShell, ShellId nId); void MoveToTop (const SfxShell& rParentShell); SfxShell* GetShell (ShellId nId) const; SfxShell* GetTopShell (void) const; - ShellId GetShellId (const SfxShell* pShell) const; - void ReplaceUndoManager (SfxUndoManager* pManager, SfxUndoManager* pReplacement); void Shutdown (void); void InvalidateAllSubShells (const SfxShell* pParentShell); @@ -235,7 +228,6 @@ private: DECL_LINK(WindowEventHandler, VclWindowEvent*); - void DumpActiveShell (const ActiveShellList& rList); void DumpShellStack (const ShellStack& rStack); void DumpSfxShellStack (void); @@ -246,10 +238,6 @@ private: */ void Deactivate (SfxShell* pShell); - ShellDescriptor CreateViewShell ( - ShellId nShellId, - ::Window* pParentWindow, - FrameView* pFrameView); ShellDescriptor CreateSubShell ( SfxShell* pShell, ShellId nShellId, @@ -304,20 +292,6 @@ void ViewShellManager::RemoveSubShellFactory ( -ViewShell* ViewShellManager::ActivateViewShell ( - ShellId nShellId, - ::Window* pParentWindow, - FrameView* pFrameView) -{ - if (mbValid) - return mpImpl->ActivateViewShell(nShellId,pParentWindow,pFrameView); - else - return NULL; -} - - - - void ViewShellManager::ActivateViewShell (ViewShell* pViewShell) { if (mbValid) @@ -377,15 +351,6 @@ void ViewShellManager::DeactivateSubShell (const ViewShell& rViewShell, ShellId -void ViewShellManager::DeactivateAllSubShells (const ViewShell& rViewShell) -{ - if (mbValid) - mpImpl->DeactivateAllSubShells(rViewShell); -} - - - - void ViewShellManager::InvalidateAllSubShells (ViewShell* pViewShell) { if (mbValid) @@ -413,15 +378,6 @@ void ViewShellManager::DeactivateShell (const SfxShell* pShell) -void ViewShellManager::InvalidateShellStack (const SfxShell* pShell) -{ - if (mbValid) - mpImpl->TakeShellsFromStack(pShell); -} - - - - void ViewShellManager::MoveToTop (const ViewShell& rParentShell) { if (mbValid) @@ -453,26 +409,6 @@ SfxShell* ViewShellManager::GetTopShell (void) const -ShellId ViewShellManager::GetShellId (const SfxShell* pShell) const -{ - if (mbValid) - return mpImpl->GetShellId(pShell); - else - return snInvalidShellId; -} - - - - -void ViewShellManager::ReplaceUndoManager (SfxUndoManager* pManager, SfxUndoManager* pReplacement) -{ - if (mbValid) - mpImpl->ReplaceUndoManager(pManager,pReplacement); -} - - - - void ViewShellManager::Shutdown (void) { if (mbValid) @@ -572,24 +508,6 @@ void ViewShellManager::Implementation::RemoveShellFactory ( -ViewShell* ViewShellManager::Implementation::ActivateViewShell ( - ShellId nShellId, - ::Window* pParentWindow, - FrameView* pFrameView) -{ - ::osl::MutexGuard aGuard (maMutex); - - // Create a new shell or recycle on in the cache. - ShellDescriptor aDescriptor (CreateViewShell(nShellId, pParentWindow, pFrameView)); - - ActivateShell(aDescriptor); - - return dynamic_cast<ViewShell*>(aDescriptor.mpShell); -} - - - - void ViewShellManager::Implementation::ActivateViewShell (ViewShell* pViewShell) { ::osl::MutexGuard aGuard (maMutex); @@ -953,66 +871,6 @@ SfxShell* ViewShellManager::Implementation::GetTopShell (void) const -ShellId ViewShellManager::Implementation::GetShellId (const SfxShell* pShell) const -{ - ::osl::MutexGuard aGuard (maMutex); - - ShellId nId = snInvalidShellId; - - // First search the active view shells. - const ViewShell* pViewShell = dynamic_cast<const ViewShell*>(pShell); - if (pShell != NULL) - { - ActiveShellList::const_iterator iShell ( - ::std::find_if ( - maActiveViewShells.begin(), - maActiveViewShells.end(), - IsShell(pViewShell))); - if (iShell != maActiveViewShells.end()) - nId = iShell->mnId; - } - if (nId == snInvalidShellId) - { - // Now search the active sub shells of every active view shell. - SubShellList::const_iterator iList; - for (iList=maActiveSubShells.begin(); iList!=maActiveSubShells.end(); ++iList) - { - const SubShellSubList& rList (iList->second); - SubShellSubList::const_iterator iSubShell( - ::std::find_if(rList.begin(),rList.end(), IsShell(pShell))); - if (iSubShell != rList.end()) - { - nId = iSubShell->mnId; - break; - } - } - } - - return nId; -} - - - - -void ViewShellManager::Implementation::ReplaceUndoManager ( - SfxUndoManager* pManager, - SfxUndoManager* pReplacement) -{ - for (USHORT i=0; ;++i) - { - SfxShell* pShell = mrBase.GetSubShell(i); - if (pShell == NULL) - break; - if (pShell->GetUndoManager() == pManager) - pShell->SetUndoManager(pReplacement); - } -} - - - - - - void ViewShellManager::Implementation::LockUpdate (void) { mnUpdateLockCount++; @@ -1333,44 +1191,6 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, -ShellDescriptor ViewShellManager::Implementation::CreateViewShell ( - ShellId nShellId, - ::Window* pParentWindow, - FrameView* pFrameView) -{ - ShellDescriptor aResult; - - if (pParentWindow != NULL) - { - ShellDescriptor aDescriptor ( - CreateSubShell(NULL,nShellId,pParentWindow,pFrameView)); - aResult.mpShell = dynamic_cast<ViewShell*>(aDescriptor.mpShell); - aResult.mpFactory = aDescriptor.mpFactory; - aResult.mnId = aDescriptor.mnId; - - // Register as window listener so that the shells of the current - // window can be moved to the top of the shell stack. - if (aResult.mpShell != NULL) - { - ::Window* pWindow = aResult.GetWindow(); - if (pWindow != NULL) - pWindow->AddEventListener( - LINK(this, ViewShellManager::Implementation, WindowEventHandler)); - else - { - DBG_ASSERT (false, - "ViewShellManager::ActivateViewShell: " - "new view shell has no active window"); - } - } - } - - return aResult; -} - - - - ShellDescriptor ViewShellManager::Implementation::CreateSubShell ( SfxShell* pParentShell, ShellId nShellId, @@ -1499,15 +1319,6 @@ void ViewShellManager::Implementation::Shutdown (void) -void ViewShellManager::Implementation::DumpActiveShell (const ActiveShellList& rList) -{ - for (ActiveShellList::const_iterator aI=rList.begin(); aI!=rList.end(); ++aI) - OSL_TRACE (" %d %p\r", aI->mnId, aI->mpShell); -} - - - - void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack) { ShellStack::const_reverse_iterator iEntry; @@ -1580,24 +1391,6 @@ void ViewShellManager::Implementation::SetFormShell ( -void ViewShellManager::Implementation::DeactivateAllSubShells ( - const SfxShell& rViewShell) -{ - ::osl::MutexGuard aGuard (maMutex); - - SubShellList::iterator iList (maActiveSubShells.find(&rViewShell)); - if (iList != maActiveSubShells.end()) - { - SubShellSubList& rList (iList->second); - UpdateLock aLock (*this); - while ( ! rList.empty()) - DeactivateSubShell(rViewShell, rList.front().mnId); - } -} - - - - namespace { ShellDescriptor::ShellDescriptor (void) diff --git a/sd/source/ui/view/bmcache.cxx b/sd/source/ui/view/bmcache.cxx index d8781733c520..c7f313037ff8 100644 --- a/sd/source/ui/view/bmcache.cxx +++ b/sd/source/ui/view/bmcache.cxx @@ -58,115 +58,6 @@ BitmapCache::~BitmapCache() } } -/************************************************************************* -|* -|* Cache-Eintrag einfuegen -|* -\************************************************************************/ - -void BitmapCache::Add(const SdPage* pPage, const Bitmap& rBmp, long nZoom) -{ - BitmapCacheEntry* pEntry = NULL; - ULONG nSizeOfBitmap = rBmp.GetSizeBytes(); - - if( nSizeOfBitmap < nMaxSize ) - { - while (nCurSize + nSizeOfBitmap > nMaxSize) - { - if( aEntries.Count() ) - { - pEntry = (BitmapCacheEntry*) aEntries.Remove(aEntries.Count() - 1); - - if( pEntry && pEntry->pGraphicObject ) - { - nCurSize -= pEntry->nSizeBytes; - delete pEntry->pGraphicObject; - } - - delete pEntry; - } - else - break; - } - - pEntry = new BitmapCacheEntry; - pEntry->pPage = pPage; - pEntry->pGraphicObject = new GraphicObject( rBmp ); - pEntry->nSizeBytes = nSizeOfBitmap; - pEntry->nZoom = nZoom; - - aEntries.Insert( pEntry, (ULONG) 0 ); - nCurSize += nSizeOfBitmap; - } -} - -/************************************************************************* -|* -|* Cache-Eintrag suchen, Bitmap-Zeiger zurueckgeben (NULL, wenn Bitmap nicht -|* im Cache) -|* - auf rZoomPercent wird der Zoomfaktor der Bitmap geschrieben -|* - abs(nZoomTolerance) gibt die maximal erlaubte Abweichung des -|* Zoomfaktors an; ist die Toleranz negativ, so sucht der Cache den -|* "best fit", sonst den "first fit", -|* - es werden nur Bitmaps mit Zoomfaktoren kleiner oder gleich rZoomPercent -|* beruecksichtigt, um ein Verkleinern der Bitmap beim Zeichnen zu vermeiden -|* -\************************************************************************/ - -const GraphicObject* BitmapCache::Get( const SdPage* pPage, long& rZoomPercent, long nZoomTolerancePercent) -{ - BitmapCacheEntry* pEntry = NULL; - GraphicObject* pGraphicObject = NULL; - - if( nZoomTolerancePercent < 0 ) - { - // "best fit"-Suche - long nTolerance = -nZoomTolerancePercent; - BitmapCacheEntry* pBest = NULL; - long nBest = LONG_MAX; - long nTest = 0L; - - for( ULONG nPos = 0; nPos < aEntries.Count(); nPos++ ) - { - pEntry = (BitmapCacheEntry*) aEntries.GetObject( nPos ); - - if( pEntry->pPage == pPage ) - { - nTest = rZoomPercent - pEntry->nZoom; - - if( nTest >= 0 && nTest < nBest && nTest <= nTolerance ) - pBest = pEntry; - } - } - - pEntry = pBest; - } - else - { - // "first fit"-suche - for( ULONG nPos = 0; nPos < aEntries.Count(); nPos++ ) - { - pEntry = (BitmapCacheEntry*)aEntries.GetObject( nPos ); - - if (pEntry->pPage == pPage && Abs( pEntry->nZoom - rZoomPercent ) <= nZoomTolerancePercent ) - break; - else - pEntry = NULL; - } - } - - // was passendes gefunden? - if( pEntry ) - { - pGraphicObject = pEntry->pGraphicObject; - aEntries.Remove( pEntry ); - aEntries.Insert( pEntry, (ULONG) 0 ); - rZoomPercent = pEntry->nZoom; - } - - return pGraphicObject; -} - void BitmapCache::Remove( const SdPage* pPage ) { for( ULONG nPos = 0; nPos < aEntries.Count(); ) diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 4b9aecb02ac5..302bdab6f115 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -92,7 +92,6 @@ #include "slideshow.hxx" #include "optsitem.hxx" #include "fusearch.hxx" -#include "fuspell.hxx" #include "Outliner.hxx" #include "AnimationChildWindow.hxx" #include "SdUnoDrawView.hxx" diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index aa1a0f53c15a..9669a33bd402 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -105,48 +105,6 @@ namespace sd { /************************************************************************* |* -|* modal dialog for #90356# -|* -\************************************************************************/ - -class ImpUndoDeleteWarning : public ModalDialog -{ -private: - FixedImage maImage; - FixedText maWarningFT; - CheckBox maDisableCB; - OKButton maYesBtn; - CancelButton maNoBtn; - -public: - ImpUndoDeleteWarning(Window* pParent); - BOOL IsWarningDisabled() const { return maDisableCB.IsChecked(); } -}; - -ImpUndoDeleteWarning::ImpUndoDeleteWarning(Window* pParent) -: ModalDialog(pParent, SdResId(RID_UNDO_DELETE_WARNING)), - maImage(this, SdResId(IMG_UNDO_DELETE_WARNING)), - maWarningFT(this, SdResId(FT_UNDO_DELETE_WARNING)), - maDisableCB(this, SdResId(CB_UNDO_DELETE_DISABLE)), - maYesBtn(this, SdResId(BTN_UNDO_DELETE_YES)), - maNoBtn(this, SdResId(BTN_UNDO_DELETE_NO)) -{ - FreeResource(); - - SetHelpId( HID_SD_UNDODELETEWARNING_DLG ); - maDisableCB.SetHelpId( HID_SD_UNDODELETEWARNING_CBX ); - - maYesBtn.SetText(Button::GetStandardText(BUTTON_YES)); - maNoBtn.SetText(Button::GetStandardText(BUTTON_NO)); - maImage.SetImage(WarningBox::GetStandardImage()); - - // #93721# Set focus to YES-Button - maYesBtn.GrabFocus(); -} - - -/************************************************************************* -|* |* SfxRequests fuer temporaere Funktionen |* \************************************************************************/ diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 4dd3c61556e1..3ca5644d040b 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -193,32 +193,6 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet) /************************************************************************* |* -|* SfxRequests fuer Objektpalette bearbeiten -|* -\************************************************************************/ - -void DrawViewShell::ExecObjPalette( SfxRequest& ) -{ - // Diese Methode muss erhalten bleiben, bis - // der/die Slots entfernt wurden; - // ==> Voll-Update -} - -/************************************************************************* -|* -|* Statuswerte fuer Objektpalette zurueckgeben -|* -\************************************************************************/ - -void DrawViewShell::GetObjPaletteState(SfxItemSet& ) -{ - // Diese Methode muss erhalten bleiben, bis - // der/die Slots entfernt wurden; - // ==> Voll-Update -} - -/************************************************************************* -|* |* SfxRequests fuer Animator bearbeiten |* \************************************************************************/ diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 4d30831f4e2a..882e3040d134 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -150,21 +150,6 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas /************************************************************************* |* -|* Copy-Konstruktor -|* -\************************************************************************/ - -DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ::Window* pParentWindow, const DrawViewShell& rShell ) -: ViewShell(pFrame, pParentWindow, rShell) -, maTabControl(this, pParentWindow) -, mbIsInSwitchPage(false) -{ - mpFrameView = new FrameView(GetDoc()); - Construct (GetDocSh(), PK_STANDARD); -} - -/************************************************************************* -|* |* Destruktor |* \************************************************************************/ diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx index 1c22348f8b87..646a437c42bf 100644 --- a/sd/source/ui/view/grviewsh.cxx +++ b/sd/source/ui/view/grviewsh.cxx @@ -61,24 +61,6 @@ GraphicViewShell::GraphicViewShell ( ConstructGraphicViewShell(); } -/************************************************************************* -|* -|* Copy-Konstruktor -|* -\************************************************************************/ - -GraphicViewShell::GraphicViewShell ( - SfxViewFrame* pFrame, - ::Window* pParentWindow, - const DrawViewShell& rShell) - : DrawViewShell (pFrame, pParentWindow, rShell) -{ - ConstructGraphicViewShell(); -} - - - - GraphicViewShell::~GraphicViewShell (void) { } diff --git a/sd/source/ui/view/makefile.mk b/sd/source/ui/view/makefile.mk index 3b3bca4ff3d5..4acd747adc65 100644 --- a/sd/source/ui/view/makefile.mk +++ b/sd/source/ui/view/makefile.mk @@ -84,7 +84,6 @@ SLOFILES = \ $(SLO)$/presvish.obj \ $(SLO)$/outlview.obj \ $(SLO)$/tabcontr.obj \ - $(SLO)$/showview.obj \ $(SLO)$/bmcache.obj \ $(SLO)$/drbezob.obj \ $(SLO)$/drtxtob.obj \ diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 1467e6c24bd0..aa11707cdb32 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -235,31 +235,6 @@ OutlineViewShell::OutlineViewShell ( Construct(GetDocSh()); } - -/************************************************************************* -|* -|* Copy-Konstruktor -|* -\************************************************************************/ - -OutlineViewShell::OutlineViewShell ( - SfxViewFrame* pFrame, - ::Window* pParentWindow, - const OutlineViewShell& rShell) - : ViewShell (pFrame, pParentWindow, rShell), - pOlView(NULL), - pLastPage( NULL ), - pClipEvtLstnr(NULL), - bPastePossible(FALSE), - mbInitialized(false) - -{ - mpFrameView = new FrameView(GetDoc()); - mpFrameView->Connect(); - - Construct(GetDocSh()); -} - /************************************************************************* |* |* Destruktor diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 30daec8b636e..dfad4b34c6f2 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -2040,6 +2040,7 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo) return 0; } +#if 0 sal_Int32 OutlineView::GetPageNumberWidthPixel() { Window* pActWin = mpOutlineViewShell->GetActiveWindow(); @@ -2062,6 +2063,7 @@ sal_Int32 OutlineView::GetPageNumberWidthPixel() } return mnPageNumberWidthPixel; } +#endif // -------------------------------------------------------------------- diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 813c6caba95a..3aed9c6c0d9c 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -969,89 +969,6 @@ void View::SetMarkedOriginalSize() delete pUndoGroup; } -/** create a virtual device and paints the slide contents into it. - The caller must delete the returned device */ -VirtualDevice* View::CreatePageVDev(USHORT nSdPage, PageKind ePageKind, ULONG nWidthPixel) -{ - ViewShell* pViewShell = mpDocSh->GetViewShell(); - OutputDevice* pRefDevice = 0; - if( pViewShell ) - pRefDevice = pViewShell->GetActiveWindow(); - - if( !pRefDevice ) - pRefDevice = Application::GetDefaultDevice(); - - DBG_ASSERT( pRefDevice, "sd::View::CreatePageVDev(), I need a reference device to work properly!" ); - - VirtualDevice* pVDev; - if( pRefDevice ) - pVDev = new VirtualDevice( *pRefDevice ); - else - pVDev = new VirtualDevice(); - - MapMode aMM( MAP_100TH_MM ); - - SdPage* pPage = mpDoc->GetSdPage(nSdPage, ePageKind); - DBG_ASSERT(pPage, "sd::View::CreatePageVDev(), slide not found!"); - - if( pPage ) - { - Size aPageSize(pPage->GetSize()); - aPageSize.Width() -= pPage->GetLftBorder(); - aPageSize.Width() -= pPage->GetRgtBorder(); - aPageSize.Height() -= pPage->GetUppBorder(); - aPageSize.Height() -= pPage->GetLwrBorder(); - - // use scaling? - if( nWidthPixel ) - { - const Fraction aFrac( (long) nWidthPixel, pVDev->LogicToPixel( aPageSize, aMM ).Width() ); - - aMM.SetScaleX( aFrac ); - aMM.SetScaleY( aFrac ); - } - - pVDev->SetMapMode( aMM ); - if( pVDev->SetOutputSize(aPageSize) ) - { - std::auto_ptr< SdrView > pView( new SdrView(mpDoc, pVDev) ); - pView->SetPageVisible( FALSE ); - pView->SetBordVisible( FALSE ); - pView->SetGridVisible( FALSE ); - pView->SetHlplVisible( FALSE ); - pView->SetGlueVisible( FALSE ); - pView->ShowSdrPage(pPage); // WAITING FOR SJ , Point(-pPage->GetLftBorder(), -pPage->GetUppBorder())); - SdrPageView* pPageView = pView->GetSdrPageView(); - if( pViewShell ) - { - FrameView* pFrameView = pViewShell->GetFrameView(); - if( pFrameView ) - { - pPageView->SetVisibleLayers( pFrameView->GetVisibleLayers() ); - pPageView->SetLockedLayers( pFrameView->GetLockedLayers() ); - pPageView->SetPrintableLayers( pFrameView->GetPrintableLayers() ); - } - } - - // SJ: i40609, the vdev mapmode seems to be dangled after CompleteRedraw, - // so we are pushing here, because the mapmode is used afterwards - pVDev->Push(); - - Point aPoint( 0, 0 ); - Region aRegion (Rectangle( aPoint, aPageSize ) ); - pView->CompleteRedraw(pVDev, aRegion); - pVDev->Pop(); - } - else - { - DBG_ERROR("sd::View::CreatePageVDev(), virt. device creation failed!"); - } - } - return pVDev; -} - - - /************************************************************************* |* |* OLE-Obj am Client connecten diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 44e5127bfb25..1767217ebea3 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -599,11 +599,6 @@ void View::LockRedraw(BOOL bLock) -bool View::IsRedrawLocked (void) const -{ - return mnLockRedrawSmph>0; -} - /************************************************************************* |* |* StyleSheet aus der Sleketion besorgen diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 7cae5d452a1b..268d77fa8fd8 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -147,35 +147,6 @@ void Window::SetViewShell (ViewShell* pViewSh) } } - - - -/************************************************************************* -|* -|* Die Haelfte des Sichtbaren Bereich eines anderen Fensters darstellen -|* -\************************************************************************/ - -void Window::ShareViewArea(Window* pOtherWin) -{ - mpShareWin = pOtherWin; - maViewOrigin = pOtherWin->maViewOrigin; - maViewSize = pOtherWin->maViewSize; - mnMinZoom = pOtherWin->mnMinZoom; - mnMaxZoom = pOtherWin->mnMaxZoom; - mbCenterAllowed = pOtherWin->mbCenterAllowed; - - long nZoom = pOtherWin->GetZoom(); - MapMode aMap(GetMapMode()); - aMap.SetScaleX(Fraction(nZoom, 100)); - aMap.SetScaleY(Fraction(nZoom, 100)); - aMap.SetOrigin(pOtherWin->GetMapMode().GetOrigin()); - SetMapMode(aMap); -} - - - - void Window::CalcMinZoom() { // Are we entitled to change the minimal zoom factor? diff --git a/sd/source/ui/view/showview.cxx b/sd/source/ui/view/showview.cxx deleted file mode 100644 index a60195eac1b8..000000000000 --- a/sd/source/ui/view/showview.cxx +++ /dev/null @@ -1,170 +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 "showview.hxx" -#include <svx/svdmodel.hxx> -#include <svx/fmview.hxx> - - -#include "drawdoc.hxx" -#include "sdpage.hxx" -#include "ViewShell.hxx" -#include "FrameView.hxx" - -namespace sd { - -#ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED -#define SO2_DECL_SVINPLACEOBJECT_DEFINED -SO2_DECL_REF(SvInPlaceObject) -#endif -#ifndef SO2_DECL_SVINPLACECLIENT_DEFINED -#define SO2_DECL_SVINPLACECLIENT_DEFINED -SO2_DECL_REF(SvInPlaceClient) -#endif - -/************************************************************************* -|* -|* der Konstruktor setzt den MapMode und arrangiert die einzelnen Seiten -|* -\************************************************************************/ - -ShowView::ShowView ( - SdDrawDocument* pDoc, - OutputDevice* pOut, - ViewShell* pViewShell, - ::Window* pWin) - : FmFormView(pDoc, pOut), - pDrDoc(pDoc), - mpViewSh(pViewShell), - pWindowForPlugIns(pWin), - nAllowInvalidateSmph(0), - bAllowMasterPageCaching(TRUE) -{ - // #i73602# Use default from the configuration - SetBufferedOverlayAllowed(getOptionsDrawinglayer().IsOverlayBuffer_DrawImpress()); - - // #i74769#, #i75172# Use default from the configuration - SetBufferedOutputAllowed(getOptionsDrawinglayer().IsPaintBuffer_DrawImpress()); - - EnableExtendedKeyInputDispatcher(FALSE); - EnableExtendedMouseEventDispatcher(FALSE); - EnableExtendedCommandEventDispatcher(FALSE); -} - -/************************************************************************* -|* -|* Destruktor -|* -\************************************************************************/ - -ShowView::~ShowView() -{ -} - -/************************************************************************* -|* -|* Zaehler fuer Invalidierungserlaubnis hoch- oder runter zaehlen -|* -\************************************************************************/ - -void ShowView::SetAllowInvalidate(BOOL bFlag) -{ - if (!bFlag) - { - nAllowInvalidateSmph++; - } - else if (nAllowInvalidateSmph > 0) - { - nAllowInvalidateSmph--; - } -} - -/************************************************************************* -|* -|* ermittelt, ob invalidiert werden darf -|* -\************************************************************************/ - -BOOL ShowView::IsInvalidateAllowed() const -{ - return (nAllowInvalidateSmph == 0); -} - -/************************************************************************* -|* -|* Invalidate abfangen -|* -\************************************************************************/ - -void ShowView::InvalidateOneWin (::Window& rWin) -{ - if (IsInvalidateAllowed()) - { - FmFormView::InvalidateOneWin(rWin); - } -} - -/************************************************************************* -|* -|* Invalidate abfangen -|* -\************************************************************************/ - -void ShowView::InvalidateOneWin (::Window& rWin, const Rectangle& rRect) -{ - if (IsInvalidateAllowed()) - { - FmFormView::InvalidateOneWin(rWin, rRect); - } -} - -/************************************************************************* -|* -|* Paint-Methode: das Ereignis wird an die View weitergeleitet -|* -\************************************************************************/ - -void ShowView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/) -{ - FmFormView::CompleteRedraw(pOutDev, rReg, pRedirector); -} - -/************************************************************************* -|* -|* DoConnect -|* -\************************************************************************/ - -void ShowView::DoConnect(SdrOle2Obj* ) -{ - // connected wird jetzt in FuSlideShow::ShowPlugIns() -} - -} // end of namespace sd diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 5a3426a42533..616516782be3 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -526,34 +526,6 @@ void ViewShell::DrawMarkRect(const Rectangle& rRect) const } } - -/************************************************************************* -|* -|* Auf allen Split-Windows ein Rechteck zeichnen. Fuer den Rahmen wird der -|* uebergebene Pen, zum Fuellen die uebergebene Brush benutzt. -|* -\************************************************************************/ - -void ViewShell::DrawFilledRect( const Rectangle& rRect, const Color& rLColor, - const Color& rFColor ) const -{ - if (mpContentWindow.get() != NULL) - { - const Color& rOldLineColor = mpContentWindow->GetLineColor(); - const Color& rOldFillColor = mpContentWindow->GetFillColor(); - - mpContentWindow->SetLineColor( rLColor ); - mpContentWindow->SetFillColor( rFColor ); - - mpContentWindow->DrawRect(rRect); - - mpContentWindow->SetLineColor( rOldLineColor ); - mpContentWindow->SetFillColor( rOldFillColor ); - } -} - - - /************************************************************************* |* |* Groesse und Raender aller Seiten setzen @@ -851,18 +823,6 @@ void ViewShell::WriteFrameViewData() /************************************************************************* |* -|* Auf allen Split-Windows ein Update erzwingen. -|* -\************************************************************************/ - -void ViewShell::UpdateWindows() -{ - if (mpContentWindow.get() != NULL) - mpContentWindow->Update(); -} - -/************************************************************************* -|* |* OLE-Object aktivieren |* \************************************************************************/ diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 578026018b9f..c1f4bc070bcf 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -173,14 +173,6 @@ ViewShell::ViewShell( SfxViewFrame*, ::Window* pParentWindow, ViewShellBase& rVi construct(); } -ViewShell::ViewShell( SfxViewFrame*, ::Window* pParentWindow, const ViewShell& rShell) -: SfxShell(rShell.GetViewShell()) -, mbCenterAllowed(rShell.mbCenterAllowed) -, mpParentWindow(pParentWindow) -{ - construct(); -} - ViewShell::~ViewShell() { // Keep the content window from accessing in its destructor the diff --git a/sd/source/ui/view/zoomlist.cxx b/sd/source/ui/view/zoomlist.cxx index 6f4d56b6f0a3..9ae178e3d7a6 100644 --- a/sd/source/ui/view/zoomlist.cxx +++ b/sd/source/ui/view/zoomlist.cxx @@ -112,19 +112,6 @@ void ZoomList::InsertZoomRect(const Rectangle& rRect) rBindings.Invalidate( SID_ZOOM_PREV ); } - -/************************************************************************* -|* -|* Aktuelles ZoomRect herausgeben -|* -\************************************************************************/ - -Rectangle ZoomList::GetCurrentZoomRect() const -{ - Rectangle aRect(*(Rectangle*) GetObject(mnCurPos)); - return (aRect); -} - /************************************************************************* |* |* Naechstes ZoomRect herausgeben |