diff options
Diffstat (limited to 'sd/source/ui/func')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/func/fuconstr.cxx | 7 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/func/fudraw.cxx | 8 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/func/fuoutl.cxx | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/func/fupoor.cxx | 22 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/func/fusearch.cxx | 9 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/func/fusnapln.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/func/fuspell.cxx | 166 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/func/futransf.cxx | 25 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/func/makefile.mk | 4 | ||||
| -rw-r--r-- | sd/source/ui/func/outlinfo.cxx | 301 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/func/sdundogr.cxx | 11 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/func/unoaprms.cxx | 46 |
12 files changed, 9 insertions, 597 deletions
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index 1a1ecf7de..1d62b9a76 100644..100755 --- 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 70e4e4712..4a93eff1e 100644..100755 --- 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 1f4d92e6e..2f26f0a81 100644..100755 --- 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 9e85a6d9a..7bfafc33f 100644..100755 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -247,16 +247,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 @@ -1121,18 +1111,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 48abb5759..b7781d984 100644..100755 --- 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/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index 1e0508780..e99220578 100644..100755 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -123,6 +123,7 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) { OSL_ASSERT(pPV!=NULL); aLinePos = (pPV->GetHelpLines())[nHelpLine].GetPos(); + pPV->LogicToPagePos(aLinePos); bLineExist = true; } aNewAttr.Put(SfxUInt32Item(ATTR_SNAPLINE_X, aLinePos.X())); diff --git a/sd/source/ui/func/fuspell.cxx b/sd/source/ui/func/fuspell.cxx deleted file mode 100644 index b07aff27b..000000000 --- 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 f4ee320c1..8e39dc38b 100644..100755 --- 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 9ec946325..e4df8fe9d 100644..100755 --- 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 \ @@ -159,7 +157,6 @@ LIB3OBJFILES= \ $(SLO)$/fuolbull.obj \ $(SLO)$/fucopy.obj \ $(SLO)$/fulink.obj \ - $(SLO)$/fuspell.obj \ $(SLO)$/futhes.obj \ $(SLO)$/fusearch.obj \ $(SLO)$/fuinsfil.obj \ @@ -173,7 +170,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 886a3fa5b..000000000 --- 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 7393864b1..11b8b70d1 100644..100755 --- 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 86da40636..b6a529947 100644..100755 --- 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() |* \************************************************************************/ |