[Libreoffice-commits] .: sd/source
Joseph Powers
jpowers at kemper.freedesktop.org
Wed Mar 2 19:49:23 PST 2011
sd/source/ui/inc/bmcache.hxx | 54 ------------------
sd/source/ui/inc/fuslsel.hxx | 122 ------------------------------------------
sd/source/ui/view/bmcache.cxx | 80 ---------------------------
sd/source/ui/view/makefile.mk | 3 -
4 files changed, 1 insertion(+), 258 deletions(-)
New commits:
commit d2a73910caea5c2013447681a6c0fd132a40d9f8
Author: Rafael Dominguez <venccsralph at gmail.com>
Date: Wed Mar 2 19:48:50 2011 -0800
Remove dead code inside sd.
diff --git a/sd/source/ui/inc/bmcache.hxx b/sd/source/ui/inc/bmcache.hxx
deleted file mode 100644
index 3841dc3..0000000
--- a/sd/source/ui/inc/bmcache.hxx
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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_BMCACHE_HXX
-#define _SD_BMCACHE_HXX
-
-#include <tools/list.hxx>
-
-
-class SdPage;
-class GraphicObject;
-
-class BitmapCache
-{
- ULONG nMaxSize;
- ULONG nCurSize;
- List aEntries;
-
-public:
- BitmapCache(ULONG nMaxSizeKB)
- : nMaxSize(nMaxSizeKB), nCurSize(0) {}
- virtual ~BitmapCache();
-
- void Remove(const SdPage* pPage);
-};
-
-#endif // _SD_BMCACHE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/fuslsel.hxx b/sd/source/ui/inc/fuslsel.hxx
deleted file mode 100644
index 23b4549..0000000
--- a/sd/source/ui/inc/fuslsel.hxx
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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_SLIDE_SELECTION_HXX
-#define SD_FU_SLIDE_SELECTION_HXX
-
-#include "fuslid.hxx"
-#include <tools/list.hxx>
-
-class SdDrawDocument;
-class Sound;
-
-namespace sd {
-
-class SlideView;
-class SlideViewShell;
-class Window;
-
-struct FSS_IsShowingEffectInfo
-{
- BOOL bIsShowingEffect; // TRUE while we show a fade effect one the slide view
- BOOL bDisposed; // TRUE if the FuSlideSelection was deleted during fade effect
-};
-
-
-class FuSlideSelection
- : public FuSlide
-{
-public:
- TYPEINFO();
-
- static FunctionReference Create( SlideViewShell* pViewSh, ::sd::Window* pWin, SlideView* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
- virtual void DoExecute( SfxRequest& rReq );
-
- // Mouse- & Key-Events
- virtual BOOL KeyInput(const KeyEvent& rKEvt);
- virtual BOOL MouseMove(const MouseEvent& rMEvt);
- virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
- virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin);
-
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
-
- virtual void ScrollStart();
- virtual void ScrollEnd();
-
- BOOL IsShowingEffect() const { return pIsShowingEffectInfo && pIsShowingEffectInfo->bIsShowingEffect; }
-
- /** is called when the currenct function should be aborted. <p>
- This is used when a function gets a KEY_ESCAPE but can also
- be called directly.
-
- @returns true if a active function was aborted
- */
- virtual bool cancel();
-
-protected:
- FuSlideSelection (
- SlideViewShell* pViewSh,
- ::sd::Window* pWin,
- SlideView* pView,
- SdDrawDocument* pDoc,
- SfxRequest& rReq);
- virtual ~FuSlideSelection (void);
-
-private:
- BOOL bSubstShown;
- BOOL bPageHit;
- List aSubstList; // Liste mit Ertsatzdarstellungen
- Point aDragPos; // hier wird die Seite angefasst
- BOOL bDragSelection;
- Point aDragSelRectAnchor; // fester Punkt des Selektionsrechtecks
- Rectangle aDragSelRect;
- Point aPosOfInsertMarker;
- FSS_IsShowingEffectInfo* pIsShowingEffectInfo;
-
- void DrawInsertMarker(BOOL bShow);
- Point CalcPosOfInsertMarker(const Point& rPoint);
-
- USHORT GetTargetPage(const Point& rPoint) const;
-
- void CreateSubst();
- void DeleteSubst();
- void DrawSubst() const;
- void ChangeSubstPos(const Point& rVector);
- void DrawDragSelectionRect() const;
- void ShowEffect(USHORT nPageNo);
-
- DECL_LINK( DragSlideHdl, Timer* );
-};
-
-} // end of namespace sd
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/view/bmcache.cxx b/sd/source/ui/view/bmcache.cxx
deleted file mode 100644
index c52a8c5..0000000
--- a/sd/source/ui/view/bmcache.cxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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 <limits.h> // LONG_MAX
-#include <tools/solar.h>
-#include <svtools/grfmgr.hxx>
-#include "bmcache.hxx"
-
-// eine Struktur fuer die Cache-Eintraege
-struct BitmapCacheEntry
-{
- const SdPage* pPage;
- GraphicObject* pGraphicObject;
- sal_uInt32 nSizeBytes;
- long nZoom;
-};
-
-/*************************************************************************
-|*
-|* Destruktor, loescht die gespeicherten Bitmaps
-|*
-\************************************************************************/
-
-BitmapCache::~BitmapCache()
-{
- for( void* pEntry = aEntries.First(); pEntry; pEntry = aEntries.Next() )
- {
- delete static_cast< BitmapCacheEntry* >( pEntry )->pGraphicObject;
- delete static_cast< BitmapCacheEntry* >( pEntry );
- }
-}
-
-void BitmapCache::Remove( const SdPage* pPage )
-{
- for( ULONG nPos = 0; nPos < aEntries.Count(); )
- {
- BitmapCacheEntry* pCand = (BitmapCacheEntry*) aEntries.GetObject( nPos );
-
- if( pCand->pPage == pPage )
- {
- pCand = (BitmapCacheEntry*) aEntries.Remove((ULONG)nPos);
- delete pCand->pGraphicObject;
- delete pCand;
- }
- else
- nPos++;
- }
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/view/makefile.mk b/sd/source/ui/view/makefile.mk
index 0ee8280..def8f79 100644
--- a/sd/source/ui/view/makefile.mk
+++ b/sd/source/ui/view/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# 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
@@ -85,7 +85,6 @@ SLOFILES = \
$(SLO)$/presvish.obj \
$(SLO)$/outlview.obj \
$(SLO)$/tabcontr.obj \
- $(SLO)$/bmcache.obj \
$(SLO)$/drbezob.obj \
$(SLO)$/drtxtob.obj \
$(SLO)$/drtxtob1.obj \
More information about the Libreoffice-commits
mailing list