summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx29
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx1
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx8
-rw-r--r--sd/source/ui/slidesorter/view/SlsButtonBar.cxx8
-rw-r--r--sd/source/ui/slidesorter/view/SlsFontProvider.cxx29
-rwxr-xr-xunusedcode.easy3
6 files changed, 0 insertions, 78 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 5849b1c271d8..54aa95b35c39 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -139,9 +139,6 @@ public:
const AcceptDropEvent& rEvent,
const sal_Int8 nDragAction,
SlideSorter& rSlideSorter);
- EventDescriptor (
- const KeyEvent& rEvent,
- SlideSorter& rSlideSorter);
private:
/** Compute a numerical code that describes a mouse event and that can
@@ -977,32 +974,6 @@ SelectionFunction::EventDescriptor::EventDescriptor (
-SelectionFunction::EventDescriptor::EventDescriptor (
- const KeyEvent& rEvent,
- SlideSorter& rSlideSorter)
- : maMousePosition(),
- maMouseModelPosition(),
- mpHitDescriptor(),
- mpHitPage(),
- mnEventCode(KEY_EVENT),
- mbIsOverButton(rSlideSorter.GetView().GetButtonBar().IsMouseOverButton()),
- meDragMode(InsertionIndicatorHandler::MoveMode),
- mbMakeSelectionVisible(true),
- mbIsLeaving(false)
-{
- model::SharedPageDescriptor pHitDescriptor (
- rSlideSorter.GetController().GetFocusManager().GetFocusedPageDescriptor());
- if (pHitDescriptor.get() != NULL)
- {
- mpHitPage = pHitDescriptor->GetPage();
- mpHitDescriptor = pHitDescriptor;
- }
-
- mnEventCode |= EncodeKeyEvent(rEvent) | EncodeState();
-}
-
-
-
sal_uInt32 SelectionFunction::EventDescriptor::EncodeMouseEvent (
const MouseEvent& rEvent) const
diff --git a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
index a6a3482ec380..6bb273f1faf1 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
@@ -224,7 +224,6 @@ public:
virtual Size GetSize (void) const;
virtual Size GetSize (const IconSize eIconSize) const;
::rtl::OUString GetHelpText (void) const;
- bool IsDown (void) const;
void SetActiveState (const bool bIsActive);
bool IsActive (void) const;
void SetIconSize (const IconSize eIconSize);
diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
index 82487471edb0..2e2513c9cf76 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
@@ -54,14 +54,6 @@ public:
*/
static FontProvider& Instance (void);
- /** Return a font that is scaled according to the current map mode of
- the given device. Repeated calls with a device, not necessarily the
- same device, with the same map mode will return the same font. The
- first call with a different map mode will release the old font and
- create a new one that is correctly scaled.
- */
- SharedFontPointer GetFont (const OutputDevice& rDevice);
-
/** Call this method to tell an object to release its currently used
font. The next call to GetFont() will then create a new one.
Typically called after a DataChange event when for instance a system
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index 28c5a26a3c11..0304f25c70f5 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -924,14 +924,6 @@ Rectangle Button::GetBoundingBox (void) const
-bool Button::IsDown (void) const
-{
- return mbIsActive && meState==State_Down;
-}
-
-
-
-
void Button::SetActiveState (const bool bIsActive)
{
mbIsActive = bIsActive;
diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx
index 1e285469a81c..9356d6811676 100644
--- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx
+++ b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx
@@ -98,35 +98,6 @@ void FontProvider::Invalidate (void)
-
-FontProvider::SharedFontPointer FontProvider::GetFont (const OutputDevice& rDevice)
-{
- // Reset the font when the map mode has changed since its creation.
- if (maMapMode != rDevice.GetMapMode())
- maFont.reset();
-
- if (maFont.get() == NULL)
- {
- // Initialize the font from the application style settings.
- maFont.reset(new Font (Application::GetSettings().GetStyleSettings().GetAppFont()));
- maFont->SetTransparent(sal_True);
- maFont->SetWeight(WEIGHT_NORMAL);
-
- // Transform the point size to pixel size.
- MapMode aFontMapMode (MAP_POINT);
- Size aFontSize (rDevice.LogicToPixel(maFont->GetSize(), aFontMapMode));
-
- // Transform the font size to the logical coordinates of the device.
- maFont->SetSize (rDevice.PixelToLogic(aFontSize));
-
- // Remember the map mode of the given device to detect different
- // devices or modified zoom scales on future calls.
- maMapMode = rDevice.GetMapMode();
- }
-
- return maFont;
-}
-
} } } // end of namespace ::sd::slidesorter::view
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 4faad3378407..de2277b38972 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -764,9 +764,6 @@ sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
sd::ViewShellBase::RegisterFactory(unsigned short)
-sd::slidesorter::controller::SelectionFunction::EventDescriptor::EventDescriptor(KeyEvent const&, sd::slidesorter::SlideSorter&)
-sd::slidesorter::view::Button::IsDown() const
-sd::slidesorter::view::FontProvider::GetFont(OutputDevice const&)
sdr::animation::Scheduler::Reset(unsigned int)
sdr::contact::ViewContactOfPageObj::GetReferencedPage() const
sdr::contact::ViewContactOfSdrMediaObj::hasPreferredSize() const