diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-08-19 15:09:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-08-20 10:17:07 +0100 |
commit | f8dafc05e3f2621bdd4ed871aaa00366792a2f48 (patch) | |
tree | 5aa9ae3728dc4f95377f7f9f2acc1f5c0a0af762 | |
parent | fix fallout of c1b73536343ae0a7b6dd940b1c8a01784c4d7a30 (diff) | |
download | binfilter-f8dafc05e3f2621bdd4ed871aaa00366792a2f48.tar.gz binfilter-f8dafc05e3f2621bdd4ed871aaa00366792a2f48.zip |
callcatcher: ditch some unused methods
Change-Id: I11a0b7e8ee9ee419279c947dd282cd1437ff3e2f
-rw-r--r-- | binfilter/bf_sd/source/filter/propread.hxx | 12 | ||||
-rw-r--r-- | binfilter/bf_sd/source/filter/sd_propread.cxx | 32 | ||||
-rw-r--r-- | binfilter/bf_svtools/source/misc/tl_strimp.cxx | 44 | ||||
-rw-r--r-- | binfilter/bf_svtools/source/misc/tl_tstring.cxx | 42 | ||||
-rw-r--r-- | binfilter/bf_svx/source/svdraw/makefile.mk | 1 | ||||
-rw-r--r-- | binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx | 1 | ||||
-rw-r--r-- | binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx | 65 | ||||
-rw-r--r-- | binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx | 83 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/frmedt/sw_fews.cxx | 4 | ||||
-rw-r--r-- | binfilter/bf_sw/source/ui/inc/edtwin.hxx | 2 | ||||
-rw-r--r-- | binfilter/bf_sw/source/ui/utlui/sw_initui.cxx | 1 | ||||
-rw-r--r-- | binfilter/inc/bf_svx/svdpntv.hxx | 13 | ||||
-rw-r--r-- | binfilter/inc/bf_svx/svdvmark.hxx | 153 | ||||
-rw-r--r-- | binfilter/inc/bf_sw/fesh.hxx | 3 | ||||
-rw-r--r-- | binfilter/inc/bf_tools/string.hxx | 1 |
15 files changed, 44 insertions, 413 deletions
diff --git a/binfilter/bf_sd/source/filter/propread.hxx b/binfilter/bf_sd/source/filter/propread.hxx index 35ae1f98d..4a9984b97 100644 --- a/binfilter/bf_sd/source/filter/propread.hxx +++ b/binfilter/bf_sd/source/filter/propread.hxx @@ -105,18 +105,6 @@ class PropItem : public SvMemoryStream PropItem& operator=( PropItem& rPropItem ); }; -// ------------------------------------------------------------------------ - -class Dictionary : protected List -{ - friend class Section; - - public : - Dictionary(){}; - ~Dictionary(); - Dictionary& operator=( Dictionary& rDictionary ); -}; - } //namespace binfilter #endif diff --git a/binfilter/bf_sd/source/filter/sd_propread.cxx b/binfilter/bf_sd/source/filter/sd_propread.cxx index d8c812464..64583c724 100644 --- a/binfilter/bf_sd/source/filter/sd_propread.cxx +++ b/binfilter/bf_sd/source/filter/sd_propread.cxx @@ -40,38 +40,6 @@ PropItem& PropItem::operator=( PropItem& rPropItem ) return *this; } -// ----------------------------------------------------------------------- - -struct Dict -{ - sal_uInt32 mnId; - String aString; - - Dict( sal_uInt32 nId, String rString ) { mnId = nId; aString = rString; }; -}; - -// ----------------------------------------------------------------------- - -Dictionary::~Dictionary() -{ - for ( void* pPtr = First(); pPtr; pPtr = Next() ) - delete (Dict*)pPtr; -} - -// ----------------------------------------------------------------------- - -Dictionary& Dictionary::operator=( Dictionary& rDictionary ) -{ - if ( this != &rDictionary ) - { - void* pPtr; for ( pPtr = First(); pPtr; pPtr = Next() ) - delete (Dict*)pPtr; - - for ( pPtr = rDictionary.First(); pPtr; pPtr = rDictionary.Next() ) - Insert( new Dict( ((Dict*)pPtr)->mnId, ((Dict*)pPtr)->aString ), LIST_APPEND ); - } - return *this; -} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/binfilter/bf_svtools/source/misc/tl_strimp.cxx b/binfilter/bf_svtools/source/misc/tl_strimp.cxx index 8e0641b07..a30f8c1d1 100644 --- a/binfilter/bf_svtools/source/misc/tl_strimp.cxx +++ b/binfilter/bf_svtools/source/misc/tl_strimp.cxx @@ -531,50 +531,6 @@ xub_StrLen STRING::Search( STRCODE c, xub_StrLen nIndex ) const // ----------------------------------------------------------------------- -xub_StrLen STRING::Search( const STRCODE* pCharStr, xub_StrLen nIndex ) const -{ - DBG_CHKTHIS( STRING, DBGCHECKSTRING ); - - sal_Int32 nLen = mpData->mnLen; - xub_StrLen nStrLen = ImplStringLen( pCharStr ); - - // Falls die Laenge des uebergebenen Strings 0 ist oder der Index - // hinter dem String liegt, dann wurde der String nicht gefunden - if ( !nStrLen || (nIndex >= nLen) ) - return STRING_NOTFOUND; - - const STRCODE* pStr = mpData->maStr; - pStr += nIndex; - - if ( nStrLen == 1 ) - { - STRCODE cSearch = *pCharStr; - while ( nIndex < nLen ) - { - if ( *pStr == cSearch ) - return nIndex; - ++pStr, - ++nIndex; - } - } - else - { - // Nur innerhalb des Strings suchen - while ( nLen - nIndex >= nStrLen ) - { - // Stimmt der String ueberein - if ( ImplStringCompareWithoutZero( pStr, pCharStr, nStrLen ) == 0 ) - return nIndex; - ++pStr, - ++nIndex; - } - } - - return STRING_NOTFOUND; -} - -// ----------------------------------------------------------------------- - xub_StrLen STRING::GetTokenCount( STRCODE cTok ) const { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); diff --git a/binfilter/bf_svtools/source/misc/tl_tstring.cxx b/binfilter/bf_svtools/source/misc/tl_tstring.cxx index b9002872d..16593a82f 100644 --- a/binfilter/bf_svtools/source/misc/tl_tstring.cxx +++ b/binfilter/bf_svtools/source/misc/tl_tstring.cxx @@ -136,6 +136,48 @@ STRING& STRING::Insert( const STRCODE* pCharStr, xub_StrLen nIndex ) return *this; } +xub_StrLen STRING::Search( const STRCODE* pCharStr, xub_StrLen nIndex ) const +{ + DBG_CHKTHIS( STRING, DBGCHECKSTRING ); + + sal_Int32 nLen = mpData->mnLen; + xub_StrLen nStrLen = ImplStringLen( pCharStr ); + + // Falls die Laenge des uebergebenen Strings 0 ist oder der Index + // hinter dem String liegt, dann wurde der String nicht gefunden + if ( !nStrLen || (nIndex >= nLen) ) + return STRING_NOTFOUND; + + const STRCODE* pStr = mpData->maStr; + pStr += nIndex; + + if ( nStrLen == 1 ) + { + STRCODE cSearch = *pCharStr; + while ( nIndex < nLen ) + { + if ( *pStr == cSearch ) + return nIndex; + ++pStr, + ++nIndex; + } + } + else + { + // Nur innerhalb des Strings suchen + while ( nLen - nIndex >= nStrLen ) + { + // Stimmt der String ueberein + if ( ImplStringCompareWithoutZero( pStr, pCharStr, nStrLen ) == 0 ) + return nIndex; + ++pStr, + ++nIndex; + } + } + + return STRING_NOTFOUND; +} + ByteString ByteString::CreateFromInt32(sal_Int32 n, sal_Int16 nRadix) { sal_Char aBuf[RTL_STR_MAX_VALUEOFINT32]; diff --git a/binfilter/bf_svx/source/svdraw/makefile.mk b/binfilter/bf_svx/source/svdraw/makefile.mk index 2d7fa3ddc..babd7fc7b 100644 --- a/binfilter/bf_svx/source/svdraw/makefile.mk +++ b/binfilter/bf_svx/source/svdraw/makefile.mk @@ -87,7 +87,6 @@ SLOFILES=\ $(SLO)$/svx_svdundo.obj \ $(SLO)$/svx_svdview.obj \ $(SLO)$/svx_svdviter.obj \ - $(SLO)$/svx_svdvmark.obj \ $(SLO)$/svx_svdxcgv.obj .IF "$(OS)$(CPU)"=="LINUXI" diff --git a/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx index 925746fbf..b96a21890 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx @@ -19,7 +19,6 @@ #include "svdcrtv.hxx" #include "svdio.hxx" -#include "svdvmark.hxx" namespace binfilter { diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx index dcd04955b..f67a74496 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx @@ -22,7 +22,6 @@ #include "svdpagv.hxx" #include "svdpage.hxx" -#include "svdvmark.hxx" #include "svdio.hxx" #include "svdview.hxx" #include "svdograf.hxx" @@ -121,13 +120,6 @@ IMPL_LINK(FrameAnimator,Hdl,AutoTimer*,EMPTYARG) { return 0; } // DBG_BF_ASSERT /*N*/ /*N*/ nGraphicManagerDrawMode = GRFMGR_DRAW_STANDARD; /*N*/ -/*N*/ aComeBackTimer.SetTimeout(1); -/*N*/ aComeBackTimer.SetTimeoutHdl(LINK(this,SdrPaintView,ImpComeBackHdl)); -/*N*/ aAfterPaintTimer.SetTimeout(1); -/*N*/ aAfterPaintTimer.SetTimeoutHdl(LINK(this,SdrPaintView,ImpAfterPaintHdl)); -/*N*/ aUserMarkerAnimator.SetTimeout(50); -/*N*/ aUserMarkerAnimator.SetTimeoutHdl(LINK(this,SdrPaintView,ImpUserMarkerAnimatorHdl)); -/*N*/ /*N*/ String aNam; // System::GetUserName() just return an empty string /*N*/ /*N*/ if (pMod) @@ -143,8 +135,7 @@ IMPL_LINK(FrameAnimator,Hdl,AutoTimer*,EMPTYARG) { return 0; } // DBG_BF_ASSERT /*N*/ aPagV(1024,16,16), /*N*/ aPagHide(1024,16,16), /*N*/ aAni(*(SdrView*)this), -/*N*/ aDefaultAttr(pModel1->GetItemPool()), -/*N*/ aUserMarkers(1024,16,16) +/*N*/ aDefaultAttr(pModel1->GetItemPool()) /*N*/ { /*N*/ DBG_CTOR(SdrPaintView,NULL); /*N*/ pMod=pModel1; @@ -164,14 +155,7 @@ IMPL_LINK(FrameAnimator,Hdl,AutoTimer*,EMPTYARG) { return 0; } // DBG_BF_ASSERT /*N*/ EndListening( maColorConfig ); /*N*/ /*N*/ ClearAll(); -/*N*/ if (pXOut!=NULL) { -/*N*/ delete pXOut; -/*N*/ } -/*N*/ USHORT nAnz=ImpGetUserMarkerCount(); -/*N*/ for (USHORT nNum=0; nNum<nAnz; nNum++) { -/*?*/ SdrViewUserMarker* pUM=ImpGetUserMarker(nNum); -/*?*/ pUM->pView=NULL; // Weil's mich gleich nichtmehr gibt. -/*N*/ } +/*N*/ delete pXOut; /*N*/ } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -215,21 +199,6 @@ IMPL_LINK(FrameAnimator,Hdl,AutoTimer*,EMPTYARG) { return 0; } // DBG_BF_ASSERT //////////////////////////////////////////////////////////////////////////////////////////////////// -/*N*/ IMPL_LINK_INLINE_START(SdrPaintView,ImpComeBackHdl,Timer*,EMPTYARG) -/*N*/ { -/*N*/ if (bSomeObjChgdFlag) { -/*N*/ bSomeObjChgdFlag=FALSE; -/*N*/ ModelHasChanged(); -/*N*/ } -/*N*/ return 0; -/*N*/ } - -/*N*/ IMPL_LINK_INLINE_END(SdrPaintView,ImpComeBackHdl,Timer*,pTimer) - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -IMPL_LINK(SdrPaintView,ImpAfterPaintHdl,Timer*,EMPTYARG) { return 0; } // DBG_BF_ASSERT - /*N*/ void SdrPaintView::ModelHasChanged() /*N*/ { /*N*/ // Auch alle PageViews benachrichtigen @@ -257,36 +226,6 @@ IMPL_LINK(SdrPaintView,ImpAfterPaintHdl,Timer*,EMPTYARG) { return 0; } // DBG_BF //////////////////////////////////////////////////////////////////////////////////////////////////// -IMPL_LINK_INLINE_START(SdrPaintView,ImpUserMarkerAnimatorHdl,AutoTimer*,EMPTYARG) { return 0; } // DBG_BF_ASSERT - -/*N*/ IMPL_LINK_INLINE_END(SdrPaintView,ImpUserMarkerAnimatorHdl,AutoTimer*,pTimer) - -/*N*/ void SdrPaintView::ImpInsertUserMarker(SdrViewUserMarker* pMarker) -/*N*/ { -/*N*/ aUserMarkers.Insert(pMarker); -/*N*/ ImpCheckMarkerAnimator(); -/*N*/ } -/*N*/ -/*N*/ void SdrPaintView::ImpRemoveUserMarker(SdrViewUserMarker* pMarker) -/*N*/ { -/*N*/ aUserMarkers.Remove(pMarker); -/*N*/ ImpCheckMarkerAnimator(); -/*N*/ } -/*N*/ -/*N*/ void SdrPaintView::ImpCheckMarkerAnimator() -/*N*/ { -/*N*/ BOOL bNeed=FALSE; -/*N*/ USHORT nAnz=ImpGetUserMarkerCount(); -/*N*/ for (USHORT nNum=0; nNum<nAnz && !bNeed; nNum++) { -/*N*/ SdrViewUserMarker* pUM=ImpGetUserMarker(nNum); -/*N*/ bNeed=pUM->IsAnimate(); -/*N*/ } -/*N*/ if (bNeed) aUserMarkerAnimator.Start(); -/*N*/ else aUserMarkerAnimator.Stop(); -/*N*/ } - -//////////////////////////////////////////////////////////////////////////////////////////////////// - /*N*/ void SdrPaintView::ClearPageViews() /*N*/ { /*N*/ BrkAction(); diff --git a/binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx b/binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx deleted file mode 100644 index d6bbc7967..000000000 --- a/binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx +++ /dev/null @@ -1,83 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "svdvmark.hxx" -#include "svdobj.hxx" -#include "svdpntv.hxx" - -namespace binfilter { - -/*N*/ SdrViewUserMarker::SdrViewUserMarker(SdrPaintView* pView_) -/*N*/ : pView(pView_), -/*N*/ pForcedOutDev(NULL), -/*N*/ pPoint(NULL), -/*N*/ pRect(NULL), -/*N*/ pPoly(NULL), -/*N*/ pPolyPoly(NULL), -/*N*/ pXPoly(NULL), -/*N*/ pXPolyPoly(NULL), -/*N*/ eAlign(SDRMARKER_ALIGNCENTER), -/*N*/ nPixelDistance(0), -/*N*/ nLineWdt(0), -/*N*/ nCrossSize(0), -/*N*/ bLineWdtLog(FALSE), -/*N*/ bCrossSizeLog(FALSE), -/*N*/ bSolidArea(FALSE), -/*N*/ bDashed(FALSE), -/*N*/ bCrossHair(FALSE), -/*N*/ bStripes(FALSE), -/*N*/ bEllipse(FALSE), -/*N*/ bPolyLine(FALSE), -/*N*/ bAnimate(FALSE), -/*N*/ bVisible(FALSE), -/*N*/ nAnimateDelay(0), -/*N*/ nAnimateSpeed(0), -/*N*/ nAnimateAnz(0), -/*N*/ bAnimateBwd(FALSE), -/*N*/ bAnimateToggle(FALSE), -/*N*/ nAnimateDelayCountDown(0), -/*N*/ nAnimateSpeedCountDown(0), -/*N*/ nAnimateNum(0), -/*N*/ bHasPointer(FALSE), -/*N*/ bMouseMovable(FALSE) -/*N*/ { -/*N*/ if (pView!=NULL) pView->ImpInsertUserMarker(this); -/*N*/ bAnimateToggle=TRUE; -/*N*/ } -/*N*/ -/*N*/ SdrViewUserMarker::~SdrViewUserMarker() -/*N*/ { -/*N*/ if (bVisible) {DBG_BF_ASSERT(0, "STRIP"); } -/*N*/ if (pView!=NULL) pView->ImpRemoveUserMarker(this); -/*N*/ ImpDelGeometrics(); -/*N*/ } -/*N*/ -/*N*/ void SdrViewUserMarker::ImpDelGeometrics() -/*N*/ { -/*N*/ if (pPoint !=NULL) { delete pPoint ; pPoint =NULL; } -/*N*/ if (pRect !=NULL) { delete pRect ; pRect =NULL; } -/*N*/ if (pPoly !=NULL) { delete pPoly ; pPoly =NULL; } -/*N*/ if (pPolyPoly !=NULL) { delete pPolyPoly ; pPolyPoly =NULL; } -/*N*/ if (pXPoly !=NULL) { delete pXPoly ; pXPoly =NULL; } -/*N*/ if (pXPolyPoly!=NULL) { delete pXPolyPoly; pXPolyPoly=NULL; } -/*N*/ } - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/binfilter/bf_sw/source/core/frmedt/sw_fews.cxx b/binfilter/bf_sw/source/core/frmedt/sw_fews.cxx index a24493229..d9918a61f 100644 --- a/binfilter/bf_sw/source/core/frmedt/sw_fews.cxx +++ b/binfilter/bf_sw/source/core/frmedt/sw_fews.cxx @@ -22,8 +22,6 @@ #pragma hdrstop #endif -#include <bf_svx/svdvmark.hxx> - #include <horiornt.hxx> #include <fesh.hxx> @@ -45,8 +43,6 @@ namespace binfilter { /*N*/ SwFEShell::~SwFEShell() /*N*/ { -/*N*/ delete pChainFrom; -/*N*/ delete pChainTo; /*N*/ } } diff --git a/binfilter/bf_sw/source/ui/inc/edtwin.hxx b/binfilter/bf_sw/source/ui/inc/edtwin.hxx index 0f3fc3628..b0beb5546 100644 --- a/binfilter/bf_sw/source/ui/inc/edtwin.hxx +++ b/binfilter/bf_sw/source/ui/inc/edtwin.hxx @@ -35,7 +35,6 @@ class SwView; class SwRect; class SwDrawBase; class ViewShell; -class SdrViewUserMarker; class SdrObject; class SwShadowCursor; class DataChangedEvent; @@ -93,7 +92,6 @@ friend void PageNumNotify( ViewShell* pVwSh, SwApplyTemplate *pApplyTempl; - SdrViewUserMarker *pUserMarker; SdrObject *pUserMarkerObj; SwView &rView; diff --git a/binfilter/bf_sw/source/ui/utlui/sw_initui.cxx b/binfilter/bf_sw/source/ui/utlui/sw_initui.cxx index b42f8956f..8d7f99042 100644 --- a/binfilter/bf_sw/source/ui/utlui/sw_initui.cxx +++ b/binfilter/bf_sw/source/ui/utlui/sw_initui.cxx @@ -34,7 +34,6 @@ #include "swtypes.hxx" namespace binfilter { -#define C2S(cChar) UniString::CreateFromAscii(cChar) /*-------------------------------------------------------------------- Beschreibung: globale Pointer --------------------------------------------------------------------*/ diff --git a/binfilter/inc/bf_svx/svdpntv.hxx b/binfilter/inc/bf_svx/svdpntv.hxx index ee35c4e88..e95460311 100644 --- a/binfilter/inc/bf_svx/svdpntv.hxx +++ b/binfilter/inc/bf_svx/svdpntv.hxx @@ -53,7 +53,6 @@ class SdrGrafObj; class SdrPage; class SdrPageViewWinRec; class SdrView; -class SdrViewUserMarker; class ExtOutputDevice; class SdrNamedSubRecord; class SdrIOHeader; @@ -196,7 +195,6 @@ class SdrPaintView: public SfxListener, public SfxRepeatTarget, public SfxBroadc { friend class SdrPageView; friend class FrameAnimator; - friend class SdrViewUserMarker; friend class SdrGrafObj; protected: @@ -219,8 +217,6 @@ protected: SfxItemSet aDefaultAttr; Timer aComeBackTimer; Timer aAfterPaintTimer; - AutoTimer aUserMarkerAnimator; - Container aUserMarkers; SdrAnimationMode eAnimationMode; @@ -247,16 +243,7 @@ protected: Color maGridColor; private: - DECL_LINK(ImpComeBackHdl,Timer*); - DECL_LINK(ImpAfterPaintHdl,Timer*); - DECL_LINK(ImpUserMarkerAnimatorHdl,AutoTimer*); - void ImpClearVars(); - void ImpInsertUserMarker(SdrViewUserMarker* pMarker); - void ImpRemoveUserMarker(SdrViewUserMarker* pMarker); - void ImpCheckMarkerAnimator(); - USHORT ImpGetUserMarkerCount() const { return (USHORT)aUserMarkers.Count(); } - SdrViewUserMarker* ImpGetUserMarker(USHORT nNum) const { return (SdrViewUserMarker*)aUserMarkers.GetObject(nNum); } protected: virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType); diff --git a/binfilter/inc/bf_svx/svdvmark.hxx b/binfilter/inc/bf_svx/svdvmark.hxx deleted file mode 100644 index dc2d4e3a9..000000000 --- a/binfilter/inc/bf_svx/svdvmark.hxx +++ /dev/null @@ -1,153 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef _SVDVMARK_HXX -#define _SVDVMARK_HXX - -#include <bf_svtools/bf_solar.h> - -#include <vcl/outdev.hxx> - -namespace binfilter { - -//************************************************************ -// Vorausdeklarationen -//************************************************************ - -class XPolygon; -class XPolyPolygon; -class SdrObject; -class SdrPageView; -class SdrPaintView; - -//************************************************************ -// Defines -//************************************************************ - -enum SdrViewUserMarkerAlign -{ - SDRMARKER_ALIGNCENTER, - SDRMARKER_ALIGNINNER, - SDRMARKER_ALIGNOUTER -}; - -//************************************************************ -// SdrViewUserMarker -//************************************************************ - -class SdrViewUserMarker -{ - friend class SdrPaintView; - - SdrPaintView* pView; - OutputDevice* pForcedOutDev; - Point* pPoint; - Rectangle* pRect; - Polygon* pPoly; - PolyPolygon* pPolyPoly; - XPolygon* pXPoly; - XPolyPolygon* pXPolyPoly; - - SdrViewUserMarkerAlign eAlign; - USHORT nPixelDistance; // Abstand des Rahmen zum eigentlichen pRect - USHORT nLineWdt; // Strichstaerke - USHORT nCrossSize; // fuer CrossHair und Stripes. 0=FullWindow - bool bLineWdtLog; - bool bCrossSizeLog; - bool bSolidArea; - bool bDashed; - bool bCrossHair; // Bei pPoint: Fadenkreuz. Sonst Dot (Rect oder Circle) - bool bStripes; // Bei pRect - bool bEllipse; // Bei pRect oder pPoint - bool bPolyLine; // Bei pPoly oder pXPoly - bool bAnimate; - bool bVisible; - - USHORT nAnimateDelay; - USHORT nAnimateSpeed; - USHORT nAnimateAnz; - bool bAnimateBwd; - bool bAnimateToggle; - USHORT nAnimateDelayCountDown; - USHORT nAnimateSpeedCountDown; - USHORT nAnimateNum; - - bool bHasPointer; - bool bMouseMovable; - -protected: - void ImpDelGeometrics(); - -public: - SdrViewUserMarker(SdrPaintView* pView); - - // Jede Ableitung, die ImpDraw ueberladen hat muss - // im Dtor IsVisible() fragen und ggf. Hiden! - virtual ~SdrViewUserMarker(); - - // Falls der Marker nur in einem bestimmten Window der View - // dargestellt werden soll. Default ist NULL= alle Windows der View. - void SetOutputDevice(OutputDevice* pOut) { pForcedOutDev=pOut; } - OutputDevice* GetOutputDevice() const { return pForcedOutDev; } - - void SetAnimateDelay(USHORT nTime) { nAnimateDelay=(nTime+25)/50; } - void SetAnimateSpeed(USHORT nTime) { nAnimateSpeed=(nTime+25)/50; if (nAnimateSpeed>0) nAnimateSpeed--; } - void SetAnimateCount(USHORT nAnz) { nAnimateAnz=nAnz; } - void SetAnimateBackward(bool bOn) { bAnimateBwd=bOn; } - void SetAnimateToggle(bool bOn) { bAnimateToggle=bOn; } - - const Point* GetPoint() const { return pPoint; } - const Rectangle* GetRectangle() const { return pRect; } - const Polygon* GetPolygon() const { return pPoly; } - const PolyPolygon* GetPolyPolygon() const { return pPolyPoly; } - const XPolygon* GetXPolygon() const { return pXPoly; } - const XPolyPolygon* GetXPolyPolygon() const { return pXPolyPoly; } - - bool IsDot() const { return pPoint!=NULL && !bCrossHair; } - bool IsCrossHair() const { return pPoint!=NULL && bCrossHair; } - bool IsRectangle() const { return pRect!=NULL && !bEllipse && !bStripes; } - bool IsStripes() const { return pRect!=NULL && bStripes; } - bool IsEllipse() const { return pRect!=NULL && bEllipse; } - bool IsPolyLine() const { return (pPoly!=NULL || pPolyPoly!=NULL || pXPoly!=NULL || pXPolyPoly!=NULL) && bPolyLine; } - - bool IsSolidArea() const { return bSolidArea && pPoint==NULL && !bPolyLine; } - bool IsDashed() const { return bDashed; } - USHORT GetPixelDistance() const { return nPixelDistance; } - USHORT GetLineWidth() const { return nLineWdt; } - bool IsLineWidthIsLogic() const { return bLineWdtLog; } - USHORT GetCrossHairSize() const { return nCrossSize; } - bool IsCrossHairSizeIsLogic() const { return bCrossSizeLog; } - - bool IsAnimate() const { return bAnimate; } - USHORT GetAnimateDelay() const { return nAnimateDelay*50; } - USHORT GetAnimateSpeed() const { return (nAnimateSpeed+1)*50; } - USHORT GetAnimateCount() const { return nAnimateAnz; } - bool IsAnimateBackward() const { return bAnimateBwd; } - bool IsAnimateToggle() const { return bAnimateToggle; } - - bool IsVisible() const { return bVisible; } - - bool HasPointer() const { return bHasPointer; } - bool IsMouseMovable() const { return bMouseMovable; } -}; - -}//end of namespace binfilter -#endif //_SVDVMARK_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/binfilter/inc/bf_sw/fesh.hxx b/binfilter/inc/bf_sw/fesh.hxx index 49c372d8d..dae1a2821 100644 --- a/binfilter/inc/bf_sw/fesh.hxx +++ b/binfilter/inc/bf_sw/fesh.hxx @@ -49,7 +49,6 @@ class SdrObject; class Outliner; class SotDataObject; -class SdrViewUserMarker; class SwFrmFmt; struct SwSortOptions; class SdrMarkList; @@ -158,8 +157,6 @@ struct SwGetCurColNumPara class SwFEShell : public SwEditShell { - SdrViewUserMarker *pChainFrom, - *pChainTo; BOOL bCheckForOLEInCaption; public: diff --git a/binfilter/inc/bf_tools/string.hxx b/binfilter/inc/bf_tools/string.hxx index f77fb76d3..4554d4ed8 100644 --- a/binfilter/inc/bf_tools/string.hxx +++ b/binfilter/inc/bf_tools/string.hxx @@ -425,7 +425,6 @@ public: xub_StrLen Search( sal_Unicode c, xub_StrLen nIndex = 0 ) const; xub_StrLen Search( const UniString& rStr, xub_StrLen nIndex = 0 ) const; - xub_StrLen Search( const sal_Unicode* pCharStr, xub_StrLen nIndex = 0 ) const; xub_StrLen SearchAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex = 0 ) const; xub_StrLen SearchBackward( sal_Unicode c, xub_StrLen nIndex = STRING_LEN ) const; |