summaryrefslogtreecommitdiff
path: root/sdext/source/presenter/PresenterSlideSorter.cxx
diff options
context:
space:
mode:
authorRich Wareham <rjw57@cam.ac.uk>2012-01-12 12:05:37 +0000
committerMichael Meeks <michael.meeks@suse.com>2012-01-12 14:43:15 +0000
commit15fd86b9753cf201e7893618cb442ecc06c5385d (patch)
tree3f7040d4e176220b3c6ce5e1d73c0f0f04043ed4 /sdext/source/presenter/PresenterSlideSorter.cxx
parente198eea5a87bff84783bd038cf134e6ea3b764ad (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/PresenterSlideSorter.cxx')
-rw-r--r--sdext/source/presenter/PresenterSlideSorter.cxx229
1 files changed, 0 insertions, 229 deletions
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index e874002d0c3d..30e19e630434 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#include "PresenterSlideSorter.hxx"
#include "PresenterButton.hxx"
#include "PresenterCanvasHelper.hxx"
@@ -90,8 +89,6 @@ namespace {
sal_Int32 floor (const double nValue) { return sal::static_int_cast<sal_Int32>(nValue); }
}
-
-
//===== PresenterSlideSorter::Layout ==========================================
class PresenterSlideSorter::Layout
@@ -153,9 +150,6 @@ private:
sal_Int32 GetColumn (const sal_Int32 nSlideIndex) const;
};
-
-
-
//==== PresenterSlideSorter::MouseOverManager =================================
class PresenterSlideSorter::MouseOverManager
@@ -209,9 +203,6 @@ private:
const geometry::IntegerSize2D& rSize) const;
};
-
-
-
//==== PresenterSlideSorter::CurrentSlideFrameRenderer ========================
class PresenterSlideSorter::CurrentSlideFrameRenderer
@@ -262,9 +253,6 @@ private:
const double nHeight);
};
-
-
-
//===== PresenterSlideSorter ==================================================
PresenterSlideSorter::PresenterSlideSorter (
@@ -409,16 +397,10 @@ PresenterSlideSorter::PresenterSlideSorter (
}
}
-
-
-
PresenterSlideSorter::~PresenterSlideSorter (void)
{
}
-
-
-
void SAL_CALL PresenterSlideSorter::disposing (void)
{
mxComponentContext = NULL;
@@ -481,17 +463,11 @@ void SAL_CALL PresenterSlideSorter::disposing (void)
}
}
-
-
-
void PresenterSlideSorter::SetActiveState (const bool bIsActive)
{
(void)bIsActive;
}
-
-
-
//----- lang::XEventListener --------------------------------------------------
void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventObject)
@@ -519,9 +495,6 @@ void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventOb
}
}
-
-
-
//----- XWindowListener -------------------------------------------------------
void SAL_CALL PresenterSlideSorter::windowResized (const awt::WindowEvent& rEvent)
@@ -533,9 +506,6 @@ void SAL_CALL PresenterSlideSorter::windowResized (const awt::WindowEvent& rEven
mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
}
-
-
-
void SAL_CALL PresenterSlideSorter::windowMoved (const awt::WindowEvent& rEvent)
throw (uno::RuntimeException)
{
@@ -543,9 +513,6 @@ void SAL_CALL PresenterSlideSorter::windowMoved (const awt::WindowEvent& rEvent)
ThrowIfDisposed();
}
-
-
-
void SAL_CALL PresenterSlideSorter::windowShown (const lang::EventObject& rEvent)
throw (uno::RuntimeException)
{
@@ -555,9 +522,6 @@ void SAL_CALL PresenterSlideSorter::windowShown (const lang::EventObject& rEvent
mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
}
-
-
-
void SAL_CALL PresenterSlideSorter::windowHidden (const lang::EventObject& rEvent)
throw (uno::RuntimeException)
{
@@ -565,9 +529,6 @@ void SAL_CALL PresenterSlideSorter::windowHidden (const lang::EventObject& rEven
ThrowIfDisposed();
}
-
-
-
//----- XPaintListener --------------------------------------------------------
void SAL_CALL PresenterSlideSorter::windowPaint (const css::awt::PaintEvent& rEvent)
@@ -586,9 +547,6 @@ void SAL_CALL PresenterSlideSorter::windowPaint (const css::awt::PaintEvent& rEv
xSpriteCanvas->updateScreen(sal_False);
}
-
-
-
//----- XMouseListener --------------------------------------------------------
void SAL_CALL PresenterSlideSorter::mousePressed (const css::awt::MouseEvent& rEvent)
@@ -598,9 +556,6 @@ void SAL_CALL PresenterSlideSorter::mousePressed (const css::awt::MouseEvent& rE
mnSlideIndexMousePressed = mpLayout->GetSlideIndexForPosition(aPosition);
}
-
-
-
void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent& rEvent)
throw(css::uno::RuntimeException)
{
@@ -626,18 +581,12 @@ void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent& r
}
}
-
-
-
void SAL_CALL PresenterSlideSorter::mouseEntered (const css::awt::MouseEvent& rEvent)
throw(css::uno::RuntimeException)
{
(void)rEvent;
}
-
-
-
void SAL_CALL PresenterSlideSorter::mouseExited (const css::awt::MouseEvent& rEvent)
throw(css::uno::RuntimeException)
{
@@ -647,9 +596,6 @@ void SAL_CALL PresenterSlideSorter::mouseExited (const css::awt::MouseEvent& rEv
mpMouseOverManager->SetSlide(mnSlideIndexMousePressed, awt::Rectangle(0,0,0,0));
}
-
-
-
//----- XMouseMotionListener --------------------------------------------------
void SAL_CALL PresenterSlideSorter::mouseMoved (const css::awt::MouseEvent& rEvent)
@@ -676,18 +622,12 @@ void SAL_CALL PresenterSlideSorter::mouseMoved (const css::awt::MouseEvent& rEve
}
}
-
-
-
void SAL_CALL PresenterSlideSorter::mouseDragged (const css::awt::MouseEvent& rEvent)
throw (css::uno::RuntimeException)
{
(void)rEvent;
}
-
-
-
//----- XResourceId -----------------------------------------------------------
Reference<XResourceId> SAL_CALL PresenterSlideSorter::getResourceId (void)
@@ -697,18 +637,12 @@ Reference<XResourceId> SAL_CALL PresenterSlideSorter::getResourceId (void)
return mxViewId;
}
-
-
-
sal_Bool SAL_CALL PresenterSlideSorter::isAnchorOnly (void)
throw (RuntimeException)
{
return false;
}
-
-
-
//----- XPropertyChangeListener -----------------------------------------------
void SAL_CALL PresenterSlideSorter::propertyChange (
@@ -718,9 +652,6 @@ void SAL_CALL PresenterSlideSorter::propertyChange (
(void)rEvent;
}
-
-
-
//----- XSlidePreviewCacheListener --------------------------------------------
void SAL_CALL PresenterSlideSorter::notifyPreviewCreation (
@@ -733,9 +664,6 @@ void SAL_CALL PresenterSlideSorter::notifyPreviewCreation (
mpPresenterController->GetPaintManager()->Invalidate(mxWindow, aBBox, true);
}
-
-
-
//----- XDrawView -------------------------------------------------------------
void SAL_CALL PresenterSlideSorter::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide)
@@ -770,9 +698,6 @@ void SAL_CALL PresenterSlideSorter::setCurrentPage (const Reference<drawing::XDr
}
}
-
-
-
Reference<drawing::XDrawPage> SAL_CALL PresenterSlideSorter::getCurrentPage (void)
throw (RuntimeException)
{
@@ -780,9 +705,6 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterSlideSorter::getCurrentPage (voi
return NULL;
}
-
-
-
//-----------------------------------------------------------------------------
void PresenterSlideSorter::UpdateLayout (void)
@@ -847,9 +769,6 @@ void PresenterSlideSorter::UpdateLayout (void)
mxPreviewFrame = NULL;
}
-
-
-
geometry::RealRectangle2D PresenterSlideSorter::PlaceScrollBars (
const geometry::RealRectangle2D& rUpperBox)
{
@@ -915,9 +834,6 @@ geometry::RealRectangle2D PresenterSlideSorter::PlaceScrollBars (
return rUpperBox;
}
-
-
-
void PresenterSlideSorter::PlaceCloseButton (
const PresenterPaneContainer::SharedPaneDescriptor& rpPane,
const awt::Rectangle& rCenterBox,
@@ -948,9 +864,6 @@ void PresenterSlideSorter::PlaceCloseButton (
rCenterBox.Height - mpCloseButton->GetSize().Height/ 2));
}
-
-
-
void PresenterSlideSorter::ClearBackground (
const Reference<rendering::XCanvas>& rxCanvas,
const awt::Rectangle& rUpdateBox)
@@ -966,9 +879,6 @@ void PresenterSlideSorter::ClearBackground (
awt::Rectangle());
}
-
-
-
double PresenterSlideSorter::GetSlideAspectRatio (void) const
{
double nSlideAspectRatio (28.0/21.0);
@@ -997,9 +907,6 @@ double PresenterSlideSorter::GetSlideAspectRatio (void) const
return nSlideAspectRatio;
}
-
-
-
Reference<rendering::XBitmap> PresenterSlideSorter::GetPreview (const sal_Int32 nSlideIndex)
{
if (nSlideIndex < 0 || nSlideIndex>=mpLayout->mnSlideCount)
@@ -1010,9 +917,6 @@ Reference<rendering::XBitmap> PresenterSlideSorter::GetPreview (const sal_Int32
return NULL;
}
-
-
-
void PresenterSlideSorter::PaintPreview (
const Reference<rendering::XCanvas>& rxCanvas,
const css::awt::Rectangle& rUpdateBox,
@@ -1048,7 +952,6 @@ void PresenterSlideSorter::PaintPreview (
const rendering::ViewState aViewState (geometry::AffineMatrix2D(1,0,0, 0,1,0), xClip);
-
rendering::RenderState aRenderState (
geometry::AffineMatrix2D(
1, 0, aTopLeft.X,
@@ -1057,7 +960,6 @@ void PresenterSlideSorter::PaintPreview (
Sequence<double>(4),
rendering::CompositeOperation::SOURCE);
-
// Emphasize the current slide.
if (nSlideIndex == mnCurrentSlideIndex)
{
@@ -1107,9 +1009,6 @@ void PresenterSlideSorter::PaintPreview (
mpMouseOverManager->Paint(nSlideIndex, mxCanvas, xClip);
}
-
-
-
void PresenterSlideSorter::Paint (const awt::Rectangle& rUpdateBox)
{
const bool bCanvasChanged ( ! mxCanvas.is());
@@ -1165,9 +1064,6 @@ void PresenterSlideSorter::Paint (const awt::Rectangle& rUpdateBox)
xSpriteCanvas->updateScreen(sal_False);
}
-
-
-
void PresenterSlideSorter::SetHorizontalOffset (const double nXOffset)
{
if (mpLayout->SetHorizontalOffset(nXOffset))
@@ -1180,9 +1076,6 @@ void PresenterSlideSorter::SetHorizontalOffset (const double nXOffset)
}
}
-
-
-
void PresenterSlideSorter::SetVerticalOffset (const double nYOffset)
{
if (mpLayout->SetVerticalOffset(nYOffset))
@@ -1195,17 +1088,11 @@ void PresenterSlideSorter::SetVerticalOffset (const double nYOffset)
}
}
-
-
-
void PresenterSlideSorter::GotoSlide (const sal_Int32 nSlideIndex)
{
mxSlideShowController->gotoSlideIndex(nSlideIndex);
}
-
-
-
bool PresenterSlideSorter::ProvideCanvas (void)
{
if ( ! mxCanvas.is())
@@ -1229,9 +1116,6 @@ bool PresenterSlideSorter::ProvideCanvas (void)
return mxCanvas.is();
}
-
-
-
void PresenterSlideSorter::ThrowIfDisposed (void)
throw (lang::DisposedException)
{
@@ -1244,9 +1128,6 @@ void PresenterSlideSorter::ThrowIfDisposed (void)
}
}
-
-
-
//===== PresenterSlideSorter::Layout ==========================================
PresenterSlideSorter::Layout::Layout (
@@ -1275,9 +1156,6 @@ PresenterSlideSorter::Layout::Layout (
{
}
-
-
-
void PresenterSlideSorter::Layout::Update (
const geometry::RealRectangle2D& rBoundingBox,
const double nSlideAspectRatio)
@@ -1384,9 +1262,6 @@ void PresenterSlideSorter::Layout::Update (
}
}
-
-
-
void PresenterSlideSorter::Layout::SetupVisibleArea (void)
{
geometry::RealPoint2D aPoint (GetLocalPosition(
@@ -1415,9 +1290,6 @@ void PresenterSlideSorter::Layout::SetupVisibleArea (void)
}
}
-
-
-
bool PresenterSlideSorter::Layout::IsScrollBarNeeded (const sal_Int32 nSlideCount)
{
geometry::RealPoint2D aBottomRight;
@@ -1431,9 +1303,6 @@ bool PresenterSlideSorter::Layout::IsScrollBarNeeded (const sal_Int32 nSlideCoun
|| aBottomRight.Y > maBoundingBox.Y2-maBoundingBox.Y1;
}
-
-
-
geometry::RealPoint2D PresenterSlideSorter::Layout::GetLocalPosition(
const geometry::RealPoint2D& rWindowPoint) const
{
@@ -1442,9 +1311,6 @@ geometry::RealPoint2D PresenterSlideSorter::Layout::GetLocalPosition(
rWindowPoint.Y - maBoundingBox.Y1 + mnVerticalOffset);
}
-
-
-
geometry::RealPoint2D PresenterSlideSorter::Layout::GetWindowPosition(
const geometry::RealPoint2D& rLocalPoint) const
{
@@ -1453,9 +1319,6 @@ geometry::RealPoint2D PresenterSlideSorter::Layout::GetWindowPosition(
rLocalPoint.Y - mnVerticalOffset + maBoundingBox.Y1);
}
-
-
-
sal_Int32 PresenterSlideSorter::Layout::GetColumn (
const css::geometry::RealPoint2D& rLocalPoint,
const bool bReturnInvalidValue) const
@@ -1471,9 +1334,6 @@ sal_Int32 PresenterSlideSorter::Layout::GetColumn (
return -1;
}
-
-
-
sal_Int32 PresenterSlideSorter::Layout::GetRow (
const css::geometry::RealPoint2D& rLocalPoint,
const bool bReturnInvalidValue) const
@@ -1489,9 +1349,6 @@ sal_Int32 PresenterSlideSorter::Layout::GetRow (
return -1;
}
-
-
-
sal_Int32 PresenterSlideSorter::Layout::GetSlideIndexForPosition (
const css::geometry::RealPoint2D& rWindowPoint) const
{
@@ -1514,9 +1371,6 @@ sal_Int32 PresenterSlideSorter::Layout::GetSlideIndexForPosition (
}
}
-
-
-
geometry::RealPoint2D PresenterSlideSorter::Layout::GetPoint (
const sal_Int32 nSlideIndex,
const sal_Int32 nRelativeHorizontalPosition,
@@ -1547,9 +1401,6 @@ geometry::RealPoint2D PresenterSlideSorter::Layout::GetPoint (
return aPosition;
}
-
-
-
awt::Rectangle PresenterSlideSorter::Layout::GetBoundingBox (const sal_Int32 nSlideIndex) const
{
const geometry::RealPoint2D aWindowPosition(GetWindowPosition(GetPoint(nSlideIndex, -1, -1)));
@@ -1561,9 +1412,6 @@ awt::Rectangle PresenterSlideSorter::Layout::GetBoundingBox (const sal_Int32 nSl
aWindowPosition.Y + maPreviewSize.Height));
}
-
-
-
void PresenterSlideSorter::Layout::ForAllVisibleSlides (const ::boost::function<void(sal_Int32)>& rAction)
{
for (sal_Int32 nRow=mnFirstVisibleRow; nRow<=mnLastVisibleRow; ++nRow)
@@ -1578,17 +1426,11 @@ void PresenterSlideSorter::Layout::ForAllVisibleSlides (const ::boost::function<
}
}
-
-
-
sal_Int32 PresenterSlideSorter::Layout::GetFirstVisibleSlideIndex (void) const
{
return GetIndex(mnFirstVisibleRow, mnFirstVisibleColumn);
}
-
-
-
sal_Int32 PresenterSlideSorter::Layout::GetLastVisibleSlideIndex (void) const
{
return ::std::min(
@@ -1596,9 +1438,6 @@ sal_Int32 PresenterSlideSorter::Layout::GetLastVisibleSlideIndex (void) const
mnSlideCount);
}
-
-
-
bool PresenterSlideSorter::Layout::SetHorizontalOffset (const double nOffset)
{
if (mnHorizontalOffset != nOffset)
@@ -1612,9 +1451,6 @@ bool PresenterSlideSorter::Layout::SetHorizontalOffset (const double nOffset)
return false;
}
-
-
-
bool PresenterSlideSorter::Layout::SetVerticalOffset (const double nOffset)
{
if (mnVerticalOffset != nOffset)
@@ -1628,18 +1464,12 @@ bool PresenterSlideSorter::Layout::SetVerticalOffset (const double nOffset)
return false;
}
-
-
-
PresenterSlideSorter::Layout::Orientation
PresenterSlideSorter::Layout::GetOrientation (void) const
{
return meOrientation;
}
-
-
-
void PresenterSlideSorter::Layout::UpdateScrollBars (void)
{
sal_Int32 nTotalColumnCount (0);
@@ -1676,14 +1506,9 @@ void PresenterSlideSorter::Layout::UpdateScrollBars (void)
mpVerticalScrollBar->SetLineHeight(maPreviewSize.Height);
}
-
-
// No place yet for the vertical scroll bar.
}
-
-
-
sal_Int32 PresenterSlideSorter::Layout::GetIndex (
const sal_Int32 nRow,
const sal_Int32 nColumn) const
@@ -1694,9 +1519,6 @@ sal_Int32 PresenterSlideSorter::Layout::GetIndex (
return nRow * mnColumnCount + nColumn;
}
-
-
-
sal_Int32 PresenterSlideSorter::Layout::GetRow (const sal_Int32 nSlideIndex) const
{
if (meOrientation == Horizontal)
@@ -1705,9 +1527,6 @@ sal_Int32 PresenterSlideSorter::Layout::GetRow (const sal_Int32 nSlideIndex) con
return nSlideIndex / mnColumnCount;
}
-
-
-
sal_Int32 PresenterSlideSorter::Layout::GetColumn (const sal_Int32 nSlideIndex) const
{
if (meOrientation == Horizontal)
@@ -1716,9 +1535,6 @@ sal_Int32 PresenterSlideSorter::Layout::GetColumn (const sal_Int32 nSlideIndex)
return nSlideIndex % mnColumnCount;
}
-
-
-
//===== PresenterSlideSorter::MouseOverManager ================================
PresenterSlideSorter::MouseOverManager::MouseOverManager (
@@ -1751,16 +1567,10 @@ PresenterSlideSorter::MouseOverManager::MouseOverManager (
}
}
-
-
-
PresenterSlideSorter::MouseOverManager::~MouseOverManager (void)
{
}
-
-
-
void PresenterSlideSorter::MouseOverManager::Paint (
const sal_Int32 nSlideIndex,
const Reference<rendering::XCanvas>& rxCanvas,
@@ -1796,9 +1606,6 @@ void PresenterSlideSorter::MouseOverManager::Paint (
}
}
-
-
-
void PresenterSlideSorter::MouseOverManager::SetCanvas (
const Reference<rendering::XCanvas>& rxCanvas)
{
@@ -1807,9 +1614,6 @@ void PresenterSlideSorter::MouseOverManager::SetCanvas (
mpFont->PrepareFont(Reference<rendering::XCanvas>(mxCanvas, UNO_QUERY));
}
-
-
-
void PresenterSlideSorter::MouseOverManager::SetSlide (
const sal_Int32 nSlideIndex,
const awt::Rectangle& rBox)
@@ -1846,9 +1650,6 @@ void PresenterSlideSorter::MouseOverManager::SetSlide (
Invalidate();
}
-
-
-
Reference<rendering::XBitmap> PresenterSlideSorter::MouseOverManager::CreateBitmap (
const OUString& rsText,
const sal_Int32 nMaximalWidth) const
@@ -1918,9 +1719,6 @@ Reference<rendering::XBitmap> PresenterSlideSorter::MouseOverManager::CreateBitm
return xBitmap;
}
-
-
-
OUString PresenterSlideSorter::MouseOverManager::GetFittingText (
const OUString& rsText,
const double nMaximalWidth) const
@@ -1978,9 +1776,6 @@ OUString PresenterSlideSorter::MouseOverManager::GetFittingText (
return rsText;
}
-
-
-
geometry::IntegerSize2D PresenterSlideSorter::MouseOverManager::CalculateLabelSize (
const OUString& rsText) const
{
@@ -2002,9 +1797,6 @@ geometry::IntegerSize2D PresenterSlideSorter::MouseOverManager::CalculateLabelSi
return geometry::IntegerSize2D(nWidth, nHeight);
}
-
-
-
void PresenterSlideSorter::MouseOverManager::PaintButtonBackground (
const Reference<rendering::XBitmapCanvas>& rxCanvas,
const geometry::IntegerSize2D& rSize) const
@@ -2031,18 +1823,12 @@ void PresenterSlideSorter::MouseOverManager::PaintButtonBackground (
xRightLabelBitmap);
}
-
-
-
void PresenterSlideSorter::MouseOverManager::Invalidate (void)
{
if (mpPaintManager.get() != NULL)
mpPaintManager->Invalidate(mxInvalidateTarget, maSlideBoundingBox, true);
}
-
-
-
//===== PresenterSlideSorter::CurrentSlideFrameRenderer =======================
PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer (
@@ -2120,16 +1906,10 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer (
}
}
-
-
-
PresenterSlideSorter::CurrentSlideFrameRenderer::~CurrentSlideFrameRenderer (void)
{
}
-
-
-
void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintCurrentSlideFrame (
const awt::Rectangle& rSlideBoundingBox,
const Reference<rendering::XCanvas>& rxCanvas,
@@ -2223,9 +2003,6 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintCurrentSlideFrame (
}
}
-
-
-
awt::Rectangle PresenterSlideSorter::CurrentSlideFrameRenderer::GetBoundingBox (
const awt::Rectangle& rSlideBoundingBox)
{
@@ -2236,9 +2013,6 @@ awt::Rectangle PresenterSlideSorter::CurrentSlideFrameRenderer::GetBoundingBox (
rSlideBoundingBox.Height + mnTopFrameSize + mnBottomFrameSize);
}
-
-
-
void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintBitmapOnce(
const css::uno::Reference<css::rendering::XBitmap>& rxBitmap,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
@@ -2268,9 +2042,6 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintBitmapOnce(
aRenderState);
}
-
-
-
void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintBitmapTiled(
const css::uno::Reference<css::rendering::XBitmap>& rxBitmap,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,