[Libreoffice-commits] .: 2 commits - basic/CppunitTest_basic_scanner.mk sd/Library_sd.mk sd/source unusedcode.easy
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Oct 21 07:57:07 PDT 2011
basic/CppunitTest_basic_scanner.mk | 6
sd/Library_sd.mk | 1
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 9
sd/source/ui/slidesorter/cache/SlsPageCache.cxx | 8
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 9
sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx | 104 --------
sd/source/ui/slidesorter/controller/SlsAnimator.cxx | 30 --
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 16 -
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx | 51 ----
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx | 10
sd/source/ui/slidesorter/controller/SlsPageSelector.cxx | 13 -
sd/source/ui/slidesorter/controller/SlsProperties.cxx | 8
sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx | 22 -
sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx | 88 -------
sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx | 98 --------
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 19 -
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 8
sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx | 6
sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 5
sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx | 52 ----
sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx | 4
sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx | 5
sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx | 3
sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx | 1
sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx | 4
sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx | 1
sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx | 2
sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx | 8
sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx | 3
sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx | 50 ----
sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx | 3
sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx | 27 --
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx | 9
sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx | 4
sd/source/ui/slidesorter/model/SlsVisualState.cxx | 56 ----
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 25 --
sd/source/ui/slidesorter/view/SlsButtonBar.cxx | 118 ----------
sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 16 -
sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 10
sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx | 2
sd/source/ui/slidesorter/view/SlsLayouter.cxx | 74 ------
sd/source/ui/slidesorter/view/SlsTheme.cxx | 95 --------
sd/source/ui/slidesorter/view/SlsToolTip.cxx | 16 -
unusedcode.easy | 56 ----
44 files changed, 6 insertions(+), 1149 deletions(-)
New commits:
commit 48e2a853b9106033094d2fd917dbf14ada5abdc0
Author: Felix Zhang <fezhang at suse.com>
Date: Fri Oct 21 17:51:50 2011 +0800
remove unused methods from sd::slidesorter
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 0db1153..96e6e69 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -335,7 +335,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/slidesorter/controller/SlsPageSelector \
sd/source/ui/slidesorter/controller/SlsProperties \
sd/source/ui/slidesorter/controller/SlsScrollBarManager \
- sd/source/ui/slidesorter/controller/SlsSelectionCommand \
sd/source/ui/slidesorter/controller/SlsSelectionFunction \
sd/source/ui/slidesorter/controller/SlsSelectionManager \
sd/source/ui/slidesorter/controller/SlsSelectionObserver \
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index c7635ef..8a83694 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -74,7 +74,6 @@ public:
Bitmap GetMarkedPreview (void) const { return maMarkedPreview; }
inline void SetMarkedPreview (const Bitmap& rMarkePreview);
- bool HasMarkedPreview (void) const;
bool HasReplacement (void) const { return (mpReplacement.get() != NULL); }
inline bool HasLosslessReplacement (void) const;
@@ -685,14 +684,6 @@ inline void BitmapCache::CacheEntry::SetMarkedPreview (const Bitmap& rMarkedPrev
-bool BitmapCache::CacheEntry::HasMarkedPreview (void) const
-{
- return ! maMarkedPreview.IsEmpty();
-}
-
-
-
-
inline bool BitmapCache::CacheEntry::HasLosslessReplacement (void) const
{
return mpReplacement.get()!=NULL
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
index 7fb9d95..a6ab5e2 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
@@ -124,14 +124,6 @@ void PageCache::InvalidatePreviewBitmap (
-void PageCache::ReleasePreviewBitmap (const CacheKey aKey)
-{
- mpImplementation->ReleasePreviewBitmap(aKey);
-}
-
-
-
-
void PageCache::InvalidateCache (const bool bUpdateCache)
{
mpImplementation->InvalidateCache(bUpdateCache);
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 0d2e49d..4012a25 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -37,7 +37,6 @@
#include "controller/SlsCurrentSlideManager.hxx"
#include "SlsListener.hxx"
#include "controller/SlsFocusManager.hxx"
-#include "SlsSelectionCommand.hxx"
#include "controller/SlsAnimator.hxx"
#include "controller/SlsClipboard.hxx"
#include "controller/SlsInsertionIndicatorHandler.hxx"
@@ -1035,14 +1034,6 @@ void SlideSorterController::PageNameHasChanged (int nPageIndex, const String& rs
-bool SlideSorterController::IsContextMenuOpen (void) const
-{
- return mbIsContextMenuOpen;
-}
-
-
-
-
void SlideSorterController::SetDocumentSlides (const Reference<container::XIndexAccess>& rxSlides)
{
if (mrModel.GetDocumentSlides() != rxSlides)
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx b/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx
index 517f1c6..db5dea6 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx
@@ -47,63 +47,6 @@ double AnimationFunction::Linear (const double nTime)
-double AnimationFunction::FastInSlowOut_Sine (const double nTime)
-{
- OSL_ASSERT(nTime>=0.0 && nTime<=1.0);
-
- const double nResult (sin(nTime * M_PI/2));
-
- OSL_ASSERT(nResult>=0.0 && nResult<=1.0);
- return nResult;
-}
-
-
-
-
-double AnimationFunction::FastInSlowOut_Root (const double nTime)
-{
- OSL_ASSERT(nTime>=0.0 && nTime<=1.0);
-
- const double nResult (sqrt(nTime));
-
- OSL_ASSERT(nResult>=0.0 && nResult<=1.0);
- return nResult;
-}
-
-
-
-
-double AnimationFunction::SlowInSlowOut_0to0_Sine (const double nTime)
-{
- OSL_ASSERT(nTime>=0.0 && nTime<=1.0);
-
- const double nResult (sin(nTime * M_PI));
-
- OSL_ASSERT(nResult>=0.0 && nResult<=1.0);
- return nResult;
-}
-
-
-
-
-double AnimationFunction::Vibrate_Sine (const double nTime)
-{
- return sin(nTime*M_PI*8);
-}
-
-
-
-
-Point AnimationFunction::ScalePoint (const Point& rPoint, const double nTime)
-{
- return Point(
- sal_Int32(::rtl::math::round(rPoint.X() * nTime)),
- sal_Int32(::rtl::math::round(rPoint.Y() * nTime)));
-}
-
-
-
-
double AnimationFunction::Blend (
const double nStartValue,
const double nEndValue,
@@ -115,38 +58,6 @@ double AnimationFunction::Blend (
-void AnimationFunction::ApplyVisualStateChange (
- const model::SharedPageDescriptor& rpDescriptor,
- view::SlideSorterView& rView,
- const double nTime)
-{
- if (rpDescriptor)
- {
- rpDescriptor->GetVisualState().SetVisualStateBlend(nTime);
- rView.RequestRepaint(rpDescriptor);
- }
-}
-
-
-
-
-void AnimationFunction::ApplyLocationOffsetChange (
- const model::SharedPageDescriptor& rpDescriptor,
- view::SlideSorterView& rView,
- const Point aLocationOffset)
-{
- if (rpDescriptor)
- {
- const Rectangle aOldBoundingBox(rpDescriptor->GetBoundingBox());
- rpDescriptor->GetVisualState().SetLocationOffset(aLocationOffset);
- rView.RequestRepaint(aOldBoundingBox);
- rView.RequestRepaint(rpDescriptor);
- }
-}
-
-
-
-
void AnimationFunction::ApplyButtonAlphaChange(
const model::SharedPageDescriptor& rpDescriptor,
view::SlideSorterView& rView,
@@ -168,21 +79,6 @@ void AnimationFunction::ApplyButtonAlphaChange(
AnimationBezierFunction::AnimationBezierFunction (
const double nX1,
- const double nY1,
- const double nX2,
- const double nY2)
- : mnX1(nX1),
- mnY1(nY1),
- mnX2(nX2),
- mnY2(nY2)
-{
-}
-
-
-
-
-AnimationBezierFunction::AnimationBezierFunction (
- const double nX1,
const double nY1)
: mnX1(nX1),
mnY1(nY1),
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index 6a634b1..887d962 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -153,36 +153,6 @@ Animator::AnimationId Animator::AddAnimation (
-Animator::AnimationId Animator::AddInfiniteAnimation (
- const AnimationFunctor& rAnimation,
- const double nDelta)
-{
- (void)nDelta;
-
- // When the animator is already disposed then ignore this call
- // silently (well, we show an assertion, but do not throw an exception.)
- OSL_ASSERT( ! mbIsDisposed);
- if (mbIsDisposed)
- return -1;
-
- boost::shared_ptr<Animation> pAnimation (
- new Animation(
- rAnimation,
- 0,
- -1,
- maElapsedTime.getElapsedTime(),
- mnNextAnimationId++,
- FinishFunctor()));
- maAnimations.push_back(pAnimation);
-
- RequestNextFrame();
-
- return pAnimation->mnAnimationId;
-}
-
-
-
-
void Animator::RemoveAnimation (const Animator::AnimationId nId)
{
OSL_ASSERT( ! mbIsDisposed);
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 27f378a..cbc1c6e 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -565,22 +565,6 @@ IMPL_LINK(Clipboard, ProcessDragFinished, void*, pUserData)
-void Clipboard::SelectPages (void)
-{
- PageSelector& rSelector (mrController.GetPageSelector());
-
- // Select the dropped pages.
- PageList::iterator iPage;
- rSelector.DeselectAllPages();
- for (iPage=maPagesToSelect.begin(); iPage!=maPagesToSelect.end(); ++iPage)
- {
- rSelector.SelectPage(*iPage);
- }
-}
-
-
-
-
sal_Int8 Clipboard::AcceptDrop (
const AcceptDropEvent& rEvent,
DropTargetHelper& rTargetHelper,
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index f89b8a8..d4b3775 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -74,57 +74,6 @@ DragAndDropContext::~DragAndDropContext (void)
-void DragAndDropContext::GetPagesFromBookmarks (
- ::std::vector<const SdPage*>& rPages,
- sal_Int32& rnSelectionCount,
- DrawDocShell* pDocShell,
- const List& rBookmarks) const
-{
- if (pDocShell == NULL)
- return;
-
- const SdDrawDocument* pDocument = pDocShell->GetDoc();
- if (pDocument == NULL)
- return;
-
- for (sal_uLong nIndex=0,nCount=rBookmarks.Count(); nIndex<nCount; ++nIndex)
- {
- const String sPageName (*static_cast<String*>(rBookmarks.GetObject(nIndex)));
- sal_Bool bIsMasterPage (sal_False);
- const sal_uInt16 nPageIndex (pDocument->GetPageByName(sPageName, bIsMasterPage));
- if (nPageIndex == SDRPAGE_NOTFOUND)
- continue;
-
- const SdPage* pPage = dynamic_cast<const SdPage*>(pDocument->GetPage(nPageIndex));
- if (pPage != NULL)
- rPages.push_back(pPage);
- }
- rnSelectionCount = rBookmarks.Count();
-}
-
-
-
-
-void DragAndDropContext::GetPagesFromSelection (
- ::std::vector<const SdPage*>& rPages,
- sal_Int32& rnSelectionCount,
- model::PageEnumeration& rSelection) const
-{
- // Show a new substitution for the selected page objects.
- rnSelectionCount = 0;
-
- while (rSelection.HasMoreElements())
- {
- model::SharedPageDescriptor pDescriptor (rSelection.GetNextElement());
- if (rPages.size() < 3)
- rPages.push_back(pDescriptor->GetPage());
- ++rnSelectionCount;
- }
-}
-
-
-
-
void DragAndDropContext::Dispose (void)
{
mnInsertionIndex = -1;
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
index ba505fa..1f9139a 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
@@ -82,16 +82,6 @@ private:
SlideSorter* mpTargetSlideSorter;
model::SharedPageDescriptor mpHitDescriptor;
sal_Int32 mnInsertionIndex;
-
- void GetPagesFromBookmarks (
- ::std::vector<const SdPage*>& rPages,
- sal_Int32& rnSelectionCount,
- DrawDocShell* pDocShell,
- const List& rBookmarks) const;
- void GetPagesFromSelection (
- ::std::vector<const SdPage*>& rPages,
- sal_Int32& rnSelectionCount,
- model::PageEnumeration& rSelection) const;
};
diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
index cfd34db..bd015fe 100644
--- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
@@ -217,19 +217,6 @@ void PageSelector::DeselectPage (
void PageSelector::DeselectPage (
- const SdPage* pPage,
- const bool bUpdateCurrentPage)
-{
- const sal_Int32 nPageIndex (mrModel.GetIndex(pPage));
- SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nPageIndex));
- if (pDescriptor.get()!=NULL && pDescriptor->GetPage()==pPage)
- DeselectPage(pDescriptor, bUpdateCurrentPage);
-}
-
-
-
-
-void PageSelector::DeselectPage (
const SharedPageDescriptor& rpDescriptor,
const bool bUpdateCurrentPage)
{
diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx
index 88a17a8..47bc79a 100644
--- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx
@@ -257,14 +257,6 @@ bool Properties::IsOnlyPreviewTriggersMouseOver (void) const
-void Properties::SetOnlyPreviewTriggersMouseOver (const bool bFlag)
-{
- mbIsOnlyPreviewTriggersMouseOver = bFlag;
-}
-
-
-
-
bool Properties::IsHighContrastModeActive (void) const
{
return mbIsHighContrastModeActive;
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index 3de7eb8..ed836b9 100644
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -493,28 +493,6 @@ void ScrollBarManager::SetTopLeft (const Point aNewTopLeft)
-sal_Int32 ScrollBarManager::GetTop (void) const
-{
- if (mpVerticalScrollBar != NULL)
- return mpVerticalScrollBar->GetThumbPos();
- else
- return 0;
-}
-
-
-
-
-sal_Int32 ScrollBarManager::GetLeft (void) const
-{
- if (mpHorizontalScrollBar != NULL)
- return mpHorizontalScrollBar->GetThumbPos();
- else
- return 0;
-}
-
-
-
-
int ScrollBarManager::GetVerticalScrollBarWidth (void) const
{
if (mpVerticalScrollBar != NULL && mpVerticalScrollBar->IsVisible())
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx
deleted file mode 100644
index 174c3b9..0000000
--- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx
+++ /dev/null
@@ -1,88 +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.
- *
- ************************************************************************/
-
-#include "precompiled_sd.hxx"
-
-#include "SlsSelectionCommand.hxx"
-
-#include "controller/SlsCurrentSlideManager.hxx"
-#include "model/SlideSorterModel.hxx"
-#include "model/SlsPageDescriptor.hxx"
-
-#include "sdpage.hxx"
-
-namespace sd { namespace slidesorter { namespace controller {
-
-
-
-SelectionCommand::SelectionCommand (
- PageSelector& rSelector,
- const ::boost::shared_ptr<CurrentSlideManager>& rpCurrentSlideManager,
- const model::SlideSorterModel& rModel)
- : mrPageSelector(rSelector),
- mpCurrentSlideManager(rpCurrentSlideManager),
- mrModel(rModel),
- maPagesToSelect(),
- mnCurrentPageIndex(-1)
-{
-}
-
-
-
-
-void SelectionCommand::AddSlide (sal_uInt16 nPageIndex)
-{
- maPagesToSelect.push_back(nPageIndex);
-}
-
-
-
-
-void SelectionCommand::operator() (void)
-{
- OSL_ASSERT(mpCurrentSlideManager.get()!=NULL);
-
- mrPageSelector.DeselectAllPages();
-
- if (mnCurrentPageIndex >= 0)
- mpCurrentSlideManager->SwitchCurrentSlide(mnCurrentPageIndex);
-
- PageList::iterator iPage = maPagesToSelect.begin();
- PageList::iterator iEnd = maPagesToSelect.end();
- for (; iPage!=iEnd; ++iPage)
- {
- sal_Int32 nIndex (*iPage);
- if (nIndex >= 0)
- mrPageSelector.SelectPage(mrModel.GetPageDescriptor(nIndex));
- }
-}
-
-
-} } } // end of namespace sd::slidesorter::controller
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx
deleted file mode 100644
index 1bc8026..0000000
--- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx
+++ /dev/null
@@ -1,98 +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_SLIDESORTER_SELECTION_COMMAND_HXX
-#define SD_SLIDESORTER_SELECTION_COMMAND_HXX
-
-#include "controller/SlsPageSelector.hxx"
-#include "SlsCommand.hxx"
-#include <tools/solar.h>
-#include <com/sun/star/drawing/XDrawPage.hpp>
-
-#include <boost/shared_ptr.hpp>
-#include <vector>
-
-namespace sd { namespace slidesorter { namespace model {
-class SlideSorterModel;
-} } }
-
-
-namespace sd { namespace slidesorter { namespace controller {
-
-class CurrentSlideManager;
-class PageSelector;
-
-/** The SelectionCommand stores a list of pages that it will select on its
- execution. Furthermore it will make a page the current page. Note that
- internally pages are stored with pointers because this command is designed
- to be executed after model changes where page indices may change but
- page object identities remain.
-*/
-class SelectionCommand
- : public Command
-{
-public:
- /** Create a new command object that will on its exection use the given
- PageSelector to select a set of pages.
- */
- SelectionCommand (
- PageSelector& rSelector,
- const ::boost::shared_ptr<controller::CurrentSlideManager>& rpCurrentSlideManager,
- const model::SlideSorterModel& rModel);
-
- /** Remember the specified page to be selected when this command is
- executed.
- */
- void AddSlide (sal_uInt16 nPageIndex);
-
- /** Execute the command and select the pages added by previous calls to
- AddPages() and AddPage().
- */
- virtual void operator() (void);
-
-private:
- /// The page selector is used to select pages and set the current page.
- PageSelector& mrPageSelector;
- /// Used for setting the current slide.
- ::boost::shared_ptr<controller::CurrentSlideManager> mpCurrentSlideManager;
- /// The model is used to translate page indices into page pointers.
- const model::SlideSorterModel& mrModel;
- /// The list of pages to be selected when the command is executed.
- typedef ::std::vector<sal_Int32> PageList;
- PageList maPagesToSelect;
- /** The page that will be made the current page when the command is
- executed.
- */
- sal_Int32 mnCurrentPageIndex;
-};
-
-} } } // end of namespace sd::slidesorter::controller
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index c52581f..03d5c16 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -146,8 +146,6 @@ public:
const KeyEvent& rEvent,
SlideSorter& rSlideSorter);
- void SetDragMode (const InsertionIndicatorHandler::Mode eMode);
-
private:
/** Compute a numerical code that describes a mouse event and that can
be used for fast look up of the appropriate reaction.
@@ -794,15 +792,6 @@ void SelectionFunction::MouseDragged (
-void SelectionFunction::ProcessKeyEvent (const KeyEvent& rEvent)
-{
- EventDescriptor aEventDescriptor (rEvent, mrSlideSorter);
- ProcessEvent(aEventDescriptor);
-}
-
-
-
-
void SelectionFunction::ProcessEvent (EventDescriptor& rDescriptor)
{
// The call to ProcessEvent may switch to another mode handler.
@@ -1018,14 +1007,6 @@ SelectionFunction::EventDescriptor::EventDescriptor (
-void SelectionFunction::EventDescriptor::SetDragMode (const InsertionIndicatorHandler::Mode eMode)
-{
- meDragMode = eMode;
-}
-
-
-
-
sal_uInt32 SelectionFunction::EventDescriptor::EncodeMouseEvent (
const MouseEvent& rEvent) const
{
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 9da4ab3..f3a0074 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1160,14 +1160,6 @@ void SlotManager::DuplicateSelectedSlides (SfxRequest& rRequest)
_1));
}
-void SlotManager::ExecuteCommandAsynchronously (::std::auto_ptr<Command> pCommand)
-{
- // Ownership of command is (implicitely) transferred to the queue.
- maCommandQueue.push(pCommand.get());
- pCommand.release();
- Application::PostUserEvent(LINK(this,SlotManager,UserEventCallback));
-}
-
IMPL_LINK(SlotManager, UserEventCallback, void*, EMPTYARG)
{
if ( ! maCommandQueue.empty())
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
index 0262358..3039671 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
@@ -145,12 +145,6 @@ public:
const CacheKey aKey,
const bool bRequestPreview);
- /** 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.
- */
- void ReleasePreviewBitmap (const CacheKey aKey);
-
/** Call this method when all preview bitmaps have to be generated anew.
This is the case when the size of the page objects on the screen has
changed or when the model has changed.
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index 4e76284..6ea8d8b 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -224,11 +224,6 @@ public:
*/
void PageNameHasChanged (int nPageIndex, const String& rsOldName);
- /** Return whether a context menu has been opened by the called
- SlideSorterController object and is still open.
- */
- bool IsContextMenuOpen (void) const;
-
/** Provide the set of pages to be displayed in the slide sorter. The
GetDocumentSlides() method can be found only in the SlideSorterModel.
*/
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
index fa06359..c93ec65 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
@@ -56,53 +56,10 @@ public:
*/
static double Linear (const double nTime);
- /** Acceleration function that maps [0,1] to [0,1]. Speed starts fast
- and ends slow following the sine function.
- */
- static double FastInSlowOut_Sine (const double nTime);
-
- /** Acceleration function that maps [0,1] to [0,1]. Speed starts fast
- and ends slow following the square root function.
- */
- static double FastInSlowOut_Root (const double nTime);
-
- /** Acceleration function that maps [0,1] to [0,0]. Speed starts slow,
- rises, drops and ends slow following the sine function.
- */
- static double SlowInSlowOut_0to0_Sine (const double nTime);
-
- /** Acceleration function that maps [0,1] to [0,0]. Speed starts slow,
- rises and drops several times and ends slow following multiple
- cycles of the the sine function.
- */
- static double Vibrate_Sine (const double nTime);
-
- /** Scale point linearly.
- */
- static Point ScalePoint (const Point& rPoint, const double nTime);
-
/** Blend two points together according to the given weight.
*/
static double Blend (const double nStartValue, const double nEndValue, const double nWeight);
- /** Apply a gradual visual state change. The kind of change, i.e. the
- previous and the new states are expected to be already set. This
- method only adjusts the blending of the visual representation from
- one state to the other.
- */
- static void ApplyVisualStateChange (
- const model::SharedPageDescriptor& rpDescriptor,
- view::SlideSorterView& rView,
- const double nTime);
-
- /** Apply a gradual change of a previously set offset to the location of
- a page object.
- */
- static void ApplyLocationOffsetChange (
- const model::SharedPageDescriptor& rpDescriptor,
- view::SlideSorterView& rView,
- const Point aLocationOffset);
-
/** Apply a gradual change the alpha value from the old value to a
new value (set prior to this call.)
*/
@@ -120,15 +77,6 @@ class AnimationBezierFunction
{
public:
/** Create a cubic bezier curve whose start and end points are given
- implicitly as P0=(0,0) and P3=(1,1).
- */
- AnimationBezierFunction (
- const double nX1,
- const double nY1,
- const double nX2,
- const double nY2);
-
- /** Create a cubic bezier curve whose start and end points are given
implicitly as P0=(0,0) and P3=(1,1). The second control point is
implicitly given as P2=(1-nY1,1-nX1).
*/
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index e06bc6c..af18213 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -88,10 +88,6 @@ public:
const sal_Int32 nDuration,
const FinishFunctor& rFinishFunctor = FinishFunctor());
- AnimationId AddInfiniteAnimation (
- const AnimationFunctor& rAnimation,
- const double nDelta);
-
/** Abort and remove an animation. In order to reduce the bookkeeping
on the caller side, it is OK to call this method with an animation
function that is not currently being animated. Such a call is
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
index fc97dd3..7bd302e 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
@@ -144,11 +144,6 @@ private:
::Window* pWindow,
bool bDrag);
- /** Select the pages stored in the maPagesToSelect member. The list in
- the member is cleared afterwards.
- */
- void SelectPages (void);
-
/** Determine the position of where to insert the pages in the current
transferable of the sd module.
@param pWindow
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
index 2aa7ee1..42ab151 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -111,9 +111,6 @@ public:
int nPageIndex,
const bool bUpdateCurrentPage = true);
void DeselectPage (
- const SdPage* pPage,
- const bool bUpdateCurrentPage = true);
- void DeselectPage (
const model::SharedPageDescriptor& rpDescriptor,
const bool bUpdateCurrentPage = true);
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
index 2e9a183..990d66a 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
@@ -119,7 +119,6 @@ public:
area or the whole page object area.
*/
bool IsOnlyPreviewTriggersMouseOver (void) const;
- void SetOnlyPreviewTriggersMouseOver (const bool bFlag);
bool IsHighContrastModeActive (void) const;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
index 2894650..2ce5057 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
@@ -139,10 +139,6 @@ public:
*/
void SetTopLeft (const Point aNewTopLeft);
- sal_Int32 GetTop (void) const;
-
- sal_Int32 GetLeft (void) const;
-
/** Return the width of the vertical scroll bar, which--when
shown--should be fixed in contrast to its height.
@return
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index 95800d1..9d77f1a 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -182,7 +182,6 @@ private:
void GotoPage (int nIndex);
void ProcessMouseEvent (sal_uInt32 nEventType, const MouseEvent& rEvent);
- void ProcessKeyEvent (const KeyEvent& rEvent);
// What follows are a couple of helper methods that are used by
// ProcessMouseEvent().
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
index c21df03..5e5ad8a 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
@@ -71,8 +71,6 @@ public:
void ExecCtrl (SfxRequest& rRequest);
void GetAttrState (SfxItemSet& rSet);
- void ExecuteCommandAsynchronously (::std::auto_ptr<Command> pCommand);
-
/** Exclude or include one slide or all selected slides.
@param rpDescriptor
When the pointer is empty then apply the new state to all
diff --git a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
index 02187f8..bfc05fd 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
@@ -54,23 +54,15 @@ public:
VisualState (const sal_Int32 nPageId);
~VisualState (void);
- State GetCurrentVisualState (void) const;
- State GetOldVisualState (void) const;
void SetVisualState (const State eState);
- double GetVisualStateBlend (void) const;
void SetVisualStateBlend (const double nBlend);
void UpdateVisualState (const PageDescriptor& rDescriptor);
void SetMouseOverState (const bool bIsMouseOver);
- sal_Int32 GetStateAnimationId (void) const;
- void SetStateAnimationId (const sal_Int32 nAnimationId);
-
Point GetLocationOffset (void) const;
bool SetLocationOffset (const Point& rPoint);
- sal_Int32 GetLocationAnimationId (void) const;
- void SetLocationAnimationId (const sal_Int32 nAnimationId);
double GetButtonAlpha (void) const;
void SetButtonAlpha (const double nAlpha);
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 099f654..4229665 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -117,8 +117,6 @@ public:
virtual void ModelHasChanged (void);
- void LocalModelHasChanged(void);
-
/** This method is typically called before a model change takes place.
All references to model data are released. PostModelChange() has to
be called to complete the handling of the model change. When the
@@ -244,7 +242,6 @@ public:
class DrawLock
{
public:
- DrawLock (view::SlideSorterView& rView, const SharedSdWindow& rpWindow);
DrawLock (SlideSorter& rSlideSorter);
~DrawLock (void);
/** When the DrawLock is disposed then it will not request a repaint
diff --git a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
index 43b0421..6d8ce62 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
@@ -71,29 +71,6 @@ public:
void ResetPage (void);
- /** Return the number of buttons that are to be displayed in page
- objects which the mouse hovers over.
- @param bIsExcluded
- When this flag is <TRUE/> then return the number of
- buttons that is to be displayed for pages that are
- excluded from the slide show.
- */
- sal_Int32 GetButtonCount (const bool bIsExcluded) const;
-
- /** Return the specified button.
- @param nIndex
- Valid values lie in the range [0,GetButtonCount()).
- @param bIsExcluded
- When this flag is <TRUE/> then return a button that is to
- be displayed for pages that are excluded from the slide
- show.
- @return
- Returns an empty pointer when the given index is not valid.
- */
- ::boost::shared_ptr<Button> GetButton (
- const bool bIsExcluded,
- const sal_Int32 nIndex) const;
-
bool IsMouseOverBar (void) const;
/** Paint the specified page object. When this is not the same as the
@@ -106,8 +83,6 @@ public:
bool IsMouseOverButton (void) const;
- void RequestLayout (void);
-
/** Return the help text for the button under the mouse.
@return
When the mouse is not over a button then an empty string
@@ -221,7 +196,6 @@ public:
then <TRUE/> is returned.
*/
bool SetState (const State eState);
- State GetState (void) const;
virtual void Place (const Rectangle aButtonBarBox) = 0;
virtual void Paint (
@@ -244,7 +218,6 @@ public:
void SetActiveState (const bool bIsActive);
bool IsActive (void) const;
void SetIconSize (const IconSize eIconSize);
- IconSize GetIconSize (void) const;
/** By default a button is always enabled. Override to change this.
*/
virtual bool IsEnabled (void) const;
@@ -261,29 +234,6 @@ protected:
-class TextButton : public Button
-{
-public:
- TextButton (
- SlideSorter& rSlideSorter,
- const ::rtl::OUString& rsText,
- const ::rtl::OUString& rsHelpText);
-
- virtual void Place (const Rectangle aButtonBarBox);
- virtual void Paint (
- OutputDevice& rDevice,
- const Point aOffset,
- const double nAlpha,
- const ::boost::shared_ptr<Theme>& rpTheme) const;
- virtual Size GetSize (void) const;
- virtual Size GetSize (const IconSize eIconSize) const;
-
-private:
- const ::rtl::OUString msText;
-};
-
-
-
class ImageButton : public Button
{
public:
diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
index a7d6d87..8bac58a 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
@@ -104,9 +104,6 @@ private:
::boost::scoped_ptr<FramePainter> mpShadowPainter;
void SetPositionAndSize (const Rectangle& rBoundingBox);
- void SelectRepresentatives (
- model::PageEnumeration& rSelection,
- ::std::vector<model::SharedPageDescriptor>& rDescriptors) const;
Point PaintRepresentatives (
OutputDevice& rContent,
const Size aPreviewSize,
diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
index 997b815..342c3d5 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
@@ -83,26 +83,6 @@ public:
~Layouter (void);
::boost::shared_ptr<PageObjectLayouter> GetPageObjectLayouter (void) const;
- /** 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
- is not sufficient.
- @param nLeftBorder
- Use a negative value to indicate that the left border size
- shall not be modified. A value of 10 is the default.
- @param nRightBorder
- Use a negative value to indicate that the right border size
- shall not be modified. A value of 10 is the default.
- @param nTopBorder
- Use a negative value to indicate that the top border size
- shall not be modified. A value of 10 is the default.
- @param nBottomBorder
- Use a negative value to indicate that the bottom border size
- shall not be modified. A value of 10 is the default.
- */
- void SetBorders (sal_Int32 nLeftBorder, sal_Int32 nRightBorder,
- sal_Int32 nTopBorder, sal_Int32 nBottomBorder);
-
/** Set the interval of valid column counts. When nMinimalColumnCount
<= nMaximalColumnCount is not fullfilled then the call is ignored.
@param nMinimalColumnCount
@@ -142,19 +122,12 @@ public:
/** Change the zoom factor. This does not change the general layout
(number of columns).
*/
- void _SetZoom (double nZoomFactor);
void _SetZoom (Fraction nZoomFactor);
/** Return the number of columns.
*/
sal_Int32 GetColumnCount (void) const;
- sal_Int32 GetRowCount (void) const;
-
- sal_Int32 GetRow (const sal_Int32 nIndex) const;
-
- sal_Int32 GetColumn (const sal_Int32 nIndex) const;
-
sal_Int32 GetIndex (const sal_Int32 nRow, const sal_Int32 nColumn) const;
/** Return the scale factor that can be set at the map mode of the
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index fe5a437..a14863f 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -88,7 +88,6 @@ public:
_ColorType_Size_
};
ColorData GetColor (const ColorType eType);
- void SetColor (const ColorType eType, const ColorData aColorData);
enum GradientColorType {
Gradient_NormalPage,
@@ -110,9 +109,6 @@ public:
ColorData GetGradientColor (
const GradientColorType eType,
const GradientColorClass eClass);
- sal_Int32 GetGradientOffset (
- const GradientColorType eType,
- const GradientColorClass eClass);
void SetGradient (
const GradientColorType eType,
const ColorData aBaseColor,
@@ -122,10 +118,6 @@ public:
const sal_Int32 nFillEndOffset,
const sal_Int32 nBorderStartOffset,
const sal_Int32 nBorderEndOffset);
- sal_Int32 GetGradientSaturationOverride (const GradientColorType eType);
- sal_Int32 GetGradientBrightnessOverride (const GradientColorType eType);
- void SetGradientSaturationOverride (const GradientColorType eType, const sal_Int32 nValue);
- void SetGradientBrightnessOverride (const GradientColorType eType, const sal_Int32 nValue);
enum IconType
{
@@ -181,7 +173,6 @@ public:
_IntegerValueType_Size_
};
sal_Int32 GetIntegerValue (const IntegerValueType eType) const;
- void SetIntegerValue (const IntegerValueType eType, const sal_Int32 nValue);
enum StringType
{
diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
index 1cef1fa..a296568 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
@@ -54,10 +54,6 @@ public:
*/
void SetPage (const model::SharedPageDescriptor& rpPage);
- /** Set and show the default help text.
- */
- void ShowDefaultHelpText (const ::rtl::OUString& rsHelpText);
-
/** Show a previously set default help text.
*/
void ShowDefaultHelpText (void);
diff --git a/sd/source/ui/slidesorter/model/SlsVisualState.cxx b/sd/source/ui/slidesorter/model/SlsVisualState.cxx
index 84a4837..fd84d18 100644
--- a/sd/source/ui/slidesorter/model/SlsVisualState.cxx
+++ b/sd/source/ui/slidesorter/model/SlsVisualState.cxx
@@ -64,22 +64,6 @@ VisualState::~VisualState (void)
-VisualState::State VisualState::GetCurrentVisualState (void) const
-{
- return meCurrentVisualState;
-}
-
-
-
-
-VisualState::State VisualState::GetOldVisualState (void) const
-{
- return meOldVisualState;
-}
-
-
-
-
void VisualState::SetVisualState (const State eState)
{
meOldVisualState = meCurrentVisualState;
@@ -90,14 +74,6 @@ void VisualState::SetVisualState (const State eState)
-double VisualState::GetVisualStateBlend (void) const
-{
- return mnVisualStateBlend;
-}
-
-
-
-
void VisualState::SetVisualStateBlend (const double nBlend)
{
mnVisualStateBlend = nBlend;
@@ -134,22 +110,6 @@ void VisualState::SetMouseOverState (const bool bIsMouseOver)
-sal_Int32 VisualState::GetStateAnimationId (void) const
-{
- return mnStateAnimationId;
-}
-
-
-
-
-void VisualState::SetStateAnimationId (const sal_Int32 nAnimationId)
-{
- mnStateAnimationId = nAnimationId;
-}
-
-
-
-
Point VisualState::GetLocationOffset (void) const
{
return maLocationOffset;
@@ -172,22 +132,6 @@ bool VisualState::SetLocationOffset (const Point& rOffset)
-sal_Int32 VisualState::GetLocationAnimationId (void) const
-{
- return mnLocationAnimationId;
-}
-
-
-
-
-void VisualState::SetLocationAnimationId (const sal_Int32 nAnimationId)
-{
- mnLocationAnimationId = nAnimationId;
-}
-
-
-
-
double VisualState::GetButtonAlpha (void) const
{
return mnButtonAlpha;
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 8bbe698..4d043cb 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -281,17 +281,6 @@ void SlideSorterView::ModelHasChanged (void)
-void SlideSorterView::LocalModelHasChanged(void)
-{
- mbModelChangedWhileModifyEnabled = false;
-
- // First call our base class.
- View::ModelHasChanged ();
-}
-
-
-
-
void SlideSorterView::PreModelChange (void)
{
// Reset the slide under the mouse. It will be re-set in PostModelChange().
@@ -1083,20 +1072,6 @@ bool SlideSorterView::SetState (
//===== SlideSorterView::DrawLock =============================================
-SlideSorterView::DrawLock::DrawLock (
- view::SlideSorterView& rView,
- const SharedSdWindow& rpWindow)
- : mrView(rView),
- mpWindow(rpWindow)
-{
- if (mrView.mnLockRedrawSmph == 0)
- mrView.maRedrawRegion.SetEmpty();
- ++mrView.mnLockRedrawSmph;
-}
-
-
-
-
SlideSorterView::DrawLock::DrawLock (SlideSorter& rSlideSorter)
: mrView(rSlideSorter.GetView()),
mpWindow(rSlideSorter.GetContentWindow())
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index 87c384f..a60fd91 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -347,37 +347,6 @@ bool ButtonBar::SetPage (const model::SharedPageDescriptor& rpDescriptor)
-sal_Int32 ButtonBar::GetButtonCount (const bool bIsExcluded) const
-{
- if (bIsExcluded)
- return maExcludedButtons.size();
- else
- return maRegularButtons.size();
-}
-
-
-
-
-::boost::shared_ptr<Button> ButtonBar::GetButton (
- const bool bIsExcluded,
- const sal_Int32 nIndex) const
-{
- const ::std::vector<boost::shared_ptr<Button> >& rButtons (bIsExcluded
- ? maExcludedButtons
- : maRegularButtons);
-
- if (nIndex<0 || sal_uInt32(nIndex)>=rButtons.size())
- {
- OSL_ASSERT(nIndex<0 || sal_uInt32(nIndex)>=rButtons.size());
- return ::boost::shared_ptr<Button>();
- }
- else
- return rButtons[sal_uInt32(nIndex)];
-}
-
-
-
-
SharedButton ButtonBar::GetButtonAt (const Point aModelLocation)
{
if (IsMouseOverBar(aModelLocation))
@@ -520,14 +489,6 @@ bool ButtonBar::IsMouseOverBar (const Point aModelLocation) const
-void ButtonBar::RequestLayout (void)
-{
- maPageObjectSize = Size(0,0);
-}
-
-
-
-
void ButtonBar::LayoutButtons (const Size aPageObjectSize)
{
if (maPageObjectSize != aPageObjectSize)
@@ -1102,14 +1063,6 @@ bool Button::SetState (const State eState)
-Button::State Button::GetState (void) const
-{
- return meState;
-}
-
-
-
-
Rectangle Button::GetBoundingBox (void) const
{
if (mbIsActive)
@@ -1164,14 +1117,6 @@ void Button::SetIconSize (const IconSize eIconSize)
-Button::IconSize Button::GetIconSize (void) const
-{
- return meIconSize;
-}
-
-
-
-
bool Button::IsEnabled (void) const
{
return true;
@@ -1180,69 +1125,6 @@ bool Button::IsEnabled (void) const
-//===== TextButton ============================================================
-
-TextButton::TextButton (
- SlideSorter& rSlideSorter,
- const ::rtl::OUString& rsText,
- const ::rtl::OUString& rsHelpText)
- : Button(rSlideSorter, rsHelpText),
- msText(rsText)
-{
-}
-
-
-
-
-void TextButton::Place (const Rectangle aButtonBarBox)
-{
- maBoundingBox = aButtonBarBox;
- SetActiveState(true);
-}
-
-
-
-
-void TextButton::Paint (
- OutputDevice& rDevice,
- const Point aOffset,
- const double nAlpha,
- const ::boost::shared_ptr<Theme>& rpTheme) const
-{
- (void)nAlpha;
-
- if (mbIsActive)
- {
- // Paint text over the button background.
- if (meState == State_Normal)
- rDevice.SetTextColor(rpTheme->GetColor(Theme::Color_ButtonText));
- else
- rDevice.SetTextColor(rpTheme->GetColor(Theme::Color_ButtonTextHover));
- Rectangle aBox (maBoundingBox);
- aBox += aOffset;
- rDevice.DrawText(aBox, msText, TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER);
- }
-}
-
-
-
-
-Size TextButton::GetSize (void) const
-{
- return Size();
-}
-
-
-
-
-Size TextButton::GetSize (const Button::IconSize) const
-{
- return Size();
-}
-
-
-
-
//===== ImageButon ============================================================
ImageButton::ImageButton (
diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index c5a4112..d41c33f 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -177,22 +177,6 @@ void InsertionIndicatorOverlay::Create (
-void InsertionIndicatorOverlay::SelectRepresentatives (
- model::PageEnumeration& rSelection,
- ::std::vector<model::SharedPageDescriptor>& rDescriptors) const
-{
- sal_Int32 nCount (0);
- while (rSelection.HasMoreElements())
- {
- if (nCount++ >= 3)
- break;
- rDescriptors.push_back(rSelection.GetNextElement());
- }
-}
-
-
-
-
Point InsertionIndicatorOverlay::PaintRepresentatives (
OutputDevice& rContent,
const Size aPreviewSize,
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index e0976f6..242aa9a 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -261,16 +261,6 @@ void LayeredDevice::RemovePainter (
-bool LayeredDevice::HasPainter (const sal_Int32 nLayer)
-{
- return nLayer>=0
- && sal_uInt32(nLayer)<mpLayers->size()
- && (*mpLayers)[nLayer]->HasPainter();
-}
-
-
-
-
void LayeredDevice::Repaint (const Region& rRepaintRegion)
{
// Validate the contents of all layers (that have their own devices.)
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
index c0d4b9f..274a7be 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
@@ -74,8 +74,6 @@ public:
const SharedILayerPainter& rPainter,
const sal_Int32 nLayer);
- bool HasPainter (const sal_Int32 nLayer);
-
bool HandleMapModeChange (void);
void Repaint (const Region& rRepaintRegion);
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index 66f2209..990e8c6 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -271,9 +271,6 @@ protected:
class HorizontalImplementation : public Layouter::Implementation
{
public:
- HorizontalImplementation (
- const SharedSdWindow& rpWindow,
- const ::boost::shared_ptr<view::Theme>& rpTheme);
HorizontalImplementation (const Implementation& rImplementation);
virtual Layouter::Orientation GetOrientation (void) const;
@@ -348,25 +345,6 @@ Layouter::~Layouter (void)
-void Layouter::SetBorders (
- sal_Int32 nLeftBorder,
- sal_Int32 nRightBorder,
- sal_Int32 nTopBorder,
- sal_Int32 nBottomBorder)
-{
- if (nLeftBorder >= 0)
- mpImplementation->mnRequestedLeftBorder = nLeftBorder;
- if (nRightBorder >= 0)
- mpImplementation->mnRequestedRightBorder = nRightBorder;
- if (nTopBorder >= 0)
- mpImplementation->mnRequestedTopBorder = nTopBorder;
- if (nBottomBorder >= 0)
- mpImplementation->mnRequestedBottomBorder = nBottomBorder;
-}
-
-
-
-
void Layouter::SetColumnCount (
sal_Int32 nMinimalColumnCount,
sal_Int32 nMaximalColumnCount)
@@ -398,14 +376,6 @@ bool Layouter::Rearrange (
-void Layouter::_SetZoom (double nZoomFactor)
-{
- _SetZoom(Fraction(nZoomFactor));
-}
-
-
-
-
void Layouter::_SetZoom (Fraction nZoomFactor)
{
OSL_ASSERT(mpWindow);
@@ -427,30 +397,6 @@ sal_Int32 Layouter::GetColumnCount (void) const
-sal_Int32 Layouter::GetRowCount (void) const
-{
- return mpImplementation->mnRowCount;
-}
-
-
-
-
-sal_Int32 Layouter::GetRow (const sal_Int32 nIndex) const
-{
- return nIndex / mpImplementation->mnColumnCount;
-}
-
-
-
-
-sal_Int32 Layouter::GetColumn (const sal_Int32 nIndex) const
-{
- return nIndex % mpImplementation->mnColumnCount;
-}
-
-
-
-
sal_Int32 Layouter::GetIndex (const sal_Int32 nRow, const sal_Int32 nColumn) const
{
return mpImplementation->GetIndex(nRow,nColumn,true);
@@ -1204,16 +1150,6 @@ void Layouter::Implementation::CalculateVerticalLogicalInsertPosition (
//===== HorizontalImplementation ================================================
-HorizontalImplementation::HorizontalImplementation (
- const SharedSdWindow& rpWindow,
- const ::boost::shared_ptr<view::Theme>& rpTheme)
- : Implementation(rpWindow, rpTheme)
-{
-}
-
-
-
-
HorizontalImplementation::HorizontalImplementation (const Implementation& rImplementation)
: Implementation(rImplementation)
{
@@ -1283,16 +1219,6 @@ void HorizontalImplementation::CalculateLogicalInsertPosition (
//===== VerticalImplementation ================================================
-VerticalImplementation::VerticalImplementation (
- const SharedSdWindow& rpWindow,
- const ::boost::shared_ptr<view::Theme>& rpTheme)
- : Implementation(rpWindow, rpTheme)
-{
-}
-
-
-
-
VerticalImplementation::VerticalImplementation (const Implementation& rImplementation)
: Implementation(rImplementation)
{
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index 0fdb8b4..eab9fe9 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -313,17 +313,6 @@ ColorData Theme::GetColor (const ColorType eType)
-void Theme::SetColor (
- const ColorType eType,
- const ColorData aData)
-{
- if (eType>=0 && sal_uInt32(eType)<maColor.size())
- maColor[eType] = aData;
-}
-
-
-
-
ColorData Theme::GetGradientColor (
const GradientColorType eType,
const GradientColorClass eClass)
@@ -344,26 +333,6 @@ ColorData Theme::GetGradientColor (
-sal_Int32 Theme::GetGradientOffset (
- const GradientColorType eType,
- const GradientColorClass eClass)
-{
- GradientDescriptor& rDescriptor (GetGradient(eType));
-
- switch (eClass)
- {
- case Border1: return rDescriptor.mnBorderOffset1;
- case Border2: return rDescriptor.mnBorderOffset2;
- case Fill1: return rDescriptor.mnFillOffset1;
- case Fill2: return rDescriptor.mnFillOffset2;
- default: OSL_ASSERT(false); // fall through
- case Base: return 0;
- }
-}
-
-
-
-
void Theme::SetGradient (
const GradientColorType eType,
const ColorData aBaseColor,
@@ -398,57 +367,6 @@ void Theme::SetGradient (
-sal_Int32 Theme::GetGradientSaturationOverride (const GradientColorType eType)
-{
- GradientDescriptor& rGradient (GetGradient(eType));
- return rGradient.mnSaturationOverride;
-}
-
-
-
-
-sal_Int32 Theme::GetGradientBrightnessOverride (const GradientColorType eType)
-{
- GradientDescriptor& rGradient (GetGradient(eType));
- return rGradient.mnBrightnessOverride;
-}
-
-
-
-
-void Theme::SetGradientSaturationOverride (const GradientColorType eType, const sal_Int32 nValue)
-{
- GradientDescriptor& rGradient (GetGradient(eType));
- SetGradient(
- eType,
- rGradient.maBaseColor,
- nValue,
- rGradient.mnBrightnessOverride,
- rGradient.mnFillOffset1,
- rGradient.mnFillOffset2,
- rGradient.mnBorderOffset1,
- rGradient.mnBorderOffset2);
-}
-
-
-
-
-void Theme::SetGradientBrightnessOverride (const GradientColorType eType, const sal_Int32 nValue)
-{
- GradientDescriptor& rGradient (GetGradient(eType));
- SetGradient(eType,
- rGradient.maBaseColor,
- rGradient.mnSaturationOverride,
- nValue,
- rGradient.mnFillOffset1,
- rGradient.mnFillOffset2,
- rGradient.mnBorderOffset1,
- rGradient.mnBorderOffset2);
-}
-
-
-
-
const BitmapEx& Theme::GetIcon (const IconType eType)
{
if (eType>=0 && size_t(eType)<maIcons.size())
@@ -477,19 +395,6 @@ sal_Int32 Theme::GetIntegerValue (const IntegerValueType eType) const
-void Theme::SetIntegerValue (const IntegerValueType eType, const sal_Int32 nValue)
-{
- if (eType>=0 && size_t(eType)<maIntegerValues.size())
- maIntegerValues[eType] = nValue;
- else
- {
- OSL_ASSERT(eType>=0 && size_t(eType)<maIntegerValues.size());
- }
-}
-
-
-
-
::rtl::OUString Theme::GetString (const StringType eType) const
{
if (eType>=0 && size_t(eType)<maStrings.size())
diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
index 49b7050..0d4c080 100644
--- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx
+++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
@@ -104,22 +104,6 @@ void ToolTip::SetPage (const model::SharedPageDescriptor& rpDescriptor)
-void ToolTip::ShowDefaultHelpText (const ::rtl::OUString& rsHelpText)
-{
- if (msDefaultHelpText != rsHelpText)
- {
- const bool bIsVisible (Hide());
-
- msDefaultHelpText = rsHelpText;
- msCurrentHelpText = rsHelpText;
-
- Show(bIsVisible);
- }
-}
-
-
-
-
void ToolTip::ShowDefaultHelpText (void)
{
if (msCurrentHelpText != msDefaultHelpText)
diff --git a/unusedcode.easy b/unusedcode.easy
index c6a0ba0..1cdb047 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2610,67 +2610,11 @@ sd::ViewShellBase::RegisterFactory(unsigned short)
sd::framework::ConfigurationClassifier::GetC1andC2() const
sd::framework::ConfigurationClassifier::TraceResourceIdVector(char const*, std::__debug::vector<com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>, std::allocator<com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> > > const&) const
sd::framework::ConfigurationTracer::TraceConfiguration(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfiguration> const&, char const*)
-sd::slidesorter::cache::BitmapCache::CacheEntry::HasMarkedPreview() const
-sd::slidesorter::cache::PageCache::ReleasePreviewBitmap(SdrPage const*)
-sd::slidesorter::controller::AnimationBezierFunction::AnimationBezierFunction(double, double, double, double)
-sd::slidesorter::controller::AnimationFunction::ApplyLocationOffsetChange(boost::shared_ptr<sd::slidesorter::model::PageDescriptor> const&, sd::slidesorter::view::SlideSorterView&, Point)
-sd::slidesorter::controller::AnimationFunction::ApplyVisualStateChange(boost::shared_ptr<sd::slidesorter::model::PageDescriptor> const&, sd::slidesorter::view::SlideSorterView&, double)
-sd::slidesorter::controller::AnimationFunction::FastInSlowOut_Root(double)
-sd::slidesorter::controller::AnimationFunction::FastInSlowOut_Sine(double)
-sd::slidesorter::controller::AnimationFunction::ScalePoint(Point const&, double)
-sd::slidesorter::controller::AnimationFunction::SlowInSlowOut_0to0_Sine(double)
-sd::slidesorter::controller::AnimationFunction::Vibrate_Sine(double)
-sd::slidesorter::controller::Animator::AddInfiniteAnimation(boost::function1<void, double> const&, double)
-sd::slidesorter::controller::Clipboard::SelectPages()
-sd::slidesorter::controller::DragAndDropContext::GetPagesFromBookmarks(std::__debug::vector<SdPage const*, std::allocator<SdPage const*> >&, int&, sd::DrawDocShell*, List const&) const
-sd::slidesorter::controller::DragAndDropContext::GetPagesFromSelection(std::__debug::vector<SdPage const*, std::allocator<SdPage const*> >&, int&, sd::slidesorter::model::PageEnumeration&) const
-sd::slidesorter::controller::PageSelector::DeselectPage(SdPage const*, bool)
-sd::slidesorter::controller::Properties::SetOnlyPreviewTriggersMouseOver(bool)
-sd::slidesorter::controller::ScrollBarManager::GetLeft() const
-sd::slidesorter::controller::ScrollBarManager::GetTop() const
-sd::slidesorter::controller::SelectionCommand::AddSlide(unsigned short)
-sd::slidesorter::controller::SelectionCommand::SelectionCommand(sd::slidesorter::controller::PageSelector&, boost::shared_ptr<sd::slidesorter::controller::CurrentSlideManager> const&, sd::slidesorter::model::SlideSorterModel const&)
-sd::slidesorter::controller::SelectionFunction::EventDescriptor::SetDragMode(sd::slidesorter::controller::InsertionIndicatorHandler::Mode)
-sd::slidesorter::controller::SelectionFunction::ProcessKeyEvent(KeyEvent const&)
-sd::slidesorter::controller::SlideSorterController::IsContextMenuOpen() const
-sd::slidesorter::controller::SlotManager::ExecuteCommandAsynchronously(std::auto_ptr<sd::slidesorter::controller::Command>)
-sd::slidesorter::model::VisualState::GetCurrentVisualState() const
-sd::slidesorter::model::VisualState::GetLocationAnimationId() const
-sd::slidesorter::model::VisualState::GetOldVisualState() const
-sd::slidesorter::model::VisualState::GetStateAnimationId() const
-sd::slidesorter::model::VisualState::GetVisualStateBlend() const
-sd::slidesorter::model::VisualState::SetLocationAnimationId(int)
-sd::slidesorter::model::VisualState::SetStateAnimationId(int)
sd::slidesorter::view::(anonymous namespace)::Blend(unsigned char, unsigned char, double)
sd::slidesorter::view::(anonymous namespace)::CalculateColorChannel(double, double, double, double, double)
sd::slidesorter::view::(anonymous namespace)::PageObjectRun::GetInnerBoundingBox(sd::slidesorter::view::Layouter const&, int) const
sd::slidesorter::view::(anonymous namespace)::RectangleBackgroundTheme::RectangleBackgroundTheme(boost::shared_ptr<sd::slidesorter::view::Theme> const&, std::__debug::vector<boost::shared_ptr<sd::slidesorter::view::Button>, std::allocator<boost::shared_ptr<sd::slidesorter::view::Button> > > const&)
-sd::slidesorter::view::Button::GetIconSize() const
-sd::slidesorter::view::Button::GetState() const
-sd::slidesorter::view::ButtonBar::GetButton(bool, int) const
-sd::slidesorter::view::ButtonBar::GetButtonCount(bool) const
-sd::slidesorter::view::ButtonBar::RequestLayout()
sd::slidesorter::view::FontProvider::GetFont(OutputDevice const&)
-sd::slidesorter::view::HorizontalImplementation::HorizontalImplementation(boost::shared_ptr<sd::Window> const&, boost::shared_ptr<sd::slidesorter::view::Theme> const&)
-sd::slidesorter::view::InsertionIndicatorOverlay::SelectRepresentatives(sd::slidesorter::model::PageEnumeration&, std::__debug::vector<boost::shared_ptr<sd::slidesorter::model::PageDescriptor>, std::allocator<boost::shared_ptr<sd::slidesorter::model::PageDescriptor> > >&) const
-sd::slidesorter::view::LayeredDevice::HasPainter(int)
-sd::slidesorter::view::Layouter::GetColumn(int) const
-sd::slidesorter::view::Layouter::GetRow(int) const
-sd::slidesorter::view::Layouter::GetRowCount() const
-sd::slidesorter::view::Layouter::SetBorders(int, int, int, int)
-sd::slidesorter::view::Layouter::_SetZoom(double)
-sd::slidesorter::view::SlideSorterView::DrawLock::DrawLock(sd::slidesorter::view::SlideSorterView&, boost::shared_ptr<sd::Window> const&)
-sd::slidesorter::view::SlideSorterView::LocalModelHasChanged()
-sd::slidesorter::view::TextButton::TextButton(sd::slidesorter::SlideSorter&, rtl::OUString const&, rtl::OUString const&)
-sd::slidesorter::view::Theme::GetGradientBrightnessOverride(sd::slidesorter::view::Theme::GradientColorType)
-sd::slidesorter::view::Theme::GetGradientOffset(sd::slidesorter::view::Theme::GradientColorType, sd::slidesorter::view::Theme::GradientColorClass)
-sd::slidesorter::view::Theme::GetGradientSaturationOverride(sd::slidesorter::view::Theme::GradientColorType)
-sd::slidesorter::view::Theme::SetColor(sd::slidesorter::view::Theme::ColorType, unsigned int)
-sd::slidesorter::view::Theme::SetGradientBrightnessOverride(sd::slidesorter::view::Theme::GradientColorType, int)
-sd::slidesorter::view::Theme::SetGradientSaturationOverride(sd::slidesorter::view::Theme::GradientColorType, int)
-sd::slidesorter::view::Theme::SetIntegerValue(sd::slidesorter::view::Theme::IntegerValueType, int)
-sd::slidesorter::view::ToolTip::ShowDefaultHelpText(rtl::OUString const&)
-sd::slidesorter::view::VerticalImplementation::VerticalImplementation(boost::shared_ptr<sd::Window> const&, boost::shared_ptr<sd::slidesorter::view::Theme> const&)
sdext::presenter::(anonymous namespace)::Element::SetEnabledState(bool)
sdext::presenter::(anonymous namespace)::ModeChangeAnimationStarter::ModeChangeAnimationStarter(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfigurationController> const&, com::sun::star::uno::Reference<com::sun::star::awt::XWindow> const&, com::sun::star::uno::Reference<com::sun::star::rendering::XSpriteCanvas> const&, boost::shared_ptr<sdext::presenter::PresenterAnimator> const&)
sdext::presenter::(anonymous namespace)::ProgressLabel::ProgressLabel(rtl::Reference<sdext::presenter::PresenterToolBar> const&)
commit cbfaa4dd71b39d393524afa7438c6da4e1e68df4
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Oct 21 16:44:43 2011 +0200
Fix Windows build (missing oleout32 library).
diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk
index bf8237c..0e18e51 100644
--- a/basic/CppunitTest_basic_scanner.mk
+++ b/basic/CppunitTest_basic_scanner.mk
@@ -25,6 +25,12 @@ $(eval $(call gb_CppunitTest_add_linked_libs,basic_scanner, \
$(gb_STDLIBS) \
))
+ifeq ($(GUI),WNT)
+$(eval $(call gb_CppunitTest_add_linked_libs,basic_scanner, \
+ oleaut32 \
+))
+endif
+
$(eval $(call gb_CppunitTest_set_include,basic_scanner,\
-I$(realpath $(SRCDIR)/basic/source/inc) \
-I$(realpath $(SRCDIR)/basic/inc) \
More information about the Libreoffice-commits
mailing list