diff options
author | Rich Wareham <rjw57@cam.ac.uk> | 2012-01-12 12:05:37 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-01-12 14:43:15 +0000 |
commit | 15fd86b9753cf201e7893618cb442ecc06c5385d (patch) | |
tree | 3f7040d4e176220b3c6ce5e1d73c0f0f04043ed4 /sdext/source/presenter/PresenterToolBar.cxx | |
parent | e198eea5a87bff84783bd038cf134e6ea3b764ad (diff) |
sdext/source/presenter/*: remove extraneous vertical whitespace
Replace 5 lines of vertical whitespace in sdext/source/presenter/* with
a single line so that more can be seen on the screen at once.
Fixes bug 44635
Diffstat (limited to 'sdext/source/presenter/PresenterToolBar.cxx')
-rw-r--r-- | sdext/source/presenter/PresenterToolBar.cxx | 222 |
1 files changed, 0 insertions, 222 deletions
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 19abfd8f5e94..905c2f3700ac 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ - #include "PresenterToolBar.hxx" #include "PresenterBitmapContainer.hxx" @@ -125,7 +124,6 @@ namespace { } // end of anonymous namespace - class PresenterToolBar::Context : private ::boost::noncopyable { @@ -135,9 +133,6 @@ public: css::uno::Reference<css::rendering::XCanvas> mxCanvas; }; - - - //===== PresenterToolBar::Element ============================================= namespace { @@ -217,15 +212,11 @@ namespace { } // end of anonymous namespace - class PresenterToolBar::ElementContainerPart : public ::std::vector<rtl::Reference<Element> > { }; - - - //===== Button ================================================================ namespace { @@ -264,9 +255,6 @@ namespace { PresenterBitmapDescriptor::Mode GetMode (void) const; }; - - - //===== Label ================================================================= class Label : public Element @@ -285,10 +273,8 @@ namespace { const Reference<rendering::XCanvas>& rxCanvas); }; - // Some specialized controls. - class TimeFormatter { public: @@ -388,8 +374,6 @@ namespace { }; } // end of anonymous namespace - - //===== PresenterToolBar ====================================================== PresenterToolBar::PresenterToolBar ( @@ -414,9 +398,6 @@ PresenterToolBar::PresenterToolBar ( { } - - - void PresenterToolBar::Initialize ( const ::rtl::OUString& rsConfigurationPath) { @@ -450,16 +431,10 @@ void PresenterToolBar::Initialize ( } } - - - PresenterToolBar::~PresenterToolBar (void) { } - - - void SAL_CALL PresenterToolBar::disposing (void) { if (mxWindow.is()) @@ -496,9 +471,6 @@ void SAL_CALL PresenterToolBar::disposing (void) maElementContainer.clear(); } - - - void PresenterToolBar::InvalidateArea ( const awt::Rectangle& rRepaintBox, const bool bSynchronous) @@ -1189,9 +1161,6 @@ Element::~Element (void) { } - - - void Element::SetModes ( const SharedElementMode& rpNormalMode, const SharedElementMode& rpMouseOverMode, @@ -1205,16 +1174,10 @@ void Element::SetModes ( mpMode = rpNormalMode; } - - - void Element::disposing (void) { } - - - awt::Size Element::GetBoundingSize ( const Reference<rendering::XCanvas>& rxCanvas) { @@ -1222,40 +1185,26 @@ awt::Size Element::GetBoundingSize ( return maSize; } - - - awt::Rectangle Element::GetBoundingBox (void) const { return awt::Rectangle(maLocation.X,maLocation.Y, maSize.Width, maSize.Height); } - - - void Element::CurrentSlideHasChanged (void) { UpdateState(); } - - - void Element::SetLocation (const awt::Point& rLocation) { maLocation = rLocation; } - - void Element::SetSize (const geometry::RealSize2D& rSize) { maSize = awt::Size(sal_Int32(0.5+rSize.Width), sal_Int32(0.5+rSize.Height)); } - - - bool Element::SetState ( const bool bIsOver, const bool bIsPressed) @@ -1307,18 +1256,12 @@ bool Element::SetState ( return bModified; } - - - void Element::Invalidate (const bool bSynchronous) { OSL_ASSERT(mpToolBar.is()); mpToolBar->InvalidateArea(GetBoundingBox(), bSynchronous); } - - - bool Element::IsOutside (const awt::Rectangle& rBox) { if (rBox.X >= maLocation.X+maSize.Width) @@ -1333,24 +1276,16 @@ bool Element::IsOutside (const awt::Rectangle& rBox) return false; } - - bool Element::IsEnabled (void) const { return mbIsEnabled; } - - - bool Element::IsFilling (void) const { return false; } - - - void Element::UpdateState (void) { OSL_ASSERT(mpToolBar.get() != NULL); @@ -1368,9 +1303,6 @@ void Element::UpdateState (void) } } - - - //----- lang::XEventListener -------------------------------------------------- void SAL_CALL Element::disposing (const css::lang::EventObject& rEvent) @@ -1379,9 +1311,6 @@ void SAL_CALL Element::disposing (const css::lang::EventObject& rEvent) (void)rEvent; } - - - //----- document::XEventListener ---------------------------------------------- void SAL_CALL Element::notifyEvent (const css::document::EventObject& rEvent) @@ -1391,9 +1320,6 @@ void SAL_CALL Element::notifyEvent (const css::document::EventObject& rEvent) UpdateState(); } - - - //----- frame::XStatusListener ------------------------------------------------ void SAL_CALL Element::statusChanged (const css::frame::FeatureStateEvent& rEvent) @@ -1414,9 +1340,6 @@ void SAL_CALL Element::statusChanged (const css::frame::FeatureStateEvent& rEven } // end of anonymous namespace - - - //===== ElementMode =========================================================== namespace { @@ -1428,9 +1351,6 @@ ElementMode::ElementMode (void) { } - - - void ElementMode::ReadElementMode ( const Reference<beans::XPropertySet>& rxElementProperties, const OUString& rsModeName, @@ -1490,9 +1410,6 @@ void ElementMode::ReadElementMode ( } // end of anonymous namespace - - - //===== Button ================================================================ namespace { @@ -1505,9 +1422,6 @@ namespace { return ::rtl::Reference<Element>(pElement.get()); } - - - Button::Button ( const ::rtl::Reference<PresenterToolBar>& rpToolBar) : Element(rpToolBar), @@ -1518,25 +1432,16 @@ Button::Button ( OSL_ASSERT(mpToolBar->GetPresenterController()->GetWindowManager().is()); } - - - Button::~Button (void) { } - - - void Button::Initialize (void) { mpToolBar->GetPresenterController()->GetWindowManager()->AddLayoutListener(this); mbIsListenerRegistered = true; } - - - void Button::disposing (void) { OSL_ASSERT(mpToolBar.get() != NULL); @@ -1552,9 +1457,6 @@ void Button::disposing (void) Element::disposing(); } - - - void Button::Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState) @@ -1582,9 +1484,6 @@ void Button::Paint ( mpMode->maText.Paint(rxCanvas, rViewState, GetBoundingBox(), aOffset); } - - - awt::Size Button::CreateBoundingSize ( const Reference<rendering::XCanvas>& rxCanvas) { @@ -1609,9 +1508,6 @@ awt::Size Button::CreateBoundingSize ( return awt::Size(nTextWidth,nTextHeight); } - - - void Button::PaintIcon ( const Reference<rendering::XCanvas>& rxCanvas, const sal_Int32 nTextHeight, @@ -1636,9 +1532,6 @@ void Button::PaintIcon ( } } - - - PresenterBitmapDescriptor::Mode Button::GetMode (void) const { if ( ! IsEnabled()) @@ -1651,9 +1544,6 @@ PresenterBitmapDescriptor::Mode Button::GetMode (void) const return PresenterBitmapDescriptor::Normal; } - - - //----- lang::XEventListener -------------------------------------------------- void SAL_CALL Button::disposing (const css::lang::EventObject& rEvent) @@ -1666,9 +1556,6 @@ void SAL_CALL Button::disposing (const css::lang::EventObject& rEvent) } // end of anonymous namespace - - - //===== PresenterToolBar::Label =============================================== namespace { @@ -1678,9 +1565,6 @@ Label::Label (const ::rtl::Reference<PresenterToolBar>& rpToolBar) { } - - - awt::Size Label::CreateBoundingSize ( const Reference<rendering::XCanvas>& rxCanvas) { @@ -1693,10 +1577,6 @@ awt::Size Label::CreateBoundingSize ( sal::static_int_cast<sal_Int32>(0.5 + aTextBBox.Y2 - aTextBBox.Y1)); } - - - - void Label::SetText (const OUString& rsText) { OSL_ASSERT(mpToolBar.get() != NULL); @@ -1715,9 +1595,6 @@ void Label::SetText (const OUString& rsText) Invalidate(false); } - - - void Label::Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState) @@ -1729,9 +1606,6 @@ void Label::Paint ( mpMode->maText.Paint(rxCanvas, rViewState, GetBoundingBox(), awt::Point(0,0)); } - - - bool Label::SetState (const bool bIsOver, const bool bIsPressed) { // For labels there is no mouse over effect. @@ -1742,9 +1616,6 @@ bool Label::SetState (const bool bIsOver, const bool bIsPressed) } // end of anonymous namespace - - - //===== Text ================================================================== namespace { @@ -1755,18 +1626,12 @@ Text::Text (void) { } - - - Text::Text (const Text& rText) : msText(rText.msText), mpFont(rText.mpFont) { } - - - Text::Text ( const OUString& rsText, const PresenterTheme::SharedFontDescriptor& rpFont) @@ -1775,33 +1640,21 @@ Text::Text ( { } - - - void Text::SetText (const OUString& rsText) { msText = rsText; } - - - OUString Text::GetText (void) const { return msText; } - - - PresenterTheme::SharedFontDescriptor Text::GetFont (void) const { return mpFont; } - - - void Text::Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState, @@ -1849,9 +1702,6 @@ void Text::Paint ( rendering::TextDirection::WEAK_LEFT_TO_RIGHT); } - - - geometry::RealRectangle2D Text::GetBoundingBox (const Reference<rendering::XCanvas>& rxCanvas) { if (mpFont.get() != NULL && !msText.isEmpty()) @@ -1872,9 +1722,6 @@ geometry::RealRectangle2D Text::GetBoundingBox (const Reference<rendering::XCanv return geometry::RealRectangle2D(0,0,0,0); } - - - //===== TimeFormatter ========================================================= TimeFormatter::TimeFormatter (void) @@ -1884,9 +1731,6 @@ TimeFormatter::TimeFormatter (void) { } - - - OUString TimeFormatter::FormatTime (const oslDateTime& rTime) { ::rtl::OUStringBuffer sText; @@ -1930,9 +1774,6 @@ OUString TimeFormatter::FormatTime (const oslDateTime& rTime) return sText.makeStringAndClear(); } - - - //===== TimeLabel ============================================================= TimeLabel::TimeLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar) @@ -1941,27 +1782,18 @@ TimeLabel::TimeLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar) { } - - - void SAL_CALL TimeLabel::disposing (void) { PresenterClockTimer::Instance(mpToolBar->GetComponentContext())->RemoveListener(mpListener); mpListener.reset(); } - - - void TimeLabel::ConnectToTimer (void) { mpListener.reset(new Listener(this)); PresenterClockTimer::Instance(mpToolBar->GetComponentContext())->AddListener(mpListener); } - - - //===== CurrentTimeLabel ====================================================== ::rtl::Reference<Element> CurrentTimeLabel::Create ( @@ -1972,16 +1804,10 @@ void TimeLabel::ConnectToTimer (void) return ::rtl::Reference<Element>(pElement.get()); } - - - CurrentTimeLabel::~CurrentTimeLabel (void) { } - - - CurrentTimeLabel::CurrentTimeLabel ( const ::rtl::Reference<PresenterToolBar>& rpToolBar) : TimeLabel(rpToolBar), @@ -1989,18 +1815,12 @@ CurrentTimeLabel::CurrentTimeLabel ( { } - - - void CurrentTimeLabel::TimeHasChanged (const oslDateTime& rCurrentTime) { SetText(maTimeFormatter.FormatTime(rCurrentTime)); Invalidate(false); } - - - void CurrentTimeLabel::SetModes ( const SharedElementMode& rpNormalMode, const SharedElementMode& rpMouseOverMode, @@ -2011,9 +1831,6 @@ void CurrentTimeLabel::SetModes ( SetText(maTimeFormatter.FormatTime(PresenterClockTimer::GetCurrentTime())); } - - - //===== PresentationTimeLabel ================================================= ::rtl::Reference<Element> PresentationTimeLabel::Create ( @@ -2024,16 +1841,10 @@ void CurrentTimeLabel::SetModes ( return ::rtl::Reference<Element>(pElement.get()); } - - - PresentationTimeLabel::~PresentationTimeLabel (void) { } - - - PresentationTimeLabel::PresentationTimeLabel ( const ::rtl::Reference<PresenterToolBar>& rpToolBar) : TimeLabel(rpToolBar), @@ -2044,9 +1855,6 @@ PresentationTimeLabel::PresentationTimeLabel ( maStartTimeValue.Nanosec = 0; } - - - void PresentationTimeLabel::TimeHasChanged (const oslDateTime& rCurrentTime) { TimeValue aCurrentTimeValue; @@ -2076,8 +1884,6 @@ void PresentationTimeLabel::TimeHasChanged (const oslDateTime& rCurrentTime) } } - - void PresentationTimeLabel::SetModes ( const SharedElementMode& rpNormalMode, const SharedElementMode& rpMouseOverMode, @@ -2093,9 +1899,6 @@ void PresentationTimeLabel::SetModes ( } } - - - //===== VerticalSeparator ===================================================== VerticalSeparator::VerticalSeparator ( @@ -2104,9 +1907,6 @@ VerticalSeparator::VerticalSeparator ( { } - - - void VerticalSeparator::Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState) @@ -2138,9 +1938,6 @@ void VerticalSeparator::Paint ( aRenderState); } - - - awt::Size VerticalSeparator::CreateBoundingSize ( const Reference<rendering::XCanvas>& rxCanvas) { @@ -2148,17 +1945,11 @@ awt::Size VerticalSeparator::CreateBoundingSize ( return awt::Size(1,20); } - - - bool VerticalSeparator::IsFilling (void) const { return true; } - - - //===== HorizontalSeparator =================================================== HorizontalSeparator::HorizontalSeparator ( @@ -2167,9 +1958,6 @@ HorizontalSeparator::HorizontalSeparator ( { } - - - void HorizontalSeparator::Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState) @@ -2201,9 +1989,6 @@ void HorizontalSeparator::Paint ( aRenderState); } - - - awt::Size HorizontalSeparator::CreateBoundingSize ( const Reference<rendering::XCanvas>& rxCanvas) { @@ -2211,20 +1996,13 @@ awt::Size HorizontalSeparator::CreateBoundingSize ( return awt::Size(20,1); } - - - bool HorizontalSeparator::IsFilling (void) const { return true; } - - - } // end of anonymous namespace - } } // end of namespace ::sdext::presenter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |